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

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

Oct. 17, 2010

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 Oct. 15, 2010

Oct. 15, 2010

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 Oct. 15, 2010

Oct. 15, 2010

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

[Suiviobsmer-commits] r680 - in branches/wao-1.5.x: . src/announcement wao-business wao-ui wao-ui/src/main/java/fr/ifremer/wao/ui/pages
by fdesbois＠users.labs.libre-entreprise.org Oct. 15, 2010

Oct. 15, 2010

Author: fdesbois Date: 2010-10-15 16:11:20 +0000 (Fri, 15 Oct 2010) New Revision: 680 Log: ANO #2540 : NPE on old contact state when validate unfinished contact for program. Added: branches/wao-1.5.x/src/announcement/release-email-1.5.4.txt Modified: branches/wao-1.5.x/changelog.txt 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 branches/wao-1.5.x/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java Modified: branches/wao-1.5.x/changelog.txt =================================================================== --- branches/wao-1.5.x/changelog.txt 2010-10-15 15:33:29 UTC (rev 679) +++ branches/wao-1.5.x/changelog.txt 2010-10-15 16:11:20 UTC (rev 680) @@ -3,6 +3,15 @@ Historique des versions +1.5.4 +----- + +Anomalies ++++++++++ + +- [fdesbois] Ano #2540 : La validation programme ne fonctionne plus sur un contact + refusé. + 1.5.3 ----- Modified: branches/wao-1.5.x/pom.xml =================================================================== --- branches/wao-1.5.x/pom.xml 2010-10-15 15:33:29 UTC (rev 679) +++ branches/wao-1.5.x/pom.xml 2010-10-15 16:11:20 UTC (rev 680) @@ -15,7 +15,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>1.5.3</version> + <version>1.5.4-SNAPSHOT</version> <modules> <module>wao-ui</module> Added: 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 (rev 0) +++ branches/wao-1.5.x/src/announcement/release-email-1.5.4.txt 2010-10-15 16:11:20 UTC (rev 680) @@ -0,0 +1,20 @@ + +Un correctif 1.5.4 pour la version 1.5 de Wao est disponible. + +Résolution d'anomalies : + +- 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: branches/wao-1.5.x/wao-business/pom.xml =================================================================== --- branches/wao-1.5.x/wao-business/pom.xml 2010-10-15 15:33:29 UTC (rev 679) +++ branches/wao-1.5.x/wao-business/pom.xml 2010-10-15 16:11:20 UTC (rev 680) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>1.5.3</version> + <version>1.5.4-SNAPSHOT</version> </parent> <groupId>fr.ifremer.wao</groupId> Modified: branches/wao-1.5.x/wao-ui/pom.xml =================================================================== --- branches/wao-1.5.x/wao-ui/pom.xml 2010-10-15 15:33:29 UTC (rev 679) +++ branches/wao-1.5.x/wao-ui/pom.xml 2010-10-15 16:11:20 UTC (rev 680) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>1.5.3</version> + <version>1.5.4-SNAPSHOT</version> </parent> <groupId>fr.ifremer.wao</groupId> Modified: branches/wao-1.5.x/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java =================================================================== --- branches/wao-1.5.x/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java 2010-10-15 15:33:29 UTC (rev 679) +++ branches/wao-1.5.x/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java 2010-10-15 16:11:20 UTC (rev 680) @@ -684,29 +684,21 @@ " du jour"); } - if (logger.isDebugEnabled()) { - logger.debug("IsUnfinished : " + contactState.isUnfinishedState()); - logger.debug("OldUnfinished : " + oldState.isUnfinishedState()); - - String newComment = contactEdited.getComment(); - boolean commentDefined = StringUtils.isNotEmpty(newComment); - boolean commentChanged = commentDefined && !newComment.equals(oldComment); - - logger.debug("commentDefined : " + commentDefined); - logger.debug("commentChanged : " + commentChanged); - } - // Non abouti, Refus ou Refus Définitif if (contactState.isUnfinishedState()) { String newComment = contactEdited.getComment(); - boolean commentChanged = - StringUtils.isNotEmpty(newComment) && + boolean commentDefined = StringUtils.isNotEmpty(newComment); + boolean commentChanged = commentDefined && !newComment.equals(oldComment); + // Ano #2540 : NPE on oldState, extract boolean for + // previous unfinishedState case + boolean previousUnfinishedState = commentDefined && + oldState != null && oldState.isUnfinishedState(); + // Ano #2440 : no restriction if previous state is unfinished - if (oldState.isUnfinishedState() && - StringUtils.isNotEmpty(newComment) || commentChanged) { + if (previousUnfinishedState || commentChanged) { // RAZ des champs contactEdited.setTideBeginDate(null); @@ -715,6 +707,7 @@ contactEdited.setMammalsCapture(false); contactEdited.setMammalsObservation(false); contactEdited.setDataInputDate(null); + } else { contactsForm.recordError(comment, "Vous devez ajouter" + " un commentaire pour l'état" +

1 0

[Suiviobsmer-commits] r679 - in trunk/wao-ui/src/main: java/fr/ifremer/wao/ui/pages webapp
by bleny＠users.labs.libre-entreprise.org Oct. 15, 2010

Oct. 15, 2010

