Update the number of results when the epn-tap window is loaded (All dataproductType)

Nathanael Jourdane
1 parent 0f872815
Showing 2 changed files with 32 additions and 24 deletions Show diff stats
js/app/controllers/EpnTapModule.js
js/app/views/EpnTapUI.js
@@ -96,6 +96,7 @@ Ext.define(&#39;amdaDesktop.EpnTapModule&#39;, {
 	- `target`: an array of 3 values: [dataproduct_type, target_class, target_name]; or null.
 	*/
 	initWindow: function(target) {
+		Ext.data.StoreManager.lookup('servicesStore').on('add', function() { this.updateNbResults(); }, this);
 		Ext.data.StoreManager.lookup('servicesStore').load();
 		Ext.data.StoreManager.lookup('metadataStore').load();
  
@@ -154,8 +155,6 @@ Ext.define(&#39;amdaDesktop.EpnTapModule&#39;, {
 			this.targetNameCB.select('all');
 			this.targetNameCB.disable();
 		}
-
-		this.updateNbResults();
 	},
  
 	/**
@@ -335,6 +334,7 @@ Ext.define(&#39;amdaDesktop.EpnTapModule&#39;, {
 		this.select = Array();
  
 		var selectedService = Ext.data.StoreManager.lookup('servicesStore').findRecord('id', selectedServiceId).data;
+		console.log(selectedService);
 		if (selectedService == null) {
 			throw this.selectedServiceId + ' not found in the list of services.';
 			return;
@@ -373,38 +373,44 @@ Ext.define(&#39;amdaDesktop.EpnTapModule&#39;, {
 	/**
 	Update the nb_result field of the services store (see `EpnTapUI.servicesStore`), according to the field values in `serviceFilterPanel`.
 	*/
-	updateNbResults: function(ui) {
-		if(this.productTypeCB.value === 'all' && !this.launchedFromTree ) {
+	updateNbResults: function() {
+		var productType = Ext.getCmp('epnTapProductTypeCB').value;
+		var targetClass = Ext.getCmp('epnTapTargetClassCB').value;
+		var targetName = Ext.getCmp('epnTapTargetNameCB').value;
+		var metadataStore = Ext.data.StoreManager.lookup('metadataStore');
+		var servicesStore = Ext.data.StoreManager.lookup('servicesStore');
+		var timeSelector = Ext.getCmp('epnTapTimeSelector');
+
+		if(productType === 'all' && !this.launchedFromTree ) {
 			var filter = [];
-		} else if(this.targetClassCB.value === 'all') {
+		} else if(targetClass === 'all') {
 			var filter = [
-				{property: "dataproduct_type", value: this.productTypeCB.value}
+				{property: "dataproduct_type", value: productType}
 			];
-		} else if(this.targetNameCB.value === 'all') {
+		} else if(targetName === 'all') {
 			var filter = [
-				{property: "dataproduct_type", value: this.productTypeCB.value},
-				{property: "target_class", value: this.targetClassCB.value}
+				{property: "dataproduct_type", value: productType},
+				{property: "target_class", value: targetClass}
 			];
 		} else {
 			var filter = [
-				{property: "dataproduct_type", value: this.productTypeCB.value},
-				{property: "target_class", value: this.targetClassCB.value},
-				{property: "target_name", value: this.targetNameCB.value}
+				{property: "dataproduct_type", value: productType},
+				{property: "target_class", value: targetClass},
+				{property: "target_name", value: targetName}
 			];
 		}
-		var metadataStore = Ext.data.StoreManager.lookup('metadataStore');
  
-		Ext.data.StoreManager.lookup('servicesStore').each(function(record, idx) {
+		servicesStore.each(function(record, idx) {
 			metadataStore.filter(filter.concat({property: 'service_id', value: record.get('id')}));
 			record.set('nb_results', metadataStore.sum('nb_results'));
 			metadataStore.clearFilter();
 		});
-		Ext.data.StoreManager.lookup('servicesStore').sort('nb_results', 'DESC');
+		servicesStore.sort('nb_results', 'DESC');
  
 		var timeMin = metadataStore.min('time_min');
 		var timeMax = metadataStore.max('time_max');
-		this.timeSelector.setLimits(timeMin, timeMax);
-		this.timeSelector.setInterval(timeMin, timeMax);
+		timeSelector.setLimits(timeMin, timeMax);
+		timeSelector.setInterval(timeMin, timeMax);
 	},
  
 	/**
@@ -99,9 +99,7 @@ Ext.create(&#39;Ext.data.Store&#39;, {
 	],
 	listeners: {
 		beforeload: function(store) {
-			AmdaAction.epnTapGetServices( function(services) {
-				store.add(services);
-			});
+			AmdaAction.epnTapGetServices( function(services) { store.add(services); });
 		}
 	}
 });
@@ -250,8 +248,8 @@ Ext.define(&#39;amdaUI.EpnTapUI&#39;, {
 				flex: 1,
 				height: 405,
 				columns: [
-					{text: 'Name', dataIndex: 'short_name', flex: 3},
-					{text: '~Nb results', dataIndex: 'nb_results', flex: 2}
+					{text: 'Name', dataIndex: 'short_name', flex: 1},
+					{text: '~Nb results', dataIndex: 'nb_results', flex: 1}
 				],
 				renderer: function(value, metadata, record) {
 					return getExpandableImage(value, metadata,record);
@@ -289,7 +287,11 @@ Ext.define(&#39;amdaUI.EpnTapUI&#39;, {
 						var service = epnTapServicesGrid.getView().getRecord(tooltip.triggerElement);
 						var ttContent = '<h3>' + service.get('short_name') + '</h3><ul>';
 						for (var column in column_titles) {
-							ttContent += '<li><b>' + column_titles[column] + '</b>: ' + service.get(column) + '</li>';
+							var col_content = service.get(column);
+							if(column === 'content_level' && col_content!=='') {
+								col_content = col_content.replace(/#/g, ", ");
+							}
+							ttContent += '<li><b>' + column_titles[column] + '</b>: ' + col_content + '</li>';
 						}
 						tooltip.update(ttContent + '</ul>');
 					}
@@ -405,7 +407,7 @@ Ext.define(&#39;amdaUI.EpnTapUI&#39;, {
 				id: 'epnTapGranulesGrid',
 				title: 'Granules',
 				store: Ext.data.StoreManager.lookup('granulesStore'),
-				flex: 5,
+				flex: 4,
 				height: 405,
 				columns: [
 					{ text: 'Num',  dataIndex: 'num', flex: 1, renderer: txtRender },