Index: lams_webct_integration/db/sql/createTable.sql
===================================================================
diff -u -r1e48e51fc873467eef72ce5af99d865c5a0d818c -r1f78d75662f32653744b32eba99d5ffc3b222855
--- lams_webct_integration/db/sql/createTable.sql	(.../createTable.sql)	(revision 1e48e51fc873467eef72ce5af99d865c5a0d818c)
+++ lams_webct_integration/db/sql/createTable.sql	(.../createTable.sql)	(revision 1f78d75662f32653744b32eba99d5ffc3b222855)
@@ -1,28 +1,28 @@
 USE webctdatabase;
 
 IF EXISTS
-	(SELECT 1 FROM sys.objects WHERE OBJECT_ID = OBJECT_ID(N'[dbo].[LAMS_LESSON]') 
+	(SELECT 1 FROM sys.objects WHERE OBJECT_ID = OBJECT_ID(N'dbo.LAMS_LESSON') 
 	AND type = (N'U'))    
-	DROP TABLE [dbo].[LAMS_LESSON];
+	DROP TABLE dbo.LAMS_LESSON;
 
-CREATE TABLE [dbo].[LAMS_LESSON](
-	[id] [bigint] IDENTITY(1,1) NOT NULL,
-	[pt_id] [bigint] NOT NULL,
-	[lesson_id] [bigint] NOT NULL,
-	[learning_context_id] [bigint] NOT NULL,
-	[sequence_id] [bigint] NULL,
-	[owner_id] [varchar](255) COLLATE SQL_Latin1_General_CP1_CI_AS NULL,
-	[owner_first_name] [varchar](255) COLLATE SQL_Latin1_General_CP1_CI_AS NULL,
-	[owner_last_name] [varchar](255) COLLATE SQL_Latin1_General_CP1_CI_AS NULL,
-	[title] [varchar](255) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL,
-	[description] [text] COLLATE SQL_Latin1_General_CP1_CI_AS NULL,
-	[hidden] [bit] NOT NULL CONSTRAINT [DF_LAMS_LESSON_hidden]  DEFAULT ((0)),
-	[schedule] [bit] NOT NULL CONSTRAINT [DF_LAMS_LESSON_schedule]  DEFAULT ((0)),
-	[start_date_time] [datetime] NULL,
-	[end_date_time] [datetime] NULL,
- CONSTRAINT [PK_LAMS_LESSON] PRIMARY KEY CLUSTERED 
+CREATE TABLE dbo.LAMS_LESSON(
+	id bigint IDENTITY(1,1) NOT NULL,
+	pt_id bigint NOT NULL,
+	lesson_id bigint NOT NULL,
+	learning_context_id bigint NOT NULL,
+	sequence_id bigint NULL,
+	owner_id varchar(255) COLLATE SQL_Latin1_General_CP1_CI_AS NULL,
+	owner_first_name varchar(255) COLLATE SQL_Latin1_General_CP1_CI_AS NULL,
+	owner_last_name varchar(255) COLLATE SQL_Latin1_General_CP1_CI_AS NULL,
+	title varchar(255) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL,
+	description text COLLATE SQL_Latin1_General_CP1_CI_AS NULL,
+	hidden bit NOT NULL CONSTRAINT DF_LAMS_LESSON_hidden  DEFAULT ((0)),
+	schedule bit NOT NULL CONSTRAINT DF_LAMS_LESSON_schedule  DEFAULT ((0)),
+	start_date_time datetime NULL,
+	end_date_time datetime NULL,
+ CONSTRAINT PK_LAMS_LESSON PRIMARY KEY CLUSTERED 
 (
-	[lesson_id] ASC
-)WITH (IGNORE_DUP_KEY = OFF) ON [WEBCT_DATA]
-) ON [WEBCT_DATA] TEXTIMAGE_ON [WEBCT_DATA];
+	lesson_id ASC
+)WITH (IGNORE_DUP_KEY = OFF) ON WEBCT_DATA
+) ON WEBCT_DATA TEXTIMAGE_ON WEBCT_DATA;
 
Index: lams_webct_integration/db/sql/deleteTable.sql
===================================================================
diff -u -r2654d999eb449c7c2223997b0386cb8798186646 -r1f78d75662f32653744b32eba99d5ffc3b222855
--- lams_webct_integration/db/sql/deleteTable.sql	(.../deleteTable.sql)	(revision 2654d999eb449c7c2223997b0386cb8798186646)
+++ lams_webct_integration/db/sql/deleteTable.sql	(.../deleteTable.sql)	(revision 1f78d75662f32653744b32eba99d5ffc3b222855)
@@ -1,6 +1,6 @@
 USE webctdatabase;
 
 IF EXISTS
