@things-factory/operato-pms 3.7.5 → 3.8.13

package/dist-server/entities/plantation-setting.js

@@ -0,0 +1,76 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+var _a, _b, _c;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PlantationSetting = void 0;
+const typeorm_1 = require("typeorm");
+const auth_base_1 = require("@things-factory/auth-base");
+const shell_1 = require("@things-factory/shell");
+let PlantationSetting = class PlantationSetting {
+};
+__decorate([
+    (0, typeorm_1.PrimaryGeneratedColumn)('uuid'),
+    __metadata("design:type", String)
+], PlantationSetting.prototype, "id", void 0);
+__decorate([
+    (0, typeorm_1.ManyToOne)(type => shell_1.Domain),
+    __metadata("design:type", typeof (_a = typeof shell_1.Domain !== "undefined" && shell_1.Domain) === "function" ? _a : Object)
+], PlantationSetting.prototype, "domain", void 0);
+__decorate([
+    (0, typeorm_1.RelationId)((plantationSetting) => plantationSetting.domain),
+    __metadata("design:type", String)
+], PlantationSetting.prototype, "domainId", void 0);
+__decorate([
+    (0, typeorm_1.Column)(),
+    __metadata("design:type", String)
+], PlantationSetting.prototype, "name", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ nullable: true }),
+    __metadata("design:type", String)
+], PlantationSetting.prototype, "description", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ nullable: true }),
+    __metadata("design:type", String)
+], PlantationSetting.prototype, "category", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ nullable: true }),
+    __metadata("design:type", String)
+], PlantationSetting.prototype, "value", void 0);
+__decorate([
+    (0, typeorm_1.CreateDateColumn)(),
+    __metadata("design:type", Date)
+], PlantationSetting.prototype, "createdAt", void 0);
+__decorate([
+    (0, typeorm_1.UpdateDateColumn)(),
+    __metadata("design:type", Date)
+], PlantationSetting.prototype, "updatedAt", void 0);
+__decorate([
+    (0, typeorm_1.ManyToOne)(type => auth_base_1.User, { nullable: true }),
+    __metadata("design:type", typeof (_b = typeof auth_base_1.User !== "undefined" && auth_base_1.User) === "function" ? _b : Object)
+], PlantationSetting.prototype, "creator", void 0);
+__decorate([
+    (0, typeorm_1.RelationId)((plantationSetting) => plantationSetting.creator),
+    __metadata("design:type", String)
+], PlantationSetting.prototype, "creatorId", void 0);
+__decorate([
+    (0, typeorm_1.ManyToOne)(type => auth_base_1.User, { nullable: true }),
+    __metadata("design:type", typeof (_c = typeof auth_base_1.User !== "undefined" && auth_base_1.User) === "function" ? _c : Object)
+], PlantationSetting.prototype, "updater", void 0);
+__decorate([
+    (0, typeorm_1.RelationId)((plantationSetting) => plantationSetting.updater),
+    __metadata("design:type", String)
+], PlantationSetting.prototype, "updaterId", void 0);
+PlantationSetting = __decorate([
+    (0, typeorm_1.Entity)(),
+    (0, typeorm_1.Index)('ix_plantation_setting_0', (plantationSetting) => [plantationSetting.domain, plantationSetting.name], { unique: true })
+], PlantationSetting);
+exports.PlantationSetting = PlantationSetting;
+//# sourceMappingURL=plantation-setting.js.map

package/dist-server/entities/plantation-setting.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"plantation-setting.js","sourceRoot":"","sources":["../../server/entities/plantation-setting.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,qCASgB;AAEhB,yDAAgD;AAChD,iDAA8C;AAQ9C,IAAa,iBAAiB,GAA9B,MAAa,iBAAiB;CAuC7B,CAAA;AArCC;IADC,IAAA,gCAAsB,EAAC,MAAM,CAAC;;6CACrB;AAGV;IADC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,cAAM,CAAC;kDAClB,cAAM,oBAAN,cAAM;iDAAA;AAGd;IADC,IAAA,oBAAU,EAAC,CAAC,iBAAoC,EAAE,EAAE,CAAC,iBAAiB,CAAC,MAAM,CAAC;;mDAC/D;AAGhB;IADC,IAAA,gBAAM,GAAE;;+CACG;AAGZ;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;sDACR;AAGnB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;mDACX;AAGhB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;gDACd;AAGb;IADC,IAAA,0BAAgB,GAAE;8BACR,IAAI;oDAAA;AAGf;IADC,IAAA,0BAAgB,GAAE;8BACR,IAAI;oDAAA;AAGf;IADC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,gBAAI,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;kDACnC,gBAAI,oBAAJ,gBAAI;kDAAA;AAGb;IADC,IAAA,oBAAU,EAAC,CAAC,iBAAoC,EAAE,EAAE,CAAC,iBAAiB,CAAC,OAAO,CAAC;;oDAC/D;AAGjB;IADC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,gBAAI,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;kDACnC,gBAAI,oBAAJ,gBAAI;kDAAA;AAGb;IADC,IAAA,oBAAU,EAAC,CAAC,iBAAoC,EAAE,EAAE,CAAC,iBAAiB,CAAC,OAAO,CAAC;;oDAC/D;AAtCN,iBAAiB;IAN7B,IAAA,gBAAM,GAAE;IACR,IAAA,eAAK,EACJ,yBAAyB,EACzB,CAAC,iBAAoC,EAAE,EAAE,CAAC,CAAC,iBAAiB,CAAC,MAAM,EAAE,iBAAiB,CAAC,IAAI,CAAC,EAC5F,EAAE,MAAM,EAAE,IAAI,EAAE,CACjB;GACY,iBAAiB,CAuC7B;AAvCY,8CAAiB"}

package/dist-server/entities/truck.js

@@ -0,0 +1,77 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+var _a, _b, _c;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Truck = void 0;
+const typeorm_1 = require("typeorm");
+const auth_base_1 = require("@things-factory/auth-base");
+const shell_1 = require("@things-factory/shell");
+const entities_1 = require("../entities");
+let Truck = class Truck {
+};
+__decorate([
+    (0, typeorm_1.PrimaryGeneratedColumn)('uuid'),
+    __metadata("design:type", String)
+], Truck.prototype, "id", void 0);
+__decorate([
+    (0, typeorm_1.ManyToOne)(type => shell_1.Domain),
+    __metadata("design:type", typeof (_a = typeof shell_1.Domain !== "undefined" && shell_1.Domain) === "function" ? _a : Object)
+], Truck.prototype, "domain", void 0);
+__decorate([
+    (0, typeorm_1.RelationId)((truck) => truck.domain),
+    __metadata("design:type", String)
+], Truck.prototype, "domainId", void 0);
+__decorate([
+    (0, typeorm_1.Column)(),
+    __metadata("design:type", String)
+], Truck.prototype, "name", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ nullable: true }),
+    __metadata("design:type", String)
+], Truck.prototype, "description", void 0);
+__decorate([
+    (0, typeorm_1.ManyToOne)(type => entities_1.Organization),
+    __metadata("design:type", entities_1.Organization)
+], Truck.prototype, "organization", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ nullable: true }),
+    __metadata("design:type", Date)
+], Truck.prototype, "deletedAt", void 0);
+__decorate([
+    (0, typeorm_1.CreateDateColumn)(),
+    __metadata("design:type", Date)
+], Truck.prototype, "createdAt", void 0);
+__decorate([
+    (0, typeorm_1.UpdateDateColumn)(),
+    __metadata("design:type", Date)
+], Truck.prototype, "updatedAt", void 0);
+__decorate([
+    (0, typeorm_1.ManyToOne)(type => auth_base_1.User, { nullable: true }),
+    __metadata("design:type", typeof (_b = typeof auth_base_1.User !== "undefined" && auth_base_1.User) === "function" ? _b : Object)
+], Truck.prototype, "creator", void 0);
+__decorate([
+    (0, typeorm_1.RelationId)((truck) => truck.creator),
+    __metadata("design:type", String)
+], Truck.prototype, "creatorId", void 0);
+__decorate([
+    (0, typeorm_1.ManyToOne)(type => auth_base_1.User, { nullable: true }),
+    __metadata("design:type", typeof (_c = typeof auth_base_1.User !== "undefined" && auth_base_1.User) === "function" ? _c : Object)
+], Truck.prototype, "updater", void 0);
+__decorate([
+    (0, typeorm_1.RelationId)((truck) => truck.updater),
+    __metadata("design:type", String)
+], Truck.prototype, "updaterId", void 0);
+Truck = __decorate([
+    (0, typeorm_1.Entity)(),
+    (0, typeorm_1.Index)('ix_truck_0', (truck) => [truck.domain, truck.id], { unique: true })
+], Truck);
+exports.Truck = Truck;
+//# sourceMappingURL=truck.js.map

