verdnatura/salix
verdnatura
/
salix
3
5
Fork 2
Code Issues Pull Requests 70 Releases Wiki Activity

2672-trigger_itemTag #509

Merged
bernat merged 3 commits from 2672-trigger_itemTag into dev 2021-01-13 07:33:58 +00:00
Conversation 0 Commits 3 Files Changed 1 +533 -68
31 changed files with 533 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit ba69f9e20c - Show all commits

5
front/core/components/field/index.js
View File

@ -187,7 +187,10 @@ export default class Field extends FormInput {
} }
onChange() { onChange() {
this.emit('change', {value: this.field}); // Changes doesn't reflect until appling async
this.$.$applyAsync(() => {
this.emit('change', {value: this.field});
});
} }
} }
Field.$inject = ['$element', '$scope']; Field.$inject = ['$element', '$scope'];

1
front/core/components/searchbar/search-panel.js
View File

@ -1,4 +1,5 @@
import Component from '../../lib/component'; import Component from '../../lib/component';
import './style.scss';
export default class SearchPanel extends Component { export default class SearchPanel extends Component {
set filter(value) { set filter(value) {

25
front/core/components/searchbar/style.scss
View File

@ -1,4 +1,4 @@
@import "variables"; @import "./variables";
vn-searchbar { vn-searchbar {
display: block; display: block;
@ -44,4 +44,27 @@ vn-searchbar {
& > form { & > form {
padding: $spacing-lg; padding: $spacing-lg;
} }
& > form#manifold-form {
padding: 0;
.manifold-panel {
border: $border-thin-light;
border-radius: 5px;
position: relative;
text-align: right;
.or {
font-weight: bold;
font-size: 26px;
color: $color-font-secondary
}
vn-icon[icon="info"] {
position: absolute;
top: 2px;
right: 2px
}
}
}
} }

1
front/core/components/th/index.js
View File

@ -1,4 +1,5 @@
import ngModule from '../../module'; import ngModule from '../../module';
import './style.scss';
export default class Th { export default class Th {
constructor($element) { constructor($element) {

15
front/salix/components/summary/style.scss
View File

@ -73,6 +73,21 @@ ui-view > .vn-summary {
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
position: relative;
span {
display: block;
}
a {
color: $color-font;
}
}
h4 span:after {
font-family: 'Material Icons';
content: 'open_in_new';
position: absolute;
right: 5px;
text-transform: none;
color: $color-spacer
} }
& > * { & > * {
margin: $spacing-sm; margin: $spacing-sm;

1
front/salix/locale/es.yml
View File

@ -52,6 +52,7 @@ Suppliers: Proveedores
Summary: Vista previa Summary: Vista previa
Basic data: Datos básicos Basic data: Datos básicos
List: Listado List: Listado
Go to: Ir a
# Misc # Misc

16
modules/account/front/summary/index.html
View File

@ -1,6 +1,7 @@
<vn-card class="summary"> <vn-card class="summary">
<h5> <h5>
<a ng-if="::summary.id" <a
ng-if="::summary.id"
vn-tooltip="Go to the user" vn-tooltip="Go to the user"
ui-sref="account.card.summary({id: {{::summary.id}}})" ui-sref="account.card.summary({id: {{::summary.id}}})"
name="goToSummary"> name="goToSummary">
@ -10,7 +11,18 @@
</h5> </h5>
<vn-horizontal class="vn-pa-md"> <vn-horizontal class="vn-pa-md">
<vn-one> <vn-one>
<h4 translate>Basic data</h4> <h4 ng-show="$ctrl.isHr">
<a
ui-sref="account.card.basicData({id:summary.id})"
target="_self">
<span translate vn-tooltip="Go to">Basic Data</span>
</a>
</h4>
<h4
translate
ng-show="!$ctrl.isHr">
Basic Data
</h4>
<vn-label-value <vn-label-value
label="Id" label="Id"
value="{{summary.id}}"> value="{{summary.id}}">

3
modules/account/front/summary/index.js
View File

@ -18,6 +18,9 @@ class Controller extends Summary {
this.$http.get(`Accounts/${value.id}`, {filter}) this.$http.get(`Accounts/${value.id}`, {filter})
.then(res => this.$.summary = res.data); .then(res => this.$.summary = res.data);
} }
get isHr() {
return this.aclService.hasAny(['hr']);
}
get user() { get user() {
return this._user; return this._user;

42
modules/claim/front/summary/index.html
View File

@ -4,7 +4,8 @@
</vn-crud-model> </vn-crud-model>
<vn-card class="summary"> <vn-card class="summary">
<h5> <h5>
<a ng-if="::$ctrl.summary.claim.id" <a
ng-if="::$ctrl.summary.claim.id"
vn-tooltip="Go to the claim" vn-tooltip="Go to the claim"
ui-sref="claim.card.summary({id: {{::$ctrl.summary.claim.id}}})" ui-sref="claim.card.summary({id: {{::$ctrl.summary.claim.id}}})"
name="goToSummary"> name="goToSummary">
@ -54,7 +55,18 @@
</vn-range> </vn-range>
</vn-one> </vn-one>
<vn-auto> <vn-auto>
<h4 translate>Detail</h4> <h4 ng-show="$ctrl.isSalesPerson">
<a
ui-sref="claim.card.detail({id:$ctrl.claim.id})"
target="_self">
<span translate vn-tooltip="Go to">Detail</span>
</a>
</h4>
<h4
ng-show="!$ctrl.isSalesPerson"
translate>
Detail
</h4>
<vn-data-viewer data="::$ctrl.summary.salesClaimed"> <vn-data-viewer data="::$ctrl.summary.salesClaimed">
<vn-table> <vn-table>
<vn-thead> <vn-thead>
@ -105,7 +117,18 @@
</vn-horizontal> </vn-horizontal>
</vn-auto> </vn-auto>
<vn-auto> <vn-auto>
<h4 translate>Development</h4> <h4 ng-show="$ctrl.isClaimManager">
<a
ui-sref="claim.card.development({id:$ctrl.claim.id})"
target="_self">
<span translate vn-tooltip="Go to">Development</span>
</a>
</h4>
<h4
translate
ng-show="!$ctrl.isClaimManager">
Development
</h4>
<vn-data-viewer data="::$ctrl.summary.developments"> <vn-data-viewer data="::$ctrl.summary.developments">
<vn-table> <vn-table>
<vn-thead> <vn-thead>
@ -136,7 +159,18 @@
</vn-data-viewer> </vn-data-viewer>
</vn-auto> </vn-auto>
<vn-auto> <vn-auto>
<h4 translate>Action</h4> <h4 ng-show="$ctrl.isClaimManager">
<a
ui-sref="claim.card.action({id:$ctrl.claim.id})"
target="_self">
<span translate vn-tooltip="Go to">Action</span>
</a>
</h4>
<h4
translate
ng-show="!$ctrl.isClaimManager">
Action
</h4>
<vn-data-viewer data="::$ctrl.summary.actions"> <vn-data-viewer data="::$ctrl.summary.actions">
<vn-table> <vn-table>
<vn-thead> <vn-thead>

8
modules/claim/front/summary/index.js
View File

@ -13,6 +13,14 @@ class Controller extends Summary {
this.getSummary(); this.getSummary();
} }
get isSalesPerson() {
return this.aclService.hasAny(['salesPerson']);
}
get isClaimManager() {
return this.aclService.hasAny(['claimManager']);
}
get claim() { get claim() {
return this._claim; return this._claim;
} }

77
modules/client/front/summary/index.html
View File

@ -12,7 +12,18 @@
</h5> </h5>
<vn-horizontal> <vn-horizontal>
<vn-one> <vn-one>
<h4 translate>Basic data</h4> <h4 ng-show="$ctrl.isEmployee">
<a
ui-sref="client.card.basicData({id:$ctrl.client.id})"
target="_self">
<span translate vn-tooltip="Go to">Basic data</span>
</a>
</h4>
<h4
translate
ng-show="!$ctrl.isEmployee">
Basic data
</h4>
<vn-label-value label="Id" <vn-label-value label="Id"
value="{{$ctrl.summary.id}}"> value="{{$ctrl.summary.id}}">
</vn-label-value> </vn-label-value>
@ -43,7 +54,18 @@
</vn-label-value> </vn-label-value>
</vn-one> </vn-one>
<vn-one> <vn-one>
<h4 translate>Fiscal address</h4> <h4 ng-show="$ctrl.isEmployee">
<a
ui-sref="client.card.fiscalData({id:$ctrl.client.id})"
target="_self">
<span translate vn-tooltip="Go to">Fiscal address</span>
</a>
</h4>
<h4
translate
ng-show="!$ctrl.isEmployee">
Fiscal address
</h4>
<vn-label-value label="Social name" <vn-label-value label="Social name"
value="{{$ctrl.summary.socialName}}"> value="{{$ctrl.summary.socialName}}">
</vn-label-value> </vn-label-value>
@ -67,7 +89,18 @@
</vn-label-value> </vn-label-value>
</vn-one> </vn-one>
<vn-one> <vn-one>
<h4 translate>Fiscal data</h4> <h4 ng-show="$ctrl.isEmployee">
<a
ui-sref="client.card.fiscalData({id:$ctrl.client.id})"
target="_self">
<span translate vn-tooltip="Go to">Fiscal data</span>
</a>
</h4>
<h4
translate
ng-show="!$ctrl.isEmployee">
Fiscal data
</h4>
<vn-vertical> <vn-vertical>
<vn-check <vn-check
label="Is equalizated" label="Is equalizated"
@ -107,7 +140,18 @@
</vn-vertical> </vn-vertical>
</vn-one> </vn-one>
<vn-one> <vn-one>
<h4 translate>Billing data</h4> <h4 ng-show="$ctrl.isEmployee">
<a
ui-sref="client.card.billingData({id:$ctrl.client.id})"
target="_self">
<span translate vn-tooltip="Go to">Billing data</span>
</a>
</h4>
<h4
translate
ng-show="!$ctrl.isEmployee">
Billing data
</h4>
<vn-label-value label="Pay method" <vn-label-value label="Pay method"
value="{{$ctrl.summary.payMethod.name}}"> value="{{$ctrl.summary.payMethod.name}}">
</vn-label-value> </vn-label-value>
@ -136,7 +180,18 @@
</vn-vertical> </vn-vertical>
</vn-one> </vn-one>
<vn-one> <vn-one>
<h4 translate>Default address</h4> <h4 ng-show="$ctrl.isEmployee">
<a
ui-sref="client.card.address.index({id:$ctrl.client.id})"
target="_self">
<span translate vn-tooltip="Go to">Address</span>
</a>
</h4>
<h4
translate
ng-show="!$ctrl.isEmployee">
Address
</h4>
<vn-label-value label="Name" <vn-label-value label="Name"
value="{{$ctrl.summary.defaultAddress.nickname}}"> value="{{$ctrl.summary.defaultAddress.nickname}}">
</vn-label-value> </vn-label-value>
@ -148,7 +203,17 @@
</vn-label-value> </vn-label-value>
</vn-one> </vn-one>
<vn-one> <vn-one>
<h4 translate>Web access</h4> <h4 ng-show="$ctrl.isEmployee">
<a
ui-sref="client.card.webAccess({id:$ctrl.client.id})"
target="_self">
<span translate vn-tooltip="Go to">Web access</span>
</a>
</h4>
<h4
translate
ng-show="!$ctrl.isEmployee">Web access
</h4>
<vn-label-value label="User" <vn-label-value label="User"
value="{{$ctrl.summary.account.name}}"> value="{{$ctrl.summary.account.name}}">
</vn-label-value> </vn-label-value>

3
modules/client/front/summary/index.js
View File

@ -18,6 +18,9 @@ class Controller extends Summary {
} }
}); });
} }
get isEmployee() {
return this.aclService.hasAny(['employee']);
}
sumRisk() { sumRisk() {
let total = 0; let total = 0;

1
modules/client/front/summary/locale/es.yml
View File

@ -7,6 +7,7 @@ Secured credit: Crédito asegurado
Average invoiced: Consumo medio Average invoiced: Consumo medio
Sales person: Comercial Sales person: Comercial
Recovery: Recobro Recovery: Recobro
Basic data: Datos básicos
Balance due: Saldo vencido Balance due: Saldo vencido
Rate: Tarifa Rate: Tarifa
Business data: Datos comerciales Business data: Datos comerciales

91
modules/item/front/summary/index.html
View File

@ -25,7 +25,18 @@
</vn-horizontal> </vn-horizontal>
</vn-one> </vn-one>
<vn-one name="basicData"> <vn-one name="basicData">
<h4 translate>Basic data</h4> <h4 ng-show="$ctrl.isBuyer">
<a
ui-sref="item.card.basicData({id:$ctrl.item.id})"
target="_self">
<span translate vn-tooltip="Go to">Basic data</span>
</a>
</h4>
<h4
translate
ng-show="!$ctrl.isBuyer">
Basic data
</h4>
<vn-label-value label="Name" <vn-label-value label="Name"
value="{{$ctrl.summary.item.name}}"> value="{{$ctrl.summary.item.name}}">
</vn-label-value> </vn-label-value>
@ -53,7 +64,18 @@
</vn-label-value> </vn-label-value>
</vn-one> </vn-one>
<vn-one name="otherData"> <vn-one name="otherData">
<h4 translate>Other data</h4> <h4 ng-show="$ctrl.isBuyer">
<a
ui-sref="item.card.basicData({id:$ctrl.item.id})"
target="_self">
<span translate vn-tooltip="Go to">Other data</span>
</a>
</h4>
<h4
translate
ng-show="!$ctrl.isBuyer">
Other data
</h4>
<vn-label-value label="Intrastat code" <vn-label-value label="Intrastat code"
value="{{$ctrl.summary.item.intrastat.id}}"> value="{{$ctrl.summary.item.intrastat.id}}">
</vn-label-value> </vn-label-value>
@ -77,7 +99,18 @@
</vn-label-value> </vn-label-value>
</vn-one> </vn-one>
<vn-one name="tags"> <vn-one name="tags">
<h4 translate>Tags</h4> <h4 ng-show="$ctrl.isBuyer || $ctrl.isReplenisher">
<a
ui-sref="item.card.tags({id:$ctrl.item.id})"
target="_self">
<span translate vn-tooltip="Go to">Tags</span>
</a>
</h4>
<h4
translate
ng-show="!$ctrl.isBuyer || !$ctrl.isReplenisher">
Tags
</h4>
<vn-label-value <vn-label-value
label="{{tag.priority}} {{tag.tag.name}}" label="{{tag.priority}} {{tag.tag.name}}"
ng-repeat="tag in $ctrl.summary.tags track by tag.id" ng-repeat="tag in $ctrl.summary.tags track by tag.id"
@ -85,21 +118,54 @@
</vn-label-value> </vn-label-value>
</vn-one> </vn-one>
<vn-one name="tax"> <vn-one name="tax">
<h4 translate>Tax</h4> <h4 ng-show="$ctrl.isBuyer || $ctrl.isAdministrative">
<a
ui-sref="item.card.tax({id:$ctrl.item.id})"
target="_self">
<span translate vn-tooltip="Go to">Tax</span>
</a>
</h4>
<h4
translate
ng-show="!$ctrl.isBuyer || !$ctrl.isAdministrative">
Tax
</h4>
<vn-label-value label="{{tax.country.country}}" <vn-label-value label="{{tax.country.country}}"
ng-repeat="tax in $ctrl.summary.item.taxes" ng-repeat="tax in $ctrl.summary.item.taxes"
value="{{tax.taxClass.description}}"> value="{{tax.taxClass.description}}">
</vn-label-value> </vn-label-value>
</vn-one> </vn-one>
<vn-one name="niche"> <vn-one name="niche">
<h4 translate>Niche</h4> <h4 ng-show="$ctrl.isBuyer || $ctrl.isReplenisher">
<a
ui-sref="item.card.niche({id:$ctrl.item.id})"
target="_self">
<span translate vn-tooltip="Go to">Niche</span>
</a>
</h4>
<h4
translate
ng-show="!$ctrl.isBuyer || !$ctrl.isReplenisher">
Niche
</h4>
<vn-label-value label="{{niche.warehouse.name}}" <vn-label-value label="{{niche.warehouse.name}}"
ng-repeat="niche in $ctrl.summary.niches" ng-repeat="niche in $ctrl.summary.niches"
value="{{niche.code}}"> value="{{niche.code}}">
</vn-label-value> </vn-label-value>
</vn-one> </vn-one>
<vn-one name="botanical"> <vn-one name="botanical">
<h4 translate>Botanical</h4> <h4 ng-show="$ctrl.isBuyer">
<a
ui-sref="item.card.botanical({id:$ctrl.item.id})"
target="_self">
<span translate vn-tooltip="Go to">Botanical</span>
</a>
</h4>
<h4
translate
ng-show="!$ctrl.isBuyer">
Botanical
</h4>
<vn-label-value label="Botanical" <vn-label-value label="Botanical"
value="{{$ctrl.summary.botanical.botanical}}"> value="{{$ctrl.summary.botanical.botanical}}">
</vn-label-value> </vn-label-value>
@ -111,7 +177,18 @@
</vn-label-value> </vn-label-value>
</vn-one> </vn-one>
<vn-one name="barcode"> <vn-one name="barcode">
<h4 translate>Barcode</h4> <h4 ng-show="$ctrl.isBuyer || $ctrl.isReplenisher">
<a
ui-sref="item.card.itemBarcode({id:$ctrl.item.id})"
target="_self">
<span translate vn-tooltip="Go to">Barcode</span>
</a>
</h4>
<h4
translate
ng-show="!$ctrl.isBuyer || !$ctrl.isReplenisher">
Barcode
</h4>
<p ng-repeat="barcode in $ctrl.summary.item.itemBarcode track by $index"> <p ng-repeat="barcode in $ctrl.summary.item.itemBarcode track by $index">
<b>{{barcode.code}}</b> <b>{{barcode.code}}</b>
</p> </p>

16
modules/item/front/summary/index.js
View File

@ -13,6 +13,22 @@ class Controller extends Summary {
if (this.item && this.item.id) if (this.item && this.item.id)
this.getSummary(); this.getSummary();
} }
get isBuyer() {
return this.aclService.hasAny(['buyer']);
}
get isReplenisher() {
return this.aclService.hasAny(['replenisher']);
}
get isAdministrative() {
return this.aclService.hasAny(['administrative']);
}
get isEmployee() {
return this.aclService.hasAny(['employee']);
}
} }
ngModule.vnComponent('vnItemSummary', { ngModule.vnComponent('vnItemSummary', {

13
modules/route/front/summary/index.html
View File

@ -61,7 +61,18 @@
</vn-textarea> </vn-textarea>
</vn-one> </vn-one>
<vn-auto> <vn-auto>
<h4 translate>Ticket</h4> <h4 ng-show="$ctrl.isDelivery">
<a
ui-sref="route.card.tickets({id:$ctrl.route.id})"
target="_self">
<span translate vn-tooltip="Go to">Ticket</span>
</a>
</h4>
<h4
translate
ng-show="!$ctrl.isDelivery">
Ticket
</h4>
<vn-table model="model"> <vn-table model="model">
<vn-thead> <vn-thead>
<vn-tr> <vn-tr>

4
modules/route/front/summary/index.js
View File

@ -16,6 +16,10 @@ class Controller extends Summary {
}); });
} }
get isDelivery() {
return this.aclService.hasAny(['delivery']);
}
get route() { get route() {
return this._route; return this._route;
} }

