November 2010 - Wao-commits - mailman.cloud.codelutin.com

[Suiviobsmer-commits] r737 - trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components
by bleny＠users.labs.libre-entreprise.org Nov. 4, 2010

Nov. 4, 2010

Author: bleny Date: 2010-11-04 20:21:42 +0000 (Thu, 04 Nov 2010) New Revision: 737 Log: layout for square brackets (no line break) Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/IndicatorLevels.tml Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/IndicatorLevels.tml =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/IndicatorLevels.tml 2010-11-04 10:32:57 UTC (rev 736) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/IndicatorLevels.tml 2010-11-04 20:21:42 UTC (rev 737) @@ -51,15 +51,10 @@ ${indicatorLevel.upperBound} <p:else> <t:if test="indicatorLevel.lowerBoundPositiveInfinity"> - ] ${indicatorLevel.upperBound} et plus + ] ${indicatorLevel.upperBound} et plus <p:else> - [ ${indicatorLevel.lowerBound} à ${indicatorLevel.upperBound} - <t:if test="indicatorLevel.upperBoundIncluded"> - ] - <p:else> - [ - </p:else> - </t:if> + [ ${indicatorLevel.lowerBound} à + ${indicatorLevel.upperBound} <t:if test="indicatorLevel.upperBoundIncluded">]<p:else>[</p:else></t:if> </p:else> </t:if> </p:else>

1 0

[Suiviobsmer-commits] r736 - trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages
by bleny＠users.labs.libre-entreprise.org Nov. 4, 2010

Nov. 4, 2010

Author: bleny Date: 2010-11-04 10:32:57 +0000 (Thu, 04 Nov 2010) New Revision: 736 Log: bugfix : using filters no longer change page in synthesis Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java 2010-11-03 18:42:33 UTC (rev 735) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java 2010-11-04 10:32:57 UTC (rev 736) @@ -47,6 +47,7 @@ import fr.ifremer.wao.ui.data.RequiresAuthentication; import fr.ifremer.wao.ui.services.WaoManager; import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.lang.BooleanUtils; import org.apache.tapestry5.Block; import org.apache.tapestry5.ComponentResources; import org.apache.tapestry5.RenderSupport; @@ -176,11 +177,16 @@ } Block activeBlock; - if (showGlobalSynthesis) { + if (BooleanUtils.isTrue(showGlobalSynthesis)) { activeBlock = resources.getBlock("globalSynthesis"); } else { activeBlock = resources.getBlock("ind" + getActiveSynthesis().ordinal()); } + + if (log.isDebugEnabled()) { + log.debug("activeBlock = " + activeBlock); + } + return activeBlock; } @@ -192,11 +198,11 @@ return ChartType.class.getName(); } - private boolean showGlobalSynthesis; + @Persist + private Boolean showGlobalSynthesis; public String getActionShowGlobalSynthesis() { - showGlobalSynthesis = true; - return "globalSynthesis"; + return "showGlobalSynthesis"; } @@ -216,15 +222,23 @@ @Log Object onAction(String actionType, String actionValue) { + + showGlobalSynthesis = false; + + if (log.isDebugEnabled()) { + log.debug("actionType = " + actionType); + } + // Delegator action (menu) if (actionType.equals(SynthesisId.class.getName())) { activeSynthesis = SynthesisId.valueOf(actionValue); return delegator.getBody(); - // Change chart type for dataSampling + // Change chart type for dataSampling } else if (actionType.equals(ChartType.class.getName())) { - dataSamplingChartType = ChartType.valueOf(actionValue); - } else if (actionType.equals("ShowGlobalSynthesis")) { - return "globalSynthesis"; + dataSamplingChartType = ChartType.valueOf(actionValue); + } else if (actionType.equals("showGlobalSynthesis")) { + showGlobalSynthesis = true; + return delegator.getBody(); } return this; }

1 0

[Suiviobsmer-commits] r735 - in trunk: wao-business/src/main/java/fr/ifremer/wao/service wao-business/src/main/resources/i18n wao-business/src/main/xmi wao-ui/src/main/java/fr/ifremer/wao/ui/pages wao-ui/src/main/webapp
by bleny＠users.labs.libre-entreprise.org Nov. 3, 2010

Nov. 3, 2010

Author: bleny Date: 2010-11-03 18:42:33 +0000 (Wed, 03 Nov 2010) New Revision: 735 Log: update service synthesis to support modification of all global synthesis parameters Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java trunk/wao-business/src/main/resources/i18n/wao-business-en_GB.properties trunk/wao-business/src/main/resources/i18n/wao-business-fr_FR.properties trunk/wao-business/src/main/xmi/wao.zargo trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Administration.java trunk/wao-ui/src/main/webapp/Administration.tml Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java 2010-11-03 16:51:31 UTC (rev 734) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java 2010-11-03 18:42:33 UTC (rev 735) @@ -895,64 +895,97 @@ } @Override - protected void executeUpdateGlobalSynthesisParameter(TopiaContext transaction, - Indicator indicator, WaoUser author, String comment) - throws Exception { - String logText = ""; + protected void executeUpdateGlobalSynthesisParameters(TopiaContext transaction, + GlobalSynthesisParameters parameters, WaoUser author, String comment) + throws Exception { + // will be true if something has changed and we need to add a log for that boolean somethingChanged = false; + String logText = ""; - // fist, find the indicator - Indicator oldIndicator = WaoDAOHelper.getIndicatorDAO(transaction) - .findByIndicatorId(indicator.getIndicatorId()); - // find what have been changed - boolean coefficientChanged = indicator.getCoefficient() - != oldIndicator.getCoefficient(); - if (coefficientChanged) { - somethingChanged = true; + List<Indicator> allIndicators = new ArrayList<Indicator>(); + allIndicators.addAll(parameters.getParameters()); + allIndicators.add(parameters.getGlobalIndicator()); + + for (Indicator indicator : allIndicators) { - // add something to log - // update database - logText += String.format( - "Modification du coefficient de l'indicateur « %s » " + - "(ancienne valeur = %s, nouvelle valeur = %s).\n\n", - indicator.getSynthesisId().getLabel(), - oldIndicator.getCoefficient(), - indicator.getCoefficient()); + boolean indicatorChanged = false; - oldIndicator.setCoefficient(indicator.getCoefficient()); - } + // fist, find the indicator + Indicator oldIndicator = WaoDAOHelper.getIndicatorDAO(transaction) + .findByIndicatorId(indicator.getIndicatorId()); - // new compare old and new level bounds - for (IndicatorLevel level : oldIndicator.getIndicatorLevel()) { - IndicatorLevel newLevel = null; + // now, find what has changed + boolean coefficientChanged = false; + if (oldIndicator.getCoefficient() != null) { + coefficientChanged = ! oldIndicator.getCoefficient(). + equals( indicator.getCoefficient()); + } - // set newLevel - for (IndicatorLevel tempLevel : indicator.getIndicatorLevel()) { - if (tempLevel.getLevel() == level.getLevel()) { - newLevel = tempLevel; - } + if (log.isDebugEnabled()) { + log.debug("old coefficient value = " + oldIndicator.getCoefficient() + + " new coefficient value = " + indicator.getCoefficient() + + " coefficientChanged = " + coefficientChanged); } + if (coefficientChanged) { + indicatorChanged = true; - boolean upperBoundChanged = level.getUpperBound() - != newLevel.getUpperBound(); - if (upperBoundChanged) { - somethingChanged = true; - + // add something to log + // update database logText += String.format( - "Modification du seuil de transition entre les niveaux " - + "%s et %s de l'indicateur « %s » (ancienne valeur = %s" - + ", nouvelle valeur = %s).\n\n", - level.getLevel(), level.getLevel() + 1, + "Modification du coefficient de l'indicateur « %s » " + + "(ancienne valeur = %s, nouvelle valeur = %s).\n\n", indicator.getSynthesisId().getLabel(), - level.getUpperBound(), newLevel.getUpperBound()); + oldIndicator.getCoefficient(), + indicator.getCoefficient()); - level.setUpperBound(newLevel.getUpperBound()); + oldIndicator.setCoefficient(indicator.getCoefficient()); + } - WaoDAOHelper.getIndicatorLevelDAO(transaction).update(level); + // new compare old and new level bounds + for (IndicatorLevel level : oldIndicator.getIndicatorLevel()) { + IndicatorLevel newLevel = null; + + // set newLevel + for (IndicatorLevel tempLevel : indicator.getIndicatorLevel()) { + if (tempLevel.getLevel() == level.getLevel()) { + newLevel = tempLevel; + } + } + + boolean upperBoundChanged = level.getUpperBound() + != newLevel.getUpperBound(); + if (upperBoundChanged) { + indicatorChanged = true; + + String changedIndicatorName; + if (indicator.getSynthesisId() == null) { + changedIndicatorName = "Bilan de la synthèse globale"; + } else { + changedIndicatorName = indicator.getSynthesisId().getLabel(); + } + + logText += String.format( + "Modification du seuil de transition entre les niveaux " + + "%s et %s de l'indicateur « %s » (ancienne valeur = %s" + + ", nouvelle valeur = %s).\n\n", + level.getLevel(), level.getLevel() + 1, + changedIndicatorName, + level.getUpperBound(), newLevel.getUpperBound()); + + level.setUpperBound(newLevel.getUpperBound()); + + WaoDAOHelper.getIndicatorLevelDAO(transaction).update(level); + } + } + if (indicatorChanged) { + // finally, update the indicator + WaoDAOHelper.getIndicatorDAO(transaction).update(oldIndicator); + somethingChanged = true; + } } if (somethingChanged) { @@ -972,15 +1005,6 @@ // add entity logText WaoDAOHelper.getIndicatorLogDAO(transaction).create(indicatorLog); - // attach the new indicator log to the concerned indicator - // Collection indicatorLogs = indicator.getIndicatorLog(); - Collection<IndicatorLog> indicatorLogs = oldIndicator.getIndicatorLog(); - indicatorLogs.add(indicatorLog); - oldIndicator.setIndicatorLog(indicatorLogs); - - // finally, update the indicator - WaoDAOHelper.getIndicatorDAO(transaction).update(oldIndicator); - transaction.commitTransaction(); } else { log.warn("no modification were found in global synthesis " + Modified: trunk/wao-business/src/main/resources/i18n/wao-business-en_GB.properties =================================================================== --- trunk/wao-business/src/main/resources/i18n/wao-business-en_GB.properties 2010-11-03 16:51:31 UTC (rev 734) +++ trunk/wao-business/src/main/resources/i18n/wao-business-en_GB.properties 2010-11-03 18:42:33 UTC (rev 735) @@ -90,7 +90,7 @@ wao.error.serviceSynthesis.getGlobalSynthesisParameters=Unable to get data about global synthesis parameters wao.error.serviceSynthesis.getGlobalSynthesisResult= wao.error.serviceSynthesis.getNonComplianceBoardingIndicator= -wao.error.serviceSynthesis.updateGlobalSynthesisParameter=Unable to update global synthesis parameters +wao.error.serviceSynthesis.updateGlobalSynthesisParameters=Unable to update global synthesis parameters wao.error.serviceUser.connect= wao.error.serviceUser.createDefaultAdmin= wao.error.serviceUser.createUpdateCompany= Modified: trunk/wao-business/src/main/resources/i18n/wao-business-fr_FR.properties =================================================================== --- trunk/wao-business/src/main/resources/i18n/wao-business-fr_FR.properties 2010-11-03 16:51:31 UTC (rev 734) +++ trunk/wao-business/src/main/resources/i18n/wao-business-fr_FR.properties 2010-11-03 18:42:33 UTC (rev 735) @@ -89,7 +89,7 @@ wao.error.serviceSynthesis.getGlobalSynthesisParameters=Impossible de r\u00E9cup\u00E9rer les donn\u00E9es concernant les indicateurs pour la synth\u00E8se globale wao.error.serviceSynthesis.getGlobalSynthesisResult= wao.error.serviceSynthesis.getNonComplianceBoardingIndicator=Impossible de r\u00E9cup\u00E9rer l'indicateur de non respect du nombre d'observateurs embarqu\u00E9s -wao.error.serviceSynthesis.updateGlobalSynthesisParameter=Impossible de mettre \u00E0 jour les param\u00E8tres de la synth\u00E8se globale +wao.error.serviceSynthesis.updateGlobalSynthesisParameters=Impossible de mettre \u00E0 jour les param\u00E8tres de la synth\u00E8se globale wao.error.serviceUser.connect=Une erreur est survenue lors de la demande de connexion wao.error.serviceUser.createDefaultAdmin=Impossible de cr\u00E9er l'administrateur par d\u00E9faut wao.error.serviceUser.createUpdateCompany=Impossible de cr\u00E9er ou de mettre \u00E0 jour la soci\u00E9t\u00E9 Modified: trunk/wao-business/src/main/xmi/wao.zargo =================================================================== (Binary files differ) Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Administration.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Administration.java 2010-11-03 16:51:31 UTC (rev 734) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Administration.java 2010-11-03 18:42:33 UTC (rev 735) @@ -640,10 +640,9 @@ } void onSuccessFromSynthesisParametersForm() { - for (Indicator indicator : getGlobalSynthesisParameters().getParameters()) { - serviceSynthesis.updateGlobalSynthesisParameter - (indicator, currentUser.getUser(), comment); - } + serviceSynthesis.updateGlobalSynthesisParameters( + getGlobalSynthesisParameters(), currentUser.getUser(), comment); + getGlobalSynthesisParameters(); } /* variable used in loop */ Modified: trunk/wao-ui/src/main/webapp/Administration.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Administration.tml 2010-11-03 16:51:31 UTC (rev 734) +++ trunk/wao-ui/src/main/webapp/Administration.tml 2010-11-03 18:42:33 UTC (rev 735) @@ -182,7 +182,7 @@ <t:errors t:banner="message:errors-banner" />  - <t:loop t:source="globalSynthesisParameters.parameters" t:value="indicator" volatile="true"> + <t:loop t:source="globalSynthesisParameters.parameters" t:value="indicator" t:volatile="true"> <t:indicatorLevels t:indicator="indicator" editable="true" /> </t:loop> @@ -195,7 +195,7 @@ <table class="indicatorLevels"> <tr> - <td t:type="loop" t:source="globalSynthesisParameters.globalIndicator.indicatorLevel" t:value="indicatorLevel"> + <td t:type="loop" t:source="globalSynthesisParameters.globalIndicator.indicatorLevel" t:value="indicatorLevel" t:volatile="true"> ${globalIndicatorValue.label} </td> </tr>

1 0

[Suiviobsmer-commits] r734 - in trunk: . src/announcement src/site/rst wao-business wao-business/src/main/filters wao-business/src/main/java/fr/ifremer/wao wao-business/src/main/java/fr/ifremer/wao/bean wao-business/src/main/java/fr/ifremer/wao/entity wao-business/src/main/java/fr/ifremer/wao/service wao-business/src/main/xmi wao-business/src/test/java/fr/ifremer/wao wao-business/src/test/java/fr/ifremer/wao/io wao-business/src/test/java/fr/ifremer/wao/service wao-business/src/test/resources wao-business/sr
by bleny＠users.labs.libre-entreprise.org Nov. 3, 2010

Nov. 3, 2010

Author: bleny Date: 2010-11-03 16:51:31 +0000 (Wed, 03 Nov 2010) New Revision: 734 Log: merge changes from branches 1.5.4 : will bring bugfixes into 1.6 Added: trunk/src/announcement/release-email-1.5.4.txt trunk/wao-ui/src/main/webapp/js/administration.js trunk/wao-ui/src/main/webapp/js/news.js Removed: trunk/wao-ui/src/main/webapp/js/AdminUserSelect.js trunk/wao-ui/src/main/webapp/js/NewsHider.js Modified: trunk/ trunk/changelog.txt trunk/src/site/rst/index.rst trunk/wao-business/ trunk/wao-business/pom.xml trunk/wao-business/src/main/filters/Wao.properties trunk/wao-business/src/main/java/fr/ifremer/wao/ trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java trunk/wao-business/src/main/java/fr/ifremer/wao/WaoBusinessException.java trunk/wao-business/src/main/java/fr/ifremer/wao/WaoMigrationCallBack.java trunk/wao-business/src/main/java/fr/ifremer/wao/bean/CompanyBoatInfosImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SynthesisId.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/WaoUserImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ trunk/wao-business/src/main/xmi/wao.properties trunk/wao-business/src/main/xmi/wao.zargo trunk/wao-business/src/test/java/fr/ifremer/wao/ trunk/wao-business/src/test/java/fr/ifremer/wao/TestManager.java trunk/wao-business/src/test/java/fr/ifremer/wao/WaoUtilsTest.java trunk/wao-business/src/test/java/fr/ifremer/wao/io/ImportHelperTest.java trunk/wao-business/src/test/java/fr/ifremer/wao/service/ActivityCalendarImportTest.java trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceBoatImplTest.java trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactInternalTest.java trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceReferentialImplTest.java trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSamplingImplTest.java trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSynthesisImplTest.java trunk/wao-business/src/test/resources/WaoTest.properties trunk/wao-business/src/test/resources/import/echantillonnage.csv trunk/wao-business/src/test/resources/import/navires.csv trunk/wao-business/src/test/resources/import/zonesPeche.csv trunk/wao-ui/ trunk/wao-ui/src/main/java/fr/ifremer/wao/ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/WaoPropertyChangeListener.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Administration.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Index.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/WaoManager.java trunk/wao-ui/src/main/resources/fr/ifremer/wao/ trunk/wao-ui/src/main/webapp/Contacts.tml trunk/wao-ui/src/main/webapp/js/contacts.js Property changes on: trunk ___________________________________________________________________ Added: svn:mergeinfo + /branches/wao-1.5.x:679-733 Modified: trunk/changelog.txt =================================================================== --- trunk/changelog.txt 2010-11-03 13:37:52 UTC (rev 733) +++ trunk/changelog.txt 2010-11-03 16:51:31 UTC (rev 734) @@ -3,6 +3,16 @@ Historique des versions +1.5.4 +----- + +Anomalies ++++++++++ + +- [fdesbois] Ano #2526 : Mail automatique non fonctionnel sous IE. +- [fdesbois] Ano #2540 : La validation programme ne fonctionne plus sur un + contact avec l'état "refus", "refus définitif" ou "non abouti. + 1.5.3 ----- Copied: trunk/src/announcement/release-email-1.5.4.txt (from rev 733, branches/wao-1.5.x/src/announcement/release-email-1.5.4.txt) =================================================================== --- trunk/src/announcement/release-email-1.5.4.txt (rev 0) +++ trunk/src/announcement/release-email-1.5.4.txt 2010-11-03 16:51:31 UTC (rev 734) @@ -0,0 +1,21 @@ + +Un correctif 1.5.4 pour la version 1.5 de Wao est disponible. + +Résolution d'anomalies : + +- Mail automatique non fonctionnel sous IE. [fdesbois-Ano #2526] +- La validation programme ne fonctionne plus sur un contact refusé. + [fdesbois-Ano #2540] + +Documentation : + +http://suiviobsmer.labs.libre-entreprise.org/wao/ + +Téléchargement : + +https://labs.libre-entreprise.org/frs/?group_id=154 + +Cordialement, + +L'équipe Wao + Modified: trunk/src/site/rst/index.rst =================================================================== --- trunk/src/site/rst/index.rst 2010-11-03 13:37:52 UTC (rev 733) +++ trunk/src/site/rst/index.rst 2010-11-03 16:51:31 UTC (rev 734) @@ -26,3 +26,8 @@ .. - Application permettant le suivi des embarquements effectués sur des navires de pêche dans le cadre d'observations scientifiques. + +Cette application n'est pas complètement supporté par le navigateur Microsoft Internet Explorer. Il est préférable d'utiliser un +autre navigateur Internet comme `Mozilla Firefox`_ . + +.. _Mozilla Firefox: http://www.mozilla-europe.org/fr/firefox/ Property changes on: trunk/wao-business ___________________________________________________________________ Deleted: svn:mergeinfo - Modified: trunk/wao-business/pom.xml =================================================================== --- trunk/wao-business/pom.xml 2010-11-03 13:37:52 UTC (rev 733) +++ trunk/wao-business/pom.xml 2010-11-03 16:51:31 UTC (rev 734) @@ -205,9 +205,9 @@ <scm> <url>http://labs.libre-entreprise.org/scm/viewvc.php/trunk/wao-business/?root=su…</url> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-business</connection> - <developerConnection>scm:svn:svn+ssh://${username}@labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-business</developerConnection> - </scm> + <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-business</connection> + <developerConnection>scm:svn:svn+ssh://${username}@labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-business</developerConnection> + </scm>   Property changes on: trunk/wao-business/src/main/filters/Wao.properties ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoBusinessException.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoMigrationCallBack.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/CompanyBoatInfosImpl.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SynthesisId.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/WaoUserImpl.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/service ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/wao-business/src/main/xmi/wao.properties ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/wao-business/src/main/xmi/wao.zargo ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/wao-business/src/test/java/fr/ifremer/wao ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/wao-business/src/test/java/fr/ifremer/wao/TestManager.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/wao-business/src/test/java/fr/ifremer/wao/WaoUtilsTest.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/wao-business/src/test/java/fr/ifremer/wao/io/ImportHelperTest.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ActivityCalendarImportTest.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceBoatImplTest.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactInternalTest.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceReferentialImplTest.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSamplingImplTest.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSynthesisImplTest.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/wao-business/src/test/resources/WaoTest.properties ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/wao-business/src/test/resources/import/echantillonnage.csv ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/wao-business/src/test/resources/import/navires.csv ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/wao-business/src/test/resources/import/zonesPeche.csv ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/wao-ui ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/wao-ui/src/main/java/fr/ifremer/wao ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/WaoPropertyChangeListener.java ___________________________________________________________________ Deleted: svn:mergeinfo - Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Administration.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Administration.java 2010-11-03 13:37:52 UTC (rev 733) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Administration.java 2010-11-03 16:51:31 UTC (rev 734) @@ -92,7 +92,7 @@ */ @RequiresAuthentication(value = {UserRole.ADMIN, UserRole.COORDINATOR}, readOnlyAllowed = false) @IncludeStylesheet("context:css/administration.css") - at IncludeJavaScriptLibrary("context:js/AdminUserSelect.js") + at IncludeJavaScriptLibrary("context:js/administration.js") public class Administration { @InjectComponent Property changes on: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java ___________________________________________________________________ Deleted: svn:mergeinfo - Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Index.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Index.java 2010-11-03 13:37:52 UTC (rev 733) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Index.java 2010-11-03 16:51:31 UTC (rev 734) @@ -56,7 +56,7 @@ */ @RequiresAuthentication @IncludeStylesheet("context:css/news.css") - at IncludeJavaScriptLibrary("context:js/NewsHider.js") + at IncludeJavaScriptLibrary("context:js/news.js") public class Index { @Inject Property changes on: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/WaoManager.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/wao-ui/src/main/resources/fr/ifremer/wao ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: trunk/wao-ui/src/main/webapp/Contacts.tml ___________________________________________________________________ Deleted: svn:mergeinfo - Deleted: trunk/wao-ui/src/main/webapp/js/AdminUserSelect.js =================================================================== --- trunk/wao-ui/src/main/webapp/js/AdminUserSelect.js 2010-11-03 13:37:52 UTC (rev 733) +++ trunk/wao-ui/src/main/webapp/js/AdminUserSelect.js 2010-11-03 16:51:31 UTC (rev 734) @@ -1,53 +0,0 @@ -/* - * #%L - * Wao :: Web Interface - * %% - * Copyright (C) 2009 - 2010 Ifremer - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * #L% - */ -/** - * This class is used to manage manually user select on Administration page. - * Options need style depends on inactivity of users. So we use javascript to - * manage dynamic states of the select. Initialization if needed (the correct - * option to select) then use a hidden field 'hiddenUserId' to keep userId - * context (ids are values of options). - * This hidden field will be interpreted by Tapestry when form will be submit. - */ -AdminUserSelect = Class.create({ - initialize: function() { - this.hiddenUserId = $('userActionsForm').hiddenUserId; - this.userSelect = $('userActionsForm').users; - this.userSelect.observe('change', this.updateUserId.bind(this)); - - var userId = $F(this.hiddenUserId); - - // Initialize selected option - if (userId) { - var options = this.userSelect.select('option'); - for (i = 0; i < options.length; i++) { - if (options[i].value == userId) { - options[i].selected = true; - break; - } - } - } - //Tapestry.debug('Initialized !'); - }, - updateUserId: function(event) { - //Tapestry.debug('select value : ' + $F(this.userSelect)); - this.hiddenUserId.setValue($F(this.userSelect)); - } -}); Deleted: trunk/wao-ui/src/main/webapp/js/NewsHider.js =================================================================== --- trunk/wao-ui/src/main/webapp/js/NewsHider.js 2010-11-03 13:37:52 UTC (rev 733) +++ trunk/wao-ui/src/main/webapp/js/NewsHider.js 2010-11-03 16:51:31 UTC (rev 734) @@ -1,100 +0,0 @@ -/* - * #%L - * Wao :: Web Interface - * %% - * Copyright (C) 2009 - 2010 Ifremer - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * #L% - */ -/** - * This class is used to hide news details depends on an anchor. This anchor - * must be called 'details' and be surrounded by a paragraph block (<p>) in - * the news content. The anchor will be transformed in a clickable link, then - * the rest of the news will be hidden using NewsDetails object. - */ -NewsHider = Class.create({ - initialize: function() { - this.allNews = $('so-news').select('div.news-content'); - this.anchorPattern = 'a[name="details"]'; - }, - /** - * Method to call to hide all news that contains the anchor 'details' - */ - hideAllNewsDetails: function() { - for (j = 0; j < this.allNews.length; j++) { - this.hideNewsDetails(this.allNews[j]); - } - }, - /** - * Hide a {news} if contains an anchor called 'details'. A NewsDetails object - * will be instantiate to transform the anchor found and hide the rest of - * the news in a hiddenBlock. - */ - hideNewsDetails: function(news) { - // Select all paragraphs in the news - var paragraphs = news.select('p'); - //Tapestry.debug('nb paragraphs in news : ' + paragraphs.length); - - for (i = 0; i < paragraphs.length; i++) { - var paragraph = paragraphs[i]; - - // Check the firstDescendant in the paragraph, we take only anchor called 'details' - if (paragraph.firstDescendant() && paragraph.firstDescendant().match(this.anchorPattern)) { - var anchor = paragraph.firstDescendant(); - - //Tapestry.debug('Find anchor !'); - - // paragraphs to hide are the next siblings of current paragraph - var paragraphsToHide = paragraph.nextSiblings(); - - var details = new NewsDetails(anchor, paragraphsToHide); - - // append the hidden block to the news - news.appendChild(details.hiddenBlock); - break; - } - } - } -}); - -/** - * This class is used to transform an {anchor} in clickable link to display a - * hidden block as news details. The {paragraphsToHide} will be wrapped into - * a div hidden element. When user will click on the {anchor}, the hidden - * block will be toggled to be displayed or not. - */ -NewsDetails = Class.create({ - initialize: function(anchor, paragraphsToHide) { - - //Tapestry.debug('create NewsDetails'); - - // Update params of the anchor to be clickable - anchor.update('Lire la suite...'); - anchor.addClassName('news-details-link'); - // Bind the click on the anchor with the toggle on hiddenBlock - anchor.observe('click', this.toggleDetails.bind(this)); - - // Create hidden block - this.hiddenBlock = document.createElement('div'); - this.hiddenBlock.addClassName('hidden'); - - for (i = 0; i < paragraphsToHide.length; i++) { - this.hiddenBlock.appendChild(paragraphsToHide[i]); - } - }, - toggleDetails: function(event) { - this.hiddenBlock.toggleClassName('hidden'); - } -}); Copied: trunk/wao-ui/src/main/webapp/js/administration.js (from rev 733, branches/wao-1.5.x/wao-ui/src/main/webapp/js/administration.js) =================================================================== --- trunk/wao-ui/src/main/webapp/js/administration.js (rev 0) +++ trunk/wao-ui/src/main/webapp/js/administration.js 2010-11-03 16:51:31 UTC (rev 734) @@ -0,0 +1,53 @@ +/* + * #%L + * Wao :: Web Interface + * %% + * Copyright (C) 2009 - 2010 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +/** + * This class is used to manage manually user select on Administration page. + * Options need style depends on inactivity of users. So we use javascript to + * manage dynamic states of the select. Initialization if needed (the correct + * option to select) then use a hidden field 'hiddenUserId' to keep userId + * context (ids are values of options). + * This hidden field will be interpreted by Tapestry when form will be submit. + */ +AdminUserSelect = Class.create({ + initialize: function() { + this.hiddenUserId = $('userActionsForm').hiddenUserId; + this.userSelect = $('userActionsForm').users; + this.userSelect.observe('change', this.updateUserId.bind(this)); + + var userId = $F(this.hiddenUserId); + + // Initialize selected option + if (userId) { + var options = this.userSelect.select('option'); + for (i = 0; i < options.length; i++) { + if (options[i].value == userId) { + options[i].selected = true; + break; + } + } + } + //Tapestry.debug('Initialized !'); + }, + updateUserId: function(event) { + //Tapestry.debug('select value : ' + $F(this.userSelect)); + this.hiddenUserId.setValue($F(this.userSelect)); + } +}); Modified: trunk/wao-ui/src/main/webapp/js/contacts.js =================================================================== --- trunk/wao-ui/src/main/webapp/js/contacts.js 2010-11-03 13:37:52 UTC (rev 733) +++ trunk/wao-ui/src/main/webapp/js/contacts.js 2010-11-03 16:51:31 UTC (rev 734) @@ -142,7 +142,8 @@ initialize: function(message, contactState) { this.contactState = contactState; this.message = message; - $('contactsForm').saveContact.observe('click', this.doConfirm.bind(this)); + + $('saveContact').observe('click', this.doConfirm.bind(this)); }, doConfirm: function(event) { Copied: trunk/wao-ui/src/main/webapp/js/news.js (from rev 733, branches/wao-1.5.x/wao-ui/src/main/webapp/js/news.js) =================================================================== --- trunk/wao-ui/src/main/webapp/js/news.js (rev 0) +++ trunk/wao-ui/src/main/webapp/js/news.js 2010-11-03 16:51:31 UTC (rev 734) @@ -0,0 +1,100 @@ +/* + * #%L + * Wao :: Web Interface + * %% + * Copyright (C) 2009 - 2010 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +/** + * This class is used to hide news details depends on an anchor. This anchor + * must be called 'details' and be surrounded by a paragraph block (<p>) in + * the news content. The anchor will be transformed in a clickable link, then + * the rest of the news will be hidden using NewsDetails object. + */ +NewsHider = Class.create({ + initialize: function() { + this.allNews = $('so-news').select('div.news-content'); + this.anchorPattern = 'a[name="details"]'; + }, + /** + * Method to call to hide all news that contains the anchor 'details' + */ + hideAllNewsDetails: function() { + for (j = 0; j < this.allNews.length; j++) { + this.hideNewsDetails(this.allNews[j]); + } + }, + /** + * Hide a {news} if contains an anchor called 'details'. A NewsDetails object + * will be instantiate to transform the anchor found and hide the rest of + * the news in a hiddenBlock. + */ + hideNewsDetails: function(news) { + // Select all paragraphs in the news + var paragraphs = news.select('p'); + //Tapestry.debug('nb paragraphs in news : ' + paragraphs.length); + + for (i = 0; i < paragraphs.length; i++) { + var paragraph = paragraphs[i]; + + // Check the firstDescendant in the paragraph, we take only anchor called 'details' + if (paragraph.firstDescendant() && paragraph.firstDescendant().match(this.anchorPattern)) { + var anchor = paragraph.firstDescendant(); + + //Tapestry.debug('Find anchor !'); + + // paragraphs to hide are the next siblings of current paragraph + var paragraphsToHide = paragraph.nextSiblings(); + + var details = new NewsDetails(anchor, paragraphsToHide); + + // append the hidden block to the news + news.appendChild(details.hiddenBlock); + break; + } + } + } +}); + +/** + * This class is used to transform an {anchor} in clickable link to display a + * hidden block as news details. The {paragraphsToHide} will be wrapped into + * a div hidden element. When user will click on the {anchor}, the hidden + * block will be toggled to be displayed or not. + */ +NewsDetails = Class.create({ + initialize: function(anchor, paragraphsToHide) { + + //Tapestry.debug('create NewsDetails'); + + // Update params of the anchor to be clickable + anchor.update('Lire la suite...'); + anchor.addClassName('news-details-link'); + // Bind the click on the anchor with the toggle on hiddenBlock + anchor.observe('click', this.toggleDetails.bind(this)); + + // Create hidden block + this.hiddenBlock = new Element('div'); + this.hiddenBlock.addClassName('hidden'); + + for (i = 0; i < paragraphsToHide.length; i++) { + this.hiddenBlock.appendChild(paragraphsToHide[i]); + } + }, + toggleDetails: function(event) { + this.hiddenBlock.toggleClassName('hidden'); + } +});

1 0

[Suiviobsmer-commits] r733 - in trunk: wao-business/src/main/java/fr/ifremer/wao/service wao-ui/src/main/java/fr/ifremer/wao/ui/pages wao-ui/src/main/webapp
by bleny＠users.labs.libre-entreprise.org Nov. 3, 2010

Nov. 3, 2010

Author: bleny Date: 2010-11-03 13:37:52 +0000 (Wed, 03 Nov 2010) New Revision: 733 Log: added form in admin to change global indicator levels ; fix build Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Administration.java trunk/wao-ui/src/main/webapp/Administration.tml Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java 2010-11-03 11:22:57 UTC (rev 732) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java 2010-11-03 13:37:52 UTC (rev 733) @@ -852,11 +852,13 @@ double lowerBound; double lastUpperBound; + int lastLevelNumber = levels.size() + 1; if (indicator.getSynthesisId() == null) { // this is the global average parameters globalIndicator = indicator; lowerBound = 1.0; lastUpperBound = 6.0; + lastLevelNumber = levels.size(); // start at 0, so don't do +1 } else if (indicator.getSynthesisId() == SynthesisId.IND_ALLEGRO_REACTIVITY) { lowerBound = Double.MAX_VALUE; lastUpperBound = 0.0; @@ -872,8 +874,7 @@ // Finally, adding a last level IndicatorLevelImpl lastIndicatorLevel = new IndicatorLevelImpl(); - int nextLevelNumber = levels.size() + 1; - lastIndicatorLevel.setLevel(nextLevelNumber); + lastIndicatorLevel.setLevel(lastLevelNumber); lastIndicatorLevel.setLowerBound(lowerBound); lastIndicatorLevel.setUpperBound(lastUpperBound); lastIndicatorLevel.setUpperBoundIncluded(true); Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Administration.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Administration.java 2010-11-03 11:22:57 UTC (rev 732) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Administration.java 2010-11-03 13:37:52 UTC (rev 733) @@ -29,11 +29,13 @@ import fr.ifremer.wao.WaoException; import fr.ifremer.wao.WaoProperty; import fr.ifremer.wao.bean.ConnectedUser; +import fr.ifremer.wao.bean.GlobalIndicatorValue; import fr.ifremer.wao.bean.GlobalSynthesisParameters; import fr.ifremer.wao.bean.UserRole; import fr.ifremer.wao.entity.Company; import fr.ifremer.wao.entity.CompanyImpl; import fr.ifremer.wao.entity.Indicator; +import fr.ifremer.wao.entity.IndicatorLevel; import fr.ifremer.wao.entity.WaoUser; import fr.ifremer.wao.io.ImportResults; import fr.ifremer.wao.io.ImportResultsImpl; @@ -644,5 +646,18 @@ } } + /* variable used in loop */ + @Property + private IndicatorLevel indicatorLevel; + public GlobalIndicatorValue getGlobalIndicatorValue() { + if (log.isDebugEnabled()) { + log.debug("indicatorLevel is " + indicatorLevel); + log.debug(indicatorLevel.getLevel() + " is " + + GlobalIndicatorValue.valueOf(indicatorLevel.getLevel())); + } + return GlobalIndicatorValue.valueOf(indicatorLevel.getLevel()); + } + + } Modified: trunk/wao-ui/src/main/webapp/Administration.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Administration.tml 2010-11-03 11:22:57 UTC (rev 732) +++ trunk/wao-ui/src/main/webapp/Administration.tml 2010-11-03 13:37:52 UTC (rev 733) @@ -193,6 +193,26 @@ </tr> </table> + <table class="indicatorLevels"> + <tr> + <td t:type="loop" t:source="globalSynthesisParameters.globalIndicator.indicatorLevel" t:value="indicatorLevel"> + ${globalIndicatorValue.label} + </td> + </tr> + <tr> + <td t:type="loop" t:source="globalSynthesisParameters.globalIndicator.indicatorLevel" t:value="indicatorLevel" volatile="true"> + [ <input type="text" size="3" value="${indicatorLevel.lowerBound}" disabled="disabled" /> ; + <input t:type="textfield" value="indicatorLevel.upperBound" size="3" /> + <t:if test="indicatorLevel.upperBoundIncluded"> + ] + <p:else> + [ + </p:else> + </t:if> + </td> + </tr> + </table> + <div> <p><label>Commentaire sur la modification* :</label></p> <p><input t:type="textarea" t:id="comment" cols="50" rows="5" value="comment"/></p> @@ -200,7 +220,7 @@ <div class="fright"> <a t:type="pagelink" page="IndicatorsHistory"> - <img src="${asset:context:}/img/clock.png" alt="Historique" title="Voir l'historique des modifications des indicateurs" /> + <img src="${asset:context:/img/clock.png}" alt="Historique" title="Voir l'historique des modifications des indicateurs" /> </a> <input t:type="submit" t:id="saveData" class="ico save" value="Save" title="Enregistrer les modifications" /> <input type="reset" class="ico undo" value="Annuler les modificationss" title="Annuler les modifications" />

1 0

[Suiviobsmer-commits] r732 - in trunk: wao-business/src/main/java/fr/ifremer/wao wao-business/src/main/java/fr/ifremer/wao/bean wao-business/src/main/java/fr/ifremer/wao/entity wao-business/src/main/java/fr/ifremer/wao/service wao-business/src/main/xmi wao-ui/src/main/java/fr/ifremer/wao/ui/pages wao-ui/src/main/webapp
by bleny＠users.labs.libre-entreprise.org Nov. 3, 2010

Nov. 3, 2010

Author: bleny Date: 2010-11-03 11:22:57 +0000 (Wed, 03 Nov 2010) New Revision: 732 Log: make global synthesis main indicator depends on data in the DB to make it modifiable by a user Added: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/GlobalSynthesisParametersImpl.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java trunk/wao-business/src/main/java/fr/ifremer/wao/bean/GlobalIndicatorValue.java trunk/wao-business/src/main/java/fr/ifremer/wao/bean/GlobalSynthesisResultImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/IndicatorImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java trunk/wao-business/src/main/xmi/wao.zargo trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Administration.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java trunk/wao-ui/src/main/webapp/Administration.tml trunk/wao-ui/src/main/webapp/Synthesis.tml Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java 2010-11-03 09:10:05 UTC (rev 731) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java 2010-11-03 11:22:57 UTC (rev 732) @@ -355,7 +355,15 @@ coefficientValue)); } + // now insert an indicator corresponding to the global level + String globalIndicatorTopiaId = topiaIndicatorIdPrefix + "g"; + queries.add(String.format(insertIntoIndicator, globalIndicatorTopiaId, + topiaVersion, + topiaCreateDateValue, + null, + null)); + String topiaIndicatorLevelIdPrefix = "fr.ifremer.wao.entities.IndicatorLevel#1286890064000#1929220062_"; int topiaIdSuffix = 0; @@ -397,6 +405,11 @@ queries.add(getInsertIndicatorLevelQuery_1_6(topiaIndicatorLevelIdPrefix + topiaIdSuffix++, 4, 95.0, indicatorTopiaId)); queries.add(getInsertIndicatorLevelQuery_1_6(topiaIndicatorLevelIdPrefix + topiaIdSuffix++, 5, 100.0, indicatorTopiaId)); + + queries.add(getInsertIndicatorLevelQuery_1_6(topiaIndicatorLevelIdPrefix + topiaIdSuffix++, 0, 2.0, globalIndicatorTopiaId)); + queries.add(getInsertIndicatorLevelQuery_1_6(topiaIndicatorLevelIdPrefix + topiaIdSuffix++, 1, 3.0, globalIndicatorTopiaId)); + queries.add(getInsertIndicatorLevelQuery_1_6(topiaIndicatorLevelIdPrefix + topiaIdSuffix++, 2, 5.0, globalIndicatorTopiaId)); + queries.add(getInsertIndicatorLevelQuery_1_6(topiaIndicatorLevelIdPrefix + topiaIdSuffix++, 3, 5.5, globalIndicatorTopiaId)); } /** Help method to create insertion for initial data in table levels. Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/GlobalIndicatorValue.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/bean/GlobalIndicatorValue.java 2010-11-03 09:10:05 UTC (rev 731) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/GlobalIndicatorValue.java 2010-11-03 11:22:57 UTC (rev 732) @@ -23,4 +23,13 @@ public String getLabel() { return _(label); } + + public static GlobalIndicatorValue valueOf(int ordinal) { + for (GlobalIndicatorValue globalIndicatorValue : GlobalIndicatorValue.values()) { + if (globalIndicatorValue.ordinal() == ordinal) { + return globalIndicatorValue; + } + } + return null; + } } Added: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/GlobalSynthesisParametersImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/bean/GlobalSynthesisParametersImpl.java (rev 0) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/GlobalSynthesisParametersImpl.java 2010-11-03 11:22:57 UTC (rev 732) @@ -0,0 +1,26 @@ +package fr.ifremer.wao.bean; + +import fr.ifremer.wao.entity.Indicator; + +public class GlobalSynthesisParametersImpl extends GlobalSynthesisParameters { + + /** in the list of indicators, find the one with given synthesisId. */ + @Override + public Indicator getParameter(SynthesisId synthesisId) { + for (Indicator indicator : getParameters()) { + if (indicator.getSynthesisId().equals(synthesisId)) { + return indicator; + } + } + return null; + } + + @Override + public Double getTotalCoefficients() { + Double totalCoefficient = 0.0; + for (Indicator indicator : getParameters()) { + totalCoefficient += indicator.getCoefficient(); + } + return totalCoefficient; + } +} Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/GlobalSynthesisResultImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/bean/GlobalSynthesisResultImpl.java 2010-11-03 09:10:05 UTC (rev 731) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/GlobalSynthesisResultImpl.java 2010-11-03 11:22:57 UTC (rev 732) @@ -5,7 +5,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.List; import java.util.Map; public class GlobalSynthesisResultImpl extends GlobalSynthesisResult { @@ -15,32 +14,11 @@ protected Map<SynthesisId, Double> values; - protected List<Indicator> globalSynthesisParameters; - public void setIndicatorValues(Map<SynthesisId, Double> indicatorValues) { this.values = indicatorValues; } - public void setGlobalSynthesisParameters(List<Indicator> globalSynthesisParameters) { - this.globalSynthesisParameters = globalSynthesisParameters; - } - @Override - public List<Indicator> getGlobalSynthesisParameters() { - return globalSynthesisParameters; - } - - /** in the list of indicators, find the one with given synthesisId. */ - protected Indicator findIndicator(SynthesisId id) { - for (Indicator indicator : globalSynthesisParameters) { - if (indicator.getSynthesisId().equals(id)) { - return indicator; - } - } - return null; - } - - @Override public IndicatorLevel getLevelForIndicator(SynthesisId synthesisId) { if (log.isDebugEnabled()) { log.debug("looking for value of " + synthesisId); @@ -52,7 +30,7 @@ Double value = values.get(synthesisId); IndicatorLevel result = null; if (value != null) { - Indicator indicator = findIndicator(synthesisId); + Indicator indicator = globalSynthesisParameters.getParameter(synthesisId); result = indicator.getLevelForValue(value); } return result; @@ -65,7 +43,7 @@ double totalLevels = 0.0; double totalCoefficients = 0.0; - for (Indicator indicator : globalSynthesisParameters) { + for (Indicator indicator : globalSynthesisParameters.getParameters()) { IndicatorLevel indicatorLevel = getLevelForIndicator(indicator.getSynthesisId()); if (indicatorLevel == null) { @@ -92,18 +70,22 @@ log.debug("value for global indicator = " + value); } - GlobalIndicatorValue result = null; - if (value >= 1.0 && value < 2.0) { - result = GlobalIndicatorValue.VERY_BAD; - } else if (value >= 2.0 && value < 3.0) { - result = GlobalIndicatorValue.BAD; - } else if (value >= 3.0 && value < 5.0) { - result = GlobalIndicatorValue.NEUTRAL; - } else if (value >= 5.0 && value < 5.5) { - result = GlobalIndicatorValue.GOOD; - } else if (value >= 5.5 && value <= 6.0) { - result = GlobalIndicatorValue.VERY_GOOD; + // in this indicator, the level is the ordinal of GlobalIndicatorValue + Indicator globalIndicator = getGlobalSynthesisParameters().getGlobalIndicator(); + + if (log.isDebugEnabled()) { + log.debug("levels for global indicator are"); + for (IndicatorLevel level : globalIndicator.getIndicatorLevel()) { + log.debug(level.getLevel() + " -> " + level.getLowerBound() + + " to " + level.getUpperBound()); + } } + + int globalIndicatorValueOrdinal = globalIndicator.getLevelForValue(value).getLevel(); + GlobalIndicatorValue result = GlobalIndicatorValue.valueOf(globalIndicatorValueOrdinal); + if (log.isDebugEnabled()) { + log.debug("global indicator value is " + result); + } return result; } } Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/IndicatorImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/IndicatorImpl.java 2010-11-03 09:10:05 UTC (rev 731) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/IndicatorImpl.java 2010-11-03 11:22:57 UTC (rev 732) @@ -14,7 +14,11 @@ @Override public SynthesisId getSynthesisId() { - return SynthesisId.valueOf(getIndicatorId()); + SynthesisId result = null; + if (getIndicatorId() != null) { + result = SynthesisId.valueOf(getIndicatorId()); + } + return result; } @Override Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java 2010-11-03 09:10:05 UTC (rev 731) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java 2010-11-03 11:22:57 UTC (rev 732) @@ -830,21 +830,20 @@ value = getIndicatorValueForDataReliability(filter); indicatorValues.put(SynthesisId.IND_DATA_RELIABILITY, value); - GlobalSynthesisResultImpl result = null; - - result = new GlobalSynthesisResultImpl(); - List<Indicator> indicators = executeGetGlobalSynthesisParameters(transaction); + GlobalSynthesisResultImpl result = new GlobalSynthesisResultImpl(); + GlobalSynthesisParameters parameters = executeGetGlobalSynthesisParameters(transaction); result.setIndicatorValues(indicatorValues); - result.setGlobalSynthesisParameters(indicators); + result.setGlobalSynthesisParameters(parameters); return result; } @Override - protected List<Indicator> executeGetGlobalSynthesisParameters(TopiaContext transaction) throws Exception { + protected GlobalSynthesisParameters executeGetGlobalSynthesisParameters(TopiaContext transaction) throws Exception { IndicatorDAO indicatorDAO = WaoDAOHelper.getIndicatorDAO(transaction); List<Indicator> indicators = indicatorDAO.findAll(); + Indicator globalIndicator = null; // will be found in the list for (Indicator indicator : indicators) { @@ -853,7 +852,12 @@ double lowerBound; double lastUpperBound; - if (indicator.getSynthesisId() == SynthesisId.IND_ALLEGRO_REACTIVITY) { + if (indicator.getSynthesisId() == null) { + // this is the global average parameters + globalIndicator = indicator; + lowerBound = 1.0; + lastUpperBound = 6.0; + } else if (indicator.getSynthesisId() == SynthesisId.IND_ALLEGRO_REACTIVITY) { lowerBound = Double.MAX_VALUE; lastUpperBound = 0.0; } else { @@ -880,7 +884,13 @@ // but database should not be affected } - return indicators; + indicators.remove(globalIndicator); + + GlobalSynthesisParameters result = new GlobalSynthesisParametersImpl(); + result.setParameters(indicators); + result.setGlobalIndicator(globalIndicator); + + return result; } @Override Modified: trunk/wao-business/src/main/xmi/wao.zargo =================================================================== (Binary files differ) Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Administration.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Administration.java 2010-11-03 09:10:05 UTC (rev 731) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Administration.java 2010-11-03 11:22:57 UTC (rev 732) @@ -29,11 +29,11 @@ import fr.ifremer.wao.WaoException; import fr.ifremer.wao.WaoProperty; import fr.ifremer.wao.bean.ConnectedUser; +import fr.ifremer.wao.bean.GlobalSynthesisParameters; import fr.ifremer.wao.bean.UserRole; import fr.ifremer.wao.entity.Company; import fr.ifremer.wao.entity.CompanyImpl; import fr.ifremer.wao.entity.Indicator; -import fr.ifremer.wao.entity.IndicatorLevel; import fr.ifremer.wao.entity.WaoUser; import fr.ifremer.wao.io.ImportResults; import fr.ifremer.wao.io.ImportResultsImpl; @@ -79,8 +79,6 @@ import java.io.FileNotFoundException; import java.io.InputStream; import java.util.ArrayList; -import java.util.Collection; -import java.util.Iterator; import java.util.List; /** @@ -610,34 +608,19 @@ @Inject private ServiceSynthesis serviceSynthesis; + private GlobalSynthesisParameters globalSynthesisParameters; + /* variable used in view */ @Property private Indicator indicator; - /* variable used in view */ - private List<Indicator> indicators; - - /** Sum of the coefficient of the indicators. */ - private Double totalCoefficient; - - public Double getTotalCoefficient() { - if (totalCoefficient == null) { - totalCoefficient = 0.0; - for (Indicator indicator : getIndicators()) { - totalCoefficient += indicator.getCoefficient(); - } + public GlobalSynthesisParameters getGlobalSynthesisParameters() { + if (globalSynthesisParameters == null) { + globalSynthesisParameters = serviceSynthesis.getGlobalSynthesisParameters(); } - return totalCoefficient; + return globalSynthesisParameters; } - public List<Indicator> getIndicators() { - if (indicators == null) { - indicators = serviceSynthesis.getGlobalSynthesisParameters(); - } - return indicators; - } - - @InjectComponent private Form synthesisParametersForm; @@ -655,7 +638,7 @@ } void onSuccessFromSynthesisParametersForm() { - for (Indicator indicator : getIndicators()) { + for (Indicator indicator : getGlobalSynthesisParameters().getParameters()) { serviceSynthesis.updateGlobalSynthesisParameter (indicator, currentUser.getUser(), comment); } Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java 2010-11-03 09:10:05 UTC (rev 731) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java 2010-11-03 11:22:57 UTC (rev 732) @@ -31,6 +31,7 @@ import fr.ifremer.wao.bean.ContactState; import fr.ifremer.wao.bean.ContactStateStatistics; import fr.ifremer.wao.bean.GlobalIndicatorValue; +import fr.ifremer.wao.bean.GlobalSynthesisParameters; import fr.ifremer.wao.bean.GlobalSynthesisResult; import fr.ifremer.wao.bean.SamplingFilter; import fr.ifremer.wao.bean.SamplingFilterImpl; @@ -129,22 +130,10 @@ return activeSynthesis; } - /** in a list of indicators, find the one with given synthesisId. */ - protected Indicator findIndicator(SynthesisId id, - List<Indicator> indicators) { - for (Indicator indicator : indicators) { - if (indicator.getSynthesisId().equals(id)) { - return indicator; - } - } - log.warn("indicator not found : " + id); - return null; - } + private GlobalSynthesisParameters globalSynthesisParameters; - private List<Indicator> globalSynthesisParameters; - /** permit lazy call to serviceSynthesis to set globalSynthesisParameters field. */ - public List<Indicator> getGlobalSynthesisParameters() { + public GlobalSynthesisParameters getGlobalSynthesisParameters() { if (globalSynthesisParameters == null) { globalSynthesisParameters = getGlobalSynthesisResult().getGlobalSynthesisParameters(); @@ -166,8 +155,7 @@ */ public Indicator getActiveIndicator() { SynthesisId activeSynthesis = getActiveSynthesis(); - List<Indicator> globalSynthesisParameters = getGlobalSynthesisParameters(); - activeIndicator = findIndicator(activeSynthesis, globalSynthesisParameters); + activeIndicator = getGlobalSynthesisParameters().getParameter(activeSynthesis); return activeIndicator; } Modified: trunk/wao-ui/src/main/webapp/Administration.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Administration.tml 2010-11-03 09:10:05 UTC (rev 731) +++ trunk/wao-ui/src/main/webapp/Administration.tml 2010-11-03 11:22:57 UTC (rev 732) @@ -182,14 +182,14 @@ <t:errors t:banner="message:errors-banner" />  - <t:loop t:source="indicators" t:value="indicator" volatile="true"> + <t:loop t:source="globalSynthesisParameters.parameters" t:value="indicator" volatile="true"> <t:indicatorLevels t:indicator="indicator" editable="true" /> </t:loop> <table class="indicatorLevels"> <tr> <th>Total coefficients : </th> - <td>${totalCoefficient}</td> + <td>${globalSynthesisParameters.totalCoefficients}</td> </tr> </table> Modified: trunk/wao-ui/src/main/webapp/Synthesis.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Synthesis.tml 2010-11-03 09:10:05 UTC (rev 731) +++ trunk/wao-ui/src/main/webapp/Synthesis.tml 2010-11-03 11:22:57 UTC (rev 732) @@ -359,7 +359,7 @@ <h2>Synthèse globale</h2> <br /> - <t:loop t:source="globalSynthesisParameters" t:value="activeIndicator"> + <t:loop t:source="globalSynthesisParameters.parameters" t:value="activeIndicator"> <t:indicatorLevels t:indicator="activeIndicator" t:highlightLevel="activeIndicatorLevel" /> </t:loop>

