@things-factory/operato-pms 3.7.5 → 3.8.13

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

@@ -0,0 +1,87 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.monthlyFfbSaleReports = void 0;
+exports.monthlyFfbSaleReports = {
+    async monthlyFfbSaleReports(_, 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 organization = params.filters.find(x => x.name == 'organization');
+            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 raw_block_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
+          ${organization ? organization.value == 'null' ? `AND dd.dispatch_to_id IS NULL` : `AND dd.dispatch_to_id = '${organization.value}'` : ''}
+        );
+        `, [fromDateString, toDateString]);
+            await tx.query(`
+          CREATE TEMP TABLE temp_monthly_dispatch_to_mill_data ON COMMIT DROP AS (
+            SELECT "id", dispatch_at, 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", round(COALESCE(tonnage,0), 2)::varchar AS "tonnage",
+            CASE WHEN forward_rn = 1 THEN dispatch_at::date::varchar ELSE '' END AS "dispatchAt", 
+            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_at::date
+                ORDER BY rbd.dispatch_at ASC
+              ) as forward_rn
+              , ROW_NUMBER() OVER(
+                PARTITION BY 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_block_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
+          ORDER BY "dispatch_at";
+        `);
+            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-ffb-sale-reports.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"monthly-ffb-sale-reports.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/report/monthly-ffb-sale-reports.ts"],"names":[],"mappings":";;;AAKa,QAAA,qBAAqB,GAAG;IACnC,KAAK,CAAC,qBAAqB,CAAC,CAAM,EAAE,MAAiB,EAAE,OAAY;QACjE,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;YAC1F,IAAI,YAAY,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,IAAI,cAAc,CAAC,CAAA;YAErE,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,EAAE,CAAC,KAAK,CACZ;;;;;;YAMI,YAAY,CAAC,CAAC,CAAC,YAAY,CAAC,KAAK,IAAI,MAAM,CAAC,CAAC,CAAC,+BAA+B,CAAC,CAAC,CAAC,4BAA4B,YAAY,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,EAAE;;SAEzI,EAAE,CAAC,cAAc,EAAE,YAAY,CAAC,CAClC,CAAA;YAED,MAAM,EAAE,CAAC,KAAK,CACZ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;SAmCC,CACF,CAAA;YAED,MAAM,MAAM,GAAQ,MAAM,EAAE,CAAC,KAAK,CAChC;;;SAGC,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-production-reports.js

@@ -21,65 +21,80 @@ exports.monthlyProductionReports = {
                 String(toDate.getDate()).padStart(2, '0')
             ].join('-');
             await tx.query(`
-          create temp table temp_monthly_production_data as (
+        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 GROUP BY block_id, id, name ORDER BY block_id, id, name 
+        );
+      `);
+            await tx.query(`
+          create temp table temp_monthly_production_data on commit drop as (
             select b.id, b.name as "block", 
             coalesce(harvest.total_harvester, 0) as "totalHarvester", 
             coalesce(harvest.out_turn,0) as "totalOutTurn", 
             coalesce(harvest.days_worked,0) as "daysWorked", 
-            round(coalesce((harvest.out_turn / harvest.days_worked),0)::DECIMAL, 2)::TEXT as "avgOutTurn",
-            round(coalesce((harvest.total_bunch_harvested),0)::DECIMAL, 2)::text as "totalBunchHarvested", 
-            round(coalesce((loading.total_weight_loaded),0)::DECIMAL, 2)::TEXT as "production", 
-            round(case when loading.total_weight_loaded <> 0 then (loading.total_bunch_loaded / loading.total_weight_loaded * 1000) else '0' end::DECIMAL, 2)::TEXT as "bunchesPerTon",
-            round(case when loading.total_bunch_loaded <> 0 then (loading.total_weight_loaded / loading.total_bunch_loaded * 1000) else '0' end::DECIMAL, 2)::TEXT as "bunchesWt",
-            round(coalesce((harvest.total_bunch_harvested / harvest.total_harvest_coverage),0)::DECIMAL, 2)::TEXT as "bunchesPerHectar",
-            round(coalesce((harvest.total_harvest_coverage / block_details.total_hectarage),0)::DECIMAL, 2)::TEXT as "harvestingRd",
-            round(coalesce((loading.total_weight_loaded / harvest.out_turn),0)::DECIMAL, 2)::TEXT as "productivities",
-            coalesce(block_details.total_hectarage::text, '-') as "hectarage",
-            round(coalesce((loading.total_bunch_loaded / block_details.total_hectarage),0)::DECIMAL, 2)::TEXT as "yieldPerHectar",
-            round(coalesce((harvest.total_harvest_coverage / harvest.days_worked),0)::DECIMAL, 2)::TEXT as "coveragePerDay",
-            '-' as "rainfall",
-            round(coalesce((harvest.total_bunch_harvested / block_details.total_stand),0)::DECIMAL, 2)::TEXT as "bunchesPerPalm",
-            coalesce(block_details.year_planted::text, '-') as "yearPlanted",
-            coalesce(block_details.total_stand::text, '-') as "totalStand"
+            round(coalesce((harvest.total_bunch_harvested),0)::DECIMAL, 1)::text as "totalBunchHarvested", 
+            round(coalesce((loading.total_weight_loaded),0)::DECIMAL, 4)::TEXT as "production", 
+            round(case when loading.total_weight_loaded <> 0 then (loading.total_bunch_loaded / loading.total_weight_loaded) else '0' end::DECIMAL, 4)::TEXT as "bunchesPerTon",
+            round(case when loading.total_bunch_loaded <> 0 then (loading.total_weight_loaded / loading.total_bunch_loaded) else '0' end::DECIMAL, 4)::TEXT as "bunchesWt",
+            round(coalesce((harvest.total_bunch_harvested / harvest.total_harvest_coverage),0)::DECIMAL, 4)::TEXT as "bunchesPerHectar",
+            round(coalesce((harvest.total_harvest_coverage / block_details.total_hectarage),0)::DECIMAL, 4)::TEXT as "harvestingRd",
+            round(coalesce((loading.total_weight_loaded / harvest.out_turn),0)::DECIMAL, 4)::TEXT as "productivities",
+            coalesce(block_details.total_hectarage::text, '') as "hectarage",
+            round(coalesce((loading.total_bunch_loaded / block_details.total_hectarage),0)::DECIMAL, 4)::TEXT as "yieldPerHectar",
+            round(coalesce((harvest.total_harvest_coverage / harvest.days_worked),0)::DECIMAL, 4)::TEXT as "coveragePerDay",
+            round(coalesce((harvest.total_bunch_harvested / block_details.total_stand),0)::DECIMAL, 4)::TEXT as "bunchesPerPalm",
+            coalesce(block_details.year_planted::text, '') as "yearPlanted",
+            coalesce(block_details.total_stand::text, '') as "totalStand",
+            '' as "rainfall"
             from blocks b
             left join(
-              select dh.block_id,
+              select blk.block_id,
               count(distinct dhd.organization_staff_id) as total_harvester,
               count(dhd.id) as out_turn,
               count(distinct concat(dh.block_id, dh.harvest_date)) as days_worked,
               sum(dhd.total_bunch_harvested) as total_bunch_harvested,
               sum(dh.coverage) as total_harvest_coverage
               from daily_harvests dh 
+              inner join temp_blocks blk on blk.id = dh.block_id
               inner join daily_harvest_details dhd on dhd.daily_harvest_id = dh.id
               where dh.harvest_date::timestamp between $1::timestamp and $2::timestamp
-              group by dh.block_id
+              group by blk.block_id
             ) as harvest on harvest.block_id = b.id
             left join(
-              select dl.block_id, sum(total_weight) as total_weight_loaded, sum(total_bunch) as total_bunch_loaded
+              select blk.block_id, sum(total_weight) as total_weight_loaded, sum(total_bunch) as total_bunch_loaded
               from daily_loadings dl 
+              inner join temp_blocks blk on blk.id = dl.block_id
               inner join daily_loading_details dld on dld.daily_loading_id = dl.id
               where dl.loading_date::timestamp between $1::timestamp and $2::timestamp
-              group by dl.block_id
+              group by blk.block_id
             ) as loading on loading.block_id = b.id
             left join(
-              SELECT DISTINCT ON (block_id)
-                *
+              SELECT DISTINCT ON (blk.block_id) bd.*
               FROM block_details bd 
+              inner join temp_blocks blk on blk.id = bd.block_id
               where valid_from::timestamp <= $1::timestamp
-              ORDER  BY block_id, valid_from desc
+              ORDER BY blk.block_id, valid_from desc
             ) block_details on block_details.block_id = b.id
             order by b.name
           )`, [fromDateString, toDateString]);
             const result = await tx.query(`
-            select * from temp_monthly_production_data dt
-          `);
+        select * from temp_monthly_production_data dt
+      `);
             const total = await tx.query(`
-          select count(*) from temp_monthly_production_data
-          `);
-            await tx.query(`
-            drop table temp_monthly_production_data
-          `);
-            return { items: result, total: total[0].count };
+        select count(*) from temp_monthly_production_data
+      `);
+            return {
+                items: result.map(itm => {
+                    return Object.assign(Object.assign({}, itm), { avgOutTurn: ((parseFloat(itm.totalOutTurn) / parseFloat(itm.daysWorked)) || 0).toFixed(4) });
+                }), total: total[0].count
+            };
         }
         catch (error) {
             throw error;

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

@@ -1 +1 @@
-{"version":3,"file":"monthly-production-reports.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/report/monthly-production-reports.ts"],"names":[],"mappings":";;;AAGa,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,EAAE,CAAC,KAAK,CACZ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;YAiDI,EACJ,CAAC,cAAc,EAAE,YAAY,CAAC,CAC/B,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":"monthly-production-reports.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/report/monthly-production-reports.ts"],"names":[],"mappings":";;;AAIa,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,EAAE,CAAC,KAAK,CAAC;;;;;;;;;;;;OAYd,CAAC,CAAA;YAEF,MAAM,EAAE,CAAC,KAAK,CACZ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;YAkDI,EACJ,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;YAGF,OAAO;gBACL,KAAK,EAAE,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;oBACtB,uCACK,GAAG,KACN,UAAU,EAAE,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,YAAY,CAAC,GAAG,UAAU,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAC1F;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/yearly-production-reports.js

@@ -11,67 +11,77 @@ exports.yearlyProductionReports = {
             let thisYearDateString = [fromDate.getFullYear().toString(), '01', '01'].join('-');
             let nextYearDateString = [String(fromDate.getFullYear() + 1).toString(), '01', '01'].join('-');
             await tx.query(`
-          create temp table temp_yearly_production_data as (
+        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 GROUP BY block_id, id, name ORDER BY block_id, id, name 
+        );
+      `);
+            await tx.query(`
+          create temp table temp_yearly_production_data on commit drop as (
             select 
             b.name as "block",
             coalesce(bd.year_planted::varchar, '-') as "yearPlanted",
-            '-' as "estimatedLastFfb",
-            coalesce(last_trans.total_ffb, 0) as "totalLastFfb",
-            '-' as "estimatedFfb",
-            coalesce(trans.total_ffb, 0) as "totalFfb",
-            case when last_bd.matured_hectarage is not null then coalesce(last_trans.total_ffb, 0) / last_bd.matured_hectarage else 0 end as "lastYieldPerHectarage",
-            case when bd.matured_hectarage is not null then coalesce(trans.total_ffb, 0) / bd.matured_hectarage else 0 end as "yieldPerHectarage",
+            '' as "estimatedLastFfb",
+            round(coalesce(last_trans.total_ffb, 0)::DECIMAL, 4)::TEXT as "totalLastFfb",
+            '' as "estimatedFfb",
+            round(coalesce(trans.total_ffb, 0)::DECIMAL, 4)::TEXT as "totalFfb",
+            round((case when last_bd.matured_hectarage is not null AND last_bd.matured_hectarage <> 0 then coalesce(last_trans.total_ffb, 0) / last_bd.matured_hectarage else 0 end)::DECIMAL, 4)::TEXT as "lastYieldPerHectarage",
+            round((case when bd.matured_hectarage is not null AND bd.matured_hectarage <> 0 then coalesce(trans.total_ffb, 0) / bd.matured_hectarage else 0 end)::DECIMAL, 4)::TEXT as "yieldPerHectarage",
             coalesce(bd.matured_hectarage, 0) as "maturedHectarage",
             coalesce(harvest.total_coverage, 0) as "totalCoverage",
-            case when bd.matured_hectarage is not null then coalesce(harvest.total_coverage, 0)/ bd.matured_hectarage else 0 end as "totalHarvestingRd",
-            (1 - abs(case when last_trans.total_ffb is not null then coalesce(trans.total_ffb, 0)/last_trans.total_ffb else 1 end)) * 100 as "actualAgainstLast"
+            round((case when bd.matured_hectarage is not null AND bd.matured_hectarage <> 0 then coalesce(harvest.total_coverage, 0)/ bd.matured_hectarage else 0 end)::DECIMAL, 4)::TEXT as "totalHarvestingRd",
+            round(((1 - abs(case when last_trans.total_ffb is not null AND last_trans.total_ffb <> 0 then coalesce(trans.total_ffb, 0)/last_trans.total_ffb else 1 end)) * 100)::DECIMAL, 4)::TEXT as "actualAgainstLast"
             from blocks b 
             left join (
-              SELECT DISTINCT ON (block_id)
-              *
+              SELECT DISTINCT ON (block_id) *
               FROM block_details bd 
               where valid_from < $3::timestamp
               ORDER  BY block_id, valid_from desc
             ) bd on bd.block_id = b.id
             left join (
-              SELECT DISTINCT ON (block_id)
-              *
+              SELECT DISTINCT ON (block_id) *
               FROM block_details bd 
               where valid_from < $2::timestamp
               ORDER  BY block_id, valid_from desc
             ) last_bd on last_bd.block_id = b.id
             left join (
-              select t.block_id, sum(ramp_weight) as total_ffb 
-              from record_transactions t 
+              select blk.block_id, sum(ramp_weight) as total_ffb 
+              from record_transactions t               
+              inner join temp_blocks blk on blk.id = t.block_id
               where transaction_type = 'LOADING' 
               and transaction_date::timestamp between $2::timestamp and $3::timestamp
-              group by block_id
+              group by blk.block_id
             ) trans on trans.block_id = b.id
             left join (
-              select t.block_id, sum(ramp_weight) as total_ffb 
+              select blk.block_id, sum(ramp_weight) as total_ffb 
               from record_transactions t 
+              inner join temp_blocks blk on blk.id = t.block_id
               where transaction_type = 'LOADING' 
               and transaction_date::timestamp between $1::timestamp and $2::timestamp
-              group by block_id
+              group by blk.block_id
             ) last_trans on last_trans.block_id = b.id
             left join (
-              select dh.block_id, sum(coverage) as total_coverage 
+              select blk.block_id, sum(coverage) as total_coverage 
               from daily_harvests dh
+              inner join temp_blocks blk on blk.id = dh.block_id
               where harvest_date::timestamp between $2::timestamp and $3::timestamp
-              group by block_id
+              group by blk.block_id
             ) harvest on harvest.block_id = b.id
-            where b.has_children = false 
             order by b.name 
           )`, [pastYearDateString, thisYearDateString, nextYearDateString]);
             const result = await tx.query(`
-            select * from temp_yearly_production_data dt
-          `);
+        select * from temp_yearly_production_data dt
+      `);
             const total = await tx.query(`
-          select count(*) from temp_yearly_production_data
-          `);
-            await tx.query(`
-            drop table temp_yearly_production_data
-          `);
+        select count(*) from temp_yearly_production_data
+      `);
             return { items: result, total: total[0].count };
         }
         catch (error) {

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

@@ -1 +1 @@
-{"version":3,"file":"yearly-production-reports.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/report/yearly-production-reports.ts"],"names":[],"mappings":";;;AAGa,QAAA,uBAAuB,GAAG;IACrC,KAAK,CAAC,uBAAuB,CAAC,CAAM,EAAE,MAAiB,EAAE,OAAY;QACnE,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,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAA;YAC1E,IAAI,QAAQ,GAAG,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC,CAAA;YAEnC,IAAI,kBAAkB,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC,CAAC,QAAQ,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;YAE9F,IAAI,kBAAkB,GAAG,CAAC,QAAQ,CAAC,WAAW,EAAE,CAAC,QAAQ,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;YAElF,IAAI,kBAAkB,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC,CAAC,QAAQ,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;YAE9F,MAAM,EAAE,CAAC,KAAK,CACZ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;YAoDI,EACJ,CAAC,kBAAkB,EAAE,kBAAkB,EAAE,kBAAkB,CAAC,CAC7D,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":"yearly-production-reports.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/report/yearly-production-reports.ts"],"names":[],"mappings":";;;AAIa,QAAA,uBAAuB,GAAG;IACrC,KAAK,CAAC,uBAAuB,CAAC,CAAM,EAAE,MAAiB,EAAE,OAAY;QACnE,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,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAA;YAC1E,IAAI,QAAQ,GAAG,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC,CAAA;YAEnC,IAAI,kBAAkB,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC,CAAC,QAAQ,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;YAE9F,IAAI,kBAAkB,GAAG,CAAC,QAAQ,CAAC,WAAW,EAAE,CAAC,QAAQ,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;YAElF,IAAI,kBAAkB,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC,CAAC,QAAQ,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;YAE9F,MAAM,EAAE,CAAC,KAAK,CAAC;;;;;;;;;;;;OAYd,CAAC,CAAA;YAEF,MAAM,EAAE,CAAC,KAAK,CACZ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;YAoDI,EACJ,CAAC,kBAAkB,EAAE,kBAAkB,EAAE,kBAAkB,CAAC,CAC7D,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/truck/delete-trucks.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.deleteTrucks = void 0;
+const typeorm_1 = require("typeorm");
+const entities_1 = require("../../../entities");
+exports.deleteTrucks = {
+    async deleteTrucks(_, { ids }, context) {
+        const { domain, tx } = context.state;
+        await tx.getRepository(entities_1.Truck).update({
+            domain,
+            id: (0, typeorm_1.In)(ids)
+        }, {
+            deletedAt: new Date()
+        });
+        return true;
+    }
+};
+//# sourceMappingURL=delete-trucks.js.map

package/dist-server/graphql/resolvers/truck/delete-trucks.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"delete-trucks.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/truck/delete-trucks.ts"],"names":[],"mappings":";;;AAAA,qCAA4B;AAE5B,gDAAyC;AAE5B,QAAA,YAAY,GAAG;IAC1B,KAAK,CAAC,YAAY,CAAC,CAAM,EAAE,EAAE,GAAG,EAAE,EAAE,OAAY;QAC9C,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;QAEpC,MAAM,EAAE,CAAC,aAAa,CAAC,gBAAK,CAAC,CAAC,MAAM,CAClC;YACE,MAAM;YACN,EAAE,EAAE,IAAA,YAAE,EAAC,GAAG,CAAC;SACZ,EACD;YACE,SAAS,EAAE,IAAI,IAAI,EAAE;SACtB,CACF,CAAA;QAED,OAAO,IAAI,CAAA;IACb,CAAC;CACF,CAAA"}

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

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TruckResolver = void 0;
+const delete_trucks_1 = require("./delete-trucks");
+const truck_query_1 = require("./truck-query");
+const update_multiple_truck_1 = require("./update-multiple-truck");
+exports.TruckResolver = {
+    Truck: truck_query_1.Truck,
+    Query: truck_query_1.Query,
+    Mutation: Object.assign(Object.assign({}, update_multiple_truck_1.updateMultipleTruck), delete_trucks_1.deleteTrucks)
+};
+//# sourceMappingURL=index.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/truck/index.ts"],"names":[],"mappings":";;;AAAA,mDAA8C;AAC9C,+CAA4C;AAC5C,mEAA6D;AAEhD,QAAA,aAAa,GAAG;IAC3B,KAAK,EAAL,mBAAK;IACL,KAAK,EAAL,mBAAK;IACL,QAAQ,kCACH,2CAAmB,GACnB,4BAAY,CAChB;CACF,CAAA"}

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

@@ -0,0 +1,46 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Truck = exports.Query = 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");
+exports.Query = {
+    async truck(_, { name }, context) {
+        const { domain, tx } = context.state;
+        const repository = await tx.getRepository(entities_1.Truck);
+        return await repository.findOne({
+            where: { domain, name },
+            relations: ['domain', 'organization', 'creator', 'updater']
+        });
+    },
+    async trucks(_, params, context) {
+        var _a;
+        const { tx } = context.state;
+        const queryBuilder = await tx.getRepository(entities_1.Truck).createQueryBuilder();
+        (0, shell_1.buildQuery)(queryBuilder, params, context);
+        queryBuilder
+            .leftJoinAndSelect('Truck.domain', 'Domain')
+            .leftJoinAndSelect('Truck.organization', 'Organization')
+            .leftJoinAndSelect('Truck.creator', 'Creator')
+            .leftJoinAndSelect('Truck.updater', 'Updater');
+        if (((_a = params.filters) === null || _a === void 0 ? void 0 : _a.length) > 0)
+            queryBuilder.andWhere('Truck.deletedAt IS NULL');
+        else
+            queryBuilder.where('Truck.deletedAt IS NULL');
+        const [items, total] = await queryBuilder.getManyAndCount();
+        return { items, total };
+    }
+};
+exports.Truck = {
+    async domain(truck) {
+        return await (0, typeorm_1.getRepository)(shell_1.Domain).findOne(truck.domainId);
+    },
+    async creator(truck) {
+        return await (0, typeorm_1.getRepository)(auth_base_1.User).findOne(truck.creatorId);
+    },
+    async updater(truck) {
+        return await (0, typeorm_1.getRepository)(auth_base_1.User).findOne(truck.updaterId);
+    }
+};
+//# sourceMappingURL=truck-query.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"truck-query.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/truck/truck-query.ts"],"names":[],"mappings":";;;AAAA,qCAAsD;AAEtD,yDAAgD;AAChD,iDAAqE;AAErE,gDAAwD;AAE3C,QAAA,KAAK,GAAG;IACnB,KAAK,CAAC,KAAK,CAAC,CAAM,EAAE,EAAE,IAAI,EAAE,EAAE,OAAY;QACxC,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;QACpC,MAAM,UAAU,GAAG,MAAM,EAAE,CAAC,aAAa,CAAC,gBAAW,CAAC,CAAA;QAEtD,OAAO,MAAM,UAAU,CAAC,OAAO,CAAC;YAC9B,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE;YACvB,SAAS,EAAE,CAAC,QAAQ,EAAE,cAAc,EAAE,SAAS,EAAE,SAAS,CAAC;SAC5D,CAAC,CAAA;IACJ,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,CAAM,EAAE,MAAiB,EAAE,OAAY;;QAClD,MAAM,EAAE,EAAE,EAAE,GAA0B,OAAO,CAAC,KAAK,CAAA;QAEnD,MAAM,YAAY,GAAG,MAAM,EAAE,CAAC,aAAa,CAAC,gBAAW,CAAC,CAAC,kBAAkB,EAAE,CAAA;QAC7E,IAAA,kBAAU,EAAC,YAAY,EAAE,MAAM,EAAE,OAAO,CAAC,CAAA;QAEzC,YAAY;aACT,iBAAiB,CAAC,cAAc,EAAE,QAAQ,CAAC;aAC3C,iBAAiB,CAAC,oBAAoB,EAAE,cAAc,CAAC;aACvD,iBAAiB,CAAC,eAAe,EAAE,SAAS,CAAC;aAC7C,iBAAiB,CAAC,eAAe,EAAE,SAAS,CAAC,CAAA;QAEhD,IAAI,CAAA,MAAA,MAAM,CAAC,OAAO,0CAAE,MAAM,IAAG,CAAC;YAAE,YAAY,CAAC,QAAQ,CAAC,yBAAyB,CAAC,CAAA;;YAC3E,YAAY,CAAC,KAAK,CAAC,yBAAyB,CAAC,CAAA;QAElD,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;AAEY,QAAA,KAAK,GAAG;IACnB,KAAK,CAAC,MAAM,CAAC,KAAK;QAChB,OAAO,MAAM,IAAA,uBAAa,EAAC,cAAM,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAA;IAC5D,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,KAAK;QACjB,OAAO,MAAM,IAAA,uBAAa,EAAC,gBAAI,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC,CAAA;IAC3D,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,KAAK;QACjB,OAAO,MAAM,IAAA,uBAAa,EAAC,gBAAI,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC,CAAA;IAC3D,CAAC;CACF,CAAA"}

package/dist-server/graphql/resolvers/truck/update-multiple-truck.js

@@ -0,0 +1,40 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.updateMultipleTruck = void 0;
+const entities_1 = require("../../../entities");
+exports.updateMultipleTruck = {
+    async updateMultipleTruck(_, { patches }, context) {
+        var _a, _b, _c;
+        const { domain, user, tx } = context.state;
+        let results = [];
+        const _createRecords = patches.filter((patch) => patch.cuFlag.toUpperCase() === '+');
+        const _updateRecords = patches.filter((patch) => patch.cuFlag.toUpperCase() === 'M');
+        const truckRepo = tx.getRepository(entities_1.Truck);
+        if (_createRecords.length > 0) {
+            for (let i = 0; i < _createRecords.length; i++) {
+                const newRecord = _createRecords[i];
+                const organization = await tx.getRepository(entities_1.Organization).findOneOrFail({
+                    where: { id: (_a = newRecord === null || newRecord === void 0 ? void 0 : newRecord.organization) === null || _a === void 0 ? void 0 : _a.id }
+                });
+                const result = await truckRepo.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++) {
+                let newRecord = _updateRecords[i];
+                const truck = await truckRepo.findOne({ domain, id: newRecord.id });
+                if ((_b = newRecord === null || newRecord === void 0 ? void 0 : newRecord.organization) === null || _b === void 0 ? void 0 : _b.id) {
+                    const organization = await tx.getRepository(entities_1.Organization).findOneOrFail({
+                        where: { id: (_c = newRecord === null || newRecord === void 0 ? void 0 : newRecord.organization) === null || _c === void 0 ? void 0 : _c.id }
+                    });
+                    newRecord = Object.assign(Object.assign({}, newRecord), { organization });
+                }
+                const result = await truckRepo.save(Object.assign(Object.assign(Object.assign({}, truck), newRecord), { updater: user }));
+                results.push(Object.assign(Object.assign({}, result), { cuFlag: 'M' }));
+            }
+        }
+        return results;
+    }
+};
+//# sourceMappingURL=update-multiple-truck.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"update-multiple-truck.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/truck/update-multiple-truck.ts"],"names":[],"mappings":";;;AAAA,gDAAuD;AAE1C,QAAA,mBAAmB,GAAG;IACjC,KAAK,CAAC,mBAAmB,CAAC,CAAM,EAAE,EAAE,OAAO,EAAE,EAAE,OAAY;;QACzD,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;QAE1C,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,SAAS,GAAG,EAAE,CAAC,aAAa,CAAC,gBAAK,CAAC,CAAA;QAEzC,IAAI,cAAc,CAAC,MAAM,GAAG,CAAC,EAAE;YAC7B,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,YAAY,GAAG,MAAM,EAAE,CAAC,aAAa,CAAC,uBAAY,CAAC,CAAC,aAAa,CAAC;oBACtE,KAAK,EAAE,EAAE,EAAE,EAAE,MAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,YAAY,0CAAE,EAAE,EAAE;iBAC3C,CAAC,CAAA;gBAEF,MAAM,MAAM,GAAG,MAAM,SAAS,CAAC,IAAI,iCAC9B,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;SACF;QAED,IAAI,cAAc,CAAC,MAAM,GAAG,CAAC,EAAE;YAC7B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,cAAc,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;gBAC9C,IAAI,SAAS,GAAG,cAAc,CAAC,CAAC,CAAC,CAAA;gBACjC,MAAM,KAAK,GAAG,MAAM,SAAS,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,SAAS,CAAC,EAAE,EAAE,CAAC,CAAA;gBAEnE,IAAI,MAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,YAAY,0CAAE,EAAE,EAAE;oBAC/B,MAAM,YAAY,GAAG,MAAM,EAAE,CAAC,aAAa,CAAC,uBAAY,CAAC,CAAC,aAAa,CAAC;wBACtE,KAAK,EAAE,EAAE,EAAE,EAAE,MAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,YAAY,0CAAE,EAAE,EAAE;qBAC3C,CAAC,CAAA;oBACF,SAAS,mCAAQ,SAAS,KAAE,YAAY,GAAE,CAAA;iBAC3C;gBAED,MAAM,MAAM,GAAG,MAAM,SAAS,CAAC,IAAI,+CAC9B,KAAK,GACL,SAAS,KACZ,OAAO,EAAE,IAAI,IACb,CAAA;gBAEF,OAAO,CAAC,IAAI,iCAAM,MAAM,KAAE,MAAM,EAAE,GAAG,IAAG,CAAA;aACzC;SACF;QAED,OAAO,OAAO,CAAA;IAChB,CAAC;CACF,CAAA"}

package/dist-server/graphql/types/daily-dispatch/daily-dispatch-patch.js

@@ -10,10 +10,13 @@ exports.DailyDispatchPatch = (0, graphql_tag_1.default) `
     id: String
     name: String
     description: String
