add note filtering

Author: LeoDJ

src/app/app-routing.module.ts

@@ -21,7 +21,7 @@ const routes: Routes = [
     { path: 'pupil/:id',        component: PupilComponent,     canActivate: [LoginService] },
     { path: 'notes',            component: NotesComponent,     canActivate: [LoginService] },
     { path: 'notes/:id',        component: NotesComponent,     canActivate: [LoginService] },
-    { path: 'notes/pupil/:pId', component: NotesComponent,     canActivate: [LoginService] },
+    { path: 'notes/pupil/:pId', component: NotesComponent,     canActivate: [LoginService], data: [{filter: 'pupil'}] },
     { path: 'dashboard',        component: DashboardComponent, canActivate: [LoginService] }
 ];
 

src/app/data.service.ts

@@ -86,6 +86,11 @@ export class DataService {
     return this.getTeachers().find(x => x.mail.toLowerCase() == mail.toLowerCase());
   }
 
+  getTeacherName(id) {
+    let t = this.getTeacher(id);
+    return t.firstName + " " + t.lastName;
+  }
+
   removeTeacher(id) {
     let teachers = this.getTeachers();
     teachers = teachers.filter(e => e.id !== id);
@@ -184,6 +189,11 @@ export class DataService {
     return pupils.filter(e => e.id == id)[0];
   }
 
+  getPupilName(id) {
+    let p = this.getPupil(id);
+    return p.firstName + " " + p.lastName;
+  }
+
   addPupil(firstName, lastName, classId) {
     let pupils = this.getPupils();
     let id = Math.max.apply(this, pupils.map(e => e.id)) + 1; //generate new id

src/app/notes/notes.component.html

@@ -1,6 +1,7 @@
 <div *ngIf="!id">
   <div class="container">
-    <h1>Einträgeübersicht</h1>
+    <h1 *ngIf="!pupilId">Einträgeübersicht</h1>
+    <h1 *ngIf="pupilId" >Einträgeübersicht für {{dataService.getPupilName(pupilId)}}</h1>
     <div class="row row-spacing">
       <button class="btn btn-success" (click)="add()">
         <i class="fa fa-plus" aria-hidden="true"></i>
@@ -15,7 +16,7 @@ <h1>Einträgeübersicht</h1>
           <th>Datum</th>
           <th></th>
         </tr>
-        <tr class="clickable" *ngFor="let note of dataService.getNotes()" routerLink="/notes/{{note.id}}">
+        <tr class="clickable" *ngFor="let note of getNotes()" routerLink="/notes/{{note.id}}">
           <td>{{dataService.getNotePupilName(note.id)}}</td>
           <td>{{dataService.getNoteTeacherName(note.id)}}</td>
           <td>

src/app/notes/notes.component.ts

@@ -12,6 +12,7 @@ import {Location} from "@angular/common";
 export class NotesComponent implements OnInit, OnDestroy {
 
   private id: string;
+  private pupilId: string;
   private sub: any;
   notes: any;
   interval: any;
@@ -32,6 +33,7 @@ export class NotesComponent implements OnInit, OnDestroy {
         this.model = this.dataService.getNote(this.id);
         this.convertToModelDate(this.model.date);
       }
+      this.pupilId = params['pId'];
     });
   }
 
@@ -71,13 +73,21 @@ export class NotesComponent implements OnInit, OnDestroy {
     console.log(l);
   }
 
-  @ViewChild('addNote') addNote;
+  getNotes() {
+    let n = this.dataService.getNotes();
+    if (this.pupilId)
+      return n.filter(e => e.id === this.pupilId);
+    else
+      return n;
+  }
 
   convertToModelDate(d) {
     this.model.datePicker = {year: d.getFullYear(), month: d.getMonth() + 1, day: d.getDay() + 1};
     this.model.time = {hour: d.getHours(), minute: d.getMinutes()};
   }
 
+  @ViewChild('addNote') addNote;
+
   add() {
     let d = new Date();
     this.convertToModelDate(d);