sandre/SkydiveLogs
0
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rename the methods

Browse Source
This commit is contained in:
Sébastien ANDRE
2023-06-29 15:59:58 +02:00
parent f789a4269a
commit 8598f4e087
23 changed files with 62 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Front/skydivelogs-app/src/app/default/default.component.ts
View File

@@ -46,7 +46,7 @@ export class DefaultComponent implements OnInit {
private updateTitle() { private updateTitle() {
this.translateService.get("Default_Title").subscribe( this.translateService.get("Default_Title").subscribe(
data => { this.serviceComm.UpdatedComponentTitle(data); } data => { this.serviceComm.updatedComponentTitle(data); }
); );
} }
} }

4
Front/skydivelogs-app/src/app/jump-infos/jump-infos.component.ts
View File

@@ -25,12 +25,12 @@ export class JumpInfosComponent implements OnInit {
ngOnInit(): void {} ngOnInit(): void {}
public updateJump() { public updateJump() {
this.serviceJump.UpdateJump(this.jump.id, this.serviceJump.updateJump(this.jump.id,
this.jump.isSpecial, this.jump.isSpecial,
this.jump.withCutaway, this.jump.withCutaway,
this.jump.notes) this.jump.notes)
.subscribe(() => { .subscribe(() => {
this.serviceComm.RefreshData(AddAction.Jump); this.serviceComm.refreshData(AddAction.Jump);
}); });
} }
} }

2
Front/skydivelogs-app/src/app/list-of-aircrafts/list-of-aircrafts.component.ts
View File

@@ -65,7 +65,7 @@ export class ListOfAircraftsComponent implements OnInit {
private updateTitle() { private updateTitle() {
this.translateService.get("ListAircrafts_Title").subscribe( this.translateService.get("ListAircrafts_Title").subscribe(
data => { this.serviceComm.UpdatedComponentTitle(data); } data => { this.serviceComm.updatedComponentTitle(data); }
); );
} }
} }

6
Front/skydivelogs-app/src/app/list-of-dzs/list-of-dzs.component.ts
View File

