Merged in feature/IO-2501-Add-Jobs-Completed-Delivered-Not-Invoiced-Section (pull request #1107)

IO-2501 Add Jobs Complete Not Invoiced Section to Stats

Approved-by: Dave Richer

client/src/components/scoreboard-timetickets-stats/scoreboard-timetickets.component.jsx

@@ -29,7 +29,7 @@ export default connect(
 
 export function ScoreboardTimeTicketsStats({ bodyshop }) {
   const { t } = useTranslation();
-  const startDate = moment().startOf("month")
+  const startDate = moment().startOf("month");
   const endDate = moment().endOf("month");
 
   const fixedPeriods = useMemo(() => {
@@ -84,6 +84,8 @@ export function ScoreboardTimeTicketsStats({ bodyshop }) {
       end: endDate.format("YYYY-MM-DD"),
       fixedStart: fixedPeriods.start.format("YYYY-MM-DD"),
       fixedEnd: fixedPeriods.end.format("YYYY-MM-DD"),
+      jobStart: startDate,
+      jobEnd: endDate,
     },
     fetchPolicy: "network-only",
     nextFetchPolicy: "network-only",
@@ -340,11 +342,21 @@ export function ScoreboardTimeTicketsStats({ bodyshop }) {
       larData.push({ ...r, ...lar });
     });
 
+    const jobData = {};
+    data.jobs.forEach((job) => {
+      job.tthrs = job.joblines.reduce((acc, val) => acc + val.mod_lb_hrs, 0);
+    });
+    jobData.tthrs = data.jobs
+      .reduce((acc, val) => acc + val.tthrs, 0)
+      .toFixed(1);
+    jobData.count = data.jobs.length.toFixed(0);
+
     return {
       fixed: ret,
       combinedData: combinedData,
       labData: labData,
       larData: larData,
+      jobData: jobData,
     };
   }, [fixedPeriods, data, bodyshop]);
 
@@ -356,7 +368,10 @@ export function ScoreboardTimeTicketsStats({ bodyshop }) {
         <ScoreboardTimeticketsTargetsTable />
       </Col>
       <Col span={24}>
-        <ScoreboardTicketsStats data={calculatedData.fixed} />
+        <ScoreboardTicketsStats
+          data={calculatedData.fixed}
+          jobData={calculatedData.jobData}
+        />
       </Col>
       <Col span={24}>
         <ScoreboardTimeTicketsChart

client/src/components/scoreboard-timetickets-stats/scoreboard-timetickets.stats.component.jsx

@@ -41,7 +41,7 @@ function useLocalStorage(key, initialValue) {
   return [storedValue, setStoredValue];
 }
 
-export function ScoreboardTicketsStats({ data, bodyshop }) {
+export function ScoreboardTicketsStats({ data, jobData, bodyshop }) {
   const { t } = useTranslation();
   const [isLarge, setIsLarge] = useLocalStorage("isLargeStatistic", false);
 
@@ -408,7 +408,7 @@ export function ScoreboardTicketsStats({ data, bodyshop }) {
             {/* Monthly Stats */}
             <Row gutter={[16, 16]}>
               {/* This Month */}
-              <Col span={8} align="center">
+              <Col span={7} align="center">
                 <Card size="small" title={t("scoreboard.labels.thismonth")}>
                   <Row gutter={[16, 16]}>
                     <Col span={24}>
@@ -482,7 +482,7 @@ export function ScoreboardTicketsStats({ data, bodyshop }) {
                 </Card>
               </Col>
               {/* Last Month */}
-              <Col span={8} align="center">
+              <Col span={7} align="center">
                 <Card size="small" title={t("scoreboard.labels.lastmonth")}>
                   <Row gutter={[16, 16]}>
                     <Col span={24}>
@@ -556,7 +556,7 @@ export function ScoreboardTicketsStats({ data, bodyshop }) {
                 </Card>
               </Col>
               {/* Efficiency Over Period */}
-              <Col span={8} align="center">
+              <Col span={7} align="center">
                 <Card
                   size="small"
                   title={t("scoreboard.labels.efficiencyoverperiod")}
@@ -604,6 +604,40 @@ export function ScoreboardTicketsStats({ data, bodyshop }) {
                   </Row>
                 </Card>
               </Col>
+              <Col span={3} align="center">
+                <Card
+                  size="small"
+                  title={t("scoreboard.labels.jobscompletednotinvoiced")}
+                >
+                  <Row gutter={[16, 16]}>
+                    <Col span={24}>
+                      <Statistic
+                        value={jobData.count}
+                        valueStyle={{
+                          fontSize: statisticSize,
+                          fontWeight: statisticWeight,
+                        }}
+                      />
+                    </Col>
+                  </Row>
+                  <Row gutter={[16, 16]}>
+                    <Col span={24}>
+                      <Statistic
+                        title={
+                          <Typography.Text strong>
+                            {t("scoreboard.labels.totalhrs")}
+                          </Typography.Text>
+                        }
+                        value={jobData.tthrs}
+                        valueStyle={{
+                          fontSize: statisticSize,
+                          fontWeight: statisticWeight,
+                        }}
+                      />
+                    </Col>
+                  </Row>
+                </Card>
+              </Col>
             </Row>
           </Space>
           {/* Disclaimer */}

client/src/graphql/timetickets.queries.js

@@ -143,9 +143,14 @@ export const QUERY_TIME_TICKETS_IN_RANGE_SB = gql`
     $end: date!
     $fixedStart: date!
     $fixedEnd: date!
+    $jobStart: timestamptz!
+    $jobEnd: timestamptz!
   ) {
     timetickets(
-      where: { date: { _gte: $start, _lte: $end }, cost_center: {_neq: "timetickets.labels.shift"} }
+      where: {
+        date: { _gte: $start, _lte: $end }
+        cost_center: { _neq: "timetickets.labels.shift" }
+      }
       order_by: { date: desc_nulls_first }
     ) {
       actualhrs
@@ -176,7 +181,10 @@ export const QUERY_TIME_TICKETS_IN_RANGE_SB = gql`
       }
     }
     fixedperiod: timetickets(
-      where: { date: { _gte: $fixedStart, _lte: $fixedEnd }, cost_center: {_neq: "timetickets.labels.shift"} }
+      where: {
+        date: { _gte: $fixedStart, _lte: $fixedEnd }
+        cost_center: { _neq: "timetickets.labels.shift" }
+      }
       order_by: { date: desc_nulls_first }
     ) {
       actualhrs
@@ -205,6 +213,25 @@ export const QUERY_TIME_TICKETS_IN_RANGE_SB = gql`
         last_name
       }
     }
+    jobs(
+      where: {
+        date_invoiced: { _is_null: true }
+        ro_number: { _is_null: false }
+        voided: { _eq: false }
+        _or: [
+          { actual_completion: { _gte: $jobStart, _lte: $jobEnd } }
+          { actual_delivery: { _gte: $jobStart, _lte: $jobEnd } }
+        ]
+      }
+    ) {
+      id
+      joblines(order_by: { line_no: asc }, where: { removed: { _eq: false } }) {
+        convertedtolbr
+        convertedtolbr_data
+        mod_lb_hrs
+        mod_lbr_ty
+      }
+    }
   }
 `;
 

client/src/translations/en_us/common.json

@@ -2695,6 +2695,7 @@
 				"efficiencyoverperiod": "Efficiency over Selected Dates",
 				"entries": "Scoreboard Entries",
 				"jobs": "Jobs",
+				"jobscompletednotinvoiced": "Completed Not Invoiced",
 				"lastmonth": "Last Month",
 				"lastweek": "Last Week",
 				"monthlytarget": "Monthly",
@@ -2709,6 +2710,7 @@
 				"timetickets": "Time Tickets",
 				"timeticketsemployee": "Time Tickets by Employee",
 				"todateactual": "Actual (MTD)",
+				"totalhrs": "Total Hours",
 				"totaloverperiod": "Total over Selected Dates",
 				"weeklyactual": "Actual (W)",
 				"weeklytarget": "Weekly",

client/src/translations/es/common.json

@@ -2695,6 +2695,7 @@
 				"efficiencyoverperiod": "",
 				"entries": "",
 				"jobs": "",
+				"jobscompletednotinvoiced": "",
 				"lastmonth": "",
 				"lastweek": "",
 				"monthlytarget": "",
@@ -2709,6 +2710,7 @@
 				"timetickets": "",
 				"timeticketsemployee": "",
 				"todateactual": "",
+				"totalhrs": "",
 				"totaloverperiod": "",
 				"weeklyactual": "",
 				"weeklytarget": "",

client/src/translations/fr/common.json

@@ -2695,6 +2695,7 @@
 				"efficiencyoverperiod": "",
 				"entries": "",
 				"jobs": "",
+				"jobscompletednotinvoiced": "",
 				"lastmonth": "",
 				"lastweek": "",
 				"monthlytarget": "",
@@ -2709,6 +2710,7 @@
 				"timetickets": "",
 				"timeticketsemployee": "",
 				"todateactual": "",
+				"totalhrs": "",
 				"totaloverperiod": "",
 				"weeklyactual": "",
 				"weeklytarget": "",