Changes for page homeopathsSheet

Last modified by Jip-jan Alunkel on March 26, 17:31
From version 1.67
edited by Jip-jan Alunkel
on March 08, 01:18
Change comment: There is no comment for this version
To version 1.73
edited by Jip-jan Alunkel
on March 08, 14:16
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -32,19 +32,22 @@
32 32  #if($xcontext.action == "view")
33 33  <div id="${spaceTitle}" class="box sheet_properties">
34 34   <h2>Details</h2>
35 -#set($classProperties = {
36 - 'practiceName': {'type': 'text', 'opener': 0},
37 - 'pmStreet': {'type': 'text', 'opener': 0},
38 - 'pmHousenumber': {'type': 'text', 'opener': 0, 'parent': 'certification'},
39 - 'pmPostcode': {'type': 'text', 'opener': 0},
40 - 'pmCity': {'type': 'text', 'opener': 0},
41 - 'pmCounty': {'type': 'text', 'opener': 0, 'parent': 'certification'},
42 - 'pmState': {'type': 'text', 'opener': 0},
43 - 'pmCountry': {'type': 'text', 'opener': 0},
44 - 'certification': {'type': 'checkbox', 'opener': 1},
45 - 'certificationFrom': {'type': 'text', 'opener': 0, 'parent': 'certification'}
46 -})
47 -#foreach($property in $classProperties.keySet())
35 +## The classProperties Map has to be in the order of how you want the form elements to appear in the form.
36 +#set($classProperties = [
37 + {'practiceName': {'type': 'text', 'opener': 0}},
38 + {'pmStreet': {'type': 'text', 'opener': 0}},
39 + {'pmHousenumber': {'type': 'text', 'opener': 0, 'parent': 'certification'}},
40 + {'pmPostcode': {'type': 'text', 'opener': 0}},
41 + {'pmCity': {'type': 'text', 'opener': 0}},
42 + {'pmCounty': {'type': 'text', 'opener': 0, 'parent': 'certification'}},
43 + {'pmState': {'type': 'text', 'opener': 0}},
44 + {'pmCountry': {'type': 'text', 'opener': 0}},
45 + {'certification': {'type': 'checkbox', 'opener': 1}},
46 + {'certificationFrom': {'type': 'text', 'opener': 0, 'parent': 'certification'}}
47 +])
48 +#foreach($property in $classProperties)
49 + $property.keySet()[0]
50 +#*
48 48   #if($theDocObj.getProperty($property))
49 49   <p class="property">
50 50   #if($theDocObj.getProperty($property).value != "" && $property != "pmHousenumber") ## Difference with added housenumber because of the streetaddress layout.
... ... @@ -56,6 +56,8 @@
56 56   </p>
57 57   #end
58 58   #end
62 +*#
63 +
59 59  #end
60 60  
61 61   #if($hasRight)
... ... @@ -76,19 +76,20 @@
76 76   })
77 77   #set($thisObj = {})
78 78   #set($children = {})
79 -$classProperties
84 + #set($nonChildren = {})
80 80   #foreach($item in $classProperties.keySet())
81 - #if($classProperties[$item].parent)
86 + #if($classProperties[$item].opener == 1)
82 82   #set($parentID = $classProperties[$item].parent)
83 83   #if(!$children[$parentID])
84 84   #set($discard = $children.put("$parentID", {}))
85 85   #end
86 86   #set($discard = $children["$parentID"].put($item, $classProperties[$item]))
87 - #set($discard = $classProperties.delete("$item"))
92 + #elseif($classProperties[$item].parent)## ???? Ws fout
93 + #else
94 + #set($discard = $nonChildren.put($item, $classProperties[$item]))
88 88   #end
89 89   #end
90 -$classProperties
91 -#createElementObjects($classProperties)
97 + #createElementObjects($nonChildren)
92 92   #set($submit = {
93 93   "id" : "edit_details",
94 94   "button-text" : "Save changes",