[Logicampus-cvs] logicampus/src/logicreate/lib ClassGradebook.php, 1.14, 1.15

[Mark K <har...@us...>]

Update of /cvsroot/logicampus/logicampus/src/logicreate/lib
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv32460/lib

Modified Files:
	ClassGradebook.php 
Log Message:
Some gradebook fixes to use user primary key's instead of usernames everywhere.


Index: ClassGradebook.php
===================================================================
RCS file: /cvsroot/logicampus/logicampus/src/logicreate/lib/ClassGradebook.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** ClassGradebook.php	8 Oct 2007 14:35:27 -0000	1.14
--- ClassGradebook.php	8 Oct 2007 17:16:54 -0000	1.15
***************
*** 289,293 ****
  		$db = DB::getHandle();
  		$db->RESULT_TYPE = MYSQL_ASSOC;
! 		$sql = 'select p.firstname,p.lastname,p.username,ss.active,ss.withdrew_on 
  			FROM class_enrollment as ss
  			left join lcUsers as u on ss.student_id = u.pkey
--- 289,293 ----
  		$db = DB::getHandle();
  		$db->RESULT_TYPE = MYSQL_ASSOC;
! 		$sql = 'select p.firstname,p.lastname,p.username,ss.active,ss.withdrew_on, u.pkey
  			FROM class_enrollment as ss
  			left join lcUsers as u on ss.student_id = u.pkey
***************
*** 311,315 ****
  		while ($db->nextRecord()) {
  			$db->record['username'] = strtolower($db->record['username']);
! 			$this->students[$db->record['username']] = ClassGradeBookStudent::load($db->record);
  		}
  	}
--- 311,315 ----
  		while ($db->nextRecord()) {
  			$db->record['username'] = strtolower($db->record['username']);
! 			$this->students[$db->record['pkey']] = ClassGradebookStudent::load($db->record);
  		}
  	}
***************
*** 321,325 ****
  		$db->RESULT_TYPE = MYSQL_ASSOC;
  
! 		$sql = 'select p.firstname,p.lastname,p.username,ss.active,ss.withdrew_on 
  			FROM class_enrollment as ss
  			left join lcUsers as u on ss.student_id = u.pkey
--- 321,325 ----
  		$db->RESULT_TYPE = MYSQL_ASSOC;
  
! 		$sql = 'select p.firstname,p.lastname,p.username,ss.active,ss.withdrew_on, u.pkey
  			FROM class_enrollment as ss
  			left join lcUsers as u on ss.student_id = u.pkey
***************
*** 332,336 ****
  		$db->queryOne($sql);
  		if ( $db->record['username'] == '' ) return false;
! 		$this->students[$db->record['username']] = ClassGradebookStudent::load($db->record);
  		return true;
  	}
--- 332,336 ----
  		$db->queryOne($sql);
  		if ( $db->record['username'] == '' ) return false;
! 		$this->students[$db->record['pkey']] = ClassGradebookStudent::load($db->record);
  		return true;
  	}
***************
*** 509,514 ****
  
  			$entry = $this->entries[$valObj->idClassGradebookEntries];
! 			$j = strtolower($valObj->username);
! #			$j = $valObj->username;
  			$student = $this->students[$j];
  			if ( strtolower(get_class($student)) != 'classgradebookstudent' ){
--- 509,513 ----
  
  			$entry = $this->entries[$valObj->idClassGradebookEntries];
! 			$j = $valObj->studentId;
  			$student = $this->students[$j];
  			if ( strtolower(get_class($student)) != 'classgradebookstudent' ){
***************
*** 958,961 ****
--- 957,961 ----
  		$x->username = $array['username'];
  		$x->active = $array['active'];
+ 		$x->userId = $array['pkey'];
  		$x->dateWithdrawn = $array['dateWithdrawn'];
  		return $x;