From 7f6b6b858eb00948ffa33c98b1c577bcf9b3bcff Mon Sep 17 00:00:00 2001 From: Francesco Mangiacrapa Date: Fri, 12 Jul 2019 16:07:03 +0000 Subject: [PATCH] Task #17166 Fixing CSS for synoptic table and fixing allyears for FARM git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/performfish-analytics-portlet@181223 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../PerformFishAnnualAnalyticsController.java | 18 ++++- ...formFishAnnualAnalyticsViewController.java | 4 +- .../PerformFishAnalyticsController.java | 2 +- src/main/webapp/PerformFishAnalytics.css | 73 ++++++++++++++++--- 4 files changed, 80 insertions(+), 17 deletions(-) diff --git a/src/main/java/org/gcube/portlets/user/performfishanalytics/client/annualcontrollers/PerformFishAnnualAnalyticsController.java b/src/main/java/org/gcube/portlets/user/performfishanalytics/client/annualcontrollers/PerformFishAnnualAnalyticsController.java index 72a7ea3..b055b1f 100644 --- a/src/main/java/org/gcube/portlets/user/performfishanalytics/client/annualcontrollers/PerformFishAnnualAnalyticsController.java +++ b/src/main/java/org/gcube/portlets/user/performfishanalytics/client/annualcontrollers/PerformFishAnnualAnalyticsController.java @@ -170,9 +170,11 @@ public class PerformFishAnnualAnalyticsController { //boolean isKPIsSelected = viewAnnualController.validateKPIFields(); int selectedKPIsSize = viewAnnualController.getSelectedKPIs().size(); viewAnnualController.manageAlgorithmsSubmit(selectedKPIsSize); + viewAnnualController.enableSynopticTable(true); }else { //viewController.enableLoadBatches(false); viewAnnualController.enableAllAlgorithmsForSubmit(false); + viewAnnualController.enableSynopticTable(false); } } }); @@ -285,7 +287,6 @@ public class PerformFishAnnualAnalyticsController { List selectedKPI = viewAnnualController.getSelectedKPIs(); viewAnnualController.manageAlgorithmsSubmit(selectedKPI.size()); - if(theFocusValue!=null) { if(isValidKPI){ @@ -303,7 +304,6 @@ public class PerformFishAnnualAnalyticsController { public void onLoadSynopticTable(LoadSynopticTableEvent loadSynopticTableEvent) { callAlgorithmSynopticTableFarm(); - } }); @@ -325,7 +325,17 @@ public class PerformFishAnnualAnalyticsController { dataInputsFormatter = appendDMInputTable(performFishResponseMap, dataInputsFormatter, PerformFishAnalyticsConstant.PFSERVICE_TO_DM_MAPPING_TABLE.AnnualTable); dataInputsFormatter = appendDMInputTable(performFishResponseMap, dataInputsFormatter, PerformFishAnalyticsConstant.PFSERVICE_TO_DM_MAPPING_TABLE.AntibioticsTable); dataInputsFormatter = appendDMInputTable(performFishResponseMap, dataInputsFormatter, PerformFishAnalyticsConstant.PFSERVICE_TO_DM_MAPPING_TABLE.AntiparasiticTable); - dataInputsFormatter.append(PerformFishAnalyticsConstant.DM_ALLYEARS_PARAM+"="+ PerformFishAnalyticsConstant.DM_VALUE_ALL +";"); + + + String yearsValue = ""; + for (String year : viewAnnualController.getSelectedYears()) { + yearsValue+=year+"#"; + } + yearsValue = yearsValue.substring(0, yearsValue.length()-1); + + dataInputsFormatter.append(PerformFishAnalyticsConstant.DM_ALLYEARS_PARAM+"="+ yearsValue +";"); + + //dataInputsFormatter.append(PerformFishAnalyticsConstant.DM_ALLYEARS_PARAM+"="+ PerformFishAnalyticsConstant.DM_VALUE_ALL +";"); //dataInputsFormatter.append(PerformFishAnalyticsConstant.DM_ALLYEARS_PARAM+"=2016;"); String dataInParameters = dataInputsFormatter.toString(); @@ -825,7 +835,7 @@ public class PerformFishAnnualAnalyticsController { case DEA_CHART: break; case PERFORMFISH_SYNOPTIC_TABLE_FARM: - cssTableStyle = "synoptictable"; + cssTableStyle = "synoptictable-farm"; break; } diff --git a/src/main/java/org/gcube/portlets/user/performfishanalytics/client/annualcontrollers/PerformFishAnnualAnalyticsViewController.java b/src/main/java/org/gcube/portlets/user/performfishanalytics/client/annualcontrollers/PerformFishAnnualAnalyticsViewController.java index c41f9b6..51fd697 100644 --- a/src/main/java/org/gcube/portlets/user/performfishanalytics/client/annualcontrollers/PerformFishAnnualAnalyticsViewController.java +++ b/src/main/java/org/gcube/portlets/user/performfishanalytics/client/annualcontrollers/PerformFishAnnualAnalyticsViewController.java @@ -211,10 +211,10 @@ public class PerformFishAnnualAnalyticsViewController { if (populationType.getName().equalsIgnoreCase(PerformFishAnalyticsConstant.BATCH_LEVEL.GROW_OUT_AGGREGATED_CLOSED_BATCHES.name())) { visibleSynopticTable(true); - enableSynopticTable(true); + //enableSynopticTable(true); } else { visibleSynopticTable(false); - enableSynopticTable(false); + //enableSynopticTable(false); } } } diff --git a/src/main/java/org/gcube/portlets/user/performfishanalytics/client/controllers/PerformFishAnalyticsController.java b/src/main/java/org/gcube/portlets/user/performfishanalytics/client/controllers/PerformFishAnalyticsController.java index cb65f4b..9a75123 100644 --- a/src/main/java/org/gcube/portlets/user/performfishanalytics/client/controllers/PerformFishAnalyticsController.java +++ b/src/main/java/org/gcube/portlets/user/performfishanalytics/client/controllers/PerformFishAnalyticsController.java @@ -765,7 +765,7 @@ public class PerformFishAnalyticsController { case DEA_CHART: break; case PERFORMFISH_SYNOPTICTABLE_BATCH: - cssTableStyle = "synoptictable"; + cssTableStyle = "synoptictable-batch"; break; } diff --git a/src/main/webapp/PerformFishAnalytics.css b/src/main/webapp/PerformFishAnalytics.css index de6fe03..729e728 100644 --- a/src/main/webapp/PerformFishAnalytics.css +++ b/src/main/webapp/PerformFishAnalytics.css @@ -189,7 +189,7 @@ the-central-table td { padding: 2px; } -table.synoptictable { +table.synoptictable-batch { font-family: verdana, arial, sans-serif; font-size: 16px; border-collapse: collapse; @@ -198,45 +198,98 @@ table.synoptictable { text-align: center; } -table.synoptictable td { +table.synoptictable-batch td { padding: 5px; border-left: 1px solid #e3e3e3; border-right: 1px solid #e3e3e3; font-size: 16px; } -table.synoptictable tr:first-child td { +table.synoptictable-batch tr:first-child td { border-left: none; border-right: none; font-size: 16px } -table.synoptictable tr:first-child { +table.synoptictable-batch tr:first-child { font-weight: bold; border-left: none; border-right: none; } -table.synoptictable tr:nth-child(4n+0) { +table.synoptictable-batch tr:nth-child(4n+0) { background-color: #f2f2f2; } -table.synoptictable td:nth-child(3) { +table.synoptictable-batch td:nth-child(3) { font-weight: bold; } -table.synoptictable tr:nth-child(2) { +table.synoptictable-batch tr:nth-child(2) { font-weight: bold; } -table.synoptictable tr:nth-child(3) { +table.synoptictable-batch tr:nth-child(3) { font-weight: bold; } -table.synoptictable td:first-child { +table.synoptictable-batch td:first-child { border-left: none; } -table.synoptictable td:last-child { +table.synoptictable-batch td:last-child { + border-right: none; +} + + +table.synoptictable-farm { + font-family: verdana, arial, sans-serif; + font-size: 16px; + border-collapse: collapse; + margin-top: 20px; + background-color: #FFF; + text-align: center; +} + +table.synoptictable-farm td { + padding: 5px; + border-left: 1px solid #e3e3e3; + border-right: 1px solid #e3e3e3; + font-size: 16px; +} + +table.synoptictable-farm tr:first-child td { + border-left: none; + border-right: none; + font-size: 16px +} + +table.synoptictable-farm tr:first-child { + font-weight: bold; + border-left: none; + border-right: none; +} + +table.synoptictable-farm tr:nth-child(4n+0) { + background-color: #f2f2f2; +} + +table.synoptictable-farm td:nth-child(1) { + font-weight: bold; +} + +table.synoptictable-farm tr:nth-child(2) { + font-weight: bold; +} + +table.synoptictable-farm tr:nth-child(3) { + font-weight: bold; +} + +table.synoptictable-farm td:first-child { + border-left: none; +} + +table.synoptictable-farm td:last-child { border-right: none; } \ No newline at end of file