Changes for page Macros

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

Summary

Details

Page properties
Content
... ... @@ -1,7 +1,7 @@
1 1  
2 2  {{velocity}}
3 3  
4 -#set($elementDataObj = '{
4 +#set($localitySelectElement = {
5 5   "id" : "locality",
6 6   "type" : "select",
7 7   "required" : true,
... ... @@ -10,11 +10,10 @@
10 10   "data-error-response-type" : "use_label_defined_1",
11 11   "data-set-space" : "true",
12 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",
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 +})
16 16  
17 -
18 18  #macro(createSelectElement $elementDataObj)
19 19   #set($requiredAttributes = 'aria-required="false"')
20 20   #if($elementDataObj.required == true)
... ... @@ -25,8 +25,13 @@
25 25   $elementDataObj.label
26 26   <span class="input-wrap select-wrap">
27 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())
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 and doc.space <> :spaceExclude order by met.dataSpaceName asc"))
31 + #set($query = $query.bindValue('space').literal("${spaceRef}.").anyChars())
32 + #set($query = $query.bindValue('spaceExclude').literal("${spaceExcludeRef}").query())
33 + #set($results = $query.addFilter('unique').execute())
30 30   #foreach ($item in $results)
31 31   #set ($document = $xwiki.getDocument($item))
32 32   <option value="$document.space">$document.getTitle()</option>
... ... @@ -43,5 +43,9 @@
43 43   </p>
44 44   #end
45 45  #end
50 +
51 +#createSelectElement($localitySelectElement)
52 +$localitySelectElement.id
53 +
46 46  {{/velocity}}
47 47