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

src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss

@@ -278,6 +278,7 @@ table.table-bordered {
 }
 
 /// meta-data
+div.createdBy,
 div.updatedBy,
 div.metadata {
     span.user, span.date {

src/Bundle/ChillMainBundle/Resources/public/chill/scss/flex_table.scss

@@ -279,6 +279,7 @@ div.wrap-header {
 
         li {
             margin-right: 5px;
+            margin-bottom: 5px;
         }
     }
 }
@@ -316,7 +317,7 @@ div.float-button {
 
         div.action {
             height: calc(100% - 0em);
-            shape-outside: inset(calc(100% - 4em) 0 0);
+            shape-outside: inset(calc(100% - 2em) 0 0);
             display: flex;
             align-items: flex-end;
             padding: 0 0 0 1em;
@@ -328,6 +329,10 @@ div.float-button {
                 padding: 0;
             }
         }
+
+        .chill-entity.entity-address .address p {
+            display: unset;
+        }
     }
     &.debug {
         padding: 1em;

src/Bundle/ChillMainBundle/Resources/public/chill/scss/record_actions.scss

@@ -1,7 +1,7 @@
 ul.record_actions {
    display: flex;
    flex-direction: row;
-   flex-wrap: wrap-reverse;
+   flex-wrap: wrap;
    justify-content: flex-end;
    padding: 0.5em 0;
 

src/Bundle/ChillMainBundle/Resources/public/chill/scss/render_box.scss

@@ -72,9 +72,9 @@ section.chill-entity {
                 }
             }
             p {
-                // display: inline-block;
-                margin: 0 0 0 1.5em;
-                text-indent: -1.5em;
+                display: inline-block;
+                //margin: 0 0 0 1.5em;
+                //text-indent: -1.5em;
 
                 &.street {
                     span.streetnumber {

src/Bundle/ChillMainBundle/Resources/public/lib/api/apiMethods.js

@@ -1,7 +1,7 @@
 /**
  * Generic api method that can be adapted to any fetch request
  */
- const makeFetch = (method, url, body) => {
+const makeFetch = (method, url, body) => {
     return fetch(url, {
         method: method,
         headers: {
@@ -11,19 +11,20 @@
     })
     .then(response => {
         if (response.ok) {
+            console.log('200 error')
             return response.json();
         }
 
         if (response.status === 422) {
+            console.log('422 error')
             return response.json().then(response => {
                 throw ValidationException(response)
             });
         }
 
         if (response.status === 403) {
-            return response.json().then(() => {
-                throw AccessException();
-            });
+            console.log('403 error')
+            throw AccessException(response);
         }
 
         throw {
@@ -88,14 +89,13 @@ const ValidationException = (response) => {
     error.violations = response.violations.map((violation) => `${violation.title}: ${violation.propertyPath}`);
     error.titles = response.violations.map((violation) => violation.title);
     error.propertyPaths = response.violations.map((violation) => violation.propertyPath);
-
     return error;
 }
 
-const AccessException = () => {
+const AccessException = (response) => {
     const error = {};
     error.name = 'AccessException';
-    error.violations = ['You are no longer permitted to perform this action'];
+    error.violations = ['You are not allowed to perform this action'];
 
     return error;
 }

src/Bundle/ChillMainBundle/Resources/public/lib/collection/index.js

@@ -50,7 +50,7 @@ var handleAdd = function(button) {
         empty_explain = collection.querySelector('li[data-collection-empty-explain]'),
         entry = document.createElement('li'),
         event = new CustomEvent('collection-add-entry', { detail: { collection: collection, entry: entry } }),
-        counter = collection.childNodes.length,
+        counter = collection.childNodes.length + parseInt(Math.random() * 1000000)
         content
         ;
     content = prototype.replace(new RegExp('__name__', 'g'), counter);

src/Bundle/ChillMainBundle/Resources/public/module/blur/blur.scss

@@ -1,11 +1,39 @@
-.confidential{
+.confidential {
     display: flex;
+    position: relative;
+}
+.toggle-far-twig {
+    i {
+        bottom: 0px;
+        right: -30px;
+    }
+}
+
+.toggle-close-twig {
+    i {
+        bottom: 0px;
+        right: -5px;
+    }
 }
 .toggle{
     margin-left: 30px;
     margin-top: 5px;
     cursor: pointer;
+    position: absolute;
+    z-index: 5;
+    right: -30px
 }
+
+.toggle-far {
+    bottom: 0px;
+    right: 20px !important;
+}
+
+.toggle-close {
+    bottom: 125px;
+    right: 15px !important;
+}
+
 .blur {
     -webkit-filter: blur(5px);
     -moz-filter: blur(5px);

src/Bundle/ChillMainBundle/Resources/public/page/workflow-show/index.js

@@ -3,7 +3,7 @@ import {ShowHide} from 'ChillMainAssets/lib/show_hide/show_hide.js';
 window.addEventListener('DOMContentLoaded', function() {
     let
         divTransitions = document.querySelector('#transitions'),
-        futureDestUsersContainer = document.querySelector('#futureDestUsers')
+        futureDestUsersContainer = document.querySelector('#futureDests')
     ;
 
     if (null !== divTransitions) {
@@ -67,24 +67,4 @@ window.addEventListener('DOMContentLoaded', function() {
         });
     }
 
-    // validate form
-    let form = document.querySelector('form[name="workflow_step"]');
-
-    if (form === null) {
-        console.error('form to validate not found');
-    }
-
-    form.addEventListener('submit', function (event) {
-        const datas = new FormData(event.target);
-
-        if (datas.has('workflow_step[future_dest_users]')) {
-            const dests = JSON.parse(datas.get('workflow_step[future_dest_users]'));
-            if (dests === null || (dests instanceof Array && dests.length === 0)) {
-                event.preventDefault();
-                console.log('no users!');
-                window.alert('Indiquez un utilisateur pour traiter la prochaine étape.');
-            }
-        }
-    });
-
 });

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

@@ -1,11 +1,11 @@
 <template>
 
-    <a v-if="isDisplayBadge" @click="openModal">
-        <span class="chill-entity" :class="badgeType">
-            {{ buttonText }}<span v-if="isDead"> (‡)</span>
-        </span>
-    </a>
-    <a v-else class="btn btn-sm" target="_blank"
+   <a v-if="isDisplayBadge" @click="openModal">
+      <span class="chill-entity" :class="badgeType">
+         {{ buttonText }}<span v-if="isDead"> (‡)</span>
+      </span>
+   </a>
+   <a v-else class="btn btn-sm" target="_blank"
       :class="classAction"
       :title="$t(titleAction)"
       @click="openModal">
@@ -115,7 +115,6 @@ export default {
    },
    computed: {
       hasResourceComment() {
-          //console.log('hasResourceComment', this.parent);
          return (typeof this.parent !== 'undefined' && this.parent !== null)
             && this.action === 'show'
             && this.parent.type === 'accompanying_period_resource'

src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Confidential.vue

@@ -1,10 +1,10 @@
 <template>
-    <div :class="classes">
-        <div class="confidential-content" :class="{ 'blur': isBlurred }">
+    <div class="confidential">
+        <div :class="{ 'blur': isBlurred }">
             <slot name="confidential-content"></slot>
         </div>
         <div>
-            <i class="fa fa-eye toggle" aria-hidden="true" @click="toggleBlur"></i>
+            <i class="fa fa-eye toggle" :class="positionBtn" aria-hidden="true" @click="toggleBlur"></i>
         </div>
     </div>
 </template>
@@ -12,6 +12,7 @@
 <script>
 export default {
     name: "Confidential",
+    props: ['positionBtnFar'],
     data() {
         return {
             isBlurred: true,
@@ -19,9 +20,14 @@ export default {
     },
     methods : {
         toggleBlur() {
-            console.log('toggle blur');
+            console.log(this.positionBtnFar);
             this.isBlurred = !this.isBlurred;
         },
+    },
+    computed: {
+        positionBtn() {
+            return this.positionBtnFar ? 'toggle-far' : 'toggle-close'
+        }
     }
 }
 </script>
@@ -29,18 +35,5 @@ export default {
 <style scoped lang='scss'>
     .confidential{
         align-items: center;
-        display: flex;
-    }
-    .toggle{
-        margin-top: 28px;
-        cursor: pointer;
-        display: block;
-        float: right;
-        margin-right: 20px;
-    }
-    .blur {
-        -webkit-filter: blur(5px);
-        -moz-filter: blur(5px);
-        filter: blur(5px);
     }
 </style>

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

@@ -5,7 +5,7 @@
       <component :is="component" class="address" :class="multiline">
 
          <div v-if="isConfidential">
-            <confidential>
+            <confidential :positionBtnFar="true">
                <template v-slot:confidential-content>
                   <div v-if="isMultiline === true">
                      <p v-for="(l, i) in address.lines" :key="`line-${i}`">
@@ -27,7 +27,6 @@
                      </p>
                   </div>
                </template>
-
             </confidential>
          </div>
 
@@ -94,6 +93,7 @@ export default {
          return this.isMultiline === true ? "multiline" : "";
       },
       isConfidential() {
+         console.log(this.address.confidential)
          return this.address.confidential;
       }
    }

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

@@ -5,7 +5,7 @@
 
          <div>
             <div class="item-row col">
-               <h2>Workflow</h2>
+               <h2>{{ w.title }}</h2>
                <div class="flex-grow-1 ms-3 h3">
                   <div class="visually-hidden">
                      {{ w.relatedEntityClass }}

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

@@ -12,6 +12,8 @@
       :relatedEntityClass="this.relatedEntityClass"
       :relatedEntityId="this.relatedEntityId"
       :workflowsAvailables="workflowsAvailables"
+      :preventDefaultMoveToGenerate="this.$props.preventDefaultMoveToGenerate"
+      :goToGenerateWorkflowPayload="this.goToGenerateWorkflowPayload"
       @go-to-generate-workflow="goToGenerateWorkflow"
    ></pick-workflow>
 
@@ -36,6 +38,7 @@
                :relatedEntityId="this.relatedEntityId"
                :workflowsAvailables="workflowsAvailables"
                :preventDefaultMoveToGenerate="this.$props.preventDefaultMoveToGenerate"
+               :goToGenerateWorkflowPayload="this.goToGenerateWorkflowPayload"
                @go-to-generate-workflow="this.goToGenerateWorkflow"
             ></pick-workflow>
          </template>
@@ -83,6 +86,10 @@ export default {
           required: false,
           default: false,
       },
+      goToGenerateWorkflowPayload: {
+         required: false,
+         default: {}
+      },
    },
     data() {
       return {
@@ -105,7 +112,7 @@ export default {
          this.modal.showModal = true;
       },
       goToGenerateWorkflow(data) {
-          console.log('go to generate workflow intercepted');
+          console.log('go to generate workflow intercepted', data);
           this.$emit('goToGenerateWorkflow', data);
       }
    },

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

@@ -37,6 +37,10 @@ export default {
             required: false,
             default: false,
         },
+        goToGenerateWorkflowPayload: {
+            required: false,
+            default: {}
+        },
     },
     emits: ['goToGenerateWorkflow'],
     methods: {
@@ -51,7 +55,7 @@ export default {
                 window.location.assign(this.makeLink(workflowName));
             }
 
-            this.$emit('goToGenerateWorkflow', {event, workflowName, link: this.makeLink(workflowName)});
+            this.$emit('goToGenerateWorkflow', {event, workflowName, link: this.makeLink(workflowName), payload: this.goToGenerateWorkflowPayload});
         }
     }
 }