52
modules/supplier/front/summary/index.html
View File

@ -10,7 +10,18 @@
</h5> </h5>
<vn-horizontal> <vn-horizontal>
<vn-one> <vn-one>
<h4 translate>Basic data</h4> <h4 ng-show="$ctrl.isAdministrative">
<a
ui-sref="supplier.card.basicData({id:$ctrl.supplier.id})"
target="_self">
<span translate vn-tooltip="Go to">Basic data</span>
</a>
</h4>
<h4
translate
ng-show="!$ctrl.isAdministrative">
Basic data
</h4>
<vn-vertical> <vn-vertical>
<vn-label-value <vn-label-value
label="Id" label="Id"
@ -37,7 +48,18 @@
</vn-vertical> </vn-vertical>
</vn-one> </vn-one>
<vn-one> <vn-one>
<h4 translate>Billing data</h4> <h4 ng-show="$ctrl.isAdministrative">
<a
ui-sref="supplier.card.billingData({id:$ctrl.supplier.id})"
target="_self">
<span translate vn-tooltip="Go to">Billing data</span>
</a>
</h4>
<h4
translate
ng-show="!$ctrl.isAdministrative">
Billing data
</h4>
<vn-label-value <vn-label-value
label="Pay method" label="Pay method"
value="{{::$ctrl.summary.payMethod.name}}"> value="{{::$ctrl.summary.payMethod.name}}">
@ -63,7 +85,18 @@
</vn-horizontal> </vn-horizontal>
<vn-horizontal> <vn-horizontal>
<vn-one> <vn-one>
<h4 translate>Fiscal data</h4> <h4 ng-show="$ctrl.isAdministrative">
<a
ui-sref="supplier.card.fiscalData({id:$ctrl.supplier.id})"
target="_self">
<span translate vn-tooltip="Go to">Fiscal data</span>
</a>
</h4>
<h4
translate
ng-show="!$ctrl.isAdministrative">
Fiscal data
</h4>
<vn-label-value <vn-label-value
label="Sage tax type" label="Sage tax type"
value="{{::$ctrl.summary.sageTaxType.vat}}"> value="{{::$ctrl.summary.sageTaxType.vat}}">
@ -82,7 +115,18 @@
</vn-horizontal> </vn-horizontal>
<vn-horizontal> <vn-horizontal>
<vn-one> <vn-one>
<h4 translate>Fiscal address</h4> <h4 ng-show="$ctrl.isAdministrative">
<a
ui-sref="supplier.card.fiscalData({id:$ctrl.supplier.id})"
target="_self">
<span translate vn-tooltip="Go to">Fiscal address</span>
</a>
</h4>
<h4
translate
ng-show="!$ctrl.isAdministrative">
Fiscal address
</h4>
<vn-label-value <vn-label-value
label="Social name" label="Social name"
value="{{::$ctrl.summary.name}}"> value="{{::$ctrl.summary.name}}">

