Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev

2019-10-16 08:03:09 +02:00 · 2019-10-16 08:03:09 +02:00 · a501cb8887
parent b37e308a4b 6ed5695063
commit a501cb8887
15 changed files with 253 additions and 22 deletions
--- a/db/changes/10091-iberflora/00-route.sql
+++ b/db/changes/10091-iberflora/00-route.sql
@ -0,0 +1,10 @@
+ALTER TABLE `vn`.`route` 
+ADD COLUMN `zoneFk` INT NULL AFTER `description`,
+ADD INDEX `fk_route_1_idx` (`zoneFk` ASC);
+;
+ALTER TABLE `vn`.`route` 
+ADD CONSTRAINT `fk_route_1`
+  FOREIGN KEY (`zoneFk`)
+  REFERENCES `vn`.`zone` (`id`)
+  ON DELETE RESTRICT
+  ON UPDATE CASCADE;
--- a/db/changes/10100-AllSaints/00-ACL.sql
+++ b/db/changes/10100-AllSaints/00-ACL.sql
@ -0,0 +1 @@
+INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`) VALUES ('UserPhone', '*', 'WRITE', 'ALLOW', 'ROLE', 'employee');
--- a/db/changes/10100-AllSaints/00-userLog.sql
+++ b/db/changes/10100-AllSaints/00-userLog.sql
@ -0,0 +1,18 @@
+CREATE TABLE `vn`.`userLog` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `originFk` int(11) NOT NULL,
+  `userFk` int(10) unsigned DEFAULT NULL,
+  `action` set('insert','update','delete') COLLATE utf8_unicode_ci NOT NULL,
+  `creationDate` timestamp NULL DEFAULT CURRENT_TIMESTAMP,
+  `description` text CHARACTER SET utf8,
+  `changedModel` varchar(45) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `oldInstance` text COLLATE utf8_unicode_ci,
+  `newInstance` text COLLATE utf8_unicode_ci,
+  `changedModelId` int(11) DEFAULT NULL,
+  `changedModelValue` varchar(45) COLLATE utf8_unicode_ci DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  KEY `originFk` (`originFk`),
+  KEY `userFk` (`userFk`),
+  CONSTRAINT `userLog_ibfk_1` FOREIGN KEY (`originFk`) REFERENCES `client` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+  CONSTRAINT `userLog_ibfk_2` FOREIGN KEY (`userFk`) REFERENCES `account`.`user` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
--- a/db/changes/10100-AllSaints/00-userPhoneType.sql
+++ b/db/changes/10100-AllSaints/00-userPhoneType.sql
@ -0,0 +1,9 @@
+CREATE TABLE `vn`.`userPhoneType` (
+  `code` VARCHAR(45) NOT NULL,
+  `description` VARCHAR(255) NULL,
+  PRIMARY KEY (`code`));
+
+
+
+INSERT INTO `vn`.`userPhoneType` (`code`, `description`) VALUES ('businessPhone', 'Telefono de empresa del usuario');
+INSERT INTO `vn`.`userPhoneType` (`code`, `description`) VALUES ('personalPhone', 'Telefono personal del usuario');
--- a/db/changes/10100-AllSaints/01-userPhone.sql
+++ b/db/changes/10100-AllSaints/01-userPhone.sql
@ -0,0 +1,63 @@
+CREATE TABLE `vn`.`userPhone` (
+  `id` INT NOT NULL AUTO_INCREMENT,
+  `userFk` INT(10) UNSIGNED NOT NULL,
+  `typeFk` VARCHAR(45) NOT NULL,
+  `phone` INT(15) NOT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE INDEX `UserFK_Phone` (`userFk` ASC, `phone` ASC));
+
+
+ALTER TABLE `vn`.`userPhone` 
+ADD CONSTRAINT `fgnTypeFk`
+  FOREIGN KEY (typeFk)
+  REFERENCES `vn`.`userPhoneType` (code)
+  ON DELETE RESTRICT
+  ON UPDATE CASCADE;
+
+ALTER TABLE `vn`.`userPhone` 
+ADD CONSTRAINT `fgnUserFk`
+  FOREIGN KEY (userFk)
+  REFERENCES `account`.`user` (id)
+  ON DELETE CASCADE
+  ON UPDATE CASCADE;
+  
+insert into vn.userPhone(userFk,typeFk,phone)
+	select id,'PersonalPhone', phone
+		from vn.client
+        where phone is not null;
+
+
+insert into vn.userPhone(userFk,typeFk,phone)
+	select id,'businessPhone', phone
+		from vn.worker
+        where phone is not null AND phone > '';
+
+insert into vn.userPhone(userFk,typeFk,phone)
+    SELECT 
+        `w`.`userFk`,
+        'businessPhone',
+        `m`.`value` AS `mediaValue`
+    FROM
+        (((((`postgresql`.`person` `p`
+        JOIN `postgresql`.`profile` `po` ON ((`po`.`person_id` = `p`.`person_id`)))
+        JOIN `postgresql`.`profile_media` `pom` ON ((`pom`.`profile_id` = `po`.`profile_id`)))
+        JOIN `postgresql`.`media` `m` ON ((`m`.`media_id` = `pom`.`media_id`)))
+        JOIN `postgresql`.`media_type` `mt` ON ((`mt`.`media_type_id` = `m`.`media_type_id`)))
+        JOIN `vn`.`worker` `w` ON ((`w`.`id` = `p`.`id_trabajador`)))
+            WHERE
+        (`mt`.`name` = 'movil empresa');
+
+insert into vn.userPhone(userFk,typeFk,phone)
+    SELECT 
+        `w`.`userFk`,
+        'personalPhone',
+        `m`.`value` AS `mediaValue`
+    FROM
+        (((((`postgresql`.`person` `p`
+        JOIN `postgresql`.`profile` `po` ON ((`po`.`person_id` = `p`.`person_id`)))
+        JOIN `postgresql`.`profile_media` `pom` ON ((`pom`.`profile_id` = `po`.`profile_id`)))
+        JOIN `postgresql`.`media` `m` ON ((`m`.`media_id` = `pom`.`media_id`)))
+        JOIN `postgresql`.`media_type` `mt` ON ((`mt`.`media_type_id` = `m`.`media_type_id`)))
+        JOIN `vn`.`worker` `w` ON ((`w`.`id` = `p`.`id_trabajador`)))
+            WHERE
+        (`mt`.`name` = 'movil personal')
--- a/db/dump/fixtures.sql
+++ b/db/dump/fixtures.sql
@ -199,8 +199,8 @@ INSERT INTO `vn`.`client`(`id`,`name`,`fi`,`socialName`,`contact`,`street`,`city
        (108,     'Charles Xavier',     '22641921P',  'Professor X',    'Beast',            '3800 Victory Pkwy, Cincinnati, OH 45207, USA', 'Silla', 46460, 1111111111, 222222222, 333333333, 1, 'CharlesXavier@mydomain.com',         NULL, 0, 1234567890, 0, 1, 1, 300,  1, 1, NULL, 10, 5,CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, NULL, 1, 1, 1, 1, NULL, 0, 0, 19,   0, 1),
        (109,     'Bruce Banner',       '16104829E',  'Hulk',           'Black widow',      'Somewhere in New York',                        'Silla', 46460, 1111111111, 222222222, 333333333, 1, 'BruceBanner@mydomain.com',           NULL, 0, 1234567890, 0, 1, 1, 300,  1, 1, NULL, 10, 5,CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, NULL, 1, 1, 0, 0, NULL, 0, 0, 19,   0, 1),
        (110,     'Jessica Jones',      '58282869H',  'Jessica Jones',  'Luke Cage',        'NYCC 2015 Poster',                             'Silla', 46460, 1111111111, 222222222, 333333333, 1, 'JessicaJones@mydomain.com',          NULL, 0, 1234567890, 0, 1, 1, 300,  1, 1, NULL, 10, 5,CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, NULL, 1, 1, 0, 0, NULL, 0, 0, NULL, 0, 1),
