Changes for page Macros

Summary

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

Details

Page properties

Content

...	...	@@ -1,40 +1,72 @@
1	1	{{velocity}}
2		-#*
3		-#set($localitySelectElement = {
4		- "id" : "locality",
5		- "type" : "select",
6		- "required" : true,
7		- "label" : "Locality of the main complaint",
8		- "aria-label" : "Select the locality",
9		- "data-error-response-type" : "use_label_defined_1",
10		- "data-set-space" : "true",
11		- "placeholder" : "cases.word.locality_select.placeholder",
12		- "space-reference" : "cases",
13		- "help-block" : "In which physiological or psychological epicenter can the main complaint be placed? Select the best fitting option from this list."
14		-})
15		-*#
16	16	#macro(createFormElement $elementDataObj)
17	17	#set($elementType = $elementDataObj.type)
	4	+ #set($elementTagName = '')
	5	+ #set($requiredAttributes = 'aria-required="false"')
	6	+ #set($requiredCSSClass = '')
	7	+ #set($addedCSSClass = '')
	8	+ #set($hint = '')
	9	+ #if($O_elementData.required == true)
	10	+ #set($requiredAttributes = 'aria-required="true" required="required" data-error-response-type="${O_elementData.data-error-response-type}"')
	11	+ #set($requiredCSSClass = ' class="required"')
	12	+ #end
18	18	#if($elementType == "select")
19		- #createSelectElement($elementDataObj)
	14	+ #set($addedCSSClass = " select-wrap")
	15	+ #set($elementTagName = "select")
	16	+ #elseif($elementType == "text" || $elementType == "number" || $elementType == "range" || $elementType == "email")
	17	+ #set($elementTagName = "input")
	18	+ #elseif($elementType == "checkbox" || $elementType == "radio")
	19	+ #set($elementTagName = "checkradio")
	20	+ #elseif($elementType == "textarea")
	21	+ #set($elementTagName = "textarea")
	22	+ #else
	23	+ #set($hint = "This type of element does not exist, read the manual for more information about element types.")
20	20	#end
21		-#end
22		-
23		-#macro(createSelectElement $O_elementData)
24	24	{{html}}
25		- #set($requiredAttributes = 'aria-required="false"')
26		- #if($O_elementData.required == true)
27		- #set($requiredAttributes = 'aria-required="true" required="required"')
28		- <p class="required">
	26	+ #if($elementTagName == "select" || $elementTagName == "input" || $elementTagName == "textarea")
	27	+ <p${requiredCSSClass}>
	28	+ <label for="${elementDataObj.id}_${elementTagName}">
	29	+ $elementDataObj.label
	30	+ <span class="input-wrap${addedCSSClass}">
	31	+ #if($elementTagName == "select")
	32	+ #createSelectElement($elementDataObj $elementTagName $requiredAttributes)
	33	+ #elseif($elementTagName == "textarea")
	34	+ #else
	35	+ #if($elementType == "text")
	36	+ #createTextElement($elementDataObj $elementTagName $requiredAttributes)
	37	+ #elseif($elementType == "number")
	38	+ #elseif($elementType == "email")
	39	+ #elseif($elementType == "range")
	40	+ #end
	41	+ #end
	42	+ #if($elementDataObj.help-block != "")
	43	+ <span id="${elementDataObj.id}_helpBlock" class="help-block">${elementDataObj.help-block}</span>
	44	+ #end
	45	+ #if($elementDataObj.required == true)
	46	+ <span class="required-input-field" title="Required input"></span>
	47	+ <span role="alert" class="form-not-valid-tip"></span>
	48	+ #end
	49	+ </span>
	50	+ </label>
	51	+ </p>
29	29	#end
30		- <label for="${O_elementData.id}_select">
31		- $O_elementData.label
32		- <span class="input-wrap select-wrap">
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">
	53	+ #if($elementTagName == "checkradio")
	54	+ #if($elementType == "checkbox")
	55	+ #elseif($elementType == "radio")
	56	+ #end
	57	+ #end
	58	+ #if($hint != "")
	59	+ <p class="box errormessage">${hint}</p>
	60	+ #end
	61	+{{/html}}
	62	+#end
	63	+
	64	+#macro(createSelectElement $O_elementData $O_tagName $O_requiredAttributes)
	65	+ <select class="form-select form-control" aria-label="${O_elementData.aria-label}" aria-describedby="${O_elementData.id}_helpBlock" ${O_requiredAttributes}data-set-space="${O_elementData.data-set-space}" name="${O_elementData.id}_${O_tagName}" id="${O_elementData.id}_${O_tagName}">
