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

2650-add_button_edit_on_summaries #507

Merged
carlosjr merged 11 commits from 2650-add_button_edit_on_summaries into dev 2021-01-12 10:07:19 +00:00
Conversation 0 Commits 11 Files Changed 21 +189 -25
16 changed files with 189 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f45aa7937d - Show all commits

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

@ -10,13 +10,18 @@
</h5> </h5>
<vn-horizontal class="vn-pa-md"> <vn-horizontal class="vn-pa-md">
<vn-one> <vn-one>
<h4> <h4 ng-show="$ctrl.isHr">
<a <a
ui-sref="account.card.basicData({id:summary.id})" ui-sref="account.card.basicData({id:summary.id})"
target="_self"> target="_self">
<span translate vn-tooltip="Go to">Basic Data</span> <span translate vn-tooltip="Go to">Basic Data</span>
</a> </a>
</h4> </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;

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

@ -54,13 +54,18 @@
</vn-range> </vn-range>
</vn-one> </vn-one>
<vn-auto> <vn-auto>
<h4> <h4 ng-show="$ctrl.isSalesPerson">
<a <a
ui-sref="claim.card.detail({id:$ctrl.claim.id})" ui-sref="claim.card.detail({id:$ctrl.claim.id})"
target="_self"> target="_self">
<span translate vn-tooltip="Go to">Detail</span> <span translate vn-tooltip="Go to">Detail</span>
</a> </a>
</h4> </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>
@ -111,13 +116,18 @@
</vn-horizontal> </vn-horizontal>
</vn-auto> </vn-auto>
<vn-auto> <vn-auto>
<h4> <h4 ng-show="$ctrl.isClaimManager">
<a <a
ui-sref="claim.card.development({id:$ctrl.claim.id})" ui-sref="claim.card.development({id:$ctrl.claim.id})"
target="_self"> target="_self">
<span translate vn-tooltip="Go to">Development</span> <span translate vn-tooltip="Go to">Development</span>
</a> </a>
</h4> </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>
@ -148,13 +158,18 @@
</vn-data-viewer> </vn-data-viewer>
</vn-auto> </vn-auto>
<vn-auto> <vn-auto>
<h4> <h4 ng-show="$ctrl.isClaimManager">
<a <a
ui-sref="claim.card.action({id:$ctrl.claim.id})" ui-sref="claim.card.action({id:$ctrl.claim.id})"
target="_self"> target="_self">
<span translate vn-tooltip="Go to">Action</span> <span translate vn-tooltip="Go to">Action</span>
</a> </a>
</h4> </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;
} }

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

@ -12,13 +12,18 @@
</h5> </h5>
<vn-horizontal> <vn-horizontal>
<vn-one> <vn-one>
<h4> <h4 ng-show="$ctrl.isEmployee">
<a <a
ui-sref="client.card.basicData({id:$ctrl.client.id})" ui-sref="client.card.basicData({id:$ctrl.client.id})"
target="_self"> target="_self">
<span translate vn-tooltip="Go to">Basic data</span> <span translate vn-tooltip="Go to">Basic data</span>
</a> </a>
</h4> </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>
@ -49,13 +54,18 @@
</vn-label-value> </vn-label-value>
</vn-one> </vn-one>
<vn-one> <vn-one>
<h4> <h4 ng-show="$ctrl.isEmployee">
<a <a
ui-sref="client.card.fiscalData({id:$ctrl.client.id})" ui-sref="client.card.fiscalData({id:$ctrl.client.id})"
target="_self"> target="_self">
<span translate vn-tooltip="Go to">Fiscal address</span> <span translate vn-tooltip="Go to">Fiscal address</span>
</a> </a>
</h4> </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>
@ -79,13 +89,18 @@
</vn-label-value> </vn-label-value>
</vn-one> </vn-one>
<vn-one> <vn-one>
<h4> <h4 ng-show="$ctrl.isEmployee">
<a <a
ui-sref="client.card.fiscalData({id:$ctrl.client.id})" ui-sref="client.card.fiscalData({id:$ctrl.client.id})"
target="_self"> target="_self">
<span translate vn-tooltip="Go to">Fiscal data</span> <span translate vn-tooltip="Go to">Fiscal data</span>
</a> </a>
</h4> </h4>
<h4
translate
ng-show="!$ctrl.isEmployee">
Fiscal data
</h4>
<vn-vertical> <vn-vertical>
<vn-check <vn-check
label="Is equalizated" label="Is equalizated"
@ -125,13 +140,18 @@
</vn-vertical> </vn-vertical>
</vn-one> </vn-one>
<vn-one> <vn-one>
<h4> <h4 ng-show="$ctrl.isEmployee">
<a <a
ui-sref="client.card.billingData({id:$ctrl.client.id})" ui-sref="client.card.billingData({id:$ctrl.client.id})"
target="_self"> target="_self">
<span translate vn-tooltip="Go to">Billing data</span> <span translate vn-tooltip="Go to">Billing data</span>
</a> </a>
</h4> </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>
@ -160,13 +180,18 @@
</vn-vertical> </vn-vertical>
</vn-one> </vn-one>
<vn-one> <vn-one>
<h4> <h4 ng-show="$ctrl.isEmployee">
<a <a
ui-sref="client.card.address.index({id:$ctrl.client.id})" ui-sref="client.card.address.index({id:$ctrl.client.id})"
target="_self"> target="_self">
<span translate vn-tooltip="Go to">Address</span> <span translate vn-tooltip="Go to">Address</span>
</a> </a>
</h4> </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>
@ -178,13 +203,16 @@
</vn-label-value> </vn-label-value>
</vn-one> </vn-one>
<vn-one> <vn-one>
<h4> <h4 ng-show="$ctrl.isEmployee">
<a <a
ui-sref="client.card.webAccess({id:$ctrl.client.id})" ui-sref="client.card.webAccess({id:$ctrl.client.id})"
target="_self"> target="_self">
<span translate vn-tooltip="Go to">Web access</span> <span translate vn-tooltip="Go to">Web access</span>
</a> </a>
</h4> </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;

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

