From 5a502c4d1bcb3c49b68b65c85f3283993bbfae6f Mon Sep 17 00:00:00 2001
From: Patrick Fic <>
Date: Wed, 9 Dec 2020 15:05:29 -0800
Subject: [PATCH] Resolve employee search on kanban board.

---
 bodyshop_translations.babel                   | 23 ++++++++++++++++++-
 client/package-lock.json                      |  2 +-
 client/package.json                           |  2 +-
 .../employee-search-select.component.jsx      |  6 ++---
 .../production-board-filters.component.jsx    |  3 ++-
 .../production-board-kanban.utils.js          |  8 +++----
 client/src/translations/en_us/common.json     |  1 +
 client/src/translations/es/common.json        |  1 +
 client/src/translations/fr/common.json        |  1 +
 9 files changed, 36 insertions(+), 11 deletions(-)

diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel
index dd4f15360..56e3b106e 100644
--- a/bodyshop_translations.babel
+++ b/bodyshop_translations.babel
@@ -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
@@ -22524,6 +22524,27 @@
                                             </translation>
                                         </translations>
                                     </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>
                                         <name>jobdetail</name>
                                         <definition_loaded>false</definition_loaded>
diff --git a/client/package-lock.json b/client/package-lock.json
index e85db6339..21d6a3ccb 100644
--- a/client/package-lock.json
+++ b/client/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "bodyshop",
-  "version": "0.1.0001",
+  "version": "0.1.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/client/package.json b/client/package.json
index de296a348..cada3d9e4 100644
--- a/client/package.json
+++ b/client/package.json
@@ -65,7 +65,7 @@
     "analyze": "source-map-explorer 'build/static/js/*.js'",
     "start": "react-scripts start",
     "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",
     "eject": "react-scripts eject",
     "madge": "madge  --image ./madge-graph.svg --extensions js,jsx,ts,tsx --circular ."
diff --git a/client/src/components/employee-search-select/employee-search-select.component.jsx b/client/src/components/employee-search-select/employee-search-select.component.jsx
index 2b8b4977a..271f59332 100644
--- a/client/src/components/employee-search-select/employee-search-select.component.jsx
+++ b/client/src/components/employee-search-select/employee-search-select.component.jsx
@@ -1,4 +1,4 @@
-import { Select, Tag } from "antd";
+import { Select, Space, Tag } from "antd";
 import React, { forwardRef, useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 const { Option } = Select;
@@ -37,7 +37,7 @@ const EmployeeSearchSelect = (
               search={`${o.employee_number}  ${o.first_name} ${o.last_name}`}
               discount={o.discount}
             >
-              <div style={{ display: "flex" }}>
+              <Space>
                 {`${o.employee_number}  ${o.first_name} ${o.last_name}`}
                 <Tag color="blue">{o.cost_center}</Tag>
 
@@ -46,7 +46,7 @@ const EmployeeSearchSelect = (
                     ? t("timetickets.labels.flat_rate")
                     : t("timetickets.labels.straight_time")}
                 </Tag>
-              </div>
+              </Space>
             </Option>
           ))
         : null}
diff --git a/client/src/components/production-board-filters/production-board-filters.component.jsx b/client/src/components/production-board-filters/production-board-filters.component.jsx
index 363a78945..d90a3af04 100644
--- a/client/src/components/production-board-filters/production-board-filters.component.jsx
+++ b/client/src/components/production-board-filters/production-board-filters.component.jsx
@@ -21,7 +21,7 @@ export function ProductionBoardFilters({ bodyshop, filter, setFilter }) {
   const { t } = useTranslation();
 
   return (
-    <div>
+    <div style={{ display: "flex" }}>
       <Input.Search
         //value={filter.search}
         placeholder={t("general.labels.search")}
@@ -32,6 +32,7 @@ export function ProductionBoardFilters({ bodyshop, filter, setFilter }) {
       <EmployeeSearchSelectComponent
         options={bodyshop.employees}
         value={filter.employeeId}
+        placeholder={t("production.labels.employeesearch")}
         onChange={(emp) => setFilter({ ...filter, employeeId: emp })}
         allowClear
       />
diff --git a/client/src/components/production-board-kanban/production-board-kanban.utils.js b/client/src/components/production-board-kanban/production-board-kanban.utils.js
index 324612133..9dca2b2e4 100644
--- a/client/src/components/production-board-kanban/production-board-kanban.utils.js
+++ b/client/src/components/production-board-kanban/production-board-kanban.utils.js
@@ -63,10 +63,10 @@ export const createBoardData = (AllStatuses, Jobs, filter) => {
 
           if (!!employeeId) {
             include =
-              include &&
-              (j.employee_body === employeeId ||
-                j.employee_prep === employeeId ||
-                j.employee_refinish === employeeId);
+              include ||
+              j.employee_body === employeeId ||
+              j.employee_prep === employeeId ||
+              j.employee_refinish === employeeId;
           }
 
           return include;
diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json
index 3be2d4cd0..aee505c89 100644
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -1380,6 +1380,7 @@
 				"bodyhours": "B",
 				"bodypriority": "B/P",
 				"cycletime": "C/T",
+				"employeesearch": "Employee Search",
 				"jobdetail": "Job Details",
 				"note": "Production Note",
 				"paintpriority": "P/P",
diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json
index c280fe73e..688ebeff2 100644
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -1380,6 +1380,7 @@
 				"bodyhours": "",
 				"bodypriority": "",
 				"cycletime": "",
+				"employeesearch": "",
 				"jobdetail": "",
 				"note": "",
 				"paintpriority": "",
diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json
index 717d54e8d..9fd9c3026 100644
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -1380,6 +1380,7 @@
 				"bodyhours": "",
 				"bodypriority": "",
 				"cycletime": "",
+				"employeesearch": "",
 				"jobdetail": "",
 				"note": "",
 				"paintpriority": "",