@things-factory/operato-pms 3.8.13 → 3.8.14

package/client/pages/dispatchment/daily-dispatch-detail.js

@@ -127,7 +127,7 @@ class DailyDispatchDetail extends localize(i18next)(PageView) {
           <label>${i18next.t('label.chit_no')}</label>
           <input name="chitNo" />
 
-          <label>${i18next.t('label.percentage')}</label>
+          <label>${i18next.t('label.oer_percentage')}</label>
           <input name="percentage" type="number" min="0" />
         </fieldset>
       </form>

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

@@ -141,7 +141,7 @@ class DispatchmentCreateRecord extends localize(i18next)(PageView) {
           <label>${i18next.t('label.chit_no')}</label>
           <input name="chitNo" />
 
-          <label>${i18next.t('label.percentage')}</label>
+          <label>${i18next.t('label.oer_percentage')}</label>
           <input name="percentage" type="number" min="0" />
         </fieldset>
       </form>
@@ -215,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',
@@ -286,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) {
@@ -300,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'
               }
             ]
@@ -399,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
       }

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

@@ -197,9 +197,9 @@ class DailyHarvestingDetail extends localize(i18next)(PageView) {
         {
           type: 'float',
           name: 'totalTonnageHarvested',
-          header: i18next.t('field.total_tonnage_harvested'),
+          header: i18next.t('field.total_tonnage_estimated'),
           label: true,
-          width: 150
+          width: 200
         },
         {
           type: 'string',

package/client/pages/harvesting/edit-harvesting-record.js

@@ -215,9 +215,9 @@ class EditHarvestingRecord extends localize(i18next)(PageView) {
         {
           type: 'float',
           name: 'totalTonnageHarvested',
-          header: i18next.t('field.total_tonnage_harvested'),
+          header: i18next.t('field.total_tonnage_estimated'),
           record: { editable: true },
-          width: 150
+          width: 200
         },
         {
           type: 'string',

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

@@ -210,9 +210,9 @@ class HarvestingCreateRecord extends localize(i18next)(PageView) {
         {
           type: 'float',
           name: 'totalTonnageHarvested',
-          header: i18next.t('field.total_tonnage_harvested'),
+          header: i18next.t('field.total_tonnage_estimated'),
           record: { editable: true },
-          width: 150
+          width: 200
         },
         {
           type: 'string',

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/report/report-daily-ffb-dispatch-and-production.js

@@ -39,15 +39,16 @@ class ReportDailyFfbDispatchAndProduction extends connect(store)(localize(i18nex
       _config: Object,
       _gristData: Object,
       _blocks: Object,
+      _mills: Object,
       _month: String,
       data: Object
     }
   }
 
   get context() {
-    let fileName = `${i18next.t('title.ffb_tonnage_between_individual_block')}`
+    let fileName = `${i18next.t('title.daily_ffb_dispatch_and_production')}`
     return {
-      title: i18next.t('title.ffb_tonnage_between_individual_block'),
+      title: i18next.t('title.daily_ffb_dispatch_and_production'),
       printable: {
         accept: ['preview'],
         content: this
@@ -119,120 +120,138 @@ class ReportDailyFfbDispatchAndProduction extends connect(store)(localize(i18nex
     }
   }
 
-  get sectionOneColumns() {
-    return [
-      {
-        type: 'string',
-        name: 'date',
-        header: i18next.t('field.date'),
-        record: { editable: false, align: 'left' },
-        imex: {
-          header: i18next.t('field.date'),
-          key: 'date',
-          width: 20,
-          type: 'string'
-        },
-        width: 120
-      },
-      {
-        type: 'string',
-        name: 'runningNo',
-        header: i18next.t('field.no'),
-        record: { editable: false, align: 'left' },
-        imex: {
-          header: i18next.t('field.no'),
-          key: 'runningNo',
-          width: 10,
-          type: 'string'
-        },
-        width: 60
-      },
-      {
-        type: 'string',
-        name: 'dispatchTo',
-        header: i18next.t('field.dispatch_to'),
-        record: { editable: false, align: 'left' },
-        imex: {
-          header: i18next.t('field.dispatch_to'),
-          key: 'dispatchTo',
-          width: 50,
-          type: 'string'
-        },
-        width: 200
-      },
-      {
-        type: 'string',
-        name: 'lorryNo',
-        header: i18next.t('field.lorry_no'),
-        record: { editable: false, align: 'left' },
-        imex: {
-          header: i18next.t('field.lorry_no'),
-          key: 'lorryNo',
-          width: 50,
-          type: 'string'
-        },
-        width: 200
-      }
-    ]
-  }
-
-  get sectionTwoColumns() {
-    return this._blocks.sort(this._compareValues('name', 'asc')).map(blk => {
-      return {
-        type: 'number',
-        name: blk.name,
-        header: blk.name,
-        record: { editable: false, align: 'center' },
-        imex: {
-          header: blk.name,
-          key: blk.name,
-          width: 30,
-          type: 'decimal'
-        },
-        width: 120
-      }
-    })
-  }
-
-  get sectionThreeColumns() {
-    return [
-      {
-        type: 'string',
-        name: 'today',
-        header: i18next.t('field.today'),
-        record: { editable: false, align: 'center' },
-        imex: {
-          header: i18next.t('field.today'),
-          key: 'today',
-          width: 30,
-          type: 'string'
-        },
-        width: 120
-      },
-      {
-        type: 'string',
-        name: 'todate',
-        header: i18next.t('field.to_date'),
-        record: { editable: false, align: 'center' },
-        imex: {
-          header: i18next.t('field.to_date'),
-          key: 'todate',
-          width: 30,
-          type: 'string'
-        },
-        width: 120
-      }
-    ]
-  }
+  // get sectionOneColumns() {
+  //   return [
+  //     {
+  //       type: 'string',
+  //       name: 'date',
+  //       header: i18next.t('field.date'),
+  //       record: { editable: false, align: 'left' },
+  //       imex: {
+  //         header: i18next.t('field.date'),
+  //         key: 'date',
+  //         width: 20,
+  //         type: 'string'
+  //       },
+  //       width: 120
+  //     }
+  //   ]
+  // }
+
+  // get sectionTwoColumns() {
+  //   return this._blocks.sort(this._compareValues('name', 'asc')).map(blk => {
+  //     return {
+  //       type: 'number',
+  //       name: blk.name,
+  //       header: blk.name,
+  //       record: { editable: false, align: 'center' },
+  //       imex: {
+  //         header: blk.name,
+  //         key: blk.name,
+  //         width: 30,
+  //         type: 'decimal'
+  //       },
+  //       width: 120
+  //     }
+  //   })
+  // }
+
+  // get sectionThreeColumns() {
+  //   return this._mills.sort(this._compareValues('name', 'asc')).map(mill => {
+  //     return {
+  //       type: 'number',
+  //       name: mill.name,
+  //       header: mill.name,
+  //       record: { editable: false, align: 'center' },
+  //       imex: {
+  //         header: mill.name,
+  //         key: mill.name,
+  //         width: 30,
+  //         type: 'decimal'
+  //       },
+  //       width: 120
+  //     }
+  //   })
+  // }
 
   async pageInitialized() {
-    let blocks = [...(await this._fetchBlocks())]
-    this._blocks = blocks
+    this._blocks = [...(await this._fetchBlocks())]
+    this._mills = [...(await this._fetchMills())]
     this._gristData = { total: 0, records: [] }
     this._searchFields = this.searchFields
     this._config = {
       ...this.reportConfig,
-      columns: [...this.sectionOneColumns, ...this.sectionTwoColumns, ...this.sectionThreeColumns]
+      columns: [
+        {
+          type: 'string',
+          name: 'date',
+          header: i18next.t('field.date'),
+          record: { editable: false, align: 'left' },
+          imex: {
+            header: i18next.t('field.date'),
+            key: 'date',
+            width: 20,
+            type: 'string'
+          },
+          width: 120
+        },
+        ...this._blocks.sort(this._compareValues('name', 'asc')).map(blk => {
+          return {
+            type: 'string',
+            name: blk.name,
+            header: blk.name,
+            record: { editable: false, align: 'center' },
+            imex: {
+              header: blk.name,
+              key: blk.name,
+              width: 30,
+              type: 'string'
+            },
+            width: 130
+          }
+        }),
+        ...this._mills.sort(this._compareValues('name', 'asc')).map(mill => {
+          return {
+            type: 'string',
+            name: mill.name,
+            header: mill.name,
+            record: { editable: false, align: 'center' },
+            imex: {
+              header: mill.name,
+              key: mill.name,
+              width: 30,
+              type: 'string'
+            },
+            width: 130
+          }
+        }),
+        {
+          type: 'string',
+          name: 'unknown',
+          header: 'UNKNOWN',
+          record: { editable: false, align: 'center' },
+          imex: {
+            header: 'UNKNOWN',
+            key: 'unknown',
+            width: 30,
+            type: 'string'
+          },
+          width: 130
+        },
+        {
+          type: 'string',
+          name: 'today',
+          header: i18next.t('field.today'),
+          record: { editable: false, align: 'center' },
+          imex: {
+            header: i18next.t('field.today'),
+            key: 'today',
+            width: 30,
+            type: 'string'
+          },
+          width: 130
+        }
+      ]
     }
   }
 
@@ -250,16 +269,12 @@ class ReportDailyFfbDispatchAndProduction extends connect(store)(localize(i18nex
 
       const response = await client.query({
         query: gql`
-          query monthlyBlockDispatchReports($filters: [Filter], $pagination: Pagination, $sortings: [Sorting]) {
-            monthlyBlockDispatchReports(filters: $filters, pagination: $pagination, sortings: $sortings) {
+          query dailyFfbDispatchProductionReports($filters: [Filter], $pagination: Pagination, $sortings: [Sorting]) {
+            dailyFfbDispatchProductionReports(filters: $filters, pagination: $pagination, sortings: $sortings) {
               items {
-                no
                 date
                 blockData
-                lorryNo
-                dispatchTo
                 today
-                todate
               }
               total
             }
@@ -270,7 +285,7 @@ class ReportDailyFfbDispatchAndProduction extends connect(store)(localize(i18nex
 
       const data = {
         records:
-          response.data.monthlyBlockDispatchReports.items.map((item, idx) => {
+          response.data.dailyFfbDispatchProductionReports.items.map((item, idx) => {
             let blockData = JSON.parse(item.blockData)
             return {
               ...item,
@@ -278,7 +293,7 @@ class ReportDailyFfbDispatchAndProduction extends connect(store)(localize(i18nex
               runningNo: idx + 1
             }
           }) || [],
-        total: response.data.monthlyBlockDispatchReports.total
+        total: response.data.dailyFfbDispatchProductionReports.total
       }
 
       this._gristData = {
@@ -316,16 +331,42 @@ class ReportDailyFfbDispatchAndProduction extends connect(store)(localize(i18nex
     })
 
     if (!response.errors) {
-      return response.data.ramps.items.map(ramp => {
-        return {
-          id: ramp.block.id,
-          name: ramp.block.name
+      return response.data.ramps.items.reduce((acc, ramp) => {
+        if (!acc.find(itm => itm.id == ramp.block.id) && !ramp.block.deletedAt)
+          acc.push({
+            id: ramp.block.id,
+            name: ramp.block.name
+          })
+
+        return acc
+      }, [])
+    }
+  }
+
+  async _fetchMills() {
+    const filters = [{ name: 'type', operator: 'eq', value: 'MILL' }]
+    const pagination = { page: 1, limit: 99999999 }
+
+    const response = await client.query({
+      query: gql`
+        query organizations($filters: [Filter], $pagination: Pagination) {
+          organizations(filters: $filters, pagination: $pagination) {
+            items {
+              id
+              name
+            }
+          }
         }
-      })
+      `,
+      variables: { filters, pagination }
+    })
+
+    if (!response.errors) {
+      return [...response.data.organizations.items]
     }
   }
 
-  _dateChange() {
+  _dateChange(e) {
     const monthNames = [
       'January',
       'February',
@@ -342,6 +383,8 @@ class ReportDailyFfbDispatchAndProduction extends connect(store)(localize(i18nex
     ]
     let selectedDate = this._monthInput.valueAsDate
     this._month = `${monthNames[selectedDate.getMonth()]} ${selectedDate.getFullYear().toString()}`
+
+    this.searchForm.submit()
   }
 
   async _exportableData() {