From 64280af61e04665809199f429437cc57c5a0525e Mon Sep 17 00:00:00 2001 From: Furkan Date: Tue, 19 Mar 2024 13:52:30 +0000 Subject: [PATCH] 11477 - Done. --- js/app/views/VisuUI.js | 13 ++++++++++--- php/classes/AmdaAction.php | 7 +++++-- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/js/app/views/VisuUI.js b/js/app/views/VisuUI.js index b7ed28c..35a3b0b 100644 --- a/js/app/views/VisuUI.js +++ b/js/app/views/VisuUI.js @@ -131,12 +131,19 @@ Ext.define('amdaUI.VisuUI', { 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); }, diff --git a/php/classes/AmdaAction.php b/php/classes/AmdaAction.php index ad253b0..64018af 100644 --- a/php/classes/AmdaAction.php +++ b/php/classes/AmdaAction.php @@ -189,7 +189,7 @@ class AmdaAction case 'catalog': if ($isLeaf) { $info = 'Nb intervals: '.$child->getAttribute('intervals').'
'; - + // 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(); } -- libgit2 0.21.2