Merge remote-tracking branch 'origin/master' into 709-notification-eval-action

2025-08-20 14:43:49 +00:00 · 2023-06-13 23:05:51 +02:00
parent d815b44280 21f0f70350
commit 7349be94c8
60 changed files with 1859 additions and 170 deletions
--- 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:docAnchorId="this.docAnchorId">
         </add-evaluation>

         <!-- box to add new evaluation -->
@@ -406,6 +407,7 @@ export default {
   i18n,
   data() {
      return {
+         docAnchorId: null,
         isExpanded: false,
         editor: ClassicEditor,
         showAddObjective: false,
@@ -445,7 +447,14 @@ export default {
         },
      };
   },
-   computed: {
+   beforeMount() {
+       const urlParams = new URLSearchParams(window.location.search);
+       this.docAnchorId = urlParams.get('doc_id');
+   },
+   mounted() {
+     this.scrollToElement(this.docAnchorId);
+   },
+  computed: {
      ...mapState([
         'work',
         'resultsForAction',
@@ -594,7 +603,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;
@@ -616,6 +625,12 @@ export default {
                     this.$toast.open({message: 'An error occurred'});
               }
            })
+      },
+      scrollToElement(docAnchorId) {
+         const documentEl = document.getElementById(`document_${docAnchorId}`);
+         if (documentEl) {
+           documentEl.scrollIntoView({behavior: 'smooth'});
+         }
      }
   }
 };
