logicampus-cvs — SVN Commit Logs

[Logicampus-cvs] logicampus/src/logicreate/services/classroom assignments.lcp, 1.14, 1.15 main.lcp, 1.15, 1.16

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

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

Modified Files:
	assignments.lcp main.lcp 
Log Message:
Fix classroom portal lookup of activities for the student.


Index: assignments.lcp
===================================================================
RCS file: /cvsroot/logicampus/logicampus/src/logicreate/services/classroom/assignments.lcp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** assignments.lcp	8 Oct 2007 14:22:27 -0000	1.14
--- assignments.lcp	2 Nov 2007 21:54:39 -0000	1.15
***************
*** 140,144 ****
  		$classSeqId    = intval($lc->getvars['id']);
  		$classId  = $u->activeClassTaken->id_classes;
! 		$lessonId = $u->sessionvars['activeLesson']['id_class_lessons'];
  
  		$lessonSequence = new LC_LessonSequence($lessonId,$classId);
--- 140,155 ----
  		$classSeqId    = intval($lc->getvars['id']);
  		$classId  = $u->activeClassTaken->id_classes;
! 		//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'];
! 			}
! 		}
  
  		$lessonSequence = new LC_LessonSequence($lessonId,$classId);

Index: main.lcp
===================================================================
RCS file: /cvsroot/logicampus/logicampus/src/logicreate/services/classroom/main.lcp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** main.lcp	8 Oct 2007 14:22:27 -0000	1.15
--- main.lcp	2 Nov 2007 21:54:39 -0000	1.16
***************
*** 40,55 ****
  		for ($x=0; $x < $count; ++$x)  {
  			# build up SQL or clause for queries later on
! 			$assignmentsOrClause .= 'class_assignments.id_classes = '.$u->classesTaken[$x]->id_classes.' or ';
  			$lessonsOrClause .= 'class_lessons.id_classes = '.$u->classesTaken[$x]->id_classes.' or ';
  
! 			$t['classdata'][$u->classesTaken[$x]->id_classes] = '<ul>';
! 			# Pull in last annoucement for each class
! 			$sql = "
! 				SELECT id_class_assignments, title, activeDate
! 				FROM class_assignments
! 				WHERE id_classes='".$u->classesTaken[$x]->id_classes."'
! 				AND activeDate <= $ut  and (".DB::getFuncName('unix_timestamp','dateNoAccept').">$ut or dateNoAccept='0000-00-00 00:00:00') 
! 				ORDER BY dueDate ASC, activeDate DESC 
! 				LIMIT 1";
  
  			$db->queryOne($sql);
--- 40,58 ----
  		for ($x=0; $x < $count; ++$x)  {
  			# build up SQL or clause for queries later on
! 			$assignmentsOrClause .= 'class_id = '.$u->classesTaken[$x]->id_classes.' or ';
  			$lessonsOrClause .= 'class_lessons.id_classes = '.$u->classesTaken[$x]->id_classes.' or ';
  
! 			# count total number of available assignments
! 			$sql = 
! 				"SELECT count(lob_class_repo_id) as num_activity
! 				FROM class_lesson_sequence AS A
! 				LEFT JOIN class_lessons AS B
! 					ON A.lesson_id = B.id_class_lessons
! 				WHERE class_id='".$u->classesTaken[$x]->id_classes."' 
! 
! 				AND ( (start_offset + activeOn <= UNIX_TIMESTAMP()) OR start_offset IS NULL)
! 				AND ( (due_offset   + activeOn <= UNIX_TIMESTAMP()) OR due_offset IS NULL)
! 				AND lob_type = 'activity'";
! 
  
  			$db->queryOne($sql);
***************
*** 119,131 ****
  			 ****/
  
! 			$sql = "
! 			SELECT id_class_assignments, title, class_assignments.id_classes, classes.courseFamilyNumber
! 			FROM class_assignments
! 			LEFT JOIN classes ON class_assignments.id_classes = classes.id_classes
! 			WHERE ( $assignmentsOrClause )
! 			AND activeDate <= $ut 
! 			AND (dueDate >= $ut OR noDueDate = 1)
! 			ORDER BY dueDate ASC, activeDate DESC 
! 			LIMIT 5";
  			$db->query($sql);
  
--- 122,138 ----
  			 ****/
  
! 			# count total number of available assignments
! 			$sql = 
! 				"SELECT class_lesson_sequence_id, lob_title as title, class_id
! 				FROM class_lesson_sequence AS A
! 				LEFT JOIN class_lessons AS B
! 					ON A.lesson_id = B.id_class_lessons
! 				WHERE (".$assignmentsOrClause.")
! 
! 				AND ( (start_offset + activeOn <= UNIX_TIMESTAMP()) OR start_offset IS NULL)
! 				AND ( (due_offset   + activeOn <= UNIX_TIMESTAMP()) OR due_offset IS NULL)
! 				AND lob_type = 'activity'
! 				LIMIT 5";
! 
  			$db->query($sql);
  
***************
*** 137,141 ****
  				{
  					$t['assignments'] .= '<li>
! 	<a href="'.APP_URL.'classroom/assignments/event=view/id_classes='.$db->record['id_classes'].'/id='.$db->record['id_class_assignments'].'">
  	'.$db->record['title'].'</a>&nbsp;-&nbsp;'.$db->record['courseFamilyNumber'].'</li>';
  				}
--- 144,148 ----
  				{
  					$t['assignments'] .= '<li>
! 	<a href="'.APP_URL.'classroom/assignments/event=view/id_classes='.$db->record['class_id'].'/id='.$db->record['class_lesson_sequence_id'].'">
  	'.$db->record['title'].'</a>&nbsp;-&nbsp;'.$db->record['courseFamilyNumber'].'</li>';
  				}

[Logicampus-cvs] logicampus/src/logicreate/services/classmgr/templates display_main.html, 1.15, 1.16

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

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

Modified Files:
	display_main.html 
Log Message:
Remove duplicate link to backup class content.


Index: display_main.html
===================================================================
RCS file: /cvsroot/logicampus/logicampus/src/logicreate/services/classmgr/templates/display_main.html,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** display_main.html	2 Nov 2007 20:46:04 -0000	1.15
--- display_main.html	2 Nov 2007 21:34:29 -0000	1.16
***************
*** 49,56 ****
  			<li><a href="<?=modurl('adjustDates');?>">Adjust All Dates</a></li>
  			-->
! 			<li><a href="<?=modurl('dataexchange');?>"><?=lct('Export Class')?></a></li>
! 			<li><a href="<?=modurl('exportContent');?>"><?=lct('Export Content')?></a></li>
  			<li><a href="<?=APP_URL?>classmgr/semestercopy/"><?=lct('Semester Copy')?></a></li>
- 
  			</ol>
  		</td>
--- 49,54 ----
  			<li><a href="<?=modurl('adjustDates');?>">Adjust All Dates</a></li>
  			-->
! 			<li><a href="<?=modurl('dataexchange');?>"><?=lct('Backup Class Content')?></a></li>
  			<li><a href="<?=APP_URL?>classmgr/semestercopy/"><?=lct('Semester Copy')?></a></li>
  			</ol>
  		</td>

[Logicampus-cvs] logicampus/src/logicreate/services/classmgr/templates dataexchange_main.html, 1.2, 1.3

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

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

Modified Files:
	dataexchange_main.html 
Log Message:
Removing old download link.


Index: dataexchange_main.html
===================================================================
RCS file: /cvsroot/logicampus/logicampus/src/logicreate/services/classmgr/templates/dataexchange_main.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** dataexchange_main.html	15 May 2007 16:45:01 -0000	1.2
--- dataexchange_main.html	2 Nov 2007 21:32:50 -0000	1.3
***************
*** 6,13 ****
  <br>
  <center>
  	<a href="<?=modurl('dataexchange/event=download');?>"><?=$t['filename'];?></a>
- 
  	<br/>
! 	<a href="<?=modurl('exportContent/event=download');?>">new xml file</a>
  </center>
  <br>
--- 6,15 ----
  <br>
  <center>
+ 	<!--
  	<a href="<?=modurl('dataexchange/event=download');?>"><?=$t['filename'];?></a>
  	<br/>
! 	-->
! 
! 	<a href="<?=modurl('exportContent/event=download');?>">Classroom Backup File</a>
  </center>
  <br>

[Logicampus-cvs] logicampus/src/logicreate/services/classmgr/templates display_main.html, 1.14, 1.15

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

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

Modified Files:
	display_main.html 
Log Message:
Fix for broken IE CSS handling.


Index: display_main.html
===================================================================
RCS file: /cvsroot/logicampus/logicampus/src/logicreate/services/classmgr/templates/display_main.html,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** display_main.html	28 Oct 2007 23:43:10 -0000	1.14
--- display_main.html	2 Nov 2007 20:46:04 -0000	1.15
***************
*** 7,11 ****
  
  
! <table width="100%" border="0" cellspacing="10" cellpadding="2">
  	<tr> 
  		<td width="30%" valign="top">
--- 7,11 ----
  
  
! <table width="100%" border="0" cellspacing="10" cellpadding="2" class="ie_drop_fix">
  	<tr> 
  		<td width="30%" valign="top">

[Logicampus-cvs] logicampus/src/public_html/templates/sinorca sinorca-screen.css, 1.19, 1.20

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

Update of /cvsroot/logicampus/logicampus/src/public_html/templates/sinorca
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv11363/public_html/templates/sinorca

Modified Files:
	sinorca-screen.css 
Log Message:
Fix for broken IE CSS handling.


Index: sinorca-screen.css
===================================================================
RCS file: /cvsroot/logicampus/logicampus/src/public_html/templates/sinorca/sinorca-screen.css,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** sinorca-screen.css	22 May 2007 03:25:11 -0000	1.19
--- sinorca-screen.css	2 Nov 2007 20:46:04 -0000	1.20
***************
*** 459,460 ****
--- 459,463 ----
  }
  
+ TABLE.ie_drop_fix {
+ 	margin-right:-100%;
+ }

[Logicampus-cvs] logicampus/src/logicreate/lib lc_table_calendar.php, 1.17, 1.18

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

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

Modified Files:
	lc_table_calendar.php 
Log Message:
Call 'tests' 'tests' and not activities.


Index: lc_table_calendar.php
===================================================================
RCS file: /cvsroot/logicampus/logicampus/src/logicreate/lib/lc_table_calendar.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** lc_table_calendar.php	2 Nov 2007 00:53:07 -0000	1.17
--- lc_table_calendar.php	2 Nov 2007 00:57:27 -0000	1.18
***************
*** 1091,1097 ****
  				if (isset($evt['startorend']) ) {
  					if ($evt['startorend'] == 'start') {
! 						$type = 'Activity (Assigned):';
  					} else {
! 						$type = 'Activity (Due):';
  					}
  				} else {
--- 1091,1097 ----
  				if (isset($evt['startorend']) ) {
  					if ($evt['startorend'] == 'start') {
! 						$type = 'Test (Assigned):';
  					} else {
! 						$type = 'Test (Due):';
  					}
  				} else {

[Logicampus-cvs] logicampus/src/logicreate/lib lc_table_calendar.php, 1.16, 1.17

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

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

Modified Files:
	lc_table_calendar.php 
Log Message:
Small fix for events that start and stop on the same day.


Index: lc_table_calendar.php
===================================================================
RCS file: /cvsroot/logicampus/logicampus/src/logicreate/lib/lc_table_calendar.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** lc_table_calendar.php	2 Nov 2007 00:29:06 -0000	1.16
--- lc_table_calendar.php	2 Nov 2007 00:53:07 -0000	1.17
***************
*** 428,432 ****
  			$evtEnd = mktime($g,0,0,$m,$d,$y);
  
! 			if ($evtStart == $dateStamp || $evtEnd == $dateStamp) {
  				$ret[] = $evt;
  //			} else {
--- 428,437 ----
  			$evtEnd = mktime($g,0,0,$m,$d,$y);
  
! 			if ($evtStart == $dateStamp) {
! 				$evt['startorend'] = 'start';
! 				$ret[] = $evt;
! 			}
! 			if ($evtEnd == $dateStamp) {
! 				$evt['startorend'] = 'end';
  				$ret[] = $evt;
  //			} else {
***************
*** 1064,1084 ****
  		$evtEnd = mktime(0,0,0,$m,$d,$y);
  
- //		debug($evt);
  		$evtType = strtolower($evt['calendarType']);
  		switch( $evtType ) {
  			case 'activity':
  				$type = 'Activity:';
! 				if ($evtStart == $this->targetDate->timeStamp) {
! 					$type = 'Activity (Assigned):';
! 				} else if ($evtEnd == $this->targetDate->timeStamp) {
! 					$type = 'Activity (Due):';
  				}
  				break;
  			case 'test':
  				$type = 'Test:';
! 				if ($evtStart == $this->targetDate->timeStamp) {
! 					$type = 'Test (Assigned):';
! 				} else if ($evtEnd == $this->targetDate->timeStamp) {
! 					$type = 'Test (Due):';
  				}
  				break;
--- 1069,1104 ----
  		$evtEnd = mktime(0,0,0,$m,$d,$y);
  
  		$evtType = strtolower($evt['calendarType']);
  		switch( $evtType ) {
  			case 'activity':
  				$type = 'Activity:';
! 				if (isset($evt['startorend']) ) {
! 					if ($evt['startorend'] == 'start') {
! 						$type = 'Activity (Assigned):';
! 					} else {
! 						$type = 'Activity (Due):';
! 					}
! 				} else {
! 					if ($evtStart == $this->targetDate->timeStamp) {
! 						$type = 'Activity (Assigned):';
! 					} else if ($evtEnd == $this->targetDate->timeStamp) {
! 						$type = 'Activity (Due):';
! 					}
  				}
  				break;
  			case 'test':
  				$type = 'Test:';
! 				if (isset($evt['startorend']) ) {
! 					if ($evt['startorend'] == 'start') {
! 						$type = 'Activity (Assigned):';
! 					} else {
! 						$type = 'Activity (Due):';
! 					}
! 				} else {
! 					if ($evtStart == $this->targetDate->timeStamp) {
! 						$type = 'Test (Assigned):';
! 					} else if ($evtEnd == $this->targetDate->timeStamp) {
! 						$type = 'Test (Due):';
! 					}
  				}
  				break;

[Logicampus-cvs] logicampus/src/logicreate/services/classmgr lessonManager.lcp, 1.45, 1.46 lessonSequence.lcp, 1.14, 1.15

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

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

Modified Files:
	lessonManager.lcp lessonSequence.lcp 
Log Message:
Fixes to calendar to display no due dates for lesson sequence items.


Index: lessonSequence.lcp
===================================================================
RCS file: /cvsroot/logicampus/logicampus/src/logicreate/services/classmgr/lessonSequence.lcp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** lessonSequence.lcp	1 Nov 2007 17:46:41 -0000	1.14
--- lessonSequence.lcp	2 Nov 2007 00:29:06 -0000	1.15
***************
*** 285,290 ****
  			//due offset is number of days *after* the start of this object.
  			if( isset($lc->postvars['dueOffset'][$objIdx]) ) {
! 				$lessonSeqObj->setDueDay($objIdx, intval($lc->postvars['dueOffset'][$objIdx])/60/60/24);
! 				$lessonSeqObj->setDueTime($objIdx, intval($lc->postvars['dueOffset_time'][$objIdx]));
  				$save = true;
  			}
--- 285,294 ----
  			//due offset is number of days *after* the start of this object.
  			if( isset($lc->postvars['dueOffset'][$objIdx]) ) {
! 				if( $lc->postvars['dueOffset'][$objIdx] == -1) {
! 					$lessonSeqObj->setDueDay($objIdx, -1);
! 				} else {
! 					$lessonSeqObj->setDueDay($objIdx, intval($lc->postvars['dueOffset'][$objIdx])/60/60/24);
! 					$lessonSeqObj->setDueTime($objIdx, intval($lc->postvars['dueOffset_time'][$objIdx]));
! 				}
  				$save = true;
  			}

Index: lessonManager.lcp
===================================================================
RCS file: /cvsroot/logicampus/logicampus/src/logicreate/services/classmgr/lessonManager.lcp,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** lessonManager.lcp	1 Nov 2007 17:46:41 -0000	1.45
--- lessonManager.lcp	2 Nov 2007 00:29:06 -0000	1.46
***************
*** 954,975 ****
  		$colB->cellRenderer->idName = 'startOffset';
  		$colB->cellRenderer->fieldName = 'startOffset';
- 		$colB->cellRenderer->options = array(0=>'First Day');
- 		for ($qq=1; $qq< 31; $qq++) { 
- 			$colB->cellRenderer->options[] = $qq.' days';
- 		}
  
  		$colC = &$columnModel->getColumnAt(4);
  		$colC->maxWidth=200;
  		$colC->name = 'Due';
! 		$colC->cellRenderer = new LC_Table_DateOffsetRenderer();
! 		//$colC->cellRenderer = new LC_TableSelectRenderer();
! 		$colC->cellRenderer->zeroLabel = "Never";
  		$colC->cellRenderer->idName = 'dueOffset';
  		$colC->cellRenderer->fieldName = 'dueOffset';
- 		$colC->cellRenderer->options = array(0=>'Never');
  		$colC->cellRenderer->skipEmpty = true;
- 		for ($qq=1; $qq< 31; $qq++) { 
- 			$colC->cellRenderer->options[] = $qq .' days later';
- 		}
  
  		$col = &$columnModel->getColumnAt(5);
--- 954,967 ----
  		$colB->cellRenderer->idName = 'startOffset';
  		$colB->cellRenderer->fieldName = 'startOffset';
  
  		$colC = &$columnModel->getColumnAt(4);
  		$colC->maxWidth=200;
  		$colC->name = 'Due';
! 		//true or false, allow never to be an option?
! 		$colC->cellRenderer = new LC_Table_DateOffsetRenderer(true);
! 		$colC->cellRenderer->zeroLabel = "Same Day";
  		$colC->cellRenderer->idName = 'dueOffset';
  		$colC->cellRenderer->fieldName = 'dueOffset';
  		$colC->cellRenderer->skipEmpty = true;
  
  		$col = &$columnModel->getColumnAt(5);
***************
*** 1249,1255 ****
  	var $dayLabel = ' days';
  	var $zeroLabel = 'First Day';
  
! 	function LC_Table_DateOffsetRenderer() {
! 		$this->timeList = array();
  		for ($x=0; $x < 24; ++$x) {
  			for ($y=0; $y < 60; $y+=30) {
--- 1241,1248 ----
  	var $dayLabel = ' days';
  	var $zeroLabel = 'First Day';
+ 	var $allowNever = false;
  
! 	function LC_Table_DateOffsetRenderer($allowNever=false) {
! 		$this->allowNever = $allowNever;
  		for ($x=0; $x < 24; ++$x) {
  			for ($y=0; $y < 60; $y+=30) {
***************
*** 1272,1275 ****
--- 1265,1273 ----
  
  		//prepopulate days
+ 		if ($this->allowNever === true) {
+ 			$this->dayList[-1] = 'Never';
+ 		}
+ 
+ 		$this->dayList[0] = $this->zeroLabel;
  		for ($x = 1; $x <= 30; $x++) {
  			$this->dayList[ ($x*60*60*24) ] = $x .$this->dayLabel;
***************
*** 1286,1298 ****
  			return '';//"N/A";
  		}
- 
  		list($days,$hours) = @explode('|',$this->value);
  
  		$time = "<select name=\"".$this->fieldName."[".$this->row."]\">\n";
- 		$time .= "\t<option value=\"0\">".$this->zeroLabel."</option>\n";
  		$time .= Form::makeOptions($this->dayList,$days)."</select>\n";
  
  		$time .= "&nbsp;@<select name=\"".$this->fieldName."_time[".$this->row."]\">";
- 		$time .= "\t<option value=\"0\">".$this->zeroLabel."</option>\n";
  		$time .= Form::makeOptions($this->timeList,$hours)."</select>\n";
  		return $time;
--- 1284,1293 ----

[Logicampus-cvs] logicampus/src/logicreate/lib lc_lesson_sequence.php, 1.12, 1.13 lc_table_calendar.php, 1.15, 1.16 lc_table_renderer.php, 1.17, 1.18

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

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

Modified Files:
	lc_lesson_sequence.php lc_table_calendar.php 
	lc_table_renderer.php 
Log Message:
Fixes to calendar to display no due dates for lesson sequence items.


Index: lc_table_calendar.php
===================================================================
RCS file: /cvsroot/logicampus/logicampus/src/logicreate/lib/lc_table_calendar.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** lc_table_calendar.php	28 Oct 2007 23:43:10 -0000	1.15
--- lc_table_calendar.php	2 Nov 2007 00:29:06 -0000	1.16
***************
*** 477,485 ****
  
  		$sql ='
! 			SELECT C.activeOn + start_offset as startdate
! 			, C.inactiveOn + due_offset  as enddate
  			, A.lob_title as title
  			, A.start_offset
  			, A.due_offset
  			, A.lob_type as calendarType
  			FROM class_lesson_sequence AS A
--- 477,487 ----
  
  		$sql ='
! 			SELECT C.activeOn
! 			, C.inactiveOn
  			, A.lob_title as title
  			, A.start_offset
+ 			, A.start_time
  			, A.due_offset
+ 			, A.due_time
  			, A.lob_type as calendarType
  			FROM class_lesson_sequence AS A
***************
*** 492,496 ****
  			(class_id = '.$classIds.')
  			AND (lob_type = "activity" OR lob_type = "test")
! 
  			HAVING 
  			( (startdate )>='.$start.' AND (startdate) <= '.$end.')
--- 494,499 ----
  			(class_id = '.$classIds.')
  			AND (lob_type = "activity" OR lob_type = "test")
! ';
! /*
  			HAVING 
  			( (startdate )>='.$start.' AND (startdate) <= '.$end.')
***************
*** 501,504 ****
--- 504,508 ----
  			)
  ';
+  */
  
  //debug($sql,1);
***************
*** 506,509 ****
--- 510,553 ----
  		$db->query($sql);
  		while( $db->nextRecord() ) {
+ 			$startDaysUnix = $db->record['start_offset'];
+ 			$startTimeUnix = $db->record['start_time'];
+ 			$dueDaysUnix = $db->record['due_offset'];
+ 			$dueTimeUnix = $db->record['due_time'];
+ 			$min = ($startTimeUnix /60)%60;
+ 			$hour = ( ($startTimeUnix) / (60*60));
+ 
+ 			$dateObj = new LC_Calendar_DateInfo($db->record['activeOn']);
+ 			$db->record['startdate'] = mktime(
+ 				$dateObj->hour+$hour,
+ 				$dateObj->min +$min,
+ 				$dateObj->sec,
+ 				$dateObj->month,
+ 				$dateObj->date + ($startDaysUnix / 86400),
+ 				$dateObj->year
+ 			);
+ 
+ 			/*
+ debug(date('m d Y G i s', $db->record['activeOn']));
+ debug(date('m d Y G i s', $db->record['startdate']));
+ debug($db->record['title']);
+ debug($startDaysUnix/86400);
+ debug($dateObj);
+ 			 */
+ 			if ($dueDaysUnix == -1) {
+ 				$db->record['enddate'] = 0;
+ 			} else {
+ 				$min = ($dueTimeUnix /60)%60;
+ 				$hour = ( ($dueTimeUnix) / (60*60));
+ 
+ 				$db->record['enddate'] = mktime(
+ 					$dateObj->hour+$hour,
+ 					$dateObj->min +$min,
+ 					$dateObj->sec,
+ 					$dateObj->month,
+ 					$dateObj->date + (($dueDaysUnix) / 86400),
+ 					$dateObj->year
+ 				);
+ 			}
+ 
  			$this->events[] = $db->record;
  		}
***************
*** 997,1002 ****
  				}
  			}
! 			if ($v['enddate'] - $v['startdate'] < (60*60) ) {
! 				$ret .= '<br/>Event ends in one hour or less.';
  			}
  			$ret .='</li>';
--- 1041,1049 ----
  				}
  			}
! 			//check to see if there even is an enddate
! 			if ($v['enddate'] > $v['startdate']) {
! 				if ($v['enddate'] - $v['startdate'] < (60*60) ) {
! 					$ret .= '<br/>Event ends in one hour or less.';
! 				}
  			}
  			$ret .='</li>';
***************
*** 1138,1141 ****
--- 1185,1191 ----
  	var $weekOfMonth = 0;
  	var $timeStamp;
+ 	var $hour = -1;
+ 	var $min = -1;
+ 	var $sec = -1;
  
  
***************
*** 1146,1150 ****
  			$this->year,
  			$this->date,
! 			$this->month)  = explode(' ' , date('w Y d m',$ts));
  	}
  
--- 1196,1203 ----
  			$this->year,
  			$this->date,
! 			$this->month,
! 			$this->hour,
! 			$this->min,
! 			$this->sec)  = explode(' ' , date('w Y d m G i s',$ts));
  	}
  

Index: lc_lesson_sequence.php
===================================================================
RCS file: /cvsroot/logicampus/logicampus/src/logicreate/lib/lc_lesson_sequence.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** lc_lesson_sequence.php	1 Nov 2007 17:46:41 -0000	1.12
--- lc_lesson_sequence.php	2 Nov 2007 00:29:06 -0000	1.13
***************
*** 108,113 ****
  	 */
  	function setDueDay($objIdx, $intDays) {
! 		$this->items[$objIdx]->dueOffset = $intDays * (60*60*24);
! 		$this->items[$objIdx]->dueOffset += $this->items[$objIdx]->startOffset;
  	}
  
--- 108,117 ----
  	 */
  	function setDueDay($objIdx, $intDays) {
! 		if ($intDays == -1) {
! 			$this->items[$objIdx]->dueOffset = -1;
! 		} else {
! 			$this->items[$objIdx]->dueOffset = $intDays * (60*60*24);
! 			$this->items[$objIdx]->dueOffset += $this->items[$objIdx]->startOffset;
! 		}
  	}
  

Index: lc_table_renderer.php
===================================================================
RCS file: /cvsroot/logicampus/logicampus/src/logicreate/lib/lc_table_renderer.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** lc_table_renderer.php	27 Oct 2007 17:24:31 -0000	1.17
--- lc_table_renderer.php	2 Nov 2007 00:29:06 -0000	1.18
***************
*** 169,173 ****
  
  
! 				$renderer = $this->table->getCellRenderer($x,$y);
  				$this->table->prepareRenderer($renderer,$x,$y);
  
--- 169,173 ----
  
  
! 				$renderer =& $this->table->getCellRenderer($x,$y);
  				$this->table->prepareRenderer($renderer,$x,$y);
  
***************
*** 193,197 ****
  				$this->html .='>';
  
- 
  				$this->html .= $renderer->getRenderedValue();
  				$this->html .= '</td>';
--- 193,196 ----

[Logicampus-cvs] logicampus/src/logicreate/lib lc_lesson_sequence.php, 1.11, 1.12

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

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

Modified Files:
	lc_lesson_sequence.php 
Log Message:
Fixing time and date saving for sequence objects.


Index: lc_lesson_sequence.php
===================================================================
RCS file: /cvsroot/logicampus/logicampus/src/logicreate/lib/lc_lesson_sequence.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** lc_lesson_sequence.php	4 Oct 2007 02:53:45 -0000	1.11
--- lc_lesson_sequence.php	1 Nov 2007 17:46:41 -0000	1.12
***************
*** 17,21 ****
  	 */
  	function loadItems() {
! 		$this->items = ClassLessonSequencePeer::doSelect( 'class_id = '.$this->classId.' and lesson_id = '.$this->lessonId);
  	}
  
--- 17,21 ----
  	 */
  	function loadItems() {
! 		$this->items = ClassLessonSequencePeer::doSelect( 'class_id = '.$this->classId.' and lesson_id = '.$this->lessonId. ' order by rank');
  	}
  
***************
*** 88,91 ****
--- 88,132 ----
  	}
  
+ 	function setStartDay($objIdx, $intDays) {
+ 		$this->items[$objIdx]->startOffset = $intDays * (60*60*24);
+ 	}
+ 
+ 	function setStartTime($objIdx, $timestamp) {
+ 		$this->items[$objIdx]->startTime = $timestamp;
+ 	}
+ 
+ 	function getStartDay($objIdx) {
+ 		return $this->items[$objIdx]->startOffset / (60/60/24);
+ 	}
+ 
+ 	function getStartTime($objIdx) {
+ 		return $this->items[$objIdx]->startTime;
+ 	}
+ 
+ 	/**
+ 	 * Must be set after startDay
+ 	 */
+ 	function setDueDay($objIdx, $intDays) {
+ 		$this->items[$objIdx]->dueOffset = $intDays * (60*60*24);
+ 		$this->items[$objIdx]->dueOffset += $this->items[$objIdx]->startOffset;
+ 	}
+ 
+ 	/**
+ 	 * Sets the hour and minute of the due time, requires unix timestamp
+ 	 */
+ 	function setDueTime($objIdx, $timestamp) {
+ 		$this->items[$objIdx]->dueTime = $timestamp;
+ 	}
+ 
+ 	function getDueDay($objIdx) {
+ 		return $this->items[$objIdx]->dueOffset / (60/60/24);
+ 	}
+ 
+ 	function getDueTime($objIdx) {
+ 		return $this->items[$objIdx]->dueTime;
+ 	}
+ 
+ 
+ 
  	/**
  	 * Wrap utility function to update sequence table.

[Logicampus-cvs] logicampus/src/logicreate/services/classmgr lessonManager.lcp, 1.44, 1.45 lessonSequence.lcp, 1.13, 1.14

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

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

Modified Files:
	lessonManager.lcp lessonSequence.lcp 
Log Message:
Fixing time and date saving for sequence objects.


Index: lessonSequence.lcp
===================================================================
RCS file: /cvsroot/logicampus/logicampus/src/logicreate/services/classmgr/lessonSequence.lcp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** lessonSequence.lcp	28 Oct 2007 23:43:10 -0000	1.13
--- lessonSequence.lcp	1 Nov 2007 17:46:41 -0000	1.14
***************
*** 7,10 ****
--- 7,11 ----
  include_once(LIB_PATH.'PBDO/ClassLessons.php');
  include_once(LIB_PATH.'PBDO/ClassLessonSequence.php');
+ include_once(LIB_PATH.'lc_lesson_sequence.php');
  
  include(LIB_PATH.'lc_table.php');
***************
*** 271,295 ****
  		$lesson_id = (int) $lc->getvars['id'];
  
! 		$sequences = ClassLessonSequencePeer::doSelect(' class_id = '.$class_id. ' AND lesson_id = '.$lesson_id.' ORDER BY rank');
! //debug($lc->postvars,0);
! //debug($sequences,1);
! 		foreach ($sequences as $objIdx => $obj) {
  			$save = false;
  			if( isset($lc->postvars['startOffset'][$objIdx]) ) {
! 				$sequences[$objIdx]->startOffset = ($lc->postvars['startOffset'][$objIdx] );
! 				$sequences[$objIdx]->startOffset += intval($lc->postvars['startOffset_time'][$objIdx] );
  				$save = true;
  			}
  			//due offset is number of days *after* the start of this object.
  			if( isset($lc->postvars['dueOffset'][$objIdx]) ) {
! 				$sequences[$objIdx]->dueOffset = ($lc->postvars['dueOffset'][$objIdx] );
! 				$sequences[$objIdx]->dueOffset += ($sequences[$objIdx]->startOffset - ($sequences[$objIdx]->startOffset % 86400));
! 				$sequences[$objIdx]->dueTime = intval($lc->postvars['dueOffset_time'][$objIdx] );
  				$save = true;
  			}
  			if ($save) {
! 				$sequences[$objIdx]->save();
  			}
  		}
  
  		$u->addSessionMessage('Dates have been saved.');
--- 272,302 ----
  		$lesson_id = (int) $lc->getvars['id'];
  
! //		$sequences = ClassLessonSequencePeer::doSelect(' class_id = '.$class_id. ' AND lesson_id = '.$lesson_id.' ORDER BY rank');
! 
! 		$lessonSeqObj = new LC_LessonSequence($lesson_id,$class_id);
! 		$lessonSeqObj->loadItems();
! 		foreach ($lessonSeqObj->items as $objIdx => $obj) {
  			$save = false;
  			if( isset($lc->postvars['startOffset'][$objIdx]) ) {
! 				$lessonSeqObj->setStartDay($objIdx, intval($lc->postvars['startOffset'][$objIdx])/60/60/24);
! 				$lessonSeqObj->setStartTime($objIdx, intval($lc->postvars['startOffset_time'][$objIdx]));
  				$save = true;
  			}
  			//due offset is number of days *after* the start of this object.
  			if( isset($lc->postvars['dueOffset'][$objIdx]) ) {
! 				$lessonSeqObj->setDueDay($objIdx, intval($lc->postvars['dueOffset'][$objIdx])/60/60/24);
! 				$lessonSeqObj->setDueTime($objIdx, intval($lc->postvars['dueOffset_time'][$objIdx]));
  				$save = true;
  			}
+ /*
+ debug($objIdx);
+ debug($lessonSeqObj->items[$objIdx]->dueOffset);
+ debug($lessonSeqObj->items[$objIdx]->dueTime);
+ */
  			if ($save) {
! 				$lessonSeqObj->items[$objIdx]->save();
  			}
  		}
+ //exit();
  
  		$u->addSessionMessage('Dates have been saved.');

Index: lessonManager.lcp
===================================================================
RCS file: /cvsroot/logicampus/logicampus/src/logicreate/services/classmgr/lessonManager.lcp,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** lessonManager.lcp	28 Oct 2007 23:43:10 -0000	1.44
--- lessonManager.lcp	1 Nov 2007 17:46:41 -0000	1.45
***************
*** 75,83 ****
  
  				//change unix timestamp offset into days
! /*
! 				$sequences[$objIdx]->startOffset = ($obj->startOffset );
! 				$sequences[$objIdx]->dueOffset = ($obj->dueOffset );
  
- */
  			}
  
--- 75,81 ----
  
  				//change unix timestamp offset into days
! 				$sequences[$objIdx]->startOffset = ($obj->startOffset /60/60/24);
! 				$sequences[$objIdx]->dueOffset = (($obj->dueOffset - $obj->startOffset) /60/60/24);
  
  			}
  
***************
*** 876,881 ****
--- 874,891 ----
  
  
+ 		$gbcodeList = array();
  		foreach ($t['seqItems'] as $objIdx => $obj) {
  
+ 			$t['seqItems'][$objIdx]->startOffset = $obj->startOffset.'|'.$obj->startTime;
+ 
+ 			if ($obj->lobType == 'test' || $obj->lobType == 'activity') {
+ 
+ 				$t['seqItems'][$objIdx]->dueOffset = (($obj->dueOffset - $obj->startOffset));
+ 				$t['seqItems'][$objIdx]->dueOffset = $obj->dueOffset.'|'.$obj->dueTime;
+ 				$gbcodeList[] = 'link to grade';
+ 			} else {
+ 				$gbcodeList[] = '';
+ 			}
+ 
  			//change the "type" field into an image representing the mime.
  			//no reason why i'm changing lobType instead of lobMime
***************
*** 888,891 ****
--- 898,902 ----
  //			$t['seqItems'][$objIdx]->startOffset = ($obj->startOffset / 60/60/24);
  //			$t['seqItems'][$objIdx]->dueOffset = ($obj->dueOffset / 60/60/24);
+ 
  		}
  
***************
*** 932,936 ****
  		$column->setName( "Grade" );
  		$column->cellRenderer = new LC_TableStaticRenderer();
! 		$column->cellRenderer->values = array(2=>'no entry');
  		$column->maxWidth=75;
  		$table->addColumnAt(2,$column);
--- 943,947 ----
  		$column->setName( "Grade" );
  		$column->cellRenderer = new LC_TableStaticRenderer();
! 		$column->cellRenderer->values = $gbcodeList;
  		$column->maxWidth=75;
  		$table->addColumnAt(2,$column);
***************
*** 1266,1275 ****
  	}
  
  	function getRenderedValue() {
! 		if ($this->skipEmpty && $this->value == 0) {
  			return '';//"N/A";
  		}
! 		$hours = $this->value % 86400; //seconds per day
! 		$days = $this->value - $hours;
  
  		$time = "<select name=\"".$this->fieldName."[".$this->row."]\">\n";
--- 1277,1291 ----
  	}
  
