diff --git a/back/methods/dms/uploadFile.js b/back/methods/dms/uploadFile.js index b50aaf824d..41d551f2b1 100644 --- a/back/methods/dms/uploadFile.js +++ b/back/methods/dms/uploadFile.js @@ -94,7 +94,7 @@ module.exports = Self => { const models = Self.app.models; const storageConnector = Self.app.dataSources.storage.connector; const myUserId = ctx.req.accessToken.userId; - const myWorker = await models.Worker.findOne({where: {userFk: myUserId}}); + const myWorker = await models.Worker.findOne({where: {userFk: myUserId}}, myOptions); const args = ctx.args; const newDms = await Self.create({ diff --git a/db/dump/fixtures.sql b/db/dump/fixtures.sql index f701c41213..f00a98759c 100644 --- a/db/dump/fixtures.sql +++ b/db/dump/fixtures.sql @@ -471,7 +471,7 @@ INSERT INTO `vn`.`ticket`(`id`, `priority`, `agencyModeFk`,`warehouseFk`,`routeF (14, 1, 2, 1, 3, CURDATE(), DATE_ADD(CURDATE(), INTERVAL + 1 DAY), 104, 'Malibu Point', 4, NULL, 0, 9, CURDATE()), (15, 1, 7, 1, 3, CURDATE(), DATE_ADD(CURDATE(), INTERVAL + 1 DAY), 105, 'Plastic Cell', 125, NULL, 0, 3, CURDATE()), (16, 1, 7, 1, 3, CURDATE(), DATE_ADD(CURDATE(), INTERVAL + 1 DAY), 106, 'Many Places', 126, NULL, 0, 3, CURDATE()), - (17, 1, 7, 1, 3, CURDATE(), DATE_ADD(CURDATE(), INTERVAL + 1 DAY), 106, 'Many Places', 126, NULL, 0, 3, CURDATE()), + (17, 1, 7, 2, 3, CURDATE(), DATE_ADD(CURDATE(), INTERVAL + 1 DAY), 106, 'Many Places', 126, NULL, 0, 3, CURDATE()), (18, 1, 4, 4, 3, CURDATE(), DATE_ADD(CURDATE(), INTERVAL + 1 DAY), 108, 'Cerebro', 128, NULL, 0, 12, CURDATE()), (19, 1, 5, 5, 3, CURDATE(), DATE_ADD(CURDATE(), INTERVAL + 1 DAY), 109, 'Somewhere in Thailand', 129, NULL, 1, 13, CURDATE()), (20, 1, 5, 5, 3, DATE_ADD(CURDATE(), INTERVAL +1 MONTH), DATE_ADD(DATE_ADD(CURDATE(),INTERVAL +1 MONTH), INTERVAL +1 DAY), 109, 'Somewhere in Thailand', 129, NULL, 0, 13, DATE_ADD(CURDATE(), INTERVAL +1 MONTH)), diff --git a/front/core/components/dialog/style.scss b/front/core/components/dialog/style.scss index 8fad14e03f..406f86148e 100644 --- a/front/core/components/dialog/style.scss +++ b/front/core/components/dialog/style.scss @@ -31,7 +31,7 @@ tpl-body { display: block; - width: 20em; + min-width: 20em; } & > button.close { @extend %clickable; diff --git a/modules/claim/front/dms/index/index.html b/modules/claim/front/dms/index/index.html index 10e35e58e6..89d1e0b229 100644 --- a/modules/claim/front/dms/index/index.html +++ b/modules/claim/front/dms/index/index.html @@ -9,27 +9,26 @@
Drag & Drop files here...
- - -
-
+ + +
+
+
+
+ +
-
- -
-
- - Drag & Drop files here... - - - + + diff --git a/modules/claim/front/locale/es.yml b/modules/claim/front/locale/es.yml index 27a9eb9a98..f636b43ee7 100644 --- a/modules/claim/front/locale/es.yml +++ b/modules/claim/front/locale/es.yml @@ -1,6 +1,7 @@ #Ordenar alfabeticamente Add sale: Añadir linea Are you sure you want to send it?: ¿Seguro que quieres enviarlo? +Are you sure you want to delete this claim?: ¿Seguro que quieres eliminar esta reclamación? Client Id: Id cliente Claimed ticket: Ticket reclamado Delete claim: Eliminar reclamación diff --git a/modules/ticket/back/models/stowaway.js b/modules/ticket/back/models/stowaway.js index aa21e86808..780b6b31ca 100644 --- a/modules/ticket/back/models/stowaway.js +++ b/modules/ticket/back/models/stowaway.js @@ -14,7 +14,7 @@ module.exports = function(Self) { code: 'BOARDING' }; let state = await models.State.findOne({where}); - let params = {ticketFk: ctx.instance.id, stateFk: state.id}; + let params = {ticketFk: ctx.instance.shipFk, stateFk: state.id}; const loopBackContext = LoopBackContext.getCurrentContext(); let httpCtx = {req: loopBackContext.active}; diff --git a/modules/ticket/front/descriptor/addStowaway.html b/modules/ticket/front/descriptor/addStowaway.html index c51d9d0d37..0c8c3d6b0d 100644 --- a/modules/ticket/front/descriptor/addStowaway.html +++ b/modules/ticket/front/descriptor/addStowaway.html @@ -7,28 +7,28 @@ class="modal-form" on-open="model.refresh()"> - +
Stowaways to add
 - - + + Ticket id - Shipped - Agency - Warehouse - State + Shipped + Agency + Warehouse + State {{ticket.id}} - {{ticket.landed | dateTime: 'dd/MM/yyyy'}} - {{ticket.agencyMode.name}} - {{ticket.warehouse.name}} - {{ticket.state.state.name}} + {{ticket.landed | dateTime: 'dd/MM/yyyy'}} + {{ticket.agencyMode.name}} + {{ticket.warehouse.name}} + {{ticket.state.state.name}} diff --git a/modules/ticket/front/descriptor/addStowaway.js b/modules/ticket/front/descriptor/addStowaway.js index ad6750fdf1..0f34577da5 100644 --- a/modules/ticket/front/descriptor/addStowaway.js +++ b/modules/ticket/front/descriptor/addStowaway.js @@ -1,4 +1,5 @@ import ngModule from '../module'; +import './style.scss'; class Controller { constructor($stateParams, $, $http, vnApp, $translate) { diff --git a/modules/ticket/front/descriptor/index.html b/modules/ticket/front/descriptor/index.html index 5250d24ae6..d830f09d99 100644 --- a/modules/ticket/front/descriptor/index.html +++ b/modules/ticket/front/descriptor/index.html @@ -115,7 +115,7 @@ -
+
In which day you want to add the ticket?
@@ -162,7 +162,9 @@ card-reload="$ctrl.cardReload()" ticket="$ctrl.ticket"> - + + div { padding: 0 !important; } diff --git a/modules/ticket/front/dms/index/index.html b/modules/ticket/front/dms/index/index.html index 4ddb2770a9..73607f2462 100644 --- a/modules/ticket/front/dms/index/index.html +++ b/modules/ticket/front/dms/index/index.html @@ -13,7 +13,7 @@ - Id + Id Type Order Reference @@ -53,7 +53,7 @@ + field="document.dms.hasFile"> diff --git a/modules/worker/back/methods/worker/mySubordinates.js b/modules/worker/back/methods/worker/mySubordinates.js index 571edc7f88..bf1cd1be80 100644 --- a/modules/worker/back/methods/worker/mySubordinates.js +++ b/modules/worker/back/methods/worker/mySubordinates.js @@ -30,10 +30,12 @@ module.exports = Self => { stmts.push(new ParameterizedSQL('CALL vn.subordinateGetList(?)', [myWorker.id])); stmts.push('SELECT * FROM tmp.subordinate'); + stmts.push('DROP TEMPORARY TABLE tmp.subordinate'); let sql = ParameterizedSQL.join(stmts, ';'); let result = await conn.executeStmt(sql); + return result[1]; }; };