4
modules/supplier/front/summary/index.js
View File

@ -10,6 +10,10 @@ class Controller extends Summary {
this.getSummary(); this.getSummary();
} }
get isAdministrative() {
return this.aclService.hasAny(['administrative']);
}
getSummary() { getSummary() {
return this.$http.get(`Suppliers/${this.supplier.id}/getSummary`).then(response => { return this.$http.get(`Suppliers/${this.supplier.id}/getSummary`).then(response => {
this.summary = response.data; this.summary = response.data;

66
modules/ticket/front/search-panel/index.html
View File

@ -1,6 +1,6 @@
<div class="search-panel"> <div class="search-panel">
<form ng-submit="$ctrl.onSearch()"> <form id="manifold-form" ng-submit="$ctrl.onSearch()">
<vn-horizontal> <vn-horizontal class="vn-px-lg vn-pt-lg">
<vn-textfield <vn-textfield
vn-one vn-one
label="General search" label="General search"
@ -9,7 +9,7 @@
vn-focus> vn-focus>
</vn-textfield> </vn-textfield>
</vn-horizontal> </vn-horizontal>
<vn-horizontal> <vn-horizontal class="vn-px-lg">
<vn-textfield <vn-textfield
vn-one vn-one
label="Client id" label="Client id"
@ -21,27 +21,37 @@
ng-model="filter.orderFk"> ng-model="filter.orderFk">
</vn-textfield> </vn-textfield>
</vn-horizontal> </vn-horizontal>
<vn-horizontal> <section class="vn-px-md">
<vn-date-picker <vn-horizontal class="manifold-panel vn-pa-md">
vn-one <vn-date-picker
label="From" vn-one
ng-model="filter.from"> label="From"
</vn-date-picker> ng-model="filter.from"
<vn-date-picker on-change="$ctrl.from = value">
vn-one </vn-date-picker>
label="To" <vn-date-picker
ng-model="filter.to"> vn-one
</vn-date-picker> label="To"
<vn-input-number ng-model="filter.to"
vn-one on-change="$ctrl.to = value">
min="0" </vn-date-picker>
step="1" <vn-none class="or vn-px-md">O</vn-none>
label="Days onward" <vn-input-number
ng-model="filter.scopeDays" vn-one
display-controls="true"> min="0"
</vn-input-number> step="1"
</vn-horizontal> label="Days onward"
<vn-horizontal> ng-model="filter.scopeDays"
on-change="$ctrl.scopeDays = value"
display-controls="true">
</vn-input-number>
<vn-icon color-marginal
icon="info"
vn-tooltip="Cannot choose a range of dates and days onward at the same time">
</vn-icon>
</vn-horizontal>
</section>
<vn-horizontal class="vn-px-lg">
<vn-textfield <vn-textfield
vn-one vn-one
label="Nickname" label="Nickname"
@ -63,7 +73,7 @@
ng-model="filter.refFk"> ng-model="filter.refFk">
</vn-textfield> </vn-textfield>
</vn-horizontal> </vn-horizontal>
<vn-horizontal> <vn-horizontal class="vn-px-lg">
<vn-autocomplete <vn-autocomplete
vn-one vn-one
label="Agency" label="Agency"
@ -87,7 +97,7 @@
</tpl-item> </tpl-item>
</vn-autocomplete> </vn-autocomplete>
</vn-horizontal> </vn-horizontal>
<vn-horizontal> <vn-horizontal class="vn-px-lg">
<vn-autocomplete <vn-autocomplete
vn-one vn-one
label="Warehouse" label="Warehouse"
@ -101,7 +111,7 @@
url="Provinces"> url="Provinces">
</vn-autocomplete> </vn-autocomplete>
</vn-horizontal> </vn-horizontal>
<vn-horizontal> <vn-horizontal class="vn-px-lg">
<vn-check <vn-check
vn-one vn-one
label="My team" label="My team"
@ -121,7 +131,7 @@
triple-state="true"> triple-state="true">
</vn-check> </vn-check>
</vn-horizontal> </vn-horizontal>
<vn-horizontal class="vn-mt-lg"> <vn-horizontal class="vn-px-lg vn-pb-lg vn-mt-lg">
<vn-submit label="Search"></vn-submit> <vn-submit label="Search"></vn-submit>
</vn-horizontal> </vn-horizontal>
</form> </form>

32
modules/ticket/front/search-panel/index.js
View File

@ -1,8 +1,11 @@
import ngModule from '../module'; import ngModule from '../module';
import SearchPanel from 'core/components/searchbar/search-panel'; import SearchPanel from 'core/components/searchbar/search-panel';
class Controller extends SearchPanel { class Controller extends SearchPanel {
constructor($, $element) { constructor($, $element) {
super($, $element); super($, $element);
this.filter = this.$.filter;
this.getGroupedStates(); this.getGroupedStates();
} }
@ -19,6 +22,35 @@ class Controller extends SearchPanel {
this.groupedStates = groupedStates; this.groupedStates = groupedStates;
}); });
} }
get from() {
return this._from;
}
set from(value) {
this._from = value;
this.filter.scopeDays = null;
}
get to() {
return this._to;
}
set to(value) {
this._to = value;
this.filter.scopeDays = null;
}
get scopeDays() {
return this._scopeDays;
}
set scopeDays(value) {
this._scopeDays = value;
this.filter.from = null;
this.filter.to = null;
}
} }
ngModule.vnComponent('vnTicketSearchPanel', { ngModule.vnComponent('vnTicketSearchPanel', {

38
modules/ticket/front/search-panel/index.spec.js
View File

@ -10,10 +10,11 @@ describe('Ticket Component vnTicketSearchPanel', () => {
$httpBackend = _$httpBackend_; $httpBackend = _$httpBackend_;
controller = $componentController('vnTicketSearchPanel', {$element: null}); controller = $componentController('vnTicketSearchPanel', {$element: null});
controller.$t = () => {}; controller.$t = () => {};
controller.filter = {};
})); }));
describe('getGroupedStates()', () => { describe('getGroupedStates()', () => {
it('should set an array of groupedStates with the aditionof a name translation', () => { it('should set an array of groupedStates with the adition of a name translation', () => {
jest.spyOn(controller, '$t').mockReturnValue('miCodigo'); jest.spyOn(controller, '$t').mockReturnValue('miCodigo');
const data = [ const data = [
{ {
@ -32,4 +33,39 @@ describe('Ticket Component vnTicketSearchPanel', () => {
}]); }]);
}); });
}); });
describe('from() setter', () => {
it('should clear the scope days when setting the from property', () => {
controller.filter.scopeDays = 1;
controller.from = new Date();
expect(controller.filter.scopeDays).toBeNull();
expect(controller.from).toBeDefined();
});
});
describe('to() setter', () => {
it('should clear the scope days when setting the to property', () => {
controller.filter.scopeDays = 1;
controller.to = new Date();
expect(controller.filter.scopeDays).toBeNull();
expect(controller.to).toBeDefined();
});
});
describe('scopeDays() setter', () => {
it('should clear the date range when setting the scopeDays property', () => {
controller.filter.from = new Date();
controller.filter.to = new Date();
controller.scopeDays = 1;
expect(controller.filter.from).toBeNull();
expect(controller.filter.to).toBeNull();
expect(controller.scopeDays).toBeDefined();
});
});
}); });

