Author: bleny Date: 2014-06-23 20:52:57 +0200 (Mon, 23 Jun 2014) New Revision: 2087 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2087 Log: fixes #5284 change labels for boats solicitations in ObsVente Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SynthesisService.java trunk/wao-services/src/main/resources/i18n/wao-services_en_GB.properties trunk/wao-services/src/main/resources/i18n/wao-services_fr_FR.properties trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/SynthesisAction.java Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SynthesisService.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SynthesisService.java 2014-06-22 18:10:23 UTC (rev 2086) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SynthesisService.java 2014-06-23 18:52:57 UTC (rev 2087) @@ -54,7 +54,7 @@ } - public Synthesis getObsMerSynthesis(ContactsFilter filter) { + public Synthesis getSynthesis(ContactsFilter filter) { Cache<ContactsFilter, Synthesis> cache = serviceContext.getSynthesesCache(); @@ -331,8 +331,19 @@ dataset.setValue(entry.getValue(), I18n.l(locale, "wao.ui.chart.numberOfBoatsWithBoardings"), String.valueOf(entry.getKey())); } - // Axises - CategoryAxis categoryAxis = new CategoryAxis(I18n.l(locale, "wao.ui.chart.numberOfBoatsWithBoardings")); + String chartTitle; + CategoryAxis categoryAxis; + if (filter.getSampleRowFilter().getObsProgram().isObsMer()) { + chartTitle = I18n.l(locale, SynthesisId.GRAPH_BOARDING.getI18nKey()); + categoryAxis = new CategoryAxis(I18n.l(locale, "wao.ui.chart.numberOfBoatsWithBoardings")); + } else if (filter.getSampleRowFilter().getObsProgram().isObsVente()) { + chartTitle = I18n.l(locale, "wao.ui.chart.numberOfSolicitations", + WaoUtils.formatDate(locale, filter.getPeriodFrom()), + WaoUtils.formatDate(locale, filter.getPeriodTo())); + categoryAxis = new CategoryAxis(I18n.l(locale, "wao.synthesis.observationsCount")); + } else { + throw new UnsupportedOperationException(); + } ValueAxis valueAxis = new NumberAxis(I18n.l(locale, "wao.ui.chart.numberBoats")); valueAxis.setUpperMargin(0.15); @@ -348,7 +359,7 @@ plot.setAxisOffset(RectangleInsets.ZERO_INSETS); JFreeChart boardingBoatsChart = - new JFreeChart(I18n.l(locale, SynthesisId.GRAPH_BOARDING.getI18nKey()), JFreeChart.DEFAULT_TITLE_FONT, plot, true); + new JFreeChart(chartTitle, JFreeChart.DEFAULT_TITLE_FONT, plot, true); synthesis.setBoardingBoatsChart(boardingBoatsChart); Modified: trunk/wao-services/src/main/resources/i18n/wao-services_en_GB.properties =================================================================== --- trunk/wao-services/src/main/resources/i18n/wao-services_en_GB.properties 2014-06-22 18:10:23 UTC (rev 2086) +++ trunk/wao-services/src/main/resources/i18n/wao-services_en_GB.properties 2014-06-23 18:52:57 UTC (rev 2087) @@ -93,6 +93,7 @@ wao.synthesis.planned=Planned wao.ui.chart.numberBoats=Number of boats wao.ui.chart.numberOfBoatsWithBoardings=Number of boats with x boardings +wao.ui.chart.numberOfSolicitations=Number of solicitations since %s to %s wao.ui.samplingPlan.Actual=Actual wao.validation.sampleRow.conflictOnObserver=Observer %s cannot be associated to the line %s because he has to observer, on the same day, for row %s wao.validation.sampleRow.observerNotInCompany=Observer %s doesn't work for company %s Modified: trunk/wao-services/src/main/resources/i18n/wao-services_fr_FR.properties =================================================================== --- trunk/wao-services/src/main/resources/i18n/wao-services_fr_FR.properties 2014-06-22 18:10:23 UTC (rev 2086) +++ trunk/wao-services/src/main/resources/i18n/wao-services_fr_FR.properties 2014-06-23 18:52:57 UTC (rev 2087) @@ -90,6 +90,7 @@ wao.synthesis.planned=Planifié wao.ui.chart.numberBoats=Nombre de navires wao.ui.chart.numberOfBoatsWithBoardings=Nombres de navires avec x embarquements +wao.ui.chart.numberOfSolicitations=Nombre de sollicitations du %s au %s wao.ui.samplingPlan.Actual=Réalisé wao.validation.sampleRow.conflictOnObserver=L'observateur %s ne peut être associé à la ligne %s car il doit observer, le même jour, pour la ligne %s wao.validation.sampleRow.observerNotInCompany=L'observateur %s ne fait pas parti de la société %s Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/SynthesisAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/SynthesisAction.java 2014-06-22 18:10:23 UTC (rev 2086) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/SynthesisAction.java 2014-06-23 18:52:57 UTC (rev 2087) @@ -56,7 +56,7 @@ getSession().setSynthesisFilter(filter); - synthesis = service.getObsMerSynthesis(filter); + synthesis = service.getSynthesis(filter); return SUCCESS; }