Fix for milliseconds support

Benjamin Renard
1 parent d7e14b21
Showing 2 changed files with 11 additions and 2 deletions Show diff stats
js/app/views/IntervalUI.js
php/classes/RequestMgr.php
@@ -122,7 +122,7 @@ Ext.define(&#39;amdaUI.IntervalUI&#39;, {
 		// get stop value
 		var stop = this.getStopTime();
 		// if duration computable
-		if (Ext.isDate(start) && Ext.isDate(stop)) {
+		if (stop != null && start != null) {
             if ( stop <= start ) {
                 form.findField('stopDate').markInvalid('Stop Time  must be after Start Time');
             } else {
@@ -235,7 +235,7 @@ Ext.define(&#39;amdaUI.IntervalUI&#39;, {
 				tip: 'Date formatted as YYYY/MM/DD hh:mm:ss.uuu',
 				format: 'Y/m/d H:i:s.u',
 			 	enforceMaxLength: true,
-			 	maxLength: 25,
+			 	maxLength: 23,
 				fieldLabel: fieldText,
 				labelAlign: 'left',
 				labelWidth: 60,
@@ -248,6 +248,11 @@ Ext.define(&#39;amdaUI.IntervalUI&#39;, {
 							Ext.create('Ext.tip.ToolTip', { target: c.getEl(), html: c.tip });
 					},
 					scope : this
+				},
+    				didValueChange: function(newVal, oldVal){
+					// Fix BRE - Override didValueChange function (from https://docs.sencha.com/extjs/4.2.3/extjs-build/docs/source/Field2.html#Ext-form-field-Field-event-change)
+					// to be sure to call change event after each modification (during milliseconds change and some other very specific cases)
+					return true;
 				}
 		};
 	},
@@ -97,6 +97,10 @@ class RequestMgr extends AmdaObjectMgr
 		$obj->durationHour*3600 +
 		$obj->durationMin*60 + $obj->durationSec;
 		$stopTime = gmdate("Y-m-d\TH:i:s", $time+$interval);
+		if (empty($obj->durationMs)) {
+			//compatibility mode -> automatically set durationMs if not exists
+			$obj->durationMs = "000";
+		}
 		$stopTime = $stopTime.'.'.$obj->durationMs;
 		$obj->stopDate = $stopTime;