Merge remote-tracking branch 'origin/dev' into dev

src/app/component/list/list.component.ts

@@ -9,6 +9,8 @@ import {LocationEntity} from "../../interface/LocationEntity";
 import {WaypointsEntity} from "../../interface/WaypointsEntity";
 import {WaypointService} from "../../service/http/waypoint.service"
 import {cookieService} from "../../service/cookie.service";
+import {UserService} from "../../service/http/user.service";
+import {WaypointVisitedService} from "../../service/http/waypointVisited.service";
 
 @Component({
   selector: 'app-list',
@@ -16,6 +18,7 @@ import {cookieService} from "../../service/cookie.service";
   styleUrls: ['./list.component.css']
 })
 export class ListComponent implements OnInit, OnChanges {
+  percentage: number = 0;
   username: string = '';
   locationParams: string | undefined
   locations: LocationEntity[] | undefined;
@@ -32,17 +35,20 @@ export class ListComponent implements OnInit, OnChanges {
 
   positionNotFound: boolean = false;
 
+
   constructor(
     private route: ActivatedRoute,
     private positionService: positionService,
     private locationService: LocationService,
     private waypointService: WaypointService,
+    private waypointVisitedService: WaypointVisitedService,
+    private userService: UserService,
     private cookieService: cookieService,
   ) {
   }
 
   async ngOnInit() {
-    this.username =  this.cookieService.getUsername();
+    this.username = this.cookieService.getUsername();
     this.route.params.subscribe(params => {
       this.locationParams = params['location'];
     });
@@ -52,8 +58,9 @@ export class ListComponent implements OnInit, OnChanges {
         this.isNear = false;
         this.waypointService.getWaypoints(this.location.location).subscribe(waypoints => {
           this.waypoints = waypoints;
-          console.log("waypoints", this.waypoints)
-          this.setDistance()
+          console.log("waypoints", this.waypoints);
+          this.setDistance();
+          //this.setVisited();
         });
       }
 
@@ -63,9 +70,9 @@ export class ListComponent implements OnInit, OnChanges {
       console.log("locations", this.locations)
       this.setDistance()
     });
-
     this.getPosition();
     this.positionNotFoundFunction();
+
   }
 
 
@@ -121,4 +128,45 @@ export class ListComponent implements OnInit, OnChanges {
       }
     }
   }
+/*
+  private setVisited(): void {
+    if (this.username && this.waypoints) {
+      for (let i = 0; i < this.waypoints.length; i++) {
+        if (this.waypoints[i].id !== undefined) {
+          this.waypoints[i].visited == this.waypointVisitedService.getWaypointByUserAndWaypoint(this.username, this.waypoints[i].id);
+        }
+      }
+    }
+  }
+*/
+  /*
+    private setVisited(): void {
+      this.userService.getUser(this.username).subscribe((user: any) => {
+        if (this.waypoints && user.id) {
+          let userid: string = user.id.toString();
+          for (let i = 0; i < this.waypoints.length; i++) {
+            let waypoint: number;
+            if (this.waypoints[i].id!==undefined) {
+              waypoint = this.waypoints[i].id;
+            } else {
+              waypoint = 0;
+            }
+            this.waypointVisitedService.getWaypointByUserAndWaypoint(userid, waypoint).subscribe((waypointVisited: any) => {
+              if (waypointVisited) {
+                this.waypoints[i].visited = true;
+                this.setPercentage();
+              }
+            });
+          }
+        }
+      });
+    }
+
+  */
+
+  setPercentage()
+    :
+    void {
+    this.percentage = this.waypoints?.length ?? 0;
+  }
 }

src/app/component/login/login.component.ts

@@ -37,6 +37,10 @@ export class LoginComponent implements OnInit {
 
   createNewUser(createUser: UserEntity) {
     console.log(createUser.username+" "+createUser.password);
+    if (createUser.username == '' || createUser.password == '') {
+      this.errorCreateUser = true;
+      return;
+    }
     this.userService.getUsers().subscribe(users => {
       this.users = users;
       for (let i = 0; i < this.users.length; i++) {
@@ -55,9 +59,14 @@ export class LoginComponent implements OnInit {
 
   loginFunction(username: string, password: string) {
     this.userService.getUser(username).subscribe(user => {
-      if (user.password == password) {
-        this.cookieService.setUsername(username);
-        this.router.navigate(['/home']);
+      console.log(user);
+      if (user !== null) {
+        if (user.password == password) {
+          this.cookieService.setUsername(username);
+          this.router.navigate(['/home']);
+        }else {
+          this.errorLogin = true;
+        }
       } else {
         this.errorLogin = true;
       }
@@ -73,6 +82,8 @@ export class LoginComponent implements OnInit {
   }
 
   switch() {
+    this.errorCreateUser = false;
+    this.errorLogin = false;
     if (this.login) {
       this.login = false;
     } else {

src/app/component/management/management.component.ts

@@ -49,9 +49,15 @@ export class ManagementComponent implements OnInit {
     this.translations = this.readTranslationJsonService.getManagementTranslations();
     this.username = this.cookieService.getUsername();
     this.userService.getUser(this.username).subscribe(user => {
-      if (user.admin == false) {
-        this.route.navigate(['/home']);
+      if (user !== null) {
+        if (user.admin == false) {
+          this.route.navigate(['/home']);
+        }
+      }else {
+        this.cookieService.deleteUsername();
+        this.route.navigate(['/login']);
       }
+
     });
     this.locationService.getLocations().subscribe(locations => {
       this.locations = locations;

src/app/interface/WaypointsEntity.ts

@@ -7,4 +7,5 @@ export interface WaypointsEntity {
   img: string;
   locationName: string;
   distance?: number;
+  visited?: boolean;
 }

src/app/service/http/user.service.ts

@@ -1,6 +1,7 @@
 import {Injectable} from "@angular/core";
 import {HttpClient} from "@angular/common/http";
 import {UserEntity} from "../../interface/UserEntity";
+import {catchError, of} from "rxjs";
 
 const BASE_URL = "progetto152";
 const USER = BASE_URL + "/user";
@@ -21,16 +22,27 @@ export class UserService {
     return this.http.get<UserEntity[]>(USER);
   }
 
+
   getUser(username: string) {
-    return this.http.get<UserEntity>(USER + "/" + username);
+    return this.http.get<UserEntity>(USER + "/" + username).pipe(
+      catchError(error => {
+        if (error.status === 404) {
+          return of(null);
+        } else {
+          throw error;
+        }
+      })
+    );
   }
 
+
+
   getUserById(id: number) {
     return this.http.get<UserEntity>(GET_USER_BY_ID + "/" + id);
   }
 
   createUser(user: UserEntity) {
-    console.log("create "+user);
+    console.log("create " + user);
     return this.http.post<UserEntity>(USER, user);
 
   }

src/app/service/http/waypointVisited.service.ts

@@ -30,6 +30,10 @@ export class WaypointVisitedService {
     return this.http.get<WaypointsVisitedEntity[]>(GET_WAYPOINT_BY_USER + user);
   }
 
+  getWaypointByUserAndWaypoint(user: string, waypoint: number) {
+    return this.http.get<boolean>(GET_WAYPOINT_BY_USER + user + "/" + waypoint);
+  }
+
   createWaypoint(waypointvisited: WaypointsVisitedEntity) {
     return this.http.post<WaypointsVisitedEntity>(WAYPOINT_VISITED, waypointvisited);
   }