Skip to content

Commit 451dd25

Browse files
atatarelliatatarelli
committed
Issue #601
Realizzata maschera di dettaglio ricevuta. Lista: aggiunto parametro "esito=ESEGUITO".
1 parent e30be6f commit 451dd25

File tree

11 files changed

+551
-48
lines changed

11 files changed

+551
-48
lines changed

‎wars/web-console/src/main/angular/console/src/app/app.component.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -273,8 +273,8 @@ export class AppComponent implements OnInit, AfterContentChecked, IModalDialog,
273273
}
274274
}
275275
break;
276-
case UtilService.URL_RICEVUTE+UtilService.URL_DETTAGLIO:
277-
a.push({ label: 'Stampa ricevuta', type: UtilService.STAMPA_RICEVUTA });
276+
case UtilService.URL_RICEVUTE+UtilService.URL_DETTAGLIO:
277+
a.push({ label: 'Stampa ricevuta', type: UtilService.STAMPA_RICEVUTA });
278278
break;
279279
}
280280
return a;
@@ -366,8 +366,8 @@ export class AppComponent implements OnInit, AfterContentChecked, IModalDialog,
366366
case 'Pagamenti':
367367
UtilService.USER_ACL.hasPagamenti = true;
368368
if(UtilService.GESTIONE_PAGAMENTI.ENABLED){
369-
this._sideNavSetup.menu.push({ link: UtilService.URL_PAGAMENTI, name: UtilService.TXT_PAGAMENTI, xhttp: false, icon: false, sort: 1 });
370-
}
369+
this._sideNavSetup.menu.push({ link: UtilService.URL_PAGAMENTI, name: UtilService.TXT_PAGAMENTI, xhttp: false, icon: false, sort: 1 });
370+
}
371371
if(!UtilService.USER_ACL.hasPagamentiePendenze && acl.autorizzazioni.indexOf(UtilService._CODE.LETTURA) != -1 && acl.autorizzazioni.indexOf(UtilService._CODE.SCRITTURA) != -1) {
372372
UtilService.USER_ACL.hasPagamentiePendenze = true;
373373
this._sideNavSetup.terMenu.push({ link: UtilService.URL_TRACCIATI, name: UtilService.TXT_TRACCIATI, xhttp: false, icon: false, sort: 2 });

‎wars/web-console/src/main/angular/console/src/app/classes/entry-point-list.ts

+8
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import { BooleanViewComponent } from '../elements/item-view/views/boolean-view/b
2020
import { LabelViewComponent } from '../elements/item-view/views/label-view/label-view.component';
2121
import { DatePickerViewComponent, TimePickerDialogComponent } from '../elements/item-view/views/date-picker-view/date-picker-view.component';
2222

23+
import { RicevuteViewComponent } from '../elements/detail-view/views/ricevute-view/ricevute-view.component';
2324
import { PendenzeViewComponent } from '../elements/detail-view/views/pendenze-view/pendenze-view.component';
2425
import { PagamentiViewComponent } from '../elements/detail-view/views/pagamenti-view/pagamenti-view.component';
2526
import { RegistroIntermediariViewComponent } from '../elements/detail-view/views/registro-intermediari-view/registro-intermediari-view.component';
@@ -68,6 +69,7 @@ import { ConnettoreMaggioliComponent } from '../elements/detail-view/views/dialo
6869
export class EntryPointList {
6970

7071
public static entryList: Array<any> = [
72+
RicevuteViewComponent,
7173
PendenzeViewComponent,
7274
PagamentiViewComponent,
7375
RegistroIntermediariViewComponent,
@@ -135,6 +137,9 @@ export class EntryPointList {
135137

136138
switch (name) {
137139
//Component view ref
140+
case UtilService.RICEVUTE:
141+
_type = RicevuteViewComponent;
142+
break;
138143
case UtilService.PENDENZE:
139144
_type = PendenzeViewComponent;
140145
break;
@@ -452,6 +457,9 @@ export class EntryPointList {
452457
case 'SchedaPendenzaViewComponent':
453458
_name = UtilService.SCHEDA_PENDENZA;
454459
break;
460+
case 'RicevutaViewComponent':
461+
_name = UtilService.RICEVUTE;
462+
break;
455463
case 'PendenzaViewComponent':
456464
_name = UtilService.PENDENZA;
457465
break;

‎wars/web-console/src/main/angular/console/src/app/elements/detail-view/views/ricevute-view/ricevute-view.component.html

+58
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
<mat-tab-group class="ricevute-tab">
2+
<mat-tab label="DATI RICEVUTA">
3+
<div class="container my-4 card-container">
4+
<mat-card class="shadow no-border-radius mb-3" *ngIf="info">
5+
<div class="row px-3">
6+
<div class="col-sm-8 px-0 pt-3 pt-sm-0">
7+
<p class="d-block matcard-title pb-3 color-gray regular-24">Riepilogo</p>
8+
</div>
9+
<div class="col-sm-4 px-0 pt-3 pt-sm-0 text-right">
10+
<p class="text-truncate medium-24 lh-90 mb-1" *ngIf="info.importo">{{info.importo}}</p>
11+
<p class="text-truncate color-gray medium-18 mb-0">{{info.stato}}</p>
12+
<p class="text-truncate color-gray regular-14 mb-0" *ngIf="info.socketNotification">{{info.avanzamento || ''}}</p>
13+
</div>
14+
</div>
15+
<link-riepilogo-view [info]="info"></link-riepilogo-view>
16+
</mat-card>
17+
<mat-card class="shadow no-border-radius mb-3" *ngIf="infoVisualizzazione.visible">
18+
<p class="d-block matcard-title pb-3 color-gray regular-24">{{ infoVisualizzazione?.titolo }}</p>
19+
<p class="d-block matcard-title py-0 regular-16 normal-color" *ngIf="infoVisualizzazione.campi.length == 0">Nessun valore configurato</p>
20+
<div class="d-block" *ngIf="infoVisualizzazione.campi.length != 0">
21+
<link-key-value-view *ngFor="let item of infoVisualizzazione.campi" [info]="item" class="d-block link-key-value-fill-mat-card"></link-key-value-view>
22+
</div>
23+
</mat-card>
24+
<mat-card class="shadow no-border-radius mb-3" *ngIf="importi.length!=0">
25+
<p class="d-block matcard-title pb-3 color-gray regular-24">Dettaglio importi</p>
26+
<link-item-view *ngFor="let item of importi" [component-data]="item" [use-item-view-directive]="true"
27+
[show-over-icons]="false" [over-icons]="_importiOverIcons" class="link-item-view-fill">
28+
</link-item-view>
29+
<div class="row sub-totale medium-16" *ngIf="importi.length != 0">
30+
<div class="col-6 px-0 m-0">
31+
<p class="text-truncate mb-1">Totale</p>
32+
</div>
33+
<div class="col-6 px-0 m-0 text-right">
34+
<p class="text-truncate mb-1">{{us.currencyFormat(_paymentsSum)}}</p>
35+
</div>
36+
</div>
37+
</mat-card>
38+
<mat-card class="shadow no-border-radius mb-3">
39+
<p class="d-block matcard-title pb-3 color-gray regular-24">Dati PSP</p>
40+
<p class="d-block matcard-title py-0 regular-16 normal-color" *ngIf="datiPsp.length == 0">Nessun valore configurato</p>
41+
<div class="d-block" *ngIf="datiPsp.length != 0">
42+
<link-key-value-view *ngFor="let item of datiPsp" [info]="item" class="d-block link-key-value-fill-mat-card"></link-key-value-view>
43+
</div>
44+
</mat-card>
45+
</div>
46+
</mat-tab>
47+
<mat-tab label="EVENTI">
48+
<link-scroller-container (load-more)="_loadMoreEventi()" [is-loading]="_isLoadingMore">
49+
<div class="container my-4 py-3 card-container">
50+
<mat-card class="shadow no-border-radius pb-0" *ngIf="eventi.length!=0">
51+
<p class="d-block matcard-title pb-3 color-gray regular-24">Eventi</p>
52+
<link-item-view *ngFor="let item of eventi" [component-data]="item" [use-item-view-directive]="true"
53+
[show-over-icons]="false" class="link-item-view-fill"></link-item-view>
54+
</mat-card>
55+
</div>
56+
</link-scroller-container>
57+
</mat-tab>
58+
</mat-tab-group>

‎wars/web-console/src/main/angular/console/src/app/elements/detail-view/views/ricevute-view/ricevute-view.component.scss

+68
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
@import '~@angular/material/theming';
2+
@import '../../../../../styles/variables.scss';
3+
4+
.sub-totale {
5+
margin: 16px 0 -16px 0 !important;
6+
//padding-top: 16px !important;
7+
}
8+
9+
link-riepilogo-view {
10+
display: block;
11+
margin: 0 !important;
12+
}
13+
14+
link-scroller-container {
15+
display: block;
16+
overflow-y: auto;
17+
overflow-x: hidden;
18+
position: absolute;
19+
top: 0;
20+
left: 0;
21+
right: 0;
22+
bottom: 0;
23+
}
24+
25+
//.tentativi link-item-view:last-child .item-directive {
26+
// border-bottom: 0 !important;
27+
//}
28+
29+
// Overridden styles
30+
// mat-tab
31+
mat-tab-group.ricevute-tab .mat-tab-body-wrapper {
32+
position: absolute !important;
33+
top: 49px;
34+
right: 0;
35+
bottom: 0;
36+
left: 0;
37+
}
38+
39+
mat-tab-group.ricevute-tab mat-tab-header {
40+
position: fixed !important;
41+
background-color: mat-color($link-primary);
42+
box-shadow: 0 2px 2px 0 $link-shadow !important;
43+
width: 100%;
44+
z-index: 2;
45+
}
46+
47+
mat-tab-group.ricevute-tab mat-tab-header .mat-tab-label {
48+
color: white;
49+
font-weight: normal;
50+
font-variant: small-caps;
51+
}
52+
53+
mat-tab-group.ricevute-tab mat-ink-bar {
54+
background-color: mat-color($link-accent) !important;
55+
}
56+
57+
mat-tab-group.ricevute-tab mat-tab-body .mat-tab-body-content {
58+
padding: 1rem;
59+
}
60+
61+
mat-tab-group.ricevute-tab .mat-tab-header-pagination-chevron {
62+
border-color: $light-primary-text;
63+
}
64+
65+
mat-tab-group.ricevute-tab mat-tab-body:last-child,
66+
mat-tab-group.ricevute-tab mat-tab-body:last-child .mat-tab-body-content {
67+
overflow: hidden !important;
68+
}

0 commit comments

Comments
 (0)