@things-factory/operato-pms 3.8.0 → 3.8.13

package/dist-server/graphql/resolvers/plantation-setting/delete-plantation-settings.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.deletePlantationSettings = void 0;
+const typeorm_1 = require("typeorm");
+const entities_1 = require("../../../entities");
+exports.deletePlantationSettings = {
+    async deletePlantationSettings(_, { names }, context) {
+        const { domain, user } = context.state;
+        await (0, typeorm_1.getRepository)(entities_1.PlantationSetting).delete({
+            domain,
+            name: (0, typeorm_1.In)(names)
+        });
+        return true;
+    }
+};
+//# sourceMappingURL=delete-plantation-settings.js.map

package/dist-server/graphql/resolvers/plantation-setting/delete-plantation-settings.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"delete-plantation-settings.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/plantation-setting/delete-plantation-settings.ts"],"names":[],"mappings":";;;AAAA,qCAA2C;AAC3C,gDAAqD;AAExC,QAAA,wBAAwB,GAAG;IACtC,KAAK,CAAC,wBAAwB,CAAC,CAAM,EAAE,EAAE,KAAK,EAAE,EAAE,OAAY;QAC5D,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;QAEtC,MAAM,IAAA,uBAAa,EAAC,4BAAiB,CAAC,CAAC,MAAM,CAAC;YAC1C,MAAM;YACN,IAAI,EAAE,IAAA,YAAE,EAAC,KAAK,CAAC;SAClB,CAAC,CAAA;QAEF,OAAO,IAAI,CAAA;IACb,CAAC;CACF,CAAA"}

package/dist-server/graphql/resolvers/plantation-setting/index.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PlantationSettingResolver = void 0;
+const plantation_setting_query_1 = require("./plantation-setting-query");
+const update_plantation_setting_1 = require("./update-plantation-setting");
+const update_multiple_plantation_setting_1 = require("./update-multiple-plantation-setting");
+const create_plantation_setting_1 = require("./create-plantation-setting");
+const delete_plantation_setting_1 = require("./delete-plantation-setting");
+const delete_plantation_settings_1 = require("./delete-plantation-settings");
+exports.PlantationSettingResolver = {
+    PlantationSetting: plantation_setting_query_1.PlantationSetting,
+    Query: plantation_setting_query_1.Query,
+    Mutation: Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, update_plantation_setting_1.updatePlantationSetting), update_multiple_plantation_setting_1.updateMultiplePlantationSetting), create_plantation_setting_1.createPlantationSetting), delete_plantation_setting_1.deletePlantationSetting), delete_plantation_settings_1.deletePlantationSettings)
+};
+//# sourceMappingURL=index.js.map

package/dist-server/graphql/resolvers/plantation-setting/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/plantation-setting/index.ts"],"names":[],"mappings":";;;AAAA,yEAAqE;AAErE,2EAAqE;AACrE,6FAAsF;AACtF,2EAAqE;AACrE,2EAAqE;AACrE,6EAAuE;AAE1D,QAAA,yBAAyB,GAAG;IACvC,iBAAiB,EAAjB,4CAAiB;IACjB,KAAK,EAAL,gCAAK;IACL,QAAQ,4EACH,mDAAuB,GACvB,oEAA+B,GAC/B,mDAAuB,GACvB,mDAAuB,GACvB,qDAAwB,CAC5B;CACF,CAAA"}

package/dist-server/graphql/resolvers/plantation-setting/plantation-setting-query.js

@@ -0,0 +1,33 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PlantationSetting = exports.Query = void 0;
+const typeorm_1 = require("typeorm");
+const shell_1 = require("@things-factory/shell");
+const auth_base_1 = require("@things-factory/auth-base");
+const entities_1 = require("../../../entities");
+exports.Query = {
+    async plantationSetting(_, { name }, context) {
+        const { domain, user } = context.state;
+        const repository = (0, typeorm_1.getRepository)(entities_1.PlantationSetting);
+        return await repository.findOne({
+            where: { domain, name }
+        });
+    },
+    async plantationSettings(_, params, context) {
+        const convertedParams = (0, shell_1.convertListParams)(params);
+        const [items, total] = await (0, typeorm_1.getRepository)(entities_1.PlantationSetting).findAndCount(Object.assign({}, convertedParams));
+        return { items, total };
+    }
+};
+exports.PlantationSetting = {
+    async domain(plantationSetting) {
+        return await (0, typeorm_1.getRepository)(shell_1.Domain).findOne(plantationSetting.domainId);
+    },
+    async creator(plantationSetting) {
+        return await (0, typeorm_1.getRepository)(auth_base_1.User).findOne(plantationSetting.creatorId);
+    },
+    async updater(plantationSetting) {
+        return await (0, typeorm_1.getRepository)(auth_base_1.User).findOne(plantationSetting.updaterId);
+    }
+};
+//# sourceMappingURL=plantation-setting-query.js.map