1 0

[Suiviobsmer-commits] r731 - trunk/wao-ui/src/main/webapp
by bleny＠users.labs.libre-entreprise.org Nov. 3, 2010

Nov. 3, 2010

Author: bleny Date: 2010-11-03 09:10:05 +0000 (Wed, 03 Nov 2010) New Revision: 731 Log: bugfix in synthesis page layout Modified: trunk/wao-ui/src/main/webapp/Synthesis.tml Modified: trunk/wao-ui/src/main/webapp/Synthesis.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Synthesis.tml 2010-11-03 09:02:07 UTC (rev 730) +++ trunk/wao-ui/src/main/webapp/Synthesis.tml 2010-11-03 09:10:05 UTC (rev 731) @@ -187,9 +187,10 @@ </t:block>  <t:block t:id="ind2"> + <h2>Respect du nombre d'observateurs embarqués</h2> + <br /> + <div class="ind-table acenter" id="so-noncomplianceboarding"> - <h2>Respect du nombre d'observateurs embarqués</h2> - <br /> <t:if t:test="user.admin"> <p> Ces résultats concernent l'ensemble des contrats en cours @@ -225,11 +226,11 @@ </div> </p:else> </t:if> + </div> -  - <br /> - <t:indicatorLevels t:indicator="activeIndicator" t:highlightLevel="activeIndicatorLevel" withLegend="true" /> - </div> +  + <br /> + <t:indicatorLevels t:indicator="activeIndicator" t:highlightLevel="activeIndicatorLevel" withLegend="true" /> </t:block>  <t:block t:id="ind3">

