@things-factory/operato-wms 4.3.708 → 4.3.725

package/client/pages/order/release-order/b2c/b2c-order-requests.js

@@ -28,6 +28,13 @@ const HEADER_JSON = {
   Accept: 'application/json'
 }
 
+function formatLocalDate(date = new Date()) {
+  const year = date.getFullYear()
+  const month = String(date.getMonth() + 1).padStart(2, '0')
+  const day = String(date.getDate()).padStart(2, '0')
+  return `${year}-${month}-${day}`
+}
+
 class B2cOrderRequests extends connect(store)(localize(i18next)(PageView)) {
   static get styles() {
     return [
@@ -124,16 +131,29 @@ class B2cOrderRequests extends connect(store)(localize(i18next)(PageView)) {
       let { params } = lifecycle
       if (params && this._searchFields) {
         if (params.range) {
-          params.toDate = new Date().toISOString().split('T')[0]
+          const today = new Date()
+          params.toDate = formatLocalDate(today)
           switch (params.range) {
             case '1d':
-              params.fromDate = new Date(new Date().setDate(new Date().getDate() - 1)).toISOString().split('T')[0]
+              {
+                const from = new Date()
+                from.setDate(from.getDate() - 1)
+                params.fromDate = formatLocalDate(from)
+              }
               break
             case '1w':
-              params.fromDate = new Date(new Date().setDate(new Date().getDate() - 7)).toISOString().split('T')[0]
+              {
+                const from = new Date()
+                from.setDate(from.getDate() - 7)
+                params.fromDate = formatLocalDate(from)
+              }
               break
             case '1m':
-              params.fromDate = new Date(new Date().setMonth(new Date().getMonth() - 1)).toISOString().split('T')[0]
+              {
+                const from = new Date()
+                from.setMonth(from.getMonth() - 1)
+                params.fromDate = formatLocalDate(from)
+              }
               break
             default:
               break
@@ -207,7 +227,7 @@ class B2cOrderRequests extends connect(store)(localize(i18next)(PageView)) {
         value: (() => {
           let date = new Date()
           date.setMonth(date.getMonth() - 1)
-          return date.toISOString().split('T')[0]
+          return formatLocalDate(date)
         })(),
         handlers: { change: this._modifyDateRange.bind(this) }
       },
@@ -220,15 +240,15 @@ class B2cOrderRequests extends connect(store)(localize(i18next)(PageView)) {
           min: (() => {
             let date = new Date()
             date.setMonth(date.getMonth() - 1)
-            return date.toISOString().split('T')[0]
+            return formatLocalDate(date)
           })(),
           max: (() => {
             let date = new Date()
             date.setDate(date.getDate())
-            return date.toISOString().split('T')[0]
+            return formatLocalDate(date)
           })()
         },
-        value: new Date().toISOString().split('T')[0]
+        value: formatLocalDate(new Date())
       },
       {
         label: i18next.t('field.transporter'),
@@ -981,14 +1001,11 @@ class B2cOrderRequests extends connect(store)(localize(i18next)(PageView)) {
     if (this._toDateInput?.value < fromDate) this._toDateInput.value = fromDate
 
     let min = new Date(fromDate)
-    let today = new Date()
     let oneMonthRange = new Date(fromDate)
     oneMonthRange.setMonth(oneMonthRange.getMonth() + 1)
-    oneMonthRange = oneMonthRange.toISOString().split('T')[0]
-
-    today.setHours(0, 0, 0, 0)
+    oneMonthRange = formatLocalDate(oneMonthRange)
 
-    min = min.toISOString().split('T')[0]
+    min = formatLocalDate(min)
 
     this._toDateInput.min = min
     this._toDateInput.value = oneMonthRange

package/client/pages/report/analysis-picking-packing-report.js

@@ -2,24 +2,20 @@ import '@things-factory/form-ui'
 import '@things-factory/grist-ui'
 
 import gql from 'graphql-tag'
-import {
-  css,
-  html
-} from 'lit-element'
+import { css, html } from 'lit-element'
 import { connect } from 'pwa-helpers/connect-mixin'
 
-import {
-  i18next,
-  localize
-} from '@things-factory/i18n-base'
-import {
-  client,
-  gqlContext,
-  PageView,
-  store
-} from '@things-factory/shell'
+import { i18next, localize } from '@things-factory/i18n-base'
+import { client, gqlContext, PageView, store } from '@things-factory/shell'
 import { isMobileDevice } from '@things-factory/utils'
 
+function formatLocalDate(date = new Date()) {
+  const year = date.getFullYear()
+  const month = String(date.getMonth() + 1).padStart(2, '0')
+  const day = String(date.getDate()).padStart(2, '0')
+  return `${year}-${month}-${day}`
+}
+
 class AnalysisPickingPackingReport extends connect(store)(localize(i18next)(PageView)) {
   static get styles() {
     return css`
@@ -123,12 +119,12 @@ class AnalysisPickingPackingReport extends connect(store)(localize(i18next)(Page
         type: 'date',
         props: {
           searchOper: 'eq',
-          max: new Date().toISOString().split('T')[0]
+          max: formatLocalDate(new Date())
         },
         value: (() => {
-          let date = new Date()
+          const date = new Date()
           date.setMonth(date.getMonth() - 1)
-          return date.toISOString().split('T')[0]
+          return formatLocalDate(date)
         })(),
         handlers: { change: this._modifyDateRange.bind(this) }
       },
@@ -139,13 +135,13 @@ class AnalysisPickingPackingReport extends connect(store)(localize(i18next)(Page
         props: {
           searchOper: 'eq',
           min: (() => {
-            let date = new Date()
+            const date = new Date()
             date.setMonth(date.getMonth() - 1)
-            return date.toISOString().split('T')[0]
+            return formatLocalDate(date)
           })(),
-          max: new Date().toISOString().split('T')[0]
+          max: formatLocalDate(new Date())
         },
-        value: new Date().toISOString().split('T')[0],
+        value: formatLocalDate(new Date()),
         handlers: { change: this._submit.bind(this) }
       },
       {
@@ -322,8 +318,8 @@ class AnalysisPickingPackingReport extends connect(store)(localize(i18next)(Page
       const data = {
         total: response.data.analysisPickingPackingReport.total,
         records:
-          response.data.analysisPickingPackingReport.items.map(i=> {
-            let hourlyData = JSON.parse(i.hourlyData)          
+          response.data.analysisPickingPackingReport.items.map(i => {
+            let hourlyData = JSON.parse(i.hourlyData)
             return {
               ...i,
               ...hourlyData
@@ -339,7 +335,6 @@ class AnalysisPickingPackingReport extends connect(store)(localize(i18next)(Page
     } catch (e) {
       this._showToast(e)
     }
-    
   }
 
   async _fetchPartners() {
@@ -396,7 +391,10 @@ class AnalysisPickingPackingReport extends connect(store)(localize(i18next)(Page
 
     if (this._toDateInput.value < fromDate) this._toDateInput.value = fromDate
 
-    let min = new Date(fromDate).toISOString().split('T')[0]
+    const minDate = new Date(fromDate)
+    if (Number.isNaN(minDate.getTime())) return
+
+    const min = formatLocalDate(minDate)
     this._toDateInput.min = min
     this._submit()
   }
@@ -408,72 +406,71 @@ class AnalysisPickingPackingReport extends connect(store)(localize(i18next)(Page
 
   async _exportableData() {
     try {
-        const getTimeRangeHeader = hour => {
-          const now = new Date();
-          now.setHours(hour);
-          const next = new Date(now);
-          next.setHours(now.getHours() + 1);
-          return `${now.toLocaleString('en-US', { hour: 'numeric', hour12: true })} - ${next.toLocaleString('en-US', {
-              hour: 'numeric',
-              hour12: true
-          })}`;
-        };
-
-        const timeRangeColumns = Array.from({ length: 12 }, (_, i) => {
-          const startHour = i + 7;
-          const header = getTimeRangeHeader(startHour);
-          const key = `${startHour}`;
+      const getTimeRangeHeader = hour => {
+        const now = new Date()
+        now.setHours(hour)
+        const next = new Date(now)
+        next.setHours(now.getHours() + 1)
+        return `${now.toLocaleString('en-US', { hour: 'numeric', hour12: true })} - ${next.toLocaleString('en-US', {
+          hour: 'numeric',
+          hour12: true
+        })}`
+      }
+
+      const timeRangeColumns = Array.from({ length: 12 }, (_, i) => {
+        const startHour = i + 7
+        const header = getTimeRangeHeader(startHour)
+        const key = `${startHour}`
+        return {
+          type: 'number',
+          name: `${startHour}`,
+          header: header,
+          key: key,
+          record: { editable: false, align: 'center' },
+          width: 20
+        }
+      })
+
+      const headerSetting = [
+        { header: i18next.t('field.name'), key: 'name', width: 30, type: 'string' },
+        ...timeRangeColumns,
+        { header: i18next.t('field.total_days_worked'), key: 'totalDaysWorked', width: 30, type: 'float' },
+        { header: i18next.t('field.total_pack'), key: 'totalPacks', width: 30, type: 'float' },
+        { header: i18next.t('field.total_hours_worked'), key: 'totalHoursWorked', width: 30, type: 'float' },
+        { header: i18next.t('field.packing_rate'), key: 'packingRate', width: 30, type: 'float' }
+      ]
+
+      let data = (await this.fetchHandler({ page: 1, limit: 9999999 })).records.map(itm => {
+        const hourlyData = JSON.parse(itm.hourlyData) // Parse the hourly data from JSON
+        const timeRangeData = Array.from({ length: 12 }, (_, i) => {
+          const startHour = i + 7
+          const key = `${startHour}`
+          const value = parseFloat(hourlyData[startHour.toString()]) || 0 // Convert to number
           return {
-            type: 'number',
-            name: `${startHour}`,
-            header: header,
-            key: key,
-            record: { editable: false, align: 'center' },
-            width: 20
-          };
-        });
-
-        const headerSetting = [
-          { header: i18next.t('field.name'), key: 'name', width: 30, type: 'string' },
-          ...timeRangeColumns,
-          { header: i18next.t('field.total_days_worked'), key: 'totalDaysWorked', width: 30, type: 'float' },
-          { header: i18next.t('field.total_pack'), key: 'totalPacks', width: 30, type: 'float' },
-          { header: i18next.t('field.total_hours_worked'), key: 'totalHoursWorked', width: 30, type: 'float' },
-          { header: i18next.t('field.packing_rate'), key: 'packingRate', width: 30, type: 'float' }
-        ];
-
-        let data = (await this.fetchHandler({ page: 1, limit: 9999999 })).records.map(itm => {
-          const hourlyData = JSON.parse(itm.hourlyData); // Parse the hourly data from JSON
-          const timeRangeData = Array.from({ length: 12 }, (_, i) => {
-            const startHour = i + 7;
-            const key = `${startHour}`;
-            const value = parseFloat(hourlyData[startHour.toString()]) || 0; // Convert to number
-            return {
-                [key]: value
-            };
-        }).reduce((obj, item) => ({ ...obj, ...item }), {});
+            [key]: value
+          }
+        }).reduce((obj, item) => ({ ...obj, ...item }), {})
 
         return {
-          ...timeRangeData, 
-          name: itm.name, 
+          ...timeRangeData,
+          name: itm.name,
           totalDaysWorked: itm.totalDaysWorked,
           totalPacks: itm.totalPacks,
           totalHoursWorked: itm.totalHoursWorked,
           packingRate: itm.packingRate
-          };
-        });
-      
+        }
+      })
+
       var exportData = {
         header: [...headerSetting],
         data
-      };
-      
-      return exportData;
-    
+      }
+
+      return exportData
     } catch (e) {
-        this._showToast(e);
+      this._showToast(e)
     }
-}
+  }
 
   _showToast({ type, message }) {
     document.dispatchEvent(

package/client/pages/report/billing-module-report.js

@@ -11,6 +11,13 @@ import { client, gqlContext, PageView, store } from '@things-factory/shell'
 import { flattenObject, isMobileDevice } from '@things-factory/utils'
 import { LOCATION_TYPE } from '../constants/location'
 
+function formatLocalDate(date = new Date()) {
+  const year = date.getFullYear()
+  const month = String(date.getMonth() + 1).padStart(2, '0')
+  const day = String(date.getDate()).padStart(2, '0')
+  return `${year}-${month}-${day}`
+}
+
 class BillingModuleReport extends connect(store)(localize(i18next)(PageView)) {
   static get styles() {
     return css`
@@ -120,12 +127,12 @@ class BillingModuleReport extends connect(store)(localize(i18next)(PageView)) {
         type: 'date',
         props: {
           searchOper: 'eq',
-          max: new Date().toISOString().split('T')[0]
+          max: formatLocalDate(new Date())
         },
         value: (() => {
-          let date = new Date()
+          const date = new Date()
           date.setMonth(date.getMonth() - 1)
-          return date.toISOString().split('T')[0]
+          return formatLocalDate(date)
         })(),
         handlers: { change: this._modifyDateRange.bind(this) }
       },
@@ -136,39 +143,35 @@ class BillingModuleReport extends connect(store)(localize(i18next)(PageView)) {
         props: {
           searchOper: 'eq',
           min: (() => {
-            let date = new Date()
+            const date = new Date()
             date.setMonth(date.getMonth() - 1)
-            return date.toISOString().split('T')[0]
+            return formatLocalDate(date)
           })(),
-          max: new Date().toISOString().split('T')[0]
+          max: formatLocalDate(new Date())
         },
-        value: new Date().toISOString().split('T')[0]
+        value: formatLocalDate(new Date())
       },
       {
         label: i18next.t('field.location_type'),
         name: 'locationType',
         type: 'select',
-        options: [
-          {value: ''},
-          ...Object.values(LOCATION_TYPE)
-        ],
-        props: { searchOper: 'eq'}
+        options: [{ value: '' }, ...Object.values(LOCATION_TYPE)],
+        props: { searchOper: 'eq' }
       }
     ]
   }
 
   get reportConfig() {
-
     this._gristData.records.forEach((record, i) => {
       console.log(`Record ${i}:`, Object.keys(record))
     })
-    
+
     const dataKeys = this._gristData.records.reduce((keys, item) => {
       Object.keys(item).forEach(key => keys.add(key))
       return keys
     }, new Set())
 
-    let columns = [ 
+    let columns = [
       { type: 'gutter', gutterName: 'sequence' },
       {
         type: 'string',
@@ -183,7 +186,7 @@ class BillingModuleReport extends connect(store)(localize(i18next)(PageView)) {
     dataKeys.forEach(key => {
       if (!excludedKeys.has(key)) {
         columns.push({
-          type: 'string', 
+          type: 'string',
           name: key,
           header: key,
           width: 170,
@@ -193,15 +196,15 @@ class BillingModuleReport extends connect(store)(localize(i18next)(PageView)) {
     })
 
     const filteredColumns = columns
-    .filter(column => column.imex && dataKeys.has(column.imex.key))
-    .sort((a, b) => {
-      const aStartsWithTotal = a.header.toLowerCase().startsWith('total');
-      const bStartsWithTotal = b.header.toLowerCase().startsWith('total');
-      
-      if (aStartsWithTotal && !bStartsWithTotal) return 1;  // Move 'Total' headers down
-      if (!aStartsWithTotal && bStartsWithTotal) return -1; // Keep non-'Total' headers first
-      return 0; 
-    });
+      .filter(column => column.imex && dataKeys.has(column.imex.key))
+      .sort((a, b) => {
+        const aStartsWithTotal = a.header.toLowerCase().startsWith('total')
+        const bStartsWithTotal = b.header.toLowerCase().startsWith('total')
+
+        if (aStartsWithTotal && !bStartsWithTotal) return 1 // Move 'Total' headers down
+        if (!aStartsWithTotal && bStartsWithTotal) return -1 // Keep non-'Total' headers first
+        return 0
+      })
 
     return {
       columns: filteredColumns,
@@ -294,7 +297,6 @@ class BillingModuleReport extends connect(store)(localize(i18next)(PageView)) {
         if (existingRecord) {
           existingRecord[propertyName] = itm.quantity
         } else {
-          
           const propertyName = itm.packingType
 
           acc.push({
@@ -374,38 +376,33 @@ class BillingModuleReport extends connect(store)(localize(i18next)(PageView)) {
 
     if (this._toDateInput.value < fromDate) this._toDateInput.value = fromDate
 
-    let min = new Date(fromDate)
-    let today = new Date()
-    today.setHours(0, 0, 0, 0)
-
-    min = min.toISOString().split('T')[0]
+    const minDate = new Date(fromDate)
+    if (Number.isNaN(minDate.getTime())) return
 
+    const min = formatLocalDate(minDate)
     this._toDateInput.min = min
   }
 
   async _exportableData() {
     try {
-        let data = (await this.fetchHandler({ page: 1, limit: 9999999 })).records;
-
-        let header = this.dataGrist._config.columns
-            .filter(column => column.type !== 'gutter' && column.record !== undefined && column.imex !== undefined)
-            .map(column => {
-                return {
-                    header: column.imex.header ?? column.imex.key, // Assign key if header is missing
-                    key: column.imex.key
-                };
-            });
-
-        return { header, data };
+      let data = (await this.fetchHandler({ page: 1, limit: 9999999 })).records
+
+      let header = this.dataGrist._config.columns
+        .filter(column => column.type !== 'gutter' && column.record !== undefined && column.imex !== undefined)
+        .map(column => {
+          return {
+            header: column.imex.header ?? column.imex.key, // Assign key if header is missing
+            key: column.imex.key
+          }
+        })
+
+      return { header, data }
     } catch (e) {
-        console.error("Export error:", e);
-        this._showToast(e);
-    } 
+      console.error('Export error:', e)
+      this._showToast(e)
+    }
   }
 
-
-
-
   _showToast({ type, message }) {
     document.dispatchEvent(
       new CustomEvent('notify', {

package/client/pages/report/costing-report.js

@@ -11,6 +11,13 @@ import { i18next, localize } from '@things-factory/i18n-base'
 import { client, gqlContext, PageView, store } from '@things-factory/shell'
 import { flattenObject, isMobileDevice } from '@things-factory/utils'
 
+function formatLocalDate(date = new Date()) {
+  const year = date.getFullYear()
+  const month = String(date.getMonth() + 1).padStart(2, '0')
+  const day = String(date.getDate()).padStart(2, '0')
+  return `${year}-${month}-${day}`
+}
+
 class CostingReport extends connect(store)(localize(i18next)(PageView)) {
   static get styles() {
     return css`
@@ -107,12 +114,12 @@ class CostingReport extends connect(store)(localize(i18next)(PageView)) {
         type: 'date',
         props: {
           searchOper: 'eq',
-          max: new Date().toISOString().split('T')[0]
+          max: formatLocalDate(new Date())
         },
         value: (() => {
-          let date = new Date()
+          const date = new Date()
           date.setMonth(date.getMonth() - 1)
-          return date.toISOString().split('T')[0]
+          return formatLocalDate(date)
         })(),
         handlers: { change: this._modifyDateRange.bind(this) }
       },
@@ -123,17 +130,17 @@ class CostingReport extends connect(store)(localize(i18next)(PageView)) {
         props: {
           searchOper: 'eq',
           min: (() => {
-            let date = new Date()
+            const date = new Date()
             date.setMonth(date.getMonth() - 1)
-            return date.toISOString().split('T')[0]
+            return formatLocalDate(date)
           })(),
           max: (() => {
-            var max = new Date()
+            const max = new Date()
             max.setMonth(max.getMonth() + 1)
-            return max.toISOString().split('T')[0]
+            return formatLocalDate(max)
           })()
         },
-        value: new Date().toISOString().split('T')[0]
+        value: formatLocalDate(new Date())
         // handlers: { change: this._submit.bind(this) }
       }
     ]
@@ -387,15 +394,16 @@ class CostingReport extends connect(store)(localize(i18next)(PageView)) {
   _modifyDateRange(e) {
     const fromDate = e.currentTarget.value
 
-    let min = new Date(fromDate)
-    let max = new Date(fromDate)
-    max.setMonth(max.getMonth() + 2)
+    const minDate = new Date(fromDate)
+    if (Number.isNaN(minDate.getTime())) return
 
-    min = min.toISOString().split('T')[0]
-    max = max.toISOString().split('T')[0]
+    const maxDate = new Date(minDate)
+    maxDate.setMonth(maxDate.getMonth() + 2)
 
-    if (this._toDateInput.value < fromDate) this._toDateInput.value = fromDate
+    const min = formatLocalDate(minDate)
+    const max = formatLocalDate(maxDate)
 
+    if (this._toDateInput.value < fromDate) this._toDateInput.value = fromDate
     if (this._toDateInput.value > max) this._toDateInput.value = max
 
     this._toDateInput.max = max

package/client/pages/report/inbound-order-details-report.js

@@ -10,6 +10,13 @@ import { i18next, localize } from '@things-factory/i18n-base'
 import { client, gqlContext, PageView, store } from '@things-factory/shell'
 import { flattenObject, isMobileDevice } from '@things-factory/utils'
 
+function formatLocalDate(date = new Date()) {
+  const year = date.getFullYear()
+  const month = String(date.getMonth() + 1).padStart(2, '0')
+  const day = String(date.getDate()).padStart(2, '0')
+  return `${year}-${month}-${day}`
+}
+
 class InboundOrderDetailsReport extends connect(store)(localize(i18next)(PageView)) {
   static get styles() {
     return css`
@@ -118,12 +125,12 @@ class InboundOrderDetailsReport extends connect(store)(localize(i18next)(PageVie
         type: 'date',
         props: {
           searchOper: 'eq',
-          max: new Date().toISOString().split('T')[0]
+          max: formatLocalDate(new Date())
         },
         value: (() => {
-          let date = new Date()
+          const date = new Date()
           date.setMonth(date.getMonth() - 1)
-          return date.toISOString().split('T')[0]
+          return formatLocalDate(date)
         })(),
         handlers: { change: this._modifyDateRange.bind(this) }
       },
@@ -134,17 +141,16 @@ class InboundOrderDetailsReport extends connect(store)(localize(i18next)(PageVie
         props: {
           searchOper: 'eq',
           min: (() => {
-            let date = new Date()
+            const date = new Date()
             date.setMonth(date.getMonth() - 1)
-            return date.toISOString().split('T')[0]
+            return formatLocalDate(date)
           })(),
           max: (() => {
-            var max = new Date()
-            max.setUTCDate(max.getDate())
-            return max.toISOString().split('T')[0]
+            const max = new Date()
+            return formatLocalDate(max)
           })()
         },
-        value: new Date().toISOString().split('T')[0],
+        value: formatLocalDate(new Date()),
         handlers: { change: this._submit.bind(this) }
       },
       {
@@ -753,12 +759,10 @@ class InboundOrderDetailsReport extends connect(store)(localize(i18next)(PageVie
 
     if (this._toDateInput.value < fromDate) this._toDateInput.value = fromDate
 
-    let min = new Date(fromDate)
-    let today = new Date()
-    today.setHours(0, 0, 0, 0)
-
-    min = min.toISOString().split('T')[0]
+    const minDate = new Date(fromDate)
+    if (Number.isNaN(minDate.getTime())) return
 
+    const min = formatLocalDate(minDate)
     this._toDateInput.min = min
     this._submit()
   }