package/dist-server/entities/truck.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"truck.js","sourceRoot":"","sources":["../../server/entities/truck.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,qCASgB;AAEhB,yDAAgD;AAChD,iDAA8C;AAE9C,0CAA0C;AAI1C,IAAa,KAAK,GAAlB,MAAa,KAAK;CAuCjB,CAAA;AArCC;IADC,IAAA,gCAAsB,EAAC,MAAM,CAAC;;iCACrB;AAGV;IADC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,cAAM,CAAC;kDAClB,cAAM,oBAAN,cAAM;qCAAA;AAGd;IADC,IAAA,oBAAU,EAAC,CAAC,KAAY,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC;;uCAC3B;AAGhB;IADC,IAAA,gBAAM,GAAE;;mCACG;AAGZ;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;0CACR;AAGnB;IADC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,uBAAY,CAAC;8BAClB,uBAAY;2CAAA;AAG1B;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BAChB,IAAI;wCAAA;AAGf;IADC,IAAA,0BAAgB,GAAE;8BACR,IAAI;wCAAA;AAGf;IADC,IAAA,0BAAgB,GAAE;8BACR,IAAI;wCAAA;AAGf;IADC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,gBAAI,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;kDACnC,gBAAI,oBAAJ,gBAAI;sCAAA;AAGb;IADC,IAAA,oBAAU,EAAC,CAAC,KAAY,EAAE,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC;;wCAC3B;AAGjB;IADC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,gBAAI,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;kDACnC,gBAAI,oBAAJ,gBAAI;sCAAA;AAGb;IADC,IAAA,oBAAU,EAAC,CAAC,KAAY,EAAE,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC;;wCAC3B;AAtCN,KAAK;IAFjB,IAAA,gBAAM,GAAE;IACR,IAAA,eAAK,EAAC,YAAY,EAAE,CAAC,KAAY,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;GACrE,KAAK,CAuCjB;AAvCY,sBAAK"}

package/dist-server/graphql/resolvers/daily-dispatch/daily-dispatch-query.js

@@ -1,15 +1,24 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Query = void 0;
-const shell_1 = require("@things-factory/shell");
 const typeorm_1 = require("typeorm");
+const shell_1 = require("@things-factory/shell");
 const entities_1 = require("../../../entities");
 exports.Query = {
     async dailyDispatch(_, { name }, context) {
         const { domain, tx } = context.state;
         return await tx.getRepository(entities_1.DailyDispatch).findOne({
             where: { domain, name, deletedAt: (0, typeorm_1.IsNull)() },
-            relations: ['domain', 'dailyDispatchDetails', 'dailyDispatchDetails.ramp', 'driver', 'creator', 'updater']
+            relations: [
+                'domain',
+                'dailyDispatchDetails',
+                'dailyDispatchDetails.ramp',
+                'driver',
+                'dispatchTo',
+                'transport',
+                'creator',
+                'updater'
+            ]
         });
     },
     async dailyDispatches(_, params, context) {
@@ -20,6 +29,8 @@ exports.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/dist-server/graphql/resolvers/daily-dispatch/daily-dispatch-query.js.map

@@ -1 +1 @@
-{"version":3,"file":"daily-dispatch-query.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/daily-dispatch/daily-dispatch-query.ts"],"names":[],"mappings":";;;AAAA,iDAAqE;AACrE,qCAA+C;AAC/C,gDAAwE;AAE3D,QAAA,KAAK,GAAG;IACnB,KAAK,CAAC,aAAa,CAAC,CAAM,EAAE,EAAE,IAAI,EAAE,EAAE,OAAY;QAChD,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,GAA0C,OAAO,CAAC,KAAK,CAAA;QAE3E,OAAO,MAAM,EAAE,CAAC,aAAa,CAAC,wBAAmB,CAAC,CAAC,OAAO,CAAC;YACzD,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,IAAA,gBAAM,GAAE,EAAE;YAC5C,SAAS,EAAE,CAAC,QAAQ,EAAE,sBAAsB,EAAE,2BAA2B,EAAE,QAAQ,EAAE,SAAS,EAAE,SAAS,CAAC;SAC3G,CAAC,CAAA;IACJ,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,CAAM,EAAE,MAAiB,EAAE,OAAY;;QAC3D,MAAM,EAAE,EAAE,EAAE,GAA0B,OAAO,CAAC,KAAK,CAAA;QAEnD,MAAM,YAAY,GAAG,EAAE,CAAC,aAAa,CAAC,wBAAmB,CAAC,CAAC,kBAAkB,EAAE,CAAA;QAC/E,IAAA,kBAAU,EAAC,YAAY,EAAE,MAAM,EAAE,OAAO,CAAC,CAAA;QAEzC,YAAY;aACT,iBAAiB,CAAC,sBAAsB,EAAE,QAAQ,CAAC;aACnD,iBAAiB,CAAC,sBAAsB,EAAE,QAAQ,CAAC;aACnD,iBAAiB,CAAC,uBAAuB,EAAE,SAAS,CAAC;aACrD,iBAAiB,CAAC,uBAAuB,EAAE,SAAS,CAAC;aACrD,iBAAiB,CAAC,oCAAoC,EAAE,sBAAsB,CAAC,CAAA;QAElF,IAAI,CAAA,MAAA,MAAM,CAAC,OAAO,0CAAE,MAAM,IAAG,CAAC;YAAE,YAAY,CAAC,QAAQ,CAAC,iCAAiC,CAAC,CAAA;;YACnF,YAAY,CAAC,KAAK,CAAC,iCAAiC,CAAC,CAAA;QAE1D,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,MAAM,YAAY,CAAC,eAAe,EAAE,CAAA;QAE3D,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,CAAA;IACzB,CAAC;CACF,CAAA"}
+{"version":3,"file":"daily-dispatch-query.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/daily-dispatch/daily-dispatch-query.ts"],"names":[],"mappings":";;;AAAA,qCAA+C;AAE/C,iDAAqE;AAErE,gDAAwE;AAE3D,QAAA,KAAK,GAAG;IACnB,KAAK,CAAC,aAAa,CAAC,CAAM,EAAE,EAAE,IAAI,EAAE,EAAE,OAAY;QAChD,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,GAA0C,OAAO,CAAC,KAAK,CAAA;QAE3E,OAAO,MAAM,EAAE,CAAC,aAAa,CAAC,wBAAmB,CAAC,CAAC,OAAO,CAAC;YACzD,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,IAAA,gBAAM,GAAE,EAAE;YAC5C,SAAS,EAAE;gBACT,QAAQ;gBACR,sBAAsB;gBACtB,2BAA2B;gBAC3B,QAAQ;gBACR,YAAY;gBACZ,WAAW;gBACX,SAAS;gBACT,SAAS;aACV;SACF,CAAC,CAAA;IACJ,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,CAAM,EAAE,MAAiB,EAAE,OAAY;;QAC3D,MAAM,EAAE,EAAE,EAAE,GAA0B,OAAO,CAAC,KAAK,CAAA;QAEnD,MAAM,YAAY,GAAG,EAAE,CAAC,aAAa,CAAC,wBAAmB,CAAC,CAAC,kBAAkB,EAAE,CAAA;QAC/E,IAAA,kBAAU,EAAC,YAAY,EAAE,MAAM,EAAE,OAAO,CAAC,CAAA;QAEzC,YAAY;aACT,iBAAiB,CAAC,sBAAsB,EAAE,QAAQ,CAAC;aACnD,iBAAiB,CAAC,sBAAsB,EAAE,QAAQ,CAAC;aACnD,iBAAiB,CAAC,0BAA0B,EAAE,YAAY,CAAC;aAC3D,iBAAiB,CAAC,yBAAyB,EAAE,WAAW,CAAC;aACzD,iBAAiB,CAAC,uBAAuB,EAAE,SAAS,CAAC;aACrD,iBAAiB,CAAC,uBAAuB,EAAE,SAAS,CAAC;aACrD,iBAAiB,CAAC,oCAAoC,EAAE,sBAAsB,CAAC,CAAA;QAElF,IAAI,CAAA,MAAA,MAAM,CAAC,OAAO,0CAAE,MAAM,IAAG,CAAC;YAAE,YAAY,CAAC,QAAQ,CAAC,iCAAiC,CAAC,CAAA;;YACnF,YAAY,CAAC,KAAK,CAAC,iCAAiC,CAAC,CAAA;QAE1D,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,MAAM,YAAY,CAAC,eAAe,EAAE,CAAA;QAE3D,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,CAAA;IACzB,CAAC;CACF,CAAA"}

