admin/bodyshop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged in release/2023-04-28 (pull request #732)

Browse Source 
Release/2023 04 28
This commit is contained in:
Patrick Fic
2023-04-27 22:21:03 +00:00
parent 329bdbe22d ea7c22daec
commit 23fcdd6375
2 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
client/src/components/tech-job-statistics/tech-job-statistics.component.jsx
View File

@@ -1,16 +1,14 @@
import { Card, Col, Space, Statistic, Typography } from "antd";
import { useLocation } from "react-router-dom";
import queryString from "query-string";
import moment from "moment";
import { useQuery } from "@apollo/client"; import { useQuery } from "@apollo/client";
import { QUERY_TIME_TICKETS_TECHNICIAN_IN_RANGE } from "../../graphql/timetickets.queries"; import { Card, Col, Space, Statistic, Typography } from "antd";
import { createStructuredSelector } from "reselect"; import moment from "moment";
import { selectTechnician } from "../../redux/tech/tech.selectors";
import { connect } from "react-redux";
import AlertComponent from "../alert/alert.component";
import LoadingSpinner from "../loading-spinner/loading-spinner.component";
import { useMemo } from "react"; import { useMemo } from "react";
import { useTranslation } from "react-i18next"; import { useTranslation } from "react-i18next";
import { connect } from "react-redux";
import { createStructuredSelector } from "reselect";
import { QUERY_TIME_TICKETS_TECHNICIAN_IN_RANGE } from "../../graphql/timetickets.queries";
import { selectTechnician } from "../../redux/tech/tech.selectors";
import AlertComponent from "../alert/alert.component";
import LoadingSpinner from "../loading-spinner/loading-spinner.component";
const { Title } = Typography; const { Title } = Typography;
const mapStateToProps = createStructuredSelector({ const mapStateToProps = createStructuredSelector({
@@ -21,7 +19,7 @@ const mapDispatchToProps = (dispatch) => ({});
const TechJobStatistics = ({ technician }) => { const TechJobStatistics = ({ technician }) => {
const { t } = useTranslation(); const { t } = useTranslation();
const startDate = moment().startOf("week") const startDate = moment().startOf("week");
const endDate = moment().endOf("week"); const endDate = moment().endOf("week");
const { loading, error, data } = useQuery( const { loading, error, data } = useQuery(

4
os-loader.js
View File

@@ -177,7 +177,7 @@ plate_no
bulkOperation.push({ index: { _index: "payments", _id: payment.id } }); bulkOperation.push({ index: { _index: "payments", _id: payment.id } });
bulkOperation.push({ bulkOperation.push({
..._.omit(payment, ["job"]), ..._.omit(payment, ["job"]),
bodyshopid: payment.job.id, bodyshopid: payment.job.bodyshopid,
}); });
}); });
promiseQueue.push(bulkOperation); promiseQueue.push(bulkOperation);
@@ -213,7 +213,7 @@ plate_no
bulkOperation.push({ index: { _index: "bills", _id: bill.id } }); bulkOperation.push({ index: { _index: "bills", _id: bill.id } });
bulkOperation.push({ bulkOperation.push({
..._.omit(bill, ["job"]), ..._.omit(bill, ["job"]),
bodyshopid: bill.job.id, bodyshopid: bill.job.bodyshopid,
}); });
}); });
promiseQueue.push(bulkOperation); promiseQueue.push(bulkOperation);