diff --git a/Front/skydivelogs-app/src/app/new-jump/new-jump.component.html b/Front/skydivelogs-app/src/app/new-jump/new-jump.component.html index cf6a018..d1f4af9 100644 --- a/Front/skydivelogs-app/src/app/new-jump/new-jump.component.html +++ b/Front/skydivelogs-app/src/app/new-jump/new-jump.component.html @@ -50,14 +50,6 @@ - - Choose the used gear @@ -109,6 +101,14 @@ + + + + +
diff --git a/Front/skydivelogs-app/src/app/new-jump/new-jump.component.ts b/Front/skydivelogs-app/src/app/new-jump/new-jump.component.ts index 141e81f..49427a3 100644 --- a/Front/skydivelogs-app/src/app/new-jump/new-jump.component.ts +++ b/Front/skydivelogs-app/src/app/new-jump/new-jump.component.ts @@ -35,6 +35,7 @@ export class NewJumpComponent implements OnInit { listOfGear: Array; private countDatasLoaded: number; private pendingAddRequest: boolean; + comments: string; constructor( private serviceComm: ServiceComm, @@ -68,7 +69,8 @@ export class NewJumpComponent implements OnInit { this.endDate, this.exitAltitude, this.deployAltitude, - this.countOfJumps + this.countOfJumps, + this.comments ); setTimeout(() => { diff --git a/Front/skydivelogs-app/src/services/authentication.service.ts b/Front/skydivelogs-app/src/services/authentication.service.ts index 68eab99..4b6de4e 100644 --- a/Front/skydivelogs-app/src/services/authentication.service.ts +++ b/Front/skydivelogs-app/src/services/authentication.service.ts @@ -40,10 +40,7 @@ export class AuthenticationService extends BaseService { }) .pipe( map(user => { - // store user details and basic auth credentials in local storage to keep user logged in between page refreshes - user.authdata = window.btoa(username + ":" + password); - localStorage.setItem("currentUser", JSON.stringify(user)); - this.currentUserSubject.next(user); + this.pushUserToken(username, password, user); return user; }) ); @@ -56,15 +53,19 @@ export class AuthenticationService extends BaseService { }) .pipe( map(user => { - // store user details and basic auth credentials in local storage to keep user logged in between page refreshes - user.authdata = window.btoa(newUser.login + ":" + newUser.password); - localStorage.setItem("currentUser", JSON.stringify(user)); - this.currentUserSubject.next(user); + this.pushUserToken(newUser.login, newUser.password, user); return user; }) ); } + private pushUserToken(login: string, password: string, user: any){ + // store user details and basic auth credentials in local storage to keep user logged in between page refreshes + user.authdata = window.btoa(login + ":" + password); + localStorage.setItem("currentUser", JSON.stringify(user)); + this.currentUserSubject.next(user); + } + private alwaysLogin() { return this.http.get(`${this.apiUrl}/User/AlwayLogin`, { headers: this.headers diff --git a/Front/skydivelogs-app/src/services/jump.service.ts b/Front/skydivelogs-app/src/services/jump.service.ts index 81d1650..70013e1 100644 --- a/Front/skydivelogs-app/src/services/jump.service.ts +++ b/Front/skydivelogs-app/src/services/jump.service.ts @@ -37,10 +37,9 @@ export class JumpService extends BaseService { endDate: Date, defaultExitAltitude: number, defaultDeployAltitude: number, - countOfJumps: number - ) { - const diffInDays = - this.dateService.DiffBetweenDates(beginDate, endDate) + 1; + countOfJumps: number, + notes: string) { + const diffInDays = this.dateService.DiffBetweenDates(beginDate, endDate) + 1; const countOfJumpsPerDay = Math.trunc(countOfJumps / diffInDays); for (let i = 1; beginDate.getTime() < endDate.getTime(); i++) { @@ -53,7 +52,8 @@ export class JumpService extends BaseService { beginDate, defaultExitAltitude, defaultDeployAltitude, - countOfJumpsPerDay + countOfJumpsPerDay, + notes ); beginDate = this.dateService.AddDays(beginDate, 1); @@ -70,7 +70,8 @@ export class JumpService extends BaseService { beginDate, defaultExitAltitude, defaultDeployAltitude, - restfJumps + restfJumps, + notes ); } @@ -83,7 +84,8 @@ export class JumpService extends BaseService { jumpDate: Date, defaultExitAltitude: number, defaultDeployAltitude: number, - countOfJumps: number + countOfJumps: number, + notes: string ) { for (let i = 0; i < countOfJumps; i++) { const bodyNewjump: JumpReq = { @@ -94,7 +96,7 @@ export class JumpService extends BaseService { exitAltitude: defaultExitAltitude, deployAltitude: defaultDeployAltitude, gearId: selectedRig, - notes: "", + notes: notes, id: 0, jumpDate: jumpDate, };