- Merge release and adjust due to version differences

Signed-off-by: Dave Richer <dave@imexsystems.ca>

client/src/components/dashboard-grid/dashboard-grid.component.jsx

@@ -270,26 +270,22 @@ const componentList = {
         h: 2,
     },
     ScheduleInToday: {
-        label: i18next.t("dashboard.titles.scheduledintoday", {
-            date: dayjs().startOf("day").format("MM/DD/YYYY"),
-        }),
+        label: i18next.t("dashboard.titles.scheduledintoday"),
         component: DashboardScheduledInToday,
         gqlFragment: DashboardScheduledInTodayGql,
-        minW: 10,
+        minW: 6,
         minH: 2,
         w: 10,
-        h: 2,
+        h: 3,
     },
     ScheduleOutToday: {
-        label: i18next.t("dashboard.titles.scheduledouttoday", {
-            date: dayjs().startOf("day").format("MM/DD/YYYY"),
-        }),
+        label: i18next.t("dashboard.titles.scheduledouttoday"),
         component: DashboardScheduledOutToday,
         gqlFragment: DashboardScheduledOutTodayGql,
-        minW: 10,
+        minW: 6,
         minH: 2,
         w: 10,
-        h: 2,
+        h: 3,
     },
 };
 
@@ -301,8 +297,7 @@ const createDashboardQuery = (state) => {
             .map((item, index) => componentList[item.i].gqlFragment || "")
             .join("");
     return gql`
-        query QUERY_DASHBOARD_DETAILS {
-            ${componentBasedAdditions || ""}
+        query QUERY_DASHBOARD_DETAILS { ${componentBasedAdditions || ""}
             monthly_sales: jobs(where: {_and: [
                 { voided: {_eq: false}},
                 {date_invoiced: {_gte: "${dayjs()
@@ -312,7 +307,7 @@ const createDashboardQuery = (state) => {
     .endOf("month")
     .endOf("day")
     .toISOString()}"}}]}) {
-    id
+      id
                 ro_number
                 date_invoiced
                 job_totals
@@ -376,6 +371,5 @@ const createDashboardQuery = (state) => {
                     }
                 }
                 }
-            }
-    `;
+            }`;
 };

client/src/components/dashboard-grid/dashboard-grid.styles.scss

@@ -145,7 +145,7 @@
   width: 100%;
 
   .ant-card-body {
-    height: 80%;
+    height: calc(100% - 2rem);
     width: 100%;
     // //  background-color: red;
     // height: 90%;