@things-factory/operato-pms 3.7.5 → 3.8.13

package/dist-server/graphql/types/report/monthly-dispatch-summary-report.js

@@ -0,0 +1,25 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MonthlyDispatchSummaryReport = void 0;
+const graphql_tag_1 = __importDefault(require("graphql-tag"));
+exports.MonthlyDispatchSummaryReport = (0, graphql_tag_1.default) `
+  type MonthlyDispatchSummaryReport {
+    no: Int
+    id: String 
+    dispatchAt: String 
+    driverIdentification: String 
+    chitNo: String 
+    percentage: String 
+    lorryNo: String 
+    dispatchTo: String 
+    tonnage: String 
+    todayAvg: String 
+    todateAvg: String 
+    today: String 
+    todate: String 
+  }
+`;
+//# sourceMappingURL=monthly-dispatch-summary-report.js.map

package/dist-server/graphql/types/report/monthly-dispatch-summary-report.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"monthly-dispatch-summary-report.js","sourceRoot":"","sources":["../../../../server/graphql/types/report/monthly-dispatch-summary-report.ts"],"names":[],"mappings":";;;;;;AAAA,8DAA6B;AAEhB,QAAA,4BAA4B,GAAG,IAAA,qBAAG,EAAA;;;;;;;;;;;;;;;;CAgB9C,CAAA"}

package/dist-server/graphql/types/report/monthly-ffb-sale-report-list.js

@@ -0,0 +1,14 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MonthlyFfbSaleReportList = void 0;
+const graphql_tag_1 = __importDefault(require("graphql-tag"));
+exports.MonthlyFfbSaleReportList = (0, graphql_tag_1.default) `
+  type MonthlyFfbSaleReportList {
+    items: [MonthlyFfbSaleReport]
+    total: Int
+  }
+`;
+//# sourceMappingURL=monthly-ffb-sale-report-list.js.map

package/dist-server/graphql/types/report/monthly-ffb-sale-report-list.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"monthly-ffb-sale-report-list.js","sourceRoot":"","sources":["../../../../server/graphql/types/report/monthly-ffb-sale-report-list.ts"],"names":[],"mappings":";;;;;;AAAA,8DAA6B;AAChB,QAAA,wBAAwB,GAAG,IAAA,qBAAG,EAAA;;;;;CAK1C,CAAA"}

package/dist-server/graphql/types/report/monthly-ffb-sale-report.js

@@ -0,0 +1,24 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MonthlyFfbSaleReport = void 0;
+const graphql_tag_1 = __importDefault(require("graphql-tag"));
+exports.MonthlyFfbSaleReport = (0, graphql_tag_1.default) `
+  type MonthlyFfbSaleReport {
+    id: String
+    dispatchAt: String 
+    lorryNo: String
+    driverIdentification: String 
+    chitNo: String
+    percentage: String
+    dispatchTo: String 
+    tonnage: String
+    todayAvg: String
+    todateAvg: String
+    today: String 
+    todate: String 
+  }
+`;
+//# sourceMappingURL=monthly-ffb-sale-report.js.map

package/dist-server/graphql/types/report/monthly-ffb-sale-report.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"monthly-ffb-sale-report.js","sourceRoot":"","sources":["../../../../server/graphql/types/report/monthly-ffb-sale-report.ts"],"names":[],"mappings":";;;;;;AAAA,8DAA6B;AAEhB,QAAA,oBAAoB,GAAG,IAAA,qBAAG,EAAA;;;;;;;;;;;;;;;CAetC,CAAA"}

package/dist-server/graphql/types/truck/index.js

@@ -0,0 +1,33 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TruckResolver = void 0;
+const graphql_tag_1 = __importDefault(require("graphql-tag"));
+__exportStar(require("./truck"), exports);
+__exportStar(require("./new-truck"), exports);
+__exportStar(require("./truck-patch"), exports);
+__exportStar(require("./truck-list"), exports);
+exports.TruckResolver = (0, graphql_tag_1.default) `
+  extend type Mutation {
+    updateMultipleTruck(patches: [TruckPatch]!): [Truck] @transaction
+    deleteTrucks(ids: [String]!): Boolean @transaction
+  }
+
+  extend type Query {
+    trucks(filters: [Filter], pagination: Pagination, sortings: [Sorting]): TruckList @transaction
+    truck(name: String!): Truck @transaction
+  }
+`;
+//# sourceMappingURL=index.js.map

