@things-factory/operato-pms 3.8.13 → 3.8.14

package/client/pages/report/report-ffb-tonnage-between-individual-block.js

@@ -307,6 +307,7 @@ class ReportFfbTonnageBetweenIndividualBlock extends connect(store)(localize(i18
               block {
                 id
                 name
+                deletedAt
               }
             }
           }
@@ -316,16 +317,19 @@ class ReportFfbTonnageBetweenIndividualBlock extends connect(store)(localize(i18
     })
 
     if (!response.errors) {
-      return response.data.ramps.items.map(ramp => {
-        return {
-          id: ramp.block.id,
-          name: ramp.block.name
-        }
-      })
+      return response.data.ramps.items.reduce((acc, ramp) => {
+        if (!acc.find(itm => itm.id == ramp.block.id) && !ramp.block.deletedAt)
+          acc.push({
+            id: ramp.block.id,
+            name: ramp.block.name
+          })
+
+        return acc
+      }, [])
     }
   }
 
-  _dateChange() {
+  _dateChange(e) {
     const monthNames = [
       'January',
       'February',
@@ -342,6 +346,7 @@ class ReportFfbTonnageBetweenIndividualBlock extends connect(store)(localize(i18
     ]
     let selectedDate = this._monthInput.valueAsDate
     this._month = `${monthNames[selectedDate.getMonth()]} ${selectedDate.getFullYear().toString()}`
+    this.searchForm.submit()
   }
 
   async _exportableData() {

package/dist-server/constants/transaction.js

@@ -5,7 +5,8 @@ exports.TRANSACTION_TYPE = {
     HARVEST: 'HARVEST',
     LOADING: 'LOADING',
     DISPATCHMENT: 'DISPATCHMENT',
-    TONNAGE_ADJUSTMENT: 'TONNAGE_ADJUSTMENT',
+    LOADING_ADJUSTMENT: 'LOADING_ADJUSTMENT',
+    DISPATCHMENT_ADJUSTMENT: 'DISPATCHMENT_ADJUSTMENT',
     BUNCHES_ADJUSTMENT: 'BUNCHES_ADJUSTMENT',
     TERMINATED: 'TERMINATED'
 };

package/dist-server/constants/transaction.js.map

@@ -1 +1 @@
-{"version":3,"file":"transaction.js","sourceRoot":"","sources":["../../server/constants/transaction.ts"],"names":[],"mappings":";;;AAAa,QAAA,gBAAgB,GAAG;IAC9B,OAAO,EAAE,SAAS;IAClB,OAAO,EAAE,SAAS;IAClB,YAAY,EAAE,cAAc;IAC5B,kBAAkB,EAAE,oBAAoB;IACxC,kBAAkB,EAAE,oBAAoB;IACxC,UAAU,EAAE,YAAY;CACzB,CAAA"}
+{"version":3,"file":"transaction.js","sourceRoot":"","sources":["../../server/constants/transaction.ts"],"names":[],"mappings":";;;AAAa,QAAA,gBAAgB,GAAG;IAC9B,OAAO,EAAE,SAAS;IAClB,OAAO,EAAE,SAAS;IAClB,YAAY,EAAE,cAAc;IAC5B,kBAAkB,EAAE,oBAAoB;IACxC,uBAAuB,EAAE,yBAAyB;IAClD,kBAAkB,EAAE,oBAAoB;IACxC,UAAU,EAAE,YAAY;CACzB,CAAA"}

package/dist-server/entities/daily-dispatch.js

@@ -42,8 +42,7 @@ __decorate([
     __metadata("design:type", String)
 ], DailyDispatch.prototype, "externalDriver", void 0);
 __decorate([
-    (0, typeorm_1.OneToOne)(type => entities_1.Truck, { nullable: true }),
-    (0, typeorm_1.JoinColumn)(),
+    (0, typeorm_1.ManyToOne)(type => entities_1.Truck, { nullable: true }),
     __metadata("design:type", entities_1.Truck)
 ], DailyDispatch.prototype, "transport", void 0);
 __decorate([

package/dist-server/entities/daily-dispatch.js.map

@@ -1 +1 @@
-{"version":3,"file":"daily-dispatch.js","sourceRoot":"","sources":["../../server/entities/daily-dispatch.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,qCAWgB;AAEhB,yDAAgD;AAChD,iDAA8C;AAE9C,0CAAyF;AAMzF,IAAa,aAAa,GAA1B,MAAa,aAAa;CAsEzB,CAAA;AApEC;IADC,IAAA,gCAAsB,EAAC,MAAM,CAAC;;yCACrB;AAGV;IADC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,cAAM,CAAC;kDAClB,cAAM,oBAAN,cAAM;6CAAA;AAGd;IADC,IAAA,gBAAM,GAAE;;2CACG;AAGZ;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;kDACR;AAGnB;IADC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,4BAAiB,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BACjD,4BAAiB;6CAAA;AAGzB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;qDACL;AAItB;IAFC,IAAA,kBAAQ,EAAC,IAAI,CAAC,EAAE,CAAC,gBAAK,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IAC3C,IAAA,oBAAU,GAAE;8BACF,gBAAK;gDAAA;AAGhB;IADC,IAAA,gBAAM,GAAE;;kDACU;AAGnB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;2DACC;AAG5B;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC;;0DACX;AAG3B;IADC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,8BAAmB,EAAE,mBAAmB,CAAC,EAAE,CAAC,mBAAmB,CAAC,aAAa,CAAC;;2DACtD;AAG3C;IADC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,uBAAY,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BACxC,uBAAY;iDAAA;AAGxB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BACf,IAAI;IAEhB,+BAA+B;;iDAFf;AAIhB;IADC,IAAA,gBAAM,EAAC,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC;;6CACV;AAId;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC;;iDACpB;AAGlB;IADC,IAAA,gBAAM,GAAE;;6CACK;AAGd;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BAChB,IAAI;gDAAA;AAGf;IADC,IAAA,0BAAgB,GAAE;8BACR,IAAI;gDAAA;AAGf;IADC,IAAA,0BAAgB,GAAE;8BACR,IAAI;gDAAA;AAKf;IAHC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,gBAAI,EAAE;QACvB,QAAQ,EAAE,IAAI;KACf,CAAC;kDACO,gBAAI,oBAAJ,gBAAI;8CAAA;AAKb;IAHC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,gBAAI,EAAE;QACvB,QAAQ,EAAE,IAAI;KACf,CAAC;kDACO,gBAAI,oBAAJ,gBAAI;8CAAA;AArEF,aAAa;IAJzB,IAAA,gBAAM,GAAE;IACR,IAAA,eAAK,EAAC,qBAAqB,EAAE,CAAC,aAA4B,EAAE,EAAE,CAAC,CAAC,aAAa,CAAC,MAAM,EAAE,aAAa,CAAC,EAAE,CAAC,EAAE;QACxG,MAAM,EAAE,IAAI;KACb,CAAC;GACW,aAAa,CAsEzB;AAtEY,sCAAa"}
+{"version":3,"file":"daily-dispatch.js","sourceRoot":"","sources":["../../server/entities/daily-dispatch.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,qCASgB;AAEhB,yDAAgD;AAChD,iDAA8C;AAE9C,0CAAyF;AAMzF,IAAa,aAAa,GAA1B,MAAa,aAAa;CAqEzB,CAAA;AAnEC;IADC,IAAA,gCAAsB,EAAC,MAAM,CAAC;;yCACrB;AAGV;IADC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,cAAM,CAAC;kDAClB,cAAM,oBAAN,cAAM;6CAAA;AAGd;IADC,IAAA,gBAAM,GAAE;;2CACG;AAGZ;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;kDACR;AAGnB;IADC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,4BAAiB,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BACjD,4BAAiB;6CAAA;AAGzB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;qDACL;AAGtB;IADC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,gBAAK,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BAClC,gBAAK;gDAAA;AAGhB;IADC,IAAA,gBAAM,GAAE;;kDACU;AAGnB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;2DACC;AAG5B;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC;;0DACX;AAG3B;IADC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,8BAAmB,EAAE,mBAAmB,CAAC,EAAE,CAAC,mBAAmB,CAAC,aAAa,CAAC;;2DACtD;AAG3C;IADC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,uBAAY,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BACxC,uBAAY;iDAAA;AAGxB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BACf,IAAI;IAEhB,+BAA+B;;iDAFf;AAIhB;IADC,IAAA,gBAAM,EAAC,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC;;6CACV;AAId;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC;;iDACpB;AAGlB;IADC,IAAA,gBAAM,GAAE;;6CACK;AAGd;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BAChB,IAAI;gDAAA;AAGf;IADC,IAAA,0BAAgB,GAAE;8BACR,IAAI;gDAAA;AAGf;IADC,IAAA,0BAAgB,GAAE;8BACR,IAAI;gDAAA;AAKf;IAHC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,gBAAI,EAAE;QACvB,QAAQ,EAAE,IAAI;KACf,CAAC;kDACO,gBAAI,oBAAJ,gBAAI;8CAAA;AAKb;IAHC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,gBAAI,EAAE;QACvB,QAAQ,EAAE,IAAI;KACf,CAAC;kDACO,gBAAI,oBAAJ,gBAAI;8CAAA;AApEF,aAAa;IAJzB,IAAA,gBAAM,GAAE;IACR,IAAA,eAAK,EAAC,qBAAqB,EAAE,CAAC,aAA4B,EAAE,EAAE,CAAC,CAAC,aAAa,CAAC,MAAM,EAAE,aAAa,CAAC,EAAE,CAAC,EAAE;QACxG,MAAM,EAAE,IAAI;KACb,CAAC;GACW,aAAa,CAqEzB;AArEY,sCAAa"}

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

@@ -12,7 +12,7 @@ exports.updateDailyDispatch = {
         });
         let foundDailyDispatchDetails = dailyDispatch.dailyDispatchDetails;
         foundDailyDispatchDetails = foundDailyDispatchDetails.map(record => {
-            const matchedDispatchDetail = dailyDispatchDetails.filter(dispatchDetail => dispatchDetail.name === record.name)[0];
+            const matchedDispatchDetail = dailyDispatchDetails.find(dispatchDetail => dispatchDetail.name === record.name);
             return Object.assign(Object.assign(Object.assign({}, record), matchedDispatchDetail), { updater: user });
         });
         await tx.getRepository(entities_1.DailyDispatchDetail).save(foundDailyDispatchDetails);

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":";;;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"}
+{"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,IAAI,CAC1D,cAAc,CAAC,EAAE,CAAC,cAAc,CAAC,IAAI,KAAK,MAAM,CAAC,IAAI,CACtD,CAAA;YAED,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/generate-daily-harvest.js

@@ -71,7 +71,7 @@ async function addPlantationInventory(domain, newDailyHarvest, block, user, tx)
             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);
+            await (0, utils_1.generateTransactionHistory)(existingFieldBunch, newDailyHarvest.id, newDailyHarvest.name, constants_1.TRANSACTION_TYPE.LOADING, newDailyHarvest.harvestDate, -newDailyHarvest.collectedBunch, 0, user, tx);
         }
     }
     else {
@@ -91,7 +91,7 @@ async function addPlantationInventory(domain, newDailyHarvest, block, user, tx)
             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);
+            await (0, utils_1.generateTransactionHistory)(plantationInventory, newDailyHarvest.id, newDailyHarvest.name, constants_1.TRANSACTION_TYPE.LOADING, newDailyHarvest.harvestDate, -newDailyHarvest.collectedBunch, 0, user, tx);
         }
     }
 }

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-loading/update-daily-loading.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updatePlantationInventory = exports.updateDailyLoadingDetail = exports.updateDailyLoading = void 0;
 const typeorm_1 = require("typeorm");
+const constants_1 = require("../../../constants");
 const entities_1 = require("../../../entities");
 const utils_1 = require("../../../utils");
 exports.updateDailyLoading = {
@@ -46,12 +47,14 @@ async function updateDailyLoadingDetail(domain, dailyLoading, dailyLoadingDetail
     // new row added in client side
     const newDailyLoadingDetail = dailyLoadingDetailPatches.filter(detail => detail.name === null);
     if ((existingDailyLoadingDetails === null || existingDailyLoadingDetails === void 0 ? void 0 : existingDailyLoadingDetails.length) > 0) {
-        updatedDailyLoadingDetails = await Promise.all(dailyLoadingDetails.map(async (record) => {
-            const foundDailyLoadingDetailPatch = dailyLoadingDetailPatches.find(detail => detail.name === record.name);
-            return Object.assign(Object.assign({}, record), { dailyLoading, truck: await truckRepo.findOne({ id: record.truck.id }), block: await blockRepo.findOne({ id: record.block.id }), ramp: await rampRepo.findOne({ id: record.ramp.id }), totalBunchLoaded: (foundDailyLoadingDetailPatch === null || foundDailyLoadingDetailPatch === void 0 ? void 0 : foundDailyLoadingDetailPatch.totalBunchLoaded) || 0, totalBunchWeight: (foundDailyLoadingDetailPatch === null || foundDailyLoadingDetailPatch === void 0 ? void 0 : foundDailyLoadingDetailPatch.totalBunchWeight) || 0, remark: (foundDailyLoadingDetailPatch === null || foundDailyLoadingDetailPatch === void 0 ? void 0 : foundDailyLoadingDetailPatch.remark) || null, updater: user });
+        updatedDailyLoadingDetails = await Promise.all(dailyLoadingDetails.map(async (existingRecord) => {
+            const foundDailyLoadingDetailPatch = dailyLoadingDetailPatches.find(detail => detail.name === existingRecord.name);
+            if (foundDailyLoadingDetailPatch.totalBunchWeight !== existingRecord.totalBunchWeight) {
+                await updatePlantationInventory(domain, dailyLoading, foundDailyLoadingDetailPatch, existingRecord, user, tx);
+            }
+            return Object.assign(Object.assign({}, existingRecord), { dailyLoading, truck: await truckRepo.findOne({ id: existingRecord.truck.id }), block: await blockRepo.findOne({ id: existingRecord.block.id }), ramp: await rampRepo.findOne({ id: existingRecord.ramp.id }), totalBunchLoaded: (foundDailyLoadingDetailPatch === null || foundDailyLoadingDetailPatch === void 0 ? void 0 : foundDailyLoadingDetailPatch.totalBunchLoaded) || 0, totalBunchWeight: (foundDailyLoadingDetailPatch === null || foundDailyLoadingDetailPatch === void 0 ? void 0 : foundDailyLoadingDetailPatch.totalBunchWeight) || 0, remark: (foundDailyLoadingDetailPatch === null || foundDailyLoadingDetailPatch === void 0 ? void 0 : foundDailyLoadingDetailPatch.remark) || null, updater: user });
         }));
         updatedDailyLoadingDetails = await dailyLoadingDetailRepo.save(updatedDailyLoadingDetails);
-        // await updatePlantationInventory(domain, dailyLoading, updatedDailyLoadingDetails, user, tx)
     }
     if ((newDailyLoadingDetail === null || newDailyLoadingDetail === void 0 ? void 0 : newDailyLoadingDetail.length) > 0) {
         await Promise.all(newDailyLoadingDetail.map(async (dailyLoadingDetail) => {
@@ -71,9 +74,19 @@ async function updateDailyLoadingDetail(domain, dailyLoading, dailyLoadingDetail
     }
 }
 exports.updateDailyLoadingDetail = updateDailyLoadingDetail;
-async function updatePlantationInventory(domain, dailyLoading, updatedDailyLoadingDetails, user, tx) {
+async function updatePlantationInventory(domain, dailyLoading, foundDailyLoadingDetailPatch, existingRecord, user, tx) {
     const plantationInvRepo = (tx === null || tx === void 0 ? void 0 : tx.getRepository(entities_1.PlantationInventory)) || (0, typeorm_1.getRepository)(entities_1.PlantationInventory);
-    const rampRepo = (tx === null || tx === void 0 ? void 0 : tx.getRepository(entities_1.Ramp)) || (0, typeorm_1.getRepository)(entities_1.Ramp);
+    let existingRampTonnage = await plantationInvRepo.findOne({
+        where: { domain, type: constants_1.INVENTORY_TYPE.RAMP_TONNAGE, ramp: existingRecord.ramp },
+        relations: ['domain', 'block', 'ramp']
+    });
+    if (existingRampTonnage) {
+        const tonnageChanges = foundDailyLoadingDetailPatch.totalBunchWeight - existingRecord.totalBunchWeight;
+        existingRampTonnage.totalTonnage = existingRampTonnage.totalTonnage + tonnageChanges;
+        existingRampTonnage.updater = user;
+        await plantationInvRepo.save(existingRampTonnage);
+        await (0, utils_1.generateTransactionHistory)(existingRampTonnage, dailyLoading.id, dailyLoading.name, constants_1.TRANSACTION_TYPE.LOADING_ADJUSTMENT, dailyLoading.loadingDate, 0, tonnageChanges, user, tx);
+    }
 }
 exports.updatePlantationInventory = updatePlantationInventory;
 //# sourceMappingURL=update-daily-loading.js.map

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

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

package/dist-server/graphql/resolvers/dashboard/dashboard-query.js

@@ -1,7 +1,6 @@
 "use strict";
-// import { EntityManager } from 'typeorm'
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Query = void 0;
+exports.getDailyProductionData = exports.Query = void 0;
 // import { buildQuery, ListParam } from '@things-factory/shell'
 exports.Query = {
     /**
@@ -10,46 +9,34 @@ exports.Query = {
      * @returns tonnage data with its sorted date
      */
     async monthlyTonnageProductions(_, { blockId, yearAndMonth }, context) {
-        if (blockId == 'ALL_BLOCKS') {
-            // should remove block filter
-            // 'ALL_BLOCKS' was hardcoded from dashboard
-        }
-        const year = yearAndMonth.substring(0, 4);
-        const month = yearAndMonth.substring(4);
-        let data = [];
-        for (let i = 1, l = new Date(Number(year), Number(month), 0).getDate(); i <= l; i++) {
-            let theDate = new Date(`${year}-${month}-${i}`);
-            theDate.setHours(8, 0, 0, 0);
-            data.push({
-                blockId,
-                tonnage: Math.floor(Math.random() * 1000) + 200,
-                year,
-                month,
-                date: theDate.toLocaleString('default', { day: '2-digit', month: 'short' })
+        try {
+            const { tx } = context.state;
+            const year = parseInt(yearAndMonth.substring(0, 4));
+            const month = parseInt(yearAndMonth.substring(4));
+            let data = await getDailyProductionData(blockId, year, month, tx);
+            let result = [];
+            result = data.map(itm => {
+                return Object.assign(Object.assign({}, itm), { blockId, tonnage: itm.todayWeightCollected, year: itm.dateDay.getFullYear(), month: itm.dateDay.getMonth(), date: itm.dateDay.toLocaleString('default', { day: '2-digit', month: 'short' }) });
             });
+            return result;
+        }
+        catch (ex) {
         }
-        return data.sort((a, b) => (a.date > b.date ? 1 : -1));
     },
     async monthlyYields(_, { blockId, yearAndMonth }, context) {
-        if (blockId == 'ALL_BLOCKS') {
-            // should remove block filter
-            // 'ALL_BLOCKS' was hardcoded from dashboard
-        }
-        const year = yearAndMonth.substring(0, 4);
-        const month = yearAndMonth.substring(4);
-        let data = [];
-        for (let i = 1, l = new Date(Number(year), Number(month), 0).getDate(); i <= l; i++) {
-            let theDate = new Date(`${year}-${month}-${i}`);
-            theDate.setHours(8, 0, 0, 0);
-            data.push({
-                blockId,
-                yield: Math.floor(Math.random() * 1000) + 200,
-                year,
-                month,
-                date: theDate.toLocaleString('default', { day: '2-digit', month: 'short' })
+        try {
+            const { tx } = context.state;
+            const year = parseInt(yearAndMonth.substring(0, 4));
+            const month = parseInt(yearAndMonth.substring(4));
+            let data = await getDailyProductionData(blockId, year, month, tx);
+            let result = [];
+            result = data.map(itm => {
+                return Object.assign(Object.assign({}, itm), { blockId, yield: (itm.todayHectareCover != 0 ? itm.todayWeightCollected / itm.todayHectareCover : 0).toFixed(4), year: itm.dateDay.getFullYear(), month: itm.dateDay.getMonth(), date: itm.dateDay.toLocaleString('default', { day: '2-digit', month: 'short' }) });
             });
+            return result;
+        }
+        catch (ex) {
         }
-        return data.sort((a, b) => (a.date > b.date ? 1 : -1));
     },
     async weeklyBunchesCount(_, { targetDate }, context) {
         if (!targetDate || targetDate == '')
@@ -58,8 +45,10 @@ exports.Query = {
         for (let i = 0; i < 7; i++) {
             bunchesCount.push({
                 date: new Date(targetDate).toLocaleString('default', { day: '2-digit', month: 'short' }),
-                harvestedCount: Math.floor(Math.random() * 1000) + 500,
-                collectedCount: Math.floor(Math.random() * 500) + 50
+                harvestedCount: 0,
+                collectedCount: 0
+                // harvestedCount: Math.floor(Math.random() * 1000) + 500,
+                // collectedCount: Math.floor(Math.random() * 500) + 50
             });
             targetDate.setDate(targetDate.getDate() - 1);
         }
@@ -67,16 +56,149 @@ exports.Query = {
     },
     async tonnageAndBunchesInventories(_, { something }, context) {
         return {
-            bunches: Math.floor(Math.random() * 10000) + 500,
-            tonnage: Math.floor(Math.random() * 10000) + 500
+            bunches: 0,
+            tonnage: 0
+            // bunches: Math.floor(Math.random() * 10000) + 500,
+            // tonnage: Math.floor(Math.random() * 10000) + 500
         };
     },
     async productionsOverview(_, { something }, context) {
         return {
-            averageBunchWeight: Math.floor(Math.random() * 150) + 70,
-            bunchesCount: Math.floor(Math.random() * 10000) + 500,
-            tonnageWeighed: Math.floor(Math.random() * 10000) + 500
+            averageBunchWeight: 0,
+            bunchesCount: 0,
+            tonnageWeighed: 0,
+            // averageBunchWeight: Math.floor(Math.random() * 150) + 70,
+            // bunchesCount: Math.floor(Math.random() * 10000) + 500,
+            // tonnageWeighed: Math.floor(Math.random() * 10000) + 500
         };
     }
 };
+async function getDailyProductionData(blockId, year, month, tx) {
+    await tx.query(`
+    CREATE TEMP TABLE temp_blocks on commit drop AS (
+      WITH RECURSIVE b AS (   
+        SELECT b.id AS block_id, * FROM blocks b 
+        WHERE b.deleted_at IS null
+        UNION ALL
+        SELECT b.id AS block_id, cb.* FROM blocks cb
+        INNER JOIN b ON b.id = cb.parent_block_id
+        WHERE cb.deleted_at IS null
+      )
+      SELECT block_id, id, name FROM b 
+      ${blockId != 'all-blocks' && blockId != '' ? `WHERE block_id = '${blockId}' or id = '${blockId}'` : ``}
+      GROUP BY block_id, id, name 
+      ORDER BY block_id, id, name 
+    );
+  `);
+    let fromDate = new Date(year, month - 1, 1);
+    let toDate = new Date(year, month, 1);
+    toDate.setDate(toDate.getDate() - 1);
+    let fromDateString = [
+        fromDate.getFullYear().toString(),
+        String(fromDate.getMonth() + 1).padStart(2, '0'),
+        '01'
+    ].join('-');
+    let toDateString = [
+        toDate.getFullYear().toString(),
+        String(toDate.getMonth() + 1).padStart(2, '0'),
+        String(toDate.getDate()).padStart(2, '0')
+    ].join('-');
+    await tx.query(`
+    CREATE TEMP TABLE temp_records on commit drop AS (	
+      select blk.block_id, coalesce(sum(field_bunches),0) AS today_field_bunches, 
+      round(coalesce(sum(ramp_weight),0)::numeric,4) AS today_ramp_weight,
+      sum(case when transaction_type = 'HARVEST' OR transaction_type = 'BUNCHES_ADJUSTMENT' then field_bunches else 0 end) as today_bunch_harvest,
+      sum(case when transaction_type = 'LOADING' OR transaction_type = 'LOADING_ADJUSTMENT' then -field_bunches else 0 end) as today_bunch_collected,
+      round(sum(case when transaction_type = 'LOADING' OR transaction_type = 'LOADING_ADJUSTMENT' then ramp_weight else 0 end)::numeric,4) as today_ramp_weight_collected,
+      round(sum(case when transaction_type = 'DISPATCHMENT' OR transaction_type = 'DISPATCHMENT_ADJUSTMENT' then -ramp_weight else 0 end)::numeric,4) as today_weight_dispatch,	  
+      transaction_date
+      from record_transactions t2
+      inner join temp_blocks blk on blk.id = t2.block_id
+      where transaction_date <= $1
+      group by blk.block_id, transaction_date
+    )
+  `, [toDateString]);
+    await tx.query(`
+    create temp table temp_daily_production_data on commit drop as (
+      select *,
+      prev_bunch_bal_in_field + today_bunch_harvest as today_bunch_in_field,
+      prev_bunch_bal_in_field + today_bunch_harvest - today_bunch_collected as today_bunch_bal_in_field,
+      prev_weight_bal_in_ramp + today_ramp_weight_collected - today_weight_dispatch as today_weight_bal_in_ramp FROM (
+        select md.dateDay as date_day,
+        coalesce(
+        (
+          select sum(today_field_bunches) from temp_records t2 
+          where transaction_date::timestamp < md.dateDay
+        )
+        , 0) as prev_bunch_bal_in_field,
+        coalesce(
+        (
+          select sum(today_ramp_weight) from temp_records t2 
+          where transaction_date::timestamp < md.dateDay
+        )
+        , 0) as prev_weight_bal_in_ramp,
+        coalesce(today_bunch_harvest, 0) as today_bunch_harvest,
+        coalesce(sum(today_bunch_harvest) over (order by dateDay asc rows between unbounded preceding and current row), 0) as to_date_bunch_harvest,
+        coalesce(today_bunch_collected, 0) as today_bunch_collected, 
+        coalesce(sum(today_bunch_collected) over (order by dateDay asc rows between unbounded preceding and current row), 0) as to_date_bunch_collected,
+        coalesce(today_ramp_weight_collected, 0) as today_ramp_weight_collected, 
+        coalesce(sum(today_ramp_weight_collected) over (order by dateDay asc rows between unbounded preceding and current row), 0) as to_date_ramp_weight_collected,
+        coalesce(today_weight_dispatch, 0) as today_weight_dispatch, 
+        coalesce(sum(today_weight_dispatch) over (order by dateDay asc rows between unbounded preceding and current row), 0) as to_date_weight_dispatch,
+        coalesce(tot.today_out_turn, 0) as today_out_turn,
+        coalesce(sum(tot.today_out_turn) over (order by dateDay asc rows between unbounded preceding and current row), 0) as to_date_out_turn,
+        ${blockId != 'all-blocks' && blockId != '' ? `(select name from blocks b2 WHERE id = '${blockId}')` : `''`} as block,
+        coalesce(thr.today_harvesting_round, 0) as today_harvesting_round,
+        coalesce(thr.today_hectare_cover, 0) as today_hectare_cover
+        from 
+        (select generate_series((date '${fromDateString}')::timestamp, (date '${toDateString}')::timestamp, interval '1 day')::date as dateDay) as md 
+        left join (
+          select * from temp_records trx
+          where transaction_date between $1 and $2 
+          order by transaction_date
+        ) as dt on dt.transaction_date::date = md.dateDay
+        LEFT JOIN (
+          select sum(harvesting_round) AS today_harvesting_round, sum(coverage) AS today_hectare_cover, harvest_date 
+          from daily_harvests dh 
+          inner join temp_blocks blk on blk.id = dh.block_id
+          where harvest_date between $1 and $2
+          group by blk.block_id, harvest_date
+        ) as thr ON thr.harvest_date::date = md.dateDay
+        LEFT JOIN (
+          select count(*) AS today_out_turn, dh.harvest_date 
+          from daily_harvest_details dhd 
+          inner join daily_harvests dh on dh.id = dhd.daily_harvest_id
+          inner join temp_blocks blk on blk.id = dh.block_id
+          where dh.harvest_date between $1 and $2
+          GROUP BY blk.block_id, dh.harvest_date
+        ) as tot ON tot.harvest_date::date = md.dateDay
+      ) dt
+    )`, [fromDateString, toDateString]);
+    const result = await tx.query(`
+    select * from temp_daily_production_data dt
+  `);
+    return result.map(itm => {
+        return {
+            block: itm.block,
+            dateDay: itm.date_day,
+            diffInBunches: parseFloat(itm.diff_in_bunches).toFixed(1),
+            prevBunchBalInField: parseFloat(itm.prev_bunch_bal_in_field).toFixed(1),
+            prevWeightBalInRamp: parseFloat(itm.prev_weight_bal_in_ramp).toFixed(4),
+            toDateBunchHarvest: parseFloat(itm.to_date_bunch_harvest).toFixed(1),
+            toDateOutTurn: itm.to_date_out_turn,
+            toDateWeightDispatch: parseFloat(itm.to_date_weight_dispatch).toFixed(4),
+            todayBunchBalInField: parseFloat(itm.today_bunch_bal_in_field).toFixed(1),
+            todayBunchCollected: parseFloat(itm.today_bunch_collected).toFixed(1),
+            todayBunchHarvest: parseFloat(itm.today_bunch_harvest).toFixed(1),
+            todayBunchInField: parseFloat(itm.today_bunch_in_field).toFixed(1),
+            todayHarvestingRound: itm.today_harvesting_round,
+            todayHectareCover: parseFloat(itm.today_hectare_cover).toFixed(4),
+            todayOutTurn: itm.today_out_turn,
+            todayWeightCollected: parseFloat(itm.today_ramp_weight_collected).toFixed(4),
+            todayWeightBalInRamp: parseFloat(itm.today_weight_bal_in_ramp).toFixed(4),
+            todayWeightDispatch: parseFloat(itm.today_weight_dispatch).toFixed(4),
+        };
+    });
+}
+exports.getDailyProductionData = getDailyProductionData;
 //# sourceMappingURL=dashboard-query.js.map

package/dist-server/graphql/resolvers/dashboard/dashboard-query.js.map

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

package/dist-server/graphql/resolvers/report/daily-ffb-dispatch-production-reports.js

@@ -0,0 +1,111 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.dailyFfbDispatchProductionReports = void 0;
+const typeorm_1 = require("typeorm");
+const entities_1 = require("../../../entities");
+exports.dailyFfbDispatchProductionReports = {
+    async dailyFfbDispatchProductionReports(_, params, context) {
+        try {
+            const { domain, tx } = context.state;
+            let year = parseInt(params.filters.filter(x => x.name == 'month')[0].value.split('-')[0]);
+            let month = parseInt(params.filters.filter(x => x.name == 'month')[0].value.split('-')[1]);
+            let fromDate = new Date(year, month - 1, 1);
+            let toDate = new Date(year, month, 1);
+            toDate.setDate(toDate.getDate() - 1);
+            let fromDateString = [
+                fromDate.getFullYear().toString(),
+                String(fromDate.getMonth() + 1).padStart(2, '0'),
+                '01'
+            ].join('-');
+            let toDateString = [
+                toDate.getFullYear().toString(),
+                String(toDate.getMonth() + 1).padStart(2, '0'),
+                String(toDate.getDate()).padStart(2, '0')
+            ].join('-');
+            let ramps = await (0, typeorm_1.getRepository)(entities_1.Ramp).find({
+                where: { domain: domain.id, deletedAt: (0, typeorm_1.IsNull)() },
+                relations: ['block']
+            });
+            let organizations = await (0, typeorm_1.getRepository)(entities_1.Organization).find({
+                where: { domain: domain.id, deletedAt: (0, typeorm_1.IsNull)() }
+            });
+            let blocks = await tx.getRepository(entities_1.Block).query(`
+        SELECT b.id, b.name FROM ramps r
+        INNER JOIN blocks b ON b.id = r.block_id 
+        WHERE b.deleted_at IS NULL
+        AND r.domain_id = $1
+        GROUP BY b.id, b.name         
+      `, [domain.id]);
+            // --  WHERE dd.dispatch_at::timestamp between $1::timestamp and $2::timestamp
+            // [fromDateString, toDateString]
+            await tx.query(`create extension if not exists tablefunc`);
+            await tx.query(`
+          CREATE TEMP TABLE raw_block_dispatch ON COMMIT DROP AS (
+            SELECT "name", "dispatch_at", sum(weight) AS weight	FROM(
+              SELECT * FROM (
+                SELECT dd.id,COALESCE(b.name, 'unknown') AS name, 1 AS "rank", dd.dispatch_at::date AS dispatch_at,
+                COALESCE(ddd.adjusted_weight, ddd.collected_ramp_weight, 0) AS weight
+                FROM daily_dispatches dd 
+                INNER JOIN daily_dispatch_details ddd ON ddd.daily_dispatch_id = dd.id
+                INNER JOIN ramps r ON r.id = ddd.ramp_id 
+                INNER JOIN blocks b ON b.id = r.block_id
+                WHERE dd.dispatch_at::date between $1 and $2
+                UNION
+                SELECT dd.id, COALESCE(c.name, 'unknown') AS name, CASE WHEN c.name IS NULL THEN 3 ELSE 2 END AS "rank", dd.dispatch_at::date AS dispatch_at,
+                COALESCE((SELECT SUM(COALESCE(ddd.adjusted_weight, ddd.collected_ramp_weight, 0)) FROM daily_dispatch_details ddd WHERE ddd.daily_dispatch_id = dd.id),0) AS weight	
+                FROM daily_dispatches dd 
+                LEFT JOIN organizations c ON c.id = dd.dispatch_to_id
+                WHERE dd.dispatch_at::date between $1 and $2
+              ) foo 
+              ORDER BY "rank", "name", "dispatch_at"
+            ) foo
+            GROUP BY "name", "dispatch_at"
+            ORDER BY name, "dispatch_at"
+          )          
+        `, [fromDateString, toDateString]);
+            await tx.query(`
+          CREATE TEMP TABLE pivot_block_dispatch ON COMMIT DROP AS (
+            SELECT * FROM crosstab(
+              $$
+                SELECT rbd."dispatch_at",  rbd."name",
+                CONCAT('today: ', round(rbd.weight,2)::varchar, ' | todate: ', round(coalesce(sum(rbd.weight) over (PARTITION BY "name" ORDER BY name, dispatch_at asc rows between unbounded preceding and current row), 0),2)::varchar) AS weight
+                FROM raw_block_dispatch rbd
+                ORDER BY rbd."dispatch_at",  rbd."name"
+              $$,
+              $$
+                SELECT b.name FROM ramps r INNER JOIN blocks b ON b.id = r.block_id WHERE r.deleted_at IS NULL AND r.domain_id = '${domain.id}' 
+                GROUP BY b.id, b.name
+                UNION
+                SELECT c.name FROM organizations c
+              $$
+            ) AS (dispatch_at date, ${[...blocks.map(block => `"${block.name}" varchar`), ...organizations.map(organization => `"${organization.name}" varchar`)].join(',')},"unknown" varchar)
+          );
+        `);
+            await tx.query(`
+          CREATE TEMP TABLE temp_monthly_production_data ON COMMIT DROP AS (
+            SELECT TO_CHAR(md.dateDay:: DATE, 'dd/mm/yyyy') as "date"
+            , row_to_json((SELECT d FROM (SELECT ${[...blocks.map(block => `pbd."${block.name}"`), ...organizations.map(organization => `pbd."${organization.name}"`)].join(',')}, pbd."unknown") d))::varchar as "blockData"
+            , (SELECT sum(weight) FROM raw_block_dispatch rbd WHERE rbd.dispatch_at = pbd.dispatch_at) AS "today"
+            FROM (select generate_series((date '${fromDateString}')::timestamp, (date '${toDateString}')::timestamp, interval '1 day')::date as dateDay) as md 
+            LEFT JOIN pivot_block_dispatch pbd on pbd.dispatch_at::date = md.dateDay
+          );
+        `);
+            const result = await tx.query(`
+          select "date", "blockData", "today"
+          from temp_monthly_production_data dt
+        `);
+            const total = await tx.query(`
+          select count(*) from temp_monthly_production_data
+        `);
+            return {
+                items: result.map(itm => {
+                    return Object.assign({}, itm);
+                }), total: total[0].count
+            };
+        }
+        catch (error) {
+            throw error;
+        }
+    }
+};
+//# sourceMappingURL=daily-ffb-dispatch-production-reports.js.map