package/dist-server/graphql/resolvers/plantation-setting/plantation-setting-query.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"plantation-setting-query.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/plantation-setting/plantation-setting-query.ts"],"names":[],"mappings":";;;AAAA,qCAAuC;AACvC,iDAA4E;AAC5E,yDAAgD;AAChD,gDAAgF;AAEnE,QAAA,KAAK,GAAG;IACnB,KAAK,CAAC,iBAAiB,CAAC,CAAM,EAAE,EAAE,IAAI,EAAE,EAAE,OAAY;QACpD,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;QACtC,MAAM,UAAU,GAAG,IAAA,uBAAa,EAAC,4BAAuB,CAAC,CAAA;QAEzD,OAAO,MAAM,UAAU,CAAC,OAAO,CAAC;YAC9B,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE;SACxB,CAAC,CAAA;IACJ,CAAC;IAED,KAAK,CAAC,kBAAkB,CAAC,CAAM,EAAE,MAAiB,EAAE,OAAY;QAC9D,MAAM,eAAe,GAAG,IAAA,yBAAiB,EAAC,MAAM,CAAC,CAAA;QACjD,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,MAAM,IAAA,uBAAa,EAAC,4BAAuB,CAAC,CAAC,YAAY,mBAC3E,eAAe,EAClB,CAAA;QAEF,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,CAAA;IACzB,CAAC;CACF,CAAA;AAEY,QAAA,iBAAiB,GAAG;IAC/B,KAAK,CAAC,MAAM,CAAC,iBAAiB;QAC5B,OAAO,MAAM,IAAA,uBAAa,EAAC,cAAM,CAAC,CAAC,OAAO,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAA;IACxE,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,iBAAiB;QAC7B,OAAO,MAAM,IAAA,uBAAa,EAAC,gBAAI,CAAC,CAAC,OAAO,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAA;IACvE,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,iBAAiB;QAC7B,OAAO,MAAM,IAAA,uBAAa,EAAC,gBAAI,CAAC,CAAC,OAAO,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAA;IACvE,CAAC;CACF,CAAA"}

package/dist-server/graphql/resolvers/plantation-setting/update-multiple-plantation-setting.js

@@ -0,0 +1,31 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.updateMultiplePlantationSetting = void 0;
+const typeorm_1 = require("typeorm");
+const entities_1 = require("../../../entities");
+exports.updateMultiplePlantationSetting = {
+    async updateMultiplePlantationSetting(_, { patches }, context) {
+        const { domain, user } = context.state;
+        let results = [];
+        const _createRecords = patches.filter((patch) => patch.cuFlag.toUpperCase() === '+');
+        const _updateRecords = patches.filter((patch) => patch.cuFlag.toUpperCase() === 'M');
+        const plantationSettingRepo = (0, typeorm_1.getRepository)(entities_1.PlantationSetting);
+        if (_createRecords.length > 0) {
+            for (let i = 0; i < _createRecords.length; i++) {
+                const newRecord = _createRecords[i];
+                const result = await plantationSettingRepo.save(Object.assign(Object.assign({}, newRecord), { domain: domain, creator: user, updater: user }));
+                results.push(Object.assign(Object.assign({}, result), { cuFlag: '+' }));
+            }
+        }
+        if (_updateRecords.length > 0) {
+            for (let i = 0; i < _updateRecords.length; i++) {
+                const newRecord = _updateRecords[i];
+                const plantationSetting = await plantationSettingRepo.findOne({ domain, id: newRecord.id });
+                const result = await plantationSettingRepo.save(Object.assign(Object.assign(Object.assign({}, plantationSetting), newRecord), { updater: user }));
+                results.push(Object.assign(Object.assign({}, result), { cuFlag: 'M' }));
+            }
+        }
+        return results;
+    }
+};
+//# sourceMappingURL=update-multiple-plantation-setting.js.map

