From e2551f96f3896cec86497ccd5a788a4f7797a954 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bulot=20Fran=C3=A7ois?= Date: Wed, 20 Dec 2023 11:18:34 +0100 Subject: [PATCH 1/4] add pogues version --- src/layout/header/header.jsx | 6 +++++- src/scss/inc/_header.scss | 6 ++++++ src/utils/version.js | 3 +++ 3 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 src/utils/version.js diff --git a/src/layout/header/header.jsx b/src/layout/header/header.jsx index f0b4fee91..36a4f8b0e 100644 --- a/src/layout/header/header.jsx +++ b/src/layout/header/header.jsx @@ -4,6 +4,7 @@ import { Link } from 'react-router-dom'; import logo from 'layout/header/logo-insee.png'; import UserConnectionContainer from 'layout/user/user-connection-container'; import Dictionary from 'utils/dictionary/dictionary'; +import { poguesFrontVersion } from 'utils/version'; function Header() { return ( @@ -18,7 +19,10 @@ function Header() { Pogues -
{Dictionary.headerSubtitle}
+
+ {Dictionary.headerSubtitle} + {poguesFrontVersion} +
Date: Wed, 20 Dec 2023 11:18:34 +0100 Subject: [PATCH 2/4] add pogues version --- src/layout/header/header.jsx | 6 +++++- src/scss/inc/_header.scss | 6 ++++++ src/utils/version.js | 3 +++ 3 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 src/utils/version.js diff --git a/src/layout/header/header.jsx b/src/layout/header/header.jsx index f0b4fee91..36a4f8b0e 100644 --- a/src/layout/header/header.jsx +++ b/src/layout/header/header.jsx @@ -4,6 +4,7 @@ import { Link } from 'react-router-dom'; import logo from 'layout/header/logo-insee.png'; import UserConnectionContainer from 'layout/user/user-connection-container'; import Dictionary from 'utils/dictionary/dictionary'; +import { poguesFrontVersion } from 'utils/version'; function Header() { return ( @@ -18,7 +19,10 @@ function Header() { Pogues -
{Dictionary.headerSubtitle}
+
+ {Dictionary.headerSubtitle} + {poguesFrontVersion} +
Date: Wed, 20 Dec 2023 13:37:55 +0100 Subject: [PATCH 3/4] update version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 68ac7d4ee..4ac73d60f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pogues", - "version": "1.5.5-rc3", + "version": "1.5.5-rc5", "description": "Outil de conception et de test de questionnaires.", "repository": { "type": "git", From d18ae76cf81ab1a87c1b5d3232a1a4eba7bd56a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Bulot?= Date: Tue, 2 Jan 2024 13:28:38 +0100 Subject: [PATCH 4/4] Dev scope loop starts with external element (#713) * manage variables of loops starting with external-element * update version * add clg to understand loss of Scope * allow temporary clg * remove console.log * Update package.json --- package.json | 2 +- .../transformations/collected-variable.js | 52 ++++++------------- 2 files changed, 18 insertions(+), 36 deletions(-) diff --git a/package.json b/package.json index a506d258c..68ac7d4ee 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pogues", - "version": "1.5.4", + "version": "1.5.5-rc3", "description": "Outil de conception et de test de questionnaires.", "repository": { "type": "git", diff --git a/src/model/transformations/collected-variable.js b/src/model/transformations/collected-variable.js index f4021bde6..0f34c98d3 100644 --- a/src/model/transformations/collected-variable.js +++ b/src/model/transformations/collected-variable.js @@ -9,7 +9,8 @@ import { } from 'constants/pogues-constants'; const { COLLECTED } = VARIABLES_TYPES; -const { QUESTION, SEQUENCE, SUBSEQUENCE, LOOP } = COMPONENT_TYPE; +const { QUESTION, SEQUENCE, SUBSEQUENCE, LOOP, EXTERNAL_ELEMENT } = + COMPONENT_TYPE; const { TABLE, MULTIPLE_CHOICE } = QUESTION_TYPE_ENUM; const { LIST } = DIMENSION_FORMATS; @@ -185,37 +186,25 @@ function findQuestionInLoop(componentsStore) { .forEach(component => { let LoopQuestions = []; if (componentsStore[component.initialMember]) { - if (componentsStore[component.initialMember].type === SEQUENCE) { - if ( - componentsStore[component.initialMember].weight !== - componentsStore[component.finalMember].weight + if ( + componentsStore[component.initialMember].type === SEQUENCE || + componentsStore[component.initialMember].type === EXTERNAL_ELEMENT + ) { + for ( + let i = componentsStore[component.initialMember].weight; + i <= componentsStore[component.finalMember].weight; + i++ ) { - for ( - let i = componentsStore[component.initialMember].weight; - i <= componentsStore[component.finalMember].weight; - i++ - ) { - const sequence = Object.values(componentsStore).find( - element => element.type === SEQUENCE && element.weight === i, + const sequence = Object.values(componentsStore).find( + element => element.type === SEQUENCE && element.weight === i, + ); + if (sequence) { + LoopQuestions = LoopQuestions.concat( + getQuestionFromSequence(componentsStore, sequence.id), ); - if (sequence) { - LoopQuestions = LoopQuestions.concat( - getQuestionFromSequence(componentsStore, sequence.id), - ); - } } - } else { - LoopQuestions = LoopQuestions.concat( - getQuestionFromSequence( - componentsStore, - componentsStore[component.initialMember].id, - ), - ); } - } else if ( - componentsStore[component.initialMember].weight !== - componentsStore[component.finalMember].weight - ) { + } else { for ( let i = componentsStore[component.initialMember].weight; i <= componentsStore[component.finalMember].weight; @@ -234,13 +223,6 @@ function findQuestionInLoop(componentsStore) { ); } } - } else { - LoopQuestions = LoopQuestions.concat( - getQuestionFromSubSequence( - componentsStore, - componentsStore[component.initialMember].id, - ), - ); } }