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

[Suiviobsmer-commits] r690 - in branches/wao-1.5.x: . wao-business wao-ui
by bleny＠users.labs.libre-entreprise.org 19 Oct '10

19 Oct '10

Author: bleny Date: 2010-10-19 08:49:50 +0000 (Tue, 19 Oct 2010) New Revision: 690 Log: [maven-release-plugin] rollback the release of wao-1.5.4 Modified: branches/wao-1.5.x/pom.xml branches/wao-1.5.x/wao-business/pom.xml branches/wao-1.5.x/wao-ui/pom.xml Modified: branches/wao-1.5.x/pom.xml =================================================================== --- branches/wao-1.5.x/pom.xml 2010-10-19 08:44:44 UTC (rev 689) +++ branches/wao-1.5.x/pom.xml 2010-10-19 08:49:50 UTC (rev 690) @@ -15,7 +15,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>1.5.4</version> + <version>1.5.4-SNAPSHOT</version> <modules> <module>wao-ui</module> @@ -308,9 +308,9 @@  <scm> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.5.4</connection> - <developerConnection>scm:svn:svn+ssh://${username}@labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.5.4</developerConnection> - <url>http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-1.5.4?root=suiviob…</url> + <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/branches/wao-1.5.x</connection> + <developerConnection>scm:svn:svn+ssh://${username}@labs.libre-entreprise.org/svnroot/suiviobsmer/branches/wao-1.5.x</developerConnection> + <url>http://labs.libre-entreprise.org/scm/viewvc.php/branches/wao-1.5.x?root=sui…</url> </scm> <build> Modified: branches/wao-1.5.x/wao-business/pom.xml =================================================================== --- branches/wao-1.5.x/wao-business/pom.xml 2010-10-19 08:44:44 UTC (rev 689) +++ branches/wao-1.5.x/wao-business/pom.xml 2010-10-19 08:49:50 UTC (rev 690) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>1.5.4</version> + <version>1.5.4-SNAPSHOT</version> </parent> <groupId>fr.ifremer.wao</groupId> @@ -204,9 +204,9 @@ </build> <scm> - <url>http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-1.5.4/?root=suivio…</url> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.5.4/wao-business</connection> - <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.5.4/wao-business</developerConnection> + <url>http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-1.5.3/?root=suivio…</url> + <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.5.3/wao-business</connection> + <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.5.3/wao-business</developerConnection> </scm>  Modified: branches/wao-1.5.x/wao-ui/pom.xml =================================================================== --- branches/wao-1.5.x/wao-ui/pom.xml 2010-10-19 08:44:44 UTC (rev 689) +++ branches/wao-1.5.x/wao-ui/pom.xml 2010-10-19 08:49:50 UTC (rev 690) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>1.5.4</version> + <version>1.5.4-SNAPSHOT</version> </parent> <groupId>fr.ifremer.wao</groupId> @@ -227,9 +227,9 @@ </repositories> <scm> - <url>http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-1.5.4/?root=suivio…</url> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.5.4/wao-ui</connection> - <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.5.4/wao-ui</developerConnection> + <url>http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-1.5.3/?root=suivio…</url> + <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.5.3/wao-ui</connection> + <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.5.3/wao-ui</developerConnection> </scm> </project>

1 0

[Suiviobsmer-commits] r689 - in branches/wao-1.5.x: . wao-business wao-ui
by bleny＠users.labs.libre-entreprise.org 19 Oct '10

19 Oct '10

Author: bleny Date: 2010-10-19 08:44:44 +0000 (Tue, 19 Oct 2010) New Revision: 689 Log: [maven-release-plugin] prepare release wao-1.5.4 Modified: branches/wao-1.5.x/pom.xml branches/wao-1.5.x/wao-business/pom.xml branches/wao-1.5.x/wao-ui/pom.xml Modified: branches/wao-1.5.x/pom.xml =================================================================== --- branches/wao-1.5.x/pom.xml 2010-10-19 08:41:22 UTC (rev 688) +++ branches/wao-1.5.x/pom.xml 2010-10-19 08:44:44 UTC (rev 689) @@ -15,7 +15,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>1.5.4-SNAPSHOT</version> + <version>1.5.4</version> <modules> <module>wao-ui</module> @@ -308,9 +308,9 @@  <scm> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/branches/wao-1.5.x</connection> - <developerConnection>scm:svn:svn+ssh://${username}@labs.libre-entreprise.org/svnroot/suiviobsmer/branches/wao-1.5.x</developerConnection> - <url>http://labs.libre-entreprise.org/scm/viewvc.php/branches/wao-1.5.x?root=sui…</url> + <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.5.4</connection> + <developerConnection>scm:svn:svn+ssh://${username}@labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.5.4</developerConnection> + <url>http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-1.5.4?root=suiviob…</url> </scm> <build> Modified: branches/wao-1.5.x/wao-business/pom.xml =================================================================== --- branches/wao-1.5.x/wao-business/pom.xml 2010-10-19 08:41:22 UTC (rev 688) +++ branches/wao-1.5.x/wao-business/pom.xml 2010-10-19 08:44:44 UTC (rev 689) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>1.5.4-SNAPSHOT</version> + <version>1.5.4</version> </parent> <groupId>fr.ifremer.wao</groupId> @@ -204,9 +204,9 @@ </build> <scm> - <url>http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-1.5.3/?root=suivio…</url> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.5.3/wao-business</connection> - <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.5.3/wao-business</developerConnection> + <url>http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-1.5.4/?root=suivio…</url> + <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.5.4/wao-business</connection> + <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.5.4/wao-business</developerConnection> </scm>  Modified: branches/wao-1.5.x/wao-ui/pom.xml =================================================================== --- branches/wao-1.5.x/wao-ui/pom.xml 2010-10-19 08:41:22 UTC (rev 688) +++ branches/wao-1.5.x/wao-ui/pom.xml 2010-10-19 08:44:44 UTC (rev 689) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>1.5.4-SNAPSHOT</version> + <version>1.5.4</version> </parent> <groupId>fr.ifremer.wao</groupId> @@ -227,9 +227,9 @@ </repositories> <scm> - <url>http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-1.5.3/?root=suivio…</url> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.5.3/wao-ui</connection> - <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.5.3/wao-ui</developerConnection> + <url>http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-1.5.4/?root=suivio…</url> + <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.5.4/wao-ui</connection> + <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.5.4/wao-ui</developerConnection> </scm> </project>

1 0

[Suiviobsmer-commits] r688 - branches/wao-1.5.x
by bleny＠users.labs.libre-entreprise.org 19 Oct '10

19 Oct '10

Author: bleny Date: 2010-10-19 08:41:22 +0000 (Tue, 19 Oct 2010) New Revision: 688 Log: update pom for release Modified: branches/wao-1.5.x/pom.xml Modified: branches/wao-1.5.x/pom.xml =================================================================== --- branches/wao-1.5.x/pom.xml 2010-10-18 15:18:54 UTC (rev 687) +++ branches/wao-1.5.x/pom.xml 2010-10-19 08:41:22 UTC (rev 688) @@ -308,9 +308,9 @@  <scm> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.5.3</connection> - <developerConnection>scm:svn:svn+ssh://${userame}@labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.5.3</developerConnection> - <url>http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-1.5.3?root=suiviob…</url> + <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/branches/wao-1.5.x</connection> + <developerConnection>scm:svn:svn+ssh://${username}@labs.libre-entreprise.org/svnroot/suiviobsmer/branches/wao-1.5.x</developerConnection> + <url>http://labs.libre-entreprise.org/scm/viewvc.php/branches/wao-1.5.x?root=sui…</url> </scm> <build>