package/dist-server/graphql/types/truck/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../server/graphql/types/truck/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,8DAA6B;AAE7B,0CAAuB;AACvB,8CAA2B;AAC3B,gDAA6B;AAC7B,+CAA4B;AAEf,QAAA,aAAa,GAAG,IAAA,qBAAG,EAAA;;;;;;;;;;CAU/B,CAAA"}

package/dist-server/graphql/types/truck/new-truck.js

@@ -0,0 +1,14 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.NewTruck = void 0;
+const graphql_tag_1 = __importDefault(require("graphql-tag"));
+exports.NewTruck = (0, graphql_tag_1.default) `
+  input NewTruck {
+    name: String!
+    description: String
+  }
+`;
+//# sourceMappingURL=new-truck.js.map

package/dist-server/graphql/types/truck/new-truck.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"new-truck.js","sourceRoot":"","sources":["../../../../server/graphql/types/truck/new-truck.ts"],"names":[],"mappings":";;;;;;AAAA,8DAA6B;AAEhB,QAAA,QAAQ,GAAG,IAAA,qBAAG,EAAA;;;;;CAK1B,CAAA"}

package/dist-server/graphql/types/truck/truck-list.js

@@ -0,0 +1,14 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TruckList = void 0;
+const graphql_tag_1 = __importDefault(require("graphql-tag"));
+exports.TruckList = (0, graphql_tag_1.default) `
+  type TruckList {
+    items: [Truck]
+    total: Int
+  }
+`;
+//# sourceMappingURL=truck-list.js.map

package/dist-server/graphql/types/truck/truck-list.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"truck-list.js","sourceRoot":"","sources":["../../../../server/graphql/types/truck/truck-list.ts"],"names":[],"mappings":";;;;;;AAAA,8DAA6B;AAEhB,QAAA,SAAS,GAAG,IAAA,qBAAG,EAAA;;;;;CAK3B,CAAA"}

package/dist-server/graphql/types/truck/truck-patch.js

@@ -0,0 +1,17 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TruckPatch = void 0;
+const graphql_tag_1 = __importDefault(require("graphql-tag"));
+exports.TruckPatch = (0, graphql_tag_1.default) `
+  input TruckPatch {
+    id: String
+    name: String
+    description: String
+    organization: ObjectRef
+    cuFlag: String
+  }
+`;
+//# sourceMappingURL=truck-patch.js.map

package/dist-server/graphql/types/truck/truck-patch.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"truck-patch.js","sourceRoot":"","sources":["../../../../server/graphql/types/truck/truck-patch.ts"],"names":[],"mappings":";;;;;;AAAA,8DAA6B;AAEhB,QAAA,UAAU,GAAG,IAAA,qBAAG,EAAA;;;;;;;;CAQ5B,CAAA"}

package/dist-server/graphql/types/truck/truck.js

@@ -0,0 +1,22 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Truck = void 0;
+const graphql_tag_1 = __importDefault(require("graphql-tag"));
+exports.Truck = (0, graphql_tag_1.default) `
+  type Truck {
+    id: String
+    name: String
+    domain: Domain
+    description: String
+    organization: Organization
+    deletedAt: String
+    updater: User
+    creator: User
+    updatedAt: String
+    createdAt: String
+  }
+`;
+//# sourceMappingURL=truck.js.map

