Remove deprecated code (cf. #5281)

Benjamin Renard
1 parent 553dd634
Showing 5 changed files with 19 additions and 24 deletions Show diff stats
js/app/models/InteractiveNode.js
js/app/views/DownloadUI.js
js/app/views/PlotUI.js
js/app/views/SearchUI.js
js/app/views/TimeSelectorUI.js
@@ -462,7 +462,7 @@ Ext.define(&#39;amdaModel.InteractiveNode&#39;, {
 	},
  
 	getTimeFromNode: function(node)  {
-		
+console.log(node);		
 		var startString = new String(node.get('globalStart'));
 		var stopString = new String(node.get('globalStop'));
 		var startDate =  new Date(startString.replace(/\-/g,'\/').replace(/[T|Z]/g,' '));
@@ -486,7 +486,7 @@ Ext.define(&#39;amdaModel.InteractiveNode&#39;, {
 				var newNode = Ext.create(amdaModel.PlotNode.$className, { object : request });                 
 				// edit newNode into Plot Module with node as contextNode
 				newNode.editInModule();
-				if(node.get('globalStart') != 'depending on mission' && ( node.get('nodeType') == 'localParam' ||
+				if((node.get('globalStart') != null) && (node.get('globalStop') != null) && node.get('globalStart') != 'depending on mission' && ( node.get('nodeType') == 'localParam' ||
 					node.get('nodeType') == 'myDataParam' || node.get('nodeType') == 'remoteSimuParam')) {                                                                            
 					module.getUiContent().setTimeFromData(node.getTimeFromNode(node)); 
 				}
@@ -78,7 +78,8 @@ Ext.define(&#39;amdaUI.DownloadUI&#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,'\/')); 
  
@@ -108,6 +108,7 @@ Ext.define(&#39;amdaUI.PlotUI&#39;, {
 			this.object.set('last-plotted-tab', this.plotTabs.getSelectedTabId());
 		}
     	var downObject = amdaModel.DownloadNode.decodeObject(this.object);		
+console.log(this.object);
     	amdaModel.DownloadNode.set('object',Ext.create('amdaModel.Download',downObject));		 
     	amdaModel.DownloadNode.editInModule(); 
     },
@@ -170,6 +171,8 @@ 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,'\/')); 
  
@@ -328,4 +331,4 @@ Ext.define(&#39;amdaUI.PlotUI&#39;, {
 		};
 		Ext.apply (this , Ext.apply (arguments, myConf));
 	}
-});
 \ No newline at end of file
+});
@@ -105,6 +105,8 @@ Ext.define(&#39;amdaUI.SearchUI&#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,'\/')); 
  
@@ -166,26 +166,15 @@ Ext.define(&#39;amdaUI.TimeSelectorUI&#39;,
                         {
                           if (!this.valid) return false;
  
-                          var module = myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.interactive_plot.id);
-                          
-                          if (module && module.multiSelector) 
-                          {
-                              var targetWin  = myDesktopApp.desktop.getWindow(myDesktopApp.dynamicModules.interactive_plot.id);
-                              targetWin.items.items[0].setTimeFromData({ start : data.records[0].get('globalStart'),
-                                                                         stop  : data.records[0].get('globalStop')});      
-                          }
-                          else 
-                          {
-                        	  var explorerModule = myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.explorer.id);
-                        	  if (!explorerModule)
-                        		  return false;
-                              var targetModuleId = explorerModule.getPinedModule();                                
-                              var targetModule = myDesktopApp.getLoadedModule(targetModuleId);                              
-                              targetModule.getUiContent().setTimeFromData({ start : data.records[0].get('globalStart'),
-                                                                            stop  : data.records[0].get('globalStop')});     
-                              me.updateDuration();
-                          }
-                        return true;
+			  var explorerModule = myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.explorer.id);
+                          if (!explorerModule)
+                        	  return false;
+                          var targetModuleId = explorerModule.getPinedModule();                                
+                          var targetModule = myDesktopApp.getLoadedModule(targetModuleId);
+                          targetModule.getUiContent().setTimeFromData({ start : data.records[0].get('globalStart'),
+                                                                        stop  : data.records[0].get('globalStop')});     
+                          me.updateDuration();
+                          return true;
                         }
                     });
                   }