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

Merge branch 'dev' into 3830-ticket_sale
gitea/salix/pipeline/head This commit looks good Details

This commit is contained in:
Carlos Jimenez Ruiz 2022-04-13 09:12:14 +00:00
parent a47349646f f28631fa90
commit 6015050eed
23 changed files with 110 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
e2e/helpers/extensions.js
View File

@ -181,12 +181,12 @@ let actions = {
},
reloadSection: async function(state) {
await this.click('vn-icon[icon="preview"]');
await this.click('vn-icon[icon="launch"]');
await this.accessToSection(state);
},
forceReloadSection: async function(sectionRoute) {
await this.waitToClick('vn-icon[icon="preview"]');
await this.waitToClick('vn-icon[icon="launch"]');
await this.waitToClick('button[response="accept"]');
await this.waitForSelector('vn-card.summary');
await this.waitToClick(`vn-left-menu li > a[ui-sref="${sectionRoute}"]`);

2
e2e/helpers/selectors.js
View File

@ -958,7 +958,7 @@ export default {
supplierRef: 'vn-invoice-in-summary vn-label-value:nth-child(2) > section > span'
},
invoiceInDescriptor: {
summaryIcon: 'vn-invoice-in-descriptor a[title="Preview"]',
summaryIcon: 'vn-invoice-in-descriptor a[title="Go to module summary"]',
moreMenu: 'vn-invoice-in-descriptor vn-icon-button[icon=more_vert]',
moreMenuDeleteInvoiceIn: '.vn-menu [name="deleteInvoice"]',
moreMenuCloneInvoiceIn: '.vn-menu [name="cloneInvoice"]',

2
e2e/paths/10-travel/03_descriptor.spec.js
View File

@ -134,7 +134,7 @@ describe('Travel descriptor path', () => {
});
it('should navigate to the summary and then clone the travel and its entries using the descriptor menu to get redirected to the cloned travel basic data', async() => {
await page.waitToClick('vn-icon[icon="preview"]'); // summary icon
await page.waitToClick('vn-icon[icon="launch"]');
await page.waitForState('travel.card.summary');
await page.waitForTimeout(1000);
await page.waitToClick(selectors.travelDescriptor.dotMenu);

12
front/salix/components/descriptor-popover/style.scss
View File

@ -4,8 +4,14 @@
vn-descriptor-content > .descriptor {
width: 256px;
& > .header > a:first-child {
visibility: hidden;
}
& > .header {
a:first-child {
display: none;
}
vn-icon-button:nth-child(2) {
display: block;
}
}
}
}

9
front/salix/components/descriptor/index.html
View File

@ -12,10 +12,15 @@
name="goToModuleIndex">
<vn-icon icon="{{$ctrl.moduleMap[$ctrl.module].icon}}"></vn-icon>
</a>
<vn-icon-button
translate-attr="{title: 'Show summary'}"
icon="preview"
vn-click-stop="$ctrl.summary.show()">
</vn-icon-button>
<a
translate-attr="{title: 'Preview'}"
translate-attr="{title: 'Go to module summary'}"
ui-sref="{{::$ctrl.summaryState}}({id: $ctrl.descriptor.id})">
<vn-icon icon="preview"></vn-icon>
<vn-icon icon="launch"></vn-icon>
</a>
<vn-icon-button ng-if="!$ctrl.$transclude.isSlotFilled('dotMenu')"
ng-class="::{invisible: !$ctrl.$transclude.isSlotFilled('menu')}"

3
front/salix/components/descriptor/index.js
View File

@ -125,7 +125,8 @@ ngModule.vnComponent('vnDescriptorContent', {
module: '@',
baseState: '@?',
description: '<',
descriptor: '<?'
descriptor: '<?',
summary: '<?'
},
transclude: {
body: 'slotBody',

3
front/salix/components/descriptor/style.scss
View File

@ -60,6 +60,9 @@ vn-descriptor-content {
font-size: 1.75rem;
}
}
& > vn-icon-button:nth-child(2) {
display: none;
}
}
& > .body {
display: block;

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

@ -13,6 +13,8 @@ Preview: Vista previa
Profile: Perfil
Push on applications menu: Para abrir un módulo pulsa en el menú de aplicaciones
Go to module index: Ir al índice del módulo
Go to module summary: Ir a la vista previa del módulo
Show summary: Mostrar vista previa
What is new: Novedades de la versión
Settings: Ajustes

6
modules/account/front/descriptor/index.html
View File

@ -1,6 +1,7 @@
<vn-descriptor-content
module="account"
description="$ctrl.user.nickname">
description="$ctrl.user.nickname"
summary="$ctrl.$.summary">
<slot-menu>
<vn-item
ng-click="deleteUser.show()"
@ -173,3 +174,6 @@
<button response="accept" translate>Change password</button>
</tpl-buttons>
</vn-dialog>
<vn-popup vn-id="summary">
<vn-user-summary user="$ctrl.user"></vn-user-summary>
</vn-popup>

8
modules/claim/front/descriptor/index.html
View File

@ -1,6 +1,7 @@
<vn-descriptor-content
module="claim"
description="$ctrl.claim.client.name">
description="$ctrl.claim.client.name"
summary="$ctrl.$.summary">
<slot-menu>
<vn-item
ng-click="$ctrl.showPickupOrder()"
@ -96,4 +97,7 @@
</vn-worker-descriptor-popover>
<vn-ticket-descriptor-popover
vn-id="ticketDescriptor">
</vn-ticket-descriptor-popover>
</vn-ticket-descriptor-popover>
<vn-popup vn-id="summary">
<vn-claim-summary claim="$ctrl.claim"></vn-claim-summary>
</vn-popup>

8
modules/client/front/descriptor/index.html
View File

@ -1,6 +1,7 @@
<vn-descriptor-content
module="client"
description="$ctrl.client.name">
description="$ctrl.client.name"
summary="$ctrl.$.summary">
<slot-menu>
<a class="vn-item"
ui-sref="ticket.create({clientFk: $ctrl.client.id})"
@ -118,4 +119,7 @@
</vn-client-sms>
<vn-worker-descriptor-popover
vn-id="workerDescriptor">
</vn-worker-descriptor-popover>
</vn-worker-descriptor-popover>
<vn-popup vn-id="summary">
<vn-client-summary client="$ctrl.client"></vn-client-summary>
</vn-popup>

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

@ -1,6 +1,7 @@
<vn-descriptor-content
module="entry"
description="$ctrl.entry.supplier.nickname">
description="$ctrl.entry.supplier.nickname"
summary="$ctrl.$.summary">
<slot-menu>
<vn-item
ng-click="$ctrl.showEntryReport()"
@ -59,3 +60,6 @@
</div>
</slot-body>
</vn-descriptor-content>
<vn-popup vn-id="summary">
<vn-entry-summary entry="$ctrl.entry"></vn-entry-summary>
</vn-popup>

10
modules/invoiceIn/front/descriptor/index.html
View File

@ -1,4 +1,7 @@
<vn-descriptor-content module="invoiceIn" description="$ctrl.invoiceIn.supplierRef">
<vn-descriptor-content
module="invoiceIn"
description="$ctrl.invoiceIn.supplierRef"
summary="$ctrl.$.summary">
<slot-menu>
<vn-item
ng-click="$ctrl.checkToBook()"
@ -76,4 +79,7 @@
vn-id="confirm-toBookAnyway"
message="Are you sure you want to book this invoice?"
on-accept="$ctrl.onAcceptToBook()">
</vn-confirm>
</vn-confirm>
<vn-popup vn-id="summary">
<vn-invoice-in-summary invoice-in="$ctrl.invoiceIn"></vn-invoice-in-summary>
</vn-popup>

8
modules/invoiceOut/front/descriptor/index.html
View File

@ -1,6 +1,7 @@
<vn-descriptor-content
module="invoiceOut"
description="$ctrl.invoiceOut.ref">
description="$ctrl.invoiceOut.ref"
summary="$ctrl.$.summary">
<slot-dot-menu>
<vn-invoice-out-descriptor-menu
invoice-out="$ctrl.invoiceOut"
@ -49,4 +50,7 @@
</div>
</div>
</slot-body>
</vn-descriptor-content>
</vn-descriptor-content>
<vn-popup vn-id="summary">
<vn-invoice-out-summary invoice-out="$ctrl.invoiceOut"></vn-invoice-out-summary>
</vn-popup>

3
modules/item/back/model-config.json
View File

@ -29,6 +29,9 @@
"ItemLog": {
"dataSource": "vn"
},
"ItemPackingType": {
"dataSource": "vn"
},
"ItemPlacement": {
"dataSource": "vn"
},

6
modules/item/front/descriptor/index.html
View File

@ -1,6 +1,7 @@
<vn-descriptor-content
module="item"
description="$ctrl.item.name">
description="$ctrl.item.name"
summary="$ctrl.$.summary">
<slot-menu>
<vn-item
ng-click="regularize.show()"
@ -114,6 +115,9 @@
<vn-worker-descriptor-popover
vn-id="workerDescriptor">
</vn-worker-descriptor-popover>
<vn-popup vn-id="summary">
<vn-item-summary item="$ctrl.item"></vn-item-summary>
</vn-popup>
<!-- Upload photo dialog -->
<vn-upload-photo

8
modules/order/front/descriptor/index.html
View File

@ -1,6 +1,7 @@
<vn-descriptor-content
module="order"
description="$ctrl.order.client.name">
description="$ctrl.order.client.name"
summary="$ctrl.$.summary">
<slot-menu>
<vn-item
ng-click="deleteOrderConfirmation.show()"
@ -71,4 +72,7 @@
</vn-confirm>
<vn-worker-descriptor-popover
vn-id="workerDescriptor">
</vn-worker-descriptor-popover>
</vn-worker-descriptor-popover>
<vn-popup vn-id="summary">
<vn-order-summary order="$ctrl.order"></vn-order-summary>
</vn-popup>

8
modules/route/front/descriptor/index.html
View File

@ -1,6 +1,7 @@
<vn-descriptor-content
module="route"
description="$ctrl.route.name">
description="$ctrl.route.name"
summary="$ctrl.$.summary">
<slot-menu>
<vn-item
ng-click="$ctrl.showRouteReport()"
@ -61,4 +62,7 @@
vn-id="updateVolumeConfirmation"
on-accept="$ctrl.updateVolume()"
question="Are you sure you want to update the volume?">
</vn-confirm>
</vn-confirm>
<vn-popup vn-id="summary">
<vn-route-summary route="$ctrl.route"></vn-route-summary>
</vn-popup>

6
modules/supplier/front/descriptor/index.html
View File

@ -1,6 +1,7 @@
<vn-descriptor-content
module="supplier"
description="$ctrl.supplier.name">
description="$ctrl.supplier.name"
summary="$ctrl.$.summary">
<slot-body>
<div class="attributes">
<vn-label-value label="Tax number"
@ -60,3 +61,6 @@
</div>
</slot-body>
</vn-descriptor-content>
<vn-popup vn-id="summary">
<vn-supplier-summary supplier="$ctrl.supplier"></vn-supplier-summary>
</vn-popup>

8
modules/ticket/front/descriptor/index.html
View File

@ -1,6 +1,7 @@
<vn-descriptor-content
module="ticket"
description="$ctrl.ticket.client.name">
description="$ctrl.ticket.client.name"
summary="$ctrl.$.summary">
<slot-dot-menu>
<vn-ticket-descriptor-menu
vn-id="descriptorMenu"
@ -127,4 +128,7 @@
</vn-descriptor-content>
<vn-worker-descriptor-popover
vn-id="workerDescriptor">
</vn-worker-descriptor-popover>
</vn-worker-descriptor-popover>
<vn-popup vn-id="summary">
<vn-ticket-summary ticket="$ctrl.ticket"></vn-ticket-summary>
</vn-popup>

6
modules/travel/front/descriptor/index.html
View File

@ -1,6 +1,7 @@
<vn-descriptor-content
module="travel"
description="$ctrl.travel.ref">
description="$ctrl.travel.ref"
summary="$ctrl.$.summary">
<slot-dot-menu>
<vn-travel-descriptor-menu travel-id="$ctrl.travel.id"/>
</slot-dot-menu>
@ -42,3 +43,6 @@
</div>
</slot-body>
</vn-descriptor-content>
<vn-popup vn-id="summary">
<vn-travel-summary travel="$ctrl.travel"></vn-travel-summary>
</vn-popup>

6
modules/worker/front/descriptor/index.html
View File

@ -1,6 +1,7 @@
<vn-descriptor-content
module="worker"
description="$ctrl.worker.firstName +' '+ $ctrl.worker.lastName">
description="$ctrl.worker.firstName +' '+ $ctrl.worker.lastName"
summary="$ctrl.$.summary">
<slot-before>
<div class="photo" text-center>
<img vn-id="photo"
@ -57,6 +58,9 @@
</div>
</slot-body>
</vn-descriptor-content>
<vn-popup vn-id="summary">
<vn-worker-summary worker="$ctrl.worker"></vn-worker-summary>
</vn-popup>
<!-- Upload photo dialog -->
<vn-upload-photo

7
modules/zone/front/descriptor/index.html
View File

@ -1,6 +1,7 @@
<vn-descriptor-content
module="zone"
description="$ctrl.zone.name">
description="$ctrl.zone.name"
summary="$ctrl.$.summary">
<slot-menu>
<vn-item class="vn-item"
ng-click="$ctrl.onDelete()"
@ -39,6 +40,10 @@
</div>
</slot-body>
</vn-descriptor-content>
<vn-popup vn-id="summary">
<vn-zone-summary zone="$ctrl.zone"></vn-zone-summary>
</vn-popup>
<vn-confirm
vn-id="deleteZone"
on-accept="$ctrl.deleteZone()"