-        (200,     'Missing',            NULL,         'Missing man',    'Anton',            'The space',                                    'Silla', 46460, 1111111111, 222222222, 333333333, 1, NULL,                                 NULL, 0, 1234567890, 0, 1, 1, 300,  1, 1, NULL, 10, 5,CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 4, NULL, 1, 0, 1, 0, NULL, 1, 0, NULL, 0, 1),
-        (400,     'Trash',              NULL,         'Garbage man',    'Unknown name',     'New York city',                                'Silla', 46460, 1111111111, 222222222, 333333333, 1, NULL,                                 NULL, 0, 1234567890, 0, 1, 1, 300,  1, 1, NULL, 10, 5,CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 4, NULL, 1, 0, 1, 0, NULL, 1, 0, NULL, 0, 1);
+        (111,     'Missing',            NULL,         'Missing man',    'Anton',            'The space',                                    'Silla', 46460, 1111111111, 222222222, 333333333, 1, NULL,                                 NULL, 0, 1234567890, 0, 1, 1, 300,  1, 1, NULL, 10, 5,CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 4, NULL, 1, 0, 1, 0, NULL, 1, 0, NULL, 0, 1),
+        (112,     'Trash',              NULL,         'Garbage man',    'Unknown name',     'New York city',                                'Silla', 46460, 1111111111, 222222222, 333333333, 1, NULL,                                 NULL, 0, 1234567890, 0, 1, 1, 300,  1, 1, NULL, 10, 5,CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 4, NULL, 1, 0, 1, 0, NULL, 1, 0, NULL, 0, 1);

 INSERT INTO `vn`.`client`(`id`, `name`, `fi`, `socialName`, `contact`, `street`, `city`, `postcode`, `phone`, `isRelevant`, `email`, `iban`,`dueDay`,`accountingAccount`, `isEqualizated`, `provinceFk`, `hasToInvoice`, `credit`, `countryFk`, `isActive`, `gestdocFk`, `quality`, `payMethodFk`,`created`, `isTaxDataChecked`)
    SELECT id, name, CONCAT(RPAD(CONCAT(id,9),8,id),'A'), CONCAT(name, 'Social'), CONCAT(name, 'Contact'), CONCAT(name, 'Street'), 'SILLA', 46460, 623111111, 1, CONCAT(name,'@mydomain.com'), NULL, 0, 1234567890, 0, 1, 1, 300, 1, 1,NULL, 10, 5, CURDATE(), 1