package/dist-server/graphql/resolvers/plantation-setting/update-multiple-plantation-setting.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"update-multiple-plantation-setting.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/plantation-setting/update-multiple-plantation-setting.ts"],"names":[],"mappings":";;;AAAA,qCAAuC;AACvC,gDAAqD;AAExC,QAAA,+BAA+B,GAAG;IAC7C,KAAK,CAAC,+BAA+B,CAAC,CAAM,EAAE,EAAE,OAAO,EAAE,EAAE,OAAY;QACrE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;QAEtC,IAAI,OAAO,GAAG,EAAE,CAAA;QAChB,MAAM,cAAc,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,KAAU,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,WAAW,EAAE,KAAK,GAAG,CAAC,CAAA;QACzF,MAAM,cAAc,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,KAAU,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,WAAW,EAAE,KAAK,GAAG,CAAC,CAAA;QACzF,MAAM,qBAAqB,GAAG,IAAA,uBAAa,EAAC,4BAAiB,CAAC,CAAA;QAE9D,IAAI,cAAc,CAAC,MAAM,GAAG,CAAC,EAAE;YAC3B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,cAAc,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;gBAC9C,MAAM,SAAS,GAAG,cAAc,CAAC,CAAC,CAAC,CAAA;gBAEnC,MAAM,MAAM,GAAG,MAAM,qBAAqB,CAAC,IAAI,iCAC1C,SAAS,KACZ,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,IAAI,EACb,OAAO,EAAE,IAAI,IACb,CAAA;gBAEF,OAAO,CAAC,IAAI,iCAAM,MAAM,KAAE,MAAM,EAAE,GAAG,IAAG,CAAA;aACzC;SACJ;QAED,IAAI,cAAc,CAAC,MAAM,GAAG,CAAC,EAAE;YAC3B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,cAAc,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;gBAC9C,MAAM,SAAS,GAAG,cAAc,CAAC,CAAC,CAAC,CAAA;gBACnC,MAAM,iBAAiB,GAAG,MAAM,qBAAqB,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,SAAS,CAAC,EAAE,EAAC,CAAC,CAAA;gBAE1F,MAAM,MAAM,GAAG,MAAM,qBAAqB,CAAC,IAAI,+CAC1C,iBAAiB,GACjB,SAAS,KACZ,OAAO,EAAE,IAAI,IACb,CAAA;gBAEF,OAAO,CAAC,IAAI,iCAAM,MAAM,KAAE,MAAM,EAAE,GAAG,IAAG,CAAA;aACzC;SACJ;QAED,OAAO,OAAO,CAAA;IAChB,CAAC;CACF,CAAA"}

package/dist-server/graphql/resolvers/plantation-setting/update-plantation-setting.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.updatePlantationSetting = void 0;
+const typeorm_1 = require("typeorm");
+const entities_1 = require("../../../entities");
+exports.updatePlantationSetting = {
+    async updatePlantationSetting(_, { name, patch }, context) {
+        const { domain, user } = context.state;
+        const repository = (0, typeorm_1.getRepository)(entities_1.PlantationSetting);
+        const plantationSetting = await repository.findOne({
+            where: { domain, name }
+        });
+        return await repository.save(Object.assign(Object.assign(Object.assign({}, plantationSetting), patch), { updater: user }));
+    }
+};
+//# sourceMappingURL=update-plantation-setting.js.map

package/dist-server/graphql/resolvers/plantation-setting/update-plantation-setting.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"update-plantation-setting.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/plantation-setting/update-plantation-setting.ts"],"names":[],"mappings":";;;AAAA,qCAAuC;AACvC,gDAAqD;AAExC,QAAA,uBAAuB,GAAG;IACrC,KAAK,CAAC,uBAAuB,CAAC,CAAM,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,OAAY;QACjE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;QAEtC,MAAM,UAAU,GAAG,IAAA,uBAAa,EAAC,4BAAiB,CAAC,CAAA;QACnD,MAAM,iBAAiB,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC;YACjD,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE;SACxB,CAAC,CAAA;QAEF,OAAO,MAAM,UAAU,CAAC,IAAI,+CACvB,iBAAiB,GACjB,KAAK,KACR,OAAO,EAAE,IAAI,IACb,CAAA;IACJ,CAAC;CACF,CAAA"}

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

@@ -25,22 +25,36 @@ exports.dailyProductionReports = {
                 .getRepository(entities_1.Block)
                 .findOneOrFail({ where: { id: params.filters.filter(x => x.name == 'block')[0].value } });
             await tx.query(`
-        CREATE TEMP TABLE temp_records AS (	
-          select block_id, coalesce(sum(field_bunches),0) AS today_field_bunches, 
-          coalesce(sum(ramp_weight),0) AS today_ramp_weight,
+        CREATE TEMP TABLE temp_blocks on commit drop AS (
+          WITH RECURSIVE b AS (   
+            SELECT $1::uuid as block_id, * FROM blocks b 
+            WHERE id = $1::uuid
+            AND b.deleted_at IS null
+            UNION ALL
+            SELECT $1::uuid as block_id, cb.* FROM blocks cb
+            INNER JOIN b ON b.id = cb.parent_block_id
+            WHERE cb.deleted_at IS null
+          )
+          SELECT * FROM b
+        );
+      `, [block.id]);
+            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' then field_bunches else 0 end) as today_bunch_harvest,
           sum(case when transaction_type = 'LOADING' then -field_bunches else 0 end) as today_bunch_collected,
-          sum(case when transaction_type = 'LOADING' then ramp_weight else 0 end) as today_ramp_weight_collected,
-          sum(case when transaction_type = 'DISPATCHMENT' then -ramp_weight else 0 end) as today_weight_dispatch,	  
+          round(sum(case when transaction_type = 'LOADING' then ramp_weight else 0 end)::numeric,4) as today_ramp_weight_collected,
+          round(sum(case when transaction_type = 'DISPATCHMENT' then -ramp_weight else 0 end)::numeric,4) as today_weight_dispatch,	  
           transaction_date
-          from record_transactions t2 
+          from record_transactions t2
+          inner join temp_blocks blk on blk.id = t2.block_id
           where transaction_date <= $1
-          and block_id = $2
-          group by block_id, transaction_date
+          group by blk.block_id, transaction_date
         )
