@things-factory/operato-pms 4.0.24 → 4.0.28

package/client/pages/dispatchment/dispatchment-create-record.js

@@ -1,23 +1,41 @@
-import { MultiColumnFormStyles } from '@things-factory/form-ui'
+import '../../component/driver-selector-popup'
+import '../../component/truck-selector-popup'
+import '../../component/mill-selector-popup'
 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 { openPopup } from '@things-factory/layout-base'
 import { client, CustomAlert, navigate, PageView } from '@things-factory/shell'
-import gql from 'graphql-tag'
 import { CommonButtonStyles } from '@things-factory/styles'
 import { isMobileDevice } from '@things-factory/utils'
-import { css, html } from 'lit-element'
 
 class DispatchmentCreateRecord extends localize(i18next)(PageView) {
   static get properties() {
     return {
       dispatchmentGristConfig: Object,
-      dispatchmentData: Object
+      dispatchmentData: Object,
+      selectedDriverName: String,
+      selectedDriverID: String,
+      selectedTruckName: String,
+      selectedMillName: String,
+      selectedTruckID: String,
+      selectedMillID: String
     }
   }
 
   constructor() {
     super()
     this.dispatchmentData = { records: [] }
+    this.selectedDriverName = ''
+    this.selectedMillName = ''
+    this.selectedMillID = ''
+    this.selectedDriverID = ''
+    this.selectedTruckName = ''
+    this.selectedTruckID = ''
   }
 
   static get styles() {
@@ -93,17 +111,38 @@ class DispatchmentCreateRecord extends localize(i18next)(PageView) {
           <label>${i18next.t('label.dispatchment_date')}</label>
           <input type="datetime-local" name="dispatchAt" required />
 
-          <label>${i18next.t('label.truck_driver')}</label>
-          <input name="externalDriver" />
-
-          <label>${i18next.t('label.driver_identification')}</label>
-          <input name="driverIdentification" />
-
-          <label>${i18next.t('label.truck_no')}</label>
-          <input name="transportNo" required />
+          <label>${i18next.t('label.driver')}</label>
+          <input
+            name="driver"
+            readonly
+            @click="${this._openDriverSelector.bind(this)}"
+            value=${this.selectedDriverName}
+            required
+          />
+
+          <label>${i18next.t('label.lorry_no')}</label>
+          <input
+            name="transport"
+            readonly
+            @click="${this._openTruckSelector.bind(this)}"
+            value=${this.selectedTruckName}
+            required
+          />
 
           <label>${i18next.t('label.destination')}</label>
-          <input name="dispatchTo" required />
+          <input
+            name="dispatchTo"
+            readonly
+            @click="${this._openMillSelector.bind(this)}"
+            value=${this.selectedMillName}
+            required
+          />
+
+          <label>${i18next.t('label.chit_no')}</label>
+          <input name="chitNo" />
+
+          <label>${i18next.t('label.oer_percentage')}</label>
+          <input name="percentage" type="number" min="0" />
         </fieldset>
       </form>
 
@@ -132,6 +171,27 @@ class DispatchmentCreateRecord extends localize(i18next)(PageView) {
     return this.shadowRoot.querySelector('data-grist#dispatchment-grist')
   }
 
+  get driverInput() {
+    return this.shadowRoot.querySelector('input[name=driver]')
+  }
+
+  get percentageInput() {
+    return this.shadowRoot.querySelector('input[name=percentage]')
+  }
+
+  get truckInput() {
+    return this.shadowRoot.querySelector('input[name=transport]')
+  }
+
+  pageUpdated() {
+    this.selectedDriverName = ''
+    this.selectedDriverID = ''
+    this.selectedTruckName = ''
+    this.selectedTruckID = ''
+    this.selectedMillName = ''
+    this.selectedMillID = ''
+  }
+
   pageInitialized() {
     this.dispatchmentGristConfig = {
       pagination: { infinite: true },
@@ -155,38 +215,20 @@ class DispatchmentCreateRecord extends localize(i18next)(PageView) {
         },
         {
           type: 'object',
-          name: 'plantationInventory',
+          name: 'ramp',
           header: i18next.t('field.ramp'),
           record: {
             editable: true,
             options: {
-              queryName: 'plantationInventories',
-              nameField: 'rampName',
-              basicArgs: {
-                filters: [{ name: 'type', value: 'RAMP_TONNAGE', operator: 'eq' }]
-              },
+              queryName: 'ramps',
               select: [
                 { name: 'id', hidden: true },
-                { name: 'rampId', hidden: true },
-                { name: 'rampName', header: i18next.t('field.ramp'), width: 200 },
-                {
-                  name: 'totalTonnage',
-                  type: 'float',
-                  header: i18next.t('field.remaining_tonnage'),
-                  width: 200,
-                  ignoreCondition: true
-                }
+                { name: 'name', header: i18next.t('field.name'), width: 200 }
               ],
-              list: { fields: ['rampName', 'totalTonnage'] }
+              list: { fields: ['id', 'name'] }
             }
           },
-          width: 300
-        },
-        {
-          type: 'integer',
-          name: 'totalTonnage',
-          header: i18next.t('field.available_tonnage'),
-          width: 140
+          width: 130
         },
         {
           type: 'float',
@@ -226,7 +268,7 @@ class DispatchmentCreateRecord extends localize(i18next)(PageView) {
 
     try {
       if (changedColumn === 'collectedRampWeight') {
-        this._validateReleaseTonnage(changeRecord.collectedRampWeight, changeRecord.totalTonnage)
+        this._validateReleaseTonnage(changeRecord.collectedRampWeight)
       }
       this._updateInventoryList()
     } catch (e) {
@@ -240,34 +282,29 @@ class DispatchmentCreateRecord extends localize(i18next)(PageView) {
     }
   }
 
-  _validateReleaseTonnage(collectedRampWeight, totalTonnage) {
-    if (totalTonnage === undefined) throw new Error(i18next.t('text.there_is_no_selected_items'))
-    if (collectedRampWeight > totalTonnage) {
-      throw new Error(i18next.t('text.available_tonnage_insufficient'))
-    } else if (collectedRampWeight <= 0) {
+  _validateReleaseTonnage(collectedRampWeight) {
+    if (collectedRampWeight <= 0 || isNaN(collectedRampWeight)) {
       throw new Error(i18next.t('text.invalid_tonnage_input'))
     }
   }
 
   async _updateInventoryList() {
-    const _selectedInventories = (this.dispatchmentGrist.dirtyData.records || []).map(
-      record => record.plantationInventory.id
-    )
+    const _selectedRamp = (this.dispatchmentGrist.dirtyData.records || []).map(record => record.ramp.id)
     this.dispatchmentGristConfig = {
       ...this.dispatchmentGristConfig,
       columns: this.dispatchmentGristConfig.columns.map(column => {
-        if (column.name === 'plantationInventory') {
+        if (column.name === 'ramp') {
           column.record.options.basicArgs = {
             ...column.record.options.basicArgs,
             filters: [...column.record.options.basicArgs.filters.filter(filter => filter.name !== 'id')]
           }
 
-          if (_selectedInventories.length)
+          if (_selectedRamp.length)
             column.record.options.basicArgs.filters = [
               ...column.record.options.basicArgs.filters,
               {
                 name: 'id',
-                value: _selectedInventories,
+                value: _selectedRamp,
                 operator: 'notin'
               }
             ]
@@ -295,6 +332,13 @@ class DispatchmentCreateRecord extends localize(i18next)(PageView) {
       let dailyDispatch = this._getFormInfo()
       dailyDispatch.dailyDispatchDetails = this._getDispatchDetails()
 
+      dailyDispatch = {
+        ...dailyDispatch,
+        driver: { id: this.selectedDriverID, name: this.selectedDriverName },
+        transport: { id: this.selectedTruckID, name: this.selectedTruckName },
+        dispatchTo: { id: this.selectedMillID, name: this.selectedMillName }
+      }
+
       const response = await client.mutate({
         mutation: gql`
           mutation generateDailyDispatch($dailyDispatch: NewDailyDispatch!) {
@@ -319,6 +363,12 @@ class DispatchmentCreateRecord extends localize(i18next)(PageView) {
 
   _validateForm() {
     if (!this.dispatchmentForm.checkValidity()) throw new Error(i18next.t('text.dispatch_record_invalid'))
+
+    if (this.percentageInput?.value) {
+      if (isNaN(this.percentageInput.value) || this.percentageInput?.value <= 0) {
+        throw new Error(i18next.t('text.x_has_invalid_value', { state: 'label.percentage' }))
+      }
+    }
   }
 
   _validateDispatchmentData() {
@@ -326,16 +376,14 @@ class DispatchmentCreateRecord extends localize(i18next)(PageView) {
     if (!this.dispatchmentGrist.dirtyData.records || !this.dispatchmentGrist.dirtyData.records.length)
       throw new Error(i18next.t('text.no_records_in_dispatchment_list'))
 
-    if (
-      this.dispatchmentGrist.dirtyData.records.filter(record => !record.rampName || !record.collectedRampWeight).length
-    )
+    if (this.dispatchmentGrist.dirtyData.records.filter(record => !record.ramp || !record.collectedRampWeight).length)
       throw new Error(i18next.t('text.empty_value_in_dispatchment_data'))
   }
 
   _getDispatchDetails() {
     return this.dispatchmentGrist.dirtyData.records.map(record => {
       let dailyDispatchDetails = {
-        ramp: { id: record.plantationInventory.rampId, name: record.plantationInventory.rampName },
+        ramp: { id: record.ramp.id, name: record.ramp.name },
         collectedRampWeight: Number(record.collectedRampWeight),
         remark: record?.remark ? record.remark : null
       }
@@ -365,6 +413,60 @@ class DispatchmentCreateRecord extends localize(i18next)(PageView) {
     return obj
   }
 
+  _openDriverSelector() {
+    openPopup(
+      html`
+        <driver-selector-popup
+          @selected="${e => {
+            this.selectedDriverID = e.detail.id
+            this.selectedDriverName = `${e.detail.name} (${e.detail.idNumber})`
+          }}"
+        ></driver-selector-popup>
+      `,
+      {
+        backdrop: true,
+        size: 'large',
+        title: i18next.t('title.select_driver')
+      }
+    )
+  }
+
+  _openMillSelector() {
+    openPopup(
+      html`
+        <mill-selector-popup
+          @selected="${e => {
+            this.selectedMillID = e.detail.id
+            this.selectedMillName = `${e.detail.name}`
+          }}"
+        ></mill-selector-popup>
+      `,
+      {
+        backdrop: true,
+        size: 'large',
+        title: i18next.t('title.select_destination')
+      }
+    )
+  }
+
+  _openTruckSelector() {
+    openPopup(
+      html`
+        <truck-selector-popup
+          @selected="${e => {
+            this.selectedTruckID = e.detail.id
+            this.selectedTruckName = `${e.detail.name}`
+          }}"
+        ></truck-selector-popup>
+      `,
+      {
+        backdrop: true,
+        size: 'large',
+        title: i18next.t('title.select_lorry')
+      }
+    )
+  }
+
   _showToast({ type, message }) {
     document.dispatchEvent(
       new CustomEvent('notify', {

package/client/pages/dispatchment/dispatchment-list.js

@@ -1,11 +1,13 @@
 import '@things-factory/form-ui'
 import '@things-factory/grist-ui'
+
+import gql from 'graphql-tag'
+import { css, html } from 'lit-element'
+
 import { i18next, localize } from '@things-factory/i18n-base'
 import { client, navigate, PageView } 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'
 
 class DispatchmentList extends localize(i18next)(PageView) {
   static get properties() {
@@ -73,18 +75,12 @@ class DispatchmentList extends localize(i18next)(PageView) {
         name: 'dispatchAt',
         type: 'date',
         props: { searchOper: 'eq' }
-      },
-      {
-        label: i18next.t('field.truck_no'),
-        name: 'transportNo',
-        type: 'string',
-        props: { searchOper: 'i_like' }
       }
     ]
 
     this.config = {
       list: {
-        fields: ['dispatchAt', 'totalTonnageRelease', 'transportNo', 'driverName', 'updatedAt', 'updater']
+        fields: ['dispatchAt', 'totalTonnageRelease', 'driver', 'transportNo', 'dispatchTo', 'updatedAt', 'updater']
       },
       rows: { appendable: false, selectable: { multiple: true } },
       columns: [
@@ -104,6 +100,7 @@ class DispatchmentList extends localize(i18next)(PageView) {
           name: 'dispatchAt',
           header: i18next.t('field.dispatchment_date'),
           sortable: true,
+          label: true,
           width: 150
         },
         {
@@ -111,13 +108,15 @@ class DispatchmentList extends localize(i18next)(PageView) {
           name: 'totalTonnageRelease',
           header: i18next.t('field.total_tonnage_release'),
           sortable: true,
+          label: true,
           width: 150
         },
         {
-          type: 'string',
-          name: 'driverName',
+          type: 'object',
+          name: 'driver',
           header: i18next.t('field.transport_driver'),
           sortable: true,
+          label: true,
           width: 150
         },
         {
@@ -125,22 +124,31 @@ class DispatchmentList extends localize(i18next)(PageView) {
           name: 'transportNo',
           header: i18next.t('field.truck_no'),
           sortable: true,
+          label: true,
+          width: 150
+        },
+        {
+          type: 'object',
+          name: 'dispatchTo',
+          header: i18next.t('field.destination'),
+          sortable: true,
+          label: true,
           width: 150
         },
         {
           type: 'datetime',
           name: 'updatedAt',
           header: i18next.t('field.updated_at'),
-          record: { align: 'left' },
           sortable: true,
+          label: true,
           width: 160
         },
         {
           type: 'object',
           name: 'updater',
           header: i18next.t('field.updater'),
-          record: { align: 'left' },
           sortable: true,
+          label: true,
           width: 200
         }
       ]
@@ -172,14 +180,17 @@ class DispatchmentList extends localize(i18next)(PageView) {
               id
               name
               dispatchAt
-              dispatchTo
+              dispatchTo {
+                id
+                name
+                description
+              }
               transportNo
               driver {
                 id
                 name
                 description
               }
-              externalDriver
               totalTonnageRelease
               deletedAt
               createdAt
@@ -210,25 +221,6 @@ class DispatchmentList extends localize(i18next)(PageView) {
     }
   }
 
-  _compareValues(key, order = 'asc') {
-    return function innerSort(a, b) {
-      if (!a.hasOwnProperty(key) || !b.hasOwnProperty(key)) {
-        return 0
-      }
-
-      const varA = typeof a[key] === 'string' ? a[key].toUpperCase() : a[key]
-      const varB = typeof b[key] === 'string' ? b[key].toUpperCase() : b[key]
-
-      let comparison = 0
-      if (varA > varB) {
-        comparison = 1
-      } else if (varA < varB) {
-        comparison = -1
-      }
-      return order === 'desc' ? comparison * -1 : comparison
-    }
-  }
-
   _exportableData() {
     return this.dataGrist.exportRecords()
   }

package/client/pages/harvesting/daily-harvesting-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 DailyHarvestingDetail extends localize(i18next)(PageView) {
@@ -95,7 +98,7 @@ class DailyHarvestingDetail extends localize(i18next)(PageView) {
     }
 
     return {
-      title: i18next.t('title.harvesting_record_detail'),
+      title: i18next.t('title.harvesting_contractors_daily_harvesting_record'),
       actions
     }
   }
@@ -105,7 +108,7 @@ class DailyHarvestingDetail extends localize(i18next)(PageView) {
       <form name="dailyHarvest" class="multi-column-form" autocomplete="off">
         <fieldset>
           <legend>${i18next.t('title.harvest_no')}: ${this._harvestNo}</legend>
-          <label>${i18next.t('label.harvest_date')}</label>
+          <label>${i18next.t('label.date')}</label>
           <input type="date" name="harvestDate" readonly />
 
           <label>${i18next.t('label.block')}</label>
@@ -114,13 +117,22 @@ class DailyHarvestingDetail extends localize(i18next)(PageView) {
           <label>${i18next.t('label.harvesting_round')}</label>
           <input type="number" name="harvestingRound" readonly />
 
-          <label>${i18next.t('label.coverage')}</label>
+          <label>${i18next.t('label.total_task_covered')}</label>
           <input type="number" name="coverage" readonly />
         </fieldset>
         <fieldset>
-          <legend>${i18next.t('title.overall_record')}</legend>
-          <label>${i18next.t('label.total_bunch_harvested')}</label>
+          <legend>${i18next.t('title.summary')}</legend>
+          <label>${i18next.t('label.yesterday_balance_in_field')}</label>
+          <input type="number" name="yesterdayBalanceBunchInField" readonly />
+
+          <label>${i18next.t('label.harvested_today')}</label>
           <input type="number" name="totalBunchHarvested" readonly />
+
+          <label>${i18next.t('label.collected_today')}</label>
+          <input type="number" name="collectedBunch" readonly />
+
+          <label>${i18next.t('label.total_number_of_bunches')}</label>
+          <input type="number" name="balanceBunchInField" readonly />
         </fieldset>
       </form>
 
@@ -156,7 +168,7 @@ class DailyHarvestingDetail extends localize(i18next)(PageView) {
     this.harvestGristConfig = {
       pagination: { infinite: true },
       list: {
-        fields: ['organizationStaff', 'totalBunchHarvested', 'remark']
+        fields: ['organizationStaff', 'organizationName', 'totalTonnageHarvested', 'totalBunchHarvested', 'remark']
       },
       rows: { appendable: false },
       columns: [
@@ -165,18 +177,35 @@ class DailyHarvestingDetail extends localize(i18next)(PageView) {
           type: 'string',
           name: 'staffName',
           header: i18next.t('field.task_no'),
+          label: true,
+          width: 300
+        },
+        {
+          type: 'string',
+          name: 'organizationName',
+          header: i18next.t('field.contractor'),
+          label: true,
           width: 300
         },
         {
           type: 'float',
           name: 'totalBunchHarvested',
           header: i18next.t('field.total_no_of_bunches'),
+          label: true,
           width: 150
         },
+        {
+          type: 'float',
+          name: 'totalTonnageHarvested',
+          header: i18next.t('field.total_tonnage_estimated'),
+          label: true,
+          width: 200
+        },
         {
           type: 'string',
           name: 'remark',
           header: i18next.t('field.remarks'),
+          label: true,
           width: 300
         }
       ]
@@ -192,13 +221,7 @@ class DailyHarvestingDetail extends localize(i18next)(PageView) {
   }
 
   async _fetchHarvestRecord() {
-    if (!this._harvestNo) {
-      CustomAlert({
-        title: i18next.t('text.no_records'),
-        text: i18next.t('text.unable_to_find_harvest_record')
-      })
-    }
-
+    if (!this._harvestNo) return
     const response = await client.query({
       query: gql`
         query dailyHarvest($name: String!) {
@@ -211,16 +234,24 @@ class DailyHarvestingDetail extends localize(i18next)(PageView) {
             }
             harvestDate
             totalBunchHarvested
+            yesterdayBalanceBunchInField
+            balanceBunchInField
+            collectedBunch
             coverage
             rainfall
             harvestingRound
             status
             dailyHarvestDetails {
               totalBunchHarvested
+              totalTonnageHarvested
               remark
               organizationStaff {
                 id
                 name
+                organization {
+                  id
+                  name
+                }
               }
             }
           }
@@ -232,13 +263,19 @@ class DailyHarvestingDetail extends localize(i18next)(PageView) {
     if (!response.errors) {
       const dailyHarvest = response.data.dailyHarvest
       const dailyHarvestDetails = dailyHarvest.dailyHarvestDetails
-      this._fillupHarvestForm({ ...dailyHarvest, blockName: dailyHarvest.block.name })
+
+      this._fillupHarvestForm({
+        ...dailyHarvest,
+        blockName: dailyHarvest.block.name
+      })
+
       this._status = dailyHarvest.status
       this.harvestData = {
         records: dailyHarvestDetails.map(detail => {
           return {
             ...detail,
-            staffName: detail.organizationStaff && detail.organizationStaff.name
+            staffName: detail.organizationStaff && detail.organizationStaff.name,
+            organizationName: detail.organizationStaff.organization && detail.organizationStaff.organization.name
           }
         })
       }