From ff03299f80c2e2a24843a52dc23bd25789ddf2d0 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Thu, 25 May 2023 17:06:10 +0200
Subject: [PATCH 1/3] FEATURE [workflow][doc] scroll immediately to document in
 workflow and let background flash

---
 .../vuejs/AccompanyingCourseWorkEdit/App.vue  | 21 ++++++++++++++++---
 .../components/AddEvaluation.vue              |  7 +++++--
 .../components/FormEvaluation.vue             | 20 +++++++++++++++---
 .../Workflow/_evaluation_document.html.twig   |  2 +-
 4 files changed, 41 insertions(+), 9 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
index 755e4455c..adbcf1097 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
@@ -122,7 +122,8 @@
          <add-evaluation
             v-for="e in pickedEvaluations"
             v-bind:key="e.key"
-            v-bind:evaluation="e">
+            v-bind:evaluation="e"
+            v-bind:docId="this.docId">
          </add-evaluation>
 
          <!-- box to add new evaluation -->
@@ -389,6 +390,7 @@ export default {
    i18n,
    data() {
       return {
+         docId: null,
          isExpanded: false,
          editor: ClassicEditor,
          showAddObjective: false,
@@ -428,7 +430,14 @@ export default {
          },
       };
    },
-   computed: {
+   beforeMount() {
+       const urlParams = new URLSearchParams(window.location.search);
+       this.docId = urlParams.get('doc_id');
+   },
+   mounted() {
+     this.scrollToElement(this.docId);
+   },
+  computed: {
       ...mapState([
          'work',
          'resultsForAction',
@@ -559,7 +568,7 @@ export default {
          });
       },
       saveFormOnTheFly(payload) {
-         console.log('saveFormOnTheFly: type', payload.type, ', data', payload.data);
+         // console.log('saveFormOnTheFly: type', payload.type, ', data', payload.data);
 
          let body = { type: payload.type };
          body.name = payload.data.text;
@@ -581,6 +590,12 @@ export default {
                      this.$toast.open({message: 'An error occurred'});
                }
             })
+      },
+      scrollToElement(docId) {
+         const documentEl = document.getElementById(`document_${docId}`);
+         if (documentEl) {
+           documentEl.scrollIntoView({behavior: 'smooth'});
+         }
       }
    }
 };
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/AddEvaluation.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/AddEvaluation.vue
index 411c386a8..215c5d6cc 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/AddEvaluation.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/AddEvaluation.vue
@@ -11,7 +11,7 @@
       </div>
 
       <div>
-         <form-evaluation ref="FormEvaluation" :key="evaluation.key" :evaluation="evaluation"></form-evaluation>
+         <form-evaluation ref="FormEvaluation" :key="evaluation.key" :evaluation="evaluation" :docId="docId"></form-evaluation>
 
         <ul class="record_actions">
            <li v-if="evaluation.workflows_availables.length > 0">
@@ -85,7 +85,7 @@ export default {
       Modal,
       ListWorkflowModal,
    },
-   props: ['evaluation'],
+   props: ['evaluation', 'docId'],
    i18n,
    data() {
       return {
@@ -95,6 +95,9 @@ export default {
          }
       };
    },
