Merge pull request #623 from amansinghbais/#622

Improved: fetching closed cycle counts total on closed page in admin screen (#622)

src/services/CountService.ts

@@ -153,6 +153,14 @@ const fetchCycleCountUploadedFileData = async (payload: any): Promise <any> => {
   });
 }
 
+const fetchCycleCountsTotal = async (payload: any): Promise<any> => {
+  return api({
+    url: "cycleCounts/count",
+    method: "get",
+    params: payload
+  })
+}
+
 export const CountService = {
   acceptItem,
   addProductToCount,
@@ -168,6 +176,7 @@ export const CountService = {
   fetchCycleCountStats,
   fetchCycleCounts,
   fetchCycleCountItems,
+  fetchCycleCountsTotal,
   recountItems,
   updateCount,
   updateCycleCount,

src/store/modules/count/CountState.ts

@@ -14,4 +14,5 @@ export default interface CountState {
   cycleCountImportSystemMessages: Array<any>;
   defaultRecountUpdateBehaviour: String;
   cachedUnmatchProducts: any;
+  closedCycleCountsTotal: any;
 }

src/store/modules/count/actions.ts

@@ -66,6 +66,37 @@ const actions: ActionTree<CountState, RootState> = {
     commit(types.COUNT_LIST_UPDATED, { counts, total , isScrollable })
   },
 
+  async fetchClosedCycleCountsTotal({ commit, state }) {
+    const params = {
+      statusId: "INV_COUNT_COMPLETED"
+    } as any;
+    // TODO: Currently, the search functionality works only on the count name. Once the API supports searching across 
+    // multiple fields, we should include the count ID in the search parameters.
+    if(state.query.queryString.length) {
+      params["countImportName"] = state.query.queryString
+      params["countImportName_op"] = "contains"
+    }
+
+    if(state.query.facilityIds.length) {
+      params["facilityId"] = state.query.facilityIds.join(",")
+      params["facilityId_op"] = "in"
+    }
+
+    let total = "";
+    try {
+      const resp = await CountService.fetchCycleCountsTotal(params);
+      if(!hasError(resp)) {
+        total = resp.data.count;
+      } else {
+        throw resp;
+      }
+    } catch(err) {
+      logger.error(err)
+    }
+
+    commit(types.COUNT_CLOSED_CYCLE_COUNTS_TOTAL_UPDATED, total)
+  },
+
   async fetchCycleCountStats({ commit, state }, inventoryCountImportIds) {
     const cachedProducts = JSON.parse(JSON.stringify(state.cachedUnmatchProducts))
     try {
@@ -133,6 +164,7 @@ const actions: ActionTree<CountState, RootState> = {
       statusId = "INV_COUNT_COMPLETED"
     }
     dispatch("fetchCycleCounts", { pageSize: process.env.VUE_APP_VIEW_SIZE, pageIndex: 0, statusId })
+    if(payload.key === "facilityIds") dispatch("fetchClosedCycleCountsTotal")
   },
 
   async updateQueryString({ commit }, payload) {

src/store/modules/count/getters.ts

@@ -32,6 +32,9 @@ const getters: GetterTree<CountState, RootState> = {
   },
   getCachedUnmatchProducts: (state) => (id: string) => {
     return state.cachedUnmatchProducts[id]
+  },
+  getClosedCycleCountsTotal(state) {
+    return state.closedCycleCountsTotal
   }
 };
 

src/store/modules/count/index.ts

@@ -25,7 +25,8 @@ const countModule: Module<CountState, RootState> = {
     },
     cycleCountItems: {},
     defaultRecountUpdateBehaviour: "add",
-    cachedUnmatchProducts: {}
+    cachedUnmatchProducts: {},
+    closedCycleCountsTotal: ""
   },
   getters,
   actions,

src/store/modules/count/mutation-types.ts

@@ -6,4 +6,5 @@ export const COUNT_STATS_UPDATED = SN_COUNT + "/STATS_UPDATED"
 export const COUNT_UPDATED = SN_COUNT + '/UPDATED'
 export const COUNT_ITEMS_UPDATED = SN_COUNT + '/ITEMS_UPDATED'
 export const COUNT_IMPORT_SYSTEM_MESSAGES_UPDATED = SN_COUNT + 'IMPORT_SYSTEM_MESSAGES_UPDATED'
-export const COUNT_CACHED_UNMATCH_PRODUCTS_UPDATED = SN_COUNT + 'CACHED_UNMATCHED_PRODUCTS_UPDATED'
+export const COUNT_CACHED_UNMATCH_PRODUCTS_UPDATED = SN_COUNT + 'CACHED_UNMATCHED_PRODUCTS_UPDATED'
+export const COUNT_CLOSED_CYCLE_COUNTS_TOTAL_UPDATED = SN_COUNT + 'CLOSED_CYCLE_COUNTS_TOTAL_UPDATED'

src/store/modules/count/mutations.ts

@@ -37,6 +37,9 @@ const mutations: MutationTree <CountState> = {
   },
   [types.COUNT_CACHED_UNMATCH_PRODUCTS_UPDATED] (state, payload) {
     state.cachedUnmatchProducts = payload
+  },
+  [types.COUNT_CLOSED_CYCLE_COUNTS_TOTAL_UPDATED] (state, payload) {
+    state.closedCycleCountsTotal = payload
   }
 
 }	

src/views/Closed.vue

@@ -23,7 +23,7 @@
           <ion-item lines="full">
             <ion-icon slot="start" :icon="listOutline"/>
             <ion-label>{{ translate("Counts closed") }}</ion-label>
-            <ion-label slot="end">{{ cycleCounts.length }}</ion-label>
+            <ion-label slot="end">{{ (closedCycleCountsTotal || closedCycleCountsTotal === 0) ? closedCycleCountsTotal : "-" }}</ion-label>
           </ion-item>
           <ion-item lines="full">
             <ion-icon slot="start" :icon="thermometerOutline"/>
@@ -115,13 +115,14 @@ const cycleCounts = computed(() => store.getters["count/getCounts"])
 const cycleCountStats = computed(() => (id: string) => store.getters["count/getCycleCountStats"](id))
 const isScrollable = computed(() => store.getters["count/isCycleCountListScrollable"])
 const query = computed(() => store.getters["count/getQuery"])
+const closedCycleCountsTotal = computed(() => store.getters["count/getClosedCycleCountsTotal"])
 
 const isScrollingEnabled = ref(false);
 const contentRef = ref({}) as any
 const infiniteScrollRef = ref({}) as any
 
 onIonViewWillEnter(async () => {
-  await fetchClosedCycleCounts()
+  await Promise.allSettled([fetchClosedCycleCounts(), store.dispatch("count/fetchClosedCycleCountsTotal")])
 })
 
 onIonViewWillLeave(async () => {
@@ -142,7 +143,7 @@ function enableScrolling() {
 
 async function updateQueryString(key: string, value: any) {
   await store.dispatch("count/updateQueryString", { key, value })
-  fetchClosedCycleCounts();
+  await Promise.allSettled([fetchClosedCycleCounts(), store.dispatch("count/fetchClosedCycleCountsTotal")])
 }
 
 async function loadMoreCycleCounts(event: any) {