Changeset 8d391a1 for trip-planner-front/src

Timestamp:

11/26/21 20:07:18 (3 years ago)

Author:

Ema <ema_spirova@…>

Branches:

master

Children:

1ad8e64

Parents:

e29cc2e

Message:

disabling to add location if it already exists in the planner

Location:

trip-planner-front/src/app

Files:

• _services/location.service.ts (modified) (1 diff)
• create-initial-planner/create-initial-planner.component.html (modified) (1 diff)
• location/add-location-to-planner-panel/add-location-to-planner-panel.component.html (modified) (1 diff)
• location/add-location-to-planner-panel/add-location-to-planner-panel.component.ts (modified) (4 diffs)
• location/location-details/location-details.component.html (modified) (2 diffs)
• location/location.component.ts (modified) (6 diffs)
• locations-form/locations-form.component.ts (modified) (3 diffs)

trip-planner-front/src/app/_services/location.service.ts

@@ -55 +55 @@
         return this.httpClient.get<Location[]>(url + "?plannerId=" + id);
     }
+
+    getAllLocationIdsForPlanner(id:number):Observable<number[]>{
+        let url = "http://localhost:8080/api/planner/locationIds";
+        return this.httpClient.get<number[]>(url + "?plannerId="+id);
+    }
     
 }

trip-planner-front/src/app/create-initial-planner/create-initial-planner.component.html

@@ -1 @@
-<form (ngSubmit)="onFormSubmitPlanner(f)" #f="ngForm">
+<form (ngSubmit)="onFormSubmitPlanner(f)" #f="ngForm" >
   <div mat-dialog-content>
     <p>Planner name</p>

trip-planner-front/src/app/location/add-location-to-planner-panel/add-location-to-planner-panel.component.html

@@ -7 +7 @@
         </tr>
     </ng-template>
-    <ng-template pTemplate="body" let-planner>
+    <ng-template pTemplate="body" let-planner let-data>
         <tr>
             <td>{{planner.name}}</td>
-
             <td>
-                <button pButton pRipple type="button" icon="pi pi-heart"
-                    class="p-button-rounded p-button-help p-button-text" (click)="selectPlanner(planner)"></button>
+                <button pButton pRipple type="button" icon="pi pi-heart" class="p-button-rounded p-button-help"
+                    (click)="selectPlanner(planner)" ></button>
             </td>
         </tr>

trip-planner-front/src/app/location/add-location-to-planner-panel/add-location-to-planner-panel.component.ts

@@ -4 +4 @@
 import { PlannerService } from 'src/app/_services/planner.service';
 import { DynamicDialogRef } from 'primeng/dynamicdialog';
-
-
+import { LocationService } from 'src/app/_services/location.service';
+import { Location } from 'src/app/_models/location';
+import { PlannerLocationDto } from 'src/app/_models/dto/plannerLocationDto';
 
 
@@ -16 +17 @@
 
   planners: Planner[];
-
-
-
+  
   constructor(private plannerService: PlannerService,
-    private route: ActivatedRoute, private ref: DynamicDialogRef) {
+    private route: ActivatedRoute, private ref: DynamicDialogRef, private locationService : LocationService) {
     this.planners = [];
   }
@@ -31 +30 @@
       }
     );
+
   }
 
@@ -37 +37 @@
   }
 
-
-
 }

trip-planner-front/src/app/location/location-details/location-details.component.html

@@ -3 +3 @@
 <p>{{locationDetails.description}}</p>
 
-
 <div class="content-section implementation">
     <div class="card">
-        <h5>More photos</h5>
         <p-galleria [value]="images" [responsiveOptions]="responsiveOptions" [containerStyle]="{'max-width': '640px'}"
-            [numVisible]="5" [circular]="true" [showItemNavigators]="true">
+            [numVisible]="5" [circular]="true" [showItemNavigators]="true" [showThumbnails]="false">
             <ng-template pTemplate="item" let-image>
                 <img src="data:image/png;base64,{{image.content}}"
@@ -16 +14 @@
                 <div class="p-grid p-nogutter p-justify-center">
                     <img src="data:image/png;base64,{{image.content}}"
-                        style=" height:50px; display: block;" />
+                        style=" display: block;" />
                 </div>
             </ng-template>
         </p-galleria>
     </div>
-
+</div>

