Merge branch 'master' into builds/v1

SlateFoundation · Nov 20, 2017 · 3371a3a · 3371a3a
2 parents 1662779 + 4b4e00b
commit 3371a3a
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 2 deletions.
diff --git a/html-templates/scienceleadership-narratives/_body.tpl b/html-templates/scienceleadership-narratives/_body.tpl
@@ -1,7 +1,7 @@
 {extends "sbg/section-term-reports/_body.tpl"}
 
 {block fields}
-    {if $Report->Grade}
+    {if $.get.print.grade != 'no' && $Report->Grade}
         <div class="dli">
             <dt class="grade">Overall Grade</dt>
             <dd class="grade">{$Report->Grade}</dd>

diff --git a/sencha-workspace/packages/scienceleadership-narratives/overrides/TermReportPrintContainer.js b/sencha-workspace/packages/scienceleadership-narratives/overrides/TermReportPrintContainer.js
@@ -0,0 +1,16 @@
+Ext.define('ScienceLeadership.narratives.overrides.TermReportPrintContainer', {
+    override: 'SlateAdmin.view.progress.terms.print.Container',
+
+
+    initComponent: function() {
+        var me = this;
+
+        me.callParent(arguments);
+
+        me.down('fieldset#includeFieldset').add({
+            boxLabel: 'Overall Grade',
+            name: 'print[grade]',
+            checked: true
+        });
+    }
+});
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.4",
+    "version": "1.1.5",
 
     /**
      * The version that users can transparently update from without requiring code changes.