-      `, [toDateString, block.id]);
+      `, [toDateString]);
             await tx.query(`
-          create temp table temp_daily_production_data as (
+          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,
@@ -79,48 +93,47 @@ exports.dailyProductionReports = {
                 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 
+                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
-                and block_id = $3
-                group by block_id, harvest_date
+                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 
+                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
-                and block_id = $3
-                GROUP BY dh.block_id, dh.harvest_date
+                GROUP BY blk.block_id, dh.harvest_date
               ) as tot ON tot.harvest_date::date = md.dateDay
             ) dt
           )`, [fromDateString, toDateString, block.id]);
             const result = await tx.query(`
             select * from temp_daily_production_data dt
-          `);
+      `);
             const total = await tx.query(`
           select count(*) from temp_daily_production_data
-          `);
-            await tx.query(`
-            drop table temp_daily_production_data, temp_records
-          `);
+      `);
             let items = result.map(itm => {
                 return {
                     block: itm.block,
                     dateDay: itm.date_day,
-                    diffInBunches: itm.diff_in_bunches,
-                    prevBunchBalInField: itm.prev_bunch_bal_in_field,
-                    prevWeightBalInRamp: itm.prev_weight_bal_in_ramp,
-                    toDateBunchHarvest: itm.to_date_bunch_harvest,
+                    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: itm.to_date_weight_dispatch,
-                    todayBunchBalInField: itm.today_bunch_bal_in_field,
-                    todayBunchCollected: itm.today_bunch_collected,
-                    todayBunchHarvest: itm.today_bunch_harvest,
-                    todayBunchInField: itm.today_bunch_in_field,
+                    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: itm.today_hectare_cover,
+                    todayHectareCover: parseFloat(itm.today_hectare_cover).toFixed(4),
                     todayOutTurn: itm.today_out_turn,
-                    todayWeightBalInRamp: itm.today_weight_bal_in_ramp,
-                    todayWeightDispatch: itm.today_weight_dispatch
+                    todayWeightBalInRamp: parseFloat(itm.today_weight_bal_in_ramp).toFixed(4),
+                    todayWeightDispatch: parseFloat(itm.today_weight_dispatch).toFixed(4)
                 };
             });
             return { items, total: total[0].count };

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

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

package/dist-server/graphql/resolvers/report/daily-staff-harvest-reports.js

