Changes for page Macros

Summary

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

Details

Page properties

Content

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