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

merge
gitea/salix/test This commit looks good Details

This commit is contained in:
Joan Sanchez 2019-09-12 11:47:56 +02:00
parent 74bf382cc5
commit 524c4e59ed
3 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
front/core/components/table/style.scss
View File

@ -118,7 +118,7 @@ vn-table {
} }
& > vn-td .chip { & > vn-td .chip {
padding: .3em; padding: .3em;
border-radius: .3em; border-radius: .3em
} }
& > vn-td .chip.notice { & > vn-td .chip.notice {
@ -141,6 +141,11 @@ vn-table {
background-color: $color-alert-medium; background-color: $color-alert-medium;
} }
& > vn-td .chip.message {
color: $color-font-dark;
background-color: $color-bg-dark
}
& > vn-td vn-icon-menu { & > vn-td vn-icon-menu {
display: inline-block; display: inline-block;
color: $color-main; color: $color-main;

6
modules/item/front/diary/index.js
View File

@ -104,7 +104,7 @@ class Controller {
let balance = onPreparationLine.querySelector('.balanceSpan'); let balance = onPreparationLine.querySelector('.balanceSpan');
balance.classList.add('counter'); balance.classList.add('message');
balance.title = this.$translate.instant('Visible quantity'); balance.title = this.$translate.instant('Visible quantity');
let headerOffset = body.querySelector('header').getBoundingClientRect(); let headerOffset = body.querySelector('header').getBoundingClientRect();
@ -113,8 +113,8 @@ class Controller {
let offsetTop; let offsetTop;
if (this.ticketFk) { if (this.ticketFk) {
let selectedTicketLine = lines[selectedTicketLineIndex]; let selectedTicketLine = lines[selectedTicketLineIndex];
let id = selectedTicketLine.querySelector('.id'); let id = selectedTicketLine.querySelector('[name=origin]');
id.classList.add('counter'); id.classList.add('message');
offsetTop = selectedTicketLine.offsetTop - headerHeight; offsetTop = selectedTicketLine.offsetTop - headerHeight;
} else } else
offsetTop = onPreparationLine.offsetTop - headerHeight; offsetTop = onPreparationLine.offsetTop - headerHeight;

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

@ -18,10 +18,12 @@
<vn-th field="reference" shrink>Reference</vn-th> <vn-th field="reference" shrink>Reference</vn-th>
<vn-th>Description</vn-th> <vn-th>Description</vn-th>
<vn-th field="hasFile" shrink>Original</vn-th> <vn-th field="hasFile" shrink>Original</vn-th>
<vn-th>File</vn-th> <vn-th shrink>File</vn-th>
<vn-th shrink>Employee</vn-th> <vn-th shrink>Employee</vn-th>
<vn-th field="created">Created</vn-th> <vn-th field="created">Created</vn-th>
<vn-th number></vn-th> <vn-th shrink></vn-th>
<vn-th shrink></vn-th>
<vn-th shrink></vn-th>
</vn-tr> </vn-tr>
</vn-thead> </vn-thead>
<vn-tbody> <vn-tbody>
@ -33,7 +35,8 @@
</span> </span>
</vn-td> </vn-td>
<vn-td shrink number> <vn-td shrink number>
<span title="{{::document.dms.hardCopyNumber}}"> <span class="chip" title="{{::document.dms.hardCopyNumber}}"
ng-class="{'message': document.dms.hardCopyNumber}">
{{::document.dms.hardCopyNumber}} {{::document.dms.hardCopyNumber}}
</span> </span>
</vn-td> </vn-td>
@ -52,7 +55,7 @@
field="document.dms.hasFile"> field="document.dms.hasFile">
</vn-check> </vn-check>
</vn-td> </vn-td>
<vn-td> <vn-td shrink>
<a target="_blank" <a target="_blank"
title="{{'Download file' | translate}}" title="{{'Download file' | translate}}"
href="api/dms/{{::document.dmsFk}}/downloadFile?access_token={{::$ctrl.accessToken}}"> href="api/dms/{{::document.dmsFk}}/downloadFile?access_token={{::$ctrl.accessToken}}">
@ -67,7 +70,7 @@
<vn-td> <vn-td>
{{::document.dms.created | dateTime:'dd/MM/yyyy HH:mm'}} {{::document.dms.created | dateTime:'dd/MM/yyyy HH:mm'}}
</vn-td> </vn-td>
<vn-td number> <vn-td shrink>
<a target="_blank" <a target="_blank"
href="api/dms/{{::document.dmsFk}}/downloadFile?access_token={{::$ctrl.accessToken}}"> href="api/dms/{{::document.dmsFk}}/downloadFile?access_token={{::$ctrl.accessToken}}">
<vn-icon-button <vn-icon-button
@ -75,12 +78,15 @@
title="{{'Download file' | translate}}"> title="{{'Download file' | translate}}">
</vn-icon-button> </vn-icon-button>
</a> </a>
<vn-icon-button ui-sref="ticket.card.dms.edit({dmsId: {{::document.dmsFk}}})" </vn-td>
icon="edit" <vn-td shrink>
<vn-icon-button icon="edit"
ui-sref="ticket.card.dms.edit({dmsId: {{::document.dmsFk}}})"
title="{{'Edit file' | translate}}"> title="{{'Edit file' | translate}}">
</vn-icon-button> </vn-icon-button>
<vn-icon-button </vn-td>
icon="delete" <vn-td shrink>
<vn-icon-button icon="delete"
ng-click="$ctrl.showDeleteConfirm($index)" ng-click="$ctrl.showDeleteConfirm($index)"
title="{{'Remove file' | translate}}" title="{{'Remove file' | translate}}"
tabindex="-1"> tabindex="-1">