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, 'checked': 0},
	44	+ 'editAddress': {'type': 'checkbox', 'opener': 1, 'classless': 1, 'extraAttributes': {"data-checked": "false"}},
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', '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', '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.'}},
47	47	'pmStreet': {'type': 'text', 'disabled': 1},
48	48	'pmHousenumber': {'type': 'text', 'disabled': 1},
49	49	'pmPostcode': {'type': 'text', 'disabled': 1},
...	...	@@ -51,11 +51,12 @@
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'},
54	54	'certification': {'type': 'checkbox', 'opener': 1},
55	55	'certificationFrom': {'type': 'text', 'parent': 'certification'}
56	56	})
57		- #createAddress($theClass)
58		- #set($properties = ['certification','certificationFrom'])
	58	+ #createAddress($theClass 1)
	59	+ #set($properties = ['nrOfHomeopaths','certification','certificationFrom'])
59	59	#foreach($property in $properties)
60	60	#if($theDocObj.getProperty($property))
61	61	<p class="property">
...	...	@@ -99,42 +99,31 @@
99	99	</button>
100	100	</div>
101	101	<div class="modal-body">
102		- <div><address>bla</address></div>
103	103	#createAddress($theClass 1)
104	104	#set($lastChild = "")
105	105	#foreach($propertyName in $classProperties.keySet())
106	106	#set($item = $classProperties["$propertyName"])
107		- #set($propertyType = $item.type)
108		- #if($item.containsKey("disabled"))
109		- #else
110		- #if($propertyType == "checkbox")
111		- #set($value = "1")
112		- #if($item.containsKey("classless"))
113		- #if(!$item.containsKey("checked"))
114		- #set($item["checked"] = '0')
115		- #end
116		- #else
117		- #set($checkboxPropVal = $theDocObj.getProperty($propertyName).value)
118		- #set($item["checked"] = "$checkboxPropVal")
	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	+ #if($item.type == "checkbox")
	112	+ #set($item.extraAttributes["data-checked"] = "$checkBool[$value]")
119	119	#end
120		- #end
121		- #if($theDocObj.getProperty($propertyName) || $propertyType == "address") ## 'address' is not a property in the current class
122		- #if($propertyType != "checkbox")
123		- #set($value = $theDocObj.getProperty($propertyName).value)
	114	+ #else
	115	+ #set($value = "")
	116	+ #if($item.type == "checkbox" && $item.containsKey("extraAttributes") && !$item.extraAttributes.containsKey("data-checked"))
	117	+ #set($item.extraAttributes["data-checked"] = "$checkBool[0]")
124	124	#end
125	125	#end
126		- #set($propertyChecked = $item.checked)
127		- #set($propertyOpener = $item.opener)
128		- #set($propertyParent = $item.parent)
129		- #set($extraAttributes = $item.extraAttributes)
130		- #set($label = $services.localization.render("homeopaths.classproperty.${propertyName}"))
131	131	#if(!$value)
132	132	#set($value = "")
133	133	#end
	123	+ #set($label = $services.localization.render("homeopaths.classproperty.${propertyName}"))
134	134	#if($item.containsKey("classless"))
135	135	#set($newElem = {
136	136	"id" : "$propertyName",
137		- "type" : $propertyType,
	127	+ "type" : $item.type,
138	138	"required" : "false",
139	139	"label" : "$label",
140	140	"value" : "$value"
...	...	@@ -142,7 +142,7 @@
142	142	#else
143	143	#set($newElem = {
144	144	"id" : "$propertyName",
145		- "type" : $propertyType,
	135	+ "type" : $item.type,
146	146	"required" : "false",
147	147	"label" : "$label",
148	148	"data-create-xobj" : "true",
...	...	@@ -151,21 +151,15 @@
151	151	"value" : "$value"
152	152	})
153	153	#end
154		- #if($extraAttributes.keySet().size() > 0)
155		- #set($attrMap = $extraAttributes)
156		- #foreach($attr in $attrMap.keySet())
157		- #set($discard = $newElem.put("$attr", $attrMap[$attr]))
	144	+ #if($item.extraAttributes.keySet().size() > 0)
	145	+ #foreach($attr in $item.extraAttributes.keySet())
	146	+ #set($discard = $newElem.put("$attr", $item.extraAttributes[$attr]))
158	158	#end
159	159	#end
160		- #if($propertyChecked == '1')
161		- #set($discard = $newElem.put("data-checked", "true"))
162		- #else
163		- #set($discard = $newElem.put("data-checked", "false"))
164		- #end
165		- #if($propertyOpener)
	149	+ #if($item.opener)
166	166	#set($discard = $newElem.put("data-opener", "true"))
167	167	#end
168		- #if($propertyParent)
	152	+ #if($item.parent)
169	169	#set($lastChild = "$key")
170	170	#elseif($lastChild != "")
171	171	#set($lastChild = "")
...	...	@@ -172,7 +172,7 @@
172	172	#createExpandEnd()
173	173	#end
174	174	#createFormElement($newElem)
175		- #if($propertyOpener)
	159	+ #if($item.opener)
176	176	#createExpandStart($newElem $value)
177	177	#end
178	178	#end
...	...	@@ -205,7 +205,7 @@
205	205	#set($discard = $x.put("$datapart", $datapart4Publish))
206	206	#end
207	207	#end
208		- <p>
	192	+ <div class="formElement">
209	209	#if($withLabel)
210	210	<label>$services.localization.render("homeopaths.classproperty.pmAddress")</label>
211	211	#end
...	...	@@ -216,7 +216,8 @@
216	216	$x['pmCounty'] $x['pmState']<br />
217	217	$x['pmCountry']
218	218	</address>
219		- </p>
	203	+ </div>
220	220	#end
	205	+
221	221	{{/html}}
222	222	{{/velocity}}