Decimal support (5.14)

Added date and time pattern input fields  (Fixed #5)

Author: RoelandSalij

src/formatstring/formatstring.xml

@@ -60,6 +60,7 @@
 						<attributeType name="Long"/>
 						<attributeType name="DateTime"/>
 						<attributeType name="Currency"/>
+						<attributeType name="Decimal"/>
 					</attributeTypes>
 				</property>
 				<property key="emptyReplacement" type="translatableString" required="false">
@@ -78,6 +79,16 @@
 						<enumerationValue key="relative">Relative</enumerationValue>
 					</enumerationValues>
 				</property>
+				<property key="datePattern" type="translatableString" required="false">
+					<caption>Date pattern</caption>
+					<category>Behaviour</category>
+					<description>Optional, date pattern to override date part according to dojo/date/locale</description>
+				</property>
+				<property key="timePattern" type="translatableString" required="false">
+					<caption>Time pattern</caption>
+					<category>Behaviour</category>
+					<description>Optional, time pattern to override time part according to dojo/date/locale</description>
+				</property>
 				<property key="renderHTML" type="boolean" defaultValue="false">
 					<caption>Render value as HTML</caption>
 					<category>Behaviour</category>

src/formatstring/widget/formatstring.js

@@ -252,9 +252,17 @@ require([
 
 		_fetchAttr: function (obj, attr, renderAsHTML, i, emptyReplacement, decimalPrecision, groupDigits) {
 			var returnvalue = "";
+			var options = {};
 
 			if (obj.isDate(attr)) {
-				returnvalue = this._parseDate(this.attributeList[i].datetimeformat, obj.get(attr));
+				if(this.attributeList[i].datePattern !== '') {
+					options.datePattern = this.attributeList[i].datePattern;
+				}
+				if(this.attributeList[i].timePattern !== '') {
+					options.timePattern = this.attributeList[i].timePattern;
+				}
+				
+				returnvalue = this._parseDate(this.attributeList[i].datetimeformat, options, obj.get(attr));
 			} else if (obj.isEnum(attr)) {
 				returnvalue = this._checkString(obj.getEnumCaption(attr, obj.get(attr)), renderAsHTML);
 
@@ -324,7 +332,7 @@ require([
 			return string;
 		},
 
-		_parseDate: function (format, value) {
+		_parseDate: function (format, options, value) {
 			var datevalue = value;
 
 			if (value === "")
@@ -333,9 +341,9 @@ require([
 			if (format == 'relative')
 				return this._parseTimeAgo(value);
 			else {
-				datevalue = dojo.date.locale.format(new Date(value), {
-					selector: format
-				});
+				options.selector = format;
+				
+				datevalue = dojo.date.locale.format(new Date(value), options);
 			}
 			return datevalue;
 		},

src/package.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <package xmlns="http://www.mendix.com/package/1.0/">
-	<clientModule name="formatstring" version="3.2" xmlns="http://www.mendix.com/clientModule/1.0/">
+	<clientModule name="formatstring" version="4.0" xmlns="http://www.mendix.com/clientModule/1.0/">
 		<widgetFiles>
 			<widgetFile path="formatstring/formatstring.xml"/>
 		</widgetFiles>