JoeKung/Progetto-m152-Angular
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
tito
2023-05-03 11:04:50 +02:00
parent 452bf3febf 41589eb467
commit 3aa6f513d3
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/app/component/management/management.component.ts
View File

@@ -23,7 +23,7 @@ export class ManagementComponent implements OnInit {
showWaypointForm: boolean = false; showWaypointForm: boolean = false;
newUser: UserEntity = {name: "", password: "", username: ""}; newUser: UserEntity = {name: "", password: "", username: ""};
newLocation: LocationEntity = {lat: 0, location: "", lon: 0, region: ""}; newLocation: LocationEntity = {location: "", lat: 0, lon: 0, region: ""};
newWaypoint: WaypointsEntity = {description: "", img: "", lat: 0, locationName: "", lon: 0, name: ""}; newWaypoint: WaypointsEntity = {description: "", img: "", lat: 0, locationName: "", lon: 0, name: ""};
locations: LocationEntity[] | undefined; locations: LocationEntity[] | undefined;
@@ -32,7 +32,6 @@ export class ManagementComponent implements OnInit {
translations: managementTranslations = {} as managementTranslations translations: managementTranslations = {} as managementTranslations
constructor( constructor(
private route: ActivatedRoute, private route: ActivatedRoute,
private locationService: LocationService, private locationService: LocationService,
@@ -57,7 +56,7 @@ export class ManagementComponent implements OnInit {
} }
addUser(name: string, username: string, password: string) { addUser(name: string, username: string, password: string) {
this.newUser = { name: name, username: username, password: password}; this.newUser = {name: name, username: username, password: password};
this.userService.createUser(this.newUser).subscribe(user => { this.userService.createUser(this.newUser).subscribe(user => {
this.users?.push(user); this.users?.push(user);
}); });
@@ -66,6 +65,8 @@ export class ManagementComponent implements OnInit {
addLocation(name: string, region: string, lat: number, lon: number) { addLocation(name: string, region: string, lat: number, lon: number) {
this.newLocation = {location: name, region: region, lat: lat, lon: lon}; this.newLocation = {location: name, region: region, lat: lat, lon: lon};
console.log("newLocation")
console.log(this.newLocation);
this.locationService.createLocation(this.newLocation).subscribe(location => { this.locationService.createLocation(this.newLocation).subscribe(location => {
this.locations?.push(location); this.locations?.push(location);
}); });
@@ -73,7 +74,14 @@ export class ManagementComponent implements OnInit {
} }
addWaypoint(name: string, lat: number, lon: number, description: string, image: string, locationName: string) { addWaypoint(name: string, lat: number, lon: number, description: string, image: string, locationName: string) {
this.newWaypoint = {description: description, img: image, lat: lat, locationName: locationName, lon: lon, name: name} this.newWaypoint = {
description: description,
img: image,
lat: lat,
locationName: locationName,
lon: lon,
name: name
}
this.waypointService.createWaypoint(this.newWaypoint).subscribe(waypoint => { this.waypointService.createWaypoint(this.newWaypoint).subscribe(waypoint => {
this.waypoints?.push(waypoint); this.waypoints?.push(waypoint);
}); });
@@ -125,6 +133,4 @@ export class ManagementComponent implements OnInit {
this.translations.add = await this.translateService.getData(this.translations.add, lang); this.translations.add = await this.translateService.getData(this.translations.add, lang);
this.translations.close = await this.translateService.getData(this.translations.close, lang); this.translations.close = await this.translateService.getData(this.translations.close, lang);
} }
protected readonly String = String;
} }