Merge remote-tracking branch 'origin/develop' into feature/PMCORE-3140

2021-12-01 13:00:27 +00:00
parent 9bf45defb0 d2f6c1ed78
commit c4f6602016
45 changed files with 1597 additions and 1015 deletions
--- a/resources/assets/js/admin/Modals/ModalPreview.vue
+++ b/resources/assets/js/admin/Modals/ModalPreview.vue
@@ -105,7 +105,7 @@ export default {
                DRAFT: this.$i18n.t("ID_IN_DRAFT"),
                PAUSED: this.$i18n.t("ID_PAUSED"),
                UNASSIGNED: this.$i18n.t("ID_UNASSIGNED"),
-            },
+            }
        }
    },
    mounted() {
@@ -248,24 +248,35 @@ export default {
         * @return {array} dataFormat
         */
        formatUser(data) {
-          var dataFormat = [],
-              userDataFormat;
-              userDataFormat = utils.userNameDisplayFormat({
-                  userName: data.user_tooltip.usr_firstname,
-                  firstName: data.user_tooltip.usr_lastname,
-                  lastName: data.user_tooltip.usr_username,
-                  format: window.config.FORMATS.format || null
-              });
-              dataFormat.push({
-                  USERNAME_DISPLAY_FORMAT: userDataFormat,
-                  EMAIL: data.user_tooltip.usr_email,
-                  POSITION: data.user_tooltip.usr_position,
-                  AVATAR: userDataFormat !== "" ? window.config.SYS_SERVER_AJAX +
-                      window.config.SYS_URI +
-                      `users/users_ViewPhotoGrid?pUID=${data.user_tooltip.usr_id}` : "",
-                  UNASSIGNED: userDataFormat !== "" ? true : false
-              });    
-          return dataFormat;
+            var dataFormat = [],
+                userDataFormat;
+            switch (data.key_name) {
+                case 'user_tooltip':
+                    userDataFormat = utils.userNameDisplayFormat({
+                        userName: data.user_tooltip.usr_firstname,
+                        firstName: data.user_tooltip.usr_lastname,
+                        lastName: data.user_tooltip.usr_username,
+                        format: window.config.FORMATS.format || null
+                    });
+                    dataFormat.push({
+                        USERNAME_DISPLAY_FORMAT: userDataFormat,
+                        EMAIL: data.user_tooltip.usr_email,
+                        POSITION: data.user_tooltip.usr_position,
+                        AVATAR: userDataFormat !== "" ? window.config.SYS_SERVER_AJAX +
+                            window.config.SYS_URI +
+                            `users/users_ViewPhotoGrid?pUID=${data.user_tooltip.usr_id}` : "",
+                        UNASSIGNED: userDataFormat !== "" ? true : false,
+                        SHOW_TOOLTIP: true
+                    });
+                    break;
+                case 'dummy_task':
+                    dataFormat = data.dummy_task.type + ': ' + data.dummy_task.name;
+                    break;
+                default:
+                    dataFormat = "";
+                    break;
+            }
+            return dataFormat;
        }
    }
 }
--- a/resources/assets/js/components/vuetable/CurrentUserCell.vue
+++ b/resources/assets/js/components/vuetable/CurrentUserCell.vue
@@ -1,5 +1,5 @@
 <template>
-    <div v-if="data.length" class="grouped-cell">
+    <div v-if="showTooltip" class="grouped-cell">
        <div v-for="(item, index) in data" v-bind:key="item.TITLE" class="d-flex">
            <div class="avatar" :id="id + index">
                <b-avatar
@@ -36,6 +36,11 @@
            </div>
        </div>
    </div>
+    <div v-else class="grouped-cell">
+        <span class="col ellipsis">
+            {{ data }}
+        </span>
+    </div>
 </template>

 <script>
@@ -47,6 +52,14 @@ export default {
            id: "avatar-" + _.random(1000000)
        };
    },