@ -25,13 +25,18 @@
</vn-horizontal> </vn-horizontal>
</vn-one> </vn-one>
<vn-one name="basicData"> <vn-one name="basicData">
<h4> <h4 ng-show="$ctrl.isBuyer">
<a <a
ui-sref="item.card.basicData({id:$ctrl.item.id})" ui-sref="item.card.basicData({id:$ctrl.item.id})"
target="_self"> target="_self">
<span translate vn-tooltip="Go to">Basic data</span> <span translate vn-tooltip="Go to">Basic data</span>
</a> </a>
</h4> </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>
@ -59,13 +64,18 @@
</vn-label-value> </vn-label-value>
</vn-one> </vn-one>
<vn-one name="otherData"> <vn-one name="otherData">
<h4> <h4 ng-show="$ctrl.isBuyer">
<a <a
ui-sref="item.card.basicData({id:$ctrl.item.id})" ui-sref="item.card.basicData({id:$ctrl.item.id})"
target="_self"> target="_self">
<span translate vn-tooltip="Go to">Other data</span> <span translate vn-tooltip="Go to">Other data</span>
</a> </a>
</h4> </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>
@ -89,13 +99,18 @@
</vn-label-value> </vn-label-value>
</vn-one> </vn-one>
<vn-one name="tags"> <vn-one name="tags">
<h4> <h4 ng-show="$ctrl.isBuyer || $ctrl.isReplenisher">
<a <a
ui-sref="item.card.tags({id:$ctrl.item.id})" ui-sref="item.card.tags({id:$ctrl.item.id})"
target="_self"> target="_self">
<span translate vn-tooltip="Go to">Tags</span> <span translate vn-tooltip="Go to">Tags</span>
</a> </a>
</h4> </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"
@ -103,37 +118,52 @@
</vn-label-value> </vn-label-value>
</vn-one> </vn-one>
<vn-one name="tax"> <vn-one name="tax">
<h4> <h4 ng-show="$ctrl.isBuyer || $ctrl.isAdministrative">
<a ui-sref="item.card.tax"> <a ui-sref="item.card.tax({id:$ctrl.item.id})">
<span translate vn-tooltip="Go to">Tax</span> <span translate vn-tooltip="Go to">Tax</span>
</a> </a>
</h4> </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> <h4 ng-show="$ctrl.isBuyer || $ctrl.isReplenisher">
<a <a
ui-sref="item.card.niche({id:$ctrl.item.id})" ui-sref="item.card.niche({id:$ctrl.item.id})"
target="_self"> target="_self">
<span translate vn-tooltip="Go to">Niche</span> <span translate vn-tooltip="Go to">Niche</span>
</a> </a>
</h4> </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> <h4 ng-show="$ctrl.isBuyer">
<a <a
ui-sref="item.card.botanical({id:$ctrl.item.id})" ui-sref="item.card.botanical({id:$ctrl.item.id})"
target="_self"> target="_self">
<span translate vn-tooltip="Go to">Botanical</span> <span translate vn-tooltip="Go to">Botanical</span>
</a> </a>
</h4> </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>
@ -145,13 +175,18 @@
</vn-label-value> </vn-label-value>
</vn-one> </vn-one>
<vn-one name="barcode"> <vn-one name="barcode">
<h4> <h4 ng-show="$ctrl.isBuyer || $ctrl.isReplenisher">
<a <a
ui-sref="item.card.itemBarcode({id:$ctrl.item.id})" ui-sref="item.card.itemBarcode({id:$ctrl.item.id})"
target="_self"> target="_self">
<span translate vn-tooltip="Go to">Barcode</span> <span translate vn-tooltip="Go to">Barcode</span>
</a> </a>
</h4> </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', {

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