+ 	/**
+ 	 * time and date are delivered in one $this->value variable
+ 	 * separated by a pipe char.
+ 	 */
  	function getRenderedValue() {
! 		//empty values still have the pipe character
! 		if ($this->skipEmpty && strlen($this->value) < 2) {
  			return '';//"N/A";
  		}
! 
! 		list($days,$hours) = @explode('|',$this->value);
  
  		$time = "<select name=\"".$this->fieldName."[".$this->row."]\">\n";

[Logicampus-cvs] logicampus/win-setup 7z.win.sfx, NONE, 1.1 7zCon.win.sfx, NONE, 1.1 compress.sh, NONE, 1.1 xamppcampus-win32-1.6.4.zip, 1.1, 1.2

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

Update of /cvsroot/logicampus/logicampus/win-setup
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv9413

Modified Files:
	xamppcampus-win32-1.6.4.zip 
Added Files:
	7z.win.sfx 7zCon.win.sfx compress.sh 
Log Message:
Updating special win self extracting exe support files.


--- NEW FILE: 7z.win.sfx ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: 7zCon.win.sfx ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: compress.sh ---
#!/bin/sh
cd ../7ziptmp
../win-setup/p7zip_4.55/bin/7z a $1.7z $1
cat ../win-setup/7z.win.sfx $1.7z > $1.exe

Index: xamppcampus-win32-1.6.4.zip
===================================================================
RCS file: /cvsroot/logicampus/logicampus/win-setup/xamppcampus-win32-1.6.4.zip,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
Binary files /tmp/cvsA3nt7w and /tmp/cvsjZcrZc differ

[Logicampus-cvs] logicampus/src/public_html defines.template.php, 1.11, 1.12

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

Update of /cvsroot/logicampus/logicampus/src/public_html
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv23789

Modified Files:
	defines.template.php 
Log Message:
Moved around the looking for the logicreate folder so that it works from the installer
 as well as normal events.


Index: defines.template.php
===================================================================
RCS file: /cvsroot/logicampus/logicampus/src/public_html/defines.template.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** defines.template.php	30 Oct 2007 17:04:28 -0000	1.11
--- defines.template.php	30 Oct 2007 17:21:38 -0000	1.12
***************
*** 48,61 ****
  //	        ^----base      ^------tail
  
- $relpath='../logicreate/';
- if (! file_exists($relpath)) {
- 	$relpath='./logicreate/';
- 	if (! file_exists($relpath)) {
- 		$relpath='../../logicreate/';
- 		if (! file_exists($relpath)) {
- 			die("Cannot find logicreate directory.");
- 		}
- 	}
- }
  
  $PHPSESSID = @$_COOKIE['PHPSESSID'];
--- 48,51 ----
***************
*** 71,74 ****
--- 61,77 ----
  
  
+ //find the logicreate folder
+ $relpath='../logicreate/';
+ if (! file_exists($doc.$relpath)) {
+ 	$relpath='./logicreate/';
+ 	if (! file_exists($doc.$relpath)) {
+ 		$relpath='../../logicreate/';
+ 		if (! file_exists($doc.$relpath)) {
+ 			die("Cannot find logicreate directory.");
+ 		}
+ 	}
+ }
+ 
+ 
  define('DOCUMENT_ROOT',$doc);
  define('LIB_PATH',DOCUMENT_ROOT.$relpath.'lib/');

[Logicampus-cvs] logicampus/src/public_html defines.template.php, 1.10, 1.11

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

Update of /cvsroot/logicampus/logicampus/src/public_html
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv16052

Modified Files:
	defines.template.php 
Log Message:
Fix relative path checking.


Index: defines.template.php
===================================================================
RCS file: /cvsroot/logicampus/logicampus/src/public_html/defines.template.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** defines.template.php	19 Sep 2007 18:28:17 -0000	1.10
--- defines.template.php	30 Oct 2007 17:04:28 -0000	1.11
***************
*** 59,63 ****
  }
  
