case-insensitive partial dates

Author: rkrenn

core/src/main/resources/fieldCalculation.js

@@ -66,8 +66,8 @@ var FieldCalculation = FieldCalculation || {};
 	    'customMonthNumberToName' : ['JAN','FEB','MÄR','APR','MAI','JUN','JUL','AUG','SEP','OKT','NOV','DEZ'],
 	    'customDateSeparator' : '-',
 	    'customTimeSeparator' : ':',
-	    'customPartialDatePartRegExp' : /NK|NA|ND/,
-	    'customPartialTimePartRegExp' : /NK|NA|ND/
+	    'customPartialDatePartRegExp' : /NK|NA|ND/i,
+	    'customPartialTimePartRegExp' : /NK|NA|ND/i
 	};
 	localizedMessages['en'] = {
 	    'errorSectionIndex'      : "%s - %s (index %d)%s%s",
@@ -124,8 +124,8 @@ var FieldCalculation = FieldCalculation || {};
 	    'customMonthNumberToName' : ['JAN','FEB','MAR','APR','MAY','JUN','JUL','AUG','SEP','OCT','NOV','DEC'],
 	    'customDateSeparator' : '-',
 	    'customTimeSeparator' : ':',
-	    'customPartialDatePartRegExp' : /NK|NA|ND/,
-	    'customPartialTimePartRegExp' : /NK|NA|ND/
+	    'customPartialDatePartRegExp' : /NK|NA|ND/i,
+	    'customPartialTimePartRegExp' : /NK|NA|ND/i
 	};
 
 	function _cloneJSON(obj) {
@@ -1193,8 +1193,8 @@ var FieldCalculation = FieldCalculation || {};
 			}
 			m = ary[1].replace(regexp,nkMonth);
 			m_nk = true;
-		} else if (ary[1] in customMonthNameToNumberMap) {
-			m = customMonthNameToNumberMap[ary[1]];
+		} else if (ary[1].toUpperCase() in customMonthNameToNumberMap) {
+			m = customMonthNameToNumberMap[ary[1].toUpperCase()];
 		} else {
 		    if (_testFunction(error)) {
 			    error('month not regognized');

web/src/main/webapp/resources/js/fieldCalculation.js

@@ -66,8 +66,8 @@ var FieldCalculation = FieldCalculation || {};
 	    'customMonthNumberToName' : ['JAN','FEB','MÄR','APR','MAI','JUN','JUL','AUG','SEP','OKT','NOV','DEZ'],
 	    'customDateSeparator' : '-',
 	    'customTimeSeparator' : ':',
-	    'customPartialDatePartRegExp' : /NK|NA|ND/,
-	    'customPartialTimePartRegExp' : /NK|NA|ND/
+	    'customPartialDatePartRegExp' : /NK|NA|ND/i,
+	    'customPartialTimePartRegExp' : /NK|NA|ND/i
 	};
 	localizedMessages['en'] = {
 	    'errorSectionIndex'      : "%s - %s (index %d)%s%s",
@@ -124,8 +124,8 @@ var FieldCalculation = FieldCalculation || {};
 	    'customMonthNumberToName' : ['JAN','FEB','MAR','APR','MAY','JUN','JUL','AUG','SEP','OCT','NOV','DEC'],
 	    'customDateSeparator' : '-',
 	    'customTimeSeparator' : ':',
-	    'customPartialDatePartRegExp' : /NK|NA|ND/,
-	    'customPartialTimePartRegExp' : /NK|NA|ND/
+	    'customPartialDatePartRegExp' : /NK|NA|ND/i,
+	    'customPartialTimePartRegExp' : /NK|NA|ND/i
 	};
 
 	function _cloneJSON(obj) {
@@ -1193,8 +1193,8 @@ var FieldCalculation = FieldCalculation || {};
 			}
 			m = ary[1].replace(regexp,nkMonth);
 			m_nk = true;
-		} else if (ary[1] in customMonthNameToNumberMap) {
-			m = customMonthNameToNumberMap[ary[1]];
+		} else if (ary[1].toUpperCase() in customMonthNameToNumberMap) {
+			m = customMonthNameToNumberMap[ary[1].toUpperCase()];
 		} else {
 		    if (_testFunction(error)) {
 			    error('month not regognized');
@@ -2077,7 +2077,7 @@ var FieldCalculation = FieldCalculation || {};
 	function _inputFieldApplyCalculatedValue(variableName, index) {
 		var inputFieldVariable = _getSeriesInputFieldVariable(variableName, index, false);
 		if (inputFieldVariable) {
-			inputFieldVariable.enteredValue = _cloneJSON(inputFieldVariable.value);
+			inputFieldVariable.enteredValue = _cloneJSON( inputFieldVariable.value);
 			inputFieldVariable.delta = !_equalInputFieldVariable(inputFieldVariable);
 			if (FIELD_CALCULATION_DEBUG_LEVEL >= 1) {
 				console.log("apply calculated value " + _debugVarName(inputFieldVariable));
@@ -2367,12 +2367,12 @@ var FieldCalculation = FieldCalculation || {};
 	FieldCalculation.timestampApplyCalculatedValue = timestampApplyCalculatedValue;
 	FieldCalculation.timeApplyCalculatedValue = timeApplyCalculatedValue;
 	FieldCalculation.sketchApplyCalculatedValue = sketchApplyCalculatedValue;
-	
+
 	FieldCalculation.getScriptAjax = _getScriptAjax;
 	FieldCalculation.getScript = _getScriptAjax;
 
 	_exportExpressionUtils(FieldCalculation);
-	
+
 	if (FIELD_CALCULATION_DEBUG_LEVEL >= 1) {
 		console.log("field calculation utilities loaded");
 	}