--- lib/gradelib.php	2008-05-13 16:51:47.000000000 -0500
+++ lib/gradelib.php	2008-10-17 13:23:22.000000000 -0500
@@ -835,6 +835,15 @@
  */
 function grade_regrade_final_grades($courseid, $userid=null, $updated_item=null) {
 
+	// Check for Simple Grader Report
+	global $CFG;
+	
+	$exists = file_exists($CFG->dirroot. '/grade/report/simple_grader/lib/simple_gradelib.php');
+	if ($exists) {
+		require_once($CFG->dirroot . '/grade/report/simple_grader/lib/simple_gradelib.php');
+		return simple_grade_regrade_final_grades($courseid, $userid, $updated_item);
+	}
+
     $course_item = grade_item::fetch_course_item($courseid);
 
     if ($userid) {
--- lib/grade/grade_item.php	2008-03-27 12:13:01.000000000 -0500
+++ lib/grade/grade_item.php	2008-10-17 13:21:53.000000000 -0500
@@ -194,7 +194,7 @@
      * Aggregation coeficient used for weighted averages
      * @var float $aggregationcoef
      */
-    var $aggregationcoef = 0;
+    var $aggregationcoef = 1;
 
     /**
      * Sorting order of the columns.
--- grade/import/lib.php	2008-03-07 11:30:52.000000000 -0600
+++ grade/import/lib.php	2008-10-17 13:21:32.000000000 -0500
@@ -53,6 +53,14 @@
 function grade_import_commit($courseid, $importcode, $importfeedback=true, $verbose=true) {
     global $CFG, $USER;
 
+
+    $use_function = false;
+    $file = $CFG->dirroot . '/grade/report/simple_grader/lib/simple_gradelib.php';
+    if (file_exists($file)) {
+           require_once($file);
+           $use_function = true;
+    }
+    
     $commitstart = time(); // start time in case we need to roll back
     $newitemids = array(); // array to hold new grade_item ids from grade_import_newitem table, mapping array
 
@@ -78,7 +86,12 @@
 
                 // insert each individual grade to this new grade item
                 foreach ($grades as $grade) {
-                    if (!$gradeitem->update_final_grade($grade->userid, $grade->finalgrade, 'import', $grade->feedback, FORMAT_MOODLE)) {
+                    if ($use_function){
+                        if(!simple_update_final_grade($grade->userid, $gradeitem, 2, $grade->finalgrade, 'import', $grade->feedback, FORMAT_MOODLE)) {
+                            $failed = true;
+                            break 2;
+                         }
+                    } else if (!$gradeitem->update_final_grade($grade->userid, $grade->finalgrade, 'import', $grade->feedback, FORMAT_MOODLE)) {
                         $failed = true;
                         break 2;
                     }
@@ -118,7 +131,12 @@
                     if (!$importfeedback) {
                         $grade->feedback = false; // ignore it
                     }
-                    if (!$gradeitem->update_final_grade($grade->userid, $grade->finalgrade, 'import', $grade->feedback)) {
+                    if ($use_function){
+                        if(!simple_update_final_grade($grade->userid, $gradeitem, 2, $grade->finalgrade, 'import', $grade->feedback, FORMAT_MOODLE)) {
+                            $failed = true;
+                            break 2;
+                         }
+                    } else if (!$gradeitem->update_final_grade($grade->userid, $grade->finalgrade, 'import', $grade->feedback)) {
                         $failed = 1;
                         break 2;
                     }
--- grade/lib.php	2008-03-11 18:58:51.000000000 -0500
+++ grade/lib.php	2008-10-17 13:21:36.000000000 -0500
@@ -104,7 +104,7 @@
             $ofields = ", u.$this->sortfield1 AS usrt1";
             $order   = "usrt1 $this->sortorder1";
             if (!empty($this->sortfield2)) {
-                $ofields .= ", u.$this->sortfield1 AS usrt2";
+                $ofields .= ", u.$this->sortfield2 AS usrt2";
                 $order   .= ", usrt2 $this->sortorder2";
             }
             if ($this->sortfield1 != 'id' and $this->sortfield2 != 'id') {
@@ -393,7 +393,7 @@
         $menu['edit']='--'.get_string('edit');
 
         if (has_capability('moodle/grade:manage', $context)) {
-            $url = 'edit/tree/index.php?id='.$courseid;
+            $url = 'edit/simple_tree/index.php?id='.$courseid;
             if ($active_type == 'edit' and $active_plugin == 'tree' ) {
                 $active = $url;
             }
@@ -425,7 +425,7 @@
         }
 
         if (has_capability('moodle/grade:manage', $context) or has_capability('moodle/grade:manageletters', $context)) {
-            $url = 'edit/letter/index.php?id='.$courseid;
+            $url = 'edit/custom_letter/index.php?id='.$courseid;
             if ($active_type == 'edit' and $active_plugin == 'letter' ) {
                 $active = $url;
             }
--- grade/report/index.php	2007-12-17 08:11:52.000000000 -0600
+++ grade/report/index.php	2008-10-17 13:21:36.000000000 -0500
@@ -61,8 +61,8 @@
 }
 
 if (empty($last)) {
-    if (in_array('grader', $reports)) {
-        $last = 'grader';
+    if (in_array('simple_grader', $reports)) {
+        $last = 'simple_grader';
 
     } else if (in_array('user', $reports)) {
         $last = 'user';
--- grade/report/user/lib.php	2008-10-22 16:05:50.000000000 -0500
+++ grade/report/user/lib.php	2008-10-29 10:55:53.000000000 -0500
@@ -162,8 +162,18 @@
         if ($canviewhidden) {
             $altered = array();
             $unknown = array();
-        } else {
-            $hiding_affected = grade_grade::get_hiding_affected($grades, $items);
+        } else {         
+ 
+            // Adding this for proper recalcs (pcali1)
+        	$file = $CFG->dirroot. '/grade/report/simple_grader/lib/simple_gradelib.php';
+        	if (file_exists($file)) {
+        		require_once($file);
+        		$hiding_affected = simple_get_hiding_affected($grades, $items);
+            } else {
+                $hiding_affected = grade_grade::get_hiding_affected($grades, $items);
+            }
+            // end of change
+
             $altered = $hiding_affected['altered'];
             $unknown = $hiding_affected['unknown'];
             unset($hiding_affected);