+/*   mounted() {
+      console.log('docId is here', this.docId)
+   },*/
    computed: {
       pickedEvaluations() {
          return this.$store.state.evaluationsPicked;
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 7dcb595a3..ff7597dec 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue
@@ -80,7 +80,7 @@
 
        <div class="flex-table">
          <div class="item-bloc" v-for="(d, i) in evaluation.documents" :key="d.id">
-           <div class="item-row">
+           <div :id="`document_${d.id}`" class="item-row" :class="[parseInt(this.docId) === d.id ? 'bg-blink' : 'nothing']">
             <div class="input-group input-group-lg mb-3 row">
                   <label class="col-sm-3 col-form-label">Titre du document:</label>
                   <div class="col-sm-9">
@@ -92,7 +92,7 @@
                         :data-key="i"
                         @input="onInputDocumentTitle"/>
                 </div>
-               </div>
+           </div>
            </div>
            <div class="item-row">
                <div class="item-col item-meta">
@@ -221,7 +221,7 @@ const i18n = {
 
 export default {
    name: "FormEvaluation",
-   props: ['evaluation'],
+   props: ['evaluation', 'docId'],
    components: {
       ckeditor: CKEditor.component,
       PickTemplate,
@@ -402,4 +402,18 @@ export default {
    ul.document-upload {
       justify-content: flex-start;
    }
+
+   .bg-blink{
+     color: #050000;
+     padding: 10px;
+     display: inline-block;
+     border-radius: 5px;
+     animation: blinkingBackground 2.2s infinite;
+     animation-iteration-count: 3;
+   }
+   @keyframes blinkingBackground{
+     0%		{ background-color: #fa8888;}
+     50%		{ background-color: #ffffff;}
+     100%	  { background-color: #fa8888;}
+   }
 </style>
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Workflow/_evaluation_document.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Workflow/_evaluation_document.html.twig
index 691a903ab..112d4089d 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Workflow/_evaluation_document.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Workflow/_evaluation_document.html.twig
@@ -123,7 +123,7 @@
         <ul class="record_actions">
             <li>{{ doc.storedObject|chill_document_button_group(doc.title, is_granted('CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_UPDATE', evaluation.accompanyingPeriodWork)) }}</li>
             <li>
-                <a class="btn btn-show" href="{{ path('chill_person_accompanying_period_work_edit', {'id': evaluation.accompanyingPeriodWork.id}) }}">
+                <a class="btn btn-show" href="{{ path('chill_person_accompanying_period_work_edit', {'id': evaluation.accompanyingPeriodWork.id, 'doc_id': doc.id}) }}">
                     {{ 'Show'|trans }}
                 </a>
             </li>

From ed556d9ee8dd52bd6d076fee7e26b9818b2f3f0e Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Wed, 31 May 2023 09:47:48 +0200
Subject: [PATCH 2/3] FIX [review] process review and make minor visual changes

---
 .../public/vuejs/AccompanyingCourseWorkEdit/App.vue  | 12 ++++++------
 .../components/AddEvaluation.vue                     |  7 ++-----
 .../components/FormEvaluation.vue                    | 12 +++++++-----
 3 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
index adbcf1097..1c9c2fd6d 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
@@ -123,7 +123,7 @@
             v-for="e in pickedEvaluations"
             v-bind:key="e.key"
             v-bind:evaluation="e"
-            v-bind:docId="this.docId">
+            v-bind:docAnchorId="this.docAnchorId">
          </add-evaluation>
 
          <!-- box to add new evaluation -->
@@ -390,7 +390,7 @@ export default {
    i18n,
    data() {
       return {
-         docId: null,
+         docAnchorId: null,
          isExpanded: false,
          editor: ClassicEditor,
          showAddObjective: false,
@@ -432,10 +432,10 @@ export default {
    },
    beforeMount() {
        const urlParams = new URLSearchParams(window.location.search);
-       this.docId = urlParams.get('doc_id');
+       this.docAnchorId = urlParams.get('doc_id');
    },
    mounted() {
-     this.scrollToElement(this.docId);
+     this.scrollToElement(this.docAnchorId);
    },
   computed: {
       ...mapState([
@@ -591,8 +591,8 @@ export default {
                }
             })
       },
-      scrollToElement(docId) {
-         const documentEl = document.getElementById(`document_${docId}`);
+      scrollToElement(docAnchorId) {
+         const documentEl = document.getElementById(`document_${docAnchorId}`);
          if (documentEl) {
            documentEl.scrollIntoView({behavior: 'smooth'});
          }
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/AddEvaluation.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/AddEvaluation.vue
index 215c5d6cc..baa3fa798 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/AddEvaluation.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/AddEvaluation.vue
@@ -11,7 +11,7 @@
       </div>
 
       <div>
-         <form-evaluation ref="FormEvaluation" :key="evaluation.key" :evaluation="evaluation" :docId="docId"></form-evaluation>
+         <form-evaluation ref="FormEvaluation" :key="evaluation.key" :evaluation="evaluation" :docAnchorId="docAnchorId"></form-evaluation>
 
         <ul class="record_actions">
            <li v-if="evaluation.workflows_availables.length > 0">
@@ -85,7 +85,7 @@ export default {
       Modal,
       ListWorkflowModal,
    },
-   props: ['evaluation', 'docId'],
+   props: ['evaluation', 'docAnchorId'],
    i18n,
    data() {
       return {
@@ -95,9 +95,6 @@ export default {
          }
       };
    },
-/*   mounted() {
-      console.log('docId is here', this.docId)
-   },*/
    computed: {
       pickedEvaluations() {
          return this.$store.state.evaluationsPicked;
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 ff7597dec..10bac43b3 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue
@@ -80,12 +80,13 @@
 
        <div class="flex-table">
          <div class="item-bloc" v-for="(d, i) in evaluation.documents" :key="d.id">
-           <div :id="`document_${d.id}`" class="item-row" :class="[parseInt(this.docId) === d.id ? 'bg-blink' : 'nothing']">
+           <div :id="`document_${d.id}`" class="item-row">
             <div class="input-group input-group-lg mb-3 row">
                   <label class="col-sm-3 col-form-label">Titre du document:</label>
                   <div class="col-sm-9">
                     <input
                         class="form-control document-title"
+                        :class="[parseInt(this.docAnchorId) === d.id ? 'bg-blink' : 'nothing']"
                         type="text"
                         :value="d.title"
                         :id="d.id"
@@ -221,7 +222,7 @@ const i18n = {
 
 export default {
    name: "FormEvaluation",
-   props: ['evaluation', 'docId'],
+   props: ['evaluation', 'docAnchorId'],
    components: {
       ckeditor: CKEditor.component,
       PickTemplate,
@@ -409,11 +410,12 @@ export default {
      display: inline-block;
      border-radius: 5px;
      animation: blinkingBackground 2.2s infinite;
-     animation-iteration-count: 3;
+     animation-iteration-count: 2;
    }
+
    @keyframes blinkingBackground{
-     0%		{ background-color: #fa8888;}
+     0%		{ background-color: #ed776d;}
      50%		{ background-color: #ffffff;}
-     100%	  { background-color: #fa8888;}
+     100%	  { background-color: #ed776d;}
    }
 </style>

From c683123ecaf9efb4b65ad6a616115eea7796f151 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Tue, 13 Jun 2023 15:47:06 +0200
Subject: [PATCH 3/3] set blinking animation on item-row, not just on the input

---
 .../AccompanyingCourseWorkEdit/components/FormEvaluation.vue   | 3 +--
 1 file changed, 1 insertion(+), 2 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 10bac43b3..3788c3454 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue
@@ -79,14 +79,13 @@
        <h5>{{ $t('Documents') }} :</h5>
 
        <div class="flex-table">
-         <div class="item-bloc" v-for="(d, i) in evaluation.documents" :key="d.id">
+         <div class="item-bloc" v-for="(d, i) in evaluation.documents" :key="d.id" :class="[parseInt(this.docAnchorId) === d.id ? 'bg-blink' : 'nothing']">
            <div :id="`document_${d.id}`" class="item-row">
             <div class="input-group input-group-lg mb-3 row">
                   <label class="col-sm-3 col-form-label">Titre du document:</label>
                   <div class="col-sm-9">
                     <input
                         class="form-control document-title"
-                        :class="[parseInt(this.docAnchorId) === d.id ? 'bg-blink' : 'nothing']"
                         type="text"
                         :value="d.title"
                         :id="d.id"