- $relpath='../logicreate/';
  $PHPSESSID = @$_COOKIE['PHPSESSID'];
  
--- 59,62 ----

[Logicampus-cvs] logicampus/win-setup p7zip_4.55.zip, NONE, 1.1 xamppcampus-win32-1.6.4.zip, NONE, 1.1

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

Update of /cvsroot/logicampus/logicampus/win-setup
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv14371

Added Files:
	p7zip_4.55.zip xamppcampus-win32-1.6.4.zip 
Log Message:
Adding support files to make a windows installer.


--- NEW FILE: p7zip_4.55.zip ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: xamppcampus-win32-1.6.4.zip ---
(This appears to be a binary file; contents omitted.)

[Logicampus-cvs] logicampus/win-setup - New directory

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

Update of /cvsroot/logicampus/logicampus/win-setup
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv14337/win-setup

Log Message:
Directory /cvsroot/logicampus/logicampus/win-setup added to the repository

[Logicampus-cvs] logicampus/src/logicreate/services/classmgr lessonManager.lcp, 1.43, 1.44 lessonNew.lcp, 1.12, 1.13 lessonSequence.lcp, 1.12, 1.13

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

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

Modified Files:
	lessonManager.lcp lessonNew.lcp lessonSequence.lcp 
Log Message:
Fixes to start times for lesson sequences.
Don't allow lessons to start at a particular time, leave that to the content.


Index: lessonSequence.lcp
===================================================================
RCS file: /cvsroot/logicampus/logicampus/src/logicreate/services/classmgr/lessonSequence.lcp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** lessonSequence.lcp	25 Oct 2007 18:31:56 -0000	1.12
--- lessonSequence.lcp	28 Oct 2007 23:43:10 -0000	1.13
***************
*** 131,136 ****
  
  			//change unix timestamp offset into days
! 			$sequences[$objIdx]->startOffset = ($obj->startOffset / 60/60/24);
! 			$sequences[$objIdx]->dueOffset = ($obj->dueOffset / 60/60/24);
  
  		}
--- 131,136 ----
  
  			//change unix timestamp offset into days
! //			$sequences[$objIdx]->startOffset = ($obj->startOffset / 60/60/24);
! //			$sequences[$objIdx]->dueOffset = ($obj->dueOffset / 60/60/24);
  
  		}
***************
*** 277,287 ****
  			$save = false;
  			if( isset($lc->postvars['startOffset'][$objIdx]) ) {
! 				$sequences[$objIdx]->startOffset = ($lc->postvars['startOffset'][$objIdx] * 60*60*24);
  				$save = true;
  			}
  			//due offset is number of days *after* the start of this object.
  			if( isset($lc->postvars['dueOffset'][$objIdx]) ) {
! 				$sequences[$objIdx]->dueOffset = ($lc->postvars['dueOffset'][$objIdx] * 60*60*24);
! 				$sequences[$objIdx]->dueOffset += $sequences[$objIdx]->startOffset;
  				$save = true;
  			}
--- 277,289 ----
  			$save = false;
  			if( isset($lc->postvars['startOffset'][$objIdx]) ) {
! 				$sequences[$objIdx]->startOffset = ($lc->postvars['startOffset'][$objIdx] );
! 				$sequences[$objIdx]->startOffset += intval($lc->postvars['startOffset_time'][$objIdx] );
  				$save = true;
  			}
  			//due offset is number of days *after* the start of this object.
  			if( isset($lc->postvars['dueOffset'][$objIdx]) ) {
! 				$sequences[$objIdx]->dueOffset = ($lc->postvars['dueOffset'][$objIdx] );
! 				$sequences[$objIdx]->dueOffset += ($sequences[$objIdx]->startOffset - ($sequences[$objIdx]->startOffset % 86400));
! 				$sequences[$objIdx]->dueTime = intval($lc->postvars['dueOffset_time'][$objIdx] );
  				$save = true;
  			}

Index: lessonNew.lcp
===================================================================
RCS file: /cvsroot/logicampus/logicampus/src/logicreate/services/classmgr/lessonNew.lcp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** lessonNew.lcp	8 Oct 2007 14:21:07 -0000	1.12
--- lessonNew.lcp	28 Oct 2007 23:43:10 -0000	1.13
***************
*** 57,61 ****
  		$t['activeOnStruct']['displayName'] = 'Active On';
  		$t['activeOnStruct']['fieldName'] = 'activeOn';
! 		$t['activeOnStruct']['dateTimeBit'] = 63;
  		$t['activeOnStruct']['endYear'] = 4;
  
--- 57,62 ----
  		$t['activeOnStruct']['displayName'] = 'Active On';
  		$t['activeOnStruct']['fieldName'] = 'activeOn';
! //		$t['activeOnStruct']['dateTimeBit'] = 63;
! 		$t['activeOnStruct']['dateTimeBit'] = 7;
  		$t['activeOnStruct']['endYear'] = 4;
  

Index: lessonManager.lcp
===================================================================
RCS file: /cvsroot/logicampus/logicampus/src/logicreate/services/classmgr/lessonManager.lcp,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** lessonManager.lcp	27 Oct 2007 17:26:45 -0000	1.43
--- lessonManager.lcp	28 Oct 2007 23:43:10 -0000	1.44
***************
*** 75,81 ****
  
  				//change unix timestamp offset into days
! 				$sequences[$objIdx]->startOffset = ($obj->startOffset / 60/60/24);
! 				$sequences[$objIdx]->dueOffset = ($obj->dueOffset / 60/60/24);
  
  			}
  
--- 75,83 ----
  
  				//change unix timestamp offset into days
