Merge branch 'master' into builds/v1

SlateFoundation · Nov 16, 2017 · 2bdb4cd · 2bdb4cd
2 parents e456c28 + 48addcf
commit 2bdb4cd
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git a/...rkspace/packages/scienceleadership-narratives/overrides/SectionTermReportsStudentsGrid.js b/...rkspace/packages/scienceleadership-narratives/overrides/SectionTermReportsStudentsGrid.js
@@ -7,12 +7,9 @@ Ext.define('ScienceLeadership.narratives.overrides.SectionTermReportsStudentsGri
 
         me.columns = Ext.Array.insert(Ext.Array.clone(me.columns), 1, [{
             text: 'Grade',
-            dataIndex: 'report',
+            dataIndex: 'report_grade',
             emptyCellText: '&mdash;',
-            width: 70,
-            renderer: function(report) {
-                return report && report.get('Grade') || null;
-            }
+            width: 70
         }]);
 
         me.callParent(arguments);

diff --git a/sencha-workspace/packages/scienceleadership-narratives/overrides/TermReportsController.js b/sencha-workspace/packages/scienceleadership-narratives/overrides/TermReportsController.js
@@ -0,0 +1,12 @@
+Ext.define('Scienceleadership.narratives.overrides.TermsReportController', {
+    override: 'SlateAdmin.controller.progress.terms.Report',
+
+
+    syncStudent: function(student) {
+        this.callParent(arguments);
+
+        var report = student.get('report');
+
+        student.set('report_grade', report ? report.get('Grade') : null, { dirty: false });
+    }
+});
diff --git a/sencha-workspace/packages/scienceleadership-narratives/package.json b/sencha-workspace/packages/scienceleadership-narratives/package.json
@@ -62,7 +62,7 @@
      * Typically, changes to the package should come along with changes to the version.
      * This number should be in this format: d+(.d+)*
      */
-    "version": "1.1.3",
+    "version": "1.1.4",
 
     /**
      * The version that users can transparently update from without requiring code changes.