From 04ee7dfecb8388ffac3ed274567155d3740081f5 Mon Sep 17 00:00:00 2001
From: amansinghbais <singh11amanbais@gmail.com>
Date: Fri, 8 Nov 2024 16:14:54 +0530
Subject: [PATCH 1/7] Implemented: new scanning behaviour on the cycle count
 items (#429)

---
 src/views/CountDetail.vue | 246 +++++++++++++++++++-------------------
 1 file changed, 121 insertions(+), 125 deletions(-)

diff --git a/src/views/CountDetail.vue b/src/views/CountDetail.vue
index 0fe71473..eee569e5 100644
--- a/src/views/CountDetail.vue
+++ b/src/views/CountDetail.vue
@@ -11,7 +11,7 @@
         <aside class="filters">
           <div class="fixed-section">
             <ion-item lines="full">
-              <ion-input :label="translate('SKU')" :placeholder="translate('Scan or search products')" @ionFocus="selectSearchBarText($event)" v-model="queryString" @keyup.enter="searchProducts()"/>
+              <ion-input :label="translate('Scan items')" :placeholder="translate('Scan or search products')" @ionFocus="selectSearchBarText($event)" v-model="queryString" @keyup.enter="scanProduct()"/>
             </ion-item>
             <ion-segment v-model="selectedSegment" @ionChange="updateFilteredItems()">
               <template v-if="cycleCount?.statusId === 'INV_COUNT_ASSIGNED'">
@@ -51,8 +51,8 @@
               </template> 
             </ion-segment>
           </div>
-          <template v-if="filteredItems.length > 0">
-            <ProductItemList v-for="item in filteredItems" :key="item.inventoryCountImportId" :item="item"/>
+          <template v-if="itemsList?.length > 0">
+            <ProductItemList v-for="item in itemsList" :key="item.inventoryCountImportId" :item="item"/>
           </template>
           <template v-else>
             <div class="empty-state">
@@ -63,7 +63,7 @@
         <!--Product details-->
         <main class="main">
           <div class="product" @scroll="onScroll">
-            <div class="image ion-padding-top" v-for="item in filteredItems" :key="item.importItemSeqId" :data-product-id="item.productId" :data-seq="item.importItemSeqId" :id="`${item.productId}-${item.importItemSeqId}`">
+            <div class="image ion-padding-top" v-for="item in itemsList" :key="item.importItemSeqId" :data-product-id="item.productId" :data-seq="item.importItemSeqId" :id="`${item.productId}-${item.importItemSeqId}`">
               <Image :src="getProduct(item.productId)?.mainImageUrl" />
             </div>
           </div>
@@ -82,8 +82,8 @@
                 {{ translate("rejected") }}
               </ion-badge>
 
-              <ion-item lines="none" v-if="filteredItems.length">
-                <ion-label>{{ `${currentItemIndex + 1}/${filteredItems.length}` }}</ion-label>
+              <ion-item lines="none" v-if="itemsList?.length">
+                <ion-label>{{ `${currentItemIndex + 1}/${itemsList.length}` }}</ion-label>
               </ion-item>
 
               <ion-button @click="changeProduct('previous')" :disabled="isFirstItem">
@@ -112,30 +112,14 @@
             </ion-list>
             <template v-else>
               <ion-list v-if="product.isRecounting">
-                <!-- force scan -->
-                <template v-if="productStoreSettings['forceScan']">
-                  <ion-item lines="none">
-                    <ion-label slot="start">
-                      {{ translate('Force scan enabled') }}
-                      <p>{{ translate("Scan the barcode on each unit to increment the counted inventory") }}</p>
-                    </ion-label>
-                    <input type="text" class="hidden-input" v-model="scannedCount" ref="barcodeInput" @change="handleInput" @blur="handleBlur"/>
-                    <ion-button slot="end" expand="block" fill="outline" @click="focusInput">
-                      <ion-icon slot="start" :icon="cameraOutline" />
-                      {{ translate( isInputFocused ? "Scanning" : "Scan") }}
-                    </ion-button>
-                  </ion-item>
-                  <ion-item>
-                    <ion-label>{{ translate("Count") }}</ion-label>
-                    <ion-label slot="end">{{ inputCount }}</ion-label>
-                  </ion-item>
-                </template>
+                <ion-item>
+                  {{ translate("Current count") }}
+                  <ion-label slot="end">{{ product.quantity }}</ion-label>
+                </ion-item>
+                <ion-item>
+                  <ion-input :label="translate('New Count')" :disabled="productStoreSettings['forceScan']" :placeholder="translate('submit physical count')" name="value" v-model="inputCount" id="value" type="number" min="0" required @ionInput="calculateVariance();hasUnsavedChanges=true" @keydown="inputCountValidation"/>
+                </ion-item>
 
-                <template v-else>
-                  <ion-item>
-                    <ion-input :label="translate('Count')" :placeholder="translate('submit physical count')" name="value" v-model="inputCount" id="value" type="number" min="0" required @ionInput="calculateVariance" @keydown="inputCountValidation"/>
-                  </ion-item>
-                </template>
                 <template v-if="productStoreSettings['showQoh']">
                   <ion-item>
                     {{ translate("Current on hand") }}
@@ -186,30 +170,10 @@
               </ion-list>
               
               <ion-list v-else>
-                <!-- force scan -->
-                <template v-if="productStoreSettings['forceScan']">
-                  <ion-item lines="none">
-                    <ion-label slot="start">
-                      {{ translate('Force scan enabled') }}
-                      <p>{{ translate("Scan the barcode on each unit to increment the counted inventory") }}</p>
-                    </ion-label>
-                    <input type="text" class="hidden-input" v-model="scannedCount" ref="barcodeInput" @change="handleInput" @blur="handleBlur"/>
-                    <ion-button slot="end" fill="outline" @click="focusInput">
-                      <ion-icon slot="start" :icon="cameraOutline" />
-                      {{ translate( isInputFocused ? "Scanning" : "Scan") }}
-                    </ion-button>
-                  </ion-item>
-                  <ion-item>
-                    <ion-label>{{ translate("Count") }}</ion-label>
-                    <ion-label slot="end">{{ inputCount === '' ? 0 : inputCount }}</ion-label>
-                  </ion-item>
-                </template>
+                <ion-item>
+                  <ion-input :label="translate('Count')" :placeholder="translate('submit physical count')" :disabled="productStoreSettings['forceScan']" name="value" v-model="inputCount" id="value" type="number" min="0" required @ionInput="calculateVariance();hasUnsavedChanges=true" @keydown="inputCountValidation"/>
+                </ion-item>
 
-                <template v-else>
-                  <ion-item>
-                    <ion-input :label="translate('Count')" :placeholder="translate('submit physical count')" name="value" v-model="inputCount" id="value" type="number" min="0" required @ionInput="calculateVariance" @keydown="inputCountValidation"/>
-                  </ion-item>
-                </template>              
                 <template v-if="productStoreSettings['showQoh']">
                   <ion-item>
                     {{ translate("Current on hand") }}
@@ -226,7 +190,7 @@
               </ion-list>
             </template>
           </div>
-          <template v-if="!filteredItems.length">
+          <template v-if="!itemsList?.length">
             <div class="empty-state">
               <p>{{ translate("No products found.") }}</p>
             </div>
@@ -263,9 +227,10 @@ import {
   IonTitle,
   IonToolbar,
   onIonViewDidEnter,
+  onIonViewDidLeave,
   alertController
 } from '@ionic/vue';
-import { cameraOutline, chevronDownCircleOutline, chevronUpCircleOutline } from "ionicons/icons";
+import { chevronDownCircleOutline, chevronUpCircleOutline } from "ionicons/icons";
 import { translate } from '@/i18n'
 import { computed, defineProps, ref, onUpdated } from 'vue';
 import { useStore } from "@/store";
@@ -278,7 +243,7 @@ import { CountService } from '@/services/CountService';
 import { paperPlaneOutline } from "ionicons/icons"
 import Image from "@/components/Image.vue";
 import router from "@/router"
-
+import { onBeforeRouteLeave } from 'vue-router';
 
 const store = useStore();
 
@@ -288,7 +253,7 @@ const getCachedProducts = computed(() => store.getters["product/getCachedProduct
 const cycleCountItems = computed(() => store.getters["count/getCycleCountItems"]);
 const userProfile = computed(() => store.getters["user/getUserProfile"])
 const productStoreSettings = computed(() => store.getters["user/getProductStoreSettings"])
-const currentItemIndex = computed(() => !product.value ? 0 : filteredItems.value.findIndex((item) => item.productId === product?.value.productId && item.importItemSeqId === product?.value.importItemSeqId));
+const currentItemIndex = computed(() => !product.value ? 0 : itemsList?.value.findIndex((item) => item.productId === product?.value.productId && item.importItemSeqId === product?.value.importItemSeqId));
 
 const itemsList = computed(() => {
   if (selectedSegment.value === 'all') {
@@ -312,17 +277,14 @@ const props = defineProps(["id"]);
 let selectedSegment = ref('all');
 let cycleCount = ref([]);
 const queryString = ref('');
-const barcodeInput = ref(null);
-let filteredItems = ref([]);
 
 const inputCount = ref('');
-const scannedCount = ref('')
 const variance = ref(0);
 const isFirstItem = ref(true);
 const isLastItem = ref(false);
 const isScrolling = ref(false);
-const isInputFocused = ref(false)
-let previousItem = null;
+let previousItem = {};
+let hasUnsavedChanges = ref(false);
 
 // Update variance value when component is updated, ensuring it's prefilled with correct value when page loads.
 onUpdated(() => {
@@ -336,41 +298,51 @@ onIonViewDidEnter(async() => {
   await fetchCycleCountItems();
   selectedSegment.value = 'all';
   queryString.value = '';
-  updateFilteredItems();
   previousItem = itemsList.value[0]
   await store.dispatch("product/currentProduct", itemsList.value[0])
   updateNavigationState(0);
 })  
 
-async function focusInput() {
-  barcodeInput.value.focus();
-  isInputFocused.value = true;
-}
+onIonViewDidLeave(async() => {
+  await store.dispatch('count/updateCycleCountItems', []);
+})
 
-function handleBlur() {
-  isInputFocused.value = false;
-}
+onBeforeRouteLeave(async (to) => {
+  if(to.path === "/login") return;
+  console.log(hasUnsavedChanges.value);
+  
+  if(!hasUnsavedChanges.value) return true;
+  let leavePage = false;
 
-async function handleInput(event) {
-  if (!isInputFocused.value) return; 
+  const alert = await alertController.create({
+    header: translate("Leave page"),
+    message: translate("Any edits made in the counted quanity on this page will be lost."),
+    buttons: [
+      {
+        text: translate("STAY"),
+        handler: () => {
+          leavePage = false
+        }
+      },
+      {
+        text: translate("LEAVE"),
+        handler: () => {
+          leavePage = true
+        },
+      },
+    ],
+  });
 
-  let scannedValue = event.target.value;
-  if(!scannedValue) {
-    showToast(translate("Scan a valid product barcode identifier"));
-    return;
+  alert.present();
+  const data = await alert.onDidDismiss()
+  // If clicking backdrop just close the modal and do not redirect the user to previous page
+  if(data?.role === "backdrop") {
+    return false;
   }
 
-  const cachedProducts = getCachedProducts.value;
-  const barcodeIdentifer = productStoreSettings.value["barcodeIdentificationPref"];
-
-  const itemVal = getProductIdentificationValue(barcodeIdentifer, cachedProducts[product.value.productId]) ? getProductIdentificationValue(barcodeIdentifer, cachedProducts[product.value.productId]) : cachedProducts[product.value.productId]?.internalName
-  if(itemVal && itemVal === scannedValue) {
-    inputCount.value++;
-  } else {
-    showToast(translate('Scanned item does not match current product')); 
-  }
-  scannedCount.value = ''
-}
+  if(leavePage) hasUnsavedChanges = false;
+  return leavePage
+})
 
 function inputCountValidation(event) {
   if(/[`!@#$%^&*()_+\-=\\|,.<>?~e]/.test(event.key) && event.key !== 'Backspace') event.preventDefault();
@@ -409,28 +381,70 @@ function selectSearchBarText(event) {
   })
 }
 
-async function searchProducts() {
-  updateFilteredItems(); 
-}
+async function scanProduct() {
+  if(!queryString.value) {
+    showToast(translate("Please provide a valid barcode identifier."))
+    return;
+  }
 
-function updateFilteredItems() {
-  if (!queryString.value.trim()) {
-    filteredItems.value = itemsList.value;
+  const barcodeIdentifier = productStoreSettings.value["barcodeIdentificationPref"];
+  const cachedProducts = getCachedProducts.value;
+
+  let selectedItem = {}
+
+  if(cycleCount.value.statusId === 'INV_COUNT_ASSIGNED') {
+    selectedItem = itemsList.value.find((item) => {
+      const itemVal = barcodeIdentifier ? getProductIdentificationValue(barcodeIdentifier, cachedProducts[item.productId]) : item.internalName;
+      return itemVal === queryString.value && item.itemStatusId === "INV_COUNT_CREATED";
+    });
+
+    if(!selectedItem) {
+      selectedItem = itemsList.value.find((item) => {
+        const itemVal = barcodeIdentifier ? getProductIdentificationValue(barcodeIdentifier, cachedProducts[item.productId]) : item.internalName;
+        return itemVal === queryString.value;
+      });
+    }
   } else {
-    filteredItems.value = itemsList.value.filter(item => {
-      const product = getProduct.value(item.productId);
-      return product.sku.toLowerCase().includes(queryString.value.trim().toLowerCase());
+    selectedItem = itemsList.value.find((item) => {
+      const itemVal = barcodeIdentifier ? getProductIdentificationValue(barcodeIdentifier, cachedProducts[item.productId]) : item.internalName;
+      return itemVal === queryString.value;
     });
   }
-  if (filteredItems.value.length > 0) {
+
+  if(!selectedItem) {
+    showToast(translate("Scanned item is not present in the count."))
+    return;
+  }
+
+  const isAlreadySelected = (product.value.productId === selectedItem.productId && product.value.importItemSeqId === selectedItem.importItemSeqId);
+  if(!isAlreadySelected) {
+    hasUnsavedChanges.value = false;
+    await store.dispatch('product/currentProduct', { ...selectedItem, isRecounting: false });
+    router.replace({ hash: `#${selectedItem.productId}-${selectedItem.importItemSeqId}` }); 
+    setTimeout(() => {
+      const element = document.getElementById(`${selectedItem.productId}-${selectedItem.importItemSeqId}`);
+      if (element) {
+        element.scrollIntoView({ behavior: 'smooth' });
+      }
+    }, 0);
+  } else if(selectedItem.itemStatusId === "INV_COUNT_CREATED") {
+    if(!selectedItem.quantity || product.value.isRecounting) {
+      hasUnsavedChanges.value = true;
+      inputCount.value++
+    }
+  }
+}
+
+function updateFilteredItems() {
+  if (itemsList.value.length > 0) {
     // As we want to get the index of the product, if we directly store the product in the updatedProduct variable it does not return the index
     // as both the object becomes different because of the reference, so if we have a product, then first finding it in the filtered list to have a common reference and then getting the index
-    const updatedProduct = Object.keys(product.value)?.length ? filteredItems.value.find((item) => item.productId === product.value.productId && item.importItemSeqId === product.value.importItemSeqId) : filteredItems.value[0]
+    const updatedProduct = Object.keys(product.value)?.length ? itemsList.value.find((item) => item.productId === product.value.productId && item.importItemSeqId === product.value.importItemSeqId) : itemsList.value[0]
     if (updatedProduct) {
       store.dispatch("product/currentProduct", updatedProduct);
-      updateNavigationState(filteredItems.value.indexOf(updatedProduct));
+      updateNavigationState(itemsList.value.indexOf(updatedProduct));
     } else {
-      store.dispatch("product/currentProduct", product.value);
+      store.dispatch("product/currentProduct", itemsList.value[0]);
       updateNavigationState(0);
     }
   } else {
@@ -438,7 +452,7 @@ function updateFilteredItems() {
     isFirstItem.value = true
     isLastItem.value = false
   }  
-} 
+}
 
 // This function observes the scroll event on the main element, creates an IntersectionObserver to track when products come into view, 
 // and updates the current product state and navigation when a product intersects with the main element.
@@ -451,7 +465,7 @@ const onScroll = (event) => {
       if (entry.isIntersecting) {
         const productId = entry.target.dataset.productId;
         const seqId = entry.target.dataset.seq;
-        const currentProduct = filteredItems.value.find((item) => item.productId === productId && item.importItemSeqId === seqId);
+        const currentProduct = itemsList.value?.find((item) => item.productId === productId && item.importItemSeqId === seqId);
         
         if(previousItem.productId !== currentProduct.productId || previousItem.importItemSeqId !== currentProduct.importItemSeqId) {
           if(inputCount.value) saveCount(previousItem);
@@ -459,7 +473,7 @@ const onScroll = (event) => {
         previousItem = currentProduct  // Update the previousItem variable with the current item
 
         if (currentProduct) {
-          const currentIndex = filteredItems.value.indexOf(currentProduct);
+          const currentIndex = itemsList.value?.indexOf(currentProduct);
           store.dispatch("product/currentProduct", currentProduct);
           updateNavigationState(currentIndex);
           router.replace({ hash: `#${productId}-${seqId}` });
@@ -480,18 +494,18 @@ const onScroll = (event) => {
 // Add this function to update the navigation state
 const updateNavigationState = (currentIndex) => {
   isFirstItem.value = currentIndex === 0;
-  isLastItem.value = currentIndex === filteredItems.value.length - 1;
+  isLastItem.value = currentIndex === itemsList.value.length - 1;
 };
 
 async function changeProduct(direction) {
   if (isScrolling.value) return;
   isScrolling.value = true;
 
-  const currentItemIndex = filteredItems.value.findIndex((item) => item.productId === product.value.productId && item.importItemSeqId === product.value.importItemSeqId);
+  const currentItemIndex = itemsList.value.findIndex((item) => item.productId === product.value.productId && item.importItemSeqId === product.value.importItemSeqId);
   const index = (direction === 'next') ? currentItemIndex + 1 : currentItemIndex - 1;
 
-  if (index >= 0 && index < filteredItems.value.length) {
-    const product = filteredItems.value[index];
+  if (index >= 0 && index < itemsList.value.length) {
+    const product = itemsList.value[index];
     const productEl = document.querySelector(`[data-seq="${product.importItemSeqId}"]`);
     if (productEl) productEl.scrollIntoView({ behavior: 'smooth' });
     await new Promise(resolve => setTimeout(resolve, 500));
@@ -570,7 +584,7 @@ async function openRecountAlert() {
     {
       text: translate('Re-count'),
       handler: () => {
-        inputCount.value = product.value.quantity; 
+        inputCount.value = 0; 
         product.value.isRecounting = true;
       }
     }]
@@ -646,24 +660,6 @@ async function readyForReview() {
   });
   await alert.present();
 }
-
-async function findProduct(sku) {
-  if(!sku) return;
-
-  let resp;
-  const viewSize = 1, viewIndex = 0;
-
-  try {
-    resp = await store.dispatch("product/findProduct", { queryString: sku,  viewSize, viewIndex})
-    if (!hasError(resp)) {
-      return resp;
-    } else {
-      throw resp.data
-    }
-  } catch(err) {
-    logger.error("Product not found", err)
-  }
-}
 </script>
 
 <style scoped>

From d10313eb6b1bc28f8be923a170f43e90a926417b Mon Sep 17 00:00:00 2001
From: amansinghbais <singh11amanbais@gmail.com>
Date: Fri, 8 Nov 2024 18:11:45 +0530
Subject: [PATCH 2/7] Improved: added in entry in locale for the translation of
 static text and reverted unused locale entries (#429)

---
 src/locales/en.json       | 11 ++++++-----
 src/views/CountDetail.vue |  5 -----
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/locales/en.json b/src/locales/en.json
index fb247111..7d8974d5 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -9,6 +9,7 @@
   "All": "All",
   "All facilities selected": "All facilities selected",
   "All of the item(s) are accepted": "All of the item(s) are accepted",
+  "Any edits made in the counted quanity on this page will be lost.": "Any edits made in the counted quanity on this page will be lost.",
   "Add product": "Add product",
   "Add to count": "Add to count",
   "Added product to count": "Added product to count",
@@ -59,6 +60,7 @@
   "Created": "Created",
   "CSV data is missing or incorrect. Please check your file.": "CSV data is missing or incorrect. Please check your file.",
   "CSV Mapping": "CSV Mapping",
+  "Current count": "Current count",
   "Cycle Count": "Cycle Count",
   "Cycle count": "Cycle count",
   "Cycle count cancelled successfully.": "Cycle count cancelled successfully.",
@@ -117,7 +119,6 @@
   "Filters": "Filters",
   "File uploaded successfully": "File uploaded successfully",
   "Force scan": "Force scan",
-  "Force scan enabled": "Force scan enabled",
   "Go to Launchpad": "Go to Launchpad",
   "Go to OMS": "Go to OMS",
   "If a file includes multiple facilities, a count is created for every facility. All items with no facility location will be added to the same count.": "If a file includes multiple facilities, a count is created for every facility. All items with no facility location will be added to the same count.",
@@ -135,6 +136,8 @@
   "last counted 1 week ago": "last counted 1 week ago",
   "last counted": "last counted",
   "Last submitted date": "Last submitted date",
+  "LEAVE": "LEAVE",
+  "Leave page": "Leave page",
   "Loading": "Loading",
   "Loading cycle count details": "Loading cycle count details",
   "Location": "Location",
@@ -173,6 +176,7 @@
   "Pending review": "Pending review",
   "Please upload a valid csv to continue": "Please upload a valid csv to continue",
   "Please contact the administrator.": "Please contact the administrator.",
+  "Please provide a valid barcode identifier.": "Please provide a valid barcode identifier.",
   "Please select at least one field to generate CSV": "Please select at least one field to generate CSV",
   "Please select a Product identifier": "Please select a Product identifier",
   "No product found, please verify your CSV": "No product found, please verify your CSV",
@@ -218,12 +222,9 @@
   "Save new count": "Save new count",
   "Saved mappings": "Saved mappings",
   "Saving recount will replace the existing count for item.": "Saving recount will replace the existing count for item.",
-  "Scan": "Scan",
-  "Scanning": "Scanning",
   "Scan items": "Scan items",
   "Scanned item does not match current product": "Scanned item does not match current product",
   "Scan or search products": "Scan or search products",
-  "Scan a valid product barcode identifier": "Scan a valid product barcode identifier",
   "Scanned quantity": "Scanned quantity",
   "selected": "selected",
   "Select": "Select",
@@ -247,7 +248,6 @@
   "Select a different time zone": "Select a different time zone",
   "Set facility": "Set facility",
   "Settings": "Settings",
-  "Scan the barcode on each unit to increment the counted inventory": "Scan the barcode on each unit to increment the counted inventory",
   "Shopify Config": "Shopify Config",
   "Show systemic inventory": "Show systemic inventory",
   "Show the current physical quantity expected at locations while counting to help gauge inventory accuracy.": "Show the current physical quantity expected at locations while counting to help gauge inventory accuracy.",
@@ -259,6 +259,7 @@
   "Something went wrong while login. Please contact administrator": "Something went wrong while login. Please contact administrator.",
   "Specify which facility you want to operate from. Order, inventory and other configuration data will be specific to the facility you select.": "Specify which facility you want to operate from. Order, inventory and other configuration data will be specific to the facility you select.",
   "Status": "Status",
+  "STAY": "STAY",
   "Stock": "Stock",
   "Store": "Store",
   "Submission date": "Submission date",
diff --git a/src/views/CountDetail.vue b/src/views/CountDetail.vue
index eee569e5..01911776 100644
--- a/src/views/CountDetail.vue
+++ b/src/views/CountDetail.vue
@@ -668,11 +668,6 @@ ion-list {
   min-width: 400px;
 }
 
-.hidden-input {
-  position: absolute; 
-  opacity: 0
-}
-
 .find {
   display: grid;
   height: 100%;

From 05fcc1215449da08981c3e802a55394c8fb04b55 Mon Sep 17 00:00:00 2001
From: amansinghbais <singh11amanbais@gmail.com>
Date: Fri, 8 Nov 2024 18:33:53 +0530
Subject: [PATCH 3/7] Fixed: management of variable for checking saved changes
 before route leave (#429)

---
 src/views/CountDetail.vue | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/views/CountDetail.vue b/src/views/CountDetail.vue
index 01911776..2736526d 100644
--- a/src/views/CountDetail.vue
+++ b/src/views/CountDetail.vue
@@ -113,11 +113,7 @@
             <template v-else>
               <ion-list v-if="product.isRecounting">
                 <ion-item>
-                  {{ translate("Current count") }}
-                  <ion-label slot="end">{{ product.quantity }}</ion-label>
-                </ion-item>
-                <ion-item>
-                  <ion-input :label="translate('New Count')" :disabled="productStoreSettings['forceScan']" :placeholder="translate('submit physical count')" name="value" v-model="inputCount" id="value" type="number" min="0" required @ionInput="calculateVariance();hasUnsavedChanges=true" @keydown="inputCountValidation"/>
+                  <ion-input :label="translate('Count')" :disabled="productStoreSettings['forceScan']" :placeholder="translate('submit physical count')" name="value" v-model="inputCount" id="value" type="number" min="0" required @ionInput="calculateVariance();hasUnsavedChanges=true" @keydown="inputCountValidation"/>
                 </ion-item>
 
                 <template v-if="productStoreSettings['showQoh']">
@@ -451,7 +447,7 @@ function updateFilteredItems() {
     store.dispatch("product/currentProduct", {});
     isFirstItem.value = true
     isLastItem.value = false
-  }  
+  }
 }
 
 // This function observes the scroll event on the main element, creates an IntersectionObserver to track when products come into view, 
@@ -566,6 +562,7 @@ async function saveCount(currentProduct) {
     } else {
       throw resp.data;
     }
+    hasUnsavedChanges.value = false;
     updateFilteredItems();
   } catch (err) {
     logger.error(err);
@@ -628,6 +625,7 @@ async function discardRecount() {
       handler: async () => {
         inputCount.value = ''; 
         product.value.isRecounting = false;
+        hasUnsavedChanges.value = false;
       }
     }]
   });

From 75bd642bf7b6d960801bdf9075e92be6f1996f6b Mon Sep 17 00:00:00 2001
From: amansinghbais <singh11amanbais@gmail.com>
Date: Fri, 8 Nov 2024 19:20:48 +0530
Subject: [PATCH 4/7] Fixed: variance calculation on the item change and item
 counted with 0 showing in the pending (#429)

---
 src/views/CountDetail.vue | 32 ++++++++++++--------------------
 1 file changed, 12 insertions(+), 20 deletions(-)

diff --git a/src/views/CountDetail.vue b/src/views/CountDetail.vue
index 2736526d..58c57714 100644
--- a/src/views/CountDetail.vue
+++ b/src/views/CountDetail.vue
@@ -106,14 +106,14 @@
                 </ion-item>
                 <ion-item v-if="product.itemStatusId !== 'INV_COUNT_REJECTED'">
                   {{ translate("Variance") }}
-                  <ion-label slot="end">{{ getVariance(product) }}</ion-label>
+                  <ion-label slot="end">{{ getVariance(product, false) }}</ion-label>
                 </ion-item>
               </template>
             </ion-list>
             <template v-else>
               <ion-list v-if="product.isRecounting">
                 <ion-item>
-                  <ion-input :label="translate('Count')" :disabled="productStoreSettings['forceScan']" :placeholder="translate('submit physical count')" name="value" v-model="inputCount" id="value" type="number" min="0" required @ionInput="calculateVariance();hasUnsavedChanges=true" @keydown="inputCountValidation"/>
+                  <ion-input :label="translate('Count')" :disabled="productStoreSettings['forceScan']" :placeholder="translate('submit physical count')" name="value" v-model="inputCount" id="value" type="number" min="0" required @ionInput="hasUnsavedChanges=true" @keydown="inputCountValidation"/>
                 </ion-item>
 
                 <template v-if="productStoreSettings['showQoh']">
@@ -123,7 +123,7 @@
                   </ion-item>
                   <ion-item>
                     {{ translate("Variance") }}
-                    <ion-label slot="end">{{ variance }}</ion-label>
+                    <ion-label slot="end">{{ getVariance(product, true) }}</ion-label>
                   </ion-item>
                 </template>
                 <div class="ion-margin">
@@ -157,7 +157,7 @@
                   </ion-item>
                   <ion-item v-if="product.itemStatusId !== 'INV_COUNT_REJECTED'">
                     {{ translate("Variance") }}
-                    <ion-label slot="end">{{ getVariance(product) }}</ion-label>
+                    <ion-label slot="end">{{ getVariance(product, false) }}</ion-label>
                   </ion-item>
                 </template>
                 <ion-button v-if="!['INV_COUNT_REJECTED', 'INV_COUNT_COMPLETED'].includes(product.itemStatusId)" class="ion-margin" fill="outline" expand="block" @click="openRecountAlert()">
@@ -167,7 +167,7 @@
               
               <ion-list v-else>
                 <ion-item>
-                  <ion-input :label="translate('Count')" :placeholder="translate('submit physical count')" :disabled="productStoreSettings['forceScan']" name="value" v-model="inputCount" id="value" type="number" min="0" required @ionInput="calculateVariance();hasUnsavedChanges=true" @keydown="inputCountValidation"/>
+                  <ion-input :label="translate('Count')" :placeholder="translate('submit physical count')" :disabled="productStoreSettings['forceScan']" name="value" v-model="inputCount" id="value" type="number" min="0" required @ionInput="hasUnsavedChanges=true" @keydown="inputCountValidation"/>
                 </ion-item>
 
                 <template v-if="productStoreSettings['showQoh']">
@@ -177,7 +177,7 @@
                   </ion-item>
                   <ion-item>
                     {{ translate("Variance") }}
-                    <ion-label slot="end">{{ variance }}</ion-label>
+                    <ion-label slot="end">{{ getVariance(product, true) }}</ion-label>
                   </ion-item>
                 </template>
                 <ion-button v-if="!['INV_COUNT_REJECTED', 'INV_COUNT_COMPLETED'].includes(product.itemStatusId)" class="ion-margin" expand="block" @click="saveCount(product)">
@@ -255,9 +255,9 @@ const itemsList = computed(() => {
   if (selectedSegment.value === 'all') {
     return cycleCountItems.value.itemList;
   } else if (selectedSegment.value === 'pending') {
-    return cycleCountItems.value.itemList.filter(item =>!item.quantity);
+    return cycleCountItems.value.itemList.filter(item =>(item.quantity === undefined || item.quantity === null));
   } else if (selectedSegment.value === 'counted') {
-    return cycleCountItems.value.itemList.filter(item => item.quantity);
+    return cycleCountItems.value.itemList.filter(item => item.quantity >= 0);
   } else if (selectedSegment.value === 'notCounted') {
     return cycleCountItems.value.itemList.filter(item => !item.quantity && item.statusId === "INV_COUNT_REVIEW");
   } else if (selectedSegment.value === 'rejected') {
@@ -275,7 +275,6 @@ let cycleCount = ref([]);
 const queryString = ref('');
 
 const inputCount = ref('');
-const variance = ref(0);
 const isFirstItem = ref(true);
 const isLastItem = ref(false);
 const isScrolling = ref(false);
@@ -284,7 +283,6 @@ let hasUnsavedChanges = ref(false);
 
 // Update variance value when component is updated, ensuring it's prefilled with correct value when page loads.
 onUpdated(() => {
-  calculateVariance();
   isFirstItem.value = true
   isLastItem.value = false
 })
@@ -511,22 +509,16 @@ async function changeProduct(direction) {
   isScrolling.value = false;
 }
 
-async function calculateVariance() {
-  if (!product.value || !inputCount.value) {
-    variance.value = 0;
-  } else {
-    variance.value = parseInt(inputCount.value) - parseInt(product.value.qoh) || 0;
-  }
-}
 
-function getVariance(item , count) {
+function getVariance(item , isRecounting) {
   const qty = item.quantity
-  if(!qty) {
+  if(isRecounting && inputCount.value === "") return 0;
+  if(!isRecounting && !qty && qty !== 0) {
     return 0;
   }
 
   // As the item is rejected there is no meaning of displaying variance hence added check for REJECTED item status
-  return item.itemStatusId === "INV_COUNT_REJECTED" ? 0 : parseInt(count ? count : qty) - parseInt(item.qoh)
+  return item.itemStatusId === "INV_COUNT_REJECTED" ? 0 : parseInt(isRecounting ? inputCount.value : qty) - parseInt(item.qoh)
 }
 
 async function saveCount(currentProduct) {

From 2912fce328f0009bcbee77a2cbbace9839a522c5 Mon Sep 17 00:00:00 2001
From: amansinghbais <singh11amanbais@gmail.com>
Date: Fri, 8 Nov 2024 19:28:37 +0530
Subject: [PATCH 5/7] Reverted: unwanted console statement in the code (#429)

---
 src/views/CountDetail.vue | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/views/CountDetail.vue b/src/views/CountDetail.vue
index 58c57714..b07576c5 100644
--- a/src/views/CountDetail.vue
+++ b/src/views/CountDetail.vue
@@ -303,8 +303,6 @@ onIonViewDidLeave(async() => {
 
 onBeforeRouteLeave(async (to) => {
   if(to.path === "/login") return;
-  console.log(hasUnsavedChanges.value);
-  
   if(!hasUnsavedChanges.value) return true;
   let leavePage = false;
 

From 0e352f178f153288efacc60059504ddc070f267e Mon Sep 17 00:00:00 2001
From: amansinghbais <singh11amanbais@gmail.com>
Date: Mon, 11 Nov 2024 11:51:19 +0530
Subject: [PATCH 6/7] Fixed: typo in alert description, increment count case
 with 0 quantity counted items, and optimized code to find item (#429)

---
 src/locales/en.json       |  2 +-
 src/views/CountDetail.vue | 14 +++++---------
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/locales/en.json b/src/locales/en.json
index 7d8974d5..98b9d81d 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -9,7 +9,7 @@
   "All": "All",
   "All facilities selected": "All facilities selected",
   "All of the item(s) are accepted": "All of the item(s) are accepted",
-  "Any edits made in the counted quanity on this page will be lost.": "Any edits made in the counted quanity on this page will be lost.",
+  "Any edits made in the counted quantity on this page will be lost.": "Any edits made in the counted quantity on this page will be lost.",
   "Add product": "Add product",
   "Add to count": "Add to count",
   "Added product to count": "Added product to count",
diff --git a/src/views/CountDetail.vue b/src/views/CountDetail.vue
index b07576c5..a97751e3 100644
--- a/src/views/CountDetail.vue
+++ b/src/views/CountDetail.vue
@@ -308,7 +308,7 @@ onBeforeRouteLeave(async (to) => {
 
   const alert = await alertController.create({
     header: translate("Leave page"),
-    message: translate("Any edits made in the counted quanity on this page will be lost."),
+    message: translate("Any edits made in the counted quantity on this page will be lost."),
     buttons: [
       {
         text: translate("STAY"),
@@ -390,13 +390,9 @@ async function scanProduct() {
       return itemVal === queryString.value && item.itemStatusId === "INV_COUNT_CREATED";
     });
 
-    if(!selectedItem) {
-      selectedItem = itemsList.value.find((item) => {
-        const itemVal = barcodeIdentifier ? getProductIdentificationValue(barcodeIdentifier, cachedProducts[item.productId]) : item.internalName;
-        return itemVal === queryString.value;
-      });
-    }
-  } else {
+  }
+
+  if(!selectedItem) {
     selectedItem = itemsList.value.find((item) => {
       const itemVal = barcodeIdentifier ? getProductIdentificationValue(barcodeIdentifier, cachedProducts[item.productId]) : item.internalName;
       return itemVal === queryString.value;
@@ -420,7 +416,7 @@ async function scanProduct() {
       }
     }, 0);
   } else if(selectedItem.itemStatusId === "INV_COUNT_CREATED") {
-    if(!selectedItem.quantity || product.value.isRecounting) {
+    if((!selectedItem.quantity && selectedItem.quantity !== 0) || product.value.isRecounting) {
       hasUnsavedChanges.value = true;
       inputCount.value++
     }

From cb195b209707681a8cc32617c338a3a195ea5fba Mon Sep 17 00:00:00 2001
From: amansinghbais <singh11amanbais@gmail.com>
Date: Mon, 11 Nov 2024 15:32:40 +0530
Subject: [PATCH 7/7] Fixed: issue in rejected item in assigned count (#429)

---
 src/views/CountDetail.vue | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/views/CountDetail.vue b/src/views/CountDetail.vue
index a97751e3..0c186b80 100644
--- a/src/views/CountDetail.vue
+++ b/src/views/CountDetail.vue
@@ -166,7 +166,11 @@
               </ion-list>
               
               <ion-list v-else>
-                <ion-item>
+                <ion-item v-if="product.itemStatusId === 'INV_COUNT_REJECTED' || product.itemStatusId === 'INV_COUNT_COMPLETED'">
+                  {{ translate("Counted") }}
+                  <ion-label slot="end">{{ product.quantity || "-" }}</ion-label>
+                </ion-item>
+                <ion-item v-else>
                   <ion-input :label="translate('Count')" :placeholder="translate('submit physical count')" :disabled="productStoreSettings['forceScan']" name="value" v-model="inputCount" id="value" type="number" min="0" required @ionInput="hasUnsavedChanges=true" @keydown="inputCountValidation"/>
                 </ion-item>
 
@@ -389,10 +393,9 @@ async function scanProduct() {
       const itemVal = barcodeIdentifier ? getProductIdentificationValue(barcodeIdentifier, cachedProducts[item.productId]) : item.internalName;
       return itemVal === queryString.value && item.itemStatusId === "INV_COUNT_CREATED";
     });
-
   }
 
-  if(!selectedItem) {
+  if(!selectedItem || !Object.keys(selectedItem).length) {
     selectedItem = itemsList.value.find((item) => {
       const itemVal = barcodeIdentifier ? getProductIdentificationValue(barcodeIdentifier, cachedProducts[item.productId]) : item.internalName;
       return itemVal === queryString.value;