Final tweaks

Author: nuclearpidgeon

js/main.js

@@ -35,7 +35,8 @@ function Subject() {
         for (var i = 0; i < self.assessments().length; i++) {
             var newData = self.assessments()[i].toFlotData();
             data.push(newData);
-            weightingTotal += newData.data;
+            weightingTotal += parseFloat(self.assessments()[i].weighting());
+            // sometimes the weighting becomes a string on page change...
         }
         if (weightingTotal < 100 ) {
             data.push({label:"Not yet added",data:(100-weightingTotal),color:"grey"});

main.html

@@ -56,7 +56,7 @@ <h1>SubjectMarks <small><code>Beta 1.0</code></small></h1>
                                             <h3 class="list-group-item-heading"><!-- ko text: assName --><!-- /ko -->
                                                 <small data-bind="text: niceWeighting"></small>
                                             </h3>
-                                            <small data-bind="text: graded() ? 'Graded' : 'Not yet graded'"></small>
+                                            <!-- <small data-bind="text: graded() ? 'Graded' : 'Not yet graded'"></small> -->
                                             <div class="progress">
                                                 <div class="progress-bar" data-bind="style: { width: percentage() + '%' }">
                                                     <span class="sr-only">Subject Mark: 100/120</span>
@@ -177,7 +177,7 @@ <h3 class="list-group-item-heading"><!-- ko text: assName --><!-- /ko -->
                             </div>
                             <div class="panel panel-default">
                                 <div class="panel-heading">
-                                    <p class="panel-title">Weighting overview</p>
+                                    <p class="panel-title">Weighting Overview</p>
                                 </div>
                                 <div class="panel-body">
                                     <div id="pieChart" class="weightingChart" style="width:100%;height:400px"></div>