@things-factory/operato-pms 3.8.13 → 3.8.26

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../server/graphql/types/report/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,8DAA6B;AAE7B,iEAA8C;AAC9C,4DAAyC;AACzC,oEAAiD;AACjD,+DAA4C;AAC5C,uEAAoD;AACpD,kEAA+C;AAC/C,yEAAsD;AACtD,oEAAiD;AACjD,mEAAgD;AAChD,8DAA2C;AAC3C,kEAA+C;AAC/C,6DAA0C;AAE7B,QAAA,cAAc,GAAG,IAAA,qBAAG,EAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAiChC,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../server/graphql/types/report/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,8DAA6B;AAE7B,iEAA8C;AAC9C,4DAAyC;AACzC,oEAAiD;AACjD,+DAA4C;AAC5C,uEAAoD;AACpD,kEAA+C;AAC/C,yEAAsD;AACtD,oEAAiD;AACjD,mEAAgD;AAChD,8DAA2C;AAC3C,kEAA+C;AAC/C,6DAA0C;AAC1C,yEAAsD;AACtD,8EAA2D;AAE9C,QAAA,cAAc,GAAG,IAAA,qBAAG,EAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA4ChC,CAAA"}

package/dist-server/utils/core-values.js

@@ -37,8 +37,8 @@ async function getDailyBlockCalculatedValues(block, date, trxMgr) {
           select block_id, transaction_date, 
           (select opening_field_bunches from transactions dt where dt.block_id = trx.block_id and dt.seq = min(trx.seq)) as prev_bunch_bal_in_field,
           0 as prev_weight_bal_in_ramp,
-          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 = 'HARVEST' OR transaction_type = 'BUNCHES_ADJUSTMENT' then field_bunches else 0 end) as today_bunch_harvest,
+          sum(case when transaction_type = 'LOADING' OR transaction_type = 'LOADING_ADJUSTMENT' then -field_bunches else 0 end) as today_bunch_collected,
           0 as today_weight_dispatch, 
           0 as today_weight_bal_in_ramp, 
           (

package/dist-server/utils/transaction-util.js

@@ -31,7 +31,8 @@ async function generateTransactionHistory(plantationInventory, refActionID, refR
     await transactionRepo.save(recTransactionHistory);
     if (transactionType === constants_1.TRANSACTION_TYPE.LOADING ||
         transactionType === constants_1.TRANSACTION_TYPE.DISPATCHMENT ||
-        transactionType === constants_1.TRANSACTION_TYPE.TONNAGE_ADJUSTMENT) {
+        transactionType === constants_1.TRANSACTION_TYPE.LOADING_ADJUSTMENT ||
+        transactionType === constants_1.TRANSACTION_TYPE.DISPATCHMENT_ADJUSTMENT) {
         await switchRampStatus(domain, ramp, user, trxMgr);
     }
     return recTransactionHistory;

package/dist-server/utils/transaction-util.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/operato-pms",
-  "version": "3.8.13",
+  "version": "3.8.26",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -41,7 +41,7 @@
     "@operato/ghost-print": "0.1.14",
     "@things-factory/apptool-ui": "^3.8.0",
     "@things-factory/auth-ui": "^3.8.0",
-    "@things-factory/biz-base": "^3.8.0",
+    "@things-factory/biz-base": "^3.8.26",
     "@things-factory/board-service": "^3.8.0",
     "@things-factory/board-ui": "^3.8.0",
     "@things-factory/code-ui": "^3.8.0",
@@ -89,12 +89,12 @@
     "@things-factory/scene-table": "^3.7.5",
     "@things-factory/scene-visualizer": "^3.7.5",
     "@things-factory/scene-wheel-sorter": "^3.7.5",
-    "@things-factory/setting-ui": "^3.8.0",
+    "@things-factory/setting-ui": "^3.8.19",
     "@things-factory/shell": "^3.8.0",
     "@things-factory/system-ui": "^3.8.0"
   },
   "devDependencies": {
     "@things-factory/builder": "^3.7.5"
   },
-  "gitHead": "9ef0c5b4dab02fcd97623eb2d72431d2776bd3c6"
+  "gitHead": "6ca26d91b7dad8eec6bc7859391bbd50374c744b"
 }

package/server/constants/transaction.ts

