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
January 2010
- 4 participants
- 139 discussions
[Suiviobsmer-commits] r300 - trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer
by fdesbois＠users.labs.libre-entreprise.org 31 Jan '10
by fdesbois＠users.labs.libre-entreprise.org 31 Jan '10
31 Jan '10
Author: fdesbois
Date: 2010-01-31 23:22:03 +0000 (Sun, 31 Jan 2010)
New Revision: 300
Modified:
trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/ImportHelper.java
trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/SuiviObsmerContext.java
trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/SuiviObsmerMigrationCallBack.java
Log:
Implement migration to 0.4
Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/ImportHelper.java
===================================================================
--- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/ImportHelper.java 2010-01-31 22:44:44 UTC (rev 299)
+++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/ImportHelper.java 2010-01-31 23:22:03 UTC (rev 300)
@@ -394,14 +394,8 @@
}
public static String readSampleRowCode(CsvReader reader) throws IOException {
- String code = read(reader, SAMPLING.PLAN_CODE);
- // Replace single number after year by a double one : 2010_111 -> 2010_0111
- code = code.replaceFirst("_(\\d{3})$", "_0$1");
- // Replace single number after year by a double one : 2010_11 -> 2010_0011
- code = code.replaceFirst("_(\\d{2})$", "_00$1");
- // Replace single number after year by a double one : 2010_1 -> 2010_0001
- code = code.replaceFirst("_(\\d)$", "_000$1");
- return code;
+ String code = read(reader, SAMPLING.PLAN_CODE);
+ return SuiviObsmerContext.prepareSampleRowCode(code);
}
public static DateFormat getContactDateFormat() {
Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/SuiviObsmerContext.java
===================================================================
--- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/SuiviObsmerContext.java 2010-01-31 22:44:44 UTC (rev 299)
+++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/SuiviObsmerContext.java 2010-01-31 23:22:03 UTC (rev 300)
@@ -158,6 +158,16 @@
return "";
}
+ public static String prepareSampleRowCode(String code) {
+ // Replace single number after year by a double one : 2010_111 -> 2010_0111
+ code = code.replaceFirst("_(\\d{3})$", "_0$1");
+ // Replace single number after year by a double one : 2010_11 -> 2010_0011
+ code = code.replaceFirst("_(\\d{2})$", "_00$1");
+ // Replace single number after year by a double one : 2010_1 -> 2010_0001
+ code = code.replaceFirst("_(\\d)$", "_000$1");
+ return code;
+ }
+
public static <E extends TopiaEntity> boolean prepareTopiaId(Class<E> entityClass, E entity) {
String topiaId = entity.getTopiaId();
if (StringUtils.isEmpty(entity.getTopiaId())) {
Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/SuiviObsmerMigrationCallBack.java
===================================================================
--- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/SuiviObsmerMigrationCallBack.java 2010-01-31 22:44:44 UTC (rev 299)
+++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/SuiviObsmerMigrationCallBack.java 2010-01-31 23:22:03 UTC (rev 300)
@@ -1,5 +1,7 @@
package fr.ifremer.suiviobsmer;
+import fr.ifremer.suiviobsmer.entity.SampleRow;
+import fr.ifremer.suiviobsmer.entity.SampleRowDAO;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.nuiton.topia.TopiaException;
@@ -21,9 +23,14 @@
boolean showProgression) throws TopiaException {
if (log.isInfoEnabled()) {
- log.info("Migrate to version .04");
+ log.info("Migrate to version 0.4");
}
- //TODO
+
+ SampleRowDAO dao = SuiviObsmerModelDAOHelper.getSampleRowDAO(tx);
+ for (SampleRow row : dao.findAll()) {
+ String newCode = SuiviObsmerContext.prepareSampleRowCode(row.getCode());
+ row.setCode(newCode);
+ }
}
@@ -31,6 +38,7 @@
public boolean askUser(Version dbVersion,
Version applicationVersion,
List<Version> versions) {
+ // Always migrate the database
return true;
}
}
\ No newline at end of file
1
0
31 Jan '10
Author: tchemit
Date: 2010-01-31 22:44:44 +0000 (Sun, 31 Jan 2010)
New Revision: 299
Added:
trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/SuiviObsmerMigrationCallBack.java
trunk/suiviobsmer-business/src/main/resources/oldmappings/
trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/
trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/
trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/
trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/
trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/
trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/
trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityCalendarImpl.hbm.xml
trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityMonthImpl.hbm.xml
trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityProfessionImpl.hbm.xml
trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityZoneImpl.hbm.xml
trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/BoatImpl.hbm.xml
trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/BoatInfosImpl.hbm.xml
trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/CompanyImpl.hbm.xml
trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ContactImpl.hbm.xml
trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ElligibleBoatImpl.hbm.xml
trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/FishingZoneImpl.hbm.xml
trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/NewsImpl.hbm.xml
trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ProfessionImpl.hbm.xml
trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/SampleMonthImpl.hbm.xml
trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/SampleRowImpl.hbm.xml
trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/SampleRowLogImpl.hbm.xml
trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ShipOwnerImpl.hbm.xml
trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/WaoUserImpl.hbm.xml
trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/
trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/
trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/
trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/
trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/
trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ActivityCalendarImpl.hbm.xml
trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ActivityMonthImpl.hbm.xml
trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ActivityProfessionImpl.hbm.xml
trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ActivityZoneImpl.hbm.xml
trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/BoatImpl.hbm.xml
trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/BoatInfosImpl.hbm.xml
trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/CompanyImpl.hbm.xml
trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ContactImpl.hbm.xml
trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ElligibleBoatImpl.hbm.xml
trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/FishingZoneImpl.hbm.xml
trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/NewsImpl.hbm.xml
trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ProfessionImpl.hbm.xml
trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/SampleMonthImpl.hbm.xml
trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/SampleRowImpl.hbm.xml
trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/SampleRowLogImpl.hbm.xml
trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ShipOwnerImpl.hbm.xml
trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/WaoUserImpl.hbm.xml
Log:
Use topia migration service + pass model version to 0.4
Added: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/SuiviObsmerMigrationCallBack.java
===================================================================
--- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/SuiviObsmerMigrationCallBack.java (rev 0)
+++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/SuiviObsmerMigrationCallBack.java 2010-01-31 22:44:44 UTC (rev 299)
@@ -0,0 +1,36 @@
+package fr.ifremer.suiviobsmer;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.nuiton.topia.TopiaException;
+import org.nuiton.topia.framework.TopiaContextImplementor;
+import org.nuiton.topia.migration.ManualMigrationCallback;
+import org.nuiton.util.Version;
+
+import java.util.List;
+
+public class SuiviObsmerMigrationCallBack extends ManualMigrationCallback {
+
+ /**
+ * Logger
+ */
+ private static final Log log = LogFactory.getLog(SuiviObsmerMigrationCallBack.class);
+
+ public void migrateTo_0_4(TopiaContextImplementor tx,
+ boolean showSql,
+ boolean showProgression) throws TopiaException {
+
+ if (log.isInfoEnabled()) {
+ log.info("Migrate to version .04");
+ }
+ //TODO
+ }
+
+
+ @Override
+ public boolean askUser(Version dbVersion,
+ Version applicationVersion,
+ List<Version> versions) {
+ return true;
+ }
+}
\ No newline at end of file
Property changes on: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/SuiviObsmerMigrationCallBack.java
___________________________________________________________________
Added: svn:keywords
+ "Author Date Id Revision HeadURL
Added: trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ActivityCalendarImpl.hbm.xml
===================================================================
--- trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ActivityCalendarImpl.hbm.xml (rev 0)
+++ trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ActivityCalendarImpl.hbm.xml 2010-01-31 22:44:44 UTC (rev 299)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.suiviobsmer.entity">
+ <class name="fr.ifremer.suiviobsmer.entity.ActivityCalendarImpl" table="activityCalendar" node="fr.ifremer.suiviobsmer.entity.ActivityCalendarImpl" abstract="false" proxy="fr.ifremer.suiviobsmer.entity.ActivityCalendar" >
+ <id name="topiaId" type="string" length="255" node="@topiaId"/>
+ <version name="topiaVersion" type="long" node="@topiaVersion"/>
+ <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/>
+ <property name="year" type="int" access="field" column="year" node="year"/>
+ <property name="fiability" type="int" access="field" column="fiability" node="fiability"/>
+ <bag name="activityMonth" inverse="true" order-by="month" lazy="true" cascade="all,delete-orphan" node="activityMonth" embed-xml="false">
+ <key column="activityCalendar"/>
+ <one-to-many class="fr.ifremer.suiviobsmer.entity.ActivityMonthImpl" node="topiaId" embed-xml="false"/>
+ </bag>
+ <many-to-one name="boat" class="fr.ifremer.suiviobsmer.entity.BoatImpl" column="boat" node="boat/@topiaId" embed-xml="false"/>
+ </class>
+</hibernate-mapping>
Added: trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ActivityMonthImpl.hbm.xml
===================================================================
--- trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ActivityMonthImpl.hbm.xml (rev 0)
+++ trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ActivityMonthImpl.hbm.xml 2010-01-31 22:44:44 UTC (rev 299)
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.suiviobsmer.entity">
+ <class name="fr.ifremer.suiviobsmer.entity.ActivityMonthImpl" table="activityMonth" node="fr.ifremer.suiviobsmer.entity.ActivityMonthImpl" abstract="false" proxy="fr.ifremer.suiviobsmer.entity.ActivityMonth" >
+ <id name="topiaId" type="string" length="255" node="@topiaId"/>
+ <version name="topiaVersion" type="long" node="@topiaVersion"/>
+ <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/>
+ <property name="harbourLibelle" type="text" access="field" column="harbourLibelle" node="harbourLibelle"/>
+ <property name="active" type="boolean" access="field" column="active" node="active"/>
+ <property name="nbBoardingPersons" type="java.lang.Integer" access="field" column="nbBoardingPersons" node="nbBoardingPersons"/>
+ <property name="nbSeaDays" type="java.lang.Integer" access="field" column="nbSeaDays" node="nbSeaDays"/>
+ <property name="nbFishingDays" type="java.lang.Integer" access="field" column="nbFishingDays" node="nbFishingDays"/>
+ <property name="month" type="int" access="field" column="month" node="month"/>
+ <property name="harbourCode" type="text" access="field" column="harbourCode" node="harbourCode"/>
+ <property name="harbourId" type="int" access="field" column="harbourId" node="harbourId"/>
+ <bag name="activityProfession" inverse="true" order-by="professionOrder" lazy="true" cascade="all,delete-orphan" node="activityProfession" embed-xml="false">
+ <key column="activityMonth"/>
+ <one-to-many class="fr.ifremer.suiviobsmer.entity.ActivityProfessionImpl" node="topiaId" embed-xml="false"/>
+ </bag>
+ <many-to-one name="activityCalendar" class="fr.ifremer.suiviobsmer.entity.ActivityCalendarImpl" column="activityCalendar" node="activityCalendar/@topiaId" embed-xml="false"/>
+ </class>
+</hibernate-mapping>
Added: trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ActivityProfessionImpl.hbm.xml
===================================================================
--- trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ActivityProfessionImpl.hbm.xml (rev 0)
+++ trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ActivityProfessionImpl.hbm.xml 2010-01-31 22:44:44 UTC (rev 299)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.suiviobsmer.entity">
+ <class name="fr.ifremer.suiviobsmer.entity.ActivityProfessionImpl" table="activityProfession" node="fr.ifremer.suiviobsmer.entity.ActivityProfessionImpl" abstract="false" proxy="fr.ifremer.suiviobsmer.entity.ActivityProfession" >
+ <id name="topiaId" type="string" length="255" node="@topiaId"/>
+ <version name="topiaVersion" type="long" node="@topiaVersion"/>
+ <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/>
+ <property name="code" type="text" access="field" column="code" node="code"/>
+ <property name="libelle" type="text" access="field" column="libelle" node="libelle"/>
+ <property name="id" type="int" access="field" column="id" node="id"/>
+ <property name="professionOrder" type="int" access="field" column="professionOrder" node="professionOrder"/>
+ <many-to-one name="activityMonth" class="fr.ifremer.suiviobsmer.entity.ActivityMonthImpl" column="activityMonth" node="activityMonth/@topiaId" embed-xml="false"/>
+ <bag name="activityZone" inverse="true" order-by="zoneId" lazy="true" cascade="all,delete-orphan" node="activityZone" embed-xml="false">
+ <key column="activityProfession"/>
+ <one-to-many class="fr.ifremer.suiviobsmer.entity.ActivityZoneImpl" node="topiaId" embed-xml="false"/>
+ </bag>
+ </class>
+</hibernate-mapping>
Added: trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ActivityZoneImpl.hbm.xml
===================================================================
--- trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ActivityZoneImpl.hbm.xml (rev 0)
+++ trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ActivityZoneImpl.hbm.xml 2010-01-31 22:44:44 UTC (rev 299)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.suiviobsmer.entity">
+ <class name="fr.ifremer.suiviobsmer.entity.ActivityZoneImpl" table="activityZone" node="fr.ifremer.suiviobsmer.entity.ActivityZoneImpl" abstract="false" proxy="fr.ifremer.suiviobsmer.entity.ActivityZone" >
+ <id name="topiaId" type="string" length="255" node="@topiaId"/>
+ <version name="topiaVersion" type="long" node="@topiaVersion"/>
+ <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/>
+ <property name="zoneCode" type="text" access="field" column="zoneCode" node="zoneCode"/>
+ <property name="zoneLibelle" type="text" access="field" column="zoneLibelle" node="zoneLibelle"/>
+ <property name="zoneId" type="int" access="field" column="zoneId" node="zoneId"/>
+ <property name="gradiantCode" type="int" access="field" column="gradiantCode" node="gradiantCode"/>
+ <property name="gradiantLibelle" type="text" access="field" column="gradiantLibelle" node="gradiantLibelle"/>
+ <many-to-one name="activityProfession" class="fr.ifremer.suiviobsmer.entity.ActivityProfessionImpl" column="activityProfession" node="activityProfession/@topiaId" embed-xml="false"/>
+ </class>
+</hibernate-mapping>
Added: trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/BoatImpl.hbm.xml
===================================================================
--- trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/BoatImpl.hbm.xml (rev 0)
+++ trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/BoatImpl.hbm.xml 2010-01-31 22:44:44 UTC (rev 299)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.suiviobsmer.entity">
+ <class name="fr.ifremer.suiviobsmer.entity.BoatImpl" table="boat" node="fr.ifremer.suiviobsmer.entity.BoatImpl" abstract="false" proxy="fr.ifremer.suiviobsmer.entity.Boat" >
+ <id name="topiaId" type="string" length="255" node="@topiaId"/>
+ <version name="topiaVersion" type="long" node="@topiaVersion"/>
+ <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/>
+ <property name="immatriculation" type="int" access="field" column="immatriculation" node="immatriculation" index="boat_immatriculation_idx" unique="true"/>
+ <property name="name" type="text" access="field" column="name" node="name"/>
+ <property name="districtCode" type="text" access="field" column="districtCode" node="districtCode"/>
+ <property name="boatLength" type="int" access="field" column="boatLength" node="boatLength"/>
+ <property name="buildYear" type="int" access="field" column="buildYear" node="buildYear"/>
+ <property name="active" type="boolean" access="field" column="active" node="active"/>
+ <many-to-one name="shipOwner" class="fr.ifremer.suiviobsmer.entity.ShipOwnerImpl" column="shipOwner" lazy="false" node="shipOwner/@topiaId" embed-xml="false"/>
+ <bag name="companyBoatInfos" inverse="true" lazy="true" cascade="all,delete-orphan" node="companyBoatInfos" embed-xml="false">
+ <key column="boat"/>
+ <one-to-many class="fr.ifremer.suiviobsmer.entity.BoatInfosImpl" node="topiaId" embed-xml="false"/>
+ </bag>
+ <bag name="activityCalendar" inverse="true" lazy="true" cascade="all,delete-orphan" node="activityCalendar" embed-xml="false">
+ <key column="boat"/>
+ <one-to-many class="fr.ifremer.suiviobsmer.entity.ActivityCalendarImpl" node="topiaId" embed-xml="false"/>
+ </bag>
+ <bag name="elligibleBoat" inverse="true" order-by="companyActive" lazy="true" node="elligibleBoat" embed-xml="false">
+ <key column="boat"/>
+ <one-to-many class="fr.ifremer.suiviobsmer.entity.ElligibleBoatImpl" node="topiaId" embed-xml="false"/>
+ </bag>
+ </class>
+</hibernate-mapping>
Added: trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/BoatInfosImpl.hbm.xml
===================================================================
--- trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/BoatInfosImpl.hbm.xml (rev 0)
+++ trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/BoatInfosImpl.hbm.xml 2010-01-31 22:44:44 UTC (rev 299)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.suiviobsmer.entity">
+ <class name="fr.ifremer.suiviobsmer.entity.BoatInfosImpl" table="boatInfos" node="fr.ifremer.suiviobsmer.entity.BoatInfosImpl" abstract="false" proxy="fr.ifremer.suiviobsmer.entity.BoatInfos" >
+ <id name="topiaId" type="string" length="255" node="@topiaId"/>
+ <version name="topiaVersion" type="long" node="@topiaVersion"/>
+ <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/>
+ <property name="contactFirstName" type="text" access="field" column="contactFirstName" node="contactFirstName"/>
+ <property name="contactLastName" type="text" access="field" column="contactLastName" node="contactLastName"/>
+ <property name="contactEmail" type="text" access="field" column="contactEmail" node="contactEmail"/>
+ <property name="contactPhoneNumber" type="text" access="field" column="contactPhoneNumber" node="contactPhoneNumber"/>
+ <property name="dup" type="java.lang.Integer" access="field" column="dup" node="dup"/>
+ <property name="comment" type="text" access="field" column="comment" node="comment"/>
+ <many-to-one name="company" class="fr.ifremer.suiviobsmer.entity.CompanyImpl" column="company" node="company/@topiaId" embed-xml="false" />
+ <many-to-one name="boat" class="fr.ifremer.suiviobsmer.entity.BoatImpl" column="boat" node="boat/@topiaId" embed-xml="false" />
+ </class>
+</hibernate-mapping>
Added: trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/CompanyImpl.hbm.xml
===================================================================
--- trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/CompanyImpl.hbm.xml (rev 0)
+++ trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/CompanyImpl.hbm.xml 2010-01-31 22:44:44 UTC (rev 299)
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.suiviobsmer.entity">
+ <class name="fr.ifremer.suiviobsmer.entity.CompanyImpl" table="company" node="fr.ifremer.suiviobsmer.entity.CompanyImpl" abstract="false" proxy="fr.ifremer.suiviobsmer.entity.Company" >
+ <id name="topiaId" type="string" length="255" node="@topiaId"/>
+ <version name="topiaVersion" type="long" node="@topiaVersion"/>
+ <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/>
+ <property name="name" type="text" access="field" column="name" node="name"/>
+ <property name="phoneNumber" type="text" access="field" column="phoneNumber" node="phoneNumber"/>
+ <property name="address1" type="text" access="field" column="address1" node="address1"/>
+ <property name="address2" type="text" access="field" column="address2" node="address2"/>
+ <property name="active" type="boolean" access="field" column="active" node="active"/>
+ <property name="email" type="text" access="field" column="email" node="email"/>
+ <property name="city" type="text" access="field" column="city" node="city"/>
+ <property name="postalCode" type="int" access="field" column="postalCode" node="postalCode"/>
+ <bag name="waoUser" inverse="true" lazy="false" cascade="all,delete-orphan" node="waoUser" embed-xml="false">
+ <key column="company"/>
+ <one-to-many class="fr.ifremer.suiviobsmer.entity.WaoUserImpl" node="topiaId" embed-xml="false"/>
+ </bag>
+ <bag name="boatBoatInfos" inverse="true" lazy="true" cascade="all,delete-orphan" node="boatBoatInfos" embed-xml="false">
+ <key column="company"/>
+ <one-to-many class="fr.ifremer.suiviobsmer.entity.BoatInfosImpl" node="topiaId" embed-xml="false"/>
+ </bag>
+ </class>
+</hibernate-mapping>
Added: trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ContactImpl.hbm.xml
===================================================================
--- trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ContactImpl.hbm.xml (rev 0)
+++ trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ContactImpl.hbm.xml 2010-01-31 22:44:44 UTC (rev 299)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.suiviobsmer.entity">
+ <class name="fr.ifremer.suiviobsmer.entity.ContactImpl" table="contact" node="fr.ifremer.suiviobsmer.entity.ContactImpl" abstract="false" proxy="fr.ifremer.suiviobsmer.entity.Contact" >
+ <id name="topiaId" type="string" length="255" node="@topiaId"/>
+ <version name="topiaVersion" type="long" node="@topiaVersion"/>
+ <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/>
+ <property name="tideBeginDate" type="java.util.Date" access="field" column="tideBeginDate" node="tideBeginDate"/>
+ <property name="tideEndDate" type="java.util.Date" access="field" column="tideEndDate" node="tideEndDate"/>
+ <property name="nbObservants" type="int" access="field" column="nbObservants" node="nbObservants"/>
+ <property name="mammalsObservation" type="boolean" access="field" column="mammalsObservation" node="mammalsObservation"/>
+ <property name="mammalsCapture" type="boolean" access="field" column="mammalsCapture" node="mammalsCapture"/>
+ <property name="validationProgram" type="java.lang.Boolean" access="field" column="validationProgram" node="validationProgram"/>
+ <property name="validationCompany" type="java.lang.Boolean" access="field" column="validationCompany" node="validationCompany"/>
+ <property name="dataInputDate" type="java.util.Date" access="field" column="dataInputDate" node="dataInputDate"/>
+ <property name="comment" type="text" access="field" column="comment" node="comment"/>
+ <property name="state" type="text" access="field" column="state" node="state"/>
+ <property name="tideNbDays" type="int" access="field" column="tideNbDays" node="tideNbDays"/>
+ <many-to-one name="observer" class="fr.ifremer.suiviobsmer.entity.WaoUserImpl" column="observer" node="observer/@topiaId" embed-xml="false"/>
+ <many-to-one name="sampleRow" class="fr.ifremer.suiviobsmer.entity.SampleRowImpl" column="sampleRow" lazy="false" node="sampleRow/@topiaId" embed-xml="false"/>
+ <many-to-one name="boat" class="fr.ifremer.suiviobsmer.entity.BoatImpl" column="boat" lazy="false" node="boat/@topiaId" embed-xml="false"/>
+ </class>
+</hibernate-mapping>
Added: trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ElligibleBoatImpl.hbm.xml
===================================================================
--- trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ElligibleBoatImpl.hbm.xml (rev 0)
+++ trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ElligibleBoatImpl.hbm.xml 2010-01-31 22:44:44 UTC (rev 299)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.suiviobsmer.entity">
+ <class name="fr.ifremer.suiviobsmer.entity.ElligibleBoatImpl" table="elligibleBoat" node="fr.ifremer.suiviobsmer.entity.ElligibleBoatImpl" abstract="false" proxy="fr.ifremer.suiviobsmer.entity.ElligibleBoat" >
+ <id name="topiaId" type="string" length="255" node="@topiaId"/>
+ <version name="topiaVersion" type="long" node="@topiaVersion"/>
+ <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/>
+ <property name="globalActive" type="boolean" access="field" column="globalActive" node="globalActive"/>
+ <property name="companyActive" type="java.lang.Boolean" access="field" column="companyActive" node="companyActive"/>
+ <many-to-one name="boat" class="fr.ifremer.suiviobsmer.entity.BoatImpl" column="boat" lazy="false" node="boat/@topiaId" embed-xml="false"/>
+ <many-to-one name="sampleRow" class="fr.ifremer.suiviobsmer.entity.SampleRowImpl" column="sampleRow" node="sampleRow/@topiaId" embed-xml="false"/>
+ </class>
+</hibernate-mapping>
Added: trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/FishingZoneImpl.hbm.xml
===================================================================
--- trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/FishingZoneImpl.hbm.xml (rev 0)
+++ trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/FishingZoneImpl.hbm.xml 2010-01-31 22:44:44 UTC (rev 299)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.suiviobsmer.entity">
+ <class name="fr.ifremer.suiviobsmer.entity.FishingZoneImpl" table="fishingZone" node="fr.ifremer.suiviobsmer.entity.FishingZoneImpl" abstract="false" proxy="fr.ifremer.suiviobsmer.entity.FishingZone" >
+ <id name="topiaId" type="string" length="255" node="@topiaId"/>
+ <version name="topiaVersion" type="long" node="@topiaVersion"/>
+ <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/>
+ <property name="sectorName" type="text" access="field" column="sectorName" node="sectorName"/>
+ <property name="facadeName" type="text" access="field" column="facadeName" node="facadeName"/>
+ <property name="districtCode" type="text" access="field" column="districtCode" node="districtCode"/>
+ <bag name="sampleRow" table="fishingzone_samplerow" lazy="true" node="sampleRow" embed-xml="true">
+ <key column="fishingZone"/>
+ <many-to-many class="fr.ifremer.suiviobsmer.entity.SampleRowImpl" column="sampleRow" order-by="code" node="topiaId"/>
+ </bag>
+ </class>
+</hibernate-mapping>
Added: trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/NewsImpl.hbm.xml
===================================================================
--- trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/NewsImpl.hbm.xml (rev 0)
+++ trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/NewsImpl.hbm.xml 2010-01-31 22:44:44 UTC (rev 299)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.suiviobsmer.entity">
+ <class name="fr.ifremer.suiviobsmer.entity.NewsImpl" table="news" node="fr.ifremer.suiviobsmer.entity.NewsImpl" abstract="false" proxy="fr.ifremer.suiviobsmer.entity.News" >
+ <id name="topiaId" type="string" length="255" node="@topiaId"/>
+ <version name="topiaVersion" type="long" node="@topiaVersion"/>
+ <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/>
+ <property name="title" type="text" access="field" column="title" node="title"/>
+ <property name="content" type="text" access="field" column="content" node="content"/>
+ </class>
+</hibernate-mapping>
Added: trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ProfessionImpl.hbm.xml
===================================================================
--- trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ProfessionImpl.hbm.xml (rev 0)
+++ trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ProfessionImpl.hbm.xml 2010-01-31 22:44:44 UTC (rev 299)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.suiviobsmer.entity">
+ <class name="fr.ifremer.suiviobsmer.entity.ProfessionImpl" table="profession" node="fr.ifremer.suiviobsmer.entity.ProfessionImpl" abstract="false" proxy="fr.ifremer.suiviobsmer.entity.Profession" >
+ <id name="topiaId" type="string" length="255" node="@topiaId"/>
+ <version name="topiaVersion" type="long" node="@topiaVersion"/>
+ <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/>
+ <property name="codeDCF5" type="text" access="field" column="codeDCF5" node="codeDCF5"/>
+ <property name="meshSize" type="text" access="field" column="meshSize" node="meshSize"/>
+ <property name="size" type="text" access="field" column="size" node="size"/>
+ <property name="other" type="text" access="field" column="other" node="other"/>
+ <property name="libelle" type="text" access="field" column="libelle" node="libelle"/>
+ <property name="species" type="text" access="field" column="species" node="species"/>
+ </class>
+</hibernate-mapping>
Added: trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/SampleMonthImpl.hbm.xml
===================================================================
--- trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/SampleMonthImpl.hbm.xml (rev 0)
+++ trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/SampleMonthImpl.hbm.xml 2010-01-31 22:44:44 UTC (rev 299)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.suiviobsmer.entity">
+ <class name="fr.ifremer.suiviobsmer.entity.SampleMonthImpl" table="sampleMonth" node="fr.ifremer.suiviobsmer.entity.SampleMonthImpl" abstract="false" proxy="fr.ifremer.suiviobsmer.entity.SampleMonth" >
+ <id name="topiaId" type="string" length="255" node="@topiaId"/>
+ <version name="topiaVersion" type="long" node="@topiaVersion"/>
+ <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/>
+ <property name="realTidesValue" type="int" access="field" column="realTidesValue" node="realTidesValue"/>
+ <property name="expectedTidesValue" type="int" access="field" column="expectedTidesValue" node="expectedTidesValue"/>
+ <property name="periodDate" type="java.util.Date" access="field" column="periodDate" node="periodDate"/>
+ <many-to-one name="sampleRow" class="fr.ifremer.suiviobsmer.entity.SampleRowImpl" column="sampleRow" node="sampleRow/@topiaId" embed-xml="false"/>
+ </class>
+</hibernate-mapping>
Added: trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/SampleRowImpl.hbm.xml
===================================================================
--- trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/SampleRowImpl.hbm.xml (rev 0)
+++ trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/SampleRowImpl.hbm.xml 2010-01-31 22:44:44 UTC (rev 299)
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.suiviobsmer.entity">
+ <class name="fr.ifremer.suiviobsmer.entity.SampleRowImpl" table="sampleRow" node="fr.ifremer.suiviobsmer.entity.SampleRowImpl" abstract="false" proxy="fr.ifremer.suiviobsmer.entity.SampleRow" >
+ <id name="topiaId" type="string" length="255" node="@topiaId"/>
+ <version name="topiaVersion" type="long" node="@topiaVersion"/>
+ <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/>
+ <property name="nbObservants" type="int" access="field" column="nbObservants" node="nbObservants"/>
+ <property name="averageTideTime" type="double" access="field" column="averageTideTime" node="averageTideTime"/>
+ <property name="code" type="text" access="field" column="code" node="code" index="sampleRow_code_idx" unique="true"/>
+ <property name="fishingZonesInfos" type="text" access="field" column="fishingZonesInfos" node="fishingZonesInfos"/>
+ <property name="comment" type="text" access="field" column="comment" node="comment"/>
+ <property name="programName" type="text" access="field" column="programName" node="programName"/>
+ <property name="periodBegin" type="java.util.Date" access="field" column="periodBegin" node="periodBegin"/>
+ <property name="periodEnd" type="java.util.Date" access="field" column="periodEnd" node="periodEnd"/>
+ <many-to-one name="profession" class="fr.ifremer.suiviobsmer.entity.ProfessionImpl" column="profession" lazy="false" node="profession/@topiaId" embed-xml="false"/>
+ <bag name="sampleMonth" inverse="true" order-by="periodDate" lazy="false" cascade="all,delete-orphan" node="sampleMonth" embed-xml="false">
+ <key column="sampleRow"/>
+ <one-to-many class="fr.ifremer.suiviobsmer.entity.SampleMonthImpl" node="topiaId" embed-xml="false"/>
+ </bag>
+ <many-to-one name="company" class="fr.ifremer.suiviobsmer.entity.CompanyImpl" column="company" lazy="false" node="company/@topiaId" embed-xml="false"/>
+ <bag name="sampleRowLog" inverse="true" order-by="topiaCreateDate desc" lazy="false" cascade="all,delete-orphan" node="sampleRowLog" embed-xml="false">
+ <key column="sampleRow"/>
+ <one-to-many class="fr.ifremer.suiviobsmer.entity.SampleRowLogImpl" node="topiaId" embed-xml="false"/>
+ </bag>
+ <bag name="elligibleBoat" inverse="true" order-by="companyActive" lazy="false" cascade="all,delete-orphan" node="elligibleBoat" embed-xml="false">
+ <key column="sampleRow"/>
+ <one-to-many class="fr.ifremer.suiviobsmer.entity.ElligibleBoatImpl" node="topiaId" embed-xml="false"/>
+ </bag>
+ <bag name="fishingZone" table="fishingzone_samplerow" inverse="true" lazy="false" node="fishingZone" embed-xml="true">
+ <key column="sampleRow"/>
+ <many-to-many class="fr.ifremer.suiviobsmer.entity.FishingZoneImpl" column="fishingZone" order-by="facadeName,sectorName,districtCode" node="topiaId"/>
+ </bag>
+ <bag name="contact" inverse="true" lazy="true" node="contact" embed-xml="false">
+ <key column="sampleRow"/>
+ <one-to-many class="fr.ifremer.suiviobsmer.entity.ContactImpl" node="topiaId" embed-xml="false"/>
+ </bag>
+ </class>
+</hibernate-mapping>
Added: trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/SampleRowLogImpl.hbm.xml
===================================================================
--- trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/SampleRowLogImpl.hbm.xml (rev 0)
+++ trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/SampleRowLogImpl.hbm.xml 2010-01-31 22:44:44 UTC (rev 299)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.suiviobsmer.entity">
+ <class name="fr.ifremer.suiviobsmer.entity.SampleRowLogImpl" table="sampleRowLog" node="fr.ifremer.suiviobsmer.entity.SampleRowLogImpl" abstract="false" proxy="fr.ifremer.suiviobsmer.entity.SampleRowLog" >
+ <id name="topiaId" type="string" length="255" node="@topiaId"/>
+ <version name="topiaVersion" type="long" node="@topiaVersion"/>
+ <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/>
+ <property name="logText" type="text" access="field" column="logText" node="logText"/>
+ <property name="comment" type="text" access="field" column="comment" node="comment"/>
+ <many-to-one name="sampleRow" class="fr.ifremer.suiviobsmer.entity.SampleRowImpl" column="sampleRow" node="sampleRow/@topiaId" embed-xml="false"/>
+ <many-to-one name="admin" class="fr.ifremer.suiviobsmer.entity.WaoUserImpl" column="admin" lazy="false" node="admin/@topiaId" embed-xml="false"/>
+ </class>
+</hibernate-mapping>
Added: trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ShipOwnerImpl.hbm.xml
===================================================================
--- trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ShipOwnerImpl.hbm.xml (rev 0)
+++ trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ShipOwnerImpl.hbm.xml 2010-01-31 22:44:44 UTC (rev 299)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.suiviobsmer.entity">
+ <class name="fr.ifremer.suiviobsmer.entity.ShipOwnerImpl" table="shipOwner" node="fr.ifremer.suiviobsmer.entity.ShipOwnerImpl" abstract="false" proxy="fr.ifremer.suiviobsmer.entity.ShipOwner" >
+ <id name="topiaId" type="string" length="255" node="@topiaId"/>
+ <version name="topiaVersion" type="long" node="@topiaVersion"/>
+ <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/>
+ <property name="code" type="text" access="field" column="code" node="code" index="shipOwner_code_idx" unique="true"/>
+ <property name="firstName" type="text" access="field" column="firstName" node="firstName"/>
+ <property name="lastName" type="text" access="field" column="lastName" node="lastName"/>
+ </class>
+</hibernate-mapping>
Added: trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/WaoUserImpl.hbm.xml
===================================================================
--- trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/WaoUserImpl.hbm.xml (rev 0)
+++ trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/WaoUserImpl.hbm.xml 2010-01-31 22:44:44 UTC (rev 299)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.suiviobsmer.entity">
+ <class name="fr.ifremer.suiviobsmer.entity.WaoUserImpl" table="waoUser" node="fr.ifremer.suiviobsmer.entity.WaoUserImpl" abstract="false" proxy="fr.ifremer.suiviobsmer.entity.WaoUser" >
+ <id name="topiaId" type="string" length="255" node="@topiaId"/>
+ <version name="topiaVersion" type="long" node="@topiaVersion"/>
+ <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/>
+ <property name="firstName" type="text" access="field" column="firstName" node="firstName"/>
+ <property name="lastName" type="text" access="field" column="lastName" node="lastName"/>
+ <property name="phoneNumber" type="text" access="field" column="phoneNumber" node="phoneNumber"/>
+ <property name="login" type="text" access="field" column="login" node="login"/>
+ <property name="password" type="text" access="field" column="password" node="password"/>
+ <property name="active" type="boolean" access="field" column="active" node="active"/>
+ <property name="admin" type="boolean" access="field" column="admin" node="admin"/>
+ <many-to-one name="company" class="fr.ifremer.suiviobsmer.entity.CompanyImpl" column="company" node="company/@topiaId" embed-xml="false"/>
+ <bag name="contact" inverse="true" lazy="true" node="contact" embed-xml="false">
+ <key column="observer"/>
+ <one-to-many class="fr.ifremer.suiviobsmer.entity.ContactImpl" node="topiaId" embed-xml="false"/>
+ </bag>
+ </class>
+</hibernate-mapping>
Added: trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityCalendarImpl.hbm.xml
===================================================================
--- trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityCalendarImpl.hbm.xml (rev 0)
+++ trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityCalendarImpl.hbm.xml 2010-01-31 22:44:44 UTC (rev 299)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.suiviobsmer.entity">
+ <class name="fr.ifremer.suiviobsmer.entity.ActivityCalendarImpl" table="activityCalendar" node="fr.ifremer.suiviobsmer.entity.ActivityCalendarImpl" abstract="false" proxy="fr.ifremer.suiviobsmer.entity.ActivityCalendar" >
+ <id name="topiaId" type="string" length="255" node="@topiaId"/>
+ <version name="topiaVersion" type="long" node="@topiaVersion"/>
+ <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/>
+ <property name="year" type="int" access="field" column="year" node="year"/>
+ <property name="fiability" type="int" access="field" column="fiability" node="fiability"/>
+ <bag name="activityMonth" inverse="true" order-by="month" lazy="true" cascade="all,delete-orphan" node="activityMonth" embed-xml="false">
+ <key column="activityCalendar"/>
+ <one-to-many class="fr.ifremer.suiviobsmer.entity.ActivityMonthImpl" node="topiaId" embed-xml="false"/>
+ </bag>
+ <many-to-one name="boat" class="fr.ifremer.suiviobsmer.entity.BoatImpl" column="boat" node="boat/@topiaId" embed-xml="false"/>
+ </class>
+</hibernate-mapping>
Added: trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityMonthImpl.hbm.xml
===================================================================
--- trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityMonthImpl.hbm.xml (rev 0)
+++ trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityMonthImpl.hbm.xml 2010-01-31 22:44:44 UTC (rev 299)
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.suiviobsmer.entity">
+ <class name="fr.ifremer.suiviobsmer.entity.ActivityMonthImpl" table="activityMonth" node="fr.ifremer.suiviobsmer.entity.ActivityMonthImpl" abstract="false" proxy="fr.ifremer.suiviobsmer.entity.ActivityMonth" >
+ <id name="topiaId" type="string" length="255" node="@topiaId"/>
+ <version name="topiaVersion" type="long" node="@topiaVersion"/>
+ <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/>
+ <property name="harbourLibelle" type="text" access="field" column="harbourLibelle" node="harbourLibelle"/>
+ <property name="active" type="boolean" access="field" column="active" node="active"/>
+ <property name="nbBoardingPersons" type="java.lang.Integer" access="field" column="nbBoardingPersons" node="nbBoardingPersons"/>
+ <property name="nbSeaDays" type="java.lang.Integer" access="field" column="nbSeaDays" node="nbSeaDays"/>
+ <property name="nbFishingDays" type="java.lang.Integer" access="field" column="nbFishingDays" node="nbFishingDays"/>
+ <property name="month" type="int" access="field" column="month" node="month"/>
+ <property name="harbourCode" type="text" access="field" column="harbourCode" node="harbourCode"/>
+ <property name="harbourId" type="int" access="field" column="harbourId" node="harbourId"/>
+ <bag name="activityProfession" inverse="true" order-by="professionOrder" lazy="true" cascade="all,delete-orphan" node="activityProfession" embed-xml="false">
+ <key column="activityMonth"/>
+ <one-to-many class="fr.ifremer.suiviobsmer.entity.ActivityProfessionImpl" node="topiaId" embed-xml="false"/>
+ </bag>
+ <many-to-one name="activityCalendar" class="fr.ifremer.suiviobsmer.entity.ActivityCalendarImpl" column="activityCalendar" node="activityCalendar/@topiaId" embed-xml="false"/>
+ </class>
+</hibernate-mapping>
Added: trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityProfessionImpl.hbm.xml
===================================================================
--- trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityProfessionImpl.hbm.xml (rev 0)
+++ trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityProfessionImpl.hbm.xml 2010-01-31 22:44:44 UTC (rev 299)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.suiviobsmer.entity">
+ <class name="fr.ifremer.suiviobsmer.entity.ActivityProfessionImpl" table="activityProfession" node="fr.ifremer.suiviobsmer.entity.ActivityProfessionImpl" abstract="false" proxy="fr.ifremer.suiviobsmer.entity.ActivityProfession" >
+ <id name="topiaId" type="string" length="255" node="@topiaId"/>
+ <version name="topiaVersion" type="long" node="@topiaVersion"/>
+ <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/>
+ <property name="code" type="text" access="field" column="code" node="code"/>
+ <property name="libelle" type="text" access="field" column="libelle" node="libelle"/>
+ <property name="id" type="int" access="field" column="id" node="id"/>
+ <property name="professionOrder" type="int" access="field" column="professionOrder" node="professionOrder"/>
+ <many-to-one name="activityMonth" class="fr.ifremer.suiviobsmer.entity.ActivityMonthImpl" column="activityMonth" node="activityMonth/@topiaId" embed-xml="false"/>
+ <bag name="activityZone" inverse="true" order-by="zoneId" lazy="true" cascade="all,delete-orphan" node="activityZone" embed-xml="false">
+ <key column="activityProfession"/>
+ <one-to-many class="fr.ifremer.suiviobsmer.entity.ActivityZoneImpl" node="topiaId" embed-xml="false"/>
+ </bag>
+ </class>
+</hibernate-mapping>
Added: trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityZoneImpl.hbm.xml
===================================================================
--- trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityZoneImpl.hbm.xml (rev 0)
+++ trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityZoneImpl.hbm.xml 2010-01-31 22:44:44 UTC (rev 299)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.suiviobsmer.entity">
+ <class name="fr.ifremer.suiviobsmer.entity.ActivityZoneImpl" table="activityZone" node="fr.ifremer.suiviobsmer.entity.ActivityZoneImpl" abstract="false" proxy="fr.ifremer.suiviobsmer.entity.ActivityZone" >
+ <id name="topiaId" type="string" length="255" node="@topiaId"/>
+ <version name="topiaVersion" type="long" node="@topiaVersion"/>
+ <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/>
+ <property name="zoneCode" type="text" access="field" column="zoneCode" node="zoneCode"/>
+ <property name="zoneLibelle" type="text" access="field" column="zoneLibelle" node="zoneLibelle"/>
+ <property name="zoneId" type="int" access="field" column="zoneId" node="zoneId"/>
+ <property name="gradiantCode" type="int" access="field" column="gradiantCode" node="gradiantCode"/>
+ <property name="gradiantLibelle" type="text" access="field" column="gradiantLibelle" node="gradiantLibelle"/>
+ <many-to-one name="activityProfession" class="fr.ifremer.suiviobsmer.entity.ActivityProfessionImpl" column="activityProfession" node="activityProfession/@topiaId" embed-xml="false"/>
+ </class>
+</hibernate-mapping>
Added: trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/BoatImpl.hbm.xml
===================================================================
--- trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/BoatImpl.hbm.xml (rev 0)
+++ trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/BoatImpl.hbm.xml 2010-01-31 22:44:44 UTC (rev 299)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.suiviobsmer.entity">
+ <class name="fr.ifremer.suiviobsmer.entity.BoatImpl" table="boat" node="fr.ifremer.suiviobsmer.entity.BoatImpl" abstract="false" proxy="fr.ifremer.suiviobsmer.entity.Boat" >
+ <id name="topiaId" type="string" length="255" node="@topiaId"/>
+ <version name="topiaVersion" type="long" node="@topiaVersion"/>
+ <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/>
+ <property name="immatriculation" type="int" access="field" column="immatriculation" node="immatriculation" index="boat_immatriculation_idx" unique="true"/>
+ <property name="name" type="text" access="field" column="name" node="name"/>
+ <property name="districtCode" type="text" access="field" column="districtCode" node="districtCode"/>
+ <property name="boatLength" type="int" access="field" column="boatLength" node="boatLength"/>
+ <property name="buildYear" type="int" access="field" column="buildYear" node="buildYear"/>
+ <property name="active" type="boolean" access="field" column="active" node="active"/>
+ <many-to-one name="shipOwner" class="fr.ifremer.suiviobsmer.entity.ShipOwnerImpl" column="shipOwner" lazy="false" node="shipOwner/@topiaId" embed-xml="false"/>
+ <bag name="companyBoatInfos" inverse="true" lazy="true" cascade="all,delete-orphan" node="companyBoatInfos" embed-xml="false">
+ <key column="boat"/>
+ <one-to-many class="fr.ifremer.suiviobsmer.entity.BoatInfosImpl" node="topiaId" embed-xml="false"/>
+ </bag>
+ <bag name="activityCalendar" inverse="true" lazy="true" cascade="all,delete-orphan" node="activityCalendar" embed-xml="false">
+ <key column="boat"/>
+ <one-to-many class="fr.ifremer.suiviobsmer.entity.ActivityCalendarImpl" node="topiaId" embed-xml="false"/>
+ </bag>
+ <bag name="elligibleBoat" inverse="true" order-by="companyActive" lazy="true" node="elligibleBoat" embed-xml="false">
+ <key column="boat"/>
+ <one-to-many class="fr.ifremer.suiviobsmer.entity.ElligibleBoatImpl" node="topiaId" embed-xml="false"/>
+ </bag>
+ </class>
+</hibernate-mapping>
Added: trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/BoatInfosImpl.hbm.xml
===================================================================
--- trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/BoatInfosImpl.hbm.xml (rev 0)
+++ trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/BoatInfosImpl.hbm.xml 2010-01-31 22:44:44 UTC (rev 299)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.suiviobsmer.entity">
+ <class name="fr.ifremer.suiviobsmer.entity.BoatInfosImpl" table="boatInfos" node="fr.ifremer.suiviobsmer.entity.BoatInfosImpl" abstract="false" proxy="fr.ifremer.suiviobsmer.entity.BoatInfos" >
+ <id name="topiaId" type="string" length="255" node="@topiaId"/>
+ <version name="topiaVersion" type="long" node="@topiaVersion"/>
+ <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/>
+ <property name="contactFirstName" type="text" access="field" column="contactFirstName" node="contactFirstName"/>
+ <property name="contactLastName" type="text" access="field" column="contactLastName" node="contactLastName"/>
+ <property name="contactEmail" type="text" access="field" column="contactEmail" node="contactEmail"/>
+ <property name="contactPhoneNumber" type="text" access="field" column="contactPhoneNumber" node="contactPhoneNumber"/>
+ <property name="dup" type="java.lang.Integer" access="field" column="dup" node="dup"/>
+ <property name="comment" type="text" access="field" column="comment" node="comment"/>
+ <many-to-one name="company" class="fr.ifremer.suiviobsmer.entity.CompanyImpl" column="company" node="company/@topiaId" embed-xml="false" />
+ <many-to-one name="boat" class="fr.ifremer.suiviobsmer.entity.BoatImpl" column="boat" node="boat/@topiaId" embed-xml="false" />
+ </class>
+</hibernate-mapping>
Added: trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/CompanyImpl.hbm.xml
===================================================================
--- trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/CompanyImpl.hbm.xml (rev 0)
+++ trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/CompanyImpl.hbm.xml 2010-01-31 22:44:44 UTC (rev 299)
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.suiviobsmer.entity">
+ <class name="fr.ifremer.suiviobsmer.entity.CompanyImpl" table="company" node="fr.ifremer.suiviobsmer.entity.CompanyImpl" abstract="false" proxy="fr.ifremer.suiviobsmer.entity.Company" >
+ <id name="topiaId" type="string" length="255" node="@topiaId"/>
+ <version name="topiaVersion" type="long" node="@topiaVersion"/>
+ <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/>
+ <property name="name" type="text" access="field" column="name" node="name"/>
+ <property name="phoneNumber" type="text" access="field" column="phoneNumber" node="phoneNumber"/>
+ <property name="address1" type="text" access="field" column="address1" node="address1"/>
+ <property name="address2" type="text" access="field" column="address2" node="address2"/>
+ <property name="active" type="boolean" access="field" column="active" node="active"/>
+ <property name="email" type="text" access="field" column="email" node="email"/>
+ <property name="city" type="text" access="field" column="city" node="city"/>
+ <property name="postalCode" type="int" access="field" column="postalCode" node="postalCode"/>
+ <bag name="waoUser" inverse="true" lazy="false" cascade="all,delete-orphan" node="waoUser" embed-xml="false">
+ <key column="company"/>
+ <one-to-many class="fr.ifremer.suiviobsmer.entity.WaoUserImpl" node="topiaId" embed-xml="false"/>
+ </bag>
+ <bag name="boatBoatInfos" inverse="true" lazy="true" cascade="all,delete-orphan" node="boatBoatInfos" embed-xml="false">
+ <key column="company"/>
+ <one-to-many class="fr.ifremer.suiviobsmer.entity.BoatInfosImpl" node="topiaId" embed-xml="false"/>
+ </bag>
+ </class>
+</hibernate-mapping>
Added: trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ContactImpl.hbm.xml
===================================================================
--- trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ContactImpl.hbm.xml (rev 0)
+++ trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ContactImpl.hbm.xml 2010-01-31 22:44:44 UTC (rev 299)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.suiviobsmer.entity">
+ <class name="fr.ifremer.suiviobsmer.entity.ContactImpl" table="contact" node="fr.ifremer.suiviobsmer.entity.ContactImpl" abstract="false" proxy="fr.ifremer.suiviobsmer.entity.Contact" >
+ <id name="topiaId" type="string" length="255" node="@topiaId"/>
+ <version name="topiaVersion" type="long" node="@topiaVersion"/>
+ <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/>
+ <property name="tideBeginDate" type="java.util.Date" access="field" column="tideBeginDate" node="tideBeginDate"/>
+ <property name="tideEndDate" type="java.util.Date" access="field" column="tideEndDate" node="tideEndDate"/>
+ <property name="nbObservants" type="int" access="field" column="nbObservants" node="nbObservants"/>
+ <property name="mammalsObservation" type="boolean" access="field" column="mammalsObservation" node="mammalsObservation"/>
+ <property name="mammalsCapture" type="boolean" access="field" column="mammalsCapture" node="mammalsCapture"/>
+ <property name="validationProgram" type="java.lang.Boolean" access="field" column="validationProgram" node="validationProgram"/>
+ <property name="validationCompany" type="java.lang.Boolean" access="field" column="validationCompany" node="validationCompany"/>
+ <property name="dataInputDate" type="java.util.Date" access="field" column="dataInputDate" node="dataInputDate"/>
+ <property name="comment" type="text" access="field" column="comment" node="comment"/>
+ <property name="state" type="text" access="field" column="state" node="state"/>
+ <property name="tideNbDays" type="int" access="field" column="tideNbDays" node="tideNbDays"/>
+ <many-to-one name="observer" class="fr.ifremer.suiviobsmer.entity.WaoUserImpl" column="observer" node="observer/@topiaId" embed-xml="false"/>
+ <many-to-one name="sampleRow" class="fr.ifremer.suiviobsmer.entity.SampleRowImpl" column="sampleRow" lazy="false" node="sampleRow/@topiaId" embed-xml="false"/>
+ <many-to-one name="boat" class="fr.ifremer.suiviobsmer.entity.BoatImpl" column="boat" lazy="false" node="boat/@topiaId" embed-xml="false"/>
+ </class>
+</hibernate-mapping>
Added: trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ElligibleBoatImpl.hbm.xml
===================================================================
--- trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ElligibleBoatImpl.hbm.xml (rev 0)
+++ trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ElligibleBoatImpl.hbm.xml 2010-01-31 22:44:44 UTC (rev 299)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.suiviobsmer.entity">
+ <class name="fr.ifremer.suiviobsmer.entity.ElligibleBoatImpl" table="elligibleBoat" node="fr.ifremer.suiviobsmer.entity.ElligibleBoatImpl" abstract="false" proxy="fr.ifremer.suiviobsmer.entity.ElligibleBoat" >
+ <id name="topiaId" type="string" length="255" node="@topiaId"/>
+ <version name="topiaVersion" type="long" node="@topiaVersion"/>
+ <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/>
+ <property name="globalActive" type="boolean" access="field" column="globalActive" node="globalActive"/>
+ <property name="companyActive" type="java.lang.Boolean" access="field" column="companyActive" node="companyActive"/>
+ <many-to-one name="boat" class="fr.ifremer.suiviobsmer.entity.BoatImpl" column="boat" lazy="false" node="boat/@topiaId" embed-xml="false"/>
+ <many-to-one name="sampleRow" class="fr.ifremer.suiviobsmer.entity.SampleRowImpl" column="sampleRow" node="sampleRow/@topiaId" embed-xml="false"/>
+ </class>
+</hibernate-mapping>
Added: trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/FishingZoneImpl.hbm.xml
===================================================================
--- trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/FishingZoneImpl.hbm.xml (rev 0)
+++ trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/FishingZoneImpl.hbm.xml 2010-01-31 22:44:44 UTC (rev 299)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.suiviobsmer.entity">
+ <class name="fr.ifremer.suiviobsmer.entity.FishingZoneImpl" table="fishingZone" node="fr.ifremer.suiviobsmer.entity.FishingZoneImpl" abstract="false" proxy="fr.ifremer.suiviobsmer.entity.FishingZone" >
+ <id name="topiaId" type="string" length="255" node="@topiaId"/>
+ <version name="topiaVersion" type="long" node="@topiaVersion"/>
+ <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/>
+ <property name="sectorName" type="text" access="field" column="sectorName" node="sectorName"/>
+ <property name="facadeName" type="text" access="field" column="facadeName" node="facadeName"/>
+ <property name="districtCode" type="text" access="field" column="districtCode" node="districtCode"/>
+ <bag name="sampleRow" table="fishingzone_samplerow" lazy="true" node="sampleRow" embed-xml="true">
+ <key column="fishingZone"/>
+ <many-to-many class="fr.ifremer.suiviobsmer.entity.SampleRowImpl" column="sampleRow" order-by="code" node="topiaId"/>
+ </bag>
+ </class>
+</hibernate-mapping>
Added: trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/NewsImpl.hbm.xml
===================================================================
--- trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/NewsImpl.hbm.xml (rev 0)
+++ trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/NewsImpl.hbm.xml 2010-01-31 22:44:44 UTC (rev 299)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.suiviobsmer.entity">
+ <class name="fr.ifremer.suiviobsmer.entity.NewsImpl" table="news" node="fr.ifremer.suiviobsmer.entity.NewsImpl" abstract="false" proxy="fr.ifremer.suiviobsmer.entity.News" >
+ <id name="topiaId" type="string" length="255" node="@topiaId"/>
+ <version name="topiaVersion" type="long" node="@topiaVersion"/>
+ <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/>
+ <property name="title" type="text" access="field" column="title" node="title"/>
+ <property name="content" type="text" access="field" column="content" node="content"/>
+ </class>
+</hibernate-mapping>
Added: trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ProfessionImpl.hbm.xml
===================================================================
--- trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ProfessionImpl.hbm.xml (rev 0)
+++ trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ProfessionImpl.hbm.xml 2010-01-31 22:44:44 UTC (rev 299)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.suiviobsmer.entity">
+ <class name="fr.ifremer.suiviobsmer.entity.ProfessionImpl" table="profession" node="fr.ifremer.suiviobsmer.entity.ProfessionImpl" abstract="false" proxy="fr.ifremer.suiviobsmer.entity.Profession" >
+ <id name="topiaId" type="string" length="255" node="@topiaId"/>
+ <version name="topiaVersion" type="long" node="@topiaVersion"/>
+ <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/>
+ <property name="codeDCF5" type="text" access="field" column="codeDCF5" node="codeDCF5"/>
+ <property name="meshSize" type="text" access="field" column="meshSize" node="meshSize"/>
+ <property name="size" type="text" access="field" column="size" node="size"/>
+ <property name="other" type="text" access="field" column="other" node="other"/>
+ <property name="libelle" type="text" access="field" column="libelle" node="libelle"/>
+ <property name="species" type="text" access="field" column="species" node="species"/>
+ </class>
+</hibernate-mapping>
Added: trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/SampleMonthImpl.hbm.xml
===================================================================
--- trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/SampleMonthImpl.hbm.xml (rev 0)
+++ trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/SampleMonthImpl.hbm.xml 2010-01-31 22:44:44 UTC (rev 299)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.suiviobsmer.entity">
+ <class name="fr.ifremer.suiviobsmer.entity.SampleMonthImpl" table="sampleMonth" node="fr.ifremer.suiviobsmer.entity.SampleMonthImpl" abstract="false" proxy="fr.ifremer.suiviobsmer.entity.SampleMonth" >
+ <id name="topiaId" type="string" length="255" node="@topiaId"/>
+ <version name="topiaVersion" type="long" node="@topiaVersion"/>
+ <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/>
+ <property name="realTidesValue" type="int" access="field" column="realTidesValue" node="realTidesValue"/>
+ <property name="expectedTidesValue" type="int" access="field" column="expectedTidesValue" node="expectedTidesValue"/>
+ <property name="periodDate" type="java.util.Date" access="field" column="periodDate" node="periodDate"/>
+ <many-to-one name="sampleRow" class="fr.ifremer.suiviobsmer.entity.SampleRowImpl" column="sampleRow" node="sampleRow/@topiaId" embed-xml="false"/>
+ </class>
+</hibernate-mapping>
Added: trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/SampleRowImpl.hbm.xml
===================================================================
--- trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/SampleRowImpl.hbm.xml (rev 0)
+++ trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/SampleRowImpl.hbm.xml 2010-01-31 22:44:44 UTC (rev 299)
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.suiviobsmer.entity">
+ <class name="fr.ifremer.suiviobsmer.entity.SampleRowImpl" table="sampleRow" node="fr.ifremer.suiviobsmer.entity.SampleRowImpl" abstract="false" proxy="fr.ifremer.suiviobsmer.entity.SampleRow" >
+ <id name="topiaId" type="string" length="255" node="@topiaId"/>
+ <version name="topiaVersion" type="long" node="@topiaVersion"/>
+ <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/>
+ <property name="nbObservants" type="int" access="field" column="nbObservants" node="nbObservants"/>
+ <property name="averageTideTime" type="double" access="field" column="averageTideTime" node="averageTideTime"/>
+ <property name="code" type="text" access="field" column="code" node="code" index="sampleRow_code_idx" unique="true"/>
+ <property name="fishingZonesInfos" type="text" access="field" column="fishingZonesInfos" node="fishingZonesInfos"/>
+ <property name="comment" type="text" access="field" column="comment" node="comment"/>
+ <property name="programName" type="text" access="field" column="programName" node="programName"/>
+ <property name="periodBegin" type="java.util.Date" access="field" column="periodBegin" node="periodBegin"/>
+ <property name="periodEnd" type="java.util.Date" access="field" column="periodEnd" node="periodEnd"/>
+ <many-to-one name="profession" class="fr.ifremer.suiviobsmer.entity.ProfessionImpl" column="profession" lazy="false" node="profession/@topiaId" embed-xml="false"/>
+ <bag name="sampleMonth" inverse="true" order-by="periodDate" lazy="false" cascade="all,delete-orphan" node="sampleMonth" embed-xml="false">
+ <key column="sampleRow"/>
+ <one-to-many class="fr.ifremer.suiviobsmer.entity.SampleMonthImpl" node="topiaId" embed-xml="false"/>
+ </bag>
+ <many-to-one name="company" class="fr.ifremer.suiviobsmer.entity.CompanyImpl" column="company" lazy="false" node="company/@topiaId" embed-xml="false"/>
+ <bag name="sampleRowLog" inverse="true" order-by="topiaCreateDate desc" lazy="false" cascade="all,delete-orphan" node="sampleRowLog" embed-xml="false">
+ <key column="sampleRow"/>
+ <one-to-many class="fr.ifremer.suiviobsmer.entity.SampleRowLogImpl" node="topiaId" embed-xml="false"/>
+ </bag>
+ <bag name="elligibleBoat" inverse="true" order-by="companyActive" lazy="false" cascade="all,delete-orphan" node="elligibleBoat" embed-xml="false">
+ <key column="sampleRow"/>
+ <one-to-many class="fr.ifremer.suiviobsmer.entity.ElligibleBoatImpl" node="topiaId" embed-xml="false"/>
+ </bag>
+ <bag name="fishingZone" table="fishingzone_samplerow" inverse="true" lazy="false" node="fishingZone" embed-xml="true">
+ <key column="sampleRow"/>
+ <many-to-many class="fr.ifremer.suiviobsmer.entity.FishingZoneImpl" column="fishingZone" order-by="facadeName,sectorName,districtCode" node="topiaId"/>
+ </bag>
+ <bag name="contact" inverse="true" lazy="true" node="contact" embed-xml="false">
+ <key column="sampleRow"/>
+ <one-to-many class="fr.ifremer.suiviobsmer.entity.ContactImpl" node="topiaId" embed-xml="false"/>
+ </bag>
+ </class>
+</hibernate-mapping>
Added: trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/SampleRowLogImpl.hbm.xml
===================================================================
--- trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/SampleRowLogImpl.hbm.xml (rev 0)
+++ trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/SampleRowLogImpl.hbm.xml 2010-01-31 22:44:44 UTC (rev 299)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.suiviobsmer.entity">
+ <class name="fr.ifremer.suiviobsmer.entity.SampleRowLogImpl" table="sampleRowLog" node="fr.ifremer.suiviobsmer.entity.SampleRowLogImpl" abstract="false" proxy="fr.ifremer.suiviobsmer.entity.SampleRowLog" >
+ <id name="topiaId" type="string" length="255" node="@topiaId"/>
+ <version name="topiaVersion" type="long" node="@topiaVersion"/>
+ <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/>
+ <property name="logText" type="text" access="field" column="logText" node="logText"/>
+ <property name="comment" type="text" access="field" column="comment" node="comment"/>
+ <many-to-one name="sampleRow" class="fr.ifremer.suiviobsmer.entity.SampleRowImpl" column="sampleRow" node="sampleRow/@topiaId" embed-xml="false"/>
+ <many-to-one name="admin" class="fr.ifremer.suiviobsmer.entity.WaoUserImpl" column="admin" lazy="false" node="admin/@topiaId" embed-xml="false"/>
+ </class>
+</hibernate-mapping>
Added: trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ShipOwnerImpl.hbm.xml
===================================================================
--- trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ShipOwnerImpl.hbm.xml (rev 0)
+++ trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ShipOwnerImpl.hbm.xml 2010-01-31 22:44:44 UTC (rev 299)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.suiviobsmer.entity">
+ <class name="fr.ifremer.suiviobsmer.entity.ShipOwnerImpl" table="shipOwner" node="fr.ifremer.suiviobsmer.entity.ShipOwnerImpl" abstract="false" proxy="fr.ifremer.suiviobsmer.entity.ShipOwner" >
+ <id name="topiaId" type="string" length="255" node="@topiaId"/>
+ <version name="topiaVersion" type="long" node="@topiaVersion"/>
+ <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/>
+ <property name="code" type="text" access="field" column="code" node="code" index="shipOwner_code_idx" unique="true"/>
+ <property name="firstName" type="text" access="field" column="firstName" node="firstName"/>
+ <property name="lastName" type="text" access="field" column="lastName" node="lastName"/>
+ </class>
+</hibernate-mapping>
Added: trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/WaoUserImpl.hbm.xml
===================================================================
--- trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/WaoUserImpl.hbm.xml (rev 0)
+++ trunk/suiviobsmer-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/WaoUserImpl.hbm.xml 2010-01-31 22:44:44 UTC (rev 299)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.suiviobsmer.entity">
+ <class name="fr.ifremer.suiviobsmer.entity.WaoUserImpl" table="waoUser" node="fr.ifremer.suiviobsmer.entity.WaoUserImpl" abstract="false" proxy="fr.ifremer.suiviobsmer.entity.WaoUser" >
+ <id name="topiaId" type="string" length="255" node="@topiaId"/>
+ <version name="topiaVersion" type="long" node="@topiaVersion"/>
+ <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/>
+ <property name="firstName" type="text" access="field" column="firstName" node="firstName"/>
+ <property name="lastName" type="text" access="field" column="lastName" node="lastName"/>
+ <property name="phoneNumber" type="text" access="field" column="phoneNumber" node="phoneNumber"/>
+ <property name="login" type="text" access="field" column="login" node="login"/>
+ <property name="password" type="text" access="field" column="password" node="password"/>
+ <property name="active" type="boolean" access="field" column="active" node="active"/>
+ <property name="admin" type="boolean" access="field" column="admin" node="admin"/>
+ <many-to-one name="company" class="fr.ifremer.suiviobsmer.entity.CompanyImpl" column="company" node="company/@topiaId" embed-xml="false"/>
+ <bag name="contact" inverse="true" lazy="true" node="contact" embed-xml="false">
+ <key column="observer"/>
+ <one-to-many class="fr.ifremer.suiviobsmer.entity.ContactImpl" node="topiaId" embed-xml="false"/>
+ </bag>
+ </class>
+</hibernate-mapping>
1
0
[Suiviobsmer-commits] r298 - in trunk: . suiviobsmer-business suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer suiviobsmer-business/src/main/xmi suiviobsmer-ui/src/main/resources
by tchemit＠users.labs.libre-entreprise.org 31 Jan '10
by tchemit＠users.labs.libre-entreprise.org 31 Jan '10
31 Jan '10
Author: tchemit
Date: 2010-01-31 22:42:16 +0000 (Sun, 31 Jan 2010)
New Revision: 298
Modified:
trunk/pom.xml
trunk/suiviobsmer-business/pom.xml
trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/SuiviObsmerRunnerImpl.java
trunk/suiviobsmer-business/src/main/xmi/suiviobsmer.zargo
trunk/suiviobsmer-ui/src/main/resources/log4j.properties
Log:
Use topia migration service + pass model version to 0.4
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2010-01-31 21:18:32 UTC (rev 297)
+++ trunk/pom.xml 2010-01-31 22:42:16 UTC (rev 298)
@@ -64,6 +64,11 @@
<version>${topia.version}</version>
</dependency>
<dependency>
+ <groupId>org.nuiton.topia</groupId>
+ <artifactId>topia-service-migration</artifactId>
+ <version>${topia.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.tapestry</groupId>
<artifactId>tapestry-core</artifactId>
<version>${tapestry.version}</version>
Modified: trunk/suiviobsmer-business/pom.xml
===================================================================
--- trunk/suiviobsmer-business/pom.xml 2010-01-31 21:18:32 UTC (rev 297)
+++ trunk/suiviobsmer-business/pom.xml 2010-01-31 22:42:16 UTC (rev 298)
@@ -55,8 +55,13 @@
<groupId>org.nuiton.topia</groupId>
<artifactId>topia-persistence</artifactId>
</dependency>
- <!-- base h2 -->
<dependency>
+ <groupId>org.nuiton.topia</groupId>
+ <artifactId>topia-service-migration</artifactId>
+ </dependency>
+
+ <!-- base h2 -->
+ <dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
</dependency>
@@ -65,7 +70,7 @@
<artifactId>postgresql</artifactId>
</dependency>
- <!-- base postgres -->
+ <!-- base postgres -->
<!--dependency>
<groupId>postgresql</groupId>
<artifactId>postgresql</artifactId>
@@ -104,6 +109,14 @@
<include>SuiviObsmer.properties</include>
</includes>
</resource>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>false</filtering>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ </resource>
+
</resources>
<plugins>
<plugin>
@@ -111,6 +124,7 @@
<artifactId>maven-eugene-plugin</artifactId>
<executions>
<execution>
+ <id>generate-entities</id>
<phase>generate-sources</phase>
<!-- By default, generation from ObjectModel -->
<configuration>
@@ -129,6 +143,20 @@
<goal>smart-generate</goal>
</goals>
</execution>
+ <execution>
+ <phase>generate-sources</phase>
+ <id>copy-version-files</id>
+ <configuration>
+ <includes>**/suiviobsmer.objectmodel</includes>
+ <copyVersionDir>${basedir}/src/main/resources/oldmappings/%MODELNAME%
+ </copyVersionDir>
+ <copyVersionFiles>**/*.hbm.xml</copyVersionFiles>
+ <overwrite>true</overwrite>
+ </configuration>
+ <goals>
+ <goal>copyVersionFiles</goal>
+ </goals>
+ </execution>
</executions>
</plugin>
</plugins>
@@ -136,8 +164,6 @@
<scm>
<url>http://labs.libre-entreprise.org/scm/viewvc.php/trunk/suiviobsmer-business/…</url>
- <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/suiviobsmer-business</connection>
- <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/suiviobsmer-business</developerConnection>
</scm>
</project>
Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/SuiviObsmerRunnerImpl.java
===================================================================
--- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/SuiviObsmerRunnerImpl.java 2010-01-31 21:18:32 UTC (rev 297)
+++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/SuiviObsmerRunnerImpl.java 2010-01-31 22:42:16 UTC (rev 298)
@@ -22,7 +22,11 @@
package fr.ifremer.suiviobsmer;
import java.util.Date;
+import java.util.Locale;
+
+import org.nuiton.i18n.I18n;
import org.nuiton.topia.TopiaException;
+import org.nuiton.topia.migration.ManualMigrationEngine;
import org.nuiton.util.ApplicationConfig;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -53,8 +57,17 @@
_configuration.parse(new String[]{});
_configuration.setOption("topia.persistence.classes",
SuiviObsmerModelDAOHelper.getImplementationClassesAsString());
-
+
+ // migration configuration
+ _configuration.setOption(ManualMigrationEngine.MIGRATION_APPLICATION_VERSION, SuiviObsmerModelDAOHelper.getModelVersion());
+ _configuration.setOption(ManualMigrationEngine.MIGRATION_MAPPING_DIRECTORY, "oldmappings");
+ _configuration.setOption(ManualMigrationEngine.MIGRATION_MODEL_NAME, "SuiviObsmerModel");
+ _configuration.setOption("topia.service.migration", ManualMigrationEngine.class.getName());
+ _configuration.setOption(ManualMigrationEngine.MIGRATION_CALLBACK, SuiviObsmerMigrationCallBack.class.getName());
+
_configuration.printConfig();
+
+ I18n.init(Locale.FRANCE);
// Use the context to set the runner for default environment.
SuiviObsmerContext.setRunner(this);
// Create the default admin in database
Modified: trunk/suiviobsmer-business/src/main/xmi/suiviobsmer.zargo
===================================================================
(Binary files differ)
Modified: trunk/suiviobsmer-ui/src/main/resources/log4j.properties
===================================================================
--- trunk/suiviobsmer-ui/src/main/resources/log4j.properties 2010-01-31 21:18:32 UTC (rev 297)
+++ trunk/suiviobsmer-ui/src/main/resources/log4j.properties 2010-01-31 22:42:16 UTC (rev 298)
@@ -22,3 +22,4 @@
log4j.logger.fr.ifremer.suiviobsmer=DEBUG
log4j.logger.org.nuiton.util=DEBUG
+log4j.logger.org.nuiton.topia=INFO
1
0
[Suiviobsmer-commits] r297 - trunk/suiviobsmer-ui/src/main/webapp/img
by fdesbois＠users.labs.libre-entreprise.org 31 Jan '10
by fdesbois＠users.labs.libre-entreprise.org 31 Jan '10
31 Jan '10
Author: fdesbois
Date: 2010-01-31 21:18:32 +0000 (Sun, 31 Jan 2010)
New Revision: 297
Modified:
trunk/suiviobsmer-ui/src/main/webapp/img/file-export-22px.png
trunk/suiviobsmer-ui/src/main/webapp/img/file-import-22px.png
Log:
Use color convention for images
Modified: trunk/suiviobsmer-ui/src/main/webapp/img/file-export-22px.png
===================================================================
(Binary files differ)
Modified: trunk/suiviobsmer-ui/src/main/webapp/img/file-import-22px.png
===================================================================
(Binary files differ)
1
0
[Suiviobsmer-commits] r296 - in trunk: . suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl
by fdesbois＠users.labs.libre-entreprise.org 31 Jan '10
by fdesbois＠users.labs.libre-entreprise.org 31 Jan '10
31 Jan '10
Author: fdesbois
Date: 2010-01-31 20:20:36 +0000 (Sun, 31 Jan 2010)
New Revision: 296
Modified:
trunk/changelog.txt
trunk/pom.xml
trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/SuiviObsmerContext.java
trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceUserImpl.java
Log:
- Evo #2046 : Add link to website in user mail
- Use last eugene and topia released versions
Modified: trunk/changelog.txt
===================================================================
--- trunk/changelog.txt 2010-01-29 20:31:31 UTC (rev 295)
+++ trunk/changelog.txt 2010-01-31 20:20:36 UTC (rev 296)
@@ -4,12 +4,20 @@
0.4.0
-----
-- [fdesbois] Ano #2064 : Export contact : ajouter l'extension .csv + n'exporte que les 20premières lignes
-- [fdesbois] Ano #2058 : Erreur affichage calendrier d'activité
+Evolutions
+++++++++++
+
+- [fdesbois] Evo #2046 : Lien vers le site dans les mail concernant les login
- [fdesbois] Evo #2045 : Enlever le mot de passe du mail lors de la modification du compte utilisateur
- [fdesbois] Evo #1987 : Synthèse : Graphe sollicitation des navires
- [fdesbois] Evo #2065 : Amélioration import pour prise en charge du code ligne du plan (sur 4 digits dans l'application)
- [fdesbois] Evo #2061 : Synthèse : ajouter le filtre "Programme ou règlement rattachement"
+
+Anomalies
++++++++++
+
+- [fdesbois] Ano #2064 : Export contact : ajouter l'extension .csv + n'exporte que les 20premières lignes
+- [fdesbois] Ano #2058 : Erreur affichage calendrier d'activité
- [fdesbois] Ano #2056 : Le filtre sur la date de début pour les contacts ne reste pas
0.3.0
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2010-01-29 20:31:31 UTC (rev 295)
+++ trunk/pom.xml 2010-01-31 20:20:36 UTC (rev 296)
@@ -212,8 +212,8 @@
<!-- libraries version -->
<nuitonutils.version>1.1.3</nuitonutils.version>
- <topia.version>2.3.0-beta-7-SNAPSHOT</topia.version>
- <eugene.version>2.0.0-beta-4-SNAPSHOT</eugene.version>
+ <topia.version>2.3.0-beta-7</topia.version>
+ <eugene.version>2.0.0-beta-4</eugene.version>
<tapestry.version>5.1.0.5</tapestry.version>
</properties>
Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/SuiviObsmerContext.java
===================================================================
--- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/SuiviObsmerContext.java 2010-01-29 20:31:31 UTC (rev 295)
+++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/SuiviObsmerContext.java 2010-01-31 20:20:36 UTC (rev 296)
@@ -59,6 +59,7 @@
public static final String PROP_EMAIL_PORT = "suiviobsmer.email.port";
public static final String PROP_EMAIL_FROM = "suiviobsmer.email.from";
public static final String PROP_VERSION = "suiviobsmer.version";
+ public static final String PROP_SERVER = "suiviobsmer.server.path";
private static SuiviObsmerRunner runner;
Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceUserImpl.java
===================================================================
--- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceUserImpl.java 2010-01-29 20:31:31 UTC (rev 295)
+++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceUserImpl.java 2010-01-31 20:20:36 UTC (rev 296)
@@ -120,7 +120,8 @@
String msg = "Bonjour,\n\n" +
"\tUn nouveau mot de passe a été généré pour votre identifiant " + login + " :\n" +
"\t\t * mot de passe = " + password + "\n\n" +
- "Vous pouvez modifier votre password en accédant à la page de gestion de votre profile utilisateur.\n\n" +
+ "Vous pouvez modifier votre password en accédant à la page de gestion de votre profile utilisateur :\n\n" +
+ "\t\thttp://" + SuiviObsmerContext.getProperty(SuiviObsmerContext.PROP_SERVER) + "\n\n" +
"Cordialement,\n\n" +
"L'Equipe WAO";
@@ -186,7 +187,8 @@
msg += "\tVous avez été inscris sur le site WAO : Web Applicatif Obsmer. Vos identifiants de connexion sont :\n" +
"\t\t * identifiant = " + user.getLogin() + "\n" +
"\t\t * mot de passe = " + password + "\n\n" +
- "Vous pouvez modifier votre mot de passe en accédant à la page de gestion de votre profil utilisateur.\n\n";
+ "Vous pouvez modifier votre mot de passe en accédant à la page de gestion de votre profil utilisateur:\n\n" +
+ "\t\thttp://" + SuiviObsmerContext.getProperty(SuiviObsmerContext.PROP_SERVER) + "\n\n";
} else if (generatePassword) {
subject += "Modification de votre compte";
msg += "\tVotre mot de passe de connexion à l'application WAO a été modifié : " + password + "\n\n";
1
0
Author: tchemit
Date: 2010-01-29 20:31:31 +0000 (Fri, 29 Jan 2010)
New Revision: 295
Modified:
trunk/pom.xml
Log:
use eugene snapshot
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2010-01-29 17:21:13 UTC (rev 294)
+++ trunk/pom.xml 2010-01-29 20:31:31 UTC (rev 295)
@@ -213,7 +213,7 @@
<!-- libraries version -->
<nuitonutils.version>1.1.3</nuitonutils.version>
<topia.version>2.3.0-beta-7-SNAPSHOT</topia.version>
- <eugene.version>2.0.0-beta-3</eugene.version>
+ <eugene.version>2.0.0-beta-4-SNAPSHOT</eugene.version>
<tapestry.version>5.1.0.5</tapestry.version>
</properties>
1
0
29 Jan '10
Author: fdesbois
Date: 2010-01-29 17:21:13 +0000 (Fri, 29 Jan 2010)
New Revision: 294
Added:
trunk/suiviobsmer-business/src/main/sql/
trunk/suiviobsmer-business/src/main/sql/indexes.sql
Modified:
trunk/changelog.txt
trunk/pom.xml
trunk/suiviobsmer-business/pom.xml
trunk/suiviobsmer-business/src/main/filters/SuiviObsmer.properties
trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/SuiviObsmerGlobal.java
trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ActivityCalendarImport.java
trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceBoatImpl.java
trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceContactImpl.java
trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceSamplingImpl.java
trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceUserImpl.java
trunk/suiviobsmer-business/src/main/xmi/suiviobsmer.zargo
trunk/suiviobsmer-ui/pom.xml
trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/base/AbstractFilteredPage.java
trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/components/BooleanImage.java
trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/components/Chart.java
trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/components/Layout.java
trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/BoatActivityCalendar.java
trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Boats.java
trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Contacts.java
trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/SampleRowForm.java
trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Synthesis.java
trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/services/ContactModelFactory.java
Log:
- Evo #2045 : Change email message when user password is updated
- Ano #2058 : ActivityCalendar Lazy error
- Ano #2064 : Contact export problem
- Correction some code for Sonar rules compliance
- use last topia snapshot and change version to 0.4.0 -> need migration service from ToPIA
Modified: trunk/changelog.txt
===================================================================
--- trunk/changelog.txt 2010-01-28 21:53:14 UTC (rev 293)
+++ trunk/changelog.txt 2010-01-29 17:21:13 UTC (rev 294)
@@ -1,10 +1,14 @@
Release note
============
-0.3.1
+0.4.0
-----
-- [fdesbois] Amélioration import pour prise en charge du code ligne du plan (sur 4 digits dans l'application)
+- [fdesbois] Ano #2064 : Export contact : ajouter l'extension .csv + n'exporte que les 20premières lignes
+- [fdesbois] Ano #2058 : Erreur affichage calendrier d'activité
+- [fdesbois] Evo #2045 : Enlever le mot de passe du mail lors de la modification du compte utilisateur
+- [fdesbois] Evo #1987 : Synthèse : Graphe sollicitation des navires
+- [fdesbois] Evo #2065 : Amélioration import pour prise en charge du code ligne du plan (sur 4 digits dans l'application)
- [fdesbois] Evo #2061 : Synthèse : ajouter le filtre "Programme ou règlement rattachement"
- [fdesbois] Ano #2056 : Le filtre sur la date de début pour les contacts ne reste pas
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2010-01-28 21:53:14 UTC (rev 293)
+++ trunk/pom.xml 2010-01-29 17:21:13 UTC (rev 294)
@@ -15,7 +15,7 @@
<groupId>fr.ifremer</groupId>
<artifactId>suiviobsmer</artifactId>
- <version>0.3.1-SNAPSHOT</version>
+ <version>0.4.0-SNAPSHOT</version>
<modules>
<module>suiviobsmer-ui</module>
@@ -212,7 +212,7 @@
<!-- libraries version -->
<nuitonutils.version>1.1.3</nuitonutils.version>
- <topia.version>2.3.0-beta-6</topia.version>
+ <topia.version>2.3.0-beta-7-SNAPSHOT</topia.version>
<eugene.version>2.0.0-beta-3</eugene.version>
<tapestry.version>5.1.0.5</tapestry.version>
Modified: trunk/suiviobsmer-business/pom.xml
===================================================================
--- trunk/suiviobsmer-business/pom.xml 2010-01-28 21:53:14 UTC (rev 293)
+++ trunk/suiviobsmer-business/pom.xml 2010-01-29 17:21:13 UTC (rev 294)
@@ -10,7 +10,7 @@
<parent>
<groupId>fr.ifremer</groupId>
<artifactId>suiviobsmer</artifactId>
- <version>0.3.1-SNAPSHOT</version>
+ <version>0.4.0-SNAPSHOT</version>
</parent>
<groupId>fr.ifremer.suiviobsmer</groupId>
Modified: trunk/suiviobsmer-business/src/main/filters/SuiviObsmer.properties
===================================================================
--- trunk/suiviobsmer-business/src/main/filters/SuiviObsmer.properties 2010-01-28 21:53:14 UTC (rev 293)
+++ trunk/suiviobsmer-business/src/main/filters/SuiviObsmer.properties 2010-01-29 17:21:13 UTC (rev 294)
@@ -1,5 +1,5 @@
## Default properties for H2 database
-hibernate.hbm2ddl.auto=update
+hibernate.hbm2ddl.auto=create
hibernate.show_sql=false
hibernate.dialect=org.hibernate.dialect.H2Dialect
@@ -16,4 +16,4 @@
suiviobsmer.email.from=admin at suiviobsmer.org
## Version
-suiviobsmer.version=0.3.0
\ No newline at end of file
+suiviobsmer.version=0.4.0
\ No newline at end of file
Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/SuiviObsmerGlobal.java
===================================================================
--- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/SuiviObsmerGlobal.java 2010-01-28 21:53:14 UTC (rev 293)
+++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/SuiviObsmerGlobal.java 2010-01-29 17:21:13 UTC (rev 294)
@@ -44,11 +44,6 @@
private static final Logger log = LoggerFactory.getLogger(SuiviObsmerGlobal.class);
- // CREATE UNIQUE INDEX boat_immatriculation_idx ON BOAT(IMMATRICULATION)
- // CREATE UNIQUE INDEX activitycalendar_idx ON ACTIVITYCALENDAR (BOAT, YEAR)
- // CREATE UNIQUE INDEX shipowner_idx ON SHIPOWNER (CODE)
- // CREATE UNIQUE INDEX samplerow_idx ON SAMPLEROW (CODE)
-
/**
* Create a default admin user if no user already exist.
*
Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ActivityCalendarImport.java
===================================================================
--- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ActivityCalendarImport.java 2010-01-28 21:53:14 UTC (rev 293)
+++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ActivityCalendarImport.java 2010-01-29 17:21:13 UTC (rev 294)
@@ -200,10 +200,10 @@
calendar.setActivityMonth(new ArrayList<ActivityMonth>());
- if (log.isDebugEnabled()) {
- info("Création d'un calendrier " + year +
- " pour le navire immatriculé " + boatImmatriculation, currRow);
- }
+// if (log.isDebugEnabled()) {
+// info("Création d'un calendrier " + year +
+// " pour le navire immatriculé " + boatImmatriculation, currRow);
+// }
}
availableCalendars.put(key, calendar);
}
@@ -234,23 +234,6 @@
month.setActive(active);
if (active) {
-// String nbSeaDaysString = reader.get("SYNA_NOMJDM").trim();
-// Integer nbSeaDays = !nbSeaDaysString.equals("NA") ?
-// Integer.valueOf(nbSeaDaysString) : null;
-//
-// String nbFishingDaysString = reader.get("SYNA_NOMJDP").trim();
-// Integer nbFishingDays = !nbFishingDaysString.equals("NA") ?
-// Integer.valueOf(nbFishingDaysString) : null;
-//
-// String nbBoardingPersonsString = reader.get("SYNA_NOMHE").trim();
-// Integer nbBoardingPersons = !nbBoardingPersonsString.equals("NA") ?
-// Integer.valueOf(nbBoardingPersonsString) : null;
-//
-// String harbourIdString = reader.get("SYNA_TPOR_COD").trim();
-// int harbourId = !harbourIdString.equals("NA") ? Integer.parseInt(harbourIdString) : -1;
-// String harbourLibelle = reader.get("SYNA_POR_LIB").trim();
-// harbourLibelle = !harbourLibelle.equals("NA") ? harbourLibelle : null;
-// harbourCode = !harbourCode.equals("NA") ? harbourCode : null;
Integer nbSeaDays = ImportHelper.readInteger(reader, ACTIVITY_CALENDAR.SYNA_NOMJDM);
Integer nbFishingDays = ImportHelper.readInteger(reader, ACTIVITY_CALENDAR.SYNA_NOMJDP);
@@ -267,11 +250,6 @@
month.setNbFishingDays(nbFishingDays);
month.setNbSeaDays(nbSeaDays);
-// int professionOrder = Integer.parseInt(reader.get("META_ORDRE").trim()); // NA
-// String professionCode = reader.get("MET_COD").trim();
-// int professionId = Integer.parseInt(reader.get("MET_ID").trim());
-// String professionLibelle = reader.get("MET_LIB").trim();
-
// Can be equals to -1 if set to NA in Csv File (not a problem for ordering Profession)
int professionOrder = ImportHelper.readInt(reader, ACTIVITY_CALENDAR.META_ORDRE);
int professionId = ImportHelper.readInt(reader, ACTIVITY_CALENDAR.MET_ID);
@@ -321,7 +299,7 @@
zone.setGradiantCode(gradiantCode);
zone.setGradiantLibelle(gradiantLibelle);
} else {
- info("Ligne inactif", currRow);
+ //info("Ligne inactif", currRow);
}
result++;
} else {
@@ -395,8 +373,8 @@
String msg = "[" + dateString + "] " + ligne + message;
writer.write(msg + "\n");
writer.flush();
- if (log.isDebugEnabled()) {
- log.debug("write log activityCalendar : " + msg);
+ if (log.isTraceEnabled()) {
+ log.trace("write log activityCalendar : " + msg);
}
}
Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceBoatImpl.java
===================================================================
--- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceBoatImpl.java 2010-01-28 21:53:14 UTC (rev 293)
+++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceBoatImpl.java 2010-01-29 17:21:13 UTC (rev 294)
@@ -500,13 +500,13 @@
// load other complex data from collections
List<ActivityMonth> months = result.getActivityMonth();
for (ActivityMonth month : months) {
- if (month.getActive()) {
+// if (month.getActive()) {
List<ActivityProfession> professions = month.getActivityProfession();
for (ActivityProfession profession : professions) {
List<ActivityZone> zones = profession.getActivityZone();
zones.size();
}
- }
+// }
}
transaction.closeContext();
Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceContactImpl.java
===================================================================
--- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceContactImpl.java 2010-01-28 21:53:14 UTC (rev 293)
+++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceContactImpl.java 2010-01-29 17:21:13 UTC (rev 294)
@@ -183,24 +183,25 @@
}
@Override
- public InputStream exportContactCsv(WaoUser user, Collection<Contact> contacts)
+ public InputStream exportContactCsv(ContactFilter filter)
throws SuiviObsmerException {
TopiaContext transaction = null;
InputStream result = null;
+ CsvWriter writer = null;
try {
transaction = rootContext.beginTransaction();
// No contacts from arguments, select all existing from database
- if (contacts == null) {
- ContactDAO dao = SuiviObsmerModelDAOHelper.getContactDAO(transaction);
- if (user.getAdmin()) {
- contacts = dao.findAll();
- } else {
- // Filtered by company for a simple user
- contacts = dao.createQuery().add(Contact.OBSERVER + "." + WaoUser.COMPANY, user.getCompany()).
- executeToEntityList();
- }
- }
+// if (contacts == null) {
+// ContactDAO dao = SuiviObsmerModelDAOHelper.getContactDAO(transaction);
+// if (user.getAdmin()) {
+// contacts = dao.findAll();
+// } else {
+// // Filtered by company for a simple user
+// contacts = dao.createQuery().add(Contact.OBSERVER + "." + WaoUser.COMPANY, user.getCompany()).
+// executeToEntityList();
+// }
+// }
//String alea = SuiviObsmerContext.createRandomString(16);
//String filename = "/tmp/wao-contacts-" + alea + ".csv";
@@ -212,7 +213,7 @@
}
FileOutputStream output = new FileOutputStream(file);
- CsvWriter writer = new CsvWriter(output, ',', Charset.forName("UTF-8"));
+ writer = new CsvWriter(output, ',', Charset.forName("UTF-8"));
// Headers
for (int i = 0; i < ImportHelper.CONTACT_NB_HEADERS; i++) {
@@ -224,6 +225,19 @@
DateFormat dateFormat = ImportHelper.getContactDateFormat();
+ // Get contacts from database
+ ContactDAO dao = SuiviObsmerModelDAOHelper.getContactDAO(transaction);
+ TopiaQuery<Contact> query = dao.createQuery("C");
+
+ // No page limit in this case
+ query = filter.prepareQueryForContact(query).resetLimit();
+
+ if (log.isDebugEnabled()) {
+ log.debug("Exec query : " + query);
+ }
+
+ List<Contact> contacts = query.executeToEntityList();
+
int curr = 0;
for (Contact contact : contacts) {
curr++;
@@ -296,15 +310,18 @@
record[BOAT.QUARTIER_IMMA.forContactCsv()] = boat.getDistrictCode();
writer.writeRecord(record);
+ writer.flush();
}
- writer.close();
-
result = new FileInputStream(file);
transaction.closeContext();
} catch (Exception eee) {
SuiviObsmerContext.serviceException(transaction,
"Impossible d'exporter les contacts", eee);
+ } finally {
+ if (writer != null) {
+ writer.close();
+ }
}
return result;
}
Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceSamplingImpl.java
===================================================================
--- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceSamplingImpl.java 2010-01-28 21:53:14 UTC (rev 293)
+++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceSamplingImpl.java 2010-01-29 17:21:13 UTC (rev 294)
@@ -304,6 +304,9 @@
log.debug("Query : " + query);
}
+ // FIXME-FD20100129 Problem with order, need a
+ // Map<facadeName, Map<sectorName, List<sampleRow>>>
+
results = query.executeToEntityList();
transaction.closeContext();
Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceUserImpl.java
===================================================================
--- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceUserImpl.java 2010-01-28 21:53:14 UTC (rev 293)
+++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceUserImpl.java 2010-01-29 17:21:13 UTC (rev 294)
@@ -187,11 +187,9 @@
"\t\t * identifiant = " + user.getLogin() + "\n" +
"\t\t * mot de passe = " + password + "\n\n" +
"Vous pouvez modifier votre mot de passe en accédant à la page de gestion de votre profil utilisateur.\n\n";
- } else {
+ } else if (generatePassword) {
subject += "Modification de votre compte";
- msg += "\tVos identifiants de connexion à l'application WAO ont été modifiés :\n" +
- "\t\t * identifiant = " + user.getLogin() + "\n" +
- "\t\t * mot de passe = " + password + "\n\n";
+ msg += "\tVotre mot de passe de connexion à l'application WAO a été modifié : " + password + "\n\n";
}
msg += "Cordialement,\n\n" +
"L'Equipe WAO";
Added: trunk/suiviobsmer-business/src/main/sql/indexes.sql
===================================================================
--- trunk/suiviobsmer-business/src/main/sql/indexes.sql (rev 0)
+++ trunk/suiviobsmer-business/src/main/sql/indexes.sql 2010-01-29 17:21:13 UTC (rev 294)
@@ -0,0 +1,2 @@
+CREATE UNIQUE INDEX activitycalendar_idx ON ACTIVITYCALENDAR (BOAT, YEAR);
+CREATE INDEX program_idx ON SAMPLEROW (PROGRAMNAME);
\ No newline at end of file
Modified: trunk/suiviobsmer-business/src/main/xmi/suiviobsmer.zargo
===================================================================
(Binary files differ)
Modified: trunk/suiviobsmer-ui/pom.xml
===================================================================
--- trunk/suiviobsmer-ui/pom.xml 2010-01-28 21:53:14 UTC (rev 293)
+++ trunk/suiviobsmer-ui/pom.xml 2010-01-29 17:21:13 UTC (rev 294)
@@ -10,7 +10,7 @@
<parent>
<groupId>fr.ifremer</groupId>
<artifactId>suiviobsmer</artifactId>
- <version>0.3.1-SNAPSHOT</version>
+ <version>0.4.0-SNAPSHOT</version>
</parent>
<groupId>fr.ifremer.suiviobsmer</groupId>
Modified: trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/base/AbstractFilteredPage.java
===================================================================
--- trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/base/AbstractFilteredPage.java 2010-01-28 21:53:14 UTC (rev 293)
+++ trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/base/AbstractFilteredPage.java 2010-01-29 17:21:13 UTC (rev 294)
@@ -282,7 +282,7 @@
if (log.isDebugEnabled()) {
log.debug("BUSINESS REQUEST [getCompanies]");
}
- List<Company> companies = serviceUser.getCompanies(getAvailableDataForFiltersOnly());
+ List<Company> companies = serviceUser.getCompanies(isAvailableDataForFiltersOnly());
companySelectModel = new GenericSelectModel<Company>(companies,Company.class,
"name","topiaId",propertyAccess);
}
@@ -306,7 +306,7 @@
if (log.isInfoEnabled()) {
log.info("BUSINESS REQUEST [getObservers]");
}
- observers = serviceUser.getObservers(getAvailableDataForFiltersOnly());
+ observers = serviceUser.getObservers(isAvailableDataForFiltersOnly());
}
observerSelectModel = new GenericSelectModel<WaoUser>(observers,WaoUser.class,
"fullName","topiaId",propertyAccess);
@@ -342,7 +342,7 @@
*
* @return true if only active users will be showed, false otherwise
*/
- protected abstract boolean getAvailableDataForFiltersOnly();
+ protected abstract boolean isAvailableDataForFiltersOnly();
public String[] onProvideCompletionsFromBoatName(String input) throws SuiviObsmerException {
if (log.isInfoEnabled()) {
Modified: trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/components/BooleanImage.java
===================================================================
--- trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/components/BooleanImage.java 2010-01-28 21:53:14 UTC (rev 293)
+++ trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/components/BooleanImage.java 2010-01-29 17:21:13 UTC (rev 294)
@@ -22,10 +22,7 @@
package fr.ifremer.suiviobsmer.ui.components;
import org.apache.tapestry5.BindingConstants;
-import org.apache.tapestry5.annotations.Log;
import org.apache.tapestry5.annotations.Parameter;
-import org.apache.tapestry5.ioc.annotations.Inject;
-import org.slf4j.Logger;
/**
* BooleanImage
@@ -40,9 +37,6 @@
*/
public class BooleanImage {
- @Inject
- private Logger log;
-
@Parameter(required = true)
private Boolean value;
Modified: trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/components/Chart.java
===================================================================
--- trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/components/Chart.java 2010-01-28 21:53:14 UTC (rev 293)
+++ trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/components/Chart.java 2010-01-29 17:21:13 UTC (rev 294)
@@ -38,73 +38,43 @@
import org.jfree.chart.JFreeChart;
/**
- * Composant qui affiche un graphe de type PieChart.
- *
- * <pre>
- * Utilisation :
- * <t:chart width="210" height="190" values="choice" title="title" type="1"/>
- * - choice est une liste de chaînes représentant les labels et leur valeurs respectives. ({"val1", "20", "val2", "10"}...)
- * - type est le type de représentation du diagramme (1:PIE, 2:PIE3D...)
- * Pour généraliser à d'autres types de graphes il faudrait passer un JFreeChart :
- * Persist Parameter(required=true)
- * private JFreeChart _chart;
- * </pre>
- *
+ *
* @author rannou
* @version $Id$
*/
public class Chart {
-// /** diagramme de type PIE */
-// public static final int PIE = 1;
-// /** diagramme de type PIE3D */
-// public static final int PIE3D = 2;
-// /** diagramme de type RING */
-// public static final int RING = 3;
-
/** titre du diagramme */
@Parameter
- private String _title = "";
+ private String title = "";
@Parameter(required = true)
- private JFreeChart _chart;
+ private JFreeChart chart;
- /** type de représentation du diagramme */
-// @Parameter(required = true)
-// private int _type;
-
@Parameter(required = true)
- private int _width;
+ private int width;
@Parameter(required = true)
- private int _height;
+ private int height;
@Persist
private JFreeChart currentChart;
- /**
- * list(array) of paired values(label,value):
- * [String,Number,String,Number,...]
- */
-// @Parameter(required = true)
-// private List<Object> _values;
-
@Inject
- private ComponentResources _resources;
+ private ComponentResources resources;
void beginRender(MarkupWriter writer) {
- currentChart = _chart;
+ currentChart = chart;
// event link params
- Object[] params = new Object[] { _title, _width, _height };
-// params = ArrayUtil.concat(params, _values.toArray());
+ Object[] params = new Object[] { title, width, height };
// generate event link
- Link link = _resources.createEventLink("chart", params);
- Element img = writer.element("img", "src", link);
+ Link link = resources.createEventLink("chart", params);
+ writer.element("img", "src", link);
- _resources.renderInformalParameters(writer);
+ resources.renderInformalParameters(writer);
}
void afterRender(MarkupWriter writer) {
@@ -112,7 +82,6 @@
}
public StreamResponse onChart(final String title, final int width, final int height) {
-
// return the image
return new StreamResponse() {
public String getContentType() {
@@ -120,11 +89,6 @@
}
public InputStream getStream() throws IOException {
-// String alea = SuiviObsmerContext.createRandomString(8);
-// String path = SuiviObsmerContext.getProperty(SuiviObsmerContext.PROP_PATH_CHARTS);
-// File file = new File(path, "chart_" + alea + ".png");
-// file.getParentFile().mkdirs();
-
ByteArrayOutputStream output = new ByteArrayOutputStream();
ChartUtilities.writeChartAsPNG(output, currentChart, width, height);
return new ByteArrayInputStream(output.toByteArray());
Modified: trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/components/Layout.java
===================================================================
--- trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/components/Layout.java 2010-01-28 21:53:14 UTC (rev 293)
+++ trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/components/Layout.java 2010-01-29 17:21:13 UTC (rev 294)
@@ -40,7 +40,6 @@
import org.apache.tapestry5.annotations.SessionState;
import org.apache.tapestry5.ioc.annotations.Inject;
import org.apache.tapestry5.services.Request;
-import org.slf4j.Logger;
/**
* Layout
@@ -55,9 +54,6 @@
*/
public class Layout {
- @Inject
- private Logger log;
-
@Parameter(required = true, defaultPrefix = BindingConstants.LITERAL)
private String pageTitle;
Modified: trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/BoatActivityCalendar.java
===================================================================
--- trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/BoatActivityCalendar.java 2010-01-28 21:53:14 UTC (rev 293)
+++ trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/BoatActivityCalendar.java 2010-01-29 17:21:13 UTC (rev 294)
@@ -118,8 +118,8 @@
public int getProfessionIndexMax() {
int result = 0;
- for (ActivityMonth month : activityCalendar.getActivityMonth()) {
- int nbProfessions = month.sizeActivityProfession();
+ for (ActivityMonth curr : activityCalendar.getActivityMonth()) {
+ int nbProfessions = curr.sizeActivityProfession();
if (nbProfessions > result) {
result = nbProfessions;
}
Modified: trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Boats.java
===================================================================
--- trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Boats.java 2010-01-28 21:53:14 UTC (rev 293)
+++ trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Boats.java 2010-01-29 17:21:13 UTC (rev 294)
@@ -188,7 +188,7 @@
private InputStream activityCalendarLogFile;
- protected static String GZIP_MIMETYPE = "application/x-gzip";
+ protected static final String GZIP_MIMETYPE = "application/x-gzip";
InputStream getActivityCalendarLogFile() throws FileNotFoundException {
if (activityCalendarLogFile == null) {
@@ -292,7 +292,7 @@
}
@Override
- protected boolean getAvailableDataForFiltersOnly() {
+ protected boolean isAvailableDataForFiltersOnly() {
return true;
}
@@ -639,8 +639,8 @@
public boolean canCreateNewContactFromElligibleBoat() throws SuiviObsmerException {
if (!user.getAdmin() && !isElligibleBoatCompanyActiveFalse()) {
- Boat boat = getBoatInfos().getBoat();
- return boat.canCreateContact(user.getCompany());
+ Boat currentBoat = getBoatInfos().getBoat();
+ return currentBoat.canCreateContact(user.getCompany());
}
return false;
}
Modified: trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Contacts.java
===================================================================
--- trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Contacts.java 2010-01-28 21:53:14 UTC (rev 293)
+++ trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Contacts.java 2010-01-29 17:21:13 UTC (rev 294)
@@ -47,9 +47,7 @@
import java.io.InputStream;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
-import java.util.Calendar;
import java.util.Date;
-import java.util.GregorianCalendar;
import java.util.List;
import org.apache.commons.lang.BooleanUtils;
import org.apache.commons.lang.StringUtils;
@@ -157,7 +155,7 @@
return contactFilter;
}
- public boolean getFiltersVisible() {
+ public boolean isFiltersVisible() {
boolean companyFiltered = contactFilter.getCompany() != null && user.getAdmin();
return (contactFilter.isFiltered() || companyFiltered) && StringUtils.isEmpty(contactFilter.getBoatName()); /*&& !getDefaultFromDate().equals(contactFilter.getFromDate());*/
}
@@ -168,7 +166,7 @@
}
@Override
- protected boolean getAvailableDataForFiltersOnly() {
+ protected boolean isAvailableDataForFiltersOnly() {
return true;
}
@@ -234,7 +232,7 @@
public InputStream getStream() throws IOException {
InputStream result = null;
try {
- result = serviceContact.exportContactCsv(user, getContacts().values());
+ result = serviceContact.exportContactCsv(getContactFilter());
} catch (SuiviObsmerException eee) {
throw new IOException(eee);
}
@@ -243,6 +241,9 @@
@Override
public void prepareResponse(Response response) {
+ DateFormat dateFormat = new SimpleDateFormat("dd-MM-yyyy");
+ Date current = SuiviObsmerContext.getCurrentDate();
+ response.setHeader("Content-Disposition", "attachment; filename=\"wao-contacts-" + dateFormat.format(current) + ".csv\"");
}
};
}
Modified: trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/SampleRowForm.java
===================================================================
--- trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/SampleRowForm.java 2010-01-28 21:53:14 UTC (rev 293)
+++ trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/SampleRowForm.java 2010-01-29 17:21:13 UTC (rev 294)
@@ -569,7 +569,7 @@
int size = getSampleMonths().size();
SampleMonth firstMonth = getSampleMonths().get(0);
- SampleMonth lastMonth = getSampleMonths().get(size-1);
+ //SampleMonth lastMonth = getSampleMonths().get(size-1);
if (firstMonth != null) {
Date firstDate = firstMonth.getPeriodDate();
Modified: trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Synthesis.java
===================================================================
--- trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Synthesis.java 2010-01-28 21:53:14 UTC (rev 293)
+++ trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Synthesis.java 2010-01-29 17:21:13 UTC (rev 294)
@@ -121,7 +121,7 @@
}
@Override
- protected boolean getAvailableDataForFiltersOnly() {
+ protected boolean isAvailableDataForFiltersOnly() {
return false;
}
Modified: trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/services/ContactModelFactory.java
===================================================================
--- trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/services/ContactModelFactory.java 2010-01-28 21:53:14 UTC (rev 293)
+++ trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/services/ContactModelFactory.java 2010-01-29 17:21:13 UTC (rev 294)
@@ -137,7 +137,7 @@
Contact contact = (Contact)arg0;
return contact.getObserver().getFullName();
}
-
+
@Override
public void set(Object arg0, Object arg1) {
}
2
1
[Suiviobsmer-commits] r293 - in trunk: . suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/entity suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl suiviobsmer-business/src/main/xmi suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/data suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages suiviobsmer-ui/src/main/webapp
by fdesbois＠users.labs.libre-entreprise.org 28 Jan '10
by fdesbois＠users.labs.libre-entreprise.org 28 Jan '10
28 Jan '10
Author: fdesbois
Date: 2010-01-28 21:53:14 +0000 (Thu, 28 Jan 2010)
New Revision: 293
Modified:
trunk/changelog.txt
trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/entity/ContactDAOImpl.java
trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceSynthesisImpl.java
trunk/suiviobsmer-business/src/main/xmi/suiviobsmer.zargo
trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/data/ChartUtils.java
trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Synthesis.java
trunk/suiviobsmer-ui/src/main/webapp/Synthesis.tml
Log:
Evo #1967 : Static graph for boardings on boat (todo style)
Modified: trunk/changelog.txt
===================================================================
--- trunk/changelog.txt 2010-01-28 19:51:18 UTC (rev 292)
+++ trunk/changelog.txt 2010-01-28 21:53:14 UTC (rev 293)
@@ -4,6 +4,7 @@
0.3.1
-----
+- [fdesbois] Amélioration import pour prise en charge du code ligne du plan (sur 4 digits dans l'application)
- [fdesbois] Evo #2061 : Synthèse : ajouter le filtre "Programme ou règlement rattachement"
- [fdesbois] Ano #2056 : Le filtre sur la date de début pour les contacts ne reste pas
Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/entity/ContactDAOImpl.java
===================================================================
--- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/entity/ContactDAOImpl.java 2010-01-28 19:51:18 UTC (rev 292)
+++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/entity/ContactDAOImpl.java 2010-01-28 21:53:14 UTC (rev 293)
@@ -77,12 +77,15 @@
@Override
public TopiaQuery<E> createQueryDoneContactsFromDate(Boat boat, Date fromDate) {
TopiaQuery<E> query = createQuery().
- add(Contact.BOAT, boat).
add(Contact.STATE, ContactState.BOARDING_DONE.toString()).
add(Contact.VALIDATION_COMPANY, Boolean.TRUE).
add(Contact.VALIDATION_PROGRAM + " IS NULL OR " + Contact.VALIDATION_PROGRAM + " = :booleanTrue").
addParam("booleanTrue", Boolean.TRUE);
+ if (boat != null) {
+ query.add(Contact.BOAT, boat);
+ }
+
if (fromDate != null) {
query.add(Contact.TIDE_BEGIN_DATE, Op.GE, fromDate);
}
Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceSynthesisImpl.java
===================================================================
--- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceSynthesisImpl.java 2010-01-28 19:51:18 UTC (rev 292)
+++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceSynthesisImpl.java 2010-01-28 21:53:14 UTC (rev 293)
@@ -25,6 +25,9 @@
import fr.ifremer.suiviobsmer.SuiviObsmerException;
import fr.ifremer.suiviobsmer.SuiviObsmerModelDAOHelper;
import fr.ifremer.suiviobsmer.bean.SamplingFilter;
+import fr.ifremer.suiviobsmer.entity.Company;
+import fr.ifremer.suiviobsmer.entity.Contact;
+import fr.ifremer.suiviobsmer.entity.ContactDAO;
import fr.ifremer.suiviobsmer.entity.SampleMonth;
import fr.ifremer.suiviobsmer.entity.SampleMonthDAO;
import fr.ifremer.suiviobsmer.entity.SampleRow;
@@ -38,6 +41,7 @@
import java.util.TreeMap;
import org.nuiton.topia.TopiaContext;
import org.nuiton.topia.framework.TopiaQuery;
+import org.nuiton.topia.framework.TopiaQuery.Op;
import org.nuiton.util.PeriodDates;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -124,4 +128,49 @@
return results;
}
+ @Override
+ public SortedMap<Integer, Integer> getBoardingBoats(Company company, Date fromDate) throws SuiviObsmerException {
+ TopiaContext transaction = null;
+ SortedMap<Integer, Integer> results = new TreeMap<Integer, Integer>();
+ try {
+ transaction = rootContext.beginTransaction();
+
+ for (int i = 1; i <= 12; i++) {
+ results.put(i, 0);
+ }
+
+ ContactDAO dao = SuiviObsmerModelDAOHelper.getContactDAO(transaction);
+ TopiaQuery<Contact> query = dao.createQueryDoneContactsFromDate(null, fromDate);
+
+ // Only for sampleRows with averageTideTime less or equals to 2 days
+ query.add(Contact.SAMPLE_ROW + "." + SampleRow.AVERAGE_TIDE_TIME, Op.LE, 2.).
+ addGroup(Contact.BOAT).setSelect("COUNT(*)");
+
+ if (company != null) {
+ query.add(Contact.SAMPLE_ROW + "." + SampleRow.COMPANY, company);
+ }
+
+ if (log.isTraceEnabled()) {
+ log.trace("Exec query : " + query);
+ }
+
+ List<Long> nbBoardingsByBoat = (List<Long>)query.execute();
+
+ for (Long boardings : nbBoardingsByBoat) {
+ int value = boardings.intValue();
+ if (value >= 12) {
+ value = 12;
+ }
+ Integer nbBoats = results.get(value);
+ results.put(value, nbBoats + 1);
+ }
+
+ transaction.closeContext();
+ } catch (Exception eee) {
+ SuiviObsmerContext.serviceException(transaction,
+ "Impossible de récupérer les données pour le graphique dynamique des efforts de marées", eee);
+ }
+ return results;
+ }
+
}
Modified: trunk/suiviobsmer-business/src/main/xmi/suiviobsmer.zargo
===================================================================
(Binary files differ)
Modified: trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/data/ChartUtils.java
===================================================================
--- trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/data/ChartUtils.java 2010-01-28 19:51:18 UTC (rev 292)
+++ trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/data/ChartUtils.java 2010-01-28 21:53:14 UTC (rev 293)
@@ -78,24 +78,35 @@
}
- public static JFreeChart createCategoryChart(String title, String axisName, ChartType type,
- Map<String, SortedMap<Date, Integer>> input) {
+ public static JFreeChart createCategoryChart(String title, String axisName, String categoryName, ChartType type,
+ Map<String, SortedMap<?, Integer>> input) {
DateFormat format = new SimpleDateFormat("MM/yyyy");
+ boolean dateType = false;
DefaultCategoryDataset dataset = new DefaultCategoryDataset();
// Fill data in dataset
int i = 0;
- for (Map.Entry<String, SortedMap<Date, Integer>> map : input.entrySet()) {
- for (Map.Entry<Date, Integer> data : map.getValue().entrySet()) {
- dataset.setValue(data.getValue(), map.getKey(), format.format(data.getKey()));
+ for (Map.Entry<String, SortedMap<?, Integer>> map : input.entrySet()) {
+ for (Map.Entry<?, Integer> data : map.getValue().entrySet()) {
+ Object dataKey = data.getKey();
+ String columnKey = "";
+ if (Date.class.isAssignableFrom(dataKey.getClass())) {
+ columnKey = format.format((Date)dataKey);
+ dateType = true;
+ } else {
+ columnKey = dataKey.toString();
+ }
+ dataset.setValue(data.getValue(), map.getKey(), columnKey);
}
i++;
}
// Axises
- CategoryAxis categoryAxis = new CategoryAxis("Mois");
- categoryAxis.setCategoryLabelPositions(CategoryLabelPositions.UP_90);
+ CategoryAxis categoryAxis = new CategoryAxis(categoryName);
+ if (dateType) {
+ categoryAxis.setCategoryLabelPositions(CategoryLabelPositions.UP_90);
+ }
if (type.noCategoryMargin) {
categoryAxis.setCategoryMargin(0);
}
Modified: trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Synthesis.java
===================================================================
--- trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Synthesis.java 2010-01-28 19:51:18 UTC (rev 292)
+++ trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Synthesis.java 2010-01-28 21:53:14 UTC (rev 293)
@@ -24,6 +24,7 @@
import fr.ifremer.suiviobsmer.SuiviObsmerException;
import fr.ifremer.suiviobsmer.bean.BoatFilter;
import fr.ifremer.suiviobsmer.bean.BoatFilterImpl;
+import fr.ifremer.suiviobsmer.entity.Company;
import fr.ifremer.suiviobsmer.entity.WaoUser;
import fr.ifremer.suiviobsmer.services.ServiceSynthesis;
import fr.ifremer.suiviobsmer.ui.base.AbstractFilteredPage;
@@ -31,6 +32,8 @@
import fr.ifremer.suiviobsmer.ui.data.BusinessUtils;
import fr.ifremer.suiviobsmer.ui.data.ChartUtils;
import fr.ifremer.suiviobsmer.ui.data.ChartUtils.ChartType;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
@@ -44,6 +47,7 @@
import org.apache.tapestry5.corelib.components.Zone;
import org.apache.tapestry5.ioc.annotations.Inject;
import org.jfree.chart.JFreeChart;
+import org.nuiton.util.DateUtils;
import org.nuiton.util.PeriodDates;
import org.slf4j.Logger;
@@ -126,11 +130,11 @@
log.info("BUSINESS REQUEST [getDataSampling]");
}
List<SortedMap<Date, Integer>> res = serviceSynthesis.getDataSampling(getFilter());
- Map<String, SortedMap<Date, Integer>> data = new HashMap<String, SortedMap<Date, Integer>>();
+ Map<String, SortedMap<?, Integer>> data = new HashMap<String, SortedMap<?, Integer>>();
data.put("Planifié", res.get(0));
data.put("Réalisé", res.get(1));
String title = BusinessUtils.getDataSamplingTitle(getFilter());
- return ChartUtils.createCategoryChart(title, "Nb marées", getDataSamplingChartType(), data);
+ return ChartUtils.createCategoryChart(title, "Nb marées", "Mois", getDataSamplingChartType(), data);
}
public ChartType getDataSamplingChartType() {
@@ -169,5 +173,22 @@
}
return this;
}
-
+
+ /********************* STATIC GRAPH : BOARDINGBOAT ************************/
+
+ public JFreeChart getBoardingBoatsChart() throws SuiviObsmerException {
+ if (log.isInfoEnabled()) {
+ log.info("BUSINESS REQUEST [getBoardingBoats]");
+ }
+ //Company company = user.getAdmin() ? null : user.getCompany();
+ Date fromDate = DateUtils.createDateAfterToday(0, -12, 0);
+ SortedMap<Integer, Integer> res = serviceSynthesis.getBoardingBoats(getFilter().getCompany(), fromDate);
+ Map<String, SortedMap<?, Integer>> data = new HashMap<String, SortedMap<?, Integer>>();
+ data.put("Navires", res);
+
+ DateFormat dateFormat = new SimpleDateFormat("dd/MM/yyyy");
+
+ String title = "Sollicitations des navires depuis le " + dateFormat.format(fromDate);
+ return ChartUtils.createCategoryChart(title, "Nb navires", "Nb embarquements", ChartType.BAR, data);
+ }
}
Modified: trunk/suiviobsmer-ui/src/main/webapp/Synthesis.tml
===================================================================
--- trunk/suiviobsmer-ui/src/main/webapp/Synthesis.tml 2010-01-28 19:51:18 UTC (rev 292)
+++ trunk/suiviobsmer-ui/src/main/webapp/Synthesis.tml 2010-01-28 21:53:14 UTC (rev 293)
@@ -106,4 +106,7 @@
</p>
<t:chart t:width="600" t:height="400" t:chart="dataSamplingChart" />
</div>
+ <div class="acenter">
+ <t:chart t:width="600" t:height="400" t:chart="boardingBoatsChart" />
+ </div>
</t:layout>
1
0
28 Jan '10
Author: fdesbois
Date: 2010-01-28 19:51:18 +0000 (Thu, 28 Jan 2010)
New Revision: 292
Added:
trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/SuiviObsmerRunnerTest.java
trunk/suiviobsmer-business/src/test/resources/import/misc.csv
Removed:
trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/business/SuiviObsmerRunnerTest.java
Modified:
trunk/changelog.txt
trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/ImportHelper.java
trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/ContactFilterImpl.java
trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/SamplingFilterImpl.java
trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceBoatImpl.java
trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceContactImpl.java
trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceReferentialImpl.java
trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceSamplingImpl.java
trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceSynthesisImpl.java
trunk/suiviobsmer-business/src/main/xmi/suiviobsmer.zargo
trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/ImportHelperTest.java
trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/SuiviObsmerGlobalTest.java
trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/SuiviObsmerUtilsTest.java
trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/entity/BoatImplTest.java
trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/entity/BoatInfosImplTest.java
trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/entity/SampleRowImplTest.java
trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/impl/ActivityCalendarImportTest.java
trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/impl/ServiceBoatImplTest.java
trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/impl/ServiceReferentialImplTest.java
trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/impl/ServiceSamplingImplTest.java
trunk/suiviobsmer-business/src/test/resources/import/contacts.csv
trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/base/AbstractFilteredPage.java
trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Boats.java
trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Contacts.java
trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/SampleRowForm.java
trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Synthesis.java
trunk/suiviobsmer-ui/src/main/resources/fr/ifremer/suiviobsmer/ui/pages/Synthesis.properties
trunk/suiviobsmer-ui/src/main/webapp/Synthesis.tml
Log:
- Improve tests
- Evo #2061 : add program filter for synthesis
Modified: trunk/changelog.txt
===================================================================
--- trunk/changelog.txt 2010-01-28 17:22:32 UTC (rev 291)
+++ trunk/changelog.txt 2010-01-28 19:51:18 UTC (rev 292)
@@ -1,6 +1,12 @@
Release note
============
+0.3.1
+-----
+
+- [fdesbois] Evo #2061 : Synthèse : ajouter le filtre "Programme ou règlement rattachement"
+- [fdesbois] Ano #2056 : Le filtre sur la date de début pour les contacts ne reste pas
+
0.3.0
-----
Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/ImportHelper.java
===================================================================
--- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/ImportHelper.java 2010-01-28 17:22:32 UTC (rev 291)
+++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/ImportHelper.java 2010-01-28 19:51:18 UTC (rev 292)
@@ -393,6 +393,17 @@
return result.getTime();
}
+ public static String readSampleRowCode(CsvReader reader) throws IOException {
+ String code = read(reader, SAMPLING.PLAN_CODE);
+ // Replace single number after year by a double one : 2010_111 -> 2010_0111
+ code = code.replaceFirst("_(\\d{3})$", "_0$1");
+ // Replace single number after year by a double one : 2010_11 -> 2010_0011
+ code = code.replaceFirst("_(\\d{2})$", "_00$1");
+ // Replace single number after year by a double one : 2010_1 -> 2010_0001
+ code = code.replaceFirst("_(\\d)$", "_000$1");
+ return code;
+ }
+
public static DateFormat getContactDateFormat() {
return new SimpleDateFormat(CONTACT_DATE_PATTERN, Locale.FRENCH);
}
Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/ContactFilterImpl.java
===================================================================
--- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/ContactFilterImpl.java 2010-01-28 17:22:32 UTC (rev 291)
+++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/ContactFilterImpl.java 2010-01-28 19:51:18 UTC (rev 292)
@@ -59,9 +59,9 @@
// Seems to be necessary to have distinct on sampleRows in case of
// fishingZone join. Otherwise multiple contacts for sames sampleRow
// will be returned (Bad count).
- TopiaQuery<SampleRow> subquery = TopiaQuery.createQuery(SampleRow.class, "S").setSelect("S").addDistinct();
- subquery = prepareQueryForSampling(subquery, "S");
- query.add(contact + "." + Contact.SAMPLE_ROW + " IN (" + subquery.fullQuery() + ")").addParams(subquery.getParams());
+// TopiaQuery<SampleRow> subquery = TopiaQuery.createQuery(SampleRow.class, "S").setSelect("S").addDistinct();
+ query = prepareQueryForSampling(query, contact + "." + Contact.SAMPLE_ROW);
+// query.add(contact + "." + Contact.SAMPLE_ROW + " IN (" + subquery.fullQuery() + ")").addParams(subquery.getParams());
}
query = prepareQueryForBoat(query, contact + "." + Contact.BOAT);
Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/SamplingFilterImpl.java
===================================================================
--- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/SamplingFilterImpl.java 2010-01-28 17:22:32 UTC (rev 291)
+++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/SamplingFilterImpl.java 2010-01-28 19:51:18 UTC (rev 292)
@@ -51,11 +51,16 @@
if (getSampleRow() != null) {
query.add(main, getSampleRow());
} else if (StringUtils.isNotEmpty(getSectorName())) {
- query.addFrom(FishingZone.class.getName() + " F");
- query.add("F." + FishingZone.SECTOR_NAME, getSectorName()).add("F IN elements(" + main + "." + SampleRow.FISHING_ZONE + ")");
+
+ TopiaQuery<SampleRow> subquery = TopiaQuery.createQuery(SampleRow.class, "SR").addFrom(FishingZone.class.getName() + " F");
+ subquery.add("F." + FishingZone.SECTOR_NAME, getSectorName()).add("F IN elements(SR." + SampleRow.FISHING_ZONE + ")");
+
+ query.add(main + " IN (" + subquery.fullQuery() + ")").addParams(subquery.getParams());
} else if (StringUtils.isNotEmpty(getFacadeName())) {
- query.addFrom(FishingZone.class.getName() + " F");
- query.add("F." + FishingZone.FACADE_NAME, getFacadeName()).add("F IN elements(" + main + "." + SampleRow.FISHING_ZONE + ")");
+ TopiaQuery<SampleRow> subquery = TopiaQuery.createQuery(SampleRow.class, "SR").addFrom(FishingZone.class.getName() + " F");
+ subquery.add("F." + FishingZone.FACADE_NAME, getFacadeName()).add("F IN elements(SR." + SampleRow.FISHING_ZONE + ")");
+
+ query.add(main + " IN (" + subquery.fullQuery() + ")").addParams(subquery.getParams());
}
// Profession filter
@@ -63,6 +68,11 @@
query.add(main + "." + SampleRow.PROFESSION, getProfession());
}
+ // Program filter
+ if (getProgramName() != null) {
+ query.add(main + "." + SampleRow.PROGRAM_NAME, getProgramName());
+ }
+
// Period filter on sampleRow dates
if (getPeriod() != null) {
getPeriod().initDayOfMonthExtremities();
Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceBoatImpl.java
===================================================================
--- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceBoatImpl.java 2010-01-28 17:22:32 UTC (rev 291)
+++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceBoatImpl.java 2010-01-28 19:51:18 UTC (rev 292)
@@ -139,10 +139,7 @@
// Add join for ElligibleBoat
String elligibleBoatClassName = ElligibleBoat.class.getName();
query.addFrom(elligibleBoatClassName + " E").add("E." + ElligibleBoat.BOAT + " = " + main);
- //query = filter.prepareQueryForSampling(query, "E." + ElligibleBoat.SAMPLE_ROW);
- TopiaQuery<SampleRow> subquery = TopiaQuery.createQuery(SampleRow.class, "S").setSelect("S").addDistinct();
- subquery = filter.prepareQueryForSampling(subquery, "S");
- query.add("E." + ElligibleBoat.SAMPLE_ROW + " IN (" + subquery.fullQuery() + ")").addParams(subquery.getParams());
+ query = filter.prepareQueryForSampling(query, "E." + ElligibleBoat.SAMPLE_ROW);
// Company
if (filter.getCompany() != null) {
Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceContactImpl.java
===================================================================
--- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceContactImpl.java 2010-01-28 17:22:32 UTC (rev 291)
+++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceContactImpl.java 2010-01-28 19:51:18 UTC (rev 292)
@@ -361,7 +361,7 @@
}
if (company != null) {
- String rowCode = ImportHelper.read(reader, SAMPLING.PLAN_CODE);
+ String rowCode = ImportHelper.readSampleRowCode(reader);
SampleRow row = rowDAO.findByProperties(SampleRow.CODE, rowCode, SampleRow.COMPANY, company);
Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceReferentialImpl.java
===================================================================
--- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceReferentialImpl.java 2010-01-28 17:22:32 UTC (rev 291)
+++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceReferentialImpl.java 2010-01-28 19:51:18 UTC (rev 292)
@@ -26,6 +26,7 @@
import fr.ifremer.suiviobsmer.SuiviObsmerException;
import fr.ifremer.suiviobsmer.SuiviObsmerModelDAOHelper;
import fr.ifremer.suiviobsmer.SuiviObsmerContext;
+import fr.ifremer.suiviobsmer.bean.SamplingFilter;
import fr.ifremer.suiviobsmer.entity.Company;
import fr.ifremer.suiviobsmer.entity.FishingZone;
import fr.ifremer.suiviobsmer.entity.FishingZoneDAO;
@@ -66,7 +67,7 @@
}
@Override
- public List<String> getFacades(Company company) throws SuiviObsmerException {
+ public List<String> getFacades(SamplingFilter filter) throws SuiviObsmerException {
TopiaContext transaction = null;
List<String> results = new ArrayList<String>();
try {
@@ -75,11 +76,7 @@
FishingZoneDAO dao = SuiviObsmerModelDAOHelper.getFishingZoneDAO(transaction);
TopiaQuery<FishingZone> query = dao.createQuery("F");
- if (company != null) {
- query.addFrom(SampleRow.class.getName() + " S").
- add("S IN elements(F." + FishingZone.SAMPLE_ROW + ")").
- add("S." + SampleRow.COMPANY, company);
- }
+ query = prepareQueryForFishingZoneFilter(query, filter);
results = (List<String>)query.setSelect("DISTINCT F." + FishingZone.FACADE_NAME).execute();
@@ -91,7 +88,7 @@
}
@Override
- public List<String> getSectors(Company company, String facadeName) throws SuiviObsmerException {
+ public List<String> getSectors(SamplingFilter filter) throws SuiviObsmerException {
TopiaContext transaction = null;
List<String> results = new ArrayList<String>();
try {
@@ -100,14 +97,10 @@
FishingZoneDAO dao = SuiviObsmerModelDAOHelper.getFishingZoneDAO(transaction);
TopiaQuery<FishingZone> query = dao.createQuery("F");
- if (company != null) {
- query.addFrom(SampleRow.class.getName() + " S").
- add("S IN elements(F." + FishingZone.SAMPLE_ROW + ")").
- add("S." + SampleRow.COMPANY, company);
- }
+ query = prepareQueryForFishingZoneFilter(query, filter);
- if (StringUtils.isNotEmpty(facadeName)) {
- query.add("F." + FishingZone.FACADE_NAME, facadeName);
+ if (StringUtils.isNotEmpty(filter.getFacadeName())) {
+ query.add("F." + FishingZone.FACADE_NAME, filter.getFacadeName());
}
results = (List<String>)query.setSelect("DISTINCT F." + FishingZone.SECTOR_NAME).execute();
@@ -119,6 +112,23 @@
return results;
}
+ protected TopiaQuery<FishingZone> prepareQueryForFishingZoneFilter(TopiaQuery<FishingZone> query, SamplingFilter filter) {
+ if (filter.getCompany() != null || StringUtils.isNotEmpty(filter.getProgramName())) {
+ query.addFrom(SampleRow.class.getName() + " S").
+ add("S IN elements(F." + FishingZone.SAMPLE_ROW + ")");
+ }
+
+ if (filter.getCompany() != null) {
+ query.add("S." + SampleRow.COMPANY, filter.getCompany());
+ }
+
+ if (filter.getProgramName() != null) {
+ query.add("S." + SampleRow.PROGRAM_NAME, filter.getProgramName());
+ }
+
+ return query;
+ }
+
@Override
public List<Profession> getProfessions() throws SuiviObsmerException {
TopiaContext transaction = null;
Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceSamplingImpl.java
===================================================================
--- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceSamplingImpl.java 2010-01-28 17:22:32 UTC (rev 291)
+++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceSamplingImpl.java 2010-01-28 19:51:18 UTC (rev 292)
@@ -315,15 +315,21 @@
}
@Override
- public List<String> getPrograms() throws SuiviObsmerException {
+ public List<String> getPrograms(Company company) throws SuiviObsmerException {
TopiaContext transaction = null;
List<String> results = new ArrayList<String>();
try {
transaction = rootContext.beginTransaction();
SampleRowDAO dao = SuiviObsmerModelDAOHelper.getSampleRowDAO(transaction);
- results = (List<String>)dao.createQuery().setSelect("DISTINCT " + SampleRow.PROGRAM_NAME).execute();
+ TopiaQuery<SampleRow> query = dao.createQuery();
+ if (company != null) {
+ query.add(SampleRow.COMPANY, company);
+ }
+
+ results = (List<String>)query.setSelect("DISTINCT " + SampleRow.PROGRAM_NAME).execute();
+
transaction.closeContext();
} catch (Exception eee) {
SuiviObsmerContext.serviceException(transaction,
@@ -438,7 +444,7 @@
String[] part = maxCode.split("_");
num = Integer.parseInt(part[1]) + 1;
}
- String str = StringUtils.leftPad("" + num, 2, "0");
+ String str = StringUtils.leftPad("" + num, 4, "0");
result = year + "_" + str;
transaction.closeContext();
@@ -509,15 +515,12 @@
log.trace(" " + Arrays.asList(reader.getValues()));
}
- String code = reader.get(SAMPLING.PLAN_CODE.name()).trim();
+ String code = ImportHelper.readSampleRowCode(reader); //reader.get(SAMPLING.PLAN_CODE.name()).trim();
if (StringUtils.isEmpty(code)) {
continue;
}
- // Replace single number after year by a double one : 2010_1 -> 2010_01
- code = code.replaceFirst("_(\\d)$", "_0$1");
-
String districts = reader.get(FISHING_ZONE.PECHE_DIVISION.name());
row = dao.findByCode(code);
Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceSynthesisImpl.java
===================================================================
--- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceSynthesisImpl.java 2010-01-28 17:22:32 UTC (rev 291)
+++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceSynthesisImpl.java 2010-01-28 19:51:18 UTC (rev 292)
@@ -96,9 +96,7 @@
addParam("fromDate", period.getFromDate()).addParam("thruDate", period.getThruDate()).
addGroup(periodDate).addOrder(periodDate);
- TopiaQuery<SampleRow> subquery = TopiaQuery.createQuery(SampleRow.class, "S").setSelect("S").addDistinct();
- subquery = filter.prepareQueryForSampling(subquery, "S");
- query.add("M." + SampleMonth.SAMPLE_ROW + " IN (" + subquery.fullQuery() + ")").addParams(subquery.getParams());
+ query = filter.prepareQueryForSampling(query, "M." + SampleMonth.SAMPLE_ROW);
if (log.isTraceEnabled()) {
log.trace("Exec query : " + query);
Modified: trunk/suiviobsmer-business/src/main/xmi/suiviobsmer.zargo
===================================================================
(Binary files differ)
Modified: trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/ImportHelperTest.java
===================================================================
--- trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/ImportHelperTest.java 2010-01-28 17:22:32 UTC (rev 291)
+++ trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/ImportHelperTest.java 2010-01-28 19:51:18 UTC (rev 292)
@@ -21,7 +21,11 @@
package fr.ifremer.suiviobsmer;
-import fr.ifremer.suiviobsmer.business.SuiviObsmerRunnerTest;
+import com.csvreader.CsvReader;
+import fr.ifremer.suiviobsmer.ImportHelper.SAMPLING;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.charset.Charset;
import java.util.Calendar;
import java.util.Date;
import java.util.GregorianCalendar;
@@ -45,6 +49,8 @@
private static final Logger log = LoggerFactory.getLogger(ImportHelperTest.class);
+ private CsvReader reader;
+
public ImportHelperTest() {
runner = new SuiviObsmerRunnerTest();
}
@@ -60,12 +66,18 @@
}
@Before
- public void setUp() throws SuiviObsmerException {
+ public void setUp() throws SuiviObsmerException, IOException {
runner.start();
+
+ InputStream input = getClass().getResourceAsStream("/import/misc.csv");
+ reader = new CsvReader(input, Charset.forName("UTF-8"));
+ reader.readHeaders();
}
@After
public void tearDown() throws SuiviObsmerException {
+ reader.close();
+
runner.stop();
}
@@ -146,4 +158,88 @@
System.out.println("logTimeAndMemory");
}
+ /**
+ * Test of parseContactValidation method, of class ImportHelper.
+ */
+ //@Test
+ public void testParseContactValidation() throws Exception {
+ System.out.println("parseContactValidation");
+ }
+
+ /**
+ * Test of readSampleRowCode method, of class ImportHelper.
+ */
+ @Test
+ public void testReadSampleRowCode() throws Exception {
+ System.out.println("readSampleRowCode");
+
+ reader.readRecord();
+ String code = ImportHelper.readSampleRowCode(reader);
+ assertEquals(code, "2009_0001");
+
+ reader.readRecord();
+ code = ImportHelper.readSampleRowCode(reader);
+ assertEquals(code, "2009_0011");
+
+ reader.readRecord();
+ code = ImportHelper.readSampleRowCode(reader);
+ assertEquals(code, "2009_0111");
+
+ reader.readRecord();
+ code = ImportHelper.readSampleRowCode(reader);
+ assertEquals(code, "2009_1111");
+ }
+
+ /**
+ * Test of getContactDateFormat method, of class ImportHelper.
+ */
+ //@Test
+ public void testGetContactDateFormat() {
+ System.out.println("getContactDateFormat");
+ }
+
+ /**
+ * Test of read method, of class ImportHelper.
+ */
+ @Test
+ public void testRead() throws Exception {
+ log.info("read");
+
+ reader.readRecord();
+ String code = ImportHelper.read(reader, SAMPLING.PLAN_CODE);
+ assertEquals(code, "2009_1");
+ }
+
+ /**
+ * Test of readInt method, of class ImportHelper.
+ */
+ //@Test
+ public void testReadInt() throws Exception {
+ System.out.println("readInt");
+ }
+
+ /**
+ * Test of readInteger method, of class ImportHelper.
+ */
+ //@Test
+ public void testReadInteger() throws Exception {
+ System.out.println("readInteger");
+ }
+
+ /**
+ * Test of readPeriod method, of class ImportHelper.
+ */
+ //@Test
+ public void testReadPeriod() throws Exception {
+ System.out.println("readPeriod");
+ }
+
+ /**
+ * Test of readDate method, of class ImportHelper.
+ */
+ //@Test
+ public void testReadDate() throws Exception {
+ System.out.println("readDate");
+ }
+
}
Modified: trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/SuiviObsmerGlobalTest.java
===================================================================
--- trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/SuiviObsmerGlobalTest.java 2010-01-28 17:22:32 UTC (rev 291)
+++ trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/SuiviObsmerGlobalTest.java 2010-01-28 19:51:18 UTC (rev 292)
@@ -21,7 +21,6 @@
package fr.ifremer.suiviobsmer;
-import fr.ifremer.suiviobsmer.business.SuiviObsmerRunnerTest;
import fr.ifremer.suiviobsmer.entity.Company;
import fr.ifremer.suiviobsmer.entity.WaoUser;
import fr.ifremer.suiviobsmer.impl.ServiceUserImpl;
Copied: trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/SuiviObsmerRunnerTest.java (from rev 285, trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/business/SuiviObsmerRunnerTest.java)
===================================================================
--- trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/SuiviObsmerRunnerTest.java (rev 0)
+++ trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/SuiviObsmerRunnerTest.java 2010-01-28 19:51:18 UTC (rev 292)
@@ -0,0 +1,159 @@
+/*
+ * *##%
+ * SuiviObsmer :: Business
+ * Copyright (C) 2009 - 2010 Ifremer
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU 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 Lesser Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program. If not, see
+ * <http://www.gnu.org/licenses/gpl-3.0.html>.
+ * ##%*
+ */
+
+package fr.ifremer.suiviobsmer;
+
+import fr.ifremer.suiviobsmer.entity.Company;
+import fr.ifremer.suiviobsmer.entity.CompanyImpl;
+import fr.ifremer.suiviobsmer.entity.WaoUser;
+import fr.ifremer.suiviobsmer.entity.WaoUserImpl;
+import fr.ifremer.suiviobsmer.impl.ServiceBoatImpl;
+import fr.ifremer.suiviobsmer.impl.ServiceContactImpl;
+import fr.ifremer.suiviobsmer.impl.ServiceReferentialImpl;
+import fr.ifremer.suiviobsmer.impl.ServiceSamplingImpl;
+import fr.ifremer.suiviobsmer.impl.ServiceUserImpl;
+import fr.ifremer.suiviobsmer.services.ServiceBoat;
+import fr.ifremer.suiviobsmer.services.ServiceContact;
+import fr.ifremer.suiviobsmer.services.ServiceReferential;
+import fr.ifremer.suiviobsmer.services.ServiceSampling;
+import fr.ifremer.suiviobsmer.services.ServiceUser;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.Properties;
+import org.junit.Ignore;
+import org.nuiton.topia.TopiaException;
+import org.nuiton.util.ApplicationConfig;
+import org.nuiton.util.Resource;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * ContextUtilObsmerTest
+ *
+ * Created: 23 nov. 2009
+ *
+ * @author fdesbois
+ * @version $Revision$
+ *
+ * Mise a jour: $Date$
+ * par : $Author$
+ */
+ at Ignore
+public class SuiviObsmerRunnerTest implements SuiviObsmerRunner {
+
+ private static final Logger log = LoggerFactory.getLogger(SuiviObsmerRunnerTest.class);
+
+ private ApplicationConfig _configuration;
+
+ @Override
+ public void start() throws SuiviObsmerException {
+ if (log.isDebugEnabled()) {
+ log.debug("TEST START : loadConfiguration");
+ }
+ try {
+ Properties options = loadFileProperties("TopiaContextSuiviObsmer.properties");
+ options.setProperty("topia.persistence.classes",
+ SuiviObsmerModelDAOHelper.getImplementationClassesAsString());
+
+ _configuration = new ApplicationConfig();
+ _configuration.setOptions(options);
+
+ SuiviObsmerContext.setRunner(this);
+ } catch (Exception eee) {
+ SuiviObsmerContext.serviceException(null, "Error during loadConfiguration from " +
+ "'TopiaContextSuiviObsmer.properties' file", eee);
+ }
+ }
+
+ @Override
+ public void stop() throws SuiviObsmerException {
+ if (log.isDebugEnabled()) {
+ log.debug("TEST STOP : clearContext");
+ }
+ try {
+ SuiviObsmerContext.getTopiaRootContext().clear(true);
+ } catch (TopiaException eee) {
+ SuiviObsmerContext.serviceException(null, "Error during clear database", eee);
+ }
+ }
+
+ private static Properties loadFileProperties(String filename)
+ throws URISyntaxException, IOException {
+ Properties props = new Properties();
+ URL url = Resource.getURL(filename);
+ if (log.isDebugEnabled()) {
+ log.debug(url.toString());
+ }
+ props.load(url.openStream());
+ return props;
+ }
+
+ @Override
+ public Date currentDate() {
+ Calendar calendar = new GregorianCalendar(2009, 9, 23); // 23/10/2009
+ return calendar.getTime();
+ }
+
+ @Override
+ public ApplicationConfig configuration() {
+ return _configuration;
+ }
+
+ public void prepareData() throws SuiviObsmerException {
+ ServiceBoat serviceBoat = new ServiceBoatImpl();
+ ServiceReferential serviceReferential = new ServiceReferentialImpl();
+ ServiceUser serviceUser = new ServiceUserImpl();
+ ServiceSampling serviceSampling = new ServiceSamplingImpl();
+ ServiceContact serviceContact = new ServiceContactImpl();
+
+ Company company = new CompanyImpl();
+ company.setName("TARTANPION");
+ company.setActive(true);
+ serviceUser.createUpdateCompany(company);
+
+ WaoUser observer = new WaoUserImpl();
+ observer.setCompany(company);
+ observer.setFirstName("Jean");
+ observer.setLastName("Michmuche");
+ observer.setLogin("jmichmuche");
+ observer.setActive(true);
+ serviceUser.createUpdateUser(observer, true);
+
+ InputStream input = getClass().getResourceAsStream("/import/navires.csv");
+ serviceBoat.importBoatCsv(input);
+
+ input = getClass().getResourceAsStream("/import/zonesPeche.csv");
+ serviceReferential.importFishingZoneCsv(input);
+
+ input = getClass().getResourceAsStream("/import/echantillonnage.csv");
+ serviceSampling.importSamplingPlanCsv(input);
+
+ input = getClass().getResourceAsStream("/import/contacts.csv");
+ // user import : no activation
+ serviceContact.importContactCsv(observer, input);
+ }
+
+}
Modified: trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/SuiviObsmerUtilsTest.java
===================================================================
--- trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/SuiviObsmerUtilsTest.java 2010-01-28 17:22:32 UTC (rev 291)
+++ trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/SuiviObsmerUtilsTest.java 2010-01-28 19:51:18 UTC (rev 292)
@@ -21,7 +21,6 @@
package fr.ifremer.suiviobsmer;
-import fr.ifremer.suiviobsmer.business.SuiviObsmerRunnerTest;
import fr.ifremer.suiviobsmer.entity.Company;
import fr.ifremer.suiviobsmer.entity.CompanyImpl;
import org.junit.After;
Deleted: trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/business/SuiviObsmerRunnerTest.java
===================================================================
--- trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/business/SuiviObsmerRunnerTest.java 2010-01-28 17:22:32 UTC (rev 291)
+++ trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/business/SuiviObsmerRunnerTest.java 2010-01-28 19:51:18 UTC (rev 292)
@@ -1,114 +0,0 @@
-/*
- * *##%
- * SuiviObsmer :: Business
- * Copyright (C) 2009 - 2010 Ifremer
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU 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 Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program. If not, see
- * <http://www.gnu.org/licenses/gpl-3.0.html>.
- * ##%*
- */
-
-package fr.ifremer.suiviobsmer.business;
-
-import fr.ifremer.suiviobsmer.SuiviObsmerException;
-import fr.ifremer.suiviobsmer.SuiviObsmerModelDAOHelper;
-import fr.ifremer.suiviobsmer.SuiviObsmerRunner;
-import fr.ifremer.suiviobsmer.SuiviObsmerContext;
-import java.io.IOException;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.GregorianCalendar;
-import java.util.Properties;
-import org.junit.Ignore;
-import org.nuiton.topia.TopiaException;
-import org.nuiton.util.ApplicationConfig;
-import org.nuiton.util.Resource;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * ContextUtilObsmerTest
- *
- * Created: 23 nov. 2009
- *
- * @author fdesbois
- * @version $Revision$
- *
- * Mise a jour: $Date$
- * par : $Author$
- */
- at Ignore
-public class SuiviObsmerRunnerTest implements SuiviObsmerRunner {
-
- private static final Logger log = LoggerFactory.getLogger(SuiviObsmerRunnerTest.class);
-
- private ApplicationConfig _configuration;
-
- @Override
- public void start() throws SuiviObsmerException {
- if (log.isDebugEnabled()) {
- log.debug("TEST START : loadConfiguration");
- }
- try {
- Properties options = loadFileProperties("TopiaContextSuiviObsmer.properties");
- options.setProperty("topia.persistence.classes",
- SuiviObsmerModelDAOHelper.getImplementationClassesAsString());
-
- _configuration = new ApplicationConfig();
- _configuration.setOptions(options);
-
- SuiviObsmerContext.setRunner(this);
- } catch (Exception eee) {
- SuiviObsmerContext.serviceException(null, "Error during loadConfiguration from " +
- "'TopiaContextSuiviObsmer.properties' file", eee);
- }
- }
-
- @Override
- public void stop() throws SuiviObsmerException {
- if (log.isDebugEnabled()) {
- log.debug("TEST STOP : clearContext");
- }
- try {
- SuiviObsmerContext.getTopiaRootContext().clear(true);
- } catch (TopiaException eee) {
- SuiviObsmerContext.serviceException(null, "Error during clear database", eee);
- }
- }
-
- private static Properties loadFileProperties(String filename)
- throws URISyntaxException, IOException {
- Properties props = new Properties();
- URL url = Resource.getURL(filename);
- if (log.isDebugEnabled()) {
- log.debug(url.toString());
- }
- props.load(url.openStream());
- return props;
- }
-
- @Override
- public Date currentDate() {
- Calendar calendar = new GregorianCalendar(2009, 9, 23); // 23/10/2009
- return calendar.getTime();
- }
-
- @Override
- public ApplicationConfig configuration() {
- return _configuration;
- }
-
-}
Modified: trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/entity/BoatImplTest.java
===================================================================
--- trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/entity/BoatImplTest.java 2010-01-28 17:22:32 UTC (rev 291)
+++ trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/entity/BoatImplTest.java 2010-01-28 19:51:18 UTC (rev 292)
@@ -25,7 +25,7 @@
import fr.ifremer.suiviobsmer.SuiviObsmerModelDAOHelper;
import fr.ifremer.suiviobsmer.SuiviObsmerRunner;
import fr.ifremer.suiviobsmer.bean.ContactState;
-import fr.ifremer.suiviobsmer.business.SuiviObsmerRunnerTest;
+import fr.ifremer.suiviobsmer.SuiviObsmerRunnerTest;
import fr.ifremer.suiviobsmer.impl.ServiceBoatImpl;
import fr.ifremer.suiviobsmer.impl.ServiceContactImpl;
import fr.ifremer.suiviobsmer.impl.ServiceSamplingImpl;
@@ -123,7 +123,7 @@
serviceSampling.importSamplingPlanCsv(input);
SampleRowDAO rowDAO = SuiviObsmerModelDAOHelper.getSampleRowDAO(transaction);
- SampleRow row = rowDAO.findByCode("2010_01");
+ SampleRow row = rowDAO.findByCode("2010_0001");
row.getCompany();
row.getProfession();
transaction.closeContext();
Modified: trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/entity/BoatInfosImplTest.java
===================================================================
--- trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/entity/BoatInfosImplTest.java 2010-01-28 17:22:32 UTC (rev 291)
+++ trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/entity/BoatInfosImplTest.java 2010-01-28 19:51:18 UTC (rev 292)
@@ -25,7 +25,7 @@
import fr.ifremer.suiviobsmer.SuiviObsmerModelDAOHelper;
import fr.ifremer.suiviobsmer.SuiviObsmerRunner;
import fr.ifremer.suiviobsmer.bean.ContactState;
-import fr.ifremer.suiviobsmer.business.SuiviObsmerRunnerTest;
+import fr.ifremer.suiviobsmer.SuiviObsmerRunnerTest;
import fr.ifremer.suiviobsmer.impl.ServiceBoatImpl;
import fr.ifremer.suiviobsmer.impl.ServiceContactImpl;
import fr.ifremer.suiviobsmer.services.ServiceBoat;
Modified: trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/entity/SampleRowImplTest.java
===================================================================
--- trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/entity/SampleRowImplTest.java 2010-01-28 17:22:32 UTC (rev 291)
+++ trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/entity/SampleRowImplTest.java 2010-01-28 19:51:18 UTC (rev 292)
@@ -25,7 +25,7 @@
import fr.ifremer.suiviobsmer.SuiviObsmerModelDAOHelper;
import fr.ifremer.suiviobsmer.SuiviObsmerRunner;
import fr.ifremer.suiviobsmer.SuiviObsmerContext;
-import fr.ifremer.suiviobsmer.business.SuiviObsmerRunnerTest;
+import fr.ifremer.suiviobsmer.SuiviObsmerRunnerTest;
import java.util.Calendar;
import java.util.Date;
import java.util.GregorianCalendar;
Modified: trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/impl/ActivityCalendarImportTest.java
===================================================================
--- trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/impl/ActivityCalendarImportTest.java 2010-01-28 17:22:32 UTC (rev 291)
+++ trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/impl/ActivityCalendarImportTest.java 2010-01-28 19:51:18 UTC (rev 292)
@@ -24,7 +24,7 @@
import fr.ifremer.suiviobsmer.SuiviObsmerContext;
import fr.ifremer.suiviobsmer.SuiviObsmerException;
import fr.ifremer.suiviobsmer.SuiviObsmerRunner;
-import fr.ifremer.suiviobsmer.business.SuiviObsmerRunnerTest;
+import fr.ifremer.suiviobsmer.SuiviObsmerRunnerTest;
import fr.ifremer.suiviobsmer.services.ServiceBoat;
import java.io.BufferedReader;
import java.io.File;
Modified: trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/impl/ServiceBoatImplTest.java
===================================================================
--- trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/impl/ServiceBoatImplTest.java 2010-01-28 17:22:32 UTC (rev 291)
+++ trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/impl/ServiceBoatImplTest.java 2010-01-28 19:51:18 UTC (rev 292)
@@ -26,7 +26,7 @@
import fr.ifremer.suiviobsmer.SuiviObsmerRunner;
import fr.ifremer.suiviobsmer.SuiviObsmerContext;
import fr.ifremer.suiviobsmer.bean.BoatFilterImpl;
-import fr.ifremer.suiviobsmer.business.SuiviObsmerRunnerTest;
+import fr.ifremer.suiviobsmer.SuiviObsmerRunnerTest;
import fr.ifremer.suiviobsmer.bean.BoatFilter;
import fr.ifremer.suiviobsmer.bean.CompanyBoatInfos;
import fr.ifremer.suiviobsmer.bean.ContactState;
@@ -223,9 +223,9 @@
// Get two SampleRows : 2009_3 & 2010_4
SampleRowDAO rowDAO = SuiviObsmerModelDAOHelper.getSampleRowDAO(transaction);
- SampleRow row1 = rowDAO.findByCode("2009_03");
+ SampleRow row1 = rowDAO.findByCode("2009_0003");
row1.getProfession();
- SampleRow row2 = rowDAO.findByCode("2010_04");
+ SampleRow row2 = rowDAO.findByCode("2010_0004");
row2.getProfession();
transaction.commitTransaction();
@@ -269,7 +269,7 @@
TopiaContext transaction = SuiviObsmerContext.getTopiaRootContext().beginTransaction();
SampleRowDAO rowDAO = SuiviObsmerModelDAOHelper.getSampleRowDAO(transaction);
- SampleRow row = rowDAO.findByCode("2010_01");
+ SampleRow row = rowDAO.findByCode("2010_0001");
row.getCompany();
row.getProfession();
transaction.closeContext();
@@ -292,7 +292,7 @@
// ajout d'une nouvelle ligne "2010_4" non mise en elligible auparavent
companyBoatInfos.setNewElligibleBoat(rows.get(1));
// ligne deja elligible mise en inactive
- companyBoatInfos.removeElligibleBoat("2009_03");
+ companyBoatInfos.removeElligibleBoat("2009_0003");
service.createUpdateCompanyBoatInfos(companyBoatInfos);
@@ -301,18 +301,18 @@
Map<String, ElligibleBoat> results = companyBoatInfos.getElligibleBoats();
assertEquals(2, results.size());
- ElligibleBoat elligible = companyBoatInfos.getElligibleBoat("2009_03");
+ ElligibleBoat elligible = companyBoatInfos.getElligibleBoat("2009_0003");
assertNotNull(elligible.getCompanyActive());
assertFalse(elligible.getCompanyActive());
- elligible = companyBoatInfos.getElligibleBoat("2010_04");
+ elligible = companyBoatInfos.getElligibleBoat("2010_0004");
assertTrue(elligible.getCompanyActive());
/** TEST2 **/
// Suppression ligne lié elligible pour la société
- companyBoatInfos.removeElligibleBoat("2010_04");
+ companyBoatInfos.removeElligibleBoat("2010_0004");
// Reactivation ligne mise en inactive juste avant
- companyBoatInfos.activeElligibleBoat("2009_03");
+ companyBoatInfos.activeElligibleBoat("2009_0003");
service.createUpdateCompanyBoatInfos(companyBoatInfos);
@@ -321,7 +321,7 @@
results = companyBoatInfos.getElligibleBoats();
assertEquals(1, results.size());
- elligible = companyBoatInfos.getElligibleBoat("2009_03");
+ elligible = companyBoatInfos.getElligibleBoat("2009_0003");
assertNull(elligible.getCompanyActive());
assertTrue(elligible.getGlobalActive());
Modified: trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/impl/ServiceReferentialImplTest.java
===================================================================
--- trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/impl/ServiceReferentialImplTest.java 2010-01-28 17:22:32 UTC (rev 291)
+++ trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/impl/ServiceReferentialImplTest.java 2010-01-28 19:51:18 UTC (rev 292)
@@ -23,7 +23,9 @@
import fr.ifremer.suiviobsmer.SuiviObsmerException;
import fr.ifremer.suiviobsmer.SuiviObsmerRunner;
-import fr.ifremer.suiviobsmer.business.SuiviObsmerRunnerTest;
+import fr.ifremer.suiviobsmer.SuiviObsmerRunnerTest;
+import fr.ifremer.suiviobsmer.bean.SamplingFilter;
+import fr.ifremer.suiviobsmer.bean.SamplingFilterImpl;
import fr.ifremer.suiviobsmer.entity.FishingZone;
import java.io.InputStream;
import java.util.List;
@@ -81,7 +83,7 @@
InputStream input = getClass().getResourceAsStream("/import/zonesPeche.csv");
service.importFishingZoneCsv(input);
- List<String> facades = service.getFacades(null);
+ List<String> facades = service.getFacades(new SamplingFilterImpl());
assertEquals(3, facades.size());
assertTrue(facades.contains("Atlantique"));
assertTrue(facades.contains("Mer du Nord"));
@@ -95,7 +97,9 @@
InputStream input = getClass().getResourceAsStream("/import/zonesPeche.csv");
service.importFishingZoneCsv(input);
- List<String> sectors = service.getSectors(null, null);
+ SamplingFilter filter = new SamplingFilterImpl();
+
+ List<String> sectors = service.getSectors(filter);
assertEquals(5, sectors.size());
assertTrue(sectors.contains("Manche"));
assertTrue(sectors.contains("Mer du Nord"));
@@ -103,7 +107,9 @@
assertTrue(sectors.contains("Golfe de Gascogne"));
assertTrue(sectors.contains("Méditerranée"));
- sectors = service.getSectors(null, "Atlantique");
+ filter.setFacadeName("Atlantique");
+
+ sectors = service.getSectors(filter);
assertEquals(2, sectors.size());
assertTrue(sectors.contains("Manche Ouest"));
assertTrue(sectors.contains("Golfe de Gascogne"));
Modified: trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/impl/ServiceSamplingImplTest.java
===================================================================
--- trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/impl/ServiceSamplingImplTest.java 2010-01-28 17:22:32 UTC (rev 291)
+++ trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/impl/ServiceSamplingImplTest.java 2010-01-28 19:51:18 UTC (rev 292)
@@ -28,7 +28,7 @@
import fr.ifremer.suiviobsmer.bean.ImportResults;
import fr.ifremer.suiviobsmer.bean.SamplingFilter;
import fr.ifremer.suiviobsmer.bean.SamplingFilterImpl;
-import fr.ifremer.suiviobsmer.business.SuiviObsmerRunnerTest;
+import fr.ifremer.suiviobsmer.SuiviObsmerRunnerTest;
import fr.ifremer.suiviobsmer.entity.Boat;
import fr.ifremer.suiviobsmer.entity.Company;
import fr.ifremer.suiviobsmer.entity.CompanyDAO;
@@ -181,7 +181,7 @@
/**
* Test of getSampleRowsOrderedByFishingZone method, of class ServiceSamplingImpl.
*/
-// @Test
+ @Test
public void testGetSampleRowsOrderedByFishingZone() throws Exception {
log.info("getSampleRowsOrderedByFishingZone");
@@ -205,19 +205,19 @@
SampleRowDAO dao = SuiviObsmerModelDAOHelper.getSampleRowDAO(transaction);
SampleRow row1 = dao.create();
- row1.setCode("2010_01");
+ row1.setCode("2010_0001");
row1.addFishingZone(zones.get(2));
row1.setProgramName("DPMA-2009");
row1.setPeriod(period1);
SampleRow row2 = dao.create();
- row2.setCode("2010_02");
+ row2.setCode("2010_0002");
row2.addFishingZone(zones.get(0));
row2.setProgramName("DPMA-2009");
row2.setPeriod(period1);
SampleRow row3 = dao.create();
- row3.setCode("2010_03");
+ row3.setCode("2010_0003");
row3.addFishingZone(zones.get(1));
row3.addFishingZone(zones.get(2));
row3.addFishingZone(zones.get(0));
@@ -225,7 +225,7 @@
row3.setPeriod(period2);
SampleRow row4 = dao.create();
- row4.setCode("2010_04");
+ row4.setCode("2010_0004");
row4.addFishingZone(zones.get(0));
row4.setProgramName("DPMA-2009");
row4.setPeriod(period1);
@@ -244,9 +244,9 @@
List<SampleRow> rows = service.getSampleRowsOrderedByFishingZone(period, null);
assertEquals(4, rows.size());
SampleRow resultRow0 = rows.get(0);
- assertEquals("2010_02", resultRow0.getCode());
+ assertEquals("2010_0002", resultRow0.getCode());
SampleRow resultRow1 = rows.get(1);
- assertEquals("2010_03", resultRow1.getCode());
+ assertEquals("2010_0003", resultRow1.getCode());
List<FishingZone> zoneRow1 = resultRow1.getFishingZone();
assertEquals(3, zoneRow1.size());
@@ -258,9 +258,9 @@
assertEquals("V", resultZone2.getDistrictCode());
SampleRow resultRow2 = rows.get(2);
- assertEquals("2010_04", resultRow2.getCode());
+ assertEquals("2010_0004", resultRow2.getCode());
SampleRow resultRow3 = rows.get(3);
- assertEquals("2010_01", resultRow3.getCode());
+ assertEquals("2010_0001", resultRow3.getCode());
// SECOND TEST :
// ORDER by FishingZone (facadeName, sectorName, districtCode)
@@ -272,11 +272,11 @@
rows = service.getSampleRowsOrderedByFishingZone(period, null);
assertEquals(3, rows.size());
resultRow0 = rows.get(0);
- assertEquals("2010_02", resultRow0.getCode());
+ assertEquals("2010_0002", resultRow0.getCode());
resultRow1 = rows.get(1);
- assertEquals("2010_04", resultRow1.getCode());
+ assertEquals("2010_0004", resultRow1.getCode());
resultRow2 = rows.get(2);
- assertEquals("2010_01", resultRow2.getCode());
+ assertEquals("2010_0001", resultRow2.getCode());
}
@@ -397,7 +397,7 @@
}
-// @Test
+ @Test
public void testDeleteSampleRow() throws Exception {
log.info("deleteSampleRow");
@@ -418,7 +418,7 @@
service.importSamplingPlanCsv(input);
SampleRowDAO rowDAO = SuiviObsmerModelDAOHelper.getSampleRowDAO(transaction);
- SampleRow row = rowDAO.findByCode("2010_01");
+ SampleRow row = rowDAO.findByCode("2010_0001");
row.getProfession();
row.getCompany();
transaction.closeContext();
@@ -434,7 +434,7 @@
service.deleteSampleRow(row);
transaction = SuiviObsmerContext.getTopiaRootContext().beginTransaction();
rowDAO = SuiviObsmerModelDAOHelper.getSampleRowDAO(transaction);
- row = rowDAO.findByCode("2010_01");
+ row = rowDAO.findByCode("2010_0001");
assertNull(row);
ElligibleBoatDAO elligibleDAO = SuiviObsmerModelDAOHelper.getElligibleBoatDAO(transaction);
@@ -443,7 +443,7 @@
transaction.closeContext();
}
-// @Test
+ @Test
public void testImportSamplingPlanCsv() throws SuiviObsmerException, TopiaException {
log.info("importSamplingPlanCsv");
@@ -479,7 +479,7 @@
SampleRowDAO rowDAO = SuiviObsmerModelDAOHelper.getSampleRowDAO(transaction);
- SampleRow row1 = rowDAO.findByCode("2010_01");
+ SampleRow row1 = rowDAO.findByCode("2010_0001");
assertNotNull(row1);
assertEquals(1, row1.getNbObservants());
assertEquals(1.5, row1.getAverageTideTime(), 0.1);
@@ -501,7 +501,7 @@
transaction.closeContext();
}
-// @Test
+ @Test
public void testGetPrograms() throws Exception {
/** PREPARE DATA **/
TopiaContext transaction = SuiviObsmerContext.getTopiaRootContext().beginTransaction();
@@ -520,12 +520,12 @@
service.importSamplingPlanCsv(input);
/** EXEC METHOD **/
- List<String> programs = service.getPrograms();
+ List<String> programs = service.getPrograms(null);
assertEquals(4, programs.size());
}
-// @Test
+ @Test
public void testGetNewSampleRowCode() throws Exception {
log.info("getNewSampleRowCode");
@@ -552,16 +552,16 @@
Calendar begin = new GregorianCalendar(2009, 11, 1);
String result = service.getNewSampleRowCode(begin.getTime());
- Assert.assertEquals("2009_07", result);
+ Assert.assertEquals("2009_0007", result);
// Test regex for replacment in importSamplingPlanCsv
- String code = "2010_1";
- code = code.replaceFirst("_(\\d)$", "_0$1");
- Assert.assertEquals("2010_01", code);
-
- code = "2010_04";
- code = code.replaceFirst("_(\\d)$", "_0$1");
- Assert.assertEquals("2010_04", code);
+// String code = "2010_1";
+// code = code.replaceFirst("_(\\d)$", "_0$1");
+// Assert.assertEquals("2010_01", code);
+//
+// code = "2010_04";
+// code = code.replaceFirst("_(\\d)$", "_0$1");
+// Assert.assertEquals("2010_04", code);
}
}
Modified: trunk/suiviobsmer-business/src/test/resources/import/contacts.csv
===================================================================
--- trunk/suiviobsmer-business/src/test/resources/import/contacts.csv 2010-01-28 17:22:32 UTC (rev 291)
+++ trunk/suiviobsmer-business/src/test/resources/import/contacts.csv 2010-01-28 19:51:18 UTC (rev 292)
@@ -0,0 +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/07/2009,"jmichmuche","2010_01",177474,"Embarquement réalisé ",22/07/2010,22/07/2010,1,,,,22/07/2010,"A","A"
\ No newline at end of file
Added: trunk/suiviobsmer-business/src/test/resources/import/misc.csv
===================================================================
--- trunk/suiviobsmer-business/src/test/resources/import/misc.csv (rev 0)
+++ trunk/suiviobsmer-business/src/test/resources/import/misc.csv 2010-01-28 19:51:18 UTC (rev 292)
@@ -0,0 +1,5 @@
+PLAN_CODE
+2009_1
+2009_11
+2009_111
+2009_1111
\ No newline at end of file
Modified: trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/base/AbstractFilteredPage.java
===================================================================
--- trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/base/AbstractFilteredPage.java 2010-01-28 17:22:32 UTC (rev 291)
+++ trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/base/AbstractFilteredPage.java 2010-01-28 19:51:18 UTC (rev 292)
@@ -127,6 +127,14 @@
@Property
private String observerId;
+ @Persist
+ private SelectModel programSelectModel;
+
+ @Persist
+ private boolean observerSelect;
+
+ @Persist
+ private boolean programSelect;
/**
* Initialize all select for filters. By default, only facade, sector and
* sampleRow selects will be initialized.
@@ -135,7 +143,9 @@
* @param observerSelect if true, observer select will be initialized
* @throws SuiviObsmerException
*/
- protected void initSelectFilters(boolean companySelect, boolean observerSelect) throws SuiviObsmerException {
+ protected void initSelectFilters(boolean companySelect, boolean observerSelect, boolean programSelect) throws SuiviObsmerException {
+ this.observerSelect = observerSelect;
+ this.programSelect = programSelect;
if (getFilter().getSampleRow() != null) {
if (log.isDebugEnabled()) {
@@ -166,6 +176,11 @@
}
}
+ if (programSelect) {
+ programSelectModel = null;
+ getProgramSelectModel();
+ }
+
resetFacadeSelect();
resetSectorSelect();
resetSampleRowSelect();
@@ -199,7 +214,7 @@
log.info("BUSINESS REQUEST [getFacades]");
}
List<OptionModel> options = new ArrayList<OptionModel>();
- for (String facadeName : serviceReferential.getFacades(getFilter().getCompany())) {
+ for (String facadeName : serviceReferential.getFacades(getFilter())) {
options.add(new OptionModelImpl(facadeName,facadeName));
}
facadeSelectModel = new SelectModelImpl(null, options);
@@ -220,7 +235,7 @@
log.info("BUSINESS REQUEST [getSectors]");
}
List<OptionModel> options = new ArrayList<OptionModel>();
- for (String sectorName : serviceReferential.getSectors(getFilter().getCompany(), getFilter().getFacadeName())) {
+ for (String sectorName : serviceReferential.getSectors(getFilter())) {
options.add(new OptionModelImpl(sectorName,sectorName));
}
sectorSelectModel = new SelectModelImpl(null, options);
@@ -299,6 +314,27 @@
return observerSelectModel;
}
+ /**
+ * Get select model for sampleRow program. Depends on company set in
+ * filter.
+ *
+ * @return the SelectModel for program names
+ * @throws SuiviObsmerException
+ */
+ public SelectModel getProgramSelectModel() throws SuiviObsmerException {
+ if (programSelectModel == null) {
+ if (log.isInfoEnabled()) {
+ log.info("BUSINESS REQUEST [getPrograms]");
+ }
+ List<OptionModel> options = new ArrayList<OptionModel>();
+ for (String programName : serviceSampling.getPrograms(getFilter().getCompany())) {
+ options.add(new OptionModelImpl(programName, programName));
+ }
+ programSelectModel = new SelectModelImpl(null, options);
+ }
+ return programSelectModel;
+ }
+
protected abstract BoatFilter getFilter() throws SuiviObsmerException;
/**
@@ -335,31 +371,54 @@
getFilter().setCompany(user.getCompany());
}
- WaoUser observer = getObserverSelectModel().findObject(observerId);
- getFilter().setObserver(observer);
+ if (observerSelect) {
+ WaoUser observer = getObserverSelectModel().findObject(observerId);
+ getFilter().setObserver(observer);
+ }
}
private boolean edited;
/**
* EVENT :: selected on refreshByCompany submit button. Reset selects for
- * company selected : facades, sectors, sampleRows and observers.
+ * company selected : programs, facades, sectors, sampleRows and observers.
* This method set the state to edited, you can use
* {@link AbstractFilteredPage#isEdited() } method to test it.
*
* @throws SuiviObsmerException
+ * @see AbstractFilteredPage#onSelectedFromRefreshByProgram()
+ */
+ public void onSelectedFromRefreshByCompany() throws SuiviObsmerException {
+ // Reset programs (the behavior is needed even if programSelect is false)
+ getFilter().setProgramName(null);
+ onSelectedFromRefreshByProgram();
+ if (observerSelect) {
+ // Reset observers
+ getFilter().setObserver(null);
+ observerSelectModel = null;
+ getObserverSelectModel();
+ }
+ if (programSelect) {
+ programSelectModel = null;
+ getProgramSelectModel();
+ }
+ edited = true;
+ }
+
+ /**
+ * EVENT :: selected on refreshByProgram submit button. Reset selects for
+ * program selected : facades, sectors and sampleRows.
+ * This method set the state to edited, you can use
+ * {@link AbstractFilteredPage#isEdited() } method to test it.
+ *
+ * @throws SuiviObsmerException
* @see AbstractFilteredPage#onSelectedFromRefreshByFacade()
*/
- public void onSelectedFromRefreshByCompany() throws SuiviObsmerException {
+ public void onSelectedFromRefreshByProgram() throws SuiviObsmerException {
// Reset facades
getFilter().setFacadeName(null);
onSelectedFromRefreshByFacade();
resetFacadeSelect();
- // Reset observers
- getFilter().setObserver(null);
- observerSelectModel = null;
- getObserverSelectModel();
- edited = true;
}
/**
Modified: trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Boats.java
===================================================================
--- trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Boats.java 2010-01-28 17:22:32 UTC (rev 291)
+++ trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Boats.java 2010-01-28 19:51:18 UTC (rev 292)
@@ -144,7 +144,7 @@
}
// Initialize filters using AbstractFilteredPage superclass
- initSelectFilters(false, false);
+ initSelectFilters(false, false, false);
companyBoatInfos = null;
//boatSelectedImmatriculation = null;
Modified: trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Contacts.java
===================================================================
--- trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Contacts.java 2010-01-28 17:22:32 UTC (rev 291)
+++ trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Contacts.java 2010-01-28 19:51:18 UTC (rev 292)
@@ -121,16 +121,10 @@
if (log.isDebugEnabled()) {
log.debug("RESET DATA");
}
- initSelectFilters(true ,true);
+ initSelectFilters(true, true, false);
contacts = null;
getContacts();
// }
-// String boatName = getFilter().getBoatName();
-// boolean companyFiltered = getFilter().getCompany() != null && user.getAdmin();
- // Show filters only if no boatName is set
-// if ((getContactFilter().isFiltered() || companyFiltered) && StringUtils.isEmpty(boatName)) {
-// filtersVisible = true;
-// }
contactsForm.clearErrors();
}
@@ -145,11 +139,6 @@
@InjectComponent
private Zone importExportZone;
-// @Property
-// @Persist(PersistenceConstants.FLASH)
-//// @Persist
-// private boolean filtersVisible;
-
private boolean reset;
@Property
Modified: trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/SampleRowForm.java
===================================================================
--- trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/SampleRowForm.java 2010-01-28 17:22:32 UTC (rev 291)
+++ trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/SampleRowForm.java 2010-01-28 19:51:18 UTC (rev 292)
@@ -344,7 +344,7 @@
log.info("BUSINESS REQUEST [getPrograms]");
}
List<OptionModel> options = new ArrayList<OptionModel>();
- for (String name : serviceSampling.getPrograms()) {
+ for (String name : serviceSampling.getPrograms(null)) {
options.add(new OptionModelImpl(name, name));
}
programSelectModel = new SelectModelImpl(null, options);
Modified: trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Synthesis.java
===================================================================
--- trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Synthesis.java 2010-01-28 17:22:32 UTC (rev 291)
+++ trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Synthesis.java 2010-01-28 19:51:18 UTC (rev 292)
@@ -77,7 +77,7 @@
private WaoUser user;
void setupRender() throws SuiviObsmerException {
- initSelectFilters(true, false);
+ initSelectFilters(true, false, true);
//getFilter().setUnfinishedRowsOnly(false);
}
@@ -100,14 +100,20 @@
dataSamplingFilter = new BoatFilterImpl();
if (!user.getAdmin()) {
dataSamplingFilter.setCompany(user.getCompany());
- }
+ }
+ }
+ return dataSamplingFilter;
+ }
+
+ public PeriodDates getPeriod() throws SuiviObsmerException {
+ if (getFilter().getPeriod() == null) {
PeriodDates period = PeriodDates.createMonthsPeriodFromToday(-12);
if (log.isDebugEnabled()) {
log.debug("Period : " + period);
}
- dataSamplingFilter.setPeriod(period);
+ getFilter().setPeriod(period);
}
- return dataSamplingFilter;
+ return getFilter().getPeriod();
}
@Override
Modified: trunk/suiviobsmer-ui/src/main/resources/fr/ifremer/suiviobsmer/ui/pages/Synthesis.properties
===================================================================
--- trunk/suiviobsmer-ui/src/main/resources/fr/ifremer/suiviobsmer/ui/pages/Synthesis.properties 2010-01-28 17:22:32 UTC (rev 291)
+++ trunk/suiviobsmer-ui/src/main/resources/fr/ifremer/suiviobsmer/ui/pages/Synthesis.properties 2010-01-28 19:51:18 UTC (rev 292)
@@ -6,4 +6,5 @@
facadeName-label: Fa\u00E7ade
sectorName-label: Zone
sampleRow-label: Code ligne
-company-label: Soci\u00E9t\u00E9
\ No newline at end of file
+company-label: Soci\u00E9t\u00E9
+programName-label: Programme
\ No newline at end of file
Modified: trunk/suiviobsmer-ui/src/main/webapp/Synthesis.tml
===================================================================
--- trunk/suiviobsmer-ui/src/main/webapp/Synthesis.tml 2010-01-28 17:22:32 UTC (rev 291)
+++ trunk/suiviobsmer-ui/src/main/webapp/Synthesis.tml 2010-01-28 19:51:18 UTC (rev 292)
@@ -54,15 +54,21 @@
<div class="filterRow">
<label>Période: </label>
<t:label t:for="periodBegin" />:
- <input t:type="datefield" class="width70" t:id="periodBegin" t:value="filter.period.fromDate" />
+ <input t:type="datefield" class="width70" t:id="periodBegin" t:value="period.fromDate" />
<t:label t:for="periodEnd" />:
- <input t:type="datefield" class="width70" t:id="periodEnd" t:value="filter.period.thruDate" />
+ <input t:type="datefield" class="width70" t:id="periodEnd" t:value="period.thruDate" />
+ </div>
+ <div>
<t:if t:test="user.admin">
- <t:label t:for="company" />:
- <input t:type="select" t:id="company" t:model="companySelectModel" value="companyId"/>
+ <t:label t:for="company" />:
+ <input t:type="select" t:id="company" t:model="companySelectModel" value="companyId"/>
<input t:type="submit" class="ico22px refresh" t:id="refreshByCompany" value="Refresh"
- title="Rafraîchir les filtres en fonction de la société sélectionnée"/>
+ title="Rafraîchir les filtres en fonction de la société sélectionnée"/>
</t:if>
+ <t:label t:for="programName" />:
+ <select t:type="select" t:id="programName" t:model="programSelectModel" value="filter.programName" />
+ <input t:type="submit" class="ico22px refresh" t:id="refreshByProgram" value="Refresh"
+ title="Rafraîchir les secteurs de pêche et les métiers en fonction du programme sélectionné"/>
</div>
<div class="filterRow" t:type="zone" t:id="sampleRowZone" t:update="show">
<t:label t:for="facadeName" />:
1
0
[Suiviobsmer-commits] r291 - in trunk: suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/services suiviobsmer-ui/src/main/webapp
by fdesbois＠users.labs.libre-entreprise.org 28 Jan '10
by fdesbois＠users.labs.libre-entreprise.org 28 Jan '10
28 Jan '10
Author: fdesbois
Date: 2010-01-28 17:22:32 +0000 (Thu, 28 Jan 2010)
New Revision: 291
Modified:
trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceBoatImpl.java
trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceSynthesisImpl.java
trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Contacts.java
trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/services/ContactModelFactory.java
trunk/suiviobsmer-ui/src/main/webapp/Boats.tml
trunk/suiviobsmer-ui/src/main/webapp/Contacts.tml
trunk/suiviobsmer-ui/src/main/webapp/Synthesis.tml
Log:
- Resolve problem on filters with facade and sector --> need subquery
- Evol #2057 : fromDate on contactFilter + text on submits buttons (search and reset)
- Ano #2056 : fromDate problem
Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceBoatImpl.java
===================================================================
--- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceBoatImpl.java 2010-01-27 17:27:43 UTC (rev 290)
+++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceBoatImpl.java 2010-01-28 17:22:32 UTC (rev 291)
@@ -139,7 +139,10 @@
// Add join for ElligibleBoat
String elligibleBoatClassName = ElligibleBoat.class.getName();
query.addFrom(elligibleBoatClassName + " E").add("E." + ElligibleBoat.BOAT + " = " + main);
- query = filter.prepareQueryForSampling(query, "E." + ElligibleBoat.SAMPLE_ROW);
+ //query = filter.prepareQueryForSampling(query, "E." + ElligibleBoat.SAMPLE_ROW);
+ TopiaQuery<SampleRow> subquery = TopiaQuery.createQuery(SampleRow.class, "S").setSelect("S").addDistinct();
+ subquery = filter.prepareQueryForSampling(subquery, "S");
+ query.add("E." + ElligibleBoat.SAMPLE_ROW + " IN (" + subquery.fullQuery() + ")").addParams(subquery.getParams());
// Company
if (filter.getCompany() != null) {
Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceSynthesisImpl.java
===================================================================
--- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceSynthesisImpl.java 2010-01-27 17:27:43 UTC (rev 290)
+++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceSynthesisImpl.java 2010-01-28 17:22:32 UTC (rev 291)
@@ -96,7 +96,9 @@
addParam("fromDate", period.getFromDate()).addParam("thruDate", period.getThruDate()).
addGroup(periodDate).addOrder(periodDate);
- query = filter.prepareQueryForSampling(query, "M." + SampleMonth.SAMPLE_ROW);
+ TopiaQuery<SampleRow> subquery = TopiaQuery.createQuery(SampleRow.class, "S").setSelect("S").addDistinct();
+ subquery = filter.prepareQueryForSampling(subquery, "S");
+ query.add("M." + SampleMonth.SAMPLE_ROW + " IN (" + subquery.fullQuery() + ")").addParams(subquery.getParams());
if (log.isTraceEnabled()) {
log.trace("Exec query : " + query);
Modified: trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Contacts.java
===================================================================
--- trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Contacts.java 2010-01-27 17:27:43 UTC (rev 290)
+++ trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Contacts.java 2010-01-28 17:22:32 UTC (rev 291)
@@ -47,7 +47,9 @@
import java.io.InputStream;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
+import java.util.Calendar;
import java.util.Date;
+import java.util.GregorianCalendar;
import java.util.List;
import org.apache.commons.lang.BooleanUtils;
import org.apache.commons.lang.StringUtils;
@@ -123,12 +125,12 @@
contacts = null;
getContacts();
// }
- String boatName = getFilter().getBoatName();
- boolean companyFiltered = getFilter().getCompany() != null && user.getAdmin();
+// String boatName = getFilter().getBoatName();
+// boolean companyFiltered = getFilter().getCompany() != null && user.getAdmin();
// Show filters only if no boatName is set
- if ((getContactFilter().isFiltered() || companyFiltered) && StringUtils.isEmpty(boatName)) {
- filtersVisible = true;
- }
+// if ((getContactFilter().isFiltered() || companyFiltered) && StringUtils.isEmpty(boatName)) {
+// filtersVisible = true;
+// }
contactsForm.clearErrors();
}
@@ -143,10 +145,10 @@
@InjectComponent
private Zone importExportZone;
- @Property
+// @Property
// @Persist(PersistenceConstants.FLASH)
-// @Persist
- private boolean filtersVisible;
+//// @Persist
+// private boolean filtersVisible;
private boolean reset;
@@ -155,6 +157,9 @@
public ContactFilter getContactFilter() throws SuiviObsmerException {
if (contactFilter == null) {
+ if (log.isDebugEnabled()) {
+ log.debug("Init contactFilter");
+ }
contactFilter = new ContactFilterImpl();
// Initialized to 12 months before the current day
Date fromDate = DateUtils.createDateAfterToday(0, -3, 0);
@@ -163,6 +168,11 @@
return contactFilter;
}
+ public boolean getFiltersVisible() {
+ boolean companyFiltered = contactFilter.getCompany() != null && user.getAdmin();
+ return (contactFilter.isFiltered() || companyFiltered) && StringUtils.isEmpty(contactFilter.getBoatName()); /*&& !getDefaultFromDate().equals(contactFilter.getFromDate());*/
+ }
+
@Override
protected BoatFilter getFilter() throws SuiviObsmerException {
return getContactFilter();
@@ -174,7 +184,7 @@
}
Object onActionFromShowFilters() {
- contactFilter = null;
+ //contactFilter = null;
return filtersZone.getBody();
}
@@ -194,6 +204,9 @@
if (reset) {
contactFilter = null;
}
+// else {
+// filtersVisible = true;
+// }
return this;
}
Modified: trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/services/ContactModelFactory.java
===================================================================
--- trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/services/ContactModelFactory.java 2010-01-27 17:27:43 UTC (rev 290)
+++ trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/services/ContactModelFactory.java 2010-01-28 17:22:32 UTC (rev 291)
@@ -73,8 +73,8 @@
Contact.TIDE_END_DATE,
Contact.NB_OBSERVANTS,
"mammals",
+ Contact.COMMENT,
Contact.DATA_INPUT_DATE,
- Contact.COMMENT,
"validation",
"actions");
Modified: trunk/suiviobsmer-ui/src/main/webapp/Boats.tml
===================================================================
--- trunk/suiviobsmer-ui/src/main/webapp/Boats.tml 2010-01-27 17:27:43 UTC (rev 290)
+++ trunk/suiviobsmer-ui/src/main/webapp/Boats.tml 2010-01-28 17:22:32 UTC (rev 291)
@@ -92,8 +92,8 @@
<input t:type="textfield" t:id="boatDistrictCode" class="width50" t:value="filter.boatDistrictCode" />
</div>
<div class="t-beaneditor-row aright">
- <input t:type="submit" class="ico search-32px" t:id="search" value="Search" />
- <input t:type="submit" class="ico undo" t:id="reset" value="Reset" />
+ <input t:type="submit" class="ico search-32px" t:id="search" value="Search" title="Rechercher les navires correspondants aux filtres saisies" />
+ <input t:type="submit" class="ico undo" t:id="reset" value="Reset" title="Remettre les filtres par défaut" />
</div>
</div>
</form>
Modified: trunk/suiviobsmer-ui/src/main/webapp/Contacts.tml
===================================================================
--- trunk/suiviobsmer-ui/src/main/webapp/Contacts.tml 2010-01-27 17:27:43 UTC (rev 290)
+++ trunk/suiviobsmer-ui/src/main/webapp/Contacts.tml 2010-01-28 17:22:32 UTC (rev 291)
@@ -8,7 +8,7 @@
<div>
<t:label t:for="boatName" /><br />
<input t:type="textfield" class="width200" t:id="boatName" value="contactFilter.boatName" t:mixins="Autocomplete"/>
- <input t:type="submit" class="ico search-32px" t:id="execSearchBoat" value="Search" />
+ <input t:type="submit" class="ico search-32px" t:id="execSearchBoat" value="Search" title="Rechercher les contacts liés à ce navire" />
</div>
</form>
<a t:type="actionlink" t:id="showFilters" t:zone="so-contacts-filters">
@@ -101,8 +101,8 @@
</t:if>
</div>
<div class="t-beaneditor-row aright">
- <input t:type="submit" class="ico search-32px" t:id="search" value="Search" />
- <input t:type="submit" class="ico undo" t:id="reset" value="Reset" />
+ <input t:type="submit" class="ico search-32px" t:id="search" value="Search" title="Rechercher les contacts correspondants aux filtres saisies" />
+ <input t:type="submit" class="ico undo" t:id="reset" value="Reset" title="Remettre les filtres par défaut" />
</div>
</div>
</form>
Modified: trunk/suiviobsmer-ui/src/main/webapp/Synthesis.tml
===================================================================
--- trunk/suiviobsmer-ui/src/main/webapp/Synthesis.tml 2010-01-27 17:27:43 UTC (rev 290)
+++ trunk/suiviobsmer-ui/src/main/webapp/Synthesis.tml 2010-01-28 17:22:32 UTC (rev 291)
@@ -79,8 +79,8 @@
<input t:type="select" t:id="program" t:model="programSelectModel" value="programId" />-->
</div>
<div class="t-beaneditor-row aright">
- <input t:type="submit" class="ico search-32px" t:id="search" value="Search" />
- <input t:type="submit" class="ico undo" t:id="reset" value="Reset" />
+ <input t:type="submit" class="ico search-32px" t:id="search" value="Search" title="Création du graphique en fonction des filtres saisies"/>
+ <input t:type="submit" class="ico undo" t:id="reset" value="Reset" title="Remettre les filtres par défaut" />
</div>
</div>
</form>
1
0