! /*
! 				$sequences[$objIdx]->startOffset = ($obj->startOffset );
! 				$sequences[$objIdx]->dueOffset = ($obj->dueOffset );
  
+ */
  			}
  
***************
*** 101,104 ****
--- 103,109 ----
  			$dm->ignoreColumn('hideAfterEnd');
  			$dm->ignoreColumn('rank');
+ 			$dm->ignoreColumn('dueTime');
+ 			$dm->ignoreColumn('endTime');
+ 			$dm->ignoreColumn('startTime');
  
  
***************
*** 737,741 ****
  		$t['activeOnStruct']['fieldName'] = 'activeOn';
  		$t['activeOnStruct']['displayName'] = 'Active On';
! 		$t['activeOnStruct']['dateTimeBit'] = 63;
  
  		$t['inactiveOnStruct']['defaultValue'] = $t['inactiveOn'];
--- 742,747 ----
  		$t['activeOnStruct']['fieldName'] = 'activeOn';
  		$t['activeOnStruct']['displayName'] = 'Active On';
! 		//$t['activeOnStruct']['dateTimeBit'] = 63;
! 		$t['activeOnStruct']['dateTimeBit'] = 7;
  
  		$t['inactiveOnStruct']['defaultValue'] = $t['inactiveOn'];
***************
*** 821,825 ****
  		$t['activeOnStruct']['fieldName'] = 'activeOn';
  		$t['activeOnStruct']['displayName'] = 'Active On';
! 		$t['activeOnStruct']['dateTimeBit'] = 63;
  
  		$t['inactiveOnStruct']['defaultValue'] = $t['inactiveOn'];
--- 827,832 ----
  		$t['activeOnStruct']['fieldName'] = 'activeOn';
  		$t['activeOnStruct']['displayName'] = 'Active On';
! //		$t['activeOnStruct']['dateTimeBit'] = 63;
! 		$t['activeOnStruct']['dateTimeBit'] = 7;
  
  		$t['inactiveOnStruct']['defaultValue'] = $t['inactiveOn'];
***************
*** 879,884 ****
  //			$t['seqItems'][$objIdx]->dueOffset = ($obj->dueOffset / 60/60/24) . ' days <br/> 9:00 am <br/><a href="#">change</a>';
  
! 			$t['seqItems'][$objIdx]->startOffset = ($obj->startOffset / 60/60/24);
! 			$t['seqItems'][$objIdx]->dueOffset = ($obj->dueOffset / 60/60/24);
  		}
  
--- 886,891 ----
  //			$t['seqItems'][$objIdx]->dueOffset = ($obj->dueOffset / 60/60/24) . ' days <br/> 9:00 am <br/><a href="#">change</a>';
  
! //			$t['seqItems'][$objIdx]->startOffset = ($obj->startOffset / 60/60/24);
! //			$t['seqItems'][$objIdx]->dueOffset = ($obj->dueOffset / 60/60/24);
  		}
  
***************
*** 903,906 ****
--- 910,916 ----
  		$dm->ignoreColumn('hideUntilStart');
  		$dm->ignoreColumn('hideAfterEnd');
+ 		$dm->ignoreColumn('dueTime');
+ 		$dm->ignoreColumn('startTime');
+ 		$dm->ignoreColumn('endTime');
  
  
***************
*** 930,935 ****
  		$colB->maxWidth=180;
  		$colB->name = 'Start';
! 		$colB->cellRenderer = new LC_TableSelectRenderer();
! 		$colB->cellRenderer->label = "&nbsp;@<select><option>9:00 am</option></select>";
  		$colB->cellRenderer->idName = 'startOffset';
  		$colB->cellRenderer->fieldName = 'startOffset';
--- 940,944 ----
  		$colB->maxWidth=180;
  		$colB->name = 'Start';
! 		$colB->cellRenderer = new LC_Table_DateOffsetRenderer();
  		$colB->cellRenderer->idName = 'startOffset';
  		$colB->cellRenderer->fieldName = 'startOffset';
***************
*** 942,951 ****
  		$colC->maxWidth=200;
  		$colC->name = 'Due';
! 		$colC->cellRenderer = new LC_TableSelectRenderer();
! 		$colC->cellRenderer->label = "&nbsp;@<select><option>9:00 am</option></select>";
  		$colC->cellRenderer->idName = 'dueOffset';
  		$colC->cellRenderer->fieldName = 'dueOffset';
  		$colC->cellRenderer->options = array(0=>'Never');
! 		$colC->cellRenderer->skipEmpty = true;;
  		for ($qq=1; $qq< 31; $qq++) { 
  			$colC->cellRenderer->options[] = $qq .' days later';
--- 951,961 ----
  		$colC->maxWidth=200;
  		$colC->name = 'Due';
! 		$colC->cellRenderer = new LC_Table_DateOffsetRenderer();
! 		//$colC->cellRenderer = new LC_TableSelectRenderer();
! 		$colC->cellRenderer->zeroLabel = "Never";
  		$colC->cellRenderer->idName = 'dueOffset';
  		$colC->cellRenderer->fieldName = 'dueOffset';
  		$colC->cellRenderer->options = array(0=>'Never');
! 		$colC->cellRenderer->skipEmpty = true;
  		for ($qq=1; $qq< 31; $qq++) { 
  			$colC->cellRenderer->options[] = $qq .' days later';
***************
*** 1213,1215 ****
--- 1223,1287 ----
  }
  
+ 
+ class LC_Table_DateOffsetRenderer extends LC_TableCellRenderer{
+ 
+ 	var $selectedVal;
+ 	var $selectedKey;
+ 	var $idName;
+ 	var $fieldName = 'item';
+ 	var $options = array();
+ 	var $label = '';
+ 	var $useKeysAsValues = true;
+ 	var $skipEmpty = false;
+ 	var $dayList = array();
+ 	var $timeList = array();
+ 	var $dayLabel = ' days';
+ 	var $zeroLabel = 'First Day';
+ 
+ 	function LC_Table_DateOffsetRenderer() {
+ 		$this->timeList = array();
+ 		for ($x=0; $x < 24; ++$x) {
+ 			for ($y=0; $y < 60; $y+=30) {
+ 				if ($x < 12) {
+ 					$ampm = 'AM';
+ 				} else {
+ 					$ampm = 'PM';
+ 				}
+ 				$fieldValue = $x * 60*60;
+ 				$fieldValue += $y * 60;
+ 				if ($x == 0 ) {
+ 					$this->timeList[$fieldValue] = ($x+12).':'.sprintf('%02d',$y). ' '.$ampm;
+ 				} else if ($x > 12) {
+ 					$this->timeList[$fieldValue] = ($x-12).':'.sprintf('%02d',$y). ' '.$ampm;
+ 				} else {
+ 					$this->timeList[$fieldValue] = $x.':'.sprintf('%02d',$y). ' '.$ampm;
+ 				}
+ 			}
+ 		}
+ 
+ 		//prepopulate days
+ 		for ($x = 1; $x <= 30; $x++) {
+ 			$this->dayList[ ($x*60*60*24) ] = $x .$this->dayLabel;
+ 		}
+ 	}
+ 
+ 	function getRenderedValue() {
+ 		if ($this->skipEmpty && $this->value == 0) {
+ 			return '';//"N/A";
+ 		}
+ 		$hours = $this->value % 86400; //seconds per day
+ 		$days = $this->value - $hours;
+ 
+ 		$time = "<select name=\"".$this->fieldName."[".$this->row."]\">\n";
+ 		$time .= "\t<option value=\"0\">".$this->zeroLabel."</option>\n";
+ 		$time .= Form::makeOptions($this->dayList,$days)."</select>\n";
+ 
+ 		$time .= "&nbsp;@<select name=\"".$this->fieldName."_time[".$this->row."]\">";
+ 		$time .= "\t<option value=\"0\">".$this->zeroLabel."</option>\n";
+ 		$time .= Form::makeOptions($this->timeList,$hours)."</select>\n";
+ 		return $time;
+ 
+ 	}
+ }
+ 
  ?>

[Logicampus-cvs] logicampus/src/logicreate/services/classmgr/templates display_main.html, 1.13, 1.14 lessonManager_show.html, 1.3, 1.4

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

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

Modified Files:
	display_main.html lessonManager_show.html 
Log Message:
Fixes to start times for lesson sequences.
Don't allow lessons to start at a particular time, leave that to the content.


Index: display_main.html
===================================================================
RCS file: /cvsroot/logicampus/logicampus/src/logicreate/services/classmgr/templates/display_main.html,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** display_main.html	27 Oct 2007 17:26:46 -0000	1.13
--- display_main.html	28 Oct 2007 23:43:10 -0000	1.14
***************
*** 46,50 ****
--- 46,52 ----
  
  			<li><a href="<?=APP_URL?>classroom/details/id_classes=<?=$t['classObj']->id_classes?>"><?=lct('View Classroom')?></a></li>
+ 			<!--
  			<li><a href="<?=modurl('adjustDates');?>">Adjust All Dates</a></li>
+ 			-->
  			<li><a href="<?=modurl('dataexchange');?>"><?=lct('Export Class')?></a></li>
  			<li><a href="<?=modurl('exportContent');?>"><?=lct('Export Content')?></a></li>

Index: lessonManager_show.html
===================================================================
RCS file: /cvsroot/logicampus/logicampus/src/logicreate/services/classmgr/templates/lessonManager_show.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** lessonManager_show.html	27 Oct 2007 17:26:46 -0000	1.3
--- lessonManager_show.html	28 Oct 2007 23:43:10 -0000	1.4
***************
*** 36,40 ****
  <style type="text/css">
  	#seq_form select {
! 		font-size: 9pt;
  		border: 1px ridge gray;
  	}
--- 36,40 ----
  <style type="text/css">
  	#seq_form select {
! 		font-size: 8pt;
  		border: 1px ridge gray;
  	}

[Logicampus-cvs] logicampus/src/logicreate/lib lc_table_calendar.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-serv8694/lib

Modified Files:
	lc_table_calendar.php 
Log Message:
Fixes to start times for lesson sequences.
Don't allow lessons to start at a particular time, leave that to the content.


