Changes for page homeopathsSheet

Last modified by Jip-jan Alunkel on March 26, 17:31
From version 1.61
edited by Jip-jan Alunkel
on March 08, 00:51
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
... ... @@ -33,16 +33,16 @@
33 33  <div id="${spaceTitle}" class="box sheet_properties">
34 34   <h2>Details</h2>
35 35  #set($classProperties = {
36 - 'practiceName': {'type': 'string', 'opener': 0},
37 - 'pmStreet': {'type': 'string', 'opener': 0},
38 - 'pmHousenumber': {'type': 'string', 'opener': 0, 'parent': 'certification'},
39 - 'pmPostcode': {'type': 'string', 'opener': 0},
40 - 'pmCity': {'type': 'string', 'opener': 0},
41 - 'pmCounty': {'type': 'string', 'opener': 0, 'parent': 'certification'},
42 - 'pmState': {'type': 'string', 'opener': 0},
43 - 'pmCountry': {'type': 'string', 'opener': 0},
44 - 'certification': {'type': 'bool', 'opener': 1},
45 - 'certificationFrom': {'type': 'string', 'opener': 0, 'parent': 'certification'}
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 46  })
47 47  #foreach($property in $classProperties.keySet())
48 48   #if($theDocObj.getProperty($property))
... ... @@ -76,16 +76,20 @@
76 76   })
77 77   #set($thisObj = {})
78 78   #set($children = {})
79 + #set($nonChildren = {})
79 79   #foreach($item in $classProperties.keySet())
80 - #if($classProperties[$item].parent)
81 + #if($classProperties[$item].parent && $classProperties[$item].opener == 0) ## eerst de diepste laag
81 81   #set($parentID = $classProperties[$item].parent)
82 82   #if(!$children[$parentID])
83 83   #set($discard = $children.put("$parentID", {}))
84 84   #end
85 85   #set($discard = $children["$parentID"].put($item, $classProperties[$item]))
87 + #elseif($classProperties[$item].parent)## ???? Ws fout
88 + #else
89 + #set($discard = $nonChildren.put($item, $classProperties[$item]))
86 86   #end
87 87   #end
88 - #createElementObjects($classProperties)
92 + #createElementObjects($nonChildren)
89 89   #set($submit = {
90 90   "id" : "edit_details",
91 91   "button-text" : "Save changes",
... ... @@ -107,11 +107,8 @@
107 107   </div>
108 108   <div class="modal-body">
109 109   #foreach($obj in $thisObj)
110 - $obj
111 -## #createFormElement($obj)
114 + #createFormElement($obj)
112 112   #end
113 -## #createFormElement($practiceName)
114 -## #createFormElement($city)
115 115   </div>
116 116   <div class="modal-footer">
117 117   <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>