Index: lams_webct_integration/web/create.vm =================================================================== diff -u -rdc39866a1a6af7b9534cccd65bb4e5ec2cec8911 -r164cf767789b4c58d9ccb41f0d71d00d4a4c9ed9 --- lams_webct_integration/web/create.vm (.../create.vm) (revision dc39866a1a6af7b9534cccd65bb4e5ec2cec8911) +++ lams_webct_integration/web/create.vm (.../create.vm) (revision 164cf767789b4c58d9ccb41f0d71d00d4a4c9ed9) @@ -42,7 +42,31 @@ var authorWin = null; var previewWin = null; - + function init() + { + var today = new Date(); + today = new Date(today.getFullYear(), today.getMonth(), today.getDate()); + + var dateEndStr = document.getElementById("dateEnd").value; + if (dateEndStr != '') + { + $('.calendarRange').calendar({minDate: today, fieldSettings: customRange, onSelect:dateSelected}); + document.create_form.endHour.disabled=false; + document.create_form.endMin.disabled=false; + document.create_form.endAMPM.disabled=false; + document.create_form.dateEnd.disabled=false; + } + else + { + $('.calendarRange').calendar({minDate: today, fieldSettings: customRange2, onSelect:dateSelected}); + document.create_form.endHour.disabled=true; + document.create_form.endMin.disabled=true; + document.create_form.endAMPM.disabled=true; + document.create_form.dateEnd.disabled=true; + } + } + + $(document).ready(function(){ var today = new Date(); today = new Date(today.getFullYear(), today.getMonth(), today.getDate()); @@ -51,10 +75,6 @@ }); 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) { @@ -68,6 +88,11 @@ return {minDate: (input.id == 'dateEnd' ? getDate($('#dateStart').val()) : null), maxDate: (input.id == 'dateStart' ? getDate($('#dateEnd').val()) : null)}; } + + function customRange2(input) + { + return {minDate: (input.id == 'dateEnd' ? getDate($('#dateStart').val()) : null)}; + } function openAuthor() { @@ -120,9 +145,13 @@ var start = new Date(parseInt(dateStartArr[2], 10), parseInt(dateStartArr[1], 10) - 1, parseInt(dateStartArr[0], 10), startHour, startMin,"0"); + var startCheck = new Date(parseInt(dateStartArr[2], 10), parseInt(dateStartArr[1], 10) - 1, parseInt(dateStartArr[0], 10), startHour, startMin + 5,"0"); var end = new Date(parseInt(dateEndArr[2], 10), parseInt(dateEndArr[1], 10) - 1, parseInt(dateEndArr[0], 10), endHour, endMin, "0"); var today = new Date(); + re = new RegExp("^[0-9]{1,2}\/[0-9]{1,2}\/[0-9]{4}$", "g"); + re2 = new RegExp("^[0-9]{1,2}\/[0-9]{1,2}\/[0-9]{4}$", "g"); + if (document.getElementById("sequence_id").value=="0") { alert('Please select a sequence before starting the lesson.'); @@ -131,25 +160,25 @@ { alert("Value required for lesson title."); } - else if (document.create_form.schedule[0].checked == true) + else if (dateStartStr==null || dateStartStr=='') + { + alert("You must select a start date."); + } + else if (!re.test(dateStartStr)) + { + alert("Incorrect format for start date, must follow the form: dd/mm/yyyy"); + } + else if (document.create_form.schedule[1].checked == true) { - - re = new RegExp("^[0-9]{1,2}\/[0-9]{1,2}\/[0-9]{4}$", "g"); - re2 = new RegExp("^[0-9]{1,2}\/[0-9]{1,2}\/[0-9]{4}$", "g"); - - if (dateStartStr==null || dateStartStr=='') + if (dateEndStr==null || dateEndStr=='') { - alert("You must select a start date if you want to schedule the lesson."); + alert("End date feild missing, if you want to have no end date for the lesson, select the 'Unlimited' option."); } - else if (!re.test(dateStartStr)) + else if (!re2.test(dateEndStr)) { - alert("Incorrect format for start date, must follow the form: dd/mm/yyyy"); - } - else if (!re2.test(dateEndStr) && dateEndStr.length>0) - { alert("Incorrect format for end date, must follow the form: dd/mm/yyyy"); - } - else if (start - +

Create LAMS Lesson


@@ -236,95 +291,106 @@
- + +

+ Dates available: +

+
- - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Schedule Lesson: - Yes
- No - 		-      - - Start date:
-

- End date:
- - 		-  Start time:
-  		*Start Time: +  :    -

-  End time:
-   : -    - - - 		+ +
End Time: Unlimited.
+ + + +  : + + +
+ + + +