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

Merge pull request '2591 - Checked data icon' (#449) from 2591-checked_data_icon into dev
gitea/salix/pipeline/head This commit looks good Details 

Reviewed-on: #449
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
This commit is contained in:
Carlos Jimenez Ruiz 2020-11-11 10:27:02 +00:00
parent 5b7a646245 9d5765724b
commit 086ac2538a
3 changed files with 28 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
modules/ticket/front/index/index.html
View File

@ -13,9 +13,8 @@
model="model"> model="model">
</vn-multi-check> </vn-multi-check>
</vn-th> </vn-th>
<vn-th></vn-th> <vn-th class="icon-field"></vn-th>
<vn-th></vn-th> <vn-th field="id">Id</vn-th>
<vn-th field="id" number>Id</vn-th>
<vn-th field="salesPersonFk" class="expendable">Salesperson</vn-th> <vn-th field="salesPersonFk" class="expendable">Salesperson</vn-th>
<vn-th field="shipped">Date</vn-th> <vn-th field="shipped">Date</vn-th>
<vn-th>Hour</vn-th> <vn-th>Hour</vn-th>
@ -33,48 +32,46 @@
<a ng-repeat="ticket in model.data" <a ng-repeat="ticket in model.data"
class="clickable vn-tr search-result" class="clickable vn-tr search-result"
ui-sref="ticket.card.summary({id: {{::ticket.id}}})"> ui-sref="ticket.card.summary({id: {{::ticket.id}}})">
<vn-td shrink> <vn-td>
<vn-check <vn-check
ng-model="ticket.checked" ng-model="ticket.checked"
vn-click-stop> vn-click-stop>
</vn-check> </vn-check>
</vn-td> </vn-td>
<vn-td shrink> <vn-td class="icon-field">
<vn-icon <vn-icon
ng-show="ticket.isTaxDataChecked" ng-show="::ticket.isTaxDataChecked === 0"
translate-attr="{title: 'Verified data'}" translate-attr="{title: 'No verified data'}"
class="bright" class="bright"
icon="check"> icon="icon-no036">
</vn-icon> </vn-icon>
</vn-td>
<vn-td shrink>
<vn-icon <vn-icon
ng-show="ticket.hasTicketRequest" ng-show="::ticket.hasTicketRequest"
translate-attr="{title: 'Purchase request'}" translate-attr="{title: 'Purchase request'}"
class="bright" class="bright"
icon="icon-100"> icon="icon-100">
</vn-icon> </vn-icon>
<vn-icon <vn-icon
ng-show="ticket.isAvailable === 0" ng-show="::ticket.isAvailable === 0"
translate-attr="{title: 'Not available'}" translate-attr="{title: 'Not available'}"
class="bright" class="bright"
vn-tooltip="Not available" vn-tooltip="Not available"
icon="icon-unavailable"> icon="icon-unavailable">
</vn-icon> </vn-icon>
<vn-icon <vn-icon
ng-show="ticket.isFreezed" ng-show="::ticket.isFreezed"
translate-attr="{title: 'Client frozen'}" translate-attr="{title: 'Client frozen'}"
class="bright" class="bright"
icon="icon-frozen"> icon="icon-frozen">
</vn-icon> </vn-icon>
<vn-icon <vn-icon
ng-show="ticket.risk" ng-show="::ticket.risk"
title="{{::$ctrl.$t('Risk')}}: {{ticket.risk}}" title="{{::$ctrl.$t('Risk')}}: {{ticket.risk}}"
class="bright" class="bright"
icon="icon-risk"> icon="icon-risk">
</vn-icon> </vn-icon>
</vn-td> </vn-td>
<vn-td number>{{::ticket.id}}</vn-td> <vn-td shrink>{{::ticket.id}}</vn-td>
<vn-td class="expendable"> <vn-td class="expendable">
<span <span
title="{{::ticket.userName}}" title="{{::ticket.userName}}"
@ -129,7 +126,7 @@
</vn-td> </vn-td>
<vn-td actions> <vn-td actions>
<vn-icon-button <vn-icon-button
vn-anchor="{state: 'ticket.card.sale', params: {id: ticket.id}}" vn-anchor="::{state: 'ticket.card.sale', params: {id: ticket.id}}"
vn-tooltip="Go to lines" vn-tooltip="Go to lines"
icon="icon-lines"> icon="icon-lines">
</vn-icon-button> </vn-icon-button>
@ -190,7 +187,7 @@
<vn-invoice-out-descriptor-popover <vn-invoice-out-descriptor-popover
vn-id="invoiceOutDescriptor"> vn-id="invoiceOutDescriptor">
</vn-invoice-out-descriptor-popover> </vn-invoice-out-descriptor-popover>
<vn-contextmenu vn-id="contextmenu" targets="['vn-data-viewer']" model="model" <vn-contextmenu vn-id="contextmenu" model="model"
expr-builder="$ctrl.exprBuilder(param, value)"> expr-builder="$ctrl.exprBuilder(param, value)">
<slot-menu> <slot-menu>
<vn-item translate <vn-item translate

1
modules/ticket/front/index/locale/es.yml
View File

@ -9,3 +9,4 @@ Filter by selection: Filtro por selección
Exclude selection: Excluir selección Exclude selection: Excluir selección
Remove filter: Quitar filtro por selección Remove filter: Quitar filtro por selección
Remove all filters: Eliminar todos los filtros Remove all filters: Eliminar todos los filtros
No verified data: Sin datos comprobados

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

@ -6,4 +6,16 @@ vn-ticket-index {
display: none; display: none;
} }
} }
vn-th.icon-field,
vn-th.icon-field *,
vn-td.icon-field,
vn-td.icon-field * {
padding: 0
}
vn-td.icon-field > vn-icon {
margin-left: 3px;
margin-right: 3px;
}
} }