Changes for page Macros

Summary

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

Details

Page properties

Content

...	...	@@ -1,4 +1,6 @@
	1	+
1	1	{{velocity}}
	3	+
2	2	#set($localitySelectElement = {
3	3	"id" : "locality",
4	4	"type" : "select",
...	...	@@ -11,30 +11,24 @@
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	})
14		-#macro(createFormElement $elementDataObj)
15		- #set($elementType = $elementDataObj.type)
16		- #if($elementType == "select")
17		- #createSelectElement($elementDataObj)
18		- #end
19		-#end
20	20
21		-#macro(createSelectElement $O_elementData)
22		-{{html}}
	17	+#macro(createSelectElement $elementDataObj)
23	23	#set($requiredAttributes = 'aria-required="false"')
24		- #if($O_elementData.required == true)
	19	+ #if($elementDataObj.required == true)
25	25	#set($requiredAttributes = 'aria-required="true" required="required"')
26	26	<p class="required">
27	27	#end
28		- <label for="${O_elementData.id}_select">
29		- $O_elementData.label
	23	+ <label for="${elementDataObj.id}_select">
	24	+ $elementDataObj.label
30	30	<span class="input-wrap select-wrap">
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>
	26	+ <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">
	27	+ <option value="" disabled="" selected="" hidden="hidden">$services.localization.render(${elementDataObj.placeholder})</option>
	28	+## #set ($spaceRef = $elementDataObj.space-reference)
	29	+## #set ($spaceExcludeRef = "${spaceRef}.Code")
33	33	#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"))
34		- #set ($spaceLikeRef = $O_elementData.space-reference.replaceAll('([%_!])', '!$1').concat('.%'))
35		- #set ($spaceExcludeRef = $O_elementData.space-reference.replaceAll('([%_!])', '!$1').concat('.Code'))
	31	+ #set ($spaceLikeRef = $elementDataObj.space-reference.replaceAll('([%_!])', '!$1').concat('.%'))
36	36	#set($query = $query.bindValue('space', $spaceLikeRef))
37		- #set($query = $query.bindValue('spaceExclude', $spaceExcludeRef))
	33	+ #set($query = $query.bindValue('spaceExclude', '${spaceLikeRef}.Code'))
38	38	#set($results = $query.addFilter('unique').execute())
39	39	#foreach ($item in $results)
40	40	#set ($document = $xwiki.getDocument($item))
...	...	@@ -41,19 +41,20 @@
41	41	<option value="$document.space">$document.getTitle()</option>
42	42	#end
43	43	</select>
44		- <span id="${O_elementData.id}_helpBlock" class="help-block">${O_elementData.help-block}</span>
45		- #if($O_elementData.required == true)
	40	+ <span id="${elementDataObj.id}_helpBlock" class="help-block">${elementDataObj.help-block}</span>
	41	+ #if($elementDataObj.required == true)
46	46	<span class="required-input-field" title="Required input"></span>
47	47	<span role="alert" class="form-not-valid-tip"></span>
48	48	#end
49	49	</span>
50	50	</label>
51		- #if($O_elementData.required == true)
	47	+ #if($elementDataObj.required == true)
52	52	</p>
53	53	#end
54		-{{/html}}
55	55	#end
56	56
57		-#createFormElement($localitySelectElement)
	52	+#createSelectElement($localitySelectElement)
	53	+$localitySelectElement.id
	54	+
58	58	{{/velocity}}
59	59