+    transport: ObjectRef
     transportNo: String
+    chitNo: String
+    percentage: Float
     driverIdentification: String
     totalTonnageRelease: Float
-    dispatchTo: String
+    dispatchTo: ObjectRef
     dispatchAt: String
     externalDriver: String
     driver: ObjectRef

package/dist-server/graphql/types/daily-dispatch/daily-dispatch-patch.js.map

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

package/dist-server/graphql/types/daily-dispatch/daily-dispatch.js

@@ -11,8 +11,11 @@ exports.DailyDispatch = (0, graphql_tag_1.default) `
     name: String
     domain: Domain
     dispatchAt: String
-    dispatchTo: String
+    dispatchTo: Organization
     driverIdentification: String
+    chitNo: String
+    percentage: Float
+    transport: Truck
     transportNo: String
     driver: OrganizationStaff
     externalDriver: String

package/dist-server/graphql/types/daily-dispatch/daily-dispatch.js.map

@@ -1 +1 @@
-{"version":3,"file":"daily-dispatch.js","sourceRoot":"","sources":["../../../../server/graphql/types/daily-dispatch/daily-dispatch.ts"],"names":[],"mappings":";;;;;;AAAA,8DAA6B;AAEhB,QAAA,aAAa,GAAG,IAAA,qBAAG,EAAA;;;;;;;;;;;;;;;;;;;;;CAqB/B,CAAA"}
+{"version":3,"file":"daily-dispatch.js","sourceRoot":"","sources":["../../../../server/graphql/types/daily-dispatch/daily-dispatch.ts"],"names":[],"mappings":";;;;;;AAAA,8DAA6B;AAEhB,QAAA,aAAa,GAAG,IAAA,qBAAG,EAAA;;;;;;;;;;;;;;;;;;;;;;;;CAwB/B,CAAA"}

package/dist-server/graphql/types/daily-dispatch/index.js

@@ -22,7 +22,12 @@ __exportStar(require("./new-daily-dispatch"), exports);
 exports.DailyDispatchResolver = (0, graphql_tag_1.default) `
   extend type Mutation {
     generateDailyDispatch(dailyDispatch: NewDailyDispatch!): DailyDispatch @transaction
-    updateDailyDispatch(name: String!, dailyDispatchDetails: [DailyDispatchDetailPatch]): DailyDispatch @transaction
+    updateDailyDispatch(
+      name: String!
+      chitNo: String
+      percentage: Float
+      dailyDispatchDetails: [DailyDispatchDetailPatch]
+    ): DailyDispatch @transaction
     deleteDailyDispatch(name: String!): Boolean @transaction
   }
 

