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

Resolve employee search on kanban board.

Browse Source
This commit is contained in:
Patrick Fic
2020-12-09 15:05:29 -08:00
parent 4212ba9c85
commit 5a502c4d1b
9 changed files with 36 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
bodyshop_translations.babel
View File

@@ -1,4 +1,4 @@
<babeledit_project version="1.2" be_version="2.7.1"> <babeledit_project be_version="2.7.1" version="1.2">
<!-- <!--
BabelEdit project file BabelEdit project file
@@ -22524,6 +22524,27 @@
</translation> </translation>
</translations> </translations>
</concept_node> </concept_node>
<concept_node>
<name>employeesearch</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>jobdetail</name> <name>jobdetail</name>
<definition_loaded>false</definition_loaded> <definition_loaded>false</definition_loaded>

2
client/package-lock.json generated
View File

@@ -1,6 +1,6 @@
{ {
"name": "bodyshop", "name": "bodyshop",
"version": "0.1.0001", "version": "0.1.1",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {

2
client/package.json
View File

@@ -65,7 +65,7 @@
"analyze": "source-map-explorer 'build/static/js/*.js'", "analyze": "source-map-explorer 'build/static/js/*.js'",
"start": "react-scripts start", "start": "react-scripts start",
"build": "REACT_APP_GIT_SHA=`git rev-parse --short HEAD` react-scripts build", "build": "REACT_APP_GIT_SHA=`git rev-parse --short HEAD` react-scripts build",
"build-deploy": "REACT_APP_GIT_SHA=`git rev-parse --short HEAD` react-scripts build && $ s3cmd sync build/* s3://imex-online-production && echo '🚀 Deployed!'", "build-deploy": "REACT_APP_GIT_SHA=`git rev-parse --short HEAD` react-scripts build && s3cmd sync build/* s3://imex-online-production && echo '🚀 Deployed!'",
"test": "react-scripts test", "test": "react-scripts test",
"eject": "react-scripts eject", "eject": "react-scripts eject",
"madge": "madge --image ./madge-graph.svg --extensions js,jsx,ts,tsx --circular ." "madge": "madge --image ./madge-graph.svg --extensions js,jsx,ts,tsx --circular ."

6
client/src/components/employee-search-select/employee-search-select.component.jsx
View File

@@ -1,4 +1,4 @@
import { Select, Tag } from "antd"; import { Select, Space, Tag } from "antd";
import React, { forwardRef, useEffect, useState } from "react"; import React, { forwardRef, useEffect, useState } from "react";
import { useTranslation } from "react-i18next"; import { useTranslation } from "react-i18next";
const { Option } = Select; const { Option } = Select;
@@ -37,7 +37,7 @@ const EmployeeSearchSelect = (
search={`${o.employee_number} ${o.first_name} ${o.last_name}`} search={`${o.employee_number} ${o.first_name} ${o.last_name}`}
discount={o.discount} discount={o.discount}
> >
<div style={{ display: "flex" }}> <Space>
{`${o.employee_number} ${o.first_name} ${o.last_name}`} {`${o.employee_number} ${o.first_name} ${o.last_name}`}
<Tag color="blue">{o.cost_center}</Tag> <Tag color="blue">{o.cost_center}</Tag>
@@ -46,7 +46,7 @@ const EmployeeSearchSelect = (
? t("timetickets.labels.flat_rate") ? t("timetickets.labels.flat_rate")
: t("timetickets.labels.straight_time")} : t("timetickets.labels.straight_time")}
</Tag> </Tag>
</div> </Space>
</Option> </Option>
)) ))
: null} : null}

3
client/src/components/production-board-filters/production-board-filters.component.jsx
View File

@@ -21,7 +21,7 @@ export function ProductionBoardFilters({ bodyshop, filter, setFilter }) {
const { t } = useTranslation(); const { t } = useTranslation();
return ( return (
<div> <div style={{ display: "flex" }}>
<Input.Search <Input.Search
//value={filter.search} //value={filter.search}
placeholder={t("general.labels.search")} placeholder={t("general.labels.search")}
@@ -32,6 +32,7 @@ export function ProductionBoardFilters({ bodyshop, filter, setFilter }) {
<EmployeeSearchSelectComponent <EmployeeSearchSelectComponent
options={bodyshop.employees} options={bodyshop.employees}
value={filter.employeeId} value={filter.employeeId}
placeholder={t("production.labels.employeesearch")}
onChange={(emp) => setFilter({ ...filter, employeeId: emp })} onChange={(emp) => setFilter({ ...filter, employeeId: emp })}
allowClear allowClear
/> />

8
client/src/components/production-board-kanban/production-board-kanban.utils.js
View File

@@ -63,10 +63,10 @@ export const createBoardData = (AllStatuses, Jobs, filter) => {
if (!!employeeId) { if (!!employeeId) {
include = include =
include && include ||
(j.employee_body === employeeId || j.employee_body === employeeId ||
j.employee_prep === employeeId || j.employee_prep === employeeId ||
j.employee_refinish === employeeId); j.employee_refinish === employeeId;
} }
return include; return include;

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

@@ -1380,6 +1380,7 @@
"bodyhours": "B", "bodyhours": "B",
"bodypriority": "B/P", "bodypriority": "B/P",
"cycletime": "C/T", "cycletime": "C/T",
"employeesearch": "Employee Search",
"jobdetail": "Job Details", "jobdetail": "Job Details",
"note": "Production Note", "note": "Production Note",
"paintpriority": "P/P", "paintpriority": "P/P",

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

@@ -1380,6 +1380,7 @@
"bodyhours": "", "bodyhours": "",
"bodypriority": "", "bodypriority": "",
"cycletime": "", "cycletime": "",
"employeesearch": "",
"jobdetail": "", "jobdetail": "",
"note": "", "note": "",
"paintpriority": "", "paintpriority": "",

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

@@ -1380,6 +1380,7 @@
"bodyhours": "", "bodyhours": "",
"bodypriority": "", "bodypriority": "",
"cycletime": "", "cycletime": "",
"employeesearch": "",
"jobdetail": "", "jobdetail": "",
"note": "", "note": "",
"paintpriority": "", "paintpriority": "",