[Logicampus-cvs] logicampus/src/logicreate/services/gradebook entry.lcp, 1.11, 1.12

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

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

Modified Files:
	entry.lcp 
Log Message:
Rework the gradebook to accept activity grades based on lesson sequence ID


Index: entry.lcp
===================================================================
RCS file: /cvsroot/logicampus/logicampus/src/logicreate/services/gradebook/entry.lcp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** entry.lcp	8 Oct 2007 14:28:07 -0000	1.11
--- entry.lcp	8 Oct 2007 17:02:14 -0000	1.12
***************
*** 52,55 ****
--- 52,60 ----
  
  		$t['gbe'] = ClassGradebookEntriesPeer::doSelect('id_classes="'.$u->activeClassTaught->id_classes.'" order by  id_class_gradebook_categories, title');
+ 		//customize data for the table
+ 		foreach ($t['gbe'] as $idx => $gbe) {
+ 			$gbe->title = 
+ 				'<a href="'.modurl('entry').'/event=edit/id='.$gbe->idClassGradebookEntries.'">'.$gbe->title.'</a>';
+ 		}
  
  		$dm = new LC_Table_ObjectModel($t['gbe']);
***************
*** 96,104 ****
  		$colE = &$columnModel->getColumnAt(4);
  		$colE->justify='left';
! 
  
  		$t['datagrid'] = new LC_TableRenderer($table);
  
- 
  		// Get the categories
  		$db->query("SELECT 
--- 101,108 ----
  		$colE = &$columnModel->getColumnAt(4);
  		$colE->justify='left';
! 		$colE->maxWidth='256';
  
  		$t['datagrid'] = new LC_TableRenderer($table);
  
  		// Get the categories
  		$db->query("SELECT 
***************
*** 154,157 ****
--- 158,163 ----
  				'id_classes' => $u->activeClassTaught->id_classes
  			) );
+ 			$t['gbeObj'] = $gbEntry;
+ 
  			if(!$gbEntry->idClassGradebookEntries)
  			{
***************
*** 164,183 ****
  				return;
  			}
- 			$f = new SiteForm();
- 			$gbEntry->set( 'category', $gbEntry->idClassGradebookCategories );
- 			if ( !$gbEntry->publishFlag ) unset($gbEntry->publishFlag);
- 			$f->getForm('gbaddentry', $gbEntry);
- 			if ($lc->getvars['id']) $f->modFormValue('submit', 'Modify Entry');
- 
- 			# handle assessments a little differently
- 			if ($gbEntry->assessmentId)
- 			{
- 				$f->removeFormField('totalPoints');
- 				$f->addHidden('totalPoints', $gbEntry->totalPoints);
- 				$t['assessment'] = TRUE;
- 				$t['assessmentId'] = $gbEntry->assessmentId;
- 			}
- 			$t['form'] = $f->ToHTML();
- 
  		}
  
--- 170,173 ----
***************
*** 188,196 ****
  			# to the server has access to update this pkey
  			# information to the server
! 			if ($lc->getvars['id'])
  			{
  				// it's an edit
  				$gbEntry = ClassGradebookEntries::load( array(
! 					'id_class_gradebook_entries' => (int)$lc->getvars['id'],
  					'id_classes' => $u->activeClassTaught->id_classes
  				) );
--- 178,187 ----
  			# to the server has access to update this pkey
  			# information to the server
! 			if (isset($lc->getvars['id']))
  			{
+ 				$gbeId = intval($lc->getvars['id']);
  				// it's an edit
  				$gbEntry = ClassGradebookEntries::load( array(
! 					'id_class_gradebook_entries' => $gbeId,
  					'id_classes' => $u->activeClassTaught->id_classes
  				) );
***************
*** 209,213 ****
  				// it's an add
  				$gbEntry = new ClassGradebookEntries();
! 				$gbEntry->idClassGradebookCategories = $lc->postvars['category'];
  				$gbEntry->idClasses = $u->activeClassTaught->id_classes;
  
--- 200,204 ----
  				// it's an add
  				$gbEntry = new ClassGradebookEntries();
! 				$gbEntry->idClassGradebookCategories = intval($lc->postvars['category']);
  				$gbEntry->idClasses = $u->activeClassTaught->id_classes;
  
***************
*** 215,232 ****
  			}
  
- 			$f = new SiteForm();
- 			$t['error'] = $f->validateForm('gbaddentry', $lc->postvars);
- 			if ($t['error'])
- 			{
- 				$this->data = $f->cleanedArray;
- 				if ($lc->getvars['id']) {
- 					$this->editRun($db, $u, $lc, $t);
- 					return;
- 				} else {
- 					$this->addRun($db, $u, $lc, $t);
- 					return;
- 				}
- 			} 
  
  			$gbEntry->set('title', inputCleanString($lc->postvars['title']));
  			$gbEntry->set('gradebookCode',inputCleanString($lc->postvars['gradebookCode']));
--- 206,211 ----
  			}
  
  
+ 			$gbEntry->set('classLessonSequenceId', intval($lc->postvars['seqId']));
  			$gbEntry->set('title', inputCleanString($lc->postvars['title']));
  			$gbEntry->set('gradebookCode',inputCleanString($lc->postvars['gradebookCode']));
***************
*** 241,245 ****
  				$u->sessionvars['message'] = $t['message'];
  				$this->presentor = 'redirectPresentation';
! 				$t['url'] = MOD_URL;
  			} else {
  				$lc->templateName = 'entry_error';
--- 220,224 ----
  				$u->sessionvars['message'] = $t['message'];
  				$this->presentor = 'redirectPresentation';
! 				$t['url'] = appurl('gradebook').'/entry';
  			} else {
  				$lc->templateName = 'entry_error';
***************
*** 258,262 ****
  				.$t['user']->profile->values['lastname'].', '.$t['user']->profile->values['firstname'];
  
! 			$t['vals'] = ClassGradebookVal::getValsByStudent($lc->getvars['user']);
  			$count = count($t['vals']);
  			for($i=0; $i<$count; $i++)
--- 237,241 ----
  				.$t['user']->profile->values['lastname'].', '.$t['user']->profile->values['firstname'];
  
! 			$t['vals'] = ClassGradebookVal::getValsByStudentId($t['user']->userId);
  			$count = count($t['vals']);
  			for($i=0; $i<$count; $i++)