PMCORE-4027[28891-29654] Case history and case data showing previous case information

Corrections

add overlay

CR

resources/assets/js/components/home/caseDetail/CaseHistory.vue

@@ -5,7 +5,7 @@
       ref="IFrameCaseHistory"
       title="IFrameCaseHistory"
       frameborder="0"
-      :src="path"
+      :src="url"
       :height="height"
       allowfullscreen
     ></iframe>
@@ -16,25 +16,22 @@
 export default {
   name: "CaseHistory",
   props: {
-    data: Object,
+    historyData: Object,
   },
   data() {
     return {
+      url: "",
       height: "500px",
       width: "100%",
       diffHeight: 10,
     };
   },
-  computed: {
+  computed: {},
-    path() {
+  mounted() {
-      let url =
+    this.url = window.config.SYS_SERVER_AJAX +
-        window.config.SYS_SERVER_AJAX +
       window.config.SYS_URI +
-        `cases/ajaxListener?action=caseHistory`;
+      `cases/ajaxListener?action=caseHistory&appUid=` + this.data.APP_UID;
-      return url;
   },
-  },
-  mounted() {},
   methods: {
     classBtn(cls) {
       return "btn v-btn-request " + cls;

resources/assets/js/components/tabs/Tab.vue

@@ -1,6 +1,6 @@
 <template>
   <section
-    v-show="isActive"
+    v-if="isActive"
     :aria-hidden="!isActive"
     class="tabs-component-panel"
     :id="computedId"

resources/assets/js/components/tabs/Tabs.vue

@@ -66,7 +66,6 @@ export default {
     const previousSelectedTabHash = expiringStorage.get(this.storageKey);
     if (this.findTab(previousSelectedTabHash)) {
       this.selectTab(previousSelectedTabHash);
-      return;
     }
     if (
       this.options.defaultTabHash !== null &&

resources/assets/js/home/AdvancedSearch/AdvancedSearch.vue

@@ -25,6 +25,7 @@
 
         <modal-new-request ref="newRequest"></modal-new-request>
         <settings-popover :options="formatColumnSettings(options.headings)" target="pm-dr-column-settings" @onUpdateColumnSettings="onUpdateColumnSettings" :key="random+1" :selected="formatColumnSelected(columns)"/>
+        <b-overlay :show="showOverlay" rounded="sm">
         <v-server-table
             :data="tableData"
             :columns="columns"
@@ -79,6 +80,7 @@
                 </div>
             </div>
         </v-server-table>
+        </b-overlay>
         <vue-simple-context-menu
             :elementId="idContextMenu"
             :options="contextMenuItems"
@@ -201,7 +203,7 @@ export default {
                 },
                 sortable: ["case_number"],
                 requestFunction(data) {
-                    return this.$parent.$parent.getCasesForVueTable(data);
+                    return this.$parent.$parent.$parent.getCasesForVueTable(data);
                 },
                 customFilters: ["myfilter"]
             },
@@ -214,7 +216,8 @@ export default {
                 "DRAFT": this.$i18n.t("ID_IN_DRAFT"),
                 "PAUSED": this.$i18n.t("ID_PAUSED"),
                 "UNASSIGNED": this.$i18n.t("ID_UNASSIGNED")
-            }
+            },
+            showOverlay: false,
         };
     },
     mounted() {
@@ -239,6 +242,7 @@ export default {
                 }, 400);
             } else if (self.clickCount === 2) {
                 clearTimeout(self.singleClickTimer);
+                self.showOverlay = true;
                 self.clickCount = 0;
                 self.openCaseDetail(event.row);
             }

resources/assets/js/home/MyCases/MyCases.vue

@@ -27,6 +27,7 @@
             :key="random + 1"
             :selected="formatColumnSelected(columns)"
         />
+        <b-overlay :show="showOverlay" rounded="sm">
         <v-server-table
             :data="tableData"
             :columns="columns"
@@ -76,6 +77,7 @@
                 </div>
             </div>
         </v-server-table>
+        </b-overlay>
         <ModalComments
             ref="modal-comments"
             @postNotes="onPostNotes"
@@ -206,7 +208,7 @@ export default {
                         ? this.settings.orderBy
                         : {},
                 requestFunction(data) {
-                    return this.$parent.$parent.getCasesForVueTable(data);
+                    return this.$parent.$parent.$parent.getCasesForVueTable(data);
                 },
                 settings: {
                     actions: {
@@ -235,6 +237,7 @@ export default {
                 UNASSIGNED: this.$i18n.t("ID_UNASSIGNED"),
             },
             clearSortState: this.settings && this.settings.orderBy && this.settings.orderBy.column,
+            showOverlay: false,
         };
     },
     mounted() {
@@ -323,6 +326,7 @@ export default {
                 }, 400);
             } else if (self.clickCount === 2) {
                 clearTimeout(self.singleClickTimer);
+                self.showOverlay = true;
                 self.clickCount = 0;
                 self.openCaseDetail(event.row);
             }

resources/assets/js/home/TabsCaseDetail.vue

@@ -15,7 +15,7 @@
         </ProcessMap>
       </tab>
       <tab :name="$t('ID_CASE_HISTORY')">
-        <CaseHistory :data="dataCase"> </CaseHistory>
+        <CaseHistory :historyData="dataCase"> </CaseHistory>
       </tab>
       <tab :name="$t('ID_DYNAFORM_HISTORY')">
         <ChangeLog :caseData="dataCase"> </ChangeLog>

workflow/engine/methods/cases/caseHistory_Ajax.php

@@ -8,7 +8,7 @@ $actionAjax = isset($_REQUEST['actionAjax']) ? $_REQUEST['actionAjax'] : null;
 switch ($actionAjax) {
     case 'historyGridList_JXP':
         global $G_PUBLISH;
-        $appUid = $_SESSION['APPLICATION'];
+        $appUid = isset($_REQUEST['appUid']) ? $_REQUEST['appUid'] : $_SESSION['APPLICATION'];
         $case = new ClassesCases();
         $fields = $case->loadCase($appUid);
         $criteria = Cases::getTransferHistoryCriteria($fields['APP_NUMBER']);

workflow/engine/templates/cases/caseHistory.js

@@ -179,11 +179,12 @@
   //!!historyGridList|changeLog
 
   function historyGridList(){
+      var appUid = this.window.location.search.substr(27);
       store = new Ext.data.GroupingStore({
         proxy : new Ext.data.HttpProxy
         (
           {
-            url: 'caseHistory_Ajax.php?actionAjax=historyGridList_JXP'
+            url: 'caseHistory_Ajax.php?actionAjax=historyGridList_JXP&appUid=' + appUid
           }
         ),