Index: lc_table_calendar.php
===================================================================
RCS file: /cvsroot/logicampus/logicampus/src/logicreate/lib/lc_table_calendar.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** lc_table_calendar.php	9 Oct 2007 23:52:45 -0000	1.14
--- lc_table_calendar.php	28 Oct 2007 23:43:10 -0000	1.15
***************
*** 419,425 ****
  	function getEventsAtHour($dateStamp) {
  		$ret = array();
! //		echo "Hour is : ".date('G:i:s',$evtStart);
  //		echo "<br/><br/>";
  		foreach($this->events as $blank=>$evt) {
  			list($m,$d,$y,$g) = explode(' ', date('m d Y G',$evt['startdate']));
  			$evtStart = mktime($g,0,0,$m,$d,$y);
--- 419,426 ----
  	function getEventsAtHour($dateStamp) {
  		$ret = array();
! //		echo "Hour is : ".date('m d Y G:i:s',$dateStamp)."<br/>\n";
  //		echo "<br/><br/>";
  		foreach($this->events as $blank=>$evt) {
+ //		echo "Start is : ".date('m d Y G:i:s',$evt['startdate'])." title is : ".$evt['title']."<br/>\n";
  			list($m,$d,$y,$g) = explode(' ', date('m d Y G',$evt['startdate']));
  			$evtStart = mktime($g,0,0,$m,$d,$y);

[Logicampus-cvs] logicampus/src/logicreate/services/classmgr/templates display_main.html, 1.12, 1.13 lessonManager_show.html, 1.2, 1.3

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

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

Modified Files:
	display_main.html lessonManager_show.html 
Log Message:
Fix list spacing on classroom manager page for IE.
Adjust the look of the way start and due dates are set.


Index: display_main.html
===================================================================
RCS file: /cvsroot/logicampus/logicampus/src/logicreate/services/classmgr/templates/display_main.html,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** display_main.html	4 Oct 2007 17:50:58 -0000	1.12
--- display_main.html	27 Oct 2007 17:26:46 -0000	1.13
***************
*** 18,23 ****
  			<li><a href="<?=APP_URL?>gradebook/main/event=controlPanel"><?=lct('Gradebook Setup')?></a></li>
  			<li><a href="<?=APP_URL?>classmgr/users/"><?=lct('Student Management')?></a></li>
! 			<li><a href="<?=APP_URL?>classmgr/faq/"><?=lct('FAQs')?></a></li>
! 			<br/>
  			<li><a href="<?=APP_URL?>classmgr/textbooks"><?=lct('Textbooks')?></a></li>
  			<li><a href="<?=APP_URL?>classmgr/examschedule/"><?=lct('Exam Scheduling')?></a></li>
--- 18,22 ----
  			<li><a href="<?=APP_URL?>gradebook/main/event=controlPanel"><?=lct('Gradebook Setup')?></a></li>
  			<li><a href="<?=APP_URL?>classmgr/users/"><?=lct('Student Management')?></a></li>
! 			<li style="margin-bottom:1em;"><a href="<?=APP_URL?>classmgr/faq/"><?=lct('FAQs')?></a></li>
  			<li><a href="<?=APP_URL?>classmgr/textbooks"><?=lct('Textbooks')?></a></li>
  			<li><a href="<?=APP_URL?>classmgr/examschedule/"><?=lct('Exam Scheduling')?></a></li>
***************
*** 44,50 ****
  			-->
  			<li><a href="<?=modurl('lessonObjectives');?>"><?=lct('Objectives')?></a></li>
! 			<li><a href="<?=modurl('lessonWebliography');?>"><?=lct('Webliography')?></a></li>
! 
! 			<br/>
  
  			<li><a href="<?=APP_URL?>classroom/details/id_classes=<?=$t['classObj']->id_classes?>"><?=lct('View Classroom')?></a></li>
--- 43,47 ----
  			-->
  			<li><a href="<?=modurl('lessonObjectives');?>"><?=lct('Objectives')?></a></li>
! 			<li style="margin-bottom:1em;"><a href="<?=modurl('lessonWebliography');?>"><?=lct('Webliography')?></a></li>
  
  			<li><a href="<?=APP_URL?>classroom/details/id_classes=<?=$t['classObj']->id_classes?>"><?=lct('View Classroom')?></a></li>
***************
*** 64,74 ****
  			<li><a href="<?=APP_URL?>gradebook/main/"><?=lct('Gradebook')?></a></li>
  			<li><a href="<?=appurl('classmgr/assignmentManage/');?>"><?=lct('Activities')?></a></li>
! 			<li><a href="<?=appurl('assessments');?>"><?=lct('Test Manager')?></a></li>
! 			<br/>
  			<li><a href="<?=modurl('cal/');?>"><?=lct('Calendar')?></a></li>
  			<li><a href="<?=modurl('announcements/');?>"><?=lct('Announcements')?></a></li>
  			<li><a href="#" onClick = "window.open('<?=APP_URL?>classchat/main/event=initialize/id_classes=<?=$obj->user->activeClassTaught->id_classes?>','generic2','toolbar=0,location=0,directories=0,status=0,menubar=0,scrollbars=1,resizable=1,width=790,height=500');"><?=lct('Chat')?></a></li>
! 			<li><a href="<?=appurl('classforums/main/');?>id_classes=<?=$t['classObj']->id_classes?>"><?=lct('Discussion Forums')?></a></li>
! 			<br/>
  			<li><a href="<?=modurl('contactStudents/');?>"><?=lct('Contact Students')?></a></li>
  			<li><a href="<?=modurl('studentPresentation');?>"><?=lct('Student Presentation')?></a></li>
--- 61,69 ----
  			<li><a href="<?=APP_URL?>gradebook/main/"><?=lct('Gradebook')?></a></li>
  			<li><a href="<?=appurl('classmgr/assignmentManage/');?>"><?=lct('Activities')?></a></li>
! 			<li style="margin-bottom:1em;"><a href="<?=appurl('assessments');?>"><?=lct('Test Manager')?></a></li>
  			<li><a href="<?=modurl('cal/');?>"><?=lct('Calendar')?></a></li>
  			<li><a href="<?=modurl('announcements/');?>"><?=lct('Announcements')?></a></li>
  			<li><a href="#" onClick = "window.open('<?=APP_URL?>classchat/main/event=initialize/id_classes=<?=$obj->user->activeClassTaught->id_classes?>','generic2','toolbar=0,location=0,directories=0,status=0,menubar=0,scrollbars=1,resizable=1,width=790,height=500');"><?=lct('Chat')?></a></li>
! 			<li style="margin-bottom:1em;"><a href="<?=appurl('classforums/main/');?>id_classes=<?=$t['classObj']->id_classes?>"><?=lct('Discussion Forums')?></a></li>
  			<li><a href="<?=modurl('contactStudents/');?>"><?=lct('Contact Students')?></a></li>
  			<li><a href="<?=modurl('studentPresentation');?>"><?=lct('Student Presentation')?></a></li>

Index: lessonManager_show.html
===================================================================
RCS file: /cvsroot/logicampus/logicampus/src/logicreate/services/classmgr/templates/lessonManager_show.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** lessonManager_show.html	8 Oct 2007 00:34:04 -0000	1.2
--- lessonManager_show.html	27 Oct 2007 17:26:46 -0000	1.3
***************
*** 34,37 ****
--- 34,43 ----
  </table>
  
+ <style type="text/css">
+ 	#seq_form select {
+ 		font-size: 9pt;
+ 		border: 1px ridge gray;
+ 	}
+ </style>
  
  <form name="seq_form" id="seq_form" action="<?=appurl('classmgr');?>/lessonSequence/event=save/id=<?=$t['lessonId'];?>" method="POST">
***************
*** 42,45 ****
--- 48,52 ----
  <input type="submit" name="save_btn" id="save_btn" value="Save Changes"/>
  </form>
+ <p>&nbsp;</p>
  
  	<div style="float:right;padding-top:.5em;width:48%;align:right;">

[Logicampus-cvs] logicampus/src/logicreate/services/classmgr assignmentManage.lcp, 1.26, 1.27 lessonManager.lcp, 1.42, 1.43

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

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

Modified Files:
	assignmentManage.lcp lessonManager.lcp 
Log Message:
Fix list spacing on classroom manager page for IE.
Adjust the look of the way start and due dates are set.


Index: assignmentManage.lcp
===================================================================
RCS file: /cvsroot/logicampus/logicampus/src/logicreate/services/classmgr/assignmentManage.lcp,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** assignmentManage.lcp	8 Oct 2007 17:02:14 -0000	1.26
--- assignmentManage.lcp	27 Oct 2007 17:26:45 -0000	1.27
***************
*** 716,719 ****
--- 716,720 ----
  		$lessonSequence->loadItems();
  		$lesson = new LC_Lesson($lessonId);
+ 		$t['lessonTitle'] = $lesson->getTitle();
  
  		$activityLob = $lessonSequence->fetchObject($classSeqId);
***************
*** 853,856 ****
--- 854,858 ----
  		$lessonSequence->loadItems();
  		$lesson = new LC_Lesson($lessonId);
+ 		$t['lessonTitle'] = $lesson->getTitle();
  
  		$activityLob = $lessonSequence->fetchObject($classSeqId);

Index: lessonManager.lcp
===================================================================
RCS file: /cvsroot/logicampus/logicampus/src/logicreate/services/classmgr/lessonManager.lcp,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** lessonManager.lcp	8 Oct 2007 17:02:14 -0000	1.42
--- lessonManager.lcp	27 Oct 2007 17:26:45 -0000	1.43
***************
*** 55,59 ****
  
  		$t['content'] = $dg->toHTML();
! */
  
  		$t['lessonList'] = LC_Lesson::loadClassLessons($classId);
--- 55,59 ----
  
  		$t['content'] = $dg->toHTML();
! //*/
  
  		$t['lessonList'] = LC_Lesson::loadClassLessons($classId);
***************
*** 162,166 ****
  		// also, correct the checkbox selection state with a one to
  		// many lookup
! 		$sql = "SELECT A.lob_class_repo_id, A.class_id, B.title, A.lesson_id
  			FROM class_lesson_sequence AS A
  			LEFT JOIN class_lessons AS B
--- 162,166 ----
  		// also, correct the checkbox selection state with a one to
  		// many lookup
! 		$sql = "SELECT A.lob_class_repo_id, A.class_id, B.title, A.lesson_id, A.class_lesson_sequence_id
  			FROM class_lesson_sequence AS A
  			LEFT JOIN class_lessons AS B
***************
*** 314,318 ****
  		// also, correct the checkbox selection state with a one to
  		// many lookup
! 		$sql = "SELECT A.class_lesson_sequence_id, A.lesson_id, A.lob_class_repo_id, B.title
  			FROM class_lesson_sequence AS A
  			LEFT JOIN class_lessons AS B
--- 314,318 ----
  		// also, correct the checkbox selection state with a one to
  		// many lookup
! 		$sql = "SELECT A.class_id, A.lesson_id, A.lob_class_repo_id, B.title
  			FROM class_lesson_sequence AS A
  			LEFT JOIN class_lessons AS B
***************
*** 347,351 ****
  		$col_c->justify='left';
  		$col_c->cellRenderer = new LC_TableLessonRenderer();
! 		$col_c->cellRenderer->idName = 'id_class_objectives';
  		$col_c->cellRenderer->lessonTitles = $itemsToTitles;
  
--- 347,351 ----
  		$col_c->justify='left';
  		$col_c->cellRenderer = new LC_TableLessonRenderer();
! 		$col_c->cellRenderer->idName = 'lob_class_repo_id';
  		$col_c->cellRenderer->lessonTitles = $itemsToTitles;
  
***************
*** 462,466 ****
  			  ON A.lesson_id = B.id_class_lessons
  			WHERE A.class_id = ".$class_id."
! 			AND A.lob_type = 'activity'
  			ORDER BY B.title";
  		$db->query($sql);
--- 462,466 ----
  			  ON A.lesson_id = B.id_class_lessons
  			WHERE A.class_id = ".$class_id."
! 			AND A.lob_type = 'test'
  			ORDER BY B.title";
  		$db->query($sql);
***************
*** 491,495 ****
  		$col_c->cellRenderer = new LC_TableLessonRenderer();
  		$col_c->cellRenderer->lessonTitles = $itemsToTitles;
! 		$col_c->cellRenderer->idName = 'assessment_id';
  
  		$t['table'] = new LC_TableRenderer($table);
--- 491,495 ----
  		$col_c->cellRenderer = new LC_TableLessonRenderer();
  		$col_c->cellRenderer->lessonTitles = $itemsToTitles;
! 		$col_c->cellRenderer->idName = 'lob_class_repo_id';
  
  		$t['table'] = new LC_TableRenderer($table);
***************
*** 863,867 ****
  		while ( $db->nextRecord() )
  			$t['assessments'][] = $db->record['display_name'];
! */
  
  
--- 863,867 ----
  		while ( $db->nextRecord() )
  			$t['assessments'][] = $db->record['display_name'];
! //*/
  
  
***************
*** 876,879 ****
--- 876,882 ----
  
  			//change unix timestamp offset into days
+ //			$t['seqItems'][$objIdx]->startOffset = ($obj->startOffset / 60/60/24). ' days <br/> 9:00 am <br/><a href="#">change</a>';
+ //			$t['seqItems'][$objIdx]->dueOffset = ($obj->dueOffset / 60/60/24) . ' days <br/> 9:00 am <br/><a href="#">change</a>';
+ 
  			$t['seqItems'][$objIdx]->startOffset = ($obj->startOffset / 60/60/24);
  			$t['seqItems'][$objIdx]->dueOffset = ($obj->dueOffset / 60/60/24);
***************
*** 915,949 ****
  
  		//create a gradebook entry column
  		$column = new LC_TableColumn();
! 		$column->setName( "Gradebook" );
  		$column->cellRenderer = new LC_TableStaticRenderer();
  		$column->cellRenderer->values = array(2=>'no entry');
! 		$column->maxWidth=128;
  		$table->addColumnAt(2,$column);
  
  		$colB = &$columnModel->getColumnAt(3);
! 		$colB->maxWidth=64;
  		$colB->name = 'Start';
  		$colB->cellRenderer = new LC_TableSelectRenderer();
  		$colB->cellRenderer->idName = 'startOffset';
  		$colB->cellRenderer->fieldName = 'startOffset';
! 		$colB->cellRenderer->options = array(0=>'0');
! 		for ($qq=1; $qq< 21; $qq++) { 
! 			$colB->cellRenderer->options[] = $qq;
  		}
  
  		$colC = &$columnModel->getColumnAt(4);
! 		$colC->maxWidth=64;
  		$colC->name = 'Due';
  		$colC->cellRenderer = new LC_TableSelectRenderer();
  		$colC->cellRenderer->idName = 'dueOffset';
  		$colC->cellRenderer->fieldName = 'dueOffset';
  		$colC->cellRenderer->options = array(0=>'Never');
! 		for ($qq=1; $qq< 21; $qq++) { 
! 			$colC->cellRenderer->options[] = $qq;
  		}
  
  		$col = &$columnModel->getColumnAt(5);
! 		$col->maxWidth=64;
  		$col->name = 'Rank';
  		$col->cellRenderer = new LC_Table_SequenceRenderer();
--- 918,957 ----
  
  		//create a gradebook entry column
+ // *
  		$column = new LC_TableColumn();
! 		$column->setName( "Grade" );
  		$column->cellRenderer = new LC_TableStaticRenderer();
  		$column->cellRenderer->values = array(2=>'no entry');
! 		$column->maxWidth=75;
  		$table->addColumnAt(2,$column);
+ //*/
  
  		$colB = &$columnModel->getColumnAt(3);
! 		$colB->maxWidth=180;
  		$colB->name = 'Start';
  		$colB->cellRenderer = new LC_TableSelectRenderer();
+ 		$colB->cellRenderer->label = "&nbsp;@<select><option>9:00 am</option></select>";
  		$colB->cellRenderer->idName = 'startOffset';
  		$colB->cellRenderer->fieldName = 'startOffset';
! 		$colB->cellRenderer->options = array(0=>'First Day');
! 		for ($qq=1; $qq< 31; $qq++) { 
! 			$colB->cellRenderer->options[] = $qq.' days';
  		}
  
  		$colC = &$columnModel->getColumnAt(4);
! 		$colC->maxWidth=200;
  		$colC->name = 'Due';
  		$colC->cellRenderer = new LC_TableSelectRenderer();
+ 		$colC->cellRenderer->label = "&nbsp;@<select><option>9:00 am</option></select>";
  		$colC->cellRenderer->idName = 'dueOffset';
  		$colC->cellRenderer->fieldName = 'dueOffset';
  		$colC->cellRenderer->options = array(0=>'Never');
! 		$colC->cellRenderer->skipEmpty = true;;
! 		for ($qq=1; $qq< 31; $qq++) { 
! 			$colC->cellRenderer->options[] = $qq .' days later';
  		}
  
  		$col = &$columnModel->getColumnAt(5);
! 		$col->maxWidth=50;
  		$col->name = 'Rank';
  		$col->cellRenderer = new LC_Table_SequenceRenderer();

[Logicampus-cvs] logicampus/src/logicreate/lib/PBDO LobClassActivity.php, NONE, 1.1 LobClassTest.php, NONE, 1.1

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

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

Added Files:
	LobClassActivity.php LobClassTest.php 
Log Message:
Basic PBDOs for class tests and class activities.


--- NEW FILE: LobClassActivity.php ---
<?

class LobClassActivityBase {

	var $_new = true;	//not pulled from DB
	var $_modified;		//set() called
	var $_version = '1.6';	//PBDO version number
	var $_entityVersion = '';	//Source version number
	var $lobClassActivityId;
	var $lobClassRepoId;
	var $responseTypeId;

	var $__attributes = array( 
	'lobClassActivityId'=>'integer',
	'lobClassRepoId'=>'integer',
	'responseTypeId'=>'tinyint');

	var $__nulls = array();

	/**
	 * Retrieves one lob_class_repo object via the foreign key lob_class_repo_id.
	 * 
	 * @param String $dsn the name of the data source to use for the sql query.
	 * @return Object the related object.
	 */
	function getLobClassRepoByLobClassRepoId($dsn='default') {
		if ( $this->lobClassRepoId == '' ) { trigger_error('Peer doSelect with empty key'); return false; }
		$array = LobClassRepoPeer::doSelect('lob_class_repo_id = \''.$this->lobClassRepoId.'\'',$dsn);
		if ( count($array) > 1 ) { trigger_error('multiple objects on one-to-one relationship'); }
		return $array[0];
	}



	function getPrimaryKey() {
		return $this->lobClassActivityId;
	}


	function setPrimaryKey($val) {
		$this->lobClassActivityId = $val;
	}


	function save($dsn="default") {
		if ( $this->isNew() ) {
			$this->setPrimaryKey(LobClassActivityPeer::doInsert($this,$dsn));
		} else {
			LobClassActivityPeer::doUpdate($this,$dsn);
		}
	}


	function load($key,$dsn="default") {
		$where = '';
		if (is_array($key) ) {
			while (list ($k,$v) = @each($key) ) {
			$where .= "$k='$v' and ";
			}
			$where = substr($where,0,-5);
		} else {
			$where = "lob_class_activity_id='".$key."'";
		}
		$array = LobClassActivityPeer::doSelect($where,$dsn);
		return $array[0];
	}


	function loadAll($dsn="default") {
		$array = LobClassActivityPeer::doSelect('',$dsn);
		return $array;
	}


	function delete($deep=false,$dsn="default") {
		LobClassActivityPeer::doDelete($this,$deep,$dsn);
	}


	function isNew() {
		return $this->_new;
	}


	function isModified() {
		return $this->_modified;

	}


	function get($key) {
		return $this->{$key};
	}


	/**
	 * only sets if the new value is !== the current value
	 * returns true if the value was updated
	 * also, sets _modified to true on success
	 */
	function set($key,$val) {
		if ($this->{$key} !== $val) {
			$this->_modified = true;
			$this->{$key} = $val;
			return true;
		}
		return false;
	}

}


class LobClassActivityPeerBase {

	var $tableName = 'lob_class_activity';

	function doSelect($where,$dsn="default") {
		//use this tableName
		$db = DB::getHandle($dsn);
		$st = new PBDO_SelectStatement("lob_class_activity",$where);
		$st->fields['lob_class_activity_id'] = 'lob_class_activity_id';
		$st->fields['lob_class_repo_id'] = 'lob_class_repo_id';
		$st->fields['response_type_id'] = 'response_type_id';


		$array = array();
		$db->executeQuery($st);
		while($db->nextRecord() ) {
			$array[] = LobClassActivityPeer::row2Obj($db->record);
		}
		return $array;
	}

	function doInsert(&$obj,$dsn="default") {
		//use this tableName
		$db = DB::getHandle($dsn);
		$st = new PBDO_InsertStatement("lob_class_activity");
		$st->fields['lob_class_activity_id'] = $this->lobClassActivityId;
		$st->fields['lob_class_repo_id'] = $this->lobClassRepoId;
		$st->fields['response_type_id'] = $this->responseTypeId;


		$st->key = 'lob_class_activity_id';
		$db->executeQuery($st);

		$obj->_new = false;
		$obj->_modified = false;
		$id =  $db->getInsertID();
		return $id;

	}

	function doUpdate(&$obj,$dsn="default") {
		//use this tableName
		$db = DB::getHandle($dsn);
		$st = new PBDO_UpdateStatement("lob_class_activity");
		$st->fields['lob_class_activity_id'] = $obj->lobClassActivityId;
		$st->fields['lob_class_repo_id'] = $obj->lobClassRepoId;
		$st->fields['response_type_id'] = $obj->responseTypeId;


		$st->key = 'lob_class_activity_id';
		$db->executeQuery($st);
		$obj->_modified = false;

	}

	function doReplace($obj,$dsn="default") {
		//use this tableName
		$db = DB::getHandle($dsn);
		if ($this->isNew() ) {
			$db->executeQuery(new PBDO_InsertStatement($criteria));
		} else {
			$db->executeQuery(new PBDO_UpdateStatement($criteria));
		}
	}


	/**
	 * remove an object
	 */
	function doDelete(&$obj,$deep=false,$dsn="default") {
		//use this tableName
		$db = DB::getHandle($dsn);
		$st = new PBDO_DeleteStatement("lob_class_activity","lob_class_activity_id = '".$obj->getPrimaryKey()."'");

		$db->executeQuery($st);

		if ( $deep ) {

		}

		$obj->_new = false;
		$obj->_modified = false;
		$id =  $db->getInsertID();
		return $id;

	}



	/**
	 * send a raw query
	 */
	function doQuery(&$sql,$dsn="default") {
		//use this tableName
		$db = DB::getHandle($dsn);

		$db->query($sql);

	  	return;
	}



	function row2Obj($row) {
		$x = new LobClassActivity();
		$x->lobClassActivityId = $row['lob_class_activity_id'];
		$x->lobClassRepoId = $row['lob_class_repo_id'];
		$x->responseTypeId = $row['response_type_id'];

		$x->_new = false;
		return $x;
	}

		
}


//You can edit this class, but do not change this next line!
class LobClassActivity extends LobClassActivityBase {



}



class LobClassActivityPeer extends LobClassActivityPeerBase {

}

?>
--- NEW FILE: LobClassTest.php ---
<?

class LobClassTestBase {

	var $_new = true;	//not pulled from DB
	var $_modified;		//set() called
	var $_version = '1.6';	//PBDO version number
	var $_entityVersion = '';	//Source version number
	var $lobClassTestId;
	var $lobClassRepoId;
	var $numRetry;
	var $isPractice;

	var $__attributes = array( 
	'lobClassTestId'=>'integer',
	'lobClassRepoId'=>'integer',
	'numRetry'=>'integer',
	'isPractice'=>'tinyint');

	var $__nulls = array();

	/**
	 * Retrieves one lob_class_repo object via the foreign key lob_class_repo_id.
	 * 
	 * @param String $dsn the name of the data source to use for the sql query.
	 * @return Object the related object.
	 */
	function getLobClassRepoByLobClassRepoId($dsn='default') {
		if ( $this->lobClassRepoId == '' ) { trigger_error('Peer doSelect with empty key'); return false; }
		$array = LobClassRepoPeer::doSelect('lob_class_repo_id = \''.$this->lobClassRepoId.'\'',$dsn);
		if ( count($array) > 1 ) { trigger_error('multiple objects on one-to-one relationship'); }
		return $array[0];
	}



	function getPrimaryKey() {
		return $this->lobClassTestId;
	}


	function setPrimaryKey($val) {
		$this->lobClassTestId = $val;
	}


	function save($dsn="default") {
		if ( $this->isNew() ) {
			$this->setPrimaryKey(LobClassTestPeer::doInsert($this,$dsn));
		} else {
			LobClassTestPeer::doUpdate($this,$dsn);
		}
	}


	function load($key,$dsn="default") {
		$where = '';
		if (is_array($key) ) {
			while (list ($k,$v) = @each($key) ) {
			$where .= "$k='$v' and ";
			}
			$where = substr($where,0,-5);
		} else {
			$where = "lob_class_test_id='".$key."'";
		}
		$array = LobClassTestPeer::doSelect($where,$dsn);
		return $array[0];
	}


	function loadAll($dsn="default") {
		$array = LobClassTestPeer::doSelect('',$dsn);
		return $array;
	}


	function delete($deep=false,$dsn="default") {
		LobClassTestPeer::doDelete($this,$deep,$dsn);
	}


	function isNew() {
		return $this->_new;
	}


	function isModified() {
		return $this->_modified;

	}


	function get($key) {
		return $this->{$key};
	}


	/**
	 * only sets if the new value is !== the current value
	 * returns true if the value was updated
	 * also, sets _modified to true on success
	 */
	function set($key,$val) {
		if ($this->{$key} !== $val) {
			$this->_modified = true;
			$this->{$key} = $val;
			return true;
		}
		return false;
	}

}


class LobClassTestPeerBase {

	var $tableName = 'lob_class_test';

	function doSelect($where,$dsn="default") {
		//use this tableName
		$db = DB::getHandle($dsn);
		$st = new PBDO_SelectStatement("lob_class_test",$where);
		$st->fields['lob_class_test_id'] = 'lob_class_test_id';
		$st->fields['lob_class_repo_id'] = 'lob_class_repo_id';
		$st->fields['num_retry'] = 'num_retry';
		$st->fields['is_practice'] = 'is_practice';


		$array = array();
		$db->executeQuery($st);
		while($db->nextRecord() ) {
			$array[] = LobClassTestPeer::row2Obj($db->record);
		}
		return $array;
	}

	function doInsert(&$obj,$dsn="default") {
		//use this tableName
		$db = DB::getHandle($dsn);
		$st = new PBDO_InsertStatement("lob_class_test");
		$st->fields['lob_class_test_id'] = $this->lobClassTestId;
		$st->fields['lob_class_repo_id'] = $this->lobClassRepoId;
		$st->fields['num_retry'] = $this->numRetry;
		$st->fields['is_practice'] = $this->isPractice;


		$st->key = 'lob_class_test_id';
		$db->executeQuery($st);

		$obj->_new = false;
		$obj->_modified = false;
		$id =  $db->getInsertID();
		return $id;

	}

	function doUpdate(&$obj,$dsn="default") {
		//use this tableName
		$db = DB::getHandle($dsn);
		$st = new PBDO_UpdateStatement("lob_class_test");
		$st->fields['lob_class_test_id'] = $obj->lobClassTestId;
		$st->fields['lob_class_repo_id'] = $obj->lobClassRepoId;
		$st->fields['num_retry'] = $obj->numRetry;
		$st->fields['is_practice'] = $obj->isPractice;


		$st->key = 'lob_class_test_id';
		$db->executeQuery($st);
		$obj->_modified = false;

	}

	function doReplace($obj,$dsn="default") {
		//use this tableName
		$db = DB::getHandle($dsn);
		if ($this->isNew() ) {
			$db->executeQuery(new PBDO_InsertStatement($criteria));
		} else {
			$db->executeQuery(new PBDO_UpdateStatement($criteria));
		}
	}


	/**
	 * remove an object
	 */
	function doDelete(&$obj,$deep=false,$dsn="default") {
		//use this tableName
		$db = DB::getHandle($dsn);
		$st = new PBDO_DeleteStatement("lob_class_test","lob_class_test_id = '".$obj->getPrimaryKey()."'");

		$db->executeQuery($st);

		if ( $deep ) {

		}

		$obj->_new = false;
		$obj->_modified = false;
		$id =  $db->getInsertID();
		return $id;

	}



	/**
	 * send a raw query
	 */
	function doQuery(&$sql,$dsn="default") {
		//use this tableName
		$db = DB::getHandle($dsn);

		$db->query($sql);

	  	return;
	}



	function row2Obj($row) {
		$x = new LobClassTest();
		$x->lobClassTestId = $row['lob_class_test_id'];
		$x->lobClassRepoId = $row['lob_class_repo_id'];
		$x->numRetry = $row['num_retry'];
		$x->isPractice = $row['is_practice'];

		$x->_new = false;
		return $x;
	}

		
}


//You can edit this class, but do not change this next line!
class LobClassTest extends LobClassTestBase {



}



class LobClassTestPeer extends LobClassTestPeerBase {

}

?>

[Logicampus-cvs] logicampus/src/logicreate/lib lc_table_renderer.php, 1.16, 1.17

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

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

Modified Files:
	lc_table_renderer.php 
Log Message:
Adding select column renderer


Index: lc_table_renderer.php
===================================================================
RCS file: /cvsroot/logicampus/logicampus/src/logicreate/lib/lc_table_renderer.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** lc_table_renderer.php	8 Oct 2007 19:41:21 -0000	1.16
--- lc_table_renderer.php	27 Oct 2007 17:24:31 -0000	1.17
***************
*** 452,455 ****
--- 452,458 ----
  	var $fieldName = 'item';
  	var $options = array();
+ 	var $label = '';
+ 	var $useKeysAsValues = true;
+ 	var $skipEmpty = false;
  
  	function LC_TableSelectRenderer() {
***************
*** 474,483 ****
  			$selected = ($this->selectedVal == $this->value->{$this->selectedKey}) ? ' CHECKED ':'';
  		}
  
! 		foreach ($this->options as $v) {
! 			if ($v == $this->value) { $selected = 'selected="SELECTED"';} else { $selected = '';}
! 			$html .= "<option value=\"".$v."\" ".$selected.">".$v."</option>\n\t";
  		}
! 		return $html."\n\t</select>&nbsp;Days\n";
  	}
  }
--- 477,494 ----
  			$selected = ($this->selectedVal == $this->value->{$this->selectedKey}) ? ' CHECKED ':'';
  		}
