From 9d07b8ad8274efdb94d279c6c3909b6106e088e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Danyi=20D=C3=A1vid?= <danyi.david@gmail.com>
Date: Mon, 28 Jan 2019 12:42:46 +0100
Subject: [PATCH] * maintenance by year passed correclty in frontend

---
 .../list-all-maintenances.component.html                      | 2 +-
 .../list-all-maintenances/list-all-maintenances.component.ts  | 2 +-
 src/app/maintenance/maintenance-manager.service.ts            | 4 ++++
 src/app/maintenance/maintenance-resolver.service.ts           | 3 ++-
 src/app/maintenance/maintenance-routing.module.ts             | 2 +-
 .../upcoming-maintenances.component.html                      | 2 +-
 .../upcoming-maintenances/upcoming-maintenances.component.ts  | 2 ++
 7 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/app/maintenance/list-all-maintenances/list-all-maintenances.component.html b/src/app/maintenance/list-all-maintenances/list-all-maintenances.component.html
index 4b39cb0..ce80f43 100644
--- a/src/app/maintenance/list-all-maintenances/list-all-maintenances.component.html
+++ b/src/app/maintenance/list-all-maintenances/list-all-maintenances.component.html
@@ -28,7 +28,7 @@
                                         <i class="file pdf outline icon"></i>
                                     </a>
                                     <i *ngIf="!hasPdf(task)" class="icon {{taskIcon(task)}}"></i>
-                                    <a *ngIf="canModify()" [routerLink]="['/karbantartas/szerkesztes', task.hash]"
+                                    <a *ngIf="canModify()" [routerLink]="['/karbantartas/szerkesztes', year, task.hash]"
                                        title="Szerkesztés">{{task?.shouldStartAt}}</a>
                                     <ng-container *ngIf="!canModify()">{{task?.shouldStartAt}}</ng-container>
                                 </div>
diff --git a/src/app/maintenance/list-all-maintenances/list-all-maintenances.component.ts b/src/app/maintenance/list-all-maintenances/list-all-maintenances.component.ts
index f3681a9..9cf73c1 100644
--- a/src/app/maintenance/list-all-maintenances/list-all-maintenances.component.ts
+++ b/src/app/maintenance/list-all-maintenances/list-all-maintenances.component.ts
@@ -15,7 +15,7 @@ import { RoleGuardService } from "../../auth/role-guard.service";
 })
 export class ListAllMaintenancesComponent implements OnInit {
 
-    public year: number = 2018;
+    public year: number = 2019;
     private today: string = "";
 
     constructor(private maintenanceManager: MaintenanceManagerService,
diff --git a/src/app/maintenance/maintenance-manager.service.ts b/src/app/maintenance/maintenance-manager.service.ts
index 1e14b56..07f412d 100644
--- a/src/app/maintenance/maintenance-manager.service.ts
+++ b/src/app/maintenance/maintenance-manager.service.ts
@@ -51,6 +51,10 @@ export class MaintenanceManagerService {
         return this.httpClient.get<MaintenanceEntity>(`${MaintenanceManagerService.apiEndpoint}/${hash}`);
     }
 
+    public getByIdAndYear(hash: string, year: number): Observable<MaintenanceEntity> {
+        return this.httpClient.get<MaintenanceEntity>(`${MaintenanceManagerService.apiEndpoint}/${year}/${hash}`);
+    }
+
     public update(maintenance: MaintenanceEntity) {
         return this.httpClient.put<MaintenanceEntity>(`${MaintenanceManagerService.apiEndpoint}/${maintenance.hash}`, maintenance);
     }
diff --git a/src/app/maintenance/maintenance-resolver.service.ts b/src/app/maintenance/maintenance-resolver.service.ts
index e5807df..ea42114 100644
--- a/src/app/maintenance/maintenance-resolver.service.ts
+++ b/src/app/maintenance/maintenance-resolver.service.ts
@@ -17,6 +17,7 @@ export class MaintenanceResolverService {
      * @returns {Promise<MaintenanceEntity>}
      */
     resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Promise<MaintenanceEntity> {
-        return this.maintenanceManager.get(route.params.id).toPromise();
+//        return this.maintenanceManager.get(route.params.id).toPromise();
+        return this.maintenanceManager.getByIdAndYear(route.params.id, route.params.year).toPromise();
     }
 }
diff --git a/src/app/maintenance/maintenance-routing.module.ts b/src/app/maintenance/maintenance-routing.module.ts
index a8c93aa..4926fd8 100644
--- a/src/app/maintenance/maintenance-routing.module.ts
+++ b/src/app/maintenance/maintenance-routing.module.ts
@@ -72,7 +72,7 @@ const routes: Routes = [
             filter: 'calendar',
         },
     }, {
-        path: 'karbantartas/szerkesztes/:id',
+        path: 'karbantartas/szerkesztes/:year/:id',
         component: EditMaintenanceComponent,
         canActivate: [AuthGuardService, RoleGuardService],
         resolve: {
diff --git a/src/app/maintenance/upcoming-maintenances/upcoming-maintenances.component.html b/src/app/maintenance/upcoming-maintenances/upcoming-maintenances.component.html
index ebca195..bcd1fa5 100644
--- a/src/app/maintenance/upcoming-maintenances/upcoming-maintenances.component.html
+++ b/src/app/maintenance/upcoming-maintenances/upcoming-maintenances.component.html
@@ -18,7 +18,7 @@
                     <td *ngIf="canModify()" class="collapsing icon">
                         <a *ngIf="hasMaintenanceSheet(task)" title="PDF letöltés"
                            [href]="maintenancePdfUrl(task)" target="_blank"><i class="file pdf outline icon"></i></a>
-                        <a [routerLink]="['/karbantartas/szerkesztes', task.hash]"
+                        <a [routerLink]="['/karbantartas/szerkesztes', year, task.hash]"
                            title="Szerkesztés"><i class="fitted pencil icon"></i></a>
                     </td>
                     <td class="collapsing">{{device.name}}</td>
diff --git a/src/app/maintenance/upcoming-maintenances/upcoming-maintenances.component.ts b/src/app/maintenance/upcoming-maintenances/upcoming-maintenances.component.ts
index 291c5ff..a66e506 100644
--- a/src/app/maintenance/upcoming-maintenances/upcoming-maintenances.component.ts
+++ b/src/app/maintenance/upcoming-maintenances/upcoming-maintenances.component.ts
@@ -17,12 +17,14 @@ export class UpcomingMaintenancesComponent implements OnInit {
     @Input() warnWhenPast: boolean = true;
     @Input() maintenances: Array<DeviceGroup> = [];
     private today: string = "";
+    public year: number;
 
     constructor(
         private roleGuard: RoleGuardService,
         private maintenanceManager: MaintenanceManagerService
     ) {
         this.today = (new Date()).toISOString().substring(0, 10);
+        this.year = new Date().getFullYear();
     }
 
     ngOnInit() {