db/dump/structure.sql

@@ -39331,38 +39331,39 @@ DROP TABLE IF EXISTS `worker`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `worker` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `code` varchar(3) COLLATE utf8_unicode_ci NOT NULL,
-  `firstName` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `lastName` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `password__` varchar(50) CHARACTER SET utf8 DEFAULT NULL,
-  `email__` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `extension__` varchar(10) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `code` varchar(3) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `firstName` varchar(50) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `lastName` varchar(50) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `password__` varchar(50) CHARACTER SET utf8mb3 DEFAULT NULL,
+  `email__` varchar(50) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `extension__` varchar(10) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `sub` int(11) unsigned DEFAULT NULL,
-  `user__` varchar(20) CHARACTER SET utf8 DEFAULT NULL,
-  `typeBussines__` varchar(30) CHARACTER SET utf8 DEFAULT 'no dejar vacio' COMMENT 'campo obsoleto, actualmente se rellena en laboral',
-  `laborCategory__` varchar(45) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `user__` varchar(20) CHARACTER SET utf8mb3 DEFAULT NULL,
+  `typeBussines__` varchar(30) CHARACTER SET utf8mb3 DEFAULT 'no dejar vacio' COMMENT 'campo obsoleto, actualmente se rellena en laboral',
+  `laborCategory__` varchar(45) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `started__` datetime DEFAULT NULL,
   `ended__` datetime DEFAULT NULL,
-  `notes__` varchar(254) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `photo` blob,
-  `fi__` varchar(9) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `address__` varchar(50) COLLATE utf8_unicode_ci NOT NULL,
+  `notes__` varchar(254) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `photo` blob DEFAULT NULL,
+  `fi__` varchar(9) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `address__` varchar(50) COLLATE utf8mb3_unicode_ci NOT NULL,
   `birthed__` date NOT NULL,
-  `phone` varchar(9) COLLATE utf8_unicode_ci NOT NULL,
+  `phone` varchar(9) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `mobileExtension` int(4) DEFAULT NULL,
   `clientFk__` int(11) DEFAULT NULL,
   `userFk` int(10) unsigned DEFAULT NULL,
-  `bossFk` int(11) NOT NULL DEFAULT '103',
+  `bossFk` int(11) NOT NULL DEFAULT 103,
   `fiDueDate` datetime DEFAULT NULL,
-  `hasMachineryAuthorized` tinyint(2) DEFAULT '0',
+  `hasMachineryAuthorized` tinyint(2) DEFAULT 0,
   `seniority` date DEFAULT NULL,
-  `isTodayRelative` tinyint(1) NOT NULL DEFAULT '0' COMMENT 'Para el F11. Calcula los problemas de visiblidad en funcion del dia actual',
-  `isF11Allowed` tinyint(1) NOT NULL DEFAULT '0' COMMENT 'Usuario autorizado para abrir el F11',
+  `isTodayRelative` tinyint(1) NOT NULL DEFAULT 0 COMMENT 'Para el F11. Calcula los problemas de visiblidad en funcion del dia actual',
+  `isF11Allowed` tinyint(1) NOT NULL DEFAULT 0 COMMENT 'Usuario autorizado para abrir el F11',
   `sectorFk` int(11) DEFAULT NULL COMMENT 'Sector que tiene asociado el trabajador.',
-  `maritalStatus` enum('S','M') COLLATE utf8_unicode_ci NOT NULL,
+  `maritalStatus` enum('S','M') COLLATE utf8mb3_unicode_ci NOT NULL,
   `labelerFk` tinyint(3) unsigned DEFAULT NULL,
   `originCountryFk` mediumint(8) unsigned DEFAULT NULL COMMENT 'País de origen',
   `educationLevelFk` smallint(6) DEFAULT NULL,
-  `SSN` varchar(15) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `SSN` varchar(15) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`id`),
   UNIQUE KEY `CodigoTrabajador_UNIQUE` (`code`),
   UNIQUE KEY `user` (`user__`),
