Debug java date format

Author: theus77

Form/DataField/DateFieldType.php

@@ -37,7 +37,7 @@ public static function getIcon(){
 	 */
 	public function getDataValue(DataField &$dataField, array $options){
 
-		$format = DateFieldType::convertJavaDateFormat($options['displayOptions']['displayFormat']);
+		$format = DateFieldType::convertJavascriptDateFormat($options['displayOptions']['displayFormat']);
 
 		$dates = [];
 		if(null !== $dataField->getRawData()){
@@ -238,6 +238,22 @@ public static function convertJavaDateFormat($format){
 		return $dateFormat;
 	}
 
+
+	public static function convertJavascriptDateFormat($format){
+		$dateFormat = $format;
+		//see https://bootstrap-datepicker.readthedocs.io/en/latest/options.html#format	
+		$dateFormat = str_replace('yyyy', 'Y', $dateFormat);
+		$dateFormat = str_replace('yy', 'y', $dateFormat);
+		$dateFormat = str_replace('DD', 'l', $dateFormat);
+		$dateFormat = str_replace('D', 'D', $dateFormat);
+		$dateFormat = str_replace('dd', 'd', $dateFormat);
+		// 		$dateFormat = str_replace('d', 't', $dateFormat);
+		$dateFormat = str_replace('mm', 'm', $dateFormat);
+		// 		$dateFormat = str_replace('m', 'n', $dateFormat);
+		$dateFormat = str_replace('MM', 'F', $dateFormat);
+		$dateFormat = str_replace('M', 'M', $dateFormat);
+		return $dateFormat;
+	}
 
 	/**
 	 *

Form/DataField/DateRangeFieldType.php

@@ -45,7 +45,7 @@ public function getDataValue(DataField &$dataField, array $options){
 			$dateTo = \DateTime::createFromFormat(\DateTime::ISO8601, $temp[$options['mappingOptions']['toDateMachineName']]);
 
 			if($dateFrom && $dateTo){
-				$displayformat = DateRangeFieldType::convertJavascriptDateFormat($options['displayOptions']['locale']['format']);
+				$displayformat = DateRangeFieldType::convertJavascriptDateRangeFormat($options['displayOptions']['locale']['format']);
 				return $dateFrom->format($displayformat) . ' - ' . $dateTo->format($displayformat);
 			}
 		}
@@ -58,7 +58,7 @@ public function getDataValue(DataField &$dataField, array $options){
 	 *
 	 */
 	public function setDataValue($input, DataField &$dataField, array $options){
-		$format = DateRangeFieldType::convertJavascriptDateFormat($options['displayOptions']['locale']['format']);
+		$format = DateRangeFieldType::convertJavascriptDateRangeFormat($options['displayOptions']['locale']['format']);
 
 		$inputs = explode(' - ', $input);
 
@@ -184,12 +184,13 @@ public function getDefaultOptions($name) {
 
 
 
-	public static function convertJavascriptDateFormat($format){
+	public static function convertJavascriptDateRangeFormat($format){
 		$dateFormat = $format;
-		//TODO: naive approch....find a way to comvert java date format into php
+		//see http://www.daterangepicker.com/#examples
 		$dateFormat = str_replace('DD', 'd', $dateFormat);
 		$dateFormat = str_replace('MM', 'm', $dateFormat);
 		$dateFormat = str_replace('YYYY', 'Y', $dateFormat);
+		$dateFormat = str_replace('YY', 'y', $dateFormat);
 		$dateFormat = str_replace('hh', 'h', $dateFormat);
 		$dateFormat = str_replace('HH', 'H', $dateFormat);
 		$dateFormat = str_replace('mm', 'i', $dateFormat);

Resources/views/macros/data-field-type.html.twig

@@ -566,8 +566,7 @@
 			<ul>
 				{% for value in dataField.dateValues %}
 					<li>
-						{{ value|date(dataField.fieldType.displayOptions.displayFormat|convertJavaDateFormat) }}
-						({{ value|date(dataField.fieldType.mappingOptions.format|convertJavaDateFormat) }})
+						{{ value|date(dataField.fieldType.displayOptions.displayFormat|convertJavascriptDateFormat) }}
 					</li>
 				{% endfor %}
 			</ul>
@@ -600,13 +599,13 @@
 				{% if dateFrom %}
 					<li>
 						<b>From </b>
-						{{ dateFrom|date(dataField.fieldType.displayOptions.locale.format|convertJavascriptDateFormat) }}
+						{{ dateFrom|date(dataField.fieldType.displayOptions.locale.format|convertJavascriptDateRangeFormat) }}
 					</li>	
 				{% endif %}		
 				{% if dateTo %}
 					<li>
 						<b>To </b>
-						{{ dateTo|date(dataField.fieldType.displayOptions.locale.format|convertJavascriptDateFormat) }}
+						{{ dateTo|date(dataField.fieldType.displayOptions.locale.format|convertJavascriptDateRangeFormat) }}
 					</li>	
 				{% endif %}		
 				{% if dateFrom and dateTo %}

Twig/AppExtension.php

@@ -67,6 +67,7 @@ public function getFilters()
 				new \Twig_SimpleFilter('md5', array($this, 'md5')),
 				new \Twig_SimpleFilter('convertJavaDateFormat', array($this, 'convertJavaDateFormat')),
 				new \Twig_SimpleFilter('convertJavascriptDateFormat', array($this, 'convertJavascriptDateFormat')),
+				new \Twig_SimpleFilter('convertJavascriptDateRangeFormat', array($this, 'convertJavascriptDateRangeFormat')),
 				new \Twig_SimpleFilter('getTimeFieldTimeFormat', array($this, 'getTimeFieldTimeFormat')),
 				new \Twig_SimpleFilter('soapRequest', array($this, 'soapRequest')),
 				new \Twig_SimpleFilter('luma', array($this, 'relativeluminance')),
@@ -413,12 +414,17 @@ public function dump($object) {
 
 	public function convertJavaDateFormat($format)
 	{
-    	return DateFieldType::convertJavaDateFormat($format);
+		return DateFieldType::convertJavaDateFormat($format);
 	}
 
 	public function convertJavascriptDateFormat($format)
 	{
-    	return DateRangeFieldType::convertJavascriptDateFormat($format);
+    	return DateFieldType::convertJavascriptDateFormat($format);
+	}
+
+	public function convertJavascriptDateRangeFormat($format)
+	{
+    	return DateRangeFieldType::convertJavascriptDateRangeFormat($format);
 	}
 
 	public function getTimeFieldTimeFormat($options)