@things-factory/operato-pms 4.0.27 → 4.0.32

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/operato-pms",
-  "version": "4.0.27",
+  "version": "4.0.32",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -38,63 +38,63 @@
     "docker:run": "docker run -p 4000:3000 hatiolab/operato-pms:latest"
   },
   "dependencies": {
-    "@operato/ghost-print": "^0.3.2",
-    "@operato/scene-chartjs": "^0.1.0",
-    "@operato/scene-clock": "^0.1.0",
-    "@operato/scene-clone": "^0.1.0",
-    "@operato/scene-compass": "^0.1.0",
-    "@operato/scene-gauge": "^0.1.0",
-    "@operato/scene-indoor-map": "^0.1.0",
-    "@operato/scene-legend": "^0.1.0",
-    "@operato/scene-progressbar": "^0.1.0",
-    "@operato/scene-random": "^0.1.0",
-    "@operato/scene-switch": "^0.1.0",
-    "@operato/scene-tab": "^0.1.0",
-    "@operato/scene-table": "^0.1.0",
-    "@operato/scene-wheel-sorter": "^0.1.0",
-    "@things-factory/apptool-ui": "^4.0.27",
-    "@things-factory/auth-ui": "^4.0.27",
-    "@things-factory/biz-base": "^4.0.27",
-    "@things-factory/board-service": "^4.0.27",
-    "@things-factory/board-ui": "^4.0.27",
-    "@things-factory/code-ui": "^4.0.27",
-    "@things-factory/context-ui": "^4.0.27",
-    "@things-factory/dashboard": "^4.0.27",
-    "@things-factory/document-template-ui": "^4.0.27",
-    "@things-factory/export-ui": "^4.0.27",
-    "@things-factory/export-ui-csv": "^4.0.27",
-    "@things-factory/export-ui-excel": "^4.0.27",
-    "@things-factory/fav-base": "^4.0.27",
-    "@things-factory/form-ui": "^4.0.27",
-    "@things-factory/grist-ui": "^4.0.27",
-    "@things-factory/help": "^4.0.27",
-    "@things-factory/i18n-ui": "^4.0.27",
-    "@things-factory/import-ui": "^4.0.27",
-    "@things-factory/import-ui-excel": "^4.0.27",
-    "@things-factory/lite-menu": "^4.0.27",
-    "@things-factory/more-ui": "^4.0.27",
-    "@things-factory/notification": "^4.0.27",
-    "@things-factory/print-ui": "^4.0.27",
-    "@things-factory/resource-ui": "^4.0.27",
-    "@things-factory/scene-data-transform": "^4.0.27",
-    "@things-factory/scene-excel": "^4.0.27",
-    "@things-factory/scene-firebase": "^4.0.27",
-    "@things-factory/scene-form": "^4.0.27",
-    "@things-factory/scene-google-map": "^4.0.27",
-    "@things-factory/scene-graphql": "^4.0.27",
+    "@operato/ghost-print": "^0.3.7",
+    "@operato/scene-chartjs": "^0.1.2",
+    "@operato/scene-clock": "^0.1.2",
+    "@operato/scene-clone": "^0.1.2",
+    "@operato/scene-compass": "^0.1.2",
+    "@operato/scene-gauge": "^0.1.2",
+    "@operato/scene-indoor-map": "^0.1.2",
+    "@operato/scene-legend": "^0.1.2",
+    "@operato/scene-progressbar": "^0.1.2",
+    "@operato/scene-random": "^0.1.2",
+    "@operato/scene-switch": "^0.1.2",
+    "@operato/scene-tab": "^0.1.2",
+    "@operato/scene-table": "^0.1.2",
+    "@operato/scene-wheel-sorter": "^0.1.2",
+    "@things-factory/apptool-ui": "^4.0.32",
+    "@things-factory/auth-ui": "^4.0.32",
+    "@things-factory/biz-base": "^4.0.32",
+    "@things-factory/board-service": "^4.0.32",
+    "@things-factory/board-ui": "^4.0.32",
+    "@things-factory/code-ui": "^4.0.32",
+    "@things-factory/context-ui": "^4.0.32",
+    "@things-factory/dashboard": "^4.0.32",
+    "@things-factory/document-template-ui": "^4.0.32",
+    "@things-factory/export-ui": "^4.0.32",
+    "@things-factory/export-ui-csv": "^4.0.32",
+    "@things-factory/export-ui-excel": "^4.0.32",
+    "@things-factory/fav-base": "^4.0.32",
+    "@things-factory/form-ui": "^4.0.32",
+    "@things-factory/grist-ui": "^4.0.32",
+    "@things-factory/help": "^4.0.32",
+    "@things-factory/i18n-ui": "^4.0.32",
+    "@things-factory/import-ui": "^4.0.32",
+    "@things-factory/import-ui-excel": "^4.0.32",
+    "@things-factory/lite-menu": "^4.0.32",
+    "@things-factory/more-ui": "^4.0.32",
+    "@things-factory/notification": "^4.0.32",
+    "@things-factory/print-ui": "^4.0.32",
+    "@things-factory/resource-ui": "^4.0.32",
+    "@things-factory/scene-data-transform": "^4.0.32",
+    "@things-factory/scene-excel": "^4.0.32",
+    "@things-factory/scene-firebase": "^4.0.32",
+    "@things-factory/scene-form": "^4.0.32",
+    "@things-factory/scene-google-map": "^4.0.32",
+    "@things-factory/scene-graphql": "^4.0.32",
     "@things-factory/scene-half-roundrect": "^4.0.9",
-    "@things-factory/scene-label": "^4.0.27",
-    "@things-factory/scene-marker": "^4.0.27",
-    "@things-factory/scene-mqtt": "^4.0.27",
-    "@things-factory/scene-news-ticker": "^4.0.27",
-    "@things-factory/scene-restful": "^4.0.27",
-    "@things-factory/scene-visualizer": "^4.0.27",
-    "@things-factory/setting-ui": "^4.0.27",
-    "@things-factory/shell": "^4.0.27",
-    "@things-factory/system-ui": "^4.0.27"
+    "@things-factory/scene-label": "^4.0.32",
+    "@things-factory/scene-marker": "^4.0.32",
+    "@things-factory/scene-mqtt": "^4.0.32",
+    "@things-factory/scene-news-ticker": "^4.0.32",
+    "@things-factory/scene-restful": "^4.0.32",
+    "@things-factory/scene-visualizer": "^4.0.32",
+    "@things-factory/setting-ui": "^4.0.32",
+    "@things-factory/shell": "^4.0.32",
+    "@things-factory/system-ui": "^4.0.32"
   },
   "devDependencies": {
-    "@things-factory/builder": "^4.0.27"
+    "@things-factory/builder": "^4.0.32"
   },
