From 3d6745e535cd0e8708f3dde4f7df66c99e3529e4 Mon Sep 17 00:00:00 2001 From: Julie Lenaerts Date: Mon, 28 Mar 2022 12:00:13 +0200 Subject: [PATCH 1/6] display of interlocuteurs changed to flex-table to prevent cut-off of information --- CHANGELOG.md | 1 + .../public/vuejs/AccompanyingCourse/components/Resources.vue | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 56b958bb6..739a4a1f3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -77,6 +77,7 @@ and this project adheres to * [parcours] Create document buttons made sticky (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/532) * [person] Trailing guillemet removed (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/530) * [notification] Display of social action within workflow notification set to display block (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/537) +* [parcours] Display of interlocuteurs changed to flex-table in parcours edit page to prevent cut-off of information (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/535) ## Test releases diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources.vue index e9b9695ab..7287437a3 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources.vue +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources.vue @@ -10,7 +10,7 @@ -
+
Date: Mon, 28 Mar 2022 14:30:49 +0200 Subject: [PATCH 2/6] activity: add spacing between buttons + better alignment --- .../Resources/public/page/edit_activity/index.scss | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/Bundle/ChillActivityBundle/Resources/public/page/edit_activity/index.scss b/src/Bundle/ChillActivityBundle/Resources/public/page/edit_activity/index.scss index 16e66eadb..5d1ccf976 100644 --- a/src/Bundle/ChillActivityBundle/Resources/public/page/edit_activity/index.scss +++ b/src/Bundle/ChillActivityBundle/Resources/public/page/edit_activity/index.scss @@ -4,6 +4,13 @@ div.chill-dropzone__below-zone { } } +ul[data-collection-name="documents"] { + button.remove-entry { + margin: 0.5rem 0!important; + } +} + + // do it in js does not work // document.addEventListener('DOMContentLoaded', e => { // const dropzoneBelow = document.querySelectorAll('div.chill-dropzone__below-zone'); From 10fcd4f7329d543b65dc53b3468cffd3f623de92 Mon Sep 17 00:00:00 2001 From: nobohan Date: Mon, 28 Mar 2022 15:12:16 +0200 Subject: [PATCH 3/6] accompanying course: evaluation documents: align buttons --- .../components/FormEvaluation.vue | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue index eff62bbbb..5f4fdedec 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue @@ -138,12 +138,12 @@ @go-to-generate-document="submitBeforeGenerate" >
- -
    + +
    • From a4ece21f2b5ec4312298af7b56fee67e1e916329 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Fri, 1 Apr 2022 15:06:00 +0200 Subject: [PATCH 4/6] in household, force validTo of address to be NULL --- src/Bundle/ChillPersonBundle/Entity/Household/Household.php | 2 ++ .../ChillPersonBundle/Tests/Entity/Household/HouseholdTest.php | 3 +++ 2 files changed, 5 insertions(+) diff --git a/src/Bundle/ChillPersonBundle/Entity/Household/Household.php b/src/Bundle/ChillPersonBundle/Entity/Household/Household.php index 2620ed19a..fed9f0af0 100644 --- a/src/Bundle/ChillPersonBundle/Entity/Household/Household.php +++ b/src/Bundle/ChillPersonBundle/Entity/Household/Household.php @@ -514,6 +514,8 @@ class Household if ($iterator->valid()) { $current->setValidTo($iterator->current()->getValidFrom()); + } else { + $current->setValidTo(null); } } } diff --git a/src/Bundle/ChillPersonBundle/Tests/Entity/Household/HouseholdTest.php b/src/Bundle/ChillPersonBundle/Tests/Entity/Household/HouseholdTest.php index 6799f882b..7cf8af3e5 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Entity/Household/HouseholdTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Entity/Household/HouseholdTest.php @@ -75,6 +75,7 @@ final class HouseholdTest extends TestCase $lastAddress = new Address(); $lastAddress->setValidFrom($yesterday = new DateTime('yesterday')); + $lastAddress->setValidTo(new DateTime('tomorrow')); $household->addAddress($lastAddress); $this->assertNull($lastAddress->getValidTo()); @@ -82,6 +83,7 @@ final class HouseholdTest extends TestCase $previousAddress = new Address(); $previousAddress->setValidFrom($oneMonthAgo = new DateTime('1 month ago')); + $previousAddress->setValidTo(new DateTime('now')); $household->addAddress($previousAddress); $addresses = $household->getAddressesOrdered(); @@ -95,6 +97,7 @@ final class HouseholdTest extends TestCase $futureAddress = new Address(); $futureAddress->setValidFrom($tomorrow = new DateTime('tomorrow')); + $futureAddress->setValidTo(new DateTime('2150-01-01')); $household->addAddress($futureAddress); $addresses = $household->getAddressesOrdered(); From 37c04d3f125b2663477dac16168340432293bb25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Wed, 6 Apr 2022 12:00:49 +0200 Subject: [PATCH 5/6] update changelog --- CHANGELOG.md | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 603feecc7..d80038b97 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,9 +11,15 @@ and this project adheres to ## Unreleased +* [parcours] Display of interlocuteurs changed to flex-table in parcours edit page to prevent cut-off of information (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/535) + +## Test releases + +### continuous release in February and March + +* Creation of PickCivilityType, and implementation in PersonType and ThirdpartyType * [person] Accompanying course evaluation documents: disable the WOPI edit link if mimetype not supported and if no keyInfos (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/585) - * [activity] display error messages above the form in creating a new location (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/481) * [activity] show required field in activity edit/new by an asterix in the vuejs fields (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/494) * [ACL] fix allow to see the course, event if the scope'course does not contains the scope's user @@ -78,9 +84,6 @@ and this project adheres to * [person] Trailing guillemet removed (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/530) * [notification] Display of social action within workflow notification set to display block (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/537) * [onthefly] trim trailing whitespace in email of person and thirdparty (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/542) -* [parcours] Display of interlocuteurs changed to flex-table in parcours edit page to prevent cut-off of information (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/535) - -## Test releases ### test release 2022-02-21 @@ -108,8 +111,6 @@ and this project adheres to * [bug]: fix confidential toggle of address in thirdpartyrenderbox (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/460) -## Test releases -* Creation of PickCivilityType, and implementation in PersonType and ThirdpartyType ### test release 2022-02-14 From 066afc07a8e09a1f98ea8c5d6b8df9b4ce06ac65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Wed, 6 Apr 2022 12:08:44 +0200 Subject: [PATCH 6/6] update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d80038b97..0aa10a5c2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ and this project adheres to * [parcours] Display of interlocuteurs changed to flex-table in parcours edit page to prevent cut-off of information (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/535) +* [activity] espace entre les boutons pour supprimer les documents ## Test releases