Add question group #2059

theodaviddd · 2025-03-18T17:32:23Z

No description provided.

theodaviddd · 2025-04-23T09:00:48Z

class/control.class.php

+                        $questionOrGroup->fk_question_group = 0;
+                        $questions[] = $questionOrGroup;
+                    }
+                }


mettre ça dans une fonction

theodaviddd · 2025-04-23T09:04:51Z

class/sheet.class.php

+
+
+        $res = $this->db->query($sql);
+        $questionAndGroupIds = [];


$questionAndGroups

fetch_object_linked et concaténer les tableaux digiquali_question et digiquali_questiongroup

en fait je crois que je peux pas utiliser les fonctions natives parce que je veux absolument que ce soit trié par position et y a pas moyen de le faire via fetchObjectLinked vu que c'est deux types d'objets différents il peut pas envoyer une seule liste ordonnée par position

theodaviddd · 2025-04-23T09:14:27Z

class/questiongroup.class.php

+
+/**
+ * \file    class/question_group.class.php
+ * \ingroup digiquali


vérifier les noms de classe partout

theodaviddd · 2025-04-23T09:14:56Z

class/questiongroup.class.php

+     * Note: To have value dynamic, you can set value to 0 in definition and edit the value on the fly into the constructor
+     */
+
+//CREATE TABLE llx_digiquali_question_group(


theodaviddd · 2025-04-23T09:15:36Z

class/questiongroup.class.php

+        'ref'                    => ['type' => 'varchar(128)', 'label' => 'Ref',                  'enabled' => 1, 'position' => 10,  'notnull' => 1, 'visible' => 4, 'noteditable' => 1, 'default' => '(PROV)', 'index' => 1, 'searchall' => 1, 'showoncombobox' => 1, 'validate' => 1, 'comment' => 'Reference of object'],
+        'ref_ext'                => ['type' => 'varchar(128)', 'label' => 'RefExt',               'enabled' => 1, 'position' => 20,  'notnull' => 0, 'visible' => 0, 'noteditable' => 1, 'index' => 1, 'comment' => 'External reference of object'],
+        'entity'                 => ['type' => 'integer',      'label' => 'Entity',               'enabled' => 1, 'position' => 30,  'notnull' => 1, 'visible' => 0, 'noteditable' => 1, 'default' => 1, 'index' => 1, 'comment' => 'Entity'],
+        'date_creation'          => ['type' => 'datetime',     'label' => 'DateCreation',         'enabled' => 1, 'position' => 40,  'notnull' => 1, 'visible' => 0, 'noteditable' => 1, 'default' => '@NOW@', 'index' => 1, 'comment' => 'Creation date'],


@now@ ?
enlever les comment

theodaviddd · 2025-04-23T09:17:23Z

class/questiongroup.class.php