@@ -2,7 +2,8 @@ export const TRANSACTION_TYPE = {
   HARVEST: 'HARVEST',
   LOADING: 'LOADING',
   DISPATCHMENT: 'DISPATCHMENT',
-  TONNAGE_ADJUSTMENT: 'TONNAGE_ADJUSTMENT',
+  LOADING_ADJUSTMENT: 'LOADING_ADJUSTMENT',
+  DISPATCHMENT_ADJUSTMENT: 'DISPATCHMENT_ADJUSTMENT',
   BUNCHES_ADJUSTMENT: 'BUNCHES_ADJUSTMENT',
   TERMINATED: 'TERMINATED'
 }

package/server/entities/daily-dispatch.ts

@@ -3,10 +3,8 @@ import {
   CreateDateColumn,
   Entity,
   Index,
-  JoinColumn,
   ManyToOne,
   OneToMany,
-  OneToOne,
   PrimaryGeneratedColumn,
   UpdateDateColumn
 } from 'typeorm'
@@ -39,8 +37,7 @@ export class DailyDispatch {
   @Column({ nullable: true })
   externalDriver: string
 
-  @OneToOne(type => Truck, { nullable: true })
-  @JoinColumn()
+  @ManyToOne(type => Truck, { nullable: true })
   transport: Truck
 
   @Column()

package/server/graphql/resolvers/daily-dispatch/update-daily-dispatch.ts

@@ -18,9 +18,9 @@ export const updateDailyDispatch = {
     let foundDailyDispatchDetails: DailyDispatchDetail[] = dailyDispatch.dailyDispatchDetails
 
     foundDailyDispatchDetails = foundDailyDispatchDetails.map(record => {
-      const matchedDispatchDetail: any = dailyDispatchDetails.filter(
+      const matchedDispatchDetail: any = dailyDispatchDetails.find(
         dispatchDetail => dispatchDetail.name === record.name
-      )[0]
+      )
 
       return {
         ...record,

package/server/graphql/resolvers/daily-harvest/generate-daily-harvest.ts

@@ -137,7 +137,7 @@ export async function addPlantationInventory(
         existingFieldBunch,
         newDailyHarvest.id,
         newDailyHarvest.name,
-        TRANSACTION_TYPE.BUNCHES_ADJUSTMENT,
+        TRANSACTION_TYPE.LOADING,
         newDailyHarvest.harvestDate,
         -newDailyHarvest.collectedBunch,
         0,
@@ -181,7 +181,7 @@ export async function addPlantationInventory(
         plantationInventory,
         newDailyHarvest.id,
         newDailyHarvest.name,
-        TRANSACTION_TYPE.BUNCHES_ADJUSTMENT,
+        TRANSACTION_TYPE.LOADING,
         newDailyHarvest.harvestDate,
         -newDailyHarvest.collectedBunch,
         0,

package/server/graphql/resolvers/daily-loading/update-daily-loading.ts

@@ -3,8 +3,9 @@ import { EntityManager, getRepository, Repository } from 'typeorm'
 import { User } from '@things-factory/auth-base'
 import { Domain } from '@things-factory/shell'
 
+import { INVENTORY_TYPE, TRANSACTION_TYPE } from '../../../constants'
 import { Block, DailyLoading, DailyLoadingDetail, PlantationInventory, Ramp, Truck } from '../../../entities'
-import { NoGenerator } from '../../../utils'
+import { generateTransactionHistory, NoGenerator } from '../../../utils'
 
 export const updateDailyLoading = {
   async updateDailyLoading(_: any, { name, dailyLoadingPatch }, context: any) {
@@ -68,15 +69,21 @@ export async function updateDailyLoadingDetail(
 
   if (existingDailyLoadingDetails?.length > 0) {
     updatedDailyLoadingDetails = await Promise.all(
-      dailyLoadingDetails.map(async (record: DailyLoadingDetail) => {
-        const foundDailyLoadingDetailPatch = dailyLoadingDetailPatches.find(detail => detail.name === record.name)
+      dailyLoadingDetails.map(async (existingRecord: DailyLoadingDetail) => {
+        const foundDailyLoadingDetailPatch = dailyLoadingDetailPatches.find(
+          detail => detail.name === existingRecord.name
+        )
+
+        if (foundDailyLoadingDetailPatch.totalBunchWeight !== existingRecord.totalBunchWeight) {
+          await updatePlantationInventory(domain, dailyLoading, foundDailyLoadingDetailPatch, existingRecord, user, tx)
+        }
 
         return {
-          ...record,
+          ...existingRecord,
           dailyLoading,
-          truck: await truckRepo.findOne({ id: record.truck.id }),
-          block: await blockRepo.findOne({ id: record.block.id }),
-          ramp: await rampRepo.findOne({ id: record.ramp.id }),
+          truck: await truckRepo.findOne({ id: existingRecord.truck.id }),
+          block: await blockRepo.findOne({ id: existingRecord.block.id }),
+          ramp: await rampRepo.findOne({ id: existingRecord.ramp.id }),
           totalBunchLoaded: foundDailyLoadingDetailPatch?.totalBunchLoaded || 0,
           totalBunchWeight: foundDailyLoadingDetailPatch?.totalBunchWeight || 0,
           remark: foundDailyLoadingDetailPatch?.remark || null,
@@ -85,8 +92,6 @@ export async function updateDailyLoadingDetail(
       })
     )
     updatedDailyLoadingDetails = await dailyLoadingDetailRepo.save(updatedDailyLoadingDetails)
-
-    // await updatePlantationInventory(domain, dailyLoading, updatedDailyLoadingDetails, user, tx)
   }
 
   if (newDailyLoadingDetail?.length > 0) {
@@ -113,12 +118,35 @@ export async function updateDailyLoadingDetail(
 export async function updatePlantationInventory(
   domain: Domain,
   dailyLoading: DailyLoading,
-  updatedDailyLoadingDetails: DailyLoadingDetail[],
+  foundDailyLoadingDetailPatch: any,
+  existingRecord: DailyLoadingDetail,
   user: User,
   tx?: EntityManager
 ): Promise<void> {
   const plantationInvRepo: Repository<PlantationInventory> =
     tx?.getRepository(PlantationInventory) || getRepository(PlantationInventory)
 
-  const rampRepo: Repository<Ramp> = tx?.getRepository(Ramp) || getRepository(Ramp)
+  let existingRampTonnage: PlantationInventory = await plantationInvRepo.findOne({
+    where: { domain, type: INVENTORY_TYPE.RAMP_TONNAGE, ramp: existingRecord.ramp },
+    relations: ['domain', 'block', 'ramp']
+  })
+
+  if (existingRampTonnage) {
+    const tonnageChanges: number = foundDailyLoadingDetailPatch.totalBunchWeight - existingRecord.totalBunchWeight
+    existingRampTonnage.totalTonnage = existingRampTonnage.totalTonnage + tonnageChanges
+    existingRampTonnage.updater = user
+    await plantationInvRepo.save(existingRampTonnage)
+
+    await generateTransactionHistory(
+      existingRampTonnage,
+      dailyLoading.id,
+      dailyLoading.name,
+      TRANSACTION_TYPE.LOADING_ADJUSTMENT,
+      dailyLoading.loadingDate,
+      0,
+      tonnageChanges,
+      user,
+      tx
+    )
+  }
 }

package/server/graphql/resolvers/dashboard/dashboard-query.ts

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

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

@@ -0,0 +1,138 @@
+import { EntityManager, getRepository, Not, IsNull } from 'typeorm'
+
+import { ListParam, Domain } from '@things-factory/shell'
+import { Block, Organization, Ramp } from '../../../entities'
+
+export const dailyFfbDispatchProductionReports = {
+  async dailyFfbDispatchProductionReports(_: any, params: ListParam, context: any) {
+    try {
+      const { domain, tx }: { domain: Domain, tx: EntityManager } = 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 getRepository(Ramp).find({
+        where: { domain: domain.id, deletedAt: IsNull() },
+        relations: ['block']
+      })
+
+      let organizations = await getRepository(Organization).find({
+        where: { domain: domain.id, deletedAt: IsNull() }
+      })
+
+      let blocks = await tx.getRepository(Block).query(`
+        SELECT b.id, b.name FROM ramps r
+        INNER JOIN blocks b ON b.id = r.block_id 
+        WHERE b.deleted_at IS NULL
+        AND r.domain_id = $1
+        GROUP BY b.id, b.name         
+      `, [domain.id])
+
+
+      // --  WHERE dd.dispatch_at::timestamp between $1::timestamp and $2::timestamp
+      // [fromDateString, toDateString]
+      await tx.query(`create extension if not exists tablefunc`)
+
+      await tx.query(
+        `
+          CREATE TEMP TABLE raw_block_dispatch ON COMMIT DROP AS (
+            SELECT "name", "dispatch_at", sum(weight) AS weight	FROM(
+              SELECT * FROM (
+                SELECT dd.id,COALESCE(b.name, 'unknown') AS name, 1 AS "rank", dd.dispatch_at::date AS dispatch_at,
+                COALESCE(ddd.adjusted_weight, ddd.collected_ramp_weight, 0) AS weight
+                FROM daily_dispatches dd 
+                INNER JOIN daily_dispatch_details ddd ON ddd.daily_dispatch_id = dd.id
+                INNER JOIN ramps r ON r.id = ddd.ramp_id 
+                INNER JOIN blocks b ON b.id = r.block_id
+                WHERE dd.dispatch_at::date between $1 and $2
+                UNION
+                SELECT dd.id, COALESCE(c.name, 'unknown') AS name, CASE WHEN c.name IS NULL THEN 3 ELSE 2 END AS "rank", dd.dispatch_at::date AS dispatch_at,
+                COALESCE((SELECT SUM(COALESCE(ddd.adjusted_weight, ddd.collected_ramp_weight, 0)) FROM daily_dispatch_details ddd WHERE ddd.daily_dispatch_id = dd.id),0) AS weight	
+                FROM daily_dispatches dd 
+                LEFT JOIN organizations c ON c.id = dd.dispatch_to_id
+                WHERE dd.dispatch_at::date between $1 and $2
+              ) foo 
+              ORDER BY "rank", "name", "dispatch_at"
+            ) foo
+            GROUP BY "name", "dispatch_at"
+            ORDER BY name, "dispatch_at"
+          )          
+        `,
+        [fromDateString, toDateString]
+      )
+
+      await tx.query(
+        `
+          CREATE TEMP TABLE pivot_block_dispatch ON COMMIT DROP AS (
+            SELECT * FROM crosstab(
+              $$
+                SELECT rbd."dispatch_at",  rbd."name",
+                CONCAT('today: ', round(rbd.weight,2)::varchar, ' | todate: ', round(coalesce(sum(rbd.weight) over (PARTITION BY "name" ORDER BY name, dispatch_at asc rows between unbounded preceding and current row), 0),2)::varchar) AS weight
+                FROM raw_block_dispatch rbd
+                ORDER BY rbd."dispatch_at",  rbd."name"
+              $$,
+              $$
+                SELECT b.name FROM ramps r INNER JOIN blocks b ON b.id = r.block_id WHERE r.deleted_at IS NULL AND r.domain_id = '${domain.id}' 
+                GROUP BY b.id, b.name
+                UNION
+                SELECT c.name FROM organizations c
+              $$
+            ) AS (dispatch_at date, ${[...blocks.map(block => `"${block.name}" varchar`), ...organizations.map(organization => `"${organization.name}" varchar`)].join(',')},"unknown" varchar)
+          );
+        `
+      )
+
+      await tx.query(
+        `
+          CREATE TEMP TABLE temp_monthly_production_data ON COMMIT DROP AS (
+            SELECT TO_CHAR(md.dateDay:: DATE, 'dd/mm/yyyy') as "date"
+            , row_to_json((SELECT d FROM (SELECT ${[...blocks.map(block => `pbd."${block.name}"`), ...organizations.map(organization => `pbd."${organization.name}"`)].join(',')}, pbd."unknown") d))::varchar as "blockData"
+            , (SELECT sum(weight) FROM raw_block_dispatch rbd WHERE rbd.dispatch_at = pbd.dispatch_at) AS "today"
+            FROM (select generate_series((date '${fromDateString}')::timestamp, (date '${toDateString}')::timestamp, interval '1 day')::date as dateDay) as md 
+            LEFT JOIN pivot_block_dispatch pbd on pbd.dispatch_at::date = md.dateDay
+          );
+        `
+      )
+
+      const result: any = await tx.query(
+        `
+          select "date", "blockData", "today"
+          from temp_monthly_production_data dt
+        `
+      )
+
+      const total: any = await tx.query(
+        `
+          select count(*) from temp_monthly_production_data
+        `
+      )
+
+
+      return {
+        items: result.map(itm => {
+          return {
+            ...itm
+          }
+        }), total: total[0].count
+      }
+    } catch (error) {
+      throw error
+    }
+  }
+}