diff --git a/db/changes/232202/00-procedurecanAdvance.sql b/db/changes/232202/00-procedurecanAdvance.sql
new file mode 100644
index 000000000..d82294b3c
--- /dev/null
+++ b/db/changes/232202/00-procedurecanAdvance.sql
@@ -0,0 +1,127 @@
+DELIMITER $$
+$$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`ticket_canAdvance`(vDateFuture DATE, vDateToAdvance DATE, vWarehouseFk INT)
+BEGIN
+/**
+ * Devuelve los tickets y la cantidad de lineas de venta que se pueden adelantar.
+ *
+ * @param vDateFuture Fecha de los tickets que se quieren adelantar.
+ * @param vDateToAdvance Fecha a cuando se quiere adelantar.
+ * @param vWarehouseFk Almacén
+ */
+
+ DECLARE vDateInventory DATE;
+
+ SELECT inventoried INTO vDateInventory FROM config;
+
+ DROP TEMPORARY TABLE IF EXISTS tmp.stock;
+ CREATE TEMPORARY TABLE tmp.stock
+ (itemFk INT PRIMARY KEY,
+ amount INT)
+ ENGINE = MEMORY;
+
+ INSERT INTO tmp.stock(itemFk, amount)
+ SELECT itemFk, SUM(quantity) amount FROM
+ (
+ SELECT itemFk, quantity
+ FROM itemTicketOut
+ WHERE shipped >= vDateInventory
+ AND shipped < vDateFuture
+ AND warehouseFk = vWarehouseFk
+ UNION ALL
+ SELECT itemFk, quantity
+ FROM itemEntryIn
+ WHERE landed >= vDateInventory
+ AND landed < vDateFuture
+ AND isVirtualStock = FALSE
+ AND warehouseInFk = vWarehouseFk
+ UNION ALL
+ SELECT itemFk, quantity
+ FROM itemEntryOut
+ WHERE shipped >= vDateInventory
+ AND shipped < vDateFuture
+ AND warehouseOutFk = vWarehouseFk
+ ) t
+ GROUP BY itemFk HAVING amount != 0;
+
+ DROP TEMPORARY TABLE IF EXISTS tmp.filter;
+ CREATE TEMPORARY TABLE tmp.filter
+ (INDEX (id))
+SELECT
+ origin.ticketFk futureId,
+ dest.ticketFk id,
+ dest.state,
+ origin.futureState,
+ origin.futureIpt,
+ dest.ipt,
+ origin.workerFk,
+ origin.futureLiters,
+ origin.futureLines,
+ dest.shipped,
+ origin.shipped futureShipped,
+ dest.totalWithVat,
+ origin.totalWithVat futureTotalWithVat,
+ dest.agency,
+ origin.futureAgency,
+ dest.lines,
+ dest.liters,
+ origin.futureLines - origin.hasStock AS notMovableLines,
+ (origin.futureLines = origin.hasStock) AS isFullMovable,
+ origin.classColor futureClassColor,
+ dest.classColor
+ FROM (
+ SELECT
+ s.ticketFk,
+ t.workerFk,
+ t.shipped,
+ t.totalWithVat,
+ st.name futureState,
+ t.addressFk,
+ am.name futureAgency,
+ count(s.id) futureLines,
+ GROUP_CONCAT(DISTINCT ipt.code ORDER BY ipt.code) futureIpt,
+ CAST(SUM(litros) AS DECIMAL(10,0)) futureLiters,
+ SUM((s.quantity <= IFNULL(st.amount,0))) hasStock,
+ st.classColor
+ FROM ticket t
+ JOIN sale s ON s.ticketFk = t.id
+ JOIN saleVolume sv ON sv.saleFk = s.id
+ JOIN item i ON i.id = s.itemFk
+ JOIN ticketState ts ON ts.ticketFk = t.id
+ JOIN state st ON st.id = ts.stateFk
+ JOIN agencyMode am ON t.agencyModeFk = am.id
+ LEFT JOIN itemPackingType ipt ON ipt.code = i.itemPackingTypeFk
+ LEFT JOIN tmp.stock st ON st.itemFk = i.id
+ WHERE t.shipped BETWEEN vDateFuture AND util.dayend(vDateFuture)
+ AND t.warehouseFk = vWarehouseFk
+ GROUP BY t.id
+ ) origin
+ JOIN (
+ SELECT
+ t.id ticketFk,
+ t.addressFk,
+ st.name state,
+ GROUP_CONCAT(DISTINCT ipt.code ORDER BY ipt.code) ipt,
+ t.shipped,
+ t.totalWithVat,
+ am.name agency,
+ CAST(SUM(litros) AS DECIMAL(10,0)) liters,
+ CAST(COUNT(*) AS DECIMAL(10,0)) `lines`,
+ st.classColor
+ FROM ticket t
+ JOIN sale s ON s.ticketFk = t.id
+ JOIN saleVolume sv ON sv.saleFk = s.id
+ JOIN item i ON i.id = s.itemFk
+ JOIN ticketState ts ON ts.ticketFk = t.id
+ JOIN state st ON st.id = ts.stateFk
+ JOIN agencyMode am ON t.agencyModeFk = am.id
+ LEFT JOIN itemPackingType ipt ON ipt.code = i.itemPackingTypeFk
+ WHERE t.shipped BETWEEN vDateToAdvance AND util.dayend(vDateToAdvance)
+ AND t.warehouseFk = vWarehouseFk
+ AND st.order <= 5
+ GROUP BY t.id
+ ) dest ON dest.addressFk = origin.addressFk
+ WHERE origin.hasStock != 0;
+ DROP TEMPORARY TABLE tmp.stock;
+END$$
+DELIMITER ;
diff --git a/db/changes/232202/00-procedurecanbePostponed.sql b/db/changes/232202/00-procedurecanbePostponed.sql
new file mode 100644
index 000000000..9d42dcc4b
--- /dev/null
+++ b/db/changes/232202/00-procedurecanbePostponed.sql
@@ -0,0 +1,74 @@
+DELIMITER $$
+$$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`ticket_canbePostponed`(vOriginDated DATE, vFutureDated DATE, vWarehouseFk INT)
+BEGIN
+/**
+ * Devuelve un listado de tickets susceptibles de fusionarse con otros tickets en el futuro
+ *
+ * @param vOriginDated Fecha en cuestión
+ * @param vFutureDated Fecha en el futuro a sondear
+ * @param vWarehouseFk Identificador de vn.warehouse
+ */
+ DROP TEMPORARY TABLE IF EXISTS tmp.filter;
+ CREATE TEMPORARY TABLE tmp.filter
+ (INDEX (id))
+ SELECT sv.ticketFk id,
+ sub2.id futureId,
+ GROUP_CONCAT(DISTINCT i.itemPackingTypeFk ORDER BY i.itemPackingTypeFk) ipt,
+ CAST(sum(litros) AS DECIMAL(10,0)) liters,
+ CAST(count(*) AS DECIMAL(10,0)) `lines`,
+ st.name state,
+ sub2.iptd futureIpt,
+ sub2.state futureState,
+ t.clientFk,
+ t.warehouseFk,
+ ts.alertLevel,
+ t.shipped,
+ sub2.shipped futureShipped,
+ t.workerFk,
+ st.code stateCode,
+ sub2.code futureStateCode,
+ st.classColor,
+ sub2.classColor futureClassColor
+ FROM vn.saleVolume sv
+ JOIN vn.sale s ON s.id = sv.saleFk
+ JOIN vn.item i ON i.id = s.itemFk
+ JOIN vn.ticket t ON t.id = sv.ticketFk
+ JOIN vn.address a ON a.id = t.addressFk
+ JOIN vn.province p ON p.id = a.provinceFk
+ JOIN vn.country c ON c.id = p.countryFk
+ JOIN vn.ticketState ts ON ts.ticketFk = t.id
+ JOIN vn.state st ON st.id = ts.stateFk
+ JOIN vn.alertLevel al ON al.id = ts.alertLevel
+ LEFT JOIN vn.ticketParking tp ON tp.ticketFk = t.id
+ LEFT JOIN (
+ SELECT *
+ FROM (
+ SELECT
+ t.addressFk,
+ t.id,
+ t.shipped,
+ st.name state,
+ st.code,
+ st.classColor,
+ GROUP_CONCAT(DISTINCT i.itemPackingTypeFk ORDER BY i.itemPackingTypeFk) iptd
+ FROM vn.ticket t
+ JOIN vn.ticketState ts ON ts.ticketFk = t.id
+ JOIN vn.state st ON st.id = ts.stateFk
+ JOIN vn.sale s ON s.ticketFk = t.id
+ JOIN vn.item i ON i.id = s.itemFk
+ WHERE t.shipped BETWEEN vFutureDated
+ AND util.dayend(vFutureDated)
+ AND t.warehouseFk = vWarehouseFk
+ GROUP BY t.id
+ ) sub
+ GROUP BY sub.addressFk
+ ) sub2 ON sub2.addressFk = t.addressFk AND t.id != sub2.id
+ WHERE t.shipped BETWEEN vOriginDated AND util.dayend(vOriginDated)
+ AND t.warehouseFk = vWarehouseFk
+ AND al.code = 'FREE'
+ AND tp.ticketFk IS NULL
+ GROUP BY sv.ticketFk
+ HAVING futureId;
+END$$
+DELIMITER ;
diff --git a/front/salix/components/log/index.html b/front/salix/components/log/index.html
index d5675975b..e6ade48fb 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}}
{{::prop.nameI18n}}:
-
,
+
,
{{::prop.nameI18n}}:
-
+
- ←
+ ←
@@ -163,12 +161,17 @@
data="$ctrl.models"
class="changed-model">
-
a.nameI18n.localeCompare(b.nameI18n));
}
+
+ function getVal(vals, prop) {
+ let val, id;
+ const showProp = `${prop}$`;
+
+ if (vals[showProp] != null) {
+ val = vals[showProp];
+ id = vals[prop];
+ } else
+ val = vals[prop];
+
+ return {val: castJsonValue(val), id};
+ }
}
get models() {
@@ -113,10 +131,6 @@ export default class Controller extends Section {
: value;
}
- mainVal(prop, action) {
- return action == 'delete' ? prop.old : prop.new;
- }
-
relativeDate(dateVal) {
if (dateVal == null) return '';
const date = new Date(dateVal);
@@ -150,14 +164,16 @@ export default class Controller extends Section {
if (value == null || value == '') return null;
switch (prop) {
case 'search':
- if (/^[0-9]+$/.test(value))
- return {changedModelId: value};
- else
- return {changedModelValue: {like: `%${value}%`}};
+ const or = [];
+ if (/^[\w_-]+$/.test(value))
+ or.push({changedModelId: value});
+ if (!/^[0-9]+$/.test(value))
+ or.push({changedModelValue: {like: `%${value}%`}});
+ return or.length ? {or} : null;
case 'changes':
return {or: [
- {oldInstance: {like: `%${value}%`}},
- {newInstance: {like: `%${value}%`}},
+ {oldJson: {like: `%${value}%`}},
+ {newJson: {like: `%${value}%`}},
{description: {like: `%${value}%`}}
]};
case 'who':
@@ -238,3 +254,12 @@ ngModule.vnComponent('vnLog', {
url: '@'
}
});
+
+ngModule.component('vnLogValue', {
+ template:
+ '' +
+ ' #{{::$ctrl.val.id}}',
+ bindings: {
+ val: '',
+ }
+});
diff --git a/front/salix/components/log/locale/es.yml b/front/salix/components/log/locale/es.yml
index 95d930716..0f2755f2e 100644
--- a/front/salix/components/log/locale/es.yml
+++ b/front/salix/components/log/locale/es.yml
@@ -2,6 +2,9 @@ Date: Fecha
Concept: Concepto
Search: Buscar
Search by id or concept: Buscar por identificador o concepto
+Search by changes: |
+ Buscar por cambios realizados. Los atributos deben buscarse por su nombre
+ interno, para obtenerlo situar el cursor sobre el nombre.
Entity: Entidad
Action: Acción
Author: Autor
diff --git a/front/salix/components/log/style.scss b/front/salix/components/log/style.scss
index 7a5e18049..cec591a7f 100644
--- a/front/salix/components/log/style.scss
+++ b/front/salix/components/log/style.scss
@@ -105,6 +105,7 @@ vn-log {
& > .model-id {
color: $color-font-secondary;
font-size: .9rem;
+ float: right;
}
}
}
@@ -144,3 +145,7 @@ vn-log {
}
}
}
+vn-log-value > .id-value {
+ font-size: .9rem;
+ color: $color-font-secondary;
+}
diff --git a/loopback/common/models/log.json b/loopback/common/models/log.json
index 54046f072..6d246371c 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/locale/role-inherit/en.yml b/modules/account/back/locale/role-inherit/en.yml
index 760881325..8422ecdce 100644
--- a/modules/account/back/locale/role-inherit/en.yml
+++ b/modules/account/back/locale/role-inherit/en.yml
@@ -1,4 +1,5 @@
name: subrole
columns:
+ id: id
role: rol
inheritsFrom: inherits
diff --git a/modules/account/back/locale/role-inherit/es.yml b/modules/account/back/locale/role-inherit/es.yml
index c352c6ff2..10381628c 100644
--- a/modules/account/back/locale/role-inherit/es.yml
+++ b/modules/account/back/locale/role-inherit/es.yml
@@ -1,4 +1,5 @@
name: subrol
columns:
+ id: id
role: rol
inheritsFrom: hereda
diff --git a/modules/account/back/models/role-log.json b/modules/account/back/models/role-log.json
index 510e98b68..324000b68 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 c5aa08e05..8c0234aca 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 9f28af63e..2c061b08f 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/locale/sms/en.yml b/modules/client/back/locale/sms/en.yml
new file mode 100644
index 000000000..cb52f80ec
--- /dev/null
+++ b/modules/client/back/locale/sms/en.yml
@@ -0,0 +1,10 @@
+name: SMS
+columns:
+ id: id
+ senderFk: sender
+ sender: sender number
+ destination: destination
+ message: message
+ statusCode: status code
+ status: status
+ created: created
diff --git a/modules/client/back/locale/sms/es.yml b/modules/client/back/locale/sms/es.yml
new file mode 100644
index 000000000..f314921c1
--- /dev/null
+++ b/modules/client/back/locale/sms/es.yml
@@ -0,0 +1,10 @@
+name: SMS
+columns:
+ id: id
+ senderFk: remitente
+ sender: número remitente
+ destination: destinatario
+ message: mensaje
+ statusCode: código estado
+ status: estado
+ created: creado
diff --git a/modules/client/back/models/client-log.json b/modules/client/back/models/client-log.json
index 316dbe972..c0e69df35 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 b4370e3bc..ac4d803d1 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 70892d0f9..43ebb4c55 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 19c132187..8b8534d11 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 93f570593..63c233bdd 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 e8245f770..03a5dda1a 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 86fa2e54a..1fe4752a0 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 df04348da..d5d1e5520 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/ticket/front/advance/index.html b/modules/ticket/front/advance/index.html
index c937fe2ac..e6f16c965 100644
--- a/modules/ticket/front/advance/index.html
+++ b/modules/ticket/front/advance/index.html
@@ -150,7 +150,7 @@
{{::ticket.futureIpt | dashIfEmpty}} |
+ class="chip {{ticket.futureClassColor}}">
{{::ticket.futureState | dashIfEmpty}}
|
diff --git a/modules/ticket/front/advance/index.js b/modules/ticket/front/advance/index.js
index 7b8008426..0cec41227 100644
--- a/modules/ticket/front/advance/index.js
+++ b/modules/ticket/front/advance/index.js
@@ -102,13 +102,6 @@ export default class Controller extends Section {
return checkedLines;
}
- stateColor(state) {
- if (state === 'OK')
- return 'success';
- else if (state === 'Libre')
- return 'notice';
- }
-
dateRange(value) {
const minHour = new Date(value);
minHour.setHours(0, 0, 0, 0);
diff --git a/modules/ticket/front/advance/index.spec.js b/modules/ticket/front/advance/index.spec.js
index 6874f914b..da8614ca5 100644
--- a/modules/ticket/front/advance/index.spec.js
+++ b/modules/ticket/front/advance/index.spec.js
@@ -61,24 +61,6 @@ describe('Component vnTicketAdvance', () => {
});
});
- describe('stateColor()', () => {
- it('should return success to the OK tickets', () => {
- const ok = controller.stateColor(controller.$.model.data[0].state);
- const notOk = controller.stateColor(controller.$.model.data[1].state);
-
- expect(ok).toEqual('success');
- expect(notOk).not.toEqual('success');
- });
-
- it('should return success to the FREE tickets', () => {
- const notFree = controller.stateColor(controller.$.model.data[0].state);
- const free = controller.stateColor(controller.$.model.data[1].state);
-
- expect(free).toEqual('notice');
- expect(notFree).not.toEqual('notice');
- });
- });
-
describe('dateRange()', () => {
it('should return two dates with the hours at the start and end of the given date', () => {
const now = Date.vnNew();
diff --git a/modules/ticket/front/future/index.html b/modules/ticket/front/future/index.html
index 2f0290c27..78b0f9864 100644
--- a/modules/ticket/front/future/index.html
+++ b/modules/ticket/front/future/index.html
@@ -158,7 +158,7 @@
{{::ticket.futureIpt | dashIfEmpty}} |
+ class="chip {{ticket.futureClassColor}}">
{{::ticket.futureState}}
|
diff --git a/modules/travel/back/models/travel-log.json b/modules/travel/back/models/travel-log.json
index e781c2948..e01d57943 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 71c54a9c1..b87fe5e6b 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 6eb8b75be..1ca1ac5ff 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 72dd305b2..403966ddd 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"]
}
}