Changeset b738035 for trip-planner-front/src
- Timestamp:
- 01/24/22 21:08:32 (3 years ago)
- Branches:
- master
- Children:
- 76712b2
- Parents:
- bdd6491
- Location:
- trip-planner-front/src/app
- Files:
-
- 7 added
- 3 deleted
- 23 edited
- 1 moved
Legend:
- Unmodified
- Added
- Removed
-
trip-planner-front/src/app/_models/city.ts
rbdd6491 rb738035 7 7 constructor(){ 8 8 this.id = 1; 9 this.name= ' City name';10 this.description= ' City description';9 this.name= ''; 10 this.description= ''; 11 11 } 12 12 } -
trip-planner-front/src/app/_services/location.service.ts
rbdd6491 rb738035 23 23 postLocationToPlanner(plannerLocationDto : PlannerLocationDto) : Observable<Location>{ 24 24 let url = "http://localhost:8080/api/add-location"; 25 return this.httpClient.p ut<Location>(url, plannerLocationDto);25 return this.httpClient.post<Location>(url, plannerLocationDto); 26 26 } 27 27 -
trip-planner-front/src/app/_services/planner.service.ts
rbdd6491 rb738035 3 3 import { Observable } from "rxjs"; 4 4 import { PlannerDto } from "../_models/dto/plannerDto"; 5 import { PlannerLocationDto } from "../_models/dto/plannerLocationDto"; 5 6 import { Planner } from "../_models/planner"; 6 7 … … 15 16 'Content-Type': 'application/json' 16 17 }); 17 18 18 19 19 constructor(private httpClient: HttpClient) { … … 30 30 postInitialPlanner(plannerDto: PlannerDto): Observable<Planner> { 31 31 let url = "http://localhost:8080/api/planner/new"; 32 return this.httpClient.post<Planner>(url, plannerDto );32 return this.httpClient.post<Planner>(url, plannerDto, {headers: this.httpHeaders}); 33 33 } 34 34 … … 47 47 return this.httpClient.delete<Planner>(url, { headers: this.httpHeaders }); 48 48 } 49 50 deleteLocationFromPlanner(plannerLocationDto : PlannerLocationDto) { 51 let url = "http://localhost:8080/api/delete-location"; 52 const options = { 53 body: { 54 "plannerId": plannerLocationDto.plannerId, 55 "locationId": plannerLocationDto.locationId 56 } 57 } 58 return this.httpClient.request('delete', url, options); 59 } 60 61 49 62 } -
trip-planner-front/src/app/_services/user.service.ts
rbdd6491 rb738035 43 43 let user = sessionStorage.getItem("username"); 44 44 let token = sessionStorage.getItem("token"); 45 console.log(user);46 console.log(token);47 console.log(!(user === null));48 45 return !(user === null); 49 46 } 50 47 48 getAllUsernames() { 49 let url = "http://localhost:8080/api/users/usernames"; 50 return this.httpClient.get<string[]>(url); 51 } 52 53 getPassword(loginRequest : LoginRequest){ 54 let url="http://localhost:8080/api/users/password"; 55 const options = { 56 57 body: { 58 "username": loginRequest.username 59 60 } 61 } 62 return this.httpClient.request('get', url, options); 63 } 64 51 65 } -
trip-planner-front/src/app/app-routing.module.ts
rbdd6491 rb738035 1 1 import { NgModule } from '@angular/core'; 2 2 import { RouterModule, Routes } from '@angular/router'; 3 import { AuthGuard } from './auth/auth.guard';3 import { ExploreComponent } from './explore/explore.component'; 4 4 import { HomepageComponent } from './homepage/homepage.component'; 5 5 import { LoginComponent } from './homepage/login/login.component'; … … 17 17 {path: '', component: HomepageComponent}, 18 18 {path: '', component:LoginComponent}, 19 {path: 'location', component: LocationDetailsComponent} 19 {path: 'location', component: LocationDetailsComponent}, 20 {path: 'explore', component: ExploreComponent} 20 21 ]; 21 22 -
trip-planner-front/src/app/app.module.ts
rbdd6491 rb738035 4 4 import { NgModule, NO_ERRORS_SCHEMA } from '@angular/core'; 5 5 import { FormsModule, ReactiveFormsModule } from '@angular/forms'; 6 import { HttpClient , HttpClientModule, HTTP_INTERCEPTORS } from '@angular/common/http';6 import { HttpClientModule, HTTP_INTERCEPTORS } from '@angular/common/http'; 7 7 import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; 8 8 import { CategoryService } from './_services/cateogry.service'; … … 26 26 import { MatAutocompleteModule } from '@angular/material/autocomplete'; 27 27 import { EditPlannerComponent } from './planner/edit-planner/edit-planner.component'; 28 import { DetailPlannerComponent } from './planner/detail-planner/detail-planner.component';29 28 import { AddLocationToPlannerPanelComponent } from './location/add-location-to-planner-panel/add-location-to-planner-panel.component'; 30 29 import { HomepageComponent } from './homepage/homepage.component'; … … 49 48 import { AuthGuard } from './auth/auth.guard'; 50 49 import { AuthInterceptor } from './auth/auth.interceptor'; 51 50 import { ExploreComponent } from './explore/explore.component'; 51 import {AutoCompleteModule} from 'primeng/autocomplete'; 52 import { ExploreResultComponent } from './explore/explore-result/explore-result.component'; 53 import {RatingModule} from 'primeng/rating'; 54 import { CustomValidators } from './providers/CustomValidators'; 52 55 53 56 @NgModule({ … … 59 62 LocationsFormComponent, 60 63 EditPlannerComponent, 61 DetailPlannerComponent,62 64 AddLocationToPlannerPanelComponent, 63 65 HomepageComponent, 64 66 LocationDetailsComponent, 65 67 RegisterComponent, 66 LoginComponent 68 LoginComponent, 69 ExploreComponent, 70 ExploreResultComponent 67 71 ], 68 72 imports: [ … … 104 108 FormsModule, 105 109 PaginatorModule, 106 CardModule 110 CardModule, 111 AutoCompleteModule, 112 RatingModule 107 113 ], 108 114 -
trip-planner-front/src/app/create-initial-planner/create-initial-planner.component.ts
rbdd6491 rb738035 19 19 20 20 ngOnInit(): void { 21 this.plannerDto = new Planner ();21 this.plannerDto = new PlannerDto(); 22 22 } 23 23 -
trip-planner-front/src/app/homepage/homepage.component.html
rbdd6491 rb738035 10 10 11 11 <body> 12 12 <p-toast></p-toast> 13 13 <header> 14 14 <nav class="navbar navbar-expand-sm bg-light"> -
trip-planner-front/src/app/homepage/homepage.component.ts
rbdd6491 rb738035 1 1 import { HttpErrorResponse } from '@angular/common/http'; 2 import { identifierModuleUrl } from '@angular/compiler'; 2 3 import { Component, OnInit } from '@angular/core'; 3 4 import { Router } from '@angular/router'; 5 import { MessageService } from 'primeng/api'; 4 6 import { DialogService, DynamicDialogRef } from 'primeng/dynamicdialog'; 5 7 import { LoginRequest } from '../_models/dto/loginRequest'; … … 20 22 21 23 imageURI = 'https://i.pinimg.com/736x/a1/1a/57/a11a572a1ec4e07039bbd04661a3b035.jpg'; 22 myLogo = 'http://www.logo-designer.co/wp-content/uploads/2020/02/2020-tripadvisor-new-logo-design-by-mother-design-4.png';23 24 responsiveOptions; 24 25 locations: Location[]; … … 27 28 28 29 constructor(private locationService: LocationService, private dialogService: DialogService, private userService: UserService, 29 private router: Router ) {30 private router: Router, private messageService: MessageService) { 30 31 this.responsiveOptions = [ 31 32 { … … 61 62 } 62 63 ); 63 64 64 } 65 65 … … 82 82 }, 83 83 err => { 84 84 console.log("oops"); 85 85 }); 86 86 } -
trip-planner-front/src/app/homepage/login/login.component.html
rbdd6491 rb738035 1 <div class="p-col-12 p-md-4"> 2 <div class="p-inputgroup"> 3 <span class="p-inputgroup-addon"><i class="pi pi-user"></i></span> 4 <input type="text" pInputText placeholder="Email address (Username)" 5 [(ngModel)]="loginRequest.username" name="username"> 1 <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.1/dist/css/bootstrap.min.css" rel="stylesheet" 2 integrity="sha384-+0n0xVW2eSR5OomGNYDnhzAbDsOXxcvSN1TPprVMTNDbiYZCxYbOOl7+AMvyTG2x" crossorigin="anonymous"> 3 4 5 6 <div class="readersack"> 7 <div class="container"> 8 <div class="row"> 9 <div class="col-md-6 offset-md-3"> 10 <form [formGroup]="form" #myform="ngForm" (ngSubmit)="onFormLogIn(loginRequest)"> 11 <div class="form-group"> 12 13 <label>Username (email)</label> 14 <input formControlName="username" id="username" type="text" class="form-control" 15 [(ngModel)]="loginRequest.username" 16 [ngClass]="{ 'is-invalid': myform.submitted && (form.get('username')?.errors?.['required'] 17 || form.get('username')?.errors?.['validateUser'])}" /> 18 <div *ngIf="form.get('username')?.hasError('required') && myform.submitted" 19 class="invalid-feedback"> 20 Username is required 21 </div> 22 <div *ngIf="form.get('username')?.hasError('validateUser') && myform.submitted" 23 class="invalid-feedback"> 24 Invalid username 25 </div> 26 27 <label>Password</label> 28 <input formControlName="password" id="password" type="password" class="form-control" 29 [(ngModel)]="loginRequest.password" [ngClass]="{ 'is-invalid': myform.submitted && form.get('password')?.errors?.['required']}" /> 30 <div *ngIf="form.get('password')?.hasError('required') && myform.submitted" 31 class="invalid-feedback"> 32 Password is required</div> 33 34 35 <div class="p-col-12 p-md-4"> 36 <button type="submit" pButton pRipple class="p-button-secondary">Submit</button> 37 </div> 38 </div> 39 </form> 40 </div> 41 </div> 6 42 </div> 7 43 </div> 8 <div class="p-col-12 p-md-4">9 <div class="p-inputgroup">10 <span class="p-inputgroup-addon"><i class="pi pi-password"></i></span>11 <input type="password" pInputText placeholder="Password" name="password" [(ngModel)]="loginRequest.password">12 </div>13 </div>14 15 <div class="p-col-12 p-md-4">16 <button pButton pRipple label="Log in" class="p-button-secondary" type="submit"17 (click)="onFormLogIn(loginRequest)"></button>18 </div> -
trip-planner-front/src/app/homepage/login/login.component.ts
rbdd6491 rb738035 1 1 import { Component, OnInit } from '@angular/core'; 2 import { Router } from '@angular/router';2 import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms'; 3 3 import { DynamicDialogRef } from 'primeng/dynamicdialog'; 4 4 import { LoginRequest } from 'src/app/_models/dto/loginRequest'; 5 import { PlannerLocationDto } from 'src/app/_models/dto/plannerLocationDto'; 6 import { UserDto } from 'src/app/_models/dto/userDto'; 7 import { UsernameDto } from 'src/app/_models/dto/usernameDto'; 5 8 import { UserService } from 'src/app/_services/user.service'; 6 9 … … 12 15 export class LoginComponent implements OnInit { 13 16 17 form: FormGroup; 18 loginRequest: LoginRequest; 19 usernames: string[]; 14 20 15 loginRequest : LoginRequest; 21 constructor(private ref: DynamicDialogRef, private userService: UserService, formBuilder: FormBuilder) { 22 this.loginRequest = new LoginRequest(); 23 this.usernames = []; 16 24 17 constructor(private ref: DynamicDialogRef, private router: Router, private userService : UserService) { 18 this.loginRequest = new LoginRequest(); 19 25 this.form = formBuilder.group({ 26 username: new FormControl('', [Validators.required]), 27 password: new FormControl('', [Validators.required, Validators.minLength(6)]), 28 }, 29 { 30 validators: [ 31 this.validateUser('username') 32 ] 33 } 34 ); 20 35 } 21 36 22 37 ngOnInit(): void { 38 23 39 } 24 40 25 onFormLogIn(loginRequest){ 26 this.ref.close(loginRequest); 27 41 onFormLogIn(loginRequest) { 42 const { valid } = this.form; 43 if (valid) { 44 this.ref.close(loginRequest); 45 } 46 } 47 48 validateUser(username: string) { 49 return (formGroup: FormGroup) => { 50 const control = formGroup.controls[username]; 51 52 if (control.errors && !control.errors.validateUser) { 53 return; 54 } 55 56 this.userService.getAllUsernames().subscribe( 57 data => { 58 this.usernames = data; 59 for (let i = 0; i < this.usernames.length; i++) { 60 if (control.value === this.usernames[i]) { 61 control.setErrors(null); 62 63 break; 64 } else { 65 control.setErrors({ validateUser: true }); 66 } 67 68 } 69 } 70 ); 71 return null; 72 73 }; 74 28 75 } 29 76 } -
trip-planner-front/src/app/homepage/register/register.component.html
rbdd6491 rb738035 2 2 integrity="sha384-+0n0xVW2eSR5OomGNYDnhzAbDsOXxcvSN1TPprVMTNDbiYZCxYbOOl7+AMvyTG2x" crossorigin="anonymous"> 3 3 4 <div class="p-grid p-fluid">5 <div class="p-col-12 p-md-4">6 <div class="p-inputgroup">7 <span class="p-inputgroup-addon"><i class="pi pi-user"></i></span>8 <input type="text" pInputText placeholder="Full name" [(ngModel)]="user.fullName" name="fullName"9 class="form-control">10 4 5 <div class="readersack"> 6 <div class="container"> 7 <div class="row"> 8 <div class="col-md-6 offset-md-3"> 9 <form [formGroup]="form" #myform="ngForm" (ngSubmit)="onFormSubmitSignUp(user)"> 10 <div class="form-group"> 11 <label>Full name</label> 12 <input formControlName="fullName" id="fullName" type="text" class="form-control" 13 [(ngModel)]="user.fullName" 14 [ngClass]="{ 'is-invalid': myform.submitted && form.get('fullName')?.errors?.['required']}" /> 15 <div *ngIf="myform.submitted && form.get('fullName')?.errors" class="invalid-feedback"> 16 <div *ngIf="form.get('fullName')?.hasError('required') && myform.submitted"> 17 Full Name is required 18 </div> 19 </div> 20 21 <label>Username (email)</label> 22 <input formControlName="username" id="username" type="text" class="form-control" 23 [(ngModel)]="user.username" 24 [ngClass]="{ 'is-invalid': myform.submitted && (form.get('username')?.errors?.['required'] || 25 form.get('username')?.errors?.['email'] || form.get('username')?.hasError('validateUsername'))}" /> 26 <div *ngIf="form.get('username')?.hasError('required') && myform.submitted" 27 class="invalid-feedback"> 28 Username is required</div> 29 <div *ngIf="form.get('username')?.hasError('email') && myform.submitted" 30 class="invalid-feedback"> 31 Please enter valid email.</div> 32 <div *ngIf="form.get('username')?.hasError('validateUsername') && myform.submitted" 33 class="invalid-feedback"> 34 Username already exists</div> 35 36 37 38 <label>Password</label> 39 <input formControlName="password" id="password" type="password" class="form-control" 40 [(ngModel)]="user.password" [ngClass]="{ 'is-invalid': myform.submitted && (form.get('password')?.errors?.['required'] || 41 form.get('password')?.errors?.['minlength'])}" /> 42 <div *ngIf="form.get('password')?.hasError('required') && myform.submitted" 43 class="invalid-feedback"> 44 Password is required</div> 45 <div *ngIf="form.get('password')?.errors?.['minlength'] && myform.submitted" 46 class="invalid-feedback"> 47 Password must be at least 6 characters long. 48 </div> 49 50 <label>Confirm password</label> 51 <input formControlName="confirmPassword" id="confirmPassword" type="password" 52 class="form-control" [(ngModel)]="user.confirmPassword" 53 [ngClass]="{ 'is-invalid': myform.submitted && (form.get('confirmPassword')?.errors?.['required'] || 54 form.get('confirmPassword')?.errors?.['minlength'] || form.get('confirmPassword')?.errors?.['mustMatch'])}" /> 55 <div *ngIf="form.get('confirmPassword')?.hasError('required') && myform.submitted" 56 class="invalid-feedback"> 57 Confirm Password is required</div> 58 <div *ngIf="form.get('confirmPassword')?.errors?.['minlength'] && myform.submitted" 59 class="invalid-feedback"> 60 Confirm Password must be at least 6 characters long. 61 </div> 62 <div *ngIf="form.get('confirmPassword')?.errors?.['mustMatch'] && myform.submitted" 63 class="invalid-feedback">Password and confirm password must match 64 </div> 65 66 <div class="p-col-12 p-md-4"> 67 <button type="submit" pButton pRipple class="p-button-secondary">Submit</button> 68 </div> 69 </div> 70 </form> 71 </div> 11 72 </div> 12 73 </div> 13 14 <div class="p-col-12 p-md-4">15 <div class="p-inputgroup">16 <span class="p-inputgroup-addon"><i class="pi pi-user"></i></span>17 <input type="text" pInputText placeholder="Email address (Username)" [(ngModel)]="user.username"18 name="username">19 </div>20 </div>21 22 <div class="p-col-12 p-md-4">23 <div class="p-inputgroup">24 <span class="p-inputgroup-addon"><i class="pi pi-password"></i></span>25 <input type="password" pInputText placeholder="Password" [(ngModel)]="user.password" name="password">26 </div>27 </div>28 29 <div class="p-col-12 p-md-4">30 <div class="p-inputgroup">31 <span class="p-inputgroup-addon"><i class="pi pi-password"></i></span>32 <input type="password" pInputText placeholder="Repeat password" [(ngModel)]="user.confirmPassword"33 name="confirmPassword">34 </div>35 </div>36 37 <div class="p-col-12 p-md-4">38 <button pButton pRipple label="Submit" class="p-button-secondary" type="button"39 (click)="onFormSubmitSignUp(user)"></button>40 </div>41 74 </div> 42 43 -
trip-planner-front/src/app/homepage/register/register.component.ts
rbdd6491 rb738035 1 1 import { Component, OnInit } from '@angular/core'; 2 import { FormBuilder, Form Group, Validators } from '@angular/forms';2 import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms'; 3 3 import { DynamicDialogRef } from 'primeng/dynamicdialog'; 4 import { CustomValidators } from 'src/app/providers/CustomValidators'; 4 5 import { UserDto } from 'src/app/_models/dto/userDto'; 6 import { UserService } from 'src/app/_services/user.service'; 5 7 6 8 @Component({ … … 12 14 13 15 user: UserDto; 14 myForm: FormGroup; 16 form: FormGroup; 17 usernames: string[]; 15 18 16 constructor(private ref: DynamicDialogRef, private fb: FormBuilder) { 19 20 constructor(private ref: DynamicDialogRef, 21 formBuilder: FormBuilder, private userService: UserService) { 17 22 this.user = new UserDto(); 18 this.myForm = fb.group({ 19 title: fb.control('initial value', Validators.required) 23 this.usernames = []; 24 25 this.form = formBuilder.group({ 26 fullName: new FormControl('', [Validators.required, Validators.minLength(3)]), 27 username: new FormControl('', [Validators.required, Validators.email]), 28 password: new FormControl('', [Validators.required, Validators.minLength(6)]), 29 confirmPassword: new FormControl('', [Validators.required, Validators.minLength(6)]) 30 }, { 31 validators: [ 32 CustomValidators.mustMatch('password', 'confirmPassword'), 33 this.validateUsername('username') 34 ] 20 35 }); 21 36 } 22 37 23 38 ngOnInit(): void { 24 this.myForm = this.fb.group({25 fullName: this.fb.control('', Validators.required),26 username: this.fb.control('', Validators.required),27 password: this.fb.control('', Validators.required),28 confirmPassword: this.fb.control('', Validators.required)29 });30 39 } 31 40 32 41 onFormSubmitSignUp(user) { 33 this.ref.close(user); 34 //window.location.reload(); 42 const { valid } = this.form; 43 if (valid) { 44 this.ref.close(user); 45 } 46 } 47 48 validateUsername(username: string) { 49 return (formGroup: FormGroup) => { 50 const control = formGroup.controls[username]; 51 52 if (control.errors && !control.errors.validateUsername) { 53 return; 54 } 55 56 this.userService.getAllUsernames().subscribe( 57 data => { 58 this.usernames = data; 59 for (let i = 0; i < this.usernames.length; i++) { 60 if (control.value === this.usernames[i]) { 61 control.setErrors({ validateUsername: true }); 62 break; 63 } else { 64 control.setErrors(null); 65 } 66 } 67 } 68 ); 69 return null; 70 }; 35 71 36 72 } -
trip-planner-front/src/app/location/add-location-to-planner-panel/add-location-to-planner-panel.component.html
rbdd6491 rb738035 7 7 </tr> 8 8 </ng-template> 9 <ng-template pTemplate="body" let-planner let-data>9 <ng-template pTemplate="body" let-planner> 10 10 <tr> 11 11 <td>{{planner.name}}</td> -
trip-planner-front/src/app/location/add-location-to-planner-panel/add-location-to-planner-panel.component.ts
rbdd6491 rb738035 1 1 import { Component, OnInit } from '@angular/core'; 2 import { ActivatedRoute } from '@angular/router';3 2 import { Planner } from 'src/app/_models/planner'; 4 3 import { PlannerService } from 'src/app/_services/planner.service'; 5 4 import { DynamicDialogRef } from 'primeng/dynamicdialog'; 6 import { LocationService } from 'src/app/_services/location.service';7 5 8 6 … … 17 15 planners: Planner[]; 18 16 19 constructor(private plannerService: PlannerService, 20 private route: ActivatedRoute, private ref: DynamicDialogRef, private locationService : LocationService) { 17 constructor(private plannerService: PlannerService, private ref: DynamicDialogRef) { 21 18 this.planners = []; 22 19 } … … 29 26 } 30 27 ); 31 32 28 } 33 29 -
trip-planner-front/src/app/location/location-details/location-details.component.html
rbdd6491 rb738035 18 18 </ng-template> 19 19 </p-galleria> 20 <br> 21 <p-rating></p-rating> 20 22 </div> 21 23 </div> -
trip-planner-front/src/app/location/location-details/location-details.component.ts
rbdd6491 rb738035 1 import { Component, OnInit , ViewEncapsulation} from '@angular/core';1 import { Component, OnInit } from '@angular/core'; 2 2 import { ActivatedRoute, Router } from '@angular/router'; 3 3 import { Images } from 'src/app/_models/images'; -
trip-planner-front/src/app/location/location.component.css
rbdd6491 rb738035 1 img{ 2 width: 150px; 3 height: 120px; 4 display: block; 5 } -
trip-planner-front/src/app/location/location.component.html
rbdd6491 rb738035 9 9 <tr> 10 10 <th scope="col">#</th> 11 <th scope="col">Photo</th> 11 12 <th scope="col">Location name</th> 12 13 <th scope="col"> Add to my planner</th> … … 17 18 <tr *ngFor="let location of listLocations"> 18 19 <td>{{location.id}}</td> 20 <td><img src="data:image/png;base64,{{location.photo}}" /></td> 19 21 <td>{{location.name}}</td> 20 22 <td><button type="button" (click)="show(location)" pButton icon="pi pi-info-circle" 21 23 label="Add to my planner"></button></td> 22 24 <td><button type="button" color="primary" pButton icon="pi pi-info-circle" 23 (click)="onClickSeeDetails(location.id)" label="See details"></button></td> 25 (click)="onClickSeeDetails(location.id)" label="See details"></button> 26 </td> 24 27 </tr> 25 28 </tbody> -
trip-planner-front/src/app/location/location.component.ts
rbdd6491 rb738035 93 93 94 94 this.ref.onClose.subscribe((planner: Planner) => { 95 if (planner){96 this.plannerLocationDto.locationId = location.id;97 this.plannerLocationDto.plannerId = planner.id;98 console.log("LOC ID: " + this.plannerLocationDto.locationId);99 console.log("PLANNER ID: " + this.plannerLocationDto.plannerId);95 if (planner) { 96 this.plannerLocationDto.locationId = location.id; 97 this.plannerLocationDto.plannerId = planner.id; 98 console.log("LOC ID: " + this.plannerLocationDto.locationId); 99 console.log("PLANNER ID: " + this.plannerLocationDto.plannerId); 100 100 101 this.locationService.getAllLocationIdsForPlanner(planner.id).subscribe( 102 lid => { 103 if (lid.length == 0) { 104 this.locationService.postLocationToPlanner(this.plannerLocationDto).subscribe( 105 data => { 106 console.log(data); 107 } 108 ); 109 this.messageService.add({ severity: 'success', summary: 'Location ' + location.name + ' has been added to planner: ', detail: planner.name }); 110 111 } else if (lid.length > 0) { 112 if (lid.indexOf(this.plannerLocationDto.locationId) !== -1) { 113 console.log("LOKACIJATA VEKE JA IMA VO PLANEROT"); 114 this.messageService.add({ severity: 'error', summary: 'Location ' + location.name + ' already exists in the planner.' }); 115 } else { 101 this.locationService.getAllLocationIdsForPlanner(planner.id).subscribe( 102 lid => { 103 if (lid.length == 0) { 116 104 this.locationService.postLocationToPlanner(this.plannerLocationDto).subscribe( 117 105 data => { … … 120 108 ); 121 109 this.messageService.add({ severity: 'success', summary: 'Location ' + location.name + ' has been added to planner: ', detail: planner.name }); 110 111 } else if (lid.length > 0) { 112 if (lid.indexOf(this.plannerLocationDto.locationId) !== -1) { 113 console.log("LOKACIJATA VEKE JA IMA VO PLANEROT"); 114 this.messageService.add({ severity: 'error', summary: 'Location ' + location.name + ' already exists in the planner.' }); 115 } else { 116 this.locationService.postLocationToPlanner(this.plannerLocationDto).subscribe( 117 data => { 118 console.log(data); 119 } 120 ); 121 this.messageService.add({ severity: 'success', summary: 'Location ' + location.name + ' has been added to planner: ', detail: planner.name }); 122 } 123 122 124 } 123 124 125 } 125 } 126 ); 126 ); 127 127 } 128 128 }); 129 129 130 130 } 131 131 -
trip-planner-front/src/app/planner/edit-planner/edit-planner.component.html
rbdd6491 rb738035 38 38 </td> 39 39 <td> 40 <button pButton pRipple type="button" icon="pi pi-times" class="p-button-rounded p-button-danger p-button-text" ></button>40 <button pButton pRipple type="button" icon="pi pi-times" class="p-button-rounded p-button-danger p-button-text" (click)="onClickRemoveLocation(planner, location)"></button> 41 41 </td> 42 42 </tr> -
trip-planner-front/src/app/planner/edit-planner/edit-planner.component.ts
rbdd6491 rb738035 3 3 import { ActivatedRoute, Router } from '@angular/router'; 4 4 import { PlannerDto } from 'src/app/_models/dto/plannerDto'; 5 import { PlannerLocationDto } from 'src/app/_models/dto/plannerLocationDto'; 5 6 import { Location } from 'src/app/_models/location'; 6 7 import { Planner } from 'src/app/_models/planner'; … … 21 22 id: number; 22 23 locations: Location[]; 23 24 plannerLocationDto: PlannerLocationDto; 24 25 25 26 constructor(private router: Router, private route: ActivatedRoute, private fb: FormBuilder, private plannerService: PlannerService, … … 33 34 this.id = 1; 34 35 this.locations = []; 36 this.plannerLocationDto = new PlannerLocationDto(); 35 37 } 36 38 … … 64 66 } 65 67 66 privateupdatePlanner() {68 updatePlanner() { 67 69 this.plannerService.updatePlanner(this.id, this.form.value) 68 70 .pipe() … … 81 83 } 82 84 83 onClickRemoveLocation(id : number){ 84 85 onClickRemoveLocation(planner: Planner, location: Location) { 86 planner.id = this.id; 87 88 this.plannerLocationDto.plannerId = planner.id; 89 this.plannerLocationDto.locationId = location.id; 90 console.log(this.plannerLocationDto.plannerId); 91 console.log(this.plannerLocationDto.locationId); 92 this.plannerService.deleteLocationFromPlanner(this.plannerLocationDto).subscribe( 93 data => { 94 console.log("deleted") 95 } 96 ); 97 window.location.reload(); 85 98 } 86 99 } -
trip-planner-front/src/app/planner/planner.component.ts
rbdd6491 rb738035 72 72 this.messageService.add({ severity: 'success', summary: 'The planner: ' + plannerDto.name + ' has been created.' }); 73 73 } 74 74 75 75 }); 76 76
Note:
See TracChangeset
for help on using the changeset viewer.