Changes for page homeopathsSheet

Last modified by Jip-jan Alunkel on March 26, 17:31
From version 3.103
edited by Jip-jan Alunkel
on March 10, 21:09
Change comment: Rollback to version 1.38
To version 3.98
edited by Jip-jan Alunkel
on March 09, 20:37
Change comment: Rollback to version 1.38

Summary

Details

Page properties
Content
... ... @@ -41,7 +41,7 @@
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': 0},
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 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.'}},
47 47   'pmStreet': {'type': 'text', 'disabled': 1},
... ... @@ -56,7 +56,7 @@
56 56   'certificationFrom': {'type': 'text', 'parent': 'certification'}
57 57   })
58 58   #createAddress($theClass 1)
59 - #set($properties = ['nrOfHomeopaths','certification','certificationFrom'])
59 + #set($properties = ['certification','certificationFrom'])
60 60   #foreach($property in $properties)
61 61   #if($theDocObj.getProperty($property))
62 62   <p class="property">
... ... @@ -104,29 +104,37 @@
104 104   #set($lastChild = "")
105 105   #foreach($propertyName in $classProperties.keySet())
106 106   #set($item = $classProperties["$propertyName"])
107 - #if(!$item.containsKey("disabled"))
108 - #set($checkBool = ["false","true"])
109 - #if(!$item.containsKey("classless") && $theDocObj.getProperty($propertyName)) ## 'address' is not a property in the current class
110 - #set($value = $theDocObj.getProperty($propertyName).value)
111 - #if($item.type == "checkbox")
112 - #set($item.extraAttributes["data-checked"] = "$checkBool[$value]")
113 - #end
114 - #else
115 - #if($item.type == "checkbox")
116 - #set($value = "1")
117 - #if(!$item.extraAttributes.containsKey("data-checked")
118 - #set($item.extraAttributes["data-checked"] = "$checkBool[0]")
107 + #set($propertyType = $item.type)
108 + #if($item.containsKey("disabled"))
109 + #else
110 + #if($propertyType == "checkbox")
111 + #set($value = "1")
112 + #if($item.containsKey("classless"))
113 + #if(!$item.containsKey("checked"))
114 + #set($item["checked"] = '0')
119 119   #end
116 + #else
117 + #set($checkboxPropVal = $theDocObj.getProperty($propertyName).value)
118 + #set($item["checked"] = "$checkboxPropVal")
120 120   #end
121 121   #end
121 + #if($theDocObj.getProperty($propertyName) || $propertyType == "address") ## 'address' is not a property in the current class
122 + #if($propertyType != "checkbox")
123 + #set($value = $theDocObj.getProperty($propertyName).value)
124 + #end
125 + #end
126 + #set($propertyChecked = $item.checked)
127 + #set($propertyOpener = $item.opener)
128 + #set($propertyParent = $item.parent)
129 + #set($extraAttributes = $item.extraAttributes)
130 + #set($label = $services.localization.render("homeopaths.classproperty.${propertyName}"))
122 122   #if(!$value)
123 123   #set($value = "")
124 124   #end
125 - #set($label = $services.localization.render("homeopaths.classproperty.${propertyName}"))
126 126   #if($item.containsKey("classless"))
127 127   #set($newElem = {
128 128   "id" : "$propertyName",
129 - "type" : $item.type,
137 + "type" : $propertyType,
130 130   "required" : "false",
131 131   "label" : "$label",
132 132   "value" : "$value"
... ... @@ -134,7 +134,7 @@
134 134   #else
135 135   #set($newElem = {
136 136   "id" : "$propertyName",
137 - "type" : $item.type,
145 + "type" : $propertyType,
138 138   "required" : "false",
139 139   "label" : "$label",
140 140   "data-create-xobj" : "true",
... ... @@ -143,15 +143,21 @@
143 143   "value" : "$value"
144 144   })
145 145   #end
146 - #if($item.extraAttributes.keySet().size() > 0)
147 - #foreach($attr in $item.extraAttributes.keySet())
148 - #set($discard = $newElem.put("$attr", $item.extraAttributes[$attr]))
154 + #if($extraAttributes.keySet().size() > 0)
155 + #set($attrMap = $extraAttributes)
156 + #foreach($attr in $attrMap.keySet())
157 + #set($discard = $newElem.put("$attr", $attrMap[$attr]))
149 149   #end
150 150   #end
151 - #if($item.opener)
160 + #if($propertyChecked == '1')
161 + #set($discard = $newElem.put("data-checked", "true"))
162 + #else
163 + #set($discard = $newElem.put("data-checked", "false"))
164 + #end
165 + #if($propertyOpener)
152 152   #set($discard = $newElem.put("data-opener", "true"))
153 153   #end
154 - #if($item.parent)
168 + #if($propertyParent)
155 155   #set($lastChild = "$key")
156 156   #elseif($lastChild != "")
157 157   #set($lastChild = "")
... ... @@ -158,7 +158,7 @@
158 158   #createExpandEnd()
159 159   #end
160 160   #createFormElement($newElem)
161 - #if($item.opener)
175 + #if($propertyOpener)
162 162   #createExpandStart($newElem $value)
163 163   #end
164 164   #end