From 39e625b98e1125db07de78236ec077e9368f0a69 Mon Sep 17 00:00:00 2001
From: amansinghbais <singh11amanbais@gmail.com>
Date: Mon, 30 Dec 2024 16:18:38 +0530
Subject: [PATCH 1/2] Improved: empty state in case of no cycle count items and
 UI for the counted count for hard count (#555)

---
 src/utils/index.ts                | 8 ++++++--
 src/views/Assigned.vue            | 2 +-
 src/views/AssignedDetail.vue      | 4 ++--
 src/views/Closed.vue              | 2 +-
 src/views/Count.vue               | 4 ++--
 src/views/CountDetail.vue         | 2 +-
 src/views/DraftDetail.vue         | 2 +-
 src/views/PendingReview.vue       | 2 +-
 src/views/PendingReviewDetail.vue | 2 +-
 9 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/utils/index.ts b/src/utils/index.ts
index 4d30ff32..33e1b686 100644
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@@ -92,9 +92,13 @@ function timeFromNow(time: any) {
   return DateTime.local().plus(timeDiff).toRelative();
 }
 
-function getCycleCountStats(id: string) {
+function getCycleCountStats(id: string, isHardCount = false) {
   const stats = cycleCountStats(id)
-  return stats ? `${stats.itemCounted}/${stats.totalItems}` : "0/0"
+  if(stats) {
+    return isHardCount ? `${stats.itemCounted}` : `${stats.itemCounted}/${stats.totalItems}`
+  } else {
+    return isHardCount ? "0" : "0/0"
+  }
 }
 
 function getFacilityName(id: string) {
diff --git a/src/views/Assigned.vue b/src/views/Assigned.vue
index f28fbbaf..532d53d0 100644
--- a/src/views/Assigned.vue
+++ b/src/views/Assigned.vue
@@ -34,7 +34,7 @@
           
           <ion-label>
             <!-- TODO: make it dynamic currently not getting stats correctly -->
-            {{ getCycleCountStats(count.inventoryCountImportId) }}
+            {{ getCycleCountStats(count.inventoryCountImportId, count.countTypeEnumId === "HARD_COUNT") }}
             <p>{{ translate("counted") }}</p>
           </ion-label>
 
diff --git a/src/views/AssignedDetail.vue b/src/views/AssignedDetail.vue
index 473477ea..972c81cb 100644
--- a/src/views/AssignedDetail.vue
+++ b/src/views/AssignedDetail.vue
@@ -56,7 +56,7 @@
           </div>
           <div class="filters ion-padding">
             <ion-list>
-              <ion-item>
+              <ion-item v-if="currentCycleCount.countTypeEnumId !== 'HARD_COUNT'">
                 <ion-label>{{ translate("Progress") }}</ion-label>
                 <ion-label slot="end">{{ getProgress() }}</ion-label>
               </ion-item>
@@ -118,7 +118,7 @@
           </div>
         </template>
         <p v-else class="empty-state">
-          {{ translate("No items found") }}
+          {{ translate("No items added to count") }}
         </p>
       </template>
       <template v-else>
diff --git a/src/views/Closed.vue b/src/views/Closed.vue
index 7913a37d..2ea5b9c5 100644
--- a/src/views/Closed.vue
+++ b/src/views/Closed.vue
@@ -47,7 +47,7 @@
           </ion-chip>
 
           <ion-label>
-            {{ getCycleCountStats(count.inventoryCountImportId) }}
+            {{ getCycleCountStats(count.inventoryCountImportId, count.countTypeEnumId === "HARD_COUNT") }}
             <p>{{ translate("products counted") }}</p>
           </ion-label>
 
diff --git a/src/views/Count.vue b/src/views/Count.vue
index 866aa5d9..6bbcda07 100644
--- a/src/views/Count.vue
+++ b/src/views/Count.vue
@@ -58,7 +58,7 @@
                     <p>{{ getDateWithOrdinalSuffix(count.createdDate) }}</p>
                   </ion-label>
                 </ion-card-title>
-                <ion-note>{{ getCycleCountStats(count.inventoryCountImportId) }} {{ translate("items counted") }}</ion-note>
+                <ion-note>{{ getCycleCountStats(count.inventoryCountImportId, count.countTypeEnumId === "HARD_COUNT") }} {{ translate("items counted") }}</ion-note>
               </ion-card-header>
               <ion-item>
                 {{ translate("Due date") }}
@@ -83,7 +83,7 @@
                     <p>{{ getDateWithOrdinalSuffix(count.createdDate) }}</p>
                   </ion-label>
                 </ion-card-title>
-                <ion-note>{{ getCycleCountStats(count.inventoryCountImportId) }} {{ translate("items counted") }}</ion-note>
+                <ion-note>{{ getCycleCountStats(count.inventoryCountImportId, count.countTypeEnumId === "HARD_COUNT") }} {{ translate("items counted") }}</ion-note>
               </ion-card-header>
               <div class="header">
                 <div class="search">
diff --git a/src/views/CountDetail.vue b/src/views/CountDetail.vue
index ae32e931..5880faeb 100644
--- a/src/views/CountDetail.vue
+++ b/src/views/CountDetail.vue
@@ -201,7 +201,7 @@
           </template>
           <template v-else>
             <div class="empty-state">
-              <p>{{ translate("No products found.") }}</p>
+              <p>{{ translate("No items added to count") }}</p>
             </div>
           </template>
         </main>
diff --git a/src/views/DraftDetail.vue b/src/views/DraftDetail.vue
index a7986cae..b8bb8342 100644
--- a/src/views/DraftDetail.vue
+++ b/src/views/DraftDetail.vue
@@ -99,7 +99,7 @@
               <ion-icon slot="icon-only" :icon="isProductAvailableInCycleCount ? checkmarkCircle : addCircleOutline"/>
             </ion-button>
           </ion-item>
-          <p v-else-if="queryString">{{ translate("No product found") }}</p>
+          <p v-else-if="queryString">{{ translate("No items added to count") }}</p>
         </div>
 
         <hr />
diff --git a/src/views/PendingReview.vue b/src/views/PendingReview.vue
index 44bcb78f..b9d26820 100644
--- a/src/views/PendingReview.vue
+++ b/src/views/PendingReview.vue
@@ -34,7 +34,7 @@
           
           <ion-label>
             <!-- TODO: make it dynamic currently not getting stats correctly -->
-            {{ getCycleCountStats(count.inventoryCountImportId) }}
+            {{ getCycleCountStats(count.inventoryCountImportId, count.countTypeEnumId === "HARD_COUNT") }}
             <p>{{ translate("counted") }}</p>
           </ion-label>
 
diff --git a/src/views/PendingReviewDetail.vue b/src/views/PendingReviewDetail.vue
index e720dadf..0c57f666 100644
--- a/src/views/PendingReviewDetail.vue
+++ b/src/views/PendingReviewDetail.vue
@@ -153,7 +153,7 @@
         </template>
 
         <p v-else class="empty-state">
-          {{ translate("No items found") }}
+          {{ translate("No items added to count") }}
         </p>
       </template>
       <template v-else>

From 0f9eae3d88be57617ebfb66713a2a723c537dd17 Mon Sep 17 00:00:00 2001
From: amansinghbais <singh11amanbais@gmail.com>
Date: Mon, 30 Dec 2024 16:59:48 +0530
Subject: [PATCH 2/2] Improved: showing item instead of items in label for
 counts with only 1 item counted (#555)

---
 src/locales/en.json | 1 +
 src/views/Count.vue | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/locales/en.json b/src/locales/en.json
index 22206690..721e1200 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -138,6 +138,7 @@
   "inventory variance": "inventory variance", 
   "Instance Url": "Instance Url",
   "items": "items",
+  "item counted": "item counted",
   "items counted": "items counted",
   "Item has been removed from the cycle count": "Item has been removed from the cycle count",
   "Item added to upload list": "Item added to upload list",
diff --git a/src/views/Count.vue b/src/views/Count.vue
index 6bbcda07..8498c992 100644
--- a/src/views/Count.vue
+++ b/src/views/Count.vue
@@ -58,7 +58,7 @@
                     <p>{{ getDateWithOrdinalSuffix(count.createdDate) }}</p>
                   </ion-label>
                 </ion-card-title>
-                <ion-note>{{ getCycleCountStats(count.inventoryCountImportId, count.countTypeEnumId === "HARD_COUNT") }} {{ translate("items counted") }}</ion-note>
+                <ion-note>{{ getCycleCountStats(count.inventoryCountImportId, count.countTypeEnumId === "HARD_COUNT") }} {{ translate((count.countTypeEnumId === "HARD_COUNT" && getCycleCountStats(count.inventoryCountImportId, count.countTypeEnumId === "HARD_COUNT") === "1") ? "item counted" : "items counted") }}</ion-note>
               </ion-card-header>
               <ion-item>
                 {{ translate("Due date") }}
@@ -83,7 +83,7 @@
                     <p>{{ getDateWithOrdinalSuffix(count.createdDate) }}</p>
                   </ion-label>
                 </ion-card-title>
-                <ion-note>{{ getCycleCountStats(count.inventoryCountImportId, count.countTypeEnumId === "HARD_COUNT") }} {{ translate("items counted") }}</ion-note>
+                <ion-note>{{ getCycleCountStats(count.inventoryCountImportId, count.countTypeEnumId === "HARD_COUNT") }} {{ translate((count.countTypeEnumId === "HARD_COUNT" && getCycleCountStats(count.inventoryCountImportId, count.countTypeEnumId === "HARD_COUNT") === "1") ? "item counted" : "items counted") }}</ion-note>
               </ion-card-header>
               <div class="header">
                 <div class="search">