Merge

main/gradebook/gradebook_add_eval.php

@@ -1,10 +1,11 @@
 <?php
 /* For licensing terms, see /license.txt */
+
 $language_file = 'gradebook';
-require_once ('../inc/global.inc.php');
-require_once ('lib/be.inc.php');
-require_once ('lib/gradebook_functions.inc.php');
-require_once ('lib/fe/evalform.class.php');
+require_once '../inc/global.inc.php';
+require_once 'lib/be.inc.php';
+require_once 'lib/gradebook_functions.inc.php';
+require_once 'lib/fe/evalform.class.php';
 api_block_anonymous_users();
 block_students();
 
@@ -31,6 +32,7 @@ if ($form->validate()) {
 	}
 	$eval->set_category_id($values['hid_category_id']);
 	$eval->set_weight($values['weight']);
+	
 	$eval->set_max($values['max']);
 	if (empty ($values['visible'])) {
 		$visible = 0;

main/gradebook/lib/be/abstractlink.class.php

@@ -180,7 +180,7 @@ abstract class AbstractLink implements GradebookItem {
 			$link->set_user_id($data['user_id']);
 			$link->set_course_code($data['course_code']);
 			$link->set_category_id($data['category_id']);
-			$link->set_date(api_get_local_time($data['created_at']));
+			$link->set_date(api_get_local_time());
 			$link->set_weight($data['weight']);
 			$link->set_visible($data['visible']);
 			$links[]=$link;

main/gradebook/lib/be/evaluation.class.php

@@ -227,10 +227,12 @@ class Evaluation implements GradebookItem
 			if (empty($this->type)) {
 				$this->type = 'evaluation';	
 			}
+			$sql .= ", '".api_get_utc_datetime()."'";
+			
 			$sql .= ',\''.Database::escape_string($this->type).'\'';
 			
-			$sql .= ", '".api_get_utc_datetime()."'";
 			$sql .= ")";
+			
 			Database::query($sql);
 			$this->set_id(Database::insert_id());
 		}