Skip to content

Commit 6ec0589

Browse files
authored
Fixed 2 small mistakes (#988)
1 parent 7d43b70 commit 6ec0589

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

app/components/tools/board-room-presence.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import { dropTask, restartableTask, timeout } from 'ember-concurrency';
22
import Component from '@glimmer/component';
3-
// import Ember from 'ember';
43
import { action } from '@ember/object';
54
import moment from 'moment';
65
import { inject as service } from '@ember/service';

app/components/tools/study-room-presence.hbs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
<span class='status-dot label-{{this.overallStatus}}'></span>
66

77
<BsPopover
8+
{{!-- @triggerEvents='focus' --}}
89
@placement='bottom'
910
@title='Aanwezig in de 2de Kamer'
1011
@renderInPlace="{{true}}"

app/components/tools/study-room-presence.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { inject as service } from '@ember/service';
66
import { tracked } from '@glimmer/tracking';
77
import Ember from 'ember';
88

9-
export default class BoardRoomPresence extends Component {
9+
export default class StudyRoomPresence extends Component {
1010
@service session;
1111
@service store;
1212
@service abilities;
@@ -72,23 +72,23 @@ export default class BoardRoomPresence extends Component {
7272
const currentStatusses = this.model
7373
.filter((presence) => {
7474
return moment().isBetween(
75-
moment(presence.get('startTime')),
76-
moment(presence.get('endTime')),
75+
moment(presence.startTime),
76+
moment(presence.endTime),
7777
'minute',
7878
'[)'
7979
);
8080
})
8181
.mapBy('status');
8282

8383
if (currentStatusses.includes('chilling')) {
84-
return 'Chillen';
84+
return 'chilling';
8585
}
8686

87-
if (currentStatusses.includes('studeren')) {
88-
return 'Studying';
87+
if (currentStatusses.includes('studying')) {
88+
return 'studying';
8989
}
9090

91-
return 'Vergaderen';
91+
return 'vergaderen';
9292
}
9393

9494
get saveButtonDisabled() {
@@ -112,7 +112,7 @@ export default class BoardRoomPresence extends Component {
112112
this.currentUserPresence = this.store.createRecord('study-room-presence', {
113113
startTime: moment().startOf('minute').toDate(),
114114
endTime: moment().startOf('minute').add(1, 'hours').toDate(),
115-
status: 'present',
115+
status: 'chilling',
116116
user: this.session.currentUser,
117117
});
118118
}

0 commit comments

Comments
 (0)