Changes for page Macros

Last modified by Jip-jan Alunkel on April 15, 18:09
From version 1.2
edited by Jip-jan Alunkel
on March 24, 13:51
Change comment: There is no comment for this version
To version 1.3
edited by Jip-jan Alunkel
on March 24, 14:36
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -1,32 +1,47 @@
1 1  
2 2  {{velocity}}
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)
3 +
4 +#set($elementDataObj = '{
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 + "xwql" : "from doc.object(AppWithinMinutes.MetadataClass) met where doc.space like \'cases.%\' and doc.space <> \'cases.Code\' order by met.dataSpaceName asc",
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"')
11 11   <p class="required">
12 - <label for="locality_select">
13 - Locality of the main complaint
23 + #end
24 + <label for="${elementDataObj.id}_select">
25 + $elementDataObj.label
14 14   <span class="input-wrap select-wrap">
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())
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($results = $services.query.xwql($elementDataObj.xwql).addFilter('unique').execute())
19 19   #foreach ($item in $results)
20 20   #set ($document = $xwiki.getDocument($item))
21 21   <option value="$document.space">$document.getTitle()</option>
22 22   #end
23 23   </select>
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>
35 + <span id="${elementDataObj.id}_helpBlock" class="help-block">${elementDataObj.help-block}</span>
36 + #if($elementDataObj.required == true)
25 25   <span class="required-input-field" title="Required input"></span>
26 26   <span role="alert" class="form-not-valid-tip"></span>
39 + #end
27 27   </span>
28 28   </label>
42 + #if($elementDataObj.required == true)
29 29   </p>
44 + #end
30 30  #end
31 31  {{/velocity}}
32 32