diff --git a/client/client/src/recovery-list/recovery-list.html b/client/client/src/recovery-list/recovery-list.html
index 86609e573b..24f9ec2a37 100644
--- a/client/client/src/recovery-list/recovery-list.html
+++ b/client/client/src/recovery-list/recovery-list.html
@@ -13,22 +13,22 @@
+ ng-repeat="recovery in $ctrl.instances track by $index">
- lock
- {{recovery.started | date:'dd/MM/yyyy' }}
+ {{::recovery.started | date:'dd/MM/yyyy' }}
{{recovery.finished | date:'dd/MM/yyyy' }}
- {{recovery.amount | currency:'€':0}}
- {{recovery.period}}
+ {{::recovery.amount | currency:'€':0}}
+ {{::recovery.period}}
No results
-
+
diff --git a/services/db/install/changes/1.0.3/06-ticketWeekly.sql b/services/db/install/changes/1.0.3/06-ticketWeekly.sql
new file mode 100644
index 0000000000..c8230a9b00
--- /dev/null
+++ b/services/db/install/changes/1.0.3/06-ticketWeekly.sql
@@ -0,0 +1,10 @@
+USE `vn`;
+CREATE
+ OR REPLACE ALGORITHM = UNDEFINED
+ DEFINER = `root`@`%`
+ SQL SECURITY DEFINER
+VIEW `ticketWeekly` AS
+ SELECT
+ `t`.`Id_Ticket` AS `ticketFk`, `t`.`weekDay` AS `weekDay`
+ FROM
+ `vn2008`.`Tickets_turno` `t`;
\ No newline at end of file
diff --git a/services/db/install/dump/fixtures.sql b/services/db/install/dump/fixtures.sql
index 49cd561433..581e232212 100644
--- a/services/db/install/dump/fixtures.sql
+++ b/services/db/install/dump/fixtures.sql
@@ -586,4 +586,17 @@ INSERT INTO `cache`.`cache_calc`(`id`, `cache_id`, `cacheName`, `params`, `last_
INSERT INTO `bs`.`workerMana`(`workerFk`, `amount`)
VALUES
( 1, -500),
+ ( 3, 0),
+ ( 5, 250),
+ ( 6, 1000),
+ ( 9, 1500);
+
+
+INSERT INTO `vn`.`ticketWeekly`(`ticketFk`, `weekDay`)
+ VALUES
+ ( 1, 0),
+ ( 2, 1),
+ ( 3, 2),
+ ( 4, 4),
+ ( 5, 6);
\ No newline at end of file
diff --git a/services/loopback/common/models/workerMana.json b/services/loopback/common/models/workerMana.json
index bfa8938787..33b8b6ff9b 100644
--- a/services/loopback/common/models/workerMana.json
+++ b/services/loopback/common/models/workerMana.json
@@ -8,11 +8,11 @@
},
"properties": {
"amount": {
- "type": "String"
+ "type": "Number"
},
"workerFk": {
"id": true,
- "type": "String"
+ "type": "Number"
}
},
"relations": {
diff --git a/services/ticket/common/models/ticketWeekly.json b/services/ticket/common/models/ticketWeekly.json
new file mode 100644
index 0000000000..51c635e922
--- /dev/null
+++ b/services/ticket/common/models/ticketWeekly.json
@@ -0,0 +1,25 @@
+{
+ "name": "TicketWeekly",
+ "base": "VnModel",
+ "options": {
+ "mysql": {
+ "table": "ticketWeekly"
+ }
+ },
+ "properties": {
+ "weekDay": {
+ "type": "Number"
+ },
+ "ticketFk": {
+ "id": true,
+ "type": "Number"
+ }
+ },
+ "relations": {
+ "ticket": {
+ "type": "belongsTo",
+ "model": "Ticket",
+ "foreignKey": "ticketFk"
+ }
+ }
+}
diff --git a/services/ticket/server/model-config.json b/services/ticket/server/model-config.json
index 637bd89633..8d38b35828 100644
--- a/services/ticket/server/model-config.json
+++ b/services/ticket/server/model-config.json
@@ -34,6 +34,9 @@
},
"TicketUpdateAction": {
"dataSource": "vn"
+ },
+ "TicketWeekly": {
+ "dataSource": "vn"
}
}