Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improved: clearing the hard count component state on leaving the component and added empty state (#528) #552

Merged
merged 4 commits into from
Dec 27, 2024
Merged

Improved: clearing the hard count component state on leaving the component and added empty state (#528) #552

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a04538a
Improved: clearing the hard count component state on leaving the comp…
amansinghbais Dec 27, 2024
9c8e007
Fixed: stopped enable scrolling in the facility group (#528)
amansinghbais Dec 27, 2024
74adfae
Implemented: logic to save the count of the unmatched product when ma…
amansinghbais Dec 27, 2024
de303c5
Improved: the condition for saving the count of the unmatched product…
amansinghbais Dec 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/locales/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,8 @@
"Nearest due": "Nearest due",
"No cycle counts found": "No cycle counts found",
"No data found": "No data found",
"No facility found.": "No facility found.",
"No facility group found.": "No facility group found.",
"No items found": "No items found",
"No new file upload. Please try again.": "No new file upload. Please try again.",
"No products found.": "No products found.",
Expand Down
59 changes: 39 additions & 20 deletions src/views/HardCount.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</ion-toolbar>
</ion-header>

<ion-content class="main-content" ref="contentRef" :scroll-events="true" @ionScroll="enableScrolling()">
<ion-content class="main-content" ref="contentRef" :scroll-events="true" @ionScroll="selectedSegment === 'individual' ? enableScrolling() : ''">
<div class="header">
<div class="search">
<ion-item lines="none" class="ion-padding">
Expand Down Expand Up @@ -67,28 +67,38 @@
</ion-segment>

<ion-list v-if="selectedSegment === 'group'">
<ion-list-header>{{ translate("Select a facility group to hard count") }}</ion-list-header>

<ion-radio-group v-model="selectedFacilityGroupId">
<ion-item v-for="group in facilityGroups" :key="group.facilityGroupId">
<ion-radio :value="group.facilityGroupId">{{ group.facilityGroupName }}</ion-radio>
</ion-item>
</ion-radio-group>
<template v-if="facilityGroups?.length">
<ion-list-header>{{ translate("Select a facility group to hard count") }}</ion-list-header>

<ion-radio-group v-model="selectedFacilityGroupId">
<ion-item v-for="group in facilityGroups" :key="group.facilityGroupId">
<ion-radio :value="group.facilityGroupId">{{ group.facilityGroupName }}</ion-radio>
</ion-item>
</ion-radio-group>
</template>
<div v-else class="empty-state">
<p>{{ translate("No facility group found.") }}</p>
</div>
</ion-list>
<div v-else>
<ion-searchbar v-model="queryString" :placeholder="translate('Search facilities')" @keyup.enter="fetchFacilities()" />

<ion-list>
<ion-list-header>{{ translate("Select facilities to hard count") }}</ion-list-header>

<ion-item v-for="facility in facilities" :key="facility.facilityId">
<ion-checkbox :checked="selectedFacilityIds.includes(facility.facilityId)" @ionChange="toggleFacilitySelection(facility.facilityId)">
<ion-label>
{{ facility.facilityName ? facility.facilityName : facility.facilityId }}
<p>{{ facility.facilityId }}</p>
</ion-label>
</ion-checkbox>
</ion-item>
<template v-if="facilities?.length">
<ion-list-header>{{ translate("Select facilities to hard count") }}</ion-list-header>

<ion-item v-for="facility in facilities" :key="facility.facilityId">
<ion-checkbox :checked="selectedFacilityIds.includes(facility.facilityId)" @ionChange="toggleFacilitySelection(facility.facilityId)">
<ion-label>
{{ facility.facilityName ? facility.facilityName : facility.facilityId }}
<p>{{ facility.facilityId }}</p>
</ion-label>
</ion-checkbox>
</ion-item>
</template>
<div v-else class="empty-state">
<p>{{ translate("No facility found.") }}</p>
</div>
</ion-list>

<ion-infinite-scroll
Expand All @@ -115,7 +125,7 @@
<script setup lang="ts">
import { translate } from "@/i18n";
import { calendarNumberOutline, checkmarkDoneOutline, storefrontOutline } from "ionicons/icons";
import { IonBackButton, IonButton, IonCheckbox, IonContent, IonDatetime, IonFab, IonFabButton, IonHeader, IonIcon, IonInfiniteScroll, IonInfiniteScrollContent, IonInput, IonItem, IonLabel, IonList, IonListHeader, IonModal, IonPage, IonRadio, IonRadioGroup, IonSearchbar, IonSegment, IonSegmentButton, IonTitle, IonToggle, IonToolbar, onIonViewWillEnter} from "@ionic/vue";
import { IonBackButton, IonButton, IonCheckbox, IonContent, IonDatetime, IonFab, IonFabButton, IonHeader, IonIcon, IonInfiniteScroll, IonInfiniteScrollContent, IonInput, IonItem, IonLabel, IonList, IonListHeader, IonModal, IonPage, IonRadio, IonRadioGroup, IonSearchbar, IonSegment, IonSegmentButton, IonTitle, IonToggle, IonToolbar, onIonViewWillEnter, onIonViewWillLeave} from "@ionic/vue";
import { ref, nextTick, computed, Ref } from "vue"
import { hasError, getDateTime, getDateWithOrdinalSuffix, handleDateTimeInput, showToast } from "@/utils";
import logger from "@/logger"
Expand All @@ -124,7 +134,7 @@ import store from "@/store";
import router from "@/router"
import { UtilService } from "@/services/UtilService";

const countName = ref(`Hard count - ${DateTime.now().toFormat('dd-MM-yyyy hh:mm:ss')}`);
const countName = ref("");
const selectedSegment = ref("group");
const dueDate = ref("") as Ref<number | string>;
const queryString = ref("");
Expand All @@ -143,9 +153,18 @@ const infiniteScrollRef = ref("");
const facilityGroups = computed(() => store.getters["util/getFacilityGroups"])

onIonViewWillEnter(async () => {
countName.value = `Hard count - ${DateTime.now().toFormat('dd-MM-yyyy hh:mm:ss')}`;
await Promise.allSettled([store.dispatch("util/fetchFacilityGroups"), fetchFacilities()]);
})

onIonViewWillLeave(() => {
selectedFacilityGroupId.value = "";
selectedFacilityIds.value = [];
selectedSegment.value = "group";
dueDate.value = "";
isAutoAssignEnabled.value = false;
})

async function saveCount() {
if(selectedSegment.value === "group" && !selectedFacilityGroupId.value) {
showToast(translate("Please select a facility group."))
Expand Down
18 changes: 13 additions & 5 deletions src/views/HardCountDetail.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -463,19 +463,27 @@ async function updateCurrentItemInList(newItem: any, scannedValue: string) {
updatedItem = { ...updatedItem, ...newItem, isMatching: false }
updatedItem["isMatchNotFound"] = newItem?.importItemSeqId ? false : true

let newCount = "" as any;
if(updatedItem && updatedItem.scannedId !== updatedProduct.scannedId && updatedItem?.scannedCount) {
newCount = updatedItem.scannedCount
} else if(selectedSegment.value === "unmatched" && (inputCount.value || updatedItem.scannedCount)) {
newCount = Number(inputCount.value || 0) + Number(updatedItem.scannedCount || 0)
}

if(newCount) {
try {
const resp = await CountService.updateCount({
inventoryCountImportId: cycleCount.value.inventoryCountImportId,
importItemSeqId: updatedItem?.importItemSeqId,
productId: updatedItem.productId,
quantity: updatedItem.scannedCount,
quantity: newCount,
countedByUserLoginId: userProfile.value.username
})

if(hasError(resp)) {
updatedItem["quantity"] = updatedItem.scannedCount
if(!hasError(resp)) {
updatedItem["quantity"] = newCount
delete updatedItem["scannedCount"];
inputCount.value = ""
}
} catch(error) {
logger.error(error)
Expand Down Expand Up @@ -629,7 +637,7 @@ async function matchProduct(currentProduct: any) {
if(result.data?.selectedProduct) {
const product = result.data.selectedProduct
const newItem = await addProductToCount(product.productId)
updateCurrentItemInList(newItem, currentProduct.scannedId);
await updateCurrentItemInList(newItem, currentProduct.scannedId);
}
})

Expand Down
Loading