1 0

[Suiviobsmer-commits] r687 - in trunk: wao-business/src/main/java/fr/ifremer/wao/bean wao-ui/src/main/java/fr/ifremer/wao/ui/pages wao-ui/src/main/webapp
by bleny＠users.labs.libre-entreprise.org 18 Oct '10

18 Oct '10

Author: bleny Date: 2010-10-18 15:18:54 +0000 (Mon, 18 Oct 2010) New Revision: 687 Log: removing UI consideration in business (synthesisId blockid) Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SynthesisId.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java trunk/wao-ui/src/main/webapp/Synthesis.tml Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SynthesisId.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SynthesisId.java 2010-10-18 14:30:34 UTC (rev 686) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SynthesisId.java 2010-10-18 15:18:54 UTC (rev 687) @@ -35,54 +35,35 @@ public enum SynthesisId { /** */ - GRAPH_SAMPLING("graph1", "wao.business.bean.SynthesisId.graph_sampling"), + GRAPH_SAMPLING("wao.business.bean.SynthesisId.graph_sampling"), /** */ - GRAPH_BOARDING("graph2", "wao.business.bean.SynthesisId.graph_boarding"), + GRAPH_BOARDING("wao.business.bean.SynthesisId.graph_boarding"), /** */ - IND_NON_COMPLIANCE_BOARDING("ind1", "wao.business.bean.SynthesisId.non_compliance_boarding"), + IND_COMPLIANCE_BOARDING("wao.business.bean.SynthesisId.compliance_boarding"), /** */ - IND_CONTACT_STATE("ind2", "wao.business.bean.SynthesisId.contact_state"), + IND_CONTACT_STATE("wao.business.bean.SynthesisId.contact_state"), /** */ - IND_ALLEGRO_REACTIVITY("ind3", "wao.business.bean.SynthesisId.allegro_reactivity"), + IND_ALLEGRO_REACTIVITY("wao.business.bean.SynthesisId.allegro_reactivity"), /** */ - IND_COMPLIANCE_BOARDING("ind4", "wao.business.bean.SynthesisId.compliance_boarding"), + IND_DATA_RELIABILITY("wao.business.bean.SynthesisId.data_reliability"); - /** */ - IND_DATA_RELIABILITY("ind5", "wao.business.bean.SynthesisId.data_reliability"); - - protected String blockId; - /** An i18n key to make enumeration printable in logs and UI. */ protected String label; - SynthesisId(String blockId, String label) { - this.blockId = blockId; + SynthesisId(String label) { this.label = label; } - public String getBlockId() { - return blockId; - } - /** Get a translated name for the current value. */ public String getLabel() { return _(label); } - public static SynthesisId getSynthesisId(String blockId) { - for (SynthesisId synthesisId : SynthesisId.values()) { - if (synthesisId.getBlockId().equals(blockId)) { - return synthesisId; - } - } - return null; - } - public static SynthesisId valueOf(int ordinal) { for (SynthesisId synthesisId : SynthesisId.values()) { if (synthesisId.ordinal() == ordinal) { 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-10-18 14:30:34 UTC (rev 686) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java 2010-10-18 15:18:54 UTC (rev 687) @@ -162,7 +162,7 @@ case GRAPH_SAMPLING : initSamplingBlock(); break; case GRAPH_BOARDING : initBoardingBlock(); } - return resources.getBlock(getActiveSynthesis().getBlockId()); + return resources.getBlock("ind" + getActiveSynthesis().ordinal()); } public String getActionSynthesisId() { @@ -401,10 +401,10 @@ /********************* INDICATOR : NON COMPLIANCE BOARDING ****************/ - private Map<String, Double> nonComplianceBoarding; + private Map<String, Double> complianceBoarding; @Property - private Map.Entry<String, Double> nonComplianceBoardingEntry; + private Map.Entry<String, Double> complianceBoardingEntry; /** * Data for nonComplianceBoarding indicator. The key is the company @@ -414,17 +414,17 @@ * @return a Map with companies and there values for nonComplianceBoarding * @throws WaoException */ - public Map<String, Double> getNonComplianceBoarding() throws WaoException { - if (nonComplianceBoarding == null) { + public Map<String, Double> getComplianceBoarding() throws WaoException { + if (complianceBoarding == null) { Company company = !user.isAdmin() ? user.getCompany() : null; - nonComplianceBoarding = + complianceBoarding = serviceSynthesis.getComplianceBoardingIndicator(company); // FIXME 20101015 bleny business code, should be moved in business // computing level for indicator double total = 0.0; - int numberOfCompanies = nonComplianceBoarding.size(); - for (Double compliance : nonComplianceBoarding.values()) { + int numberOfCompanies = complianceBoarding.size(); + for (Double compliance : complianceBoarding.values()) { total += compliance; } double indicatorValue = 100 * (total / numberOfCompanies); @@ -434,7 +434,7 @@ activeIndicatorLevel = activeIndicator.getLevelForValue(indicatorValue); } - return nonComplianceBoarding; + return complianceBoarding; } /** @@ -444,8 +444,8 @@ * @return the value of the indicator * @throws WaoException */ - public Double getNonComplianceBoardingValue() throws WaoException { - return getNonComplianceBoarding().get(user.getCompany().getName()); + public Double getComplianceBoardingValue() throws WaoException { + return getComplianceBoarding().get(user.getCompany().getName()); } /********************* INDICATOR : CONTACT STATE ******************/ Modified: trunk/wao-ui/src/main/webapp/Synthesis.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Synthesis.tml 2010-10-18 14:30:34 UTC (rev 686) +++ trunk/wao-ui/src/main/webapp/Synthesis.tml 2010-10-18 15:18:54 UTC (rev 687) @@ -47,7 +47,7 @@ </a> </li> <li> - <a t:type="actionlink" t:context="[actionSynthesisId,'IND_NON_COMPLIANCE_BOARDING']" t:zone="so-synthesis-main"> + <a t:type="actionlink" t:context="[actionSynthesisId,'IND_COMPLIANCE_BOARDING']" t:zone="so-synthesis-main"> <img src="${asset:context:}/img/synthesis-ind-non-compliance-boarding.png" alt="Indicateur" title="Indicateur de non respect du nombre d'observateurs embarqués" /> </a> @@ -72,7 +72,7 @@ </div>  - <t:block t:id="graph1"> + <t:block t:id="ind0"> <div class="acenter" id="so-datasampling"> <h2>Données des marées (réalisé / planifié)</h2> <fieldset> @@ -150,7 +150,7 @@ </div> </t:block>  - <t:block t:id="graph2"> + <t:block t:id="ind1"> <div class="acenter"> <h2>Sollicitations des navires</h2> <br /> @@ -177,8 +177,8 @@ <t:indicatorLevels t:indicator="activeIndicator" t:highlightLevel="activeIndicatorLevel" /> </div> </t:block> -  - <t:block t:id="ind1"> +  + <t:block t:id="ind2"> <div class="ind-table acenter" id="so-noncomplianceboarding"> <h2>Non respect du nombre d'observateurs embarqués</h2> <br /> @@ -195,10 +195,10 @@ </tr> </thead> <tbody> - <tr t:type="loop" t:source="nonComplianceBoarding.entrySet()" t:value="nonComplianceBoardingEntry"> - <td class="company">${nonComplianceBoardingEntry.key}</td> + <tr t:type="loop" t:source="complianceBoarding.entrySet()" t:value="complianceBoardingEntry"> + <td class="company">${complianceBoardingEntry.key}</td> <td class="number"> - <t:output t:value="nonComplianceBoardingEntry.value" t:format="percentFormat"/> + <t:output t:value="complianceBoardingEntry.value" t:format="percentFormat"/> </td> </tr> </tbody> @@ -210,8 +210,8 @@ </p> <div class="indicator"> <p class="number"> - <span t:type="output" t:value="nonComplianceBoardingValue" t:format="percentFormat"> - ${nonComplianceBoardingValue} + <span t:type="output" t:value="complianceBoardingValue" t:format="percentFormat"> + ${complianceBoardingValue} </span> </p> </div> @@ -224,7 +224,7 @@ </div> </t:block>  - <t:block t:id="ind2"> + <t:block t:id="ind3"> <div class="ind-table acenter" id="so-contactstate"> <h2>Etats des contacts</h2> <br /> @@ -278,7 +278,7 @@ </div> </t:block>  - <t:block t:id="ind3"> + <t:block t:id="ind4"> <div class="ind-table acenter" id="so-allegroreactivity"> <h2>Réactivité de la saisie dans Allegro par rapport à la date de fin de la marée</h2> <br />

1 0

[Suiviobsmer-commits] r686 - trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages
by bleny＠users.labs.libre-entreprise.org 18 Oct '10

18 Oct '10

Author: bleny Date: 2010-10-18 14:30:34 +0000 (Mon, 18 Oct 2010) New Revision: 686 Log: bugfix 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-10-18 14:25:45 UTC (rev 685) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java 2010-10-18 14:30:34 UTC (rev 686) @@ -427,7 +427,7 @@ for (Double compliance : nonComplianceBoarding.values()) { total += compliance; } - double indicatorValue = (total / numberOfCompanies); + double indicatorValue = 100 * (total / numberOfCompanies); activeSynthesis = SynthesisId.IND_COMPLIANCE_BOARDING; activeIndicator = getActiveIndicator();

1 0

[Suiviobsmer-commits] r685 - 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/service wao-business/src/main/resources/i18n wao-business/src/main/xmi wao-ui/src/main/java/fr/ifremer/wao/ui/components wao-ui/src/main/java/fr/ifremer/wao/ui/pages wao-ui/src/main/resources/fr/ifremer/wao/ui/components wao-ui/src/main/webapp wao-ui/src/main/webapp/css
by bleny＠users.labs.libre-entreprise.org 18 Oct '10

18 Oct '10

Author: bleny Date: 2010-10-18 14:25:45 +0000 (Mon, 18 Oct 2010) New Revision: 685 Log: style for indicators tables, sumup coefficient, migrating SynthesisService to deliver compliance instead of non-compliance, and i18n on enmum (to be done properly later) Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SynthesisId.java 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/components/IndicatorLevels.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/Synthesis.java trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/IndicatorLevels.tml trunk/wao-ui/src/main/webapp/Administration.tml trunk/wao-ui/src/main/webapp/Synthesis.tml trunk/wao-ui/src/main/webapp/css/common.css trunk/wao-ui/src/main/webapp/css/synthesis.css Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java 2010-10-17 14:53:36 UTC (rev 684) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java 2010-10-18 14:25:45 UTC (rev 685) @@ -334,7 +334,7 @@ SynthesisId.IND_COMPLIANCE_BOARDING, SynthesisId.GRAPH_BOARDING, SynthesisId.IND_ALLEGRO_REACTIVITY, - SynthesisId.IND_SAMPLE_RELIABILITY }; + SynthesisId.IND_DATA_RELIABILITY }; double coefficientValue = 1.0; @@ -385,7 +385,7 @@ queries.add(getInsertIndicatorLevelQuery_1_6(topiaIndicatorLevelIdPrefix + topiaIdSuffix++, 4, 10.0, indicatorTopiaId)); queries.add(getInsertIndicatorLevelQuery_1_6(topiaIndicatorLevelIdPrefix + topiaIdSuffix++, 5, 5.0, indicatorTopiaId)); // 5 days - indicatorTopiaId = indicatorsTopiaIds.get(SynthesisId.IND_SAMPLE_RELIABILITY); + indicatorTopiaId = indicatorsTopiaIds.get(SynthesisId.IND_DATA_RELIABILITY); queries.add(getInsertIndicatorLevelQuery_1_6(topiaIndicatorLevelIdPrefix + topiaIdSuffix++, 1, 80.0, indicatorTopiaId)); queries.add(getInsertIndicatorLevelQuery_1_6(topiaIndicatorLevelIdPrefix + topiaIdSuffix++, 2, 85.0, indicatorTopiaId)); queries.add(getInsertIndicatorLevelQuery_1_6(topiaIndicatorLevelIdPrefix + topiaIdSuffix++, 3, 90.0, indicatorTopiaId)); Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SynthesisId.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SynthesisId.java 2010-10-17 14:53:36 UTC (rev 684) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SynthesisId.java 2010-10-18 14:25:45 UTC (rev 685) @@ -23,6 +23,8 @@ */ package fr.ifremer.wao.bean; +import static org.nuiton.i18n.I18n._; + /** * SynthesisID * @@ -33,36 +35,45 @@ public enum SynthesisId { /** */ - GRAPH_SAMPLING("graph1"), + GRAPH_SAMPLING("graph1", "wao.business.bean.SynthesisId.graph_sampling"), /** */ - GRAPH_BOARDING("graph2"), + GRAPH_BOARDING("graph2", "wao.business.bean.SynthesisId.graph_boarding"), /** */ - IND_NON_COMPLIANCE_BOARDING("ind1"), + IND_NON_COMPLIANCE_BOARDING("ind1", "wao.business.bean.SynthesisId.non_compliance_boarding"), /** */ - IND_CONTACT_STATE("ind2"), + IND_CONTACT_STATE("ind2", "wao.business.bean.SynthesisId.contact_state"), /** */ - IND_ALLEGRO_REACTIVITY("ind3"), + IND_ALLEGRO_REACTIVITY("ind3", "wao.business.bean.SynthesisId.allegro_reactivity"), /** */ - IND_COMPLIANCE_BOARDING("ind4"), + IND_COMPLIANCE_BOARDING("ind4", "wao.business.bean.SynthesisId.compliance_boarding"), /** */ - IND_SAMPLE_RELIABILITY("ind5"); + IND_DATA_RELIABILITY("ind5", "wao.business.bean.SynthesisId.data_reliability"); - private String blockId; + protected String blockId; - SynthesisId(String blockId) { + /** An i18n key to make enumeration printable in logs and UI. */ + protected String label; + + SynthesisId(String blockId, String label) { this.blockId = blockId; + this.label = label; } public String getBlockId() { return blockId; } + /** Get a translated name for the current value. */ + public String getLabel() { + return _(label); + } + public static SynthesisId getSynthesisId(String blockId) { for (SynthesisId synthesisId : SynthesisId.values()) { if (synthesisId.getBlockId().equals(blockId)) { 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-10-17 14:53:36 UTC (rev 684) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java 2010-10-18 14:25:45 UTC (rev 685) @@ -260,7 +260,7 @@ return result; } - @Override + public Map<String, Double> executeGetNonComplianceBoardingIndicator( TopiaContext transaction, Company company) throws TopiaException { @@ -354,6 +354,24 @@ } @Override + protected Map<String, Double> executeGetComplianceBoardingIndicator( + TopiaContext transaction, Company company) throws Exception { + // here, we need compliance, so we get non-compliance values + // and we make the operation to switch + + Map<String, Double> nonCompliances = executeGetNonComplianceBoardingIndicator(transaction, company); + Map<String, Double> compliances = new HashMap<String, Double>(); + + // make the switch, fill compliances with data from nonCompliances + for (Map.Entry<String, Double> nonCompliance : nonCompliances.entrySet()) { + Double compliance = 1.0 - nonCompliance.getValue(); + compliances.put(nonCompliance.getKey(), compliance); + } + + return compliances; + } + + @Override public Collection<ContactStateStatistics> executeGetContactStateStatistics( TopiaContext transaction, Company company, PeriodDates period) throws TopiaException { 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-10-17 14:53:36 UTC (rev 684) +++ trunk/wao-business/src/main/resources/i18n/wao-business-en_GB.properties 2010-10-18 14:25:45 UTC (rev 685) @@ -2,6 +2,13 @@ wao.business.bean.DataReliability.not_reliable=not reliable wao.business.bean.DataReliability.reliable=reliable wao.business.bean.DataReliability.unknown=unknown +wao.business.bean.SynthesisId.allegro_reactivity= +wao.business.bean.SynthesisId.compliance_boarding= +wao.business.bean.SynthesisId.contact_state= +wao.business.bean.SynthesisId.data_reliability= +wao.business.bean.SynthesisId.graph_boarding= +wao.business.bean.SynthesisId.graph_sampling= +wao.business.bean.SynthesisId.non_compliance_boarding= wao.error.boat.canCreateContact= wao.error.boat.getNbBoarding= wao.error.boatInfos.getNbBoardingForCompany= @@ -67,6 +74,7 @@ wao.error.serviceSampling.getSampleRowsOrderedByFishingZone= wao.error.serviceSampling.importSamplingPlanCsv= wao.error.serviceSynthesis.getBoardingBoats= +wao.error.serviceSynthesis.getComplianceBoardingIndicator= wao.error.serviceSynthesis.getContactDataInputDateReactivity= wao.error.serviceSynthesis.getContactPieChartData= wao.error.serviceSynthesis.getContactPieChartDataByBoatDistrict= 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-10-17 14:53:36 UTC (rev 684) +++ trunk/wao-business/src/main/resources/i18n/wao-business-fr_FR.properties 2010-10-18 14:25:45 UTC (rev 685) @@ -2,6 +2,13 @@ wao.business.bean.DataReliability.not_reliable=non exploitable wao.business.bean.DataReliability.reliable=exploitable wao.business.bean.DataReliability.unknown=non renseign\u00E9e +wao.business.bean.SynthesisId.allegro_reactivity=D\u00E9lais de transmission des donn\u00E9es +wao.business.bean.SynthesisId.compliance_boarding=Respect du nombre d'observateurs embarqu\u00E9s +wao.business.bean.SynthesisId.contact_state=\u00C9tats des contacts +wao.business.bean.SynthesisId.data_reliability=Qualit\u00E9 de la donn\u00E9e +wao.business.bean.SynthesisId.graph_boarding=Taux d'embarquement sur un m\u00EAme navire conforme aux exigences +wao.business.bean.SynthesisId.graph_sampling=Taux de r\u00E9alisation du plan d'\u00E9chantillonage +wao.business.bean.SynthesisId.non_compliance_boarding=Non-respect du nombre d'observateurs embarqu\u00E9s wao.error.boat.canCreateContact=Impossible de cr\u00E9er un nouveau contact pour la soci\u00E9t\u00E9 %1$s et le navire %2$s (%3$d) wao.error.boat.getNbBoarding=Impossible de r\u00E9cup\u00E9rer le nombre d'embarquements r\u00E9els depuis le %1$s wao.error.boatInfos.getNbBoardingForCompany=Impossible de r\u00E9cup\u00E9rer le nombre d'embarquements r\u00E9els depuis le %1$s pour la soci\u00E9t\u00E9 %2$s @@ -66,6 +73,7 @@ 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.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 wao.error.serviceSynthesis.getContactPieChartData= wao.error.serviceSynthesis.getContactPieChartDataByBoatDistrict= Modified: trunk/wao-business/src/main/xmi/wao.zargo =================================================================== (Binary files differ) Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/IndicatorLevels.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/IndicatorLevels.java 2010-10-17 14:53:36 UTC (rev 684) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/IndicatorLevels.java 2010-10-18 14:25:45 UTC (rev 685) @@ -30,6 +30,10 @@ @Parameter(required = false) private IndicatorLevel highlightLevel; + /** if true, add a last line with a text explaining what colors mean. */ + @Parameter(required = false) + private Boolean withLegend; + /* variable used in view */ @Property private IndicatorLevel indicatorLevel; @@ -41,6 +45,13 @@ return indicator; } + public Boolean isWithLegend() { + if (withLegend = null) { + withLegend = false; + } + return withLegend; + } + public boolean highLightCurrentIndicatorLevel() { if (log.isDebugEnabled()) { log.debug("indicatorLevel = " + indicatorLevel); 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-10-17 14:53:36 UTC (rev 684) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Administration.java 2010-10-18 14:25:45 UTC (rev 685) @@ -614,6 +614,19 @@ /* 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(); + } + } + return totalCoefficient; + } + public List<Indicator> getIndicators() { if (indicators == null) { indicators = serviceSynthesis.getGlobalSynthesisParameters(); 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-10-17 14:53:36 UTC (rev 684) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java 2010-10-18 14:25:45 UTC (rev 685) @@ -418,7 +418,7 @@ if (nonComplianceBoarding == null) { Company company = !user.isAdmin() ? user.getCompany() : null; nonComplianceBoarding = - serviceSynthesis.getNonComplianceBoardingIndicator(company); + serviceSynthesis.getComplianceBoardingIndicator(company); // FIXME 20101015 bleny business code, should be moved in business // computing level for indicator @@ -427,9 +427,8 @@ for (Double compliance : nonComplianceBoarding.values()) { total += compliance; } - double indicatorValue = 100.0 - (total / numberOfCompanies); + double indicatorValue = (total / numberOfCompanies); - // XXX 20101015 bleny switching synthesisId while rendering. side-effects ? activeSynthesis = SynthesisId.IND_COMPLIANCE_BOARDING; activeIndicator = getActiveIndicator(); activeIndicatorLevel = activeIndicator.getLevelForValue(indicatorValue); 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-10-17 14:53:36 UTC (rev 684) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/IndicatorLevels.tml 2010-10-18 14:25:45 UTC (rev 685) @@ -22,19 +22,27 @@ <html xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" xmlns:p="tapestry:parameter"> - <table class="indicator"> - <caption>Indicateur : ${indicator.synthesisId} (coefficient = ${indicator.coefficient})</caption> + <table class="indicatorLevels"> + <caption></caption> <tbody> <tr> + <th /> + <th colspan="${indicator.indicatorLevel.size()}">Indicateur : ${indicator.synthesisId.label}</th> + <th>coefficient</th> + </tr> + <tr> <th>Niveaux</th> <t:loop t:source="indicator.indicatorLevel" t:value="indicatorLevel"> <t:if test="highLightCurrentIndicatorLevel()"> - <td class="highlight">${indicatorLevel.level}</td> + <td class="highlight selected">${indicatorLevel.level}</td> <p:else> <td>${indicatorLevel.level}</td> </p:else> </t:if> </t:loop> + <td rowspan="2"> + ${indicator.coefficient} + </td> </tr> <tr> <th>Bornes</th> @@ -54,6 +62,11 @@ </td> </t:loop> </tr> +  + <caption> + En jaune, la position actuelle de la société selon cet indicateur. + </caption> +  </tbody> </table> Modified: trunk/wao-ui/src/main/webapp/Administration.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Administration.tml 2010-10-17 14:53:36 UTC (rev 684) +++ trunk/wao-ui/src/main/webapp/Administration.tml 2010-10-18 14:25:45 UTC (rev 685) @@ -174,7 +174,7 @@ <t:if t:test="currentUser.admin"> - <h2>Synthèse globale</h2> + <h2>Indicateurs qualités prestataires</h2>  @@ -182,9 +182,7 @@ <t:indicatorLevels t:indicator="indicator" /> </t:loop> -  - - + Total coefficients : ${totalCoefficient} </t:if> Modified: trunk/wao-ui/src/main/webapp/Synthesis.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Synthesis.tml 2010-10-17 14:53:36 UTC (rev 684) +++ trunk/wao-ui/src/main/webapp/Synthesis.tml 2010-10-18 14:25:45 UTC (rev 685) @@ -146,7 +146,7 @@  <br /> - <t:indicatorLevels t:indicator="activeIndicator" highlightLevel="activeIndicatorLevel" /> + <t:indicatorLevels t:indicator="activeIndicator" t:highlightLevel="activeIndicatorLevel" /> </div> </t:block>  @@ -174,7 +174,7 @@  <br /> - <t:indicatorLevels t:indicator="activeIndicator" highlightLevel="activeIndicatorLevel" /> + <t:indicatorLevels t:indicator="activeIndicator" t:highlightLevel="activeIndicatorLevel" /> </div> </t:block>  @@ -220,7 +220,7 @@  <br /> - <t:indicatorLevels t:indicator="activeIndicator" highlightLevel="activeIndicatorLevel" /> + <t:indicatorLevels t:indicator="activeIndicator" t:highlightLevel="activeIndicatorLevel" /> </div> </t:block>  @@ -325,7 +325,7 @@  <br /> - <t:indicatorLevels t:indicator="activeIndicator" highlightLevel="activeIndicatorLevel" /> + <t:indicatorLevels t:indicator="activeIndicator" t:highlightLevel="activeIndicatorLevel" /> </div> </t:block> </t:layout> Modified: trunk/wao-ui/src/main/webapp/css/common.css =================================================================== --- trunk/wao-ui/src/main/webapp/css/common.css 2010-10-17 14:53:36 UTC (rev 684) +++ trunk/wao-ui/src/main/webapp/css/common.css 2010-10-18 14:25:45 UTC (rev 685) @@ -374,7 +374,7 @@ } /* INDICATOR TABLES */ -table.indicator { +table.indicatorLevels { border: solid 1px black; margin-left: auto; margin-right: auto; @@ -382,31 +382,31 @@ border-collapse: collapse; } -table.indicator th, table.indicator td { +table.indicatorLevels th, table.indicatorLevels td { border: solid 1px black; padding: 5px; } -table.indicator th { +table.indicatorLevels th { text-align: left; } -table.indicator td { +table.indicatorLevels td { text-align: center; } -table.indicator td.highlight { +table.indicatorLevels td.highlight { border-width: 3px; } -table.indicator td.penalty { +table.indicatorLevels td.penalty { background-color: #fee; } -table.indicator td.neutral { +table.indicatorLevels td.neutral { background-color: #eee; } -table.indicator td.bonus { +table.indicatorLevels td.bonus { background-color: #efe; } Modified: trunk/wao-ui/src/main/webapp/css/synthesis.css =================================================================== --- trunk/wao-ui/src/main/webapp/css/synthesis.css 2010-10-17 14:53:36 UTC (rev 684) +++ trunk/wao-ui/src/main/webapp/css/synthesis.css 2010-10-18 14:25:45 UTC (rev 685) @@ -160,7 +160,7 @@ width: 50%; } -div#so-contactstate table { +div#so-noncomplianceboarding indicator { width: 90%; } @@ -173,3 +173,7 @@ div#so-allegroreactivity td.warn { color: red; } + +table.indicatorLevels { + width: 90%; +} \ No newline at end of file

1 0

[Suiviobsmer-commits] r684 - 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/resources/i18n wao-business/src/main/xmi wao-ui/src/main/java/fr/ifremer/wao/ui/pages wao-ui/src/main/java/fr/ifremer/wao/ui/services wao-ui/src/main/webapp
by bleny＠users.labs.libre-entreprise.org 17 Oct '10

17 Oct '10

Author: bleny Date: 2010-10-17 14:53:36 +0000 (Sun, 17 Oct 2010) New Revision: 684 Log: add dataReliability to model and schema, showed in Contacts view, edit form missing Added: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/DataReliability.java trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SynthesisId.java Removed: trunk/wao-business/src/main/java/fr/ifremer/wao/SynthesisId.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java trunk/wao-business/src/main/java/fr/ifremer/wao/WaoMigrationCallBack.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ContactImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/IndicatorImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowImpl.java 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/Synthesis.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/ContactModelFactory.java trunk/wao-ui/src/main/webapp/Contacts.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-10-17 01:42:13 UTC (rev 683) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java 2010-10-17 14:53:36 UTC (rev 684) @@ -25,6 +25,7 @@ package fr.ifremer.wao; import fr.ifremer.wao.bean.ContactState; +import fr.ifremer.wao.bean.SynthesisId; import org.hibernate.SQLQuery; import org.nuiton.topia.TopiaException; import org.nuiton.topia.framework.TopiaContextImplementor; @@ -271,6 +272,7 @@ queries.add("UPDATE Contact SET emailSent = TRUE WHERE dataInputDate IS NOT NULL;"); } + /** Create tables for indicators and related data. */ @Override protected void createTablesForIndicatorsAdministration_1_6(List<String> queries) { // Evo #386 create Tables for Indicator IndicatorLevel and IndicatorLog @@ -314,6 +316,7 @@ } + /** Insert initial data specified in newly created tables about indicators. */ @Override protected void insertIndicatorLevelInitialValues_1_6(List<String> queries) { @@ -391,8 +394,7 @@ } - /** - * help method to create insertion for initial data in table levels + /** Help method to create insertion for initial data in table levels. * @param indicatorTopiaId the topiaId of the concerned indicator (foreign key) * @param level value in the tuple * @param upperBound value in the tuble @@ -418,4 +420,11 @@ indicatorTopiaId); return request; } + + /** Add a columns to Contact. */ + @Override + protected void addDataReliability_1_6(List<String> queries) { + queries.add("ALTER TABLE Contact ADD dataReliabilityOrdinal SMALLINT;"); + queries.add("UPDATE Contact SET dataReliabilityOrdinal=0;"); + } } Deleted: trunk/wao-business/src/main/java/fr/ifremer/wao/SynthesisId.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/SynthesisId.java 2010-10-17 01:42:13 UTC (rev 683) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/SynthesisId.java 2010-10-17 14:53:36 UTC (rev 684) @@ -1,83 +0,0 @@ -/* - * #%L - * Wao :: Web Interface - * - * $Id$ - * $HeadURL$ - * %% - * 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% - */ -package fr.ifremer.wao; - -/** - * SynthesisID - * - * Created: 9 févr. 2010 - * - * @author fdesbois <fdesbois at codelutin.com> - */ -public enum SynthesisId { - - /** */ - GRAPH_SAMPLING("graph1"), - - /** */ - GRAPH_BOARDING("graph2"), - - /** */ - IND_NON_COMPLIANCE_BOARDING("ind1"), - - /** */ - IND_CONTACT_STATE("ind2"), - - /** */ - IND_ALLEGRO_REACTIVITY("ind3"), - - /** */ - IND_COMPLIANCE_BOARDING("ind4"), - - /** */ - IND_SAMPLE_RELIABILITY("ind5"); - - private String blockId; - - SynthesisId(String blockId) { - this.blockId = blockId; - } - - public String getBlockId() { - return blockId; - } - - public static SynthesisId getSynthesisId(String blockId) { - for (SynthesisId synthesisId : SynthesisId.values()) { - if (synthesisId.getBlockId().equals(blockId)) { - return synthesisId; - } - } - return null; - } - - public static SynthesisId valueOf(int ordinal) { - for (SynthesisId synthesisId : SynthesisId.values()) { - if (synthesisId.ordinal() == ordinal) { - return synthesisId; - } - } - return null; - } -} Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoMigrationCallBack.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/WaoMigrationCallBack.java 2010-10-17 01:42:13 UTC (rev 683) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/WaoMigrationCallBack.java 2010-10-17 14:53:36 UTC (rev 684) @@ -82,6 +82,8 @@ protected abstract void insertIndicatorLevelInitialValues_1_6(List<String> queries); + protected abstract void addDataReliability_1_6(List<String> queries); + protected static final Version[] VERSIONS = new Version[] { VersionUtil.valueOf("1.0"), VersionUtil.valueOf("1.1"), @@ -238,6 +240,8 @@ insertIndicatorLevelInitialValues_1_6(queries); + addDataReliability_1_6(queries); + if (log.isDebugEnabled()) { log.debug("queries for migration to version 1.6 are \n" + queries); } Added: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/DataReliability.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/bean/DataReliability.java (rev 0) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/DataReliability.java 2010-10-17 14:53:36 UTC (rev 684) @@ -0,0 +1,45 @@ +package fr.ifremer.wao.bean; + +import static org.nuiton.i18n.I18n._; + +/** + * This enumeration represents the different levels of trust that can accorded to + * a contact and to the data she provided. + * + * @author bleny + */ +public enum DataReliability { + + /** Data reliability has not been evaluated yet (?% trust). */ + UNKNOWN("wao.business.bean.DataReliability.unknown"), + + /** Data are not reliable (0% trust). */ + NOT_RELIABLE("wao.business.bean.DataReliability.not_reliable"), + + /** Data are doubtful (50% trust). */ + DOUBTFUL("wao.business.bean.DataReliability.doubtful"), + + /** Data are trustworthy (100% trust). */ + RELIABLE("wao.business.bean.DataReliability.reliable"); + + /** An i18n key to make enumeration printable in logs and UI. */ + protected String label; + + DataReliability(String label) { + this.label = label; + } + + /** Get a translated name for the current value. */ + public String getLabel() { + return _(label); + } + + public static DataReliability valueOf(int ordinal) { + for (DataReliability dataReliability : DataReliability.values()) { + if (dataReliability.ordinal() == ordinal) { + return dataReliability; + } + } + return null; + } +} Copied: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SynthesisId.java (from rev 683, trunk/wao-business/src/main/java/fr/ifremer/wao/SynthesisId.java) =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SynthesisId.java (rev 0) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SynthesisId.java 2010-10-17 14:53:36 UTC (rev 684) @@ -0,0 +1,83 @@ +/* + * #%L + * Wao :: Web Interface + * + * $Id$ + * $HeadURL$ + * %% + * 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% + */ +package fr.ifremer.wao.bean; + +/** + * SynthesisID + * + * Created: 9 févr. 2010 + * + * @author fdesbois <fdesbois at codelutin.com> + */ +public enum SynthesisId { + + /** */ + GRAPH_SAMPLING("graph1"), + + /** */ + GRAPH_BOARDING("graph2"), + + /** */ + IND_NON_COMPLIANCE_BOARDING("ind1"), + + /** */ + IND_CONTACT_STATE("ind2"), + + /** */ + IND_ALLEGRO_REACTIVITY("ind3"), + + /** */ + IND_COMPLIANCE_BOARDING("ind4"), + + /** */ + IND_SAMPLE_RELIABILITY("ind5"); + + private String blockId; + + SynthesisId(String blockId) { + this.blockId = blockId; + } + + public String getBlockId() { + return blockId; + } + + public static SynthesisId getSynthesisId(String blockId) { + for (SynthesisId synthesisId : SynthesisId.values()) { + if (synthesisId.getBlockId().equals(blockId)) { + return synthesisId; + } + } + return null; + } + + public static SynthesisId valueOf(int ordinal) { + for (SynthesisId synthesisId : SynthesisId.values()) { + if (synthesisId.ordinal() == ordinal) { + return synthesisId; + } + } + return null; + } +} Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SynthesisId.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:mergeinfo + Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ContactImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ContactImpl.java 2010-10-17 01:42:13 UTC (rev 683) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ContactImpl.java 2010-10-17 14:53:36 UTC (rev 684) @@ -25,6 +25,7 @@ package fr.ifremer.wao.entity; import fr.ifremer.wao.bean.ContactState; +import fr.ifremer.wao.bean.DataReliability; import org.nuiton.util.DateUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -92,4 +93,14 @@ setState(contactState.ordinal()); } + @Override + public DataReliability getDataReliability() { + return DataReliability.valueOf(getDataReliabilityOrdinal()); + } + + @Override + public void setDataReliability(DataReliability dataReliability) { + setDataReliabilityOrdinal(dataReliability.ordinal()); + } + } 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-10-17 01:42:13 UTC (rev 683) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/IndicatorImpl.java 2010-10-17 14:53:36 UTC (rev 684) @@ -1,6 +1,6 @@ package fr.ifremer.wao.entity; -import fr.ifremer.wao.SynthesisId; +import fr.ifremer.wao.bean.SynthesisId; /** * Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowImpl.java 2010-10-17 01:42:13 UTC (rev 683) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowImpl.java 2010-10-17 14:53:36 UTC (rev 684) @@ -25,6 +25,7 @@ package fr.ifremer.wao.entity; import fr.ifremer.wao.WaoUtils; +import fr.ifremer.wao.bean.DataReliability; import fr.ifremer.wao.service.ServiceSampling; import org.apache.commons.lang.BooleanUtils; import org.apache.commons.lang.time.DurationFormatUtils; 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-10-17 01:42:13 UTC (rev 683) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java 2010-10-17 14:53:36 UTC (rev 684) @@ -24,7 +24,7 @@ package fr.ifremer.wao.service; -import fr.ifremer.wao.SynthesisId; +import fr.ifremer.wao.bean.SynthesisId; import fr.ifremer.wao.WaoContext; import fr.ifremer.wao.WaoDAOHelper; import fr.ifremer.wao.WaoException; 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-10-17 01:42:13 UTC (rev 683) +++ trunk/wao-business/src/main/resources/i18n/wao-business-en_GB.properties 2010-10-17 14:53:36 UTC (rev 684) @@ -1,3 +1,7 @@ +wao.business.bean.DataReliability.doubtful=doubtful +wao.business.bean.DataReliability.not_reliable=not reliable +wao.business.bean.DataReliability.reliable=reliable +wao.business.bean.DataReliability.unknown=unknown wao.error.boat.canCreateContact= wao.error.boat.getNbBoarding= wao.error.boatInfos.getNbBoardingForCompany= 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-10-17 01:42:13 UTC (rev 683) +++ trunk/wao-business/src/main/resources/i18n/wao-business-fr_FR.properties 2010-10-17 14:53:36 UTC (rev 684) @@ -1,3 +1,7 @@ +wao.business.bean.DataReliability.doubtful=douteuse +wao.business.bean.DataReliability.not_reliable=non exploitable +wao.business.bean.DataReliability.reliable=exploitable +wao.business.bean.DataReliability.unknown=non renseign\u00E9e wao.error.boat.canCreateContact=Impossible de cr\u00E9er un nouveau contact pour la soci\u00E9t\u00E9 %1$s et le navire %2$s (%3$d) wao.error.boat.getNbBoarding=Impossible de r\u00E9cup\u00E9rer le nombre d'embarquements r\u00E9els depuis le %1$s wao.error.boatInfos.getNbBoardingForCompany=Impossible de r\u00E9cup\u00E9rer le nombre d'embarquements r\u00E9els depuis le %1$s pour la soci\u00E9t\u00E9 %2$s Modified: trunk/wao-business/src/main/xmi/wao.zargo =================================================================== (Binary files differ) 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-10-17 01:42:13 UTC (rev 683) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java 2010-10-17 14:53:36 UTC (rev 684) @@ -24,7 +24,7 @@ package fr.ifremer.wao.ui.pages; -import fr.ifremer.wao.SynthesisId; +import fr.ifremer.wao.bean.SynthesisId; import fr.ifremer.wao.WaoException; import fr.ifremer.wao.bean.BoardingResult; import fr.ifremer.wao.bean.ConnectedUser; @@ -42,7 +42,6 @@ import fr.ifremer.wao.ui.data.ChartUtils; import fr.ifremer.wao.ui.data.ChartUtils.ChartType; import fr.ifremer.wao.ui.data.RequiresAuthentication; -import fr.ifremer.wao.SynthesisId; import fr.ifremer.wao.ui.services.WaoManager; import org.apache.commons.collections.CollectionUtils; import org.apache.tapestry5.Block; @@ -67,7 +66,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.Set; import java.util.SortedMap; /** Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/ContactModelFactory.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/ContactModelFactory.java 2010-10-17 01:42:13 UTC (rev 683) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/ContactModelFactory.java 2010-10-17 14:53:36 UTC (rev 684) @@ -112,6 +112,7 @@ contactModel.add(RelativePosition.AFTER, "fishingZoneSector", "fishingZoneDivision", getFishingZoneDivisionPropertyConduit()); contactModel.add(RelativePosition.AFTER, Contact.BOAT, "boatImmatriculation", getBoatImmatriculationPropertyConduit()); contactModel.add(RelativePosition.AFTER, "boatImmatriculation", "boatDistrictCode", getBoatDistrictCodePropertyConduit()); + contactModel.add(RelativePosition.AFTER, "validation", "dataReliability", getDataReliabilityPropertyConduit()); contactModel.get("observer").sortable(false); contactModel.get(WaoUser.COMPANY).sortable(false); @@ -124,6 +125,7 @@ contactModel.get("fishingZoneDivision").sortable(false); contactModel.get("boatImmatriculation").sortable(false); contactModel.get("boatDistrictCode").sortable(false); + contactModel.get("dataReliability").sortable(false); // contactModel.add(RelativePosition.AFTER, TopiaEntity.TOPIA_CREATE_DATE, "observer", null); // contactModel.add(RelativePosition.AFTER, "observer", User.COMPANY, null); @@ -502,4 +504,28 @@ } }; } + + public PropertyConduit getDataReliabilityPropertyConduit() { + return new PropertyConduit() { + @Override + public Object get(Object arg0) { + Contact contact = (Contact) arg0; + return contact.getDataReliability(); + } + + @Override + public void set(Object arg0, Object arg1) { + } + + @Override + public Class getPropertyType() { + return String.class; + } + + @Override + public <T extends Annotation> T getAnnotation(Class<T> arg0) { + return null; + } + }; + } } Modified: trunk/wao-ui/src/main/webapp/Contacts.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Contacts.tml 2010-10-17 01:42:13 UTC (rev 683) +++ trunk/wao-ui/src/main/webapp/Contacts.tml 2010-10-17 14:53:36 UTC (rev 684) @@ -289,6 +289,14 @@ </p:else> </t:if> </p:commentCell> + <p:dataReliabilityCell> + <t:if t:test="editionMode"> + <input t:type="select" t:id="dataReliability" t:value="contactEdited.dataReliability" /> + <p:else> + ${contact.dataReliability.label} + </p:else> + </t:if> + </p:dataReliabilityCell> <p:commentCoordinatorCell> <span t:type="ck/Tooltip" title="Commentaire société" t:value="${getCommentTooltip(contact.commentCoordinator)}" t:effect="appear"> ${getCommentDisplayText(contact.commentCoordinator)}

2 2

[Suiviobsmer-commits] r683 - trunk
by tchemit＠users.labs.libre-entreprise.org 17 Oct '10

17 Oct '10

Author: tchemit Date: 2010-10-17 01:42:13 +0000 (Sun, 17 Oct 2010) New Revision: 683 Log: Update mavenpom4labs to 2.3.2. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-10-15 18:32:15 UTC (rev 682) +++ trunk/pom.xml 2010-10-17 01:42:13 UTC (rev 683) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4labs</artifactId> - <version>2.3.1</version> + <version>2.3.2</version> </parent> <groupId>fr.ifremer</groupId>

1 0

[Suiviobsmer-commits] r682 - in branches/wao-1.5.x: . src/announcement src/site/rst wao-ui/src/main/java/fr/ifremer/wao/ui/pages wao-ui/src/main/webapp/js
by fdesbois＠users.labs.libre-entreprise.org 15 Oct '10

15 Oct '10

Author: fdesbois Date: 2010-10-15 18:32:15 +0000 (Fri, 15 Oct 2010) New Revision: 682 Log: ANO #2526 : Bug on IE javascript : - Rename js files - Resolve News bug and Contact automatic mail bug Added: branches/wao-1.5.x/wao-ui/src/main/webapp/js/administration.js branches/wao-1.5.x/wao-ui/src/main/webapp/js/news.js Removed: branches/wao-1.5.x/wao-ui/src/main/webapp/js/AdminUserSelect.js branches/wao-1.5.x/wao-ui/src/main/webapp/js/NewsHider.js Modified: branches/wao-1.5.x/changelog.txt branches/wao-1.5.x/src/announcement/release-email-1.5.4.txt branches/wao-1.5.x/src/site/rst/index.rst branches/wao-1.5.x/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Administration.java branches/wao-1.5.x/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Index.java branches/wao-1.5.x/wao-ui/src/main/webapp/js/contacts.js Modified: branches/wao-1.5.x/changelog.txt =================================================================== --- branches/wao-1.5.x/changelog.txt 2010-10-15 16:30:12 UTC (rev 681) +++ branches/wao-1.5.x/changelog.txt 2010-10-15 18:32:15 UTC (rev 682) @@ -9,8 +9,9 @@ Anomalies +++++++++ -- [fdesbois] Ano #2540 : La validation programme ne fonctionne plus sur un contact - refusé. +- [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 ----- Modified: branches/wao-1.5.x/src/announcement/release-email-1.5.4.txt =================================================================== --- branches/wao-1.5.x/src/announcement/release-email-1.5.4.txt 2010-10-15 16:30:12 UTC (rev 681) +++ branches/wao-1.5.x/src/announcement/release-email-1.5.4.txt 2010-10-15 18:32:15 UTC (rev 682) @@ -3,6 +3,7 @@ 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] Modified: branches/wao-1.5.x/src/site/rst/index.rst =================================================================== --- branches/wao-1.5.x/src/site/rst/index.rst 2010-10-15 16:30:12 UTC (rev 681) +++ branches/wao-1.5.x/src/site/rst/index.rst 2010-10-15 18:32:15 UTC (rev 682) @@ -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/ Modified: branches/wao-1.5.x/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Administration.java =================================================================== --- branches/wao-1.5.x/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Administration.java 2010-10-15 16:30:12 UTC (rev 681) +++ branches/wao-1.5.x/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Administration.java 2010-10-15 18:32:15 UTC (rev 682) @@ -85,7 +85,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 Modified: branches/wao-1.5.x/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Index.java =================================================================== --- branches/wao-1.5.x/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Index.java 2010-10-15 16:30:12 UTC (rev 681) +++ branches/wao-1.5.x/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Index.java 2010-10-15 18:32:15 UTC (rev 682) @@ -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 Deleted: branches/wao-1.5.x/wao-ui/src/main/webapp/js/AdminUserSelect.js =================================================================== --- branches/wao-1.5.x/wao-ui/src/main/webapp/js/AdminUserSelect.js 2010-10-15 16:30:12 UTC (rev 681) +++ branches/wao-1.5.x/wao-ui/src/main/webapp/js/AdminUserSelect.js 2010-10-15 18:32:15 UTC (rev 682) @@ -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: branches/wao-1.5.x/wao-ui/src/main/webapp/js/NewsHider.js =================================================================== --- branches/wao-1.5.x/wao-ui/src/main/webapp/js/NewsHider.js 2010-10-15 16:30:12 UTC (rev 681) +++ branches/wao-1.5.x/wao-ui/src/main/webapp/js/NewsHider.js 2010-10-15 18:32:15 UTC (rev 682) @@ -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: branches/wao-1.5.x/wao-ui/src/main/webapp/js/administration.js (from rev 678, branches/wao-1.5.x/wao-ui/src/main/webapp/js/AdminUserSelect.js) =================================================================== --- branches/wao-1.5.x/wao-ui/src/main/webapp/js/administration.js (rev 0) +++ branches/wao-1.5.x/wao-ui/src/main/webapp/js/administration.js 2010-10-15 18:32:15 UTC (rev 682) @@ -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: branches/wao-1.5.x/wao-ui/src/main/webapp/js/contacts.js =================================================================== --- branches/wao-1.5.x/wao-ui/src/main/webapp/js/contacts.js 2010-10-15 16:30:12 UTC (rev 681) +++ branches/wao-1.5.x/wao-ui/src/main/webapp/js/contacts.js 2010-10-15 18:32:15 UTC (rev 682) @@ -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: branches/wao-1.5.x/wao-ui/src/main/webapp/js/news.js (from rev 678, branches/wao-1.5.x/wao-ui/src/main/webapp/js/NewsHider.js) =================================================================== --- branches/wao-1.5.x/wao-ui/src/main/webapp/js/news.js (rev 0) +++ branches/wao-1.5.x/wao-ui/src/main/webapp/js/news.js 2010-10-15 18:32:15 UTC (rev 682) @@ -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] r681 - in trunk/wao-ui/src/main: java/fr/ifremer/wao/ui/pages webapp
by bleny＠users.labs.libre-entreprise.org 15 Oct '10

15 Oct '10

Author: bleny Date: 2010-10-15 16:30:12 +0000 (Fri, 15 Oct 2010) New Revision: 681 Log: add synthesis render for third indicator Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java trunk/wao-ui/src/main/webapp/Synthesis.tml 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-10-15 16:11:20 UTC (rev 680) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java 2010-10-15 16:30:12 UTC (rev 681) @@ -258,10 +258,15 @@ // FIXME 20101015 bleny business code, should be moved in business + // computing level for indicator int totalNumberOfRealized = 0; int totalNumberOfPlanned = 0; for (Map.Entry<Date, Integer> entry : res.get(1).entrySet()) { + // res.get(1) contains number of realized + // while res.get(0) contains planned + Date date = entry.getKey(); + // both variables will contains planned and realized at the same date int numberOfRealized = entry.getValue(); int numberOfPlanned = res.get(0).get(date); @@ -359,6 +364,18 @@ if (boardingResult == null) { boardingResult = serviceSynthesis.getBoardingBoats( getCompanyForBoarding(), getFromDate()); + + // FIXME 20101015 bleny business code, should be moved in business + // computing level for indicator + int numberOfBoatWithOneBoarding = boardingResult.getData().get("1"); + int totalNumberOfBoarding = 0; + for (Integer numberOfBoarding : boardingResult.getData().values()) { + totalNumberOfBoarding += numberOfBoarding; + } + double rate = ((double) numberOfBoatWithOneBoarding / + (double) totalNumberOfBoarding) * 100.0; + activeIndicator = getActiveIndicator(); + activeIndicatorLevel = activeIndicator.getLevelForValue(rate); } return boardingResult; } @@ -406,6 +423,7 @@ serviceSynthesis.getNonComplianceBoardingIndicator(company); // FIXME 20101015 bleny business code, should be moved in business + // computing level for indicator double total = 0.0; int numberOfCompanies = nonComplianceBoarding.size(); for (Double compliance : nonComplianceBoarding.values()) { @@ -521,6 +539,8 @@ serviceSynthesis.getContactDataInputDateReactivity(company, getPeriodForAllegroReactivity()); + // FIXME 20101015 bleny business code, should be moved in business + // computing level for indicator double sumAverages = 0.0; for (ContactAverageReactivity reactivity : allegroReactivity) { sumAverages += reactivity.getResult(); Modified: trunk/wao-ui/src/main/webapp/Synthesis.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Synthesis.tml 2010-10-15 16:11:20 UTC (rev 680) +++ trunk/wao-ui/src/main/webapp/Synthesis.tml 2010-10-15 16:30:12 UTC (rev 681) @@ -171,6 +171,10 @@ <strong>${boardingResult.maxBoardingBoat.name} (${boardingResult.maxBoardingBoat.immatriculation})</strong> </p> </t:if> + +  + <br /> + <t:indicatorLevels t:indicator="activeIndicator" highlightLevel="activeIndicatorLevel" /> </div> </t:block>

1 0