+	 *
+	 *  @return    int         <=0 if no, >0 if yes
+	 */
+	public function isErasable() {


is_erasable

theodaviddd · 2025-04-23T09:20:29Z

class/questiongroup.class.php

+		global $langs;
+
+		$ret   = parent::getTriggerDescription($object);
+		$ret  .= (dol_strlen($object->photo_ok) > 0 ? $langs->transnoentities('PhotoOK') . ' : ' . $object->photo_ok . '</br>' : '');


enlever photo ko et ok

theodaviddd · 2025-04-23T09:21:13Z

class/survey.class.php


-                    $surveyLine->create($user);
+                    $test = $surveyLine->create($user);


theodaviddd · 2025-04-23T09:24:54Z

core/modules/digiquali/question_group/mod_questiongroup_standard.php

+ */
+
+/**
+ *  \file    core/modules/digiquali/question/mod_question_standard.php


vérifier nom

theodaviddd · 2025-04-23T09:30:18Z

sql/question_group/llx_categorie_question_group.key.sql

+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License


ou est passé le sql de question group

theodaviddd · 2025-04-23T09:31:34Z

core/tpl/digiquali_answers_save_action.tpl.php

-    if (!empty($sheet->linkedObjects['digiquali_question'])) {
-        foreach ($sheet->linkedObjects['digiquali_question'] as $question) {
+    $questionAndGroups = $sheet->fetchQuestionsAndGroups();
+    $object->fetchLinesCommon();


pas sûr que ce soit utile

theodaviddd · 2025-04-23T09:32:32Z

core/tpl/digiquali_answers_save_action.tpl.php

                        }
                        if (dol_strlen($comment) > 0) {
                            $line->comment = $comment;
                        }

+                        $line->fk_question_group = $question->fk_question_group;


pas sûr d'avoir besoin de ça

theodaviddd · 2025-04-23T09:33:16Z

core/tpl/digiquali_answers_save_action.tpl.php

            if (!empty($object->lines)) {
                foreach ($object->lines as $line) {
-                    if ($line->fk_question === $question->id) {
+                    if ($line->fk_question === $question->id && $line->fk_question_group === $question->fk_question_group) {


update toutes les lines pour mettre le fk_question_group à 0

theodaviddd · 2025-04-23T09:38:22Z

js/modules/sheet.js

+    } else {
+      addGroupRow.classList.remove("hidden");
+      addQuestionRow.classList.add("hidden");
+    }


theodaviddd · 2025-04-23T09:40:27Z

js/modules/sheet.js

+  });
+}
+
+window.digiquali.sheet.closeAllGroups = function () {


theodaviddd · 2025-04-23T09:42:33Z

js/modules/sheet.js

+  );
+}
+
+window.digiquali.sheet.showQuestionCard = function () {


a voir si ça existe encore

theodaviddd · 2025-04-23T09:44:08Z

js/modules/sheet.js

+        lineOrder.push($(this).attr('id'));
+      });
+
+      const token = $('.fiche').find('input[name="token"]').val();


saturne gettoken

theodaviddd · 2025-04-23T09:44:23Z

js/modules/sheet.js

+      if (document.URL.match(/action=/)) {
+        document.URL = document.URL.split(/\?/)[0];
+        separator = '?';
+      }


get query separator

theodaviddd · 2025-04-23T09:57:32Z

view/questiongroup/questiongroup_card.php

+		// Define confirmation messages
+		$formquestion_groupclone = [
+			['type' => 'text', 'name' => 'clone_label', 'label' => $langs->trans('NewLabelForClone', $langs->transnoentities('The' . ucfirst($object->element))), 'value' => $langs->trans('CopyOf') . ' ' . $object->ref, 'size' => 24],
+			['type' => 'checkbox', 'name' => 'clone_photos', 'label' => $langs->trans('ClonePhotos'), 'value' => 1],


theodaviddd · 2025-04-23T09:58:10Z

view/questiongroup/questiongroup_card.php

+				print '<span class="butActionRefused classfortooltip" title="' . dol_escape_htmltag($langs->trans('ObjectMustBeDraft', ucfirst($langs->transnoentities('The' . ucfirst($object->element))))) . '"><i class="fas fa-edit"></i> ' . $langs->trans('Modify') . '</span>';
+			}
+
+			// Lock


pas d'object type là

theodaviddd · 2025-04-23T09:58:38Z

view/questiongroup/questiongroup_card.php

+		print '</div>';
+	}
+
+    // ANSWERS LINES


mauvais commentaire

theodaviddd · 2025-04-23T10:00:01Z

view/questiongroup/questiongroup_list.php

+ *   	\file       view/question_group/question_group_list.php
+ *		\ingroup    digiquali
+ *		\brief      List page for question_group
+ */


rework la liste avec les nouveaux tpl

theodaviddd · 2025-04-23T10:00:36Z

view/questiongroup/questiongroup_list.php

+	$error = 0;
+
+	// Action to set status STATUS_LOCKED
+	if (!$error && ($massaction == 'lock' || ($action == 'lock' && $confirm == 'yes')) && $permissiontoadd) {


pas de object type

theodaviddd · 2025-04-23T10:01:00Z

view/questiongroup/questiongroup_list.php

+		if (!empty($toselect)) {
+			foreach ($toselect as $toselectedid) {
+				$object->fetch($toselectedid);
+                if ($object->type == 'UniqueChoice' || $object->type == 'MultipleChoices') {


enlever les massa actions

theodaviddd · 2025-04-23T10:04:36Z

view/sheet/sheet_card.php

-			print '</td>';
+// QUESTIONS LINES
+    print '<div class="div-table-responsive-no-min">';
+    print load_fiche_titre($langs->trans("LinkedQuestionsList"), '', '', 0, 'questionList');


remettre le question counter

theodaviddd · 2025-04-23T10:05:08Z

view/sheet/sheet_card.php

+    print '<td class="center">' . $langs->trans('Action') . '</td>';
+    print '<td class="center"></td>';
+    print '</tr></thead>';
+    print '<tbody>'; // Ajouter ici le conteneur partagé pour tous les éléments


commentaire

theodaviddd · 2025-04-23T10:07:15Z

view/sheet/sheet_export.php

@@ -53,6 +54,7 @@
 // Initialize technical objects
 $object   = new Sheet($db);
 $question = new Question($db);
+$questionGroup = new QuestionGroup($db);
 $answer   = new Answer($db);



vérifier que l'export marche bien

theodaviddd · 2025-04-23T10:07:55Z

view/survey/survey_card.php

@@ -513,14 +529,14 @@

    $averagePercentageQuestions = 0;
    $percentQuestionCounter     = 0;
-    foreach ($sheet->linkedObjects['digiquali_question'] as $questionLinked) {
+    foreach ($questionIds as $questionId) {
        if ($questionLinked->type !== 'Percentage') {


…n groups

theodaviddd requested a review from nicolas-eoxia March 18, 2025 17:32

This was linked to issues Mar 25, 2025

[DataModel] - Ajout des groupes de questions #1927

Open

[IHM] - Réalisation la maquette de simplification création des formulaires, groupe de questions et question dans la meme interface #1952

Open

theodaviddd force-pushed the add_question_group branch 3 times, most recently from 2c95944 to dc57672 Compare April 1, 2025 14:36

theodaviddd force-pushed the add_question_group branch 2 times, most recently from cdba5c9 to 34cf1bd Compare April 15, 2025 14:45

Evarisk#1927 [QuestionGroup] add: question group

beecfd9

theodaviddd force-pushed the add_question_group branch from 97eebdf to beecfd9 Compare April 23, 2025 08:27

Evarisk#1927 [Survey] fix: survey interactions with question group

131faa6

theodaviddd self-assigned this Apr 23, 2025

theodaviddd commented Apr 23, 2025

View reviewed changes

theodaviddd added 16 commits April 23, 2025 16:17

Evarisk#1927 [QuestionGroup] add: function to get all questions withi…

98ef068

…n groups

Evarisk#1927 [Sheet] fix: change variable name

9233181

Evarisk#1927 [QuestionGroup] fix: minor fixes

d4deb2a

Evarisk#1927 [QuestionGroup] fix: is_erasable case

3cce541

Evarisk#1927 [QuestionGroup] fix: remove useless lines

58ae087

Evarisk#1927 [JS] fix: jquery & saturne uses

b3d8b65

Evarisk#1927 [Lib] fix: comments question group

7ca0ef3

Evarisk#1927 [Control] fix: public control questions & answers

023b385

Evarisk#1927 [Categorie] fix: question group categories sql

00a57b8

Evarisk#1927 [Question] fix: question card

224182f

Evarisk#1927 [QuestionGroup] fix: question group card

7e3775e

Evarisk#1927 [QuestionGroup] fix: rework question group list

7ad3684

Evarisk#1927 [Sheet] fix: add question counter in sheet card

0152b09

Evarisk#1927 [Sheet] fix: remove comment

35b5100

Evarisk#1927 [Export] fix: question groups export & import

bf09581

Evarisk#1927 [Survey] fix: survey card

352306b

lmag added this to DigiQuali 21.2.0 - Gestion de groupes de questions et de formulaires complexes May 7, 2025

lmag moved this to 👀 Review in progress in DigiQuali 21.2.0 - Gestion de groupes de questions et de formulaires complexes May 7, 2025

lmag moved this from 👀 Review in progress to Pull requests in DigiQuali 21.2.0 - Gestion de groupes de questions et de formulaires complexes May 7, 2025

lmag added the 21 label May 7, 2025


		$surveyLine->create($user);
		$test = $surveyLine->create($user);

Add question group #2059

Are you sure you want to change the base?

Add question group #2059

Conversation

theodaviddd commented Mar 18, 2025

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

theodaviddd Apr 23, 2025 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

theodaviddd Apr 23, 2025 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

theodaviddd Apr 23, 2025 •

edited

Loading

theodaviddd Apr 23, 2025 •

edited

Loading