Changes for page homeopathsSheet

Last modified by Jip-jan Alunkel on March 26, 17:31
From version 1.120
edited by Jip-jan Alunkel
on March 08, 18:16
Change comment: There is no comment for this version
To version 1.112
edited by Jip-jan Alunkel
on March 08, 15:40
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -35,12 +35,11 @@
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'}},
38 - {'pmAddress': 'type': 'text', '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 39   {'pmStreet': {'type': 'text'}},
40 - {'pmHousenumber': {'type': 'text'}},
39 + {'pmHousenumber': {'type': 'text', 'parent': 'certification'}},
41 41   {'pmPostcode': {'type': 'text'}},
42 42   {'pmCity': {'type': 'text'}},
43 - {'pmCounty': {'type': 'text'}},
42 + {'pmCounty': {'type': 'text', 'parent': 'certification'}},
44 44   {'pmState': {'type': 'text'}},
45 45   {'pmCountry': {'type': 'text'}},
46 46   {'certification': {'type': 'checkbox', 'opener': 1}},
... ... @@ -63,6 +63,24 @@
63 63   "url": "",
64 64   "use_captcha": "false"
65 65   })
65 +#* #set($thisObj = {})
66 + #set($children = {})
67 + #set($nonChildren = {})
68 + #foreach($item in $classProperties.keySet())
69 + #if($classProperties[$item].opener == 1)
70 + #set($parentID = $classProperties[$item].parent)
71 + #if(!$children[$parentID])
72 + #set($discard = $children.put("$parentID", {}))
73 + #end
74 + #set($discard = $children["$parentID"].put($item, $classProperties[$item]))
75 + #elseif($classProperties[$item].parent)## ???? Ws fout
76 + #else
77 + #set($discard = $nonChildren.put($item, $classProperties[$item]))
78 + #end
79 + #end
80 +## #createElementObjects($nonChildren)
81 +*#
82 +
66 66   #set($submit = {
67 67   "id" : "edit_details",
68 68   "button-text" : "Save changes",
... ... @@ -101,6 +101,7 @@
101 101   #if(!$value)
102 102   #set($value = "1")
103 103   #end
121 +## $key : $value<br />
104 104   #set($newElem = {
105 105   "id" : "$key",
106 106   "type" : $propertyType,
... ... @@ -121,16 +121,31 @@
121 121   #set($discard = $newElem.put("data-opener", "true"))
122 122   #end
123 123   #if($propertyParent)
124 - #set($lastChild = "$key")
142 + #set($lastChild = $key)
125 125   #elseif($lastChild != "")
126 126   #set($lastChild = "")
127 - #createExpandEnd()
145 +## #createExpandEnd()
128 128   #end
129 129   #createFormElement($newElem)
130 130   #if($propertyOpener)
131 - #createExpandStart($newElem $newElem["value"])
149 +## #createExpandStart($newElem $newElem["value"])
132 132   #end
133 133   #end
152 +
153 +#*
154 + #if($theDocObj.getProperty($property))
155 + <p class="property">
156 + #if($theDocObj.getProperty($property).value != "" && $property != "pmHousenumber") ## Difference with added housenumber because of the streetaddress layout.
157 + #if($property == "pmStreet") ## Difference with added housenumber because of the streetaddress layout.
158 + <span class="property-name">$services.localization.render("homeopaths.classproperty.address")</span> <span class="property-value">$doc.display($property) $doc.display("pmHousenumber")</span>
159 + #else
160 + <span class="property-name">$services.localization.render("homeopaths.classproperty.${property}")</span> <span class="property-value">$doc.display($property)</span>
161 + #end
162 + </p>
163 + #end
164 + #end
165 +*#
166 +
134 134  #end
135 135   </div>
136 136   <div class="modal-footer">
... ... @@ -146,7 +146,7 @@
146 146   This page can not be viewed in inline mode.
147 147  #end
148 148  
149 -#macro(createElementObjects $properties)
182 +#macro(createElementObject $properties)
150 150   #foreach($item in $properties.keySet())
151 151   #set($label = $services.localization.render("homeopaths.classproperty.${item}"))
152 152   #if($theDocObj.getProperty($item))