@things-factory/operato-pms 3.7.7 → 3.8.19

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')

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

@@ -1,8 +1,18 @@
+import { EntityManager, getRepository, Repository } from 'typeorm'
+
 import { User } from '@things-factory/auth-base'
 import { Domain } from '@things-factory/shell'
-import { EntityManager, getRepository, Repository } from 'typeorm'
-import { RECORD_STATUS, INVENTORY_TYPE, TRANSACTION_TYPE } from '../../../constants'
-import { DailyDispatch, DailyDispatchDetail, OrganizationStaff, PlantationInventory, Ramp } from '../../../entities'
+
+import { INVENTORY_TYPE, RECORD_STATUS, TRANSACTION_TYPE } from '../../../constants'
+import {
+  DailyDispatch,
+  DailyDispatchDetail,
+  Organization,
+  OrganizationStaff,
+  PlantationInventory,
+  Ramp,
+  Truck
+} from '../../../entities'
 import { generateTransactionHistory, NoGenerator } from '../../../utils'
 
 export const generateDailyDispatch = {
@@ -11,10 +21,24 @@ export const generateDailyDispatch = {
 
     let dailyDispatchDetails: DailyDispatchDetail[] = dailyDispatch.dailyDispatchDetails
     let driver: OrganizationStaff
+    let transport: Truck
+    let dispatchTo: Organization
 
-    if (!dailyDispatch?.externalDriver) {
+    if (dailyDispatch?.driver) {
       driver = await tx.getRepository(OrganizationStaff).findOne({
-        where: { staffId: dailyDispatch.staffId }
+        where: { id: dailyDispatch.driver.id }
+      })
+    }
+
+    if (dailyDispatch?.transport) {
+      transport = await tx.getRepository(Truck).findOne({
+        where: { id: dailyDispatch.transport.id }
+      })
+    }
+
+    if (dailyDispatch?.dispatchTo) {
+      dispatchTo = await tx.getRepository(Organization).findOne({
+        where: { id: dailyDispatch.dispatchTo.id }
       })
     }
 
@@ -26,14 +50,15 @@ export const generateDailyDispatch = {
     let newDailyDispatch: DailyDispatch = new DailyDispatch()
     newDailyDispatch.name = NoGenerator.dailyDispatch()
     newDailyDispatch.domain = domain
-    newDailyDispatch.transportNo = dailyDispatch.transportNo
-    newDailyDispatch.driverIdentification = dailyDispatch?.driverIdentification
-      ? dailyDispatch.driverIdentification
-      : null
-    newDailyDispatch.driver = driver ? driver : null
-    newDailyDispatch.externalDriver = dailyDispatch?.externalDriver ? dailyDispatch.externalDriver : null
+    newDailyDispatch.transport = transport
+    newDailyDispatch.transportNo = transport.name
+    newDailyDispatch.driver = driver
+    newDailyDispatch.driverIdentification = driver?.idNumber ? driver.idNumber : null
+    newDailyDispatch.externalDriver = driver?.name ? driver?.name : null
     newDailyDispatch.totalTonnageRelease = totalTonnageRelease
-    newDailyDispatch.dispatchTo = dailyDispatch.dispatchTo
+    newDailyDispatch.chitNo = dailyDispatch?.chitNo
+    newDailyDispatch.percentage = dailyDispatch?.percentage
+    newDailyDispatch.dispatchTo = dispatchTo
     newDailyDispatch.dispatchAt = dailyDispatch.dispatchAt
     newDailyDispatch.status = RECORD_STATUS.STORED
     newDailyDispatch.creator = user
@@ -50,7 +75,7 @@ export const generateDailyDispatch = {
       tx
     )
 
-    // await updatePlantationInventory(domain, newDailyDispatch, dailyDispatchDetails, user, tx)
+    await updatePlantationInventory(domain, newDailyDispatch, dailyDispatchDetails, user, tx)
 
     return newDailyDispatch
   }
@@ -108,13 +133,14 @@ export async function updatePlantationInventory(
       rampInventory.totalTonnage = currentRampTonnage - dispatchedTonnage
       rampInventory.updater = user
       rampInventory = await plantationInvRepo.save(rampInventory)
+      const dispatchDate: string = newDailyDispatch.dispatchAt.toString().split('T')[0]
 
       await generateTransactionHistory(
         rampInventory,
         newDailyDispatch.id,
         newDailyDispatch.name,
         TRANSACTION_TYPE.DISPATCHMENT,
-        newDailyDispatch.dispatchAt.toISOString().split('T')[0],
+        dispatchDate,
         0,
         -dispatchedTonnage,
         user,

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

@@ -1,10 +1,12 @@
+import { EntityManager } from 'typeorm'
+
 import { User } from '@things-factory/auth-base'
 import { Domain } from '@things-factory/shell'
-import { EntityManager } from 'typeorm'
+
 import { DailyDispatch, DailyDispatchDetail } from '../../../entities'
 
 export const updateDailyDispatch = {
-  async updateDailyDispatch(_: any, { name, dailyDispatchDetails }, context: any) {
+  async updateDailyDispatch(_: any, { name, chitNo, percentage, dailyDispatchDetails }, context: any) {
     const { domain, tx, user }: { domain: Domain; tx: EntityManager; user: User } = context.state
 
     const repository = tx.getRepository(DailyDispatch)
@@ -16,9 +18,9 @@ export const updateDailyDispatch = {
     let foundDailyDispatchDetails: DailyDispatchDetail[] = dailyDispatch.dailyDispatchDetails
 
     foundDailyDispatchDetails = foundDailyDispatchDetails.map(record => {
-      const matchedDispatchDetail: any = dailyDispatchDetails.filter(
+      const matchedDispatchDetail: any = dailyDispatchDetails.find(
         dispatchDetail => dispatchDetail.name === record.name
-      )[0]
+      )
 
       return {
         ...record,
@@ -31,6 +33,8 @@ export const updateDailyDispatch = {
 
     return await repository.save({
       ...dailyDispatch,
+      chitNo,
+      percentage,
       updater: user
     })
   }

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

@@ -1,11 +1,15 @@
-import { buildQuery, Domain, ListParam } from '@things-factory/shell'
 import { EntityManager, IsNull } from 'typeorm'
-import { DailyHarvest as DailyHarvestEntity } from '../../../entities'
+
+import { buildQuery, Domain, ListParam } from '@things-factory/shell'
+
+import { DailyHarvest as DailyHarvestEntity, RecordTransaction } from '../../../entities'
 
 export const Query = {
   async dailyHarvest(_: any, { name }, context: any) {
     const { domain, tx }: { domain: Domain; tx: EntityManager } = context.state
 
+    const transaction: RecordTransaction = await tx.getRepository(RecordTransaction).findOne({ where: { domain } })
+
     return await tx.getRepository(DailyHarvestEntity).findOne({
       where: { domain, name, deletedAt: IsNull() },
       relations: [
@@ -13,6 +17,7 @@ export const Query = {
         'block',
         'dailyHarvestDetails',
         'dailyHarvestDetails.organizationStaff',
+        'dailyHarvestDetails.organizationStaff.organization',
         'creator',
         'updater'
       ]