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

feat: actualizada visualizacion de datos
gitea/salix/pipeline/head Something is wrong with the build of this commit Details

This commit is contained in:
Vicent Llopis 2023-01-30 12:13:01 +01:00
parent f7fa082294
commit 0ffbb5fe2c
4 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
modules/invoiceOut/front/global-invoicing/index.html
View File

@ -1,7 +1,8 @@
<vn-card class="vn-w-lg vn-ma-md"> <vn-card class="vn-w-lg vn-ma-md">
<h5 ng-if="$ctrl.packageInvoicing" translate text-center class="vn-pa-md">{{'Calculating packages to invoice...'}}</h5> <h5 ng-if="$ctrl.packageInvoicing" translate text-center class="vn-pa-md">{{'Calculating packages to invoice...'}}</h5>
<vn-vertical ng-if="$ctrl.clients.length" text-center class="vn-pa-md"> <vn-vertical ng-if="$ctrl.clients.length" text-center class="vn-pa-md">
<h5 translate>Invoicing</h5> <h5 translate ng-if="$ctrl.percentage != 100">Invoicing</h5>
<h5 translate ng-if="$ctrl.percentage == 100">Ended process</h5>
<div> <div>
{{'Current client id' | translate}}: {{$ctrl.currentClientId}} {{'Current client id' | translate}}: {{$ctrl.currentClientId}}
</div> </div>
@ -31,7 +32,7 @@
{{::client.id}} {{::client.id}}
</span> </span>
</vn-td> </vn-td>
<vn-td> <vn-td expand>
{{::client.address.nickname}} {{::client.address.nickname}}
</vn-td> </vn-td>
<vn-td number> <vn-td number>
@ -40,7 +41,7 @@
<vn-td expand> <vn-td expand>
{{::client.address.street}} {{::client.address.street}}
</vn-td> </vn-td>
<vn-td expand> <vn-td expand id="error">
<vn-spinner <vn-spinner
ng-if="client.status == 'waiting'" ng-if="client.status == 'waiting'"
enable="true"> enable="true">

8
modules/invoiceOut/front/global-invoicing/index.js
View File

@ -39,7 +39,7 @@ class Controller extends Section {
} }
getPercentage() { getPercentage() {
this.percentage = (this.currentClient * 100) / this.clients.length; this.percentage = ((this.currentClient - 1) * 100) / this.clients.length;
} }
restartValues() { restartValues() {
@ -49,7 +49,10 @@ class Controller extends Section {
invoiceOut(invoice, clientsAndAddresses) { invoiceOut(invoice, clientsAndAddresses) {
const [clientAndAddress] = clientsAndAddresses; const [clientAndAddress] = clientsAndAddresses;
if (!clientAndAddress) return; if (!clientAndAddress) {
this.percentage = 100;
return;
}
this.currentClientId = clientAndAddress.clientId; this.currentClientId = clientAndAddress.clientId;
this.currentClient = ++this.currentClient; this.currentClient = ++this.currentClient;
@ -113,7 +116,6 @@ class Controller extends Section {
return this.invoiceOut(invoice, clientsAndAddresses); return this.invoiceOut(invoice, clientsAndAddresses);
}) })
.then(() => this.vnApp.showSuccess(this.$t('Data saved!')))
.finally(() => this.restartValues()); .finally(() => this.restartValues());
} catch (e) { } catch (e) {
this.vnApp.showError(this.$t(e.message)); this.vnApp.showError(this.$t(e.message));

1
modules/invoiceOut/front/global-invoicing/locale/es.yml
View File

@ -17,4 +17,5 @@ of: de
Client: Cliente Client: Cliente
Current client id: Id cliente actual Current client id: Id cliente actual
Invoicing: Facturando Invoicing: Facturando
Ended process: Proceso finalizado
Invoice out: Facturar Invoice out: Facturar

6
modules/invoiceOut/front/global-invoicing/style.scss
View File

@ -6,8 +6,10 @@ vn-invoice-out-global-invoicing{
color: $color-primary; color: $color-primary;
} }
.vn-table vn-tbody > * > vn-td { #error {
overflow: visible; line-break: normal;
overflow-wrap: break-word;
white-space: normal;
} }
} }