Index: lams_central/web/includes/javascript/monitorToolSummaryAdvanced.js =================================================================== diff -u -rbe513b5b177ecf4aa4c83b1725fe3c4dd5113081 -r31e6bbeab2ea68cd74d596bfc0ba41b58d6e49de --- lams_central/web/includes/javascript/monitorToolSummaryAdvanced.js (.../monitorToolSummaryAdvanced.js) (revision be513b5b177ecf4aa4c83b1725fe3c4dd5113081) +++ lams_central/web/includes/javascript/monitorToolSummaryAdvanced.js (.../monitorToolSummaryAdvanced.js) (revision 31e6bbeab2ea68cd74d596bfc0ba41b58d6e49de) @@ -25,7 +25,12 @@ $("#datetime").datetimepicker(); if (submissionDeadlineSettings.submissionDeadline != "") { var date = new Date(eval(submissionDeadlineSettings.submissionDeadline)); - $("#dateInfo").html( formatDate(date) ); + + if ( typeof submissionDeadlineSettings.submissionDateString != 'undefined' ) { + $("#dateInfo").html( submissionDeadlineSettings.submissionDateString ); + } else { + $("#dateInfo").html( formatDate(date) ); + } if ( $("#restrictUsageDiv").hasClass("collapse") ) { // new version - using the according @@ -38,6 +43,7 @@ } }); + // fallback routine for when Java formatted dates are not available function formatDate(date) { var currHour = "" + date.getHours(); if (currHour.length == 1) { @@ -64,10 +70,15 @@ + date.getTime() + "&reqID=" + reqIDVar.getTime(); $.ajax({ url : url, - success : function() { + success : function(data) { + debugger; $.growlUI(submissionDeadlineSettings.messageNotification, submissionDeadlineSettings.messageRestrictionSet); $("#datetimeDiv").hide(); - $("#dateInfo").html(formatDate(date) ); + if ( data != '' ) { + $("#dateInfo").html( data ); + } else { + $("#dateInfo").html( formatDate(date) ); + } $("#dateInfoDiv").show(); } }); @@ -84,7 +95,6 @@ success : function() { $.growlUI(submissionDeadlineSettings.messageNotification, submissionDeadlineSettings.messageRestrictionRemoved); $("#dateInfoDiv").hide(); - $("#datetimeDiv").show(); $("#datetime").val(""); }