@things-factory/operato-pms 3.7.7 → 3.8.19

package/client/pages/inventory/inventory-ramp-tonnage.js

@@ -1,14 +1,16 @@
 import '@things-factory/form-ui'
 import '@things-factory/grist-ui'
+import './inventory-history-by-tonnage'
+
+import gql from 'graphql-tag'
+import { css, html } from 'lit-element'
+import { connect } from 'pwa-helpers/connect-mixin'
+
 import { i18next, localize } from '@things-factory/i18n-base'
 import { openPopup } from '@things-factory/layout-base'
 import { client, PageView, store } from '@things-factory/shell'
 import { ScrollbarStyles } from '@things-factory/styles'
 import { isMobileDevice } from '@things-factory/utils'
-import gql from 'graphql-tag'
-import { css, html } from 'lit-element'
-import { connect } from 'pwa-helpers/connect-mixin'
-import './inventory-history-by-tonnage'
 
 class InventoryRampTonnage extends connect(store)(localize(i18next)(PageView)) {
   static get styles() {
@@ -79,20 +81,20 @@ class InventoryRampTonnage extends connect(store)(localize(i18next)(PageView)) {
   }
 
   async pageInitialized() {
-    const _blocks = await this.fetchBlocks()
+    const _ramps = await this._fetchRamp()
 
     this._searchFields = [
       {
-        label: i18next.t('field.block'),
-        name: 'blockId',
+        label: i18next.t('field.ramp'),
+        name: 'rampId',
         type: 'select',
         options: [
           { value: '' },
-          ..._blocks
-            .map(block => {
+          ..._ramps
+            .map(ramp => {
               return {
-                name: block.name,
-                value: block.id
+                name: ramp.name,
+                value: ramp.id
               }
             })
             .sort(this._compareValues('name', 'asc'))
@@ -103,15 +105,10 @@ class InventoryRampTonnage extends connect(store)(localize(i18next)(PageView)) {
 
     this.config = {
       list: {
-        fields: ['block', 'ramp', 'tonnage', 'updatedAt']
-      },
-      pagination: { pages: [10, 20, 50, 2500] },
-      rows: {
-        selectable: {
-          multiple: true
-        },
-        appendable: false
+        fields: ['ramp', 'tonnage', 'updatedAt']
       },
+      pagination: { pages: [10, 20, 50, 100] },
+      rows: { appendable: false },
       columns: [
         { type: 'gutter', gutterName: 'sequence' },
         {
@@ -122,20 +119,13 @@ class InventoryRampTonnage extends connect(store)(localize(i18next)(PageView)) {
             click: this._showTonnageMovement.bind(this)
           }
         },
-        {
-          type: 'object',
-          name: 'block',
-          header: i18next.t('field.block'),
-          imex: { header: i18next.t('field.block'), key: 'block', width: 50, type: 'string' },
-          sortable: true,
-          width: 150
-        },
         {
           type: 'object',
           name: 'ramp',
           header: i18next.t('field.ramp'),
           imex: { header: i18next.t('field.ramp'), key: 'ramp', width: 50, type: 'string' },
           sortable: true,
+          label: true,
           width: 150
         },
         {
@@ -144,6 +134,7 @@ class InventoryRampTonnage extends connect(store)(localize(i18next)(PageView)) {
           header: i18next.t('field.tonnage_remaining'),
           imex: { header: i18next.t('field.tonnage_remaining'), key: 'tonnage', width: 30, type: 'string' },
           sortable: true,
+          label: true,
           width: 200
         },
         {
@@ -151,6 +142,7 @@ class InventoryRampTonnage extends connect(store)(localize(i18next)(PageView)) {
           name: 'updatedAt',
           header: i18next.t('field.updated_at'),
           sortable: true,
+          label: true,
           imex: { header: i18next.t('field.updated_at'), key: 'updatedAt', width: 75, type: 'date' },
           width: 150
         }
@@ -233,12 +225,12 @@ class InventoryRampTonnage extends connect(store)(localize(i18next)(PageView)) {
     }
   }
 
-  async fetchBlocks() {
+  async _fetchRamp() {
     const filters = []
     const response = await client.query({
       query: gql`
-        query blocks($filters: [Filter]) {
-          blocks(filters: $filters) {
+        query ramps($filters: [Filter]) {
+          ramps(filters: $filters) {
             items {
               id
               name
@@ -249,7 +241,7 @@ class InventoryRampTonnage extends connect(store)(localize(i18next)(PageView)) {
       `,
       variables: { filters }
     })
-    return response.data.blocks.items
+    return response.data.ramps.items
   }
 
   _showTonnageMovement(columns, data, column, record, rowIndex) {

package/client/pages/loading/daily-loading-detail.js

@@ -1,11 +1,14 @@
-import { MultiColumnFormStyles } from '@things-factory/form-ui'
 import '@things-factory/grist-ui'
+
+import gql from 'graphql-tag'
+import { css, html } from 'lit-element'
+
+import { MultiColumnFormStyles } from '@things-factory/form-ui'
 import { i18next, localize } from '@things-factory/i18n-base'
 import { client, CustomAlert, navigate, PageView } from '@things-factory/shell'
 import { CommonButtonStyles } from '@things-factory/styles'
 import { isMobileDevice } from '@things-factory/utils'
-import gql from 'graphql-tag'
-import { css, html } from 'lit-element'
+
 import { RECORD_STATUS } from '../constants'
 
 class DailyLoadingDetail extends localize(i18next)(PageView) {
@@ -97,7 +100,7 @@ class DailyLoadingDetail extends localize(i18next)(PageView) {
     }
 
     return {
-      title: i18next.t('title.loading_record_detail'),
+      title: i18next.t('title.field_loading_contractor_daily_loading_record'),
       actions
     }
   }
@@ -107,11 +110,8 @@ class DailyLoadingDetail extends localize(i18next)(PageView) {
       <form name="dailyLoading" class="multi-column-form" autocomplete="off">
         <fieldset>
           <legend>${i18next.t('title.loading_no')}: ${this._loadingNo}</legend>
-          <label>${i18next.t('label.loading_date')}</label>
+          <label>${i18next.t('label.date')}</label>
           <input type="date" name="loadingDate" readonly />
-
-          <label>${i18next.t('label.block')}</label>
-          <input type="text" name="blockName" readonly />
         </fieldset>
       </form>
 
@@ -125,15 +125,6 @@ class DailyLoadingDetail extends localize(i18next)(PageView) {
             .config=${this.loadingGristConfig}
             .data="${this.loadingData}"
           ></data-grist>
-
-          <h2><mwc-icon>list_alt</mwc-icon>${i18next.t('title.ramp_loading_data')}</h2>
-
-          <data-grist
-            id="ramp-grist"
-            .mode=${isMobileDevice() ? 'LIST' : 'GRID'}
-            .config=${this.rampGristConfig}
-            .data="${this.rampData}"
-          ></data-grist>
         </div>
       </div>
     `
@@ -142,7 +133,6 @@ class DailyLoadingDetail extends localize(i18next)(PageView) {
   constructor() {
     super()
     this.loadingData = { records: [] }
-    this.rampData = { records: [] }
   }
 
   get loadingForm() {
@@ -153,68 +143,59 @@ class DailyLoadingDetail extends localize(i18next)(PageView) {
     return this.shadowRoot.querySelector('data-grist#loading-grist')
   }
 
-  get rampGrist() {
-    return this.shadowRoot.querySelector('data-grist#ramp-grist')
-  }
-
   pageInitialized() {
     this.loadingGristConfig = {
       pagination: { infinite: true },
       list: {
-        fields: ['organizationStaff', 'totalBunchLoaded', 'totalBunchWeight', 'remark']
+        fields: ['truck', 'block', 'totalBunchLoaded', 'totalBunchWeight', 'ramp', 'remark']
       },
       rows: { appendable: false },
       columns: [
         { type: 'gutter', gutterName: 'sequence' },
         {
-          type: 'string',
-          name: 'staffName',
-          header: i18next.t('field.trip'),
-          width: 300
+          type: 'object',
+          name: 'truck',
+          header: i18next.t('field.truck_no'),
+          label: true,
+          width: 120
         },
         {
-          type: 'integer',
+          type: 'object',
+          name: 'block',
+          header: i18next.t('field.block'),
+          label: true,
+          width: 120
+        },
+        {
+          type: 'float',
           name: 'totalBunchLoaded',
-          header: i18next.t('field.total_no_of_bunches'),
+          header: i18next.t('field.total_bunch'),
+          label: true,
           width: 150
         },
         {
           type: 'float',
           name: 'totalBunchWeight',
-          header: i18next.t('field.total_weight_loaded'),
+          header: i18next.t('field.total_tonnage'),
+          label: true,
           width: 150
         },
+        {
+          type: 'object',
+          name: 'ramp',
+          header: i18next.t('field.ramp'),
+          label: true,
+          width: 120
+        },
         {
           type: 'string',
           name: 'remark',
           header: i18next.t('field.remarks'),
+          label: true,
           width: 300
         }
       ]
     }
-
-    this.rampGristConfig = {
-      pagination: { infinite: true },
-      list: {
-        fields: ['ramp', 'totalBunchWeight']
-      },
-      rows: { appendable: false },
-      columns: [
-        { type: 'gutter', gutterName: 'sequence' },
-        {
-          type: 'string',
-          name: 'rampName',
-          header: i18next.t('field.ramp'),
-          width: 300
-        },
-        {
-          type: 'float',
-          name: 'totalBunchWeight',
-          header: i18next.t('field.total_weight_loaded'),
-          width: 150
-        }
-      ]
-    }
   }
 
   async pageUpdated(changes) {
@@ -226,40 +207,30 @@ class DailyLoadingDetail extends localize(i18next)(PageView) {
   }
 
   async _fetchLoadingRecord() {
-    if (!this._loadingNo) {
-      CustomAlert({
-        title: i18next.t('text.no_records'),
-        text: i18next.t('text.unable_to_find_loading_record')
-      })
-    }
+    if (!this._loadingNo) return
 
     const response = await client.query({
       query: gql`
         query dailyLoading($name: String!) {
           dailyLoading(name: $name) {
             name
-            block {
-              id
-              name
-              description
-            }
             loadingDate
-            totalBunch
             totalWeight
+            totalBunch
             status
-            dailyLoadingRamps {
+            dailyLoadingDetails {
               totalBunchWeight
-              ramp {
+              totalBunchLoaded
+              remark
+              truck {
                 id
                 name
-                description
               }
-            }
-            dailyLoadingDetails {
-              totalBunchLoaded
-              totalBunchWeight
-              remark
-              organizationStaff {
+              block {
+                id
+                name
+              }
+              ramp {
                 id
                 name
               }
@@ -273,26 +244,9 @@ class DailyLoadingDetail extends localize(i18next)(PageView) {
     if (!response.errors) {
       const dailyLoading = response.data.dailyLoading
       const dailyLoadingDetails = dailyLoading.dailyLoadingDetails
-      const dailyLoadingRamps = dailyLoading.dailyLoadingRamps
       this._status = dailyLoading.status
-      this._fillupLoadingForm({ ...dailyLoading, blockName: dailyLoading.block.name })
-      this.loadingData = {
-        records: dailyLoadingDetails.map(detail => {
-          return {
-            ...detail,
-            staffName: detail.organizationStaff && detail.organizationStaff.name
-          }
-        })
-      }
-
-      this.rampData = {
-        records: dailyLoadingRamps.map(loadingRamp => {
-          return {
-            ...loadingRamp,
-            rampName: loadingRamp.ramp && loadingRamp.ramp.name
-          }
-        })
-      }
+      this._fillupLoadingForm({ ...dailyLoading })
+      this.loadingData = { records: dailyLoadingDetails }
     }
   }