rating MDL-23328 made date restriction of ratings work correctly

course/moodleform_mod.php

@@ -100,10 +100,8 @@ function data_preprocessing(&$default_values){
         }
 
         if (empty($default_values['assessed'])){
-            //$default_values['userating'] = 0;//this was used by glossary to check/uncheck a 'use ratings' checkbox
             $default_values['ratingtime'] = 0;
         } else {
-            //$default_values['userating'] = 1;
             $default_values['ratingtime']=
                 ($default_values['assesstimestart'] && $default_values['assesstimefinish']) ? 1 : 0;
         }

lib/outputrenderers.php

@@ -1306,7 +1306,7 @@ function render_rating(rating $rating) {
         //check the item we're rating was created in the assessable time window
         $inassessablewindow = true;
         if ( $rating->settings->assesstimestart && $rating->settings->assesstimefinish ) {
-            if ($rating->itemtimecreated < $rating->settings->assesstimestart || $item->itemtimecreated > $rating->settings->assesstimefinish) {
+            if ($rating->itemtimecreated < $rating->settings->assesstimestart || $rating->itemtimecreated > $rating->settings->assesstimefinish) {
                 $inassessablewindow = false;
             }
         }

mod/data/mod_form.php

@@ -71,9 +71,7 @@ function definition() {
     }
 
     function data_preprocessing(&$default_values){
-        if (empty($default_values['scale'])){
-            $default_values['assessed'] = 0;
-        }
+        parent::data_preprocessing($default_values);
     }
 
 }

mod/forum/mod_form.php

@@ -170,6 +170,8 @@ function definition_after_data() {
     }
 
     function data_preprocessing(&$default_values) {
+        parent::data_preprocessing($default_values);
+
         // Set up the completion checkboxes which aren't part of standard data.
         // We also make the default value (if you turn on the checkbox) for those
         // numbers to be 1, this will not apply unless checkbox is ticked.

mod/glossary/mod_form.php

@@ -176,6 +176,7 @@ function definition_after_data() {
     }
 
     function data_preprocessing(&$default_values){
+        parent::data_preprocessing($default_values);
     }
 
 }

rating/lib.php

@@ -375,15 +375,8 @@ public function get_ratings($options) {
                     $rating->aggregate  = $rec->aggrrating; //unset($rec->aggrrating);
                     $rating->count      = $rec->numratings; //unset($rec->numratings);
                     $rating->rating     = $rec->usersrating; //unset($rec->usersrating);
-                    if( !empty($item->created) ) {
-                        $rating->itemtimecreated = $item->created;//the forum_posts table has created instead of timecreated
-                    }
-                    else if(!empty($item->timecreated)) {
-                        $rating->itemtimecreated = $item->timecreated;
-                    }
-                    else {
-                        $rating->itemtimecreated = null;
-                    }
+                    $rating->itemtimecreated = $this->get_item_time_created($item);
+
                     break;
                 }
             }
@@ -402,7 +395,7 @@ public function get_ratings($options) {
                 $rating->itemid     = $item->id;
                 $rating->userid     = null;
                 $rating->scaleid     = null;
-                $rating->itemtimecreated = null;
+                $rating->itemtimecreated = $this->get_item_time_created($item);
             }
 
             if( !empty($item->userid) ) {
@@ -428,6 +421,18 @@ public function get_ratings($options) {
         return $options->items;
     }
 
+    private function get_item_time_created($item) {
+        if( !empty($item->created) ) {
+            return $item->created;//the forum_posts table has created instead of timecreated
+        }
+        else if(!empty($item->timecreated)) {
+            return $item->timecreated;
+        }
+        else {
+            return null;
+        }
+    }
+
     /**
     * Returns an array of grades calculated by aggregating item ratings.
     * @param object $options {