Changes for page homeopathsSheet

Last modified by Jip-jan Alunkel on March 26, 17:31
From version 3.91
edited by Jip-jan Alunkel
on March 09, 19:10
Change comment: Rollback to version 1.38
To version 3.101
edited by Jip-jan Alunkel
on March 10, 20:30
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, 'checked': 0},
44 + 'editAddress': {'type': 'checkbox', 'opener': 1, 'classless': 1, 'extraAttributes': {"data-checked": "false"}},
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', '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', '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},
48 48   'pmHousenumber': {'type': 'text', 'disabled': 1},
49 49   'pmPostcode': {'type': 'text', 'disabled': 1},
... ... @@ -51,11 +51,12 @@
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'},
54 54   'certification': {'type': 'checkbox', 'opener': 1},
55 55   'certificationFrom': {'type': 'text', 'parent': 'certification'}
56 56   })
57 - #createAddress($theClass)
58 - #set($properties = ['certification','certificationFrom'])
58 + #createAddress($theClass 1)
59 + #set($properties = ['nrOfHomeopaths','certification','certificationFrom'])
59 59   #foreach($property in $properties)
60 60   #if($theDocObj.getProperty($property))
61 61   <p class="property">
... ... @@ -103,10 +103,18 @@
103 103   #set($lastChild = "")
104 104   #foreach($propertyName in $classProperties.keySet())
105 105   #set($item = $classProperties["$propertyName"])
106 - #set($propertyType = $item.type)
107 - #if($item.containsKey("disabled"))
108 - #else
109 - #if($propertyType == "checkbox")
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")
110 110   #set($value = "1")
111 111   #if($item.containsKey("classless"))
112 112   #if(!$item.containsKey("checked"))
... ... @@ -117,11 +117,6 @@
117 117   #set($item["checked"] = "$checkboxPropVal")
118 118   #end
119 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)
123 - #end
124 - #end
125 125   #set($propertyChecked = $item.checked)
126 126   #set($propertyOpener = $item.opener)
127 127   #set($propertyParent = $item.parent)
... ... @@ -133,7 +133,7 @@
133 133   #if($item.containsKey("classless"))
134 134   #set($newElem = {
135 135   "id" : "$propertyName",
136 - "type" : $propertyType,
140 + "type" : $item.type,
137 137   "required" : "false",
138 138   "label" : "$label",
139 139   "value" : "$value"
... ... @@ -141,7 +141,7 @@
141 141   #else
142 142   #set($newElem = {
143 143   "id" : "$propertyName",
144 - "type" : $propertyType,
148 + "type" : $item.type,
145 145   "required" : "false",
146 146   "label" : "$label",
147 147   "data-create-xobj" : "true",
... ... @@ -151,9 +151,8 @@
151 151   })
152 152   #end
153 153   #if($extraAttributes.keySet().size() > 0)
154 - #set($attrMap = $extraAttributes)
155 - #foreach($attr in $attrMap.keySet())
156 - #set($discard = $newElem.put("$attr", $attrMap[$attr]))
158 + #foreach($attr in $extraAttributes.keySet())
159 + #set($discard = $newElem.put("$attr", $extraAttributes[$attr]))
157 157   #end
158 158   #end
159 159   #if($propertyChecked == '1')