-  "gitHead": "276eaface2890c8f229ce6c9f64cde9c6b1e0083"
+  "gitHead": "a1a16e7d4531ae3ff035295fc7bf05bf0d3153a7"
 }

package/server/constants/index.ts

@@ -5,3 +5,4 @@ export * from './ramp'
 export * from './template'
 export * from './transaction'
 export * from './master'
+export * from './organization'

package/server/constants/organization.ts

@@ -0,0 +1,5 @@
+export const ORGANIZATION_TYPES = {
+  OWNER: { name: 'owner', value: 'OWNER' },
+  CONTRACTOR: { name: 'contractor', value: 'CONTRACTOR' },
+  MILL: { name: 'mill', value: 'MILL' }
+}

package/server/constants/transaction.ts

@@ -2,7 +2,8 @@ export const TRANSACTION_TYPE = {
   HARVEST: 'HARVEST',
   LOADING: 'LOADING',
   DISPATCHMENT: 'DISPATCHMENT',
-  TONNAGE_ADJUSTMENT: 'TONNAGE_ADJUSTMENT',
+  LOADING_ADJUSTMENT: 'LOADING_ADJUSTMENT',
+  DISPATCHMENT_ADJUSTMENT: 'DISPATCHMENT_ADJUSTMENT',
   BUNCHES_ADJUSTMENT: 'BUNCHES_ADJUSTMENT',
   TERMINATED: 'TERMINATED'
 }

package/server/controllers/render-dispatchment.ts

