Changes for page homeopathsSheet

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

From version 3.102
edited by Jip-jan Alunkel
on March 10, 20:54
Change comment: Rollback to version 1.38
To version 3.97
edited by Jip-jan Alunkel
on March 09, 20:08
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},
... ... @@ -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,27 +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]")
106 + #set($propertyType = $item.type)
107 + #if($item.containsKey("disabled"))
108 + #else
109 + #if($propertyType == "checkbox")
110 + #set($value = "1")
111 + #if($item.containsKey("classless"))
112 + #if(!$item.containsKey("checked"))
113 + #set($item["checked"] = '0')
114 + #end
115 + #else
116 + #set($checkboxPropVal = $theDocObj.getProperty($propertyName).value)
117 + #set($item["checked"] = "$checkboxPropVal")
113 113   #end
114 - #else
115 - #set($value = "")
116 - #if($item.type == "checkbox" && $item.containsKey("extraAttributes") && !$item.extraAttributes.containsKey("data-checked"))
117 - #set($item.extraAttributes["data-checked"] = "$checkBool[0]")
119 + #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)
118 118   #end
119 119   #end
125 + #set($propertyChecked = $item.checked)
126 + #set($propertyOpener = $item.opener)
127 + #set($propertyParent = $item.parent)
128 + #set($extraAttributes = $item.extraAttributes)
129 + #set($label = $services.localization.render("homeopaths.classproperty.${propertyName}"))
120 120   #if(!$value)
121 121   #set($value = "")
122 122   #end
123 - #set($label = $services.localization.render("homeopaths.classproperty.${propertyName}"))
124 124   #if($item.containsKey("classless"))
125 125   #set($newElem = {
126 126   "id" : "$propertyName",
127 - "type" : $item.type,
136 + "type" : $propertyType,
128 128   "required" : "false",
129 129   "label" : "$label",
130 130   "value" : "$value"
... ... @@ -132,7 +132,7 @@
132 132   #else
133 133   #set($newElem = {
134 134   "id" : "$propertyName",
135 - "type" : $item.type,
144 + "type" : $propertyType,
136 136   "required" : "false",
137 137   "label" : "$label",
138 138   "data-create-xobj" : "true",
... ... @@ -141,15 +141,21 @@
141 141   "value" : "$value"
142 142   })
143 143   #end
144 - #if($item.extraAttributes.keySet().size() > 0)
145 - #foreach($attr in $item.extraAttributes.keySet())
146 - #set($discard = $newElem.put("$attr", $item.extraAttributes[$attr]))
153 + #if($extraAttributes.keySet().size() > 0)
154 + #set($attrMap = $extraAttributes)
155 + #foreach($attr in $attrMap.keySet())
156 + #set($discard = $newElem.put("$attr", $attrMap[$attr]))
147 147   #end
148 148   #end
149 - #if($item.opener)
159 + #if($propertyChecked == '1')
160 + #set($discard = $newElem.put("data-checked", "true"))
161 + #else
162 + #set($discard = $newElem.put("data-checked", "false"))
163 + #end
164 + #if($propertyOpener)
150 150   #set($discard = $newElem.put("data-opener", "true"))
151 151   #end
152 - #if($item.parent)
167 + #if($propertyParent)
153 153   #set($lastChild = "$key")
154 154   #elseif($lastChild != "")
155 155   #set($lastChild = "")
... ... @@ -156,7 +156,7 @@
156 156   #createExpandEnd()
157 157   #end
158 158   #createFormElement($newElem)
159 - #if($item.opener)
174 + #if($propertyOpener)
160 160   #createExpandStart($newElem $value)
161 161   #end
162 162   #end