Changes for page homeopathsSheet

Last modified by Jip-jan Alunkel on March 26, 17:31
From version 1.75
edited by Jip-jan Alunkel
on March 08, 14:18
Change comment: There is no comment for this version
To version 1.69
edited by Jip-jan Alunkel
on March 08, 02:33
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -32,26 +32,19 @@
32 32  #if($xcontext.action == "view")
33 33  <div id="${spaceTitle}" class="box sheet_properties">
34 34   <h2>Details</h2>
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 - #foreach($item in $property.keySet())
50 - $item
51 - #end
52 - #set($item = $property.keySet())
53 - $item[0]
54 -#*
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())
55 55   #if($theDocObj.getProperty($property))
56 56   <p class="property">
57 57   #if($theDocObj.getProperty($property).value != "" && $property != "pmHousenumber") ## Difference with added housenumber because of the streetaddress layout.
... ... @@ -63,8 +63,6 @@
63 63   </p>
64 64   #end
65 65   #end
66 -*#
67 -
68 68  #end
69 69  
70 70   #if($hasRight)
... ... @@ -87,7 +87,7 @@
87 87   #set($children = {})
88 88   #set($nonChildren = {})
89 89   #foreach($item in $classProperties.keySet())
90 - #if($classProperties[$item].opener == 1)
81 + #if($classProperties[$item].parent && $classProperties[$item].opener == 0) ## eerst de diepste laag
91 91   #set($parentID = $classProperties[$item].parent)
92 92   #if(!$children[$parentID])
93 93   #set($discard = $children.put("$parentID", {}))