Aggiunta caching locale

Introdotto un sistema di caching per il profilo paziente, per ora funzionante solo in locale

package.json

@@ -57,6 +57,7 @@
     "@ionic/angular-toolkit": "^11.0.1",
     "@types/bcryptjs": "^2.4.6",
     "@types/jasmine": "~5.1.0",
+    "@types/lodash": "^4.17.4",
     "@typescript-eslint/eslint-plugin": "^6.0.0",
     "@typescript-eslint/parser": "^6.0.0",
     "eslint": "^8.57.0",

src/app/models/ModelUtilities.ts

@@ -1,6 +1,6 @@
 import { Paziente } from "./paziente/Paziente";
 import { Medico } from "./medico/Medico";
-import { Person } from "./person/person";
+import { Persona } from "./persona/persona";
 import { Infermiere } from "./infermiere/Infermiere";
 import { Terapia } from "./Terapia/Terapia";
 
@@ -45,7 +45,7 @@ export class ModelUtilities {
     return infermiere;
   }
 
-  private static personFromJSON(json: any, persona: Person) {
+  private static personFromJSON(json: any, persona: Persona) {
     persona.id = json.id;
     persona.nome = json.nome;
     persona.cognome = json.cognome;

src/app/models/infermiere/Infermiere.ts

@@ -1,6 +1,6 @@
-import { Person } from "../person/person";
+import { Persona } from "../persona/persona";
 
-export class Infermiere extends Person {
+export class Infermiere extends Persona {
   constructor() {
     super(0, "", "", "", "", "");
     this._ospedale = "";

src/app/models/medico/Medico.ts

@@ -1,9 +1,9 @@
-import {Person} from "../person/person";
+import {Persona} from "../persona/persona";
 import {TipologiaMedico} from "./tipologia-medico";
 import {Terapia} from "../Terapia/Terapia";
 import {Paziente} from "../paziente/Paziente";
 
-export class Medico extends Person {
+export class Medico extends Persona {
   constructor() {
     super(0, "", "", "", "", "");
     this._ospedale = "";

src/app/models/paziente/Paziente.ts

@@ -1,9 +1,9 @@
-import { Person } from "../person/person";
-import { Indirizzo } from "../person/Indirizzo";
+import { Persona } from "../persona/persona";
+import { Indirizzo } from "../persona/Indirizzo";
 import { Medico } from "../medico/Medico";
 import { Terapia } from "../Terapia/Terapia";
 
-export class Paziente extends Person{
+export class Paziente extends Persona{
   constructor() {
     super(0, "", "", "", "", "");
 

src/app/models/person/person.ts → src/app/models/persona/persona.ts

@@ -1,6 +1,6 @@
 import {Sesso} from "./sesso";
 
-export abstract class Person {
+export abstract class Persona {
   protected constructor(
      id: number,
      nome: string,

src/app/pages/medic/home/home.page.ts

@@ -30,7 +30,7 @@ import {TipologiaMedico} from "../../../models/medico/tipologia-medico";
 import {Observable, Subscription} from "rxjs";
 import {DataService} from "../../../services/data.service";
 import {MedicoService} from "../../../services/MedicoService/medico.service";
-import {Sesso} from "../../../models/person/sesso";
+import {Sesso} from "../../../models/persona/sesso";
 import {StorageService} from "../../../services/StorageService/storage.service";
 import {Router} from "@angular/router";
 import {Paziente} from "../../../models/paziente/Paziente";

src/app/pages/medic/notifications/notifications.page.ts

@@ -19,7 +19,7 @@ import {Observable, Subscription} from "rxjs";
 import {DataService} from "../../../services/data.service";
 import {MedicoService} from "../../../services/MedicoService/medico.service";
 import {Terapia} from "../../../models/Terapia/Terapia";
-import {Sesso} from "../../../models/person/sesso";
+import {Sesso} from "../../../models/persona/sesso";
 import {StorageService} from "../../../services/StorageService/storage.service";
 import {Router} from "@angular/router";
 import {Paziente} from "../../../models/paziente/Paziente";

src/app/pages/medic/patients/patients-prescriptions/patients-prescriptions.page.ts

@@ -10,7 +10,7 @@ import { Paziente } from 'src/app/models/paziente/Paziente';
 import { Medico } from 'src/app/models/medico/Medico';
 import { delay } from 'rxjs';
 import {PersonaService} from "../../../../services/PersonaService/persona.service";
-import {Sesso} from "../../../../models/person/sesso";
+import {Sesso} from "../../../../models/persona/sesso";
 import {StorageService} from "../../../../services/StorageService/storage.service";
 
 @Component({

src/app/pages/medic/patients/patients-prescriptions/user-details/user-details.page.ts

@@ -7,7 +7,7 @@ import { Paziente } from 'src/app/models/paziente/Paziente';
 import { ModelUtilities } from 'src/app/models/ModelUtilities';
 import { DataService } from 'src/app/services/data.service';
 import { AlertController } from '@ionic/angular';
-import { Sesso } from "../../../../../models/person/sesso";
+import { Sesso } from "../../../../../models/persona/sesso";
 import { StorageService } from "../../../../../services/StorageService/storage.service";
 
 @Component({

src/app/pages/medic/patients/patients.page.ts

@@ -16,7 +16,7 @@ import {NavController} from "@ionic/angular";
 import {PersonaService} from "../../../services/PersonaService/persona.service";
 import {Medico} from "../../../models/medico/Medico";
 import {TipologiaMedico} from "../../../models/medico/tipologia-medico";
-import {Sesso} from "../../../models/person/sesso";
+import {Sesso} from "../../../models/persona/sesso";
 import {StorageService} from "../../../services/StorageService/storage.service";
 import {Router} from "@angular/router";
 import {Paziente} from "../../../models/paziente/Paziente";

src/app/pages/nurse/drugs/drugs.page.ts

@@ -14,7 +14,7 @@ import {
 import {NavController} from "@ionic/angular";
 import {PersonaService} from "../../../services/PersonaService/persona.service";
 import {Infermiere} from "../../../models/infermiere/Infermiere";
-import {Sesso} from "../../../models/person/sesso";
+import {Sesso} from "../../../models/persona/sesso";
 import {StorageService} from "../../../services/StorageService/storage.service";
 import {Router} from "@angular/router";
 import {InfermiereService} from "../../../services/InfermiereService/infermiere.service";

src/app/pages/nurse/home/home.page.ts

@@ -25,7 +25,7 @@ import {
 import {NavController} from "@ionic/angular";
 import {Infermiere} from "../../../models/infermiere/Infermiere";
 import {PersonaService} from "../../../services/PersonaService/persona.service";
-import {Sesso} from "../../../models/person/sesso";
+import {Sesso} from "../../../models/persona/sesso";
 import {StorageService} from "../../../services/StorageService/storage.service";
 import {Router} from "@angular/router";
 import {InfermiereService} from "../../../services/InfermiereService/infermiere.service";

src/app/pages/nurse/shifts/shifts.page.ts

@@ -14,7 +14,7 @@ import {
 import {NavController} from "@ionic/angular";
 import {PersonaService} from "../../../services/PersonaService/persona.service";
 import {Infermiere} from "../../../models/infermiere/Infermiere";
-import {Sesso} from "../../../models/person/sesso";
+import {Sesso} from "../../../models/persona/sesso";
 import {StorageService} from "../../../services/StorageService/storage.service";
 import {Router} from "@angular/router";
 import {InfermiereService} from "../../../services/InfermiereService/infermiere.service";

src/app/pages/nurse/sos/sos.page.ts

@@ -14,7 +14,7 @@ import {
 import {NavController} from "@ionic/angular";
 import {PersonaService} from "../../../services/PersonaService/persona.service";
 import {Infermiere} from "../../../models/infermiere/Infermiere";
-import {Sesso} from "../../../models/person/sesso";
+import {Sesso} from "../../../models/persona/sesso";
 import {StorageService} from "../../../services/StorageService/storage.service";
 import {Router} from "@angular/router";
 import {InfermiereService} from "../../../services/InfermiereService/infermiere.service";

src/app/pages/patient/home/home.page.ts

@@ -33,7 +33,7 @@ import {Paziente} from "../../../models/paziente/Paziente";
 import {Medico} from "../../../models/medico/Medico";
 import {DataService} from "../../../services/data.service";
 import {PersonaService} from "../../../services/PersonaService/persona.service";
-import {Sesso} from "../../../models/person/sesso";
+import {Sesso} from "../../../models/persona/sesso";
 import {StorageService} from "../../../services/StorageService/storage.service";
 import {routes} from "../../../app.routes";
 import {Router} from "@angular/router";
@@ -79,7 +79,10 @@ export class HomePage implements OnInit {
     this.getAllMediciSubscription = new Subscription();
     this.getPazienteByEmailObservable = new Observable<Paziente>();
     this.getMedicoByEmailObservable = new Observable<Medico>();
-    this.paziente = new Paziente();
+    this.paziente = personaService.getPersona();
+
+    if (!this.paziente)
+      this.paziente = new Paziente();
 
     console.log(history.state.pazienteEmail)
     console.log(router.url);
@@ -97,7 +100,7 @@ export class HomePage implements OnInit {
     if (this.paziente.isEmpty())
       this.paziente.setState(false);
 
-    if (!this.paziente.isSet()) {
+    if (this.paziente != undefined && !this.paziente.isSet()) {
       this.pazienteService.offlineSetPaziente(this.paziente);
       this.citta = this.paziente.indirizzo.città;
     }
@@ -125,6 +128,8 @@ export class HomePage implements OnInit {
   }
 
   logout() {
+    if (!this.paziente.isSet())
+      this.storageService.cacheState(this.paziente);
     this.navCtrl.navigateRoot("login");
   }
 

src/app/pages/patient/logbook/logbook-reservations/logbook-reservations.page.html

@@ -14,7 +14,7 @@
     <ion-item class="item-title" *ngFor="let prenotazione of prenotazioni">
       <div class="item-content">
         <ion-img class="reservation-icon" slot="start" src="../../assets/icon/home/calendar.png"></ion-img>
-        <ion-text class="item-title-list">Prenotazione {{prenotazione.orario}}
+        <ion-text class="item-title-list">Prenotazione {{prenotazione.orario | date: 'yyyy-MM-dd'}}
           appuntamento con {{paziente.medico.nome}} {{paziente.medico.cognome}}</ion-text>
       </div>
     </ion-item>

src/app/pages/patient/logbook/logbook-reservations/logbook-reservations.page.ts

@@ -25,7 +25,7 @@ import {Paziente} from "../../../../models/paziente/Paziente";
 })
 
 export class LogbookReservationsPage implements OnInit {
-  protected paziente!: Paziente;
+  protected paziente: Paziente;
   protected prenotazioni!: Terapia[];
 
   constructor(
@@ -40,29 +40,11 @@ export class LogbookReservationsPage implements OnInit {
     console.log(this.paziente);
 
     if (this.paziente && this.paziente.terapie) {
-      this.prenotazioni = this.formatPrenotazioni(this.paziente.terapie);
+      this.prenotazioni = this.paziente.terapie;
       console.log(this.prenotazioni);
     }
   }
 
-  formatPrenotazioni(value: Terapia[]) :Terapia[]  {
-    const carattere: string = "T";
-    let prenotazioni:Terapia[] = []
-    let prenotazione: Terapia = new Terapia();
-    for (const terapia of value) {
-      if (terapia.orario !== undefined && terapia.orario !== null) {
-        let posizione: number = terapia.orario.indexOf(carattere);
-        let sottostringa: string = terapia.orario.substring(0, posizione);
-        prenotazione = terapia;
-        prenotazione.orario = sottostringa;
-        prenotazioni.push(prenotazione);
-      }
-      else
-        prenotazioni.push(terapia);
-    }
-    return prenotazioni
-  }
-
   navigateBack() {
     this.navCtrl.navigateBack("patient-logbook");
   }

src/app/pages/patient/logbook/logbook.page.ts

@@ -16,7 +16,7 @@ import {NavController} from "@ionic/angular";
 import {PersonaService} from "../../../services/PersonaService/persona.service";
 import {Medico} from "../../../models/medico/Medico";
 import {Paziente} from "../../../models/paziente/Paziente";
-import {Sesso} from "../../../models/person/sesso";
+import {Sesso} from "../../../models/persona/sesso";
 import {StorageService} from "../../../services/StorageService/storage.service";
 import {Router} from "@angular/router";
 import {TipologiaMedico} from "../../../models/medico/tipologia-medico";
@@ -48,7 +48,8 @@ export class LogbookPage implements OnInit {
   }
 
   ngOnInit() {
-    if (!this.paziente.isSet())
+    console.log(this.paziente);
+    if (this.paziente != undefined && !this.paziente.isSet())
       this.pazienteService.offlineSetPaziente(this.paziente);
   }
 

src/app/pages/patient/reservation/reservation-date/reservation-continue/reservation-continue.page.ts

@@ -36,7 +36,7 @@ import {firstValueFrom, Observable, Subscription} from "rxjs";
 import {Paziente} from "../../../../../models/paziente/Paziente";
 import {Terapia} from "../../../../../models/Terapia/Terapia";
 import {PazienteService} from "../../../../../services/PazienteService/paziente.service";
-import {TerapiaService} from "../../../../../services/terapiaService/terapia.service";
+import {TerapiaService} from "../../../../../services/TerapiaService/terapia.service";
 import {TipologiaTerapia} from "../../../../../models/Terapia/tipologia-terapia";
 import {PersonaService} from "../../../../../services/PersonaService/persona.service";
 

src/app/pages/patient/reservation/reservation.page.ts

@@ -20,7 +20,7 @@ import {NavController} from "@ionic/angular";
 import {PersonaService} from "../../../services/PersonaService/persona.service";
 import {Medico} from "../../../models/medico/Medico";
 import {Paziente} from "../../../models/paziente/Paziente";
-import {Sesso} from "../../../models/person/sesso";
+import {Sesso} from "../../../models/persona/sesso";
 import {StorageService} from "../../../services/StorageService/storage.service";
 import {Router} from "@angular/router";
 import {TipologiaMedico} from "../../../models/medico/tipologia-medico";
@@ -54,7 +54,7 @@ export class ReservationPage implements OnInit {
   }
 
   ngOnInit() {
-    if (!this.paziente.isSet())
+    if (this.paziente != undefined && !this.paziente.isSet())
       this.pazienteService.offlineSetPaziente(this.paziente);
   }
 

src/app/pages/patient/sos/sos.page.ts

@@ -16,7 +16,7 @@ import {NavController} from "@ionic/angular";
 import {PersonaService} from "../../../services/PersonaService/persona.service";
 import {Paziente} from "../../../models/paziente/Paziente";
 import {Medico} from "../../../models/medico/Medico";
-import {Sesso} from "../../../models/person/sesso";
+import {Sesso} from "../../../models/persona/sesso";
 import {StorageService} from "../../../services/StorageService/storage.service";
 import {Router} from "@angular/router";
 import {TipologiaMedico} from "../../../models/medico/tipologia-medico";
@@ -48,7 +48,7 @@ export class SOSPage implements OnInit {
   }
 
   ngOnInit() {
-    if (!this.paziente.isSet())
+    if (this.paziente != undefined && !this.paziente.isSet())
       this.pazienteService.offlineSetPaziente(this.paziente);
   }