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

Added detail for departing jos ons chedule BOD-254

Browse Source
This commit is contained in:
Patrick Fic
2020-08-17 10:11:56 -07:00
parent 85ee5bac04
commit 5efb21ada7
15 changed files with 427 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
bodyshop_translations.babel
View File

@@ -526,6 +526,27 @@
</translation> </translation>
</translations> </translations>
</concept_node> </concept_node>
<concept_node>
<name>completingjobs</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-MX</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-CA</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node> <concept_node>
<name>history</name> <name>history</name>
<definition_loaded>false</definition_loaded> <definition_loaded>false</definition_loaded>
@@ -547,6 +568,27 @@
</translation> </translation>
</translations> </translations>
</concept_node> </concept_node>
<concept_node>
<name>nocompletingjobs</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-MX</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-CA</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node> <concept_node>
<name>nodateselected</name> <name>nodateselected</name>
<definition_loaded>false</definition_loaded> <definition_loaded>false</definition_loaded>
@@ -1463,6 +1505,27 @@
</translation> </translation>
</translations> </translations>
</concept_node> </concept_node>
<concept_node>
<name>prodtargethrs</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-MX</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-CA</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node> <concept_node>
<name>responsibilitycenter</name> <name>responsibilitycenter</name>
<definition_loaded>false</definition_loaded> <definition_loaded>false</definition_loaded>
@@ -6732,6 +6795,27 @@
</translation> </translation>
</translations> </translations>
</concept_node> </concept_node>
<concept_node>
<name>hours</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-MX</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-CA</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node> <concept_node>
<name>in</name> <name>in</name>
<definition_loaded>false</definition_loaded> <definition_loaded>false</definition_loaded>

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

