[Logicampus-cvs] logicampus/src/logicreate/services/gradebook assessment.lcp, 1.6, 1.7 category.lcp, 1.9, 1.10 entry.lcp, 1.10, 1.11 gradesbystudent.lcp, 1.6, 1.7 main.lcp, 1.9, 1.10 report.lcp, 1.10, 1.11

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

Update of /cvsroot/logicampus/logicampus/src/logicreate/services/gradebook
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv22998

Modified Files:
	assessment.lcp category.lcp entry.lcp gradesbystudent.lcp 
	main.lcp report.lcp 
Log Message:
Change function "next_record" to "nextRecord".

Index: report.lcp
===================================================================
RCS file: /cvsroot/logicampus/logicampus/src/logicreate/services/gradebook/report.lcp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** report.lcp	13 Feb 2007 01:57:57 -0000	1.10
--- report.lcp	8 Oct 2007 14:28:07 -0000	1.11
***************
*** 57,61 ****
  		$sql = "select sectionNumbers from classes where id_classes=$c";
  		$db->queryOne($sql);
! 		$s = explode("\n",$db->Record['sectionNumbers']);
  		$t['sections'] = $s;
  	}
--- 57,61 ----
  		$sql = "select sectionNumbers from classes where id_classes=$c";
  		$db->queryOne($sql);
! 		$s = explode("\n",$db->record['sectionNumbers']);
  		$t['sections'] = $s;
  	}

Index: gradesbystudent.lcp
===================================================================
RCS file: /cvsroot/logicampus/logicampus/src/logicreate/services/gradebook/gradesbystudent.lcp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** gradesbystudent.lcp	13 Feb 2007 01:57:57 -0000	1.6
--- gradesbystudent.lcp	8 Oct 2007 14:28:07 -0000	1.7
***************
*** 106,114 ****
  		//assume rank is one, push rank down for each student that has a higher score
  		$t['rank'] = 1;