-	(SELECT 1 FROM sys.objects WHERE OBJECT_ID = OBJECT_ID(N'[dbo].[LAMS_LESSON]') 
+	(SELECT 1 FROM sys.objects WHERE OBJECT_ID = OBJECT_ID(N'dbo.LAMS_LESSON') 
 	AND type = (N'U'))    
-	DROP TABLE [dbo].[LAMS_LESSON];
\ No newline at end of file
+	DROP TABLE dbo.LAMS_LESSON;
\ No newline at end of file
Index: lams_webct_integration/src/org/lamsfoundation/integration/dao/LamsLessonDaoJDBC.java
===================================================================
diff -u -r1e48e51fc873467eef72ce5af99d865c5a0d818c -r1f78d75662f32653744b32eba99d5ffc3b222855
--- lams_webct_integration/src/org/lamsfoundation/integration/dao/LamsLessonDaoJDBC.java	(.../LamsLessonDaoJDBC.java)	(revision 1e48e51fc873467eef72ce5af99d865c5a0d818c)
+++ lams_webct_integration/src/org/lamsfoundation/integration/dao/LamsLessonDaoJDBC.java	(.../LamsLessonDaoJDBC.java)	(revision 1f78d75662f32653744b32eba99d5ffc3b222855)
@@ -102,19 +102,19 @@
 			connection = getConnection();
 			Statement stmt = connection.createStatement();
 			
-			String query = "SELECT [lesson_id]," +
-			 		"[learning_context_id]," +
-			 		"[sequence_id]," +
-			 		"[owner_id]," +
-			 		"[owner_first_name]," +
-			 		"[owner_last_name]," +
-			 		"[title]," +
-			 		"[description]," +
-			 		"[hidden]," +
-			 		"[schedule]," +
-			 		"[start_date_time]," +
-			 		"[end_date_time] " +
-			 		"FROM [webctdatabase].[dbo].[LAMS_LESSON] " +
+			String query = "SELECT lesson_id," +
+			 		"learning_context_id," +
+			 		"sequence_id," +
+			 		"owner_id," +
+			 		"owner_first_name," +
+			 		"owner_last_name," +
+			 		"title," +
+			 		"description," +
+			 		"hidden," +
+			 		"schedule," +
+			 		"start_date_time," +
+			 		"end_date_time " +
+			 		"FROM webctdatabase.dbo.LAMS_LESSON " +
 			 		"WHERE (learning_context_id=" +learningContextId+ ") " +
 			 		"AND   (pt_id=" +ptId+ ")";
 			
@@ -163,19 +163,19 @@
 			connection = getConnection();
 			Statement stmt = connection.createStatement();
 			
-			String query = "SELECT [lesson_id]," +
-			 		"[learning_context_id]," +
-			 		"[sequence_id]," +
-			 		"[owner_id]," +
-			 		"[owner_first_name]," +
-			 		"[owner_last_name]," +
-			 		"[title]," +
-			 		"[description]," +
-			 		"[hidden]," +
-			 		"[schedule]," +
-			 		"[start_date_time]," +
-			 		"[end_date_time] " +
-			 		"FROM [webctdatabase].[dbo].[LAMS_LESSON] " +
+			String query = "SELECT lesson_id," +
+			 		"learning_context_id," +
+			 		"sequence_id," +
+			 		"owner_id," +
+			 		"owner_first_name," +
+			 		"owner_last_name," +
+			 		"title," +
+			 		"description," +
+			 		"hidden," +
+			 		"schedule," +
+			 		"start_date_time," +
+			 		"end_date_time " +
+			 		"FROM webctdatabase.dbo.LAMS_LESSON " +
 			 		"WHERE " +
 			 		"(" +
 				 			"(learning_context_id=" +learningContextId+ ") " +
@@ -265,20 +265,20 @@
 			Statement stmt = connection.createStatement();
 			
 			
-			String insert = "INSERT INTO [webctdatabase].[dbo].[LAMS_LESSON]" +
-			"([lesson_id]," +
-			"[pt_id]," +
-			"[learning_context_id]," +
-			"[sequence_id]," +
-			"[owner_id]," +
-			"[owner_first_name]," +
-			"[owner_last_name]," +
-			"[title]," +
-			"[description]," +
-			"[hidden]," +
-			"[schedule]," +
-			"[start_date_time]," +
-			"[end_date_time])" +
+			String insert = "INSERT INTO webctdatabase.dbo.LAMS_LESSON" +
+			"(lesson_id," +
+			"pt_id," +
+			"learning_context_id," +
+			"sequence_id," +
+			"owner_id," +
+			"owner_first_name," +
+			"owner_last_name," +
+			"title," +
+			"description," +
+			"hidden," +
+			"schedule," +
+			"start_date_time," +
+			"end_date_time)" +
 			"VALUES" +
 			"(" +lesson.getLessonId()+ "," + 
 			"" +lesson.getPtId()+ "," +
@@ -314,39 +314,48 @@
 	
 	public boolean updateLesson(LamsLesson lesson)
 	{
-		
-		
 		Connection connection;
 		int rows = 0;
 		try
 		{
 			connection = getConnection();
 			Statement stmt = connection.createStatement();
 			
+			int hidden=0;
+			int schedule=0;
+			
+			if (lesson.getHidden()) {hidden=1;}
+			if (lesson.getSchedule()) {schedule=1;}
+			
 			String startTimeStamp = "null";
 			if (lesson.getStartTimestamp()!=null)
-				startTimeStamp = lesson.getStartTimestamp().toString().replaceAll("-", "");
-			
+			{
+				startTimeStamp = "\'" +lesson.getStartTimestamp();
+				startTimeStamp = startTimeStamp.replaceAll("-", "") + "\'";
+			}
+				
 			String endTimeStamp = "null";
 			if (lesson.getEndTimestamp()!=null)
-				endTimeStamp = lesson.getEndTimestamp().toString().replaceAll("-", "");
+			{	
+				endTimeStamp = "\'" + lesson.getEndTimestamp();
+				endTimeStamp = endTimeStamp.replaceAll("-", "") + "\'";
+			}
 			
+			String update="UPDATE webctdatabase.dbo.LAMS_LESSON" +
+					" SET pt_id = " +lesson.getPtId()+
+				    ",learning_context_id = " +lesson.getLearningContextId()+
+				    ",sequence_id = " + lesson.getSequenceId()+
+				    ",owner_id = \'" + lesson.getOwnerId()+ "\'" +
+				    ",owner_first_name = \'" +lesson.getOwnerFirstName()+ "\'" +
+				    ",owner_last_name = \'" + lesson.getOwnerLastName()+ "\'" +
+				    ",title = \'" +lesson.getTitle()+ "\'" +
+				    ",description = \'" +lesson.getDescription()+ "\'" +
+				    ",hidden = " +hidden+
+				    ",schedule = " +schedule+ 
+				    ",start_date_time = " +startTimeStamp+
+				    ",end_date_time = " +endTimeStamp+ " " + 
+				    "WHERE lesson_id = " + lesson.getLessonId();
 			
-			String update="UPDATE [webctdatabase].[dbo].[LAMS_LESSON]" +
-					" SET [pt_id] = " +lesson.getPtId()+
-				    ",[learning_context_id] = " +lesson.getLearningContextId()+
-				    ",[sequence_id] = " + lesson.getSequenceId()+
-				    ",[owner_id] = \'" + lesson.getOwnerId()+ "\'" +
-				    ",[owner_first_name] = \'" +lesson.getOwnerFirstName()+ "\'" +
-				    ",[owner_last_name] = \'" + lesson.getOwnerLastName()+ "\'" +
-				    ",[title] = \'" +lesson.getTitle()+ "\'" +
-				    ",[description] = \'" +lesson.getDescription()+ "\'" +
-				    ",[hidden] = \'" +lesson.getHidden()+ "\'" + 
-				    ",[schedule] = \'" +lesson.getSchedule()+ "\'" +
-				    ",[start_date_time] = \'" +startTimeStamp+ "\'" +
-				    ",[end_date_time] = \'" +endTimeStamp+ "\' " +
-				    "WHERE [lesson_id] = " + lesson.getLessonId();
-			
 			System.out.println("UPDATE: " + update);
 			
 			rows = stmt.executeUpdate(update);
@@ -362,6 +371,11 @@
 			e.printStackTrace();
 			log.error("Error updating LAMS lesson to database.", e);
 		}
+		catch (Exception e)
+		{
+			e.printStackTrace();
+			log.error("Error updating LAMS lesson to database.", e);
+		}
 		
 		return rows>0;
 	
@@ -377,7 +391,7 @@
 			connection = getConnection();
 			Statement stmt = connection.createStatement();
 			
-			String delete="DELETE FROM [webctdatabase].[dbo].[LAMS_LESSON] WHERE lesson_id=" +lsId;
+			String delete="DELETE FROM webctdatabase.dbo.LAMS_LESSON WHERE lesson_id=" +lsId;
 			System.out.println("DELETE: " + delete);
 			
 			rows = stmt.executeUpdate(delete);
@@ -407,20 +421,20 @@
 			connection = getConnection();
 			Statement stmt = connection.createStatement();
 			
-			String query = "SELECT [lesson_id]," +
-			 		"[pt_id]," +
-			 		"[learning_context_id]," +
-			 		"[sequence_id]," +
-			 		"[owner_id]," +
-			 		"[owner_first_name]," +
-			 		"[owner_last_name]," +
-			 		"[title]," +
-			 		"[description]," +
-			 		"[hidden]," +
-			 		"[schedule]," +
-			 		"[start_date_time]," +
-			 		"[end_date_time] " +
-			 		"FROM [webctdatabase].[dbo].[LAMS_LESSON] " +
+			String query = "SELECT lesson_id," +
+			 		"pt_id," +
+			 		"learning_context_id," +
+			 		"sequence_id," +
+			 		"owner_id," +
+			 		"owner_first_name," +
+			 		"owner_last_name," +
+			 		"title," +
+			 		"description," +
+			 		"hidden," +
+			 		"schedule," +
+			 		"start_date_time," +
+			 		"end_date_time " +
+			 		"FROM webctdatabase.dbo.LAMS_LESSON " +
 			 		"WHERE (lesson_id=" +lsId+ ")";
 			
 			System.out.println("GET LESSON: " +query);
Index: lams_webct_integration/src/org/lamsfoundation/integration/webct/LamsModule.java
===================================================================
diff -u -r1e48e51fc873467eef72ce5af99d865c5a0d818c -r1f78d75662f32653744b32eba99d5ffc3b222855
--- lams_webct_integration/src/org/lamsfoundation/integration/webct/LamsModule.java	(.../LamsModule.java)	(revision 1e48e51fc873467eef72ce5af99d865c5a0d818c)
+++ lams_webct_integration/src/org/lamsfoundation/integration/webct/LamsModule.java	(.../LamsModule.java)	(revision 1f78d75662f32653744b32eba99d5ffc3b222855)
@@ -11,7 +11,7 @@
 import java.util.Properties;
 import javax.security.auth.Subject;
 import javax.security.auth.callback.CallbackHandler;
-import java.sql.Date;
+import java.util.Calendar;
 import java.sql.Timestamp;
 
 import javax.security.auth.login.LoginException;
@@ -431,34 +431,61 @@
 	        	params.put("lsID", request.getParameter("lsID"));
 	        	params.put("title", modLesson.getTitle());
 	        	params.put("description", modLesson.getDescription());
-	        	params.put("start", modLesson.getStartTimestamp());
-	        	params.put("end", modLesson.getEndTimestamp());
 	        	
+	        	
+	        	if (modLesson.getStartTimestamp()!=null)
+	        	{
+	        		Calendar calendarStart = Calendar.getInstance();      	
+	        		calendarStart.setTime(modLesson.getStartTimestamp());
+	        		params.put("startStr", + calendarStart.get(Calendar.DATE) + "/" + calendarStart.get(Calendar.MONTH) + "/" + calendarStart.get(Calendar.YEAR));
+	        		params.put("stHrCk" + calendarStart.get(Calendar.HOUR), "selected" );
+	        		params.put("stMnCk" + calendarStart.get(Calendar.MINUTE), "selected" );
+	        		params.put("stAmCk" + calendarStart.get(Calendar.AM_PM), "selected" );
+	        	}
+	        	else
+	        	{
+	        		params.put("startStr", "");
+		        	params.put("stHrCk9", "selected" );
+		        	params.put("stMnCk0", "selected" );
+		        	params.put("stAmCk0", "selected" );
+	        	}
+	        	
+	        	if (modLesson.getEndTimestamp()!=null)
+	        	{
+	        		Calendar calendarEnd = Calendar.getInstance();
+	        		calendarEnd.setTime(modLesson.getEndTimestamp());
+		        	params.put("endStr", calendarEnd.get(Calendar.DATE) + "/" + calendarEnd.get(Calendar.MONTH) + "/" + calendarEnd.get(Calendar.YEAR));
+		        	params.put("edHrCk" + calendarEnd.get(Calendar.HOUR), "selected" );
+		        	params.put("edMnCk" + calendarEnd.get(Calendar.MINUTE), "selected" );
+		        	params.put("edAmCk" + calendarEnd.get(Calendar.AM_PM), "selected" );
+	        	}
+	        	else
+	        	{
+	        		params.put("endStr", "");
+		        	params.put("edHrCk9", "selected" );
+		        	params.put("edMnCk0", "selected" );
+		        	params.put("edAmCk0", "selected" );
+	        	}
 	
 	        	if (modLesson.getHidden()) 
 	        	{
-	        		params.put("hidden", "true");
-	        		params.put("notHidden", "false");
+	        		params.put("hidden", "checked");
 	        	}
 	        	else
 	        	{
-	        		params.put("hidden", "false");
-	        		params.put("notHidden", "true");
+	        		params.put("nothidden", "checked");
 	        	}
 	        	
 	        	
 	        	if (modLesson.getSchedule())
 	        	{
-	        		params.put("schedule", "true");
-	        		params.put("notSchedule", "false");
+	        		params.put("schedule", "checked");
 	        	}
 	        	else
 	        	{
-	        		params.put("schedule", "false");
-	        		params.put("notSchedule", "true");
+	        		params.put("notschedule", "checked");
 	        	}
 	        	
-	        	
 	        	html = this.generatePage("web/modify.vm", params);
         	}
         	catch (Exception e)
@@ -478,10 +505,36 @@
 	        	
 	        	modLesson.setTitle(request.getParameter("title"));
 	        	modLesson.setDescription(request.getParameter("description"));
-	        	modLesson.setHidden(request.getParameter("isAvailable").equals("true"));
+	        	modLesson.setHidden(request.getParameter("isAvailable").equals("false"));
 	        	modLesson.setSchedule(request.getParameter("schedule").equals("true"));
 	        	
+	        	Timestamp start = null;
+        		Timestamp end = null;
+        			
+        		if (request.getParameter("schedule").equals("true"))
+        		{
+        			if (request.getParameter("dateStart")!=null && !request.getParameter("dateStart").equals(""))
+            		{
+        				start = getTimeStamp(request.getParameter("dateStart"), 
+        							 request.getParameter("startHour"), 
+        							 request.getParameter("startMin"), 
+        							 request.getParameter("startAMPM"));
+            		}
+        			
+        			if (request.getParameter("dateEnd")!=null && !request.getParameter("dateEnd").equals(""))
+            		{
+        			
+        				end = getTimeStamp(request.getParameter("dateEnd"), 
+							 	request.getParameter("endHour"), 
+							 	request.getParameter("endMin"), 
+							 	request.getParameter("endAMPM"));
+            		}
+        		}
 	        	
+        		modLesson.setStartTimestamp(start);
+	        	modLesson.setEndTimestamp(end);
+	        	
+	        	
 	        	boolean success = lessonDao.updateLesson(modLesson);
 	        	
 	
Index: lams_webct_integration/web/create.vm
===================================================================
diff -u -r1e48e51fc873467eef72ce5af99d865c5a0d818c -r1f78d75662f32653744b32eba99d5ffc3b222855
--- lams_webct_integration/web/create.vm	(.../create.vm)	(revision 1e48e51fc873467eef72ce5af99d865c5a0d818c)
+++ lams_webct_integration/web/create.vm	(.../create.vm)	(revision 1f78d75662f32653744b32eba99d5ffc3b222855)
@@ -44,12 +44,31 @@
 
 
 	$(document).ready(function(){
-		$('#dateStart').calendar();
-		$('#dateEnd').calendar();
+		var today = new Date();
+		today = new Date(today.getFullYear(), today.getMonth(), today.getDate());
+		
+		$('.calendarRange').calendar({minDate: today, fieldSettings: customRange, onSelect:dateSelected});
 	});
 
-    
-    
+	function dateSelected() {
+		var schedule = document.create_form.schedule[0];
+		var dontschedule = document.create_form.schedule[1];
+		schedule.checked = true;
+		dontschedule.checked = false;
+	}
+
+	function getDate(value) {
+		fields = value.split('/');
+		return (fields.length < 3 ? null :
+			new Date(parseInt(fields[2], 10), parseInt(fields[1], 10) - 1, parseInt(fields[0], 10)));
+	}
+
+    function customRange(input) 
+    {
+		return {minDate: (input.id == 'dateEnd' ? getDate($('#dateStart').val()) : null),
+				maxDate: (input.id == 'dateStart' ? getDate($('#dateEnd').val()) : null)};
+	}
+   
     function openAuthor()
     {
     	authorUrl = '${authorUrl}'; 
@@ -184,9 +203,9 @@
 	        </td>
 	        <td valign="top">
 				Start date:<br>
-					<input type="text" id="dateStart" name="dateStart"  value="" /><br><br>
+					<input type="text" class="calendarRange" id="dateStart" name="dateStart"  value="" /><br><br>
 				End date:<br>
-					<input type="text" id="dateEnd" name="dateEnd" value="" /> 			
+					<input type="text" class="calendarRange" id="dateEnd" name="dateEnd" value="" /> 			
 	        </td>
 	        <td valign="top">
 				&nbsp;Start time: <br>
Index: lams_webct_integration/web/learner.vm
===================================================================
diff -u -r7270334471e73c186bfa26adeec6d7575dcbdbca -r1f78d75662f32653744b32eba99d5ffc3b222855
--- lams_webct_integration/web/learner.vm	(.../learner.vm)	(revision 7270334471e73c186bfa26adeec6d7575dcbdbca)
+++ lams_webct_integration/web/learner.vm	(.../learner.vm)	(revision 1f78d75662f32653744b32eba99d5ffc3b222855)
@@ -48,6 +48,11 @@
 	        }
 	    }
 	}
