Suggested values now rendered in template

jamesread · Aug 14, 2023 · 181255b · 181255b
1 parent 737bbe1
commit 181255b
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 10 deletions.
diff --git a/src/main/php/libAllure/Element.php b/src/main/php/libAllure/Element.php
@@ -42,6 +42,7 @@ protected function validateInternals()
     protected function afterConstruct()
     {
     }
+
     abstract public function render();
 
     public function addSuggestedValue($value, $caption = null)
@@ -51,6 +52,11 @@ public function addSuggestedValue($value, $caption = null)
         $this->suggestedValues[$value] = $caption;
     }
 
+    public function getSuggestedValues(): array
+    {
+        return $this->suggestedValues;
+    }
+
     final public function validate()
     {
         $this->validateRequired();

diff --git a/src/main/php/libAllure/ElementInput.php b/src/main/php/libAllure/ElementInput.php
@@ -22,15 +22,7 @@ public function render()
 
         $classes = ($this->required) ? ' class = "required" ' : null;
 
-        $suggestedValues = array();
-
-        if (!empty($this->suggestedValues)) {
-            foreach ($this->suggestedValues as $suggestedValue => $caption) {
-                $suggestedValues[] = '<span class = "dummyLink" onclick = "document.getElementById(\'' . $this->name . '\').value = \'' . $suggestedValue . '\'">' . $caption . '</span>';
-            }
-        }
-
-        return sprintf('<input %s id = "%s" name = "%s" value = "%s" /><div>%s</div>', $onChange, $this->name, $this->name, $value, implode(', ', $suggestedValues));
+        return sprintf('<input %s id = "%s" name = "%s" value = "%s" />', $onChange, $this->name, $this->name, $value);
     }
 
     public function validateInternals()

diff --git a/src/main/php/libAllure/templates/formElements.tpl b/src/main/php/libAllure/templates/formElements.tpl
@@ -11,13 +11,21 @@
 		{elseif $element->getType() eq 'submit'}
 			<button value = "{$form->getName()}" name = "{$element->getName()}" type = "submit">{$element->getCaption()}</button>
 		{else}
-			<fieldset>				
+			<fieldset>
 				{$element->render()}
 
 				{if $element->description ne ''}
 				<p class = "description"><img src = "resources/images/icons/help.png" class = "imageIcon" alt = "Form element help" />{$element->description}</p>
 				{/if}
 
+				{if !empty($suggestedValues)}
+				<div>
+					{foreach from = $suggestedValues key = sv item = caption}
+						<span class = "dummyLink" onclick = "document.getElementById('{$element->getName()}').value = '{$sv} '">{$caption}</span>';
+					{/foreach}
+				</div>
+				{/if}
+
 				{if $element->getValidationError() ne ''}
 				<p class = "formValidationError">{$element->getValidationError()}</p>
 				{/if}