Author: bleny Date: 2010-10-15 15:33:29 +0000 (Fri, 15 Oct 2010) New Revision: 679 Log: add fourth indicator position 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 15:14:53 UTC (rev 678) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java 2010-10-15 15:33:29 UTC (rev 679) @@ -202,7 +202,7 @@ return this; } - /********************* DYNAMICAL GRAPH : DATASAMPLING *********************/ + /********************* DYNAMICAL GRAPH : DATA SAMPLING ********************/ @Persist private SamplingFilter dataSamplingFilter; @@ -520,6 +520,17 @@ allegroReactivity = serviceSynthesis.getContactDataInputDateReactivity(company, getPeriodForAllegroReactivity()); + + double sumAverages = 0.0; + for (ContactAverageReactivity reactivity : allegroReactivity) { + sumAverages += reactivity.getResult(); + } + + double numberOfCompanies = (double) allegroReactivity.size(); + double totalAverages = sumAverages / numberOfCompanies; + + activeIndicator = getActiveIndicator(); + activeIndicatorLevel = activeIndicator.getLevelForValue(totalAverages); } return allegroReactivity; } Modified: trunk/wao-ui/src/main/webapp/Synthesis.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Synthesis.tml 2010-10-15 15:14:53 UTC (rev 678) +++ trunk/wao-ui/src/main/webapp/Synthesis.tml 2010-10-15 15:33:29 UTC (rev 679) @@ -318,6 +318,10 @@ </div> </p:else> </t:if> + +  + <br /> + <t:indicatorLevels t:indicator="activeIndicator" highlightLevel="activeIndicatorLevel" /> </div> </t:block> </t:layout>

1 0

[Suiviobsmer-commits] r678 - branches
by fdesbois＠users.labs.libre-entreprise.org Oct. 15, 2010

Oct. 15, 2010

Author: fdesbois Date: 2010-10-15 15:14:53 +0000 (Fri, 15 Oct 2010) New Revision: 678 Log: Some bugs are found on 1.5 Added: branches/wao-1.5.x/

1 0

[Suiviobsmer-commits] r677 - in trunk/wao-ui/src/main: java/fr/ifremer/wao/ui/pages webapp
by bleny＠users.labs.libre-entreprise.org Oct. 15, 2010

Oct. 15, 2010

