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

Added working days to scheduling IO-153

Browse Source
This commit is contained in:
Patrick Fic
2021-01-29 17:26:48 -08:00
parent e71a7bd17b
commit 10e70230ba
20 changed files with 638 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.component.jsx
View File

@@ -184,6 +184,9 @@ export function JobsDetailHeaderActions({
{ defaultOpenStatus: bodyshop.md_ro_statuses.default_imported },
(newJobId) => {
history.push(`/manage/jobs/${newJobId}`);
notification["success"]({
message: t("jobs.successes.duplicated"),
});
}
)
}

37
client/src/components/schedule-calendar-wrapper/schedule-calendar-header.component.js
View File

@@ -8,13 +8,14 @@ import { Link } from "react-router-dom";
import { createStructuredSelector } from "reselect";
import {
selectScheduleLoad,
selectScheduleLoadCalculating
selectScheduleLoadCalculating,
} from "../../redux/application/application.selectors";
import { selectBodyshop } from "../../redux/user/user.selectors";
import { DateTimeFormatter } from "../../utils/DateFormatter";
import LoadingSkeleton from "../loading-skeleton/loading-skeleton.component";
import ScheduleBlockDay from "../schedule-block-day/schedule-block-day.component";
import ScheduleCalendarHeaderGraph from "./schedule-calendar-header-graph.component";
import moment from "moment";
const mapStateToProps = createStructuredSelector({
bodyshop: selectBodyshop,
@@ -124,10 +125,42 @@ export function ScheduleCalendarHeaderComponent({
</div>
) : null;
const isShopOpen = (date) => {
let day;
switch (moment(date).day()) {
case 0:
day = "sunday";
break;
case 1:
day = "monday";
break;
case 2:
day = "tuesday";
break;
case 3:
day = "wednesday";
break;
case 4:
day = "thursday";
break;
case 5:
day = "friday";
break;
case 6:
day = "saturday";
break;
default:
day = "sunday";
break;
}
return bodyshop.workingdays[day];
};
return (
<div className="imex-calendar-load">
<ScheduleBlockDay date={date} refetch={refetch}>
<div>
<div style={{ color: isShopOpen(date) ? "" : "tomato" }}>
{label}
{calculating ? <LoadingSkeleton /> : LoadComponent}
</div>

4
client/src/components/schedule-job-modal/schedule-job-modal.component.jsx
View File

@@ -31,7 +31,7 @@ export function ScheduleJobModalComponent({
const [loading, setLoading] = useState(false);
const [smartOptions, setSmartOptions] = useState([]);
const handleAuto = async () => {
const handleSmartScheduling = async () => {
setLoading(true);
try {
const response = await axios.post("/scheduling/job", {
@@ -92,7 +92,7 @@ export function ScheduleJobModalComponent({
</Form.Item>
</LayoutFormRow>
<Card title={t("appointments.labels.smartscheduling")}>
<Button onClick={handleAuto} loading={loading}>
<Button onClick={handleSmartScheduling} loading={loading}>
{t("appointments.actions.calculate")}
</Button>
{smartOptions.length > 0 && (

51
client/src/components/shop-info/shop-info.component.jsx
View File

@@ -193,6 +193,57 @@ export default function ShopInfoComponent({ form, saveLoading }) {
<InputNumber min={15} precision={0} />
</Form.Item>
</LayoutFormRow>
<LayoutFormRow header={t("bodyshop.labels.workingdays")}>
<Form.Item
label={t("general.labels.sunday")}
name={["workingdays", "sunday"]}
valuePropName="checked"
>
<Switch />
</Form.Item>
<Form.Item
label={t("general.labels.monday")}
name={["workingdays", "monday"]}
valuePropName="checked"
>
<Switch />
</Form.Item>
<Form.Item
label={t("general.labels.tuesday")}
name={["workingdays", "tuesday"]}
valuePropName="checked"
>
<Switch />
</Form.Item>
<Form.Item
label={t("general.labels.wednesday")}
name={["workingdays", "wednesday"]}
valuePropName="checked"
>
<Switch />
</Form.Item>
<Form.Item
label={t("general.labels.thursday")}
name={["workingdays", "thursday"]}
valuePropName="checked"
>
<Switch />
</Form.Item>
<Form.Item
label={t("general.labels.friday")}
name={["workingdays", "friday"]}
valuePropName="checked"
>
<Switch />
</Form.Item>
<Form.Item
label={t("general.labels.saturday")}
name={["workingdays", "saturday"]}
valuePropName="checked"
>
<Switch />
</Form.Item>
</LayoutFormRow>
<LayoutFormRow>
<Form.Item
label={t("bodyshop.fields.dailypainttarget")}

2
client/src/graphql/bodyshop.queries.js
View File

@@ -76,6 +76,7 @@ export const QUERY_BODYSHOP = gql`
schedule_end_time
imexshopid
default_adjustment_rate
workingdays
employees {
id
first_name
@@ -150,6 +151,7 @@ export const UPDATE_SHOP = gql`
schedule_end_time
imexshopid
default_adjustment_rate
workingdays
employees {
id
first_name

2
client/src/pages/manage/manage.page.component.jsx
View File

@@ -385,7 +385,7 @@ export function Manage({ match, conflict }) {
<BackTop />
<div style={{ textAlign: "center", margin: "1rem 0rem" }}>
<div>
{`ImEX Online V.${process.env.NODE_ENV}-${process.env.REACT_APP_GIT_SHA}`}{" "}
{`ImEX Online V.${process.env.NODE_ENV}-${process.env.REACT_APP_GIT_SHA}`}
</div>
<Link to="/about" target="_blank" style={{ color: "#ccc" }}>
Disclaimer

10
client/src/translations/en_us/common.json
View File

@@ -393,7 +393,8 @@
},
"scheduling": "SMART Scheduling",
"shopinfo": "Shop Information",
"speedprint": "Speed Print Configuration"
"speedprint": "Speed Print Configuration",
"workingdays": "Working Days"
},
"successes": {
"save": "Shop configuration saved successfully. "
@@ -687,6 +688,7 @@
"email": "Email",
"errors": "Errors",
"exceptiontitle": "An error has occurred.",
"friday": "Friday",
"hours": "hrs",
"in": "In",
"instanceconflictext": "Your $t(titles.app) account can only be used on one device at any given time. Refresh your session to take control.",
@@ -695,6 +697,7 @@
"loadingapp": "Loading $t(titles.app)",
"loadingshop": "Loading shop data...",
"loggingin": "Authorizing...",
"monday": "Monday",
"na": "N/A",
"no": "No",
"out": "Out",
@@ -704,15 +707,20 @@
"passwordsdonotmatch": "The passwords you have entered do not match.",
"print": "Print",
"required": "Required",
"saturday": "Saturday",
"search": "Search...",
"selectdate": "Select date...",
"sendagain": "Send Again",
"sendby": "Send By",
"sunday": "Sunday",
"text": "Text",
"thursday": "Thursday",
"totals": "Totals",
"tuesday": "Tuesday",
"unknown": "Unknown",
"username": "Username",
"view": "View",
"wednesday": "Wednesday",
"yes": "Yes"
},
"languages": {

10
client/src/translations/es/common.json
View File

@@ -393,7 +393,8 @@
},
"scheduling": "",
"shopinfo": "",
"speedprint": ""
"speedprint": "",
"workingdays": ""
},
"successes": {
"save": ""
@@ -687,6 +688,7 @@
"email": "",
"errors": "",
"exceptiontitle": "",
"friday": "",
"hours": "",
"in": "en",
"instanceconflictext": "",
@@ -695,6 +697,7 @@
"loadingapp": "Cargando $t(titles.app)",
"loadingshop": "Cargando datos de la tienda ...",
"loggingin": "Iniciando sesión ...",
"monday": "",
"na": "N / A",
"no": "",
"out": "Afuera",
@@ -704,15 +707,20 @@
"passwordsdonotmatch": "",
"print": "",
"required": "",
"saturday": "",
"search": "Buscar...",
"selectdate": "",
"sendagain": "",
"sendby": "",
"sunday": "",
"text": "",
"thursday": "",
"totals": "",
"tuesday": "",
"unknown": "Desconocido",
"username": "",
"view": "",
"wednesday": "",
"yes": ""
},
"languages": {

10
client/src/translations/fr/common.json
View File

@@ -393,7 +393,8 @@
},
"scheduling": "",
"shopinfo": "",
"speedprint": ""
"speedprint": "",
"workingdays": ""
},
"successes": {
"save": ""
@@ -687,6 +688,7 @@
"email": "",
"errors": "",
"exceptiontitle": "",
"friday": "",
"hours": "",
"in": "dans",
"instanceconflictext": "",
@@ -695,6 +697,7 @@
"loadingapp": "Chargement de $t(titles.app)",
"loadingshop": "Chargement des données de la boutique ...",
"loggingin": "Vous connecter ...",
"monday": "",
"na": "N / A",
"no": "",
"out": "En dehors",
@@ -704,15 +707,20 @@
"passwordsdonotmatch": "",
"print": "",
"required": "",
"saturday": "",
"search": "Chercher...",
"selectdate": "",
"sendagain": "",
"sendby": "",
"sunday": "",
"text": "",
"thursday": "",
"totals": "",
"tuesday": "",
"unknown": "Inconnu",
"username": "",
"view": "",
"wednesday": "",
"yes": ""
},
"languages": {

19
client/src/utils/TemplateConstants.js
View File

@@ -16,7 +16,7 @@ export const TemplateList = (type, context) => {
title: i18n.t("printcenter.jobs.estimate_detail"),
description: "Est Detail",
subject: `${i18n.t("printcenter.jobs.estimate_detail")} - ${
context.job.ro_number
context && context.job && context.job.ro_number
}`,
key: "estimate_detail",
disabled: false,
@@ -25,7 +25,7 @@ export const TemplateList = (type, context) => {
title: i18n.t("printcenter.jobs.casl_authorization"),
description: "CASL Authorization",
subject: `${i18n.t("printcenter.jobs.casl_authorization")} - ${
context.job.ro_number
context && context.job && context.job.ro_number
}`,
key: "casl_authorization",
disabled: false,
@@ -35,7 +35,7 @@ export const TemplateList = (type, context) => {
description: "Diagnostic Authorization",
subject: `${i18n.t(
"printcenter.jobs.diagnostic_authorization"
)} - ${context.job.ro_number}`,
)} - ${context && context.job && context.job.ro_number}`,
key: "diagnostic_authorization",
disabled: false,
},
@@ -43,7 +43,7 @@ export const TemplateList = (type, context) => {
title: i18n.t("printcenter.jobs.job_notes"),
description: "All Jobs Notes",
subject: `${i18n.t("printcenter.jobs.job_notes")} - ${
context.job.ro_number
context && context.job && context.job.ro_number
}`,
key: "job_notes",
disabled: false,
@@ -57,7 +57,7 @@ export const TemplateList = (type, context) => {
description: "Appointment Confirmation",
subject: `${i18n.t(
"printcenter.appointments.appointment_confirmation"
)} - ${context.job.ro_number}`,
)} - ${context && context.job && context.job.ro_number}`,
key: "appointment_confirmation",
disabled: false,
},
@@ -70,7 +70,14 @@ export const TemplateList = (type, context) => {
description: "Parts Order",
key: "parts_order_confirmation",
subject: `${bodyshop.shopname} Parts Order ${
(context && context.job && context.job.ro_number) || ""
(context &&
context &&
context.job &&
context.job &&
context &&
context.job &&
context.job.ro_number) ||
""
}`,
disabled: false,
},