From 3ecfd05283f6896813a2ba97c8b4ebb94e5cd993 Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Fri, 28 Dec 2012 15:05:03 +0100
Subject: [PATCH] Adding score see BT#5622

---
 main/inc/lib/attendance.lib.php          |  2 +-
 tests/migrate/migration.custom.class.php | 11 +++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/main/inc/lib/attendance.lib.php b/main/inc/lib/attendance.lib.php
index c5baa4983e..b98f293599 100644
--- a/main/inc/lib/attendance.lib.php
+++ b/main/inc/lib/attendance.lib.php
@@ -1148,7 +1148,7 @@ class Attendance
         // check if datetime already exists inside the table
 		$sql = "SELECT * FROM $tbl_attendance_calendar
 		        WHERE   c_id = $course_id AND
-                        date_time ='".Database::escape_string($date_time)."' AND
+                        date_time = '".Database::escape_string($date_time)."' AND
                         attendance_id = '$attendance_id'";
         $result = Database::query($sql);
         if (Database::num_rows($result)) {
diff --git a/tests/migrate/migration.custom.class.php b/tests/migrate/migration.custom.class.php
index 7de9776575..e27ca28186 100644
--- a/tests/migrate/migration.custom.class.php
+++ b/tests/migrate/migration.custom.class.php
@@ -1556,6 +1556,7 @@ error_log('Editing extra field: '.print_r($extra_field_option_info,1));
         if ($data['error'] == false) {
             $uidIdPrograma = $original_data['orig_id'];
             $uidIdPersona  = $original_data['item_id'];
+            $score          = $data['infoextra'];
 
             $session_id = self::get_session_id_by_programa_id($uidIdPrograma);
             $user_id = self::get_user_id_by_persona_id($uidIdPersona);
@@ -1599,7 +1600,7 @@ error_log('Editing extra field: '.print_r($extra_field_option_info,1));
                                 $res->set_user_id($user_id);
 
                                 //if no scores are given, don't set the score
-                                $res->set_score($data['informacionExtra']);
+                                $res->set_score($score);
                                 $res->add();
 
                                 $eval_result = Result :: load (null, $user_id, $eval_id);
@@ -1736,6 +1737,7 @@ error_log('Editing extra field: '.print_r($extra_field_option_info,1));
         if ($data['error'] == false) {
             $uidIdPrograma = $original_data['orig_id'];
             $uidIdPersona  = $original_data['item_id'];
+            $score         = $data['infoextra'];
 
             $session_id = self::get_session_id_by_programa_id($uidIdPrograma);
             $user_id = self::get_user_id_by_persona_id($uidIdPersona);
@@ -1778,7 +1780,7 @@ error_log('Editing extra field: '.print_r($extra_field_option_info,1));
                             if (!empty($check_result)) {
                                 $res->set_evaluation_id($eval_id);
                                 $res->set_user_id($user_id);
-                                $res->set_score($data['informacionExtra']);
+                                $res->set_score($score);
                                 $res->save();
 
                                 $eval_result = Result :: load (null, $user_id, $eval_id);
@@ -1829,8 +1831,9 @@ error_log('Editing extra field: '.print_r($extra_field_option_info,1));
 
             $uidIdPrograma = $data['orig_id'];
             $uidIdPersona = $data['item_id'];
-            $attendance_date = $data['fecha'];
-            $attendance_user_status = $data['status'];
+
+            $attendance_date = $data['infoextra'];
+            $attendance_user_status = $data['status']; // ??
 
             $session_id = self::get_session_id_by_programa_id($uidIdPrograma);
             $user_id = self::get_user_id_by_persona_id($uidIdPersona);