! 		while ($db->next_record() ) {
! 			if ($lc->getvars['user'] == $db->Record['username']) {
! 				$usersScore = $db->Record['score'];
  			}
! 			$scores[$db->Record['username']] = $db->Record['score'];
  		}
  		foreach ($scores as $username => $score) {
--- 106,114 ----
  		//assume rank is one, push rank down for each student that has a higher score
  		$t['rank'] = 1;
! 		while ($db->nextRecord() ) {
! 			if ($lc->getvars['user'] == $db->record['username']) {
! 				$usersScore = $db->record['score'];
  			}
! 			$scores[$db->record['username']] = $db->record['score'];
  		}
  		foreach ($scores as $username => $score) {

Index: category.lcp
===================================================================
RCS file: /cvsroot/logicampus/logicampus/src/logicreate/services/gradebook/category.lcp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** category.lcp	26 Jan 2007 03:13:44 -0000	1.9
--- category.lcp	8 Oct 2007 14:28:07 -0000	1.10
***************
*** 177,181 ****
  			$db->queryOne('select calculation_type from class_gradebook
  				where id_classes="'.$u->activeClassTaught->id_classes.'"');
! 			if ($db->Record['calculation_type'] == 1) { // weighted
  
  				$sql = "SELECT SUM(weight) as sumweight FROM class_gradebook_categories
--- 177,181 ----
  			$db->queryOne('select calculation_type from class_gradebook
  				where id_classes="'.$u->activeClassTaught->id_classes.'"');
! 			if ($db->record['calculation_type'] == 1) { // weighted
  
  				$sql = "SELECT SUM(weight) as sumweight FROM class_gradebook_categories
***************
*** 184,189 ****
  				$db->queryOne($sql);
  
! 				if ( ($db->Record['sumweight'] + $gbCat->weight) > 100 ) {
! 					$t['error'] = 'Your current total of percentages is <b>'.$db->Record['sumweight'].'%</b>.  If we add another <b>'.$gbCat->weight.'%</b> as you requested, the total of these weights will be greater than 100%.  Please double check your calculation, or adjust another category.';
  					if ( $lc->getvars['event'] == 'edit' ) $this->editRun($db,$u,$lc,$t);
  					else $this->addRun($db,$u,$lc,$t);
--- 184,189 ----
  				$db->queryOne($sql);
  
! 				if ( ($db->record['sumweight'] + $gbCat->weight) > 100 ) {
! 					$t['error'] = 'Your current total of percentages is <b>'.$db->record['sumweight'].'%</b>.  If we add another <b>'.$gbCat->weight.'%</b> as you requested, the total of these weights will be greater than 100%.  Please double check your calculation, or adjust another category.';
  					if ( $lc->getvars['event'] == 'edit' ) $this->editRun($db,$u,$lc,$t);
  					else $this->addRun($db,$u,$lc,$t);

Index: main.lcp
===================================================================
RCS file: /cvsroot/logicampus/logicampus/src/logicreate/services/gradebook/main.lcp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** main.lcp	13 Feb 2007 01:57:57 -0000	1.9
--- main.lcp	8 Oct 2007 14:28:07 -0000	1.10
***************
*** 88,92 ****
  		$db->queryOne('select semesterTerm, semesterYear from semesters
  			where id_semesters='.$u->activeClassTaught->id_semesters);
! 		$t['semester'] = $db->Record['semesterTerm'].' '.$db->Record['semesterYear'];
  
  		// stupid hack to get a feedback message
--- 88,92 ----
  		$db->queryOne('select semesterTerm, semesterYear from semesters
  			where id_semesters='.$u->activeClassTaught->id_semesters);
! 		$t['semester'] = $db->record['semesterTerm'].' '.$db->record['semesterYear'];
  
  		// stupid hack to get a feedback message

Index: assessment.lcp
===================================================================
RCS file: /cvsroot/logicampus/logicampus/src/logicreate/services/gradebook/assessment.lcp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** assessment.lcp	15 Jan 2007 04:14:37 -0000	1.6
--- assessment.lcp	8 Oct 2007 14:28:07 -0000	1.7
***************
*** 106,110 ****
  			WHERE id_classes = '.$u->activeClassTaught->id_classes.'
  			AND id_class_gradebook_entries = '.$lc->postvars['entryid']);
! 			if( !$db->next_record() ) {
  				$this->presentor = 'errorMessage';
  				$t['message'] = "You don't own this gradebook entry.";
--- 106,110 ----
  			WHERE id_classes = '.$u->activeClassTaught->id_classes.'
  			AND id_class_gradebook_entries = '.$lc->postvars['entryid']);
! 			if( !$db->nextRecord() ) {
  				$this->presentor = 'errorMessage';
  				$t['message'] = "You don't own this gradebook entry.";

Index: entry.lcp
===================================================================
RCS file: /cvsroot/logicampus/logicampus/src/logicreate/services/gradebook/entry.lcp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** entry.lcp	3 Oct 2007 20:26:00 -0000	1.10
--- entry.lcp	8 Oct 2007 14:28:07 -0000	1.11
***************
*** 123,127 ****
  			$db->queryOne('select count(id_class_gradebook_categories) as cnt from class_gradebook_categories
  				where id_classes="'.$u->activeClassTaught->id_classes.'"');
! 			if ($db->Record['cnt'] == 0) {
  				$this->presentor = 'errorMessage';
  				$t['message'] = 'You must first create a <a href="'
--- 123,127 ----
  			$db->queryOne('select count(id_class_gradebook_categories) as cnt from class_gradebook_categories
  				where id_classes="'.$u->activeClassTaught->id_classes.'"');
! 			if ($db->record['cnt'] == 0) {
  				$this->presentor = 'errorMessage';
  				$t['message'] = 'You must first create a <a href="'
***************
*** 383,388 ****
  			$t['user'] = array(
  				'username' => $user,
! 				'firstname' => $db->Record['firstname'],
! 				'lastname' => $db->Record['lastname']
  			);
  
--- 383,388 ----
  			$t['user'] = array(
  				'username' => $user,
! 				'firstname' => $db->record['firstname'],
! 				'lastname' => $db->record['lastname']
  			);