Changes for page Macros

Summary

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

Details

Page properties

Content

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