FIX: Change Ready to Mark to Ready for Feedback in text

doubtfire-lms · Jul 28, 2016 · 2967784 · 2967784
1 parent a9bd940
commit 2967784
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/src/app/common/services/task-service.coffee b/src/app/common/services/task-service.coffee
@@ -90,7 +90,7 @@ angular.module("doubtfire.common.services.tasks", [])
     fail:               'FAL'
 
   taskService.statusLabels =
-    ready_to_mark:      'Ready to Mark'
+    ready_to_mark:      'Ready for Feedback'
     not_started:        'Not Started'
     working_on_it:      'Working On It'
     need_help:          'Need Help'

diff --git a/src/app/projects/project-viewer/project-viewer.coffee b/src/app/projects/project-viewer/project-viewer.coffee
@@ -127,7 +127,7 @@ angular.module("doubtfire.projects.project-viewer", [])
         else
           # Show the first interesting task
           if $scope.assessingUnitRole?
-            # Find first task that is Ready To Mark or Need Help
+            # Find first task that is Ready for Feedback or Need Help
             t = _.find filteredTasks, (t) -> t.status == 'need_help' || t.status == 'ready_to_mark'
             if not t? # else find discuss
               t = _.find filteredTasks, (t) -> t.status == 'discuss' || t.status == 'demonstrate'

diff --git a/src/app/tasks/task-feedback-assessor-list/task-feedback-assessor-list.tpl.html b/src/app/tasks/task-feedback-assessor-list/task-feedback-assessor-list.tpl.html
@@ -18,7 +18,7 @@ <h4 class="panel-title" ng-hide="context=='task'">{{title}}</h4>
           </div>
           <div class="btn-group" ng-show="context == 'assess'">
             <label class="btn btn-default" ng-model="statusFilter" btn-radio="'ready_to_mark'">
-              <i class="fa fa-thumbs-up" tooltip-placement="{{ fullscreen ? 'bottom' : 'top' }}" tooltip-append-to-body="true" tooltip="Show tasks that are ready to mark."></i>
+              <i class="fa fa-thumbs-up" tooltip-placement="{{ fullscreen ? 'bottom' : 'top' }}" tooltip-append-to-body="true" tooltip="Show tasks that are awaiting feedback."></i>
             </label>
             <label class="btn btn-default" ng-model="statusFilter" btn-radio="'need_help'">
               <i class="fa fa-question" tooltip-placement="{{ fullscreen ? 'bottom' : 'top' }}" tooltip-append-to-body="true" tooltip="Show tasks that need help."></i>

diff --git a/src/app/tasks/task-viewer/task-viewer.coffee b/src/app/tasks/task-viewer/task-viewer.coffee
@@ -94,6 +94,7 @@ angular.module('doubtfire.tasks.task-viewer', [])
         $scope.setActiveTab($scope.tabs.taskSheet)
       # Update the task grade if applicable
       $scope.taskIsGraded = taskService.taskIsGraded newTask
+      $scope.numStars = newTask.definition.max_quality_pts
 
     #
     # Watch grade for changes