@things-factory/operato-pms 6.1.83 → 6.1.85

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/operato-pms",
-  "version": "6.1.83",
+  "version": "6.1.85",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -19,12 +19,12 @@
   "scripts": {
     "serve": "things-factory operato-pms",
     "serve:dev": "npm run build:server && things-factory-dev operato-pms",
-    "build": "tsc --p tsconfig.json",
-    "build:client": "npm run clean:client && webpack --config ../builder/webpack.config.js",
-    "build:server": "npm run clean:server && tsc",
+    "build": "npm run build:server",
+    "build:server": "npm run clean:server && tsc --p ./server/tsconfig.json",
+    "build:app": "npm run clean:app && webpack --config ../builder/webpack.config.js",
     "clean:server": "rm -rf dist-server",
-    "clean:client": "rm -rf dist-client",
-    "clean": "npm run clean:server && npm run clean:client",
+    "clean:app": "rm -rf dist-app",
+    "clean": "npm run clean:server",
     "migration": "things-factory-migration",
     "migration:privileges": "things-factory-migration-privileges",
     "migration:create": "node ../../node_modules/typeorm/cli.js migration:create -d ./server/migrations",
@@ -33,7 +33,7 @@
     "migration:revert": "node ../../node_modules/typeorm/cli.js migration:revert",
     "stop:dev": "kill $(lsof -t -i:3000,3001)",
     "stop": "things-factory-stop operato-pms",
-    "docker": "things-factory-dockerize hatiolab/operato-pms:latest hatiolab/operato-pms:$npm_package_version linux/amd64",
+    "docker": "npm run build:app && things-factory-dockerize hatiolab/operato-pms:latest hatiolab/operato-pms:$npm_package_version linux/amd64",
     "docker:push": "docker image push hatiolab/operato-pms:latest && docker image push hatiolab/operato-pms:$npm_package_version",
     "docker:run": "docker run --platform linux/amd64 -p 4000:3000 hatiolab/operato-pms:latest"
   },
@@ -64,36 +64,36 @@
     "@operato/scene-table": "^1.0.0",
     "@operato/scene-visualizer": "^1.0.0",
     "@operato/scene-wheel-sorter": "^1.0.0",
-    "@things-factory/apptool-ui": "^6.1.81",
-    "@things-factory/auth-ui": "^6.1.81",
-    "@things-factory/biz-base": "^6.1.81",
-    "@things-factory/board-service": "^6.1.83",
-    "@things-factory/board-ui": "^6.1.83",
-    "@things-factory/code-ui": "^6.1.81",
-    "@things-factory/context-ui": "^6.1.81",
-    "@things-factory/dashboard": "^6.1.83",
-    "@things-factory/document-template-ui": "^6.1.81",
-    "@things-factory/export-ui": "^6.1.81",
-    "@things-factory/export-ui-csv": "^6.1.81",
-    "@things-factory/export-ui-excel": "^6.1.81",
-    "@things-factory/fav-base": "^6.1.81",
+    "@things-factory/apptool-ui": "^6.1.84",
+    "@things-factory/auth-ui": "^6.1.84",
+    "@things-factory/biz-base": "^6.1.84",
+    "@things-factory/board-service": "^6.1.84",
+    "@things-factory/board-ui": "^6.1.84",
+    "@things-factory/code-ui": "^6.1.84",
+    "@things-factory/context-ui": "^6.1.84",
+    "@things-factory/dashboard": "^6.1.84",
+    "@things-factory/document-template-ui": "^6.1.84",
+    "@things-factory/export-ui": "^6.1.84",
+    "@things-factory/export-ui-csv": "^6.1.84",
+    "@things-factory/export-ui-excel": "^6.1.84",
+    "@things-factory/fav-base": "^6.1.84",
     "@things-factory/form-ui": "^6.1.79",