+ 		if ($this->skipEmpty && $this->value == 0) {
+ 			return '';//"N/A";
+ 		}
  
! 		foreach ($this->options as $k => $v) {
! 			if ($this->useKeysAsValues) {
! 				$value = $k;
! 			} else {
! 				$value = $v;
! 			}
! 			if ($value == $this->value) { $selected = 'selected="SELECTED"';} else { $selected = '';}
! 			$html .= "<option value=\"".$value."\" ".$selected.">".$v."</option>\n\t";
  		}
! 		return $html."\n\t</select>".$this->label."\n";
  	}
  }

[Logicampus-cvs] logicampus/data class_lesson_sequence.mysql.sql, 1.6, 1.7

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

Update of /cvsroot/logicampus/logicampus/data
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv15346/data

Modified Files:
	class_lesson_sequence.mysql.sql 
Log Message:
Updating class lesson sequence schema to include start, stop, and due times.


Index: class_lesson_sequence.mysql.sql
===================================================================
RCS file: /cvsroot/logicampus/logicampus/data/class_lesson_sequence.mysql.sql,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** class_lesson_sequence.mysql.sql	2 Oct 2007 17:06:36 -0000	1.6
--- class_lesson_sequence.mysql.sql	27 Oct 2007 17:22:56 -0000	1.7
***************
*** 2,6 ****
  -- entity version: 0.0
  -- DB type: mysql
! -- generated on: 09.30.2007
  
  
--- 2,6 ----
  -- entity version: 0.0
  -- DB type: mysql
! -- generated on: 10.27.2007
  
  
***************
*** 19,24 ****
--- 19,27 ----
  	`not_before_seq_id` int (11), 
  	`start_offset` int (11), 
+ 	`start_time` mediumint (5) unsigned, 
  	`end_offset` int (11), 
+ 	`end_time` mediumint (5) unsigned, 
  	`due_offset` int (11), 
+ 	`due_time` mediumint (5) unsigned, 
  	`grace_period_days` int (11), 
  	`rank` integer (11) NOT NULL, 
***************
*** 28,35 ****
  );
  
! CREATE INDEX class_idx ON class_lesson_sequence (class_id);
! CREATE INDEX lesson_idx ON class_lesson_sequence (lesson_id);
! CREATE INDEX lob_class_repo_idx ON class_lesson_sequence (lob_class_repo_id);
! CREATE INDEX rank_idx ON class_lesson_sequence (rank);
! CREATE INDEX link_text_idx ON class_lesson_sequence (link_text);
  
--- 31,38 ----
  );
  
! CREATE INDEX `class_idx` ON `class_lesson_sequence` (`class_id`);
! CREATE INDEX `lesson_idx` ON `class_lesson_sequence` (`lesson_id`);
! CREATE INDEX `lob_class_repo_idx` ON `class_lesson_sequence` (`lob_class_repo_id`);
! CREATE INDEX `rank_idx` ON `class_lesson_sequence` (`rank`);
! CREATE INDEX `link_text_idx` ON `class_lesson_sequence` (`link_text`);
  

[Logicampus-cvs] logicampus/src/public_html/install schema_27.php, NONE, 1.1 schema_28.php, NONE, 1.1 schema_29.php, NONE, 1.1 schema_18.php, 1.10, 1.11 schema_21.php, 1.5, 1.6

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

Update of /cvsroot/logicampus/logicampus/src/public_html/install
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv15346/src/public_html/install

Modified Files:
	schema_18.php schema_21.php 
Added Files:
	schema_27.php schema_28.php schema_29.php 
Log Message:
Updating class lesson sequence schema to include start, stop, and due times.