3
modules/ticket/front/search-panel/locale/es.yml
View File

@ -16,4 +16,5 @@ Pending: Pendiente
FREE: Libre FREE: Libre
DELIVERED: Servido DELIVERED: Servido
ON_PREPARATION: En preparacion ON_PREPARATION: En preparacion
PACKED: Encajado PACKED: Encajado
Cannot choose a range of dates and days onward at the same time: No se puede selecionar un rango de fechas y días en adelante a la vez

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

@ -1,6 +1,7 @@
<vn-card class="summary"> <vn-card class="summary">
<h5> <h5>
<a ng-if="::$ctrl.summary.id" <a
ng-if="::$ctrl.summary.id"
vn-tooltip="Go to the ticket" vn-tooltip="Go to the ticket"
ui-sref="ticket.card.summary({id: {{::$ctrl.summary.id}}})" ui-sref="ticket.card.summary({id: {{::$ctrl.summary.id}}})"
name="goToSummary"> name="goToSummary">
@ -103,7 +104,13 @@
<p><vn-label><strong>Total</strong></vn-label> <strong>{{$ctrl.summary.total | currency: 'EUR':2}}</strong></p> <p><vn-label><strong>Total</strong></vn-label> <strong>{{$ctrl.summary.total | currency: 'EUR':2}}</strong></p>
</vn-one> </vn-one>
<vn-auto name="sales"> <vn-auto name="sales">
<h4 translate>Sale</h4> <h4>
<a
ui-sref="ticket.card.sale({id:$ctrl.ticket.id})"
target="_self">
<span translate vn-tooltip="Go to">Sale</span>
</a>
</h4>
<vn-table> <vn-table>
<vn-thead> <vn-thead>
<vn-tr> <vn-tr>
@ -158,7 +165,13 @@
</vn-table> </vn-table>
</vn-auto> </vn-auto>
<vn-one ng-if="$ctrl.summary.packagings.length != 0"> <vn-one ng-if="$ctrl.summary.packagings.length != 0">
<h4 translate>Packages</h4> <h4>
<a
ui-sref="ticket.card.package({id:$ctrl.ticket.id})"
target="_self">
<span translate vn-tooltip="Go to">Packages</span>
</a>
</h4>
<vn-table model="model"> <vn-table model="model">
<vn-thead> <vn-thead>
<vn-tr> <vn-tr>
@ -177,7 +190,13 @@
</vn-table> </vn-table>
</vn-one> </vn-one>
<vn-one class="services" ng-if="$ctrl.summary.services.length != 0"> <vn-one class="services" ng-if="$ctrl.summary.services.length != 0">
<h4 translate>Service</h4> <h4>
<a
ui-sref="ticket.card.service({id:$ctrl.ticket.id})"
target="_self">
<span translate vn-tooltip="Go to">Service</span>
</a>
</h4>
<vn-table model="model"> <vn-table model="model">
<vn-thead> <vn-thead>
<vn-tr> <vn-tr>
@ -202,7 +221,13 @@
</vn-horizontal> </vn-horizontal>
<vn-horizontal> <vn-horizontal>
<vn-auto ng-if="$ctrl.summary.requests.length != 0"> <vn-auto ng-if="$ctrl.summary.requests.length != 0">
<h4 translate>Purchase request</h4> <h4>
<a
ui-sref="ticket.card.request.index({id:$ctrl.ticket.id})"
target="_self">
<span translate vn-tooltip="Go to">Purchase request</span>
</a>
</h4>
<vn-table model="model"> <vn-table model="model">
<vn-thead> <vn-thead>
<vn-tr> <vn-tr>

