Add location to single event

ilios · Mar 24, 2016 · f4c2183 · f4c2183
1 parent e2f572f
commit f4c2183
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 1 deletion.
diff --git a/addon/components/ilios-calendar-single-event.js b/addon/components/ilios-calendar-single-event.js
@@ -12,6 +12,7 @@ export default Component.extend({
   sessionTitle: null,
   description: null,
   offeredAtPhrase: null,
+  location: null,
   taughtByPhrase: null,
   sessionIsPhrase: null,
   noContentPhrase: 'None',

diff --git a/addon/templates/components/ilios-calendar-single-event.hbs b/addon/templates/components/ilios-calendar-single-event.hbs
@@ -6,6 +6,7 @@
     {{courseTitle}} - <em>{{sessionTitle}}</em>
   </h1>
   <div class='ilios-calendar-single-event-offered-at'>{{offeredAtPhrase}}</div>
+  <div class='ilios-calendar-single-event-location'>{{location}}</div>
   {{#if taughtByPhrase}}
     <div class='ilios-calendar-single-event-instructors'>{{taughtByPhrase}}</div>
   {{/if}}

diff --git a/tests/dummy/app/controllers/application.js b/tests/dummy/app/controllers/application.js
@@ -103,6 +103,7 @@ export default Controller.extend({
         courseTitle: 'Fake Event',
         sessionTitle: 'Fake Event',
         offeredAtPhrase: 'On ' + moment(event.startDate).format('dddd, MMMM Do YYYY, h:mm a'),
+        location: event.location,
         taughtByPhrase: 'Taught By Barry Bods, Neil deGrasse Tyson',
         sessionIs: 'Session is "lecture"',
         courseObjectives: [

diff --git a/tests/dummy/app/templates/application.hbs b/tests/dummy/app/templates/application.hbs
@@ -1,6 +1,6 @@
 <h1>Demo of ilios-calendar</h1>
 {{#unless fakeSingleEvent}}
-  {{ilios-calendar 
+  {{ilios-calendar
     calendarEventsPromise=calendarEventsPromise
     selectedView=selectedView
     selectedDate=selectedDate
@@ -15,6 +15,7 @@
     courseTitle=fakeSingleEvent.courseTitle
     sessionTitle=fakeSingleEvent.sessionTitle
     offeredAtPhrase=fakeSingleEvent.offeredAtPhrase
+    location=fakeSingleEvent.location
     sessionIsPhrase=fakeSingleEvent.sessionIsPhrase
     taughtByPhrase=fakeSingleEvent.taughtByPhrase
     courseObjectives=fakeSingleEvent.courseObjectives

diff --git a/tests/integration/components/ilios-calendar-single-event-test.js b/tests/integration/components/ilios-calendar-single-event-test.js
@@ -68,3 +68,12 @@ test('taughtBy does not display', function(assert) {
 
   assert.ok(isEmpty(this.$('.ilios-calendar-single-event-instructors')));
 });
+
+test('setting location changes display', function(assert) {
+  assert.expect(1);
+  this.render(hbs`{{ilios-calendar-single-event location='Room 1b'
+    courseObjectives=courseObjectives
+    sessionObjectives=sessionObjectives
+  }}`);
+  assert.notEqual(this.$().text().trim().search(/Room 1b/), -1);
+});