Merge branch 'develop' of https://gitlab.irap.omp.eu/CDPP/AMDA_IHM into develop

Erdogan Furkan
2 parents 3ec6bc73 e3824d6e
Showing 29 changed files with 254 additions and 148 deletions Show diff stats
js/app/controllers/PlotModule.js
js/app/models/AmdaTimeObject.js
js/app/models/Catalog.js
js/app/models/Download.js
js/app/models/DownloadNode.js
js/app/models/InteractiveNode.js
js/app/models/PlotObjects/MultiplotRequestObject.js
js/app/models/PlotObjects/PlotRequestObject.js
js/app/models/Search.js
js/app/models/Statistic.js
js/app/models/TimeTable.js
js/app/views/CatalogUI.js
js/app/views/IntervalUI.js
js/app/views/PlotComponents/PlotExtendShiftPlug.js
js/app/views/PlotComponents/PlotSauvaudForm.js
js/app/views/PlotComponents/PlotTabContent.js
js/app/views/PlotComponents/PlotZoomPlug.js
js/app/views/PlotTabResultUI.js
js/app/views/PlotUI.js
js/app/views/StatisticsUI.js
@@ -214,6 +214,21 @@ Ext.define(&#39;amdaDesktop.PlotModule&#39;, {
 	    if (!this.plotResultWindowsManager.get(winResultId)) return null;
 	    return this.plotResultWindowsManager.get(winResultId);	    
     },
+    
+    setTimeInterval : function(timeObj){
+         var me = this;
+        var desktop = this.app.getDesktop();
+        var win = desktop.getWindow(this.id);
+        if (win) {
+            me.getUiContent().setTimeFromData(timeObj);
+            win.show();
+        }
+        else {
+            this.createWindow(function () {
+                me.getUiContent().setTimeFromData(timeObj);
+            });
+        }
+    },
     addParameter : function(paramNode) {
         var me = this;
@@ -324,6 +339,7 @@ Ext.define(&#39;amdaDesktop.PlotModule&#39;, {
         downloadValues.durationHour = plotValues.durationHour;
         downloadValues.durationMin = plotValues.durationMin;
         downloadValues.durationSec = plotValues.durationSec;
+        downloadValues.durationMs = plotValues.durationMs;
         if (plotValues.timeTables)
             downloadValues.timeTables = plotValues.timeTables;
         downloadValues.list = [];
@@ -37,26 +37,31 @@ Ext.define(&#39;amdaModel.AmdaTimeObject&#39;, {
         { name: 'folderId', type: 'string'}, 
         { name: 'processId', type: 'string'},
         { name: 'timesrc', type: 'string'/*, defaultValue: amdaModel.AmdaTimeObject.inputTimeSrc[1] /*'Interval'*/ },
-        { name: 'startDate', type: 'date', defaultValue:Ext.Date.add(Ext.Date.clearTime(new Date()),Ext.Date.DAY,-1),
+        { 
+            name: 'startDate', 
+            type: 'date', 
+            defaultValue:Ext.Date.add(Ext.Date.clearTime(new Date()),Ext.Date.DAY,-1),
             convert: function(value,rec) {
                 if (!Ext.isDate(value)) {
-                    var valueString = new String(value);
-                    var date = new Date(valueString.replace(/\-/g,'\/').replace(/[T|Z]/g,' '));
+                    var valueString = new String(value).replaceAll('\/','\-');
+                    var date = new Date(valueString);
                         return date;
                 }
                 return value;
             }
         },
         { 
-            name: 'stopDate', type: 'date', defaultValue: Ext.Date.clearTime (new Date()), persist: false, 
-            convert: function(value,rec) {
-                if (!Ext.isDate(value)){
-                    var valueString = new String(value);
-                    var date = new Date(valueString.replace(/\-/g,'\/').replace(/[T|Z]/g,' '));
-                    return date;
+            name: 'stopDate', 
+            type: 'date', 
+            defaultValue: Ext.Date.clearTime (new Date()), persist: false, 
+           convert: function(value,rec) {
+                if (!Ext.isDate(value)) {
+                    var valueString = new String(value).replaceAll('\/','\-');
+                    var date = new Date(valueString);
+                        return date;
                 }
                 return value;
-            } 
+            }
         }, 
         { 
             name: 'durationDay', type: 'int',  
@@ -90,7 +95,15 @@ Ext.define(&#39;amdaModel.AmdaTimeObject&#39;, {
                 return Ext.String.leftPad(Math.floor(diffS), 2, '0');      
             }
-        }, 
+        },
+          { 
+            name: 'durationMs', type: 'int',  
+            convert: function(value, rec) {
+                var diffS = (rec.get('stopDate') - rec.get('startDate'))%1000;
+                
+                return Ext.String.leftPad(Math.floor(diffS), 3, '0');      
+            }
+        },
         { name: 'timeTables', defaultValue: null }    // array of TTobject
     ]
 });
@@ -37,7 +37,7 @@ Ext.define(&#39;amdaModel.Catalog&#39;, {
 //     	}
     	values.objName = this.get('objName');
     	values.objFormat = this.get('objFormat');
-        values.folderId = this.get('folderId');
+                    values.folderId = this.get('folderId');
     	values.nbIntervals = this.get('nbIntervals');
     	values.cacheToken = this.get('cacheToken');
    	values.parameters = this.get('parameters');
@@ -163,12 +163,13 @@ Ext.define(&#39;amdaModel.Download&#39;, {
                     }
                 });
             } else {
-                myValues.startDate = this.get('startDate');
-                myValues.stopDate = this.get('stopDate');
+                myValues.startDate = Ext.Date.format(this.get('startDate'), 'Y-m-d\\TH:i:s.u');	
+                myValues.stopDate =  Ext.Date.format(this.get('stopDate'), 'Y-m-d\\TH:i:s.u');	
                 myValues.durationDay = this.get('durationDay');
                 myValues.durationHour = this.get('durationHour');
                 myValues.durationMin = this.get('durationMin');
                 myValues.durationSec = this.get('durationSec');
+                myValues.durationMs = this.get('durationMs');
             }
             // if there's at least one parameter
