Fix id comparison for specific pupil view

Author: raspyweather

src/app/class/class.component.html

@@ -13,7 +13,7 @@ <h1>Klassenübersicht</h1>
           <th>Klassenstufe</th>
           <th></th>
         </tr>
-        <tr class="clickable" *ngFor="let cl of dataService.getClasses()" routerLink="/class/{{cl.id}}">
+        <tr class="clickable" *ngFor="let cl of dataService.getClassesVisible()" routerLink="/class/{{cl.id}}">
           <td>{{cl.name}}</td>
           <td>{{cl.grade}}</td>
           <td>

src/app/notes/notes.component.ts

@@ -1,8 +1,8 @@
-import {Component, OnInit, OnDestroy, ViewChild} from '@angular/core';
-import {ActivatedRoute, Router} from "@angular/router";
-import {DataService} from "../data.service";
-import {NgbModal} from "@ng-bootstrap/ng-bootstrap";
-import {Location} from "@angular/common";
+import { Component, OnInit, OnDestroy, ViewChild } from '@angular/core';
+import { ActivatedRoute, Router } from "@angular/router";
+import { DataService } from "../data.service";
+import { NgbModal } from "@ng-bootstrap/ng-bootstrap";
+import { Location } from "@angular/common";
 
 @Component({
   selector: 'app-notes',
@@ -17,21 +17,21 @@ export class NotesComponent implements OnInit, OnDestroy {
   notes: any;
   interval: any;
 
-  model: any = {pupilId: -1, teacherId: -1, text: "", date: new Date()};
+  model: any = { pupilId: -1, teacherId: -1, text: "", date: new Date() };
 
   constructor(private route: ActivatedRoute,
-              private dataService: DataService,
-              private modalService: NgbModal,
-              private router: Router,
-              private location: Location) {
+    private dataService: DataService,
+    private modalService: NgbModal,
+    private router: Router,
+    private location: Location) {
   }
 
   ngOnInit() {
     this.sub = this.route.params.subscribe(params => {
       this.id = +params['id']; //get ID from route parameter
       if (!this.overview()) {
         this.model = this.dataService.getNote(this.id);
-        if(this.model)
+        if (this.model)
           this.convertToModelDate(this.model.date);
       }
       this.pupilId = +params['pId'];
@@ -52,7 +52,7 @@ export class NotesComponent implements OnInit, OnDestroy {
   }
 
   goBack() {
-    if(this.pupilView()) {
+    if (this.pupilView()) {
       this.router.navigate(['/notes/pupil', this.pupilId]);
     }
     else
@@ -84,23 +84,23 @@ export class NotesComponent implements OnInit, OnDestroy {
 
   getNotes() {
     let n = this.dataService.getNotes();
-    if (this.pupilId)
-      return n.filter(e => e.id === this.pupilId);
+    if (!isNaN(this.pupilId))
+      return n.filter(e => e.pupilId == this.pupilId);
     else
       return n;
   }
 
   convertToModelDate(d) {
-    this.model.datePicker = {year: d.getFullYear(), month: d.getMonth() + 1, day: d.getDate()};
-    this.model.time = {hour: d.getHours(), minute: d.getMinutes()};
+    this.model.datePicker = { year: d.getFullYear(), month: d.getMonth() + 1, day: d.getDate() };
+    this.model.time = { hour: d.getHours(), minute: d.getMinutes() };
   }
 
   @ViewChild('addNote') addNote;
 
   add() {
     let d = new Date();
     this.convertToModelDate(d);
-    if(this.pupilId)
+    if (!isNaN(this.pupilId))
       this.model.pupilId = this.pupilId;
     this.modalService.open(this.addNote).result.then((res) => {
       if (res) { //if modal got closed with data
@@ -120,11 +120,11 @@ export class NotesComponent implements OnInit, OnDestroy {
   @ViewChild('deleteQuestion') deleteQuestion; //get template from HTML
   delete(id) {
     this.modalService.open(this.deleteQuestion).result.then((reallyDelete) => {
-        if (reallyDelete)
-          this.dataService.removeNote(id);
-        //workaround because for some reason it wants to open the detail page, but doesn't do it on any other overview page
-        this.location.back(); //TODO: fix this
-      },
+      if (reallyDelete)
+        this.dataService.removeNote(id);
+      //workaround because for some reason it wants to open the detail page, but doesn't do it on any other overview page
+      this.location.back(); //TODO: fix this
+    },
       (reason) => { //dismissed
       });
   }

src/app/pupil/pupil.component.html

@@ -106,7 +106,7 @@ <h4 class="modal-title">Wirklich löschen?</h4>
     <label class="control-label col-sm-4" for="class">Klasse:</label>
     <div class="col-sm-8">
       <select class="form-control" id="class" [(ngModel)]="model.classId" required>
-        <option *ngFor="let class of dataService.getClasses()" [value]="class.id">{{class.name}}</option>
+        <option *ngFor="let class of dataService.getClassesVisible()" [value]="class.id">{{class.name}}</option>
       </select>
     </div>
   </div>