logicampus-cvs

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

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

Modified Files:
	content.lcp lessons.lcp viewer.lcp 
Log Message:
Fixes to copy a test down to your classroom and see it in the classroom viewer.


Index: viewer.lcp
===================================================================
RCS file: /cvsroot/logicampus/logicampus/src/logicreate/services/classroom/viewer.lcp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** viewer.lcp	4 Oct 2007 02:53:46 -0000	1.15
--- viewer.lcp	5 Oct 2007 22:37:38 -0000	1.16
***************
*** 86,92 ****
  		}
  
! 		if ($t['lob']['lob_type'] == 'assessment') {
! 			$db->query("SELECT * FROM assessment as A 
! 				WHERE assessment_id ='".$t['lob']['lob_class_repo_id']."'");
  			$db->nextRecord();
  			$t['activity'] = $db->record;
--- 86,92 ----
  		}
  
! 		if ($t['lob']['lob_type'] == 'test') {
! 			$db->query("SELECT * FROM lob_class_test as A 
! 				WHERE lob_class_repo_id ='".$t['lob']['lob_class_repo_id']."'");
  			$db->nextRecord();
  			$t['activity'] = $db->record;

Index: content.lcp
===================================================================
RCS file: /cvsroot/logicampus/logicampus/src/logicreate/services/classroom/content.lcp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** content.lcp	3 Oct 2007 22:00:34 -0000	1.12
--- content.lcp	5 Oct 2007 22:37:38 -0000	1.13
***************
*** 79,83 ****
  
  		//SEQUENCE ITEMS
! 		$uniqcode = lcClass::makeUniqueCode($u->activeClassTaken);
  
  		$t['seqItems'] = ClassLessonSequencePeer::doSelect(' class_id = '.$classId. ' AND lesson_id = '.$lesson_id . ' ORDER BY rank');
--- 79,83 ----
  
  		//SEQUENCE ITEMS
! 		$uniqCode = lcClass::makeUniqueCode($u->activeClassTaken);
  
  		$t['seqItems'] = ClassLessonSequencePeer::doSelect(' class_id = '.$classId. ' AND lesson_id = '.$lesson_id . ' ORDER BY rank');
***************
*** 95,105 ****
  		if ($prevIdx < 0 ) { $prevIdx = 0; }
  
  		//choose a start URL, viewer or content
  		if ($t['seqItems'][$nextIdx]->lobMime == 'text/html') {
! 			$t['nextUrl'] = appurl('classroom/content/'.$uniqcode.'/'.$t['seqItems'][$nextIdx]->linkText);
  		} else {
! 			$t['nextUrl'] = appurl('classroom/viewer/'.$uniqcode.'/'.$t['seqItems'][$nextIdx]->linkText);
  		}
- 
  
  
--- 95,115 ----
  		if ($prevIdx < 0 ) { $prevIdx = 0; }
  
+ 
  		//choose a start URL, viewer or content
+ 		if ( is_object($t['seqItems'][$nextIdx]) ) {
  		if ($t['seqItems'][$nextIdx]->lobMime == 'text/html') {
! 			$t['nextUrl'] = appurl('classroom/content/'.$uniqCode.'/'.$t['seqItems'][$nextIdx]->linkText);
  		} else {
! 			$t['nextUrl'] = appurl('classroom/viewer/'.$uniqCode.'/'.$t['seqItems'][$nextIdx]->linkText);
! 		}
! 		}
! 		//choose a previous URL, viewer or content
! 		if ($prevIdx > -1) {
! 		if ($t['seqItems'][$prevIdx]->lobMime == 'text/html') {
! 			$t['prevUrl'] = appurl('classroom/content/'.$uniqCode.'/'.$t['seqItems'][$prevIdx]->linkText);
! 		} else {
! 			$t['prevUrl'] = appurl('classroom/viewer/'.$uniqCode.'/'.$t['seqItems'][$prevIdx]->linkText);
! 		}
  		}
  
  

Index: lessons.lcp
===================================================================
RCS file: /cvsroot/logicampus/logicampus/src/logicreate/services/classroom/lessons.lcp,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** lessons.lcp	3 Oct 2007 02:09:01 -0000	1.21
--- lessons.lcp	5 Oct 2007 22:37:38 -0000	1.22
***************
*** 43,47 ****
  
  		$db->query($sql);
! 		while ($db->next_record()) $lessons[] = $db->Record;
  
  
--- 43,47 ----
  
  		$db->query($sql);
! 		while ($db->next_record()){ $lessons[] = $db->Record; }
  
  
***************
*** 132,136 ****
  			WHERE class_lesson_objectives.id_class_lesson='".$lesson_id."' 
  			AND f_hide=0 ORDER BY i_sort ASC");
! 		while ($db->next_record()) $t['objectives'][] = $db->Record;
  
  
--- 132,138 ----
  			WHERE class_lesson_objectives.id_class_lesson='".$lesson_id."' 
  			AND f_hide=0 ORDER BY i_sort ASC");
! 		while ($db->next_record()) {
! 			$t['objectives'][] = $db->Record;
! 		}
  
  
***************
*** 298,302 ****
  				$tablePkeyLabel ='$contentPkey'";
  		$db->queryOne($sql);
! 		if ($activeClassTaken == $db->Record[$contentLabel])
  		{
  			return true;
--- 300,304 ----
  				$tablePkeyLabel ='$contentPkey'";
  		$db->queryOne($sql);
! 		if ($activeClassTaken == $db->record[$contentLabel])
  		{
  			return true;