@@ -73,12 +73,13 @@ Ext.define(&#39;amdaModel.DownloadNode&#39;, {
             });            
         }
         else {
-            myValues.startDate = obj.get('startDate');
-            myValues.stopDate = obj.get('stopDate');
+            myValues.startDate =  Ext.Date.format(obj.get('startDate'), 'Y-m-d\\TH:i:s.u');	
+            myValues.stopDate =  Ext.Date.format(obj.get('startDate'), 'Y-m-d\\TH:i:s.u');
             myValues.durationDay = obj.get('durationDay');
             myValues.durationHour = obj.get('durationHour');
             myValues.durationMin = obj.get('durationMin');
             myValues.durationSec = obj.get('durationSec');
+            myValues.durationMs = obj.get('durationMs');
         }
         myValues.name = obj.get('name');
@@ -476,14 +476,14 @@ Ext.define(&#39;amdaModel.InteractiveNode&#39;, {
 		var startDate =  new Date(startString.replace(/\-/g,'\/').replace(/[T|Z]/g,' '));
 		var stopDate =  new Date(stopString.replace(/\-/g,'\/').replace(/[T|Z]/g,' '));
-
+                                                
 		if (stopDate -  startDate  > 86400000 ) {
 			var startTime = Ext.Date.add(stopDate, Ext.Date.DAY, -1);
 			// var timeObj = {start: Ext.Date.format(startTime, 'Y/m/d H:i:s'), stop: Ext.Date.format(stopDate, 'Y/m/d H:i:s')};
-			var timeObj = {start: Ext.Date.format(startTime, 'Y/m/d'), stop: Ext.Date.format(stopDate, 'Y/m/d')};
+			var timeObj = {start: Ext.Date.format(startTime, 'Y/m/d H:i:s.u'), stop: Ext.Date.format(stopDate, 'Y/m/d H:i:s.u')};
 		}
 		else {
-			var timeObj = {start:  node.get('globalStart'), stop:  node.get('globalStop')};
+			var timeObj = {start: Ext.Date.format(startTime, 'Y/m/d H:i:s.u'), stop: Ext.Date.format(stopDate, 'Y/m/d H:i:s.u')};
 		}
 		return timeObj;
 	},
@@ -126,12 +126,13 @@ Ext.define(&#39;amdaPlotObj.MultiplotRequestObject&#39;, {
                 }
             });
         } else {
-            requestValues['startDate'] = this.get('startDate');
-            requestValues['stopDate'] = this.get('stopDate');
+            requestValues['startDate'] =  Ext.Date.format(this.get('startDate'), 'Y-m-d\\TH:i:s.u');	
+            requestValues['stopDate'] =  Ext.Date.format(this.get('stopDate'), 'Y-m-d\\TH:i:s.u');	
             requestValues['durationDay'] = this.get('durationDay');
             requestValues['durationHour'] = this.get('durationHour');
             requestValues['durationMin'] = this.get('durationMin');
             requestValues['durationSec'] = this.get('durationSec');
+            requestValues['durationMs'] = this.get('durationMs');
         }
         requestValues['plots'] = [];
@@ -288,12 +288,13 @@ Ext.define(&#39;amdaPlotObj.PlotRequestObject&#39;, {
             	}
             });            
         } else {
-        	requestValues['startDate'] = this.get('startDate');	
-            requestValues['stopDate'] = this.get('stopDate'); 
+            requestValues['startDate'] = Ext.Date.format(this.get('startDate'), 'Y-m-d\\TH:i:s.u');	
+            requestValues['stopDate'] = Ext.Date.format(this.get('stopDate'), 'Y-m-d\\TH:i:s.u');	
             requestValues['durationDay'] = this.get('durationDay');
             requestValues['durationHour'] = this.get('durationHour');
             requestValues['durationMin'] = this.get('durationMin');
             requestValues['durationSec'] = this.get('durationSec');
+            requestValues['durationMs'] = this.get('durationMs');
         }
     	requestValues['page-layout-type'] = this.get('page-layout-type');
@@ -65,12 +65,13 @@ Ext.define(&#39;amdaModel.Search&#39;, {
 	       }                
             });            
         } else {
-            myValues.startDate = this.get('startDate');
-            myValues.stopDate = this.get('stopDate');
+            myValues.startDate =  Ext.Date.format(this.get('startDate'), 'Y-m-d\\TH:i:s.u');	
+            myValues.stopDate =  Ext.Date.format(this.get('stopDate'), 'Y-m-d\\TH:i:s.u');
             myValues.durationDay = this.get('durationDay');
             myValues.durationHour = this.get('durationHour');
             myValues.durationMin = this.get('durationMin');
             myValues.durationSec = this.get('durationSec');
+            myValues.durationMs = this.get('durationMs');
         }
         myValues.leaf = true;
@@ -104,12 +104,13 @@ Ext.define(&#39;amdaModel.Statistic&#39;, {
 			});            
 		} else 
 		{
-			values.startDate = this.get('startDate');
-			values.stopDate = this.get('stopDate');
+			values.startDate =  Ext.Date.format(this.get('startDate'), 'Y-m-d\\TH:i:s.u');	
+			values.stopDate =  Ext.Date.format(this.get('stopDate'), 'Y-m-d\\TH:i:s.u');	
 			values.durationDay = this.get('durationDay');
 			values.durationHour = this.get('durationHour');
 			values.durationMin = this.get('durationMin');
 			values.durationSec = this.get('durationSec');
+                                                            values.durationMs = this.get('durationMs');
 		} 
 		values.leaf = true;
