Modifications pour le document homeopathsSheet

Modifié par Jip-jan Alunkel le mars 26, 17:31

Depuis la version 1.153
modifié par Jip-jan Alunkel
sur mars 08, 18:56
Commentaire de modification : Il n'y a aucun commentaire pour cette version
À la version 3.1
modifié par Jip-jan Alunkel
sur mars 08, 19:11
Commentaire de modification : Rollback to version 1.38

Résumé

Détails

Propriétés de la Page
Contenu
... ... @@ -1,15 +1,14 @@
1 1  {{include reference="assets.pagemaker.macros"/}}
2 2  
3 3  {{velocity}}
4 -#set($discard = $services.localization.use('document', 'assets.global.translations'))
4 +#set($discard = $services.localization.use('document', 'homeopaths.Code.translations'))
5 5  #set($discard = $services.localization.use('document', 'assets.pagemaker.translations'))
6 6  #set($discard = $xwiki.ssx.use('assets.pagemaker.WebHome', {'minify': false}))
7 7  #set($discard = $xwiki.jsx.use('assets.pagemaker.WebHome', {'minify': false, 'language': $context.language, 'myParameter': 'value'}))
8 8  #set($theDoc = $xwiki.getDocument("${doc.fullName}").getTranslatedDocument())
9 9  #set($isInline = $xcontext.action == 'edit' && $request.get('editor') == 'inline')
10 -#set($theClass = "homeopaths.Code.homeopathsClass")
11 11  ## Create object (important for sheet binding, do not remove)
12 -#set($theDocObj = $doc.getObject($theClass, true))
11 +#set($theDocObj = $doc.getObject("homeopaths.Code.homeopathsClass", true))
13 13  #set($hasRight = !$isGuest && ($theDocObj.getProperty('user').value == $context.getUser() || $hasAdmin))
14 14  $theDoc.getContent()
15 15  {{html wiki="true" clean="false"}}
... ... @@ -32,20 +32,31 @@
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'}},
38 - {'pmAddress': {'type': 'address', '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 - {'pmStreet': {'type': 'text'}},
40 - {'pmHousenumber': {'type': 'text'}},
41 - {'pmPostcode': {'type': 'text'}},
42 - {'pmCity': {'type': 'text'}},
43 - {'pmCounty': {'type': 'text'}},
44 - {'pmState': {'type': 'text'}},
45 - {'pmCountry': {'type': 'text'}},
46 - {'certification': {'type': 'checkbox', 'opener': 1}},
47 - {'certificationFrom': {'type': 'text', 'parent': 'certification'}}
48 -])
34 +#set($classProperties = {
35 + 'practiceName': {'type': 'string', 'opener': 0},
36 + 'pmStreet': {'type': 'string', 'opener': 0},
37 + 'pmHousenumber': {'type': 'string', 'opener': 0},
38 + 'pmPostcode': {'type': 'string', 'opener': 0},
39 + 'pmCity': {'type': 'string', 'opener': 0},
40 + 'pmCounty': {'type': 'string', 'opener': 0},
41 + 'pmState': {'type': 'string', 'opener': 0},
42 + 'pmCountry': {'type': 'string', 'opener': 0},
43 + 'certification': {'type': 'bool', 'opener': 1},
44 + 'certificationFrom': {'type': 'string', 'opener': 0, 'parent': 'certification'}
45 +})
46 +#foreach($property in $classProperties.keySet())
47 + #if($theDocObj.getProperty($property))
48 + <p class="property">
49 + #if($theDocObj.getProperty($property).value != "" && $property != "pmHousenumber") ## Difference with added housenumber because of the streetaddress layout.
50 + #if($property == "pmStreet") ## Difference with added housenumber because of the streetaddress layout.
51 + <span class="property-name">$services.localization.render("homeopaths.classproperty.address")</span> <span class="property-value">$doc.display($property) $doc.display("pmHousenumber")</span>
52 + #else
53 + <span class="property-name">$services.localization.render("homeopaths.classproperty.${property}")</span> <span class="property-value">$doc.display($property)</span>
54 + #end
55 + </p>
56 + #end
57 + #end
58 +#end
49 49  
50 50   #if($hasRight)
51 51   <p class="buttons text-align-right">
... ... @@ -63,6 +63,63 @@
63 63   "url": "",
64 64   "use_captcha": "false"
65 65   })
76 + #set($thisObj = {})
77 + #set($children = {})
78 + #foreach($item in $classProperties.keySet())
79 + #if($classProperties[$item].parent)
80 + #set($discard = $children[$classProperties[$item].parent].add($classProperties[$item]))
81 + #end
82 + #end
83 +$children
84 + #foreach($item in $classProperties.keySet())
85 + #set($label = $services.localization.render("homeopaths.classproperty.${item}"))
86 + #if($theDocObj.getProperty($item))
87 + #set($value = $theDocObj.getProperty($item).value)
88 + #if($classProperties[$item].type == "bool")
89 + #set($newElem = {
90 + "id" : "$item",
91 + "type" : "checkbox",
92 + "required" : "false",
93 + "label" : "$label",
94 + "value" : "$value",
95 + "data-opener" : "true"
96 + })
97 + #else
98 +## #if($classProperties[$item].opener)
99 + #set($newElem = {
100 + "id": "$item",
101 + "type": "text",
102 + "required" : "false",
103 + "label" : "$label",
104 + "data-create-xobj" : "true",
105 + "data-xobj-classname" : "homeopaths.Code.homeopathsClass",
106 + "data-xobj-fieldname" : "$item",
107 + "value": "$value"
108 + })
109 + #end
110 + #set($thisObj["$item"] = $newElem)
111 + #end
112 + #end
113 + #set($practiceName = {
114 + "id": "practiceName",
115 + "type": "text",
116 + "required" : "false",
117 + "label" : "Practice name",
118 + "data-create-xobj" : "true",
119 + "data-xobj-classname" : "homeopaths.Code.homeopathsClass",
120 + "data-xobj-fieldname" : "practiceName",
121 + "value": "$doc.getTitle()"
122 + })
123 + #set($city = {
124 + "id": "city",
125 + "type": "text",
126 + "required" : "false",
127 + "label" : "City",
128 + "data-create-xobj" : "true",
129 + "data-xobj-classname" : "homeopaths.Code.homeopathsClass",
130 + "data-xobj-fieldname" : "pmCity",
131 + "value": "$theDocObj.getProperty('pmCity').value"
132 + })
66 66   #set($submit = {
67 67   "id" : "edit_details",
68 68   "button-text" : "Save changes",
... ... @@ -83,61 +83,11 @@
83 83   </button>
84 84   </div>
85 85   <div class="modal-body">
86 -#set($lastChild = "")
87 -#foreach($property in $classProperties)
88 - #foreach($item in $property.keySet())
89 - #set($key = $item)
90 - #end
91 - #foreach($item in $property.values())
92 - #set($propertyType = $item.type)
93 - #set($propertyOpener = $item.opener)
94 - #set($propertyParent = $item.parent)
95 - #set($extraAttributes = $item.extraAttributes)
96 - #end
97 - #set($label = $services.localization.render("homeopaths.classproperty.${key}"))
98 - #if($theDocObj.getProperty($key) || $propertyType == "address")
99 - #set($value = $theDocObj.getProperty($key).value)
100 - #if(!$value)
101 -$propertyType
102 - #if($propertyType == "checkbox" || $propertyType == "radio")
103 - #set($value = "1")
104 -$propertyType - $value
105 - #else
106 - #set($value = "")
107 - #end
153 + #foreach($obj in $thisObj)
154 + #createFormElement($obj)
108 108   #end
109 - #set($newElem = {
110 - "id" : "$key",
111 - "type" : $propertyType,
112 - "required" : "false",
113 - "label" : "$label",
114 - "data-create-xobj" : "true",
115 - "data-xobj-classname" : $theClass,
116 - "data-xobj-fieldname" : "$key",
117 - "value" : "$value"
118 - })
119 - #if($extraAttributes.keySet().size() > 0)
120 - #set($attrMap = $extraAttributes)
121 - #foreach($attr in $attrMap.keySet())
122 - #set($discard = $newElem.put("$attr", $attrMap[$attr]))
123 - #end
124 - #end
125 - #if($propertyOpener)
126 - #set($discard = $newElem.put("data-opener", "true"))
127 - #end
128 - #if($propertyParent)
129 - #set($lastChild = "$key")
130 - #elseif($lastChild != "")
131 - #set($lastChild = "")
132 - #createExpandEnd()
133 - #end
134 - #createFormElement($newElem)
135 - #if($propertyOpener)
136 -##$value
137 - #createExpandStart($newElem $value)
138 - #end
139 - #end
140 -#end
156 + #createFormElement($practiceName)
157 + #createFormElement($city)
141 141   </div>
142 142   <div class="modal-footer">
143 143   <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
... ... @@ -151,35 +151,5 @@
151 151  #else
152 152   This page can not be viewed in inline mode.
153 153  #end
154 -
155 -#macro(createElementObjects $properties)
156 - #foreach($item in $properties.keySet())
157 - #set($label = $services.localization.render("homeopaths.classproperty.${item}"))
158 - #if($theDocObj.getProperty($item))
159 - #set($value = $theDocObj.getProperty($item).value)
160 - #set($newElem = {
161 - "id" : "$item",
162 - "type" : $classProperties[$item].type,
163 - "required" : "false",
164 - "label" : "$label",
165 - "data-create-xobj" : "true",
166 - "data-xobj-classname" : $theClass,
167 - "data-xobj-fieldname" : "$item",
168 - "value" : "$value"
169 - })
170 - #if($classProperties[$item].opener == 1)
171 - #set($discard = $newElem.put("data-opener", "true"))
172 - #end
173 - #if($classProperties[$item].extraAttributes)
174 - #set($attrMap = $classProperties[$item].extraAttributes)
175 - #foreach($attr in $attrMap.keySet())
176 - #set($discard = $newElem.put("$attr", $attrMap[$attr]))
177 - #end
178 - #end
179 - #set($thisObj["$item"] = $newElem)
180 - #end
181 - #end
182 -#end
183 -
184 184  {{/html}}
185 185  {{/velocity}}