Changes for page homeopathsSheet
Last modified by Jip-jan Alunkel on March 26, 17:31
From version 3.1
edited by Jip-jan Alunkel
on March 08, 19:11
on March 08, 19:11
Change comment:
Rollback to version 1.38
To version 1.150
edited by Jip-jan Alunkel
on March 08, 18:54
on March 08, 18:54
Change comment:
There is no comment for this version
Summary
-
Page properties (1 modified, 0 added, 0 removed)
Details
- Page properties
-
- Content
-
... ... @@ -1,14 +1,15 @@ 1 1 {{include reference="assets.pagemaker.macros"/}} 2 2 3 3 {{velocity}} 4 -#set($discard = $services.localization.use('document', ' homeopaths.Code.translations'))4 +#set($discard = $services.localization.use('document', 'assets.global.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") 10 10 ## Create object (important for sheet binding, do not remove) 11 -#set($theDocObj = $doc.getObject( "homeopaths.Code.homeopathsClass", true))12 +#set($theDocObj = $doc.getObject($theClass, true)) 12 12 #set($hasRight = !$isGuest && ($theDocObj.getProperty('user').value == $context.getUser() || $hasAdmin)) 13 13 $theDoc.getContent() 14 14 {{html wiki="true" clean="false"}} ... ... @@ -31,31 +31,20 @@ 31 31 #if($xcontext.action == "view") 32 32 <div id="${spaceTitle}" class="box sheet_properties"> 33 33 <h2>Details</h2> 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 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 +]) 59 59 60 60 #if($hasRight) 61 61 <p class="buttons text-align-right"> ... ... @@ -73,63 +73,6 @@ 73 73 "url": "", 74 74 "use_captcha": "false" 75 75 }) 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 - }) 133 133 #set($submit = { 134 134 "id" : "edit_details", 135 135 "button-text" : "Save changes", ... ... @@ -150,11 +150,60 @@ 150 150 </button> 151 151 </div> 152 152 <div class="modal-body"> 153 - #foreach($obj in $thisObj) 154 - #createFormElement($obj) 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 + #if($propertyType == "checkbox" || $propertyType == "radio") 102 + #set($value = "1") 103 +$value 104 + #else 105 + #set($value = "") 106 + #end 155 155 #end 156 - #createFormElement($practiceName) 157 - #createFormElement($city) 108 + #set($newElem = { 109 + "id" : "$key", 110 + "type" : $propertyType, 111 + "required" : "false", 112 + "label" : "$label", 113 + "data-create-xobj" : "true", 114 + "data-xobj-classname" : $theClass, 115 + "data-xobj-fieldname" : "$key", 116 + "value" : "$value" 117 + }) 118 + #if($extraAttributes.keySet().size() > 0) 119 + #set($attrMap = $extraAttributes) 120 + #foreach($attr in $attrMap.keySet()) 121 + #set($discard = $newElem.put("$attr", $attrMap[$attr])) 122 + #end 123 + #end 124 + #if($propertyOpener) 125 + #set($discard = $newElem.put("data-opener", "true")) 126 + #end 127 + #if($propertyParent) 128 + #set($lastChild = "$key") 129 + #elseif($lastChild != "") 130 + #set($lastChild = "") 131 + #createExpandEnd() 132 + #end 133 + #createFormElement($newElem) 134 + #if($propertyOpener) 135 +$value 136 + #createExpandStart($newElem $value) 137 + #end 138 + #end 139 +#end 158 158 </div> 159 159 <div class="modal-footer"> 160 160 <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button> ... ... @@ -168,5 +168,35 @@ 168 168 #else 169 169 This page can not be viewed in inline mode. 170 170 #end 153 + 154 +#macro(createElementObjects $properties) 155 + #foreach($item in $properties.keySet()) 156 + #set($label = $services.localization.render("homeopaths.classproperty.${item}")) 157 + #if($theDocObj.getProperty($item)) 158 + #set($value = $theDocObj.getProperty($item).value) 159 + #set($newElem = { 160 + "id" : "$item", 161 + "type" : $classProperties[$item].type, 162 + "required" : "false", 163 + "label" : "$label", 164 + "data-create-xobj" : "true", 165 + "data-xobj-classname" : $theClass, 166 + "data-xobj-fieldname" : "$item", 167 + "value" : "$value" 168 + }) 169 + #if($classProperties[$item].opener == 1) 170 + #set($discard = $newElem.put("data-opener", "true")) 171 + #end 172 + #if($classProperties[$item].extraAttributes) 173 + #set($attrMap = $classProperties[$item].extraAttributes) 174 + #foreach($attr in $attrMap.keySet()) 175 + #set($discard = $newElem.put("$attr", $attrMap[$attr])) 176 + #end 177 + #end 178 + #set($thisObj["$item"] = $newElem) 179 + #end 180 + #end 181 +#end 182 + 171 171 {{/html}} 172 172 {{/velocity}}