@@ -26,7 +26,7 @@ export async function renderDispatchment({ dispatchNo, timezoneOffSet }, context
     truck_driver: dailyDispatch?.driver ? dailyDispatch.driver : dailyDispatch.externalDriver,
     driver_identification: dailyDispatch.driverIdentification || '',
     truck_no: dailyDispatch.transportNo,
-    destination: dailyDispatch.dispatchTo,
+    // destination: dailyDispatch.dispatchTo,
     dispatch_date: DateTimeConverter.datetime(dailyDispatch.dispatchAt, timezoneOffSet),
     issued_by: dailyDispatch.updater,
     dispatch_list: dailyDispatch.dailyDispatchDetails.map((item: any, idx) => {

package/server/entities/daily-dispatch.ts

@@ -1,5 +1,3 @@
-import { User } from '@things-factory/auth-base'
-import { Domain } from '@things-factory/shell'
 import {
   Column,
   CreateDateColumn,
@@ -10,7 +8,11 @@ import {
   PrimaryGeneratedColumn,
   UpdateDateColumn
 } from 'typeorm'
-import { OrganizationStaff, DailyDispatchDetail } from '../entities'
+
+import { User } from '@things-factory/auth-base'
+import { Domain } from '@things-factory/shell'
+
+import { DailyDispatchDetail, Organization, OrganizationStaff, Truck } from '../entities'
 
 @Entity()
 @Index('ix_daily_dispatch_0', (dailyDispatch: DailyDispatch) => [dailyDispatch.domain, dailyDispatch.id], {
@@ -35,6 +37,9 @@ export class DailyDispatch {
   @Column({ nullable: true })
   externalDriver: string
 
+  @ManyToOne(type => Truck, { nullable: true })
+  transport: Truck
+
   @Column()
   transportNo: string
 
@@ -47,12 +52,20 @@ export class DailyDispatch {
   @OneToMany(type => DailyDispatchDetail, dailyDispatchDetail => dailyDispatchDetail.dailyDispatch)
   dailyDispatchDetails: DailyDispatchDetail[]
 
-  @Column()
-  dispatchTo: string
+  @ManyToOne(type => Organization, { nullable: true })
+  dispatchTo: Organization
 
   @Column({ nullable: true })
   dispatchAt: Date
 
+  // Given by mill after delivery
+  @Column({ default: '' })
+  chitNo: string
+
+  // Given by mill after delivery
+  @Column({ type: 'float', default: 0 })
+  percentage: number
+
   @Column()
   status: string
 

package/server/entities/daily-harvest-detail.ts

@@ -1,6 +1,8 @@
+import { Column, CreateDateColumn, Entity, Index, ManyToOne, PrimaryGeneratedColumn, UpdateDateColumn } from 'typeorm'
+
 import { User } from '@things-factory/auth-base'
 import { Domain } from '@things-factory/shell'
-import { Column, CreateDateColumn, Entity, Index, ManyToOne, PrimaryGeneratedColumn, UpdateDateColumn } from 'typeorm'
+
 import { DailyHarvest, OrganizationStaff } from '../entities'
 
 @Entity()
@@ -28,12 +30,13 @@ export class DailyHarvestDetail {
   @Column({ nullable: true })
   remark: string
 
-  @Column({ type: 'float' })
+  @Column({ type: 'float', default: 0 })
   totalBunchHarvested: number
 
-  @Column({
-    nullable: true
-  })
+  @Column({ type: 'float', default: 0, nullable: true })
+  totalTonnageHarvested: number
+
+  @Column({ nullable: true })
   description: string
 
   @Column({ nullable: true })
@@ -45,13 +48,9 @@ export class DailyHarvestDetail {
   @UpdateDateColumn()
   updatedAt: Date
 
-  @ManyToOne(type => User, {
-    nullable: true
-  })
+  @ManyToOne(type => User, { nullable: true })
   creator: User
 
-  @ManyToOne(type => User, {
-    nullable: true
-  })
+  @ManyToOne(type => User, { nullable: true })
   updater: User
 }

package/server/entities/daily-harvest.ts

@@ -1,5 +1,3 @@
-import { User } from '@things-factory/auth-base'
-import { Domain } from '@things-factory/shell'
 import {
   Column,
   CreateDateColumn,
@@ -10,6 +8,10 @@ import {
   PrimaryGeneratedColumn,
   UpdateDateColumn
 } from 'typeorm'
+
+import { User } from '@things-factory/auth-base'
+import { Domain } from '@things-factory/shell'
+
 import { Block, DailyHarvestDetail } from '../entities'
 
 @Entity()
@@ -27,9 +29,7 @@ export class DailyHarvest {
   @Column()
   name: string
 
-  @Column({
-    nullable: true
-  })
+  @Column({ nullable: true })
   description: string
 
   @Column()
@@ -39,15 +39,24 @@ export class DailyHarvest {
   totalBunchHarvested: number
 
   @Column({ type: 'float', default: 0 })
+  yesterdayBalanceBunchInField: number
+
+  @Column({ type: 'float', default: 0 })
+  balanceBunchInField: number
+
+  @Column({ type: 'float', default: 0 })
+  collectedBunch: number
+
+  @Column({ type: 'float', default: 0, nullable: true })
   coverage: number
 
   @Column({ nullable: true })
   rainfall: string
 
-  @Column({ type: 'int', default: 0 })
+  @Column({ type: 'int', default: 0, nullable: true })
   harvestingRound: number
 
-  @Column({ type: 'int', default: 0 })
+  @Column({ type: 'int', default: 0, nullable: true })
   harvestingDays: number
 
   @OneToMany(type => DailyHarvestDetail, dailyHarvestDetail => dailyHarvestDetail.dailyHarvest)

package/server/entities/daily-loading-detail.ts

@@ -1,7 +1,9 @@
+import { Column, CreateDateColumn, Entity, Index, ManyToOne, PrimaryGeneratedColumn, UpdateDateColumn } from 'typeorm'
+
 import { User } from '@things-factory/auth-base'
 import { Domain } from '@things-factory/shell'
-import { Column, CreateDateColumn, Entity, Index, ManyToOne, PrimaryGeneratedColumn, UpdateDateColumn } from 'typeorm'
-import { DailyLoading, OrganizationStaff } from '../entities'
+
+import { Block, DailyLoading, Ramp, Truck } from '../entities'
 
 @Entity()
 @Index(
@@ -19,8 +21,14 @@ export class DailyLoadingDetail {
   @ManyToOne(type => DailyLoading)
   dailyLoading: DailyLoading
 
-  @ManyToOne(type => OrganizationStaff)
-  organizationStaff: OrganizationStaff
+  @ManyToOne(type => Truck)
+  truck: Truck
+
+  @ManyToOne(type => Block)
+  block: Block
+
+  @ManyToOne(type => Ramp)
+  ramp: Ramp
 
   @Column()
   name: string
@@ -28,10 +36,10 @@ export class DailyLoadingDetail {
   @Column({ nullable: true })
   remark: string
 
-  @Column({ type: 'int' })
+  @Column({ type: 'int', default: 0, nullable: true })
   totalBunchLoaded: number
 
-  @Column({ type: 'float' })
+  @Column({ type: 'float', default: 0 })
   totalBunchWeight: number
 
   @Column({ nullable: true })

package/server/entities/daily-loading.ts

@@ -1,5 +1,3 @@
-import { User } from '@things-factory/auth-base'
-import { Domain } from '@things-factory/shell'
 import {
   Column,
   CreateDateColumn,
@@ -10,7 +8,11 @@ import {
   PrimaryGeneratedColumn,
   UpdateDateColumn
 } from 'typeorm'
-import { Block, DailyLoadingDetail, DailyLoadingRamp } from '../entities'
+
+import { User } from '@things-factory/auth-base'
+import { Domain } from '@things-factory/shell'
+
+import { DailyLoadingDetail } from '../entities'
 
 @Entity()
 @Index('ix_daily-loading_0', (dailyLoading: DailyLoading) => [dailyLoading.domain, dailyLoading.id], { unique: true })
@@ -21,27 +23,21 @@ export class DailyLoading {
   @ManyToOne(type => Domain)
   domain: Domain
 
-  @ManyToOne(type => Block)
-  block: Block
-
   @Column()
   name: string
 
   @Column()
   loadingDate: string
 
-  @Column({ type: 'float' })
+  @Column({ type: 'float', default: 0 })
   totalWeight: number
 
-  @Column({ type: 'int' })
+  @Column({ type: 'int', default: 0, nullable: true })
   totalBunch: number
 
   @OneToMany(type => DailyLoadingDetail, dailyLoadingDetail => dailyLoadingDetail.dailyLoading)
   dailyLoadingDetails: DailyLoadingDetail[]
 
-  @OneToMany(type => DailyLoadingRamp, dailyLoadingRamp => dailyLoadingRamp.dailyLoading)
-  dailyLoadingRamps: DailyLoadingRamp[]
-
   @Column({ nullable: true })
   remark: string
 

package/server/entities/index.ts

@@ -1,3 +1,5 @@
+import { Truck } from './truck'
+import { PlantationSetting } from './plantation-setting'
 import { BlockDetail } from './block-detail'
 import { Block } from './block'
 import { DailyBlockDetail } from './daily-block-detail'
@@ -15,6 +17,8 @@ import { Ramp } from './ramp'
 import { RecordTransaction } from './record-transaction'
 
 export const entities = [
+	Truck,
+	PlantationSetting,
   BlockDetail,
   Block,
   DailyBlockDetail,
@@ -33,6 +37,8 @@ export const entities = [
 ]
 
 export {
+	Truck,
+	PlantationSetting,
   BlockDetail,
   Block,
   DailyBlockDetail,

package/server/entities/organization-staff.ts

@@ -1,6 +1,8 @@
+import { Column, CreateDateColumn, Entity, Index, ManyToOne, PrimaryGeneratedColumn, UpdateDateColumn } from 'typeorm'
+
 import { User } from '@things-factory/auth-base'
 import { Domain } from '@things-factory/shell'
-import { Column, CreateDateColumn, Entity, Index, ManyToOne, PrimaryGeneratedColumn, UpdateDateColumn } from 'typeorm'
+
 import { Organization } from '../entities'
 
 @Entity()
@@ -31,6 +33,9 @@ export class OrganizationStaff {
   @Column({ nullable: true })
   description: string
 
+  @Column({ nullable: true })
+  type: string
+
   @Column()
   status: string
 

package/server/entities/plantation-inventory.ts

@@ -1,6 +1,8 @@
+import { Column, CreateDateColumn, Entity, Index, ManyToOne, PrimaryGeneratedColumn, UpdateDateColumn } from 'typeorm'
+
 import { User } from '@things-factory/auth-base'
 import { Domain } from '@things-factory/shell'
-import { Column, CreateDateColumn, Entity, Index, ManyToOne, PrimaryGeneratedColumn, UpdateDateColumn } from 'typeorm'
+
 import { Block, Ramp } from '../entities'
 
 @Entity()
@@ -25,9 +27,7 @@ export class PlantationInventory {
   @Column()
   name: string
 
-  @Column({
-    nullable: true
-  })
+  @Column({ nullable: true })
   description: string
 
   @Column()
@@ -48,13 +48,9 @@ export class PlantationInventory {
   @UpdateDateColumn()
   updatedAt: Date
 
-  @ManyToOne(type => User, {
-    nullable: true
-  })
+  @ManyToOne(type => User, { nullable: true })
   creator: User
 
-  @ManyToOne(type => User, {
-    nullable: true
-  })
+  @ManyToOne(type => User, { nullable: true })
   updater: User
 }

package/server/entities/plantation-setting.ts

@@ -0,0 +1,60 @@
+import {
+  Column,
+  CreateDateColumn,
+  Entity,
+  Index,
+  ManyToOne,
+  PrimaryGeneratedColumn,
+  RelationId,
+  UpdateDateColumn
+} from 'typeorm'
+
+import { User } from '@things-factory/auth-base'
+import { Domain } from '@things-factory/shell'
+
+@Entity()
+@Index(
+  'ix_plantation_setting_0',
+  (plantationSetting: PlantationSetting) => [plantationSetting.domain, plantationSetting.name],
+  { unique: true }
+)
+export class PlantationSetting {
+  @PrimaryGeneratedColumn('uuid')
+  id: string
+
+  @ManyToOne(type => Domain)
+  domain: Domain
+
+  @RelationId((plantationSetting: PlantationSetting) => plantationSetting.domain)
+  domainId: string
+
+  @Column()
+  name: string
+
+  @Column({ nullable: true })
+  description: string
+
+  @Column({ nullable: true })
+  category: string
+
+  @Column({ nullable: true })
+  value: string
+
+  @CreateDateColumn()
+  createdAt: Date
+
+  @UpdateDateColumn()
+  updatedAt: Date
+
+  @ManyToOne(type => User, { nullable: true })
+  creator: User
+
+  @RelationId((plantationSetting: PlantationSetting) => plantationSetting.creator)
+  creatorId: string
+
+  @ManyToOne(type => User, { nullable: true })
+  updater: User
+
+  @RelationId((plantationSetting: PlantationSetting) => plantationSetting.updater)
+  updaterId: string
+}

package/server/entities/truck.ts

@@ -0,0 +1,58 @@
+import {
+  Column,
+  CreateDateColumn,
+  Entity,
+  Index,
+  ManyToOne,
+  PrimaryGeneratedColumn,
+  RelationId,
+  UpdateDateColumn
+} from 'typeorm'
+
+import { User } from '@things-factory/auth-base'
+import { Domain } from '@things-factory/shell'
+
+import { Organization } from '../entities'
+
+@Entity()
+@Index('ix_truck_0', (truck: Truck) => [truck.domain, truck.id], { unique: true })
+export class Truck {
+  @PrimaryGeneratedColumn('uuid')
+  id: string
+
+  @ManyToOne(type => Domain)
+  domain: Domain
+
+  @RelationId((truck: Truck) => truck.domain)
+  domainId: string
+
+  @Column()
+  name: string
+
+  @Column({ nullable: true })
+  description: string
+
+  @ManyToOne(type => Organization)
+  organization: Organization
+
+  @Column({ nullable: true })
+  deletedAt: Date
+
+  @CreateDateColumn()
+  createdAt: Date
+
+  @UpdateDateColumn()
+  updatedAt: Date
+
+  @ManyToOne(type => User, { nullable: true })
+  creator: User
+
+  @RelationId((truck: Truck) => truck.creator)
+  creatorId: string
+
+  @ManyToOne(type => User, { nullable: true })
+  updater: User
+
+  @RelationId((truck: Truck) => truck.updater)
+  updaterId: string
+}

package/server/graphql/resolvers/daily-dispatch/daily-dispatch-query.ts

@@ -1,5 +1,7 @@
-import { buildQuery, Domain, ListParam } from '@things-factory/shell'
 import { EntityManager, IsNull } from 'typeorm'
+
+import { buildQuery, Domain, ListParam } from '@things-factory/shell'
+
 import { DailyDispatch as DailyDispatchEntity } from '../../../entities'
 
 export const Query = {
@@ -8,7 +10,16 @@ export const Query = {
 
     return await tx.getRepository(DailyDispatchEntity).findOne({
       where: { domain, name, deletedAt: IsNull() },
-      relations: ['domain', 'dailyDispatchDetails', 'dailyDispatchDetails.ramp', 'driver', 'creator', 'updater']
+      relations: [
+        'domain',
+        'dailyDispatchDetails',
+        'dailyDispatchDetails.ramp',
+        'driver',
+        'dispatchTo',
+        'transport',
+        'creator',
+        'updater'
+      ]
     })
   },
 
@@ -21,6 +32,8 @@ export const Query = {
     queryBuilder
       .leftJoinAndSelect('DailyDispatch.domain', 'Domain')
       .leftJoinAndSelect('DailyDispatch.driver', 'Driver')
+      .leftJoinAndSelect('DailyDispatch.dispatchTo', 'DispatchTo')
+      .leftJoinAndSelect('DailyDispatch.transport', 'Transport')
       .leftJoinAndSelect('DailyDispatch.creator', 'Creator')
       .leftJoinAndSelect('DailyDispatch.updater', 'Updater')
       .leftJoinAndSelect('DailyDispatch.dailyDispatchDetails', 'DailyDispatchDetails')