Add error and info informations on services grid

Nathanael Jourdane
1 parent 977e2c07
Showing 3 changed files with 37 additions and 7 deletions Show diff stats
js/app/views/EpnTapUI.js
js/resources/css/amda.css
php/epntap.php
@@ -101,7 +101,9 @@ Ext.create(&#39;Ext.data.Store&#39;, {
 		{name: 'reference_url', type: 'string'},
 		{name: 'created', type: 'date', dateFormat: 'c'},
 		{name: 'updated', type: 'date', dateFormat: 'c'},
-		{name: 'nb_results', type: 'integer'}
+		{name: 'nb_results', type: 'integer'},
+		{name: 'info', type: 'string'},
+		{name: 'error', type: 'string'}
 	],
 	proxy: {
 		type: 'ajax',
@@ -476,7 +478,7 @@ Ext.define(&#39;amdaUI.EpnTapUI&#39;, {
 	*/
 	createServicesGrid: function() {
 		var nbResRender = function(val) {
-			if(val<0 || isNaN(val)) {
+			if(val < 0) {
 				return '-';
 			} else if(val >= 1000*1000) {
 				return (val/(1000*1000)).toPrecision(3) + 'm';
@@ -499,7 +501,9 @@ Ext.define(&#39;amdaUI.EpnTapUI&#39;, {
 			viewConfig: {
 				getRowClass: function(record, index) {
 					var nb_res = record.get('nb_results');
-					if (nb_res <= 0 || isNaN(nb_res)) {
+					if(record.get('error').length > 0) {
+						return 'error_row';
+					} else if (nb_res <= 0) {
 						return 'disabled_row';
 					}
 				}
@@ -526,6 +530,11 @@ Ext.define(&#39;amdaUI.EpnTapUI&#39;, {
 							'updated': 'Updated on'};
 					var service = epnTapServicesGrid.getView().getRecord(tooltip.triggerElement);
 					var ttContent = '<h3>' + service.get('short_name') + '</h3><ul>';
+					if(service.get('error').length > 0) {
+						ttContent += '<p style="color:IndianRed">' + service.get('error') + '</p><br/>';
+					} else if(service.get('info').length > 0) {
+						ttContent += '<p style="color:green">' + service.get('info') + '</p><br/>';
+					}
 					for (var column in column_titles) {
 						var col_content = service.get(column);
 						if(column === 'content_level' && col_content!=='') {
@@ -489,6 +489,9 @@ p + p {
 }
  
 .disabled_row {
-	pointer-events: none;
-    color: gray;
+	color: gray;
+}
+
+.error_row {
+	color: IndianRed;
 }
@@ -16,9 +16,11 @@ switch ($action) {
 	case 'getNbResults':
 		echo getNbResults();
 		break;
-
-	default:
+	case 'getGranules':
+		echo json_encode(getGranules());
 		break;
+	default:
+		echo 'unknown action';
 }
  
 function resolver() {
@@ -50,6 +52,7 @@ function getServices() {
 			for($j=0; $j<count($services); $j++) {
 				$services[$j]['id'] = generateServiceId($services[$j]);
 				$services[$j]['nb_results'] = -1;
+				$services[$j]['info'] = 'Please make a query first.';
 				if($services[$j]['id'] == 'cdpp/amda/amdadb') {
 					array_splice($services, $j, 1);
 					$j-=1;
@@ -88,6 +91,21 @@ function getNbResults() {
 	}
 }
  
+function getGranules() {
+	$url = filter_var($_GET['url'], FILTER_SANITIZE_STRING, FILTER_FLAG_STRIP_LOW);
+	$tableName = filter_var($_GET['tableName'], FILTER_SANITIZE_STRING, FILTER_FLAG_STRIP_LOW);
+	$targetName = filter_var($_GET['targetName'], FILTER_SANITIZE_STRING, FILTER_FLAG_STRIP_LOW);
+	$productTypes = filter_var($_GET['productTypes'], FILTER_SANITIZE_STRING, FILTER_FLAG_STRIP_LOW);
+	$timeMin = filter_var($_GET['timeMin'], FILTER_SANITIZE_STRING, FILTER_FLAG_STRIP_LOW);
+	$timeMax = filter_var($_GET['timeMax'], FILTER_SANITIZE_STRING, FILTER_FLAG_STRIP_LOW);
+
+	// TODO: make this more beatiful
+	// TODO find a way to handle 'non existing key errors' (and then add access_format)
+	$query = "SELECT dataproduct_type, target_name, time_min, time_max, granule_uid, access_estsize, access_url, thumbnail_url FROM $tableName" . createFilter($targetName, $productTypes, $timeMin, $timeMax);
+	$result = request($url, $query);
+	return $result;
+}
+
 // ----- utils -----
  
 function request($access_url, $query) {