fix(formanswers): execute show conditions when displaying formanswer

Signed-off-by: Thierry Bugier <tbugier@teclib.com>
pluginsGLPI · Mar 24, 2021 · 3e508a1 · 3e508a1
1 parent 9778b30
commit 3e508a1
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 10 deletions.
diff --git a/inc/formanswer.class.php b/inc/formanswer.class.php
@@ -525,15 +525,25 @@ public function showForm($ID, $options = []) {
 
       echo '<ol>';
       $domain = PluginFormcreatorForm::getTranslationDomain($_SESSION['glpilanguage'], $form->getID());
+
+      // Get fields populated with answers
+      $answers = $this->getAnswers(
+         $this->getID()
+      );
+      $answers['plugin_formcreator_forms_id'] = $form->getID();
+      $visibility = PluginFormcreatorFields::updateVisibility($answers);
+
       $sections = (new PluginFormcreatorSection)->getSectionsFromForm($form->getID());
       foreach ($sections as $section) {
          $sectionId = $section->getID();
 
          // Section header
+         $hiddenAttribute = $visibility[$section->getType()][$sectionId] ? '' : 'hidden=""';
          echo '<li'
          . ' class="plugin_formcreator_section"'
          . ' data-itemtype="' . PluginFormcreatorSection::class . '"'
          . ' data-id="' . $sectionId . '"'
+         . " $hiddenAttribute"
          . '">';
 
          // section name
@@ -544,14 +554,6 @@ public function showForm($ID, $options = []) {
          // Section content
          echo '<div>';
 
-         // Get fields populated with answers
-         $answers = $this->getAnswers(
-            $this->getID(),
-            [
-               PluginFormcreatorSection::getForeignKeyField() => $section->getID(),
-            ]
-         );
-
          // Display all fields of the section
          $lastQuestion = null;
          $questions = (new PluginFormcreatorQuestion)->getQuestionsFromSection($sectionId);
@@ -569,7 +571,7 @@ public function showForm($ID, $options = []) {
                   }
                }
             }
-            echo $question->getRenderedHtml($domain, $canEdit, $answers);
+            echo $question->getRenderedHtml($domain, $canEdit, $answers, $visibility[$question->getType()][$question->getID()]);
             $lastQuestion = $question;
          }
          echo '</div>';

diff --git a/inc/question.class.php b/inc/question.class.php
@@ -270,8 +270,9 @@ public function getDesignHtml() : string {
     * @param string  $domain  Translation domain of the form
     * @param boolean $canEdit Can the requester edit the field of the question ?
     * @param array   $value   Values all fields of the form
+    * @param bool $isVisible is the question visible by default ?
     */
-   public function getRenderedHtml($domain, $canEdit = true, $value = []) : string {
+   public function getRenderedHtml($domain, $canEdit = true, $value = [], $isVisible = true) : string {
       if ($this->isNewItem()) {
          return '';
       }
@@ -297,11 +298,13 @@ public function getRenderedHtml($domain, $canEdit = true, $value = []) : string
       $required = ($this->fields['required']) ? ' required' : '';
       $x = $this->fields['col'];
       $width = $this->fields['width'];
+      $hiddenAttribute = $isVisible ? '' : 'hidden=""';
       $html .= '<div'
          . ' data-gs-x="' . $x . '"'
          . ' data-gs-width="' . $width . '"'
          . ' data-itemtype="' . self::class . '"'
          . ' data-id="' . $this->getID() . '"'
+         . " $hiddenAttribute"
          . ' >';
       $html .= '<div class="grid-stack-item-content form-group ' . $required . '" id="form-group-field-' . $this->getID() . '">';
       $html .= $field->show($domain, $canEdit);