@things-factory/operato-pms 3.8.0 → 3.8.20

package/server/graphql/types/dashboard/productions-overview.ts

@@ -0,0 +1,9 @@
+import gql from 'graphql-tag'
+
+export const ProductionsOverview = gql`
+  type ProductionsOverview {
+    averageBunchWeight: Int
+    bunchesCount: Int
+    tonnageWeighed: Int
+  }
+`

package/server/graphql/types/dashboard/tonnage-bunches-inventories.ts

@@ -0,0 +1,8 @@
+import gql from 'graphql-tag'
+
+export const TonnageBunchesInventories = gql`
+  type TonnageBunchesInventories {
+    bunches: Int
+    tonnage: Int
+  }
+`

package/server/graphql/types/dashboard/tonnage-production.ts

@@ -0,0 +1,11 @@
+import gql from 'graphql-tag'
+
+export const TonnageProduction = gql`
+  type TonnageProduction {
+    blockId: String
+    tonnage: Int
+    year: String
+    month: String
+    date: String
+  }
+`

package/server/graphql/types/dashboard/yield-production.ts

@@ -0,0 +1,11 @@
+import gql from 'graphql-tag'
+
+export const YieldProduction = gql`
+  type YieldProduction {
+    blockId: String
+    yield: Int
+    year: String
+    month: String
+    date: String
+  }
+`

package/server/graphql/types/index.ts

@@ -1,16 +1,20 @@
-export * from './block'
 export * from './block-detail'
+export * from './block'
 export * from './daily-block-detail'
-export * from './daily-dispatch'
 export * from './daily-dispatch-detail'
-export * from './daily-harvest'
+export * from './daily-dispatch'
 export * from './daily-harvest-detail'
-export * from './daily-loading'
+export * from './daily-harvest'
 export * from './daily-loading-detail'
 export * from './daily-loading-ramp'
-export * from './organization'
+export * from './daily-loading'
+export * from './dashboard'
 export * from './organization-staff'
+export * from './organization'
 export * from './plantation-inventory'
+export * from './plantation-setting'
 export * from './ramp'
-export * from './report'
 export * from './record-transaction'
+export * from './report'
+
+export * from './truck'

package/server/graphql/types/organization-staff/organization-staff-patch.ts

@@ -7,7 +7,9 @@ export const OrganizationStaffPatch = gql`
     description: String
     status: String
     staffId: String
+    type: String
     organization: ObjectRef
+    idNumber: String
     cuFlag: String
   }
 `

package/server/graphql/types/organization-staff/organization-staff.ts