@ -226,8 +226,8 @@ INSERT INTO `vn`.`address`(`id`, `nickname`, `street`, `city`, `postalCode`, `pr
        (8, 'Charles Xavier',       '3800 Victory Pkwy, Cincinnati, OH 45207, USA', 'Silla', 46460, 1, 1111111111, 222222222, 1, 108,    2, NULL, NULL, 0, 1),
        (9, 'Bruce Banner',         'Somewhere in New York',                        'Silla', 46460, 1, 1111111111, 222222222, 1, 109,    2, NULL, NULL, 0, 1),
        (10, 'Jessica Jones',       'NYCC 2015 Poster',                             'Silla', 46460, 1, 1111111111, 222222222, 1, 110,    2, NULL, NULL, 0, 1),
-        (11, 'Missing',             'The space',                                    'Silla', 46460, 1, 1111111111, 222222222, 1, 200,   10, NULL, NULL, 0, 1),
-        (12, 'Trash',               'New York city',                                'Silla', 46460, 1, 1111111111, 222222222, 1, 400,   10, NULL, NULL, 0, 1),
+        (11, 'Missing',             'The space',                                    'Silla', 46460, 1, 1111111111, 222222222, 1, 111,   10, NULL, NULL, 0, 1),
+        (12, 'Trash',               'New York city',                                'Silla', 46460, 1, 1111111111, 222222222, 1, 112,   10, NULL, NULL, 0, 1),
        (101, 'address 01',         'Somewhere in Thailand',                        'Silla', 46460, 1, 1111111111, 222222222, 1, 109,    2, NULL, NULL, 0, 0),
        (102, 'address 02',         'Somewhere in Poland',                          'Silla', 46460, 1, 3333333333, 444444444, 1, 109,    2, NULL, NULL, 0, 0),
        (103, 'address 03',         'Somewhere in Japan',                           'Silla', 46460, 1, 3333333333, 444444444, 1, 109,    2, NULL, NULL, 0, 0),
@ -257,9 +257,7 @@ INSERT INTO `vn`.`address`(`id`, `nickname`, `street`, `city`, `postalCode`, `pr
        (127, 'address 27',         'Your pocket',                                  'Silla', 46460, 1, 1111111111, 222222222, 1, 107,    2, NULL, NULL, 0, 0),
        (128, 'address 28',         'Cerebro',                                      'Silla', 46460, 1, 1111111111, 222222222, 1, 108,    2, NULL, NULL, 0, 0),
        (129, 'address 29',         'Luke Cages Bar',                               'Silla', 46460, 1, 1111111111, 222222222, 1, 110,    2, NULL, NULL, 0, 0),
-        (130, 'address 30',         'Non valid address',                            'Silla', 46460, 1, 1111111111, 222222222, 0, 101,    2, NULL, NULL, 0, 0),
-        (131, 'Missing',            'The space',                                    'Silla', 46460, 1, 1111111111, 222222222, 1, 200,   10, NULL, NULL, 0, 0),
-        (132, 'Trash',              'New York city',                                'Silla', 46460, 1, 1111111111, 222222222, 1, 400,   10, NULL, NULL, 0, 0);
+        (130, 'address 30',         'Non valid address',                            'Silla', 46460, 1, 1111111111, 222222222, 0, 101,    2, NULL, NULL, 0, 0);

 INSERT INTO `vn`.`address`( `nickname`, `street`, `city`, `postalCode`, `provinceFk`, `isActive`, `clientFk`, `agencyModeFk`, `isDefaultAddress`)
    SELECT name, CONCAT(name, 'Street'), 'SILLA', 46460, 1, 1, id, 2, 1
--- a/modules/invoiceOut/back/methods/invoiceOut/filter.js
+++ b/modules/invoiceOut/back/methods/invoiceOut/filter.js
@ -77,11 +77,11 @@ module.exports = Self => {
        let where = buildFilter(ctx.args, (param, value) => {
            switch (param) {
            case 'search':
-                return {ref: {like: `%${value}%`}};
+                return {'i.ref': {like: `%${value}%`}};
            case 'min':
-                return {amount: {gte: value}};
+                return {'i.amount': {gte: value}};
            case 'max':
-                return {amount: {lte: value}};
+                return {'i.amount': {lte: value}};
            case 'hasPdf':
                return {'i.hasPdf': value};
            case 'created':
--- a/modules/route/back/models/route.json
+++ b/modules/route/back/models/route.json
@ -69,6 +69,11 @@
 			"type": "hasMany",
 			"model": "Ticket",
 			"foreignKey": "routeFk"
-		}
+		},
+		"zone": {
+            "type": "belongsTo",
+            "model": "Zone",
+            "foreignKey": "zoneFk"
+        }
    }
 }
--- a/modules/route/front/card/index.js
+++ b/modules/route/front/card/index.js
@ -19,7 +19,8 @@ export default class Controller {
                'kmEnd',
                'started',
                'finished',
-                'cost'
+                'cost',
+                'zoneFk'
            ],

            where: {id: $stateParams.id},
@ -35,6 +36,12 @@ export default class Controller {
                    scope: {
                        fields: ['id', 'm3']
                    }
+                },
+                {
+                    relation: 'zone',
+                    scope: {
+                        fields: ['id', 'name']
+                    }
                }
            ]
        };
