WIP: Section display mode

RoboFile.php

@@ -133,9 +133,9 @@ public function archiveBuild($release = 'release') {
             throw new Exception('The Official release constant must be true');
          }
 
-         if (Git::tagExists($version)) {
+         // if (Git::tagExists($version)) {
             // throw new Exception("The tag $version already exists");
-         }
+         // }
 
          // if (!Git::isTagMatchesCurrentCommit($version)) {
          //    throw new Exception("HEAD is not pointing to the tag of the version to build");
@@ -145,13 +145,12 @@ public function archiveBuild($release = 'release') {
          if (!is_array($versionTag)) {
             throw new Exception("The version does not exists in the XML file");
          }
+
+         // $this->updateChangelog();
       }
 
       // update version in package.json
       $this->sourceUpdatePackageJson($version);
-      if ($release == 'release') {
-         // $this->updateChangelog();
-      }
 
       $diff = $this->gitDiff(['package.json']);
       $diff = implode("\n", $diff);

css/print_form.css

@@ -133,3 +133,15 @@ label[for] {
    height:16px;
    width:16px;
 }
+
+#plugin_formcreator_form.plugin_formcreator_form li.plugin_formcreator_section {
+   position: inherit;
+   top: inherit;
+   left: inherit;
+   display: inherit !important;
+}
+
+#plugin_formcreator_form.plugin_formcreator_form li.plugin_formcreator_section .next_button,
+#plugin_formcreator_form.plugin_formcreator_form li.plugin_formcreator_section .previous_button {
+   display: none;
+}

css/styles.scss

@@ -225,12 +225,34 @@
       list-style-type: none;
       text-align: left;
       padding-left: 0;
+      overflow: hidden;
    }
 
    [data-itemtype = "PluginFormcreatorQuestion"]:not([hidden]), .plugin_formcreator_gap {
       vertical-align: top;
       display: inline-block;
    }
