From c2de5c5ff4fa4c07f9c6721b540832d566778b52 Mon Sep 17 00:00:00 2001
From: alexandre <alexandre@verdnatura.es>
Date: Tue, 2 May 2023 07:28:59 +0200
Subject: [PATCH] refs #4797 added redirection section

---
 db/dump/fixtures.sql                          |  7 +++++-
 loopback/locale/es.json                       | 23 ++++++++++---------
 modules/client/back/models/client.json        |  2 +-
 modules/worker/front/index.js                 |  1 +
 modules/worker/front/notifications/index.html |  2 ++
 modules/worker/front/notifications/index.js   | 21 +++++++++++++++++
 modules/worker/front/routes.json              |  9 ++++++++
 7 files changed, 52 insertions(+), 13 deletions(-)
 create mode 100644 modules/worker/front/notifications/index.html
 create mode 100644 modules/worker/front/notifications/index.js

diff --git a/db/dump/fixtures.sql b/db/dump/fixtures.sql
index 15ccece35..6554adc33 100644
--- a/db/dump/fixtures.sql
+++ b/db/dump/fixtures.sql
@@ -2723,7 +2723,10 @@ INSERT INTO `util`.`notification` (`id`, `name`, `description`)
 
 INSERT INTO `util`.`notificationAcl` (`notificationFk`, `roleFk`)
     VALUES
-        (1, 9);
+        (1, 9),
+        (1, 1),
+        (2, 1),
+        (4, 1);
 
 INSERT INTO `util`.`notificationQueue` (`id`, `notificationFk`, `params`, `authorFk`, `status`, `created`)
     VALUES
@@ -2735,6 +2738,8 @@ INSERT INTO `util`.`notificationSubscription` (`notificationFk`, `userFk`)
     VALUES
         (1, 1109),
         (1, 1110),
+        (2, 1110),
+        (4, 1110),
         (2, 1109),
 	    (1,9),
         (1,3);
diff --git a/loopback/locale/es.json b/loopback/locale/es.json
index 3ef3c4a22..628f7ace6 100644
--- a/loopback/locale/es.json
+++ b/loopback/locale/es.json
@@ -279,15 +279,16 @@
 	"Comment added to client": "Observación añadida al cliente {{clientFk}}",
 	"Cannot create a new claimBeginning from a different ticket": "No se puede crear una línea de reclamación de un ticket diferente al origen",
 	"company": "Compañía",
-    "country": "País",
-    "clientId": "Id cliente",
-    "clientSocialName": "Cliente",
-    "amount": "Importe",
-    "taxableBase": "Base",
-    "ticketFk": "Id ticket",
-    "isActive": "Activo",
-    "hasToInvoice": "Facturar",
-    "isTaxDataChecked": "Datos comprobados",
-    "comercialId": "Id comercial",
-    "comercialName": "Comercial"
+	"country": "País",
+	"clientId": "Id cliente",
+	"clientSocialName": "Cliente",
+	"amount": "Importe",
+	"taxableBase": "Base",
+	"ticketFk": "Id ticket",
+	"isActive": "Activo",
+	"hasToInvoice": "Facturar",
+	"isTaxDataChecked": "Datos comprobados",
+	"comercialId": "Id comercial",
+	"comercialName": "Comercial",
+	"You dont have permission to modify this user": "No tienes permiso para modificar este usuario"
 }
diff --git a/modules/client/back/models/client.json b/modules/client/back/models/client.json
index 5f56a1ed2..73b6cccb4 100644
--- a/modules/client/back/models/client.json
+++ b/modules/client/back/models/client.json
@@ -158,7 +158,7 @@
 		},
 		"user": {
 			"type": "belongsTo",
-			"model": "Account",
+			"model": "VnUser",
 			"foreignKey": "id"
 		},
 		"payMethod": {
diff --git a/modules/worker/front/index.js b/modules/worker/front/index.js
index 8fad2c0df..5c03dc8de 100644
--- a/modules/worker/front/index.js
+++ b/modules/worker/front/index.js
@@ -20,4 +20,5 @@ import './dms/create';
 import './dms/edit';
 import './note/index';
 import './note/create';
+import './notifications';
 
diff --git a/modules/worker/front/notifications/index.html b/modules/worker/front/notifications/index.html
new file mode 100644
index 000000000..7fb3b870e
--- /dev/null
+++ b/modules/worker/front/notifications/index.html
@@ -0,0 +1,2 @@
+<vn-card>
+</vn-card>
diff --git a/modules/worker/front/notifications/index.js b/modules/worker/front/notifications/index.js
new file mode 100644
index 000000000..622892979
--- /dev/null
+++ b/modules/worker/front/notifications/index.js
@@ -0,0 +1,21 @@
+import ngModule from '../module';
+import Section from 'salix/components/section';
+
+class Controller extends Section {
+    constructor($element, $) {
+        super($element, $);
+    }
+
+    async $onInit() {
+        const url = await this.vnApp.getUrl(`worker/${this.$params.id}/notifications`);
+        window.open(url).focus();
+    }
+}
+
+ngModule.vnComponent('vnWorkerNotifications', {
+    template: require('./index.html'),
+    controller: Controller,
+    bindings: {
+        ticket: '<'
+    }
+});
diff --git a/modules/worker/front/routes.json b/modules/worker/front/routes.json
index 25a0ffbcf..bce0172a2 100644
--- a/modules/worker/front/routes.json
+++ b/modules/worker/front/routes.json
@@ -15,6 +15,7 @@
             {"state": "worker.card.timeControl", "icon": "access_time"},
             {"state": "worker.card.calendar", "icon": "icon-calendar"},
             {"state": "worker.card.pda", "icon": "phone_android"},
+            {"state": "worker.card.notifications", "icon": "notifications"},
             {"state": "worker.card.pbx", "icon": "icon-pbx"},
             {"state": "worker.card.dms.index", "icon": "cloud_upload"},
             {
@@ -109,6 +110,14 @@
             "params": {
                 "worker": "$ctrl.worker"
             }
+        }, {
+            "url": "/notifications",
+            "state": "worker.card.notifications",
+            "component": "vn-worker-notifications",
+            "description": "Notifications",
+            "params": {
+                "worker": "$ctrl.worker"
+            }
         }, {
             "url": "/time-control?timestamp",
             "state": "worker.card.timeControl",