trip-planner-front/src/app/location/location.component.ts

@@ -1 +1 @@
 import { Component, OnInit } from '@angular/core';
-import { FormBuilder, FormGroup, Validators } from '@angular/forms';
 import { ActivatedRoute, Router } from '@angular/router';
-import { MessageService, PrimeNGConfig } from 'primeng/api';
+import { MessageService } from 'primeng/api';
 import { DialogService, DynamicDialogRef } from 'primeng/dynamicdialog';
 import { Planner } from '../_models/planner';
@@ -30 +29 @@
   plannerLocationDto: PlannerLocationDto;
   ref: DynamicDialogRef;
-
+  locationIdsPlanner: number[];
 
 
@@ -42 +41 @@
     this.regionId = 1;
     this.locationId = 1;
-    this.ref = new DynamicDialogRef;
+    this.ref = new DynamicDialogRef();
     this.plannerLocationDto = new PlannerLocationDto();
-
+    this.locationIdsPlanner = [];
   }
 
@@ -85 +84 @@
 
   show(location: Location) {
+    console.log(location.id);
     this.ref = this.dialogService.open(AddLocationToPlannerPanelComponent, {
       header: 'Choose a Planner',
@@ -93 +93 @@
 
     this.ref.onClose.subscribe((planner: Planner) => {
-
       this.plannerLocationDto.locationId = location.id;
       this.plannerLocationDto.plannerId = planner.id;
       console.log("LOC ID: " + this.plannerLocationDto.locationId);
       console.log("PLANNER ID: " + this.plannerLocationDto.plannerId);
-      this.locationService.postLocationToPlanner(this.plannerLocationDto).subscribe(
-        data => {
-          console.log(data);
+
+      this.locationService.getAllLocationIdsForPlanner(planner.id).subscribe(
+        lid => {
+          if (lid.length == 0) {
+            this.locationService.postLocationToPlanner(this.plannerLocationDto).subscribe(
+              data => {
+                console.log(data);
+              }
+            );
+            this.messageService.add({ severity: 'success', summary: 'Location ' + location.name + ' has been added to planner: ', detail: planner.name });
+
+          } else if (lid.length > 0) {
+            if (lid.indexOf(this.plannerLocationDto.locationId) !== -1) {
+              console.log("LOKACIJATA VEKE JA IMA VO PLANEROT");
+              this.messageService.add({ severity: 'error', summary: 'Location ' + location.name + ' already exists in the planner.' });
+            } else {
+              this.locationService.postLocationToPlanner(this.plannerLocationDto).subscribe(
+                data => {
+                  console.log(data);
+                }
+              );
+              this.messageService.add({ severity: 'success', summary: 'Location ' + location.name + ' has been added to planner: ', detail: planner.name });
+            }
+
+          }
         }
       );
-      if (planner) {
-        this.messageService.add({ severity: 'success', summary: 'Location ' + location.name +  ' has been added to planner: ' , detail: planner.name });
-      }
+
+
     });
   }
@@ -115 +135 @@
   }
 
-  onClickBackToMyPlanners(){
+  onClickBackToMyPlanners() {
     this.router.navigate(['planners']);
   }
+
+
 }

trip-planner-front/src/app/locations-form/locations-form.component.ts

@@ -68 +68 @@
 
   ngOnInit(): void {
-  
+
     this.filteredOptions = this.myControl.valueChanges
       .pipe(
@@ -140 +140 @@
           console.log(result);
           this.proba = result;
-          this.router.navigate(['locations'], {queryParams: {cityId: this.cityId, companionId: this.companionId, lengthOfStay: this.lengthOfStay, categoryIds: this.categoryIds}});
+          this.router.navigate(['locations'], { queryParams: { cityId: this.cityId, companionId: this.companionId, lengthOfStay: this.lengthOfStay, categoryIds: this.categoryIds } });
         }
       );
@@ -148 +148 @@
           result => {
             console.log(result);
-            this.router.navigate(['locations'], {queryParams: {regionId: this.regionId, companionId: this.companionId, lengthOfStay: this.lengthOfStay, categoryIds: this.categoryIds}});
+            this.router.navigate(['locations'], { queryParams: { regionId: this.regionId, companionId: this.companionId, lengthOfStay: this.lengthOfStay, categoryIds: this.categoryIds } });
           }
         );