+	
+	function formSubmit()
+	{
+		document.learner_form.submit();
+	}
 //-->
 
 </script>
@@ -60,9 +65,9 @@
 <table width='100%' border='1' cellpadding='10' style="padding:10px 10px 10px 10px;" class="tablebody">	
 <thead>
 <tr>
-	<th>Title</th>
-	<th>Description</th>
-	<th>Actions</th>
+	<th width="20%">Title</th>
+	<th width="60%">Description</th>
+	<th width="20%">Actions</th>
 </tr>
 </thead>
 <tbody>
@@ -78,7 +83,20 @@
 #end
 	</tbody>
 </table>
+<br>
+<form name="learner_form" id="create_form" action="$url" method="post">
+	<input type="hidden" name="sequence_id" id="sequence_id"  value='0'>
+	<input type="hidden" name="$id_param_name" value="$pt_id"/>
+	<input type="hidden" name="page_id" value="$page_id"/>
+	<input type="hidden" name="form_action" id="form_action" value=""/>
 
+	<div class="actionbuttondiv">
+		<a class="action" href="javascript:formSubmit()">Refresh List</a>
+	</div>
+</form>
+
+
+
 </body>
 #else
     <i>No LAMS lessons running.</i>
Index: lams_webct_integration/web/modify.vm
===================================================================
diff -u -r1e48e51fc873467eef72ce5af99d865c5a0d818c -r1f78d75662f32653744b32eba99d5ffc3b222855
--- lams_webct_integration/web/modify.vm	(.../modify.vm)	(revision 1e48e51fc873467eef72ce5af99d865c5a0d818c)
+++ lams_webct_integration/web/modify.vm	(.../modify.vm)	(revision 1f78d75662f32653744b32eba99d5ffc3b222855)
@@ -27,23 +27,69 @@
 <head>
 <title>LAMS: Modify Lesson</title>
 
