Compare commits

..

3 Commits

4 changed files with 293 additions and 328 deletions

View File

@ -29,7 +29,7 @@ export interface StrutturePubblicheControllerFindManyStrutture$Params {
/**
* Regione
*/
regione: string;
regione?: string;
/**
* Sigla Provincia

View File

@ -1,61 +1,41 @@
@let vm = (model$ | async)!;
<div
class="bg-surface-0 dark:bg-surface-950 p-6 md:p-12 lg:p-15 flex flex-col gap-8"
>
<div
class="flex flex-col md:flex-row justify-between items-center md:items-end gap-4 md:gap-6"
>
<div class="bg-surface-0 dark:bg-surface-950 p-6 md:p-12 lg:p-15 flex flex-col gap-8">
<div class="flex flex-col md:flex-row justify-between items-center md:items-end gap-4 md:gap-6">
<div>
<img
src="assets/images/MUSA/logo.png"
<img src="assets/images/MUSA/logo.png"
alt="logo-consorzio-musa"
class="block mx-auto"
style="height: 50px"
/>
style="height: 50px" />
</div>
<div class="flex-1 flex flex-col text-center md:text-left">
<h1
class="text-surface-900 dark:text-surface-0 text-2xl font-semibold leading-tight"
>
<h1 class="text-surface-900 dark:text-surface-0 text-2xl font-semibold leading-tight">
Consorzio Mu.Sa.
</h1>
<h2
class="text-surface-500 dark:text-surface-200 text-xl font-normal leading-tight"
>
<h2 class="text-surface-500 dark:text-surface-200 text-xl font-normal leading-tight">
Cerca strutture convenzionate
</h2>
</div>
</div>
<p-divider class="w-full my-0!"></p-divider>
<form [formGroup]="cercaStruttureForm" (ngSubmit)="getStrutture()">
<form [formGroup]="cercaStruttureForm"
(ngSubmit)="getStrutture()">
<div class="flex flex-wrap gap-8 md:gap-6 items-start">
<div
class="flex-3 bg-surface-0 dark:bg-surface-950 flex flex-col justify-start items-start gap-8 md:gap-12 w-full"
>
class="flex-3 bg-surface-0 dark:bg-surface-950 flex flex-col justify-start items-start gap-8 md:gap-12 w-full">
<div class="self-stretch flex flex-col justify-start items-start gap-6">
<div class="self-stretch flex flex-col justify-start items-start gap-6">
<div
class="self-stretch flex flex-col justify-start items-start gap-6"
>
<div
class="self-stretch justify-start text-surface-900 dark:text-surface-0 text-lg md:text-xl font-semibold leading-tight"
>
class="self-stretch justify-start text-surface-900 dark:text-surface-0 text-lg md:text-xl font-semibold leading-tight">
Strutture Convenzionate
</div>
<div
class="self-stretch flex flex-col justify-start items-start gap-4"
>
<div
class="self-stretch flex flex-col justify-start items-start gap-2"
>
<div
id="tipoStruttura"
class="self-stretch justify-start text-surface-900 dark:text-surface-0 text-base font-normal leading-tight"
>
<div class="self-stretch flex flex-col justify-start items-start gap-4">
<div class="self-stretch flex flex-col justify-start items-start gap-2">
<div id="tipoStruttura"
class="self-stretch justify-start text-surface-900 dark:text-surface-0 text-base font-normal leading-tight">
Tipologia struttura
</div>
<p-select
[options]="vm.tipologieStrutture"
<p-select [options]="vm.tipologieStrutture"
class="flex-auto lg:flex-1 lg:mt-0 w-full mr-0 lg:mr-1 text-surface-900 dark:text-surface-0"
name="tiplogiaStruttura"
appendTo="body"
@ -68,23 +48,15 @@
emptyFilterMessage="Nessuna tipologia struttura trovata"
emptyMessage="Nessuna tipologia struttura trovata"
[loading]="vm.tipologieStruttureAreLoading"
[filter]="true"
></p-select>
[filter]="true"></p-select>
</div>
</div>
<div
class="self-stretch flex flex-col md:flex-row justify-start items-start gap-4"
>
<div
class="flex-1 flex flex-col justify-start items-start gap-2 w-full"
>
<div
id="stato"
class="self-stretch justify-start text-surface-900 dark:text-surface-0 text-base font-normal leading-tight"
>
Stato<small class="text-red-600"
>*
<div class="self-stretch flex flex-col md:flex-row justify-start items-start gap-4">
<div class="flex-1 flex flex-col justify-start items-start gap-2 w-full hidden">
<div id="stato"
class="self-stretch justify-start text-surface-900 dark:text-surface-0 text-base font-normal leading-tight">
Stato<small class="text-red-600">*
@if (
cercaStruttureForm.controls.stato.errors?.['required'] &&
vm.cercaStruttureFormSubmitted
@ -93,8 +65,7 @@
}
</small>
</div>
<p-select
[options]="vm.stati"
<p-select [options]="vm.stati"
class="flex-auto lg:flex-1 lg:mt-0 w-full mr-0 lg:mr-1 text-surface-900 dark:text-surface-0"
[ngClass]="{
'ng-invalid ng-dirty':
@ -111,38 +82,33 @@
emptyFilterMessage="Nessuno Stato trovato"
emptyMessage="Nessuno Stato trovato"
[loading]="vm.statiAreLoading"
[filter]="true"
>
<ng-template #selectedItem let-selectedOption>
<div class="flex items-center gap-2" *ngIf="selectedOption">
<img
src="./assets/images/flags/{{
[filter]="true">
<ng-template #selectedItem
let-selectedOption>
<div class="flex items-center gap-2"
*ngIf="selectedOption">
<img src="./assets/images/flags/{{
selectedOption.codiceStato | lowercase
}}.png"
style="width: 18px; vertical-align: middle"
onerror="this.style.display='none'"
/>
onerror="this.style.display='none'" />
<div>{{ selectedOption.stato }}</div>
</div>
</ng-template>
<ng-template let-stato #item>
<ng-template let-stato
#item>
<div class="flex items-center gap-2">
<img
src="./assets/images/flags/{{
<img src="./assets/images/flags/{{
stato.codiceStato | lowercase
}}.png"
style="width: 18px; vertical-align: middle"
onerror="this.style.display='none'"
/>
onerror="this.style.display='none'" />
<div>{{ stato.stato }}</div>
</div>
</ng-template>
<ng-template #dropdownicon>
<i class="pi pi-map"></i>
</ng-template>
<ng-template #header>
<div class="font-medium p-3">Stati</div>
</ng-template>
</p-select>
<!-- <p-autoComplete #acSt
formControlName="luogo"
@ -234,16 +200,14 @@
</ng-template>
</p-autoComplete> -->
</div>
<div
*ngIf="cercaStruttureForm.controls.stato.value"
class="flex-1 flex flex-col justify-start items-start gap-2 w-full"
>
<div
id="regione"
class="self-stretch justify-start text-surface-900 dark:text-surface-0 text-base font-normal leading-tight"
>
Regione<small class="text-red-600"
>*
<div *ngIf="
cercaStruttureForm.controls.stato.value &&
cercaStruttureForm.controls.stato.value.codiceStato === 'ITA'
"
class="flex-1 flex flex-col justify-start items-start gap-2 w-full">
<div id="regione"
class="self-stretch justify-start text-surface-900 dark:text-surface-0 text-base font-normal leading-tight">
Regione<small class="text-red-600">*
@if (
cercaStruttureForm.controls.regione.errors?.[
'required'
@ -253,8 +217,7 @@
}
</small>
</div>
<p-select
[options]="vm.regioni"
<p-select [options]="vm.regioni"
class="flex-auto lg:flex-1 lg:mt-0 w-full mr-0 lg:mr-1 text-surface-900 dark:text-surface-0"
[ngClass]="{
'ng-dirty ng-invalid':
@ -272,21 +235,15 @@
emptyFilterMessage="Nessuna Regione trovata"
emptyMessage="Nessuna Regione trovata"
[loading]="vm.regioniAreLoading"
[filter]="true"
/>
[filter]="true" />
</div>
<div
*ngIf="cercaStruttureForm.controls.regione.value"
class="flex-1 flex flex-col justify-start items-start gap-2 w-full"
>
<div
id="provincia"
class="self-stretch justify-start text-surface-900 dark:text-surface-0 text-base font-normal leading-tight"
>
<div *ngIf="cercaStruttureForm.controls.regione.value"
class="flex-1 flex flex-col justify-start items-start gap-2 w-full">
<div id="provincia"
class="self-stretch justify-start text-surface-900 dark:text-surface-0 text-base font-normal leading-tight">
Provincia
</div>
<p-select
[options]="vm.province"
<p-select [options]="vm.province"
class="flex-auto lg:flex-1 lg:mt-0 w-full mr-0 lg:mr-1 text-surface-900 dark:text-surface-0"
name="provincia"
appendTo="body"
@ -298,22 +255,16 @@
emptyFilterMessage="Nessuna Provincia trovata"
emptyMessage="Nessuna Provincia trovata"
[loading]="vm.provinceAreLoading"
[filter]="true"
>
[filter]="true">
</p-select>
</div>
<div
*ngIf="cercaStruttureForm.controls.provincia.value"
class="flex-1 flex flex-col justify-start items-start gap-2 w-full"
>
<div
id="citta"
class="self-stretch justify-start text-surface-900 dark:text-surface-0 text-base font-normal leading-tight"
>
<div *ngIf="cercaStruttureForm.controls.provincia.value"
class="flex-1 flex flex-col justify-start items-start gap-2 w-full">
<div id="citta"
class="self-stretch justify-start text-surface-900 dark:text-surface-0 text-base font-normal leading-tight">
Città
</div>
<p-select
[options]="vm.citta"
<p-select [options]="vm.citta"
class="flex-auto lg:flex-1 lg:mt-0 w-full mr-0 lg:mr-1 text-surface-900 dark:text-surface-0"
name="citta"
appendTo="body"
@ -325,33 +276,24 @@
emptyFilterMessage="Nessuna Città trovata"
emptyMessage="Nessuna Città trovata"
[loading]="vm.cittaAreLoading"
[filter]="true"
>
[filter]="true">
</p-select>
</div>
</div>
</div>
<div
class="self-stretch flex flex-col justify-start items-start gap-6"
>
<div
class="flex-1 flex flex-col justify-start items-start gap-2 w-full"
>
<div
id="indirizzo"
class="self-stretch justify-start text-surface-900 dark:text-surface-0 text-base font-normal leading-tight"
>
<div class="self-stretch flex flex-col justify-start items-start gap-6">
<div class="flex-1 flex flex-col justify-start items-start gap-2 w-full">
<div id="indirizzo"
class="self-stretch justify-start text-surface-900 dark:text-surface-0 text-base font-normal leading-tight">
Indirizzo
</div>
<input
type="text"
<input type="text"
class="flex-auto lg:flex-1 lg:mt-0 w-full mr-0 lg:mr-1 text-surface-900 dark:text-surface-0"
formControlName="indirizzo"
pInputText
aria-labelledby="indirizzo"
placeholder="Inserisci l'indirizzo"
/>
placeholder="Inserisci l'indirizzo" />
</div>
</div>
<!-- <div class="self-stretch flex flex-col md:flex-row justify-end items-center gap-4">
@ -452,20 +394,15 @@
</div>
</div> -->
<div
class="self-stretch flex flex-col md:flex-row justify-end items-center gap-4"
>
<button
pButton
<div class="self-stretch flex flex-col md:flex-row justify-end items-center gap-4">
<button pButton
severity="secondary"
class="w-full md:w-auto"
(click)="cercaStruttureForm.reset()"
[outlined]="true"
>
[outlined]="true">
<span pButtonLabel>Annulla filtri</span>
</button>
<button
pButton
<button pButton
type="submit"
[disabled]="vm.isSearching"
[loading]="vm.isSearching"
@ -474,29 +411,27 @@
vm.isSearching ? 'Ricerca in corso...' : 'Cerca strutture'
"
severity="primary"
class="w-full md:w-auto"
></button>
class="w-full md:w-auto"></button>
</div>
</div>
</div>
<div
class="flex-auto lg:flex-2 bg-surface-50 dark:bg-surface-900 rounded-2xl border-2 border-dashed border-surface-200 dark:border-surface-700 h-[343px] w-full lg:1/2"
>
<google-map #gmap height="100%" width="100%" [options]="options">
<map-marker
#marker="mapMarker"
class="flex-auto lg:flex-2 bg-surface-50 dark:bg-surface-900 rounded-2xl border-2 border-dashed border-surface-200 dark:border-surface-700 h-[343px] w-full lg:1/2">
<google-map #gmap
height="100%"
width="100%"
[options]="options">
<map-marker #marker="mapMarker"
*ngFor="let markerOption of markerOptions; let i = index"
[options]="markerOption"
(mapClick)="openInfoWindow(marker, i)"
></map-marker>
(mapClick)="openInfoWindow(marker, i)"></map-marker>
<map-info-window></map-info-window>
</google-map>
</div>
</div>
</form>
<p-table
#struttureTable
<p-table #struttureTable
*ngIf="vm.strutture !== undefined"
[totalRecords]="vm.strutture.length"
dataKey="id"
@ -515,77 +450,68 @@
[globalFilterFields]="[
'struttura.nome',
'struttura.struttureTipiStrutture',
]"
>
]">
<ng-template #caption>
<div class="flex">
<p-iconfield iconPosition="left" class="ml-auto">
<p-iconfield iconPosition="left"
class="ml-auto">
<p-inputicon>
<i class="pi pi-search"></i>
</p-inputicon>
<input
pInputText
<input pInputText
type="text"
aria-label="Filtra strutture"
(input)="applyFilterGlobal($event, 'contains')"
placeholder="Filtra strutture"
/>
placeholder="Filtra strutture" />
</p-iconfield>
</div>
</ng-template>
<ng-template pTemplate="header" let-columns>
<ng-template pTemplate="header"
let-columns>
<tr>
<th
*ngFor="let col of cols"
<th *ngFor="let col of cols"
pResizableColumn
[pSortableColumn]="col.sortField ?? ''"
class="p-table-scrollable-header"
>
class="p-table-scrollable-header">
<div style="display: flex; align-items: center; text-wrap: nowrap">
<div>
{{ col.header }}
<p-sortIcon
*ngIf="col.sortField"
[field]="col.sortField"
></p-sortIcon>
<p-sortIcon *ngIf="col.sortField"
[field]="col.sortField"></p-sortIcon>
</div>
</div>
</th>
</tr>
</ng-template>
<ng-template pTemplate="body" let-row let-rowIndex="rowIndex">
<ng-template pTemplate="body"
let-row
let-rowIndex="rowIndex">
<tr>
<ng-container *ngFor="let col of cols" [ngSwitch]="col.field">
<ng-container *ngFor="let col of cols"
[ngSwitch]="col.field">
<td *ngSwitchCase="'struttura.struttureTipiStrutture'">
<div>
<ng-container
*ngFor="
<ng-container *ngFor="
let item of row.struttura.struttureTipiStrutture.split(',')
"
>
<span class="font-light">{{ item.trim() }}</span
><br />
">
<span class="font-light">{{ item.trim() }}</span><br />
</ng-container>
</div>
</td>
<td *ngSwitchCase="'struttura.nome'">
<div>
<p-rating
*ngIf="row.struttura.stelline.length"
<p-rating *ngIf="row.struttura.stelline.length"
[(ngModel)]="row.struttura.stelline.length"
[readonly]="true"
/>
[readonly]="true" />
<p>
<b>{{ row.struttura.nome }}</b>
</p>
</div>
<div *ngIf="row.struttura.sitoWeb" class="mt-4 ont-light">
<a
class="cursor-pointer hover:underline text-primary-700"
(click)="externalLink(row.struttura.sitoWeb)"
>Sito Web</a
>
<div *ngIf="row.struttura.sitoWeb"
class="mt-4 ont-light">
<a class="cursor-pointer hover:underline text-primary-700"
(click)="externalLink(row.struttura.sitoWeb)">Sito Web</a>
</div>
</td>
<td *ngSwitchCase="'indirizzo'">
@ -609,40 +535,30 @@
: ''
}}
</p>
<div class="text-sm" *ngIf="row.struttura.cupPubblico">
<div class="text-sm"
*ngIf="row.struttura.cupPubblico">
CUP Pubblico:
<a
class="cursor-pointer hover:underline text-primary-700"
href="tel:{{ row.struttura.cupPubblico }}"
>{{ row.struttura.cupPubblico }}</a
>
<a class="cursor-pointer hover:underline text-primary-700"
href="tel:{{ row.struttura.cupPubblico }}">{{ row.struttura.cupPubblico }}</a>
</div>
<div *ngIf="row.struttura.cupPrivato" class="text-sm">
<div *ngIf="row.struttura.cupPrivato"
class="text-sm">
CUP Privato:
<a
class="cursor-pointer hover:underline text-primary-700"
href="tel:{{ row.struttura.cupPrivato }}"
>{{ row.struttura.cupPrivato }}</a
>
<a class="cursor-pointer hover:underline text-primary-700"
href="tel:{{ row.struttura.cupPrivato }}">{{ row.struttura.cupPrivato }}</a>
</div>
<ng-container
*ngIf="!row.struttura.cupPubblico && !row.struttura.cupPrivato"
>
<div *ngIf="row.struttura.telefono1" class="text-sm">
<ng-container *ngIf="!row.struttura.cupPubblico && !row.struttura.cupPrivato">
<div *ngIf="row.struttura.telefono1"
class="text-sm">
tel:
<a
class="cursor-pointer hover:underline text-primary-700"
href="tel:{{ row.struttura.telefono1 }}"
>{{ row.struttura.telefono1 }}</a
>
<a class="cursor-pointer hover:underline text-primary-700"
href="tel:{{ row.struttura.telefono1 }}">{{ row.struttura.telefono1 }}</a>
</div>
<div *ngIf="row.struttura.telefono2" class="text-sm">
<div *ngIf="row.struttura.telefono2"
class="text-sm">
tel:
<a
class="cursor-pointer hover:underline text-primary-700"
href="tel:{{ row.struttura.telefono2 }}"
>{{ row.struttura.telefono2 }}</a
>
<a class="cursor-pointer hover:underline text-primary-700"
href="tel:{{ row.struttura.telefono2 }}">{{ row.struttura.telefono2 }}</a>
</div>
</ng-container>
</span>
@ -650,14 +566,12 @@
<td *ngSwitchCase="'posizione'">
<div class="flex align-items-center">
<p-button
icon="pi pi-map-marker"
<p-button icon="pi pi-map-marker"
label="Apri in Google Maps"
[rounded]="true"
styleClass="hover:underline text-primary-700"
(onClick)="calculateMapsLink(row)"
[text]="true"
/>
[text]="true" />
</div>
</td>
</ng-container>

View File

@ -224,6 +224,10 @@ export class StrutturePubblicheComponent {
const fetchStati$ = this.strutturePubblicheService.getStati().pipe(
tap(() => this.state.set({ statiAreLoading: true })),
map((stati) => ({ stati })),
tap((stati) => {
if (stati)
this.cercaStruttureForm.get('stato')?.setValue(stati.stati[0]);
}),
catchError(() => {
this.messageService.add({
severity: 'error',
@ -241,6 +245,34 @@ export class StrutturePubblicheComponent {
const fetchRegioni$ =
this.cercaStruttureForm.controls.stato.valueChanges.pipe(
tap(() => this.state.set({ regioniAreLoading: true })),
tap((stato) => {
const isITA = stato?.codiceStato === 'ITA';
if (!isITA) {
// Reset completo
this.resetLocation('stato');
// Disable cascata
this.cercaStruttureForm.get('regione')?.disable();
this.cercaStruttureForm.get('provincia')?.disable();
this.cercaStruttureForm.get('citta')?.disable();
// Rimuovo il required da regione (non serve più)
this.cercaStruttureForm.get('regione')?.clearValidators();
this.cercaStruttureForm.get('regione')?.updateValueAndValidity();
return;
}
// Se ITA → abilita tutto e rimetti validatori
this.cercaStruttureForm.get('regione')?.enable();
this.cercaStruttureForm.get('provincia')?.enable();
this.cercaStruttureForm.get('citta')?.enable();
this.cercaStruttureForm
.get('regione')
?.setValidators([Validators.required]);
this.cercaStruttureForm.get('regione')?.updateValueAndValidity();
}),
filter((stato) => !!stato),
switchMap((stato) =>
this.strutturePubblicheService.getRegioni(stato.codiceStato).pipe(
@ -255,6 +287,7 @@ export class StrutturePubblicheComponent {
const fetchProvince$ =
this.cercaStruttureForm.controls.regione.valueChanges.pipe(
tap(() => this.state.set({ provinceAreLoading: true })),
tap(() => this.resetLocation('regione')),
filter((regione) => !!regione),
switchMap((regione) =>
this.strutturePubblicheService
@ -271,6 +304,7 @@ export class StrutturePubblicheComponent {
const fetchCitta$ =
this.cercaStruttureForm.controls.provincia.valueChanges.pipe(
tap(() => this.state.set({ cittaAreLoading: true })),
tap(() => this.resetLocation('provincia')),
filter((provincia) => !!provincia),
switchMap((provincia) =>
this.strutturePubblicheService
@ -327,6 +361,23 @@ export class StrutturePubblicheComponent {
this.state.connect(fetchCities$);
}
private resetLocation(level: 'stato' | 'regione' | 'provincia') {
if (level === 'stato') {
this.cercaStruttureForm.get('regione')?.reset();
this.cercaStruttureForm.get('provincia')?.reset();
this.cercaStruttureForm.get('citta')?.reset();
}
if (level === 'regione') {
this.cercaStruttureForm.get('provincia')?.reset();
this.cercaStruttureForm.get('citta')?.reset();
}
if (level === 'provincia') {
this.cercaStruttureForm.get('citta')?.reset();
}
}
getStrutture() {
this.state.set({
cercaStruttureFormSubmitted: true,
@ -342,7 +393,7 @@ export class StrutturePubblicheComponent {
indirizzo: _form.indirizzo,
tipoStruttura: _form.tipologiaStruttura,
codiceStato: _form.stato!.codiceStato,
regione: _form.regione!.regione,
regione: _form.regione?.regione,
siglaProvincia: _form.provincia?.siglaProvincia,
comune: _form.citta?.comune,
};