-    "@things-factory/help": "^6.1.81",
-    "@things-factory/i18n-base": "^6.1.81",
-    "@things-factory/import-ui": "^6.1.81",
-    "@things-factory/import-ui-excel": "^6.1.81",
-    "@things-factory/lite-menu": "^6.1.83",
-    "@things-factory/more-ui": "^6.1.81",
-    "@things-factory/notification": "^6.1.81",
-    "@things-factory/print-ui": "^6.1.81",
-    "@things-factory/resource-ui": "^6.1.81",
+    "@things-factory/help": "^6.1.84",
+    "@things-factory/i18n-base": "^6.1.84",
+    "@things-factory/import-ui": "^6.1.84",
+    "@things-factory/import-ui-excel": "^6.1.84",
+    "@things-factory/lite-menu": "^6.1.84",
+    "@things-factory/more-ui": "^6.1.84",
+    "@things-factory/notification": "^6.1.84",
+    "@things-factory/print-ui": "^6.1.84",
+    "@things-factory/resource-ui": "^6.1.84",
     "@things-factory/scene-google-map": "^6.1.79",
-    "@things-factory/setting-ui": "^6.1.81",
-    "@things-factory/shell": "^6.1.81",
-    "@things-factory/system-ui": "^6.1.81"
+    "@things-factory/setting-ui": "^6.1.84",
+    "@things-factory/shell": "^6.1.84",
+    "@things-factory/system-ui": "^6.1.84"
   },
   "devDependencies": {
-    "@things-factory/builder": "^6.1.79"
+    "@things-factory/builder": "^6.1.85"
   },
-  "gitHead": "a4aa065ad799671d92996ea07daa0eef99350009"
+  "gitHead": "5ebda26d71b4181008aea1b2eb8cd9169928e55d"
 }

package/server/constants/block.ts

@@ -1,4 +0,0 @@
-export const BLOCK_STATUS = {
-  ACTIVE: 'ACTIVE',
-  INACTIVE: 'INACTIVE'
-}

package/server/constants/index.ts

@@ -1,8 +0,0 @@
-export * from './block'
-export * from './record'
-export * from './inventory'
-export * from './ramp'
-export * from './template'
-export * from './transaction'
-export * from './master'
-export * from './organization'

package/server/constants/inventory.ts

@@ -1,9 +0,0 @@
-export const INVENTORY_TYPE = {
-  FIELD_BUNCHES: 'FIELD_BUNCHES',
-  RAMP_TONNAGE: 'RAMP_TONNAGE'
-}
-
-export const INVENTORY_STATUS = {
-  STORED: 'STORED',
-  EMPTY: 'EMPTY'
-}

package/server/constants/master.ts

@@ -1,9 +0,0 @@
-export const ORGANIZATION_STATUS = {
-  ACTIVE: 'ACTIVE',
-  INACTIVE: 'INACTIVE'
-}
-
-export const ORGANIZATION_STAFF_STATUS = {
-  ACTIVE: 'ACTIVE',
-  INACTIVE: 'INACTIVE'
-}

package/server/constants/organization.ts

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

package/server/constants/ramp.ts

@@ -1,9 +0,0 @@
-export const RAMP_STATUS = {
-  EMPTY: 'EMPTY',
-  FILLED: 'FILLED'
-}
-
-export const RAMP_TONNAGE_STATUS = {
-  STORED: 'STORED',
-  TERMINATED: 'TERMINATED'
-}

package/server/constants/record.ts

@@ -1,4 +0,0 @@
-export const RECORD_STATUS = {
-  STORED: 'STORED',
-  LOCKED: 'LOCKED'
-}

package/server/constants/template.ts

@@ -1,3 +0,0 @@
-export const TEMPLATE_TYPE = {
-  DISPATCHMENT: 'DISPATCHMENT'
-}

package/server/constants/transaction.ts

@@ -1,9 +0,0 @@
-export const TRANSACTION_TYPE = {
-  HARVEST: 'HARVEST',
-  LOADING: 'LOADING',
-  DISPATCHMENT: 'DISPATCHMENT',
-  LOADING_ADJUSTMENT: 'LOADING_ADJUSTMENT',
-  DISPATCHMENT_ADJUSTMENT: 'DISPATCHMENT_ADJUSTMENT',
-  BUNCHES_ADJUSTMENT: 'BUNCHES_ADJUSTMENT',
-  TERMINATED: 'TERMINATED'
-}

