Changes for page homeopathsSheet

Last modified by Jip-jan Alunkel on March 26, 17:31

From version 3.22
edited by Jip-jan Alunkel
on March 09, 01:33
Change comment: Rollback to version 1.38
To version 3.15
edited by Jip-jan Alunkel
on March 09, 00:43
Change comment: Rollback to version 1.38

Summary

Details

Page properties
Content
... ... @@ -35,15 +35,14 @@
35 35  ## The classProperties Map has to be in the order of how you want the form elements to appear in the form.
36 36   #set($classProperties = {
37 37   '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.'}},
38 - 'editAddress': {'type': 'checkbox', 'opener': 1},
39 - 'pmAddress': {'type': 'address', 'parent': 'editAddress', 'extraAttributes': {"aria-label": "Input and select the address of your practice", "placeholder": "$services.localization.render('homeopaths.multiword.address.placeholder')", "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.'}},
40 - 'pmStreet': {'type': 'text', 'disabled': 1},
41 - 'pmHousenumber': {'type': 'text', 'disabled': 1},
42 - 'pmPostcode': {'type': 'text', 'disabled': 1},
43 - 'pmCity': {'type': 'text', 'disabled': 1},
44 - 'pmCounty': {'type': 'text', 'disabled': 1},
45 - 'pmState': {'type': 'text', 'disabled': 1},
46 - 'pmCountry': {'type': 'text', 'disabled': 1},
38 + 'pmAddress': {'type': 'address', 'extraAttributes': {"aria-label": "Input and select the address of your practice", "placeholder": "$services.localization.render('homeopaths.multiword.address.placeholder')", "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.'}},
39 + 'pmStreet': {'type': 'text'},
40 + 'pmHousenumber': {'type': 'text'},
41 + 'pmPostcode': {'type': 'text'},
42 + 'pmCity': {'type': 'text'},
43 + 'pmCounty': {'type': 'text'},
44 + 'pmState': {'type': 'text'},
45 + 'pmCountry': {'type': 'text'},
47 47   'certification': {'type': 'checkbox', 'opener': 1},
48 48   'certificationFrom': {'type': 'text', 'parent': 'certification'}
49 49   })
... ... @@ -113,10 +113,11 @@
113 113   #set($discard = $x.put("$datapart", $datapart4Publish))
114 114   #end
115 115  #end
116 -$x['pmStreet'] $x['pmHousenumber']<br />
117 -$x['pmPostcode'] $x['pmCity']<br />
118 -$x['pmCounty'] $x['pmState']<br />
119 -$x['pmCountry']
115 +
116 +$x['pmStreet'] $theDocObj.getProperty('pmHousenumber').value<br />
117 +$theDocObj.getProperty('pmPostcode').value $theDocObj.getProperty('pmCity').value<br />
118 +$theDocObj.getProperty('pmCounty,').value $theDocObj.getProperty('pmState').value<br />
119 +$theDocObj.getProperty('pmCountry').value.toUpperCase()
120 120   </address>
121 121   </fieldset>
122 122  #set($lastChild = "")
... ... @@ -129,43 +129,44 @@
129 129   #set($propertyParent = $item.parent)
130 130   #set($extraAttributes = $item.extraAttributes)
131 131   #set($label = $services.localization.render("homeopaths.classproperty.${propertyName}"))
132 - #if($propertyType == "checkbox" || $propertyType == "radio")
133 - #set($value = "0")
134 - #elseif($theDocObj.getProperty($propertyName) || $propertyType == "address") ## 'address' is not a property in the current class
132 + #if($theDocObj.getProperty($propertyName) || $propertyType == "address")
135 135   #set($value = $theDocObj.getProperty($propertyName).value)
136 - #end
137 - #if(!$value)
138 - #set($value = "")
139 - #end
140 - #set($newElem = {
141 - "id" : "$propertyName",
142 - "type" : $propertyType,
143 - "required" : "false",
144 - "label" : "$label",
145 - "data-create-xobj" : "true",
146 - "data-xobj-classname" : $theClass,
147 - "data-xobj-fieldname" : "$propertyName",
148 - "value" : "$value"
149 - })
150 - #if($extraAttributes.keySet().size() > 0)
151 - #set($attrMap = $extraAttributes)
152 - #foreach($attr in $attrMap.keySet())
153 - #set($discard = $newElem.put("$attr", $attrMap[$attr]))
134 + #if($propertyType == "checkbox" || $propertyType == "radio")
135 + #set($value = "1")
154 154   #end
137 + #if(!$value)
138 + #set($value = "")
139 + #end
140 + #set($newElem = {
141 + "id" : "$propertyName",
142 + "type" : $propertyType,
143 + "required" : "false",
144 + "label" : "$label",
145 + "data-create-xobj" : "true",
146 + "data-xobj-classname" : $theClass,
147 + "data-xobj-fieldname" : "$propertyName",
148 + "value" : "$value"
149 + })
150 + #if($extraAttributes.keySet().size() > 0)
151 + #set($attrMap = $extraAttributes)
152 + #foreach($attr in $attrMap.keySet())
153 + #set($discard = $newElem.put("$attr", $attrMap[$attr]))
154 + #end
155 + #end
156 + #if($propertyOpener)
157 + #set($discard = $newElem.put("data-opener", "true"))
158 + #end
159 + #if($propertyParent)
160 + #set($lastChild = "$key")
161 + #elseif($lastChild != "")
162 + #set($lastChild = "")
163 + #createExpandEnd()
164 + #end
165 + #createFormElement($newElem)
166 + #if($propertyOpener)
167 + #createExpandStart($newElem $value)
168 + #end
155 155   #end
156 - #if($propertyOpener)
157 - #set($discard = $newElem.put("data-opener", "true"))
158 - #end
159 - #if($propertyParent)
160 - #set($lastChild = "$key")
161 - #elseif($lastChild != "")
162 - #set($lastChild = "")
163 - #createExpandEnd()
164 - #end
165 - #createFormElement($newElem)
166 - #if($propertyOpener)
167 - #createExpandStart($newElem $value)
168 - #end
169 169   #end
170 170  #end
171 171   </div>