diff --git a/distro/changelog.xml b/distro/changelog.xml
index dc8c30d..a3adb5b 100644
--- a/distro/changelog.xml
+++ b/distro/changelog.xml
@@ -4,6 +4,7 @@
date="${buildDate}">
[Task #17247] Add numbers to correlation charts
[Task #17225] Change Speedometer to Performeter
+ [Task #17570] Added synoptic tables for Pre-grow and Hatchery
() {
@Override
@@ -390,14 +414,14 @@ public class PerformFishAnalyticsController {
checkTabSpinner(submitRequestPanel, tab);
//field_unary_algorithm.setVisible(true);
GWT.log("I'm displaying: "+dmResponse);
- displayOutputFilesAsStaticEntities(dmResponse, chartType, null, null, null, panelContainer, false);
+ displayOutputFilesAsStaticEntities(dmResponse, toFinalChartType, null, null, null, panelContainer, false);
}
@Override
public void onFailure(Throwable caught) {
loaderIcon.setVisible(false);
checkTabSpinner(submitRequestPanel, tab);
- displayOutputFilesAsStaticEntities(null, chartType, null, null, null, panelContainer, true);
+ displayOutputFilesAsStaticEntities(null, toFinalChartType, null, null, null, panelContainer, true);
}
});
@@ -757,6 +781,8 @@ public class PerformFishAnalyticsController {
case DEA_CHART:
break;
case PERFORMFISH_SYNOPTICTABLE_BATCH:
+ case PERFORMFISH_SYNOPTICTABLE_BATCH_HATCHERY:
+ case PERFORMFISH_SYNOPTICTABLE_BATCH_PREGROW:
break;
}
@@ -811,6 +837,8 @@ public class PerformFishAnalyticsController {
case DEA_CHART:
break;
case PERFORMFISH_SYNOPTICTABLE_BATCH:
+ case PERFORMFISH_SYNOPTICTABLE_BATCH_HATCHERY:
+ case PERFORMFISH_SYNOPTICTABLE_BATCH_PREGROW:
if(!result.getFileName().contains("legend")) {
cssTableStyle = "synoptictable-batch";
diff --git a/src/main/java/org/gcube/portlets/user/performfishanalytics/client/controllers/PerformFishAnalyticsViewController.java b/src/main/java/org/gcube/portlets/user/performfishanalytics/client/controllers/PerformFishAnalyticsViewController.java
index b4cceae..96e197b 100644
--- a/src/main/java/org/gcube/portlets/user/performfishanalytics/client/controllers/PerformFishAnalyticsViewController.java
+++ b/src/main/java/org/gcube/portlets/user/performfishanalytics/client/controllers/PerformFishAnalyticsViewController.java
@@ -601,4 +601,14 @@ public class PerformFishAnalyticsViewController {
recapPage.setVisibleLoadSynopsisPanel(b);
}
+
+
+ /**
+ * Gets the selected population.
+ *
+ * @return the selected population
+ */
+ public Population getSelectedPopulation() {
+ return selectedPopulation;
+ }
}
diff --git a/src/main/java/org/gcube/portlets/user/performfishanalytics/server/PerformFishAnalyticsServiceImpl.java b/src/main/java/org/gcube/portlets/user/performfishanalytics/server/PerformFishAnalyticsServiceImpl.java
index e4d9260..ff12f88 100644
--- a/src/main/java/org/gcube/portlets/user/performfishanalytics/server/PerformFishAnalyticsServiceImpl.java
+++ b/src/main/java/org/gcube/portlets/user/performfishanalytics/server/PerformFishAnalyticsServiceImpl.java
@@ -497,7 +497,7 @@ public class PerformFishAnalyticsServiceImpl extends RemoteServiceServlet
dmRequestParameters.put("Version", Arrays.asList("1.0.0"));
//dmRequestParameters.put("gcube-token", Arrays.asList(pContext.getUserToken()));
dmRequestParameters.put("lang", Arrays.asList("en-US"));
- dmRequestParameters.put("Identifier", Arrays.asList("org.gcube.dataanalysis.wps.statisticalmanager.synchserver.mappedclasses.transducerers.PERFORMFISH_SYNOPTICTABLE_BATCH"));
+ //dmRequestParameters.put("Identifier", Arrays.asList("org.gcube.dataanalysis.wps.statisticalmanager.synchserver.mappedclasses.transducerers.PERFORMFISH_SYNOPTICTABLE_BATCH"));
dmRequestParameters.putAll(mapParameters);
return callTheDataMiner(dmRequestParameters);
}