Changes for page Macros

Summary

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

Details

Page properties

Content

...	...	@@ -1,55 +1,32 @@
1	1
2	2	{{velocity}}
3		-
4		-#set($localitySelectElement = '{
5		- "id" : "locality",
6		- "type" : "select",
7		- "required" : true,
8		- "label" : "Locality of the main complaint",
9		- "aria-label" : "Select the locality",
10		- "data-error-response-type" : "use_label_defined_1",
11		- "data-set-space" : "true",
12		- "placeholder" : "cases.word.locality_select.placeholder",
13		- "space-reference" : "cases",
14		- "help-block" : "In which physiological or psychological epicenter can the main complaint be placed? Select the best fitting option from this list."
15		-}')
16		-
17		-
18		-#macro(createSelectElement $elementDataObj)
19		- #set($requiredAttributes = 'aria-required="false"')
20		- #if($elementDataObj.required == true)
21		- #set($requiredAttributes = 'aria-required="true" required="required"')
	3	+type: select
	4	+id: locality
	5	+label: Locality of the main complaint
	6	+aria-label: Select the locality
	7	+data-error-response-type: use_label_defined_1
	8	+data-set-space: true
	9	+placeholder translation key: cases.word.locality_select.placeholder
	10	+#macro(displayNotificationEventSkeleton $mainIcon $smallIcon $content $details)
22	22	<p class="required">
23		- #end
24		- <label for="${elementDataObj.id}_select">
25		- $elementDataObj.label
	12	+ <label for="locality_select">
	13	+ Locality of the main complaint
26	26	<span class="input-wrap select-wrap">
27		- <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">
28		- <option value="" disabled="" selected="" hidden="hidden">$services.localization.render('${elementDataObj.placeholder}')</option>
29		- #set ($spaceRef = $elementDataObj.space-reference)
30		- #set ($spaceExcludeRef = "${spaceRef}.Code")
31		- #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"))
32		- #set($query = $query.bindValue('space').literal("${spaceRef}.").anyChars())
33		- #set($query = $query.bindValue('spaceExclude').literal("${spaceExcludeRef}").query())
34		- #set($results = $query.addFilter('unique').execute())
	15	+ <select class="form-select form-control" aria-label="Select the locality" aria-describedby="locality_helpBlock" aria-required="true" required="required" data-error-response-type="use_label_defined_1" data-set-space="true" name="locality_select" id="locality_select">
	16	+ <option value="" disabled="" selected="" hidden="hidden">$services.localization.render('cases.word.locality_select.placeholder')</option>
	17	+ #set($xwql = "from doc.object(AppWithinMinutes.MetadataClass) met where doc.space like 'cases.%' and doc.space <> 'cases.Code' order by met.dataSpaceName asc")
	18	+ #set($results = $services.query.xwql($xwql).addFilter('unique').execute())
35	35	#foreach ($item in $results)
36	36	#set ($document = $xwiki.getDocument($item))
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)
	24	+ <span id="locality_helpBlock" class="help-block">In which physiological or psychological epicenter can the main complaint be placed? Select the best fitting option from this list.</span>
42	42	<span class="required-input-field" title="Required input"></span>
43	43	<span role="alert" class="form-not-valid-tip"></span>
44		- #end
45	45	</span>
46	46	</label>
47		- #if($elementDataObj.required == true)
48	48	</p>
49		- #end
50	50	#end
51		-
52		-#createSelectElement($localitySelectElement)
53		-
54	54	{{/velocity}}
55	55