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

Added shift clock to front office side. BOD-188

Browse Source
This commit is contained in:
Patrick Fic
2020-07-16 10:33:03 -07:00
parent 6a8b59c7e6
commit bbc0359e3a
9 changed files with 110 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
bodyshop_translations.babel
View File

@@ -13685,6 +13685,27 @@
</translation> </translation>
</translations> </translations>
</concept_node> </concept_node>
<concept_node>
<name>shiftclock</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>shop</name> <name>shop</name>
<definition_loaded>false</definition_loaded> <definition_loaded>false</definition_loaded>

142
client/src/components/header/header.component.jsx
View File

@@ -81,7 +81,7 @@ function Header({
<Row> <Row>
<Col {...logoSpan}> <Col {...logoSpan}>
<img <img
className="header-shop-logo" className='header-shop-logo'
alt={bodyshop ? bodyshop.shopname : "ImEX Online Logo"} alt={bodyshop ? bodyshop.shopname : "ImEX Online Logo"}
src={ src={
bodyshop && bodyshop.logo_img_path bodyshop && bodyshop.logo_img_path
@@ -92,13 +92,12 @@ function Header({
</Col> </Col>
<Col {...menuSpan}> <Col {...menuSpan}>
<Menu <Menu
mode="horizontal" mode='horizontal'
theme="dark" theme='dark'
className="header-main-menu" className='header-main-menu'
onClick={handleMenuClick} onClick={handleMenuClick}>
> <Menu.Item key='home'>
<Menu.Item key="home"> <Link to='/manage'>
<Link to="/manage">
<HomeFilled /> <HomeFilled />
{t("menus.header.home")} {t("menus.header.home")}
</Link> </Link>
@@ -109,51 +108,50 @@ function Header({
<Icon component={FaCarCrash} /> <Icon component={FaCarCrash} />
<span>{t("menus.header.jobs")}</span> <span>{t("menus.header.jobs")}</span>
</span> </span>
} }>
> <Menu.Item key='schedule'>
<Menu.Item key="schedule"> <Link to='/manage/schedule'>
<Link to="/manage/schedule">
<Icon component={FaCalendarAlt} /> <Icon component={FaCalendarAlt} />
{t("menus.header.schedule")} {t("menus.header.schedule")}
</Link> </Link>
</Menu.Item> </Menu.Item>
<Menu.Item key="productionlist"> <Menu.Item key='productionlist'>
<Link to="/manage/production/list"> <Link to='/manage/production/list'>
<Icon component={FaCalendarAlt} /> <Icon component={FaCalendarAlt} />
{t("menus.header.productionlist")} {t("menus.header.productionlist")}
</Link> </Link>
</Menu.Item> </Menu.Item>
<Menu.Item key="productionboard"> <Menu.Item key='productionboard'>
<Link to="/manage/production/board"> <Link to='/manage/production/board'>
{t("menus.header.productionboard")} {t("menus.header.productionboard")}
</Link> </Link>
</Menu.Item> </Menu.Item>
<Menu.Item key="scoreboard"> <Menu.Item key='scoreboard'>
<Link to="/manage/scoreboard"> <Link to='/manage/scoreboard'>
{t("menus.header.scoreboard")} {t("menus.header.scoreboard")}
</Link> </Link>
</Menu.Item> </Menu.Item>
<Menu.Item key="activejobs"> <Menu.Item key='activejobs'>
<Link to="/manage/jobs">{t("menus.header.activejobs")}</Link> <Link to='/manage/jobs'>{t("menus.header.activejobs")}</Link>
</Menu.Item> </Menu.Item>
<Menu.Item key="alljobs"> <Menu.Item key='alljobs'>
<Link to="/manage/jobs/all">{t("menus.header.alljobs")}</Link> <Link to='/manage/jobs/all'>{t("menus.header.alljobs")}</Link>
</Menu.Item> </Menu.Item>
<Menu.Item key="availablejobs"> <Menu.Item key='availablejobs'>
<Link to="/manage/available"> <Link to='/manage/available'>
{t("menus.header.availablejobs")} {t("menus.header.availablejobs")}
</Link> </Link>
</Menu.Item> </Menu.Item>
</Menu.SubMenu> </Menu.SubMenu>
<Menu.SubMenu title={t("menus.header.customers")}> <Menu.SubMenu title={t("menus.header.customers")}>
<Menu.Item key="owners"> <Menu.Item key='owners'>
<Link to="/manage/owners"> <Link to='/manage/owners'>
<TeamOutlined /> <TeamOutlined />
{t("menus.header.owners")} {t("menus.header.owners")}
</Link> </Link>
</Menu.Item> </Menu.Item>
<Menu.Item key="vehicles"> <Menu.Item key='vehicles'>
<Link to="/manage/vehicles"> <Link to='/manage/vehicles'>
<CarFilled /> <CarFilled />
{t("menus.header.vehicles")} {t("menus.header.vehicles")}
</Link> </Link>
@@ -165,22 +163,21 @@ function Header({
<CarFilled /> <CarFilled />
<span>{t("menus.header.courtesycars")}</span> <span>{t("menus.header.courtesycars")}</span>
</span> </span>
} }>
> <Menu.Item key='courtesycarsall'>
<Menu.Item key="courtesycarsall"> <Link to='/manage/courtesycars'>
<Link to="/manage/courtesycars">
<CarFilled /> <CarFilled />
{t("menus.header.courtesycars-all")} {t("menus.header.courtesycars-all")}
</Link> </Link>
</Menu.Item> </Menu.Item>
<Menu.Item key="contracts"> <Menu.Item key='contracts'>
<Link to="/manage/courtesycars/contracts"> <Link to='/manage/courtesycars/contracts'>
<FileFilled /> <FileFilled />
{t("menus.header.courtesycars-contracts")} {t("menus.header.courtesycars-contracts")}
</Link> </Link>
</Menu.Item> </Menu.Item>
<Menu.Item key="newcontract"> <Menu.Item key='newcontract'>
<Link to="/manage/courtesycars/contracts/new"> <Link to='/manage/courtesycars/contracts/new'>
<FileAddFilled /> <FileAddFilled />
{t("menus.header.courtesycars-newcontract")} {t("menus.header.courtesycars-newcontract")}
</Link> </Link>
@@ -192,87 +189,83 @@ function Header({
<DollarCircleFilled /> <DollarCircleFilled />
<span>{t("menus.header.accounting")}</span> <span>{t("menus.header.accounting")}</span>
</span> </span>
} }>
>
<Menu.Item <Menu.Item
key="enterpayments" key='enterpayments'
onClick={() => { onClick={() => {
setPaymentContext({ setPaymentContext({
actions: {}, actions: {},
context: {}, context: {},
}); });
}} }}>
>
<Icon component={FaCreditCard} /> <Icon component={FaCreditCard} />
{t("menus.header.enterpayment")} {t("menus.header.enterpayment")}
</Menu.Item> </Menu.Item>
<Menu.Item <Menu.Item
key="enterinvoices" key='enterinvoices'
onClick={() => { onClick={() => {
setInvoiceEnterContext({ setInvoiceEnterContext({
actions: {}, actions: {},
context: {}, context: {},
}); });
}} }}>
>
{t("menus.header.enterinvoices")} {t("menus.header.enterinvoices")}
</Menu.Item> </Menu.Item>
<Menu.Item key="invoices"> <Menu.Item key='invoices'>
<Link to="/manage/invoices">{t("menus.header.invoices")}</Link> <Link to='/manage/invoices'>{t("menus.header.invoices")}</Link>
</Menu.Item> </Menu.Item>
<Menu.Item <Menu.Item
key="entertimetickets" key='entertimetickets'
onClick={() => { onClick={() => {
setTimeTicketContext({ setTimeTicketContext({
actions: {}, actions: {},
context: {}, context: {},
}); });
}} }}>
>
{t("menus.header.entertimeticket")} {t("menus.header.entertimeticket")}
</Menu.Item> </Menu.Item>
<Menu.SubMenu title={t("menus.header.export")}> <Menu.SubMenu title={t("menus.header.export")}>
<Menu.Item key="receivables"> <Menu.Item key='receivables'>
<Link to="/manage/accounting/receivables"> <Link to='/manage/accounting/receivables'>
{t("menus.header.accounting-receivables")} {t("menus.header.accounting-receivables")}
</Link> </Link>
</Menu.Item> </Menu.Item>
<Menu.Item key="payables"> <Menu.Item key='payables'>
<Link to="/manage/accounting/payables"> <Link to='/manage/accounting/payables'>
{t("menus.header.accounting-payables")} {t("menus.header.accounting-payables")}
</Link> </Link>
</Menu.Item> </Menu.Item>
<Menu.Item key="payments"> <Menu.Item key='payments'>
<Link to="/manage/accounting/payments"> <Link to='/manage/accounting/payments'>
{t("menus.header.accounting-payments")} {t("menus.header.accounting-payments")}
</Link> </Link>
</Menu.Item> </Menu.Item>
</Menu.SubMenu> </Menu.SubMenu>
<Menu.Item key="allpayments"> <Menu.Item key='allpayments'>
<Link to="/manage/payments"> <Link to='/manage/payments'>
{t("menus.header.allpayments")} {t("menus.header.allpayments")}
</Link> </Link>
</Menu.Item> </Menu.Item>
</Menu.SubMenu> </Menu.SubMenu>
<Menu.SubMenu title={t("menus.header.shop")}> <Menu.SubMenu title={t("menus.header.shop")}>
<Menu.Item key="shop"> <Menu.Item key='shop'>
<Link to="/manage/shop">{t("menus.header.shop_config")}</Link> <Link to='/manage/shop'>{t("menus.header.shop_config")}</Link>
</Menu.Item> </Menu.Item>
<Menu.Item key="shop-templates"> <Menu.Item key='shop-templates'>
<Link to="/manage/shop/templates"> <Link to='/manage/shop/templates'>
{t("menus.header.shop_templates")} {t("menus.header.shop_templates")}
</Link> </Link>
</Menu.Item> </Menu.Item>
<Menu.Item key="shop-vendors"> <Menu.Item key='shop-vendors'>
<Link to="/manage/shop/vendors"> <Link to='/manage/shop/vendors'>
{t("menus.header.shop_vendors")} {t("menus.header.shop_vendors")}
</Link> </Link>
</Menu.Item> </Menu.Item>
<Menu.Item key="shop-csi"> <Menu.Item key='shop-csi'>
<Link to="/manage/shop/csi">{t("menus.header.shop_csi")}</Link> <Link to='/manage/shop/csi'>{t("menus.header.shop_csi")}</Link>
</Menu.Item> </Menu.Item>
</Menu.SubMenu> </Menu.SubMenu>
<Menu.SubMenu <Menu.SubMenu
@@ -297,13 +290,17 @@ function Header({
{currentUser.displayName || t("general.labels.unknown")} {currentUser.displayName || t("general.labels.unknown")}
</div> </div>
} }>
>
<Menu.Item danger onClick={() => signOutStart()}> <Menu.Item danger onClick={() => signOutStart()}>
{t("user.actions.signout")} {t("user.actions.signout")}
</Menu.Item> </Menu.Item>
<Menu.Item key='shiftclock'>
<Link to='/manage/shiftclock'>
{t("menus.header.shiftclock")}
</Link>
</Menu.Item>
<Menu.Item> <Menu.Item>
<Link to="/manage/profile"> <Link to='/manage/profile'>
{t("menus.currentuser.profile")} {t("menus.currentuser.profile")}
</Link> </Link>
</Menu.Item> </Menu.Item>
@@ -313,15 +310,14 @@ function Header({
<GlobalOutlined /> <GlobalOutlined />
<span>{t("menus.currentuser.languageselector")}</span> <span>{t("menus.currentuser.languageselector")}</span>
</span> </span>
} }>
> <Menu.Item actiontype='lang-select' key='en-US'>
<Menu.Item actiontype="lang-select" key="en-US">
{t("general.languages.english")} {t("general.languages.english")}
</Menu.Item> </Menu.Item>
<Menu.Item actiontype="lang-select" key="fr-CA"> <Menu.Item actiontype='lang-select' key='fr-CA'>
{t("general.languages.french")} {t("general.languages.french")}
</Menu.Item> </Menu.Item>
<Menu.Item actiontype="lang-select" key="es-MX"> <Menu.Item actiontype='lang-select' key='es-MX'>
{t("general.languages.spanish")} {t("general.languages.spanish")}
</Menu.Item> </Menu.Item>
</Menu.SubMenu> </Menu.SubMenu>

2
client/src/components/time-ticket-shift-form/time-ticket-shift-form.component.jsx
View File

@@ -1,4 +1,4 @@
import { Form, InputNumber, Select } from "antd"; import { Form, Select } from "antd";
import React from "react"; import React from "react";
import { useTranslation } from "react-i18next"; import { useTranslation } from "react-i18next";
import { connect } from "react-redux"; import { connect } from "react-redux";

1
client/src/components/time-ticket-shift-form/time-ticket-shift-form.container.jsx
View File

@@ -69,7 +69,6 @@ export function TimeTicektShiftContainer({
return ( return (
<div> <div>
The form TimeTicektShiftContainer
<Form <Form
form={form} form={form}
layout='vertical' layout='vertical'

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

@@ -116,7 +116,7 @@ const ShopCsiPageContainer = lazy(() =>
const PaymentsAll = lazy(() => const PaymentsAll = lazy(() =>
import("../payments-all/payments-all.container.page") import("../payments-all/payments-all.container.page")
); );
const ShiftClock = lazy(() => import("../shift-clock/shift-clock.page"));
const Scoreboard = lazy(() => const Scoreboard = lazy(() =>
import("../scoreboard/scoreboard.page.container.jsx") import("../scoreboard/scoreboard.page.container.jsx")
); );
@@ -319,6 +319,11 @@ export function Manage({ match, conflict }) {
path={`${match.path}/payments`} path={`${match.path}/payments`}
component={PaymentsAll} component={PaymentsAll}
/> />
<Route
exact
path={`${match.path}/shiftclock`}
component={ShiftClock}
/>
<Route <Route
exact exact
path={`${match.path}/scoreboard`} path={`${match.path}/scoreboard`}

10
client/src/pages/shift-clock/shift-clock.page.jsx Normal file
View File

@@ -0,0 +1,10 @@
import React from "react";
import TimeTicketShift from "../../components/time-ticket-shift/time-ticket-shift.container";
export default function ShiftClock() {
return (
<div>
<TimeTicketShift />
</div>
);
}

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

@@ -834,6 +834,7 @@
"productionlist": "Production - List", "productionlist": "Production - List",
"schedule": "Schedule", "schedule": "Schedule",
"scoreboard": "Scoreboard", "scoreboard": "Scoreboard",
"shiftclock": "Shift Clock",
"shop": "My Shop", "shop": "My Shop",
"shop_config": "Configuration", "shop_config": "Configuration",
"shop_csi": "CSI", "shop_csi": "CSI",

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

@@ -834,6 +834,7 @@
"productionlist": "", "productionlist": "",
"schedule": "Programar", "schedule": "Programar",
"scoreboard": "", "scoreboard": "",
"shiftclock": "",
"shop": "Mi tienda", "shop": "Mi tienda",
"shop_config": "Configuración", "shop_config": "Configuración",
"shop_csi": "", "shop_csi": "",

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

@@ -834,6 +834,7 @@
"productionlist": "", "productionlist": "",
"schedule": "Programme", "schedule": "Programme",
"scoreboard": "", "scoreboard": "",
"shiftclock": "",
"shop": "Mon magasin", "shop": "Mon magasin",
"shop_config": "Configuration", "shop_config": "Configuration",
"shop_csi": "", "shop_csi": "",