CDPP / AMDA_IHM

Commit 584231184c092ac6ec0c0928fc43f006b9d9e47f

Authored by Nathanael Jourdane
1 parent a117468a
Exists in master and in 112 other branches 10098, 10178, 5390, 6629, 6728, 6920, 7494, 7497, 7616, 8459, 8528, 8928, 9014, 9016Bis, 9017, 9049, 9084, 9259, 9326, 9345, 9505, 9660, 9750, 9750.bck, 9800, 9980, FER_10285, FER_10400, FER_10435, FER_10557, FER_10663, FER_10765, FER_10828, FER_10828_2, FER_10829, FER_10836, FER_10852, FER_10934, FER_11100, FER_11242, FER_11478, FER_11500, FER_11537, FER_11586, FER_11588, FER_5119, FER_5165, FER_6265, FER_6860, FER_6899, FER_6951, FER_7618, FER_7862, FER_8455, FER_9629, FER_9660, FER_9915, FER_CR41, FER_CR42, FER_CR43, FER_TFCat, Histo1D2D, MAZ_10936, MAZ_11362, MAZ_11427, MAZ_6018, MAZ_9016_New, MAZ_FIX_9016, New_ColorMaps, SpeasyGet, akkodis/amdadev, alias, amdadev, amdadev_test, anr_tempete, catalog-histo, create-user, cu2022, data-activities, density_maps, develop, epn-tap, expression-parser-bre, frames-transformation, hapi, homePage, install-rework, livraison-akka, master_vge, minimize, mlplasmas, multiplot, new-save-plot-request, openam, plot-request, plot-request-update, plot-tt-catalog, remoteData, rm_5118, rm_5776, rm_6912, rm_6912_bis, rm_7926, rm_8932, save-other-requests, save-plot, save-plot-request, shared-objects-updater, special-params, sum-components-indexes, test-merge, ws_get_catalog

Prompt an error message when granules can no be displayed

Showing 2 changed files with 11 additions and 1 deletions   Show diff stats
Inline Side-by-side
js/app/controllers/EpnTapModule.js
  Diff comments   View file @5842311
... ... @@ -405,6 +405,8 @@ Ext.define('amdaDesktop.EpnTapModule', {
405 405 var timeMax = metadataStore.max('time_max');
406 406 timeSelector.setLimits(timeMin, timeMax);
407 407 timeSelector.setInterval(timeMin, timeMax);
  408 + // console.log("Done services");
  409 + // loadMask.hide();
408 410 },
409 411  
410 412 /**
... ... @@ -433,17 +435,25 @@ Ext.define('amdaDesktop.EpnTapModule', {
433 435 fillGranules: function(granules) {
434 436 if (granules["error"] != null) {
435 437 console.log('Can not get request response:', granules["error"]);
  438 + if(granules["error"] == "no result") {
  439 + alert("There is no result for this query.");
  440 + } else {
  441 + alert("Can not display granules due to an error from the selected epn-tap service.");
  442 + }
436 443 } else {
437 444 try {
438 445 Ext.getCmp('epnTapGranulesGrid').getStore().removeAll();
439 446 Ext.getCmp('epnTapGranulesGrid').getStore().add(granules);
440 447 } catch( e ) {
441 448 console.log('Can not add granules: ' + e);
  449 + alert("Can not display granules due to an error from the selected epn-tap service.");
442 450 }
443 451 }
444 452 Ext.getCmp('epnTapServicesGrid').setDisabled(false);
445 453 Ext.getCmp('epnTapGranulesGrid').setDisabled(false);
446 454 Ext.getCmp('epnTapServicesGrid').getEl().setStyle('cursor', 'default'); // CSS is correctly changed but without visible result.
  455 + // console.log("Done granules");
  456 + // loadMask.hide();
447 457 },
448 458  
449 459 /**
... ...
php/classes/VOTableMgr.php
  Diff comments   View file @5842311
... ... @@ -269,7 +269,7 @@ class VOTableMgr {
269 269 $this->stream = base64_decode($query_stream->textContent);
270 270 $stream_len = strlen($this->stream);
271 271 if($stream_len == 0) {
272   - $this->votable_error = "There is no result for this query.";
  272 + $this->votable_error = "no result";
273 273 return null;
274 274 }
275 275 while($this->c < strlen($this->stream)) {
... ...