@@ -1,20 +1,23 @@
import Icon from "@ant-design/icons"; import Icon from "@ant-design/icons";
import { Statistic } from "antd"; import { Popover, Statistic } from "antd";
import React from "react"; import React from "react";
import { useTranslation } from "react-i18next";
import { MdFileDownload, MdFileUpload } from "react-icons/md"; import { MdFileDownload, MdFileUpload } from "react-icons/md";
import { connect } from "react-redux"; import { connect } from "react-redux";
import { Link } from "react-router-dom";
import { createStructuredSelector } from "reselect"; import { createStructuredSelector } from "reselect";
import { import {
selectScheduleLoad, selectScheduleLoad,
selectScheduleLoadCalculating, selectScheduleLoadCalculating,
} from "../../redux/application/application.selectors"; } 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 LoadingSkeleton from "../loading-skeleton/loading-skeleton.component";
import ScheduleBlockDay from "../schedule-block-day/schedule-block-day.component"; import ScheduleBlockDay from "../schedule-block-day/schedule-block-day.component";
const ShopTargetHrs = 100;
const mapStateToProps = createStructuredSelector({ const mapStateToProps = createStructuredSelector({
//currentUser: selectCurrentUser //currentUser: selectCurrentUser
bodyshop: selectBodyshop,
load: selectScheduleLoad, load: selectScheduleLoad,
calculating: selectScheduleLoadCalculating, calculating: selectScheduleLoadCalculating,
}); });
@@ -24,6 +27,7 @@ const mapDispatchToProps = (dispatch) => ({
}); });
export function ScheduleCalendarHeaderComponent({ export function ScheduleCalendarHeaderComponent({
bodyshop,
label, label,
refetch, refetch,
date, date,
@@ -31,28 +35,70 @@ export function ScheduleCalendarHeaderComponent({
calculating, calculating,
...otherProps ...otherProps
}) { }) {
const { t } = useTranslation();
const loadData = load[date.toISOString().substr(0, 10)]; const loadData = load[date.toISOString().substr(0, 10)];
const LoadComponent = loadData ? ( const popContent = () => (
<div className="imex-flex-row imex-flex-row__flex-space-around"> <div onClick={(e) => e.stopPropagation()}>
<Icon component={MdFileDownload} style={{ color: "green" }} /> <table>
{(loadData.hoursIn || 0) && loadData.hoursIn.toFixed(2)} <tbody>
<Icon component={MdFileUpload} style={{ color: "red" }} /> {loadData && loadData.jobsOut ? (
{(loadData.hoursOut || 0) && loadData.hoursOut.toFixed(2)} loadData.jobsOut.map((j) => (
<Statistic <tr key={j.id}>
value={((loadData.expectedLoad || 0) / ShopTargetHrs) * 100} <td>
suffix={"%"} <Link to={`/manage/jobs/${j.id}`}>{j.ro_number}</Link>
precision={0} </td>
valueStyle={{ <td>
color: {`(${(
Math.abs( j.labhrs.aggregate.sum.mod_lb_hrs +
100 - ((loadData.expectedLoad || 0) / ShopTargetHrs) * 100 j.larhrs.aggregate.sum.mod_lb_hrs
) <= 10 ).toFixed(1)} ${t("general.labels.hours")})`}
? "green" </td>
: "red", <td>
}} <DateTimeFormatter>
/> {j.scheduled_completion}
</DateTimeFormatter>
</td>
</tr>
))
) : (
<tr>
<td>{t("appointments.labels.nocompletingjobs")}</td>
</tr>
)}
</tbody>
</table>
</div> </div>
);
const LoadComponent = loadData ? (
<Popover
placement={"bottom"}
content={popContent}
trigger="hover"
title={t("appointments.labels.completingjobs")}
>
<div className="imex-flex-row imex-flex-row__flex-space-around">
<Icon component={MdFileDownload} style={{ color: "green" }} />
{(loadData.hoursIn || 0) && loadData.hoursIn.toFixed(2)}
<Icon component={MdFileUpload} style={{ color: "red" }} />
{(loadData.hoursOut || 0) && loadData.hoursOut.toFixed(2)}
<Statistic
value={((loadData.expectedLoad || 0) / bodyshop.prodtargethrs) * 100}
suffix={"%"}
precision={0}
valueStyle={{
color:
Math.abs(
100 -
((loadData.expectedLoad || 0) / bodyshop.prodtargethrs) * 100
) <= 10
? "green"
: "red",
}}
/>
</div>
</Popover>
) : null; ) : null;
return ( return (

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

@@ -153,6 +153,18 @@ export default function ShopInfoComponent({ form, saveLoading }) {
> >
<InputNumber min={0} max={12} precision={0} /> <InputNumber min={0} max={12} precision={0} />
</Form.Item> </Form.Item>
<Form.Item
label={t("bodyshop.fields.prodtargethrs")}
name={["prodtargethrs"]}
rules={[
{
required: true,
message: t("general.validation.required"),
},
]}
>
<InputNumber min={1} precision={1} />
</Form.Item>
<Form.Item <Form.Item
name={["md_referral_sources"]} name={["md_referral_sources"]}
label={t("bodyshop.fields.md_referral_sources")} label={t("bodyshop.fields.md_referral_sources")}

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

@@ -143,6 +143,8 @@ export const QUERY_SCHEDULE_LOAD_DATA = gql`
where: { scheduled_completion: { _gte: $start, _lte: $end } } where: { scheduled_completion: { _gte: $start, _lte: $end } }
) { ) {
id id
est_number
ro_number
scheduled_completion scheduled_completion
labhrs: joblines_aggregate(where: { mod_lbr_ty: { _eq: "LAB" } }) { labhrs: joblines_aggregate(where: { mod_lbr_ty: { _eq: "LAB" } }) {
aggregate { aggregate {

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

@@ -53,6 +53,7 @@ export const QUERY_BODYSHOP = gql`
md_parts_locations md_parts_locations
md_notes_presets md_notes_presets
md_rbac md_rbac
prodtargethrs
employees { employees {
id id
first_name first_name
@@ -112,6 +113,7 @@ export const UPDATE_SHOP = gql`
md_parts_locations md_parts_locations
md_notes_presets md_notes_presets
md_rbac md_rbac
prodtargethrs
employees { employees {
id id
first_name first_name

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

@@ -40,7 +40,9 @@
"arrivedon": "Arrived on: ", "arrivedon": "Arrived on: ",
"blocked": "Blocked", "blocked": "Blocked",
"cancelledappointment": "Canceled appointment for: ", "cancelledappointment": "Canceled appointment for: ",
"completingjobs": "Completing Jobs",
"history": "History", "history": "History",
"nocompletingjobs": "No jobs scheduled for completion.",
"nodateselected": "No date has been selected.", "nodateselected": "No date has been selected.",
"priorappointments": "Previous Appointments", "priorappointments": "Previous Appointments",
"scheduledfor": "Scheduled appointment for: " "scheduledfor": "Scheduled appointment for: "
@@ -104,6 +106,7 @@
"noteslabel": "Note Label", "noteslabel": "Note Label",
"notestext": "Note Text", "notestext": "Note Text",
"partslocation": "Parts Location", "partslocation": "Parts Location",
"prodtargethrs": "Production Target Hours",
"responsibilitycenter": "Responsibility Center", "responsibilitycenter": "Responsibility Center",
"responsibilitycenter_accountdesc": "Account Description", "responsibilitycenter_accountdesc": "Account Description",
"responsibilitycenter_accountitem": "Item", "responsibilitycenter_accountitem": "Item",
@@ -443,6 +446,7 @@
"email": "Email", "email": "Email",
"errors": "Errors", "errors": "Errors",
"exceptiontitle": "An error has occurred.", "exceptiontitle": "An error has occurred.",
"hours": "hrs",
"in": "In", "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.", "instanceconflictext": "Your $t(titles.app) account can only be used on one device at any given time. Refresh your session to take control.",
"instanceconflictitle": "Your account is being used elsewhere.", "instanceconflictitle": "Your account is being used elsewhere.",

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

@@ -40,7 +40,9 @@
"arrivedon": "Llegado el:", "arrivedon": "Llegado el:",
"blocked": "", "blocked": "",
"cancelledappointment": "Cita cancelada para:", "cancelledappointment": "Cita cancelada para:",
"completingjobs": "",
"history": "", "history": "",
"nocompletingjobs": "",
"nodateselected": "No se ha seleccionado ninguna fecha.", "nodateselected": "No se ha seleccionado ninguna fecha.",
"priorappointments": "Nombramientos previos", "priorappointments": "Nombramientos previos",
"scheduledfor": "Cita programada para:" "scheduledfor": "Cita programada para:"
@@ -104,6 +106,7 @@
"noteslabel": "", "noteslabel": "",
"notestext": "", "notestext": "",
"partslocation": "", "partslocation": "",
"prodtargethrs": "",
"responsibilitycenter": "", "responsibilitycenter": "",
"responsibilitycenter_accountdesc": "", "responsibilitycenter_accountdesc": "",
"responsibilitycenter_accountitem": "", "responsibilitycenter_accountitem": "",
@@ -443,6 +446,7 @@
"email": "", "email": "",
"errors": "", "errors": "",
"exceptiontitle": "", "exceptiontitle": "",
"hours": "",
"in": "en", "in": "en",
"instanceconflictext": "", "instanceconflictext": "",
"instanceconflictitle": "", "instanceconflictitle": "",

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

@@ -40,7 +40,9 @@
"arrivedon": "Arrivé le:", "arrivedon": "Arrivé le:",
"blocked": "", "blocked": "",
"cancelledappointment": "Rendez-vous annulé pour:", "cancelledappointment": "Rendez-vous annulé pour:",
"completingjobs": "",
"history": "", "history": "",
"nocompletingjobs": "",
"nodateselected": "Aucune date n'a été sélectionnée.", "nodateselected": "Aucune date n'a été sélectionnée.",
"priorappointments": "Rendez-vous précédents", "priorappointments": "Rendez-vous précédents",
"scheduledfor": "Rendez-vous prévu pour:" "scheduledfor": "Rendez-vous prévu pour:"
@@ -104,6 +106,7 @@
"noteslabel": "", "noteslabel": "",
"notestext": "", "notestext": "",
"partslocation": "", "partslocation": "",
"prodtargethrs": "",
"responsibilitycenter": "", "responsibilitycenter": "",
"responsibilitycenter_accountdesc": "", "responsibilitycenter_accountdesc": "",
"responsibilitycenter_accountitem": "", "responsibilitycenter_accountitem": "",
@@ -443,6 +446,7 @@
"email": "", "email": "",
"errors": "", "errors": "",
"exceptiontitle": "", "exceptiontitle": "",
"hours": "",
"in": "dans", "in": "dans",
"instanceconflictext": "", "instanceconflictext": "",
"instanceconflictitle": "", "instanceconflictitle": "",

5
hasura/migrations/1597681392700_alter_table_public_bodyshops_add_column_prodtargethrs/down.yaml Normal file
View File

@@ -0,0 +1,5 @@
- args:
cascade: false
read_only: false
sql: ALTER TABLE "public"."bodyshops" DROP COLUMN "prodtargethrs";
type: run_sql

6
hasura/migrations/1597681392700_alter_table_public_bodyshops_add_column_prodtargethrs/up.yaml Normal file
View File

@@ -0,0 +1,6 @@
- args:
cascade: false
read_only: false
sql: ALTER TABLE "public"."bodyshops" ADD COLUMN "prodtargethrs" numeric NOT NULL
DEFAULT 1;
type: run_sql

61
hasura/migrations/1597681402689_update_permission_user_public_table_bodyshops/down.yaml Normal file
View File

@@ -0,0 +1,61 @@
- args:
role: user
table:
name: bodyshops
schema: public
type: drop_select_permission
- args:
permission:
allow_aggregations: false
columns:
- accountingconfig
- address1
- address2
- appt_length
- city
- country
- created_at
- email
- federal_tax_id
- id
- inhousevendorid
- insurance_vendor_id
- intakechecklist
- invoice_tax_rates
- logo_img_path
- md_messaging_presets
- md_notes_presets
- md_order_statuses
- md_parts_locations
- md_rbac
- md_referral_sources
- md_responsibility_centers
- md_ro_statuses
- messagingservicesid
- production_config
- region_config
- scoreboard_target
- shopname
- shoprates
- speedprint
- ssbuckets
- state
- state_tax_id
- stripe_acct_id
- template_header
- textid
- updated_at
- zip_post
computed_fields: []
filter:
associations:
bodyshop:
associations:
user:
authid:
_eq: X-Hasura-User-Id
role: user
table:
name: bodyshops
schema: public
type: create_select_permission

62
hasura/migrations/1597681402689_update_permission_user_public_table_bodyshops/up.yaml Normal file
View File

@@ -0,0 +1,62 @@
- args:
role: user
table:
name: bodyshops
schema: public
type: drop_select_permission
- args:
permission:
allow_aggregations: false
columns:
- accountingconfig
- address1
- address2
- appt_length
- city
- country
- created_at
- email
- federal_tax_id
- id
- inhousevendorid
- insurance_vendor_id
- intakechecklist
- invoice_tax_rates
- logo_img_path
- md_messaging_presets
- md_notes_presets
- md_order_statuses
- md_parts_locations
- md_rbac
- md_referral_sources
- md_responsibility_centers
- md_ro_statuses
- messagingservicesid
- prodtargethrs
- production_config
- region_config
- scoreboard_target
- shopname
- shoprates
- speedprint
- ssbuckets
- state
- state_tax_id
- stripe_acct_id
- template_header
- textid
- updated_at
- zip_post
computed_fields: []
filter:
associations:
bodyshop:
associations:
user:
authid:
_eq: X-Hasura-User-Id
role: user
table:
name: bodyshops
schema: public
type: create_select_permission

55
hasura/migrations/1597681427500_update_permission_user_public_table_bodyshops/down.yaml Normal file
View File

@@ -0,0 +1,55 @@
- args:
role: user
table:
name: bodyshops
schema: public
type: drop_update_permission
- args:
permission:
columns:
- accountingconfig
- address1
- address2
- appt_length
- city
- country
- created_at
- email
- federal_tax_id
- id
- inhousevendorid
- insurance_vendor_id
- intakechecklist
- invoice_tax_rates
- logo_img_path
- md_messaging_presets
- md_notes_presets
- md_order_statuses
- md_parts_locations
- md_rbac
- md_referral_sources
- md_responsibility_centers
- md_ro_statuses
- production_config
- scoreboard_target
- shopname
- shoprates
- speedprint
- ssbuckets
- state
- state_tax_id
- updated_at
- zip_post
filter:
associations:
bodyshop:
associations:
user:
authid:
_eq: X-Hasura-User-Id
set: {}
role: user
table:
name: bodyshops
schema: public
type: create_update_permission

56
hasura/migrations/1597681427500_update_permission_user_public_table_bodyshops/up.yaml Normal file
View File

@@ -0,0 +1,56 @@
- args:
role: user
table:
name: bodyshops
schema: public
type: drop_update_permission
- args:
permission:
columns:
- accountingconfig
- address1
- address2
- appt_length
- city
- country
- created_at
- email
- federal_tax_id
- id
- inhousevendorid
- insurance_vendor_id
- intakechecklist
- invoice_tax_rates
- logo_img_path
- md_messaging_presets
- md_notes_presets
- md_order_statuses
- md_parts_locations
- md_rbac
- md_referral_sources
- md_responsibility_centers
- md_ro_statuses
- prodtargethrs
- production_config
- scoreboard_target
- shopname
- shoprates
- speedprint
- ssbuckets
- state
- state_tax_id
- updated_at
- zip_post
filter:
associations:
bodyshop:
associations:
user:
authid:
_eq: X-Hasura-User-Id
set: {}
role: user
table:
name: bodyshops
schema: public
type: create_update_permission

2
hasura/migrations/metadata.yaml
View File

@@ -483,6 +483,7 @@ tables:
- md_responsibility_centers - md_responsibility_centers
- md_ro_statuses - md_ro_statuses
- messagingservicesid - messagingservicesid
- prodtargethrs
- production_config - production_config
- region_config - region_config
- scoreboard_target - scoreboard_target
@@ -531,6 +532,7 @@ tables:
- md_referral_sources - md_referral_sources
- md_responsibility_centers - md_responsibility_centers
- md_ro_statuses - md_ro_statuses
- prodtargethrs
- production_config - production_config
- scoreboard_target - scoreboard_target
- shopname - shopname