Merge remote-tracking branch 'origin/master' into user_absences

2025-08-23 08:03:49 +00:00 · 2023-03-01 14:59:43 +01:00
parent 5bfd2aefe6 813adc70f4
commit f1ebc089c3
144 changed files with 3999 additions and 785 deletions
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/AdminLocation.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/AdminLocation.vue
@@ -34,7 +34,7 @@

 <script>
 import VueMultiselect from 'vue-multiselect';
-import { makeFetch } from 'ChillMainAssets/lib/api/apiMethods';
+import { fetchResults } from 'ChillMainAssets/lib/api/apiMethods';
 import { mapState, mapGetters } from 'vuex';

 export default {
@@ -58,23 +58,17 @@ export default {
   },
   methods: {
      getOptions() {
-         const url = `/api/1.0/main/location.json`;
-         makeFetch('GET', url)
+         fetchResults(`/api/1.0/main/location.json`)
            .then(response => {
-               let options = response.results;
-               let uniqueLocationTypeId = [...new Set(options.map(o => o.locationType.id))];
+               let uniqueLocationTypeId = [...new Set(response.map(o => o.locationType.id))];
               let results = [];
               for (let id of uniqueLocationTypeId) {
                  results.push({
-                    locationCategories: options.filter(o => o.locationType.id === id)[0].locationType.title.fr,
-                    locations: options.filter(o => o.locationType.id === id)
+                    locationCategories: response.filter(o => o.locationType.id === id)[0].locationType.title.fr,
+                    locations: response.filter(o => o.locationType.id === id)
                  })
               }
               this.options = results;
-               return response;
-            })
-            .catch((error) => {
-               this.$toast.open({message: error.txt})
            })
      },
      updateAdminLocation(value) {
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue
@@ -111,14 +111,13 @@
                     </add-async-upload>
                   </li>
                   <li>
-                     <add-async-upload-downloader
-                        :buttonTitle="$t('download')"
-                        :storedObject="d.storedObject"
-                     >
-                     </add-async-upload-downloader>
-                   </li>
-                   <li v-if="canEditDocument(d)">
-                     <a :href="buildEditLink(d.storedObject)" class="btn btn-wopilink"></a>
+                     <document-action-buttons-group
+                         :stored-object="d.storedObject"
+                         :filename="d.title"
+                         :can-edit="true"
+                         :execute-before-leave="submitBeforeLeaveToEditor"
+                         @on-stored-object-status-change="onStatusDocumentChanged"
+                     ></document-action-buttons-group>
                   </li>
                   <li v-if="d.workflows.length === 0">
                     <a class="btn btn-delete" @click="removeDocument(d)">
@@ -174,6 +173,7 @@ import AddAsyncUpload from 'ChillDocStoreAssets/vuejs/_components/AddAsyncUpload
 import AddAsyncUploadDownloader from 'ChillDocStoreAssets/vuejs/_components/AddAsyncUploadDownloader.vue';
 import ListWorkflowModal from 'ChillMainAssets/vuejs/_components/EntityWorkflow/ListWorkflowModal.vue';
 import {buildLinkCreate} from 'ChillMainAssets/lib/entity-workflow/api.js';
+import DocumentActionButtonsGroup from "ChillDocStoreAssets/vuejs/DocumentActionButtonsGroup.vue";

 const i18n = {
   messages: {
@@ -212,6 +212,7 @@ export default {
      AddAsyncUpload,
      AddAsyncUploadDownloader,
      ListWorkflowModal,
+      DocumentActionButtonsGroup,
   },
   i18n,
   data() {
@@ -223,78 +224,6 @@ export default {
            maxPostSize: 15000000,
            required: false,
         },
-         mime: [
-            // TODO temporary hardcoded. to be replaced by twig extension or a collabora server query
-            'application/clarisworks',
-            'application/coreldraw',
-            'application/macwriteii',
-            'application/msword',
-            'application/vnd.lotus-1-2-3',
-            'application/vnd.ms-excel',
-            'application/vnd.ms-excel.sheet.binary.macroEnabled.12',
-            'application/vnd.ms-excel.sheet.macroEnabled.12',
-            'application/vnd.ms-excel.template.macroEnabled.12',
-            'application/vnd.ms-powerpoint',
-            'application/vnd.ms-powerpoint.presentation.macroEnabled.12',
-            'application/vnd.ms-powerpoint.template.macroEnabled.12',
-            'application/vnd.ms-visio.drawing',
-            'application/vnd.ms-word.document.macroEnabled.12',
-            'application/vnd.ms-word.template.macroEnabled.12',
-            'application/vnd.ms-works',
-            'application/vnd.oasis.opendocument.chart',
-            'application/vnd.oasis.opendocument.formula',
-            'application/vnd.oasis.opendocument.graphics',
-            'application/vnd.oasis.opendocument.graphics-flat-xml',
-            'application/vnd.oasis.opendocument.graphics-template',
-            'application/vnd.oasis.opendocument.presentation',
-            'application/vnd.oasis.opendocument.presentation-flat-xml',
-            'application/vnd.oasis.opendocument.presentation-template',
-            'application/vnd.oasis.opendocument.spreadsheet',
-            'application/vnd.oasis.opendocument.spreadsheet-flat-xml',
-            'application/vnd.oasis.opendocument.spreadsheet-template',
-            'application/vnd.oasis.opendocument.text',
-            'application/vnd.oasis.opendocument.text-flat-xml',
-            'application/vnd.oasis.opendocument.text-master',
-            'application/vnd.oasis.opendocument.text-master-template',
-            'application/vnd.oasis.opendocument.text-template',
-            'application/vnd.oasis.opendocument.text-web',
-            'application/vnd.openxmlformats-officedocument.presentationml.presentation',
-            'application/vnd.openxmlformats-officedocument.presentationml.slideshow',
-            'application/vnd.openxmlformats-officedocument.presentationml.template',
-            'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
-            'application/vnd.openxmlformats-officedocument.spreadsheetml.template',
-            'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
-            'application/vnd.openxmlformats-officedocument.wordprocessingml.template',
-            'application/vnd.sun.xml.calc',
-            'application/vnd.sun.xml.calc.template',
-            'application/vnd.sun.xml.chart',
-            'application/vnd.sun.xml.draw',
-            'application/vnd.sun.xml.draw.template',
-            'application/vnd.sun.xml.impress',
-            'application/vnd.sun.xml.impress.template',
-            'application/vnd.sun.xml.math',
-            'application/vnd.sun.xml.writer',
-            'application/vnd.sun.xml.writer.global',
-            'application/vnd.sun.xml.writer.template',
-            'application/vnd.visio',
-            'application/vnd.visio2013',
-            'application/vnd.wordperfect',
-            'application/x-abiword',
-            'application/x-aportisdoc',
-            'application/x-dbase',
-            'application/x-dif-document',
-            'application/x-fictionbook+xml',
-            'application/x-gnumeric',
-            'application/x-hwp',
-            'application/x-iwork-keynote-sffkey',
-            'application/x-iwork-numbers-sffnumbers',
-            'application/x-iwork-pages-sffpages',
-            'application/x-mspublisher',
-            'application/x-mswrite',
-            'application/x-pagemaker',
-            'application/x-sony-bbeb',
-            'application/x-t602',
-         ]
      }
   },
   computed: {
@@ -343,10 +272,6 @@ export default {
   },
   methods: {
      ISOToDatetime,
-      canEditDocument(document) {
-         return 'storedObject' in document ?
-            this.mime.includes(document.storedObject.type) : false;
-      },
      listAllStatus() {
         console.log('load all status');
         let url = `/api/`;
@@ -359,10 +284,25 @@ export default {
         })
         ;
      },
-      buildEditLink(storedObject) {
-         return `/chill/wopi/edit/${storedObject.uuid}?returnPath=` + encodeURIComponent(
+      buildEditLink(document) {
+         return `/chill/wopi/edit/${document.storedObject.uuid}?returnPath=` + encodeURIComponent(
            window.location.pathname + window.location.search + window.location.hash);
      },
+      submitBeforeLeaveToEditor() {
+        console.log('submit beore edit 2');
+        // empty callback
+        const callback = () => null;
+        return this.$store.dispatch('submit', callback).catch(e => { console.log(e); throw e; });
+      },
+     submitBeforeEdit(storedObject) {
+         const callback = (data) => {
+            let evaluation = data.accompanyingPeriodWorkEvaluations.find(e => e.key === this.evaluation.key);
+            let document = evaluation.documents.find(d => d.storedObject.id === storedObject.id);
+            //console.log('=> document', document);
+            window.location.assign(this.buildEditLink(document));
+         };
+         return this.$store.dispatch('submit', callback).catch(e => { console.log(e); throw e; });
+      },
      submitBeforeGenerate({template}) {
         const callback = (data) => {
            let evaluationId = data.accompanyingPeriodWorkEvaluations.find(e => e.key === this.evaluation.key).id;
@@ -399,6 +339,10 @@ export default {
            this.$store.commit('removeDocument', {key: this.evaluation.key, document: document});
         }
      },
+      onStatusDocumentChanged(newStatus) {
+        console.log('onStatusDocumentChanged', newStatus);
+        this.$store.commit('statusDocumentChanged', {key: this.evaluation.key, newStatus: newStatus});
+      },
      goToGenerateWorkflowEvaluationDocument({event, link, workflowName, payload}) {
         const callback = (data) => {
            let evaluation = data.accompanyingPeriodWorkEvaluations.find(e => e.key === this.evaluation.key);
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/store.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/store.js
@@ -360,7 +360,22 @@ const store = createStore({
        state.evaluationsPicked.find(e => e.key === payload.evaluationKey)
          .documents.find(d => d.id === payload.id).title = payload.title;
      }
-    }
+    },
+    statusDocumentChanged(state, {newStatus, key}) {
+      const e = state.evaluationsPicked.find(e => e.key === key);
+      if (typeof e === 'undefined') {
+        console.error('evaluation not found for given key', {key});
+      }
+
+      const doc = e.documents.find(d => d.storedObject?.id === newStatus.id);
+      if (typeof doc === 'undefined') {
+        console.error('document not found', {newStatus});
+      }
+
+      doc.storedObject.status = newStatus.status;
+      doc.storedObject.type = newStatus.type;
+      doc.storedObject.filename = newStatus.filename;
+    },
  },
  actions: {
    updateThirdParty({ commit }, payload) {
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_objectifs_results_evaluations.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_objectifs_results_evaluations.html.twig
@@ -142,7 +142,7 @@
                                            {{ mm.mimeIcon(d.storedObject.type) }}
                                        </div>
                                        <div class="col col-lg-4 text-end">
-                                            {{ m.download_button_small(d.storedObject, d.title) }}
+                                            {{ d.storedObject|chill_document_button_group(d.title, is_granted('CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_UPDATE', w), {'small': true}) }}
                                        </div>
                                    </div>
                                {% endfor %}
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/show.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/show.html.twig
@@ -6,20 +6,20 @@

 {% block css %}
    {{ parent() }}
-    {{ encore_entry_link_tags('mod_async_upload') }}
    {{ encore_entry_link_tags('mod_entity_workflow_pick') }}
+    {{ encore_entry_link_tags('mod_document_action_buttons_group') }}
 {% endblock %}

 {% block js %}
    {{ parent() }}
-    {{ encore_entry_script_tags('mod_async_upload') }}
    {{ encore_entry_script_tags('mod_entity_workflow_pick') }}
+    {{ encore_entry_script_tags('mod_document_action_buttons_group') }}
 {% endblock %}

 {% block content %}
    <div class="accompanying-course-work">
        <h1>{{ block('title') }}</h1>
-    
+
        <div class="flex-table mt-4">
            {% include '@ChillPerson/AccompanyingCourseWork/_item.html.twig' with {
                'w': work,
@@ -29,7 +29,7 @@
            } %}
            <div class="p-3 mt-3">{{ macro.metadata(work) }}</div>
        </div>
-    
+
        <ul class="record_actions sticky-form-buttons">
            <li class="cancel">
                <a href="{{ path('chill_person_accompanying_period_work_list', { 'id': accompanyingCourse.id }) }}"
@@ -51,7 +51,7 @@
                </li>
            {% endif %}
        </ul>
-        
+
    </div>
 {% endblock %}

--- a/src/Bundle/ChillPersonBundle/Resources/views/Person/edit.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Person/edit.html.twig
@@ -63,6 +63,41 @@
        {%- endif -%}
    </fieldset>

+    {%- if form.email is defined or form.phonenumber is defined or form.mobilenumber is defined or form.contactInfo is defined-%}
+        <fieldset>
+            <legend><h2>{{ 'Contact information'|trans }}</h2></legend>
+            {%- if form.email is defined -%}
+                <div id="personEmail">
+                    {{ form_row(form.email, {'label': 'Email'}) }}
+                </div>
+            {% endif %}
+            {%- if form.acceptEmail is defined -%}
+                <div id="personAcceptEmail">
+                    {{ form_row(form.acceptEmail, {'label' : 'Accept emails ?'}) }}
+                </div>
+            {%- endif -%}
+
+            {%- if form.phonenumber is defined -%}
+                {{ form_row(form.phonenumber, {'label': 'Phonenumber'}) }}
+            {%- endif -%}
+            {%- if form.mobilenumber is defined -%}
+                <div id="personPhoneNumber">
+                    {{ form_row(form.mobilenumber, {'label': 'Mobilenumber'}) }}
+                </div>
+                <div id="personAcceptSMS">
+                    {{ form_row(form.acceptSMS, {'label' : 'Accept short text message ?'}) }}
+                </div>
+            {%- endif -%}
+            {%- if form.otherPhoneNumbers is defined -%}
+                {{ form_widget(form.otherPhoneNumbers) }}
+                {{ form_errors(form.otherPhoneNumbers) }}
+            {%- endif -%}
+            {%- if form.contactInfo is defined -%}
+                {{ form_row(form.contactInfo, {'label': 'Notes on contact information'}) }}
+            {%- endif -%}
+        </fieldset>
+    {%- endif -%}
+
    {%- if form.nationality is defined or form.spokenLanguages is defined -%}
    <fieldset>
        <legend><h2>{{ 'Administrative information'|trans }}</h2></legend>
@@ -93,41 +128,6 @@
    </fieldset>
    {%- endif -%}

-    {%- if form.email is defined or form.phonenumber is defined or form.mobilenumber is defined or form.contactInfo is defined-%}
-    <fieldset>
-        <legend><h2>{{ 'Contact information'|trans }}</h2></legend>
-        {%- if form.email is defined -%}
-            <div id="personEmail">
-                {{ form_row(form.email, {'label': 'Email'}) }}
-            </div>
-        {% endif %}
-        {%- if form.acceptEmail is defined -%}
-            <div id="personAcceptEmail">
-                {{ form_row(form.acceptEmail, {'label' : 'Accept emails ?'}) }}
-            </div>
-        {%- endif -%}
-
-        {%- if form.phonenumber is defined -%}
-            {{ form_row(form.phonenumber, {'label': 'Phonenumber'}) }}
-        {%- endif -%}
-        {%- if form.mobilenumber is defined -%}
-            <div id="personPhoneNumber">
-                {{ form_row(form.mobilenumber, {'label': 'Mobilenumber'}) }}
-            </div>
-            <div id="personAcceptSMS">
-                {{ form_row(form.acceptSMS, {'label' : 'Accept short text message ?'}) }}
-            </div>
-        {%- endif -%}
-        {%- if form.otherPhoneNumbers is defined -%}
-            {{ form_widget(form.otherPhoneNumbers) }}
-            {{ form_errors(form.otherPhoneNumbers) }}
-        {%- endif -%}
-        {%- if form.contactInfo is defined -%}
-            {{ form_row(form.contactInfo, {'label': 'Notes on contact information'}) }}
-        {%- endif -%}
-    </fieldset>
-    {%- endif -%}
-
    {{ form_rest(form) }}

    <ul class="record_actions sticky-form-buttons">
--- a/src/Bundle/ChillPersonBundle/Resources/views/Workflow/_evaluation_document.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Workflow/_evaluation_document.html.twig
@@ -120,20 +120,13 @@
    </div>

    {% if display_action is defined and display_action == true %}
-        {% if is_granted('CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_UPDATE', evaluation.accompanyingPeriodWork) %}
        <ul class="record_actions">
-            <li>{{ m.download_button(doc.storedObject, doc.title) }}</li>
-            {% if chill_document_is_editable(doc.storedObject) %}
-                <li>
-                    {{ doc.storedObject|chill_document_edit_button }}
-                </li>
-            {% endif %}
+            <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}) }}">
                    {{ 'Show'|trans }}
                </a>
            </li>
        </ul>
-        {% endif %}
    {% endif %}
 {% endif %}
--- a/src/Bundle/ChillPersonBundle/Resources/views/menu.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/menu.html.twig
@@ -17,9 +17,13 @@

 <div class="list-group vertical-menu {{ 'menu-' ~ menus.name }}">
    {% for menu in menus %}
-        <a class="list-group-item list-group-item-action"
+
+        <a class="list-group-item list-group-item-action d-flex justify-content-between align-items-center"
            href="{{ menu.uri }}">
            {{ menu.label|upper }}
+            {% if menu.extras.counter is defined and menu.extras.counter is not null %}
+                <span class="badge rounded-pill bg-secondary notification-counter">{{ menu.extras.counter }}</span>
+            {% endif %}
        </a>
    {% endfor %}
 </div>