Wao-commits
Threads by month
- ----- 2026 -----
- June
- May
- April
- March
- February
- January
- ----- 2025 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
December 2010
- 3 participants
- 58 discussions
[Suiviobsmer-commits] r855 - trunk/wao-ui/src/main/webapp
by bleny@users.labs.libre-entreprise.org 23 Dec '10
by bleny@users.labs.libre-entreprise.org 23 Dec '10
23 Dec '10
Author: bleny
Date: 2010-12-23 17:15:46 +0000 (Thu, 23 Dec 2010)
New Revision: 855
Log:
disable activity calender in 'boats' page
Modified:
trunk/wao-ui/src/main/webapp/Boats.tml
Modified: trunk/wao-ui/src/main/webapp/Boats.tml
===================================================================
--- trunk/wao-ui/src/main/webapp/Boats.tml 2010-12-23 15:45:24 UTC (rev 854)
+++ trunk/wao-ui/src/main/webapp/Boats.tml 2010-12-23 17:15:46 UTC (rev 855)
@@ -185,6 +185,7 @@
<t:delegate to="activeBoatInfosBlock" />
</t:if>
<!-- BODY - activity calendar -->
+ <!--
<fieldset id="so-boats-boat-infos-calendar">
<legend>Calendrier d'activité</legend>
<p>
@@ -198,6 +199,7 @@
</t:if>
</p>
</fieldset>
+ -->
<!-- FOOTER For user -->
<t:unless t:test="user.admin">
<div id="so-boats-boat-infos-message">
1
0
[Suiviobsmer-commits] r854 - trunk/wao-ui/src/main/webapp
by bleny@users.labs.libre-entreprise.org 23 Dec '10
by bleny@users.labs.libre-entreprise.org 23 Dec '10
23 Dec '10
Author: bleny
Date: 2010-12-23 15:45:24 +0000 (Thu, 23 Dec 2010)
New Revision: 854
Log:
fix XML
Modified:
trunk/wao-ui/src/main/webapp/ContactForm.tml
Modified: trunk/wao-ui/src/main/webapp/ContactForm.tml
===================================================================
--- trunk/wao-ui/src/main/webapp/ContactForm.tml 2010-12-23 15:08:24 UTC (rev 853)
+++ trunk/wao-ui/src/main/webapp/ContactForm.tml 2010-12-23 15:45:24 UTC (rev 854)
@@ -114,7 +114,7 @@
<div class="t-beaneditor-row">
<t:label t:for="nbObservants" />
${contact.nbObservants}
- </div
+ </div>
<div class="t-beaneditor-row">
<t:label t:for="beginDate" />
<t:output value="contact.observationBeginDate" format="dateTimeFormat" />
1
0
[Suiviobsmer-commits] r853 - in trunk/wao-business/src: main/java/fr/ifremer/wao/entity main/xmi test/java/fr/ifremer/wao/service
by bleny@users.labs.libre-entreprise.org 23 Dec '10
by bleny@users.labs.libre-entreprise.org 23 Dec '10
23 Dec '10
Author: bleny
Date: 2010-12-23 15:08:24 +0000 (Thu, 23 Dec 2010)
New Revision: 853
Log:
remove useless method from entity
Modified:
trunk/wao-business/src/main/java/fr/ifremer/wao/entity/WaoUserImpl.java
trunk/wao-business/src/main/xmi/wao.zargo
trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceUserImplTest.java
Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/WaoUserImpl.java
===================================================================
--- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/WaoUserImpl.java 2010-12-23 14:50:37 UTC (rev 852)
+++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/WaoUserImpl.java 2010-12-23 15:08:24 UTC (rev 853)
@@ -89,16 +89,4 @@
}
return false;
}
-
- @Override
- public void addProfile(UserProfile userProfile) {
- Collection<UserProfile> profiles = getUserProfile();
-
- if (profiles == null) {
- profiles = new ArrayList<UserProfile>();
- setUserProfile(profiles);
- }
-
- profiles.add(userProfile);
- }
}
Modified: trunk/wao-business/src/main/xmi/wao.zargo
===================================================================
(Binary files differ)
Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceUserImplTest.java
===================================================================
--- trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceUserImplTest.java 2010-12-23 14:50:37 UTC (rev 852)
+++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceUserImplTest.java 2010-12-23 15:08:24 UTC (rev 853)
@@ -212,7 +212,7 @@
user1.setLogin("user1");
user1.setFirstName("Jean");
user1.setLastName("Michmuche");
- user1.addProfile(observerProfile);
+ user1.addUserProfile(observerProfile);
user1.setCompany(company);
user1.setActive(true);
service.createUpdateUser(user1, true);
@@ -221,7 +221,7 @@
user2.setLogin("user2");
user2.setFirstName("Jack");
user2.setLastName("Pot");
- user2.addProfile(adminProfile);
+ user2.addUserProfile(adminProfile);
user2.setCompany(company);
user2.setActive(true);
service.createUpdateUser(user2, true);
@@ -230,8 +230,8 @@
user3.setLogin("user3");
user3.setFirstName("Denis");
user3.setLastName("La Malice");
- user3.addProfile(coordinatorProfile2);
- user3.addProfile(observerProfile2);
+ user3.addUserProfile(coordinatorProfile2);
+ user3.addUserProfile(observerProfile2);
user3.setCompany(company);
user3.setActive(false);
service.createUpdateUser(user3, true);
@@ -241,7 +241,7 @@
user4.setFirstName("Ben");
user4.setLastName("Hur");
// The coordinator is also an observer
- user4.addProfile(coordinatorProfile);
+ user4.addUserProfile(coordinatorProfile);
user4.setCompany(company2);
user4.setActive(true);
service.createUpdateUser(user4, true);
1
0
[Suiviobsmer-commits] r852 - in trunk: wao-business/src/test/resources wao-ui/src/test/resources
by bleny@users.labs.libre-entreprise.org 23 Dec '10
by bleny@users.labs.libre-entreprise.org 23 Dec '10
23 Dec '10
Author: bleny
Date: 2010-12-23 14:50:37 +0000 (Thu, 23 Dec 2010)
New Revision: 852
Log:
logs should not flood the build messages
Modified:
trunk/wao-business/src/test/resources/log4j.properties
trunk/wao-ui/src/test/resources/log4j.properties
Modified: trunk/wao-business/src/test/resources/log4j.properties
===================================================================
--- trunk/wao-business/src/test/resources/log4j.properties 2010-12-23 14:49:12 UTC (rev 851)
+++ trunk/wao-business/src/test/resources/log4j.properties 2010-12-23 14:50:37 UTC (rev 852)
@@ -31,6 +31,6 @@
log4j.appender.A1.layout=org.apache.log4j.PatternLayout
log4j.appender.A1.layout.ConversionPattern=%d [%p] %c{2} %m%n
-log4j.logger.fr.ifremer.wao=DEBUG
+log4j.logger.fr.ifremer.wao=INFO
log4j.logger.org.nuiton.util=INFO
log4j.logger.org.nuiton.util.beans.BinderProvider=ERROR
Modified: trunk/wao-ui/src/test/resources/log4j.properties
===================================================================
--- trunk/wao-ui/src/test/resources/log4j.properties 2010-12-23 14:49:12 UTC (rev 851)
+++ trunk/wao-ui/src/test/resources/log4j.properties 2010-12-23 14:50:37 UTC (rev 852)
@@ -30,9 +30,9 @@
#log4j.appender.console.layout.ConversionPattern=%d{HH:mm:ss} %5p (%F:%L) %m%n
log4j.appender.console.Threshold=DEBUG
-#log4j.logger.test.fr.ifremer.wao=INFO
-#log4j.logger.fr.ifremer.wao=INFO
-log4j.logger.test.fr.ifremer.wao=TRACE
-log4j.logger.fr.ifremer.wao=TRACE
+log4j.logger.test.fr.ifremer.wao=INFO
+log4j.logger.fr.ifremer.wao=INFO
+#log4j.logger.test.fr.ifremer.wao=TRACE
+#log4j.logger.fr.ifremer.wao=TRACE
log4j.logger.org.apache.tapestry5.internal.pageload=INFO
1
0
[Suiviobsmer-commits] r851 - in trunk: wao-business/src/test/java/fr/ifremer/wao wao-business/src/test/resources wao-ui/src/test/resources
by bleny@users.labs.libre-entreprise.org 23 Dec '10
by bleny@users.labs.libre-entreprise.org 23 Dec '10
23 Dec '10
Author: bleny
Date: 2010-12-23 14:49:12 +0000 (Thu, 23 Dec 2010)
New Revision: 851
Log:
remove strange file
Removed:
trunk/wao-business/src/test/java/fr/ifremer/wao/ErrorDB1_0Test.java
Modified:
trunk/wao-business/src/test/resources/log4j.properties
trunk/wao-ui/src/test/resources/log4j.properties
Deleted: trunk/wao-business/src/test/java/fr/ifremer/wao/ErrorDB1_0Test.java
===================================================================
--- trunk/wao-business/src/test/java/fr/ifremer/wao/ErrorDB1_0Test.java 2010-12-23 14:48:19 UTC (rev 850)
+++ trunk/wao-business/src/test/java/fr/ifremer/wao/ErrorDB1_0Test.java 2010-12-23 14:49:12 UTC (rev 851)
@@ -1,165 +0,0 @@
-/*
- * #%L
- * Wao :: Business
- *
- * $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;
-
-import fr.ifremer.wao.entity.Contact;
-import fr.ifremer.wao.entity.ContactDAO;
-import fr.ifremer.wao.entity.SampleMonth;
-import fr.ifremer.wao.entity.SampleRow;
-import fr.ifremer.wao.entity.SampleRowDAO;
-import org.apache.commons.io.IOUtils;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.nuiton.topia.TopiaContext;
-import org.nuiton.topia.TopiaException;
-import org.nuiton.topia.framework.TopiaQuery;
-import org.nuiton.util.ArgumentsParserException;
-import org.nuiton.util.DateUtil;
-
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileWriter;
-import java.io.Writer;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-/**
- * ErrorDB1_0
- *
- * Error #2124 : problem with between comparison to give the correct SampleMonth
- * from a given contact date.
- *
- * This problem may cause errors in database on sampleRow.realTideTime calcul.
- *
- * This class is used to test all sampleRows who have a bad calcul on contacts.
- *
- * Created: 1 mars 2010
- *
- * @author fdesbois <fdesbois at codelutin.com>
- */
- at Ignore
-public class ErrorDB1_0Test {
-
- private static TestManager manager;
-
- //FIXME tchemit 2010-10-13 : on ne met pas ce genre d'objet en attibut, ou bien on s'assure qu'ils seront bien fermer dans une AfterClass
- private static Writer writerAll;
-
- private static Writer writerKos;
-
- public ErrorDB1_0Test() {
- manager = new TestManager();
- }
-
- @BeforeClass
- public static void setUpClass() throws Exception {
- String filename = "/tmp/wao/test_db/error_db1";
- File file = new File(filename);
- file.getParentFile().mkdirs();
- if (file.exists()) {
- file.delete();
- file.createNewFile();
- }
- writerAll = new BufferedWriter(new FileWriter(filename));
- writerKos = new BufferedWriter(new FileWriter(filename + "_ko"));
- }
-
- @AfterClass
- public static void tearDownClass() throws Exception {
-
- }
-
- @Before
- public void setUp() throws ArgumentsParserException {
- manager.start();
- }
-
- @After
- public void tearDown() throws TopiaException {
- manager.stop();
- }
-
- @Test
- public void testExecute() throws Exception {
-
- TopiaContext transaction =
- manager.getContext().beginTransaction();
-
- ContactDAO dao = WaoDAOHelper.getContactDAO(transaction);
-
-
- SampleRowDAO rowDAO = WaoDAOHelper.getSampleRowDAO(transaction);
-
- DateFormat dateFormat = new SimpleDateFormat("MM/yyyy");
-
- for (SampleRow curr : rowDAO.findAll()) {
- TopiaQuery query =
- dao.createQueryDoneContactsFromDate(null, null);
- String contact = query.getMainAlias();
- String tideBegin = contact + "." + Contact.PROPERTY_TIDE_BEGIN_DATE;
-
- String sampleRow = contact + "." + Contact.PROPERTY_SAMPLE_ROW;
- query.addEquals(sampleRow, curr);
-
- query.addGroup(sampleRow);
-
- for (SampleMonth month : curr.getSampleMonth()) {
- Date begin = DateUtil.setFirstDayOfMonth(month.getPeriodDate());
- Date end = DateUtil.setLastDayOfMonth(month.getPeriodDate());
-
- query.addWhere(tideBegin + " BETWEEN :begin AND :end").
- addParam("begin", begin).addParam("end", end);
-
- int nbRealTides = dao.countByQuery(query);
-
- boolean ok = month.getRealTidesValue() == nbRealTides;
- String ko = ok ? "" : "## KO ";
-
- String msg = "[" + curr.getCode() + "] " +
- dateFormat.format(month.getPeriodDate()) + " : " +
- "currValue = " + month.getRealTidesValue() + " _ " +
- "expectedValue = " + nbRealTides + "\n";
-
- if (!ok) {
- writerKos.write(msg);
- writerKos.flush();
- }
-
- writerAll.write(ko + msg);
- writerAll.flush();
- }
- }
-
- IOUtils.closeQuietly(writerAll);
- IOUtils.closeQuietly(writerKos);
- transaction.closeContext();
- }
-
-}
Modified: trunk/wao-business/src/test/resources/log4j.properties
===================================================================
--- trunk/wao-business/src/test/resources/log4j.properties 2010-12-23 14:48:19 UTC (rev 850)
+++ trunk/wao-business/src/test/resources/log4j.properties 2010-12-23 14:49:12 UTC (rev 851)
@@ -31,6 +31,6 @@
log4j.appender.A1.layout=org.apache.log4j.PatternLayout
log4j.appender.A1.layout.ConversionPattern=%d [%p] %c{2} %m%n
-log4j.logger.fr.ifremer.wao=INFO
+log4j.logger.fr.ifremer.wao=DEBUG
log4j.logger.org.nuiton.util=INFO
log4j.logger.org.nuiton.util.beans.BinderProvider=ERROR
Modified: trunk/wao-ui/src/test/resources/log4j.properties
===================================================================
--- trunk/wao-ui/src/test/resources/log4j.properties 2010-12-23 14:48:19 UTC (rev 850)
+++ trunk/wao-ui/src/test/resources/log4j.properties 2010-12-23 14:49:12 UTC (rev 851)
@@ -30,5 +30,9 @@
#log4j.appender.console.layout.ConversionPattern=%d{HH:mm:ss} %5p (%F:%L) %m%n
log4j.appender.console.Threshold=DEBUG
-log4j.logger.test.fr.ifremer.wao=DEBUG
+#log4j.logger.test.fr.ifremer.wao=INFO
+#log4j.logger.fr.ifremer.wao=INFO
+log4j.logger.test.fr.ifremer.wao=TRACE
log4j.logger.fr.ifremer.wao=TRACE
+
+log4j.logger.org.apache.tapestry5.internal.pageload=INFO
1
0
23 Dec '10
Author: bleny
Date: 2010-12-23 14:48:19 +0000 (Thu, 23 Dec 2010)
New Revision: 850
Log:
rename tideBegin and tideEnd to observationBegin and observationEnd in contact to make it program-neutral
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/WaoQueryBuilder.java
trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactStatus.java
trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ContactDAOImpl.java
trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ContactImpl.java
trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java
trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java
trunk/wao-business/src/main/xmi/wao.zargo
trunk/wao-business/src/test/java/fr/ifremer/wao/AbstractServiceTest.java
trunk/wao-business/src/test/java/fr/ifremer/wao/entity/BoatImplTest.java
trunk/wao-business/src/test/java/fr/ifremer/wao/entity/SampleRowImplTest.java
trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactInternalTest.java
trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSynthesisImplTest.java
trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/ContactForm.java
trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java
trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/ContactModelFactory.java
trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Contacts.properties
trunk/wao-ui/src/main/webapp/ContactForm.tml
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-12-23 14:42:28 UTC (rev 849)
+++ trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java 2010-12-23 14:48:19 UTC (rev 850)
@@ -684,4 +684,10 @@
queries.add(sql);
}
+
+ @Override
+ protected void renameContactsColumnsToCommonName_2_0(List<String> queries) {
+ queries.add("ALTER TABLE Contact RENAME tideBeginDate TO observationBeginDate");
+ queries.add("ALTER TABLE Contact RENAME tideEndDate TO observationEndDate");
+ }
}
Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoMigrationCallBack.java
===================================================================
--- trunk/wao-business/src/main/java/fr/ifremer/wao/WaoMigrationCallBack.java 2010-12-23 14:42:28 UTC (rev 849)
+++ trunk/wao-business/src/main/java/fr/ifremer/wao/WaoMigrationCallBack.java 2010-12-23 14:48:19 UTC (rev 850)
@@ -117,6 +117,8 @@
protected abstract void addAdminRolesToAdmin_2_0(TopiaContextImplementor tx, List<String> queries) throws TopiaException;
+ protected abstract void renameContactsColumnsToCommonName_2_0(List<String> queries);
+
protected static final Version[] VERSIONS = new Version[] {
VersionUtil.valueOf("1.0"),
VersionUtil.valueOf("1.1"),
@@ -419,6 +421,8 @@
addAdminRolesToAdmin_2_0(tx, queries);
+ renameContactsColumnsToCommonName_2_0(queries);
+
String[] strings = queries.toArray(new String[queries.size()]);
executeSQL(tx, true, true, strings);
}
Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java
===================================================================
--- trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java 2010-12-23 14:42:28 UTC (rev 849)
+++ trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java 2010-12-23 14:48:19 UTC (rev 850)
@@ -595,7 +595,7 @@
filter.setPeriod(period);
if (filter.isSortedByBoardingDate()) {
- query.addOrder(contactProperty.$property(Contact.PROPERTY_TIDE_BEGIN_DATE + " DESC"));
+ query.addOrder(contactProperty.$property(Contact.PROPERTY_OBSERVATION_BEGIN_DATE + " DESC"));
}
// ORDER_BY
Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactStatus.java
===================================================================
--- trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactStatus.java 2010-12-23 14:42:28 UTC (rev 849)
+++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactStatus.java 2010-12-23 14:48:19 UTC (rev 850)
@@ -153,8 +153,8 @@
return false;
}
DateFormat dateFormat = new SimpleDateFormat("MM/yyyy");
- Date oldTideBeginDate = oldContact.getTideBeginDate();
- Date newTideBeginDate = newContact.getTideBeginDate();
+ Date oldTideBeginDate = oldContact.getObservationBeginDate();
+ Date newTideBeginDate = newContact.getObservationBeginDate();
logger.debug("old : " + oldTideBeginDate + ", new : " + newTideBeginDate);
@@ -242,15 +242,15 @@
Date tideBeginDate = null;
switch(context) {
- case OLD: tideBeginDate = oldContact.getTideBeginDate(); break;
+ case OLD: tideBeginDate = oldContact.getObservationBeginDate(); break;
// newContact may be null in CREATE case, so we use the previous
// one
case NEW:
if (newContact != null &&
- newContact.getTideBeginDate() != null) {
- tideBeginDate = newContact.getTideBeginDate();
+ newContact.getObservationBeginDate() != null) {
+ tideBeginDate = newContact.getObservationBeginDate();
} else {
- tideBeginDate = oldContact.getTideBeginDate();
+ tideBeginDate = oldContact.getObservationBeginDate();
}
}
@@ -353,12 +353,12 @@
public String toString() {
DateFormat dateFormat = new SimpleDateFormat("MM/yyyy");
String oldMonth = oldContact != null &&
- oldContact.getTideBeginDate() != null ?
- dateFormat.format(oldContact.getTideBeginDate()) : "";
+ oldContact.getObservationBeginDate() != null ?
+ dateFormat.format(oldContact.getObservationBeginDate()) : "";
String newMonth = newContact != null &&
- newContact.getTideBeginDate() != null ?
- dateFormat.format(newContact.getTideBeginDate()) : "";
+ newContact.getObservationBeginDate() != null ?
+ dateFormat.format(newContact.getObservationBeginDate()) : "";
StringBuilder builder =
new StringBuilder("\nContactStatus : VALIDATE :: ").
Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ContactDAOImpl.java
===================================================================
--- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ContactDAOImpl.java 2010-12-23 14:42:28 UTC (rev 849)
+++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ContactDAOImpl.java 2010-12-23 14:48:19 UTC (rev 850)
@@ -103,7 +103,7 @@
}
if (fromDate != null) {
- query.addWhere(contactProperty.tideBeginDate(), Op.GE, fromDate);
+ query.addWhere(contactProperty.observationBeginDate(), Op.GE, fromDate);
}
return query;
}
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-12-23 14:42:28 UTC (rev 849)
+++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ContactImpl.java 2010-12-23 14:48:19 UTC (rev 850)
@@ -59,8 +59,8 @@
*/
@Override
protected void calculTideNbDays() {
- Date beginDate = getTideBeginDate();
- Date endDate = getTideEndDate();
+ Date beginDate = getObservationBeginDate();
+ Date endDate = getObservationEndDate();
if (beginDate != null && endDate != null) {
int nbDays = DateUtil.getDifferenceInDays(beginDate, endDate);
// nbDays + 1 to have the first day
@@ -78,8 +78,8 @@
if (log.isDebugEnabled()) {
log.debug("topia " + getTopiaCreateDate());
}
- if (getTideBeginDate() != null) {
- return getTideBeginDate();
+ if (getObservationBeginDate() != null) {
+ return getObservationBeginDate();
}
return getTopiaCreateDate();
}
Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java
===================================================================
--- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2010-12-23 14:42:28 UTC (rev 849)
+++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2010-12-23 14:48:19 UTC (rev 850)
@@ -439,13 +439,13 @@
dateFormat.format(contact.getTopiaCreateDate()));
export.record(CONTACT.CONT_ETAT,
contact.getContactState().libelle());
- if (contact.getTideBeginDate() != null) {
+ if (contact.getObservationBeginDate() != null) {
export.record(CONTACT.CONT_DEBUT_MAREE,
- CONTACT.CONT_DEBUT_MAREE.format(contact.getTideBeginDate()));
+ CONTACT.CONT_DEBUT_MAREE.format(contact.getObservationBeginDate()));
}
- if (contact.getTideEndDate() != null) {
+ if (contact.getObservationEndDate() != null) {
export.record(CONTACT.CONT_FIN_MAREE,
- CONTACT.CONT_FIN_MAREE.format(contact.getTideEndDate()));
+ CONTACT.CONT_FIN_MAREE.format(contact.getObservationEndDate()));
}
export.record(CONTACT.CONT_NB_OBSERV,
String.valueOf(contact.getNbObservants()));
@@ -632,16 +632,16 @@
log.debug("exception", eee);
log.debug("contact : " + contact);
if (contact != null) {
- log.debug("tideBeginDate : " + contact.getTideBeginDate());
+ log.debug("tideBeginDate : " + contact.getObservationBeginDate());
}
// The row will be refused in this case
throw new ImportRefusedException("Impossible de " +
"mettre à jour le nombre de marée réels, " +
"vérifiez le mois de " +
- dateFormat.format(contact.getTideBeginDate()) +
+ dateFormat.format(contact.getObservationBeginDate()) +
" pour la ligne du plan " +
contactCsv.getSampleRow().getCode(), currRow,
- Contact.PROPERTY_TIDE_BEGIN_DATE, eee);
+ Contact.PROPERTY_OBSERVATION_BEGIN_DATE, eee);
}
result.incNbImported();
@@ -700,9 +700,9 @@
contact.setBoat(ImportHelper.readInt(reader, BOAT.NAVS_COD));
- contact.setTideBeginDate(
+ contact.setObservationBeginDate(
ImportHelper.readDate(reader, CONTACT.CONT_DEBUT_MAREE));
- contact.setTideEndDate(
+ contact.setObservationEndDate(
ImportHelper.readDate(reader, CONTACT.CONT_FIN_MAREE));
int nbObservants =
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-12-23 14:42:28 UTC (rev 849)
+++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java 2010-12-23 14:48:19 UTC (rev 850)
@@ -338,7 +338,7 @@
WaoQueryHelper.BoatProperty boatProperty = WaoQueryHelper.newBoatProperty();
query.setSelect(boatProperty.$alias(), // boat
sampleRowProperty.code(), // sample-row code
- contactProperty.tideBeginDate()) // boarding date
+ contactProperty.observationBeginDate()) // boarding date
// join contact, boats, and sample-rows
.addJoin(contactProperty.boat(), boatProperty.$alias(), false)
@@ -347,7 +347,7 @@
// and sort everything
.addOrder(boatProperty.name(),
sampleRowProperty.code(),
- contactProperty.tideBeginDate());
+ contactProperty.observationBeginDate());
if (log.isTraceEnabled()) {
log.trace("Exec query : " + query);
@@ -554,7 +554,7 @@
query.addWhere(WaoQueryHelper.format(
"($1 IS NOT NULL AND $1 BETWEEN :fromDate AND :thruDate)" +
" OR ($1 IS NULL AND $2 BETWEEN :fromDate AND :thruDate)",
- contactProperty.tideBeginDate(),
+ contactProperty.observationBeginDate(),
contactProperty.topiaCreateDate())
).addParam("fromDate", period.getFromDate()).
addParam("thruDate", period.getThruDate());
@@ -619,7 +619,7 @@
String companyNameProperty =
TopiaQuery.getProperty(companyProperty, Company.PROPERTY_NAME);
String tideBeginDateProperty =
- TopiaQuery.getProperty(contactAlias, Contact.PROPERTY_TIDE_BEGIN_DATE);
+ TopiaQuery.getProperty(contactAlias, Contact.PROPERTY_OBSERVATION_BEGIN_DATE);
String dataInputProperty =
TopiaQuery.getProperty(contactAlias, Contact.PROPERTY_DATA_INPUT_DATE);
Modified: trunk/wao-business/src/main/xmi/wao.zargo
===================================================================
(Binary files differ)
Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/AbstractServiceTest.java
===================================================================
--- trunk/wao-business/src/test/java/fr/ifremer/wao/AbstractServiceTest.java 2010-12-23 14:42:28 UTC (rev 849)
+++ trunk/wao-business/src/test/java/fr/ifremer/wao/AbstractServiceTest.java 2010-12-23 14:48:19 UTC (rev 850)
@@ -576,7 +576,7 @@
contact1.setSampleRow(row);
contact1.setContactState(ContactState.BOARDING_DONE);
Date begin = DateUtil.createDate(3, 3, 2010);
- contact1.setTideBeginDate(begin);
+ contact1.setObservationBeginDate(begin);
serviceContact.saveContact(contact1, false);
Contact contact2 = new ContactImpl();
@@ -585,7 +585,7 @@
contact2.setSampleRow(row);
contact2.setContactState(ContactState.BOARDING_DONE);
begin = DateUtil.createDate(3, 10, 2010);
- contact2.setTideBeginDate(begin);
+ contact2.setObservationBeginDate(begin);
serviceContact.saveContact(contact2, false);
Contact contact3 = new ContactImpl();
Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/entity/BoatImplTest.java
===================================================================
--- trunk/wao-business/src/test/java/fr/ifremer/wao/entity/BoatImplTest.java 2010-12-23 14:42:28 UTC (rev 849)
+++ trunk/wao-business/src/test/java/fr/ifremer/wao/entity/BoatImplTest.java 2010-12-23 14:48:19 UTC (rev 850)
@@ -149,7 +149,7 @@
Assert.assertTrue(result);
contact1.setContactState(ContactState.BOARDING_DONE);
- contact1.setTideBeginDate(DateUtil.createDate(3, 3, 2010));
+ contact1.setObservationBeginDate(DateUtil.createDate(3, 3, 2010));
serviceContact.saveContact(contact1, false);
result = boat.canCreateContact(company);
@@ -234,7 +234,7 @@
Contact contact1 = serviceContact.getNewContact(user, row, boat);
contact1.setContactState(ContactState.BOARDING_DONE);
Date begin = DateUtil.createDate(3, 5, 2010);
- contact1.setTideBeginDate(begin);
+ contact1.setObservationBeginDate(begin);
contact1.setValidationCompany(Boolean.TRUE);
serviceContact.saveContact(contact1, false);
@@ -248,7 +248,7 @@
// Second contact with ValidationProgram = FALSE
contact2.setContactState(ContactState.BOARDING_DONE);
begin = DateUtil.createDate(3, 8, 2010);
- contact2.setTideBeginDate(begin);
+ contact2.setObservationBeginDate(begin);
contact2.setValidationCompany(Boolean.TRUE);
contact2.setValidationProgram(Boolean.FALSE);
serviceContact.saveContact(contact2, false);
@@ -260,7 +260,7 @@
// Third contact with tideBeginDate < fromDate
contact3.setContactState(ContactState.BOARDING_DONE);
begin = DateUtil.createDate(3, 3, 2010);
- contact3.setTideBeginDate(begin);
+ contact3.setObservationBeginDate(begin);
contact3.setValidationCompany(Boolean.TRUE);
serviceContact.saveContact(contact3, false);
@@ -271,7 +271,7 @@
// Fourth contact : OK with an other company
contact4.setContactState(ContactState.BOARDING_DONE);
begin = DateUtil.createDate(3, 5, 2010);
- contact4.setTideBeginDate(begin);
+ contact4.setObservationBeginDate(begin);
contact4.setValidationCompany(Boolean.TRUE);
serviceContact.saveContact(contact4, false);
Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/entity/SampleRowImplTest.java
===================================================================
--- trunk/wao-business/src/test/java/fr/ifremer/wao/entity/SampleRowImplTest.java 2010-12-23 14:42:28 UTC (rev 849)
+++ trunk/wao-business/src/test/java/fr/ifremer/wao/entity/SampleRowImplTest.java 2010-12-23 14:48:19 UTC (rev 850)
@@ -120,8 +120,8 @@
// Contact contact = new ContactImpl();
// Date beginDate = DateUtil.createDate(12, 4, 2009);
// Date endDate = DateUtil.createDate(15, 4, 2009);
-// contact.setTideBeginDate(beginDate);
-// contact.setTideEndDate(endDate);
+// contact.setObservationBeginDate(beginDate);
+// contact.setObservationEndDate(endDate);
//
// /** EXEC METHOD **/
// row.addRealTideTime(contact);
@@ -132,7 +132,7 @@
//// result.addRealTideTime(-1);
//// // Test with a more than one day interval dates from contact
//// endDate = DateUtil.createDate(18, 4, 2009);
-//// contact.setTideEndDate(endDate);
+//// contact.setObservationEndDate(endDate);
////
//// getRowFromContext().addRealTideTime(contact);
//// result = getRowFromContext().getSampleMonth(beginDate);
@@ -149,8 +149,8 @@
// Contact contact = new ContactImpl();
// Date beginDate = DateUtil.createDate(12, 4, 2009);
// Date endDate = DateUtil.createDate(12, 4, 2009);
-// contact.setTideBeginDate(beginDate);
-// contact.setTideEndDate(endDate);
+// contact.setObservationBeginDate(beginDate);
+// contact.setObservationEndDate(endDate);
//
// /** EXEC METHOD **/
// row.removeRealTideTime(contact);
@@ -163,7 +163,7 @@
//
// // Test with a more than one day interval dates from contact : only one tide to remove
// endDate = DateUtil.createDate(18, 4, 2009);
-// contact.setTideEndDate(endDate);
+// contact.setObservationEndDate(endDate);
//
// getRowFromContext().removeRealTideTime(contact);
// result = getRowFromContext().getSampleMonth(beginDate);
Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactInternalTest.java
===================================================================
--- trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactInternalTest.java 2010-12-23 14:42:28 UTC (rev 849)
+++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactInternalTest.java 2010-12-23 14:48:19 UTC (rev 850)
@@ -168,7 +168,7 @@
SampleMonth.PROPERTY_PERIOD_DATE, monthDate);
Date contactDate = DateUtil.createDate(18, 3, 2010);
- when(contact.getTideBeginDate()).thenReturn(contactDate);
+ when(contact.getObservationBeginDate()).thenReturn(contactDate);
when(contact.getSampleRow()).thenReturn(sampleRow);
if (needBoat) {
@@ -202,7 +202,7 @@
//
// SampleMonth result =
// service.getExistingSampleMonthForContact(monthDAO,
-// contact.getSampleRow(), contact.getTideBeginDate());
+// contact.getSampleRow(), contact.getObservationBeginDate());
//
// assertEquals(sampleMonth, result);
//
@@ -218,10 +218,10 @@
// WaoDAOHelper.getSampleMonthDAO(transaction);
//
// Date contactDate = DateUtil.createDate(18, 10, 2010);
-// when(contact.getTideBeginDate()).thenReturn(contactDate);
+// when(contact.getObservationBeginDate()).thenReturn(contactDate);
//
// service.getExistingSampleMonthForContact(monthDAO,
-// contact.getSampleRow(), contact.getTideBeginDate());
+// contact.getSampleRow(), contact.getObservationBeginDate());
// } catch (Exception eee) {
// log.error("Error : " + eee.getMessage());
// assertEquals(NullSampleMonthException.class, eee.getClass());
@@ -237,8 +237,8 @@
/** PREPARE DATA **/
prepareData(false, false);
- Date tideBeginDate = new Date(contact.getTideBeginDate().getTime());
- when(contactReference.getTideBeginDate()).thenReturn(tideBeginDate);
+ Date tideBeginDate = new Date(contact.getObservationBeginDate().getTime());
+ when(contactReference.getObservationBeginDate()).thenReturn(tideBeginDate);
when(contactReference.getSampleRow()).thenReturn(sampleRow);
// WARN : by default mockito doesn't initialize Boolean type with null
when(contactReference.getValidationProgram()).thenReturn(null);
@@ -402,7 +402,7 @@
thenReturn(ContactState.BOARDING_DONE);
when(contact.getContactState()).
thenReturn(ContactState.BOARDING_DONE);
- when(contact.getTideBeginDate()).
+ when(contact.getObservationBeginDate()).
thenReturn(DateUtil.createDate(3, 4, 2010));
service.updateSampleMonthTidesValue(transaction, contactReference,
@@ -444,8 +444,8 @@
prepareData(false, false);
// contactReference as the same tideBeginDate and sampleRow as contact
- Date tideBeginDate = new Date(contact.getTideBeginDate().getTime());
- when(contactReference.getTideBeginDate()).thenReturn(tideBeginDate);
+ Date tideBeginDate = new Date(contact.getObservationBeginDate().getTime());
+ when(contactReference.getObservationBeginDate()).thenReturn(tideBeginDate);
when(contactReference.getSampleRow()).thenReturn(sampleRow);
// Initialize correct old status in contactReference
@@ -594,8 +594,8 @@
assertEquals(sampleRow, result.getSampleRow());
assertEquals(boat, result.getBoat());
- assertEquals(DateUtil.getDifferenceInMinutes(DateUtil.createDate(0,0,1,22,3,2010), result.getTideBeginDate()), 0);
- assertEquals(DateUtil.getDifferenceInMinutes(DateUtil.createDate(0,15,2,22,3,2010), result.getTideEndDate()), 0);
+ assertEquals(DateUtil.getDifferenceInMinutes(DateUtil.createDate(0,0,1,22,3,2010), result.getObservationBeginDate()), 0);
+ assertEquals(DateUtil.getDifferenceInMinutes(DateUtil.createDate(0,15,2,22,3,2010), result.getObservationEndDate()), 0);
assertEquals(1, result.getNbObservants());
assertFalse(result.getMammalsCapture());
@@ -721,8 +721,8 @@
transaction = manager.getContext().beginTransaction();
newContact.setContactState(ContactState.BOARDING_DONE);
- newContact.setTideBeginDate(tideBeginDate);
- newContact.setTideEndDate(tideEndDate);
+ newContact.setObservationBeginDate(tideBeginDate);
+ newContact.setObservationEndDate(tideEndDate);
newContact.setNbObservants(1);
ContactDAO dao = WaoDAOHelper.getContactDAO(transaction);
@@ -745,8 +745,8 @@
Contact existingContact = dao.findByTopiaId(newTopiaId);
assertNotNull(existingContact);
assertEquals(1, existingContact.getNbObservants());
- assertEquals(tideBeginDate, existingContact.getTideBeginDate());
- assertEquals(tideEndDate, existingContact.getTideEndDate());
+ assertEquals(tideBeginDate, existingContact.getObservationBeginDate());
+ assertEquals(tideEndDate, existingContact.getObservationEndDate());
assertEquals(ContactState.BOARDING_DONE,
existingContact.getContactState());
Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSynthesisImplTest.java
===================================================================
--- trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSynthesisImplTest.java 2010-12-23 14:42:28 UTC (rev 849)
+++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSynthesisImplTest.java 2010-12-23 14:48:19 UTC (rev 850)
@@ -158,7 +158,7 @@
contact1.setSampleRow(row);
contact1.setContactState(ContactState.BOARDING_DONE);
Date begin = DateUtil.createDate(3, 3, 2010);
- contact1.setTideBeginDate(begin);
+ contact1.setObservationBeginDate(begin);
contact1.setValidationCompany(Boolean.TRUE);
serviceContact.saveContact(contact1, false);
@@ -168,7 +168,7 @@
contact2.setSampleRow(row);
contact2.setContactState(ContactState.BOARDING_DONE);
begin = DateUtil.createDate(3, 3, 2010);
- contact2.setTideBeginDate(begin);
+ contact2.setObservationBeginDate(begin);
contact2.setValidationCompany(Boolean.TRUE);
serviceContact.saveContact(contact2, false);
@@ -178,7 +178,7 @@
contact3.setSampleRow(row);
contact3.setContactState(ContactState.BOARDING_DONE);
begin = DateUtil.createDate(3, 3, 2010);
- contact3.setTideBeginDate(begin);
+ contact3.setObservationBeginDate(begin);
contact3.setValidationCompany(Boolean.TRUE);
serviceContact.saveContact(contact3, false);
@@ -251,7 +251,7 @@
contact1.setNbObservants(1);
contact1.setContactState(ContactState.BOARDING_DONE);
Date begin = DateUtil.createDate(3, 3, 2010);
- contact1.setTideBeginDate(begin);
+ contact1.setObservationBeginDate(begin);
contact1.setValidationCompany(Boolean.TRUE);
serviceContact.saveContact(contact1, false);
@@ -263,7 +263,7 @@
contact2.setNbObservants(2);
contact2.setContactState(ContactState.BOARDING_DONE);
begin = DateUtil.createDate(3, 3, 2010);
- contact2.setTideBeginDate(begin);
+ contact2.setObservationBeginDate(begin);
contact2.setValidationCompany(Boolean.TRUE);
serviceContact.saveContact(contact2, false);
@@ -275,7 +275,7 @@
contact3.setNbObservants(1);
contact3.setContactState(ContactState.BOARDING_DONE);
begin = DateUtil.createDate(3, 3, 2010);
- contact3.setTideBeginDate(begin);
+ contact3.setObservationBeginDate(begin);
contact3.setValidationCompany(Boolean.TRUE);
serviceContact.saveContact(contact3, false);
@@ -360,7 +360,7 @@
// contact1.setSampleRow(row);
// contact1.setContactState(ContactState.BOARDING_DONE);
// Date begin = DateUtil.createDate(3, 3, 2010);
-// contact1.setTideBeginDate(begin);
+// contact1.setObservationBeginDate(begin);
// serviceContact.saveContact(contact1, false);
//
// Contact contact2 = new ContactImpl();
@@ -369,7 +369,7 @@
// contact2.setSampleRow(row);
// contact2.setContactState(ContactState.BOARDING_DONE);
// begin = DateUtil.createDate(3, 10, 2010);
-// contact2.setTideBeginDate(begin);
+// contact2.setObservationBeginDate(begin);
// serviceContact.saveContact(contact2, false);
//
// Contact contact3 = new ContactImpl();
@@ -530,7 +530,7 @@
contact1.setMainObserver(user);
contact1.setSampleRow(row);
Date begin = DateUtil.createDate(3, 3, 2010);
- contact1.setTideBeginDate(begin);
+ contact1.setObservationBeginDate(begin);
Date inputDate = DateUtil.createDate(15, 4, 2010);
contact1.setDataInputDate(inputDate);
contact1.setContactState(ContactState.BOARDING_DONE);
@@ -542,7 +542,7 @@
contact2.setMainObserver(user);
contact2.setSampleRow(row);
begin = DateUtil.createDate(3, 3, 2010);
- contact2.setTideBeginDate(begin);
+ contact2.setObservationBeginDate(begin);
inputDate = DateUtil.createDate(15, 3, 2010);
contact2.setDataInputDate(inputDate);
contact2.setContactState(ContactState.BOARDING_DONE);
@@ -554,7 +554,7 @@
contact3.setMainObserver(user2);
contact3.setSampleRow(row2);
begin = DateUtil.createDate(3, 3, 2010);
- contact3.setTideBeginDate(begin);
+ contact3.setObservationBeginDate(begin);
contact3.setDataInputDate(begin);
contact3.setContactState(ContactState.BOARDING_DONE);
contact3.setValidationCompany(Boolean.TRUE);
Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/ContactForm.java
===================================================================
--- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/ContactForm.java 2010-12-23 14:42:28 UTC (rev 849)
+++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/ContactForm.java 2010-12-23 14:48:19 UTC (rev 850)
@@ -353,8 +353,8 @@
logger.debug("For state : " + contactState);
}
- Date begin = contact.getTideBeginDate();
- Date end = contact.getTideEndDate();
+ Date begin = contact.getObservationBeginDate();
+ Date end = contact.getObservationEndDate();
Date input = contact.getDataInputDate();
SampleRow row = contact.getSampleRow();
@@ -409,8 +409,8 @@
if (previousUnfinishedState || commentChanged) {
// RAZ des champs
- contact.setTideBeginDate(null);
- contact.setTideEndDate(null);
+ contact.setObservationBeginDate(null);
+ contact.setObservationEndDate(null);
contact.setNbObservants(0);
contact.setMammalsCapture(false);
contact.setMammalsObservation(false);
Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java
===================================================================
--- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java 2010-12-23 14:42:28 UTC (rev 849)
+++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java 2010-12-23 14:48:19 UTC (rev 850)
@@ -414,6 +414,10 @@
return new SimpleDateFormat("dd/MM/yyyy");
}
+ public DateFormat getDateTimeFormat() {
+ return new SimpleDateFormat("dd/MM/yyyy HH:mm");
+ }
+
public boolean isEditionMode() {
//return contact.getTopiaId().equals(contactEditedId);
return contactEdited != null && contact.equals(contactEdited);
@@ -666,8 +670,8 @@
logger.debug("For state : " + contactState);
}
- Date begin = contactEdited.getTideBeginDate();
- Date end = contactEdited.getTideEndDate();
+ Date begin = contactEdited.getObservationBeginDate();
+ Date end = contactEdited.getObservationEndDate();
Date input = contactEdited.getDataInputDate();
SampleRow row = contactEdited.getSampleRow();
//DateFormat dateFormat = new SimpleDateFormat("MM/yyyy");
@@ -723,8 +727,8 @@
if (previousUnfinishedState || commentChanged) {
// RAZ des champs
- contactEdited.setTideBeginDate(null);
- contactEdited.setTideEndDate(null);
+ contactEdited.setObservationBeginDate(null);
+ contactEdited.setObservationEndDate(null);
contactEdited.setNbObservants(0);
contactEdited.setMammalsCapture(false);
contactEdited.setMammalsObservation(false);
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-12-23 14:42:28 UTC (rev 849)
+++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/ContactModelFactory.java 2010-12-23 14:48:19 UTC (rev 850)
@@ -69,8 +69,8 @@
Contact.PROPERTY_SAMPLE_ROW,
Contact.PROPERTY_BOAT,
Contact.PROPERTY_STATE,
- Contact.PROPERTY_TIDE_BEGIN_DATE,
- Contact.PROPERTY_TIDE_END_DATE,
+ Contact.PROPERTY_OBSERVATION_BEGIN_DATE,
+ Contact.PROPERTY_OBSERVATION_END_DATE,
Contact.PROPERTY_NB_OBSERVANTS,
"mammals",
Contact.PROPERTY_COMMENT,
@@ -80,8 +80,8 @@
contactModel.get(TopiaEntity.TOPIA_CREATE_DATE).sortable(false);
contactModel.get(Contact.PROPERTY_STATE).sortable(false);
- contactModel.get(Contact.PROPERTY_TIDE_BEGIN_DATE).sortable(false);
- contactModel.get(Contact.PROPERTY_TIDE_END_DATE).sortable(false);
+ contactModel.get(Contact.PROPERTY_OBSERVATION_BEGIN_DATE).sortable(false);
+ contactModel.get(Contact.PROPERTY_OBSERVATION_END_DATE).sortable(false);
contactModel.get(Contact.PROPERTY_NB_OBSERVANTS).sortable(false);
contactModel.get(Contact.PROPERTY_DATA_INPUT_DATE).sortable(false);
contactModel.get(Contact.PROPERTY_COMMENT).sortable(false);
Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Contacts.properties
===================================================================
--- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Contacts.properties 2010-12-23 14:42:28 UTC (rev 849)
+++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Contacts.properties 2010-12-23 14:48:19 UTC (rev 850)
@@ -38,8 +38,8 @@
boat-label: Navire
state-label: Etat
topiaCreateDate-label: Cr\u00e9ation
-tideBeginDate-label: D\u00e9but de la mar\u00e9e
-tideEndDate-label: Fin de la mar\u00e9e
+observationBeginDate-label: D\u00e9but de l'observation
+observationEndDate-label: Fin de l'observation
nbObservants-label: Nb obs.
lastState-label: Etat
programName-label: Programme
Modified: trunk/wao-ui/src/main/webapp/ContactForm.tml
===================================================================
--- trunk/wao-ui/src/main/webapp/ContactForm.tml 2010-12-23 14:42:28 UTC (rev 849)
+++ trunk/wao-ui/src/main/webapp/ContactForm.tml 2010-12-23 14:48:19 UTC (rev 850)
@@ -112,12 +112,16 @@
${contact.contactState.label}
</div>
<div class="t-beaneditor-row">
+ <t:label t:for="nbObservants" />
+ ${contact.nbObservants}
+ </div
+ <div class="t-beaneditor-row">
<t:label t:for="beginDate" />
- <t:output value="contact.tideBeginDate" format="dateTimeFormat" />
+ <t:output value="contact.observationBeginDate" format="dateTimeFormat" />
</div>
<div class="t-beaneditor-row">
<t:label t:for="endDate" />
- <t:output value="contact.tideEndDate" format="dateTimeFormat" />
+ <t:output value="contact.observationEndDate" format="dateTimeFormat" />
</div>
<div class="t-beaneditor-row">
<img src="${asset:context:img/eye-22px.png}" alt="Observations" title="Observations" />
@@ -163,12 +167,16 @@
<input t:type="select" t:id="contactState" t:value="contact.contactState" t:validate="required"/>
</div>
<div class="t-beaneditor-row">
+ <t:label t:for="nbObservants" />
+ <input t:type="textfield" t:id="nbObservants" t:value="contact.nbObservants" t:validate="required"/>
+ </div>
+ <div class="t-beaneditor-row">
<t:label t:for="beginDate" />
- <input t:id="beginDate" value="contact.tideBeginDate" datePattern="${dateTimeFormatPattern}" timePicker="true" timePickerAdjacent="true" use24hrs="true" />
+ <input t:id="beginDate" value="contact.observationBeginDate" datePattern="${dateTimeFormatPattern}" timePicker="true" timePickerAdjacent="true" use24hrs="true" />
</div>
<div class="t-beaneditor-row">
<t:label t:for="endDate" />
- <input t:id="endDate" value="contact.tideEndDate" datePattern="${dateTimeFormatPattern}" timePicker="true" timePickerAdjacent="true" use24hrs="true" />
+ <input t:id="endDate" value="contact.observationEndDate" datePattern="${dateTimeFormatPattern}" timePicker="true" timePickerAdjacent="true" use24hrs="true" />
</div>
<div class="t-beaneditor-row">
<img src="${asset:context:img/eye-22px.png}" alt="Observations" title="Observations" />
Modified: trunk/wao-ui/src/main/webapp/Contacts.tml
===================================================================
--- trunk/wao-ui/src/main/webapp/Contacts.tml 2010-12-23 14:42:28 UTC (rev 849)
+++ trunk/wao-ui/src/main/webapp/Contacts.tml 2010-12-23 14:48:19 UTC (rev 850)
@@ -29,8 +29,6 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<t:layout t:pageTitle="Contacts" t:contentId="so-contacts"
xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" xmlns:p="tapestry:parameter">
-<!--t:include="creationDate, lastState, boatName, boatImmatriculation, boatDistrictCode, beginTideDate, endTideDate,
- nbObservants, mammals, editDate, comment, validation"-->
<div id="so-contacts-search">
<form t:type="form" t:id="searchBoat">
<div>
@@ -219,18 +217,18 @@
<p:else>${contact.contactState.libelle()}</p:else>
</t:if>
</p:stateCell>
- <p:tideBeginDateCell>
+ <p:observationBeginDateCell>
<t:if t:test="editionMode">
- <input t:type="datefield" t:id="beginDate" class="date" value="contactEdited.tideBeginDate" />
- <p:else><t:output value="contact.tideBeginDate" format="dateFormat" /></p:else>
+ <input t:type="datefield" t:id="beginDate" class="date" value="contactEdited.observationBeginDate" />
+ <p:else><t:output value="contact.observationBeginDate" format="dateTimeFormat" /></p:else>
</t:if>
- </p:tideBeginDateCell>
- <p:tideEndDateCell>
+ </p:observationBeginDateCell>
+ <p:observationEndDateCell>
<t:if t:test="editionMode">
- <input t:type="datefield" t:id="endDate" class="date" value="contactEdited.tideEndDate" />
- <p:else><t:output value="contact.tideEndDate" format="dateFormat" /></p:else>
+ <input t:type="datefield" t:id="endDate" class="date" value="contactEdited.observationEndDate" />
+ <p:else><t:output value="contact.observationEndDate" format="dateTimeFormat" /></p:else>
</t:if>
- </p:tideEndDateCell>
+ </p:observationEndDateCell>
<p:nbObservantsCell>
<t:if t:test="editionMode">
<input t:type="textfield" t:id="nbObservants" class="nbObservants" value="contactEdited.nbObservants" />
1
0
[Suiviobsmer-commits] r849 - in trunk: . wao-ui/src/main/java/fr/ifremer/wao/ui/pages wao-ui/src/main/java/fr/ifremer/wao/ui/services wao-ui/src/main/resources/fr/ifremer/wao/ui/components wao-ui/src/test/java/test/fr/ifremer/wao/ui wao-ui/src/test/java/test/fr/ifremer/wao/ui/pages
by fdesbois@users.labs.libre-entreprise.org 23 Dec '10
by fdesbois@users.labs.libre-entreprise.org 23 Dec '10
23 Dec '10
Author: fdesbois
Date: 2010-12-23 14:42:28 +0000 (Thu, 23 Dec 2010)
New Revision: 849
Log:
Resolve tests, use proper instances instead of mock, two much methods to wrap otherwise
Modified:
trunk/
trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Connexion.java
trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/AppModule.java
trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/Layout.tml
trunk/wao-ui/src/test/java/test/fr/ifremer/wao/ui/AbstractApplicationTest.java
trunk/wao-ui/src/test/java/test/fr/ifremer/wao/ui/pages/AdministrationTest.java
trunk/wao-ui/src/test/java/test/fr/ifremer/wao/ui/pages/ConnectionTest.java
Property changes on: trunk
___________________________________________________________________
Modified: svn:ignore
- *.ipr
*.iws
*.iml
target
nbactions.xml
+ *.ipr
*.iws
*.iml
*.idea
target
nbactions.xml
Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Connexion.java
===================================================================
--- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Connexion.java 2010-12-23 11:42:31 UTC (rev 848)
+++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Connexion.java 2010-12-23 14:42:28 UTC (rev 849)
@@ -35,11 +35,7 @@
import fr.ifremer.wao.ui.services.ServiceAuthentication;
import org.apache.tapestry5.Link;
import org.apache.tapestry5.PersistenceConstants;
-import org.apache.tapestry5.annotations.IncludeJavaScriptLibrary;
-import org.apache.tapestry5.annotations.InjectComponent;
-import org.apache.tapestry5.annotations.Log;
-import org.apache.tapestry5.annotations.Persist;
-import org.apache.tapestry5.annotations.Property;
+import org.apache.tapestry5.annotations.*;
import org.apache.tapestry5.corelib.components.Form;
import org.apache.tapestry5.ioc.annotations.Inject;
import org.apache.tapestry5.ioc.services.PropertyAccess;
@@ -261,14 +257,14 @@
WaoUser user = serviceAuthentication.getConnectedUser().getUser();
if (logger.isDebugEnabled()) {
- logger.debug("Load user roles for " + user.getLogin());
+ logger.debug("Load user roles for " + user.getFullName());
}
List<UserProfile> profiles = new ArrayList<UserProfile>(user.getUserProfile());
profileSelectModel = new GenericSelectModel<UserProfile>(profiles,
- UserProfile.class, "Description", "topiaId", propertyAccess);
+ UserProfile.class, "description", "topiaId", propertyAccess);
} else if (profileSelectModel == null) {
profileSelectModel = new GenericSelectModel<UserProfile>(new ArrayList<UserProfile>(),
- UserProfile.class, "Description", "topiaId", propertyAccess);
+ UserProfile.class, "description", "topiaId", propertyAccess);
}
return profileSelectModel;
}
Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/AppModule.java
===================================================================
--- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/AppModule.java 2010-12-23 11:42:31 UTC (rev 848)
+++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/AppModule.java 2010-12-23 14:42:28 UTC (rev 849)
@@ -28,23 +28,7 @@
import fr.ifremer.wao.bean.ConnectedUser;
import fr.ifremer.wao.bean.PieChartData;
import fr.ifremer.wao.bean.PieChartDataImpl;
-import fr.ifremer.wao.service.ServiceBoat;
-import fr.ifremer.wao.service.ServiceBoatImpl;
-import fr.ifremer.wao.service.ServiceCartography;
-import fr.ifremer.wao.service.ServiceCartographyImpl;
-import fr.ifremer.wao.service.ServiceChart;
-import fr.ifremer.wao.service.ServiceContact;
-import fr.ifremer.wao.service.ServiceContactImpl;
-import fr.ifremer.wao.service.ServiceNews;
-import fr.ifremer.wao.service.ServiceNewsImpl;
-import fr.ifremer.wao.service.ServiceReferential;
-import fr.ifremer.wao.service.ServiceReferentialImpl;
-import fr.ifremer.wao.service.ServiceSampling;
-import fr.ifremer.wao.service.ServiceSamplingImpl;
-import fr.ifremer.wao.service.ServiceSynthesis;
-import fr.ifremer.wao.service.ServiceSynthesisImpl;
-import fr.ifremer.wao.service.ServiceUser;
-import fr.ifremer.wao.service.ServiceUserImpl;
+import fr.ifremer.wao.service.*;
import fr.ifremer.wao.ui.pages.PieChart;
import org.apache.tapestry5.SymbolConstants;
import org.apache.tapestry5.ioc.Configuration;
@@ -56,15 +40,7 @@
import org.apache.tapestry5.ioc.services.Coercion;
import org.apache.tapestry5.ioc.services.CoercionTuple;
import org.apache.tapestry5.ioc.services.RegistryShutdownHub;
-import org.apache.tapestry5.services.ApplicationStateContribution;
-import org.apache.tapestry5.services.ApplicationStateCreator;
-import org.apache.tapestry5.services.ApplicationStateManager;
-import org.apache.tapestry5.services.ComponentRequestFilter;
-import org.apache.tapestry5.services.PageRenderLinkSource;
-import org.apache.tapestry5.services.Request;
-import org.apache.tapestry5.services.RequestFilter;
-import org.apache.tapestry5.services.RequestHandler;
-import org.apache.tapestry5.services.Response;
+import org.apache.tapestry5.services.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -258,6 +234,9 @@
new ApplicationStateCreator<ConnectedUser>() {
@Override
public ConnectedUser create() {
+ if (logger.isDebugEnabled()) {
+ logger.debug("Create new ConnectedUser");
+ }
return serviceAuthentication.getNewUserInstance();
}
};
Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/Layout.tml
===================================================================
--- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/Layout.tml 2010-12-23 11:42:31 UTC (rev 848)
+++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/Layout.tml 2010-12-23 14:42:28 UTC (rev 849)
@@ -63,7 +63,7 @@
</a>
</div>
<div id="user-infos" class="fleft">
- Vous êtes <strong>${currentUser.user.fullName}</strong> de la société <strong>${currentUser.company.name}</strong>
+ Vous êtes <strong>${currentUser.fullName}</strong> de la société <strong>${currentUser.company.name}</strong>
(${accessText})
</div>
<div id="user-actions" class="fright">
Modified: trunk/wao-ui/src/test/java/test/fr/ifremer/wao/ui/AbstractApplicationTest.java
===================================================================
--- trunk/wao-ui/src/test/java/test/fr/ifremer/wao/ui/AbstractApplicationTest.java 2010-12-23 11:42:31 UTC (rev 848)
+++ trunk/wao-ui/src/test/java/test/fr/ifremer/wao/ui/AbstractApplicationTest.java 2010-12-23 14:42:28 UTC (rev 849)
@@ -29,23 +29,15 @@
import fr.ifremer.wao.bean.ConnectedUserImpl;
import fr.ifremer.wao.bean.ObsProgram;
import fr.ifremer.wao.bean.UserRole;
-import fr.ifremer.wao.entity.Company;
-import fr.ifremer.wao.entity.CompanyImpl;
-import fr.ifremer.wao.entity.UserProfile;
-import fr.ifremer.wao.entity.UserProfileImpl;
-import fr.ifremer.wao.entity.WaoUser;
-import fr.ifremer.wao.entity.WaoUserImpl;
+import fr.ifremer.wao.entity.*;
import fr.ifremer.wao.ui.services.AppModule;
import org.apache.tapestry5.ioc.annotations.Inject;
import org.apache.tapestry5.services.ApplicationStateManager;
-import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
+import org.nuiton.topia.persistence.TopiaId;
import test.fr.ifremer.wao.ui.demo.DemoModule;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
/**
* AbstractApplicationTest
*
@@ -71,48 +63,54 @@
MockitoAnnotations.initMocks(this);
}
- @Mock
- protected ConnectedUser user;
-
@Inject
private ApplicationStateManager stateManager;
- protected void prepareObserverUser(boolean contributeSession) {
- /*
- Company company = mock(Company.class);
- when(company.getName()).thenReturn("TARTANPION");
+ protected ConnectedUser createUser(String firstName,
+ String lastName,
+ String companyName,
+ UserRole role) {
- when(user.getFullName()).thenReturn("Jean Michmuche");
- when(user.isAdmin()).thenReturn(false);
- when(user.getRole()).thenReturn(UserRole.OBSERVER);
- when(user.getCompany()).thenReturn(company);
- */
-
Company company = new CompanyImpl();
- company.setName("TARTANPION");
- WaoUser user = new WaoUserImpl();
- user.setFirstName("Jean");
- user.setLastName("Michmuche");
- user.setCompany(company);
- UserProfile observerProfile = new UserProfileImpl(ObsProgram.OBSMER, UserRole.OBSERVER, true);
- user.addUserProfile(observerProfile);
+ company.setName(companyName);
+ WaoUser waoUser = new WaoUserImpl();
+ waoUser.setFirstName(firstName);
+ waoUser.setLastName(lastName);
+ waoUser.setCompany(company);
+ UserProfile profile = createProfile(role, ObsProgram.OBSMER, true);
+ waoUser.addUserProfile(profile);
- ConnectedUser connectedUser = new ConnectedUserImpl();
- connectedUser.setUser(user);
- connectedUser.setProfile(observerProfile);
+ ConnectedUser user = new ConnectedUserImpl();
+ user.setUser(waoUser);
+ user.setProfile(profile);
+ return user;
+ }
+ protected UserProfile createProfile(UserRole role,
+ ObsProgram program,
+ boolean canWrite) {
+
+ UserProfile profile = new UserProfileImpl();
+ profile.setTopiaId(TopiaId.create(UserProfile.class));
+ profile.setCanWrite(canWrite);
+ profile.setObsProgram(program);
+ profile.setUserRole(role);
+ return profile;
+
+ }
+
+ protected ConnectedUser createObserver(boolean contributeSession) {
+
+ ConnectedUser user =
+ createUser("Jean", "Michmuche", "TARTANPION", UserRole.OBSERVER);
+
if (contributeSession) {
- stateManager.set(ConnectedUser.class, connectedUser);
+ stateManager.set(ConnectedUser.class, user);
}
+ return user;
}
- protected void prepareAdminUser() {
- Company company = mock(Company.class);
- when(company.getName()).thenReturn("ADMIN");
-
- when(user.getFullName()).thenReturn("Super Admin");
- when(user.isAdmin()).thenReturn(true);
- when(user.getRole()).thenReturn(UserRole.ADMIN);
- when(user.getCompany()).thenReturn(company);
+ protected ConnectedUser createAdmin() {
+ return createUser("Super", "Admin", "ADMIN", UserRole.ADMIN);
}
}
Modified: trunk/wao-ui/src/test/java/test/fr/ifremer/wao/ui/pages/AdministrationTest.java
===================================================================
--- trunk/wao-ui/src/test/java/test/fr/ifremer/wao/ui/pages/AdministrationTest.java 2010-12-23 11:42:31 UTC (rev 848)
+++ trunk/wao-ui/src/test/java/test/fr/ifremer/wao/ui/pages/AdministrationTest.java 2010-12-23 14:42:28 UTC (rev 849)
@@ -46,7 +46,7 @@
public void testAuthenticationFailed() {
logger.info("## testAuthenticationFailed");
- prepareObserverUser(true);
+ createObserver(true);
Document page = tester.renderPage("administration");
// User not allowed will be redirect on Unavailable page
Modified: trunk/wao-ui/src/test/java/test/fr/ifremer/wao/ui/pages/ConnectionTest.java
===================================================================
--- trunk/wao-ui/src/test/java/test/fr/ifremer/wao/ui/pages/ConnectionTest.java 2010-12-23 11:42:31 UTC (rev 848)
+++ trunk/wao-ui/src/test/java/test/fr/ifremer/wao/ui/pages/ConnectionTest.java 2010-12-23 14:42:28 UTC (rev 849)
@@ -28,13 +28,10 @@
import fr.ifremer.wao.WaoBusinessException;
import fr.ifremer.wao.WaoException;
import fr.ifremer.wao.bean.ConnectedUser;
-import fr.ifremer.wao.bean.ConnectedUserImpl;
import fr.ifremer.wao.bean.ObsProgram;
import fr.ifremer.wao.bean.UserRole;
-import fr.ifremer.wao.entity.Company;
import fr.ifremer.wao.entity.News;
-import fr.ifremer.wao.entity.UserProfileImpl;
-import fr.ifremer.wao.entity.WaoUser;
+import fr.ifremer.wao.entity.UserProfile;
import fr.ifremer.wao.service.ServiceNews;
import fr.ifremer.wao.service.ServiceUser;
import fr.ifremer.wao.ui.services.ServiceAuthentication;
@@ -50,12 +47,9 @@
import test.fr.ifremer.wao.ui.AbstractApplicationTest;
import java.util.ArrayList;
-import java.util.Collection;
import java.util.HashMap;
-import java.util.LinkedList;
import java.util.Map;
-import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
/**
@@ -74,14 +68,14 @@
public void testUserSession() throws WaoException, WaoBusinessException {
logger.info("## testUserSession");
- prepareObserverUser(true);
+ createObserver(true);
ConnectedUser sso = stateManager.getIfExists(ConnectedUser.class);
Assert.assertNotNull(sso);
Assert.assertFalse(sso.isAdmin());
Assert.assertTrue(serviceAuthentication.existConnectedUser());
- Assert.assertNotNull(serviceAuthentication.getConnectedUser().getUser().getFullName());
+ Assert.assertNotNull(serviceAuthentication.getConnectedUser().getFullName());
Assert.assertNotNull(serviceAuthentication.getConnectedUser().getProfile());
Document page = tester.renderPage("index");
@@ -117,7 +111,7 @@
Assert.assertNotNull(connectionPage.getElementById("so-connexion-box"));
// Prepare user connection
- prepareAdminUser();
+ ConnectedUser user = createAdmin();
logger.info("-- Connect user : rediction to 'Index' page");
Document indexPage = connect(connectionPage, user);
@@ -128,61 +122,30 @@
checkIndexPage(indexPage);
}
- private Document connect(Document connectionPage, ConnectedUser user)
- throws WaoBusinessException {
- when(serviceUser.connect("login", "password")).thenReturn(user);
- when(serviceNews.getNews(user)).thenReturn(new ArrayList<News>());
-
- Map<String, String> fieldValues = new HashMap<String, String>();
- fieldValues.put("login", "login");
- fieldValues.put("password", "password");
- Document result = tester.submitForm(
- connectionPage.getElementById("connexionForm"), fieldValues);
- return result;
- }
-
- private Element checkIndexPage(Document page) {
- Element main = page.getElementById("so-news");
- if (logger.isDebugEnabled()) {
- logger.debug("Content page News : " + main);
- }
- Assert.assertNotNull(main);
- return main;
- }
-
- private WaoUser getMultiRoleUser() {
- Company company = mock(Company.class);
- when(company.getName()).thenReturn("TEST");
-
- Collection<fr.ifremer.wao.entity.UserProfile> profiles = new LinkedList<fr.ifremer.wao.entity.UserProfile>();
- profiles.add(new UserProfileImpl(ObsProgram.OBSMER, UserRole.ADMIN, true));
- profiles.add(new UserProfileImpl(ObsProgram.OBSMER, UserRole.COORDINATOR, true));
-
- WaoUser user = mock(WaoUser.class);
- when(user.getUserProfile()).thenReturn(profiles);
- when(user.getLogin()).thenReturn("multiroleUser");
- when(user.getFullName()).thenReturn("User Test");
- when(user.getCompany()).thenReturn(company);
-
- return user;
- }
-
@Test
public void testMultiRoleUserConnection() throws WaoBusinessException {
logger.info("## testMultiRoleUserConnection");
/** PREPARE LOADING **/
+ ConnectedUser user = null;
+
logger.info("-- Load 'Index' page : redirection to 'Connexion' page");
when(serviceNews.getNews(user)).thenReturn(new ArrayList<News>());
Document connectionPage1 = tester.renderPage("index");
// Prepare user for connection
- ConnectedUser userConnected = new ConnectedUserImpl();
- userConnected.setUser(getMultiRoleUser());
+ user = createUser("User", "Test", "TEST", UserRole.ADMIN);
+ // reset selected profile, because more than one is available
+ user.setProfile(null);
+ // Add other profile
+ UserProfile coordinatorProfile =
+ createProfile(UserRole.COORDINATOR, ObsProgram.OBSMER, true);
+ user.getUser().addUserProfile(coordinatorProfile);
+
logger.info("-- Connect user : no unique role found, refresh 'Connexion' page");
- Document connectionPage2 = connect(connectionPage1, userConnected);
+ Document connectionPage2 = connect(connectionPage1, user);
if (logger.isInfoEnabled()) {
logger.info("Content with popup roles : " + connectionPage2);
}
@@ -190,24 +153,42 @@
Assert.assertNotNull(connectionPage2.getElementById("roleForm"));
Assert.assertTrue(serviceAuthentication.existConnectedUser());
- /** EXECUTE SUBMISSION FOR ROLE **/
+ /** EXECUTE SUBMISSION FOR PROFILE **/
logger.info("-- Choose role ADMIN : redirection to 'Index' page");
- /*
Map<String, String> fieldValues = new HashMap<String, String>();
- fieldValues.put("userRole", UserRole.ADMIN.name());
+ fieldValues.put("userProfile", coordinatorProfile.getTopiaId());
Document result = tester.submitForm(
connectionPage2.getElementById("roleForm"), fieldValues);
- */
+ UserRole connectionRole =
+ serviceAuthentication.getConnectedUser().getRole();
+ Assert.assertNotNull(connectionRole);
+ Assert.assertEquals(UserRole.COORDINATOR, connectionRole);
+
+ checkIndexPage(result);
+ }
+
+ private Document connect(Document connectionPage, ConnectedUser user)
+ throws WaoBusinessException {
+ when(serviceUser.connect("login", "password")).thenReturn(user);
+ when(serviceNews.getNews(user)).thenReturn(new ArrayList<News>());
+
Map<String, String> fieldValues = new HashMap<String, String>();
- fieldValues.put("userProfile", user.getProfile().getTopiaId());
+ fieldValues.put("login", "login");
+ fieldValues.put("password", "password");
Document result = tester.submitForm(
- connectionPage2.getElementById("roleForm"), fieldValues);
+ connectionPage.getElementById("connexionForm"), fieldValues);
+ return result;
+ }
- Assert.assertNotNull(serviceAuthentication.getConnectedUser().getRole());
-
- checkIndexPage(result);
+ private Element checkIndexPage(Document page) {
+ Element main = page.getElementById("so-news");
+ if (logger.isDebugEnabled()) {
+ logger.debug("Content page News : " + main);
+ }
+ Assert.assertNotNull(main);
+ return main;
}
}
1
0
[Suiviobsmer-commits] r848 - in trunk: . wao-business/src/main/java/fr/ifremer/wao/bean wao-business/src/main/java/fr/ifremer/wao/io/csv wao-business/src/main/java/fr/ifremer/wao/service wao-business/src/test/java/fr/ifremer/wao/io wao-business/src/test/java/fr/ifremer/wao/service wao-business/src/test/resources/import wao-ui/src/main/java/fr/ifremer/wao/ui/pages wao-ui/src/main/resources/fr/ifremer/wao/ui/pages wao-ui/src/main/webapp
by bleny@users.labs.libre-entreprise.org 23 Dec '10
by bleny@users.labs.libre-entreprise.org 23 Dec '10
23 Dec '10
Author: bleny
Date: 2010-12-23 11:42:31 +0000 (Thu, 23 Dec 2010)
New Revision: 848
Log:
switch to date+time in contact tideBegin and tideEnd : UI + import/export
Modified:
trunk/pom.xml
trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactStatus.java
trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv/WaoCsvHeader.java
trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java
trunk/wao-business/src/test/java/fr/ifremer/wao/io/ImportHelperTest.java
trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactInternalTest.java
trunk/wao-business/src/test/resources/import/contacts.csv
trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/ContactForm.java
trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/ContactForm.properties
trunk/wao-ui/src/main/webapp/ContactForm.tml
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2010-12-22 11:16:07 UTC (rev 847)
+++ trunk/pom.xml 2010-12-23 11:42:31 UTC (rev 848)
@@ -329,7 +329,7 @@
<!-- libraries version -->
<nuitonI18nVersion>1.2.2</nuitonI18nVersion>
- <nuitonUtilsVersion>1.5.1</nuitonUtilsVersion>
+ <nuitonUtilsVersion>1.5.3-SNAPSHOT</nuitonUtilsVersion>
<nuitonWebVersion>0.1</nuitonWebVersion>
<topiaVersion>2.5-SNAPSHOT</topiaVersion>
<eugeneVersion>2.3-SNAPSHOT</eugeneVersion>
Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactStatus.java
===================================================================
--- trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactStatus.java 2010-12-22 11:16:07 UTC (rev 847)
+++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactStatus.java 2010-12-23 11:42:31 UTC (rev 848)
@@ -146,12 +146,18 @@
* @return true if tideBeginDate status changed
*/
public boolean isTideBeginDateMonthChanged() {
+ if (logger.isDebugEnabled()) {
+
+ }
if (oldContact == null || newContact == null) {
return false;
}
DateFormat dateFormat = new SimpleDateFormat("MM/yyyy");
Date oldTideBeginDate = oldContact.getTideBeginDate();
Date newTideBeginDate = newContact.getTideBeginDate();
+
+ logger.debug("old : " + oldTideBeginDate + ", new : " + newTideBeginDate);
+
// Only if old not null and new not null
if (oldTideBeginDate != null && newTideBeginDate != null) {
String oldTideBeginStr = dateFormat.format(oldTideBeginDate);
@@ -258,6 +264,9 @@
query.addEquals(SampleMonth.PROPERTY_SAMPLE_ROW, sampleRow).
addBetween(SampleMonth.PROPERTY_PERIOD_DATE, period.getFromDate(), period.getThruDate());
//add(SampleMonth.PERIOD_DATE, period);
+
+ logger.debug("query=" + query);
+
SampleMonth result = monthDAO.findByQuery(query);
if (result == null) {
throw new NullSampleMonthException("Aucun mois correspondant pour" +
Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv/WaoCsvHeader.java
===================================================================
--- trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv/WaoCsvHeader.java 2010-12-22 11:16:07 UTC (rev 847)
+++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv/WaoCsvHeader.java 2010-12-23 11:42:31 UTC (rev 848)
@@ -29,6 +29,7 @@
import java.text.DateFormat;
import java.text.NumberFormat;
import java.text.SimpleDateFormat;
+import java.util.Date;
import java.util.Locale;
/**
@@ -59,6 +60,15 @@
* @return a String corresponding to the date pattern
*/
String datePattern();
+
+ /**
+ * format a date using the right pattern for this field. The pattern
+ * used will be the same returned by datePattern
+ *
+ * @param date the date to be formatted
+ * @return
+ */
+ String format(Date date);
}
public interface ContactHeader extends IOHeader {
@@ -226,6 +236,14 @@
return defaultDatePattern();
}
+ @Override
+ public String format(Date date) {
+ DateFormat dateFormat = new SimpleDateFormat(datePattern());
+ String result = dateFormat.format(date);
+ return result;
+ }
+
+
public static String defaultDatePattern() {
return "MM/yyyy";
}
@@ -354,9 +372,20 @@
@Override
public String datePattern() {
- return defaultDatePattern();
+ String pattern = defaultDatePattern();
+ if (this == CONT_DEBUT_MAREE || this == CONT_FIN_MAREE) {
+ pattern = "dd/MM/yyyy HH:mm";
+ }
+ return pattern;
}
+ @Override
+ public String format(Date date) {
+ DateFormat dateFormat = new SimpleDateFormat(datePattern());
+ String result = dateFormat.format(date);
+ return result;
+ }
+
private static String defaultDatePattern() {
return "dd/MM/yyyy";
}
Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java
===================================================================
--- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2010-12-22 11:16:07 UTC (rev 847)
+++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2010-12-23 11:42:31 UTC (rev 848)
@@ -441,11 +441,11 @@
contact.getContactState().libelle());
if (contact.getTideBeginDate() != null) {
export.record(CONTACT.CONT_DEBUT_MAREE,
- dateFormat.format(contact.getTideBeginDate()));
+ CONTACT.CONT_DEBUT_MAREE.format(contact.getTideBeginDate()));
}
if (contact.getTideEndDate() != null) {
export.record(CONTACT.CONT_FIN_MAREE,
- dateFormat.format(contact.getTideEndDate()));
+ CONTACT.CONT_FIN_MAREE.format(contact.getTideEndDate()));
}
export.record(CONTACT.CONT_NB_OBSERV,
String.valueOf(contact.getNbObservants()));
@@ -629,6 +629,11 @@
updateValidation);
} catch (NullSampleMonthException eee) {
+ log.debug("exception", eee);
+ log.debug("contact : " + contact);
+ if (contact != null) {
+ log.debug("tideBeginDate : " + contact.getTideBeginDate());
+ }
// The row will be refused in this case
throw new ImportRefusedException("Impossible de " +
"mettre à jour le nombre de marée réels, " +
Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/io/ImportHelperTest.java
===================================================================
--- trunk/wao-business/src/test/java/fr/ifremer/wao/io/ImportHelperTest.java 2010-12-22 11:16:07 UTC (rev 847)
+++ trunk/wao-business/src/test/java/fr/ifremer/wao/io/ImportHelperTest.java 2010-12-23 11:42:31 UTC (rev 848)
@@ -43,6 +43,8 @@
import java.io.IOException;
import java.io.InputStream;
import java.nio.charset.Charset;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Date;
import java.util.GregorianCalendar;
@@ -194,6 +196,12 @@
}
@Override
+ public String format(Date date) {
+ DateFormat dateFormat = new SimpleDateFormat(datePattern());
+ return dateFormat.format(date);
+ }
+
+ @Override
public String name() {
return "DATE_1";
}
@@ -213,6 +221,12 @@
}
@Override
+ public String format(Date date) {
+ DateFormat dateFormat = new SimpleDateFormat(datePattern());
+ return dateFormat.format(date);
+ }
+
+ @Override
public String name() {
return "DATE_2";
}
@@ -231,6 +245,12 @@
}
@Override
+ public String format(Date date) {
+ DateFormat dateFormat = new SimpleDateFormat(datePattern());
+ return dateFormat.format(date);
+ }
+
+ @Override
public String name() {
return "DATE_3";
}
@@ -250,6 +270,12 @@
}
@Override
+ public String format(Date date) {
+ DateFormat dateFormat = new SimpleDateFormat(datePattern());
+ return dateFormat.format(date);
+ }
+
+ @Override
public String name() {
return "DATE_4";
}
Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactInternalTest.java
===================================================================
--- trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactInternalTest.java 2010-12-22 11:16:07 UTC (rev 847)
+++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactInternalTest.java 2010-12-23 11:42:31 UTC (rev 848)
@@ -550,9 +550,9 @@
when(reader.get(BOAT.NAVS_COD.name())).
thenReturn(String.valueOf(boat.getImmatriculation()));
when(reader.get(CONTACT.CONT_DEBUT_MAREE.name())).
- thenReturn("22/03/2010");
+ thenReturn("22/03/2010 1:00");
when(reader.get(CONTACT.CONT_FIN_MAREE.name())).
- thenReturn("22/03/10");
+ thenReturn("22/03/10 2:15");
when(reader.get(CONTACT.CONT_NB_OBSERV.name())).
thenReturn("1");
when(reader.get(CONTACT.CONT_MAM_CAPT.name())).
@@ -593,10 +593,10 @@
assertEquals(observer, result.getMainObserver());
assertEquals(sampleRow, result.getSampleRow());
assertEquals(boat, result.getBoat());
- assertEquals(DateUtil.createDate(22,3,2010),
- result.getTideBeginDate());
- assertEquals(DateUtil.createDate(22,3,2010),
- result.getTideEndDate());
+
+ assertEquals(DateUtil.getDifferenceInMinutes(DateUtil.createDate(0,0,1,22,3,2010), result.getTideBeginDate()), 0);
+ assertEquals(DateUtil.getDifferenceInMinutes(DateUtil.createDate(0,15,2,22,3,2010), result.getTideEndDate()), 0);
+
assertEquals(1, result.getNbObservants());
assertFalse(result.getMammalsCapture());
assertTrue(result.getMammalsObservation());
Modified: trunk/wao-business/src/test/resources/import/contacts.csv
===================================================================
--- trunk/wao-business/src/test/resources/import/contacts.csv 2010-12-22 11:16:07 UTC (rev 847)
+++ trunk/wao-business/src/test/resources/import/contacts.csv 2010-12-23 11:42:31 UTC (rev 848)
@@ -1,2 +1,2 @@
"CONT_CREATION","OBSERV_ID","PLAN_CODE","NAVS_COD","CONT_ETAT","CONT_DEBUT_MAREE","CONT_FIN_MAREE","CONT_NB_OBSERV","CONT_MAM_CAPT","CONT_MAM_OBS","CONT_COMMENT","CONT_ALLEGRO","CONT_SOCIETE_VALID","CONT_PROGRAM_VALID"
-17/03/2010,"jmichmuche","2010_01",175846,"Embarquement réalisé ",18/03/2010,19/03/2010,1,,,,22/07/2010,"A","A"
+17/03/2010,"jmichmuche","2010_01",175846,"Embarquement réalisé ","18/03/2010 12:34","19/03/2010 22:33",1,,,,22/07/2010,"A","A"
Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/ContactForm.java
===================================================================
--- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/ContactForm.java 2010-12-22 11:16:07 UTC (rev 847)
+++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/ContactForm.java 2010-12-23 11:42:31 UTC (rev 848)
@@ -21,6 +21,7 @@
import org.apache.tapestry5.Block;
import org.apache.tapestry5.EventContext;
import org.apache.tapestry5.RenderSupport;
+import org.apache.tapestry5.annotations.Component;
import org.apache.tapestry5.annotations.Environmental;
import org.apache.tapestry5.annotations.IncludeJavaScriptLibrary;
import org.apache.tapestry5.annotations.IncludeStylesheet;
@@ -34,6 +35,7 @@
import org.apache.tapestry5.ioc.Messages;
import org.apache.tapestry5.ioc.annotations.Inject;
import org.apache.tapestry5.ioc.services.PropertyAccess;
+import org.chenillekit.tapestry.core.components.DateTimeField;
import org.slf4j.Logger;
import java.text.DateFormat;
@@ -82,6 +84,14 @@
@InjectComponent
private Zone globalZone;
+ public String getDateTimeFormatPattern() {
+ return "dd/MM/yyyy HH:mm";
+ }
+
+ public DateFormat getDateTimeFormat() {
+ return new SimpleDateFormat(getDateTimeFormatPattern());
+ }
+
public DateFormat getDateFormat() {
return new SimpleDateFormat("dd/MM/yyyy");
}
@@ -267,6 +277,9 @@
/************************ OBSERVATION REPORT ******************************/
+ @Component
+ private DateTimeField beginDate, endDate;
+
@Inject
private Block viewObservationReport;
Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/ContactForm.properties
===================================================================
--- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/ContactForm.properties 2010-12-22 11:16:07 UTC (rev 847)
+++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/ContactForm.properties 2010-12-23 11:42:31 UTC (rev 848)
@@ -2,8 +2,8 @@
mainObserver-label: Observateur r\u00e9f\u00e9rant
secondaryObserver-label: Observateur
contactState-label: \u00c9tat du contact
-beginDate-label: D\u00e9but de la mar\u00e9e
-endDate-label: Fin de la mar\u00e9e
+beginDate-label: D\u00e9but d'observation
+endDate-label: Fin d'observation
mammalsObservation-label: Observations de mammif\u00e8res
mammalsCapture-label: Capture accidentelle de mammif\u00e8res
inputDate-label: Date de saisie des donn\u00e9es dans Allegro
Modified: trunk/wao-ui/src/main/webapp/ContactForm.tml
===================================================================
--- trunk/wao-ui/src/main/webapp/ContactForm.tml 2010-12-22 11:16:07 UTC (rev 847)
+++ trunk/wao-ui/src/main/webapp/ContactForm.tml 2010-12-23 11:42:31 UTC (rev 848)
@@ -113,11 +113,11 @@
</div>
<div class="t-beaneditor-row">
<t:label t:for="beginDate" />
- <t:output value="contact.tideBeginDate" format="dateFormat" />
+ <t:output value="contact.tideBeginDate" format="dateTimeFormat" />
</div>
<div class="t-beaneditor-row">
<t:label t:for="endDate" />
- <t:output value="contact.tideEndDate" format="dateFormat" />
+ <t:output value="contact.tideEndDate" format="dateTimeFormat" />
</div>
<div class="t-beaneditor-row">
<img src="${asset:context:img/eye-22px.png}" alt="Observations" title="Observations" />
@@ -164,11 +164,11 @@
</div>
<div class="t-beaneditor-row">
<t:label t:for="beginDate" />
- <input t:type="datefield" t:id="beginDate" class="date" value="contact.tideBeginDate" />
+ <input t:id="beginDate" value="contact.tideBeginDate" datePattern="${dateTimeFormatPattern}" timePicker="true" timePickerAdjacent="true" use24hrs="true" />
</div>
<div class="t-beaneditor-row">
<t:label t:for="endDate" />
- <input t:type="datefield" t:id="endDate" class="date" value="contact.tideEndDate" />
+ <input t:id="endDate" value="contact.tideEndDate" datePattern="${dateTimeFormatPattern}" timePicker="true" timePickerAdjacent="true" use24hrs="true" />
</div>
<div class="t-beaneditor-row">
<img src="${asset:context:img/eye-22px.png}" alt="Observations" title="Observations" />
1
0
[Suiviobsmer-commits] r847 - in trunk/wao-business/src/main: java/fr/ifremer/wao/entity java/fr/ifremer/wao/io java/fr/ifremer/wao/io/csv java/fr/ifremer/wao/service resources/i18n xmi
by bleny@users.labs.libre-entreprise.org 22 Dec '10
by bleny@users.labs.libre-entreprise.org 22 Dec '10
22 Dec '10
Author: bleny
Date: 2010-12-22 11:16:07 +0000 (Wed, 22 Dec 2010)
New Revision: 847
Log:
fix csv import/export
Modified:
trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ContactImpl.java
trunk/wao-business/src/main/java/fr/ifremer/wao/io/ContactInput.java
trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv/WaoCsvHeader.java
trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java
trunk/wao-business/src/main/resources/i18n/wao-business-fr_FR.properties
trunk/wao-business/src/main/xmi/wao.zargo
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-12-22 11:15:22 UTC (rev 846)
+++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ContactImpl.java 2010-12-22 11:16:07 UTC (rev 847)
@@ -26,6 +26,7 @@
import fr.ifremer.wao.bean.ContactState;
import fr.ifremer.wao.bean.DataReliability;
+import fr.ifremer.wao.bean.ObsProgram;
import org.nuiton.util.DateUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -103,4 +104,13 @@
setDataReliabilityOrdinal(dataReliability.ordinal());
}
+ @Override
+ public ObsProgram getObsProgram() {
+ return ObsProgram.valueOf(getObsProgramOrdinal());
+ }
+
+ @Override
+ public void setObsProgram(ObsProgram obsProgram) {
+ setObsProgramOrdinal(obsProgram.ordinal());
+ }
}
Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/ContactInput.java
===================================================================
--- trunk/wao-business/src/main/java/fr/ifremer/wao/io/ContactInput.java 2010-12-22 11:15:22 UTC (rev 846)
+++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/ContactInput.java 2010-12-22 11:16:07 UTC (rev 847)
@@ -32,6 +32,7 @@
import fr.ifremer.wao.entity.SampleRowDAO;
import fr.ifremer.wao.entity.WaoUser;
import fr.ifremer.wao.entity.WaoUserDAO;
+import org.apache.commons.lang.StringUtils;
import org.nuiton.topia.TopiaContext;
import org.nuiton.topia.TopiaException;
@@ -110,6 +111,7 @@
* @throws TopiaException
* @throws ImportRefusedException if user doesn't exist
*/
+ @Deprecated
public void setObserver(String observerLogin)
throws TopiaException, ImportRefusedException {
// Find existing user with login
@@ -122,6 +124,38 @@
setMainObserver(user);
}
+ public void setObservers(String observers) throws TopiaException,
+ ImportRefusedException {
+ if (StringUtils.isEmpty(observers)) {
+
+ }
+
+ String[] logins = observers.split(" ");
+
+ WaoUserDAO userDAO = WaoDAOHelper.getWaoUserDAO(transaction);
+
+ // a flag to make the first observer as main observer and the others
+ // as secondary observers
+ boolean mainObserverIsSet = false;
+
+ for (String login : logins) {
+
+ WaoUser observer = userDAO.findByLogin(login);
+
+ if (observer == null) {
+ throw new ImportRefusedException("Utilisateur inexistant avec " +
+ "l'identifiant : " + login, rowNumber, PROPERTY_MAIN_OBSERVER);
+ }
+
+ if (mainObserverIsSet) {
+ addSecondaryObservers(observer);
+ } else {
+ setMainObserver(observer);
+ mainObserverIsSet = true;
+ }
+ }
+ }
+
/**
* Initialize the company for the Contact. Used to check with sampleRow
* company. This method check if the observer company is the same as
@@ -187,6 +221,7 @@
sampleRowCode, rowNumber, PROPERTY_SAMPLE_ROW);
}
setSampleRow(rowFound);
+ setObsProgramOrdinal(rowFound.getObsProgramOrdinal());
}
/**
Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv/WaoCsvHeader.java
===================================================================
--- trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv/WaoCsvHeader.java 2010-12-22 11:15:22 UTC (rev 846)
+++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv/WaoCsvHeader.java 2010-12-22 11:16:07 UTC (rev 847)
@@ -307,9 +307,9 @@
/** User id **/
OBSERV_ID(2),
/** User prenom **/
- OBSERV_PRENOM(3),
+ //OBSERV_PRENOM(3),
/** User nom **/
- OBSERV_NOM(4),
+ OBSERV_NOM(3),
/** Company id **/
//SOCIETE_ID,
/** Contact state **/
Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java
===================================================================
--- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2010-12-22 11:15:22 UTC (rev 846)
+++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2010-12-22 11:16:07 UTC (rev 847)
@@ -467,11 +467,26 @@
String.valueOf(contact.getDataReliabilityOrdinal()));
// Observer part
- WaoUser observer = contact.getMainObserver();
- Company company = observer.getCompany();
- export.record(CONTACT.OBSERV_ID, observer.getLogin());
- export.record(CONTACT.OBSERV_PRENOM, observer.getFirstName());
- export.record(CONTACT.OBSERV_NOM, observer.getLastName());
+ WaoUser mainObserver = contact.getMainObserver();
+
+ StringBuilder observersLogin = new StringBuilder();
+ observersLogin.append(mainObserver.getLogin());
+ StringBuilder observersNames = new StringBuilder();
+ observersNames.append(mainObserver.getFullName());
+ if (contact.getSecondaryObservers() != null) {
+ for (WaoUser secondaryObserver : contact.getSecondaryObservers()) {
+ observersLogin.append(", ");
+ observersLogin.append(secondaryObserver.getLogin());
+ observersNames.append(", ");
+ observersNames.append(secondaryObserver.getFullName());
+ }
+ }
+
+ export.record(CONTACT.OBSERV_ID, observersLogin.toString());
+ // export.record(CONTACT.OBSERV_PRENOM, mainObserver.getFirstName());
+ export.record(CONTACT.OBSERV_NOM, observersNames.toString());
+
+ Company company = mainObserver.getCompany();
export.record(SAMPLING.SOCIETE_NOM, company.getName());
// SampleRow part
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-12-22 11:15:22 UTC (rev 846)
+++ trunk/wao-business/src/main/resources/i18n/wao-business-fr_FR.properties 2010-12-22 11:16:07 UTC (rev 847)
@@ -1,136 +1,136 @@
fr.ifremer.wao.bean.ObsProgram.OBSDEB=ObsDeb
+fr.ifremer.wao.bean.ObsProgram.OBSMER=ObsMer
fr.ifremer.wao.bean.ObsProgram.OBSVENTE=ObsVente
-fr.ifremer.wao.bean.ObsProgram.OBSMER=ObsMer
fr.ifremer.wao.bean.UserRole.ADMIN=Administrateur
fr.ifremer.wao.bean.UserRole.COORDINATOR=Coordinateur
-fr.ifremer.wao.bean.UserRole.GUEST=Invit\u00e9
+fr.ifremer.wao.bean.UserRole.GUEST=Invit\u00E9
fr.ifremer.wao.bean.UserRole.OBSERVER=Observateur
-fr.ifremer.wao.entity.FishingGearDCF.=Non sp\u00e9cifi\u00e9
-fr.ifremer.wao.entity.FishingGearDCF.DRB=Dragues remorqu\u00e9es par bateau
-fr.ifremer.wao.entity.FishingGearDCF.DRH=Dragues \u00e0 main
-fr.ifremer.wao.entity.FishingGearDCF.FAR=Pi\u00e8ges a\u00e9riens
-fr.ifremer.wao.entity.FishingGearDCF.FCN=\u00c9perviers
-fr.ifremer.wao.entity.FishingGearDCF.FG=Autres engins retombants (non-sp\u00e9cifi\u00e9s)
-fr.ifremer.wao.entity.FishingGearDCF.FIX=Pi\u00e8ges (non-sp\u00e9cifi\u00e9s)
-fr.ifremer.wao.entity.FishingGearDCF.FPN=Filets-pi\u00e8ges fixes non couverts
+fr.ifremer.wao.entity.FishingGearDCF.=Non sp\u00E9cifi\u00E9
+fr.ifremer.wao.entity.FishingGearDCF.DRB=Dragues remorqu\u00E9es par bateau
+fr.ifremer.wao.entity.FishingGearDCF.DRH=Dragues \u00E0 main
+fr.ifremer.wao.entity.FishingGearDCF.FAR=Pi\u00E8ges a\u00E9riens
+fr.ifremer.wao.entity.FishingGearDCF.FCN=\u00C9perviers
+fr.ifremer.wao.entity.FishingGearDCF.FG=Autres engins retombants (non-sp\u00E9cifi\u00E9s)
+fr.ifremer.wao.entity.FishingGearDCF.FIX=Pi\u00E8ges (non-sp\u00E9cifi\u00E9s)
+fr.ifremer.wao.entity.FishingGearDCF.FPN=Filets-pi\u00E8ges fixes non couverts
fr.ifremer.wao.entity.FishingGearDCF.FPO=Nasses (casiers)
-fr.ifremer.wao.entity.FishingGearDCF.FSN=Filets \u00e0 l'\u00e9talage (diables)
+fr.ifremer.wao.entity.FishingGearDCF.FSN=Filets \u00E0 l'\u00E9talage (diables)
fr.ifremer.wao.entity.FishingGearDCF.FWR=Barrages, parcs, bordigues, etc.
fr.ifremer.wao.entity.FishingGearDCF.FYK=Verveux
-fr.ifremer.wao.entity.FishingGearDCF.GEN=Filets maillants et filets emm\u00e9lants (non sp\u00e9cifi\u00e9s)
-fr.ifremer.wao.entity.FishingGearDCF.GES=Tamis \u00e0 civelles
-fr.ifremer.wao.entity.FishingGearDCF.GN=Filets maillants (non sp\u00e9cifi\u00e9s)
+fr.ifremer.wao.entity.FishingGearDCF.GEN=Filets maillants et filets emm\u00E9lants (non sp\u00E9cifi\u00E9s)
+fr.ifremer.wao.entity.FishingGearDCF.GES=Tamis \u00E0 civelles
+fr.ifremer.wao.entity.FishingGearDCF.GN=Filets maillants (non sp\u00E9cifi\u00E9s)
fr.ifremer.wao.entity.FishingGearDCF.GNC=Filets maillants encerclants
-fr.ifremer.wao.entity.FishingGearDCF.GND=Filets maillants d\u00e9rivants (filets d\u00e9rivants)
+fr.ifremer.wao.entity.FishingGearDCF.GND=Filets maillants d\u00E9rivants (filets d\u00E9rivants)
fr.ifremer.wao.entity.FishingGearDCF.GNF=Filets maillants fixes (sur perches)
-fr.ifremer.wao.entity.FishingGearDCF.GNS=Filets maillants cal\u00e9s (ancr\u00e9s)
-fr.ifremer.wao.entity.FishingGearDCF.GT=Tr\u00e9mailleurs
-fr.ifremer.wao.entity.FishingGearDCF.GTN=Tr\u00e9mails et filets maillants combin\u00e9s
-fr.ifremer.wao.entity.FishingGearDCF.GTR=Tr\u00e9mails
+fr.ifremer.wao.entity.FishingGearDCF.GNS=Filets maillants cal\u00E9s (ancr\u00E9s)
+fr.ifremer.wao.entity.FishingGearDCF.GT=Tr\u00E9mailleurs
+fr.ifremer.wao.entity.FishingGearDCF.GTN=Tr\u00E9mails et filets maillants combin\u00E9s
+fr.ifremer.wao.entity.FishingGearDCF.GTR=Tr\u00E9mails
fr.ifremer.wao.entity.FishingGearDCF.HAR=Harpons
-fr.ifremer.wao.entity.FishingGearDCF.HMD=Dragues m\u00e9canis\u00e9es
+fr.ifremer.wao.entity.FishingGearDCF.HMD=Dragues m\u00E9canis\u00E9es
fr.ifremer.wao.entity.FishingGearDCF.HMP=Pompes
-fr.ifremer.wao.entity.FishingGearDCF.HMX=Engins de r\u00e9colte (non sp\u00e9cifi\u00e9s)
+fr.ifremer.wao.entity.FishingGearDCF.HMX=Engins de r\u00E9colte (non sp\u00E9cifi\u00E9s)
fr.ifremer.wao.entity.FishingGearDCF.LA=Filets tournants sans coulisse (filet lamparo)
-fr.ifremer.wao.entity.FishingGearDCF.LHM=Lignes \u00e0 main et lignes avec cannes
-fr.ifremer.wao.entity.FishingGearDCF.LHP=Lignes \u00e0 main et lignes \u00e0 cannes
-fr.ifremer.wao.entity.FishingGearDCF.LL=Palangres (non sp\u00e9cifi\u00e9es)
-fr.ifremer.wao.entity.FishingGearDCF.LLD=Palangres d\u00e9rivantes
-fr.ifremer.wao.entity.FishingGearDCF.LLS=Palangres cal\u00e9es ou semi-flottantes
-fr.ifremer.wao.entity.FishingGearDCF.LN=Filets soulev\u00e9s (non sp\u00e9cifi\u00e9s)
-fr.ifremer.wao.entity.FishingGearDCF.LNB=Filets soulev\u00e9s man\u0153uvr\u00e9es du bateau
-fr.ifremer.wao.entity.FishingGearDCF.LNP=Filets soulev\u00e9s portatifs
-fr.ifremer.wao.entity.FishingGearDCF.LNS=Filets soulev\u00e9s fixes man\u0153uvr\u00e9es du rivage
-fr.ifremer.wao.entity.FishingGearDCF.LTL=lignes de tra\u00eene
-fr.ifremer.wao.entity.FishingGearDCF.LX=Hame\u00e7ons et lignes (non sp\u00e9cifi\u00e9s)
+fr.ifremer.wao.entity.FishingGearDCF.LHM=Lignes \u00E0 main et lignes avec cannes
+fr.ifremer.wao.entity.FishingGearDCF.LHP=Lignes \u00E0 main et lignes \u00E0 cannes
+fr.ifremer.wao.entity.FishingGearDCF.LL=Palangres (non sp\u00E9cifi\u00E9es)
+fr.ifremer.wao.entity.FishingGearDCF.LLD=Palangres d\u00E9rivantes
+fr.ifremer.wao.entity.FishingGearDCF.LLS=Palangres cal\u00E9es ou semi-flottantes
+fr.ifremer.wao.entity.FishingGearDCF.LN=Filets soulev\u00E9s (non sp\u00E9cifi\u00E9s)
+fr.ifremer.wao.entity.FishingGearDCF.LNB=Filets soulev\u00E9s man\u0153uvr\u00E9es du bateau
+fr.ifremer.wao.entity.FishingGearDCF.LNP=Filets soulev\u00E9s portatifs
+fr.ifremer.wao.entity.FishingGearDCF.LNS=Filets soulev\u00E9s fixes man\u0153uvr\u00E9es du rivage
+fr.ifremer.wao.entity.FishingGearDCF.LTL=lignes de tra\u00EEne
+fr.ifremer.wao.entity.FishingGearDCF.LX=Hame\u00E7ons et lignes (non sp\u00E9cifi\u00E9s)
fr.ifremer.wao.entity.FishingGearDCF.MIS=Divers
-fr.ifremer.wao.entity.FishingGearDCF.NK=Engins inconnus ou non sp\u00e9cifi\u00e9s
-fr.ifremer.wao.entity.FishingGearDCF.OT=Chaluts \u00e0 panneaux (non sp\u00e9cifi\u00e9)
-fr.ifremer.wao.entity.FishingGearDCF.OTB=Chalut de fond \u00e0 panneaux
-fr.ifremer.wao.entity.FishingGearDCF.OTM=Chaluts p\u00e9lagiques \u00e0 panneaux
-fr.ifremer.wao.entity.FishingGearDCF.OTT=Chaluts jumeaux \u00e0 panneaux
+fr.ifremer.wao.entity.FishingGearDCF.NK=Engins inconnus ou non sp\u00E9cifi\u00E9s
+fr.ifremer.wao.entity.FishingGearDCF.OT=Chaluts \u00E0 panneaux (non sp\u00E9cifi\u00E9)
+fr.ifremer.wao.entity.FishingGearDCF.OTB=Chalut de fond \u00E0 panneaux
+fr.ifremer.wao.entity.FishingGearDCF.OTM=Chaluts p\u00E9lagiques \u00E0 panneaux
+fr.ifremer.wao.entity.FishingGearDCF.OTT=Chaluts jumeaux \u00E0 panneaux
fr.ifremer.wao.entity.FishingGearDCF.PS=Filets tournants avec coulisse (sennes coulissantes)
-fr.ifremer.wao.entity.FishingGearDCF.PS1=Filets tournants, sennes coulissantes man\u0153uvr\u00e9es par un bateau
-fr.ifremer.wao.entity.FishingGearDCF.PS2=Filets tournants, sennes coulissantes man\u0153uvr\u00e9es par deux bateaux
-fr.ifremer.wao.entity.FishingGearDCF.PT=Chalut-b\u0153ufs (non sp\u00e9cifi\u00e9)
+fr.ifremer.wao.entity.FishingGearDCF.PS1=Filets tournants, sennes coulissantes man\u0153uvr\u00E9es par un bateau
+fr.ifremer.wao.entity.FishingGearDCF.PS2=Filets tournants, sennes coulissantes man\u0153uvr\u00E9es par deux bateaux
+fr.ifremer.wao.entity.FishingGearDCF.PT=Chalut-b\u0153ufs (non sp\u00E9cifi\u00E9)
fr.ifremer.wao.entity.FishingGearDCF.PTB=Chalut-b\u0153ufs de fond
-fr.ifremer.wao.entity.FishingGearDCF.PTM=Chalut-b\u0153ufs p\u00e9lagiques
-fr.ifremer.wao.entity.FishingGearDCF.RG=Engins de p\u00eache r\u00e9vr\u00e9ative
+fr.ifremer.wao.entity.FishingGearDCF.PTM=Chalut-b\u0153ufs p\u00E9lagiques
+fr.ifremer.wao.entity.FishingGearDCF.RG=Engins de p\u00EAche r\u00E9vr\u00E9ative
fr.ifremer.wao.entity.FishingGearDCF.SB=Sennes de plages
fr.ifremer.wao.entity.FishingGearDCF.SDN=Sennes danoises
-fr.ifremer.wao.entity.FishingGearDCF.SPR=Sennes man\u0153uvr\u00e9es par deux bateaux
-fr.ifremer.wao.entity.FishingGearDCF.SSC=Sennes \u00e9cossaises
-fr.ifremer.wao.entity.FishingGearDCF.SV=Sennes hal\u00e9es \u00e0 bord
-fr.ifremer.wao.entity.FishingGearDCF.SW=Sennes (non sp\u00e9cifi\u00e9es)
-fr.ifremer.wao.entity.FishingGearDCF.TB=Chalut de fond (non sp\u00e9cifi\u00e9)
-fr.ifremer.wao.entity.FishingGearDCF.TBB=Chaluts \u00e0 perche
-fr.ifremer.wao.entity.FishingGearDCF.TBN=Chalut \u00e0 langoustines
-fr.ifremer.wao.entity.FishingGearDCF.TBS=Chalut \u00e0 crevettes
-fr.ifremer.wao.entity.FishingGearDCF.TM=Chalut p\u00e9lagique (non sp\u00e9cifi\u00e9)
-fr.ifremer.wao.entity.FishingGearDCF.TMS=Chalut \u00e0 crevettes
-fr.ifremer.wao.entity.FishingGearDCF.TX=Autre chalut (non sp\u00e9cifi\u00e9)
-fr.ifremer.wao.entity.TargetSpeciesDCF.=Non sp\u00e9cifi\u00e9
+fr.ifremer.wao.entity.FishingGearDCF.SPR=Sennes man\u0153uvr\u00E9es par deux bateaux
+fr.ifremer.wao.entity.FishingGearDCF.SSC=Sennes \u00E9cossaises
+fr.ifremer.wao.entity.FishingGearDCF.SV=Sennes hal\u00E9es \u00E0 bord
+fr.ifremer.wao.entity.FishingGearDCF.SW=Sennes (non sp\u00E9cifi\u00E9es)
+fr.ifremer.wao.entity.FishingGearDCF.TB=Chalut de fond (non sp\u00E9cifi\u00E9)
+fr.ifremer.wao.entity.FishingGearDCF.TBB=Chaluts \u00E0 perche
+fr.ifremer.wao.entity.FishingGearDCF.TBN=Chalut \u00E0 langoustines
+fr.ifremer.wao.entity.FishingGearDCF.TBS=Chalut \u00E0 crevettes
+fr.ifremer.wao.entity.FishingGearDCF.TM=Chalut p\u00E9lagique (non sp\u00E9cifi\u00E9)
+fr.ifremer.wao.entity.FishingGearDCF.TMS=Chalut \u00E0 crevettes
+fr.ifremer.wao.entity.FishingGearDCF.TX=Autre chalut (non sp\u00E9cifi\u00E9)
+fr.ifremer.wao.entity.TargetSpeciesDCF.=Non sp\u00E9cifi\u00E9
fr.ifremer.wao.entity.TargetSpeciesDCF.ALG=Algues
-fr.ifremer.wao.entity.TargetSpeciesDCF.CAT=Esp\u00e8ces catadromes
-fr.ifremer.wao.entity.TargetSpeciesDCF.CRU=Crustac\u00e9s
+fr.ifremer.wao.entity.TargetSpeciesDCF.CAT=Esp\u00E8ces catadromes
+fr.ifremer.wao.entity.TargetSpeciesDCF.CRU=Crustac\u00E9s
fr.ifremer.wao.entity.TargetSpeciesDCF.CSJ=Coquilles Saint-Jacques
-fr.ifremer.wao.entity.TargetSpeciesDCF.DEF=Esp\u00e8ces d\u00e9mersales
-fr.ifremer.wao.entity.TargetSpeciesDCF.DWS=Esp\u00e8ces d'eaux profondes
+fr.ifremer.wao.entity.TargetSpeciesDCF.DEF=Esp\u00E8ces d\u00E9mersales
+fr.ifremer.wao.entity.TargetSpeciesDCF.DWS=Esp\u00E8ces d'eaux profondes
fr.ifremer.wao.entity.TargetSpeciesDCF.FIN=Poisson plats
-fr.ifremer.wao.entity.TargetSpeciesDCF.LPF=Grands p\u00e9lagiques
+fr.ifremer.wao.entity.TargetSpeciesDCF.LPF=Grands p\u00E9lagiques
fr.ifremer.wao.entity.TargetSpeciesDCF.MOL=Mollusques
-fr.ifremer.wao.entity.TargetSpeciesDCF.SPF=Petits p\u00e9lagiques
+fr.ifremer.wao.entity.TargetSpeciesDCF.SPF=Petits p\u00E9lagiques
wao.business.bean.DataReliability.doubtful=douteuse
-wao.business.bean.DataReliability.not_provided=non renseign\u00e9e
+wao.business.bean.DataReliability.not_provided=non renseign\u00E9e
wao.business.bean.DataReliability.not_reliable=non exploitable
wao.business.bean.DataReliability.reliable=exploitable
wao.business.bean.DataReliability.unknown=inconnue
-wao.business.bean.GlobalIndicatorValue.bad=P\u00e9nalit\u00e9 de niveau 1
+wao.business.bean.GlobalIndicatorValue.bad=P\u00E9nalit\u00E9 de niveau 1
wao.business.bean.GlobalIndicatorValue.good=Bonus de niveau 1
wao.business.bean.GlobalIndicatorValue.neutral=Conforme au cahier des charges
-wao.business.bean.GlobalIndicatorValue.very_bad=P\u00e9nalit\u00e9 de niveau 2
+wao.business.bean.GlobalIndicatorValue.very_bad=P\u00E9nalit\u00E9 de niveau 2
wao.business.bean.GlobalIndicatorValue.very_good=Bonus de niveau 2
-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
+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
wao.error.context.close=Une erreur est survenue pendant la fermeture du contexte principale de ToPIA
wao.error.context.encodeString=
-wao.error.context.getRootContext=Une erreur est survenue pour la r\u00e9cup\u00e9ration du contexte principale de ToPIA
+wao.error.context.getRootContext=Une erreur est survenue pour la r\u00E9cup\u00E9ration du contexte principale de ToPIA
wao.error.context.parse=Une erreur est survenue pendant le chargement de la configuration du fichier %1$s
wao.error.context.rollback=Une erreur est survenue pendant l'annulation de la transaction courante
-wao.error.context.start=Une erreur est survenue pendant le d\u00e9marrage de l'application
+wao.error.context.start=Une erreur est survenue pendant le d\u00E9marrage de l'application
wao.error.context.stop=Une erreur est survenue pendant la fermeture de l'application
-wao.error.sampleMonth.addRealTideTime=Impossible d'enregistrer le nombre de mar\u00e9es r\u00e9els pour le mois de %1$s [ligne \: %2$s]
-wao.error.sampleRow.saveSampleRowLog=Impossible d'enregistrer le commentaire \u00e9crit par %1$s
-wao.error.serviceBoat.createUpdateCompanyBoatInfos=Impossible de cr\u00e9er ou modifier les informations li\u00e9s au navire %1$d pour la soci\u00e9t\u00e9 %2$s
-wao.error.serviceBoat.exportBoatCsv=Impossible d'exporter les navires s\u00e9lectionn\u00e9s
+wao.error.sampleMonth.addRealTideTime=Impossible d'enregistrer le nombre de mar\u00E9es r\u00E9els pour le mois de %1$s [ligne \: %2$s]
+wao.error.sampleRow.saveSampleRowLog=Impossible d'enregistrer le commentaire \u00E9crit par %1$s
+wao.error.serviceBoat.createUpdateCompanyBoatInfos=Impossible de cr\u00E9er ou modifier les informations li\u00E9s au navire %1$d pour la soci\u00E9t\u00E9 %2$s
+wao.error.serviceBoat.exportBoatCsv=Impossible d'exporter les navires s\u00E9lectionn\u00E9s
wao.error.serviceBoat.getActivityCalendarLogAccessFile=
wao.error.serviceBoat.getActivityCalendarLogFile=
wao.error.serviceBoat.getBoat=Impossible de charger le navire
-wao.error.serviceBoat.getBoatNamesStartWith=Impossible de r\u00e9cup\u00e9rer les navires avec un nom commencant par '%1$s'
+wao.error.serviceBoat.getBoatNamesStartWith=Impossible de r\u00E9cup\u00E9rer les navires avec un nom commencant par '%1$s'
wao.error.serviceBoat.getBoatsByFilter=Impossible de filtrer la liste des navires
-wao.error.serviceBoat.getBoatsByImmatriculations=La cha\u00eene d'immatriculations est incorrect \! Chaque immatriculation doit poss\u00e9der 6 chiffres
-wao.error.serviceBoat.getCompanyBoatInfos=Impossible de r\u00e9cup\u00e9rer les informations du navire immatricul\u00e9 %1$d pour la soci\u00e9t\u00e9 %2$s
-wao.error.serviceBoat.getLastActivityCalendar=Impossible de charger le dernier calendrier d'activit\u00e9 du navire %1$s (%2$d)
+wao.error.serviceBoat.getBoatsByImmatriculations=La cha\u00EEne d'immatriculations est incorrect \! Chaque immatriculation doit poss\u00E9der 6 chiffres
+wao.error.serviceBoat.getCompanyBoatInfos=Impossible de r\u00E9cup\u00E9rer les informations du navire immatricul\u00E9 %1$d pour la soci\u00E9t\u00E9 %2$s
+wao.error.serviceBoat.getLastActivityCalendar=Impossible de charger le dernier calendrier d'activit\u00E9 du navire %1$s (%2$d)
wao.error.serviceBoat.getNbBoatsByFilter=Impossible de filtrer la liste des navires
wao.error.serviceBoat.getShipOwnerNamesContains=
-wao.error.serviceBoat.importActivityCalendarCsv=Probl\u00e8me d'import du fichier CSV des calendriers d'activit\u00e9
-wao.error.serviceBoat.importBoatCsv=Probl\u00e8me d'import du fichier CSV. V\u00e9rifiez l'en-t\u00eate du fichier \: [ NAVS_COD,CARN_NOM,CARN_LONGUEUR_HT,CARN_ANNEE,QUARTIER_IMMA,PER_COD,PER_NOM,PER_PRENOM,NAVS_ACTIVE ]. Voir documentation pour plus de d\u00e9tails.
+wao.error.serviceBoat.importActivityCalendarCsv=Probl\u00E8me d'import du fichier CSV des calendriers d'activit\u00E9
+wao.error.serviceBoat.importBoatCsv=Probl\u00E8me d'import du fichier CSV. V\u00E9rifiez l'en-t\u00EAte du fichier \: [ NAVS_COD,CARN_NOM,CARN_LONGUEUR_HT,CARN_ANNEE,QUARTIER_IMMA,PER_COD,PER_NOM,PER_PRENOM,NAVS_ACTIVE ]. Voir documentation pour plus de d\u00E9tails.
wao.error.serviceCartography.exportContactStatisticsKml=
-wao.error.serviceCartography.importBoatDistrictKml=Impossible d'importer les coordonn\u00e9es des quartiers des navires. V\u00e9rifiez la documentation pour le bon format du fichier Kml.
+wao.error.serviceCartography.importBoatDistrictKml=Impossible d'importer les coordonn\u00E9es des quartiers des navires. V\u00E9rifiez la documentation pour le bon format du fichier Kml.
wao.error.serviceChart.getContactPieChartData=
wao.error.serviceChart.getContactPieChartUrl=
wao.error.serviceContact.exportContactCsv=Impossible d'exporter les contacts
wao.error.serviceContact.getContact=Impossible de trouver le contact
wao.error.serviceContact.getContacts=Impossible de filtrer la liste des contacts
-wao.error.serviceContact.getNbContacts=Impossible de compter le nombre de contacts filtr\u00e9s
+wao.error.serviceContact.getNbContacts=Impossible de compter le nombre de contacts filtr\u00E9s
wao.error.serviceContact.getNewContact=Impossible d'instancier un nouveau contact
wao.error.serviceContact.importContactCsv=Impossible d'importer les contacts
wao.error.serviceContact.saveComment=
@@ -138,56 +138,56 @@
wao.error.serviceContact.sendContactDoneEmail=
wao.error.serviceContact.updateSampleMonthTidesValue=
wao.error.serviceNews.getNewNews=
-wao.error.serviceNews.getNews=Impossible de r\u00e9cup\u00e9rer l'ensemble des news
+wao.error.serviceNews.getNews=Impossible de r\u00E9cup\u00E9rer l'ensemble des news
wao.error.serviceNews.saveNews=Impossible d'enregistrer la news ayant pour titre '%1$s'
wao.error.serviceReferential.getCodesDCF5Contains=
wao.error.serviceReferential.getFacades=Impossible de charger la liste des facades
-wao.error.serviceReferential.getFishingZones=Impossible de charger la liste des secteurs de p\u00eache
-wao.error.serviceReferential.getProfessions=Impossible de charger la liste des m\u00e9tiers
-wao.error.serviceReferential.getSectors=Impossible de charger la liste des zones de p\u00eache
-wao.error.serviceReferential.importDCFcodes=Impossible de cr\u00e9er le r\u00e9f\u00e9rentiel des codes DCF
-wao.error.serviceReferential.importFishingZoneCsv=Probl\u00e8me d'import du fichier CSV. V\u00e9rifiez l'en-t\u00eate du fichier \: [ PECHE_DIVISION,PECHE_ZONE,PECHE_FACADE ]. Voir documentation pour plus de d\u00e9tails.
+wao.error.serviceReferential.getFishingZones=Impossible de charger la liste des secteurs de p\u00EAche
+wao.error.serviceReferential.getProfessions=Impossible de charger la liste des m\u00E9tiers
+wao.error.serviceReferential.getSectors=Impossible de charger la liste des zones de p\u00EAche
+wao.error.serviceReferential.importDCFcodes=Impossible de cr\u00E9er le r\u00E9f\u00E9rentiel des codes DCF
+wao.error.serviceReferential.importFishingZoneCsv=Probl\u00E8me d'import du fichier CSV. V\u00E9rifiez l'en-t\u00EAte du fichier \: [ PECHE_DIVISION,PECHE_ZONE,PECHE_FACADE ]. Voir documentation pour plus de d\u00E9tails.
wao.error.serviceSampling.createSampleRowLog=
-wao.error.serviceSampling.createUpdateSampleRow=Impossible de sauvegarder la ligne d'\u00e9chantillon
-wao.error.serviceSampling.deleteSampleRow=Impossible de supprimer la ligne d'\u00e9chantillon \: %1$s
-wao.error.serviceSampling.exportSamplingPlanCsv=Impossible d'exporter le plan d'\u00e9chantillonnage sur la p\u00e9riode du %1$s au %2$s
+wao.error.serviceSampling.createUpdateSampleRow=Impossible de sauvegarder la ligne d'\u00E9chantillon
+wao.error.serviceSampling.deleteSampleRow=Impossible de supprimer la ligne d'\u00E9chantillon \: %1$s
+wao.error.serviceSampling.exportSamplingPlanCsv=Impossible d'exporter le plan d'\u00E9chantillonnage sur la p\u00E9riode du %1$s au %2$s
wao.error.serviceSampling.getDCFGears=
wao.error.serviceSampling.getDCFSpecies=
wao.error.serviceSampling.getNewProfession=
wao.error.serviceSampling.getNewSampleMonth=
wao.error.serviceSampling.getNewSampleRow=
-wao.error.serviceSampling.getNewSampleRowCode=Impossible de r\u00e9cup\u00e9rer un nouveau code pour une ligne d'\u00e9chantillonnage
+wao.error.serviceSampling.getNewSampleRowCode=Impossible de r\u00E9cup\u00E9rer un nouveau code pour une ligne d'\u00E9chantillonnage
wao.error.serviceSampling.getNewSampleRowLog=
wao.error.serviceSampling.getPrograms=Impossible de charger la liste des programmes
-wao.error.serviceSampling.getSampleRow=Impossible de charger la ligne d'\u00e9chantillon ayant pour identifiant \: %1$s
-wao.error.serviceSampling.getSampleRowByCode=Impossible de charger la ligne d'\u00e9chantillon ayant pour code %1$s
-wao.error.serviceSampling.getSampleRowsByFilter=Impossible de r\u00e9cup\u00e9rer la liste des lignes du plan d'\u00e9chantillonnage
-wao.error.serviceSampling.getSampleRowsOrderedByFishingZone=Impossible de r\u00e9cup\u00e9rer la liste des lignes du plan d'\u00e9chantillonnage
-wao.error.serviceSampling.importSamplingPlanCsv=Erreur \u00e0 la ligne %1$d [CODE \= %2$s]
+wao.error.serviceSampling.getSampleRow=Impossible de charger la ligne d'\u00E9chantillon ayant pour identifiant \: %1$s
+wao.error.serviceSampling.getSampleRowByCode=Impossible de charger la ligne d'\u00E9chantillon ayant pour code %1$s
+wao.error.serviceSampling.getSampleRowsByFilter=Impossible de r\u00E9cup\u00E9rer la liste des lignes du plan d'\u00E9chantillonnage
+wao.error.serviceSampling.getSampleRowsOrderedByFishingZone=Impossible de r\u00E9cup\u00E9rer la liste des lignes du plan d'\u00E9chantillonnage
+wao.error.serviceSampling.importSamplingPlanCsv=Erreur \u00E0 la ligne %1$d [CODE \= %2$s]
wao.error.serviceSynthesis.getAllIndicatorLogs=
-wao.error.serviceSynthesis.getBoardingBoats=Impossible de r\u00e9cup\u00e9rer les donn\u00e9es du graphique concernant les embarquements sur les navires
+wao.error.serviceSynthesis.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.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=
-wao.error.serviceSynthesis.getContactStateStatistics=Impossible de r\u00e9cup\u00e9rer les statistiques sur les \u00e9tats des contacts
+wao.error.serviceSynthesis.getContactStateStatistics=Impossible de r\u00E9cup\u00E9rer les statistiques sur les \u00E9tats des contacts
wao.error.serviceSynthesis.getDataReliability=
-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.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.getGlobalSynthesisResult=
-wao.error.serviceSynthesis.getNonComplianceBoardingIndicator=Impossible de r\u00e9cup\u00e9rer l'indicateur de non respect du nombre d'observateurs embarqu\u00e9s
-wao.error.serviceSynthesis.updateGlobalSynthesisParameters=Impossible de mettre \u00e0 jour les param\u00e8tres de 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.serviceSynthesis.updateGlobalSynthesisParameters=Impossible de mettre \u00E0 jour les param\u00E8tres de la synth\u00E8se globale
wao.error.serviceUser.connect=Une erreur est survenue lors de la demande de connexion
-wao.error.serviceUser.createDefaultAdmin=Impossible de cr\u00e9er l'administrateur par d\u00e9faut
-wao.error.serviceUser.createUpdateCompany=Impossible de cr\u00e9er ou de mettre \u00e0 jour la soci\u00e9t\u00e9
-wao.error.serviceUser.createUpdateUser=Impossible de cr\u00e9er ou de mettre \u00e0 jour l'utilisateur
-wao.error.serviceUser.deleteCompany=Impossible de supprimer la soci\u00e9t\u00e9 ou de v\u00e9rifier les contraintes de suppression
+wao.error.serviceUser.createDefaultAdmin=Impossible de cr\u00E9er l'administrateur par d\u00E9faut
+wao.error.serviceUser.createUpdateCompany=Impossible de cr\u00E9er ou de mettre \u00E0 jour la soci\u00E9t\u00E9
+wao.error.serviceUser.createUpdateUser=Impossible de cr\u00E9er ou de mettre \u00E0 jour l'utilisateur
+wao.error.serviceUser.deleteCompany=Impossible de supprimer la soci\u00E9t\u00E9 ou de v\u00E9rifier les contraintes de suppression
wao.error.serviceUser.deleteUser=Impossible de supprimer l'utilisateur
wao.error.serviceUser.existLogin=
wao.error.serviceUser.forgetPassword=Impossible d'envoyer le mail d'oubli de mot de passe
-wao.error.serviceUser.getCompanies=Impossible de r\u00e9cup\u00e9rer la liste des soci\u00e9t\u00e9s
+wao.error.serviceUser.getCompanies=Impossible de r\u00E9cup\u00E9rer la liste des soci\u00E9t\u00E9s
wao.error.serviceUser.getCompany=
wao.error.serviceUser.getNewUser=Impossible d'instancier un nouvel utilisateur
-wao.error.serviceUser.getObservers=Impossible de r\u00e9cup\u00e9rer la liste des observateurs
+wao.error.serviceUser.getObservers=Impossible de r\u00E9cup\u00E9rer la liste des observateurs
wao.error.serviceUser.getUserRolesByLogin=
-wao.error.serviceUser.getUsersByCompany=Impossible de r\u00e9cup\u00e9rer la liste des utilisateurs de la soci\u00e9t\u00e9 %1$s
+wao.error.serviceUser.getUsersByCompany=Impossible de r\u00E9cup\u00E9rer la liste des utilisateurs de la soci\u00E9t\u00E9 %1$s
Modified: trunk/wao-business/src/main/xmi/wao.zargo
===================================================================
(Binary files differ)
1
0
[Suiviobsmer-commits] r846 - in trunk/wao-ui/src/main: java/fr/ifremer/wao/ui/pages webapp
by bleny@users.labs.libre-entreprise.org 22 Dec '10
by bleny@users.labs.libre-entreprise.org 22 Dec '10
22 Dec '10
Author: bleny
Date: 2010-12-22 11:15:22 +0000 (Wed, 22 Dec 2010)
New Revision: 846
Log:
don't show data reliability when not in ObsMer program
Modified:
trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/ContactForm.java
trunk/wao-ui/src/main/webapp/ContactForm.tml
Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/ContactForm.java
===================================================================
--- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/ContactForm.java 2010-12-21 11:17:49 UTC (rev 845)
+++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/ContactForm.java 2010-12-22 11:15:22 UTC (rev 846)
@@ -5,6 +5,7 @@
import fr.ifremer.wao.bean.ConnectedUser;
import fr.ifremer.wao.bean.ContactState;
import fr.ifremer.wao.bean.DataReliability;
+import fr.ifremer.wao.bean.ObsProgram;
import fr.ifremer.wao.bean.UserRole;
import fr.ifremer.wao.entity.Contact;
import fr.ifremer.wao.entity.SampleRow;
@@ -284,6 +285,11 @@
/************************ ADMIN FIELDS ************************************/
+ public boolean showDataReliability() {
+ // ObsMer is the single program where data reliability is evaluated
+ return getContact().getObsProgram() == ObsProgram.OBSMER;
+ }
+
public boolean canEditDataReliability() {
boolean result = connectedUser.isAdmin() // coordinator can see the value
&& BooleanUtils.isTrue(getContact().getValidationCompany())
Modified: trunk/wao-ui/src/main/webapp/ContactForm.tml
===================================================================
--- trunk/wao-ui/src/main/webapp/ContactForm.tml 2010-12-21 11:17:49 UTC (rev 845)
+++ trunk/wao-ui/src/main/webapp/ContactForm.tml 2010-12-22 11:15:22 UTC (rev 846)
@@ -202,16 +202,18 @@
<fieldset class="user-form clearfix">
<legend>Évaluation programme</legend>
<div class="t-beaneditor">
+ <t:if test="showDataReliability()">
+ <div class="t-beaneditor-row">
+ <t:label t:for="dataReliability" />
+ <t:if t:test="canEditDataReliability()">
+ <input t:type="select" t:id="dataReliability" value="contact.dataReliability" />
+ <p:else>
+ ${contact.dataReliability.label}
+ </p:else>
+ </t:if>
+ </div>
+ </t:if>
<div class="t-beaneditor-row">
- <t:label t:for="dataReliability" />
- <t:if t:test="canEditDataReliability()">
- <input t:type="select" t:id="dataReliability" value="contact.dataReliability" />
- <p:else>
- ${contact.dataReliability.label}
- </p:else>
- </t:if>
- </div>
- <div class="t-beaneditor-row">
<t:label t:for="adminComment" />
<t:if t:test="connectedUser.admin">
<input t:type="textarea" t:id="adminComment" value="contact.commentAdmin" />
1
0