Changes for page homeopathsSheet

Last modified by Jip-jan Alunkel on March 26, 17:31
From version 3.100
edited by Jip-jan Alunkel
on March 10, 20:29
Change comment: Rollback to version 1.38
To version 3.95
edited by Jip-jan Alunkel
on March 09, 20:03
Change comment: Rollback to version 1.38

Summary

Details

Page properties
Content
... ... @@ -41,9 +41,9 @@
41 41   #end
42 42  ## The classProperties Map has to be in the order of how you want the form elements to appear in the form.
43 43   #set($classProperties = {
44 - 'editAddress': {'type': 'checkbox', 'opener': 1, 'classless': 1, 'extraAttributes': {"data-checked": "false"},
44 + 'editAddress': {'type': 'checkbox', 'opener': 1, 'classless': 1, 'checked': 1},
45 45   'pmAddress': {'type': 'address', 'parent': 'editAddress', 'extraAttributes': {"aria-label": "Input and select the address of your practice", "placeholder": "$services.localization.render('homeopaths.multiword.address.placeholder')", "pmLatlong": "$xa['pmLatlong']", "pmCountry": "$xa['pmCountry']", "pmState": "$xa['pmState']", "pmCounty": "$xa['pmCounty']", "pmPostcode": "$xa['pmPostcode']", "pmCity": "$xa['pmCity']", "pmStreet": "$xa['pmStreet']", "pmHousenumber": "$xa['pmHousenumber']", "data-auto-first-capital": "true", "data-query-type": "address", "data-query-reference": "", "data-query-list-type": "suggest-select", "data-query-list-header": "$services.localization.render('pagemaker.line.suggest_select_list')", "data-query-list-contents": "value/key", "data-query-list-editable": "false", "data-create-xobj": "true", "data-xobj-classname": "homeopaths.Code.homeopathsClass", "help-block" : 'Input street and number, then select the address of your practice.'}},
46 - 'practiceName': {'type': 'text', 'disabled': 1, 'extraAttributes': {"disabled": "disabled", "help-block" : 'The name of your practice is the title of this page. If you want to change it, you should edit the content of this page.'}},
46 + 'practiceName': {'type': 'text', 'extraAttributes': {"disabled": "disabled", "help-block" : 'The name of your practice is the title of this page. If you want to change it, you should edit the content of this page.'}},
47 47   'pmStreet': {'type': 'text', 'disabled': 1},
48 48   'pmHousenumber': {'type': 'text', 'disabled': 1},
49 49   'pmPostcode': {'type': 'text', 'disabled': 1},
... ... @@ -51,12 +51,11 @@
51 51   'pmCounty': {'type': 'text', 'disabled': 1},
52 52   'pmState': {'type': 'text', 'disabled': 1},
53 53   'pmCountry': {'type': 'text', 'disabled': 1},
54 - 'nrOfHomeopaths': {'type': 'number'},
55 55   'certification': {'type': 'checkbox', 'opener': 1},
56 56   'certificationFrom': {'type': 'text', 'parent': 'certification'}
57 57   })
58 58   #createAddress($theClass 1)
59 - #set($properties = ['nrOfHomeopaths','certification','certificationFrom'])
58 + #set($properties = ['certification','certificationFrom'])
60 60   #foreach($property in $properties)
61 61   #if($theDocObj.getProperty($property))
62 62   <p class="property">
... ... @@ -104,18 +104,10 @@
104 104   #set($lastChild = "")
105 105   #foreach($propertyName in $classProperties.keySet())
106 106   #set($item = $classProperties["$propertyName"])
107 - #if(!$item.containsKey("disabled"))
108 - #if(!$item.containsKey("classless") && $theDocObj.getProperty($propertyName)) ## 'address' is not a property in the current class
109 - #set($value = $theDocObj.getProperty($propertyName).value)
110 - #if($item.type == "checkbox")
111 - #set($checkBool = ["false","true"])
112 -$checkBool[$value]
113 -#set($item.extraAttributes["data-checked"] = "$checkBool[$value]")
114 - #else
115 -
116 - #end
117 - #end
118 - #if($item.type == "checkbox")
106 + #set($propertyType = $item.type)
107 + #if($item.containsKey("disabled"))
108 + #else
109 + #if($propertyType == "checkbox")
119 119   #set($value = "1")
120 120   #if($item.containsKey("classless"))
121 121   #if(!$item.containsKey("checked"))
... ... @@ -126,6 +126,11 @@
126 126   #set($item["checked"] = "$checkboxPropVal")
127 127   #end
128 128   #end
120 + #if($theDocObj.getProperty($propertyName) || $propertyType == "address") ## 'address' is not a property in the current class
121 + #if($propertyType != "checkbox")
122 + #set($value = $theDocObj.getProperty($propertyName).value)
123 + #end
124 + #end
129 129   #set($propertyChecked = $item.checked)
130 130   #set($propertyOpener = $item.opener)
131 131   #set($propertyParent = $item.parent)
... ... @@ -137,7 +137,7 @@
137 137   #if($item.containsKey("classless"))
138 138   #set($newElem = {
139 139   "id" : "$propertyName",
140 - "type" : $item.type,
136 + "type" : $propertyType,
141 141   "required" : "false",
142 142   "label" : "$label",
143 143   "value" : "$value"
... ... @@ -145,7 +145,7 @@
145 145   #else
146 146   #set($newElem = {
147 147   "id" : "$propertyName",
148 - "type" : $item.type,
144 + "type" : $propertyType,
149 149   "required" : "false",
150 150   "label" : "$label",
151 151   "data-create-xobj" : "true",
... ... @@ -155,8 +155,9 @@
155 155   })
156 156   #end
157 157   #if($extraAttributes.keySet().size() > 0)
158 - #foreach($attr in $extraAttributes.keySet())
159 - #set($discard = $newElem.put("$attr", $extraAttributes[$attr]))
154 + #set($attrMap = $extraAttributes)
155 + #foreach($attr in $attrMap.keySet())
156 + #set($discard = $newElem.put("$attr", $attrMap[$attr]))
160 160   #end
161 161   #end
162 162   #if($propertyChecked == '1')