adjust fix for #139

bme-db-lab · Nov 16, 2020 · 7cb94ec · 7cb94ec
1 parent 823f858
commit 7cb94ec
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/app/controllers/demonstrator/detail.js b/app/controllers/demonstrator/detail.js
@@ -7,8 +7,11 @@ 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', {
@@ -47,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({});
       }
     });

diff --git a/app/templates/demonstrator/detail.hbs b/app/templates/demonstrator/detail.hbs
@@ -10,6 +10,9 @@
     {{#each-in eventsByDate as |date events|}}
       {{demonstrator-group-data currentEventTemplate=model events=(await events) evaluateEvent=(action 'evaluateEvent')}}
     {{/each-in}}
-  {{else}}
-    Nincs megjeleníthető laborcsoport.
-{{/each-in}}
+{{/each-in}}
+
+{{#if noGroupToShow}}
+  <hr/>
+  Nincs megjeleníthető laborcsoport.
+{{/if}}