logicampus-cvs

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

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

Modified Files:
	assignments.lcp 
Log Message:
Fixing class naming convetion for Lc_Lesson


Index: assignments.lcp
===================================================================
RCS file: /cvsroot/logicampus/logicampus/src/logicreate/services/classroom/assignments.lcp,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** assignments.lcp	1 Mar 2008 23:43:19 -0000	1.17
--- assignments.lcp	2 Mar 2008 18:03:25 -0000	1.18
***************
*** 142,151 ****
  		//find the lesson id
  		if ( empty($u->sessionvars['activeLesson']) ) {
! 			$lessonId = LC_Lesson::getLessonIdForSequenceId($classSeqId);
! 			LC_Lesson::storeLessonInSession($lessonId,$u);
  		} else {
  			if ( $u->sessionvars['activeLesson']['id_classes'] != $classId ) {
! 				$lessonId = LC_Lesson::getLessonIdForSequenceId($classSeqId);
! 				LC_Lesson::storeLessonInSession($lessonId,$u);
  			} else {
  				$lessonId = $u->sessionvars['activeLesson']['id_class_lessons'];
--- 142,151 ----
  		//find the lesson id
  		if ( empty($u->sessionvars['activeLesson']) ) {
! 			$lessonId = Lc_Lesson::getLessonIdForSequenceId($classSeqId);
! 			Lc_Lesson::storeLessonInSession($lessonId,$u);
  		} else {
  			if ( $u->sessionvars['activeLesson']['id_classes'] != $classId ) {
! 				$lessonId = Lc_Lesson::getLessonIdForSequenceId($classSeqId);
! 				Lc_Lesson::storeLessonInSession($lessonId,$u);
  			} else {
  				$lessonId = $u->sessionvars['activeLesson']['id_class_lessons'];
***************
*** 153,157 ****
  		}
  
! 		$lessonSequence = new LC_LessonSequence($lessonId,$classId);
  		$lessonSequence->loadItems();
  		$activityLob = $lessonSequence->fetchObject($classSeqId);
--- 153,157 ----
  		}
  
! 		$lessonSequence = new Lc_LessonSequence($lessonId,$classId);
  		$lessonSequence->loadItems();
  		$activityLob = $lessonSequence->fetchObject($classSeqId);
***************
*** 165,169 ****
  		$t['activity'] = $activityLob;
  		$sequence = $lessonSequence->getSequence($classSeqId);
! 		$lesson = new LC_Lesson($lessonId);
  		$t['lessonId'] = $lessonId;
  		$t['startDate'] = $lessonSequence->getStartDate($lesson, $classSeqId);
--- 165,169 ----
  		$t['activity'] = $activityLob;
  		$sequence = $lessonSequence->getSequence($classSeqId);
! 		$lesson = new Lc_Lesson($lessonId);
  		$t['lessonId'] = $lessonId;
  		$t['startDate'] = $lessonSequence->getStartDate($lesson, $classSeqId);
***************
*** 302,308 ****
  			$lessonId = $u->sessionvars['activeLesson']['id_class_lessons'];
  
! 			$lessonSequence = new LC_LessonSequence($lessonId,$classId);
  			$lessonSequence->loadItems();
! 			$lesson = new LC_Lesson($lessonId);
  			$activityLob = $lessonSequence->fetchObject($classSeqId);
  
--- 302,308 ----
  			$lessonId = $u->sessionvars['activeLesson']['id_class_lessons'];
  
! 			$lessonSequence = new Lc_LessonSequence($lessonId,$classId);
  			$lessonSequence->loadItems();
! 			$lesson = new Lc_Lesson($lessonId);
  			$activityLob = $lessonSequence->fetchObject($classSeqId);