Index: lams_central/web/includes/javascript/monitorToolSummaryAdvanced.js =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/includes/javascript/monitorToolSummaryAdvanced.js,v diff -u -r1.1.10.1 -r1.1.10.2 --- lams_central/web/includes/javascript/monitorToolSummaryAdvanced.js 14 Apr 2011 20:52:03 -0000 1.1.10.1 +++ lams_central/web/includes/javascript/monitorToolSummaryAdvanced.js 9 Dec 2011 21:47:13 -0000 1.1.10.2 @@ -16,73 +16,3 @@ } } -//check if jquery is loaded -if ((typeof jQuery != 'undefined') && (typeof settings != 'undefined')) { - //support for setting up submission deadline - $(function(){ - $("#datetime").datetimepicker(); - - if (settings.submissionDeadline != "") { - var date = new Date(eval(settings.submissionDeadline)); - $("#dateInfo").html( formatDate2(date) ); - - //open up date restriction area - toggleAdvancedOptionsVisibility(document.getElementById('restrictUsageDiv'), document.getElementById('restrictUsageTreeIcon'),settings.lams); - } - }); - - function formatDate2(date) { - var currHour = "" + date.getHours(); - if (currHour.length == 1) { - currHour = "0" + currHour; - } - var currMin = "" + date.getMinutes(); - if (currMin.length == 1) { - currMin = "0" + currMin; - } - return $.datepicker.formatDate( 'mm/dd/yy', date ) + " " + currHour + ":" + currMin; - } - - function setSubmissionDeadline() { - //get the timestamp in milliseconds since midnight Jan 1, 1970 - var date = $("#datetime").datetimepicker('getDate'); - if (date == null) { - return; - } - - var reqIDVar = new Date(); - var parameterDelimiter = (settings.setSubmissionDeadlineUrl.indexOf("?") == -1) ? "?" : "&"; - - var url = settings.setSubmissionDeadlineUrl + parameterDelimiter + "toolContentID=" + settings.toolContentID + "&submissionDeadline=" + - + date.getTime() + "&reqID=" + reqIDVar.getTime(); - - $.ajax({ - url : url, - success : function() { - $.growlUI(settings.messageNotification, settings.messageRestrictionSet); - $("#datetimeDiv").hide(); - $("#dateInfo").html(formatDate2(date) ); - $("#dateInfoDiv").show(); - } - }); - } - function removeSubmissionDeadline() { - var reqIDVar = new Date(); - var parameterDelimiter = (settings.setSubmissionDeadlineUrl.indexOf("?") == -1) ? "?" : "&"; - - var url = settings.setSubmissionDeadlineUrl + parameterDelimiter + "toolContentID=" + settings.toolContentID + "&submissionDeadline=" + - "&reqID=" + reqIDVar.getTime(); - - $.ajax({ - url : url, - success : function() { - $.growlUI(settings.messageNotification, settings.messageRestrictionRemoved); - $("#dateInfoDiv").hide(); - - $("#datetimeDiv").show(); - $("#datetime").val(""); - } - }); - } -} - Index: lams_tool_mindmap/web/pages/monitoring/summary.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_mindmap/web/pages/monitoring/summary.jsp,v diff -u -r1.3.2.2.2.1 -r1.3.2.2.2.2 --- lams_tool_mindmap/web/pages/monitoring/summary.jsp 14 Apr 2011 20:53:50 -0000 1.3.2.2.2.1 +++ lams_tool_mindmap/web/pages/monitoring/summary.jsp 9 Dec 2011 21:47:20 -0000 1.3.2.2.2.2 @@ -28,6 +28,73 @@ messageRestrictionRemoved: '' }; + //support for setting up submission deadline + $(function(){ + $("#datetime").datetimepicker(); + + if (settings.submissionDeadline != "") { + var date = new Date(eval(settings.submissionDeadline)); + $("#dateInfo").html( formatDate2(date) ); + + //open up date restriction area + toggleAdvancedOptionsVisibility(document.getElementById('restrictUsageDiv'), document.getElementById('restrictUsageTreeIcon'),settings.lams); + } + }); + + function formatDate2(date) { + var currHour = "" + date.getHours(); + if (currHour.length == 1) { + currHour = "0" + currHour; + } + var currMin = "" + date.getMinutes(); + if (currMin.length == 1) { + currMin = "0" + currMin; + } + return $.datepicker.formatDate( 'mm/dd/yy', date ) + " " + currHour + ":" + currMin; + } + + function setSubmissionDeadline() { + //get the timestamp in milliseconds since midnight Jan 1, 1970 + var date = $("#datetime").datetimepicker('getDate'); + if (date == null) { + return; + } + + var reqIDVar = new Date(); + var parameterDelimiter = (settings.setSubmissionDeadlineUrl.indexOf("?") == -1) ? "?" : "&"; + + var url = settings.setSubmissionDeadlineUrl + parameterDelimiter + "toolContentID=" + settings.toolContentID + "&submissionDeadline=" + + + date.getTime() + "&reqID=" + reqIDVar.getTime(); + + $.ajax({ + url : url, + success : function() { + $.growlUI(settings.messageNotification, settings.messageRestrictionSet); + $("#datetimeDiv").hide(); + $("#dateInfo").html(formatDate2(date) ); + $("#dateInfoDiv").show(); + } + }); + } + function removeSubmissionDeadline() { + var reqIDVar = new Date(); + var parameterDelimiter = (settings.setSubmissionDeadlineUrl.indexOf("?") == -1) ? "?" : "&"; + + var url = settings.setSubmissionDeadlineUrl + parameterDelimiter + "toolContentID=" + settings.toolContentID + "&submissionDeadline=" + + "&reqID=" + reqIDVar.getTime(); + + $.ajax({ + url : url, + success : function() { + $.growlUI(settings.messageNotification, settings.messageRestrictionRemoved); + $("#dateInfoDiv").hide(); + + $("#datetimeDiv").show(); + $("#datetime").val(""); + } + }); + } + //-->