@@ -29,19 +29,15 @@ Ext.define(&#39;amdaModel.Interval&#39;, {
         { name: 'start', type : 'date', defaultValue : new Date(),
 	  convert: function(value,rec) {
 		   if (!Ext.isDate(value)){
-		    var valueString = new String(value);
-		    var date = new Date(valueString.replace(/\-/g,'\/').replace(/[T|Z]/g,' '));
-		      return date;
+                                                return new Date(value);
 		   }
 		   return value;
 		   }
 	},
         { name: 'stop', type : 'date', defaultValue : new Date(),
 	  convert: function(value,rec) {
-		   if (!Ext.isDate(value)){
-		    var valueString = new String(value);
-		    var date = new Date(valueString.replace(/\-/g,'\/').replace(/[T|Z]/g,' '));
-		      return date;
+		     if (!Ext.isDate(value)){
+                                                return new Date(value);
 		   }
 		   return value;
 		   }
@@ -179,8 +179,8 @@ Ext.define(&#39;amdaUI.CatalogUI&#39;, {
                 return;
             }
             Ext.Array.each(result.intervals, function (item, index) {
-             starts[index] = (item.start);
-             stops[index] = (item.stop);
+             starts[index] = Ext.Date.format(item.start, 'Y-m-d\\TH:i:s.u');
+             stops[index] = Ext.Date.format(item.start, 'Y-m-d\\TH:i:s.u');
          });
          if(starts.length !== 0 || stops.length !== 0) {
@@ -205,7 +205,7 @@ Ext.define(&#39;amdaUI.CatalogUI&#39;, {
         var timeTabNode = Ext.create('amdaModel.TimeTableNode', {leaf: true});
         ttObj.set('relatedCatalogId', catId)
         creatDate = new Date(this.object.get('created'));
-        date = Ext.Date.format(creatDate, 'Y-m-d\\TH:i:s');
+        date = Ext.Date.format(creatDate, 'Y-m-d\\TH:i:s.u');
         descr = 'Generated by CDPP/Amda Catalog Module \n' + 'From Catalog: ' + this.object.get('name') + '\nOn: ' + date + '\n';
         ttObj.set('description', descr + this.object.get('description'));
         ttObj.set('contact', this.object.get('contact'));
@@ -271,11 +271,10 @@ Ext.define(&#39;amdaUI.CatalogUI&#39;, {
                 {
                     name: 'start',
                     type: 'date',
-                    dateFormat: 'Y-m-d\\TH:i:s',
+                    dateFormat: 'Y-m-d\\TH:i:s.u',
                     convert: function (value, rec) {
                         if (!Ext.isDate(value)) {
-                            var valueString = new String(value);
-                            return new Date(valueString.replace(/\-/g, '\/').replace(/[T|Z]/g, ' '));
+                            return new Date(value);
                         }
                         return value;
                     }
@@ -283,11 +282,10 @@ Ext.define(&#39;amdaUI.CatalogUI&#39;, {
                 {
                     name: 'stop',
                     type: 'date',
-                    dateFormat: 'Y-m-d\\TH:i:s',
+                    dateFormat: 'Y-m-d\\TH:i:s.u',
                     convert: function (value, rec) {
                         if (!Ext.isDate(value)) {
-                            var valueString = new String(value);
-                            return new Date(valueString.replace(/\-/g, '\/').replace(/[T|Z]/g, ' '));
+                            return new Date(value);
                         }
                         return value;
                     }
@@ -365,40 +363,36 @@ Ext.define(&#39;amdaUI.CatalogUI&#39;, {
                     }
                 },
                 {
-                    xtype: 'datecolumn',
-                    text: 'Start Time',
-                    format: 'Y-m-d\\TH:i:s',
-                    sortable: true,
-                    dataIndex: 'start',
-                    width: 120,
-                    minWidth: 50,
-                    menuDisabled: false,
-                    editor: {
-                        xtype: 'datefield',
-                        allowBlank: false,
-                        hideTrigger: true,
-                        format: 'Y-m-d\\TH:i:s'
-                    },
-                    filter: {type: 'date', dateFormat: 'Y-m-d'}
+                    header: 'Start Time', dataIndex: 'start', width: 120,
+                    editor: {xtype: 'datefield', allowBlank: false, hideTrigger: true, format: 'Y-m-d\\TH:i:s.u'},
+                    renderer: function (value) {
+                        if (value != null) {
+                            if (Ext.isDate(value)) {
+                                return Ext.Date.format(value, 'Y-m-d\\TH:i:s.u');
+                            } else {
+                                return Ext.Date.format(new Date(value), 'Y-m-d\\TH:i:s.u');
+                            }
+                        } else {
+                            return value;
+                        }
+                    }
                 },
                 {
-                    xtype: 'datecolumn',
-                    text: 'Stop Time',
-                    format: 'Y-m-d\\TH:i:s',
-                    sortable: true,
-                    dataIndex: 'stop',
-                    width: 120,
-                    minWidth: 50,
-                    menuDisabled: false,
-                    editor: {
-                        xtype: 'datefield',
-                        allowBlank: false,
-                        hideTrigger: true,
-                        format: 'Y-m-d\\TH:i:s'
-                    },
-                    filter: {type: 'date', dateFormat: 'Y-m-d'}
+                    header: 'Stop Time', dataIndex: 'stop', width: 120,
+                    editor: {xtype: 'datefield', allowBlank: false, hideTrigger: true, format: 'Y-m-d\\TH:i:s.u'},
+                    renderer: function (value) {
+                        if (value != null) {
+                            if (Ext.isDate(value)) {
+                                return Ext.Date.format(value, 'Y-m-d\\TH:i:s.u');
+                            } else {
+                                return Ext.Date.format(new Date(value), 'Y-m-d\\TH:i:s.u');
+                            }
+                        } else {
+                            return value;
+                        }
+                    }
                 },
-                            {
+                    {
                     xtype: 'gridcolumn',
                     text: 'Duration (day)',
                     sortable: true,
@@ -506,7 +500,7 @@ Ext.define(&#39;amdaUI.CatalogUI&#39;, {
                     case 1: //dateTime
                         field = Ext.apply({}, field, {
                             type: 'date',
-                            dateFormat: 'Y-m-d\\TH:i:s',
+                            dateFormat: 'Y-m-d\\TH:i:s.u',
                             convert: function (value, rec) {
                                 if (!Ext.isDate(value)) {
                                     var valueString = new String(value);
@@ -523,7 +517,7 @@ Ext.define(&#39;amdaUI.CatalogUI&#39;, {
                                 xtype: 'datefield',
                                 allowBlank: false,
                                 hideTrigger: true,
-                                format: 'Y-m-d\\TH:i:s'
+                                format: 'Y-m-d\\TH:i:s.u'
                             },
                             filter: {type: 'date', dateFormat: 'Y-m-d'}
                         });
@@ -894,7 +888,10 @@ Ext.define(&#39;amdaUI.CatalogUI&#39;, {
                             'isCatalog': true,
                             'data': {}
                         };
-                        obj['data'][activeColumn.dataIndex] = value;
+                        if(activeColumn.dataIndex == "start" ||  activeColumn.dataIndex == "stop")
+                                obj['data'][activeColumn.dataIndex] = Ext.Date.format(value, 'Y-m-d\\TH:i:s.u');
+                        else
+                                obj['data'][activeColumn.dataIndex] = value;
                         //Interval is modified on the server side
                         me.editing = true;
@@ -1065,10 +1062,10 @@ Ext.define(&#39;amdaUI.CatalogUI&#39;, {
                             items :[{
                                             fieldLabel: 'Start Time',
                                             name: 'surveyStart',
- 	                        emptyText: 'YYYY/MM/DDThh:mm:ss',
-                                            format: 'Y-m-d\\TH:i:s',
+ 	                        emptyText: 'YYYY/MM/DDThh:mm:ss.fff',
+                                            format: 'Y-m-d\\TH:i:s.u',
 		    enforceMaxLength: true,
-                                	    maxLength: 19,
+                                	    maxLength: 25,
                                             labelWidth: 60,
 		    labelAlign: 'left',
                                         listeners: {
@@ -1080,11 +1077,11 @@ Ext.define(&#39;amdaUI.CatalogUI&#39;, {
                                         }, {
                                             fieldLabel: 'Stop Time',
                                             name: 'surveyStop',
-		    emptyText: 'YYYY/MM/DDThh:mm:ss',
-                                            format: 'Y-m-d\\TH:i:s',
+		    emptyText: 'YYYY/MM/DDThh:mm:ss.fff',
+                                            format: 'Y-m-d\\TH:i:s.u',
                                             labelAlign: 'left',
                                             enforceMaxLength: true,
-                                	    maxLength: 19,
+                                	    maxLength: 25,
                                             labelWidth: 60,
                                             align: 'left',
                                             listeners: {
@@ -122,7 +122,7 @@ Ext.define(&#39;amdaUI.IntervalUI&#39;, {
 		// get stop value
 		var stop = this.getStopTime();
 		// if duration computable
-		if (stop != null && start != null) {
+		if (Ext.isDate(start) && Ext.isDate(stop)) {
             if ( stop <= start ) {
                 form.findField('stopDate').markInvalid('Stop Time  must be after Start Time');
             } else {
@@ -140,6 +140,7 @@ Ext.define(&#39;amdaUI.IntervalUI&#39;, {
 			form.findField('durationHour').setValue(Math.floor(diff/3600000 % 24));
 			form.findField('durationMin').setValue(Math.floor(diff/60000 % 60));
 			form.findField('durationSec').setValue(Math.floor(diff/1000 % 60));
+                                                            form.findField('durationMs').setValue(Math.floor(diff%1000 ));
 			if (durationDays > this.durationLimit) {
 					form.findField('durationDay').markInvalid('Maximum interval is ' + this.durationLimit + ' days!');
@@ -149,6 +150,7 @@ Ext.define(&#39;amdaUI.IntervalUI&#39;, {
 			form.findField('durationHour').setValue('');
 			form.findField('durationMin').setValue('');
 			form.findField('durationSec').setValue('');
+                                                            form.findField('durationMs').setValue('');
 		}
 	},
@@ -158,7 +160,8 @@ Ext.define(&#39;amdaUI.IntervalUI&#39;, {
 					form.findField('durationDay').isValid() &&
 					form.findField('durationHour').isValid() &&
 					form.findField('durationMin').isValid() &&
-					form.findField('durationSec').isValid()
+					form.findField('durationSec').isValid() &&
+                                                                                                    form.findField('durationMs').isValid()
 		);
 	},
@@ -185,7 +188,8 @@ Ext.define(&#39;amdaUI.IntervalUI&#39;, {
 		var h = form.findField('durationHour').getValue();
 		var m = form.findField('durationMin').getValue();
 		var s = form.findField('durationSec').getValue();
-		var duration = (d?d:0)*86400 + (h?h:0)*3600 + (m?m:0)*60 + (s?s:0)
+                                        var ms = form.findField('durationMs').getValue();
+		var duration = (d?d:0)*86400 + (h?h:0)*3600 + (m?m:0)*60 + (s?s:0) + (ms?ms:0)/1000;
 		var stop = Ext.Date.add(start, Ext.Date.SECOND, duration);
 		if (Ext.Date.isDST(stop) && !Ext.Date.isDST(start))
@@ -226,12 +230,12 @@ Ext.define(&#39;amdaUI.IntervalUI&#39;, {
 				xtype: 'datefield',
 			//	margin : '10 0 5 5', // (top, right, bottom, left).
 				name: fieldName, 
-			//	width : 220,
-				emptyText: 'YYYY/MM/DD hh:mm:ss',
-				tip: 'Date formatted as YYYY/MM/DD hh:mm:ss',
-				format: 'Y/m/d H:i:s',
+				width : 230,
+				emptyText: 'YYYY/MM/DD hh:mm:ss.uuu',
+				tip: 'Date formatted as YYYY/MM/DD hh:mm:ss.uuu',
+				format: 'Y/m/d H:i:s.u',
 			 	enforceMaxLength: true,
-			 	maxLength: 19,
+			 	maxLength: 25,
 				fieldLabel: fieldText,
 				labelAlign: 'left',
 				labelWidth: 60,
@@ -296,7 +300,8 @@ Ext.define(&#39;amdaUI.IntervalUI&#39;, {
 					{ name: 'durationDay',  emptyText: 'Days', tip: 'Days',    maxValue: 73000, maxLength: 5, fieldLabel: 'Duration', labelWidth: 60, width: 110},
 					{ name: 'durationHour', emptyText: 'Hrs',  tip: 'Hours',   maxValue: 23},
 					{ name: 'durationMin',  emptyText: 'Mins', tip: 'Minutes', maxValue: 59},
-					{ name: 'durationSec',  emptyText: 'Secs', tip: 'Seconds', maxValue: 59}
+					{ name: 'durationSec',  emptyText: 'Secs', tip: 'Seconds', maxValue: 59},
+                                                                                                    { name: 'durationMs',  emptyText: 'MS', tip: 'Milliseconds', maxLength: 3, maxValue: 999}
 			]
 		};
 	},
@@ -22,6 +22,8 @@ Ext.define(&#39;amdaPlotComp.PlotExtendShiftPlug&#39;, {
 	win : null,
 	form : null,
 	interactiveId : '',
+                    actionDone :'',
+                    durationDone: 0,
 	constructor: function(config) {            
 		Ext.apply(this, config);            
@@ -44,7 +46,7 @@ Ext.define(&#39;amdaPlotComp.PlotExtendShiftPlug&#39;, {
     	{
     		this.win = new Ext.Window({                
     			id: 'plot-extendshift-win-' + this.hostCmp.ownerCt.getId(), // Plot window ID                                                   
-    			width: 230,
+    			width: 275,
     			height: 120,       
     			x: 0, y: 0,                
     			baseCls:'x-panel',                
@@ -111,11 +113,23 @@ Ext.define(&#39;amdaPlotComp.PlotExtendShiftPlug&#39;, {
     	var durationUnitField = this.form.getForm().findField('durationUnit');
     	var duration = this.toSec(durationField.getValue(), durationUnitField.getValue());
     	if (duration) {
-    		this.hostCmp.callInteractivePlot({'action' : actionType, 'interactiveId' : this.interactiveId, 'duration' : duration});	                								   
+                                        this.durationDone = duration;
+                                        this.actionDone = actionType;
+    		this.hostCmp.callInteractivePlot({'action' : actionType, 'interactiveId' : this.interactiveId, 'duration' : duration});
+                                        Ext.getCmp('undo-PlotExtendShiftPlug').enable(); 
     	}	
     	else
     		myDesktopApp.errorMsg('No duration defined');	
     },
+    undoAction : function(){
+        if( this.durationDone){
+            this.hostCmp.callInteractivePlot({'action' : this.actionDone , 'interactiveId' : this.interactiveId, 'duration' : -this.durationDone});
+             Ext.getCmp('undo-PlotExtendShiftPlug').disable(); 
+        }
+        else
+    		myDesktopApp.errorMsg('No duration defined');
+        
+    },
 /**
  *        Main form
@@ -123,7 +137,7 @@ Ext.define(&#39;amdaPlotComp.PlotExtendShiftPlug&#39;, {
     getFormConfig: function(){
     	this.form = new Ext.form.FormPanel( {	    	
     		frame: true,		
-    		width: 230,		
+    		width: 275,		
     		height: 120,	    	
     		layout: {
 			    type: 'vbox',
@@ -171,6 +185,7 @@ Ext.define(&#39;amdaPlotComp.PlotExtendShiftPlug&#39;, {
     		        }
     		],
     		buttons: [
+                    
     		          {
     		        	  text: 'Extend/Shrink',
     		        	  scope : this,
@@ -178,13 +193,23 @@ Ext.define(&#39;amdaPlotComp.PlotExtendShiftPlug&#39;, {
     		        		  this.executeAction('extend');
     		        	  }
     		          },
-    		          '->',
+                                                '-',
     		          {
     		        	  text: 'Shift',
     		        	  scope : this,
     		        	  handler: function(bt,event) {
     		        		  this.executeAction('shift');
     		        	  }
+    		          },
+                                                '-',
+                                                    {
+    		        	  text: 'Undo',
+                                                             id:'undo-PlotExtendShiftPlug',
+    		        	  scope : this,
+                                                              disabled : true,
+    		        	  handler: function(bt,event) {
+    		        		  this.undoAction();
+    		        	  }
     		          }
     		]
     	});   
@@ -49,7 +49,7 @@ Ext.define(&#39;amdaPlotComp.PlotSauvaudForm&#39;, {
                                               { 'key': 0, 'value': 'dim1' },
 		      { 'key': 1, 'value': 'dim2' }, 
                                             ];
-            const dimField = this.addStandardCombo('right_dimension', 'Right Dim', dataStore , function (name, value, oldValue) {
+            const dimField = this.addStandardCombo('right_dimension', 'Switch Dimension', dataStore , function (name, value, oldValue) {
 				if (ref.object.get('right_dim') != value) {
 					ref.object.set('right_dim', value);
 				}
@@ -39,6 +39,7 @@ Ext.define(&#39;amdaPlotComp.PlotTabContent&#39;, {
     setTime : function(startDate, stopDate) {
         this.timeSelector.intervalSel.setInterval(startDate, stopDate);
+        this.timeSelector.setActiveTimeSource(amdaModel.AmdaTimeObject.inputTimeSrc[1]);
     },
     getTimeSelector: function(){
@@ -193,7 +193,13 @@ Ext.define(&#39;amdaPlotComp.PlotZoomPlug&#39;, {
     this.hostCmp.panelImage.resetZoom();
   },
-
+  setTimePlot : function(){
+    var timeObj = new Object();
+    timeObj.start = this.form.getForm().findField('zoom-min-time').getValue();
+    timeObj.stop = this.form.getForm().findField('zoom-max-time').getValue();
+    var plotModule = myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.plot.id);
+    plotModule.setTimeInterval(timeObj);
+    },
   /**
    *        Main form
    */
@@ -212,11 +218,11 @@ Ext.define(&#39;amdaPlotComp.PlotZoomPlug&#39;, {
       items: [
         {
           xtype: 'datefield', name: 'zoom-min-time', fieldLabel: 'Start Time',
-          format: 'Y-m-d\\TH:i:s'
+          format: 'Y/m/d H:i:s.u', 
         },
         {
           xtype: 'datefield', name: 'zoom-max-time', fieldLabel: 'Stop Time',
-          format: 'Y-m-d\\TH:i:s'
+          format: 'Y/m/d H:i:s.u'
         },
         {
           xtype: 'numberfield', name: 'zoom-min-float', fieldLabel: 'Min Value'
@@ -232,6 +238,15 @@ Ext.define(&#39;amdaPlotComp.PlotZoomPlug&#39;, {
           handler: function () {
             this.resetMinMaxValue();
           }
+        }, 
+         {
+          xtype: 'button',
+          width: 100,
+          text: 'Use interval in plot',
+          scope: this,
+          handler: function () {
+            this.setTimePlot();
+          }
         }
       ]
     };
@@ -372,7 +387,7 @@ Ext.define(&#39;amdaPlotComp.PlotZoomPlug&#39;, {
     this.form = new Ext.form.FormPanel({
       frame: true,
-      width: 250,
+      width: 255,
       layout: {
         type: 'vbox',
         pack: 'start',
@@ -392,8 +407,8 @@ Ext.define(&#39;amdaPlotComp.PlotZoomPlug&#39;, {
           scope: this,
           handler: function () {
             if (this.zoomType == 'timeAxis') {
-              var minZoom = this.form.getForm().findField('zoom-min-time').getValue();
-              var maxZoom = this.form.getForm().findField('zoom-max-time').getValue();
+              var minZoom = Ext.Date.format(this.form.getForm().findField('zoom-min-time').getValue(), 'Y-m-d H:i:s.u');
+              var maxZoom = Ext.Date.format(this.form.getForm().findField('zoom-max-time').getValue(),'Y-m-d H:i:s.u');
             }
             else {
               var minZoom = this.form.getForm().findField('zoom-min-float').getValue();
@@ -520,6 +520,22 @@ Ext.define(&#39;amdaUI.PlotTabResultUI&#39;, {
 					this.callInteractivePlot({'action' : 'goto', 'interactiveId' : this.interactiveId, 'ttFileIndex' : ttFileIndex, 'intIndex' : ttintervalIndex});
 				}
 			},
+                        		'-',
+			{
+				text: 'Use This Time Inteval',
+				scope: this,
+				handler: function(){
+                                                                                                    var timeObj = new Object();
+                                                                                                    var startTime = new Date(this.crtContext.page.startTime*1000);
+                                                                                                    timeObj.start  = Ext.Date.add(startTime, Ext.Date.MINUTE, startTime.getTimezoneOffset());
+                                                                                                    
+                                                                                                    var stopTime = new Date(this.crtContext.page.stopTime*1000);
+					timeObj.stop  = Ext.Date.add(stopTime, Ext.Date.MINUTE, stopTime.getTimezoneOffset());
+
+					var plotModule = myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.plot.id);
+                                                                                                    plotModule.setTimeInterval(timeObj);
+				}
+			},
 			'-',
 			{		 
 				text: 'Go to Interval #',  
@@ -140,12 +140,9 @@ Ext.define(&#39;amdaUI.PlotUI&#39;, {
     setTimeFromData : function(obj) {                                                               
         if (!obj.start || !obj.stop)
             return;
-        var dateStart = new Date(obj.start.replace(/[T|Z]/g,' ').replace(/\-/g,'\/')); 
-        var dateStop = new Date(obj.stop.replace(/[T|Z]/g,' ').replace(/\-/g,'\/')); 
-
         var plotTab = this.plotTabs.getCurrentPlotTabContent();
         if (plotTab)
-            plotTab.setTime(dateStart, dateStop);
+            plotTab.setTime(obj.start, obj.stop);
     },
     savePlotRequest : function() {
@@ -177,17 +177,17 @@ Ext.define(&#39;amdaUI.StatisticsUI&#39;,
             /**
              * Set Start-Stop from parameter info (Local & MyData)
-             */
+          
             setTimeFromData: function (obj) {
                 if (!obj.start || !obj.stop)
                     return;
-                var dateStart = new Date(obj.start.replace(/[T|Z]/g, ' ').replace(/\-/g, '\/'));
-                var dateStop = new Date(obj.stop.replace(/[T|Z]/g, ' ').replace(/\-/g, '\/'));
+                //var dateStart = new Date(obj.start.replace(/[T|Z]/g, ' ').replace(/\-/g, '\/'));
+                //var dateStop = new Date(obj.stop.replace(/[T|Z]/g, ' ').replace(/\-/g, '\/'));
-                this.formPanel.items.items[1].getForm().setValues({startDate: dateStart, stopDate: dateStop});
-                this.timeSelector.intervalSel.updateDuration();
-            },
+                //this.formPanel.items.items[1].getForm().setValues({startDate: dateStart, stopDate: dateStop});
+               // this.timeSelector.intervalSel.updateDuration();
+            },   */
             generateCatalog: function ()
             {
@@ -61,6 +61,9 @@ Ext.define(&#39;amdaUI.TimeSelectorUI&#39;, {
 	getActiveTimeSource: function() {
 		return this.timeSrc.getActiveTab().getItemId(); 
 	},
+                   setActiveTimeSource : function (timeSrcIndex){
+                    this.timeSrc.setActiveTab(timeSrcIndex);
+                 },
         isValid: function(acceptEmptyTTList = true) {
             if (this.getActiveTimeSource() === amdaModel.AmdaTimeObject.inputTimeSrc[0]) {
@@ -298,7 +298,7 @@ Ext.define(&#39;amdaUI.TimeTableUI&#39;, {
                 var catNode = Ext.create('amdaModel.CatalogNode', {leaf: true});
                 catObj.set('relatedTimeTableId', id);
                 creatDate = new Date(this.object.get('created'));
-                date = Ext.Date.format(creatDate, 'Y-m-d\\TH:i:s');
+                date = Ext.Date.format(creatDate, 'Y-m-d\\TH:i:s.u');
                 descr = 'Generated by CDPP/Amda Time Table Module \n' + 'From Time Table: ' + this.object.get('name') + ' which was generated on: ' + date + '\n';
                 catObj.set('description', descr + this.object.get('description'));
                 var nbParam = parseInt(text);
@@ -510,8 +510,8 @@ Ext.define(&#39;amdaUI.TimeTableUI&#39;, {
                 {type: 'numeric', dataIndex: 'durationHour'},
                 {type: 'numeric', dataIndex: 'durationMin'},
                 {type: 'numeric', dataIndex: 'durationSec'},
-                {type: 'date', dataIndex: 'start', dateFormat: 'Y-m-d'},
-                {type: 'date', dataIndex: 'stop', dateFormat: 'Y-m-d'}
+                {type: 'date', dataIndex: 'start', dateFormat: 'c'},
+                {type: 'date', dataIndex: 'stop', dateFormat: 'c'}
             ]
         };
         var cellEditing = Ext.create('Ext.grid.plugin.CellEditing', {
@@ -542,7 +542,7 @@ Ext.define(&#39;amdaUI.TimeTableUI&#39;, {
                             'isCatalog': false,
                             'data': {}
                         };
-                        obj['data'][activeColumn.dataIndex] = value;
+                        obj['data'][activeColumn.dataIndex] = Ext.Date.format(value, 'Y-m-d\\TH:i:s.u');
                         //context.grid.getSelectionModel().deselectAll();
                         //Interval is modified on the server side
@@ -612,13 +612,13 @@ Ext.define(&#39;amdaUI.TimeTableUI&#39;, {
                 },
                 {
                     header: 'Start Time', dataIndex: 'start', width: 120,
-                    editor: {xtype: 'datefield', allowBlank: false, hideTrigger: true, format: 'Y-m-d\\TH:i:s'},
+                    editor: {xtype: 'datefield', allowBlank: false, hideTrigger: true, format: 'Y-m-d\\TH:i:s.u'},
                     renderer: function (value) {
                         if (value != null) {
                             if (Ext.isDate(value)) {
-                                return Ext.Date.format(value, 'Y-m-d\\TH:i:s');
+                                return Ext.Date.format(value, 'Y-m-d\\TH:i:s.u');
                             } else {
-                                return Ext.Date.format(new Date(value), 'Y-m-d\\TH:i:s');
+                                return Ext.Date.format(new Date(value), 'Y-m-d\\TH:i:s.u');
                             }
                         } else {
                             return value;
@@ -627,13 +627,13 @@ Ext.define(&#39;amdaUI.TimeTableUI&#39;, {
                 },
                 {
                     header: 'Stop Time', dataIndex: 'stop', width: 120,
-                    editor: {xtype: 'datefield', allowBlank: false, hideTrigger: true, format: 'Y-m-d\\TH:i:s'},
+                    editor: {xtype: 'datefield', allowBlank: false, hideTrigger: true, format: 'Y-m-d\\TH:i:s.u'},
                     renderer: function (value) {
                         if (value != null) {
                             if (Ext.isDate(value)) {
-                                return Ext.Date.format(value, 'Y-m-d\\TH:i:s');
+                                return Ext.Date.format(value, 'Y-m-d\\TH:i:s.u');
                             } else {
-                                return Ext.Date.format(new Date(value), 'Y-m-d\\TH:i:s');
+                                return Ext.Date.format(new Date(value), 'Y-m-d\\TH:i:s.u');
                             }
                         } else {
                             return value;
@@ -247,8 +247,8 @@ class AmdaAction
                                             $info .= "<br/>Time Range : depending on mission selection"; 
                                         else 
                                             $info .= "<br/>Time Range : undefined"; 
-                                        $child->setAttribute('dataStart', date("Y-m-d\TH:i:s\Z", strtotime(' -1 day')));
-                                        $child->setAttribute('dataStop', date("Y-m-d\TH:i:s\Z", time()));                                        
+                                        $child->setAttribute('dataStart', date("Y-m-d\TH:i:s.u\Z", strtotime(' -1 day')));
+                                        $child->setAttribute('dataStop', date("Y-m-d\TH:i:s.u\Z", time()));                                        
                                     } else {
                                         $info .= "<br/>Time Range: ".$child->getAttribute('dataStart')."-".$child->getAttribute('dataStop');
                                     }
@@ -366,7 +366,7 @@ class AmdaAction
 									else {	
 										if (!empty($timeRestriction)) {
 											$disable = FALSE;
-											$formattedTimeRestriction = date("Y-m-d\TH:i:s\Z",strtotime($timeRestriction)+1);
+											$formattedTimeRestriction = date("Y-m-d\TH:i:s.u\Z",strtotime($timeRestriction)+1);
 											$info .= "<br/><b>After $formattedTimeRestriction data are restricted to group ".$child->getAttribute('group')."</b>";
 										}
 										else {
@@ -478,15 +478,15 @@ class AmdaAction
 							if ($child->tagName == 'parameter'){
 								if ($child->parentNode->hasAttribute('dataStart')){
-									$globalStart = date('Y-m-d\TH:i:s\Z', strtotime($child->parentNode->getAttribute('dataStart')));
-									$globalStop = date('Y-m-d\TH:i:s\Z',  strtotime($child->parentNode->getAttribute('dataStop')));
+									$globalStart = date('Y-m-d\TH:i:s.u\Z', strtotime($child->parentNode->getAttribute('dataStart')));
+									$globalStop = date('Y-m-d\TH:i:s.u\Z',  strtotime($child->parentNode->getAttribute('dataStop')));
 								}
 							}
 							if ( $child->tagName == 'component'){
 								if ($child->parentNode->parentNode->hasAttribute('dataStart')){
-									$globalStart = date('Y-m-d\TH:i:s\Z', strtotime($child->parentNode->getAttribute('dataStart')));
-									$globalStop = date('Y-m-d\TH:i:s\Z',  strtotime($child->parentNode->getAttribute('dataStop')));
+									$globalStart = date('Y-m-d\TH:i:s.u\Z', strtotime($child->parentNode->getAttribute('dataStart')));
+									$globalStop = date('Y-m-d\TH:i:s.u\Z',  strtotime($child->parentNode->getAttribute('dataStop')));
 								}
 							}
@@ -678,7 +678,7 @@ class AmdaAction
 				$result = $this->executeRequest((Object) array(
 					'compression' => 'none',
 					'fileformat' => 'internal',
-                                        'timeformat' => 'YYYY-MM-DDThh:mm:ss',
+                                        'timeformat' => 'YYYY-MM-DDThh:mm:ss.u',
 					'sendToSamp' => FALSE,
 					'list' => array(
 						(Object) array(
@@ -59,7 +59,7 @@ class CatalogCacheIntervalObject extends TimeTableCacheIntervalObject
 						fwrite($handle,pack('d', floatval($value)));
 					  break;
 					case 1: //date (timestamp)
-						fwrite($handle,pack('L', TimeUtils::iso2stamp($value)));
+						fwrite($handle,pack('d', TimeUtils::iso2stamp($value)));
 						break;
 					case 2: //string
 						fwrite($handle,pack('L', strlen($value)));
@@ -101,7 +101,7 @@ class CatalogCacheIntervalObject extends TimeTableCacheIntervalObject
 						$val = $res['val'];
 					  break;
 					case 1: //date (timestamp)
-						if (!$res = unpack('Lval',fread($handle,4))) {
+						if (!$res = unpack('dval',fread($handle,8))) {
 							break;
 						}
 						$val = TimeUtils::stamp2iso($res['val']);
@@ -94,9 +94,10 @@ class RequestMgr extends AmdaObjectMgr
 		$time = strtotime($obj->startDate);
 		$interval = $obj->durationDay*86400 +
-						$obj->durationHour*3600 +
-						$obj->durationMin*60 + $obj->durationSec;
+		$obj->durationHour*3600 +
+		$obj->durationMin*60 + $obj->durationSec;
 		$stopTime = gmdate("Y-m-d\TH:i:s", $time+$interval);
+		$stopTime = $stopTime.'.'.$obj->durationMs;
 		$obj->stopDate = $stopTime;
 		return $obj;
@@ -107,17 +107,27 @@ class TimeTableCacheIntervalObject
 	}
 	public function writeBin($handle) {
-		fwrite($handle,pack('L6',$this->id,$this->index,$this->start,$this->stop,$this->isNew,$this->isModified));
+
+                                        fwrite($handle,pack('L2',$this->id,$this->index));
+                                        fwrite($handle,pack('d2', $this->start,$this->stop));
+                                        fwrite($handle, pack('L2', $this->isNew,$this->isModified));
 	}
 	public function loadBin($handle) {
-		$array = unpack('L6int',fread($handle,6*4));
-		$this->id         = $array['int1'];
-		$this->index      = $array['int2'];
-		$this->start      = $array['int3'];
-		$this->stop       = $array['int4'];
-		$this->isNew      = $array['int5'];
-		$this->isModified = $array['int6'];
+            
+                                        $res =  unpack('L2int',fread($handle,4*2));
+		$this->id         = $res['int1'];
+		$this->index   = $res['int2'];
+                
+                                        $res =  unpack('d2d',fread($handle,8*2));
+		$this->start         = $res['d1'];
+		$this->stop         = $res['d2'];
+
+                
+                                        $res =  unpack('L2int',fread($handle,4*2));
+		$this->isNew         = $res['int1'];
+		$this->isModified = $res['int2'];
+                            
 	}
 	public function dump() {
@@ -240,10 +240,10 @@
 			$index = 0;
 		if (!isset($start))
-			$start = date('Y-m-d\TH:i:s');
+			$start = date('Y-m-d\TH:i:s.u');
 		if (!isset($stop))
-			$stop = date('Y-m-d\TH:i:s');
+			$stop = date('Y-m-d\TH:i:s.u');
 		$this->cache->addInterval(array('start' => $start, 'stop' => $stop), true, $index);
@@ -200,7 +200,7 @@ class TimeTableMgr extends AmdaObjectMgr
 		}
 		$this->id = $this->setId();
-		$this->created = date('Y-m-d\TH:i:s');
+		$this->created = date('Y-m-d\TH:i:s.u');
 		if (!$this->id) {
 			return ['error' => ID_CREATION_ERROR];
 		}
@@ -9,13 +9,18 @@ class TimeUtils
 		catch (Exception $e) {
 			$time = new DateTime('1970-01-01T00:00:00Z');
 		}
-		$stamp = $time->format('U');
+		$stamp = $time->format('U.u');
 		unset($time);
 		return $stamp;
 	}
 	public static function stamp2iso($stamp) {
-		return date('Y-m-d\TH:i:s',$stamp);
+                                        $intStamp = floor($stamp);
+                                        $intMilli = round(($stamp-$intStamp)*1000);
+                                        // c'est moche mais setTime de php ne prends pas en compte les ms 
+                                        $strMilli = str_pad(strval($intMilli),3, '0', STR_PAD_LEFT);
+                                        $dateIso = date("Y-m-d\TH:i:s",$intStamp).'.'.$strMilli;
+		return $dateIso;
 	}
 }