@@ -25,30 +25,41 @@ exports.dailyStaffHarvestReports = {
                 .getRepository(entities_1.Block)
                 .findOneOrFail({ where: { id: params.filters.filter(x => x.name == 'block')[0].value } });
             await tx.query(`
-            create temp table temp_daily_staff_harvest_data as (
+        CREATE TEMP TABLE temp_blocks on commit drop AS (
+          WITH RECURSIVE b AS (   
+            SELECT $1::uuid as block_id, * FROM blocks b 
+            WHERE id = $1::uuid 
+            AND b.deleted_at IS null
+            UNION ALL
+            SELECT $1::uuid as block_id, cb.* FROM blocks cb
+            INNER JOIN b ON b.id = cb.parent_block_id
+            WHERE cb.deleted_at IS null
+          )
+          SELECT * FROM b
+        );
+      `, [block.id]);
+            await tx.query(`
+            create temp table temp_daily_staff_harvest_data on commit drop as (
               select "harvestDate"::varchar as "harvestDate", "blockName"::varchar, "staffName"::varchar, sum("totalBunchHarvested")::varchar as "totalBunchHarvested" from (
                 select dh.harvest_date::date as "harvestDate", b2."name" as "blockName", os."name" as "staffName",
                 dhd.total_bunch_harvested as "totalBunchHarvested"
                 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
                 inner join organization_staffs os on os.id = dhd.organization_staff_id 
-                inner join blocks b2 on b2.id = dh.block_id
-                where dh.block_id = $1
-                and dh.harvest_date::date between $2 and $3
+                inner join blocks b2 on b2.id = blk.block_id
+                where dh.harvest_date::date between $1 and $2
               ) as dt
               group by "harvestDate", "blockName", "staffName"
               order by "staffName", "harvestDate"
             )
-          `, [block.id, fromDateString, toDateString]);
+          `, [fromDateString, toDateString]);
             const result = await tx.query(`
             select * from temp_daily_staff_harvest_data dt
-          `);
+      `);
             const total = await tx.query(`
           select count(*) from temp_daily_staff_harvest_data
-          `);
-            await tx.query(`
-            drop table temp_daily_staff_harvest_data
-          `);
+      `);
             return { items: result, total: total[0].count };
         }
         catch (error) {

package/dist-server/graphql/resolvers/report/daily-staff-harvest-reports.js.map

@@ -1 +1 @@
-{"version":3,"file":"daily-staff-harvest-reports.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/report/daily-staff-harvest-reports.ts"],"names":[],"mappings":";;;AAEA,gDAAyC;AAE5B,QAAA,wBAAwB,GAAG;IACtC,KAAK,CAAC,wBAAwB,CAAC,CAAM,EAAE,MAAiB,EAAE,OAAY;QACpE,IAAI;YACF,MAAM,EAAE,EAAE,EAAE,GAA0B,OAAO,CAAC,KAAK,CAAA;YAEnD,IAAI,IAAI,GAAG,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;YACzF,IAAI,KAAK,GAAG,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;YAE1F,IAAI,QAAQ,GAAG,IAAI,IAAI,CAAC,IAAI,EAAE,KAAK,GAAG,CAAC,EAAE,CAAC,CAAC,CAAA;YAC3C,IAAI,MAAM,GAAG,IAAI,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC,CAAA;YACrC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,CAAA;YAEpC,IAAI,cAAc,GAAG;gBACnB,QAAQ,CAAC,WAAW,EAAE,CAAC,QAAQ,EAAE;gBACjC,MAAM,CAAC,QAAQ,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC;gBAChD,IAAI;aACL,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;YAEX,IAAI,YAAY,GAAG;gBACjB,MAAM,CAAC,WAAW,EAAE,CAAC,QAAQ,EAAE;gBAC/B,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC;gBAC9C,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC;aAC1C,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;YAEX,MAAM,KAAK,GAAG,MAAM,EAAE;iBACnB,aAAa,CAAC,gBAAK,CAAC;iBACpB,aAAa,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAA;YAE3F,MAAM,EAAE,CAAC,KAAK,CACZ;;;;;;;;;;;;;;;WAeG,EACH,CAAC,KAAK,CAAC,EAAE,EAAE,cAAc,EAAE,YAAY,CAAC,CACzC,CAAA;YAED,MAAM,MAAM,GAAQ,MAAM,EAAE,CAAC,KAAK,CAChC;;WAEG,CACJ,CAAA;YAED,MAAM,KAAK,GAAQ,MAAM,EAAE,CAAC,KAAK,CAC/B;;WAEG,CACJ,CAAA;YAED,MAAM,EAAE,CAAC,KAAK,CACZ;;WAEG,CACJ,CAAA;YAED,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,CAAA;SAChD;QAAC,OAAO,KAAK,EAAE;YACd,MAAM,KAAK,CAAA;SACZ;IACH,CAAC;CACF,CAAA"}
+{"version":3,"file":"daily-staff-harvest-reports.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/report/daily-staff-harvest-reports.ts"],"names":[],"mappings":";;;AAIA,gDAAyC;AAE5B,QAAA,wBAAwB,GAAG;IACtC,KAAK,CAAC,wBAAwB,CAAC,CAAM,EAAE,MAAiB,EAAE,OAAY;QACpE,IAAI;YACF,MAAM,EAAE,EAAE,EAAE,GAA0B,OAAO,CAAC,KAAK,CAAA;YAEnD,IAAI,IAAI,GAAG,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;YACzF,IAAI,KAAK,GAAG,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;YAE1F,IAAI,QAAQ,GAAG,IAAI,IAAI,CAAC,IAAI,EAAE,KAAK,GAAG,CAAC,EAAE,CAAC,CAAC,CAAA;YAC3C,IAAI,MAAM,GAAG,IAAI,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC,CAAA;YACrC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,CAAA;YAEpC,IAAI,cAAc,GAAG;gBACnB,QAAQ,CAAC,WAAW,EAAE,CAAC,QAAQ,EAAE;gBACjC,MAAM,CAAC,QAAQ,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC;gBAChD,IAAI;aACL,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;YAEX,IAAI,YAAY,GAAG;gBACjB,MAAM,CAAC,WAAW,EAAE,CAAC,QAAQ,EAAE;gBAC/B,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC;gBAC9C,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC;aAC1C,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;YAEX,MAAM,KAAK,GAAG,MAAM,EAAE;iBACnB,aAAa,CAAC,gBAAK,CAAC;iBACpB,aAAa,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAA;YAE3F,MAAM,EAAE,CAAC,KAAK,CAAC;;;;;;;;;;;;;OAad,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC,CACZ,CAAA;YAED,MAAM,EAAE,CAAC,KAAK,CACZ;;;;;;;;;;;;;;;WAeG,EACH,CAAC,cAAc,EAAE,YAAY,CAAC,CAC/B,CAAA;YAED,MAAM,MAAM,GAAQ,MAAM,EAAE,CAAC,KAAK,CAAC;;OAElC,CAAC,CAAA;YAEF,MAAM,KAAK,GAAQ,MAAM,EAAE,CAAC,KAAK,CAAC;;OAEjC,CAAC,CAAA;YAEF,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,CAAA;SAChD;QAAC,OAAO,KAAK,EAAE;YACd,MAAM,KAAK,CAAA;SACZ;IACH,CAAC;CACF,CAAA"}

package/dist-server/graphql/resolvers/report/index.js

@@ -3,10 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ReportResolver = void 0;
 const daily_production_reports_1 = require("./daily-production-reports");
 const monthly_production_reports_1 = require("./monthly-production-reports");
+const monthly_dispatch_summary_reports_1 = require("./monthly-dispatch-summary-reports");
 const yearly_production_reports_1 = require("./yearly-production-reports");
 const daily_staff_harvest_reports_1 = require("./daily-staff-harvest-reports");
+const monthly_block_dispatch_reports_1 = require("./monthly-block-dispatch-reports");
+const monthly_ffb_sale_reports_1 = require("./monthly-ffb-sale-reports");
 exports.ReportResolver = {
-    Query: Object.assign(Object.assign(Object.assign(Object.assign({}, daily_production_reports_1.dailyProductionReports), monthly_production_reports_1.monthlyProductionReports), yearly_production_reports_1.yearlyProductionReports), daily_staff_harvest_reports_1.dailyStaffHarvestReports),
+    Query: Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, daily_production_reports_1.dailyProductionReports), monthly_production_reports_1.monthlyProductionReports), monthly_dispatch_summary_reports_1.monthlyDispatchSummaryReports), yearly_production_reports_1.yearlyProductionReports), daily_staff_harvest_reports_1.dailyStaffHarvestReports), monthly_block_dispatch_reports_1.monthlyBlockDispatchReports), monthly_ffb_sale_reports_1.monthlyFfbSaleReports),
     Mutation: {}
 };
 //# sourceMappingURL=index.js.map

package/dist-server/graphql/resolvers/report/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/report/index.ts"],"names":[],"mappings":";;;AAAA,yEAAmE;AACnE,6EAAuE;AACvE,2EAAqE;AACrE,+EAAwE;AAE3D,QAAA,cAAc,GAAG;IAC5B,KAAK,8DACA,iDAAsB,GACtB,qDAAwB,GACxB,mDAAuB,GACvB,sDAAwB,CAC5B;IACD,QAAQ,EAAE,EAAE;CACb,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/report/index.ts"],"names":[],"mappings":";;;AAAA,yEAAmE;AACnE,6EAAuE;AACvE,yFAAkF;AAClF,2EAAqE;AACrE,+EAAwE;AACxE,qFAA8E;AAC9E,yEAAkE;AAErD,QAAA,cAAc,GAAG;IAC5B,KAAK,wGACA,iDAAsB,GACtB,qDAAwB,GACxB,gEAA6B,GAC7B,mDAAuB,GACvB,sDAAwB,GACxB,4DAA2B,GAC3B,gDAAqB,CACzB;IACD,QAAQ,EAAE,EAAE;CACb,CAAA"}

package/dist-server/graphql/resolvers/report/monthly-block-dispatch-reports.js

@@ -0,0 +1,89 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.monthlyBlockDispatchReports = void 0;
+const typeorm_1 = require("typeorm");
+const entities_1 = require("../../../entities");
+exports.monthlyBlockDispatchReports = {
+    async monthlyBlockDispatchReports(_, 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']
+            });
+            // --  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 dd.id, b.name AS block_name,
+          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::timestamp between $1::timestamp and $2::timestamp
+        )
+        `, [fromDateString, toDateString]);
+            await tx.query(`
+          CREATE TEMP TABLE pivot_block_dispatch ON COMMIT DROP AS (
+            SELECT * FROM crosstab(
+              $$SELECT rbd.id, rbd.block_name, round(rbd.weight, 2 )::varchar FROM raw_block_dispatch rbd$$,
+              $$SELECT b.name FROM ramps r INNER JOIN blocks b ON b.id = r.block_id WHERE r.deleted_at IS NULL$$
+            ) AS ("id" uuid,  ${ramps.map(ramp => `"${ramp.block.name}" varchar`).join(',')})
+          );
+        `);
+            await tx.query(`
+          CREATE TEMP TABLE temp_monthly_production_data ON COMMIT DROP AS (
+            SELECT 
+            ROW_NUMBER() OVER(
+              PARTITION BY dd.dispatch_at::date
+              ORDER BY dd.dispatch_at
+            ) as rn
+            , dd.id, COALESCE(c.name, 'UNKNOWN') AS "dispatchTo"
+            , dd.transport_no as "lorryNo"
+            , dd.driver_identification as "driverIdentification"
+            , TO_CHAR(dd.dispatch_at:: DATE, 'dd/mm/yyyy') as "date"
+            , row_to_json((SELECT d FROM (SELECT ${ramps.map(ramp => `pbd."${ramp.block.name}"`).join(',')}) d))::varchar as "blockData"
+            , (SELECT sum(weight) FROM raw_block_dispatch rbd WHERE rbd.id = dd.id) AS "today"
+            FROM daily_dispatches dd 
+            INNER JOIN pivot_block_dispatch pbd ON pbd.id = dd.id
+            LEFT JOIN organizations c ON c.id = dd.dispatch_to_id 
+          );
+        `);
+            const result = await tx.query(`
+          select "id", "dispatchTo", "lorryNo", "driverIdentification", 
+          CASE WHEN "rn" = 1 THEN "date" ELSE '' END AS "date", "blockData", "today",
+          coalesce(sum(today) over (order by date asc rows between unbounded preceding and current row), 0) as "todate"
+          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=monthly-block-dispatch-reports.js.map

package/dist-server/graphql/resolvers/report/monthly-block-dispatch-reports.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"monthly-block-dispatch-reports.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/report/monthly-block-dispatch-reports.ts"],"names":[],"mappings":";;;AAAA,qCAAmE;AAGnE,gDAAwC;AAE3B,QAAA,2BAA2B,GAAG;IACzC,KAAK,CAAC,2BAA2B,CAAC,CAAM,EAAE,MAAiB,EAAE,OAAY;QACvE,IAAI;YACF,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,GAA0C,OAAO,CAAC,KAAK,CAAA;YAE3E,IAAI,IAAI,GAAG,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;YACzF,IAAI,KAAK,GAAG,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;YAE1F,IAAI,QAAQ,GAAG,IAAI,IAAI,CAAC,IAAI,EAAE,KAAK,GAAG,CAAC,EAAE,CAAC,CAAC,CAAA;YAC3C,IAAI,MAAM,GAAG,IAAI,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC,CAAA;YACrC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,CAAA;YAEpC,IAAI,cAAc,GAAG;gBACnB,QAAQ,CAAC,WAAW,EAAE,CAAC,QAAQ,EAAE;gBACjC,MAAM,CAAC,QAAQ,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC;gBAChD,IAAI;aACL,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;YAEX,IAAI,YAAY,GAAG;gBACjB,MAAM,CAAC,WAAW,EAAE,CAAC,QAAQ,EAAE;gBAC/B,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC;gBAC9C,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC;aAC1C,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;YAEX,IAAI,KAAK,GAAG,MAAM,IAAA,uBAAa,EAAC,eAAI,CAAC,CAAC,IAAI,CAAC;gBACzC,KAAK,EAAE,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,EAAE,SAAS,EAAE,IAAA,gBAAM,GAAE,EAAE;gBACjD,SAAS,EAAE,CAAC,OAAO,CAAC;aACrB,CAAC,CAAA;YAGF,8EAA8E;YAC9E,iCAAiC;YACjC,MAAM,EAAE,CAAC,KAAK,CAAC,0CAA0C,CAAC,CAAA;YAE1D,MAAM,EAAE,CAAC,KAAK,CACZ;;;;;;;;;;SAUC,EAAE,CAAC,cAAc,EAAE,YAAY,CAAC,CAClC,CAAA;YAED,MAAM,EAAE,CAAC,KAAK,CACZ;;;;;gCAKwB,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,WAAW,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC;;SAElF,CAAC,CAAA;YAEJ,MAAM,EAAE,CAAC,KAAK,CACZ;;;;;;;;;;;mDAW2C,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,QAAQ,IAAI,CAAC,KAAK,CAAC,IAAI,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC;;;;;;SAMjG,CACF,CAAA;YAED,MAAM,MAAM,GAAQ,MAAM,EAAE,CAAC,KAAK,CAChC;;;;;SAKC,CACF,CAAA;YAED,MAAM,KAAK,GAAQ,MAAM,EAAE,CAAC,KAAK,CAC/B;;SAEC,CACF,CAAA;YAGD,OAAO;gBACL,KAAK,EAAE,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;oBACtB,yBACK,GAAG,EACP;gBACH,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK;aAC1B,CAAA;SACF;QAAC,OAAO,KAAK,EAAE;YACd,MAAM,KAAK,CAAA;SACZ;IACH,CAAC;CACF,CAAA"}

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

@@ -0,0 +1,89 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.monthlyDispatchSummaryReports = void 0;
+const typeorm_1 = require("typeorm");
+const entities_1 = require("../../../entities");
+exports.monthlyDispatchSummaryReports = {
+    async monthlyDispatchSummaryReports(_, 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('-');
+            const org = await tx
+                .getRepository(entities_1.Organization)
+                .findOneOrFail({ where: { domain: domain.id, deletedAt: (0, typeorm_1.IsNull)(), id: params.filters.filter(x => x.name == 'organization')[0].value } });
+            await tx.query(`
+          CREATE TEMP TABLE raw_dispatch ON COMMIT DROP AS (
+            SELECT dd.*,
+            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 tonnage
+            FROM daily_dispatches dd 
+            WHERE dd.dispatch_at::timestamp between $1::timestamp and $2::timestamp
+            AND dd.dispatch_to_id = $3
+          );
+        `, [fromDateString, toDateString, org.id]);
+            await tx.query(`
+          CREATE TEMP TABLE temp_monthly_dispatch_to_mill_data ON COMMIT DROP AS (
+            SELECT "id", dispatch_at AS "dispatchAt", transport_no AS "lorryNo", 
+            driver_identification AS "driverIdentification", chit_no AS "chitNo",	round(COALESCE(percentage,0)::numeric, 2)::varchar AS "percentage",
+            COALESCE(diapatch_to_name, 'UNKNOWN') AS "dispatchTo", "tonnage",
+            CASE WHEN reverse_rn = 1 THEN round((coalesce(sum(percentage) over (PARTITION BY dispatch_to_id, dispatch_at::date ORDER BY dispatch_at asc rows between unbounded preceding and current row), 0)/forward_rn)::numeric,2)::varchar ELSE '' END AS "todayAvg",
+            CASE WHEN reverse_rn = 1 THEN round((coalesce(sum(percentage) over (PARTITION BY dispatch_to_id ORDER BY dispatch_at asc rows between unbounded preceding and current row), 0)/forward_rn)::numeric,2)::varchar ELSE '' END AS "todateAvg",
+            CASE WHEN reverse_rn = 1 THEN round(coalesce(sum(tonnage) over (PARTITION BY dispatch_to_id, dispatch_at::date ORDER BY dispatch_at asc rows between unbounded preceding and current row), 0),2)::varchar ELSE '' END AS "today",
+            CASE WHEN reverse_rn = 1 THEN round(coalesce(sum(tonnage) over (PARTITION BY dispatch_to_id ORDER BY dispatch_at asc rows between unbounded preceding and current row), 0),2)::varchar ELSE '' END AS "todate"
+            FROM (
+              SELECT 
+              ROW_NUMBER() OVER(
+                PARTITION BY rbd.dispatch_to_id, rbd.dispatch_at::date
+                ORDER BY rbd.dispatch_at ASC
+              ) as forward_rn
+              , ROW_NUMBER() OVER(
+                PARTITION BY rbd.dispatch_to_id, rbd.dispatch_at::date
+                ORDER BY rbd.dispatch_at DESC
+              ) as reverse_rn
+              , rbd.id
+              , rbd.dispatch_at
+              , rbd.transport_no
+              , rbd.driver_identification
+              , rbd.external_driver
+              , rbd.chit_no
+              , rbd.percentage
+              , rbd.dispatch_to_id
+              , c.name AS diapatch_to_name
+              , rbd.tonnage 
+              FROM raw_dispatch rbd
+              LEFT JOIN organizations c ON c.id = rbd.dispatch_to_id
+              ORDER BY rbd.dispatch_to_id, rbd.dispatch_at
+            ) src
+          );
+        `);
+            const result = await tx.query(`
+          select * from temp_monthly_dispatch_to_mill_data dt
+        `);
+            const total = await tx.query(`
+          select count(*) from temp_monthly_dispatch_to_mill_data
+        `);
+            return {
+                items: result.map(itm => {
+                    return Object.assign({}, itm);
+                }), total: total[0].count
+            };
+        }
+        catch (error) {
+            throw error;
+        }
+    }
+};
+//# sourceMappingURL=monthly-dispatch-summary-reports.js.map

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

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