verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 59 Releases Wiki Activity

Merge
gitea/salix/dev This commit looks good Details

This commit is contained in:
Juan Ferrer 2019-10-11 17:43:29 +02:00
parent a72c12e1c9 3e71338d94
commit 7dfd1fe6f2
12 changed files with 50 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
back/methods/dms/uploadFile.js
View File

@ -94,7 +94,7 @@ module.exports = Self => {
const models = Self.app.models; const models = Self.app.models;
const storageConnector = Self.app.dataSources.storage.connector; const storageConnector = Self.app.dataSources.storage.connector;
const myUserId = ctx.req.accessToken.userId; 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 args = ctx.args;
const newDms = await Self.create({ const newDms = await Self.create({

2
db/dump/fixtures.sql
View File

@ -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()), (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()), (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()), (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()), (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()), (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)), (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)),

2
front/core/components/dialog/style.scss
View File

@ -31,7 +31,7 @@
tpl-body { tpl-body {
display: block; display: block;
width: 20em; min-width: 20em;
} }
& > button.close { & > button.close {
@extend %clickable; @extend %clickable;

39
modules/claim/front/dms/index/index.html
View File

@ -9,27 +9,26 @@
<section><vn-icon icon="add_circle"></vn-icon></section> <section><vn-icon icon="add_circle"></vn-icon></section>
<section translate>Drag & Drop files here...</section> <section translate>Drag & Drop files here...</section>
</section> </section>
<vn-data-viewer
<vn-horizontal class="photo-list"> model="model"
<section class="photo" ng-repeat="photo in $ctrl.photos"> class="vn-w-lg">
<section class="image mdl-shadow--2dp" on-error-src <vn-horizontal class="photo-list">
ng-style="{'background': 'url(/api/dms/' + photo.dmsFk + '/downloadFile?access_token=' + $ctrl.accessToken + ')'}" <section class="photo" ng-repeat="photo in $ctrl.photos">
zoom-image="/api/dms/{{::photo.dmsFk}}/downloadFile?access_token={{::$ctrl.accessToken}}"> <section class="image mdl-shadow--2dp" on-error-src
ng-style="{'background': 'url(/api/dms/' + photo.dmsFk + '/downloadFile?access_token=' + $ctrl.accessToken + ')'}"
zoom-image="/api/dms/{{::photo.dmsFk}}/downloadFile?access_token={{::$ctrl.accessToken}}">
</section>
<section class="actions">
<button class="mdl-button mdl-js-button mdl-button--fab mdl-button--mini-fab mdl-js-ripple-effect mdl-button--colored"
ng-click="$ctrl.showDeleteConfirm($index)"
title="{{'Remove file' | translate}}"
tabindex="-1">
<vn-icon icon="delete"></vn-icon>
</button>
</section>
</section> </section>
<section class="actions"> </vn-horizontal>
<button class="mdl-button mdl-js-button mdl-button--fab mdl-button--mini-fab mdl-js-ripple-effect mdl-button--colored" </vn-data-viewer>
ng-click="$ctrl.showDeleteConfirm($index)"
title="{{'Remove file' | translate}}"
tabindex="-1">
<vn-icon icon="delete"></vn-icon>
</button>
</section>
</section>
<vn-empty-rows ng-if="$ctrl.photos.length == 0">
<span translate>Drag & Drop files here...</span>
</vn-empty-rows>
</vn-horizontal>
<vn-pagination model="model"></vn-pagination>
<vn-worker-descriptor-popover <vn-worker-descriptor-popover
vn-id="workerDescriptor"> vn-id="workerDescriptor">
</vn-worker-descriptor-popover> </vn-worker-descriptor-popover>

1
modules/claim/front/locale/es.yml
View File

@ -1,6 +1,7 @@
#Ordenar alfabeticamente #Ordenar alfabeticamente
Add sale: Añadir linea Add sale: Añadir linea
Are you sure you want to send it?: ¿Seguro que quieres enviarlo? 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 Client Id: Id cliente
Claimed ticket: Ticket reclamado Claimed ticket: Ticket reclamado
Delete claim: Eliminar reclamación Delete claim: Eliminar reclamación

2
modules/ticket/back/models/stowaway.js
View File

@ -14,7 +14,7 @@ module.exports = function(Self) {
code: 'BOARDING' code: 'BOARDING'
}; };
let state = await models.State.findOne({where}); 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(); const loopBackContext = LoopBackContext.getCurrentContext();
let httpCtx = {req: loopBackContext.active}; let httpCtx = {req: loopBackContext.active};

22
modules/ticket/front/descriptor/addStowaway.html
View File

@ -7,28 +7,28 @@
class="modal-form" class="modal-form"
on-open="model.refresh()"> on-open="model.refresh()">
<tpl-body> <tpl-body>
<vn-horizontal class="header vn-pa-md vn-w-lg"> <vn-horizontal class="header vn-pa-md">
<h5><span translate>Stowaways to add</span></h5> <h5><span translate>Stowaways to add</span></h5>
</vn-horizontal> </vn-horizontal>
<vn-horizontal class="vn-pa-md vn-w-lg"> <vn-horizontal class="vn-pa-md"> <!-- FIXME: Dialog width -->
<vn-data-viewer class="vn-w-xs" model="model"> <vn-data-viewer model="model">
<vn-table model="model" auto-load="false"> <vn-table model="model" auto-load="false">
<vn-thead> <vn-thead>
<vn-tr> <vn-tr>
<vn-th number>Ticket id</vn-th> <vn-th number>Ticket id</vn-th>
<vn-th number>Shipped</vn-th> <vn-th>Shipped</vn-th>
<vn-th number>Agency</vn-th> <vn-th>Agency</vn-th>
<vn-th number>Warehouse</vn-th> <vn-th>Warehouse</vn-th>
<vn-th number>State</vn-th> <vn-th>State</vn-th>
</vn-tr> </vn-tr>
</vn-thead> </vn-thead>
<vn-tbody> <vn-tbody>
<vn-tr ng-repeat="ticket in possibleStowaways" class="clickable" ng-click="$ctrl.addStowaway(ticket)"> <vn-tr ng-repeat="ticket in possibleStowaways" class="clickable" ng-click="$ctrl.addStowaway(ticket)">
<vn-td number>{{ticket.id}}</vn-td> <vn-td number>{{ticket.id}}</vn-td>
<vn-td number>{{ticket.landed | dateTime: 'dd/MM/yyyy'}}</vn-td> <vn-td>{{ticket.landed | dateTime: 'dd/MM/yyyy'}}</vn-td>
<vn-td number>{{ticket.agencyMode.name}}</vn-td> <vn-td>{{ticket.agencyMode.name}}</vn-td>
<vn-td number>{{ticket.warehouse.name}}</vn-td> <vn-td>{{ticket.warehouse.name}}</vn-td>
<vn-td number>{{ticket.state.state.name}}</vn-td> <vn-td>{{ticket.state.state.name}}</vn-td>
</vn-tr> </vn-tr>
</vn-tbody> </vn-tbody>
</vn-table> </vn-table>

1
modules/ticket/front/descriptor/addStowaway.js
View File

@ -1,4 +1,5 @@
import ngModule from '../module'; import ngModule from '../module';
import './style.scss';
class Controller { class Controller {
constructor($stateParams, $, $http, vnApp, $translate) { constructor($stateParams, $, $http, vnApp, $translate) {

6
modules/ticket/front/descriptor/index.html
View File

@ -115,7 +115,7 @@
<vn-dialog class="dialog-summary" <vn-dialog class="dialog-summary"
vn-id="addTurn"> vn-id="addTurn">
<tpl-body> <tpl-body>
<div> <div class="vn-pa-md">
<h5 style="text-align: center"> <h5 style="text-align: center">
<span translate>In which day you want to add the ticket?</span> <span translate>In which day you want to add the ticket?</span>
</h5> </h5>
@ -162,7 +162,9 @@
card-reload="$ctrl.cardReload()" card-reload="$ctrl.cardReload()"
ticket="$ctrl.ticket"> ticket="$ctrl.ticket">
</vn-add-stowaway> </vn-add-stowaway>
<vn-remove-stowaway vn-id="removeStowaway" card-reload="$ctrl.cardReload()" ticket="$ctrl.ticket"></vn-remove-stowaway> <vn-remove-stowaway vn-id="removeStowaway"
card-reload="$ctrl.cardReload()" ticket="$ctrl.ticket">
</vn-remove-stowaway>
<vn-confirm <vn-confirm
vn-id="confirm-dialog" vn-id="confirm-dialog"
on-response="$ctrl.returnDialog(response)" on-response="$ctrl.returnDialog(response)"

12
modules/ticket/front/descriptor/style.scss
View File

@ -1,5 +1,11 @@
@import "variables"; @import "variables";
vn-add-stowaway {
vn-data-viewer {
width: 40em
}
}
vn-dialog.modal-form { vn-dialog.modal-form {
vn-horizontal.header { vn-horizontal.header {
background-color: $color-main; background-color: $color-main;
@ -10,12 +16,6 @@ vn-dialog.modal-form {
margin: 0 auto; margin: 0 auto;
} }
} }
tpl-body {
width: 100%;
}
table {
width: 100%
}
& > div { & > div {
padding: 0 !important; padding: 0 !important;
} }

4
modules/ticket/front/dms/index/index.html
View File

@ -13,7 +13,7 @@
<vn-table model="model"> <vn-table model="model">
<vn-thead> <vn-thead>
<vn-tr> <vn-tr>
<vn-th field="dmsFk" shrink>Id</vn-th> <vn-th field="dmsFk" number shrink>Id</vn-th>
<vn-th field="dmsTypeFk" shrink>Type</vn-th> <vn-th field="dmsTypeFk" shrink>Type</vn-th>
<vn-th field="hardCopyNumber" shrink number>Order</vn-th> <vn-th field="hardCopyNumber" shrink number>Order</vn-th>
<vn-th field="reference" shrink>Reference</vn-th> <vn-th field="reference" shrink>Reference</vn-th>
@ -53,7 +53,7 @@
</vn-td> </vn-td>
<vn-td shrink> <vn-td shrink>
<vn-check disabled="true" <vn-check disabled="true"
ng-model="document.dms.hasFile"> field="document.dms.hasFile">
</vn-check> </vn-check>
</vn-td> </vn-td>
<vn-td shrink> <vn-td shrink>

2
modules/worker/back/methods/worker/mySubordinates.js
View File

@ -30,10 +30,12 @@ module.exports = Self => {
stmts.push(new ParameterizedSQL('CALL vn.subordinateGetList(?)', [myWorker.id])); stmts.push(new ParameterizedSQL('CALL vn.subordinateGetList(?)', [myWorker.id]));
stmts.push('SELECT * FROM tmp.subordinate'); stmts.push('SELECT * FROM tmp.subordinate');
stmts.push('DROP TEMPORARY TABLE tmp.subordinate');
let sql = ParameterizedSQL.join(stmts, ';'); let sql = ParameterizedSQL.join(stmts, ';');
let result = await conn.executeStmt(sql); let result = await conn.executeStmt(sql);
return result[1]; return result[1];
}; };
}; };