Änderungen von Dokument Macros
Zuletzt geändert von Jip-jan Alunkel am April 15, 18:09
Von Version 2.23
bearbeitet von Jip-jan Alunkel
am März 24, 17:24
am März 24, 17:24
Änderungskommentar:
Es gibt keinen Kommentar für diese Version
Auf Version 2.22
bearbeitet von Jip-jan Alunkel
am März 24, 15:52
am März 24, 15:52
Änderungskommentar:
Es gibt keinen Kommentar für diese Version
Zusammenfassung
-
Seiteneigenschaften (1 geändert, 0 hinzugefügt, 0 gelöscht)
Details
- Seiteneigenschaften
-
- Inhalt
-
... ... @@ -11,28 +11,22 @@ 11 11 "space-reference" : "cases", 12 12 "help-block" : "In which physiological or psychological epicenter can the main complaint be placed? Select the best fitting option from this list." 13 13 }) 14 -#macro(createFormElement $elementDataObj) 15 - #set($elementType = $elementDataObj.type) 16 - #if($elementType == "select") 17 - #createSelectElement($elementDataObj) 18 - #end 19 -#end 20 20 21 -#macro(createSelectElement $ O_elementData)15 +#macro(createSelectElement $elementDataObj) 22 22 {{html}} 23 23 #set($requiredAttributes = 'aria-required="false"') 24 - #if($ O_elementData.required == true)18 + #if($elementDataObj.required == true) 25 25 #set($requiredAttributes = 'aria-required="true" required="required"') 26 26 <p class="required"> 27 27 #end 28 - <label for="${ O_elementData.id}_select">29 - $ O_elementData.label22 + <label for="${elementDataObj.id}_select"> 23 + $elementDataObj.label 30 30 <span class="input-wrap select-wrap"> 31 - <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">32 - <option value="" disabled="" selected="" hidden="hidden">$services.localization.render(${ O_elementData.placeholder})</option>25 + <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"> 26 + <option value="" disabled="" selected="" hidden="hidden">$services.localization.render(${elementDataObj.placeholder})</option> 33 33 #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")) 34 - #set ($spaceLikeRef = $ O_elementData.space-reference.replaceAll('([%_!])', '!$1').concat('.%'))35 - #set ($spaceExcludeRef = $ O_elementData.space-reference.replaceAll('([%_!])', '!$1').concat('.Code'))28 + #set ($spaceLikeRef = $elementDataObj.space-reference.replaceAll('([%_!])', '!$1').concat('.%')) 29 + #set ($spaceExcludeRef = $elementDataObj.space-reference.replaceAll('([%_!])', '!$1').concat('.Code')) 36 36 #set($query = $query.bindValue('space', $spaceLikeRef)) 37 37 #set($query = $query.bindValue('spaceExclude', $spaceExcludeRef)) 38 38 #set($results = $query.addFilter('unique').execute()) ... ... @@ -41,19 +41,19 @@ 41 41 <option value="$document.space">$document.getTitle()</option> 42 42 #end 43 43 </select> 44 - <span id="${ O_elementData.id}_helpBlock" class="help-block">${O_elementData.help-block}</span>45 - #if($ O_elementData.required == true)38 + <span id="${elementDataObj.id}_helpBlock" class="help-block">${elementDataObj.help-block}</span> 39 + #if($elementDataObj.required == true) 46 46 <span class="required-input-field" title="Required input"></span> 47 47 <span role="alert" class="form-not-valid-tip"></span> 48 48 #end 49 49 </span> 50 50 </label> 51 - #if($ O_elementData.required == true)45 + #if($elementDataObj.required == true) 52 52 </p> 53 53 #end 54 54 {{/html}} 55 55 #end 56 56 57 -#create FormElement($localitySelectElement)51 +#createSelectElement($localitySelectElement) 58 58 {{/velocity}} 59 59