diff --git a/client/src/components/scoreboard-targets-table/scoreboard-targets-table.util.js b/client/src/components/scoreboard-targets-table/scoreboard-targets-table.util.js
index 804d808e2..1c66cb7fc 100644
--- a/client/src/components/scoreboard-targets-table/scoreboard-targets-table.util.js
+++ b/client/src/components/scoreboard-targets-table/scoreboard-targets-table.util.js
@@ -1,69 +1,42 @@
 import dayjs from "../../utils/day";
 
-// dayjs.updateLocale("ca", {
-//   workingWeekdays: [1, 2, 3, 4, 5, 6],
-// });
+export const CalculateWorkingDaysThisMonth = () =>
+    dayjs().endOf("month").businessDaysInMonth().length;
 
-export const CalculateWorkingDaysThisMonth = () => {
-  return dayjs().endOf("month").businessDaysInMonth();
-};
+export const CalculateWorkingDaysInPeriod = (start, end) =>
+    dayjs(end).businessDiff(dayjs(start));
 
-export const CalculateWorkingDaysInPeriod = (start, end) => {
-  return dayjs(start).businessDiff(dayjs(end));
-};
+export const CalculateWorkingDaysAsOfToday = () =>
+    dayjs().businessDaysInMonth().length;
 
-export const CalculateWorkingDaysAsOfToday = () => {
-  return dayjs().businessDaysInMonth();
-};
+export const CalculateWorkingDaysLastMonth = () =>
+    dayjs().subtract(1, "month").endOf("month").businessDaysInMonth().length;
 
-export const CalculateWorkingDaysLastMonth = () => {
-  return dayjs().subtract(1, "month").endOf("month").businessDaysInMonth();
-};
+export const WeeklyTargetHrs = (dailyTargetHrs) =>
+    dailyTargetHrs * CalculateWorkingDaysInPeriod(dayjs().startOf("week"), dayjs().endOf("week"));
 
-export const WeeklyTargetHrs = (dailyTargetHrs, bodyshop) => {
-  return (
-    dailyTargetHrs *
-    CalculateWorkingDaysInPeriod(
-      dayjs().startOf("week"),
-      dayjs().endOf("week")
-    )
-  );
-};
+export const WeeklyTargetHrsInPeriod = (dailyTargetHrs, start, end) =>
+    dailyTargetHrs * CalculateWorkingDaysInPeriod(start, end);
 
-export const WeeklyTargetHrsInPeriod = (
-  dailyTargetHrs,
-  start,
-  end,
-  bodyshop
-) => {
-  return dailyTargetHrs * CalculateWorkingDaysInPeriod(start, end);
-};
+export const MonthlyTargetHrs = (dailyTargetHrs) =>
+    dailyTargetHrs * CalculateWorkingDaysThisMonth();
 
-export const MonthlyTargetHrs = (dailyTargetHrs, bodyshop) => {
-  return dailyTargetHrs * CalculateWorkingDaysThisMonth();
-};
+export const LastMonthTargetHrs = (dailyTargetHrs) =>
+    dailyTargetHrs * CalculateWorkingDaysLastMonth();
 
-export const LastMonthTargetHrs = (dailyTargetHrs, bodyshop) => {
-  return dailyTargetHrs * CalculateWorkingDaysLastMonth();
-};
+export const AsOfTodayTargetHrs = (dailyTargetHrs) =>
+    dailyTargetHrs * CalculateWorkingDaysAsOfToday();
 
-export const AsOfTodayTargetHrs = (dailyTargetHrs, bodyshop) => {
-  return dailyTargetHrs * CalculateWorkingDaysAsOfToday();
-};
-
-export const AsOfDateTargetHours = (dailyTargetHours, date) => {
-  return (
-    dailyTargetHours * dayjs().startOf("month").businessDiff(dayjs(date))
-  );
-};
+export const AsOfDateTargetHours = (dailyTargetHours, date) =>
+    dailyTargetHours * dayjs(date).businessDiff(dayjs().startOf("month"));
 
 export const ListOfDaysInCurrentMonth = () => {
   const days = [];
-  const dateStart = dayjs().startOf("month");
+  let dateStart = dayjs().startOf("month");
   const dateEnd = dayjs().endOf("month");
   while (dateEnd.diff(dateStart, "day") > 0) {
     days.push(dateStart.format("YYYY-MM-DD"));
-    dateStart.add(1, "day");
+    dateStart = dateStart.add(1, "day");
   }
   days.push(dateEnd.format("YYYY-MM-DD"));
   return days;
@@ -71,12 +44,11 @@ export const ListOfDaysInCurrentMonth = () => {
 
 export const ListDaysBetween = ({ start, end }) => {
   const days = [];
-  const dateStart = dayjs(start);
+  let dateStart = dayjs(start);
   const dateEnd = dayjs(end);
-  while (dateEnd.diff(dateStart, "day") > 0) {
+  while (dateEnd.diff(dateStart, "day") >= 0) {
     days.push(dateStart.format("YYYY-MM-DD"));
-    dateStart.add(1, "day");
+    dateStart = dateStart.add(1, "day");
   }
-  days.push(dateEnd.format("YYYY-MM-DD"));
   return days;
-};
+};
\ No newline at end of file
diff --git a/client/src/components/scoreboard-timetickets/scoreboard-timetickets.component.jsx b/client/src/components/scoreboard-timetickets/scoreboard-timetickets.component.jsx
index f5e12f818..b38798d44 100644
--- a/client/src/components/scoreboard-timetickets/scoreboard-timetickets.component.jsx
+++ b/client/src/components/scoreboard-timetickets/scoreboard-timetickets.component.jsx
@@ -63,6 +63,8 @@ export default function ScoreboardTimeTickets() {
     variables: {
       start: startDate.format("YYYY-MM-DD"),
       end: endDate.format("YYYY-MM-DD"),
+      jobStart: startDate,
+      jobEnd: endDate,
       fixedStart: fixedPeriods.start.format("YYYY-MM-DD"),
       fixedEnd: fixedPeriods.end.format("YYYY-MM-DD"),
     },