@things-factory/operato-pms 3.7.6 → 3.8.14

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;AAClE,mGAA2F;AAE9E,QAAA,cAAc,GAAG;IAC5B,KAAK,sHACA,iDAAsB,GACtB,qDAAwB,GACxB,gEAA6B,GAC7B,mDAAuB,GACvB,sDAAwB,GACxB,4DAA2B,GAC3B,gDAAqB,GACrB,yEAAiC,CACrC;IACD,QAAQ,EAAE,EAAE;CACb,CAAA"}

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

@@ -0,0 +1,91 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.monthlyBlockDispatchReports = void 0;
+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 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 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 AND r.domain_id = '${domain.id}' GROUP BY b.id, b.name$$
+            ) AS ("id" uuid,  ${blocks.map(block => `"${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 ${blocks.map(block => `pbd."${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":"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"}

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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"}

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 TO_CHAR(dispatch_at:: DATE, 'dd/mm/yyyy') 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 daily_loading_details dld on dld.daily_loading_id = dl.id
+              inner join temp_blocks blk on blk.id = dld.block_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