Merge pull request sakaiproject#1410 from payten/1409-category-headers

Fade in category headers and fix course grade not refreshing in fixed column
Spencerx · Dec 7, 2015 · ad43a18 · ad43a18
2 parents 961b358 + 0747dfc
commit ad43a18
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/GradeItemCellPanel.java b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/GradeItemCellPanel.java
@@ -305,6 +305,8 @@ private void addSpecialAttributes() {
 				@Override
 				protected void onEvent(AjaxRequestTarget target) {
 					send(getPage(), Broadcast.BREADTH, new ScoreChangedEvent(studentUuid, categoryId, target));
+					// ensure the fixed course grade column has been updated
+					target.appendJavaScript(String.format("sakai.gradebookng.spreadsheet.refreshCourseGradeForStudent('%s')", studentUuid));
 				}
 			});
 			gradeCell.setOutputMarkupId(true);

diff --git a/gradebookng/tool/src/webapp/scripts/gradebook-grades.js b/gradebookng/tool/src/webapp/scripts/gradebook-grades.js
@@ -874,9 +874,12 @@ GradebookSpreadsheet.prototype.enableGroupByCategory = function() {
             offset = Math.min(offset, $cell.width() - newLabelWidth);
           }
 
-          $label.animate({
-            marginLeft: Math.max(offset, 0),
-            width: newLabelWidth
+          $label.fadeOut(1000, function() {
+            $label.css({
+                        marginLeft: Math.max(offset, 0),
+                        width: newLabelWidth
+                       })
+                  .fadeIn(1000)
           });
         });
       }, 100));
@@ -1628,9 +1631,6 @@ GradebookEditableCell.prototype.handleSaveComplete = function(cellId) {
     this.gradebookSpreadsheet.enablePopovers(this.$cell);
   }
 
-  //refresh the course grade
-  this.gradebookSpreadsheet.refreshCourseGradeForStudent(this.$cell.data("studentuuid"));
-
   if (this._focusAfterSaveComplete) {
     this.$cell.focus();
     this._focusAfterSaveComplete = false;