Merge pull request #809 from jrjohnson/change-ilmsession

Change IlmSessionFacet to IlmSession

app/components/session-overview.js

@@ -16,8 +16,8 @@ export default Ember.Component.extend(Publishable, {
     saveIndependentLearning: function(value){
       var session = this.get('session');
       if(!value){
-        session.get('ilmSessionFacet').then(function(ilmSession){
-          session.set('ilmSessionFacet', null);
+        session.get('ilmSession').then(function(ilmSession){
+          session.set('ilmSession', null);
           ilmSession.deleteRecord();
           session.save();
           ilmSession.save();
@@ -29,7 +29,7 @@ export default Ember.Component.extend(Publishable, {
           dueDate: moment().add(6, 'weeks').toDate()
         });
         ilmSession.save().then(function(savedIlmSession){
-          session.set('ilmSessionFacet', savedIlmSession);
+          session.set('ilmSession', savedIlmSession);
           session.save();
         });
       }
@@ -59,15 +59,15 @@ export default Ember.Component.extend(Publishable, {
       this.get('session').save();
     },
     changeIlmHours: function(value){
-      this.get('session.ilmSessionFacet').then(function(ilmSession){
+      this.get('session.ilmSession').then(function(ilmSession){
         if(ilmSession){
           ilmSession.set('hours', value);
           ilmSession.save();
         }
       });
     },
     changeIlmDueDate: function(value){
-      this.get('session.ilmSessionFacet').then(function(ilmSession){
+      this.get('session.ilmSession').then(function(ilmSession){
         if(ilmSession){
           ilmSession.set('dueDate', value);
           ilmSession.save();

app/models/session.js

@@ -19,8 +19,8 @@ var Session = DS.Model.extend(PublishableModel, {
   learningMaterials: DS.hasMany('session-learning-material', {async: true}),
   instructionHours: DS.hasMany('instruction-hour', {async: true}),
   sessionDescription: DS.belongsTo('session-description', {async: true}),
-  ilmSessionFacet: DS.belongsTo('ilm-session', {async: true}),
-  isIndependentLearning: Ember.computed.notEmpty('ilmSessionFacet.content'),
+  ilmSession: DS.belongsTo('ilm-session', {async: true}),
+  isIndependentLearning: Ember.computed.notEmpty('ilmSession.content'),
   offeringLearnerGroupsLength: Ember.computed.mapBy('offerings', 'learnerGroups.length'),
   learnerGroupCount: Ember.computed.sum('offeringLearnerGroupsLength'),
   offeringsWithStartDate: Ember.computed.filterBy('offerings', 'startDate'),
@@ -35,7 +35,7 @@ var Session = DS.Model.extend(PublishableModel, {
   firstOfferingDate: function(){
     var self = this;
     var deferred = Ember.RSVP.defer();
-    this.get('ilmSessionFacet').then(function(ilmSession){
+    this.get('ilmSession').then(function(ilmSession){
       if(ilmSession){
         deferred.resolve(ilmSession.get('dueDate'));
       } else {
@@ -49,7 +49,7 @@ var Session = DS.Model.extend(PublishableModel, {
     return DS.PromiseObject.create({
       promise: deferred.promise
     });
-  }.property('sortedOfferingsByDate.@each', 'ilmSessionFacet.dueDate'),
+  }.property('sortedOfferingsByDate.@each', 'ilmSession.dueDate'),
   searchString: function(){
     return this.get('title') + this.get('sessionType.title') + this.get('status');
   }.property('title', 'sessionType.title', 'status'),
@@ -60,13 +60,13 @@ var Session = DS.Model.extend(PublishableModel, {
       this.set('requiredPublicationSetFields', ['title']);
     } else {
       this.set('requiredPublicationLengthFields', []);
-      this.set('requiredPublicationSetFields', ['title', 'ilmSessionFacet.dueDate']);
+      this.set('requiredPublicationSetFields', ['title', 'ilmSession.dueDate']);
     }
     return this.getRequiredPublicationIssues();
   }.property(
     'title',
     'offerings.length',
-    'ilmSessionFacet.isPublishable',
+    'ilmSession.isPublishable',
     'isIndependentLearning'
   ),
   optionalPublicationIssues: function(){

app/templates/components/session-details.hbs

@@ -7,12 +7,12 @@
     }}
     {{#liquid-if session.isIndependentLearning class='vertical'}}
       {{detail-learnergroups
-        subject=session.ilmSessionFacet
+        subject=session.ilmSession
         cohorts=session.course.cohorts
         isIlmSession=true
       }}
       {{detail-instructors
-        ilmSession=session.ilmSessionFacet
+        ilmSession=session.ilmSession
       }}
     {{/liquid-if}}
     {{detail-objectives subject=session isSession=true}}

app/templates/components/session-overview.hbs

@@ -62,11 +62,11 @@
     {{#if session.isIndependentLearning}}
     <div class="form-col-4 form-col-4-middle sessionilmhours">
       <label class="form-label">{{t "sessions.hours"}}:</label>
-      <div class="form-data">{{inplace-text value=session.ilmSessionFacet.hours save='changeIlmHours'}}</div>
+      <div class="form-data">{{inplace-text value=session.ilmSession.hours save='changeIlmHours'}}</div>
     </div>
     <div class="form-col-4 form-col-4-right sessionilmduedate">
       <label class="form-label">{{t "sessions.dueBy"}}:</label>
-      <div class="form-data">{{inplace-date value=session.ilmSessionFacet.dueDate save='changeIlmDueDate'}}</div>
+      <div class="form-data">{{inplace-date value=session.ilmSession.dueDate save='changeIlmDueDate'}}</div>
     </div>
     {{/if}}
     <div class="form-col-12 sessiondescription">

app/templates/test-models.hbs

@@ -17,7 +17,7 @@ curriculumInventorySequences: {{content.curriculuminventorysequences.length}} <b
 departments: {{content.departments.length}} <br />
 disciplines: {{content.disciplines.length}} <br />
 educationalYears: {{content.educationalyears.length}} <br />
-ilmSessionFacets: {{content.ilmsessionfacets.length}} <br />
+ilmSessions: {{content.ilmSessions.length}} <br />
 ilmSessions: {{content.ilmsessions.length}} <br />
 instructionHours: {{content.instructionhours.length}} <br />
 instructorGroups: {{content.instructorgroups.length}} <br />

tests/acceptance/course/session/ilm-test.js

@@ -96,7 +96,7 @@ module('Acceptance: Session - Independent Learning', {
     });
     fixtures.session = server.create('session', {
       course: 1,
-      ilmSessionFacet: 1
+      ilmSession: 1
     });
   },
 

tests/acceptance/course/session/overview-test.js

@@ -59,7 +59,7 @@ test('check remove ilm', function(assert) {
   });
   server.create('session', {
     course: 1,
-    ilmSessionFacet: 1
+    ilmSession: 1
   });
   visit(url);
 
@@ -107,7 +107,7 @@ test('change ilm hours', function(assert) {
   });
   server.create('session', {
     course: 1,
-    ilmSessionFacet: 1
+    ilmSession: 1
   });
   visit(url);
 
@@ -135,7 +135,7 @@ test('change ilm due date', function(assert) {
   });
   server.create('session', {
     course: 1,
-    ilmSessionFacet: 1
+    ilmSession: 1
   });
   visit(url);
   andThen(function() {

tests/acceptance/course/session/publicationcheck-test.js

@@ -112,7 +112,7 @@ test('check remove ilm', function(assert) {
   });
   server.create('session', {
     course: 1,
-    ilmSessionFacet: 1
+    ilmSession: 1
   });
   visit('/courses/1/sessions/1/publicationcheck');
 
@@ -159,7 +159,7 @@ test('change ilm hours', function(assert) {
   });
   server.create('session', {
     course: 1,
-    ilmSessionFacet: 1
+    ilmSession: 1
   });
   visit('/courses/1/sessions/1/publicationcheck');
 
@@ -187,7 +187,7 @@ test('change ilm due date', function(assert) {
   });
   server.create('session', {
     course: 1,
-    ilmSessionFacet: 1
+    ilmSession: 1
   });
   visit('/courses/1/sessions/1/publicationcheck');
   andThen(function() {

tests/acceptance/course/session/publish-test.js

@@ -43,7 +43,7 @@ module('Acceptance: Session - Publish', {
     });
     fixtures.ilmSession = server.create('session', {
       course: 1,
-      ilmSessionFacet: 1
+      ilmSession: 1
     });
   },
 

tests/unit/models/session-test.js

@@ -75,7 +75,7 @@ test('check required ILM publication items', function(assert) {
     model.set('title', 'nothing');
     assert.equal(model.get('requiredPublicationIssues').length, 1);
     let ilmSession = store.createRecord('ilmSession');
-    model.set('ilmSessionFacet', ilmSession);
+    model.set('ilmSession', ilmSession);
     assert.equal(model.get('requiredPublicationIssues').length, 1);
   });
 });