change ID from string to number

Author: LeoDJ

src/app/class/class.component.html

@@ -1,4 +1,4 @@
-<div *ngIf="!id">
+<div *ngIf="overview()">
   <div class="container">
     <h1>Klassenübersicht</h1>
     <div class="row row-spacing">
@@ -48,7 +48,7 @@ <h4 class="modal-title">Klasse hinzufügen</h4>
 </div>
 
 
-<div *ngIf="id">
+<div *ngIf="!overview()">
   <div class="container">
     <h1>Klasse bearbeiten</h1>
     <form class="form-horizontal" (ngSubmit)="update(id)" #modifyClassForm="ngForm">

src/app/class/class.component.ts

@@ -10,7 +10,7 @@ import {NgbModal} from "@ng-bootstrap/ng-bootstrap";
 })
 export class ClassComponent implements OnInit, OnDestroy {
 
-  private id: string;
+  private id: number;
   private sub: any;
 
   model = {name: "", grade: 0, classTeacher: ""};
@@ -23,8 +23,8 @@ export class ClassComponent implements OnInit, OnDestroy {
 
   ngOnInit() {
     this.sub = this.route.params.subscribe(params => {
-      this.id = params['id']; //get ID from route parameter
-      if (this.id) {
+      this.id = +params['id']; //get ID from route parameter
+      if (!this.overview()) {
         this.model = this.dataService.getClass(this.id);
       }
     });
@@ -38,6 +38,10 @@ export class ClassComponent implements OnInit, OnDestroy {
     return !(this.model.name && this.model.grade);
   }
 
+  overview() {
+    return isNaN(this.id);
+  }
+
   @ViewChild('addClass') addClass;
   add() {
     this.modalService.open(this.addClass).result.then((res) => {

src/app/data.service.ts

@@ -46,6 +46,14 @@ export class DataService {
       {id: 2, firstName: 'Schüler', lastName: '3', classId: 1},
       {id: 3, firstName: 'Schüler', lastName: '4', classId: 2},
       {id: 4, firstName: 'Schüler', lastName: '5', classId: 3},
+    ]);
+    this.saveLocalstorage('notes', [
+      {id: 0, pupilId: 0, teacherId: 1, text: "Hat Mitschüler geschlagen.", date: new Date(1505400000000)},
+      {id: 1, pupilId: 0, teacherId: 2, text: "Hat Hausaufgaben 3 Mal nicht gemacht.", date: new Date(1505300000000)},
+      {id: 2, pupilId: 1, teacherId: 1, text: "Hat Tafel mit Edding bemalt.", date: new Date(1505200000000)},
+      {id: 3, pupilId: 1, teacherId: 2, text: "Hat Druckschrift anstatt Schreibschrift geschrieben. Strafarbeit: 5 Seiten Schreibschrift mit Füller.", date: new Date(1505100000000)},
+      {id: 4, pupilId: 1, teacherId: 1, text: "Hat \"Hosenscheißer\" zu Mitschüler gesagt.", date: new Date(1505000000000)},
+      {id: 5, pupilId: 3, teacherId: 3, text: "Schlägt Mitschülerin ins Gesicht.", date: new Date(1504900000000)},
     ])
   }
 
@@ -121,7 +129,7 @@ export class DataService {
   updateTeacher(id, fName, lName, mail) {
     let t = this.getTeachers();
     // password unset due to asynchronous encryption
-    t[id] = {id: id, firstName: fName, lastName: lName, mail: mail, pass: ''};
+    t[id] = {id: +id, firstName: fName, lastName: lName, mail: mail, pass: ''};
     this.saveLocalstorage('teachers', t);
   }
 
@@ -161,7 +169,7 @@ export class DataService {
 
   updateClass(id, name, grade) {
     let c = this.getClasses();
-    c[id] = {id: id, name: name, grade: grade};
+    c[id] = {id: +id, name: name, grade: grade};
     this.saveLocalstorage('classes', c);
   }
 
@@ -198,14 +206,14 @@ export class DataService {
     let pupils = this.getPupils();
     let id = Math.max.apply(this, pupils.map(e => e.id)) + 1; //generate new id
     if (id < 0) id = 0; //set id to zero, if no previous id was found
-    let p = {id: id, firstName: firstName, lastName: lastName, classId: classId};
+    let p = {id: id, firstName: firstName, lastName: lastName, classId: +classId};
     pupils.push(p);
     this.saveLocalstorage('pupils', pupils);
   }
 
   updatePupil(id, firstName, lastName, classId) {
     let p = this.getPupils();
-    p[id] = {id: id, firstName: firstName, lastName: lastName, classId: classId};
+    p[id] = {id: +id, firstName: firstName, lastName: lastName, classId: +classId};
     this.saveLocalstorage('pupils', p);
   }
 
@@ -228,7 +236,8 @@ export class DataService {
   getNotes() {
     let ret = this.getLocalstorage('notes');
     if (!ret) { //no data found in localstorage
-      return [];
+      this.generateInitialData();
+      return this.getNotes();
     }
     else {
       ret = ret.map(elem => {
@@ -239,7 +248,6 @@ export class DataService {
         this.notes = ret;
       return this.notes;
     }
-
   }
 
   getNote(id) {
@@ -275,14 +283,14 @@ export class DataService {
     let notes = this.getNotes();
     let id = Math.max.apply(this, notes.map(e => e.id)) + 1; //generate new id
     if (id < 0) id = 0; //set id to zero, if no previous id was found
-    let n = {id: id, pupilId: pupilId, teacherId: teacherId, text: text, date: date};
+    let n = {id: id, pupilId: +pupilId, teacherId: +teacherId, text: text, date: date};
     notes.push(n);
     this.saveLocalstorage('notes', notes);
   }
 
   updateNote(id, pupilId, teacherId, text, date) {
     let n = this.getNotes();
-    n[id] = {id: id, pupilId: pupilId, teacherId: teacherId, text: text, date: date};
+    n[id] = {id: +id, pupilId: +pupilId, teacherId: +teacherId, text: text, date: date};
     this.saveLocalstorage('notes', n);
   }
 

src/app/notes/notes.component.html

@@ -1,4 +1,4 @@
-<div *ngIf="!id">
+<div *ngIf="overview()">
   <div class="container">
     <h1 *ngIf="!pupilId">Einträgeübersicht</h1>
     <h1 *ngIf="pupilId" >Einträgeübersicht für {{dataService.getPupilName(pupilId)}}</h1>
@@ -57,7 +57,7 @@ <h4 class="modal-title">Eintrag hinzufügen</h4>
 </div>
 
 
-<div *ngIf="id">
+<div *ngIf="!overview()">
   <div class="container">
     <h1>Eintrag bearbeiten</h1>
     <form class="form-horizontal" (ngSubmit)="update(id)" #modifyNoteForm="ngForm">

src/app/notes/notes.component.ts

@@ -11,8 +11,8 @@ import {Location} from "@angular/common";
 })
 export class NotesComponent implements OnInit, OnDestroy {
 
-  private id: string;
-  private pupilId: string;
+  private id: number;
+  private pupilId: number;
   private sub: any;
   notes: any;
   interval: any;
@@ -28,12 +28,13 @@ export class NotesComponent implements OnInit, OnDestroy {
 
   ngOnInit() {
     this.sub = this.route.params.subscribe(params => {
-      this.id = params['id']; //get ID from route parameter
-      if (this.id) {
+      this.id = +params['id']; //get ID from route parameter
+      if (!this.overview()) {
         this.model = this.dataService.getNote(this.id);
-        this.convertToModelDate(this.model.date);
+        if(this.model)
+          this.convertToModelDate(this.model.date);
       }
-      this.pupilId = params['pId'];
+      this.pupilId = +params['pId'];
     });
   }
 
@@ -42,6 +43,10 @@ export class NotesComponent implements OnInit, OnDestroy {
     this.sub.unsubscribe();
   }
 
+  overview() {
+    return isNaN(this.id);
+  }
+
   goBack() {
     this.location.back();
   }
@@ -91,6 +96,8 @@ export class NotesComponent implements OnInit, OnDestroy {
   add() {
     let d = new Date();
     this.convertToModelDate(d);
+    if(this.pupilId)
+      this.model.pupilId = this.pupilId;
     this.modalService.open(this.addNote).result.then((res) => {
       if (res) { //if modal got closed with data
         let m = this.model;

src/app/pupil/pupil.component.html

@@ -1,4 +1,4 @@
-<div *ngIf="!id">
+<div *ngIf="overview()">
   <div class="container">
     <h1>Schülerübersicht</h1>
     <div class="row row-spacing">
@@ -56,7 +56,7 @@ <h4 class="modal-title">Schüler hinzufügen</h4>
 </div>
 
 
-<div *ngIf="id">
+<div *ngIf="!overview()">
   <div class="container">
     <h1>Schüler bearbeiten</h1>
     <form class="form-horizontal" (ngSubmit)="update(id)" #modifyPupilForm="ngForm">

src/app/pupil/pupil.component.ts

@@ -10,7 +10,7 @@ import {NgbModal} from "@ng-bootstrap/ng-bootstrap";
 })
 export class PupilComponent implements OnInit, OnDestroy {
 
-  private id: string;
+  private id: number;
   private sub: any;
 
   model = {firstName: "", lastName: "", classId: -1};
@@ -23,8 +23,8 @@ export class PupilComponent implements OnInit, OnDestroy {
 
   ngOnInit() {
     this.sub = this.route.params.subscribe(params => {
-      this.id = params['id']; //get ID from route parameter
-      if (this.id) {
+      this.id = +params['id']; //get ID from route parameter
+      if (!this.overview()) {
         this.model = this.dataService.getPupil(this.id);
       }
     });
@@ -39,8 +39,13 @@ export class PupilComponent implements OnInit, OnDestroy {
     return !(m.firstName && m.lastName && m.classId >= 0);
   }
 
+  overview() {
+    return isNaN(this.id);
+  }
+
   @ViewChild('addPupil') addPupil;
   add() {
+    console.log(this.model);
     this.modalService.open(this.addPupil).result.then((res) => {
       if (res) { //if modal got closed with data
         let m = this.model;

src/app/teacher/teacher.component.html

@@ -1,4 +1,4 @@
-<div *ngIf="!id">
+<div *ngIf="overview()">
   <div class="container">
     <h1>Lehrerübersicht</h1>
     <div class="row row-spacing">
@@ -50,7 +50,7 @@ <h4 class="modal-title">Lehrer hinzufügen</h4>
 </div>
 
 
-<div *ngIf="id">
+<div *ngIf="!overview()">
   <div class="container">
     <h1>Lehrer bearbeiten</h1>
     <form class="form-horizontal" (ngSubmit)="update(id)" #addTeacherForm="ngForm">

src/app/teacher/teacher.component.ts

@@ -12,7 +12,7 @@ import { NgbModal } from "@ng-bootstrap/ng-bootstrap";
 })
 export class TeacherComponent implements OnInit, OnDestroy {
 
-  id: string;
+  id: number;
   private sub: any;
 
   model = { firstName: "", lastName: "", mail: "", pass: "" };
@@ -26,8 +26,8 @@ export class TeacherComponent implements OnInit, OnDestroy {
 
   ngOnInit() {
     this.sub = this.route.params.subscribe(params => {
-      this.id = params['id']; //get ID from route parameter
-      if (this.id) {
+      this.id = +params['id']; //get ID from route parameter
+      if (!this.overview()) {
         this.model = this.dataService.getTeacher(this.id);
       }
     });
@@ -41,6 +41,10 @@ export class TeacherComponent implements OnInit, OnDestroy {
     return !(this.model.firstName && this.model.lastName && this.model.mail && this.model.pass);
   }
 
+  overview() {
+    return isNaN(this.id);
+  }
+
   add(template) {
     this.modalService.open(template).result.then((res) => {
       if (res) { //if modal got closed with data