From 75ba07f181a7dd13cb7c8203c8c1888afd2900aa Mon Sep 17 00:00:00 2001 From: Mathieu Jaumotte Date: Mon, 17 May 2021 22:50:28 +0200 Subject: [PATCH 1/5] course banner: opening date by user --- .../Resources/views/AccompanyingCourse/banner.html.twig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/banner.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/banner.html.twig index 6ddb46246..2091cf54a 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/banner.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/banner.html.twig @@ -22,8 +22,8 @@

- ouvert le 11 avril 2019
- par Soline Maillet | SIPAS + ouvert le {{ accompanyingCourse.openingDate|format_date('short') }}
+ par {{ accompanyingCourse.user.usernameCanonical }}

From 1722cf721ec2fe6bffa29793d279076e911cdfc7 Mon Sep 17 00:00:00 2001 From: Mathieu Jaumotte Date: Tue, 18 May 2021 09:57:10 +0200 Subject: [PATCH 2/5] init SocialIssue, Referrer and Confirm components --- .../public/vuejs/AccompanyingCourse/App.vue | 9 +++++++++ .../vuejs/AccompanyingCourse/components/Confirm.vue | 11 +++++++++++ .../vuejs/AccompanyingCourse/components/Referrer.vue | 11 +++++++++++ .../AccompanyingCourse/components/SocialIssue.vue | 11 +++++++++++ .../public/vuejs/AccompanyingCourse/js/i18n.js | 12 +++++++++++- 5 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Confirm.vue create mode 100644 src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Referrer.vue create mode 100644 src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/SocialIssue.vue diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/App.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/App.vue index 7a2427b5a..758b49313 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/App.vue +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/App.vue @@ -2,8 +2,11 @@ + + + @@ -13,8 +16,11 @@ import { mapState } from 'vuex' import AccompanyingCourse from './components/AccompanyingCourse.vue'; import PersonsAssociated from './components/PersonsAssociated.vue'; import Requestor from './components/Requestor.vue'; +import SocialIssue from './components/SocialIssue.vue'; +import Referrer from './components/Referrer.vue'; import Resources from './components/Resources.vue'; import Comment from './components/Comment.vue'; +import Confirm from './components/Confirm.vue'; //import Test from './components/Test.vue'; export default { @@ -23,8 +29,11 @@ export default { AccompanyingCourse, PersonsAssociated, Requestor, + SocialIssue, + Referrer, Resources, Comment, + Confirm, //Test }, computed: mapState([ diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Confirm.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Confirm.vue new file mode 100644 index 000000000..05f0a9e1d --- /dev/null +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Confirm.vue @@ -0,0 +1,11 @@ + + + diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Referrer.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Referrer.vue new file mode 100644 index 000000000..bb7dcf97c --- /dev/null +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Referrer.vue @@ -0,0 +1,11 @@ + + + diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/SocialIssue.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/SocialIssue.vue new file mode 100644 index 000000000..e66594b53 --- /dev/null +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/SocialIssue.vue @@ -0,0 +1,11 @@ + + + diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js index fd83eaf3f..d6daa7f37 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js @@ -48,6 +48,12 @@ const appMessages = { address: "Adresse", location: "Localité", }, + social_issue: { + title: "Problématiques sociales", + }, + referrer: { + title: "Référent", + }, resources: { title: "Interlocuteurs privilégiés", counter: "Pas d'interlocuteur | 1 interlocuteur | {count} interlocuteurs", @@ -58,7 +64,11 @@ const appMessages = { comment: { title: "Ajout d'une note", content: "Rédigez une première note..." - } + }, + confirm: { + title: "Confirmation", + }, + } }; From 5acc78507e82721053d7ef5a49bf004f5f65e8d2 Mon Sep 17 00:00:00 2001 From: Mathieu Jaumotte Date: Tue, 18 May 2021 10:15:45 +0200 Subject: [PATCH 3/5] building Confirm component --- .../components/AccompanyingCourse.vue | 61 +++++++------------ .../AccompanyingCourse/components/Confirm.vue | 36 ++++++++++- .../vuejs/AccompanyingCourse/js/i18n.js | 2 + 3 files changed, 60 insertions(+), 39 deletions(-) diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/AccompanyingCourse.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/AccompanyingCourse.vue index 80e75414b..d620b3be1 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/AccompanyingCourse.vue +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/AccompanyingCourse.vue @@ -1,45 +1,30 @@ diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js index d6daa7f37..1d607411e 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js @@ -67,6 +67,8 @@ const appMessages = { }, confirm: { title: "Confirmation", + text_draft: "Le parcours est actuellement au statut de brouillon. En validant cette étape, vous lui donnez le statut actif.", + ok: "Activer le parcours" }, } From f978636d577fae7cf52ff6e0c0429ac1069b76b4 Mon Sep 17 00:00:00 2001 From: Mathieu Jaumotte Date: Tue, 18 May 2021 16:14:10 +0200 Subject: [PATCH 4/5] add intensity in teleported toggleFlags --- .../Resources/public/scss/chillmain.scss | 12 +++++++++ .../components/AccompanyingCourse.vue | 1 + .../AccompanyingCourse/components/Comment.vue | 6 ++++- .../AccompanyingCourse/components/Confirm.vue | 22 +++++++++------ .../components/ToggleFlags.vue | 27 ++++++++++++++++++- .../vuejs/AccompanyingCourse/js/i18n.js | 2 ++ .../vuejs/AccompanyingCourse/store/index.js | 11 ++++++++ 7 files changed, 71 insertions(+), 10 deletions(-) diff --git a/src/Bundle/ChillMainBundle/Resources/public/scss/chillmain.scss b/src/Bundle/ChillMainBundle/Resources/public/scss/chillmain.scss index ed6d535e5..f5eb1dc09 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/scss/chillmain.scss +++ b/src/Bundle/ChillMainBundle/Resources/public/scss/chillmain.scss @@ -182,3 +182,15 @@ div.results { color: grey; margin-right: 1em; } + +a.flag-toggle { + color: white; + padding: 0 10px; + cursor: pointer; + &:hover { + color: white; + //border: 1px solid rgba(255,255,255,0.2); + text-decoration: underline; + border-radius: 20px; + } +} diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/AccompanyingCourse.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/AccompanyingCourse.vue index d620b3be1..685d454c3 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/AccompanyingCourse.vue +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/AccompanyingCourse.vue @@ -9,6 +9,7 @@ diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Comment.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Comment.vue index b34b0d701..f1ccf7667 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Comment.vue +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Comment.vue @@ -24,7 +24,11 @@ ckeditor="ckeditor" v-model="content"> - +
    +
  • + +
  • +
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Confirm.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Confirm.vue index 7488ee3bd..83f2c4c90 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Confirm.vue +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Confirm.vue @@ -4,27 +4,33 @@ {{ $t('confirm.title') }} - {{ $t('course.step.active') }} + {{ $t('course.step.active') }} + - {{ $t('course.step.draft') }} + {{ $t('course.step.draft') }} +

{{ $t('confirm.text_draft') }}

-
+
{{ $t('course.closing_date') }}
-
{{ $d(accompanyingCourse.closingDate.datetime, 'short') }}
+
{{ $d(accompanyingCourse.closingDate.datetime, 'short') }}
{{ $t('course.closing_motive') }}
{{ accompanyingCourse.closingMotive.name.fr }}
- +
    +
  • + +
  • +
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/ToggleFlags.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/ToggleFlags.vue index 12c372f12..cade04dc6 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/ToggleFlags.vue +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/ToggleFlags.vue @@ -1,5 +1,12 @@