package/dist-server/graphql/resolvers/daily-dispatch/generate-daily-dispatch.js

@@ -10,9 +10,21 @@ exports.generateDailyDispatch = {
         const { domain, user, tx } = context.state;
         let dailyDispatchDetails = dailyDispatch.dailyDispatchDetails;
         let driver;
-        if (!(dailyDispatch === null || dailyDispatch === void 0 ? void 0 : dailyDispatch.externalDriver)) {
+        let transport;
+        let dispatchTo;
+        if (dailyDispatch === null || dailyDispatch === void 0 ? void 0 : dailyDispatch.driver) {
             driver = await tx.getRepository(entities_1.OrganizationStaff).findOne({
-                where: { staffId: dailyDispatch.staffId }
+                where: { id: dailyDispatch.driver.id }
+            });
+        }
+        if (dailyDispatch === null || dailyDispatch === void 0 ? void 0 : dailyDispatch.transport) {
+            transport = await tx.getRepository(entities_1.Truck).findOne({
+                where: { id: dailyDispatch.transport.id }
+            });
+        }
+        if (dailyDispatch === null || dailyDispatch === void 0 ? void 0 : dailyDispatch.dispatchTo) {
+            dispatchTo = await tx.getRepository(entities_1.Organization).findOne({
+                where: { id: dailyDispatch.dispatchTo.id }
             });
         }
         const totalTonnageRelease = dailyDispatchDetails.reduce(function (prev, cur) {
@@ -22,14 +34,15 @@ exports.generateDailyDispatch = {
         let newDailyDispatch = new entities_1.DailyDispatch();
         newDailyDispatch.name = utils_1.NoGenerator.dailyDispatch();
         newDailyDispatch.domain = domain;
-        newDailyDispatch.transportNo = dailyDispatch.transportNo;
-        newDailyDispatch.driverIdentification = (dailyDispatch === null || dailyDispatch === void 0 ? void 0 : dailyDispatch.driverIdentification)
-            ? dailyDispatch.driverIdentification
-            : null;
-        newDailyDispatch.driver = driver ? driver : null;
-        newDailyDispatch.externalDriver = (dailyDispatch === null || dailyDispatch === void 0 ? void 0 : dailyDispatch.externalDriver) ? dailyDispatch.externalDriver : null;
+        newDailyDispatch.transport = transport;
+        newDailyDispatch.transportNo = transport.name;
+        newDailyDispatch.driver = driver;
+        newDailyDispatch.driverIdentification = (driver === null || driver === void 0 ? void 0 : driver.idNumber) ? driver.idNumber : null;
+        newDailyDispatch.externalDriver = (driver === null || driver === void 0 ? void 0 : driver.name) ? driver === null || driver === void 0 ? void 0 : driver.name : null;
         newDailyDispatch.totalTonnageRelease = totalTonnageRelease;
-        newDailyDispatch.dispatchTo = dailyDispatch.dispatchTo;
+        newDailyDispatch.chitNo = dailyDispatch === null || dailyDispatch === void 0 ? void 0 : dailyDispatch.chitNo;
+        newDailyDispatch.percentage = dailyDispatch === null || dailyDispatch === void 0 ? void 0 : dailyDispatch.percentage;
+        newDailyDispatch.dispatchTo = dispatchTo;
         newDailyDispatch.dispatchAt = dailyDispatch.dispatchAt;
         newDailyDispatch.status = constants_1.RECORD_STATUS.STORED;
         newDailyDispatch.creator = user;
@@ -38,7 +51,7 @@ exports.generateDailyDispatch = {
         dailyDispatchDetails = await addDailyDispatchDetail(domain, newDailyDispatch, dailyDispatchDetails.map((record) => {
             return Object.assign({}, record);
         }), user, tx);
-        // await updatePlantationInventory(domain, newDailyDispatch, dailyDispatchDetails, user, tx)
+        await updatePlantationInventory(domain, newDailyDispatch, dailyDispatchDetails, user, tx);
         return newDailyDispatch;
     }
 };
@@ -65,7 +78,8 @@ async function updatePlantationInventory(domain, newDailyDispatch, dailyDispatch
         rampInventory.totalTonnage = currentRampTonnage - dispatchedTonnage;
         rampInventory.updater = user;
         rampInventory = await plantationInvRepo.save(rampInventory);
-        await (0, utils_1.generateTransactionHistory)(rampInventory, newDailyDispatch.id, newDailyDispatch.name, constants_1.TRANSACTION_TYPE.DISPATCHMENT, newDailyDispatch.dispatchAt.toISOString().split('T')[0], 0, -dispatchedTonnage, user, tx);
+        const dispatchDate = newDailyDispatch.dispatchAt.toString().split('T')[0];
+        await (0, utils_1.generateTransactionHistory)(rampInventory, newDailyDispatch.id, newDailyDispatch.name, constants_1.TRANSACTION_TYPE.DISPATCHMENT, dispatchDate, 0, -dispatchedTonnage, user, tx);
     }));
 }
 exports.updatePlantationInventory = updatePlantationInventory;

package/dist-server/graphql/resolvers/daily-dispatch/generate-daily-dispatch.js.map

@@ -1 +1 @@
-{"version":3,"file":"generate-daily-dispatch.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/daily-dispatch/generate-daily-dispatch.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"generate-daily-dispatch.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/daily-dispatch/generate-daily-dispatch.ts"],"names":[],"mappings":"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"}

package/dist-server/graphql/resolvers/daily-dispatch/update-daily-dispatch.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateDailyDispatch = void 0;
 const entities_1 = require("../../../entities");
 exports.updateDailyDispatch = {
-    async updateDailyDispatch(_, { name, dailyDispatchDetails }, context) {
+    async updateDailyDispatch(_, { name, chitNo, percentage, dailyDispatchDetails }, context) {
         const { domain, tx, user } = context.state;
         const repository = tx.getRepository(entities_1.DailyDispatch);
         const dailyDispatch = await repository.findOne({
@@ -16,7 +16,8 @@ exports.updateDailyDispatch = {
             return Object.assign(Object.assign(Object.assign({}, record), matchedDispatchDetail), { updater: user });
         });
         await tx.getRepository(entities_1.DailyDispatchDetail).save(foundDailyDispatchDetails);
-        return await repository.save(Object.assign(Object.assign({}, dailyDispatch), { updater: user }));
+        return await repository.save(Object.assign(Object.assign({}, dailyDispatch), { chitNo,
+            percentage, updater: user }));
     }
 };
 //# sourceMappingURL=update-daily-dispatch.js.map

package/dist-server/graphql/resolvers/daily-dispatch/update-daily-dispatch.js.map

@@ -1 +1 @@
-{"version":3,"file":"update-daily-dispatch.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/daily-dispatch/update-daily-dispatch.ts"],"names":[],"mappings":";;;AAGA,gDAAsE;AAEzD,QAAA,mBAAmB,GAAG;IACjC,KAAK,CAAC,mBAAmB,CAAC,CAAM,EAAE,EAAE,IAAI,EAAE,oBAAoB,EAAE,EAAE,OAAY;QAC5E,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,IAAI,EAAE,GAAsD,OAAO,CAAC,KAAK,CAAA;QAE7F,MAAM,UAAU,GAAG,EAAE,CAAC,aAAa,CAAC,wBAAa,CAAC,CAAA;QAClD,MAAM,aAAa,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC;YAC7C,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE;YACvB,SAAS,EAAE,CAAC,sBAAsB,CAAC;SACpC,CAAC,CAAA;QAEF,IAAI,yBAAyB,GAA0B,aAAa,CAAC,oBAAoB,CAAA;QAEzF,yBAAyB,GAAG,yBAAyB,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE;YACjE,MAAM,qBAAqB,GAAQ,oBAAoB,CAAC,MAAM,CAC5D,cAAc,CAAC,EAAE,CAAC,cAAc,CAAC,IAAI,KAAK,MAAM,CAAC,IAAI,CACtD,CAAC,CAAC,CAAC,CAAA;YAEJ,qDACK,MAAM,GACN,qBAAqB,KACxB,OAAO,EAAE,IAAI,IACd;QACH,CAAC,CAAC,CAAA;QAEF,MAAM,EAAE,CAAC,aAAa,CAAC,8BAAmB,CAAC,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAA;QAE3E,OAAO,MAAM,UAAU,CAAC,IAAI,iCACvB,aAAa,KAChB,OAAO,EAAE,IAAI,IACb,CAAA;IACJ,CAAC;CACF,CAAA"}
+{"version":3,"file":"update-daily-dispatch.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/daily-dispatch/update-daily-dispatch.ts"],"names":[],"mappings":";;;AAKA,gDAAsE;AAEzD,QAAA,mBAAmB,GAAG;IACjC,KAAK,CAAC,mBAAmB,CAAC,CAAM,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,oBAAoB,EAAE,EAAE,OAAY;QAChG,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,IAAI,EAAE,GAAsD,OAAO,CAAC,KAAK,CAAA;QAE7F,MAAM,UAAU,GAAG,EAAE,CAAC,aAAa,CAAC,wBAAa,CAAC,CAAA;QAClD,MAAM,aAAa,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC;YAC7C,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE;YACvB,SAAS,EAAE,CAAC,sBAAsB,CAAC;SACpC,CAAC,CAAA;QAEF,IAAI,yBAAyB,GAA0B,aAAa,CAAC,oBAAoB,CAAA;QAEzF,yBAAyB,GAAG,yBAAyB,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE;YACjE,MAAM,qBAAqB,GAAQ,oBAAoB,CAAC,MAAM,CAC5D,cAAc,CAAC,EAAE,CAAC,cAAc,CAAC,IAAI,KAAK,MAAM,CAAC,IAAI,CACtD,CAAC,CAAC,CAAC,CAAA;YAEJ,qDACK,MAAM,GACN,qBAAqB,KACxB,OAAO,EAAE,IAAI,IACd;QACH,CAAC,CAAC,CAAA;QAEF,MAAM,EAAE,CAAC,aAAa,CAAC,8BAAmB,CAAC,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAA;QAE3E,OAAO,MAAM,UAAU,CAAC,IAAI,iCACvB,aAAa,KAChB,MAAM;YACN,UAAU,EACV,OAAO,EAAE,IAAI,IACb,CAAA;IACJ,CAAC;CACF,CAAA"}

package/dist-server/graphql/resolvers/daily-harvest/daily-harvest-query.js

@@ -1,12 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Query = void 0;
-const shell_1 = require("@things-factory/shell");
 const typeorm_1 = require("typeorm");
+const shell_1 = require("@things-factory/shell");
 const entities_1 = require("../../../entities");
 exports.Query = {
     async dailyHarvest(_, { name }, context) {
         const { domain, tx } = context.state;
+        const transaction = await tx.getRepository(entities_1.RecordTransaction).findOne({ where: { domain } });
         return await tx.getRepository(entities_1.DailyHarvest).findOne({
             where: { domain, name, deletedAt: (0, typeorm_1.IsNull)() },
             relations: [
@@ -14,6 +15,7 @@ exports.Query = {
                 'block',
                 'dailyHarvestDetails',
                 'dailyHarvestDetails.organizationStaff',
+                'dailyHarvestDetails.organizationStaff.organization',
                 'creator',
                 'updater'
             ]

package/dist-server/graphql/resolvers/daily-harvest/daily-harvest-query.js.map

@@ -1 +1 @@
-{"version":3,"file":"daily-harvest-query.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/daily-harvest/daily-harvest-query.ts"],"names":[],"mappings":";;;AAAA,iDAAqE;AACrE,qCAA+C;AAC/C,gDAAsE;AAEzD,QAAA,KAAK,GAAG;IACnB,KAAK,CAAC,YAAY,CAAC,CAAM,EAAE,EAAE,IAAI,EAAE,EAAE,OAAY;QAC/C,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,GAA0C,OAAO,CAAC,KAAK,CAAA;QAE3E,OAAO,MAAM,EAAE,CAAC,aAAa,CAAC,uBAAkB,CAAC,CAAC,OAAO,CAAC;YACxD,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,IAAA,gBAAM,GAAE,EAAE;YAC5C,SAAS,EAAE;gBACT,QAAQ;gBACR,OAAO;gBACP,qBAAqB;gBACrB,uCAAuC;gBACvC,SAAS;gBACT,SAAS;aACV;SACF,CAAC,CAAA;IACJ,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,CAAM,EAAE,MAAiB,EAAE,OAAY;;QACzD,MAAM,EAAE,EAAE,EAAE,GAA0B,OAAO,CAAC,KAAK,CAAA;QAEnD,MAAM,YAAY,GAAG,EAAE,CAAC,aAAa,CAAC,uBAAkB,CAAC,CAAC,kBAAkB,EAAE,CAAA;QAC9E,IAAA,kBAAU,EAAC,YAAY,EAAE,MAAM,EAAE,OAAO,CAAC,CAAA;QAEzC,YAAY;aACT,iBAAiB,CAAC,qBAAqB,EAAE,QAAQ,CAAC;aAClD,iBAAiB,CAAC,oBAAoB,EAAE,OAAO,CAAC;aAChD,iBAAiB,CAAC,sBAAsB,EAAE,SAAS,CAAC;aACpD,iBAAiB,CAAC,sBAAsB,EAAE,SAAS,CAAC,CAAA;QAEvD,IAAI,CAAA,MAAA,MAAM,CAAC,OAAO,0CAAE,MAAM,IAAG,CAAC;YAAE,YAAY,CAAC,QAAQ,CAAC,gCAAgC,CAAC,CAAA;;YAClF,YAAY,CAAC,KAAK,CAAC,gCAAgC,CAAC,CAAA;QAEzD,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,MAAM,YAAY,CAAC,eAAe,EAAE,CAAA;QAE3D,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,CAAA;IACzB,CAAC;CACF,CAAA"}
+{"version":3,"file":"daily-harvest-query.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/daily-harvest/daily-harvest-query.ts"],"names":[],"mappings":";;;AAAA,qCAA+C;AAE/C,iDAAqE;AAErE,gDAAyF;AAE5E,QAAA,KAAK,GAAG;IACnB,KAAK,CAAC,YAAY,CAAC,CAAM,EAAE,EAAE,IAAI,EAAE,EAAE,OAAY;QAC/C,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,GAA0C,OAAO,CAAC,KAAK,CAAA;QAE3E,MAAM,WAAW,GAAsB,MAAM,EAAE,CAAC,aAAa,CAAC,4BAAiB,CAAC,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,CAAC,CAAA;QAE/G,OAAO,MAAM,EAAE,CAAC,aAAa,CAAC,uBAAkB,CAAC,CAAC,OAAO,CAAC;YACxD,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,IAAA,gBAAM,GAAE,EAAE;YAC5C,SAAS,EAAE;gBACT,QAAQ;gBACR,OAAO;gBACP,qBAAqB;gBACrB,uCAAuC;gBACvC,oDAAoD;gBACpD,SAAS;gBACT,SAAS;aACV;SACF,CAAC,CAAA;IACJ,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,CAAM,EAAE,MAAiB,EAAE,OAAY;;QACzD,MAAM,EAAE,EAAE,EAAE,GAA0B,OAAO,CAAC,KAAK,CAAA;QAEnD,MAAM,YAAY,GAAG,EAAE,CAAC,aAAa,CAAC,uBAAkB,CAAC,CAAC,kBAAkB,EAAE,CAAA;QAC9E,IAAA,kBAAU,EAAC,YAAY,EAAE,MAAM,EAAE,OAAO,CAAC,CAAA;QAEzC,YAAY;aACT,iBAAiB,CAAC,qBAAqB,EAAE,QAAQ,CAAC;aAClD,iBAAiB,CAAC,oBAAoB,EAAE,OAAO,CAAC;aAChD,iBAAiB,CAAC,sBAAsB,EAAE,SAAS,CAAC;aACpD,iBAAiB,CAAC,sBAAsB,EAAE,SAAS,CAAC,CAAA;QAEvD,IAAI,CAAA,MAAA,MAAM,CAAC,OAAO,0CAAE,MAAM,IAAG,CAAC;YAAE,YAAY,CAAC,QAAQ,CAAC,gCAAgC,CAAC,CAAA;;YAClF,YAAY,CAAC,KAAK,CAAC,gCAAgC,CAAC,CAAA;QAEzD,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,MAAM,YAAY,CAAC,eAAe,EAAE,CAAA;QAE3D,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,CAAA;IACzB,CAAC;CACF,CAAA"}

package/dist-server/graphql/resolvers/daily-harvest/generate-daily-harvest.js

@@ -10,12 +10,16 @@ exports.generateDailyHarvest = {
         const { domain, user, tx } = context.state;
         let dailyHarvestDetails = dailyHarvest.dailyHarvestDetails;
         const block = await tx.getRepository(entities_1.Block).findOne({
-            where: { name: dailyHarvest.block, deletedAt: (0, typeorm_1.IsNull)() }
+            where: { domain, name: dailyHarvest.block, deletedAt: (0, typeorm_1.IsNull)() }
         });
         // get sum of bunch harvested from all staff
         const totalBunchHarvested = dailyHarvestDetails.reduce(function (prev, cur) {
             return prev + cur.totalBunchHarvested;
         }, 0);
+        const collectedBunch = dailyHarvest.collectedBunch || 0;
+        let yesterdayBalanceBunchInField = dailyHarvest.yesterdayBalanceBunchInField || 0;
+        if (collectedBunch > totalBunchHarvested)
+            throw new Error('Collected bunch more than total bunch harvested today');
         // 1. Create daily harvest
         let newDailyHarvest = new entities_1.DailyHarvest();
         newDailyHarvest.name = utils_1.NoGenerator.dailyHarvest();
@@ -24,7 +28,10 @@ exports.generateDailyHarvest = {
         newDailyHarvest.harvestingRound = dailyHarvest.harvestingRound;
         newDailyHarvest.harvestDate = dailyHarvest.harvestDate;
         newDailyHarvest.coverage = dailyHarvest.coverage;
+        newDailyHarvest.yesterdayBalanceBunchInField = yesterdayBalanceBunchInField;
         newDailyHarvest.totalBunchHarvested = totalBunchHarvested;
+        newDailyHarvest.collectedBunch = collectedBunch;
+        newDailyHarvest.balanceBunchInField = yesterdayBalanceBunchInField + totalBunchHarvested - collectedBunch;
         newDailyHarvest.status = constants_1.RECORD_STATUS.STORED;
         newDailyHarvest.creator = user;
         newDailyHarvest.updater = user;
@@ -58,8 +65,14 @@ async function addPlantationInventory(domain, newDailyHarvest, block, user, tx)
         newTotalBunches = existingFieldBunch.totalBunches + newDailyHarvest.totalBunchHarvested;
         existingFieldBunch.totalBunches = newTotalBunches;
         existingFieldBunch.updater = user;
-        await plantationInvRepo.save(existingFieldBunch);
+        existingFieldBunch = await plantationInvRepo.save(existingFieldBunch);
         await (0, utils_1.generateTransactionHistory)(existingFieldBunch, newDailyHarvest.id, newDailyHarvest.name, constants_1.TRANSACTION_TYPE.HARVEST, newDailyHarvest.harvestDate, newDailyHarvest.totalBunchHarvested, 0, user, tx);
+        if (newDailyHarvest.collectedBunch > 0) {
+            existingFieldBunch.totalBunches -= newDailyHarvest.collectedBunch;
+            existingFieldBunch.updater = user;
+            existingFieldBunch = await plantationInvRepo.save(existingFieldBunch);
+            await (0, utils_1.generateTransactionHistory)(existingFieldBunch, newDailyHarvest.id, newDailyHarvest.name, constants_1.TRANSACTION_TYPE.BUNCHES_ADJUSTMENT, newDailyHarvest.harvestDate, -newDailyHarvest.collectedBunch, 0, user, tx);
+        }
     }
     else {
         newTotalBunches = newTotalBunches + newDailyHarvest.totalBunchHarvested;
@@ -74,6 +87,12 @@ async function addPlantationInventory(domain, newDailyHarvest, block, user, tx)
         plantationInventory.updater = user;
         plantationInventory = await plantationInvRepo.save(plantationInventory);
         await (0, utils_1.generateTransactionHistory)(plantationInventory, newDailyHarvest.id, newDailyHarvest.name, constants_1.TRANSACTION_TYPE.HARVEST, newDailyHarvest.harvestDate, newDailyHarvest.totalBunchHarvested, 0, user, tx);
+        if (newDailyHarvest.collectedBunch > 0) {
+            plantationInventory.totalBunches -= newDailyHarvest.collectedBunch;
+            plantationInventory.updater = user;
+            plantationInventory = await plantationInvRepo.save(plantationInventory);
+            await (0, utils_1.generateTransactionHistory)(plantationInventory, newDailyHarvest.id, newDailyHarvest.name, constants_1.TRANSACTION_TYPE.BUNCHES_ADJUSTMENT, newDailyHarvest.harvestDate, -newDailyHarvest.collectedBunch, 0, user, tx);
+        }
     }
 }
 exports.addPlantationInventory = addPlantationInventory;

package/dist-server/graphql/resolvers/daily-harvest/generate-daily-harvest.js.map

@@ -1 +1 @@
-{"version":3,"file":"generate-daily-harvest.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/daily-harvest/generate-daily-harvest.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"generate-daily-harvest.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/daily-harvest/generate-daily-harvest.ts"],"names":[],"mappings":"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"}

package/dist-server/graphql/resolvers/daily-harvest/update-daily-harvest.js

@@ -21,8 +21,9 @@ exports.updateDailyHarvest = {
         // new row has been added
         let newDailyHarvestDetails = dailyHarvestPatch.dailyHarvestDetails.filter(detail => detail.name === null);
         const block = await tx.getRepository(entities_1.Block).findOne({
-            where: { name: dailyHarvestPatch.block, deletedAt: (0, typeorm_1.IsNull)() }
+            where: { domain, name: dailyHarvestPatch.block, deletedAt: (0, typeorm_1.IsNull)() }
         });
+        const collectedBunch = dailyHarvestPatch.collectedBunch || 0;
         // get sum of bunch harvested from all staff
         var totalBunchHarvested = dailyHarvestPatch.dailyHarvestDetails.reduce(function (prev, cur) {
             return prev + cur.totalBunchHarvested;
@@ -30,7 +31,11 @@ exports.updateDailyHarvest = {
         foundDailyHarvest.block = block;
         foundDailyHarvest.coverage = dailyHarvestPatch.coverage;
         foundDailyHarvest.harvestingRound = dailyHarvestPatch.harvestingRound;
+        foundDailyHarvest.yesterdayBalanceBunchInField = dailyHarvestPatch.yesterdayBalanceBunchInField;
         foundDailyHarvest.totalBunchHarvested = totalBunchHarvested;
+        foundDailyHarvest.collectedBunch = collectedBunch;
+        foundDailyHarvest.balanceBunchInField =
+            foundDailyHarvest.yesterdayBalanceBunchInField + totalBunchHarvested - collectedBunch;
         foundDailyHarvest.harvestDate = dailyHarvestPatch.harvestDate;
         foundDailyHarvest.updater = user;
         await dailyHarvestRepo.save(foundDailyHarvest);
@@ -44,7 +49,7 @@ exports.updateDailyHarvest = {
                     const foundStaff = await organizationStaffRepo.findOne({
                         where: { id: foundDailyHarvestDetailPatch.organizationStaff.id }
                     });
-                    await dailyHarvestDetailRepo.save(Object.assign(Object.assign({}, record), { dailyHarvest: foundDailyHarvest, organizationStaff: foundStaff, totalBunchHarvested: foundDailyHarvestDetailPatch.totalBunchHarvested, remark: foundDailyHarvestDetailPatch.remark, updater: user }));
+                    await dailyHarvestDetailRepo.save(Object.assign(Object.assign({}, record), { dailyHarvest: foundDailyHarvest, organizationStaff: foundStaff, totalBunchHarvested: foundDailyHarvestDetailPatch.totalBunchHarvested, totalTonnageHarvested: foundDailyHarvestDetailPatch.totalTonnageHarvested, remark: foundDailyHarvestDetailPatch.remark, updater: user }));
                 }
             }));
         }
@@ -59,6 +64,7 @@ exports.updateDailyHarvest = {
                     id: dailyHarvestDetail.organizationStaff.id
                 });
                 newDailyHarvestDetail.totalBunchHarvested = dailyHarvestDetail.totalBunchHarvested;
+                newDailyHarvestDetail.totalTonnageHarvested = dailyHarvestDetail.totalTonnageHarvested;
                 newDailyHarvestDetail.remark = dailyHarvestDetail.remark;
                 newDailyHarvestDetail.creator = user;
                 newDailyHarvestDetail.updater = user;

package/dist-server/graphql/resolvers/daily-harvest/update-daily-harvest.js.map

@@ -1 +1 @@
-{"version":3,"file":"update-daily-harvest.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/daily-harvest/update-daily-harvest.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"update-daily-harvest.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/daily-harvest/update-daily-harvest.ts"],"names":[],"mappings":";;;AAAA,qCAA0E;AAK1E,kDAAqE;AACrE,gDAAmH;AACnH,0CAAwE;AAE3D,QAAA,kBAAkB,GAAG;IAChC,KAAK,CAAC,kBAAkB,CAAC,CAAM,EAAE,EAAE,IAAI,EAAE,iBAAiB,EAAE,EAAE,OAAY;QACxE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,GAAsD,OAAO,CAAC,KAAK,CAAA;QAC7F,MAAM,gBAAgB,GAAG,EAAE,CAAC,aAAa,CAAC,uBAAY,CAAC,CAAA;QACvD,MAAM,sBAAsB,GAAG,EAAE,CAAC,aAAa,CAAC,6BAAkB,CAAC,CAAA;QACnE,MAAM,qBAAqB,GAAG,EAAE,CAAC,aAAa,CAAC,4BAAiB,CAAC,CAAA;QAEjE,IAAI,iBAAiB,GAAiB,MAAM,gBAAgB,CAAC,OAAO,CAAC;YACnE,KAAK,EAAE,EAAE,IAAI,EAAE;YACf,SAAS,EAAE,CAAC,OAAO,EAAE,qBAAqB,EAAE,uCAAuC,CAAC;SACrF,CAAC,CAAA;QAEF,wBAAwB;QACxB,IAAI,wBAAwB,GAAyB,iBAAiB,CAAC,mBAAmB,CAAA,CAAC,UAAU;QACrG,IAAI,2BAA2B,GAAyB,iBAAiB,CAAC,mBAAmB,CAAC,MAAM,CAClG,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,IAAI,CAC/B,CAAA,CAAC,mBAAmB;QAErB,yBAAyB;QACzB,IAAI,sBAAsB,GAAyB,iBAAiB,CAAC,mBAAmB,CAAC,MAAM,CAC7F,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,IAAI,CAC/B,CAAA;QAED,MAAM,KAAK,GAAU,MAAM,EAAE,CAAC,aAAa,CAAC,gBAAK,CAAC,CAAC,OAAO,CAAC;YACzD,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,iBAAiB,CAAC,KAAK,EAAE,SAAS,EAAE,IAAA,gBAAM,GAAE,EAAE;SACtE,CAAC,CAAA;QAEF,MAAM,cAAc,GAAW,iBAAiB,CAAC,cAAc,IAAI,CAAC,CAAA;QAEpE,4CAA4C;QAC5C,IAAI,mBAAmB,GAAG,iBAAiB,CAAC,mBAAmB,CAAC,MAAM,CAAC,UAAU,IAAI,EAAE,GAAG;YACxF,OAAO,IAAI,GAAG,GAAG,CAAC,mBAAmB,CAAA;QACvC,CAAC,EAAE,CAAC,CAAC,CAAA;QAEL,iBAAiB,CAAC,KAAK,GAAG,KAAK,CAAA;QAC/B,iBAAiB,CAAC,QAAQ,GAAG,iBAAiB,CAAC,QAAQ,CAAA;QACvD,iBAAiB,CAAC,eAAe,GAAG,iBAAiB,CAAC,eAAe,CAAA;QACrE,iBAAiB,CAAC,4BAA4B,GAAG,iBAAiB,CAAC,4BAA4B,CAAA;QAC/F,iBAAiB,CAAC,mBAAmB,GAAG,mBAAmB,CAAA;QAC3D,iBAAiB,CAAC,cAAc,GAAG,cAAc,CAAA;QACjD,iBAAiB,CAAC,mBAAmB;YACnC,iBAAiB,CAAC,4BAA4B,GAAG,mBAAmB,GAAG,cAAc,CAAA;QACvF,iBAAiB,CAAC,WAAW,GAAG,iBAAiB,CAAC,WAAW,CAAA;QAC7D,iBAAiB,CAAC,OAAO,GAAG,IAAI,CAAA;QAChC,MAAM,gBAAgB,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAA;QAE9C,IAAI,CAAA,2BAA2B,aAA3B,2BAA2B,uBAA3B,2BAA2B,CAAE,MAAM,IAAG,CAAC,EAAE;YAC3C,MAAM,OAAO,CAAC,GAAG,CACf,wBAAwB,CAAC,GAAG,CAAC,KAAK,EAAE,MAA0B,EAAE,EAAE;gBAChE,IAAI,MAAM,CAAC,mBAAmB,IAAI,CAAC,EAAE;oBACnC,MAAM,sBAAsB,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;iBAC5C;qBAAM;oBACL,MAAM,4BAA4B,GAAG,iBAAiB,CAAC,mBAAmB,CAAC,IAAI,CAC7E,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,MAAM,CAAC,IAAI,CACtC,CAAA;oBAED,MAAM,UAAU,GAAsB,MAAM,qBAAqB,CAAC,OAAO,CAAC;wBACxE,KAAK,EAAE,EAAE,EAAE,EAAE,4BAA4B,CAAC,iBAAiB,CAAC,EAAE,EAAE;qBACjE,CAAC,CAAA;oBAEF,MAAM,sBAAsB,CAAC,IAAI,iCAC5B,MAAM,KACT,YAAY,EAAE,iBAAiB,EAC/B,iBAAiB,EAAE,UAAU,EAC7B,mBAAmB,EAAE,4BAA4B,CAAC,mBAAmB,EACrE,qBAAqB,EAAE,4BAA4B,CAAC,qBAAqB,EACzE,MAAM,EAAE,4BAA4B,CAAC,MAAM,EAC3C,OAAO,EAAE,IAAI,IACb,CAAA;iBACH;YACH,CAAC,CAAC,CACH,CAAA;SACF;QAED,+BAA+B;QAC/B,IAAI,CAAA,sBAAsB,aAAtB,sBAAsB,uBAAtB,sBAAsB,CAAE,MAAM,IAAG,CAAC,EAAE;YACtC,MAAM,OAAO,CAAC,GAAG,CACf,sBAAsB,CAAC,GAAG,CAAC,KAAK,EAAE,kBAAsC,EAAE,EAAE;gBAC1E,IAAI,qBAAqB,GAAuB,IAAI,6BAAkB,EAAE,CAAA;gBACxE,qBAAqB,CAAC,YAAY,GAAG,MAAM,gBAAgB,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,CAAC,CAAA;gBAChG,qBAAqB,CAAC,MAAM,GAAG,MAAM,CAAA;gBACrC,qBAAqB,CAAC,IAAI,GAAG,mBAAW,CAAC,kBAAkB,EAAE,CAAA;gBAC7D,qBAAqB,CAAC,iBAAiB,GAAG,MAAM,qBAAqB,CAAC,OAAO,CAAC;oBAC5E,EAAE,EAAE,kBAAkB,CAAC,iBAAiB,CAAC,EAAE;iBAC5C,CAAC,CAAA;gBACF,qBAAqB,CAAC,mBAAmB,GAAG,kBAAkB,CAAC,mBAAmB,CAAA;gBAClF,qBAAqB,CAAC,qBAAqB,GAAG,kBAAkB,CAAC,qBAAqB,CAAA;gBACtF,qBAAqB,CAAC,MAAM,GAAG,kBAAkB,CAAC,MAAM,CAAA;gBACxD,qBAAqB,CAAC,OAAO,GAAG,IAAI,CAAA;gBACpC,qBAAqB,CAAC,OAAO,GAAG,IAAI,CAAA;gBAEpC,MAAM,sBAAsB,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAA;YAC1D,CAAC,CAAC,CACH,CAAA;SACF;QAED,MAAM,yBAAyB,CAAC,MAAM,EAAE,iBAAiB,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,CAAC,CAAA;QAE3E,OAAO,iBAAiB,CAAA;IAC1B,CAAC;CACF,CAAA;AAEM,KAAK,UAAU,yBAAyB,CAC7C,MAAc,EACd,iBAA+B,EAC/B,KAAY,EACZ,IAAU,EACV,EAAkB;IAElB,MAAM,iBAAiB,GACrB,CAAA,EAAE,aAAF,EAAE,uBAAF,EAAE,CAAE,aAAa,CAAC,8BAAmB,CAAC,KAAI,IAAA,uBAAa,EAAC,8BAAmB,CAAC,CAAA;IAE9E,IAAI,2BAA2B,GAAwB,MAAM,iBAAiB,CAAC,OAAO,CAAC;QACrF,KAAK,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,0BAAc,CAAC,aAAa,EAAE;QAC5D,SAAS,EAAE,CAAC,QAAQ,EAAE,OAAO,EAAE,MAAM,CAAC;KACvC,CAAC,CAAA;IAEF,IAAI,CAAC,2BAA2B;QAAE,MAAM,IAAI,KAAK,CAAC,6CAA6C,CAAC,CAAA;IAEhG,IAAI,eAAe,GAAW,CAAC,CAAA;IAC/B,IAAI,mBAAmB,GAAW,2BAA2B,CAAC,YAAY,CAAA;IAE1E,eAAe,GAAG,iBAAiB,CAAC,mBAAmB,GAAG,mBAAmB,CAAA;IAE7E,2BAA2B,CAAC,YAAY,GAAG,mBAAmB,GAAG,eAAe,CAAA;IAChF,2BAA2B,CAAC,OAAO,GAAG,IAAI,CAAA;IAC1C,MAAM,iBAAiB,CAAC,IAAI,CAAC,2BAA2B,CAAC,CAAA;IAEzD,MAAM,IAAA,kCAA0B,EAC9B,2BAA2B,EAC3B,iBAAiB,CAAC,EAAE,EACpB,iBAAiB,CAAC,IAAI,EACtB,4BAAgB,CAAC,kBAAkB,EACnC,iBAAiB,CAAC,WAAW,EAC7B,eAAe,EACf,CAAC,EACD,IAAI,EACJ,EAAE,CACH,CAAA;AACH,CAAC;AArCD,8DAqCC"}

package/dist-server/graphql/resolvers/daily-loading/daily-loading-query.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Query = void 0;
-const shell_1 = require("@things-factory/shell");
 const typeorm_1 = require("typeorm");
+const shell_1 = require("@things-factory/shell");
 const entities_1 = require("../../../entities");
 exports.Query = {
     async dailyLoading(_, { name }, context) {
@@ -11,11 +11,10 @@ exports.Query = {
             where: { domain, name, deletedAt: (0, typeorm_1.IsNull)() },
             relations: [
                 'domain',
-                'block',
                 'dailyLoadingDetails',
-                'dailyLoadingDetails.organizationStaff',
-                'dailyLoadingRamps',
-                'dailyLoadingRamps.ramp',
+                'dailyLoadingDetails.truck',
+                'dailyLoadingDetails.block',
+                'dailyLoadingDetails.ramp',
                 'creator',
                 'updater'
             ]
@@ -28,7 +27,6 @@ exports.Query = {
         (0, shell_1.buildQuery)(queryBuilder, params, context);
         queryBuilder
             .leftJoinAndSelect('DailyLoading.domain', 'Domain')
-            .leftJoinAndSelect('DailyLoading.block', 'Block')
             .leftJoinAndSelect('DailyLoading.creator', 'Creator')
             .leftJoinAndSelect('DailyLoading.updater', 'Updater');
         if (((_a = params.filters) === null || _a === void 0 ? void 0 : _a.length) > 0)

package/dist-server/graphql/resolvers/daily-loading/daily-loading-query.js.map

@@ -1 +1 @@
-{"version":3,"file":"daily-loading-query.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/daily-loading/daily-loading-query.ts"],"names":[],"mappings":";;;AAAA,iDAAqE;AACrE,qCAA+C;AAC/C,gDAAsE;AAEzD,QAAA,KAAK,GAAG;IACnB,KAAK,CAAC,YAAY,CAAC,CAAM,EAAE,EAAE,IAAI,EAAE,EAAE,OAAY;QAC/C,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,GAA0C,OAAO,CAAC,KAAK,CAAA;QAE3E,OAAO,MAAM,EAAE,CAAC,aAAa,CAAC,uBAAkB,CAAC,CAAC,OAAO,CAAC;YACxD,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,IAAA,gBAAM,GAAE,EAAE;YAC5C,SAAS,EAAE;gBACT,QAAQ;gBACR,OAAO;gBACP,qBAAqB;gBACrB,uCAAuC;gBACvC,mBAAmB;gBACnB,wBAAwB;gBACxB,SAAS;gBACT,SAAS;aACV;SACF,CAAC,CAAA;IACJ,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,CAAM,EAAE,MAAiB,EAAE,OAAY;;QACzD,MAAM,EAAE,EAAE,EAAE,GAA0B,OAAO,CAAC,KAAK,CAAA;QAEnD,MAAM,YAAY,GAAG,EAAE,CAAC,aAAa,CAAC,uBAAkB,CAAC,CAAC,kBAAkB,EAAE,CAAA;QAC9E,IAAA,kBAAU,EAAC,YAAY,EAAE,MAAM,EAAE,OAAO,CAAC,CAAA;QAEzC,YAAY;aACT,iBAAiB,CAAC,qBAAqB,EAAE,QAAQ,CAAC;aAClD,iBAAiB,CAAC,oBAAoB,EAAE,OAAO,CAAC;aAChD,iBAAiB,CAAC,sBAAsB,EAAE,SAAS,CAAC;aACpD,iBAAiB,CAAC,sBAAsB,EAAE,SAAS,CAAC,CAAA;QAEvD,IAAI,CAAA,MAAA,MAAM,CAAC,OAAO,0CAAE,MAAM,IAAG,CAAC;YAAE,YAAY,CAAC,QAAQ,CAAC,gCAAgC,CAAC,CAAA;;YAClF,YAAY,CAAC,KAAK,CAAC,gCAAgC,CAAC,CAAA;QAEzD,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,MAAM,YAAY,CAAC,eAAe,EAAE,CAAA;QAE3D,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,CAAA;IACzB,CAAC;CACF,CAAA"}
+{"version":3,"file":"daily-loading-query.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/daily-loading/daily-loading-query.ts"],"names":[],"mappings":";;;AAAA,qCAA+C;AAE/C,iDAAqE;AAErE,gDAAsE;AAEzD,QAAA,KAAK,GAAG;IACnB,KAAK,CAAC,YAAY,CAAC,CAAM,EAAE,EAAE,IAAI,EAAE,EAAE,OAAY;QAC/C,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,GAA0C,OAAO,CAAC,KAAK,CAAA;QAE3E,OAAO,MAAM,EAAE,CAAC,aAAa,CAAC,uBAAkB,CAAC,CAAC,OAAO,CAAC;YACxD,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,IAAA,gBAAM,GAAE,EAAE;YAC5C,SAAS,EAAE;gBACT,QAAQ;gBACR,qBAAqB;gBACrB,2BAA2B;gBAC3B,2BAA2B;gBAC3B,0BAA0B;gBAC1B,SAAS;gBACT,SAAS;aACV;SACF,CAAC,CAAA;IACJ,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,CAAM,EAAE,MAAiB,EAAE,OAAY;;QACzD,MAAM,EAAE,EAAE,EAAE,GAA0B,OAAO,CAAC,KAAK,CAAA;QAEnD,MAAM,YAAY,GAAG,EAAE,CAAC,aAAa,CAAC,uBAAkB,CAAC,CAAC,kBAAkB,EAAE,CAAA;QAC9E,IAAA,kBAAU,EAAC,YAAY,EAAE,MAAM,EAAE,OAAO,CAAC,CAAA;QAEzC,YAAY;aACT,iBAAiB,CAAC,qBAAqB,EAAE,QAAQ,CAAC;aAClD,iBAAiB,CAAC,sBAAsB,EAAE,SAAS,CAAC;aACpD,iBAAiB,CAAC,sBAAsB,EAAE,SAAS,CAAC,CAAA;QAEvD,IAAI,CAAA,MAAA,MAAM,CAAC,OAAO,0CAAE,MAAM,IAAG,CAAC;YAAE,YAAY,CAAC,QAAQ,CAAC,gCAAgC,CAAC,CAAA;;YAClF,YAAY,CAAC,KAAK,CAAC,gCAAgC,CAAC,CAAA;QAEzD,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,MAAM,YAAY,CAAC,eAAe,EAAE,CAAA;QAE3D,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,CAAA;IACzB,CAAC;CACF,CAAA"}