34	34	<option value="" disabled="" selected="" hidden="hidden">$services.localization.render(${O_elementData.placeholder})</option>
35	35	#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"))
36		- #set ($spaceLikeRef = $O_elementData.space-reference.replaceAll('([%_!])', '!$1').concat('.%'))
37		- #set ($spaceExcludeRef = $O_elementData.space-reference.replaceAll('([%_!])', '!$1').concat('.Code'))
	68	+ #set($spaceLikeRef = $O_elementData.space-reference.replaceAll('([%_!])', '!$1').concat('.%'))
	69	+ #set($spaceExcludeRef = $O_elementData.space-reference.replaceAll('([%_!])', '!$1').concat('.Code'))
38	38	#set($query = $query.bindValue('space', $spaceLikeRef))
39	39	#set($query = $query.bindValue('spaceExclude', $spaceExcludeRef))
40	40	#set($results = $query.addFilter('unique').execute())
...	...	@@ -43,19 +43,23 @@
43	43	<option value="$document.space">$document.getTitle()</option>
44	44	#end
45	45	</select>
46		- <span id="${O_elementData.id}_helpBlock" class="help-block">${O_elementData.help-block}</span>
47		- #if($O_elementData.required == true)
48		- <span class="required-input-field" title="Required input"></span>
49		- <span role="alert" class="form-not-valid-tip"></span>
50		- #end
51		- </span>
52		- </label>
53		- #if($O_elementData.required == true)
54		- </p>
55		- #end
56		-{{/html}}
57	57	#end
	79	+#macro(createTextElement $O_elementData $O_tagName $O_requiredAttributes)
	80	+#set($dataAttributes = '')
	81	+#if($O_elementData.data-query-type) #set($dataAttributes = ' data-query-type="${O_elementData.data-query-type}"')#end
	82	+#if($O_elementData.data-query-list-type) #set($dataAttributes = '${dataAttributes} data-query-list-type="${O_elementData.data-query-list-type}"')#end
	83	+#if($O_elementData.data-query-list-contents) #set($dataAttributes = '${dataAttributes} data-query-list-contents="${O_elementData.data-query-list-contents}"')#end
	84	+#if($O_elementData.data-create-page) #set($dataAttributes = '${dataAttributes} data-create-page="${O_elementData.data-create-page}"')#end
	85	+#if($O_elementData.data-query-scope) #set($dataAttributes = '${dataAttributes} data-query-scope="${O_elementData.data-query-scope}"')#end
	86	+#if($O_elementData.data-create-xobj) #set($dataAttributes = '${dataAttributes} data-create-xobj="${O_elementData.data-create-xobj}"')#end
	87	+#if($O_elementData.data-xobj-classname) #set($dataAttributes = '${dataAttributes} data-xobj-classname="${O_elementData.data-xobj-classname}"')#end
	88	+#if($O_elementData.data-xobj-fieldname) #set($dataAttributes = '${dataAttributes} data-xobj-fieldname="${O_elementData.data-xobj-fieldname}"')#end
	89	+#if($O_elementData.data-query-list-editable) #set($dataAttributes = '${dataAttributes} data-query-list-editable="${O_elementData.data-query-list-editable}"')#end
	90	+ <input type="text" class="form-control full" name="${O_elementData.id}_${O_tagName}" id="${O_elementData.id}_${O_tagName}" autocomplete="off" placeholder="$services.localization.render(${O_elementData.placeholder})" aria-describedby="${O_elementData.id}_helpBlock"${O_requiredAttributes} aria-label="${O_elementData.aria-label}"${dataAttributes}>
	91	+#end
58	58
59		-##createFormElement($localitySelectElement)
	93	+id
	94	+
	95	+
60	60	{{/velocity}}
61	61