@@ -67,7 +67,7 @@ export class ListOfDzsComponent implements OnInit {
public setToFavorite(dropzone: DropZoneResp) { public setToFavorite(dropzone: DropZoneResp) {
dropzone.isFavorite = true; dropzone.isFavorite = true;
this.serviceApi.SetFavoriteDropZone(dropzone); this.serviceApi.setFavoriteDropZone(dropzone);
const data = this.dataSourceTable.data; const data = this.dataSourceTable.data;
data.sort((a, b) => (b.isFavorite ? 1 : 0) - (a.isFavorite ? 1 : 0)); data.sort((a, b) => (b.isFavorite ? 1 : 0) - (a.isFavorite ? 1 : 0));
@@ -77,7 +77,7 @@ export class ListOfDzsComponent implements OnInit {
public removeToFavorite(dropzone: DropZoneResp) { public removeToFavorite(dropzone: DropZoneResp) {
dropzone.isFavorite = false; dropzone.isFavorite = false;
this.serviceApi.RemoveFavoriteDropZone(dropzone); this.serviceApi.removeFavoriteDropZone(dropzone);
const data = this.dataSourceTable.data; const data = this.dataSourceTable.data;
data.sort((a, b) => (b.isFavorite ? 1 : 0) - (a.isFavorite ? 1 : 0)); data.sort((a, b) => (b.isFavorite ? 1 : 0) - (a.isFavorite ? 1 : 0));
@@ -99,7 +99,7 @@ export class ListOfDzsComponent implements OnInit {
private updateTitle() { private updateTitle() {
this.translateService.get("ListDz_Title").subscribe( this.translateService.get("ListDz_Title").subscribe(
data => { this.serviceComm.UpdatedComponentTitle(data); } data => { this.serviceComm.updatedComponentTitle(data); }
); );
} }
} }

2
Front/skydivelogs-app/src/app/list-of-gears/list-of-gears.component.ts
View File

@@ -71,7 +71,7 @@ export class ListOfGearsComponent implements OnInit {
private updateTitle() { private updateTitle() {
this.translateService.get("ListGears_Title").subscribe( this.translateService.get("ListGears_Title").subscribe(
data => { this.serviceComm.UpdatedComponentTitle(data); } data => { this.serviceComm.updatedComponentTitle(data); }
); );
} }
} }

2
Front/skydivelogs-app/src/app/list-of-images/list-of-images.component.ts
View File

@@ -108,7 +108,7 @@ export class ListOfImagesComponent implements OnInit {
return; return;
} }
this.serviceApi.AddImage(formData.comment, this.selectedFile) this.serviceApi.addImage(formData.comment, this.selectedFile)
.subscribe( .subscribe(
() => { this.getListOfImages(); } () => { this.getListOfImages(); }
); );

2
Front/skydivelogs-app/src/app/list-of-jump-types/list-of-jump-types.component.ts
View File

@@ -65,7 +65,7 @@ export class ListOfJumpTypesComponent implements OnInit {
private updateTitle() { private updateTitle() {
this.translateService.get("ListJumpTypes_Title").subscribe( this.translateService.get("ListJumpTypes_Title").subscribe(
data => { this.serviceComm.UpdatedComponentTitle(data); } data => { this.serviceComm.updatedComponentTitle(data); }
); );
} }
} }

6
Front/skydivelogs-app/src/app/list-of-jumps/list-of-jumps.component.ts
View File

@@ -61,7 +61,7 @@ export class ListOfJumpsComponent implements OnInit {
getListOfJumps(pageSize: number = 20, pageIndex: number = 0) { getListOfJumps(pageSize: number = 20, pageIndex: number = 0) {
this.isLoading = true; this.isLoading = true;
this.serviceApi.GetJumps(pageIndex * pageSize, pageIndex * pageSize + pageSize) this.serviceApi.getJumps(pageIndex * pageSize, pageIndex * pageSize + pageSize)
.subscribe((data) => { .subscribe((data) => {
this.dataSourceTable.data = data.rows; this.dataSourceTable.data = data.rows;
setTimeout(() => { setTimeout(() => {
@@ -86,7 +86,7 @@ export class ListOfJumpsComponent implements OnInit {
this.dataSourceTable.data = data; this.dataSourceTable.data = data;
this.serviceApi.DeleteJump(item); this.serviceApi.deleteJump(item);
this.statsService.resetStats(); this.statsService.resetStats();
} }
@@ -96,7 +96,7 @@ export class ListOfJumpsComponent implements OnInit {
private updateTitle() { private updateTitle() {
this.translateService.get("ListJumps_Title").subscribe((data) => { this.translateService.get("ListJumps_Title").subscribe((data) => {
this.serviceComm.UpdatedComponentTitle(data); this.serviceComm.updatedComponentTitle(data);
}); });
} }
} }

2
Front/skydivelogs-app/src/app/list-of-tunnel-flights/list-of-tunnel-flights.component.ts
View File

@@ -38,7 +38,7 @@ export class ListOfTunnelFlightsComponent implements OnInit {
private updateTitle() { private updateTitle() {
this.translateService.get("ListTunnelFlight_Title").subscribe( this.translateService.get("ListTunnelFlight_Title").subscribe(
data => { this.serviceComm.UpdatedComponentTitle(data); } data => { this.serviceComm.updatedComponentTitle(data); }
); );
} }

4
Front/skydivelogs-app/src/app/new-aircraft/new-aircraft.component.ts
View File

@@ -31,9 +31,9 @@ export class NewAircraftComponent implements OnInit {
return; return;
} }
this.serviceApi.AddAircraft(formData.aircraftName, this.selectedFile) this.serviceApi.addAircraft(formData.aircraftName, this.selectedFile)
.subscribe(() => { .subscribe(() => {
this.serviceComm.RefreshData(AddAction.Aircraft); this.serviceComm.refreshData(AddAction.Aircraft);
}); });
} }

4
Front/skydivelogs-app/src/app/new-drop-zone/new-drop-zone.component.ts
View File

@@ -49,7 +49,7 @@ export class NewDropZoneComponent implements OnInit {
dzType.push("tunnel"); dzType.push("tunnel");
} }
this.dropzoneService.AddDropZone(splitGps[0], this.dropzoneService.addDropZone(splitGps[0],
splitGps[1], splitGps[1],
formData.dzName, formData.dzName,
formData.address, formData.address,
@@ -58,7 +58,7 @@ export class NewDropZoneComponent implements OnInit {
dzType, dzType,
false) false)
.subscribe(() => { .subscribe(() => {
this.serviceComm.RefreshData(AddAction.Dropzone); this.serviceComm.refreshData(AddAction.Dropzone);
}); });
} }
} }

4
Front/skydivelogs-app/src/app/new-gear/new-gear.component.ts
View File

@@ -49,7 +49,7 @@ export class NewGearComponent implements OnInit {
ngOnInit() { } ngOnInit() { }
onSubmit(formData) { onSubmit(formData) {
this.serviceApi.AddGear(formData.name, this.serviceApi.addGear(formData.name,
formData.manufacturer, formData.manufacturer,
+formData.minSize, +formData.minSize,
+formData.maxSize, +formData.maxSize,
@@ -57,7 +57,7 @@ export class NewGearComponent implements OnInit {
formData.mainCanopy, formData.mainCanopy,
formData.reserveCanopy) formData.reserveCanopy)
.subscribe(() => { .subscribe(() => {
this.serviceComm.RefreshData(AddAction.Gear); this.serviceComm.refreshData(AddAction.Gear);
}); });
} }
} }

4
Front/skydivelogs-app/src/app/new-jump-type/new-jump-type.component.ts
View File

@@ -25,9 +25,9 @@ export class NewJumpTypeComponent implements OnInit {
ngOnInit() { } ngOnInit() { }
onSubmit(formData) { onSubmit(formData) {
this.jumpTypeService.AddJumpType(formData.jumptypeName) this.jumpTypeService.addJumpType(formData.jumptypeName)
.subscribe(() => { .subscribe(() => {
this.serviceComm.RefreshData(AddAction.JumpType); this.serviceComm.refreshData(AddAction.JumpType);
}); });
} }
} }

6
Front/skydivelogs-app/src/app/new-jump/new-jump.component.ts
View File

@@ -90,7 +90,7 @@ export class NewJumpComponent implements OnInit {
onFormSubmit() { onFormSubmit() {
this.pendingAddRequest = true; this.pendingAddRequest = true;
this.serviceJump.AddListOfJump(this.selectedJumpType.id, this.serviceJump.addListOfJump(this.selectedJumpType.id,
this.selectedAircraft.id, this.selectedAircraft.id,
this.selectedDz.id, this.selectedDz.id,
this.selectedGear.id, this.selectedGear.id,
@@ -172,7 +172,7 @@ export class NewJumpComponent implements OnInit {
private initForm() { private initForm() {
this.endDate = new Date(); this.endDate = new Date();
this.endDate.setHours(0, 0, 0, 0); this.endDate.setHours(0, 0, 0, 0);
this.beginDate = this.dateService.AddDays(this.endDate, -1); this.beginDate = this.dateService.addDays(this.endDate, -1);
this.exitAltitude = 4000; this.exitAltitude = 4000;
this.deployAltitude = 1000; this.deployAltitude = 1000;
@@ -225,7 +225,7 @@ export class NewJumpComponent implements OnInit {
private updateTitle() { private updateTitle() {
this.translateService.get("NewJump_Title").subscribe( this.translateService.get("NewJump_Title").subscribe(
data => { this.serviceComm.UpdatedComponentTitle(data); } data => { this.serviceComm.updatedComponentTitle(data); }
); );
} }
} }

2
Front/skydivelogs-app/src/app/summary/summary.component.ts
View File

@@ -129,7 +129,7 @@ export class SummaryComponent implements OnInit {
private updateTitle() { private updateTitle() {
this.translateService.get("Summary_Title").subscribe( this.translateService.get("Summary_Title").subscribe(
data => { this.serviceComm.UpdatedComponentTitle(data); } data => { this.serviceComm.updatedComponentTitle(data); }
); );
} }
} }

2
Front/skydivelogs-app/src/services/aircraft.service.ts
View File

@@ -26,7 +26,7 @@ export class AircraftService extends BaseService {
return this.serviceCacheApi.get<Array<AircraftResp>>(CacheApiKey.Aircraft, callToApi); return this.serviceCacheApi.get<Array<AircraftResp>>(CacheApiKey.Aircraft, callToApi);
} }
public AddAircraft(aircraftName: string, dataImg: string) { public addAircraft(aircraftName: string, dataImg: string) {
const bodyNewAircraft: AircraftReq = { const bodyNewAircraft: AircraftReq = {
id: 0, id: 0,
name: aircraftName, name: aircraftName,

4
Front/skydivelogs-app/src/services/date.service.ts
View File

@@ -8,7 +8,7 @@ export class DateService {
this.milliSeconInDay = 1000 * 60 * 60 * 24; this.milliSeconInDay = 1000 * 60 * 60 * 24;
} }
public AddDays(currentDate: Date, nbDays: number): Date { public addDays(currentDate: Date, nbDays: number): Date {
const totalMilliSeconds = nbDays * this.milliSeconInDay; const totalMilliSeconds = nbDays * this.milliSeconInDay;
const currentTime = currentDate.getTime(); const currentTime = currentDate.getTime();
const tmpDate = new Date(currentDate.getTime()); const tmpDate = new Date(currentDate.getTime());
@@ -18,7 +18,7 @@ export class DateService {
return tmpDate; return tmpDate;
} }
public DiffBetweenDates(beginDate: Date, endDate: Date): number { public diffBetweenDates(beginDate: Date, endDate: Date): number {
const diffInTime = endDate.getTime() - beginDate.getTime(); const diffInTime = endDate.getTime() - beginDate.getTime();
const diffInDays = Math.round(diffInTime / (1000 * 3600 * 24)); const diffInDays = Math.round(diffInTime / (1000 * 3600 * 24));

6
Front/skydivelogs-app/src/services/dropzone.service.ts
View File

@@ -30,7 +30,7 @@ export class DropzoneService extends BaseService {
return this.serviceCacheApi.get<Array<DropZoneResp>>(CacheApiKey.Dropzone, callToApi); return this.serviceCacheApi.get<Array<DropZoneResp>>(CacheApiKey.Dropzone, callToApi);
} }
public SetFavoriteDropZone(selectedDz: DropZoneResp) { public setFavoriteDropZone(selectedDz: DropZoneResp) {
selectedDz.isFavorite = true; selectedDz.isFavorite = true;
this.http.put(`${this.apiUrl}/DropZone/AddToFavorite/${selectedDz.id}`, this.http.put(`${this.apiUrl}/DropZone/AddToFavorite/${selectedDz.id}`,
@@ -41,7 +41,7 @@ export class DropzoneService extends BaseService {
}); });
} }
public RemoveFavoriteDropZone(selectedDz: DropZoneResp) { public removeFavoriteDropZone(selectedDz: DropZoneResp) {
selectedDz.isFavorite = false; selectedDz.isFavorite = false;
this.http.put(`${this.apiUrl}/DropZone/RemoveToFavorite${selectedDz.id}`, this.http.put(`${this.apiUrl}/DropZone/RemoveToFavorite${selectedDz.id}`,
@@ -52,7 +52,7 @@ export class DropzoneService extends BaseService {
}); });
} }
public AddDropZone(latitude: string, public addDropZone(latitude: string,
longitude: string, longitude: string,
name: string, name: string,
address: string, address: string,

2
Front/skydivelogs-app/src/services/gear.service.ts
View File

@@ -19,7 +19,7 @@ export class GearService extends BaseService {
return this.serviceCacheApi.get<Array<GearResp>>(CacheApiKey.Gear, callToApi); return this.serviceCacheApi.get<Array<GearResp>>(CacheApiKey.Gear, callToApi);
} }
public AddGear(name: string, public addGear(name: string,
manufacturer: string, manufacturer: string,
minSize: number, minSize: number,
maxSize: number, maxSize: number,

2
Front/skydivelogs-app/src/services/image.service.ts
View File

@@ -18,7 +18,7 @@ export class ImageService extends BaseService {
}); });
} }
public AddImage(commentImg: string, dataImg: string) { public addImage(commentImg: string, dataImg: string) {
const bodyNewImage: ImageReq = { const bodyNewImage: ImageReq = {
id: 0, id: 0,
comment: commentImg, comment: commentImg,

2
Front/skydivelogs-app/src/services/jump-type.service.ts
View File

@@ -19,7 +19,7 @@ export class JumpTypeService extends BaseService {
return this.serviceCacheApi.get<Array<JumpTypeResp>>(CacheApiKey.JumpType, callToApi); return this.serviceCacheApi.get<Array<JumpTypeResp>>(CacheApiKey.JumpType, callToApi);
} }
public AddJumpType(jumptypetName: string) { public addJumpType(jumptypetName: string) {
const bodyJumpType: JumpTypeReq = { const bodyJumpType: JumpTypeReq = {
id: 0, id: 0,
name: jumptypetName name: jumptypetName

34
Front/skydivelogs-app/src/services/jump.service.ts
View File

@@ -1,7 +1,7 @@
import { Injectable } from "@angular/core"; import { Injectable } from "@angular/core";
import { HttpClient } from "@angular/common/http"; import { HttpClient } from "@angular/common/http";
import { DatePipe } from '@angular/common'; import { DatePipe } from '@angular/common';
import { forkJoin, Observable, of } from "rxjs"; import { forkJoin, Observable } from "rxjs";
import { map } from "rxjs/operators"; import { map } from "rxjs/operators";
import { JumpResp, JumpReq, Jump } from "../models/jump"; import { JumpResp, JumpReq, Jump } from "../models/jump";
@@ -32,20 +32,18 @@ export class JumpService extends BaseService {
super(); super();
} }
public GetListOfJumps(): Observable<Array<Jump>> { public getListOfJumps(): Observable<Array<Jump>> {
return this.http.get<Array<JumpResp>>(`${this.apiUrl}/Jump`, return this.http.get<Array<JumpResp>>(`${this.apiUrl}/Jump`, { headers: this.headers })
{ headers: this.headers })
.pipe(map((response) => { .pipe(map((response) => {
return this.MapWithDataInCache(response); return this.mapWithDataInCache(response);
})); }));
} }
public GetJumps(beginIndex: number, endIndex: number): Observable<JumpList> { public getJumps(beginIndex: number, endIndex: number): Observable<JumpList> {
return this.http.get<JumpListResp>(`${this.apiUrl}/Jump/${beginIndex}/${endIndex}`, return this.http.get<JumpListResp>(`${this.apiUrl}/Jump/${beginIndex}/${endIndex}`, { headers: this.headers })
{ headers: this.headers })
.pipe(map((response) => { .pipe(map((response) => {
let result: JumpList = { let result: JumpList = {
rows: this.MapWithDataInCache(response.rows), rows: this.mapWithDataInCache(response.rows),
count: response.count count: response.count
}; };
@@ -53,7 +51,7 @@ export class JumpService extends BaseService {
})); }));
} }
public AddListOfJump(selectedJumpType: number, public addListOfJump(selectedJumpType: number,
selectedAircraft: number, selectedAircraft: number,
selectedDz: number, selectedDz: number,
selectedRig: number, selectedRig: number,
@@ -66,11 +64,11 @@ export class JumpService extends BaseService {
notes: string, notes: string,
isSpecial: boolean): Observable<any[]> { isSpecial: boolean): Observable<any[]> {
this.callsToAdd = new Array<Observable<any>>(); this.callsToAdd = new Array<Observable<any>>();
const diffInDays = this.dateService.DiffBetweenDates(beginDate, endDate) + 1; const diffInDays = this.dateService.diffBetweenDates(beginDate, endDate) + 1;
const countOfJumpsPerDay = Math.trunc(countOfJumps / diffInDays); const countOfJumpsPerDay = Math.trunc(countOfJumps / diffInDays);
for (let i = 1; beginDate.getTime() < endDate.getTime(); i++) { for (let i = 1; beginDate.getTime() < endDate.getTime(); i++) {
this.AddJumps(selectedJumpType, this.addJumps(selectedJumpType,
selectedAircraft, selectedAircraft,
selectedDz, selectedDz,
selectedRig, selectedRig,
@@ -82,12 +80,12 @@ export class JumpService extends BaseService {
notes, notes,
isSpecial); isSpecial);
beginDate = this.dateService.AddDays(beginDate, 1); beginDate = this.dateService.addDays(beginDate, 1);
} }
const restfJumps = countOfJumps - countOfJumpsPerDay * (diffInDays - 1); const restfJumps = countOfJumps - countOfJumpsPerDay * (diffInDays - 1);
this.AddJumps(selectedJumpType, this.addJumps(selectedJumpType,
selectedAircraft, selectedAircraft,
selectedDz, selectedDz,
selectedRig, selectedRig,
@@ -102,13 +100,13 @@ export class JumpService extends BaseService {
return forkJoin(this.callsToAdd); return forkJoin(this.callsToAdd);
} }
public DeleteJump(item: Jump) { public deleteJump(item: Jump) {
this.http.delete(`${this.apiUrl}/Jump/${item.id}`, this.http.delete(`${this.apiUrl}/Jump/${item.id}`,
{ headers: this.headers, }) { headers: this.headers, })
.subscribe(); .subscribe();
} }
public UpdateJump(id: number, public updateJump(id: number,
isSpecial: boolean, isSpecial: boolean,
withCutaway: boolean, withCutaway: boolean,
notes: string) { notes: string) {
@@ -125,7 +123,7 @@ export class JumpService extends BaseService {
{ headers: this.headers, }); { headers: this.headers, });
} }
private AddJumps(selectedJumpType: number, private addJumps(selectedJumpType: number,
selectedAircraft: number, selectedAircraft: number,
selectedDz: number, selectedDz: number,
selectedRig: number, selectedRig: number,
@@ -157,7 +155,7 @@ export class JumpService extends BaseService {
} }
} }
private MapWithDataInCache(apiResp: Array<JumpResp>): Array<Jump> { private mapWithDataInCache(apiResp: Array<JumpResp>): Array<Jump> {
let allDropzones: Array<DropZoneResp>; let allDropzones: Array<DropZoneResp>;
this.dropzoneService.getFromCache().subscribe(data => { allDropzones = data; }); this.dropzoneService.getFromCache().subscribe(data => { allDropzones = data; });
let allAircrafts: Array<AircraftResp>; let allAircrafts: Array<AircraftResp>;

3
Front/skydivelogs-app/src/services/service-cache-api.service.ts
View File

@@ -15,7 +15,6 @@ export class ServiceCacheApi {
} }
public get<T>(key: CacheApiKey, callToApi: Observable<T>) : Observable<T> { public get<T>(key: CacheApiKey, callToApi: Observable<T>) : Observable<T> {
// console.log(`Get/push cache : ${CacheApiKey[key]}`);
const cached = this.cache.get(key); const cached = this.cache.get(key);
if (cached) { if (cached) {
@@ -29,12 +28,10 @@ export class ServiceCacheApi {
} }
public delete(key: CacheApiKey) { public delete(key: CacheApiKey) {
// console.log(`Delete cache : ${CacheApiKey[key]}`);
this.cache.delete(key); this.cache.delete(key);
} }
public getByKey<T>(key: CacheApiKey) : Observable<T> { public getByKey<T>(key: CacheApiKey) : Observable<T> {
// console.log(`Get cache by key : ${CacheApiKey[key]}`);
return this.cache.get(key); return this.cache.get(key);
} }
} }