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

added shrink class to item index #1278
gitea/salix/dev This commit looks good Details

This commit is contained in:
Joan Sanchez 2019-03-29 08:01:15 +01:00
parent 8bf4190d12
commit 8db51fdf64
14 changed files with 38 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/item/front/fetched-tags/index.html
View File

@ -1,7 +1,7 @@
<vn-horizontal>
<vn-one>{{::$ctrl.title}}</vn-one>
<vn-one title="{{::$ctrl.item.name}}">{{::$ctrl.item.name}}</vn-one>
<vn-one ng-if="$ctrl.subName">
<h3>{{::$ctrl.subName}}</h3>
<h3 title="{{::$ctrl.subName}}">{{::$ctrl.subName}}</h3>
</vn-one>
<vn-auto>
<section

57
modules/item/front/index/index.html
View File

@ -20,20 +20,20 @@
<vn-table model="model" auto-load="false" show-fields="$ctrl.showFields" vn-uvc="itemIndex">
<vn-thead>
<vn-tr>
<vn-th th-id="picture"></vn-th>
<vn-th field="id" number>Id</vn-th>
<vn-th th-id="grouping" number>Grouping</vn-th>
<vn-th th-id="packing" number>Packing</vn-th>
<vn-th th-id="picture" shrink></vn-th>
<vn-th field="id" shrink>Id</vn-th>
<vn-th th-id="grouping" shrink>Grouping</vn-th>
<vn-th th-id="packing" shrink>Packing</vn-th>
<vn-th th-id="description" style="text-align: center">Description</vn-th>
<vn-th th-id="stems" number>Stems</vn-th>
<vn-th th-id="size"number>Size</vn-th>
<vn-th th-id="niche"number>Niche</vn-th>
<vn-th th-id="type">Type</vn-th>
<vn-th th-id="category">Category</vn-th>
<vn-th th-id="intrastat">Intrastat</vn-th>
<vn-th th-id="origin">Origin</vn-th>
<vn-th th-id="salesperson">Buyer</vn-th>
<vn-th th-id="density" number>Density</vn-th>
<vn-th th-id="stems" shrink>Stems</vn-th>
<vn-th th-id="size" shrink>Size</vn-th>
<vn-th th-id="niche" shrink>Niche</vn-th>
<vn-th th-id="type" shrink>Type</vn-th>
<vn-th th-id="category" shrink>Category</vn-th>
<vn-th th-id="intrastat" shrink>Intrastat</vn-th>
<vn-th th-id="origin" shrink>Origin</vn-th>
<vn-th th-id="salesperson" shrink>Buyer</vn-th>
<vn-th th-id="density" shrink>Density</vn-th>
<vn-th th-id="active" shrink>Active</vn-th>
<vn-th></vn-th>
</vn-tr>
@ -49,38 +49,43 @@
ng-click="$ctrl.stopEvent($event)"
on-error-src/>
</vn-td>
<vn-td number>
<vn-td shrink>
<span
class="link"
ng-click="$ctrl.showItemDescriptor($event, item.id)">
{{::item.id | zeroFill:6}}
</span>
</vn-td>
<vn-td number>{{::item.grouping | dashIfEmpty}}</vn-td>
<vn-td number>{{::item.packing | dashIfEmpty}}</vn-td>
<vn-td shrink>{{::item.grouping | dashIfEmpty}}</vn-td>
<vn-td shrink>{{::item.packing | dashIfEmpty}}</vn-td>
<vn-td expand>
<vn-fetched-tags
max-length="6"
item="::item"
title="::item.name"
sub-name="::item.subName">
</vn-fetched-tags>
</vn-td>
<vn-td number>{{::item.stems}}</vn-td>
<vn-td number>{{::item.size}}</vn-td>
<vn-td number>{{::item.niche}}</vn-td>
<vn-td>{{::item.type}}</vn-td>
<vn-td>{{::item.category}}</vn-td>
<vn-td>{{::item.intrastat}}</vn-td>
<vn-td>{{::item.origin}}</vn-td>
<vn-td expand>
<vn-td shrink>{{::item.stems}}</vn-td>
<vn-td shrink>{{::item.size}}</vn-td>
<vn-td shrink>{{::item.niche}}</vn-td>
<vn-td shrink title="{{::item.type}}">
{{::item.type}}
</vn-td>
<vn-td shrink title="{{::item.category}}">
{{::item.category}}
</vn-td>
<vn-td shrink title="{{::item.intrastat}}">
{{::item.intrastat}}
</vn-td>
<vn-td shrink>{{::item.origin}}</vn-td>
<vn-td shrink title="{{::item.userNickname}}">
<span
class="link"
ng-click="$ctrl.showWorkerDescriptor($event, item.userId)">
{{::item.userNickname}}
</span>
</vn-td>
<vn-td number>{{::item.density}}</vn-td>
<vn-td shrink>{{::item.density}}</vn-td>
<vn-td shrink>
<vn-check
disabled="true"