Author: bleny Date: 2010-10-15 13:33:57 +0000 (Fri, 15 Oct 2010) New Revision: 677 Log: add second indicator position 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 10:57:56 UTC (rev 676) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java 2010-10-15 13:33:57 UTC (rev 677) @@ -122,23 +122,39 @@ return activeSynthesis; } - public Indicator getActiveIndicator() { - - SynthesisId activeSynthesis = getActiveSynthesis(); - // FIXME bleny 20101014 lazy call service and keep result ? - // what if values are updated ? - List<Indicator> globalSynthesisParameters = - serviceSynthesis.getGlobalSynthesisParameters(); - - for (Indicator indicator : globalSynthesisParameters) { - if (indicator.getSynthesisId() == 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 List<Indicator> globalSynthesisParameters; + + /** permit lazy call to serviceSynthesis to set globalSynthesisParameters field. */ + public List<Indicator> getGlobalSynthesisParameters() { + if (globalSynthesisParameters == null) { + globalSynthesisParameters = + serviceSynthesis.getGlobalSynthesisParameters(); + } + return globalSynthesisParameters; + } + + /** update activeIndicator to the indicator corresponding to activeSynthesis. + * @return the value of activeIndicator field, after modification + */ + public Indicator getActiveIndicator() { + SynthesisId activeSynthesis = getActiveSynthesis(); + List<Indicator> globalSynthesisParameters = getGlobalSynthesisParameters(); + activeIndicator = findIndicator(activeSynthesis, globalSynthesisParameters); + return activeIndicator; + } + public IndicatorLevel getActiveIndicatorLevel() { return activeIndicatorLevel; } @@ -368,7 +384,7 @@ companyForBoarding = getCompanySelectModel().findObject(companyIdForBoarding); } - /********************* INDICATOR : NONCOMPLIANCEBOARDING ******************/ + /********************* INDICATOR : NON COMPLIANCE BOARDING ****************/ private Map<String, Double> nonComplianceBoarding; @@ -383,13 +399,26 @@ * @return a Map with companies and there values for nonComplianceBoarding * @throws WaoException */ - public Map<String, Double> getNonComplianceBoarding() - throws WaoException { + public Map<String, Double> getNonComplianceBoarding() throws WaoException { if (nonComplianceBoarding == null) { Company company = !user.isAdmin() ? user.getCompany() : null; nonComplianceBoarding = serviceSynthesis.getNonComplianceBoardingIndicator(company); + + // FIXME 20101015 bleny business code, should be moved in business + double total = 0.0; + int numberOfCompanies = nonComplianceBoarding.size(); + for (Double compliance : nonComplianceBoarding.values()) { + total += compliance; + } + double indicatorValue = 100.0 - (total / numberOfCompanies); + + // XXX 20101015 bleny switching synthesisId while rendering. side-effects ? + activeSynthesis = SynthesisId.IND_COMPLIANCE_BOARDING; + activeIndicator = getActiveIndicator(); + activeIndicatorLevel = activeIndicator.getLevelForValue(indicatorValue); } + return nonComplianceBoarding; } @@ -404,7 +433,7 @@ return getNonComplianceBoarding().get(user.getCompany().getName()); } - /********************* INDICATOR : NONCOMPLIANCEBOARDING ******************/ + /********************* INDICATOR : CONTACT STATE ******************/ private Collection<ContactStateStatistics> contactStateStatistics; @@ -474,7 +503,7 @@ return (double)getNbContactStates() / (double)contactStateStats.getTotal(); } - /********************* INDICATOR : NONCOMPLIANCEBOARDING ******************/ + /********************* INDICATOR : ALLEGRO REACTIVITY ******************/ private Collection<ContactAverageReactivity> allegroReactivity; Modified: trunk/wao-ui/src/main/webapp/Synthesis.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Synthesis.tml 2010-10-15 10:57:56 UTC (rev 676) +++ trunk/wao-ui/src/main/webapp/Synthesis.tml 2010-10-15 13:33:57 UTC (rev 677) @@ -213,6 +213,10 @@ </div> </p:else> </t:if> + +  + <br /> + <t:indicatorLevels t:indicator="activeIndicator" highlightLevel="activeIndicatorLevel" /> </div> </t:block>

1 0

[Suiviobsmer-commits] r676 - in trunk: wao-business/src/main/java/fr/ifremer/wao/entity 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 Oct. 15, 2010

Oct. 15, 2010

Author: bleny Date: 2010-10-15 10:57:56 +0000 (Fri, 15 Oct 2010) New Revision: 676 Log: highlight current indicator level on graph-sampling, add missing methods in indicators to find level Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/IndicatorImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/IndicatorLevelImpl.java 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/Synthesis.java trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/IndicatorLevels.tml trunk/wao-ui/src/main/webapp/Synthesis.tml trunk/wao-ui/src/main/webapp/css/common.css 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-14 15:20:20 UTC (rev 675) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/IndicatorImpl.java 2010-10-15 10:57:56 UTC (rev 676) @@ -16,4 +16,15 @@ public void setSynthesisId(SynthesisId synthesisId) { setIndicatorId(synthesisId.ordinal()); } + + /** return the level that contains given value between it's two bound */ + @Override + public IndicatorLevel getLevelForValue(double value) { + for (IndicatorLevel level : getIndicatorLevel()) { + if (level.containsValue(value)) { + return level; + } + } + return null; + } } Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/IndicatorLevelImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/IndicatorLevelImpl.java 2010-10-14 15:20:20 UTC (rev 675) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/IndicatorLevelImpl.java 2010-10-15 10:57:56 UTC (rev 676) @@ -29,4 +29,27 @@ return getLowerBound() == getUpperBound(); } + /** if upperBound and lowerBound are equals, return true if value is equals + * if lowerBound and upperBound are different, return true if value is + * between bound. + * + * upperBound is always strict comparison, lowerBound non-strict comparison + */ + @Override + public boolean containsValue(double value) { + boolean containsValue; + if (lowerEqualsUpperBounds()) { + containsValue = value == getUpperBound(); + } else { + if (getLowerBound() < getUpperBound()) { + containsValue = value >= getLowerBound() + && value < getUpperBound(); + } else { + containsValue = value >= getUpperBound() + && value < getLowerBound(); + } + } + return containsValue; + } + } 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-14 15:20:20 UTC (rev 675) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/IndicatorLevels.java 2010-10-15 10:57:56 UTC (rev 676) @@ -24,10 +24,12 @@ @Inject private Logger log; - /* variable used in view */ @Parameter(required = true) private Indicator indicator; + @Parameter(required = false) + private IndicatorLevel highlightLevel; + /* variable used in view */ @Property private IndicatorLevel indicatorLevel; @@ -39,4 +41,12 @@ return indicator; } + public boolean highLightCurrentIndicatorLevel() { + if (log.isDebugEnabled()) { + log.debug("indicatorLevel = " + indicatorLevel); + log.debug("highlightLevel = " + highlightLevel); + } + return indicatorLevel.equals(highlightLevel); + } + } 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-14 15:20:20 UTC (rev 675) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java 2010-10-15 10:57:56 UTC (rev 676) @@ -35,6 +35,8 @@ import fr.ifremer.wao.bean.SamplingFilterImpl; import fr.ifremer.wao.bean.UserRole; import fr.ifremer.wao.entity.Company; +import fr.ifremer.wao.entity.Indicator; +import fr.ifremer.wao.entity.IndicatorLevel; import fr.ifremer.wao.service.ServiceSynthesis; import fr.ifremer.wao.ui.base.AbstractFilteredPage; import fr.ifremer.wao.ui.data.ChartUtils; @@ -65,6 +67,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Set; import java.util.SortedMap; /** @@ -76,8 +79,7 @@ */ @RequiresAuthentication({UserRole.ADMIN, UserRole.COORDINATOR, UserRole.OBSERVER}) @IncludeStylesheet("context:css/synthesis.css") -public class - Synthesis extends AbstractFilteredPage { +public class Synthesis extends AbstractFilteredPage { @Inject private WaoManager manager; @@ -95,6 +97,12 @@ @Persist private SynthesisId activeSynthesis; + @Persist + private Indicator activeIndicator; + + @Persist + private IndicatorLevel activeIndicatorLevel; + @Inject private ComponentResources resources; @@ -106,16 +114,41 @@ initCompanyFilter(); } - public Block getActiveBlock() throws WaoException { + public SynthesisId getActiveSynthesis() { if (activeSynthesis == null) { // Initialize default synthesis by Data Sampling activeSynthesis = SynthesisId.GRAPH_SAMPLING; } - switch (activeSynthesis) { + return activeSynthesis; + } + + public Indicator getActiveIndicator() { + + SynthesisId activeSynthesis = getActiveSynthesis(); + // FIXME bleny 20101014 lazy call service and keep result ? + // what if values are updated ? + List<Indicator> globalSynthesisParameters = + serviceSynthesis.getGlobalSynthesisParameters(); + + for (Indicator indicator : globalSynthesisParameters) { + if (indicator.getSynthesisId() == activeSynthesis) { + return indicator; + } + } + + return null; + } + + public IndicatorLevel getActiveIndicatorLevel() { + return activeIndicatorLevel; + } + + public Block getActiveBlock() throws WaoException { + switch (getActiveSynthesis()) { case GRAPH_SAMPLING : initSamplingBlock(); break; case GRAPH_BOARDING : initBoardingBlock(); } - return resources.getBlock(activeSynthesis.getBlockId()); + return resources.getBlock(getActiveSynthesis().getBlockId()); } public String getActionSynthesisId() { @@ -205,6 +238,40 @@ getFilter().getEstimatedTides() ? "Estimé" : "Réalisé"; data.put(realText, res.get(1)); String title = manager.getDataSamplingTitle(getFilter()); + + + + // FIXME 20101015 bleny business code, should be moved in business + int totalNumberOfRealized = 0; + int totalNumberOfPlanned = 0; + for (Map.Entry<Date, Integer> entry : res.get(1).entrySet()) { + Date date = entry.getKey(); + int numberOfRealized = entry.getValue(); + int numberOfPlanned = res.get(0).get(date); + + totalNumberOfPlanned += numberOfPlanned; + totalNumberOfRealized += numberOfRealized; + + if (log.isDebugEnabled()) { + log.debug(String.format( + "number of planed %s (%s), number of realized %s (%s)", + numberOfPlanned, totalNumberOfPlanned, + numberOfRealized, totalNumberOfRealized)); + } + } + + double percentRealized = ((double) totalNumberOfRealized / + (double) totalNumberOfPlanned) * 100.0; + + if (log.isDebugEnabled()) { + log.debug(String.format("percent realized %f %%", percentRealized)); + } + + activeIndicatorLevel = getActiveIndicator().getLevelForValue(percentRealized); + if (log.isDebugEnabled()) { + log.debug("activeIndicatorLevel = " + activeIndicatorLevel.getLevel()); + } + return ChartUtils.createCategoryChart(title, "Nb marées", "Mois", getDataSamplingChartType(), data); } 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-14 15:20:20 UTC (rev 675) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/IndicatorLevels.tml 2010-10-15 10:57:56 UTC (rev 676) @@ -28,7 +28,12 @@ <tr> <th>Niveaux</th> <t:loop t:source="indicator.indicatorLevel" t:value="indicatorLevel"> - <td>${indicatorLevel.level}</td> + <t:if test="highLightCurrentIndicatorLevel()"> + <td class="highlight">${indicatorLevel.level}</td> + <p:else> + <td>${indicatorLevel.level}</td> + </p:else> + </t:if> </t:loop> </tr> <tr> Modified: trunk/wao-ui/src/main/webapp/Synthesis.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Synthesis.tml 2010-10-14 15:20:20 UTC (rev 675) +++ trunk/wao-ui/src/main/webapp/Synthesis.tml 2010-10-15 10:57:56 UTC (rev 676) @@ -143,6 +143,10 @@  <t:chart t:width="600" t:height="400" t:chart="dataSamplingChart" />  + +  + <br /> + <t:indicatorLevels t:indicator="activeIndicator" highlightLevel="activeIndicatorLevel" /> </div> </t:block>  Modified: trunk/wao-ui/src/main/webapp/css/common.css =================================================================== --- trunk/wao-ui/src/main/webapp/css/common.css 2010-10-14 15:20:20 UTC (rev 675) +++ trunk/wao-ui/src/main/webapp/css/common.css 2010-10-15 10:57:56 UTC (rev 676) @@ -393,4 +393,20 @@ table.indicator td { text-align: center; -} \ No newline at end of file +} + +table.indicator td.highlight { + border-width: 3px; +} + +table.indicator td.penalty { + background-color: #fee; +} + +table.indicator td.neutral { + background-color: #eee; +} + +table.indicator td.bonus { + background-color: #efe; +}

1 0

[Suiviobsmer-commits] r675 - in trunk: 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/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
by bleny＠users.labs.libre-entreprise.org Oct. 14, 2010

Oct. 14, 2010

Author: bleny Date: 2010-10-14 15:20:20 +0000 (Thu, 14 Oct 2010) New Revision: 675 Log: creation d'un component pour les indicateurs, doc Added: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/IndicatorLevels.java trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/IndicatorLevels.tml Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/IndicatorLevelImpl.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/Administration.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java trunk/wao-ui/src/main/webapp/Administration.tml Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/IndicatorLevelImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/IndicatorLevelImpl.java 2010-10-14 10:51:37 UTC (rev 674) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/IndicatorLevelImpl.java 2010-10-14 15:20:20 UTC (rev 675) @@ -24,4 +24,9 @@ lowerBound = Double.MAX_VALUE; } + @Override + public boolean lowerEqualsUpperBounds() { + return getLowerBound() == getUpperBound(); + } + } 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-14 10:51:37 UTC (rev 674) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java 2010-10-14 15:20:20 UTC (rev 675) @@ -639,9 +639,10 @@ IndicatorDAO indicatorDAO = WaoDAOHelper.getIndicatorDAO(transaction); List<Indicator> indicators = indicatorDAO.findAll(); - // now, setting the lowerBound for (Indicator indicator : indicators) { + + // reading the indicators to set missing lowerBound (not stored in DB) Collection<IndicatorLevel> levels = indicator.getIndicatorLevel(); double lowerBound; @@ -659,12 +660,17 @@ lowerBound = level.getUpperBound(); } + // Finally, adding a last level IndicatorLevel lastIndicatorLevel = new IndicatorLevelImpl(); int nextLevelNumber = levels.size() + 1; lastIndicatorLevel.setLevel(nextLevelNumber); lastIndicatorLevel.setLowerBound(lowerBound); lastIndicatorLevel.setUpperBound(lastUpperBound); indicator.getIndicatorLevel().add(lastIndicatorLevel); + + // we don't store nor commit anything, those modification are only + // for those entities to be used conveniently in service and UI + // but database should not be affected } return indicators; 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-14 10:51:37 UTC (rev 674) +++ trunk/wao-business/src/main/resources/i18n/wao-business-en_GB.properties 2010-10-14 15:20:20 UTC (rev 675) @@ -68,6 +68,7 @@ wao.error.serviceSynthesis.getContactPieChartDataByBoatDistrict= wao.error.serviceSynthesis.getContactStateStatistics= wao.error.serviceSynthesis.getDataSampling= +wao.error.serviceSynthesis.getGlobalSynthesisParameters=Unable to get data about global synthesis parameters wao.error.serviceSynthesis.getNonComplianceBoardingIndicator= wao.error.serviceUser.connect= wao.error.serviceUser.createDefaultAdmin= 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-14 10:51:37 UTC (rev 674) +++ trunk/wao-business/src/main/resources/i18n/wao-business-fr_FR.properties 2010-10-14 15:20:20 UTC (rev 675) @@ -67,6 +67,7 @@ wao.error.serviceSynthesis.getContactPieChartDataByBoatDistrict= wao.error.serviceSynthesis.getContactStateStatistics=Impossible de r\u00E9cup\u00E9rer les statistiques sur les \u00E9tats des contacts wao.error.serviceSynthesis.getDataSampling=Impossible de r\u00E9cup\u00E9rer les donn\u00E9es pour le graphique dynamique des efforts de mar\u00E9es +wao.error.serviceSynthesis.getGlobalSynthesisParameters=Impossible de r\u00E9cup\u00E9rer les donn\u00E9es concernant les indicateurs pour la synth\u00E8se globale wao.error.serviceSynthesis.getNonComplianceBoardingIndicator=Impossible de r\u00E9cup\u00E9rer l'indicateur de non respect du nombre d'observateurs embarqu\u00E9s 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 Modified: trunk/wao-business/src/main/xmi/wao.zargo =================================================================== (Binary files differ) Added: 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 (rev 0) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/IndicatorLevels.java 2010-10-14 15:20:20 UTC (rev 675) @@ -0,0 +1,42 @@ +package fr.ifremer.wao.ui.components; + +import fr.ifremer.wao.entity.Indicator; +import fr.ifremer.wao.entity.IndicatorLevel; +import fr.ifremer.wao.service.ServiceSynthesis; +import org.apache.tapestry5.annotations.Parameter; +import org.apache.tapestry5.annotations.Property; +import org.apache.tapestry5.ioc.annotations.Inject; +import org.slf4j.Logger; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + +/** + * Render a table with levels as columns and two lines : level number and + * lower + upper bound values. The table has a header with indicator name + * and coefficient + * + * @author bleny + */ +public class IndicatorLevels { + + @Inject + private Logger log; + + /* variable used in view */ + @Parameter(required = true) + private Indicator indicator; + + /* variable used in view */ + @Property + private IndicatorLevel indicatorLevel; + + /* variable used in view */ + private List<IndicatorLevel> indicatorLevels; + + public Indicator getIndicator() { + return indicator; + } + +} 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-14 10:51:37 UTC (rev 674) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Administration.java 2010-10-14 15:20:20 UTC (rev 675) @@ -614,35 +614,10 @@ /* variable used in view */ private List<Indicator> indicators; - /* variable used in view */ - @Property - private IndicatorLevel indicatorLevel; - - /* variable used in view */ - private List<IndicatorLevel> indicatorLevels; - - /* variable used in view */ - private boolean lowerUpperBoundAreEquals; - public List<Indicator> getIndicators() { - List<Indicator> indicators = serviceSynthesis.getGlobalSynthesisParameters(); + if (indicators == null) { + indicators = serviceSynthesis.getGlobalSynthesisParameters(); + } return indicators; } - - public List<IndicatorLevel> getIndicatorLevels() { - Collection<IndicatorLevel> indicatorLevels = indicator.getIndicatorLevel(); - List<IndicatorLevel> result = new ArrayList<IndicatorLevel>(indicatorLevels); - - if (log.isDebugEnabled()) { - log.debug(String.format("levels for indicator %s are %s", - indicator, indicatorLevels)); - } - - return result; - } - - public boolean getLowerUpperBoundAreEquals() { - return indicatorLevel.getLowerBound() == indicatorLevel.getUpperBound(); - } - } 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-14 10:51:37 UTC (rev 674) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java 2010-10-14 15:20:20 UTC (rev 675) @@ -76,7 +76,8 @@ */ @RequiresAuthentication({UserRole.ADMIN, UserRole.COORDINATOR, UserRole.OBSERVER}) @IncludeStylesheet("context:css/synthesis.css") -public class Synthesis extends AbstractFilteredPage { +public class + Synthesis extends AbstractFilteredPage { @Inject private WaoManager manager; Added: 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 (rev 0) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/IndicatorLevels.tml 2010-10-14 15:20:20 UTC (rev 675) @@ -0,0 +1,55 @@ + +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<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> + <tbody> + <tr> + <th>Niveaux</th> + <t:loop t:source="indicator.indicatorLevel" t:value="indicatorLevel"> + <td>${indicatorLevel.level}</td> + </t:loop> + </tr> + <tr> + <th>Bornes</th> + <t:loop t:source="indicator.indicatorLevel" t:value="indicatorLevel"> + <td> + <t:if test="indicatorLevel.lowerEqualsUpperBounds()"> + ${indicatorLevel.upperBound} + <p:else> + <t:if test="indicatorLevel.lowerBoundPositiveInfinity"> + ${indicatorLevel.upperBound} et plus + <p:else> + ${indicatorLevel.lowerBound} à ${indicatorLevel.upperBound} + </p:else> + </t:if> + </p:else> + </t:if> + </td> + </t:loop> + </tr> + </tbody> + </table> + +</html> \ No newline at end of file Modified: trunk/wao-ui/src/main/webapp/Administration.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Administration.tml 2010-10-14 10:51:37 UTC (rev 674) +++ trunk/wao-ui/src/main/webapp/Administration.tml 2010-10-14 15:20:20 UTC (rev 675) @@ -179,35 +179,7 @@  <t:loop t:source="indicators" t:value="indicator"> - <table class="indicator"> - <caption>Indicateur : ${indicator.synthesisId} (coefficient = ${indicator.coefficient})</caption> - <tbody> - <tr> - <th>Niveaux</th> - <t:loop t:source="indicatorLevels" t:value="indicatorLevel"> - <td>${indicatorLevel.level}</td> - </t:loop> - </tr> - <tr> - <th>Bornes</th> - <t:loop t:source="indicatorLevels" t:value="indicatorLevel"> - <td> - <t:if test="lowerUpperBoundAreEquals"> - ${indicatorLevel.upperBound} - <p:else> - <t:if test="indicatorLevel.lowerBoundPositiveInfinity"> - ${indicatorLevel.upperBound} et plus - <p:else> - ${indicatorLevel.lowerBound} à ${indicatorLevel.upperBound} - </p:else> - </t:if> - </p:else> - </t:if> - </td> - </t:loop> - </tr> - </tbody> - </table> + <t:indicatorLevels t:indicator="indicator" /> </t:loop>

1 0

[Suiviobsmer-commits] r674 - in trunk: wao-business/src/main/java/fr/ifremer/wao 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 wao-ui/src/main/webapp/css
by bleny＠users.labs.libre-entreprise.org Oct. 14, 2010

Oct. 14, 2010

Author: bleny Date: 2010-10-14 10:51:37 +0000 (Thu, 14 Oct 2010) New Revision: 674 Log: add indicators in services, render all levels in administration pages Added: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/IndicatorImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/IndicatorLevelImpl.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/SynthesisId.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java trunk/wao-business/src/main/xmi/wao.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 trunk/wao-ui/src/main/webapp/css/common.css Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/SynthesisId.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/SynthesisId.java 2010-10-14 10:51:10 UTC (rev 673) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/SynthesisId.java 2010-10-14 10:51:37 UTC (rev 674) @@ -71,4 +71,13 @@ } return null; } + + public static SynthesisId valueOf(int ordinal) { + for (SynthesisId synthesisId : SynthesisId.values()) { + if (synthesisId.ordinal() == ordinal) { + return synthesisId; + } + } + return null; + } } Added: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/IndicatorImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/IndicatorImpl.java (rev 0) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/IndicatorImpl.java 2010-10-14 10:51:37 UTC (rev 674) @@ -0,0 +1,19 @@ +package fr.ifremer.wao.entity; + +import fr.ifremer.wao.SynthesisId; + +/** + * + */ +public class IndicatorImpl extends IndicatorAbstract { + + @Override + public SynthesisId getSynthesisId() { + return SynthesisId.valueOf(getIndicatorId()); + } + + @Override + public void setSynthesisId(SynthesisId synthesisId) { + setIndicatorId(synthesisId.ordinal()); + } +} Added: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/IndicatorLevelImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/IndicatorLevelImpl.java (rev 0) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/IndicatorLevelImpl.java 2010-10-14 10:51:37 UTC (rev 674) @@ -0,0 +1,27 @@ +package fr.ifremer.wao.entity; + +public class IndicatorLevelImpl extends IndicatorLevelAbstract { + + protected double lowerBound; + + @Override + public double getLowerBound() { + return lowerBound; + } + + @Override + public void setLowerBound(double lowerBound) { + this.lowerBound = lowerBound; + } + + @Override + public boolean isLowerBoundPositiveInfinity() { + return lowerBound == Double.MAX_VALUE; + } + + @Override + public void setLowerBoundToPositiveInfinity() { + lowerBound = Double.MAX_VALUE; + } + +} 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-14 10:51:10 UTC (rev 673) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java 2010-10-14 10:51:37 UTC (rev 674) @@ -24,6 +24,7 @@ package fr.ifremer.wao.service; +import fr.ifremer.wao.SynthesisId; import fr.ifremer.wao.WaoContext; import fr.ifremer.wao.WaoDAOHelper; import fr.ifremer.wao.WaoException; @@ -31,26 +32,8 @@ import fr.ifremer.wao.WaoQueryHelper; import fr.ifremer.wao.WaoQueryHelper.BoatDistrictProperty; import fr.ifremer.wao.WaoQueryHelper.ContactProperty; -import fr.ifremer.wao.bean.BoardingResult; -import fr.ifremer.wao.bean.BoardingResultImpl; -import fr.ifremer.wao.bean.ContactAverageReactivity; -import fr.ifremer.wao.bean.ContactAverageReactivityImpl; -import fr.ifremer.wao.bean.ContactFilter; -import fr.ifremer.wao.bean.ContactPieChartConstant; -import fr.ifremer.wao.bean.ContactState; -import fr.ifremer.wao.bean.ContactStateStatistics; -import fr.ifremer.wao.bean.ContactStateStatisticsImpl; -import fr.ifremer.wao.bean.PieChartData; -import fr.ifremer.wao.bean.PieChartDataImpl; -import fr.ifremer.wao.bean.PieChartSeries; -import fr.ifremer.wao.bean.PieChartSeriesImpl; -import fr.ifremer.wao.bean.SamplingFilter; -import fr.ifremer.wao.entity.Boat; -import fr.ifremer.wao.entity.Company; -import fr.ifremer.wao.entity.Contact; -import fr.ifremer.wao.entity.ContactDAO; -import fr.ifremer.wao.entity.SampleRow; -import fr.ifremer.wao.entity.WaoUser; +import fr.ifremer.wao.bean.*; +import fr.ifremer.wao.entity.*; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; import org.nuiton.topia.framework.TopiaQuery; @@ -651,6 +634,42 @@ return results; } + @Override + protected List<Indicator> executeGetGlobalSynthesisParameters(TopiaContext transaction) throws Exception { + IndicatorDAO indicatorDAO = WaoDAOHelper.getIndicatorDAO(transaction); + List<Indicator> indicators = indicatorDAO.findAll(); + + // now, setting the lowerBound + + for (Indicator indicator : indicators) { + Collection<IndicatorLevel> levels = indicator.getIndicatorLevel(); + + double lowerBound; + double lastUpperBound; + if (indicator.getSynthesisId() == SynthesisId.IND_ALLEGRO_REACTIVITY) { + lowerBound = Double.MAX_VALUE; + lastUpperBound = 0.0; + } else { + lowerBound = 0.0; + lastUpperBound = 100.0; + } + + for (IndicatorLevel level : levels) { + level.setLowerBound(lowerBound); + lowerBound = level.getUpperBound(); + } + + IndicatorLevel lastIndicatorLevel = new IndicatorLevelImpl(); + int nextLevelNumber = levels.size() + 1; + lastIndicatorLevel.setLevel(nextLevelNumber); + lastIndicatorLevel.setLowerBound(lowerBound); + lastIndicatorLevel.setUpperBound(lastUpperBound); + indicator.getIndicatorLevel().add(lastIndicatorLevel); + } + + return indicators; + } + protected PieChartData createContactPieChartData() { PieChartData data = new PieChartDataImpl(); for (ContactPieChartConstant constant : ContactPieChartConstant.values()) { Modified: trunk/wao-business/src/main/xmi/wao.properties =================================================================== --- trunk/wao-business/src/main/xmi/wao.properties 2010-10-14 10:51:10 UTC (rev 673) +++ trunk/wao-business/src/main/xmi/wao.properties 2010-10-14 10:51:37 UTC (rev 674) @@ -30,4 +30,6 @@ fr.ifremer.wao.entity.ElligibleBoat.attribute.boat.tagvalue.lazy=false fr.ifremer.wao.entity.Contact.attribute.sampleRow.tagvalue.lazy=false -fr.ifremer.wao.entity.Contact.attribute.boat.tagvalue.lazy=false \ No newline at end of file +fr.ifremer.wao.entity.Contact.attribute.boat.tagvalue.lazy=false + +fr.ifremer.wao.entity.Indicator.attribute.indicatorLevel.tagvalue.lazy=false 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-10-14 10:51:10 UTC (rev 673) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Administration.java 2010-10-14 10:51:37 UTC (rev 674) @@ -32,6 +32,8 @@ 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; @@ -39,6 +41,7 @@ import fr.ifremer.wao.service.ServiceCartography; import fr.ifremer.wao.service.ServiceReferential; import fr.ifremer.wao.service.ServiceSampling; +import fr.ifremer.wao.service.ServiceSynthesis; import fr.ifremer.wao.service.ServiceUser; import fr.ifremer.wao.ui.components.Layout; import fr.ifremer.wao.ui.data.ErrorReport; @@ -74,6 +77,7 @@ import java.io.FileNotFoundException; import java.io.InputStream; import java.util.ArrayList; +import java.util.Collection; import java.util.List; /** @@ -96,7 +100,7 @@ private ConnectedUser currentUser; @Inject - private Logger logger; + private Logger log; @Inject private WaoManager manager; @@ -253,8 +257,8 @@ result = serviceBoat.getActivityCalendarLogFile(); } } catch (FileNotFoundException eee) { - if (logger.isInfoEnabled()) { - logger.info("Not existing log file for " + property); + if (log.isInfoEnabled()) { + log.info("Not existing log file for " + property); } } return result; @@ -285,7 +289,7 @@ } } - /**************************** FORMS ****************************************/ + /**************************** EDITING COMPANIES ***************************/ public List<Company> getCompanies() throws WaoException { if (companies == null) { @@ -353,8 +357,8 @@ // public GenericSelectModel<WaoUser> getUsersSelectModel() throws WaoException { // if (usersSelectModel == null) { // List<WaoUser> users = serviceUser.getUsersByCompany(getCompany()); -// if (logger.isDebugEnabled()) { -// logger.debug("Nb users : " + users.size()); +// if (log.isDebugEnabled()) { +// log.debug("Nb users : " + users.size()); // } // usersSelectModel = new GenericSelectModel<WaoUser>(users, WaoUser.class, // "fullName", "id", propertyAccess); @@ -405,12 +409,12 @@ layout.addError(eee.getMessage()); } } - if (logger.isDebugEnabled()) { - logger.debug("'User id : " + userId); + if (log.isDebugEnabled()) { + log.debug("'User id : " + userId); } } - /******************** USER FORM ******************************************/ + /******************** USER PROFILE FORM ***********************************/ @InjectComponent private Zone userFormZone; @@ -436,8 +440,8 @@ public WaoUser getUserEdited() throws WaoException { if (userEdited == null) { if (userId != null) { - if (logger.isDebugEnabled()) { - logger.debug("User exist in selectModel : " + userId); + if (log.isDebugEnabled()) { + log.debug("User exist in selectModel : " + userId); } userEdited = findUser(userId); } else { @@ -480,8 +484,8 @@ @Log Object onSuccessFromUserForm() throws WaoException { - if (logger.isDebugEnabled()) { - logger.debug("User : " + userEdited); + if (log.isDebugEnabled()) { + log.debug("User : " + userEdited); } if (!StringUtils.isEmpty(password)) { @@ -574,8 +578,8 @@ @Log Object onActionFromAddRole() { - if (logger.isDebugEnabled()) { - logger.debug("Add userRole : " + userRole + + if (log.isDebugEnabled()) { + log.debug("Add userRole : " + userRole + " (readOnly=" + readOnly + ")"); } if (userRole != null) { @@ -597,5 +601,48 @@ refreshUserRoleZone = true; return userRoleZone; } + + /*********************** INDICATORS AND LEVELS ****************************/ + + @Inject + private ServiceSynthesis serviceSynthesis; + + /* variable used in view */ + @Property + private Indicator indicator; + + /* variable used in view */ + private List<Indicator> indicators; + + /* variable used in view */ + @Property + private IndicatorLevel indicatorLevel; + + /* variable used in view */ + private List<IndicatorLevel> indicatorLevels; + + /* variable used in view */ + private boolean lowerUpperBoundAreEquals; + + public List<Indicator> getIndicators() { + List<Indicator> indicators = serviceSynthesis.getGlobalSynthesisParameters(); + return indicators; + } + + public List<IndicatorLevel> getIndicatorLevels() { + Collection<IndicatorLevel> indicatorLevels = indicator.getIndicatorLevel(); + List<IndicatorLevel> result = new ArrayList<IndicatorLevel>(indicatorLevels); + + if (log.isDebugEnabled()) { + log.debug(String.format("levels for indicator %s are %s", + indicator, indicatorLevels)); + } + + return result; + } + + public boolean getLowerUpperBoundAreEquals() { + return indicatorLevel.getLowerBound() == indicatorLevel.getUpperBound(); + } } Modified: trunk/wao-ui/src/main/webapp/Administration.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Administration.tml 2010-10-14 10:51:10 UTC (rev 673) +++ trunk/wao-ui/src/main/webapp/Administration.tml 2010-10-14 10:51:37 UTC (rev 674) @@ -30,9 +30,9 @@ <t:layout t:pageTitle="Administration" t:contentId="so-admin" xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" xmlns:p="tapestry:parameter"> + <t:if t:test="currentUser.admin"> + <h2>Sociétés</h2> - - <t:if t:test="currentUser.admin"> <form class="actions clearfix" t:type="form" t:id="actionsForm"> <div class="fields fleft"> <t:label t:for="companies" /> : @@ -144,6 +144,8 @@ <div class="mtop30" /> <t:if t:test="currentUser.admin"> + <h2>Imports</h2> + <t:importFieldSet t:label="des zones de pêche" t:engine="fishingZoneImportEngine" /> <t:importFieldSet t:label="du plan d'échantillonnage" t:engine="samplingPlanImportEngine" /> @@ -170,4 +172,48 @@ <div class="mtop10" /> + <t:if t:test="currentUser.admin"> + + <h2>Synthèse globale</h2> + +  + + <t:loop t:source="indicators" t:value="indicator"> + <table class="indicator"> + <caption>Indicateur : ${indicator.synthesisId} (coefficient = ${indicator.coefficient})</caption> + <tbody> + <tr> + <th>Niveaux</th> + <t:loop t:source="indicatorLevels" t:value="indicatorLevel"> + <td>${indicatorLevel.level}</td> + </t:loop> + </tr> + <tr> + <th>Bornes</th> + <t:loop t:source="indicatorLevels" t:value="indicatorLevel"> + <td> + <t:if test="lowerUpperBoundAreEquals"> + ${indicatorLevel.upperBound} + <p:else> + <t:if test="indicatorLevel.lowerBoundPositiveInfinity"> + ${indicatorLevel.upperBound} et plus + <p:else> + ${indicatorLevel.lowerBound} à ${indicatorLevel.upperBound} + </p:else> + </t:if> + </p:else> + </t:if> + </td> + </t:loop> + </tr> + </tbody> + </table> + </t:loop> + +  + + + + </t:if> + </t:layout> Modified: trunk/wao-ui/src/main/webapp/css/common.css =================================================================== --- trunk/wao-ui/src/main/webapp/css/common.css 2010-10-14 10:51:10 UTC (rev 673) +++ trunk/wao-ui/src/main/webapp/css/common.css 2010-10-14 10:51:37 UTC (rev 674) @@ -372,3 +372,25 @@ height: 22px; background: url(../img/file-import-22px.png) no-repeat center center; } + +/* INDICATOR TABLES */ +table.indicator { + border: solid 1px black; + margin-left: auto; + margin-right: auto; + margin-bottom: 10px; + border-collapse: collapse; +} + +table.indicator th, table.indicator td { + border: solid 1px black; + padding: 5px; +} + +table.indicator th { + text-align: left; +} + +table.indicator td { + text-align: center; +} \ No newline at end of file

1 0