Changes for page Macros

Summary

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

Details

Page properties

Content

...	...	@@ -1,5 +1,4 @@
1	1	{{velocity}}
2		-{{html}}
3	3	#set($localitySelectElement = {
4	4	"id" : "locality",
5	5	"type" : "select",
...	...	@@ -12,22 +12,28 @@
12	12	"space-reference" : "cases",
13	13	"help-block" : "In which physiological or psychological epicenter can the main complaint be placed? Select the best fitting option from this list."
14	14	})
	14	+#macro(createFormElement $elementDataObj)
	15	+ #set($elementType = $elementDataObj.type)
	16	+ #if($elementType == "select")
	17	+ #createSelectElement($elementDataObj)
	18	+ #end
	19	+#end
15	15
16		-#macro(createSelectElement $elementDataObj)
	21	+#macro(createSelectElement $O_elementData)
	22	+{{html}}
17	17	#set($requiredAttributes = 'aria-required="false"')
18		- #if($elementDataObj.required == true)
	24	+ #if($O_elementData.required == true)
19	19	#set($requiredAttributes = 'aria-required="true" required="required"')
20	20	<p class="required">
21	21	#end
22		- <label for="${elementDataObj.id}_select">
23		- $elementDataObj.label
	28	+ <label for="${O_elementData.id}_select">
	29	+ $O_elementData.label
24	24	<span class="input-wrap select-wrap">
25		- <select class="form-select form-control" aria-label="${elementDataObj.aria-label}" aria-describedby="${elementDataObj.id}_helpBlock" $requiredAttributes data-error-response-type="${elementDataObj.data-error-response-type}" data-set-space="${elementDataObj.data-set-space}" name="${elementDataObj.id}_select" id="${elementDataObj.id}_select">
26		- <option value="" disabled="" selected="" hidden="hidden">$services.localization.render(${elementDataObj.placeholder})</option>
27		-## #set ($spaceRef = $elementDataObj.space-reference)
	31	+ <select class="form-select form-control" aria-label="${O_elementData.aria-label}" aria-describedby="${O_elementData.id}_helpBlock" $requiredAttributes data-error-response-type="${O_elementData.data-error-response-type}" data-set-space="${O_elementData.data-set-space}" name="${O_elementData.id}_select" id="${O_elementData.id}_select">
	32	+ <option value="" disabled="" selected="" hidden="hidden">$services.localization.render(${O_elementData.placeholder})</option>
28	28	#set($query = $services.query.xwql("from doc.object(AppWithinMinutes.MetadataClass) met where doc.space like :space and doc.space <> :spaceExclude order by met.dataSpaceName asc"))
29		- #set ($spaceLikeRef = $elementDataObj.space-reference.replaceAll('([%_!])', '!$1').concat('.%'))
30		- #set ($spaceExcludeRef = $elementDataObj.space-reference.replaceAll('([%_!])', '!$1').concat('.Code'))
	34	+ #set ($spaceLikeRef = $O_elementData.space-reference.replaceAll('([%_!])', '!$1').concat('.%'))
	35	+ #set ($spaceExcludeRef = $O_elementData.space-reference.replaceAll('([%_!])', '!$1').concat('.Code'))
31	31	#set($query = $query.bindValue('space', $spaceLikeRef))
32	32	#set($query = $query.bindValue('spaceExclude', $spaceExcludeRef))
33	33	#set($results = $query.addFilter('unique').execute())
...	...	@@ -36,19 +36,19 @@
36	36	<option value="$document.space">$document.getTitle()</option>
37	37	#end
38	38	</select>
39		- <span id="${elementDataObj.id}_helpBlock" class="help-block">${elementDataObj.help-block}</span>
40		- #if($elementDataObj.required == true)
	44	+ <span id="${O_elementData.id}_helpBlock" class="help-block">${O_elementData.help-block}</span>
	45	+ #if($O_elementData.required == true)
41	41	<span class="required-input-field" title="Required input"></span>
42	42	<span role="alert" class="form-not-valid-tip"></span>
43	43	#end
44	44	</span>
45	45	</label>
46		- #if($elementDataObj.required == true)
	51	+ #if($O_elementData.required == true)
47	47	</p>
48	48	#end
	54	+{{/html}}
49	49	#end
50	50
51		-#createSelectElement($localitySelectElement)
52		-{{/html}}
	57	+#createFormElement($localitySelectElement)
53	53	{{/velocity}}
54	54