Merge branch 'master' of https://github.com/ServiceAsAService/angularClassbook

Author: raspyweather

src/app/data.service.ts

@@ -82,6 +82,8 @@ export class DataService {
   getTeacherList() {
     let t = this.getTeachers();
     t.shift(); //remove root user from List
+    t = t.sort((a, b) => a.firstName.localeCompare(b.firstName));
+    t = t.sort((a, b) => a.lastName.localeCompare(b.lastName));
     return t;
   }
 
@@ -149,8 +151,10 @@ export class DataService {
       this.generateInitialData();
       return this.getClasses();
     }
-    else
+    else {
+      ret.sort((a, b) => a.name.localeCompare(b.name));
       return ret;
+    }
   }
 
   getClass(id) {
@@ -188,8 +192,11 @@ export class DataService {
       this.generateInitialData();
       return this.getPupils();
     }
-    else
+    else {
+      ret.sort((a, b) => a.firstName.localeCompare(b.firstName));
+      ret.sort((a, b) => a.lastName.localeCompare(b.lastName));
       return ret;
+    }
   }
 
   getPupil(id) {
@@ -231,6 +238,12 @@ export class DataService {
 
 
   /******************** Notes **********************/
+  dateSort(a, b) {
+    a = new Date(a.date);
+    b = new Date(b.date);
+    return a > b ? -1 : a < b ? 1 : 0;
+  }
+
   notes = [];
 
   getNotes() {
@@ -244,6 +257,7 @@ export class DataService {
         elem.date = new Date(elem.date); //convert date string back to date
         return elem;
       });
+      ret.sort(this.dateSort);
       if (JSON.stringify(this.notes) !== JSON.stringify(ret))
         this.notes = ret;
       return this.notes;

src/app/notes/notes.component.html

@@ -1,7 +1,7 @@
 <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>
+    <h1 *ngIf="!pupilView()">Einträgeübersicht</h1>
+    <h1 *ngIf="pupilView()" >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>

src/app/notes/notes.component.ts

@@ -47,8 +47,16 @@ export class NotesComponent implements OnInit, OnDestroy {
     return isNaN(this.id);
   }
 
+  pupilView() {
+    return !isNaN(this.pupilId);
+  }
+
   goBack() {
-    this.location.back();
+    if(this.pupilView()) {
+      this.router.navigate(['/notes/pupil', this.pupilId]);
+    }
+    else
+      this.router.navigate(['/notes']);
   }
 
   dateToString(date) {
@@ -74,10 +82,6 @@ export class NotesComponent implements OnInit, OnDestroy {
     return !(m.pupilId >= 0 && m.teacherId >= 0 && m.text && m.date);
   }
 
-  log(l) {
-    console.log(l);
-  }
-
   getNotes() {
     let n = this.dataService.getNotes();
     if (this.pupilId)
@@ -87,7 +91,7 @@ export class NotesComponent implements OnInit, OnDestroy {
   }
 
   convertToModelDate(d) {
-    this.model.datePicker = {year: d.getFullYear(), month: d.getMonth() + 1, day: d.getDay() + 1};
+    this.model.datePicker = {year: d.getFullYear(), month: d.getMonth() + 1, day: d.getDate()};
     this.model.time = {hour: d.getHours(), minute: d.getMinutes()};
   }