From fd64cb7e80375c7d2bf63e92c783bfa1535f2cd5 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Tue, 17 Oct 2023 13:08:00 +0200
Subject: [PATCH] refs #5919 front back

---
 db/changes/234201/00-locker.sql                    | 6 +++++-
 modules/worker/back/methods/worker/chooseLocker.js | 8 ++++----
 modules/worker/back/models/locker.json             | 7 ++-----
 modules/worker/back/models/worker.json             | 3 ---
 modules/worker/front/basic-data/index.html         | 6 +++---
 modules/worker/front/summary/index.html            | 2 +-
 modules/worker/front/summary/index.js              | 2 +-
 7 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/db/changes/234201/00-locker.sql b/db/changes/234201/00-locker.sql
index 6e9eca307b..c925cb1af7 100644
--- a/db/changes/234201/00-locker.sql
+++ b/db/changes/234201/00-locker.sql
@@ -1,5 +1,5 @@
 CREATE TABLE `vn`.`locker` (
-  `code` varchar(10) NOT NULL,
+  `code` varchar(10) DEFAULT NULL,
   `gender` varchar(255) DEFAULT NULL,
   `workerFk` int(10) unsigned DEFAULT NULL,
   PRIMARY KEY (`code`),
@@ -17,3 +17,7 @@ INSERT INTO `vn`.`locker` (code, gender, workerFk) VALUES
 INSERT INTO `vn`.`locker` (code, gender, workerFk) VALUES
     ('200A', 'F', NULL), ('201A', 'F', NULL), ('202A', 'F', NULL), ('203A', 'F', NULL), ('204A', 'F', NULL), ('205A', 'F', NULL), ('206A', 'F', NULL),
     ('200B', 'F', NULL), ('201B', 'F', NULL), ('202B', 'F', NULL), ('203B', 'F', NULL), ('204B', 'F', NULL), ('205B', 'F', NULL), ('206B', 'F', NULL);
+
+
+-- Eliminar locker
+ALTER TABLE `vn`.`worker` DROP COLUMN `locker`;
diff --git a/modules/worker/back/methods/worker/chooseLocker.js b/modules/worker/back/methods/worker/chooseLocker.js
index b3b7678cad..dc7775d08e 100644
--- a/modules/worker/back/methods/worker/chooseLocker.js
+++ b/modules/worker/back/methods/worker/chooseLocker.js
@@ -21,10 +21,10 @@ module.exports = Self => {
 
     Self.chooseLocker = async filter => {
         const query =
-            `SELECT l.code AS locker_code
-            FROM worker w
-            JOIN locker l ON w.sex = l.gender
-            WHERE w.id = ? AND l.workerFk IS NULL;
+            `SELECT l.code
+                FROM worker w
+                    JOIN locker l ON w.sex = l.gender
+                WHERE w.id = ? AND l.workerFk IS NULL;
             `[this.worker.id];
 
         return Self.chooseLocker(query, filter);
diff --git a/modules/worker/back/models/locker.json b/modules/worker/back/models/locker.json
index 0e8f9d5439..0e72784b3d 100644
--- a/modules/worker/back/models/locker.json
+++ b/modules/worker/back/models/locker.json
@@ -1,6 +1,6 @@
 {
     "name": "locker",
-    "description": "Employee´s locker",
+    "description": "Employee's locker",
     "base": "Loggable",
     "options": {
         "mysql": {
@@ -13,13 +13,10 @@
         },
         "gender": {
             "type": "string"
-        },
-        "workerFk": {
-            "type": "number"
         }
     },
     "relations": {
-        "id": {
+        "worker": {
             "type": "belongsTo",
             "model": "worker",
             "foreignKey": "workerFk"
diff --git a/modules/worker/back/models/worker.json b/modules/worker/back/models/worker.json
index dbb3ed23f9..bea86d14d4 100644
--- a/modules/worker/back/models/worker.json
+++ b/modules/worker/back/models/worker.json
@@ -44,9 +44,6 @@
         },
         "code": {
             "type" : "string"
-        },
-        "locker": {
-            "type" : "number"
         }
     },
     "relations": {
diff --git a/modules/worker/front/basic-data/index.html b/modules/worker/front/basic-data/index.html
index d832b27e5f..b15c6c669d 100644
--- a/modules/worker/front/basic-data/index.html
+++ b/modules/worker/front/basic-data/index.html
@@ -77,9 +77,9 @@
                 </vn-textfield>
                 <vn-autocomplete
                     label="Locker"
-                    ng-model="$ctrl.locker"
-                    data="chooseLocker">
-                    </vn-autocomplete>
+                    url="Lockers"
+                    data="$ctrl.locker.code">
+                </vn-autocomplete>
             </vn-horizontal>
         </vn-vertical>
     </vn-card>
diff --git a/modules/worker/front/summary/index.html b/modules/worker/front/summary/index.html
index 6604ef6ca8..0f34f4df84 100644
--- a/modules/worker/front/summary/index.html
+++ b/modules/worker/front/summary/index.html
@@ -52,7 +52,7 @@
             value="{{worker.client.phone}}">
             </vn-label-value>
             <vn-label-value label="Locker"
-            value="{{worker.locker}}">
+            value="{{::locker.code}}">
             </vn-label-value>
         </vn-one>
         <vn-one>
diff --git a/modules/worker/front/summary/index.js b/modules/worker/front/summary/index.js
index 2bb1f08530..f1e4b8b599 100644
--- a/modules/worker/front/summary/index.js
+++ b/modules/worker/front/summary/index.js
@@ -52,7 +52,7 @@ class Controller extends Summary {
                             scope: {fields: ['id', 'code', 'name']}
                         }
                     }
-                }
+                },
             ]
         };