2
modules/ticket/front/weekly/locale/es.yml
View File

@ -4,4 +4,4 @@ You are going to delete this weekly ticket: Vas a eliminar este ticket programad
This ticket will be removed from weekly tickets! Continue anyway?: Este ticket se eliminará de tickets programados! ¿Continuar de todas formas? This ticket will be removed from weekly tickets! Continue anyway?: Este ticket se eliminará de tickets programados! ¿Continuar de todas formas?
Search weekly ticket by id or client id: Busca tickets programados por el identificador o el identificador del cliente Search weekly ticket by id or client id: Busca tickets programados por el identificador o el identificador del cliente
Search by weekly ticket: Buscar por tickets programados Search by weekly ticket: Buscar por tickets programados
weekDay: Dia Weekday: Llegada

16
modules/travel/front/summary/index.html
View File

@ -1,6 +1,7 @@
<vn-card class="summary"> <vn-card class="summary">
<h5> <h5>
<a ng-if="::$ctrl.travelData.id" <a
ng-if="::$ctrl.travelData.id"
vn-tooltip="Go to the travel" vn-tooltip="Go to the travel"
ui-sref="travel.card.summary({id: {{::$ctrl.travelData.id}}})" ui-sref="travel.card.summary({id: {{::$ctrl.travelData.id}}})"
name="goToSummary"> name="goToSummary">
@ -132,7 +133,18 @@
</vn-table> </vn-table>
</vn-auto> </vn-auto>
<vn-auto ng-if="$ctrl.travelThermographs.length != 0"> <vn-auto ng-if="$ctrl.travelThermographs.length != 0">
<h4 translate>Thermographs</h4> <h4 ng-show="$ctrl.isBuyer">
<a
ui-sref="travel.card.thermograph.index({id:$ctrl.travelData.id})"
target="_self">
<span translate vn-tooltip="Go to">Thermograph</span>
</a>
</h4>
<h4
translate
ng-show="!$ctrl.isBuyer">
Thermograph
</h4>
<vn-table> <vn-table>
<vn-thead> <vn-thead>
<vn-tr> <vn-tr>

