From dd9e904378f535c4f7995ad694cada875d443a18 Mon Sep 17 00:00:00 2001
From: Thilina Pituwala <thilina.hasantha@instafreight.com>
Date: Sun, 31 May 2020 07:07:38 +0200
Subject: [PATCH] Fix menu names

---
 core/migrations/list.php                         |  1 +
 .../v20200530_270009_update_module_names.php     | 16 ++++++++++++++++
 web/admin/src/employees/lib.js                   | 11 ++++++++---
 3 files changed, 25 insertions(+), 3 deletions(-)
 create mode 100644 core/migrations/v20200530_270009_update_module_names.php

diff --git a/core/migrations/list.php b/core/migrations/list.php
index f21dca7a..5075a20e 100644
--- a/core/migrations/list.php
+++ b/core/migrations/list.php
@@ -1,5 +1,6 @@
 <?php
 $migrationList = [];
+$migrationList[] = 'v20200530_270009_update_module_names';
 $migrationList[] = 'v20200518_270011_add_al_language';
 $migrationList[] = 'v20200429_270010_setting_groups';
 $migrationList[] = 'v20200411_270009_email_log';
diff --git a/core/migrations/v20200530_270009_update_module_names.php b/core/migrations/v20200530_270009_update_module_names.php
new file mode 100644
index 00000000..4d0bceed
--- /dev/null
+++ b/core/migrations/v20200530_270009_update_module_names.php
@@ -0,0 +1,16 @@
+<?php
+namespace Classes\Migration;
+
+class v20200530_270009_update_module_names extends AbstractMigration {
+
+    public function up(){
+        $sql = <<<'SQL'
+Update Settings set value = '1' where name = 'System: Reset Module Names';
+SQL;
+        return $this->executeQuery($sql);
+    }
+
+    public function down(){
+        return true;
+    }
+}
diff --git a/web/admin/src/employees/lib.js b/web/admin/src/employees/lib.js
index 84685da7..ab67cebe 100644
--- a/web/admin/src/employees/lib.js
+++ b/web/admin/src/employees/lib.js
@@ -749,7 +749,12 @@ class EmployeeAdapter extends SubProfileEnabledAdapterBase {
       deleteBtn = '';
     }
     // eslint-disable-next-line max-len
-    let html = `<div style="width:110px;"><img class="tableActionButton" src="_BASE_images/user.png" style="cursor:pointer;" rel="tooltip" title="Login as this Employee" onclick="modJs.setAdminProfile(_id_);return false;"></img><img class="tableActionButton" src="_BASE_images/view.png" style="cursor:pointer;margin-left:15px;" rel="tooltip" title="View" onclick="modJs.view(_id_);return false;"></img><img class="tableActionButton" src="_BASE_images/edit.png" style="cursor:pointer;margin-left:15px;" rel="tooltip" title="Edit" onclick="modJs.edit(_id_);return false;"></img>${deleteBtn}</div>`;
+    let html = `<div style="width:120px;">
+<img class="tableActionButton" src="_BASE_images/user.png" style="cursor:pointer;" rel="tooltip" title="Login as this Employee" onclick="modJs.setAdminProfile(_id_);return false;"></img>
+<img class="tableActionButton" src="_BASE_images/view.png" style="cursor:pointer;margin-left:15px;" rel="tooltip" title="View" onclick="modJs.view(_id_);return false;"></img>
+<img class="tableActionButton" src="_BASE_images/edit.png" style="cursor:pointer;margin-left:15px;" rel="tooltip" title="Edit" onclick="modJs.edit(_id_);return false;"></img>
+${deleteBtn}
+</div>`;
     html = html.replace(/_id_/g, id);
     html = html.replace(/_BASE_/g, this.baseUrl);
     return html;
@@ -1213,7 +1218,7 @@ class TerminatedEmployeeAdapter extends EmployeeAdapter {
 
   getActionButtonsHtml(id) {
     // eslint-disable-next-line max-len
-    let html = `<div style="width:110px;">
+    let html = `<div style="width:120px;">
 <img class="tableActionButton" src="_BASE_images/edit.png" style="cursor:pointer;margin-left:15px;" rel="tooltip" title="Edit" onclick="modJs.edit(_id_);return false;"></img>
 <img class="tableActionButton" src="_BASE_images/delete.png" style="margin-left:15px;cursor:pointer;" rel="tooltip" title="Archive Employee" onclick="modJs.deleteEmployee(_id_);return false;"></img>
 <img class="tableActionButton" src="_BASE_images/redo.png" style="margin-left:15px;cursor:pointer;" rel="tooltip" title="Restore Employee" onclick="modJs.activateEmployee(_id_);return false;"></img>
@@ -1298,7 +1303,7 @@ class ArchivedEmployeeAdapter extends SubProfileEnabledAdapterBase {
 
   getActionButtonsHtml(id) {
     // eslint-disable-next-line max-len
-    let html = '<div style="width:110px;"><img class="tableActionButton" src="_BASE_images/download.png" style="cursor:pointer;" rel="tooltip" title="Download Archived Data" onclick="modJs.download(_id_);return false;"></img><img class="tableActionButton" src="_BASE_images/delete.png" style="margin-left:15px;cursor:pointer;" rel="tooltip" title="Remove Archived Data" onclick="modJs.deleteRow(_id_);return false;"></img></div>';
+    let html = '<div style="width:120px;"><img class="tableActionButton" src="_BASE_images/download.png" style="cursor:pointer;" rel="tooltip" title="Download Archived Data" onclick="modJs.download(_id_);return false;"></img><img class="tableActionButton" src="_BASE_images/delete.png" style="margin-left:15px;cursor:pointer;" rel="tooltip" title="Remove Archived Data" onclick="modJs.deleteRow(_id_);return false;"></img></div>';
     html = html.replace(/_id_/g, id);
     html = html.replace(/_BASE_/g, this.baseUrl);
     return html;