package/dist-server/graphql/types/daily-dispatch/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../server/graphql/types/daily-dispatch/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,8DAA6B;AAE7B,mDAAgC;AAChC,wDAAqC;AACrC,yDAAsC;AACtC,uDAAoC;AAEvB,QAAA,qBAAqB,GAAG,IAAA,qBAAG,EAAA;;;;;;;;;;;CAWvC,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../server/graphql/types/daily-dispatch/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,8DAA6B;AAE7B,mDAAgC;AAChC,wDAAqC;AACrC,yDAAsC;AACtC,uDAAoC;AAEvB,QAAA,qBAAqB,GAAG,IAAA,qBAAG,EAAA;;;;;;;;;;;;;;;;CAgBvC,CAAA"}

package/dist-server/graphql/types/daily-dispatch/new-daily-dispatch.js

@@ -9,10 +9,13 @@ exports.NewDailyDispatch = (0, graphql_tag_1.default) `
   input NewDailyDispatch {
     name: String
     description: String
+    transport: ObjectRef
     transportNo: String
     driverIdentification: String
     totalTonnageRelease: Float
-    dispatchTo: String!
+    dispatchTo: ObjectRef!
+    chitNo: String
+    percentage: Float
     dispatchAt: String!
     driver: ObjectRef
     externalDriver: String

package/dist-server/graphql/types/daily-dispatch/new-daily-dispatch.js.map

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

package/dist-server/graphql/types/daily-harvest/daily-harvest-patch.js

@@ -8,9 +8,12 @@ const graphql_tag_1 = __importDefault(require("graphql-tag"));
 exports.DailyHarvestPatch = (0, graphql_tag_1.default) `
   input DailyHarvestPatch {
     name: String
-    harvestDate: String!
-    harvestingRound: Int!
+    harvestDate: String
+    harvestingRound: Int
     totalBunchHarvested: Float
+    yesterdayBalanceBunchInField: Float
+    balanceBunchInField: Float
+    collectedBunch: Float
     block: String!
     coverage: Float
     rainfall: String

package/dist-server/graphql/types/daily-harvest/daily-harvest-patch.js.map

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

package/dist-server/graphql/types/daily-harvest/daily-harvest.js

@@ -14,6 +14,9 @@ exports.DailyHarvest = (0, graphql_tag_1.default) `
     dailyHarvestDetails: [DailyHarvestDetail]
     harvestDate: String
     totalBunchHarvested: Float
+    yesterdayBalanceBunchInField: Float
+    balanceBunchInField: Float
+    collectedBunch: Float
     harvestingRound: Int
     coverage: Float
     rainfall: String

package/dist-server/graphql/types/daily-harvest/daily-harvest.js.map

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

package/dist-server/graphql/types/daily-harvest/new-daily-harvest.js

@@ -8,8 +8,11 @@ const graphql_tag_1 = __importDefault(require("graphql-tag"));
 exports.NewDailyHarvest = (0, graphql_tag_1.default) `
   input NewDailyHarvest {
     harvestDate: String!
-    harvestingRound: Int!
+    harvestingRound: Int
     block: String!
+    balanceBunchInField: Float
+    yesterdayBalanceBunchInField: Float
+    collectedBunch: Float
     coverage: Float
     rainfall: String
     dailyHarvestDetails: [NewDailyHarvestDetail]