Merge pull request #638 from edx/muzaffar/tnl58-date-validations

More accurate validation for date & time in studio editor.

AUTHORS

@@ -11,3 +11,4 @@ David Baumgold <david@davidbaumgold.com>
 Grady Ward <gward@brandeis.edu>
 Andrew Dekker <a.dekker@uq.edu.au>
 Steven Burch <stv@stanford.edu>
+Muzaffar Yousaf <muzaffar@edx.org>

openassessment/xblock/static/js/spec/studio/oa_edit_fields.js

@@ -44,6 +44,10 @@ describe("OpenAssessment.DatetimeControl", function() {
         testValidateDate(datetimeControl, "99999999-01-01", "00:00", false, expectedError);
         testValidateDate(datetimeControl, "2014-99999-01", "00:00", false, expectedError);
         testValidateDate(datetimeControl, "2014-01-99999", "00:00", false, expectedError);
+        //invalid month
+        testValidateDate(datetimeControl, "2014-13-01", "00:00", false, expectedError);
+        //invalid day
+        testValidateDate(datetimeControl, "2014-02-30", "00:00", false, expectedError);
     });
 
     it("validates invalid times", function() {
@@ -64,6 +68,8 @@ describe("OpenAssessment.DatetimeControl", function() {
         testValidateDate(datetimeControl, "2001-12-31", "00:00", true);
         testValidateDate(datetimeControl, "2014-04-01", "12:34", true);
         testValidateDate(datetimeControl, "2014-04-01", "23:59", true);
+        // single character for month and date.
+        testValidateDate(datetimeControl, "2014-4-1", "23:59", true);
     });
 
     it("clears validation errors", function() {

openassessment/xblock/static/js/src/studio/oa_edit_fields.js

@@ -227,16 +227,31 @@ OpenAssessment.DatetimeControl.prototype = {
 
     **/
     validate: function() {
-        var datetimeString = this.datetime();
-        var matches = datetimeString.match(/^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}$/g);
-        var isValid = (matches !== null);
+        var dateString = $(this.datePicker, this.element).val();
+        var timeString = $(this.timePicker, this.element).val();
 
-        if (!isValid) {
+        //date validation
+        var isDateValid = false;
+
+        try {
+            var parsedDate = $.datepicker.parseDate($.datepicker.ISO_8601, dateString);
+            isDateValid = parsedDate instanceof Date;
+        } catch (err) {
+            // parseDate function throws error if date is not in expected format.
+            // isDateValid flag would remain false.
+        }
+        if (!isDateValid) {
             $(this.datePicker, this.element).addClass("openassessment_highlighted_field");
+        }
+
+        //time validation
+        var matches = timeString.match(/^\d{2}:\d{2}$/g);
+        var isTimeValid = (matches !== null);
+        if(!isTimeValid) {
             $(this.timePicker, this.element).addClass("openassessment_highlighted_field");
         }
 
-        return isValid;
+        return (isDateValid && isTimeValid);
     },
 
     /**