11477 - Done.

Erdogan Furkan
1 parent e07ef621
Showing 2 changed files with 15 additions and 5 deletions Show diff stats
js/app/views/VisuUI.js
php/classes/AmdaAction.php
@@ -131,12 +131,19 @@ Ext.define(&#39;amdaUI.VisuUI&#39;, {
  
             me.reset();
         }
-
+        var type = "";
+        if(this.object.get('id').includes('sharedcatalog'))
+            type = 'sharedcatalog'
+        else if(this.object.get('id') == "")
+            type = 'uploaded'
+        else
+            type = 'object'
         var opt = {
             'typeTT': 'catalog', 'id': this.object.get('id'),
-            'name': this.object.get('name')
+            'name': this.object.get('name'),
+            'type': type,
+            'format': this.object.get('objFormat')
         };
-
         this.formPanel.getForm().loadRecord(this.object);
         AmdaAction.readIntervalsForChart(opt, onAfterInit);
     },
@@ -189,7 +189,7 @@ class AmdaAction
 						case 'catalog':
 							if ($isLeaf) {
 								$info = '<b>Nb intervals:</b> '.$child->getAttribute('intervals').'<br/>';
-
+								// ICIIIII
 								$objectMgr = new TimeTableMgr();
 								$obj_info = $objectMgr->getObject($id, $nodeType);
 								if (!empty($obj_info) && !empty($obj_info['description'])) {
@@ -1202,7 +1202,10 @@ class AmdaAction
 	public function readIntervalsForChart($o)
 	{
 		$objMgr = new CatalogCacheMgr(TRUE);
-		$objMgr->initFromObject($o->id, $o->type);
+		if($o->type == 'uploaded')
+			$objMgr->initFromUploadedFile($o->name, $o->format);
+		else
+			$objMgr->initFromObject($o->id, $o->type);
 		return $objMgr->getIntervalsForChart();
 	}