--- 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" :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'],
+   props: ['evaluation', 'docAnchorId'],
   i18n,
   data() {
      return {
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue
@@ -79,8 +79,8 @@
       <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-row">
+         <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">
@@ -92,7 +92,7 @@
                        :data-key="i"
                        @input="onInputDocumentTitle"/>
                </div>
-               </div>
+           </div>
           </div>
           <div class="item-row">
               <div class="item-col item-meta">
@@ -238,7 +238,7 @@ const i18n = {

 export default {
   name: "FormEvaluation",
-   props: ['evaluation'],
+   props: ['evaluation', 'docAnchorId'],
   components: {
      ckeditor: CKEditor.component,
      PickTemplate,
@@ -437,4 +437,19 @@ 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: 2;
+   }
+
+   @keyframes blinkingBackground{
+     0%		{ background-color: #ed776d;}
+     50%		{ background-color: #ffffff;}
+     100%	  { background-color: #ed776d;}
+   }
 </style>
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue
@@ -207,7 +207,7 @@
 </template>

 <script>
-import {dateToISO} from 'ChillMainAssets/chill/js/date';
+import {dateToISO, ISOToDate} from 'ChillMainAssets/chill/js/date';
 import AddressRenderBox from 'ChillMainAssets/vuejs/_components/Entity/AddressRenderBox.vue';
 import Confidential from 'ChillMainAssets/vuejs/_components/Confidential.vue';
 import BadgeEntity from 'ChillMainAssets/vuejs/_components/BadgeEntity.vue';
@@ -262,7 +262,7 @@ export default {
    },
    birthdate: function () {
      if (this.person.birthdate !== null || this.person.birthdate === "undefined") {
-        return new Date(this.person.birthdate.datetime);
+        return ISOToDate(this.person.birthdate.datetime);
      } else {
        return "";
      }
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/_list_item.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/_list_item.html.twig
@@ -16,11 +16,13 @@
                </div>
                <div class="wh-col">
                    {% if period.step == 'DRAFT' %}
-                        <span class="badge bg-secondary">{{- 'Draft'|trans|upper -}}</span>
-                    {% elseif period.step == 'CONFIRMED' %}
-                        <span class="badge bg-primary">{{- 'Confirmed'|trans|upper -}}</span>
-                    {% else %}
-                        <span class="badge bg-danger">{{- 'Closed'|trans|upper -}}</span>
+                        <span class="badge bg-secondary" style="font-size: 85%;" title="{{ 'course.draft'|trans|e('html_attr') }}">{{ 'course.draft'|trans }}</span>
+                    {% elseif period.step == 'CLOSED' %}
+                        <span class="badge bg-danger" style="font-size: 85%;" title="{{ 'course.closed'|trans|e('html_attr') }}">{{ 'course.closed'|trans }}</span>
+                    {% elseif period.step == 'CONFIRMED_INACTIVE_SHORT' %}
+                        <span class="badge bg-chill-yellow text-primary" style="font-size: 85%;" title="{{ 'course.inactive_short'|trans|e('html_attr') }}">{{ 'course.inactive_short'|trans }}</span>
+                    {% elseif period.step == 'CONFIRMED_INACTIVE_LONG' %}
+                        <span class="badge bg-danger" style="font-size: 85%;" title="{{ 'course.inactive_long'|trans|e('html_attr') }}">{{ 'course.inactive_long'|trans }}</span>
                    {% endif %}
                </div>
            </div>
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/user_periods_list.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/user_periods_list.html.twig
@@ -17,6 +17,15 @@
    <div class="col-md-10">
        <h1>{{ 'My accompanying periods'|trans }}</h1>

+        <ul class="nav nav-pills justify-content-center">
+            <li class="nav-item">
+                <a class="nav-link {% if active == true %}active{% endif %}" aria-current="page" href="{{ chill_path_forward_return_path('chill_person_accompanying_period_user', {'active': true}) }}">{{ ['Confirmed'|trans, 'course.inactive_short'|trans, 'course.inactive_long'|trans]|join(', ') }}</a>
+            </li>
+            <li class="nav-item ">
+                <a class="nav-link {% if active == false %}active{% endif %}" href="{{ chill_path_forward_return_path('chill_person_accompanying_period_user', {'active': false}) }}">{{ 'course.closed'|trans }}</a>
+            </li>
+        </ul>
+
        <p>{{ 'Number of periods'|trans }}: <span class="badge rounded-pill bg-primary">{{ pagination.totalItems }}</span></p>

        <div class="flex-table accompanyingcourse-list">
--- a/src/Bundle/ChillPersonBundle/Resources/views/Household/accompanying_period.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/accompanying_period.html.twig
@@ -40,13 +40,14 @@
                {{ 'Household summary'|trans }}
            </a>
        </li>
-        {# TODO: add ACL to check if user is allowed to edit household? #}
-        <li>
-            <a class="btn btn-create"
-                href="{{ path ('chill_household_accompanying_course_new', {'household_id' : household.id } ) }}" role="button">
-                {{ 'Create an accompanying period'|trans }}
-            </a>
-        </li>
+        {% if is_granted('CHILL_PERSON_HOUSEHOLD_EDIT', household) %}
+            <li>
+                <a class="btn btn-create"
+                    href="{{ path ('chill_household_accompanying_course_new', {'household_id' : household.id } ) }}" role="button">
+                    {{ 'Create an accompanying period'|trans }}
+                </a>
+            </li>
+        {% endif %}
    </ul>

 </div>
--- a/src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/_sidepane.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/_sidepane.html.twig
@@ -39,7 +39,7 @@
    <li><b>{{ person.counters.nb_activity }}</b> {{ (person.counters.nb_activity > 1)? 'échanges' : 'échange' }}</li>
    <li><b>{{ person.counters.nb_task }}</b> {{ (person.counters.nb_task > 1)? 'tâches' : 'tâche' }}</li>
    <li><b>{{ person.counters.nb_document }}</b> {{ (person.counters.nb_document > 1)? 'documents' : 'document' }}</li>
-    <li><b>{{ person.counters.nb_event }}</b> {{ (person.counters.nb_event > 1)? 'événements' : 'événement' }}</li>
+{#    <li><b>{{ person.counters.nb_event }}</b> {{ (person.counters.nb_event > 1)? 'événements' : 'événement' }}</li>#}
    <li><b>{{ person.counters.nb_addresses }}</b> {{ (person.counters.nb_addresses > 1)? 'adresses' : 'adresse' }}</li>

 </ul>
--- a/src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/confirm.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/confirm.html.twig
@@ -25,7 +25,7 @@

    <h1>{{ 'Merge duplicate persons folders'|trans }}</h1>

-    <div class="col-md-6">
+    <div class="col-md-11">
        <p><b>{{ 'Old person'|trans }}</b>:
            {{ 'Old person explain'|trans }}
        </p>
@@ -43,7 +43,7 @@
        </div>
    </div>

-    <div class="col-md-6">
+    <div class="col-md-11">
        <p><b>{{ 'New person'|trans }}</b>:
            {{ 'New person explain'|trans }}
        </p>
@@ -63,10 +63,10 @@

    {{ form_start(form) }}

-    <div class="col-md-4 centered">
+    <div class="col-md-12 centered">

        <div class="container-fluid" style="padding-top: 1em;">
-            <div class="col-1 clear" style="padding-top: 10px;">
+            <div class="clear" style="padding-top: 10px;">
                {{ form_widget(form.confirm) }}
            </div>
            <div class="col-11">
--- 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>