Skip to content

Commit

Permalink
Pendenze - Dettaglio: Miglioramento visualizzazione dati da 3 a 2 col…
Browse files Browse the repository at this point in the history
…onne.

- Fix visualizzazione "unitaOperativa"
- Eliminata visualizzazione "tassonomiaAvviso" deprecato
  • Loading branch information
atatarelli committed Jan 31, 2022
1 parent 92dfb3c commit 148e0f7
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 18 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,16 @@
<mat-tab label="DATI PENDENZA">
<div class="container my-4 card-container">
<mat-card class="shadow no-border-radius mb-3" *ngIf="info">
<p class="d-block matcard-title pb-3 color-gray regular-24">Riepilogo</p>
<div class="row px-3">
<div class="col-sm-8 px-0 pt-3 pt-sm-0">
<p class="d-block matcard-title pb-3 color-gray regular-24">Riepilogo</p>
</div>
<div class="col-sm-4 px-0 pt-3 pt-sm-0 text-right">
<p class="text-truncate medium-24 lh-90 mb-1" *ngIf="info.importo">{{info.importo}}</p>
<p class="text-truncate color-gray medium-18 mb-0">{{info.stato}}</p>
<p class="text-truncate color-gray regular-14 mb-0" *ngIf="info.socketNotification">{{info.avanzamento || ''}}</p>
</div>
</div>
<link-riepilogo-view [info]="info"></link-riepilogo-view>
</mat-card>
<mat-card class="shadow no-border-radius mb-3" *ngIf="infoVisualizzazione.visible">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,8 @@ export class PendenzeViewComponent implements IModalDialog, IExport, OnInit {
if(_json.dominio.ragioneSociale && _json.dominio.idDominio) {
this.info.extraInfo.push({label: Voce.ENTE_CREDITORE + ': ', value: Dato.concatStrings([_json.dominio.ragioneSociale, _json.dominio.idDominio], ', ')});
}
if(_json.unitaOperativa && _json.unitaOperativa.ragionesociale && _json.unitaOperativa.idUnita) {
const _uo: string = Dato.concatStrings([_json.unitaOperativa.ragionesociale, _json.unitaOperativa.idUnita], ', ');
if(_json.unitaOperativa && _json.unitaOperativa.ragioneSociale && _json.unitaOperativa.idUnita) {
const _uo: string = Dato.concatStrings([_json.unitaOperativa.idUnita, _json.unitaOperativa.ragioneSociale], ' - ');
this.info.extraInfo.push({label: Voce.UNITA_OPERATIVA + ': ', value: _uo});
}
if(_json.direzione) {
Expand All @@ -102,9 +102,10 @@ export class PendenzeViewComponent implements IModalDialog, IExport, OnInit {
if(_json.tipoPendenza && _json.tipoPendenza.descrizione) {
this.info.extraInfo.push({label: Voce.TIPO_PENDENZA + ': ', value: _json.tipoPendenza.descrizione});
}
if(_json.tassonomiaAvviso) {
this.info.extraInfo.push({ label: Voce.TASSONOMIA_AVVISO+': ', value: _json.tassonomiaAvviso });
}
// DEPRECATED
// if(_json.tassonomiaAvviso) {
// this.info.extraInfo.push({ label: Voce.TASSONOMIA_AVVISO+': ', value: _json.tassonomiaAvviso });
// }
if(_json.tassonomia) {
this.info.extraInfo.push({ label: Voce.TASSONOMIA_ENTE+': ', value: _json.tassonomia });
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,23 +1,18 @@
<div class="container p-0 regular-16 normal-color" *ngIf="info">
<div class="row px-3">
<div class="col-12 col-sm-8 px-0 px-0">
<div class="col-12 col-sm-12 px-0 px-0">
<div class="row lh-130 mb-2 break-all" *ngIf="info.titolo">
<div class="col-5 color-gray">{{info.titolo?.label}}:</div>
<div class="col-7"><p class="m-0 word-break-all">{{info.titolo?.value}}</p></div>
<div class="col-lg-3 col-sm-4 color-gray">{{info.titolo?.label}}:</div>
<div class="col-lg-9 col-sm-8"><p class="m-0 word-break-all">{{info.titolo?.value}}</p></div>
</div>
<div class="row lh-130 mb-2 break-all" *ngIf="info.sottotitolo">
<div class="col-5 color-gray">{{info.sottotitolo?.label}}:</div>
<div class="col-7"><p class="m-0 word-break-all">{{info.sottotitolo?.value}}</p></div>
<div class="col-lg-3 col-sm-4 color-gray">{{info.sottotitolo?.label}}:</div>
<div class="col-lg-9 col-sm-8"><p class="m-0 word-break-all">{{info.sottotitolo?.value}}</p></div>
</div>
<div class="row lh-130 mb-2 break-all" *ngFor="let extra of info.extraInfo">
<div class="col-5 color-gray">{{extra.label}}</div>
<div class="col-7"><p class="m-0 word-break-all">{{extra.value}}</p></div>
<div class="col-lg-3 col-sm-4 color-gray">{{extra.label}}</div>
<div class="col-lg-9 col-sm-8"><p class="m-0 word-break-all">{{extra.value}}</p></div>
</div>
</div>
<div class="col-12 col-sm-4 px-0 pt-3 pt-sm-0 text-right">
<p class="text-truncate medium-24 lh-90 mb-1" *ngIf="info.importo">{{info.importo}}</p>
<p class="text-truncate color-gray medium-18">{{info.stato}}</p>
<p class="text-truncate color-gray regular-14" *ngIf="info.socketNotification">{{info.avanzamento || ''}}</p>
</div>
</div>
</div>

0 comments on commit 148e0f7

Please sign in to comment.