Author: chatellier Date: 2011-02-04 13:43:58 +0000 (Fri, 04 Feb 2011) New Revision: 685 Log: Add application zone in chart title Modified: trunk/changelog.txt trunk/coser-business/src/main/java/fr/ifremer/coser/services/PublicationService.java trunk/coser-business/src/main/java/fr/ifremer/coser/services/WebService.java Modified: trunk/changelog.txt =================================================================== --- trunk/changelog.txt 2011-02-04 13:33:27 UTC (rev 684) +++ trunk/changelog.txt 2011-02-04 13:43:58 UTC (rev 685) @@ -4,6 +4,8 @@ 1.0.0-beta4 ----------- + * Add application zone in chart title + * Add context support in application config for deploiement * Autoselection next selection accordion after validation * Global i18n changes * Add info about context menu Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/PublicationService.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/services/PublicationService.java 2011-02-04 13:33:27 UTC (rev 684) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/PublicationService.java 2011-02-04 13:43:58 UTC (rev 685) @@ -657,18 +657,20 @@ * @param resultDirectory result directory * @param rsufiResult rsufiresult * @param indicator indicator + * @param zoneDisplayName zone full name * @param indicatorName indicatorName localized * @param unit data unit * @return generated graph image (temp file) * @throws CoserBusinessException */ public File getRsufiResultComChart(Project project, File resultDirectory, - RSufiResult rsufiResult, String indicator, String indicatorName, String unit) throws CoserBusinessException { + RSufiResult rsufiResult, String indicator, + String zoneDisplayName, String indicatorName, String unit) throws CoserBusinessException { File result = null; // get graph title - String title = projectService.getProjectSurveyName(resultDirectory, rsufiResult); + String title = zoneDisplayName; title += " - " + indicatorName; // le fichier estcomind @@ -776,18 +778,20 @@ * @param rsufiResult rsufi result * @param species species * @param indicator indicator + * @param zoneDisplayName zone full name * @param indicatorName indicatorName localized * @param unit data unit * @return generated image file (temp file) * @throws CoserBusinessException */ public File getRsufiResultPopChart(Project project, File resultDirectory, - RSufiResult rsufiResult, String species, String indicator, String indicatorName, String unit) throws CoserBusinessException { + RSufiResult rsufiResult, String species, String indicator, + String zoneDisplayName, String indicatorName, String unit) throws CoserBusinessException { File result = null; // get graph title - String title = projectService.getProjectSurveyName(resultDirectory, rsufiResult); + String title = zoneDisplayName; title += " - " + indicatorName; title += " - " + projectService.getSpeciesDisplayName(project, species); Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/WebService.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/services/WebService.java 2011-02-04 13:33:27 UTC (rev 684) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/WebService.java 2011-02-04 13:43:58 UTC (rev 685) @@ -73,7 +73,6 @@ import org.apache.http.entity.mime.content.StringBody; import org.apache.http.impl.client.DefaultHttpClient; import org.nuiton.util.FileUtil; -import org.nuiton.util.Resource; import org.nuiton.util.StringUtil; import org.nuiton.util.ZipUtil; import org.w3c.dom.Document; @@ -1549,14 +1548,16 @@ Project project = projectService.openProject(projectFile.getName(), projectsDirectory); String indicatorName = (String)getIndicatorsMap().get(indicator, locale); String unit = (String)getIndicatorsMap().get(indicator, "unit"); - + + String zoneDisplayName = getZoneFullName(zone); + if (species == null) { // title = surveyName - indicateur - result = publicationService.getRsufiResultComChart(project, resultFile, rsufiResult, indicator, indicatorName, unit); + result = publicationService.getRsufiResultComChart(project, resultFile, rsufiResult, indicator, zoneDisplayName, indicatorName, unit); } else { // title = surveyName - indicateur - species - result = publicationService.getRsufiResultPopChart(project, resultFile, rsufiResult, species, indicator, indicatorName, unit); + result = publicationService.getRsufiResultPopChart(project, resultFile, rsufiResult, species, indicator, zoneDisplayName, indicatorName, unit); } break; }