--- NEW FILE: schema_29.php ---
<?
$installTableSchemas = array();
$table = <<<campusdelimeter
CREATE TABLE menu (
  pkey int(11) NOT NULL auto_increment,
  title varchar(60) NOT NULL default '',
  layout varchar(15) NOT NULL default '0',
  rank int(11) NOT NULL default '0',
  groups text NOT NULL,
  notgroups text NOT NULL,
  menuid varchar(50) NOT NULL default '',
  PRIMARY KEY  (pkey),
  KEY menuid (menuid)
) TYPE=MyISAM
campusdelimeter;
$installTableSchemas[] = $table;
$table = <<<campusdelimeter
INSERT INTO menu VALUES (1, 'Main Menu', 'vertical', 2, '|public|reg|', '||', 'main')
campusdelimeter;
$installTableSchemas[] = $table;
$table = <<<campusdelimeter
INSERT INTO menu VALUES (5, 'Administration', 'vertical', 0, '|admin|', '||', 'administration')
campusdelimeter;
$installTableSchemas[] = $table;
$table = <<<campusdelimeter
INSERT INTO menu VALUES (4, 'Member Services', 'vertical', 0, '|reg|', '||', 'memberservices')
campusdelimeter;
$installTableSchemas[] = $table;
$table = <<<campusdelimeter
CREATE TABLE menuCache (
  pkey int(11) NOT NULL default '0',
  menuObj text NOT NULL,
  menuid varchar(20) NOT NULL default '',
  rank int(11) NOT NULL default '0',
  groups text NOT NULL,
  notgroups text NOT NULL,
  PRIMARY KEY  (pkey),
  KEY menuid (menuid)
) TYPE=MyISAM
campusdelimeter;
$installTableSchemas[] = $table;
$table = <<<campusdelimeter
INSERT INTO menuCache VALUES (1, 'O:7:"menuobj":12:{s:5:"title";s:9:"Main Menu";s:6:"menuid";s:4:"main";s:6:"layout";s:8:"vertical";s:8:"VERTICAL";i:0;s:10:"HORIZONTAL";i:1;s:6:"CUSTOM";i:2;s:8:"treeList";O:8:"treelist":8:{s:13:"p_CurrentNode";O:12:"treelistnode":5:{s:7:"sibling";i:0;s:5:"child";i:0;s:6:"parent";N;s:8:"expanded";N;s:8:"contents";s:6:"_blank";}s:5:"stack";a:0:{}s:6:"indent";N;s:8:"rootNode";O:12:"treelistnode":6:{s:7:"sibling";O:12:"treelistnode":6:{s:7:"sibling";O:12:"treelistnode":6:{s:7:"sibling";i:0;s:5:"child";i:0;s:6:"parent";N;s:8:"expanded";N;s:8:"contents";O:11:"appmenuitem":19:{s:4:"type";s:3:"app";s:8:"location";s:3:"faq";s:8:"linkText";s:4:"FAQs";s:8:"editPage";s:14:"itemEditor_app";s:5:"mpkey";s:1:"1";s:6:"menuid";s:4:"main";s:5:"title";s:9:"Main Menu";s:6:"layout";s:8:"vertical";s:7:"mgroups";s:12:"|public|reg|";s:10:"mnotgroups";s:2:"||";s:5:"mrank";s:1:"2";s:4:"pkey";s:1:"3";s:6:"menuID";s:1:"1";s:4:"rank";s:1:"3";s:5:"imgOn";s:0:"";s:6:"imgOff";s:0:"";s:8:"parentID";s:1:"0";s:6:"groups";s:0:"";s:9:"appOption";s:0:"";}s:6:"indent";N;}s:5:"child";i:0;s:6:"parent";N;s:8:"expanded";N;s:8:"contents";O:11:"appmenuitem":19:{s:4:"type";s:3:"app";s:8:"location";s:6:"search";s:8:"linkText";s:6:"Search";s:8:"editPage";s:14:"itemEditor_app";s:5:"mpkey";s:1:"1";s:6:"menuid";s:4:"main";s:5:"title";s:9:"Main Menu";s:6:"layout";s:8:"vertical";s:7:"mgroups";s:12:"|public|reg|";s:10:"mnotgroups";s:2:"||";s:5:"mrank";s:1:"2";s:4:"pkey";s:2:"28";s:6:"menuID";s:1:"1";s:4:"rank";s:1:"0";s:5:"imgOn";s:0:"";s:6:"imgOff";s:0:"";s:8:"parentID";s:1:"0";s:6:"groups";s:0:"";s:9:"appOption";s:0:"";}s:6:"indent";N;}s:5:"child";i:0;s:6:"parent";N;s:8:"expanded";N;s:8:"contents";O:11:"appmenuitem":19:{s:4:"type";s:3:"app";s:8:"location";s:7:"welcome";s:8:"linkText";s:4:"Home";s:8:"editPage";s:14:"itemEditor_app";s:5:"mpkey";s:1:"1";s:6:"menuid";s:4:"main";s:5:"title";s:9:"Main Menu";s:6:"layout";s:8:"vertical";s:7:"mgroups";s:12:"|public|reg|";s:10:"mnotgroups";s:2:"||";s:5:"mrank";s:1:"2";s:4:"pkey";s:2:"26";s:6:"menuID";s:1:"1";s:4:"rank";s:1:"0";s:5:"imgOn";s:0:"";s:6:"imgOff";s:0:"";s:8:"parentID";s:1:"0";s:6:"groups";s:0:"";s:9:"appOption";s:0:"";}s:4:"root";i:1;}s:15:"defaultExpanded";b:1;s:5:"count";i:2;s:7:"keyName";s:4:"pkey";s:13:"keyParentName";s:9:"parentKey";}s:4:"pkey";s:1:"1";s:9:"linkCount";i:3;s:4:"rank";s:1:"2";s:6:"groups";a:2:{i:0;s:6:"public";i:1;s:3:"reg";}s:9:"notgroups";a:1:{i:0;s:0:"";}}', 'main', 2, '|public|reg|', '||')
campusdelimeter;
$installTableSchemas[] = $table;
$table = <<<campusdelimeter
INSERT INTO menuCache VALUES (5, 'O:7:"menuobj":12:{s:5:"title";s:14:"Administration";s:6:"menuid";s:14:"administration";s:6:"layout";s:8:"vertical";s:8:"VERTICAL";i:0;s:10:"HORIZONTAL";i:1;s:6:"CUSTOM";i:2;s:8:"treeList";O:8:"treelist":8:{s:13:"p_CurrentNode";O:12:"treelistnode":5:{s:7:"sibling";i:0;s:5:"child";i:0;s:6:"parent";N;s:8:"expanded";N;s:8:"contents";s:6:"_blank";}s:5:"stack";a:0:{}s:6:"indent";N;s:8:"rootNode";O:12:"treelistnode":6:{s:7:"sibling";O:12:"treelistnode":6:{s:7:"sibling";O:12:"treelistnode":6:{s:7:"sibling";O:12:"treelistnode":6:{s:7:"sibling";i:0;s:5:"child";i:0;s:6:"parent";N;s:8:"expanded";N;s:8:"contents";O:11:"appmenuitem":19:{s:4:"type";s:3:"app";s:8:"location";s:14:"administration";s:8:"linkText";s:12:"Manage Users";s:8:"editPage";s:14:"itemEditor_app";s:5:"mpkey";s:1:"5";s:6:"menuid";s:14:"administration";s:5:"title";s:14:"Administration";s:6:"layout";s:8:"vertical";s:7:"mgroups";s:7:"|admin|";s:10:"mnotgroups";s:2:"||";s:5:"mrank";s:1:"0";s:4:"pkey";s:2:"51";s:6:"menuID";s:1:"5";s:4:"rank";s:1:"2";s:5:"imgOn";s:0:"";s:6:"imgOff";s:0:"";s:8:"parentID";s:1:"0";s:6:"groups";s:0:"";s:9:"appOption";s:5:"users";}s:6:"indent";N;}s:5:"child";i:0;s:6:"parent";N;s:8:"expanded";N;s:8:"contents";O:11:"appmenuitem":19:{s:4:"type";s:3:"app";s:8:"location";s:14:"administration";s:8:"linkText";s:14:"Manage Classes";s:8:"editPage";s:14:"itemEditor_app";s:5:"mpkey";s:1:"5";s:6:"menuid";s:14:"administration";s:5:"title";s:14:"Administration";s:6:"layout";s:8:"vertical";s:7:"mgroups";s:7:"|admin|";s:10:"mnotgroups";s:2:"||";s:5:"mrank";s:1:"0";s:4:"pkey";s:2:"50";s:6:"menuID";s:1:"5";s:4:"rank";s:1:"1";s:5:"imgOn";s:0:"";s:6:"imgOff";s:0:"";s:8:"parentID";s:1:"0";s:6:"groups";s:0:"";s:9:"appOption";s:7:"classes";}s:6:"indent";N;}s:5:"child";i:0;s:6:"parent";N;s:8:"expanded";N;s:8:"contents";O:11:"appmenuitem":19:{s:4:"type";s:3:"app";s:8:"location";s:14:"administration";s:8:"linkText";s:14:"Manage Courses";s:8:"editPage";s:14:"itemEditor_app";s:5:"mpkey";s:1:"5";s:6:"menuid";s:14:"administration";s:5:"title";s:14:"Administration";s:6:"layout";s:8:"vertical";s:7:"mgroups";s:7:"|admin|";s:10:"mnotgroups";s:2:"||";s:5:"mrank";s:1:"0";s:4:"pkey";s:2:"49";s:6:"menuID";s:1:"5";s:4:"rank";s:1:"0";s:5:"imgOn";s:0:"";s:6:"imgOff";s:0:"";s:8:"parentID";s:1:"0";s:6:"groups";s:0:"";s:9:"appOption";s:7:"courses";}s:6:"indent";N;}s:5:"child";i:0;s:6:"parent";N;s:8:"expanded";N;s:8:"contents";O:11:"appmenuitem":19:{s:4:"type";s:3:"app";s:8:"location";s:14:"administration";s:8:"linkText";s:13:"Control Panel";s:8:"editPage";s:14:"itemEditor_app";s:5:"mpkey";s:1:"5";s:6:"menuid";s:14:"administration";s:5:"title";s:14:"Administration";s:6:"layout";s:8:"vertical";s:7:"mgroups";s:7:"|admin|";s:10:"mnotgroups";s:2:"||";s:5:"mrank";s:1:"0";s:4:"pkey";s:2:"48";s:6:"menuID";s:1:"5";s:4:"rank";s:1:"0";s:5:"imgOn";s:0:"";s:6:"imgOff";s:0:"";s:8:"parentID";s:1:"0";s:6:"groups";s:0:"";s:9:"appOption";s:0:"";}s:4:"root";i:1;}s:15:"defaultExpanded";b:1;s:5:"count";i:3;s:7:"keyName";s:4:"pkey";s:13:"keyParentName";s:9:"parentKey";}s:4:"pkey";s:1:"5";s:9:"linkCount";i:4;s:4:"rank";s:1:"0";s:6:"groups";a:1:{i:0;s:5:"admin";}s:9:"notgroups";a:1:{i:0;s:0:"";}}', 'administration', 0, '|admin|', '||')
campusdelimeter;
$installTableSchemas[] = $table;
$table = <<<campusdelimeter
INSERT INTO menuCache VALUES (4, 'O:7:"menuobj":12:{s:5:"title";s:15:"Member Services";s:6:"menuid";s:14:"memberservices";s:6:"layout";s:8:"vertical";s:8:"VERTICAL";i:0;s:10:"HORIZONTAL";i:1;s:6:"CUSTOM";i:2;s:8:"treeList";O:8:"treelist":8:{s:13:"p_CurrentNode";O:12:"treelistnode":5:{s:7:"sibling";i:0;s:5:"child";i:0;s:6:"parent";N;s:8:"expanded";N;s:8:"contents";s:6:"_blank";}s:5:"stack";a:0:{}s:6:"indent";N;s:8:"rootNode";O:12:"treelistnode":6:{s:7:"sibling";O:12:"treelistnode":6:{s:7:"sibling";O:12:"treelistnode":6:{s:7:"sibling";O:12:"treelistnode":6:{s:7:"sibling";O:12:"treelistnode":6:{s:7:"sibling";i:0;s:5:"child";i:0;s:6:"parent";N;s:8:"expanded";N;s:8:"contents";O:11:"appmenuitem":19:{s:4:"type";s:3:"app";s:8:"location";s:5:"users";s:8:"linkText";s:12:"Who\'s Online";s:8:"editPage";s:14:"itemEditor_app";s:5:"mpkey";s:1:"4";s:6:"menuid";s:14:"memberservices";s:5:"title";s:15:"Member Services";s:6:"layout";s:8:"vertical";s:7:"mgroups";s:5:"|reg|";s:10:"mnotgroups";s:2:"||";s:5:"mrank";s:1:"0";s:4:"pkey";s:2:"43";s:6:"menuID";s:1:"4";s:4:"rank";s:1:"3";s:5:"imgOn";s:0:"";s:6:"imgOff";s:0:"";s:8:"parentID";s:1:"0";s:6:"groups";s:0:"";s:9:"appOption";s:6:"online";}s:6:"indent";N;}s:5:"child";i:0;s:6:"parent";N;s:8:"expanded";N;s:8:"contents";O:11:"appmenuitem":19:{s:4:"type";s:3:"app";s:8:"location";s:2:"pm";s:8:"linkText";s:16:"Private Messages";s:8:"editPage";s:14:"itemEditor_app";s:5:"mpkey";s:1:"4";s:6:"menuid";s:14:"memberservices";s:5:"title";s:15:"Member Services";s:6:"layout";s:8:"vertical";s:7:"mgroups";s:5:"|reg|";s:10:"mnotgroups";s:2:"||";s:5:"mrank";s:1:"0";s:4:"pkey";s:2:"47";s:6:"menuID";s:1:"4";s:4:"rank";s:1:"2";s:5:"imgOn";s:0:"";s:6:"imgOff";s:0:"";s:8:"parentID";s:1:"0";s:6:"groups";s:0:"";s:9:"appOption";s:0:"";}s:6:"indent";N;}s:5:"child";i:0;s:6:"parent";N;s:8:"expanded";N;s:8:"contents";O:11:"appmenuitem":19:{s:4:"type";s:3:"app";s:8:"location";s:5:"users";s:8:"linkText";s:11:"Online Chat";s:8:"editPage";s:14:"itemEditor_app";s:5:"mpkey";s:1:"4";s:6:"menuid";s:14:"memberservices";s:5:"title";s:15:"Member Services";s:6:"layout";s:8:"vertical";s:7:"mgroups";s:5:"|reg|";s:10:"mnotgroups";s:2:"||";s:5:"mrank";s:1:"0";s:4:"pkey";s:2:"53";s:6:"menuID";s:1:"4";s:4:"rank";s:1:"2";s:5:"imgOn";s:0:"";s:6:"imgOff";s:0:"";s:8:"parentID";s:1:"0";s:6:"groups";s:0:"";s:9:"appOption";s:4:"chat";}s:6:"indent";N;}s:5:"child";i:0;s:6:"parent";N;s:8:"expanded";N;s:8:"contents";O:11:"appmenuitem":19:{s:4:"type";s:3:"app";s:8:"location";s:5:"forum";s:8:"linkText";s:17:"Discussion Forums";s:8:"editPage";s:14:"itemEditor_app";s:5:"mpkey";s:1:"4";s:6:"menuid";s:14:"memberservices";s:5:"title";s:15:"Member Services";s:6:"layout";s:8:"vertical";s:7:"mgroups";s:5:"|reg|";s:10:"mnotgroups";s:2:"||";s:5:"mrank";s:1:"0";s:4:"pkey";s:2:"46";s:6:"menuID";s:1:"4";s:4:"rank";s:1:"1";s:5:"imgOn";s:0:"";s:6:"imgOff";s:0:"";s:8:"parentID";s:1:"0";s:6:"groups";s:0:"";s:9:"appOption";s:0:"";}s:6:"indent";N;}s:5:"child";i:0;s:6:"parent";N;s:8:"expanded";N;s:8:"contents";O:11:"appmenuitem":19:{s:4:"type";s:3:"app";s:8:"location";s:5:"users";s:8:"linkText";s:12:"Edit Profile";s:8:"editPage";s:14:"itemEditor_app";s:5:"mpkey";s:1:"4";s:6:"menuid";s:14:"memberservices";s:5:"title";s:15:"Member Services";s:6:"layout";s:8:"vertical";s:7:"mgroups";s:5:"|reg|";s:10:"mnotgroups";s:2:"||";s:5:"mrank";s:1:"0";s:4:"pkey";s:2:"52";s:6:"menuID";s:1:"4";s:4:"rank";s:1:"0";s:5:"imgOn";s:0:"";s:6:"imgOff";s:0:"";s:8:"parentID";s:1:"0";s:6:"groups";s:0:"";s:9:"appOption";s:11:"editProfile";}s:4:"root";i:1;}s:15:"defaultExpanded";b:1;s:5:"count";i:4;s:7:"keyName";s:4:"pkey";s:13:"keyParentName";s:9:"parentKey";}s:4:"pkey";s:1:"4";s:9:"linkCount";i:5;s:4:"rank";s:1:"0";s:6:"groups";a:1:{i:0;s:3:"reg";}s:9:"notgroups";a:1:{i:0;s:0:"";}}', 'memberservices', 0, '|reg|', '||')
campusdelimeter;
$installTableSchemas[] = $table;
$table = <<<campusdelimeter
CREATE TABLE menuItems (
  pkey int(11) NOT NULL auto_increment,
  menuID int(11) NOT NULL default '0',
  rank tinyint(4) NOT NULL default '0',
  linkText varchar(120) NOT NULL default '',
  imgOn varchar(75) NOT NULL default '',
  imgOff varchar(75) NOT NULL default '',
  location varchar(120) NOT NULL default '',
  type char(3) NOT NULL default '',
  parentID int(11) NOT NULL default '0',
  groups tinytext NOT NULL,
  appOption varchar(50) NOT NULL default '',
  PRIMARY KEY  (pkey)
) TYPE=MyISAM
campusdelimeter;
$installTableSchemas[] = $table;
$table = <<<campusdelimeter
INSERT INTO menuItems VALUES (3, 1, 3, 'FAQs', '', '', 'faq', 'app', 0, '', '')
campusdelimeter;
$installTableSchemas[] = $table;
$table = <<<campusdelimeter
INSERT INTO menuItems VALUES (48, 5, 0, 'Control Panel', '', '', 'administration', 'app', 0, '', '')
campusdelimeter;
$installTableSchemas[] = $table;
$table = <<<campusdelimeter
INSERT INTO menuItems VALUES (26, 1, 0, 'Home', '', '', 'welcome', 'app', 0, '', '')
campusdelimeter;
$installTableSchemas[] = $table;
$table = <<<campusdelimeter
INSERT INTO menuItems VALUES (28, 1, 0, 'Search', '', '', 'search', 'app', 0, '', '')
campusdelimeter;
$installTableSchemas[] = $table;
$table = <<<campusdelimeter
INSERT INTO menuItems VALUES (51, 5, 2, 'Manage Users', '', '', 'administration', 'app', 0, '', 'users')
campusdelimeter;
$installTableSchemas[] = $table;
$table = <<<campusdelimeter
INSERT INTO menuItems VALUES (50, 5, 1, 'Manage Classes', '', '', 'administration', 'app', 0, '', 'classes')
campusdelimeter;
$installTableSchemas[] = $table;
$table = <<<campusdelimeter
INSERT INTO menuItems VALUES (49, 5, 0, 'Manage Courses', '', '', 'administration', 'app', 0, '', 'courses')
campusdelimeter;
$installTableSchemas[] = $table;
$table = <<<campusdelimeter
INSERT INTO menuItems VALUES (43, 4, 3, 'Who\'s Online', '', '', 'users', 'app', 0, '', 'online')
campusdelimeter;
$installTableSchemas[] = $table;
$table = <<<campusdelimeter
INSERT INTO menuItems VALUES (53, 4, 2, 'Online Chat', '', '', 'users', 'app', 0, '', 'chat')
campusdelimeter;
$installTableSchemas[] = $table;
$table = <<<campusdelimeter
INSERT INTO menuItems VALUES (46, 4, 1, 'Discussion Forums', '', '', 'forum', 'app', 0, '', '')
campusdelimeter;
$installTableSchemas[] = $table;
$table = <<<campusdelimeter
INSERT INTO menuItems VALUES (47, 4, 2, 'Private Messages', '', '', 'pm', 'app', 0, '', '')
campusdelimeter;
$installTableSchemas[] = $table;
$table = <<<campusdelimeter
INSERT INTO menuItems VALUES (52, 4, 0, 'Edit Profile', '', '', 'users', 'app', 0, '', 'editProfile');
campusdelimeter;
$installTableSchemas[] = $table;

