logicampus-cvs

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

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

Modified Files:
	lessonSequence.lcp 
Log Message:
Slightly better up and down re-ranking SQL.


Index: lessonSequence.lcp
===================================================================
RCS file: /cvsroot/logicampus/logicampus/src/logicreate/services/classmgr/lessonSequence.lcp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** lessonSequence.lcp	8 Oct 2007 00:34:04 -0000	1.10
--- lessonSequence.lcp	23 Oct 2007 19:56:55 -0000	1.11
***************
*** 56,60 ****
  		$sql1 = "UPDATE class_lesson_sequence
  			SET rank=-1 
! 			WHERE rank = ".$curRank;
  
  
--- 56,62 ----
  		$sql1 = "UPDATE class_lesson_sequence
  			SET rank=-1 
! 			WHERE rank = ".$curRank."
! 			AND class_id = ".$class_id."
! 			LIMIT 1";
  
  
***************
*** 62,71 ****
  			//move the above ranked item down
  			$sql2 = "UPDATE class_lesson_sequence
! 				SET rank=rank+1 
! 				WHERE rank = ".$upRank;
  			//move selected rank into new position
  			$sql3 = "UPDATE class_lesson_sequence
  				SET rank=".$upRank." 
! 				WHERE rank =-1";
  		}
  
--- 64,77 ----
  			//move the above ranked item down
  			$sql2 = "UPDATE class_lesson_sequence
! 				SET rank=".$upRank."+1 
! 				WHERE rank <= ".$curRank."
! 				AND class_id = ".$class_id."
! 				ORDER BY rank DESC
! 				LIMIT 1";
  			//move selected rank into new position
  			$sql3 = "UPDATE class_lesson_sequence
  				SET rank=".$upRank." 
! 				WHERE rank =-1
! 				AND class_id = ".$class_id;
  		}
  
***************
*** 73,82 ****
  			//move the below ranked item up
  			$sql2 = "UPDATE class_lesson_sequence
! 				SET rank=rank-1 
! 				WHERE rank = ".$dnRank;
  			//move selected rank into new position
  			$sql3 = "UPDATE class_lesson_sequence
  				SET rank=".$dnRank." 
! 				WHERE rank =-1";
  		}
  
--- 79,92 ----
  			//move the below ranked item up
  			$sql2 = "UPDATE class_lesson_sequence
! 				SET rank=".$dnRank."-1 
! 				WHERE rank >= ".$curRank."
! 				AND class_id = ".$class_id."
! 				ORDER BY rank ASC
! 				LIMIT 1";
  			//move selected rank into new position
  			$sql3 = "UPDATE class_lesson_sequence
  				SET rank=".$dnRank." 
! 				WHERE rank =-1
! 				AND class_id = ".$class_id;
  		}
  
***************
*** 269,274 ****
--- 279,286 ----
  				$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;
  			}