Changes for page homeopathsSheet

Summary

• Page properties (1 modified, 0 added, 0 removed)

Details

Page properties

Content

...	...	@@ -41,9 +41,9 @@
41	41	#end
42	42	## The classProperties Map has to be in the order of how you want the form elements to appear in the form.
43	43	#set($classProperties = {
44		- 'editAddress': {'type': 'checkbox', 'opener': 1, 'classless': 1, 'extraAttributes': {"data-checked": "false"}},
	44	+ 'editAddress': {'type': 'checkbox', 'opener': 1, 'classless': 1, 'checked': 1},
45	45	'pmAddress': {'type': 'address', 'parent': 'editAddress', 'extraAttributes': {"aria-label": "Input and select the address of your practice", "placeholder": "$services.localization.render('homeopaths.multiword.address.placeholder')", "pmLatlong": "$xa['pmLatlong']", "pmCountry": "$xa['pmCountry']", "pmState": "$xa['pmState']", "pmCounty": "$xa['pmCounty']", "pmPostcode": "$xa['pmPostcode']", "pmCity": "$xa['pmCity']", "pmStreet": "$xa['pmStreet']", "pmHousenumber": "$xa['pmHousenumber']", "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.'}},
46		- 'practiceName': {'type': 'text', 'disabled': 1, 'extraAttributes': {"disabled": "disabled", "help-block" : 'The name of your practice is the title of this page. If you want to change it, you should edit the content of this page.'}},
	46	+ 'practiceName': {'type': 'text', 'extraAttributes': {"disabled": "disabled", "help-block" : 'The name of your practice is the title of this page. If you want to change it, you should edit the content of this page.'}},
47	47	'pmStreet': {'type': 'text', 'disabled': 1},
48	48	'pmHousenumber': {'type': 'text', 'disabled': 1},
49	49	'pmPostcode': {'type': 'text', 'disabled': 1},
...	...	@@ -51,12 +51,11 @@
51	51	'pmCounty': {'type': 'text', 'disabled': 1},
52	52	'pmState': {'type': 'text', 'disabled': 1},
53	53	'pmCountry': {'type': 'text', 'disabled': 1},
54		- 'nrOfHomeopaths': {'type': 'number'},
55	55	'certification': {'type': 'checkbox', 'opener': 1},
56	56	'certificationFrom': {'type': 'text', 'parent': 'certification'}
57	57	})
58	58	#createAddress($theClass 1)
59		- #set($properties = ['nrOfHomeopaths','certification','certificationFrom'])
	58	+ #set($properties = ['certification','certificationFrom'])
60	60	#foreach($property in $properties)
61	61	#if($theDocObj.getProperty($property))
62	62	<p class="property">
...	...	@@ -104,30 +104,37 @@
104	104	#set($lastChild = "")
105	105	#foreach($propertyName in $classProperties.keySet())
106	106	#set($item = $classProperties["$propertyName"])
107		- #if(!$item.containsKey("disabled"))
108		- #set($checkBool = ["false","true"])
109		- #if(!$item.containsKey("classless") && $theDocObj.getProperty($propertyName)) ## 'address' is not a property in the current class
110		- #set($value = $theDocObj.getProperty($propertyName).value)
111		-$value
112		- #if($item.type == "checkbox")
113		- #set($item.extraAttributes["data-checked"] = "$checkBool[$value]")
114		- #end
115		- #else
116		- #if($item.type == "checkbox")
117		- #set($value = "1")
118		- #if(!$item.extraAttributes.containsKey("data-checked"))
119		- #set($item.extraAttributes["data-checked"] = "$checkBool[0]")
	106	+ #set($propertyType = $item.type)
	107	+ #if($item.containsKey("disabled"))
	108	+ #else
	109	+ #if($propertyType == "checkbox")
	110	+ #set($value = "1")
	111	+ #if($item.containsKey("classless"))
	112	+ #if(!$item.containsKey("checked"))
	113	+ #set($item["checked"] = '0')
120	120	#end
	115	+ #else
	116	+ #set($checkboxPropVal = $theDocObj.getProperty($propertyName).value)
	117	+ #set($item["checked"] = "$checkboxPropVal")
121	121	#end
122	122	#end
	120	+ #if($theDocObj.getProperty($propertyName) || $propertyType == "address") ## 'address' is not a property in the current class
	121	+ #if($propertyType != "checkbox")
	122	+ #set($value = $theDocObj.getProperty($propertyName).value)
	123	+ #end
	124	+ #end
	125	+ #set($propertyChecked = $item.checked)
	126	+ #set($propertyOpener = $item.opener)
	127	+ #set($propertyParent = $item.parent)
	128	+ #set($extraAttributes = $item.extraAttributes)
	129	+ #set($label = $services.localization.render("homeopaths.classproperty.${propertyName}"))
123	123	#if(!$value)
124	124	#set($value = "")
125	125	#end
126		- #set($label = $services.localization.render("homeopaths.classproperty.${propertyName}"))
127	127	#if($item.containsKey("classless"))
128	128	#set($newElem = {
129	129	"id" : "$propertyName",
130		- "type" : $item.type,
	136	+ "type" : $propertyType,
131	131	"required" : "false",
132	132	"label" : "$label",
133	133	"value" : "$value"
...	...	@@ -135,7 +135,7 @@
135	135	#else
136	136	#set($newElem = {
137	137	"id" : "$propertyName",
138		- "type" : $item.type,
	144	+ "type" : $propertyType,
139	139	"required" : "false",
140	140	"label" : "$label",
141	141	"data-create-xobj" : "true",
...	...	@@ -144,15 +144,21 @@
144	144	"value" : "$value"
145	145	})
146	146	#end
147		- #if($item.extraAttributes.keySet().size() > 0)
148		- #foreach($attr in $item.extraAttributes.keySet())
149		- #set($discard = $newElem.put("$attr", $item.extraAttributes[$attr]))
	153	+ #if($extraAttributes.keySet().size() > 0)
	154	+ #set($attrMap = $extraAttributes)
	155	+ #foreach($attr in $attrMap.keySet())
	156	+ #set($discard = $newElem.put("$attr", $attrMap[$attr]))
150	150	#end
151	151	#end
152		- #if($item.opener)
	159	+ #if($propertyChecked == '1')
	160	+ #set($discard = $newElem.put("data-checked", "true"))
	161	+ #else
	162	+ #set($discard = $newElem.put("data-checked", "false"))
	163	+ #end
	164	+ #if($propertyOpener)
153	153	#set($discard = $newElem.put("data-opener", "true"))
154	154	#end
155		- #if($item.parent)
	167	+ #if($propertyParent)
156	156	#set($lastChild = "$key")
157	157	#elseif($lastChild != "")
158	158	#set($lastChild = "")
...	...	@@ -159,7 +159,7 @@
159	159	#createExpandEnd()
160	160	#end
161	161	#createFormElement($newElem)
162		- #if($item.opener)
	174	+ #if($propertyOpener)
163	163	#createExpandStart($newElem $value)
164	164	#end
165	165	#end