fix: grade icon for portfolio page

Author: macite

src/app/common/grade-icon/grade-icon.coffee

@@ -9,8 +9,8 @@ angular.module('doubtfire.common.grade-icon', [])
     colorful: '=?'
   controller: ($scope, gradeService) ->
     $scope.$watch 'inputGrade', (newGrade) ->
-      $scope.grade = if _.isString($scope.inputGrade) then gradeService.grades.indexOf($scope.inputGrade) else $scope.inputGrade
+      $scope.grade = if _.isString($scope.inputGrade) then gradeService.stringToGrade($scope.inputGrade) else $scope.inputGrade
       $scope.gradeText = (grade) ->
-        if $scope.grade? then gradeService.grades[$scope.grade] or "Grade"
+        if grade? then gradeService.grades[grade] or "Grade"
       $scope.gradeLetter = (grade) ->
-        gradeService.gradeAcronyms[$scope.gradeText(grade)] or 'G'
+        gradeService.gradeAcronyms[grade] or 'G'

src/app/common/services/grade.service.ts

@@ -16,6 +16,14 @@ export class GradeService {
     3: 'High Distinction',
   };
 
+  gradeIndex = {
+    Fail: -1,
+    Pass: 0,
+    Credit: 1,
+    Distinction: 2,
+    'High Distinction': 3,
+  };
+
   gradeViewData = [
     {value: -1, viewValue: 'Fail'},
     {value: 0, viewValue: 'Pass'},
@@ -63,7 +71,7 @@ export class GradeService {
     HD: '#80FF00',
   };
 
-  public gradeFor = (project: Project): string => {
-    return this.gradeNumbers[project.targetGrade];
-  };
+  public stringToGrade(value: string): number {
+    return this.gradeIndex[value];
+  }
 }

src/app/projects/project-progress-dashboard/project-progress-dashboard.coffee

@@ -17,7 +17,6 @@ angular.module('doubtfire.projects.project-progress-dashboard',[])
       $scope.studentProjectId = $scope.project.id
 
     $scope.grades = gradeService.grades
-    $scope.gradeAcronyms = gradeService.gradeAcronyms
 
     $scope.currentVisualisation = 'burndown'
 

src/app/units/states/portfolios/portfolios.coffee

@@ -64,8 +64,6 @@ angular.module('doubtfire.units.states.portfolios', [])
 
   $scope.setActiveTab($scope.tabs.selectStudent)
 
-  $scope.grades = gradeService.grades
-
   $scope.tutor = newUserService.currentUser
 
   $scope.search = ""
@@ -76,6 +74,7 @@ angular.module('doubtfire.units.states.portfolios', [])
   $scope.pageSize = 10
 
   $scope.filterOptions = {selectedGrade: -1}
+  $scope.gradeValues = gradeService.gradeValues
   $scope.grades = gradeService.grades
   $scope.gradeAcronyms = gradeService.gradeAcronyms
 

src/app/units/states/portfolios/portfolios.tpl.html

@@ -50,15 +50,15 @@ <h4 class="panel-title">Mark Portfolios</h4>
           </div>
           <div class="btn-group btn-group-sm select-portfolio-grade">
             <label
-              ng-repeat="grade in grades"
+              ng-repeat="grade in gradeValues"
               ng-if="$index != 4"
               class="btn btn-default col-sm-3 text-center"
               ng-model="filterOptions.selectedGrade"
               btn-radio="{{$index}}"
             >
               <grade-icon
                 grade="grade"
-                tooltip="Select to show student's aiming for {{grade}}"
+                tooltip="Select to show student's aiming for {{grades[grade]}}"
                 tooltip-append-to-body="true"
                 class="text-{{$index == filterOptions.selectedGrade ? 'primary' : 'muted'}}"
               ></grade-icon>