@@ -6,7 +6,10 @@ export const OrganizationStaff = gql`
     name: String
     domain: Domain
     organization: Organization
+    organizationName: String
+    idNumber: String
     staffId: String
+    type: String
     status: String
     deletedAt: String
     description: String

package/server/graphql/types/plantation-setting/index.ts

@@ -0,0 +1,21 @@
+import gql from 'graphql-tag'
+
+export * from './plantation-setting'
+export * from './new-plantation-setting'
+export * from './plantation-setting-patch'
+export * from './plantation-setting-list'
+
+export const PlantationSettingResolver = gql`
+  extend type Mutation {
+    createPlantationSetting (plantationSetting: NewPlantationSetting!): PlantationSetting
+    updatePlantationSetting (name: String! patch: PlantationSettingPatch!): PlantationSetting
+    updateMultiplePlantationSetting (patches: [PlantationSettingPatch]!): [PlantationSetting]
+    deletePlantationSetting (name: String!): Boolean
+    deletePlantationSettings (names: [String]!): Boolean
+  }
+
+  extend type Query {
+    plantationSettings(filters: [Filter], pagination: Pagination, sortings: [Sorting]): PlantationSettingList
+    plantationSetting(name: String!): PlantationSetting
+  }
+`

package/server/graphql/types/plantation-setting/new-plantation-setting.ts

@@ -0,0 +1,10 @@
+import gql from 'graphql-tag'
+
+export const NewPlantationSetting = gql`
+  input NewPlantationSetting {
+    name: String
+    description: String
+    value: String
+    category: String
+  }
+`

package/server/graphql/types/plantation-setting/plantation-setting-list.ts

@@ -0,0 +1,8 @@
+import gql from 'graphql-tag'
+
+export const PlantationSettingList = gql`
+  type PlantationSettingList {
+    items: [PlantationSetting]
+    total: Int
+  }
+`

package/server/graphql/types/plantation-setting/plantation-setting-patch.ts

@@ -0,0 +1,12 @@
+import gql from 'graphql-tag'
+
+export const PlantationSettingPatch = gql`
+  input PlantationSettingPatch {
+    id: String
+    name: String
+    description: String
+    category: String
+    value: String
+    cuFlag: String
+  }
+`

package/server/graphql/types/plantation-setting/plantation-setting.ts

@@ -0,0 +1,16 @@
+import gql from 'graphql-tag'
+
+export const PlantationSetting = gql`
+  type PlantationSetting {
+    id: String
+    name: String
+    domain: Domain
+    description: String
+    category: String
+    value: String
+    updater: User
+    creator: User
+    updatedAt: String
+    createdAt: String
+  }
+`

package/server/graphql/types/report/daily-ffb-dispatch-production-report-list.ts

@@ -0,0 +1,8 @@
+import gql from 'graphql-tag'
+
+export const DailyFfbDispatchProductionReportList = gql`
+  type DailyFfbDispatchProductionReportList {
+    items: [DailyFfbDispatchProductionReport]
+    total: Int
+  }
+`

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

@@ -0,0 +1,9 @@
+import gql from 'graphql-tag'
+
+export const DailyFfbDispatchProductionReport = gql`
+  type DailyFfbDispatchProductionReport {
+    date: String
+    blockData: String 
+    today: String 
+  }
+`

package/server/graphql/types/report/index.ts

@@ -4,20 +4,28 @@ export * from './daily-production-report-list'
 export * from './daily-production-report'
 export * from './daily-staff-harvest-report-list'
 export * from './daily-staff-harvest-report'
+export * from './monthly-block-dispatch-report-list'
+export * from './monthly-block-dispatch-report'
+export * from './monthly-dispatch-summary-report-list'
+export * from './monthly-dispatch-summary-report'
 export * from './monthly-production-report-list'
 export * from './monthly-production-report'
 export * from './yearly-production-report-list'
 export * from './yearly-production-report'
+export * from './daily-ffb-dispatch-production-report'
+export * from './daily-ffb-dispatch-production-report-list'
 
 export const ReportResolver = gql`
   extend type Query {
     dailyProductionReports(filters: [Filter], pagination: Pagination, sortings: [Sorting]): DailyProductionReportList
       @transaction
+      
     monthlyProductionReports(
       filters: [Filter]
       pagination: Pagination
       sortings: [Sorting]
     ): MonthlyProductionReportList @transaction
+
     yearlyProductionReports(filters: [Filter], pagination: Pagination, sortings: [Sorting]): YearlyProductionReportList
       @transaction
     dailyStaffHarvestReports(
@@ -25,5 +33,30 @@ export const ReportResolver = gql`
       pagination: Pagination
       sortings: [Sorting]
     ): DailyStaffHarvestReportList @transaction
+
+    monthlyDispatchSummaryReports(
+      filters: [Filter], 
+      pagination: Pagination, 
+      sortings: [Sorting]
+    ): MonthlyDispatchSummaryReportList @transaction
+
+    monthlyBlockDispatchReports(
+      filters: [Filter], 
+      pagination: Pagination, 
+      sortings: [Sorting]
+    ): MonthlyBlockDispatchReportList @transaction
+
+    monthlyFfbSaleReports(
+      filters: [Filter], 
+      pagination: Pagination, 
+      sortings: [Sorting]
+    ): MonthlyDispatchSummaryReportList @transaction
+
+    dailyFfbDispatchProductionReports(
+      filters: [Filter], 
+      pagination: Pagination, 
+      sortings: [Sorting]
+    ): DailyFfbDispatchProductionReportList @transaction
   }
+  
 `

package/server/graphql/types/report/monthly-block-dispatch-report-list.ts

@@ -0,0 +1,7 @@
+import gql from 'graphql-tag'
+export const MonthlyBlockDispatchReportList = gql`
+  type MonthlyBlockDispatchReportList {
+    items: [MonthlyBlockDispatchReport]
+    total: Int
+  }
+`

package/server/graphql/types/report/monthly-block-dispatch-report.ts

@@ -0,0 +1,13 @@
+import gql from 'graphql-tag'
+
+export const MonthlyBlockDispatchReport = gql`
+  type MonthlyBlockDispatchReport {
+    no: Int
+    date: String
+    blockData: String 
+    lorryNo: String 
+    dispatchTo: String 
+    today: String 
+    todate: String 
+  }
+`

package/server/graphql/types/report/monthly-dispatch-summary-report-list.ts

@@ -0,0 +1,7 @@
+import gql from 'graphql-tag'
+export const MonthlyDispatchSummaryReportList = gql`
+  type MonthlyDispatchSummaryReportList {
+    items: [MonthlyDispatchSummaryReport]
+    total: Int
+  }
+`

package/server/graphql/types/report/monthly-dispatch-summary-report.ts

@@ -0,0 +1,19 @@
+import gql from 'graphql-tag'
+
+export const MonthlyDispatchSummaryReport = gql`
+  type MonthlyDispatchSummaryReport {
+    no: Int
+    id: String 
+    dispatchAt: String 
+    driverIdentification: String 
+    chitNo: String 
+    percentage: String 
+    lorryNo: String 
+    dispatchTo: String 
+    tonnage: String 
+    todayAvg: String 
+    todateAvg: String 
+    today: String 
+    todate: String 
+  }
+`

package/server/graphql/types/report/monthly-ffb-sale-report-list.ts

@@ -0,0 +1,7 @@
+import gql from 'graphql-tag'
+export const MonthlyFfbSaleReportList = gql`
+  type MonthlyFfbSaleReportList {
+    items: [MonthlyFfbSaleReport]
+    total: Int
+  }
+`

package/server/graphql/types/report/monthly-ffb-sale-report.ts

@@ -0,0 +1,18 @@
+import gql from 'graphql-tag'
+
+export const MonthlyFfbSaleReport = gql`
+  type MonthlyFfbSaleReport {
+    id: String
+    dispatchAt: String 
+    lorryNo: String
+    driverIdentification: String 
+    chitNo: String
+    percentage: String
+    dispatchTo: String 
+    tonnage: String
+    todayAvg: String
+    todateAvg: String
+    today: String 
+    todate: String 
+  }
+`

package/server/graphql/types/truck/index.ts

@@ -0,0 +1,18 @@
+import gql from 'graphql-tag'
+
+export * from './truck'
+export * from './new-truck'
+export * from './truck-patch'
+export * from './truck-list'
+
+export const TruckResolver = gql`
+  extend type Mutation {
+    updateMultipleTruck(patches: [TruckPatch]!): [Truck] @transaction
+    deleteTrucks(ids: [String]!): Boolean @transaction
+  }
+
+  extend type Query {
+    trucks(filters: [Filter], pagination: Pagination, sortings: [Sorting]): TruckList @transaction
+    truck(name: String!): Truck @transaction
+  }
+`

package/server/graphql/types/truck/new-truck.ts

@@ -0,0 +1,8 @@
+import gql from 'graphql-tag'
+
+export const NewTruck = gql`
+  input NewTruck {
+    name: String!
+    description: String
+  }
+`

package/server/graphql/types/truck/truck-list.ts

@@ -0,0 +1,8 @@
+import gql from 'graphql-tag'
+
+export const TruckList = gql`
+  type TruckList {
+    items: [Truck]
+    total: Int
+  }
+`

package/server/graphql/types/truck/truck-patch.ts

@@ -0,0 +1,11 @@
+import gql from 'graphql-tag'
+
+export const TruckPatch = gql`
+  input TruckPatch {
+    id: String
+    name: String
+    description: String
+    organization: ObjectRef
+    cuFlag: String
+  }
+`

package/server/graphql/types/truck/truck.ts

@@ -0,0 +1,16 @@
+import gql from 'graphql-tag'
+
+export const Truck = gql`
+  type Truck {
+    id: String
+    name: String
+    domain: Domain
+    description: String
+    organization: Organization
+    deletedAt: String
+    updater: User
+    creator: User
+    updatedAt: String
+    createdAt: String
+  }
+`

package/server/utils/core-values.ts

@@ -43,8 +43,8 @@ export async function getDailyBlockCalculatedValues(
           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/server/utils/transaction-util.ts

@@ -47,7 +47,8 @@ export async function generateTransactionHistory(
   if (
     transactionType === TRANSACTION_TYPE.LOADING ||
     transactionType === TRANSACTION_TYPE.DISPATCHMENT ||
-    transactionType === TRANSACTION_TYPE.TONNAGE_ADJUSTMENT
+    transactionType === TRANSACTION_TYPE.LOADING_ADJUSTMENT ||
+    transactionType === TRANSACTION_TYPE.DISPATCHMENT_ADJUSTMENT
   ) {
     await switchRampStatus(domain, ramp, user, trxMgr)
   }

package/things-factory.config.js

@@ -1,5 +1,5 @@
-import route from './client/route'
 import bootstrap from './client/bootstrap'
+import route from './client/route'
 
 export default {
   route,
@@ -24,6 +24,10 @@ export default {
       tagname: 'master-ramp',
       page: 'master-ramp'
     },
+    {
+      tagname: 'master-truck',
+      page: 'master-truck'
+    },
     {
       tagname: 'harvesting-home',
       page: 'harvesting-home'
@@ -115,6 +119,28 @@ export default {
     {
       tagname: 'report-daily-staff-harvest',
       page: 'report-daily-staff-harvest'
+    },
+    {
+      tagname: 'report-daily-ffb-dispatch-and-production',
+      page: 'report-daily-ffb-dispatch-and-production'
+    },
+    {
+      tagname: 'report-ffb-tonnage-between-individual-block',
+      page: 'report-ffb-tonnage-between-individual-block'
+    },
+    {
+      tagname: 'report-monthly-ffb-sale',
+      page: 'report-monthly-ffb-sale'
+    },
+
+    /* Setting Section */
+    {
+      tagname: 'setting-home',
+      page: 'setting-home'
+    },
+    {
+      tagname: 'plantation-setting',
+      page: 'plantation-setting'
     }
   ],
   bootstrap