Merge branch 'dev' into 3862-ticket_problemItemShortage

back/methods/account/acl.js

@@ -23,7 +23,13 @@ module.exports = Self => {
         let models = Self.app.models;
 
         let user = await models.Account.findById(userId, {
-            fields: ['id', 'name', 'nickname', 'email']
+            fields: ['id', 'name', 'nickname', 'email', 'lang'],
+            include: {
+                relation: 'userConfig',
+                scope: {
+                    fields: ['darkMode']
+                }
+            }
         });
 
         let roles = await models.RoleMapping.find({

back/models/account.json

@@ -71,6 +71,11 @@
 			"type": "hasOne",
 			"model": "Worker",
 			"foreignKey": "userFk"
+		},
+		"userConfig": {
+			"type": "hasOne",
+			"model": "UserConfig",
+			"foreignKey": "userFk"
 		}
 	},
 	"acls": [

back/models/user-config.json

@@ -9,20 +9,23 @@
     "properties": {
         "userFk": {
             "id": true,
-            "type": "Number",
+            "type": "number",
             "required": true
         },
         "warehouseFk": {
-            "type": "Number"
+            "type": "number"
         },
         "companyFk": {
-            "type": "Number"
+            "type": "number"
         },
         "created": {
-            "type": "Date"
+            "type": "date"
         },
         "updated": {
-            "type": "Date"
+            "type": "date"
+        },
+        "darkMode": {
+            "type": "boolean"
         }
     },
     "relations": {

db/changes/10451-april/00-account_user.sql

@@ -0,0 +1 @@
+ALTER TABLE `vn`.`userConfig` ADD darkMode tinyint(1) DEFAULT 1 NOT NULL COMMENT 'Salix interface dark mode';

modules/route/back/methods/route/getSuggestedTickets.js

@@ -59,6 +59,12 @@ module.exports = Self => {
                         fields: ['id', 'name']
                     }
                 },
+                {
+                    relation: 'agencyMode',
+                    scope: {
+                        fields: ['id', 'name']
+                    }
+                },
                 {
                     relation: 'address',
                     scope: {

modules/route/front/locale/en.yml

@@ -0,0 +1 @@
+Unlink zone: Unlink zone {{zoneName}} from agency {{agencyName}}

modules/route/front/locale/es.yml

@@ -2,3 +2,4 @@ Routes: Rutas
 Search routes by id: Buscar rutas por identificador
 New route: Nueva ruta
 route: ruta
+Unlink zone: Desvincular zona {{zoneName}} de agencia {{agencyName}}

modules/route/front/ticket-popup/index.html

@@ -33,7 +33,7 @@
                     </vn-th>
                     <vn-th expand>PC</vn-th>
                     <vn-th>Address</vn-th>
-                    <vn-th shrink>Warehouse</vn-th>
+                    <vn-th shrink>Zone</vn-th>
                 </vn-tr>
             </vn-thead>
             <vn-tbody>
@@ -62,7 +62,7 @@
                         <vn-icon-button
                             icon="link_off"
                             class="pointer"
-                            translate-attr="{title: 'Unlink zone: {{::ticket.zone.name}} from agency: {{::ticket.agencyMode.name}}'}"
+                            title="{{'Unlink zone' | translate: {zoneName: ticket.zone.name, agencyName: ticket.agencyMode.name} }}"
                             ng-click="unlinkZoneConfirmation.show(ticket)">
                         </vn-icon-button>
                     </vn-td>
@@ -76,4 +76,9 @@
         question="{{$ctrl.confirmationMessage}}"
         message="Unlink selected zone?">
     </vn-confirm>
+    <vn-ticket-descriptor-popover  vn-id="ticket-descriptor">
+    </vn-ticket-descriptor-popover>
+    <vn-client-descriptor-popover vn-id="client-descriptor">
+    </vn-client-descriptor-popover>
 </tpl-body>
+