1 0

[Suiviobsmer-commits] r730 - in trunk/wao-ui/src/main/webapp/img: . source
by bleny＠users.labs.libre-entreprise.org Nov. 3, 2010

Nov. 3, 2010

Author: bleny Date: 2010-11-03 09:02:07 +0000 (Wed, 03 Nov 2010) New Revision: 730 Log: add icon for data reliability menu in synthesis page Added: trunk/wao-ui/src/main/webapp/img/source/synthesis-ind-data-reliability.xcf trunk/wao-ui/src/main/webapp/img/synthesis-ind-data-reliability.png Added: trunk/wao-ui/src/main/webapp/img/source/synthesis-ind-data-reliability.xcf =================================================================== (Binary files differ) Property changes on: trunk/wao-ui/src/main/webapp/img/source/synthesis-ind-data-reliability.xcf ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/wao-ui/src/main/webapp/img/synthesis-ind-data-reliability.png =================================================================== (Binary files differ) Property changes on: trunk/wao-ui/src/main/webapp/img/synthesis-ind-data-reliability.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream

1 0

[Suiviobsmer-commits] r729 - trunk/wao-ui/src/main/webapp
by bleny＠users.labs.libre-entreprise.org Nov. 2, 2010

Nov. 2, 2010

Author: bleny Date: 2010-11-02 22:45:28 +0000 (Tue, 02 Nov 2010) New Revision: 729 Log: add message in case there is no modification in history Modified: trunk/wao-ui/src/main/webapp/IndicatorsHistory.tml Modified: trunk/wao-ui/src/main/webapp/IndicatorsHistory.tml =================================================================== --- trunk/wao-ui/src/main/webapp/IndicatorsHistory.tml 2010-11-02 22:41:53 UTC (rev 728) +++ trunk/wao-ui/src/main/webapp/IndicatorsHistory.tml 2010-11-02 22:45:28 UTC (rev 729) @@ -41,13 +41,18 @@ <div class="mtop30" /> - <p t:type="loop" t:source="indicatorLogs" t:value="indicatorLog"> - Auteur de la modification : <strong>${indicatorLog.author.fullName}</strong><br /> - Commentaire : ${indicatorLog.comment}<br /> - Modifications effectuées : ${indicatorLog.logText}<br /><br /> + <t:if test="indicatorLogs.empty"> + <strong>Aucune modification n'a été apportée à ce jour</strong> + <p:else> + <p t:type="loop" t:source="indicatorLogs" t:value="indicatorLog"> + Auteur de la modification : <strong>${indicatorLog.author.fullName}</strong><br /> + Commentaire : ${indicatorLog.comment}<br /> + Modifications effectuées : ${indicatorLog.logText}<br /><br /> - <div class="mtop30" /> - </p> + <div class="mtop30" /> + </p> + </p:else> + </t:if> </div> </t:layout>

