CDPP / AMDA_IHM

Commit 07382ff26c09a637b55403efaaae6562521e12c1

Authored by Nathanael Jourdane
1 parent 7211d9b5
Exists in master and in 111 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, 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

Format dates

Showing 2 changed files with 12 additions and 2 deletions   Show diff stats
Inline Side-by-side
js/app/views/EpnTapUI.js
  Diff comments   View file @07382ff
... ... @@ -186,7 +186,17 @@ Ext.define('App.util.Format', {
186 186 return '<p>' + txt + '</p>'
187 187 },
188 188 'date': function(data) {
189   - return data; // TODO
  189 + if(isNaN(data)) {
  190 + return '';
  191 + }
  192 + var f = Number(data) + 1401 + Math.floor((Math.floor((4 * Number(data) + 274277) / 146097) * 3) / 4) - 38;
  193 + var e = 4 * f + 3;
  194 + var g = Math.floor((e % 1461) / 4);
  195 + var h = 5 * g + 2;
  196 + var D = Math.floor((h % 153) / 5) + 1;
  197 + var M = ((Math.floor(h / 153) + 2) % 12) + 1;
  198 + var Y = Math.floor(e / 1461) - 4716 + Math.floor((12 + 2 - M) / 12);
  199 + return Ext.Date.format(new Date(Y, M-1, D), 'Y-m-d');
190 200 },
191 201 'number': function(val) {
192 202 if(val < 0) {
... ...
php/epntap.php
  Diff comments   View file @07382ff
... ... @@ -120,7 +120,7 @@ function getGranules() {
120 120  
121 121 $visibleColumns = ['granule_uid', 'dataproduct_type', 'time_min', 'time_max', 'access_estsize', 'thumbnail_url', 'access_url'];
122 122 $names = ['dataproduct_type' => 'Type', 'access_estsize' => 'Size'];
123   - $renderers = ['dataproduct_type' => 'type', 'access_estsize' => 'size', 'access_format' => 'format', 'access_url' => 'link', 'thumbnail_url' => 'img'];
  123 + $renderers = ['dataproduct_type' => 'type', 'time_min' => 'date', 'time_max' => 'date', 'access_estsize' => 'size', 'thumbnail_url' => 'img', 'access_url' => 'link', 'access_format' => 'format'];
124 124 $flexs = ['granule_uid' => 2];
125 125  
126 126 $fields = array();
... ...