@@ -39378,7 +39379,7 @@ CREATE TABLE `worker` (
   CONSTRAINT `worker_FK_1` FOREIGN KEY (`originCountryFk`) REFERENCES `country` (`id`) ON UPDATE CASCADE,
   CONSTRAINT `worker_FK_2` FOREIGN KEY (`educationLevelFk`) REFERENCES `educationLevel` (`id`) ON UPDATE CASCADE,
   CONSTRAINT `worker_ibfk_1` FOREIGN KEY (`id`) REFERENCES `account`.`user` (`id`)
-) ENGINE=InnoDBDEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=22748 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --

modules/worker/back/models/worker.json

@@ -49,6 +49,9 @@
         },
         "labelerFk": {
             "type" : "number"
+        },
+        "mobileExtension": {
+            "type" : "number"
         }
     },
     "relations": {

modules/worker/front/basic-data/index.html

@@ -25,10 +25,18 @@
             <vn-horizontal>
                 <vn-textfield
                     vn-one 
-                    label="Phone" 
+                    label="Business phone" 
                     ng-model="$ctrl.worker.phone"
                     rule>
                 </vn-textfield>
+                <vn-textfield
+                    vn-one 
+                    label="Mobile extension" 
+                    ng-model="$ctrl.worker.mobileExtension"
+                    rule>
+                </vn-textfield>
+            </vn-horizontal>
+            <vn-horizontal>
                 <vn-autocomplete
                     ng-model="$ctrl.worker.bossFk"
                     url="Workers/activeWithInheritedRole"
@@ -37,8 +45,6 @@
                     where="{role: 'employee'}"
                     label="Boss">
                 </vn-autocomplete>
-            </vn-horizontal>
-            <vn-horizontal>
                 <vn-autocomplete
                     label="Marital status"
                     data="$ctrl.maritalStatus"
@@ -46,6 +52,8 @@
                     value-field="code"
                     ng-model="$ctrl.worker.maritalStatus">
                 </vn-autocomplete>
+            </vn-horizontal>
+            <vn-horizontal>
                 <vn-autocomplete
                     ng-model="$ctrl.worker.originCountryFk"
                     url="Countries"
@@ -54,8 +62,6 @@
                     value-field="id"
                     label="Origin country">
                 </vn-autocomplete>
-            </vn-horizontal>
-            <vn-horizontal>
                 <vn-autocomplete
                     ng-model="$ctrl.worker.educationLevelFk"
                     url="EducationLevels"
@@ -64,6 +70,8 @@
                     value-field="id"
                     label="Education level">
                 </vn-autocomplete>
+            </vn-horizontal>
+            <vn-horizontal>
                 <vn-textfield
                     vn-one 
                     label="SSN" 

modules/worker/front/basic-data/locale/es.yml

@@ -3,4 +3,6 @@ Origin country: País origen
 Education level: Nivel educación
 SSN: NSS
 Married: Casado/a
-Single: Soltero/a
+Single: Soltero/a
+Business phone: Teléfono de empresa
+Mobile extension: Extensión móvil

modules/worker/front/summary/index.html

@@ -38,9 +38,15 @@
                     {{::worker.boss.nickname}}
                 </span>
             </vn-label-value>
-            <vn-label-value label="Phone" 
+            <vn-label-value label="Mobile extension" 
+                value="{{worker.mobileExtension}}">
+            </vn-label-value>
+            <vn-label-value label="Business phone" 
                 value="{{worker.phone}}">
             </vn-label-value>
+            <vn-label-value label="Personal phone" 
+            value="{{worker.client.phone}}">
+        </vn-label-value>
         </vn-one>
         <vn-one>
             <h4 translate>User data</h4>

modules/worker/front/summary/index.js

@@ -34,7 +34,7 @@ class Controller extends Summary {
                 },
                 {
                     relation: 'client',
-                    scope: {fields: ['fi']}
+                    scope: {fields: ['fi', 'phone']}
                 },
                 {
                     relation: 'boss',

modules/worker/front/summary/locale/es.yml

@@ -0,0 +1,3 @@
+Business phone: Teléfono de empresa
+Personal phone: Teléfono personal
+Mobile extension: Extensión móvil