Add visibility conditions to questions

glpi-project · Dec 9, 2024 · bc6fada · bc6fada
1 parent 6497d73
commit bc6fada
Show file tree

Hide file tree

Showing 35 changed files with 2,375 additions and 29 deletions.
diff --git a/css/includes/_base.scss b/css/includes/_base.scss
@@ -460,6 +460,16 @@ body pre {
     }
 }
 
+// Missing class from tabler, probably need to update it ?
+.btn-check:checked+.btn {
+    color           : var(--tblr-btn-hover-color) !important;
+    background-color: var(--tblr-btn-active-bg) !important;
+}
+
+.w-fit-content {
+    width: fit-content;
+}
+
 .accordion-button:hover, .accordion-button:focus {
     z-index: unset;
 }
diff --git a/css/includes/components/form/_form-editor.scss b/css/includes/components/form/_form-editor.scss
@@ -290,3 +290,39 @@
         }
     }
 }
+
+.logic-operator-selector .select2-selection {
+    border: 0 !important;
+    background-color: var(--tblr-pink-lt) !important;
+
+    // Fix some border conflicts with tabler/select2
+    border-top-right-radius: var(--tblr-border-radius) !important;
+    border-bottom-right-radius: var(--tblr-border-radius) !important;
+}
+
+.question-selector .select2-selection {
+    border: 0 !important;
+    background-color: var(--tblr-indigo-lt) !important;
+
+    // Fix some border conflicts with tabler/select2
+    border-top-right-radius: var(--tblr-border-radius) !important;
+    border-bottom-right-radius: var(--tblr-border-radius) !important;
+}
+
+.value-operator-selector .select2-selection {
+    border: 0 !important;
+    background-color: var(--tblr-teal-lt) !important;
+
+    // Fix some border conflicts with tabler/select2
+    border-top-right-radius: var(--tblr-border-radius) !important;
+    border-bottom-right-radius: var(--tblr-border-radius) !important;
+}
+
+.value-selector {
+    border: 0 !important;
+    background-color: var(--tblr-yellow-lt) !important;
+}
+
+.visibility-dropdown-card {
+    width: 600px;
+}
diff --git a/dependency_injection/services.php b/dependency_injection/services.php
@@ -59,6 +59,10 @@
     $services->load('Glpi\Http\\', $projectDir . '/src/Glpi/Http');
     $services->load('Glpi\DependencyInjection\\', $projectDir . '/src/Glpi/DependencyInjection');
     $services->load('Glpi\Progress\\', $projectDir . '/src/Glpi/Progress')->exclude($projectDir . '/src/Glpi/Progress/SessionProgress.php');
+    $services->load(
+        'Glpi\Form\ConditionalVisiblity\\',
+        $projectDir . '/src/Glpi/Form/ConditionalVisiblity/*Manager.php'
+    );
 
     /**
      * Override Symfony's logger.

diff --git a/install/migrations/update_10.0.x_to_11.0.0/form.php b/install/migrations/update_10.0.x_to_11.0.0/form.php
@@ -103,6 +103,8 @@
             `name` varchar(255) NOT NULL DEFAULT '',
             `description` longtext,
             `rank` int NOT NULL DEFAULT '0',
+            `visibility_strategy` varchar(30) NOT NULL DEFAULT '',
+            `conditions` JSON NOT NULL,
             PRIMARY KEY (`id`),
             UNIQUE KEY `uuid` (`uuid`),
             KEY `name` (`name`),
@@ -124,6 +126,8 @@
             `description` longtext,
             `default_value` text COMMENT 'JSON - The default value type may not be the same for all questions type',
             `extra_data` text COMMENT 'JSON - Extra configuration field(s) depending on the questions type',
+            `visibility_strategy` varchar(30) NOT NULL DEFAULT '',
+            `conditions` JSON NOT NULL,
             PRIMARY KEY (`id`),
             UNIQUE KEY `uuid` (`uuid`),
             KEY `name` (`name`),
@@ -142,6 +146,8 @@
             `name` varchar(255) NOT NULL DEFAULT '',
             `description` longtext,
             `rank` int NOT NULL DEFAULT '0',
+            `visibility_strategy` varchar(30) NOT NULL DEFAULT '',
+            `conditions` JSON NOT NULL,
             PRIMARY KEY (`id`),
             UNIQUE KEY `uuid` (`uuid`),
             KEY `name` (`name`),
@@ -329,6 +335,13 @@
     $migration->addField("glpi_forms_comments", "forms_sections_uuid", "string");
     $migration->addKey("glpi_forms_comments", "uuid", type: 'UNIQUE');
     $migration->addKey("glpi_forms_comments", "forms_sections_uuid");
+
+    $migration->addField("glpi_forms_questions", "visibility_strategy", "string");
+    $migration->addField("glpi_forms_questions", "conditions", "json");
+    $migration->addField("glpi_forms_sections", "visibility_strategy", "string");
+    $migration->addField("glpi_forms_sections", "conditions", "json");
+    $migration->addField("glpi_forms_comments", "visibility_strategy", "string");
+    $migration->addField("glpi_forms_comments", "conditions", "json");
 }
 
 CronTask::register('Glpi\Form\Form', 'purgedraftforms', DAY_TIMESTAMP, [

diff --git a/install/mysql/glpi-empty.sql b/install/mysql/glpi-empty.sql
@@ -9504,6 +9504,8 @@ CREATE TABLE `glpi_forms_sections` (
     `name` varchar(255) NOT NULL DEFAULT '',
     `description` longtext,
     `rank` int NOT NULL DEFAULT '0',
+    `visibility_strategy` varchar(30) NOT NULL DEFAULT '',
+    `conditions` JSON NOT NULL,
     PRIMARY KEY (`id`),
     UNIQUE KEY `uuid` (`uuid`),
     KEY `name` (`name`),
@@ -9523,6 +9525,8 @@ CREATE TABLE `glpi_forms_questions` (
     `description` longtext,
     `default_value` text COMMENT 'JSON - The default value type may not be the same for all questions type',
     `extra_data` text COMMENT 'JSON - Extra configuration field(s) depending on the questions type',
+    `visibility_strategy` varchar(30) NOT NULL DEFAULT '',
+    `conditions` JSON NOT NULL,
     PRIMARY KEY (`id`),
     UNIQUE KEY `uuid` (`uuid`),
     KEY `name` (`name`),
@@ -9539,6 +9543,8 @@ CREATE TABLE `glpi_forms_comments` (
     `name` varchar(255) NOT NULL DEFAULT '',
     `description` longtext,
     `rank` int NOT NULL DEFAULT '0',
+    `visibility_strategy` varchar(30) NOT NULL DEFAULT '',
+    `conditions` JSON NOT NULL,
     PRIMARY KEY (`id`),
     UNIQUE KEY `uuid` (`uuid`),
     KEY `name` (`name`),