diff --git a/front/salix/components/log/index.html b/front/salix/components/log/index.html
index a50bafe5d9..e6ade48fbe 100644
--- a/front/salix/components/log/index.html
+++ b/front/salix/components/log/index.html
@@ -53,12 +53,10 @@
-
#{{::log.changedModelId}}
- {{::log.changedModelValue}}
+ {{::log.changedModelValue}}
-
.model-id {
color: $color-font-secondary;
font-size: .9rem;
+ float: right;
}
}
}
diff --git a/loopback/common/models/log.json b/loopback/common/models/log.json
index 54046f0729..6d246371cc 100644
--- a/loopback/common/models/log.json
+++ b/loopback/common/models/log.json
@@ -1,4 +1,61 @@
{
- "name": "Log",
- "base": "VnModel"
+ "name": "Log",
+ "base": "VnModel",
+ "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"
+ },
+ "oldJson": {
+ "type": "String",
+ "mysql": {"columnName": "oldInstance"}
+ },
+ "newJson": {
+ "type": "String",
+ "mysql": {"columnName": "newInstance"}
+ },
+ "creationDate": {
+ "type": "date"
+ },
+ "changedModelId": {
+ "type": "string"
+ },
+ "changedModelValue": {
+ "type": "string"
+ },
+ "description": {
+ "type": "string"
+ }
+ },
+ "relations": {
+ "user": {
+ "type": "belongsTo",
+ "model": "VnUser",
+ "foreignKey": "userFk"
+ }
+ },
+ "scope": {
+ "order": ["creationDate DESC", "id DESC"]
+ }
}
diff --git a/modules/account/back/models/role-log.json b/modules/account/back/models/role-log.json
index 510e98b68f..324000b681 100644
--- a/modules/account/back/models/role-log.json
+++ b/modules/account/back/models/role-log.json
@@ -5,54 +5,5 @@
"mysql": {
"table": "account.roleLog"
}
- },
- "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"]
}
}
diff --git a/modules/account/back/models/user-log.json b/modules/account/back/models/user-log.json
index c5aa08e058..8c0234acaa 100644
--- a/modules/account/back/models/user-log.json
+++ b/modules/account/back/models/user-log.json
@@ -5,54 +5,5 @@
"mysql": {
"table": "account.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": "VnUser",
- "foreignKey": "userFk"
- }
- },
- "scope": {
- "order": ["creationDate DESC", "id DESC"]
}
}
diff --git a/modules/claim/back/models/claim-log.json b/modules/claim/back/models/claim-log.json
index 9f28af63e3..2c061b08f7 100644
--- a/modules/claim/back/models/claim-log.json
+++ b/modules/claim/back/models/claim-log.json
@@ -5,54 +5,5 @@
"mysql": {
"table": "claimLog"
}
- },
- "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": "VnUser",
- "foreignKey": "userFk"
- }
- },
- "scope": {
- "order": ["creationDate DESC", "id DESC"]
}
}
diff --git a/modules/client/back/models/client-log.json b/modules/client/back/models/client-log.json
index 316dbe9727..c0e69df351 100644
--- a/modules/client/back/models/client-log.json
+++ b/modules/client/back/models/client-log.json
@@ -5,54 +5,5 @@
"mysql": {
"table": "clientLog"
}
- },
- "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": "VnUser",
- "foreignKey": "userFk"
- }
- },
- "scope": {
- "order": ["creationDate DESC", "id DESC"]
}
}
diff --git a/modules/entry/back/models/entry-log.json b/modules/entry/back/models/entry-log.json
index b4370e3bcc..ac4d803d1b 100644
--- a/modules/entry/back/models/entry-log.json
+++ b/modules/entry/back/models/entry-log.json
@@ -5,54 +5,5 @@
"mysql": {
"table": "entryLog"
}
- },
- "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": "string"
- },
- "changedModelValue": {
- "type": "string"
- },
- "description": {
- "type": "string"
- }
- },
- "relations": {
- "user": {
- "type": "belongsTo",
- "model": "VnUser",
- "foreignKey": "userFk"
- }
- },
- "scope": {
- "order": ["creationDate DESC", "id DESC"]
}
}
diff --git a/modules/invoiceIn/back/models/invoice-in-log.json b/modules/invoiceIn/back/models/invoice-in-log.json
index 70892d0f9d..43ebb4c55c 100644
--- a/modules/invoiceIn/back/models/invoice-in-log.json
+++ b/modules/invoiceIn/back/models/invoice-in-log.json
@@ -5,57 +5,5 @@
"mysql": {
"table": "invoiceInLog"
}
- },
- "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": "string"
- },
- "changedModelValue": {
- "type": "string"
- },
- "description": {
- "type": "string"
- }
- },
- "relations": {
- "user": {
- "type": "belongsTo",
- "model": "VnUser",
- "foreignKey": "userFk"
- }
- },
- "scope": {
- "order": [
- "creationDate DESC",
- "id DESC"
- ]
}
}
diff --git a/modules/item/back/models/item-log.json b/modules/item/back/models/item-log.json
index 19c132187a..8b8534d111 100644
--- a/modules/item/back/models/item-log.json
+++ b/modules/item/back/models/item-log.json
@@ -5,54 +5,5 @@
"mysql": {
"table": "itemLog"
}
- },
- "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": "VnUser",
- "foreignKey": "userFk"
- }
- },
- "scope": {
- "order": ["creationDate DESC", "id DESC"]
}
}
diff --git a/modules/route/back/models/route-log.json b/modules/route/back/models/route-log.json
index 93f570593e..63c233bdd7 100644
--- a/modules/route/back/models/route-log.json
+++ b/modules/route/back/models/route-log.json
@@ -5,54 +5,5 @@
"mysql": {
"table": "routeLog"
}
- },
- "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": "VnUser",
- "foreignKey": "userFk"
- }
- },
- "scope": {
- "order": ["creationDate DESC", "id DESC"]
}
}
diff --git a/modules/shelving/back/models/shelving-log.json b/modules/shelving/back/models/shelving-log.json
index e8245f7702..03a5dda1a0 100644
--- a/modules/shelving/back/models/shelving-log.json
+++ b/modules/shelving/back/models/shelving-log.json
@@ -1,58 +1,9 @@
{
- "name": "ShelvingLog",
+ "name": "ShelvingLog",
"base": "Log",
- "options": {
- "mysql": {
- "table": "shelvingLog"
- }
- },
- "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"
+ "options": {
+ "mysql": {
+ "table": "shelvingLog"
}
- },
- "relations": {
- "user": {
- "type": "belongsTo",
- "model": "VnUser",
- "foreignKey": "userFk"
- }
- },
- "scope": {
- "order": ["creationDate DESC", "id DESC"]
}
}
diff --git a/modules/supplier/back/models/supplier-log.json b/modules/supplier/back/models/supplier-log.json
index 86fa2e54af..1fe4752a0c 100644
--- a/modules/supplier/back/models/supplier-log.json
+++ b/modules/supplier/back/models/supplier-log.json
@@ -5,54 +5,5 @@
"mysql": {
"table": "supplierLog"
}
- },
- "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": "string"
- },
- "changedModelValue": {
- "type": "string"
- },
- "description": {
- "type": "string"
- }
- },
- "relations": {
- "user": {
- "type": "belongsTo",
- "model": "VnUser",
- "foreignKey": "userFk"
- }
- },
- "scope": {
- "order": ["creationDate DESC", "id DESC"]
}
}
diff --git a/modules/ticket/back/models/ticket-log.json b/modules/ticket/back/models/ticket-log.json
index df04348dae..d5d1e5520b 100644
--- a/modules/ticket/back/models/ticket-log.json
+++ b/modules/ticket/back/models/ticket-log.json
@@ -1,58 +1,9 @@
{
- "name": "TicketLog",
+ "name": "TicketLog",
"base": "Log",
- "options": {
- "mysql": {
- "table": "ticketLog"
- }
- },
- "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"
+ "options": {
+ "mysql": {
+ "table": "ticketLog"
}
- },
- "relations": {
- "user": {
- "type": "belongsTo",
- "model": "VnUser",
- "foreignKey": "userFk"
- }
- },
- "scope": {
- "order": ["creationDate DESC", "id DESC"]
}
}
diff --git a/modules/travel/back/models/travel-log.json b/modules/travel/back/models/travel-log.json
index e781c2948c..e01d579436 100644
--- a/modules/travel/back/models/travel-log.json
+++ b/modules/travel/back/models/travel-log.json
@@ -5,54 +5,5 @@
"mysql": {
"table": "travelLog"
}
- },
- "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": "string"
- },
- "changedModelValue": {
- "type": "string"
- },
- "description": {
- "type": "string"
- }
- },
- "relations": {
- "user": {
- "type": "belongsTo",
- "model": "VnUser",
- "foreignKey": "userFk"
- }
- },
- "scope": {
- "order": ["creationDate DESC", "id DESC"]
}
}
diff --git a/modules/worker/back/models/device-production-log.json b/modules/worker/back/models/device-production-log.json
index 71c54a9c1b..b87fe5e6b4 100644
--- a/modules/worker/back/models/device-production-log.json
+++ b/modules/worker/back/models/device-production-log.json
@@ -1,55 +1,14 @@
{
- "name": "DeviceProductionLog",
- "base": "Log",
- "options": {
- "mysql": {
- "table": "deviceProductionLog"
- }
- },
- "properties": {
- "id": {
- "id": true,
- "type": "number",
- "forceId": false
- },
- "originFk": {
- "type": "number",
- "required": true
- },
- "userFk": {
- "type": "number"
- },
- "deviceProduction": {
- "type": "number"
- },
- "action": {
- "type": "string",
- "required": true
- },
- "created": {
- "type": "date"
- },
- "oldInstance": {
- "type": "object"
- },
- "newInstance": {
- "type": "object"
- },
- "changedModel": {
- "type": "string"
- },
- "changedModelId": {
- "type": "number"
- }
- },
- "relations": {
- "user": {
- "type": "belongsTo",
- "model": "Account",
- "foreignKey": "userFk"
+ "name": "DeviceProductionLog",
+ "base": "Log",
+ "options": {
+ "mysql": {
+ "table": "deviceProductionLog"
}
},
- "scope": {
- "order": ["created DESC", "id DESC"]
+ "properties": {
+ "deviceProduction": {
+ "type": "number"
+ }
}
}
diff --git a/modules/worker/back/models/worker-log.json b/modules/worker/back/models/worker-log.json
index 6eb8b75beb..1ca1ac5ff2 100644
--- a/modules/worker/back/models/worker-log.json
+++ b/modules/worker/back/models/worker-log.json
@@ -5,54 +5,5 @@
"mysql": {
"table": "workerLog"
}
- },
- "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": "string"
- },
- "changedModelValue": {
- "type": "string"
- },
- "description": {
- "type": "string"
- }
- },
- "relations": {
- "user": {
- "type": "belongsTo",
- "model": "VnUser",
- "foreignKey": "userFk"
- }
- },
- "scope": {
- "order": ["creationDate DESC", "id DESC"]
}
}
diff --git a/modules/zone/back/models/zone-log.json b/modules/zone/back/models/zone-log.json
index 72dd305b2a..403966ddd5 100644
--- a/modules/zone/back/models/zone-log.json
+++ b/modules/zone/back/models/zone-log.json
@@ -5,54 +5,5 @@
"mysql": {
"table": "zoneLog"
}
- },
- "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": "string"
- },
- "changedModelValue": {
- "type": "string"
- },
- "description": {
- "type": "string"
- }
- },
- "relations": {
- "user": {
- "type": "belongsTo",
- "model": "VnUser",
- "foreignKey": "userFk"
- }
- },
- "scope": {
- "order": ["creationDate DESC", "id DESC"]
}
}