@ -61,13 +61,18 @@
</vn-textarea> </vn-textarea>
</vn-one> </vn-one>
<vn-auto> <vn-auto>
<h4> <h4 ng-show="$ctrl.isDelivery">
<a <a
ui-sref="route.card.tickets({id:$ctrl.route.id})" ui-sref="route.card.tickets({id:$ctrl.route.id})"
target="_self"> target="_self">
<span translate vn-tooltip="Go to">Ticket</span> <span translate vn-tooltip="Go to">Ticket</span>
</a> </a>
</h4> </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;
} }

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

@ -10,13 +10,18 @@
</h5> </h5>
<vn-horizontal> <vn-horizontal>
<vn-one> <vn-one>
<h4> <h4 ng-show="$ctrl.isAdministrative">
<a <a
ui-sref="supplier.card.basicData({id:$ctrl.supplier.id})" ui-sref="supplier.card.basicData({id:$ctrl.supplier.id})"
target="_self"> target="_self">
<span translate vn-tooltip="Go to">Basic data</span> <span translate vn-tooltip="Go to">Basic data</span>
</a> </a>
</h4> </h4>
<h4
translate
ng-show="!$ctrl.isAdministrative">
Basic data
</h4>
<vn-vertical> <vn-vertical>
<vn-label-value <vn-label-value
label="Id" label="Id"
@ -43,13 +48,18 @@
</vn-vertical> </vn-vertical>
</vn-one> </vn-one>
<vn-one> <vn-one>
<h4> <h4 ng-show="$ctrl.isAdministrative">
<a <a
ui-sref="supplier.card.billingData({id:$ctrl.supplier.id})" ui-sref="supplier.card.billingData({id:$ctrl.supplier.id})"
target="_self"> target="_self">
<span translate vn-tooltip="Go to">Billing data</span> <span translate vn-tooltip="Go to">Billing data</span>
</a> </a>
</h4> </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}}">
@ -75,13 +85,18 @@
</vn-horizontal> </vn-horizontal>
<vn-horizontal> <vn-horizontal>
<vn-one> <vn-one>
<h4> <h4 ng-show="$ctrl.isAdministrative">
<a <a
ui-sref="supplier.card.fiscalData({id:$ctrl.supplier.id})" ui-sref="supplier.card.fiscalData({id:$ctrl.supplier.id})"
target="_self"> target="_self">
<span translate vn-tooltip="Go to">Fiscal data</span> <span translate vn-tooltip="Go to">Fiscal data</span>
</a> </a>
</h4> </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}}">
@ -100,13 +115,18 @@
</vn-horizontal> </vn-horizontal>
<vn-horizontal> <vn-horizontal>
<vn-one> <vn-one>
<h4> <h4 ng-show="$ctrl.isAdministrative">
<a <a
ui-sref="supplier.card.fiscalData({id:$ctrl.supplier.id})" ui-sref="supplier.card.fiscalData({id:$ctrl.supplier.id})"
target="_self"> target="_self">
<span translate vn-tooltip="Go to">Fiscal address</span> <span translate vn-tooltip="Go to">Fiscal address</span>
</a> </a>
</h4> </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;

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

@ -132,13 +132,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> <h4 ng-show="$ctrl.isBuyer">
<a <a
ui-sref="travel.card.thermograph.index({id:$ctrl.travelData.id})" ui-sref="travel.card.thermograph.index({id:$ctrl.travelData.id})"
target="_self"> target="_self">
<span translate vn-tooltip="Go to">Thermograph</span> <span translate vn-tooltip="Go to">Thermograph</span>
</a> </a>
</h4> </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', {

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

@ -10,11 +10,16 @@
</h5> </h5>
<vn-horizontal class="vn-pa-md"> <vn-horizontal class="vn-pa-md">
<vn-one> <vn-one>
<h4> <h4 ng-show="$ctrl.isHr">
<a ui-sref="worker.card.basicData({id:$ctrl.worker.id})"> <a ui-sref="worker.card.basicData({id:$ctrl.worker.id})">
<span translate vn-tooltip="Go to">Basic data</span> <span translate vn-tooltip="Go to">Basic data</span>
</a> </a>
</h4> </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', {