+
+   li.plugin_formcreator_section {
+      position: relative;
+      width: 100%;
+      top: 0;
+      left: 0;
+      transition-property: left;
+      transition-duration: 0.3s;
+   }
+
+   .plugin_formcreator_section_navigate {
+      padding-bottom: 8px;
+      .previous_button {
+         margin-left: 8px;
+         float: inherit;
+      }
+
+      .next_button {
+         float: right;
+      }
+   }
 }
 
 .form_answer h1 {

inc/form.class.php

@@ -61,6 +61,10 @@ class PluginFormcreatorForm extends CommonDBTM implements
    const VALIDATION_USER     = 1;
    const VALIDATION_GROUP    = 2;
 
+   const SECTION_DISPLAY_VERTICAL_STACK = 0;
+   const SECTION_DISPLAY_WIZARD = 1;
+   const SECTION_DISPLAY_ACCORDION = 2;
+
    public static function getEnumAccessType() {
       return [
          self::ACCESS_PUBLIC     => __('Public access', 'formcreator'),
@@ -69,6 +73,14 @@ public static function getEnumAccessType() {
       ];
    }
 
+   public static function getEnumSectionDisplayMode() {
+      return [
+         self::SECTION_DISPLAY_VERTICAL_STACK => __('Vertical stack', 'formcreator'),
+         self::SECTION_DISPLAY_WIZARD         => __('Wizard', 'formcreator'),
+         self::SECTION_DISPLAY_ACCORDION      => __('Accordion', 'formcreator'),
+      ];
+   }
+
    public static function getEnumShowRule() : array {
       return PluginFormcreatorCondition::getEnumShowRule();
    }
@@ -958,7 +970,20 @@ public function displayUserForm() : void {
       }
       $formanswer = new PluginFormcreatorFormAnswer();
       $formanswer->loadAnswersFromSession();
-      TemplateRenderer::getInstance()->display('@formcreator/pages/userform.html.twig', [
+
+      switch ($this->fields['section_display_mode']) {
+         default:
+            $template = '@formcreator/pages/userform_stack.html.twig';
+            break;
+         case self::SECTION_DISPLAY_WIZARD :
+            $template = '@formcreator/pages/userform_wizard.html.twig';
+            break;
+         case self::SECTION_DISPLAY_ACCORDION :
+            $template = '@formcreator/pages/userform_acordion.html.twig';
+            break;
+      }
+
+      TemplateRenderer::getInstance()->display($template, [
          'item'    => $this,
          'options' => [
             'columns' => PluginFormcreatorSection::COLUMNS,
@@ -2572,4 +2597,16 @@ public function getExtraHeader(): string {
 
       return $extra_header;
    }
+
+   /**
+    * Show a section display mode dropdown
+    *
+    * @param string $name
+    * @param array $options
+    * @return void
+    */
+   public static function dropdownSectionDisplayMode(string $name, array $options): void {
+      $modes = self::getEnumSectionDisplayMode();
+      Dropdown::showFromArray($name, $modes, $options);
+   }
 }

inc/section.class.php

@@ -449,6 +449,26 @@ public static function getSectionsFromForm($formId): \Generator {
       }
    }
 
+      /**
+    * Counts sections in a form
+    * @param int $formId ID of a form
+    * @return int
+    */
+   public static function getSectionsCountFromForm($formId): int {
+      global $DB;
+
+      $count = $DB->request([
+         'COUNT' => 'c',
+         'FROM'   => self::getTable(),
+         'WHERE'  => [
+            'plugin_formcreator_forms_id' => $formId
+         ],
+         'ORDER'  => 'order ASC'
+      ])->current();
+
+      return $count['c'];
+   }
+
    public function showForm($ID, $options = []) {
       $this->initForm($ID, $options);
       $options['candel'] = false;

install/mysql/plugin_formcreator_empty.sql

@@ -67,6 +67,7 @@ CREATE TABLE IF NOT EXISTS `glpi_plugin_formcreator_forms` (
   `show_rule`                        int(11)      NOT NULL DEFAULT '1' COMMENT 'Conditions setting to show the submit button',
   `formanswer_name`                  varchar(255) NOT NULL DEFAULT '',
   `is_visible`                       tinyint      NOT NULL DEFAULT 1,
+  `section_display_mode`             int(11)      NOT NULL DEFAULT '0',
   `uuid`                             varchar(255) DEFAULT NULL,
   PRIMARY KEY (`id`),
   INDEX `entities_id` (`entities_id`),

install/upgrade_to_2.14.php

@@ -42,6 +42,7 @@ public function upgrade(Migration $migration) {
        $this->addRights();
        $this->addPropertiesToCategories();
        $this->addTargetActorUnicity();
+       $this->addSectionDisplayMode();
    }
 
    public function addTtoToIssues() {
@@ -131,4 +132,9 @@ public function addTargetActorUnicity() {
       // Set unicity
       $this->migration->addKey($table, $unicity, 'unicity', 'UNIQUE');
    }
+
+   public function addSectionDisplayMode() {
+      $table = (new DBUtils())->getTableForItemType(PluginFormcreatorForm::class);
+      $this->migration->addField($table, 'section_display_mode', 'integer', ['after' => 'is_visible']);
+   }
 }

templates/components/form/fields_macros.html.twig

@@ -324,3 +324,24 @@
    {% endset %}
    {{ fields.field(name, field, label, options) }}
 {% endmacro %}
+
+{% macro dropdownSectionDisplayMode(name, value, label = '', options = {}) %}
+   {% import 'components/form/fields_macros.html.twig' as fields %}
+   {% set options = {'rand': random()}|merge(options) %}
+
+   {% if options.disabled %}
+      {% set options = options|merge({specific_tags: {'disabled': 'disabled'}}) %}
+   {% endif %}
+   {% if options.fields_template.isMandatoryField(name) %}
+      {% set options = {'specific_tags': {'required': true}}|merge(options) %}
+   {% endif %}
+
+   {% set field %}
+      {% do call('PluginFormcreatorForm::dropdownSectionDisplayMode', [name, {
+         'value': value,
+         'rand': rand,
+         'width': '100%'
+      }|merge(options)]) %}
+   {% endset %}
+   {{ fields.field(name, field, label, options) }}
+{% endmacro %}

templates/pages/form.html.twig

@@ -98,4 +98,6 @@
         {% set visible = item.fields['is_visible'] %}
     {% endif %}
     {{ fields.dropdownYesNo('is_visible', visible, __('Visible', 'formcreator'), { 'add_field_html': tooltip }) }}
+
+    {{ formcreatorFields.dropdownSectionDisplayMode('section_display_mode', item.fields['section_display_mode'], __('Section display mode', 'formcreator')) }}
 {% endblock %}