+    computed: {
+        /**
+         * Verify if data is an array.
+         */
+        showTooltip() {
+            return typeof this.data !== 'string'
+        }
+    },
    methods: {
        /**
         * Generates the mail link
--- a/resources/assets/js/home/CustomCaseList/CustomCaseList.vue
+++ b/resources/assets/js/home/CustomCaseList/CustomCaseList.vue
@@ -884,24 +884,32 @@ export default {
        formatUser(data) {
            var dataFormat = [],
                userDataFormat;
-            userDataFormat = utils.userNameDisplayFormat({
-                userName: data.user_tooltip.usr_firstname,
-                firstName: data.user_tooltip.usr_lastname,
-                lastName: data.user_tooltip.usr_username,
-                format: window.config.FORMATS.format || null,
-            });
-            dataFormat.push({
-                USERNAME_DISPLAY_FORMAT: userDataFormat,
-                EMAIL: data.user_tooltip.usr_email,
-                POSITION: data.user_tooltip.usr_position,
-                AVATAR:
-                    userDataFormat !== ""
-                        ? window.config.SYS_SERVER_AJAX +
-                          window.config.SYS_URI +
-                          `users/users_ViewPhotoGrid?pUID=${data.user_tooltip.usr_id}`
-                        : "",
-                UNASSIGNED: userDataFormat !== "" ? true : false,
-            });
+            switch (data.key_name) {
+                case 'user_tooltip':
+                    userDataFormat = utils.userNameDisplayFormat({
+                        userName: data.user_tooltip.usr_firstname,
+                        firstName: data.user_tooltip.usr_lastname,
+                        lastName: data.user_tooltip.usr_username,
+                        format: window.config.FORMATS.format || null
+                    });
+                    dataFormat.push({
+                        USERNAME_DISPLAY_FORMAT: userDataFormat,
+                        EMAIL: data.user_tooltip.usr_email,
+                        POSITION: data.user_tooltip.usr_position,
+                        AVATAR: userDataFormat !== "" ? window.config.SYS_SERVER_AJAX +
+                            window.config.SYS_URI +
+                            `users/users_ViewPhotoGrid?pUID=${data.user_tooltip.usr_id}` : "",
+                        UNASSIGNED: userDataFormat !== "" ? true : false,
+                        SHOW_TOOLTIP: true
+                    });
+                    break;
+                case 'dummy_task':
+                    dataFormat = data.dummy_task.type + ': ' + data.dummy_task.name;
+                    break;
+                default:
+                    dataFormat = "";
+                    break;
+            }
            return dataFormat;
        },
        /**
--- a/resources/assets/js/home/CustomCaseList/defaultMixins.js
+++ b/resources/assets/js/home/CustomCaseList/defaultMixins.js
@@ -229,7 +229,20 @@ export default {
     * Return the columns for table - concat with field "detail" "actions"
     */
    getTableColumns(columns) {
-      return _.concat(["detail"], columns, ["actions"]);
+        return _.concat(["detail"], this.removeDefaultColumns(columns), ["actions"]);
+    },
+    /**
+     * Remove the default columns, 'detail' and 'actions'
+     * @param {Array} columns 
+     */
+    removeDefaultColumns(columns) {
+        if (columns[0] === 'detail') {
+            columns.shift()
+        }
+        if (columns[columns.length - 1] === 'actions') {
+            columns.pop();
+        }
+        return columns;
    },
    /**
     * Return options for Table
--- a/resources/assets/js/home/Inbox/Inbox.vue
+++ b/resources/assets/js/home/Inbox/Inbox.vue
@@ -54,7 +54,7 @@
        <TaskCell :data="props.row.TASK" />
      </div>
      <div slot="send_by" slot-scope="props">
-        <CurrentUserCell :data="props.row.USER_DATA" />
+          <CurrentUserCell :data="props.row.USER_DATA" />
      </div>
      <div slot="current_user" slot-scope="props">
        {{ props.row.USERNAME_DISPLAY_FORMAT }}
@@ -149,7 +149,7 @@
          >{{ props["headings"][props.column] }} :</span
        >
        <span class="v-card-text-light">
-          <CurrentUserCell :data="props.item.USER_DATA" />
+            <CurrentUserCell :data="props.item.USER_DATA" />
        </span>
      </div>
    </VueCardView>
@@ -230,7 +230,7 @@
          >{{ props["headings"][props.column] }} :</span
        >
        <span class="v-card-text-light">
-          <CurrentUserCell :data="props.item.USER_DATA" />
+            <CurrentUserCell :data="props.item.USER_DATA" />
        </span>
      </div>
    </VueListView>
@@ -383,7 +383,7 @@ export default {
        buttons: {}
      },
      showEllipsis: false,
-      dataSubtitle: null
+      dataSubtitle: null,
    };
  },
  created() {
@@ -595,21 +595,32 @@ export default {
    formatUser(data) {
        var dataFormat = [],
            userDataFormat;
-            userDataFormat = utils.userNameDisplayFormat({
-                userName: data.user_tooltip.usr_firstname,
-                firstName: data.user_tooltip.usr_lastname,
-                lastName: data.user_tooltip.usr_username,
-                format: window.config.FORMATS.format || null
-            });
-            dataFormat.push({
-                USERNAME_DISPLAY_FORMAT: userDataFormat,
-                EMAIL: data.user_tooltip.usr_email,
-                POSITION: data.user_tooltip.usr_position,
-                AVATAR: userDataFormat !== "" ? window.config.SYS_SERVER_AJAX +
-                    window.config.SYS_URI +
-                    `users/users_ViewPhotoGrid?pUID=${data.user_tooltip.usr_id}` : "",
-                UNASSIGNED: userDataFormat !== "" ? true : false
-            });    
+        switch (data.key_name) {
+            case 'user_tooltip':
+                userDataFormat = utils.userNameDisplayFormat({
+                    userName: data.user_tooltip.usr_firstname,
+                    firstName: data.user_tooltip.usr_lastname,
+                    lastName: data.user_tooltip.usr_username,
+                    format: window.config.FORMATS.format || null
+                });
+                dataFormat.push({
+                    USERNAME_DISPLAY_FORMAT: userDataFormat,
+                    EMAIL: data.user_tooltip.usr_email,
+                    POSITION: data.user_tooltip.usr_position,
+                    AVATAR: userDataFormat !== "" ? window.config.SYS_SERVER_AJAX +
+                        window.config.SYS_URI +
+                        `users/users_ViewPhotoGrid?pUID=${data.user_tooltip.usr_id}` : "",
+                    UNASSIGNED: userDataFormat !== "" ? true : false,
+                    SHOW_TOOLTIP: true
+                });
+                break;
+            case 'dummy_task':
+                dataFormat = data.dummy_task.type + ': ' + data.dummy_task.name;
+                break;
+            default:
+                dataFormat = "";
+                break;
+        }
        return dataFormat;
    },
    /**
--- a/resources/assets/js/home/Paused/Paused.vue
+++ b/resources/assets/js/home/Paused/Paused.vue
@@ -48,12 +48,11 @@
      <div slot="process_name" slot-scope="props">
        {{ props.row.PROCESS_NAME }}
      </div>
-
      <div slot="task" slot-scope="props">
        <TaskCell :data="props.row.TASK" />
      </div>
      <div slot="send_by" slot-scope="props">
-        <CurrentUserCell :data="props.row.USER_DATA" />
+          <CurrentUserCell :data="props.row.USER_DATA" />
      </div>
      <div slot="current_user" slot-scope="props">
        {{ props.row.USERNAME_DISPLAY_FORMAT }}
@@ -148,7 +147,7 @@
          >{{ props["headings"][props.column] }} :</span
        >
        <span class="v-card-text-light">
-          <CurrentUserCell :data="props.item.USER_DATA" />
+            <CurrentUserCell :data="props.item.USER_DATA" />
        </span>
      </div>
    </VueCardView>
@@ -229,7 +228,7 @@
          >{{ props["headings"][props.column] }} :</span
        >
        <span class="v-card-text-light">
-          <CurrentUserCell :data="props.item.USER_DATA" />
+            <CurrentUserCell :data="props.item.USER_DATA" />
        </span>
      </div>
    </VueListView>
@@ -590,21 +589,32 @@ export default {
    formatUser(data) {
        var dataFormat = [],
            userDataFormat;
-            userDataFormat = utils.userNameDisplayFormat({
-                userName: data.user_tooltip.usr_firstname,
-                firstName: data.user_tooltip.usr_lastname,
-                lastName: data.user_tooltip.usr_username,
-                format: window.config.FORMATS.format || null
-            });
-            dataFormat.push({
-                USERNAME_DISPLAY_FORMAT: userDataFormat,
-                EMAIL: data.user_tooltip.usr_email,
-                POSITION: data.user_tooltip.usr_position,
-                AVATAR: userDataFormat !== "" ? window.config.SYS_SERVER_AJAX +
-                    window.config.SYS_URI +
-                    `users/users_ViewPhotoGrid?pUID=${data.user_tooltip.usr_id}` : "",
-                UNASSIGNED: userDataFormat !== "" ? true : false
-            });    
+        switch (data.key_name) {
+            case 'user_tooltip':
+                userDataFormat = utils.userNameDisplayFormat({
+                    userName: data.user_tooltip.usr_firstname,
+                    firstName: data.user_tooltip.usr_lastname,
+                    lastName: data.user_tooltip.usr_username,
+                    format: window.config.FORMATS.format || null
+                });
+                dataFormat.push({
+                    USERNAME_DISPLAY_FORMAT: userDataFormat,
+                    EMAIL: data.user_tooltip.usr_email,
+                    POSITION: data.user_tooltip.usr_position,
+                    AVATAR: userDataFormat !== "" ? window.config.SYS_SERVER_AJAX +
+                        window.config.SYS_URI +
+                        `users/users_ViewPhotoGrid?pUID=${data.user_tooltip.usr_id}` : "",
+                    UNASSIGNED: userDataFormat !== "" ? true : false,
+                    SHOW_TOOLTIP: true
+                });
+                break;
+            case 'dummy_task':
+                dataFormat = data.dummy_task.type + ': ' + data.dummy_task.name;
+                break;
+            default:
+                dataFormat = "";
+                break;
+        }
        return dataFormat;
    },
    /**
--- a/resources/assets/js/home/Unassigned/Unassigned.vue
+++ b/resources/assets/js/home/Unassigned/Unassigned.vue
@@ -46,12 +46,11 @@
      <div slot="process_name" slot-scope="props">
        {{ props.row.PROCESS_NAME }}
      </div>
-
      <div slot="task" slot-scope="props">
        <TaskCell :data="props.row.TASK" />
      </div>
      <div slot="send_by" slot-scope="props">
-        <CurrentUserCell :data="props.row.USER_DATA" />
+          <CurrentUserCell :data="props.row.USER_DATA" />
      </div>
      <div slot="due_date" slot-scope="props">
        {{ props.row.DUE_DATE }}
@@ -143,7 +142,7 @@
          >{{ props["headings"][props.column] }} :</span
        >
        <span class="v-card-text-light">
-          <CurrentUserCell :data="props.item.USER_DATA" />
+            <CurrentUserCell :data="props.item.USER_DATA" />
        </span>
      </div>
    </VueCardView>
@@ -224,7 +223,7 @@
          >{{ props["headings"][props.column] }} :</span
        >
        <span class="v-card-text-light">
-          <CurrentUserCell :data="props.item.USER_DATA" />
+            <CurrentUserCell :data="props.item.USER_DATA" />
        </span>
      </div>
    </VueListView>
@@ -547,21 +546,32 @@ export default {
    formatUser(data) {
        var dataFormat = [],
            userDataFormat;
-            userDataFormat = utils.userNameDisplayFormat({
-                userName: data.user_tooltip.usr_firstname,
-                firstName: data.user_tooltip.usr_lastname,
-                lastName: data.user_tooltip.usr_username,
-                format: window.config.FORMATS.format || null
-            });
-            dataFormat.push({
-                USERNAME_DISPLAY_FORMAT: userDataFormat,
-                EMAIL: data.user_tooltip.usr_email,
-                POSITION: data.user_tooltip.usr_position,
-                AVATAR: userDataFormat !== "" ? window.config.SYS_SERVER_AJAX +
-                    window.config.SYS_URI +
-                    `users/users_ViewPhotoGrid?pUID=${data.user_tooltip.usr_id}` : "",
-                UNASSIGNED: userDataFormat !== "" ? true : false
-            });    
+        switch (data.key_name) {
+            case 'user_tooltip':
+                userDataFormat = utils.userNameDisplayFormat({
+                    userName: data.user_tooltip.usr_firstname,
+                    firstName: data.user_tooltip.usr_lastname,
+                    lastName: data.user_tooltip.usr_username,
+                    format: window.config.FORMATS.format || null
+                });
+                dataFormat.push({
+                    USERNAME_DISPLAY_FORMAT: userDataFormat,
+                    EMAIL: data.user_tooltip.usr_email,
+                    POSITION: data.user_tooltip.usr_position,
+                    AVATAR: userDataFormat !== "" ? window.config.SYS_SERVER_AJAX +
+                        window.config.SYS_URI +
+                        `users/users_ViewPhotoGrid?pUID=${data.user_tooltip.usr_id}` : "",
+                    UNASSIGNED: userDataFormat !== "" ? true : false,
+                    SHOW_TOOLTIP: true
+                });
+                break;
+            case 'dummy_task':
+                dataFormat = data.dummy_task.type + ': ' + data.dummy_task.name;
+                break;
+            default:
+                dataFormat = "";
+                break;
+        }
        return dataFormat;
    },
    /**