diff --git a/db/dump/structure.sql b/db/dump/structure.sql
index bb58c1955..c616b02d4 100644
--- a/db/dump/structure.sql
+++ b/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 */;
--
diff --git a/modules/worker/back/models/worker.json b/modules/worker/back/models/worker.json
index f7a344358..3d41707ce 100644
--- a/modules/worker/back/models/worker.json
+++ b/modules/worker/back/models/worker.json
@@ -49,6 +49,9 @@
},
"labelerFk": {
"type" : "number"
+ },
+ "mobileExtension": {
+ "type" : "number"
}
},
"relations": {
diff --git a/modules/worker/front/basic-data/index.html b/modules/worker/front/basic-data/index.html
index cbe683185..5a3acdde5 100644
--- a/modules/worker/front/basic-data/index.html
+++ b/modules/worker/front/basic-data/index.html
@@ -25,10 +25,18 @@
+
+
+
+
-
-
+
+
-
-
+
+
-
+
+
+
+
User data
diff --git a/modules/worker/front/summary/index.js b/modules/worker/front/summary/index.js
index 3cdb2c36f..c2ad107d5 100644
--- a/modules/worker/front/summary/index.js
+++ b/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',
diff --git a/modules/worker/front/summary/locale/es.yml b/modules/worker/front/summary/locale/es.yml
new file mode 100644
index 000000000..e9c8e5583
--- /dev/null
+++ b/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
\ No newline at end of file