verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 58 Releases Wiki Activity

Merge pull request '4279-worker_phone' (#1034) from 4279-worker_phone into dev
gitea/salix/pipeline/head This commit looks good Details 

Reviewed-on: #1034
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
This commit is contained in:
Joan Sanchez 2022-08-03 06:45:58 +00:00
parent 185ce60bef 3bf7efea16
commit 0de2c08739
7 changed files with 52 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
db/dump/structure.sql
View File

@ -39331,38 +39331,39 @@ DROP TABLE IF EXISTS `worker`;
/*!40101 SET character_set_client = utf8 */; /*!40101 SET character_set_client = utf8 */;
CREATE TABLE `worker` ( CREATE TABLE `worker` (
`id` int(10) unsigned NOT NULL AUTO_INCREMENT, `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
`code` varchar(3) COLLATE utf8_unicode_ci NOT NULL, `code` varchar(3) COLLATE utf8mb3_unicode_ci NOT NULL,
`firstName` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL, `firstName` varchar(50) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
`lastName` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL, `lastName` varchar(50) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
`password__` varchar(50) CHARACTER SET utf8 DEFAULT NULL, `password__` varchar(50) CHARACTER SET utf8mb3 DEFAULT NULL,
`email__` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL, `email__` varchar(50) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
`extension__` varchar(10) COLLATE utf8_unicode_ci DEFAULT NULL, `extension__` varchar(10) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
`sub` int(11) unsigned DEFAULT NULL, `sub` int(11) unsigned DEFAULT NULL,
`user__` varchar(20) CHARACTER SET utf8 DEFAULT NULL, `user__` varchar(20) CHARACTER SET utf8mb3 DEFAULT NULL,
`typeBussines__` varchar(30) CHARACTER SET utf8 DEFAULT 'no dejar vacio' COMMENT 'campo obsoleto, actualmente se rellena en laboral', `typeBussines__` varchar(30) CHARACTER SET utf8mb3 DEFAULT 'no dejar vacio' COMMENT 'campo obsoleto, actualmente se rellena en laboral',
`laborCategory__` varchar(45) COLLATE utf8_unicode_ci DEFAULT NULL, `laborCategory__` varchar(45) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
`started__` datetime DEFAULT NULL, `started__` datetime DEFAULT NULL,
`ended__` datetime DEFAULT NULL, `ended__` datetime DEFAULT NULL,
`notes__` varchar(254) COLLATE utf8_unicode_ci DEFAULT NULL, `notes__` varchar(254) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
`photo` blob, `photo` blob DEFAULT NULL,
`fi__` varchar(9) COLLATE utf8_unicode_ci DEFAULT NULL, `fi__` varchar(9) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
`address__` varchar(50) COLLATE utf8_unicode_ci NOT NULL, `address__` varchar(50) COLLATE utf8mb3_unicode_ci NOT NULL,
`birthed__` date 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, `clientFk__` int(11) DEFAULT NULL,
`userFk` int(10) unsigned 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, `fiDueDate` datetime DEFAULT NULL,
`hasMachineryAuthorized` tinyint(2) DEFAULT '0', `hasMachineryAuthorized` tinyint(2) DEFAULT 0,
`seniority` date DEFAULT NULL, `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', `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', `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.', `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, `labelerFk` tinyint(3) unsigned DEFAULT NULL,
`originCountryFk` mediumint(8) unsigned DEFAULT NULL COMMENT 'País de origen', `originCountryFk` mediumint(8) unsigned DEFAULT NULL COMMENT 'País de origen',
`educationLevelFk` smallint(6) DEFAULT NULL, `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`), PRIMARY KEY (`id`),
UNIQUE KEY `CodigoTrabajador_UNIQUE` (`code`), UNIQUE KEY `CodigoTrabajador_UNIQUE` (`code`),
UNIQUE KEY `user` (`user__`), 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_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_FK_2` FOREIGN KEY (`educationLevelFk`) REFERENCES `educationLevel` (`id`) ON UPDATE CASCADE,
CONSTRAINT `worker_ibfk_1` FOREIGN KEY (`id`) REFERENCES `account`.`user` (`id`) 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 */; /*!40101 SET character_set_client = @saved_cs_client */;
-- --

3
modules/worker/back/models/worker.json
View File

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

18
modules/worker/front/basic-data/index.html
View File

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

4
modules/worker/front/basic-data/locale/es.yml
View File

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

8
modules/worker/front/summary/index.html
View File

@ -38,9 +38,15 @@
{{::worker.boss.nickname}} {{::worker.boss.nickname}}
</span> </span>
</vn-label-value> </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}}"> value="{{worker.phone}}">
</vn-label-value> </vn-label-value>
<vn-label-value label="Personal phone"
value="{{worker.client.phone}}">
</vn-label-value>
</vn-one> </vn-one>
<vn-one> <vn-one>
<h4 translate>User data</h4> <h4 translate>User data</h4>

2
modules/worker/front/summary/index.js
View File

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

3
modules/worker/front/summary/locale/es.yml Normal file
View File

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