2006-12-06 Igor Zelmanovich <[email protected]>

	* BaseCompareValidator.cs: fixed: support for type=Date on client side.


svn path=/trunk/mcs/; revision=69100

mcs/class/System.Web/System.Web.UI.WebControls/BaseCompareValidator.cs

@@ -52,6 +52,16 @@ namespace System.Web.UI.WebControls {
 		{
 			if (RenderUplevel) {
 				w.AddAttribute ("datatype", Type.ToString());
+
+#if NET_2_0
+				if (Page!=null && Type == ValidationDataType.Date) {
+					DateTimeFormatInfo dateTimeFormat = CultureInfo.CurrentUICulture.DateTimeFormat;
+					string pattern = dateTimeFormat.ShortDatePattern;
+					string dateorder = (pattern.StartsWith ("y", true, CultureInfo.InvariantCulture) ? "ymd" : (pattern.StartsWith ("m", true, CultureInfo.InvariantCulture) ? "mdy" : "dmy"));
+					Page.ClientScript.RegisterExpandoAttribute (ClientID, "dateorder", dateorder);
+					Page.ClientScript.RegisterExpandoAttribute (ClientID, "cutoffyear", dateTimeFormat.Calendar.TwoDigitYearMax.ToString());
+				}
+#endif
 			}
 
 			base.AddAttributesToRender (w);
@@ -266,3 +276,4 @@ namespace System.Web.UI.WebControls {
 
 }
 
+

mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog

@@ -1,3 +1,7 @@
+2006-12-06 Igor Zelmanovich <[email protected]>
+
+	* BaseCompareValidator.cs: fixed: support for type=Date on client side.
+
 2006-12-06 Igor Zelmanovich <[email protected]>
 
 	* TreeView.cs: fixed: support for event validation.

mcs/class/System.Web/resources/WebUIValidation_2.0.js

@@ -225,7 +225,7 @@ function IsValidationGroupMatch(vo, group) {
 /*******************/
 /* type converters */
 
-function ToInteger (s)
+function ToInteger (s, validator)
 {
 	if ((v = parseInt(s, 10)) != s - 0)
 		return null;
@@ -233,12 +233,12 @@ function ToInteger (s)
 		return v;
 }
 
-function ToString (s)
+function ToString (s, validator)
 {
 	return s;
 }
 
-function ToDouble (s)
+function ToDouble (s, validator)
 {
 	if ((v = parseFloat(s)) != s - 0)
 		return null;
@@ -246,18 +246,49 @@ function ToDouble (s)
 		return v;
 }
 
-function ToDate (s)
+function ToDate (s, validator)
 {
-	/* NYI */
-	return null;
+    var m, day, month, year;
+    var yearFirstExp = new RegExp("^\\s*((\\d{4})|(\\d{2}))([-/]|\\. ?)(\\d{1,2})\\4(\\d{1,2})\\s*$");
+    m = s.match(yearFirstExp);
+    if (m != null && (m[2].length == 4 || validator.dateorder == "ymd")) {
+        day = m[6];
+        month = m[5];
+        year = (m[2].length == 4) ? m[2] : GetFullYear(parseInt(m[3], 10), validator.cutoffyear)
+    }
+    else {
+        if (validator.dateorder == "ymd") return null;
+        var yearLastExp = new RegExp("^\\s*(\\d{1,2})([-/]|\\. ?)(\\d{1,2})\\2((\\d{4})|(\\d{2}))\\s*$");
+        m = s.match(yearLastExp);
+        if (m == null) return null;
+        if (validator.dateorder == "mdy") {
+            day = m[3];
+            month = m[1];
+        }
+        else {
+            day = m[1];
+            month = m[3];
+        }
+        year = (m[5].length == 4) ? m[5] : GetFullYear(parseInt(m[6], 10), validator.cutoffyear)
+    }
+    month -= 1;
+    var date = new Date(year, month, day);
+    return (typeof(date) == "object" && year == date.getFullYear() && month == date.getMonth() && day == date.getDate()) ? date.valueOf() : null;
 }
 
-function ToCurrency (s)
+function ToCurrency (s, validator)
 {
 	/* NYI */
 	return null;
 }
 
+function GetFullYear(year, maxYear)
+{
+    var twoDigitMaxYear = maxYear % 100;
+    var centure = maxYear - twoDigitMaxYear;
+    return ((year > twoDigitMaxYear) ? (centure - 100 + year) : (centure + year));
+}
+
 /*******************/
 /* validators	  */
 
@@ -272,13 +303,13 @@ function CompareValidatorEvaluateIsValid (validator)
 	var ctrl_value = ValidatorTrim (ValidatorGetValue (ControlToValidate));
 	var compare = (ControlToCompare != null && ControlToCompare != "") ? ValidatorTrim (ValidatorGetValue (ControlToCompare)) : ValueToCompare;
 
-	var left = Convert (ctrl_value, DataType);
+	var left = Convert (ctrl_value, DataType, validator);
  	if (left == null) {
 		ValidatorFailed (validator);
 		return false;
 	}
       
-	var right = Convert (compare, DataType);
+	var right = compare != null ? Convert (compare, DataType, validator) : null;
 	if (right == null) {
 		ValidatorSucceeded (validator);
 		 return true;
@@ -329,7 +360,7 @@ function RangeValidatorEvaluateIsValid (validator)
 		return true;
 	}
 
-	var val = Convert (ctrl_value, DataType);
+	var val = Convert (ctrl_value, DataType, validator);
 	if (val == null || val < MinimumValue || val > MaximumValue) {
 		ValidatorFailed (validator);
 		return false;
@@ -416,11 +447,11 @@ function CustomValidatorEvaluateIsValid (validator)
 /*********************/
 /* utility functions */
 
-function Convert (s, ty)
+function Convert (s, ty, validator)
 {
 	var cvt = this ["To" + ty];
 	if (typeof (cvt) == 'function')
-		return cvt (s);
+		return cvt (s, validator);
 	else
 		return null;
 }