package/server/controllers/index.ts

@@ -1 +0,0 @@
-export * from './render-dispatchment'

package/server/controllers/render-dispatchment.ts

@@ -1,53 +0,0 @@
-import FormData from 'form-data'
-import fetch from 'node-fetch'
-
-import { Attachment, STORAGE } from '@things-factory/attachment-base'
-import { config } from '@things-factory/env'
-import { getRepository } from '@things-factory/shell'
-
-import { TEMPLATE_TYPE } from '../constants'
-import { DailyDispatch } from '../entities'
-import { DateTimeConverter } from '../utils/datetime-util'
-
-const REPORT_API_URL = config.get('reportApiUrl', 'http://localhost:8888/rest/report/show_html')
-
-export async function renderDispatchment({ dispatchNo, timezoneOffSet }, context: ResolverContext) {
-  const dailyDispatch: DailyDispatch = await getRepository(DailyDispatch).findOne({
-    where: { name: dispatchNo },
-    relations: ['domain', 'dailyDispatchDetails', 'dailyDispatchDetails.ramp']
-  })
-  if (!dailyDispatch) throw new Error('Daily dispatch record not found')
-
-  const foundTemplate: Attachment = await getRepository(Attachment).findOne({
-    where: { domain: { id: dailyDispatch.domain.id }, category: TEMPLATE_TYPE.DISPATCHMENT }
-  })
-
-  const template = await STORAGE.readFile(foundTemplate.path, 'utf-8')
-
-  const data = {
-    truck_driver: dailyDispatch?.driver ? dailyDispatch.driver : dailyDispatch.externalDriver,
-    driver_identification: dailyDispatch.driverIdentification || '',
-    truck_no: dailyDispatch.transportNo,
-    // destination: dailyDispatch.dispatchTo,
-    dispatch_date: DateTimeConverter.datetime(dailyDispatch.dispatchAt, timezoneOffSet),
-    issued_by: dailyDispatch.updater,
-    dispatch_list: dailyDispatch.dailyDispatchDetails.map((item: any, idx) => {
-      return {
-        list_no: idx + 1,
-        block: item.ramp && item.ramp.name,
-        dispatch_ramp_tonnage: item.collectedRampWeight,
-        remark: item?.remark ? item.remark : null
-      }
-    })
-  }
-  const formData = new FormData()
-  formData.append('template', template)
-  formData.append('jsonString', JSON.stringify(data))
-
-  const response = await fetch(REPORT_API_URL, {
-    method: 'POST',
-    body: formData
-  })
-
-  return await response.text()
-}

package/server/entities/block-detail.ts

@@ -1,59 +0,0 @@
-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 } from '../entities'
-
-@Entity()
-@Index('ix_block-detail_0', (blockDetail: BlockDetail) => [blockDetail.domain, blockDetail.id], { unique: true })
-export class BlockDetail {
-  @PrimaryGeneratedColumn('uuid')
-  id: string
-
-  @ManyToOne(type => Domain)
-  domain: Domain
-
-  @ManyToOne(type => Block)
-  block: Block
-
-  @Column()
-  name: string
-
-  @Column({
-    nullable: true
-  })
-  description: string
-
-  @Column()
-  validFrom: Date
-
-  @Column({ type: 'int', nullable: true })
-  yearPlanted: number
-
-  @Column({ type: 'float', nullable: true })
-  maturedHectarage: number
-
-  @Column({ type: 'float', nullable: true })
-  totalHectarage: number
-
-  @Column({ type: 'int', nullable: true })
-  totalStand: number
-
-  @Column({ nullable: true })
-  deletedAt: Date
-
-  @CreateDateColumn()
-  createdAt: Date
-
-  @UpdateDateColumn()
-  updatedAt: Date
-
-  @ManyToOne(type => User, {
-    nullable: true
-  })
-  creator: User
-
-  @ManyToOne(type => User, {
-    nullable: true
-  })
-  updater: User
-}

