Merge pull request #292 from R-Sourabh/#291-job-filter

Fixed: Jobs now filtered on the basis of runTime(#291)
hotwax · Jul 9, 2024 · 5850a30 · 5850a30
2 parents 9327121 + 3a4721d
commit 5850a30
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/src/store/modules/stock/actions.ts b/src/store/modules/stock/actions.ts
@@ -223,8 +223,8 @@ const actions: ActionTree<StockState, RootState> = {
           "statusId": "SERVICE_PENDING",
           'systemJobEnumId': "JOB_SCHEDULED_RSTK",
           'systemJobEnumId_op': 'equals',
-          'orderBy': 'runTime ASC'
         },
+        "orderBy": "runTime ASC",
         "noConditionFind": "Y",
         "viewSize": 50
       } as any

diff --git a/src/views/ScheduledRestock.vue b/src/views/ScheduledRestock.vue
@@ -353,7 +353,7 @@ export default defineComponent({
       return popover.present();
     },
     async review() {
-      emitter.emit("presentLoader")
+      
       const areAllFieldsSelected = Object.values(this.fieldMapping).every(field => field !== "");
       if (!areAllFieldsSelected) {
         showToast(translate("Select all the fields to continue"));

diff --git a/src/views/ScheduledRestockReview.vue b/src/views/ScheduledRestockReview.vue
@@ -67,7 +67,7 @@
           </ion-list>
         </div>
       </div>
-      <div v-if="!parsedItems.length">
+      <div v-if="!parsedItems.length" class="empty-state">
         <p>{{ translate("No products found") }}</p>
       </div>
       <div v-else>
@@ -404,6 +404,7 @@ export default defineComponent({
 
 .filters {
   grid-area: filters;
+  max-width: 650px;
 }
 
 ion-content {