--- a/modules/route/front/descriptor/index.html
+++ b/modules/route/front/descriptor/index.html
@ -29,6 +29,9 @@
            <vn-label-value label="Agency" 
                value="{{$ctrl.route.agencyMode.name}}">
            </vn-label-value>
+            <vn-label-value label="Zone" 
+                value="{{$ctrl.route.zone.name}}">
+            </vn-label-value>
            <vn-label-value label="Volume" 
                value="{{$ctrl.route.m3 | dashIfEmpty}} / {{$ctrl.route.vehicle.m3  | dashIfEmpty}} m³">
            </vn-label-value>
--- a/modules/route/front/tickets/index.html
+++ b/modules/route/front/tickets/index.html
@ -34,8 +34,8 @@
                        </vn-multi-check>
                    </vn-th>
                    <vn-th>Order</vn-th>
-                    <vn-th number>Ticket id</vn-th>
-                    <vn-th>Alias</vn-th>
+                    <vn-th number>Ticket</vn-th>
+                    <vn-th>Client</vn-th>
                    <vn-th number shrink>Packages</vn-th>
                    <vn-th shrink>m³</vn-th>
                    <vn-th shrink>Warehouse</vn-th>
@ -53,13 +53,11 @@
                        </vn-check>
                    </vn-td>
                    <vn-td>
-                        <vn-textfield
-                            tab-index="-1"
-                            type="number"
+                        <vn-input-number
                            on-change="$ctrl.setPriority(ticket.id, ticket.priority)"
                            ng-model="ticket.priority"
                            rule="Ticket">