package/server/entities/block.ts

@@ -1,49 +0,0 @@
-import { User } from '@things-factory/auth-base'
-import { Domain } from '@things-factory/shell'
-import { Column, CreateDateColumn, Entity, Index, ManyToOne, PrimaryGeneratedColumn, UpdateDateColumn } from 'typeorm'
-
-@Entity()
-@Index('ix_block_0', (block: Block) => [block.domain, block.id], { unique: true })
-export class Block {
-  @PrimaryGeneratedColumn('uuid')
-  id: string
-
-  @ManyToOne(type => Domain)
-  domain: Domain
-
-  @Column()
-  name: string
-
-  @Column({
-    nullable: true
-  })
-  description: string
-
-  @Column()
-  type: string
-
-  @ManyToOne(type => Block, { nullable: true })
-  parentBlock: Block
-
-  @Column()
-  hasChildren: Boolean
-
-  @Column({ nullable: true })
-  deletedAt: Date
-
-  @CreateDateColumn()
-  createdAt: Date
-
-  @UpdateDateColumn()
-  updatedAt: Date
-
-  @ManyToOne(type => User, {
-    nullable: true
-  })
-  creator: User
-
-  @ManyToOne(type => User, {
-    nullable: true
-  })
-  updater: User
-}

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

@@ -1,54 +0,0 @@
-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 } from '../entities'
-
-@Entity()
-@Index(
-  'ix_daily-block-detail_0',
-  (dailyBlockDetail: DailyBlockDetail) => [dailyBlockDetail.domain, dailyBlockDetail.id],
-  { unique: true }
-)
-export class DailyBlockDetail {
-  @PrimaryGeneratedColumn('uuid')
-  id: string
-
-  @ManyToOne(type => Domain)
-  domain: Domain
-
-  @ManyToOne(type => Block)
-  block: Block
-
-  @Column()
-  name: string
-
-  @Column({ type: 'float' })
-  rainfall: number
-
-  @Column({ type: 'float' })
-  coverage: number
-
-  @Column({
-    nullable: true
-  })
-  description: string
-
-  @Column({ nullable: true })
-  deletedAt: Date
-
-  @CreateDateColumn()
-  createdAt: Date
-
-  @UpdateDateColumn()
-  updatedAt: Date
-
-  @ManyToOne(type => User, {
-    nullable: true
-  })
-  creator: User
-
-  @ManyToOne(type => User, {
-    nullable: true
-  })
-  updater: User
-}

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

@@ -1,64 +0,0 @@
-import { User } from '@things-factory/auth-base'
-import { Domain } from '@things-factory/shell'
-import { Column, CreateDateColumn, Entity, Index, ManyToOne, PrimaryGeneratedColumn, UpdateDateColumn } from 'typeorm'
-import { DailyDispatch, Ramp } from '../entities'
-
-@Entity()
-@Index(
-  'ix_daily_dispatch_detail_0',
-  (dailyDispatchDetail: DailyDispatchDetail) => [dailyDispatchDetail.domain, dailyDispatchDetail.id],
-  { unique: true }
-)
-export class DailyDispatchDetail {
-  @PrimaryGeneratedColumn('uuid')
-  id: string
-
-  @ManyToOne(type => Domain)
-  domain: Domain
-
-  @ManyToOne(type => DailyDispatch)
-  dailyDispatch: DailyDispatch
-
-  @Column()
-  name: string
-
-  @Column({ nullable: true })
-  description: string
-
-  @ManyToOne(type => Ramp, { nullable: true })
-  ramp: Ramp
-
-  @Column({ default: 0 })
-  collectedRampBunch: number
-
-  @Column({ type: 'decimal', precision: 10, scale: 2, default: 0 })
-  collectedRampWeight: number
-
-  @Column({ default: 0 })
-  adjustedBunch: number
-
-  @Column({ type: 'decimal', precision: 10, scale: 2, default: 0 })
-  adjustedWeight: number
-
-  @Column({ nullable: true })
-  remark: string
-
-  @Column({ nullable: true })
-  deletedAt: Date
-
-  @CreateDateColumn()
-  createdAt: Date
-
-  @UpdateDateColumn()
-  updatedAt: Date
-
-  @ManyToOne(type => User, {
-    nullable: true
-  })
-  creator: User
-
-  @ManyToOne(type => User, {
-    nullable: true
-  })
-  updater: User
-}