package/dist-server/graphql/types/truck/truck.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"truck.js","sourceRoot":"","sources":["../../../../server/graphql/types/truck/truck.ts"],"names":[],"mappings":";;;;;;AAAA,8DAA6B;AAEhB,QAAA,KAAK,GAAG,IAAA,qBAAG,EAAA;;;;;;;;;;;;;CAavB,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/operato-pms",
-  "version": "3.7.5",
+  "version": "3.8.13",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -39,30 +39,30 @@
   },
   "dependencies": {
     "@operato/ghost-print": "0.1.14",
-    "@things-factory/apptool-ui": "^3.7.5",
-    "@things-factory/auth-ui": "^3.7.5",
-    "@things-factory/biz-base": "^3.7.5",
-    "@things-factory/board-service": "^3.7.5",
-    "@things-factory/board-ui": "^3.7.5",
-    "@things-factory/code-ui": "^3.7.5",
-    "@things-factory/context-ui": "^3.7.5",
-    "@things-factory/dashboard": "^3.7.5",
-    "@things-factory/document-template-ui": "^3.7.5",
-    "@things-factory/export-ui": "^3.7.5",
-    "@things-factory/export-ui-csv": "^3.7.5",
-    "@things-factory/export-ui-excel": "^3.7.5",
-    "@things-factory/fav-base": "^3.7.5",
-    "@things-factory/form-ui": "^3.7.5",
+    "@things-factory/apptool-ui": "^3.8.0",
+    "@things-factory/auth-ui": "^3.8.0",
+    "@things-factory/biz-base": "^3.8.0",
+    "@things-factory/board-service": "^3.8.0",
+    "@things-factory/board-ui": "^3.8.0",
+    "@things-factory/code-ui": "^3.8.0",
+    "@things-factory/context-ui": "^3.8.0",
+    "@things-factory/dashboard": "^3.8.0",
+    "@things-factory/document-template-ui": "^3.8.0",
+    "@things-factory/export-ui": "^3.8.0",
+    "@things-factory/export-ui-csv": "^3.8.0",
+    "@things-factory/export-ui-excel": "^3.8.0",
+    "@things-factory/fav-base": "^3.8.0",
+    "@things-factory/form-ui": "^3.8.0",
     "@things-factory/grist-ui": "^3.7.5",
-    "@things-factory/help": "^3.7.5",
-    "@things-factory/i18n-ui": "^3.7.5",
-    "@things-factory/import-ui": "^3.7.5",
-    "@things-factory/import-ui-excel": "^3.7.5",
-    "@things-factory/lite-menu": "^3.7.5",
-    "@things-factory/more-ui": "^3.7.5",
-    "@things-factory/notification": "^3.7.5",
-    "@things-factory/print-ui": "^3.7.5",
-    "@things-factory/resource-ui": "^3.7.5",
+    "@things-factory/help": "^3.8.0",
+    "@things-factory/i18n-ui": "^3.8.0",
+    "@things-factory/import-ui": "^3.8.0",
+    "@things-factory/import-ui-excel": "^3.8.0",
+    "@things-factory/lite-menu": "^3.8.0",
+    "@things-factory/more-ui": "^3.8.0",
+    "@things-factory/notification": "^3.8.0",
+    "@things-factory/print-ui": "^3.8.0",
+    "@things-factory/resource-ui": "^3.8.0",
     "@things-factory/scene-chartjs": "^3.7.5",
     "@things-factory/scene-clock": "^3.7.5",
     "@things-factory/scene-clone": "^3.7.5",
@@ -76,7 +76,7 @@
     "@things-factory/scene-graphql": "^3.7.5",
     "@things-factory/scene-half-roundrect": "^3.7.5",
     "@things-factory/scene-indoor-map": "^3.7.5",
-    "@things-factory/scene-label": "^3.7.5",
+    "@things-factory/scene-label": "^3.8.0",
     "@things-factory/scene-legend": "^3.7.5",
     "@things-factory/scene-marker": "^3.7.5",
     "@things-factory/scene-mqtt": "^3.7.5",
@@ -89,12 +89,12 @@
     "@things-factory/scene-table": "^3.7.5",
     "@things-factory/scene-visualizer": "^3.7.5",
     "@things-factory/scene-wheel-sorter": "^3.7.5",
-    "@things-factory/setting-ui": "^3.7.5",
-    "@things-factory/shell": "^3.7.5",
-    "@things-factory/system-ui": "^3.7.5"
+    "@things-factory/setting-ui": "^3.8.0",
+    "@things-factory/shell": "^3.8.0",
+    "@things-factory/system-ui": "^3.8.0"
   },
   "devDependencies": {
     "@things-factory/builder": "^3.7.5"
   },
-  "gitHead": "43e77ed980b3e999d9d17aa75cf50a547f87f4e7"
+  "gitHead": "9ef0c5b4dab02fcd97623eb2d72431d2776bd3c6"
 }

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/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,16 +1,20 @@
-import { User } from '@things-factory/auth-base'
-import { Domain } from '@things-factory/shell'
 import {
   Column,
   CreateDateColumn,
   Entity,
   Index,
+  JoinColumn,
   ManyToOne,
   OneToMany,
+  OneToOne,
   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 +39,10 @@ export class DailyDispatch {
   @Column({ nullable: true })
   externalDriver: string
 
+  @OneToOne(type => Truck, { nullable: true })
+  @JoinColumn()
+  transport: Truck
+
   @Column()
   transportNo: string
 
@@ -47,12 +55,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
 }