1 0

[Suiviobsmer-commits] r728 - in trunk: wao-business/src/main/java/fr/ifremer/wao/service wao-business/src/main/resources/i18n wao-business/src/main/xmi wao-ui/src/main/java/fr/ifremer/wao/ui/pages wao-ui/src/main/webapp
by bleny＠users.labs.libre-entreprise.org Nov. 2, 2010

Nov. 2, 2010

Author: bleny Date: 2010-11-02 22:41:53 +0000 (Tue, 02 Nov 2010) New Revision: 728 Log: add page with indicators modification history Added: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/IndicatorsHistory.java trunk/wao-ui/src/main/webapp/IndicatorsHistory.tml Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java trunk/wao-business/src/main/resources/i18n/wao-business-en_GB.properties trunk/wao-business/src/main/resources/i18n/wao-business-fr_FR.properties trunk/wao-business/src/main/xmi/wao.properties trunk/wao-business/src/main/xmi/wao.zargo trunk/wao-ui/src/main/webapp/Administration.tml Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java 2010-11-02 21:17:33 UTC (rev 727) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java 2010-11-02 22:41:53 UTC (rev 728) @@ -905,7 +905,7 @@ // update database logText += String.format( "Modification du coefficient de l'indicateur « %s » " + - "(ancienne valeur = %s, nouvelle valeur = %s)\n\n", + "(ancienne valeur = %s, nouvelle valeur = %s).\n\n", indicator.getSynthesisId().getLabel(), oldIndicator.getCoefficient(), indicator.getCoefficient()); @@ -932,7 +932,7 @@ logText += String.format( "Modification du seuil de transition entre les niveaux " + "%s et %s de l'indicateur « %s » (ancienne valeur = %s" - + ", nouvelle valeur = %s)\n\n", + + ", nouvelle valeur = %s).\n\n", level.getLevel(), level.getLevel() + 1, indicator.getSynthesisId().getLabel(), level.getUpperBound(), newLevel.getUpperBound()); @@ -977,6 +977,13 @@ } } + @Override + protected List<IndicatorLog> executeGetAllIndicatorLogs(TopiaContext transaction) throws Exception { + List<IndicatorLog> allIndicatorLogs = + WaoDAOHelper.getIndicatorLogDAO(transaction).findAll(); + return allIndicatorLogs; + } + protected PieChartData createContactPieChartData() { PieChartData data = new PieChartDataImpl(); for (ContactPieChartConstant constant : ContactPieChartConstant.values()) { Modified: trunk/wao-business/src/main/resources/i18n/wao-business-en_GB.properties =================================================================== --- trunk/wao-business/src/main/resources/i18n/wao-business-en_GB.properties 2010-11-02 21:17:33 UTC (rev 727) +++ trunk/wao-business/src/main/resources/i18n/wao-business-en_GB.properties 2010-11-02 22:41:53 UTC (rev 728) @@ -78,6 +78,7 @@ wao.error.serviceSampling.getSampleRowsByFilter= wao.error.serviceSampling.getSampleRowsOrderedByFishingZone= wao.error.serviceSampling.importSamplingPlanCsv= +wao.error.serviceSynthesis.getAllIndicatorLogs= wao.error.serviceSynthesis.getBoardingBoats= wao.error.serviceSynthesis.getComplianceBoardingIndicator= wao.error.serviceSynthesis.getContactDataInputDateReactivity= Modified: trunk/wao-business/src/main/resources/i18n/wao-business-fr_FR.properties =================================================================== --- trunk/wao-business/src/main/resources/i18n/wao-business-fr_FR.properties 2010-11-02 21:17:33 UTC (rev 727) +++ trunk/wao-business/src/main/resources/i18n/wao-business-fr_FR.properties 2010-11-02 22:41:53 UTC (rev 728) @@ -77,6 +77,7 @@ wao.error.serviceSampling.getSampleRowsByFilter=Impossible de r\u00E9cup\u00E9rer la liste des lignes du plan d'\u00E9chantillonnage wao.error.serviceSampling.getSampleRowsOrderedByFishingZone=Impossible de r\u00E9cup\u00E9rer la liste des lignes du plan d'\u00E9chantillonnage wao.error.serviceSampling.importSamplingPlanCsv=Erreur \u00E0 la ligne %1$d [CODE \= %2$s] +wao.error.serviceSynthesis.getAllIndicatorLogs= wao.error.serviceSynthesis.getBoardingBoats=Impossible de r\u00E9cup\u00E9rer les donn\u00E9es du graphique concernant les embarquements sur les navires wao.error.serviceSynthesis.getComplianceBoardingIndicator= wao.error.serviceSynthesis.getContactDataInputDateReactivity=Impossible de r\u00E9cup\u00E9rer l'indicateur de r\u00E9activit\u00E9 sur les dates de saisies dans Allegro Modified: trunk/wao-business/src/main/xmi/wao.properties =================================================================== --- trunk/wao-business/src/main/xmi/wao.properties 2010-11-02 21:17:33 UTC (rev 727) +++ trunk/wao-business/src/main/xmi/wao.properties 2010-11-02 22:41:53 UTC (rev 728) @@ -33,3 +33,4 @@ fr.ifremer.wao.entity.Contact.attribute.boat.tagvalue.lazy=false fr.ifremer.wao.entity.Indicator.attribute.indicatorLevel.tagvalue.lazy=false +fr.ifremer.wao.entity.IndicatorLog.attribute.author.tagvalue.lazy=false Modified: trunk/wao-business/src/main/xmi/wao.zargo =================================================================== (Binary files differ) Added: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/IndicatorsHistory.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/IndicatorsHistory.java (rev 0) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/IndicatorsHistory.java 2010-11-02 22:41:53 UTC (rev 728) @@ -0,0 +1,38 @@ +package fr.ifremer.wao.ui.pages; + +import fr.ifremer.wao.bean.UserRole; +import fr.ifremer.wao.entity.IndicatorLog; +import fr.ifremer.wao.service.ServiceSynthesis; +import fr.ifremer.wao.ui.data.RequiresAuthentication; +import org.apache.tapestry5.annotations.IncludeStylesheet; +import org.apache.tapestry5.annotations.Property; +import org.apache.tapestry5.ioc.annotations.Inject; + +import java.util.List; + +/** + * This page show the list of all modifications done by administrators + * on the coefficient and bounds between levels since the beginning + * + * @author bleny + */ + at RequiresAuthentication(value = {UserRole.ADMIN}, readOnlyAllowed = true) + at IncludeStylesheet("context:css/common.css") +public class IndicatorsHistory { + + @Inject + private ServiceSynthesis serviceSynthesis; + + private List<IndicatorLog> indicatorLogs; + + /* variable used in template in a loop */ + @Property + private IndicatorLog indicatorLog; + + public List<IndicatorLog> getIndicatorLogs() { + if (indicatorLogs == null) { + indicatorLogs = serviceSynthesis.getAllIndicatorLogs(); + } + return indicatorLogs; + } +} Modified: trunk/wao-ui/src/main/webapp/Administration.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Administration.tml 2010-11-02 21:17:33 UTC (rev 727) +++ trunk/wao-ui/src/main/webapp/Administration.tml 2010-11-02 22:41:53 UTC (rev 728) @@ -199,6 +199,9 @@ </div> <div class="fright"> + <a t:type="pagelink" page="IndicatorsHistory"> + <img src="${asset:context:}/img/clock.png" alt="Historique" title="Voir l'historique des modifications des indicateurs" /> + </a> <input t:type="submit" t:id="saveData" class="ico save" value="Save" title="Enregistrer les modifications" /> <input type="reset" class="ico undo" value="Annuler les modificationss" title="Annuler les modifications" /> </div> Added: trunk/wao-ui/src/main/webapp/IndicatorsHistory.tml =================================================================== --- trunk/wao-ui/src/main/webapp/IndicatorsHistory.tml (rev 0) +++ trunk/wao-ui/src/main/webapp/IndicatorsHistory.tml 2010-11-02 22:41:53 UTC (rev 728) @@ -0,0 +1,53 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<t:layout t:pageTitle="Historisque des paramètres de calculs des indicateurs" t:contentId="so-indicators-history" + xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" xmlns:p="tapestry:parameter"> + + <div style="margin-left:auto; margin-right:auto; width: 80%;"> + <h2>Historique des modifications des paramètres de la synthèse globale</h2> + + <p> + Cette page présente toutes les modifications effectuées depuis l'oririgine + qui portent sur les bornes de chaque niveaux ainsi que les coefficients + de chaque indicateurs. + </p> + + <div class="mtop30" /> + + <p t:type="loop" t:source="indicatorLogs" t:value="indicatorLog"> + Auteur de la modification : <strong>${indicatorLog.author.fullName}</strong><br /> + Commentaire : ${indicatorLog.comment}<br /> + Modifications effectuées : ${indicatorLog.logText}<br /><br /> + + <div class="mtop30" /> + </p> + </div> + +</t:layout>

1 0