Changeset ceaed42 for trip-planner-front/src/app/planner

Timestamp:

11/11/21 12:59:26 (3 years ago)

Author:

Ema <ema_spirova@…>

Branches:

master

Children:

59329aa

Parents:

6c1585f

Message:

add location to planner

Location:

trip-planner-front/src/app/planner

Files:

• edit-planner/edit-planner.component.html (modified) (1 diff)
• edit-planner/edit-planner.component.ts (modified) (4 diffs)
• planner.component.ts (modified) (2 diffs)

trip-planner-front/src/app/planner/edit-planner/edit-planner.component.html

@@ -28 +28 @@
                             <td> <button mat-raised-button color="primary" (click)="onClickAddLocation()">
                                  Add locations
-                              </button>
+                                 </button>
+                            </td>
+                        </tr>
+                        <tr *ngFor ="let location of locations">
+                            <td>
+                                {{location.name}}
                             </td>
                         </tr>

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

@@ -3 +3 @@
 import { ActivatedRoute, Router } from '@angular/router';
 import { PlannerDto } from 'src/app/_models/dto/plannerDto';
+import { Location } from 'src/app/_models/location';
 import { Planner } from 'src/app/_models/planner';
+import { LocationService } from 'src/app/_services/location.service';
 import { PlannerService } from 'src/app/_services/planner.service';
 
@@ -18 +20 @@
   plannerDto: PlannerDto;
   id: number;
+  locations: Location[];
 
 
-  constructor(private router: Router, private route: ActivatedRoute ,private fb: FormBuilder, private plannerService: PlannerService) { 
+  constructor(private router: Router, private route: ActivatedRoute, private fb: FormBuilder, private plannerService: PlannerService,
+    private locationService : LocationService) {
     this.planner = new Planner();
     this.planners = [];
     this.form = fb.group({
       title: fb.control('initial value', Validators.required)
-  });
+    });
     this.plannerDto = new PlannerDto();
     this.id = 1;
+    this.locations = [];
   }
 
@@ -34 +39 @@
 
     this.form = this.fb.group({
-        name: [''],
-        description: [''],
-        locationList: []
+      name: [''],
+      description: [''],
+      locationList: []
     });
 
     this.plannerService.getPlannerById(this.id)
-    .pipe()
-    .subscribe(x => this.form.patchValue(x));
+      .pipe()
+      .subscribe(x => this.form.patchValue(x));
+
+    this.locationService.getLocationsFroPlanner(this.id).subscribe(
+      data => {
+          this.locations = data;
+      }
+    );
+    }
+ 
+  onSubmit() {
+    this.updatePlanner();
+
   }
 
-
-  onSubmit(){
-    this.updatePlanner();
-      
-  }
-
-  onClickAddLocation()
-  {
+  onClickAddLocation() {
     this.router.navigate(['form']);
   }
@@ -57 +66 @@
   private updatePlanner() {
     this.plannerService.updatePlanner(this.id, this.form.value)
-        .pipe()
-        .subscribe({
-            next: () => {
-              this.router.navigate(['planners']);
-            },
-            error: error => {
-                console.log("error");
-            }
-        });
+      .pipe()
+      .subscribe({
+        next: () => {
+          this.router.navigate(['planners']);
+        },
+        error: error => {
+          console.log("error");
+        }
+      });
+  }
+
 }
-  
-}

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

@@ -22 +22 @@
 
 
-  constructor(private plannerService: PlannerService, public dialog: MatDialog, private router: Router,
+  constructor(private plannerService: PlannerService, private dialog: MatDialog, private router: Router,
     private fb : FormBuilder) { 
     this.planners = [];
@@ -49 +49 @@
     console.log(id);
         this.plannerService.getPlannerById(id).subscribe(
-            data => {
-              
-              this.router.navigate(['edit/planner/', id])
+            data => {          
+              this.router.navigate(['edit/planner/', id]);
             }
      );