From bbd04f88764d426cebf7b058d31838abf16edb96 Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Tue, 6 Dec 2022 11:13:24 -0800 Subject: [PATCH] adds the rest of the fields for Remote --- app/Importer/Importer.php | 2 ++ app/Importer/UserImporter.php | 2 +- public/js/build/app.js | Bin 1548989 -> 1549051 bytes public/js/dist/all.js | Bin 3322219 -> 3322281 bytes public/mix-manifest.json | 4 ++-- 5 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/Importer/Importer.php b/app/Importer/Importer.php index 203e788d23..1ee90b399c 100644 --- a/app/Importer/Importer.php +++ b/app/Importer/Importer.php @@ -77,6 +77,7 @@ abstract class Importer 'manager_first_name' => 'manager first name', 'manager_last_name' => 'manager last name', 'min_amt' => 'minimum quantity', + 'remote' => 'remote', ]; /** * Map of item fields->csv names @@ -288,6 +289,7 @@ abstract class Importer 'department_id' => '', 'username' => $this->findCsvMatch($row, 'username'), 'activated' => $this->fetchHumanBoolean($this->findCsvMatch($row, 'activated')), + 'remote' => $this->fetchHumanBoolean(($this->findCsvMatch($row, 'remote'))), ]; // Maybe we're lucky and the user already exists. diff --git a/app/Importer/UserImporter.php b/app/Importer/UserImporter.php index ab5d8c4dd6..b062c16bca 100644 --- a/app/Importer/UserImporter.php +++ b/app/Importer/UserImporter.php @@ -57,7 +57,7 @@ class UserImporter extends ItemImporter $this->item['employee_num'] = $this->findCsvMatch($row, 'employee_num'); $this->item['department_id'] = $this->createOrFetchDepartment($this->findCsvMatch($row, 'department')); $this->item['manager_id'] = $this->fetchManager($this->findCsvMatch($row, 'manager_first_name'), $this->findCsvMatch($row, 'manager_last_name')); - $this->item['remote'] = $this->findCsvMatch($row, 'remote'); + $this->item['remote'] =($this->fetchHumanBoolean($this->findCsvMatch($row, 'remote')) ==1 ) ? '1' : 0; $user_department = $this->findCsvMatch($row, 'department'); if ($this->shouldUpdateField($user_department)) { diff --git a/public/js/build/app.js b/public/js/build/app.js index 3fc87b52bd2abe0ffa8874e80df5b9f7e9face0e..5c1c0197f596b4e3cc8e8a8420f2ec05aef8fde8 100644 GIT binary patch delta 131 zcmdmcH17A&xD9e@lVfCsS&LG0^GhZRDvGiNfmo@NH%N&!YpS(tsxbmF6A&{4F$)m0 z0x=s9vjZ^)5OV@C7Z7s;F%J;)0x=&D^8>K}5DNma5D*Iku?P^00dnHZFlBhwxi`$@h7M z;_?o~2?7yB5rYODaU_sL3Tb4JMGkosV4w&SC0Hn