Changes for page Macros

Summary

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

Details

Page properties

Content

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