Properly display the date value (and not the current date) in the export preview.

git-svn-id: http://svn.code.sf.net/p/itop/code/trunk@4116 a333f486-631f-4898-b8df-5754b55c2be0

core/datetimeformat.class.inc.php

@@ -309,6 +309,7 @@ function PHPDateTimeFormatToMomentFormat(sPHPFormat)
 
 function DateFormatFromPHP(sSQLDate, sPHPFormat)
 {
+	if (sSQLDate === '') return '';
 	var sPHPDateFormat = PHPDateTimeFormatToSubFormat(sPHPFormat, 'Yydjmn');
 	var sMomentFormat = PHPDateTimeFormatToMomentFormat(sPHPDateFormat);	
 	return moment(sSQLDate).format(sMomentFormat);
@@ -316,6 +317,7 @@ function DateFormatFromPHP(sSQLDate, sPHPFormat)
 
 function DateTimeFormatFromPHP(sSQLDate, sPHPFormat)
 {
+	if (sSQLDate === '') return '';
 	var sMomentFormat = PHPDateTimeFormatToMomentFormat(sPHPFormat);	
 	return moment(sSQLDate).format(sMomentFormat);
 }		

webservices/export-v2.php

@@ -204,12 +204,12 @@ function FormatDatesInPreview(sRadioSelector, sPreviewSelector)
 		sPHPFormat = $('#'+sRadioSelector+'_custom_date_time_format').val();
 	}
 	$('#interactive_fields_'+sPreviewSelector+' .user-formatted-date-time').each(function() {
-		var val = $('this').attr('data-date');
+		var val = $(this).attr('data-date');
 		var sDisplay = DateTimeFormatFromPHP(val, sPHPFormat);
 		$(this).html(sDisplay);
 	});
 	$('#interactive_fields_'+sPreviewSelector+' .user-formatted-date').each(function() {
-		var val = $('this').attr('data-date');
+		var val = $(this).attr('data-date');
 		var sDisplay = DateFormatFromPHP(val, sPHPFormat);
 		$(this).html(sDisplay);
 	});