4
modules/travel/front/summary/index.js
View File

@ -56,6 +56,10 @@ class Controller extends Summary {
return total; return total;
} }
get isBuyer() {
return this.aclService.hasAny(['buyer']);
}
} }
ngModule.vnComponent('vnTravelSummary', { ngModule.vnComponent('vnTravelSummary', {

2
modules/worker/back/models/calendar.json
View File

@ -1,6 +1,6 @@
{ {
"name": "Calendar", "name": "Calendar",
"base": "Loggable", "base": "VnModel",
"log": { "log": {
"model": "WorkerLog", "model": "WorkerLog",
"relation": "labour" "relation": "labour"

12
modules/worker/front/summary/index.html
View File

@ -10,7 +10,17 @@
</h5> </h5>
<vn-horizontal class="vn-pa-md"> <vn-horizontal class="vn-pa-md">
<vn-one> <vn-one>
<h4 translate>Basic data</h4> <h4 ng-show="$ctrl.isHr">
<a
ui-sref="worker.card.basicData({id:$ctrl.worker.id})">
<span translate vn-tooltip="Go to">Basic data</span>
</a>
</h4>
<h4
translates
ng-show="!$ctrl.isHr">
Basic data
</h4>
<vn-label-value label="Id" <vn-label-value label="Id"
value="{{worker.id}}"> value="{{worker.id}}">
</vn-label-value> </vn-label-value>

4
modules/worker/front/summary/index.js
View File

@ -52,6 +52,10 @@ class Controller extends Summary {
this.$.worker = res.data; this.$.worker = res.data;
}); });
} }
get isHr() {
return this.aclService.hasAny(['hr']);
}
} }
ngModule.vnComponent('vnWorkerSummary', { ngModule.vnComponent('vnWorkerSummary', {

9
modules/zone/front/summary/index.html
View File

@ -1,6 +1,7 @@
<vn-card class="summary"> <vn-card class="summary">
<h5> <h5>
<a ng-if="::$ctrl.summary.id" <a
ng-if="::$ctrl.summary.id"
vn-tooltip="Go to the zone" vn-tooltip="Go to the zone"
ui-sref="zone.card.summary({id: {{::$ctrl.summary.id}}})" ui-sref="zone.card.summary({id: {{::$ctrl.summary.id}}})"
name="goToSummary"> name="goToSummary">
@ -36,7 +37,11 @@
</vn-horizontal> </vn-horizontal>
<vn-horizontal class="vn-pa-md"> <vn-horizontal class="vn-pa-md">
<vn-auto> <vn-auto>
<h4 translate>Warehouses</h4> <h4>
<a ui-sref="zone.card.warehouses({id:$ctrl.zone.id})">
<span translate vn-tooltip="Go to">Warehouse</span>
</a>
</h4>
<vn-table model="model" auto-load="false"> <vn-table model="model" auto-load="false">
<vn-thead> <vn-thead>
<vn-tr> <vn-tr>