CDPP / AMDA_IHM

Commit e07ef621bcb8553f89663894511db134fb7be176

Authored by Erdogan Furkan
2 parents 1d3f12bb ac097a6f
Exists in master and in 9 other branches FER_11242, FER_11500, FER_11537, FER_6265, FER_9629, FER_TFCat, SpeasyGet, amdadev, openam

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

Showing 5 changed files with 17 additions and 13 deletions   Show diff stats
Inline Side-by-side
desktop.php
  Diff comments   View file @e07ef62
... ... @@ -41,7 +41,7 @@ if ($sessionID === FALSE) {
41 41 <!-- Important ! the order of css loading : ext-all.css - should be the first -->
42 42 <link rel="stylesheet" type="text/css" href="js/lib/ext/resources/css/ext-all.css" />
43 43 <link rel="stylesheet" type="text/css" href="js/resources/css/desktop.css" />
44   - <link rel="stylesheet" type="text/css" href="js/resources/css/amda.css" />
  44 + <link rel="stylesheet" type="text/css" href="js/resources/css/amda.css?v=2" />
45 45  
46 46 <link rel="stylesheet" href="js/lib/codemirror/codemirror-5.65.12/lib/codemirror.css">
47 47 <link rel="stylesheet" href="js/lib/codemirror/codemirror-5.65.12/addon/lint/lint.css">
... ... @@ -239,4 +239,4 @@ if ($sessionID === FALSE) {
239 239  
240 240 <body />
241 241  
242   -</html>
243 242 \ No newline at end of file
  243 +</html>
... ...
index.html
  Diff comments   View file @e07ef62
... ... @@ -106,11 +106,12 @@
106 106 <div id="PaveAnnoucements">
107 107 <div id="TitrePaveAnnoucement">Announcements</div>
108 108  
  109 +<div id="DateAnnoucement">12/03/2024</div>
  110 +<div id="TexteAnnoucement">New function histogram<br/>Juno, JUICE, Galileo M-shell from JRM33+CON2020</div>
  111 +<div id="DateAnnoucement">17/07/2023</div>
  112 +<div id="TexteAnnoucement">Juno FGM, JEDI, WAVES &amp; JADE L3: New perijoves 45-47<br/>Add Juno JADE L5 datasets: Differential Energy Flux &amp; moments<br/>Add Juno JEDI Pitch Angle Distribution</div>
  113 +
109 114 <div id="DateAnnoucement">03/08/2022</div>
110 115 <div id="TexteAnnoucement">AMDA DOI: https://doi.org/10.6096/2011</div>
111 116 <div id="DateAnnoucement">20/01/2022</div>
112 117 <div id="TexteAnnoucement">Solar Orbiter RPW, <br/>Solar Orbiter PAS: Version 2.0,<br/> Fix Cassini LEMMS data,<br/> Fix VEX orbits shared catalog,<br/>New frames available in framesTransformation function</div>
113   -<div id="DateAnnoucement">28/07/2021</div>
114   -<div id="TexteAnnoucement">New data:</br>MMS (including burst mode), <br/>VEX IMA: Version 2.0,<br/> BepiColombo Venus flybys ephemeris,<br/> PSP Venus flybys: ephemeris & data,<br/>JASON3: AMBRE</div>
115   -<div id="DateAnnoucement">28/07/2021</div>
116   -<div id="TexteAnnoucement">Fix remote access to CDAWeb</div>
... ...
js/app/AmdaApp.js
  Diff comments   View file @e07ef62
... ... @@ -471,7 +471,7 @@ Ext.define(&#39;amdaApp.AmdaApp&#39;, {
471 471 {
472 472 text : 'Workspaces',
473 473 iconCls : 'icon-ws',
474   - disabled: false,
  474 + disabled: true,
475 475 scope : this,
476 476 handler:function(obj, e){
477 477 e.stopEvent();
... ...
js/app/views/CatalogUI.js
  Diff comments   View file @e07ef62
... ... @@ -126,7 +126,9 @@ Ext.define(&#39;amdaUI.CatalogUI&#39;, {
126 126  
127 127 updateCount: function () {
128 128 this.object.set('nbIntervals', this.TTGrid.getStore().getTotalCount());
  129 + this.object.set('nbColumns', this.TTGrid.headerCt.getGridColumns().length-7);
129 130 this.formPanel.getForm().findField('nbIntervals').setValue(this.object.get('nbIntervals'));
  131 + this.formPanel.getForm().findField('nbColumns').setValue(this.object.get('nbColumns'));
130 132 },
131 133 generateTT: function () {
132 134 if (this.fclose()) {
... ... @@ -1338,11 +1340,13 @@ Ext.define(&#39;amdaUI.CatalogUI&#39;, {
1338 1340 layout: 'hbox',
1339 1341 items: [{
1340 1342 xtype: 'datefield', fieldLabel: 'Creation date',
1341   - name: 'created', disabled: true,
  1343 + name: 'created', disabled: true,flex:8,
1342 1344 hideTrigger: true, format: 'Y/m/d H:i:s'
1343 1345 },
1344 1346 {xtype: 'splitter'},
1345   - {xtype: 'textfield', fieldLabel: 'Intervals', name: 'nbIntervals', disabled: true}
  1347 + {xtype: 'textfield', fieldLabel: 'Intervals', name: 'nbIntervals', flex:5, disabled: true},
  1348 + {xtype: 'splitter'},
  1349 + {xtype: 'textfield', fieldLabel: '# Col.', name: 'nbColumns',flex:3, disabled: true}
1346 1350 ]
1347 1351 },
1348 1352 {
... ...
js/app/views/PlotTabResultUI.js
  Diff comments   View file @e07ef62
... ... @@ -609,11 +609,10 @@ Ext.define(&#39;amdaUI.PlotTabResultUI&#39;, {
609 609 var ttFileIndex = this.crtTTFileIndex;
610 610 var ttintervalIndex = this.crtContext.page.ttIndex;
611 611  
612   - if (ttintervalIndex <= 0 && ttFileIndex > 0) {
  612 + --ttintervalIndex;
  613 + if(ttintervalIndex < 0)
613 614 --ttFileIndex;
614   - }
615   - else
616   - --ttintervalIndex;
  615 +
617 616 this.callInteractivePlot({ 'action': 'goto', 'interactiveId': this.interactiveId, 'ttFileIndex': ttFileIndex, 'intIndex': ttintervalIndex });
618 617 }
619 618 },
... ...