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

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});
         }
     }
 }