package/server/entities/daily-dispatch.ts

@@ -1,90 +0,0 @@
-import {
-  Column,
-  CreateDateColumn,
-  Entity,
-  Index,
-  ManyToOne,
-  OneToMany,
-  PrimaryGeneratedColumn,
-  UpdateDateColumn
-} from 'typeorm'
-
-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], {
-  unique: true
-})
-export class DailyDispatch {
-  @PrimaryGeneratedColumn('uuid')
-  id: string
-
-  @ManyToOne(type => Domain)
-  domain: Domain
-
-  @Column()
-  name: string
-
-  @Column({ nullable: true })
-  description: string
-
-  @ManyToOne(type => OrganizationStaff, { nullable: true })
-  driver: OrganizationStaff
-
-  @Column({ nullable: true })
-  externalDriver: string
-
-  @ManyToOne(type => Truck, { nullable: true })
-  transport: Truck
-
-  @Column()
-  transportNo: string
-
-  @Column({ nullable: true })
-  driverIdentification: string
-
-  @Column({ type: 'float', default: 0 })
-  totalTonnageRelease: number
-
-  @OneToMany(type => DailyDispatchDetail, dailyDispatchDetail => dailyDispatchDetail.dailyDispatch)
-  dailyDispatchDetails: DailyDispatchDetail[]
-
-  @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, nullable: true })
-  percentage: number
-
-  @Column()
-  status: string
-
-  @Column({ nullable: true })
-  deletedAt: Date
-
-  @CreateDateColumn()
-  createdAt: Date
-
-  @UpdateDateColumn()
-  updatedAt: Date
-
-  @ManyToOne(type => User, {
-    nullable: true
-  })
-  creator: User
-
-  @ManyToOne(type => User, {
-    nullable: true
-  })
-  updater: User
-}

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

@@ -1,56 +0,0 @@
-import { Column, CreateDateColumn, Entity, Index, ManyToOne, PrimaryGeneratedColumn, UpdateDateColumn } from 'typeorm'
-
-import { User } from '@things-factory/auth-base'
-import { Domain } from '@things-factory/shell'
-
-import { DailyHarvest, OrganizationStaff } from '../entities'
-
-@Entity()
-@Index(
-  'ix_daily-harvest-detail_0',
-  (dailyHarvestDetail: DailyHarvestDetail) => [dailyHarvestDetail.domain, dailyHarvestDetail.id],
-  { unique: true }
-)
-export class DailyHarvestDetail {
-  @PrimaryGeneratedColumn('uuid')
-  id: string
-
-  @ManyToOne(type => Domain)
-  domain: Domain
-
-  @ManyToOne(type => DailyHarvest)
-  dailyHarvest: DailyHarvest
-
-  @ManyToOne(type => OrganizationStaff)
-  organizationStaff: OrganizationStaff
-
-  @Column()
-  name: string
-
-  @Column({ nullable: true })
-  remark: string
-
-  @Column({ type: 'float', default: 0 })
-  totalBunchHarvested: number
-
-  @Column({ type: 'float', default: 0, nullable: true })
-  totalTonnageHarvested: number
-
-  @Column({ nullable: true })
-  description: string
-
-  @Column({ nullable: true })
-  deletedAt: Date
-
-  @CreateDateColumn()
-  createdAt: Date
-
-  @UpdateDateColumn()
-  updatedAt: Date
-
-  @ManyToOne(type => User, { nullable: true })
-  creator: User
-
-  @ManyToOne(type => User, { nullable: true })
-  updater: User
-}