diff --git a/agridator-frontend/README.md b/agridator-frontend/README.md index 5db165e..bf240b1 100644 --- a/agridator-frontend/README.md +++ b/agridator-frontend/README.md @@ -1,3 +1,4 @@ + # AgridatorFrontend This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 15.2.4. diff --git a/agridator-frontend/src/app/components/feldkalender/feldkalender.component.html b/agridator-frontend/src/app/components/feldkalender/feldkalender.component.html index 1510c5f..5174ae6 100644 --- a/agridator-frontend/src/app/components/feldkalender/feldkalender.component.html +++ b/agridator-frontend/src/app/components/feldkalender/feldkalender.component.html @@ -1,5 +1,5 @@

{{'feldkalender.Title' | translate}}

-
- {{feldkalenderItem}} +
+ {{feldkalenderDto.todo}}
diff --git a/agridator-frontend/src/app/components/feldkalender/feldkalender.component.ts b/agridator-frontend/src/app/components/feldkalender/feldkalender.component.ts index 705d7ed..271b226 100644 --- a/agridator-frontend/src/app/components/feldkalender/feldkalender.component.ts +++ b/agridator-frontend/src/app/components/feldkalender/feldkalender.component.ts @@ -1,6 +1,7 @@ import { Component, OnInit } from '@angular/core'; import { LocalStorageService } from 'src/app/service/local-storage.service'; import {TranslateService} from "@ngx-translate/core"; +import { FeldkalenderDto } from 'src/app/dto/feldkalender-dto'; @Component({ selector: 'app-feldkalender', @@ -9,7 +10,7 @@ import {TranslateService} from "@ngx-translate/core"; }) export class FeldkalenderComponent implements OnInit { - feldkalenderArray?: string[]; + feldkalenderArray?: FeldkalenderDto[]; constructor(private localStorageService: LocalStorageService, private translate: TranslateService) {} diff --git a/agridator-frontend/src/app/components/post-tracking-infos/post-tracking-infos.component.ts b/agridator-frontend/src/app/components/post-tracking-infos/post-tracking-infos.component.ts index 78170d5..de441be 100644 --- a/agridator-frontend/src/app/components/post-tracking-infos/post-tracking-infos.component.ts +++ b/agridator-frontend/src/app/components/post-tracking-infos/post-tracking-infos.component.ts @@ -2,6 +2,7 @@ import { DOCUMENT } from '@angular/common'; import { Component, ElementRef, Renderer2, ViewChild } from '@angular/core'; import { Router } from '@angular/router'; import { Inject } from "@angular/core" +import { FeldkalenderDto } from 'src/app/dto/feldkalender-dto'; import { LocalStorageService } from 'src/app/service/local-storage.service'; import { DataService } from './../../service/data.service'; @@ -84,7 +85,10 @@ export class PostTrackingInfosComponent { moveToCalendar() { - this.localStorageService.setFeldkalender(['todo']); + const feldkalenderArray = this.localStorageService.getFeldkalender(); + const feldkalenderDto = new FeldkalenderDto(); + feldkalenderArray.push(feldkalenderDto); + this.localStorageService.setFeldkalender(feldkalenderArray); this.router.navigate(["/feldkalender"]) } } diff --git a/agridator-frontend/src/app/components/tracking/tracking.component.ts b/agridator-frontend/src/app/components/tracking/tracking.component.ts index 92a5b71..9f52446 100644 --- a/agridator-frontend/src/app/components/tracking/tracking.component.ts +++ b/agridator-frontend/src/app/components/tracking/tracking.component.ts @@ -9,7 +9,7 @@ import { Router } from '@angular/router'; export class TrackingComponent { points: any[] = []; tracking = false; - interval = 5000; + interval = 1000; timer: any = null; config: any = null; constructor(private router: Router) { @@ -77,7 +77,7 @@ export class TrackingComponent { }) } - moveToPreTracking() + moveToPreTracking() { this.router.navigate(["/pre-tracking-infos"]) } diff --git a/agridator-frontend/src/app/dto/feldkalender-dto.ts b/agridator-frontend/src/app/dto/feldkalender-dto.ts index 36973b6..c5e6bb8 100644 --- a/agridator-frontend/src/app/dto/feldkalender-dto.ts +++ b/agridator-frontend/src/app/dto/feldkalender-dto.ts @@ -1,2 +1,4 @@ export class FeldkalenderDto { + + todo = 'todo'; } diff --git a/agridator-frontend/src/app/service/local-storage.service.ts b/agridator-frontend/src/app/service/local-storage.service.ts index 68ef464..f2fff6c 100644 --- a/agridator-frontend/src/app/service/local-storage.service.ts +++ b/agridator-frontend/src/app/service/local-storage.service.ts @@ -1,4 +1,5 @@ import { Injectable } from '@angular/core'; +import { FeldkalenderDto } from '../dto/feldkalender-dto'; @Injectable({ providedIn: 'root' @@ -7,15 +8,15 @@ export class LocalStorageService { constructor() { } - setFeldkalender(feldkalender: string[]) { + setFeldkalender(feldkalender: FeldkalenderDto[]) { localStorage.setItem('feldkalender', JSON.stringify(feldkalender)); } - getFeldkalender(): string[] | undefined { + getFeldkalender(): FeldkalenderDto[] { const feldkalender = localStorage.getItem('feldkalender'); if (feldkalender) { return JSON.parse(feldkalender); } - return ['bla', 'bla', 'bla']; + return []; } }