Fixes for #139 and #140

app/controllers/demonstrator.js

@@ -1,11 +1,15 @@
 import Ember from 'ember';
+import moment from 'moment';
 
 export default Ember.Controller.extend({
   subMenu: Ember.computed('model', 'model.[]', function() {
-    return this.get('model').map(eventTemplate => ({
+    let subMenu = this.get('model').map(eventTemplate => ({
       id: eventTemplate.get('id'),
       route: 'demonstrator.detail',
       description: eventTemplate.get('name')
     }));
+    return subMenu.sort((lhs, rhs) => {
+      return lhs.description - rhs.description;
+    });
   })
 });

app/controllers/demonstrator/detail.js

@@ -7,26 +7,36 @@ export default Ember.Controller.extend({
   session: Ember.inject.service('session'),
   classNames: ['demonstrator-group'],
 
+  noGroupToShow: false,
+
   // TODO: move to models/eventTemplate.js when the Events attribute is filtered in the get call.
   sortedEventsByCourseCode: Ember.computed('model', function () {
+    this.set("noGroupToShow", false);
     return new RSVP.Promise((resolve, reject) => {
       if (this.get('model.id')) {
         this.get('store').query('event', {
           filter: {
             eventTemplateId: this.get('model.id')
           }
         }).then(events => {
-          let separatedEventsByCourseCode = {}
-          let eventDateByCourseCode = []
+          let separatedEventsByCourseCode = {};
+          let eventDateByCourseCode = [];
 
           events.map(event => {
+            let date =  event.get('date');
+            let dateString = moment(date).format("YYYY. MM. DD. hh:mm");
+
             const courseCode = event.get('CourseCode');
             if(!Object.keys(separatedEventsByCourseCode).includes(courseCode)) {
-              separatedEventsByCourseCode[courseCode] = [];
-              eventDateByCourseCode.push({ courseCode: courseCode, date: event.get('date')});
+              separatedEventsByCourseCode[courseCode] = {};
+              eventDateByCourseCode.push({ courseCode: courseCode, date: date});
+            }
+
+            if(!Object.keys(separatedEventsByCourseCode[courseCode]).includes(dateString)) {
+              separatedEventsByCourseCode[courseCode][dateString] = [];
             }
 
-            separatedEventsByCourseCode[courseCode].push(event);
+            separatedEventsByCourseCode[courseCode][dateString].push(event);
             return event;
           });
 
@@ -40,13 +50,18 @@ export default Ember.Controller.extend({
             finalEventsByCourseCode[sorted.courseCode] = separatedEventsByCourseCode[sorted.courseCode];
           });
 
+          if(Object.keys(finalEventsByCourseCode).length === 0) {
+            this.set("noGroupToShow", true);
+          }
+
           resolve(finalEventsByCourseCode);
         }, err => {
           console.error(err);
           reject(err);
         });
       }
       else {
+        this.set("noGroupToShow", true);
         resolve({});
       }
     });

app/controllers/student.js

@@ -1,4 +1,5 @@
 import Ember from 'ember';
+import moment from 'moment';
 import RSVP from 'rsvp';
 
 export default Ember.Controller.extend({
@@ -25,9 +26,9 @@ export default Ember.Controller.extend({
             promises.push(promise);
           });
           RSVP.Promise.all(promises).then(() => {
-            // sort menupoints by key
+            // sort menupoints by date
             const sorted = subMenuKeys.sort((lhs, rhs) => {
-              return lhs.event.get('date') - rhs.event.get('date');
+              return moment(lhs.event.get('date')).diff(rhs.event.get('date'));
             });
             // select the first menu that has not been graded yet.
             this.set('currentView', null);

app/styles/right.scss

@@ -29,8 +29,7 @@
         }
 
         h3 {
-          padding-left: 0;
-          padding-bottom: 0;
+          padding: 0;
         }
 
         a, input, button {

app/templates/components/demonstrator-group-data.hbs

@@ -1,7 +1,4 @@
-<hr />
-<div class="text">
-  <span class="label">Csoport</span> {{await eventGroup}}
-</div>
+<hr style="border-top: dotted 0px gray;" />
 <div class="text">
   <span class="label">Labor helyszíne</span> {{await eventPlace}}
 </div>

app/templates/demonstrator/detail.hbs

@@ -4,6 +4,15 @@
 <a class="button no-margin-top" {{action 'generateSheet'}}>generálás</a>
 <a class="button no-margin-top no-margin-left" {{action 'generateSheetSupplementary'}}>pót generálás</a>
 
-{{#each-in (await sortedEventsByCourseCode) as |courseCode events|}}
-  {{demonstrator-group-data currentEventTemplate=model events=(await events) evaluateEvent=(action 'evaluateEvent')}}
-{{/each-in}}
+{{#each-in (await sortedEventsByCourseCode) as |courseCode eventsByDate|}}
+    <hr/>
+    <h3>{{courseCode}}</h3>
+    {{#each-in eventsByDate as |date events|}}
+      {{demonstrator-group-data currentEventTemplate=model events=(await events) evaluateEvent=(action 'evaluateEvent')}}
+    {{/each-in}}
+{{/each-in}}
+
+{{#if noGroupToShow}}
+  <hr/>
+  Nincs megjeleníthető laborcsoport.
+{{/if}}