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

src/Bundle/ChillMainBundle/Resources/public/module/pick-entity/index.js

@@ -17,7 +17,12 @@ function loadDynamicPicker(element) {
             isMultiple = parseInt(el.dataset.multiple) === 1,
             uniqId = el.dataset.uniqid,
             input = element.querySelector('[data-input-uniqid="'+ el.dataset.uniqid +'"]'),
-            picked = (isMultiple) ? (JSON.parse(input.value)) : ((input.value === '[]') ? (null) : ([JSON.parse(input.value)]));
+            picked = isMultiple ?
+                JSON.parse(input.value) : (
+                    (input.value === '[]' || input.value === '') ?
+                        null : [ JSON.parse(input.value) ]
+                )
+        ;
 
         if (!isMultiple) {
             if (input.value === '[]'){

src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyAccompanyingCourses.vue

@@ -32,7 +32,7 @@
                </span>
             </td>
             <td>
-               <span v-if="c.emergency" class="badge rounded-pill bg-danger">{{ $t('emergency') }}</span>
+               <span v-if="c.emergency" class="badge rounded-pill bg-danger me-1">{{ $t('emergency') }}</span>
                <span v-if="c.confidential" class="badge rounded-pill bg-danger">{{ $t('confidential') }}</span>
             </td>
             <td>
@@ -80,5 +80,7 @@ export default {
 </script>
 
 <style scoped>
-
+span.badge.rounded-pill.bg-danger {
+   text-transform: uppercase;
+}
 </style>

src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/js/i18n.js

@@ -50,7 +50,9 @@ const appMessages = {
             assignated_evaluations: "{n} évaluation assignée | {n} évaluations assignées",
             alert_tasks: "{n} tâche en rappel | {n} tâches en rappel",
             warning_tasks: "{n} tâche à échéance | {n} tâches à échéance",
-        }
+        },
+        emergency: "Urgent",
+        confidential: "Confidentiel",
     }
 };
 

src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/OnTheFly.vue

@@ -90,7 +90,7 @@ export default {
       OnTheFlyThirdparty,
       OnTheFlyCreate
    },
-   props: ['type', 'id', 'action', 'buttonText', 'displayBadge', 'isDead', 'parent', 'canCloseModal'],
+   props: ['type', 'id', 'action', 'buttonText', 'displayBadge', 'isDead', 'parent'],
    emits: ['saveFormOnTheFly'],
    data() {
       return {
@@ -160,17 +160,10 @@ export default {
       },
       badgeType() {
          return 'entity-' + this.type + ' badge-' + this.type;
-      }
-   },
-   watch: {
-      canCloseModal: {
-         handler: function(val, oldVal) {
-            if (val) {
-               this.closeModal();
-            }
-         },
-         deep: true
-      }
+      },
+      getReturnPath() {
+         return `?returnPath=${window.location.pathname}${window.location.search}${window.location.hash}`;
+      },
    },
    methods: {
       closeModal() {
@@ -217,9 +210,9 @@ export default {
       buildLocation(id, type) {
          if (type === 'person') {
             // TODO i18n
-            return `/fr/person/${id}/general`;
+            return encodeURI(`/fr/person/${id}/general${this.getReturnPath}`);
          } else if (type === 'thirdparty') {
-            return `/fr/3party/3party/${id}/view`;
+            return encodeURI(`/fr/3party/3party/${id}/view${this.getReturnPath}`);
          }
       }
    }

src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/i18n.js

@@ -1,4 +1,7 @@
 import { personMessages } from 'ChillPersonAssets/vuejs/_js/i18n';
+import { thirdpartyMessages } from 'ChillThirdPartyAssets/vuejs/_js/i18n';
+import { addressMessages } from 'ChillMainAssets/vuejs/Address/i18n';
+import { ontheflyMessages } from 'ChillMainAssets/vuejs/OnTheFly/i18n';
 
 const appMessages = {
     fr: {
@@ -12,6 +15,6 @@ const appMessages = {
     }
 }
 
-Object.assign(appMessages.fr, personMessages.fr);
+Object.assign(appMessages.fr, personMessages.fr, thirdpartyMessages.fr, addressMessages.fr, ontheflyMessages.fr );
 
 export { appMessages };

src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Entity/AddressRenderBox.vue

@@ -42,57 +42,11 @@
                   class="street">
                   {{ address.text }}
                </p>
-               <p v-if="address.postcode"
-                  class="postcode">
-                  {{ address.postcode.code }} {{ address.postcode.name }}
-               </p>
-               <p v-if="address.country"
-                  class="country">
-                  {{ address.country.name.fr }}
-               </p>
             </div>
          </div>
 
       </component>
 
-      <!-- <div v-if="isMultiline === true" class="address-more">
-         <div v-if="address.floor">
-            <span class="floor">
-               <b>{{ $t('floor') }}</b>: {{ address.floor }}
-            </span>
-         </div>
-         <div v-if="address.corridor">
-            <span class="corridor">
-               <b>{{ $t('corridor') }}</b>: {{ address.corridor }}
-            </span>
-         </div>
-         <div v-if="address.steps">
-            <span class="steps">
-               <b>{{ $t('steps') }}</b>: {{ address.steps }}
-            </span>
-         </div>
-         <div v-if="address.flat">
-            <span class="flat">
-               <b>{{ $t('flat') }}</b>: {{ address.flat }}
-            </span>
-         </div>
-         <div v-if="address.buildingName">
-               <span class="buildingName">
-                  <b>{{ $t('buildingName') }}</b>: {{ address.buildingName }}
-               </span>
-         </div>
-         <div v-if="address.extra">
-               <span class="extra">
-                  <b>{{ $t('extra') }}</b>: {{ address.extra }}
-               </span>
-         </div>
-         <div v-if="address.distribution">
-               <span class="distribution">
-                  <b>{{ $t('distribution') }}</b>: {{ address.distribution }}
-               </span>
-         </div>
-      </div> -->
-
       <div v-if="useDatePane === true" class="address-more">
          <div v-if="address.validFrom">
             <span class="validFrom">

src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/EntityWorkflow/PickWorkflow.vue

@@ -47,7 +47,8 @@ export default {
             console.log('goToGenerateWorkflow', event, workflowName);
 
             if (!this.$props.preventDefaultMoveToGenerate) {
-                event.target.click();
+                console.log('to go generate');
+                window.location.assign(this.makeLink(workflowName));
             }
 
             this.$emit('goToGenerateWorkflow', {event, workflowName, link: this.makeLink(workflowName)});

src/Bundle/ChillMainBundle/Resources/public/vuejs/_js/i18n.js

@@ -91,11 +91,11 @@ export const multiSelectMessages = {
     multiselect: {
       placeholder: 'Choisir',
       tag_placeholder: 'Créer un nouvel élément',
-      select_label: 'Appuyer sur "Entrée" pour sélectionner',
-      deselect_label: 'Appuyer sur "Entrée" pour désélectionner',
+      select_label: '"Entrée" ou cliquez pour sélectionner',
+      deselect_label: '"Entrée" ou cliquez pour désélectionner',
       select_group_label: 'Appuyer sur "Entrée" pour sélectionner ce groupe',
       deselect_group_label: 'Appuyer sur "Entrée" pour désélectionner ce groupe',
       selected_label: 'Sélectionné'
     }
   }
-};
+};

src/Bundle/ChillMainBundle/Resources/views/Notification/_item_comments.html.twig

@@ -15,11 +15,11 @@
 
 <div class="notification-comment-list my-5">
     <h2 class="chill-blue">{{ 'notification.comments_list'|trans }}</h2>
-    
+
     {% if notification.comments|length > 0 %}
         <div class="flex-table">
             {% for comment in notification.comments %}
-                
+
                 {% if editedCommentForm is null or editedCommentId != comment.id %}
                     {{ m.show_comment(comment, {
                         'recordAction': _self.recordAction(comment)
@@ -28,10 +28,11 @@
                     <div class="item-bloc">
                         <div class="item-row row">
                             <a id="comment-{{ comment.id }}"></a>
-                            
+
                             {{ form_start(editedCommentForm) }}
                             {{ form_errors(editedCommentForm) }}
                             {{ form_widget(editedCommentForm.content) }}
+                            {{ form_errors(editedCommentForm.content) }}
                             <input type="hidden" name="form" value="edit" />
                             <ul class="record_actions">
                                 <li class="cancel">
@@ -46,24 +47,25 @@
                                 </li>
                             </ul>
                             {{ form_end(editedCommentForm) }}
-                        
+
                         </div>
                     </div>
                 {% endif %}
-            
+
             {% endfor %}
         </div>
     {% else %}
         <span class="chill-no-data-statement">{{ 'No comments'|trans }}</span>
     {% endif %}
-    
+
     {% if appendCommentForm is not null %}
         <div class="new-comment my-5">
             <h2 class="chill-blue mb-4">{{ 'Write a new comment'|trans }}</h2>
-            
+
             {{ form_start(appendCommentForm) }}
             {{ form_errors(appendCommentForm) }}
             {{ form_widget(appendCommentForm.content) }}
+            {{ form_errors(appendCommentForm.content) }}
             <input type="hidden" name="form" value="append" />
             <ul class="record_actions">
                 <li>
@@ -71,7 +73,7 @@
                 </li>
             </ul>
             {{ form_end(appendCommentForm) }}
-        
+
         </div>
     {% endif %}
-</div>
+</div>

src/Bundle/ChillMainBundle/Resources/views/Workflow/_notification_include.html.twig

@@ -2,7 +2,7 @@
     <h2>
         {{ 'workflow_'|trans }}
     </h2>
-    {% include handler.templateTitle(l.entity_workflow) with handler.templateTitleData(entity_workflow)|merge({
+    {% include handler.templateTitle(entity_workflow) with handler.templateTitleData(entity_workflow)|merge({
         'description': true,
         'breadcrumb': true,
         'add_classes': 'ms-3 h3'