1
modules/order/front/line/index.html
View File

@ -43,7 +43,6 @@
<vn-fetched-tags
max-length="6"
item="::row.item"
title="::row.item.name"
sub-name="::row.item.subName">
</vn-fetched-tags>
</vn-td>

1
modules/order/front/summary/index.html
View File

@ -72,7 +72,6 @@
<vn-fetched-tags
max-length="6"
item="::row.item"
title="::row.item.name"
sub-name="::row.item.subName">
</vn-fetched-tags>
</vn-td>

1
modules/order/front/volume/index.html
View File

@ -42,7 +42,6 @@
<vn-fetched-tags
max-length="6"
item="::row.item"
title="::row.item.name"
sub-name="::row.item.subName">
</vn-fetched-tags>
</vn-td>

2
modules/route/back/methods/route/specs/getTickets.spec.js
View File

@ -1,7 +1,7 @@
const app = require('vn-loopback/server/server');
describe('route summary()', () => {
it('should return a summary object containing data freom his tickets', async() => {
it('should return a summary object containing data from his tickets', async() => {
let result = await app.models.Route.getTickets(1);
expect(result[2].id).toEqual(11);

2
modules/route/back/methods/route/specs/summary.spec.js
View File

@ -8,7 +8,7 @@ describe('route summary()', () => {
expect(result.route.workerFk).toEqual(56);
});
it('should return a summary object containing data freom his tickets', async() => {
it('should return a summary object containing data from his tickets', async() => {
let result = await app.models.Route.summary(1);
expect(result.tickets[2].id).toEqual(11);

1
modules/ticket/front/component/index.html
View File

@ -51,7 +51,6 @@
<vn-fetched-tags
max-length="6"
item="::sale.item"
title="::sale.concept"
sub-name="::sale.item.subName">
</vn-fetched-tags>
</td>

3
modules/ticket/front/data/step-two/index.html
View File

@ -18,8 +18,7 @@
<td expand>
<vn-fetched-tags
max-length="6"
item="::sale.item"
title="::sale.concept">
item="::sale.item">
</vn-fetched-tags>
</td>
<td number>{{::sale.quantity}}</td>

1
modules/ticket/front/sale-checked/index.html
View File

@ -37,7 +37,6 @@
<vn-fetched-tags
max-length="6"
item="::sale.item"
title="::sale.concept"
sub-name="::sale.item.subName">
</vn-fetched-tags>
</vn-td>

1
modules/ticket/front/sale-tracking/index.html
View File

@ -41,7 +41,6 @@
<vn-fetched-tags
max-length="6"
item="::sale.item"
title="::sale.concept"
sub-name="::sale.item.subName">
</vn-fetched-tags>
</vn-td>

1
modules/ticket/front/sale/index.html
View File

@ -121,7 +121,6 @@
<vn-fetched-tags
max-length="6"
item="::sale.tags"
title="::sale.concept"
sub-name="::sale.subName">
</vn-fetched-tags>
</vn-td>

3
modules/ticket/front/summary/index.html
View File

@ -100,8 +100,7 @@
<vn-td expand>
<vn-fetched-tags
max-length="6"
item="::sale.item"
title="::sale.concept"
item="::sale.item"
sub-name="::sale.item.subName"/>
</vn-td>
<vn-td number>{{::sale.price | currency: 'EUR':2}}</vn-td>

3
modules/ticket/front/volume/index.html
View File

@ -45,8 +45,7 @@
<vn-td expand>
<vn-fetched-tags
max-length="6"
item="::sale.item"
title="::sale.concept"
item="::sale.item"
sub-name="::sale.item.subName"/>
</vn-td>
<vn-td number>{{::sale.quantity}}</vn-td>