+<style type="text/css">
+		<!--
+		#include( 'web/lib/jquery/css/jquery-calendar.css' )
+		-->
+</style>
+
 <script language="JavaScript" type="text/javascript">
 <!--
 	#include( 'web/lib/jquery/jquery-1.2.1.js' ) 
+	#include( 'web/lib/jquery/jquery-calendar.js' ) 
 	
+	
 	function validateLesson()
 	{
 		if (document.getElementById("form_action").value==null || document.getElementById("title").value=='')
 		{
 			alert("Value required for lesson title.");
 		}
+		else if (document.modify_form.schedule[0].checked == true)
+		{	
+			if (document.getElementById("dateStart").value==null || document.getElementById("dateStart").value=='')
+			{
+				alert("You must select a start date if you want to schedule the lesson.");
+			}
+			else
+			{
+				document.getElementById("form_action").value="modify_proc";
+    			formSubmit();
+			}
+		}
 		else
 		{
 			document.getElementById("form_action").value="modify_proc";
 			formSubmit();
 		}
 	}
 	
+	$(document).ready(function(){
+		var today = new Date();
+		today = new Date(today.getFullYear(), today.getMonth(), today.getDate());
+		
+		$('.calendarRange').calendar({minDate: today, fieldSettings: customRange, onSelect:dateSelected});
+	});
+
+	function dateSelected() {
+		var schedule = document.modify_form.schedule[0]
+		var dontschedule = document.modify_form.schedule[1]
+		schedule.checked = true;
+		dontschedule.checked = false;
+	}
+
+	function getDate(value) {
+		fields = value.split('/');
+		return (fields.length < 3 ? null :
+			new Date(parseInt(fields[2], 10), parseInt(fields[1], 10) - 1, parseInt(fields[0], 10)));
+	}
+	
+	function customRange(input) 
+    {
+		return {minDate: (input.id == 'dateEnd' ? getDate($('#dateStart').val()) : null),
+				maxDate: (input.id == 'dateStart' ? getDate($('#dateEnd').val()) : null)};
+	}
+	
 	function back()
 	{
 		document.getElementById("form_action").value="";
@@ -61,6 +107,7 @@
 	{
 		document.modify_form.submit();
 	}
+	
 //-->
 </script>
 
@@ -89,19 +136,101 @@
 		</tr>
 		<tr>
 			<td valign="top"><b>Lesson Visibility:</b></td>
-			<td><input type="Radio" name="isAvailable" value="$hidden" checked>Show Lesson <br>
-	            <input type="Radio" name="isAvailable" value="$notHidden">Hide Lesson </td>
+			<td><input type="Radio" name="isAvailable" value="true" $nothidden>Show Lesson <br>
+	            <input type="Radio" name="isAvailable" value="false" $hidden>Hide Lesson </td>
 		</tr>
+	</table>
+	
+	<br>
+	
+
+	<table border='0' >
 		<tr>
 			<td valign="top"><b>Schedule Lesson:</b></td>
-			<td>
-				<input type="Radio" name="schedule" value="true" checked>Yes<br>
-	            <input type="Radio" name="schedule" value="false">No
+			<td valign="top">
+				<input type="Radio" id="schedule" name="schedule" value="true" $schedule>Yes<br>
+	            <input type="Radio" id="schedule" name="schedule" value="false" $notschedule>No
 	        </td>
-	        
+	        <td>	
+	        	&nbsp;&nbsp;&nbsp;&nbsp;
+	        </td>
+	        <td valign="top">
+				Start date:<br>
+					<input type="text" class="calendarRange" id="dateStart" name="dateStart"  value="$startStr" /><br><br>
+				End date:<br>
+					<input type="text" class="calendarRange" id="dateEnd" name="dateEnd" value="$endStr" /> 			
+	        </td>
+	        <td valign="top">
+				&nbsp;Start time: <br>
+				&nbsp;<select name="startHour">
+						<option value ="01" $stHrCk1>01</option>
+						<option value ="02" $stHrCk2>02</option>
+						<option value ="03" $stHrCk3>03</option>
+						<option value ="04" $stHrCk4>04</option>
+						<option value ="05" $stHrCk5>05</option>
+						<option value ="06" $stHrCk6>06</option>
+						<option value ="07" $stHrCk7>07</option>
+						<option value ="08" $stHrCk8>08</option>
+						<option value ="09" $stHrCk9>09</option>
+						<option value ="10" $stHrCk10>10</option>
+						<option value ="11" $stHrCk11>11</option>
+						<option value ="12" $stHrCk12>12</option>
+					</select>&nbsp;:
+					<select name="startMin">
+						<option value ="00" $stMnCk0>00</option>
+						<option value ="05" $stMnCk5>05</option>
+						<option value ="10" $stMnCk10>10</option>
+						<option value ="15" $stMnCk15>15</option>
+						<option value ="20" $stMnCk20>20</option>
+						<option value ="25" $stMnCk25>25</option>
+						<option value ="30" $stMnCk30>30</option>
+						<option value ="35" $stMnCk35>35</option>
+						<option value ="40" $stMnCk40>40</option>
+						<option value ="45" $stMnCk45>45</option>
+						<option value ="50" $stMnCk50>50</option>
+						<option value ="55" $stMnCk55>55</option>
+					</select>&nbsp;&nbsp;
+					<select name="startAMPM">
+						<option value ="AM" $stAmCk0>AM</option>
+						<option value ="PM" $stAmCk1>PM</option>
+					</select> <br><br>
+				&nbsp;End time:<br>
+				&nbsp;<select name="endHour">
+						<option value ="01" $edHrCk1>01</option>
+						<option value ="02" $edHrCk2>02</option>
+						<option value ="03" $edHrCk3>03</option>
+						<option value ="04" $edHrCk4>04</option>
+						<option value ="05" $edHrCk5>05</option>
+						<option value ="06" $edHrCk6>06</option>
+						<option value ="07" $edHrCk7>07</option>
+						<option value ="08" $edHrCk8>08</option>
+						<option value ="09" $edHrCk9>09</option>
+						<option value ="10" $edHrCk10>10</option>
+						<option value ="11" $edHrCk11>11</option>
+						<option value ="12" $edHrCk12>12</option>
+					</select>&nbsp;:
+					<select name="endMin">
+						<option value ="00" $edMnCk0>00</option>
+						<option value ="05" $edMnCk5>05</option>
+						<option value ="10" $edMnCk10>10</option>
+						<option value ="15" $edMnCk15>15</option>
+						<option value ="20" $edMnCk20>20</option>
+						<option value ="25" $edMnCk25>25</option>
+						<option value ="30" $edMnCk30>30</option>
+						<option value ="35" $edMnCk35>35</option>
+						<option value ="40" $edMnCk40>40</option>
+						<option value ="45" $edMnCk45>45</option>
+						<option value ="50" $edMnCk50>50</option>
+						<option value ="55" $edMnCk55>55</option>
+					</select>&nbsp;&nbsp;
+					<select name="endAMPM">
+						<option value ="AM" $edAmCk0>AM</option>
+						<option value ="PM" $edAmCk1>PM</option>
+					</select>                                         					
+	        </td>
 		</tr>
-		
 	</table>
+	
 	<br>
 	<hr>
 	<br>
Index: lams_webct_integration/web/teach.vm
===================================================================
diff -u -r1e48e51fc873467eef72ce5af99d865c5a0d818c -r1f78d75662f32653744b32eba99d5ffc3b222855
--- lams_webct_integration/web/teach.vm	(.../teach.vm)	(revision 1e48e51fc873467eef72ce5af99d865c5a0d818c)
+++ lams_webct_integration/web/teach.vm	(.../teach.vm)	(revision 1f78d75662f32653744b32eba99d5ffc3b222855)
@@ -144,20 +144,52 @@
 	<table width='100%' border='1' cellpadding='10' style="padding:10px 10px 10px 10px;" class="tablebody">	
 	<thead>
 	<tr>
-		<th>Title</th>
-		<th>Description</th>
-		<th>Hidden</th>
-		<th>Scheduled</th>
-		<th>Start</th>
-		<th>End</th>
-		<th>Actions</th>
+		<th width="20%">Title</th>
+		<th width="30%">Description</th>
+		<th width="20%">Status</th>
+
+		
+		<th width="30%">Actions</th>
 	</tr>
 	</thead>
 	<tbody>
 	#foreach ($lesson in $lessons)
 		<tr>
 			<td valign='top'><b>$lesson.getTitle()</b></td>
 			<td valign='top'><i>$lesson.getDescription()</i></td>
+			
+			#set( $start = '' )
+			#set( $end = '' )
+			#set( $endStr = '' )
+			
+			<td valign='top'>
+				<i>
+				#if ( $lesson.getSchedule() )
+					#set( $start = $lesson.getStartTimestamp() )
+					#set( $end = $lesson.getEndTimestamp() )
+					#set( $endStr = $end.toString() )
+					
+					#if( $endStr != '' )
+						Scheduled from:<br>
+						&nbsp;&nbsp;&nbsp;&nbsp;$start.toString() to<br>	
+						&nbsp;&nbsp;&nbsp;&nbsp;$endStr	
+					#else
+						Scheduled from:<br>
+						&nbsp;&nbsp;&nbsp;&nbsp;$start.toString()
+					#end
+					
+					#if( $lesson.getHidden() )
+						<br>&nbsp;&nbsp;&nbsp;&nbsp;(Hidden)
+					#end
+				#elseif( $lesson.getHidden() )
+					Hidden
+				#else
+					Running
+				#end
+				</i>
+			</td>
+			
+			<!--
 			<td valign='top'><i>$lesson.getHidden()</i></td>
 			<td valign='top'><i>$lesson.getSchedule()</i></td>
 			
@@ -173,7 +205,7 @@
    				<td valign='top' align='center'></td>
    				<td valign='top' align='center'></td>
 			#end
-		
+			-->
 	
 			<td valign='top'>
 				<a class="actionlight" href="javascript:openLearner($lesson.getLessonId())">Open Learner</a>