+
{
return gql`
query QUERY_DASHBOARD_DETAILS {
${componentBasedAdditions}
+ monthly_sales: jobs(where: {_and: [{date_invoiced: {_gte: "${moment()
+ .startOf("month")
+ .format("YYYY-MM-DD")}"}}, {date_invoiced: {_lte: "${moment()
+ .endOf("month")
+ .format("YYYY-MM-DD")}"}}]}) {
+ id
+ date_invoiced
+ job_totals
+ rate_la1
+ rate_la2
+ rate_la3
+ rate_la4
+ rate_laa
+ rate_lab
+ rate_lad
+ rate_lae
+ rate_laf
+ rate_lag
+ rate_lam
+ rate_lar
+ rate_las
+ rate_lau
+ rate_ma2s
+ rate_ma2t
+ rate_ma3s
+ rate_mabl
+ rate_macs
+ rate_mahw
+ rate_mapa
+ rate_mash
+ rate_matd
+ joblines(where: { removed: { _eq: false } }) {
+ id
+ mod_lbr_ty
+ mod_lb_hrs
+ act_price
+ part_qty
+ part_type
+ }
+ }
production_jobs: jobs(where: { inproduction: { _eq: true } }) {
id
ro_number
diff --git a/client/src/components/dashboard-grid/dashboard-grid.styles.scss b/client/src/components/dashboard-grid/dashboard-grid.styles.scss
index 9f831ff1c..62a3ae72b 100644
--- a/client/src/components/dashboard-grid/dashboard-grid.styles.scss
+++ b/client/src/components/dashboard-grid/dashboard-grid.styles.scss
@@ -127,13 +127,28 @@
.dashboard-card {
height: 100%;
width: 100%;
-
.ant-card-body {
- // background-color: red;
- height: 90%;
+ height: 80%;
width: 100%;
- display: flex;
- flex-direction: column;
- align-items: center;
+ // // background-color: red;
+ // height: 90%;
+ // width: 100%;
+ // padding: 8px;
+ // display: flex;
+ // flex-direction: column;
+ // align-items: center;
+ // justify-content: center;
+ }
+ .ant-spin-nested-loading {
+ height: 100%;
+ .ant-spin-container {
+ height: 100%;
+ .ant-table {
+ height: 100%;
+ .ant-table-container {
+ height: 100%;
+ }
+ }
+ }
}
}
diff --git a/client/src/components/header/header.component.jsx b/client/src/components/header/header.component.jsx
index c7467c60a..2c3887891 100644
--- a/client/src/components/header/header.component.jsx
+++ b/client/src/components/header/header.component.jsx
@@ -3,6 +3,7 @@ import Icon, {
BarChartOutlined,
CarFilled,
ClockCircleFilled,
+ DashboardFilled,
DollarCircleFilled,
ExportOutlined,
FieldTimeOutlined,
@@ -18,7 +19,6 @@ import Icon, {
ScheduleOutlined,
SettingOutlined,
TeamOutlined,
- DashboardFilled,
ToolFilled,
UnorderedListOutlined,
UserOutlined,
@@ -46,7 +46,6 @@ import {
import { setModalContext } from "../../redux/modals/modals.actions";
import { signOutStart } from "../../redux/user/user.actions";
import { selectCurrentUser } from "../../redux/user/user.selectors";
-import GlobalSearch from "../global-search/global-search.component";
const mapStateToProps = createStructuredSelector({
currentUser: selectCurrentUser,
diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json
index e66a95d4a..1eb0ae3c6 100644
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -672,12 +672,16 @@
},
"labels": {
"bodyhrs": "Body Hrs",
- "dollarsinproduction": "Dollars in Production",
+ "dollarsinproduction": "Dollars in Production'",
"prodhrs": "Production Hrs",
"refhrs": "Refinish Hrs"
},
"titles": {
+ "monthlyjobcosting": "Monthly Job Costing ",
+ "monthlylaborsales": "Monthly Labor Sales",
+ "monthlypartssales": "Monthly Parts Sales",
"monthlyrevenuegraph": "Monthly Revenue Graph",
+ "prodhrssummary": "Production Hours Summary",
"productiondollars": "Total dollars in production",
"productionhours": "Total hours in production",
"projectedmonthlysales": "Projected Monthly Sales"
diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json
index a92dffe59..6cbc97daa 100644
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -677,7 +677,11 @@
"refhrs": ""
},
"titles": {
+ "monthlyjobcosting": "",
+ "monthlylaborsales": "",
+ "monthlypartssales": "",
"monthlyrevenuegraph": "",
+ "prodhrssummary": "",
"productiondollars": "",
"productionhours": "",
"projectedmonthlysales": ""
diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json
index b1e8b255a..f9b208bd5 100644
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -677,7 +677,11 @@
"refhrs": ""
},
"titles": {
+ "monthlyjobcosting": "",
+ "monthlylaborsales": "",
+ "monthlypartssales": "",
"monthlyrevenuegraph": "",
+ "prodhrssummary": "",
"productiondollars": "",
"productionhours": "",
"projectedmonthlysales": ""