?>
Index: schema_21.php
===================================================================
RCS file: /cvsroot/logicampus/logicampus/src/public_html/install/schema_21.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** schema_21.php	4 Oct 2007 02:12:12 -0000	1.5
--- schema_21.php	27 Oct 2007 17:22:57 -0000	1.6
***************
*** 19,27 ****
  CREATE TABLE class_assignments_grades (
    id_class_assignments_grades int(10) unsigned NOT NULL auto_increment,
!   lob_class_repo_id int(11) unsigned NOT NULL default '0',
    id_student varchar(32) NOT NULL default '',
    comments text NOT NULL,
    grade float(10,2) default NULL,
!   PRIMARY KEY  (id_class_assignments_grades)
  ) TYPE=MyISAM
  campusdelimeter;
--- 19,28 ----
  CREATE TABLE class_assignments_grades (
    id_class_assignments_grades int(10) unsigned NOT NULL auto_increment,
!   id_class_assignments int(10) unsigned NOT NULL default '0',
    id_student varchar(32) NOT NULL default '',
    comments text NOT NULL,
    grade float(10,2) default NULL,
!   PRIMARY KEY  (id_class_assignments_grades),
!   KEY `id_class_assignments_idx` (`id_class_assignments`)
  ) TYPE=MyISAM
  campusdelimeter;
***************
*** 30,34 ****
  CREATE TABLE class_assignments_turnin (
    id_class_assignments_turnin int(10) unsigned NOT NULL auto_increment,
!   lob_class_repo_id int(10) unsigned NOT NULL default '0',
    id_student varchar(32) NOT NULL default '',
    dateTurnin datetime NOT NULL default '0000-00-00 00:00:00',
--- 31,35 ----
  CREATE TABLE class_assignments_turnin (
    id_class_assignments_turnin int(10) unsigned NOT NULL auto_increment,
!   id_class_assignments int(10) unsigned NOT NULL default '0',
    id_student varchar(32) NOT NULL default '',
    dateTurnin datetime NOT NULL default '0000-00-00 00:00:00',
***************
*** 40,44 ****
    assign_file_blob longblob NOT NULL,
    PRIMARY KEY  (id_class_assignments_turnin),
!   KEY `lob_class_repo_idx` (`lob_class_repo_id`)
  ) TYPE=MyISAM
  campusdelimeter;
--- 41,45 ----
    assign_file_blob longblob NOT NULL,
    PRIMARY KEY  (id_class_assignments_turnin),
!   KEY `id_class_assignments_idx` (`id_class_assignments`)
  ) TYPE=MyISAM
  campusdelimeter;

Index: schema_18.php
===================================================================
RCS file: /cvsroot/logicampus/logicampus/src/public_html/install/schema_18.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** schema_18.php	4 Oct 2007 02:12:12 -0000	1.10
--- schema_18.php	27 Oct 2007 17:22:57 -0000	1.11
***************
*** 18,23 ****
--- 18,26 ----
  	`not_before_seq_id` int (11), 
  	`start_offset` int (11), 
+ 	`start_time` mediumint (5) unsigned, 
  	`end_offset` int (11), 
+ 	`end_time` mediumint (5) unsigned, 
  	`due_offset` int (11), 
+ 	`due_time` mediumint (5) unsigned, 
  	`grace_period_days` int (11), 
  	`rank` integer (11) NOT NULL, 
***************
*** 29,49 ****
  $installTableSchemas[] = $table;
  $table = <<<campusdelimeter
! CREATE INDEX class_idx ON class_lesson_sequence (class_id)
  campusdelimeter;
  $installTableSchemas[] = $table;
  $table = <<<campusdelimeter
! CREATE INDEX lesson_idx ON class_lesson_sequence (lesson_id)
  campusdelimeter;
  $installTableSchemas[] = $table;
  $table = <<<campusdelimeter
! CREATE INDEX lob_class_repo_idx ON class_lesson_sequence (lob_class_repo_id)
  campusdelimeter;
  $installTableSchemas[] = $table;
  $table = <<<campusdelimeter
! CREATE INDEX rank_idx ON class_lesson_sequence (rank)
  campusdelimeter;
  $installTableSchemas[] = $table;
  $table = <<<campusdelimeter
! CREATE INDEX link_text_idx ON class_lesson_sequence (link_text);
  campusdelimeter;
  $installTableSchemas[] = $table;
--- 32,52 ----
  $installTableSchemas[] = $table;
  $table = <<<campusdelimeter
! CREATE INDEX `class_idx` ON `class_lesson_sequence` (`class_id`)
  campusdelimeter;
  $installTableSchemas[] = $table;
  $table = <<<campusdelimeter
! CREATE INDEX `lesson_idx` ON `class_lesson_sequence` (`lesson_id`)
  campusdelimeter;
  $installTableSchemas[] = $table;
  $table = <<<campusdelimeter
! CREATE INDEX `lob_class_repo_idx` ON `class_lesson_sequence` (`lob_class_repo_id`)
  campusdelimeter;
  $installTableSchemas[] = $table;
  $table = <<<campusdelimeter
! CREATE INDEX `rank_idx` ON `class_lesson_sequence` (`rank`)
  campusdelimeter;
  $installTableSchemas[] = $table;
  $table = <<<campusdelimeter
! CREATE INDEX `link_text_idx` ON `class_lesson_sequence` (`link_text`);
  campusdelimeter;
  $installTableSchemas[] = $table;

--- NEW FILE: schema_28.php ---
<?
$installTableSchemas = array();
$table = <<<campusdelimeter
CREATE TABLE lc_users_last_login (
  username varchar(32) NOT NULL default '',
  last_login int(11) NOT NULL default '0',
  PRIMARY KEY  (username)
) TYPE=MyISAM
campusdelimeter;
$installTableSchemas[] = $table;
$table = <<<campusdelimeter
CREATE TABLE lc_users_login_attempt (
  username varchar(32) default '',
  login_attempt int(11) default '0',
  login_status tinyint(1) default '0',
  os varchar(10) default '',
  browser varchar(10) default '',
  version varchar(10) default '',
  KEY username (username)
) TYPE=MyISAM;
campusdelimeter;
$installTableSchemas[] = $table;

?>
--- NEW FILE: schema_27.php ---
<?
$installTableSchemas = array();
$table = <<<campusdelimeter
CREATE TABLE helpdesk_categories (
  helpdesk_category_id int(11) NOT NULL auto_increment,
  helpdesk_category_label varchar(30) NOT NULL default '',
  PRIMARY KEY  (helpdesk_category_id)
) TYPE=MyISAM
campusdelimeter;
$installTableSchemas[] = $table;
$table = <<<campusdelimeter
CREATE TABLE helpdesk_comments (
  helpdesk_comments_id int(11) NOT NULL auto_increment,
  userid varchar(32) NOT NULL default '',
  comment text NOT NULL,
  PRIMARY KEY  (helpdesk_comments_id)
) TYPE=MyISAM
campusdelimeter;
$installTableSchemas[] = $table;
$table = <<<campusdelimeter
CREATE TABLE helpdesk_status (
  helpdesk_status_id int(11) NOT NULL auto_increment,
  helpdesk_status_label varchar(30) NOT NULL default '',
  helpdesk_status_sort int(10) unsigned NOT NULL default '0',
  PRIMARY KEY  (helpdesk_status_id)
) TYPE=MyISAM
campusdelimeter;
$installTableSchemas[] = $table;
$table = <<<campusdelimeter
CREATE TABLE helpdesk_incident (
  helpdesk_id int(11) NOT NULL auto_increment,
  timedate_open int(11) NOT NULL default '0',
  timedate_close int(11) NOT NULL default '0',
  timedate_reply int(11) NOT NULL default '0',
  timedate_update int(11) NOT NULL default '0',
  status int(11) NOT NULL default '0',
  summary text NOT NULL,
  userid varchar(32) NOT NULL default '',
  category int(11) NOT NULL default '0',
  assigned_to varchar(32) NOT NULL default '',
  PRIMARY KEY  (helpdesk_id)
) TYPE=MyISAM
campusdelimeter;
$installTableSchemas[] = $table;
$table = <<<campusdelimeter
CREATE TABLE helpdesk_incident_log (
  helpdesk_incident_log_id int(11) NOT NULL auto_increment,
  helpdesk_id int(11) NOT NULL default '0',
  action varchar(15) NOT NULL default '',
  timedate int(11) NOT NULL default '0',
  comment text NOT NULL,
  userid varchar(32) NOT NULL default '',
  PRIMARY KEY  (helpdesk_incident_log_id)
) TYPE=MyISAM
campusdelimeter;
$installTableSchemas[] = $table;
$table = <<<campusdelimeter
CREATE TABLE helpdesk_faq (
  id_faq int(10) unsigned NOT NULL auto_increment,
  id_faq_category int(10) unsigned NOT NULL default '0',
  tx_username varchar(32) NOT NULL default '',
  tx_question varchar(255) NOT NULL default '',
  tx_answer text NOT NULL,
  dt_submitted datetime NOT NULL default '0000-00-00 00:00:00',
  fl_approved int(11) NOT NULL default '0',
  ic_viewed int(10) unsigned NOT NULL default '0',
  PRIMARY KEY  (id_faq),
  KEY id_faq_category (id_faq_category)
) TYPE=MyISAM
campusdelimeter;
$installTableSchemas[] = $table;
$table = <<<campusdelimeter
CREATE TABLE helpdesk_faq_category (
  id_faq_category int(10) unsigned NOT NULL auto_increment,
  tx_category varchar(100) NOT NULL default '',
  PRIMARY KEY  (id_faq_category)
) TYPE=MyISAM
campusdelimeter;
$installTableSchemas[] = $table;
$table = <<<campusdelimeter
CREATE TABLE helpdesk_faq_vote (
  username varchar(32) NOT NULL default '',
  id_faq int(10) unsigned NOT NULL default '0',
  ii_vote int(11) NOT NULL default '0',
  KEY username (username),
  KEY id_faq (id_faq)
) TYPE=MyISAM COMMENT='tracks users to their votes.'
campusdelimeter;
$installTableSchemas[] = $table;
$table = <<<campusdelimeter
INSERT INTO helpdesk_status VALUES (1,'New', 1)
campusdelimeter;
$installTableSchemas[] = $table;
$table = <<<campusdelimeter
INSERT INTO helpdesk_status VALUES (2,'In progress', 3)
campusdelimeter;
$installTableSchemas[] = $table;
$table = <<<campusdelimeter
INSERT INTO helpdesk_status VALUES (3,'Closed', 4)
campusdelimeter;
$installTableSchemas[] = $table;
$table = <<<campusdelimeter
INSERT INTO helpdesk_status VALUES (4,'Replied', 2)
campusdelimeter;
$installTableSchemas[] = $table;
$table = <<<campusdelimeter
INSERT INTO helpdesk_categories (helpdesk_category_id, helpdesk_category_label) VALUES (1, 'General Help')
campusdelimeter;
$installTableSchemas[] = $table;
$table = <<<campusdelimeter
INSERT INTO helpdesk_categories (helpdesk_category_id, helpdesk_category_label) VALUES (2, 'E-mail');
campusdelimeter;
$installTableSchemas[] = $table;

?>