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

feat: refs #8087 Traspasar redadas a travels
gitea/salix/pipeline/pr-dev There was a failure building this commit Details

This commit is contained in:
Carlos Andrés 2024-10-24 19:32:02 +02:00
parent 1bf900f81b
commit 4d3bc2c837
3 changed files with 67 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

130
modules/entry/front/descriptor/index.html
View File

@ -1,65 +1,65 @@
<vn-descriptor-content <vn-descriptor-content
module="entry" module="entry"
description="$ctrl.entry.supplier.nickname" description="$ctrl.entry.supplier.nickname"
summary="$ctrl.$.summary"> summary="$ctrl.$.summary">
<slot-menu> <slot-menu>
<vn-item <vn-item
ng-click="$ctrl.showEntryReport()" ng-click="$ctrl.showEntryReport()"
translate> translate>
Show entry report Show entry report
</vn-item> </vn-item>
</slot-menu> </slot-menu>
<slot-body> <slot-body>
<div class="attributes"> <div class="attributes">
<vn-label-value label="Agency " <vn-label-value label="Agency "
value="{{$ctrl.entry.travel.agency.name}}"> value="{{$ctrl.entry.travel.agency.name}}">
</vn-label-value> </vn-label-value>
<vn-label-value label="Landed" <vn-label-value label="Landed"
value="{{$ctrl.entry.travel.landed | date: 'dd/MM/yyyy'}}"> value="{{$ctrl.entry.travel.landed | date: 'dd/MM/yyyy'}}">
</vn-label-value> </vn-label-value>
<vn-label-value label="Warehouse Out" <vn-label-value label="Warehouse Out"
value="{{$ctrl.entry.travel.warehouseOut.name}}"> value="{{$ctrl.entry.travel.warehouseOut.name}}">
</vn-label-value> </vn-label-value>
</div> </div>
<div class="icons"> <div class="icons">
<vn-icon <vn-icon
vn-tooltip="Is inventory entry" vn-tooltip="It is a raid {{$ctrl.entryData.travel.daysInForward}} days forward"
icon="icon-inventory" icon="icon-inventory"
ng-if="$ctrl.entry.isExcludedFromAvailable"> ng-if="$ctrl.entry.isExcludedFromAvailable">
</vn-icon> </vn-icon>
<vn-icon <vn-icon
vn-tooltip="Is virtual entry" vn-tooltip="Is virtual entry"
icon="icon-net" icon="icon-net"
ng-if="$ctrl.entry.isRaid"> ng-if="$ctrl.entryData.travel.daysInForward">
</vn-icon> </vn-icon>
</div> </div>
<div class="quicklinks"> <div class="quicklinks">
<div ng-transclude="btnOne"> <div ng-transclude="btnOne">
<vn-quick-link <vn-quick-link
tooltip="Supplier card" tooltip="Supplier card"
state="['supplier.index', {q: $ctrl.entry.supplier.id }]" state="['supplier.index', {q: $ctrl.entry.supplier.id }]"
icon="icon-supplier"> icon="icon-supplier">
</vn-quick-link> </vn-quick-link>
</div> </div>
<div ng-transclude="btnTwo"> <div ng-transclude="btnTwo">
<vn-quick-link <vn-quick-link
tooltip="All travels with current agency" tooltip="All travels with current agency"
state="['travel.index', {q: $ctrl.travelFilter}]" state="['travel.index', {q: $ctrl.travelFilter}]"
icon="local_airport"> icon="local_airport">
</vn-quick-link> </vn-quick-link>
</div> </div>
<div ng-transclude="btnThree"> <div ng-transclude="btnThree">
<vn-quick-link <vn-quick-link
tooltip="All entries with current supplier" tooltip="All entries with current supplier"
state="['entry.index', {q: $ctrl.entryFilter}]" state="['entry.index', {q: $ctrl.entryFilter}]"
icon="icon-entry"> icon="icon-entry">
</vn-quick-link> </vn-quick-link>
</div> </div>
<div ng-transclude="btnThree"> <div ng-transclude="btnThree">
</div> </div>
</div> </div>
</slot-body> </slot-body>
</vn-descriptor-content> </vn-descriptor-content>
<vn-popup vn-id="summary"> <vn-popup vn-id="summary">
<vn-entry-summary entry="$ctrl.entry"></vn-entry-summary> <vn-entry-summary entry="$ctrl.entry"></vn-entry-summary>
</vn-popup> </vn-popup>

2
modules/entry/front/summary/index.html
View File

@ -86,7 +86,7 @@ auto-load="true">
</vn-check> </vn-check>
<vn-check <vn-check
label="Raid" label="Raid"
ng-model="$ctrl.entryData.isRaid" ng-model="$ctrl.entryData.travel.daysInForward"
disabled="true"> disabled="true">
</vn-check> </vn-check>
<vn-check <vn-check

1
modules/travel/back/methods/travel/filter.js
View File

@ -155,6 +155,7 @@ module.exports = Self => {
t.landingHour, t.landingHour,
t.cargoSupplierFk, t.cargoSupplierFk,
t.totalEntries, t.totalEntries,
t.daysInForward,
am.name agencyModeName, am.name agencyModeName,
win.name warehouseInName, win.name warehouseInName,
wout.name warehouseOutName, wout.name warehouseOutName,