refs #5919 front back

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`;

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);

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"

modules/worker/back/models/worker.json

@@ -44,9 +44,6 @@
         },
         "code": {
             "type" : "string"
-        },
-        "locker": {
-            "type" : "number"
         }
     },
     "relations": {

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>

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>

modules/worker/front/summary/index.js

@@ -52,7 +52,7 @@ class Controller extends Summary {
                             scope: {fields: ['id', 'code', 'name']}
                         }
                     }
-                }
+                },
             ]
         };