-                        </vn-textfield>
+                        </vn-input-number>
                    </vn-td>
                    <vn-td number>
                        <span 
@ -81,15 +79,15 @@
                    <vn-td shrink>{{ticket.client.postcode}}</vn-td>
                    <vn-td expand title="{{ticket.client.street}}">{{ticket.client.street}}</vn-td>
                    <vn-td shrink> 
-                        <vn-icon
+                        <vn-icon-button
                            ng-if="ticket.notes.length"
-                            vn-tooltip="{{ticket.notes[0].description}}"
+                            title="::{{ticket.notes[0].description}}"
                            icon="insert_drive_file">
-                        </vn-icon>
+                        </vn-icon-button>
                    </vn-td>
                    <vn-td>
                        <vn-icon-button
-                            vn-tooltip="Remove ticket"
+                            translate-attr="::{title: 'Remove ticket'}"
                            icon="delete"
                            ng-click="$ctrl.showDeleteConfirm(ticket.id)"
                            tabindex="-1">
--- a/modules/worker/back/model-config.json
+++ b/modules/worker/back/model-config.json
@ -49,5 +49,14 @@
    },
    "Device": {
        "dataSource": "vn"
+    },
+    "UserPhoneType": {
+        "dataSource": "vn"
+    },
+    "UserPhone": {
+        "dataSource": "vn"
+    },
+    "UserLog": {
+        "dataSource": "vn"
    }
 }
--- a/modules/worker/back/models/user-log.json
+++ b/modules/worker/back/models/user-log.json
@ -0,0 +1,58 @@
+{
+	"name": "UserLog",
+	"base": "VnModel",
+	"options": {
+		"mysql": {
+			"table": "userLog"
+		}
+	},
+	"properties": {
+		"id": {
+			"id": true,
+			"type": "Number",
+			"forceId": false
+		},
+		"originFk": {
+			"type": "Number",
+			"required": true
+		},
+		"userFk": { 
+			"type": "Number"
+		},
+		"action": {
+			"type": "String",
+			"required": true
+		},
+		"changedModel": {
+			"type": "String"
+		},
+		"oldInstance": {
+			"type": "Object"
+		},
+		"newInstance": {
+			"type": "Object"
+		},
+		"creationDate": {
+			"type": "Date"
+		},
+		"changedModelId": {
+			"type": "Number"
+		},
+		"changedModelValue": {
+			"type": "String"
+		},
+		"description": {
+			"type": "String"
+		}
+	},
+	"relations": {
+		"user": {
+			"type": "belongsTo",
+			"model": "Account",
+			"foreignKey": "userFk"
+		}  
+	},
+	"scope": {
+		"order": ["creationDate DESC", "id DESC"]
+	}
+}
--- a/modules/worker/back/models/user-phone-type.json
+++ b/modules/worker/back/models/user-phone-type.json
@ -0,0 +1,18 @@
+{
+    "name": "UserPhoneType",
+    "base": "VnModel",
+    "options": {
+        "mysql": {
+            "table": "userPhoneType"
+        }
+    },
+    "properties": {
+        "code": {
+            "id": true,
+            "type": "String"
+        },
+        "description": {
+            "type": "String"
+        }
+    }
+}
--- a/modules/worker/back/models/user-phone.json
+++ b/modules/worker/back/models/user-phone.json
@ -0,0 +1,34 @@
+{
+    "name": "UserPhone",
+    "base": "Loggable",
+	"log": {
+		"model":"UserLog"
+	},
+    "options": {
+        "mysql": {
+            "table": "userPhone"
+        }
+    },
+    "properties": {
+        "id": {
+            "id": true,
+            "type": "String"
+        },
+        "phone": {
+            "type": "Number",
+            "required": true
+        }
+    },
+	"relations": {
+		"user": {
+			"type": "belongsTo",
+			"model": "Account",
+			"foreignKey": "userFk"
+        },
+        "type": {
+			"type": "belongsTo",
+			"model": "UserPhoneType",
+			"foreignKey": "typeFk"
+		}
+	}
+}
				`@ -0,0 +1 @@`
				INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`) VALUES ('UserPhone', '*', 'WRITE', 'ALLOW', 'ROLE', 'employee');