@things-factory/operato-pms 3.7.5 → 3.8.13

package/client/pages/loading/loading-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 LoadingList extends localize(i18next)(PageView) {
   static get styles() {
@@ -52,9 +54,9 @@ class LoadingList extends localize(i18next)(PageView) {
 
   get context() {
     return {
-      title: i18next.t('title.loading_list'),
+      title: i18next.t('title.field_loading_contractor_daily_loading_record'),
       exportable: {
-        name: i18next.t('title.loading_list'),
+        name: i18next.t('title.field_loading_contractor_daily_loading_record'),
         data: this._exportableData.bind(this)
       }
     }
@@ -66,42 +68,22 @@ class LoadingList extends localize(i18next)(PageView) {
     }
   }
 
-  async pageInitialized() {
-    const blocks = await this.fetchBlocks()
-
+  pageInitialized() {
     this._searchFields = [
       {
-        label: i18next.t('field.loading_date'),
+        label: i18next.t('field.date'),
         name: 'loadingDate',
         type: 'date',
         props: { searchOper: 'eq' }
-      },
-      {
-        label: i18next.t('field.block'),
-        name: 'blockId',
-        type: 'select',
-        options: [
-          { value: '' },
-          ...blocks
-            .map(block => {
-              return {
-                name: block.name,
-                value: block.id
-              }
-            })
-            .sort(this._compareValues('name', 'asc'))
-        ],
-        props: { searchOper: 'eq' }
       }
     ]
 
     this.config = {
       list: {
-        fields: ['loadingDate', 'block', 'totalWeight', 'totalBunch', 'updatedAt', 'updater']
+        fields: ['loadingDate', 'totalWeight', 'totalBunch', 'updatedAt', 'updater']
       },
       rows: { appendable: false, selectable: { multiple: true } },
       columns: [
-        { type: 'gutter', gutterName: 'dirty' },
         { type: 'gutter', gutterName: 'sequence' },
         {
           type: 'gutter',
@@ -116,29 +98,25 @@ class LoadingList extends localize(i18next)(PageView) {
         {
           type: 'date',
           name: 'loadingDate',
-          header: i18next.t('field.loading_date'),
+          header: i18next.t('field.date'),
           sortable: true,
+          label: true,
           width: 120
         },
         {
-          type: 'object',
-          name: 'block',
-          header: i18next.t('field.block'),
+          type: 'float',
+          name: 'totalBunch',
+          header: i18next.t('field.total_bunch'),
           sortable: true,
-          width: 180
+          label: true,
+          width: 120
         },
         {
           type: 'float',
           name: 'totalWeight',
           header: i18next.t('field.total_weight'),
           sortable: true,
-          width: 120
-        },
-        {
-          type: 'integer',
-          name: 'totalBunch',
-          header: i18next.t('field.total_bunch'),
-          sortable: true,
+          label: true,
           width: 120
         },
         {
@@ -146,6 +124,7 @@ class LoadingList extends localize(i18next)(PageView) {
           name: 'updatedAt',
           header: i18next.t('field.updated_at'),
           sortable: true,
+          label: true,
           width: 160
         },
         {
@@ -153,6 +132,7 @@ class LoadingList extends localize(i18next)(PageView) {
           name: 'updater',
           header: i18next.t('field.updater'),
           sortable: true,
+          label: true,
           width: 200
         }
       ]
@@ -179,14 +159,9 @@ class LoadingList extends localize(i18next)(PageView) {
             items {
               id
               name
-              block {
-                id
-                name
-                description
-              }
               loadingDate
-              totalWeight
               totalBunch
+              totalWeight
               deletedAt
               createdAt
               updatedAt
@@ -211,44 +186,6 @@ class LoadingList extends localize(i18next)(PageView) {
     }
   }
 
-  async fetchBlocks() {
-    const filters = []
-    const response = await client.query({
-      query: gql`
-        query blocks($filters: [Filter]) {
-          blocks(filters: $filters) {
-            items {
-              id
-              name
-              description
-            }
-          }
-        }
-      `,
-      variables: { filters }
-    })
-    return response.data.blocks.items
-  }
-
-  _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
-    }
-  }
-
   get _columns() {
     return this.config.columns
   }

package/client/pages/master/block.js

@@ -97,6 +97,7 @@ class MasterBlock extends localize(i18next)(PageView) {
 
     this.config = {
       rows: { selectable: { multiple: true } },
+      pagination: { limit: 100, pages: [50, 100, 250] },
       list: { fields: ['name', 'description', 'type', 'parentBlock', 'updatedAt', 'updater'] },
       columns: [
         { type: 'gutter', gutterName: 'dirty' },

package/client/pages/master/company.js

@@ -1,12 +1,16 @@
-import { getCodeByName } from '@things-factory/code-base'
 import '@things-factory/form-ui'
 import '@things-factory/grist-ui'
+
+import gql from 'graphql-tag'
+import { css, html } from 'lit-element'
+
+import { getCodeByName } from '@things-factory/code-base'
 import { i18next, localize } from '@things-factory/i18n-base'
 import { client, CustomAlert, PageView } from '@things-factory/shell'
 import { CommonButtonStyles, ScrollbarStyles } from '@things-factory/styles'
 import { isMobileDevice } from '@things-factory/utils'
-import gql from 'graphql-tag'
-import { css, html } from 'lit-element'
+
+import { ORGANIZATION_TYPES } from '../constants'
 
 class MasterCompany extends localize(i18next)(PageView) {
   static get styles() {
@@ -83,7 +87,7 @@ class MasterCompany extends localize(i18next)(PageView) {
   }
 
   async pageInitialized() {
-    const _companyType = await getCodeByName('ORGANIZATION_TYPES')
+    // const _companyType = await getCodeByName('ORGANIZATION_TYPES')
     this._searchFields = [
       {
         label: i18next.t('field.name'),
@@ -97,8 +101,11 @@ class MasterCompany extends localize(i18next)(PageView) {
         type: 'select',
         options: [
           { value: '' },
-          ..._companyType.map(item => {
-            return { name: i18next.t(`label.${item.description}`), value: item.name }
+          ...Object.keys(ORGANIZATION_TYPES).map(org => {
+            return {
+              name: i18next.t(`label.${ORGANIZATION_TYPES[org].name}`),
+              value: ORGANIZATION_TYPES[org].value
+            }
           })
         ],
         props: { searchOper: 'eq' }
@@ -107,6 +114,7 @@ class MasterCompany extends localize(i18next)(PageView) {
 
     this.config = {
       rows: { selectable: { multiple: true } },
+      pagination: { limit: 100, pages: [50, 100, 250] },
       columns: [
         { type: 'gutter', gutterName: 'dirty' },
         { type: 'gutter', gutterName: 'sequence' },
@@ -121,15 +129,20 @@ class MasterCompany extends localize(i18next)(PageView) {
           width: 250
         },
         {
-          type: 'string',
+          type: 'select',
           name: 'type',
           header: i18next.t('field.type'),
-          sortable: true,
-          imex: {
-            header: i18next.t('field.type'),
-            key: 'type',
-            width: 50,
-            type: 'string'
+          record: {
+            editable: true,
+            options: [
+              { display: '', value: '' },
+              ...Object.keys(ORGANIZATION_TYPES).map(org => {
+                return {
+                  display: ORGANIZATION_TYPES[org].name,
+                  value: ORGANIZATION_TYPES[org].value
+                }
+              })
+            ]
           },
           width: 150
         },

package/client/pages/master/home.js

@@ -1,81 +1,82 @@
-import { PageView, store } from '@things-factory/shell'
 import { css, html } from 'lit-element'
 import { connect } from 'pwa-helpers/connect-mixin.js'
 
+import { PageView, store } from '@things-factory/shell'
+
 class MasterHome extends connect(store)(PageView) {
   static get styles() {
     return [
       css`
-      :host {
-        display: block;
-        background-color: var(--main-section-background-color);
-        padding: var(--padding-wide);
+        :host {
+          display: block;
+          background-color: var(--main-section-background-color);
+          padding: var(--padding-wide);
 
-        overflow: auto;
-      }
-      [message] {
-        padding: 40px 20px 0 20px;
-        max-width: var(--content-container-max-width);
-        font-size: 18px;
-        color: var(--secondary-color);
-        text-align: justify;
-      }
-      [message] strong {
-        display: block;
-        font-size: 2.5rem;
-        color: var(--primary-color);
-      }
-      [message] img {
-        float: right;
-        width: 450px;
-        max-width: 90%;
-        display: block;
-        margin: auto;
-        margin-top: 20px;
-      }
-      [message] ul {
-        margin: var(--margin-default) 0;
-        padding: 0;
-        list-style: circle inside;
-      }
-      [message] a {
-        color: var(--secondary-text-color);
-        font-size: 0.9rem;
-      }
-      [message] a:hover {
-        font-weight: bold;
-        color: var(--primary-color);
-      }
-      [button-primary] {
-        display: block;
-        background-color: var(--button-primary-background-color);
-        border: var(--button-border);
-        border-radius: var(--button-border-radius);
-        margin-top: var(--margin-wide);
-        padding: var(--button-padding);
-        color: var(--button-primary-color);
-        font: var(--button-primary-font);
-        text-transform: var(--button-text-transform);
-        text-decoration: none;
-      }
-      [button-primary]:hover {
-        background-color: var(--button-primary-active-background-color);
-        box-shadow: var(--button-active-box-shadow);
-      }
-      @media screen and (max-width: 480px) {
+          overflow: auto;
+        }
         [message] {
-          padding-top: 10px;
-          font-size: 15px;
+          padding: 40px 20px 0 20px;
+          max-width: var(--content-container-max-width);
+          font-size: 18px;
+          color: var(--secondary-color);
+          text-align: justify;
         }
         [message] strong {
-          font-size: 1.6rem;
+          display: block;
+          font-size: 2.5rem;
+          color: var(--primary-color);
         }
         [message] img {
-          float: none;
-          width: 90%;
+          float: right;
+          width: 450px;
+          max-width: 90%;
+          display: block;
+          margin: auto;
+          margin-top: 20px;
         }
-      }
-    `
+        [message] ul {
+          margin: var(--margin-default) 0;
+          padding: 0;
+          list-style: circle inside;
+        }
+        [message] a {
+          color: var(--secondary-text-color);
+          font-size: 0.9rem;
+        }
+        [message] a:hover {
+          font-weight: bold;
+          color: var(--primary-color);
+        }
+        [button-primary] {
+          display: block;
+          background-color: var(--button-primary-background-color);
+          border: var(--button-border);
+          border-radius: var(--button-border-radius);
+          margin-top: var(--margin-wide);
+          padding: var(--button-padding);
+          color: var(--button-primary-color);
+          font: var(--button-primary-font);
+          text-transform: var(--button-text-transform);
+          text-decoration: none;
+        }
+        [button-primary]:hover {
+          background-color: var(--button-primary-active-background-color);
+          box-shadow: var(--button-active-box-shadow);
+        }
+        @media screen and (max-width: 480px) {
+          [message] {
+            padding-top: 10px;
+            font-size: 15px;
+          }
+          [message] strong {
+            font-size: 1.6rem;
+          }
+          [message] img {
+            float: none;
+            width: 90%;
+          }
+        }
+      `
     ]
   }
 
@@ -92,7 +93,7 @@ class MasterHome extends connect(store)(PageView) {
   render() {
     return html`
       <div message>
-      <img src="/assets/images/image-bizplace.png" />
+        <img src="/assets/images/image-bizplace.png" />
         <strong>Master Data Management</strong>
         OPERATO allows user to manage the master data of the whole plantation such as block, ramps, company and staff.
         <ul>
@@ -100,6 +101,7 @@ class MasterHome extends connect(store)(PageView) {
           <li><a href="master-ramp">Ramp</a></li>
           <li><a href="master-company">Company & Contractors</a></li>
           <li><a href="master-staff">Company Staff & Contractors</a></li>
+          <li><a href="master-truck">Truck</a></li>
         </ul>
       </div>
     `

package/client/pages/master/ramp.js

@@ -112,6 +112,7 @@ class MasterRamp extends localize(i18next)(PageView) {
 
     this.config = {
       rows: { selectable: { multiple: true } },
+      pagination: { limit: 100, pages: [50, 100, 250] },
       columns: [
         { type: 'gutter', gutterName: 'dirty' },
         { type: 'gutter', gutterName: 'sequence' },

package/client/pages/master/staff.js

@@ -1,11 +1,14 @@
 import '@things-factory/form-ui'
 import '@things-factory/grist-ui'
+
+import gql from 'graphql-tag'
+import { css, html } from 'lit-element'
+
+import { getCodeByName } from '@things-factory/code-base'
 import { i18next, localize } from '@things-factory/i18n-base'
 import { client, CustomAlert, PageView } from '@things-factory/shell'
 import { CommonButtonStyles, ScrollbarStyles } from '@things-factory/styles'
 import { isMobileDevice } from '@things-factory/utils'
-import gql from 'graphql-tag'
-import { css, html } from 'lit-element'
 
 class MasterStaff extends localize(i18next)(PageView) {
   static get styles() {
@@ -83,6 +86,7 @@ class MasterStaff extends localize(i18next)(PageView) {
 
   async pageInitialized() {
     const _companies = await this.fetchCompanies()
+    const staffTypes = await getCodeByName('STAFF_TYPES')
 
     this._searchFields = [
       {
@@ -97,6 +101,21 @@ class MasterStaff extends localize(i18next)(PageView) {
         type: 'text',
         props: { searchOper: 'i_like' }
       },
+      {
+        label: i18next.t('field.type'),
+        name: 'type',
+        type: 'select',
+        options: [
+          { value: '' },
+          ...staffTypes.map(staffType => {
+            return {
+              name: staffType.name,
+              value: staffType.name
+            }
+          })
+        ],
+        props: { searchOper: 'eq' }
+      },
       {
         label: i18next.t('field.company'),
         name: 'organizationId',
@@ -118,6 +137,7 @@ class MasterStaff extends localize(i18next)(PageView) {
 
     this.config = {
       rows: { selectable: { multiple: true } },
+      pagination: { limit: 100, pages: [50, 100, 250] },
       columns: [
         { type: 'gutter', gutterName: 'dirty' },
         { type: 'gutter', gutterName: 'sequence' },
@@ -140,6 +160,35 @@ class MasterStaff extends localize(i18next)(PageView) {
           sortable: true,
           width: 300
         },
+        {
+          type: 'string',
+          name: 'idNumber',
+          header: i18next.t('field.id_number'),
+          record: { editable: true },
+          imex: { header: i18next.t('field.id_number'), key: 'idNumber', width: 50, type: 'string' },
+          sortable: true,
+          width: 300
+        },
+        {
+          type: 'code',
+          name: 'type',
+          header: i18next.t('field.type'),
+          record: { editable: true, codeName: 'STAFF_TYPES' },
+          imex: {
+            header: 'type',
+            key: 'type',
+            width: 100,
+            type: 'array',
+            arrData: staffTypes.map(staffType => {
+              return {
+                name: staffType.name,
+                id: staffType.name
+              }
+            })
+          },
+          sortable: true,
+          width: 130
+        },
         {
           type: 'object',
           name: 'organization',
@@ -266,17 +315,19 @@ class MasterStaff extends localize(i18next)(PageView) {
 
     const response = await client.query({
       query: gql`
-        query ramps($filters: [Filter], $pagination: Pagination, $sortings: [Sorting]) {
+        query organizationStaffs($filters: [Filter], $pagination: Pagination, $sortings: [Sorting]) {
           organizationStaffs(filters: $filters, pagination: $pagination, sortings: $sortings) {
             items {
               id
               name
               staffId
+              type
               organization {
                 id
                 name
                 description
               }
+              idNumber
               status
               deletedAt
               updatedAt