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

[Suiviobsmer-commits] r139 - trunk
by tchemit＠users.labs.libre-entreprise.org 20 Dec '09

20 Dec '09

Author: tchemit Date: 2009-12-20 19:50:20 +0000 (Sun, 20 Dec 2009) New Revision: 139 Modified: trunk/pom.xml Log: use last stable version of ToPIA Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-12-20 19:03:08 UTC (rev 138) +++ trunk/pom.xml 2009-12-20 19:50:20 UTC (rev 139) @@ -239,7 +239,7 @@  <nuitonutils.version>1.1.2-SNAPSHOT</nuitonutils.version> - <topia.version>2.3.0-beta-2-SNAPSHOT</topia.version> + <topia.version>2.3.0-beta-2</topia.version> <license.version>2.0.0</license.version> <helper.version>1.1.0</helper.version> <eugene.version>2.0.0-beta-2</eugene.version>

1 0

[Suiviobsmer-commits] r138 - in trunk: . suiviobsmer-business suiviobsmer-ui
by tchemit＠users.labs.libre-entreprise.org 20 Dec '09

20 Dec '09

Author: tchemit Date: 2009-12-20 19:03:08 +0000 (Sun, 20 Dec 2009) New Revision: 138 Modified: trunk/ trunk/suiviobsmer-business/ trunk/suiviobsmer-ui/ Log: svn ignore on idea files Property changes on: trunk ___________________________________________________________________ Modified: svn:ignore - target + target *.iml *.ipr *.iws Property changes on: trunk/suiviobsmer-business ___________________________________________________________________ Modified: svn:ignore - target + target *.iml *.ipr *.iws Property changes on: trunk/suiviobsmer-ui ___________________________________________________________________ Modified: svn:ignore - target + target *.iml *.ipr *.iws

1 0

[Suiviobsmer-commits] r137 - in trunk: . suiviobsmer-business
by tchemit＠users.labs.libre-entreprise.org 20 Dec '09

20 Dec '09

Author: tchemit Date: 2009-12-20 18:58:41 +0000 (Sun, 20 Dec 2009) New Revision: 137 Modified: trunk/pom.xml trunk/suiviobsmer-business/pom.xml Log: use pluginManagements for eugene plugin + add as dependency topia-persistence + use last stable version of eugene Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-12-20 16:35:00 UTC (rev 136) +++ trunk/pom.xml 2009-12-20 18:58:41 UTC (rev 137) @@ -242,7 +242,7 @@ <topia.version>2.3.0-beta-2-SNAPSHOT</topia.version> <license.version>2.0.0</license.version> <helper.version>1.1.0</helper.version> - <eugene.version>2.0.0-beta-2-SNAPSHOT</eugene.version> + <eugene.version>2.0.0-beta-2</eugene.version> <tapestry.version>5.1.0.5</tapestry.version>  @@ -470,6 +470,23 @@ </configuration> </plugin> + <plugin> + <groupId>org.nuiton.eugene</groupId> + <artifactId>maven-eugene-plugin</artifactId> + <version>${eugene.version}</version> + <configuration> + <inputs>zargo</inputs> + <resolver>org.nuiton.util.FasterCachedResourceResolver</resolver> + </configuration> + <dependencies> + <dependency> + <groupId>org.nuiton.topia</groupId> + <artifactId>topia-persistence</artifactId> + <version>${topia.version}</version> + </dependency> + </dependencies> + </plugin> + </plugins> </pluginManagement> Modified: trunk/suiviobsmer-business/pom.xml =================================================================== --- trunk/suiviobsmer-business/pom.xml 2009-12-20 16:35:00 UTC (rev 136) +++ trunk/suiviobsmer-business/pom.xml 2009-12-20 18:58:41 UTC (rev 137) @@ -93,13 +93,13 @@ <plugin> <groupId>org.nuiton.eugene</groupId> <artifactId>maven-eugene-plugin</artifactId> - <version>${eugene.version}</version> +  <executions> <execution> <phase>generate-sources</phase>  <configuration> - <inputs>zargo</inputs> +   <fullPackagePath>fr.ifremer.suiviobsmer</fullPackagePath>

1 0

[Suiviobsmer-commits] r136 - trunk/suiviobsmer-business
by tchemit＠users.labs.libre-entreprise.org 20 Dec '09

20 Dec '09

Author: tchemit Date: 2009-12-20 16:35:00 +0000 (Sun, 20 Dec 2009) New Revision: 136 Modified: trunk/suiviobsmer-business/pom.xml Log: use last TopiaMetaTransformer template Modified: trunk/suiviobsmer-business/pom.xml =================================================================== --- trunk/suiviobsmer-business/pom.xml 2009-12-19 18:13:48 UTC (rev 135) +++ trunk/suiviobsmer-business/pom.xml 2009-12-20 16:35:00 UTC (rev 136) @@ -105,7 +105,7 @@  <defaultPackage>fr.ifremer.suiviobsmer</defaultPackage> <templates> - org.nuiton.topia.generator.TopiaMetaGenerator, + org.nuiton.topia.generator.TopiaMetaTransformer, org.nuiton.topia.generator.InterfaceTransformer, org.nuiton.topia.generator.BeanTransformer </templates>

1 0

[Suiviobsmer-commits] r135 - trunk/suiviobsmer-business
by tchemit＠users.labs.libre-entreprise.org 19 Dec '09

19 Dec '09

Author: tchemit Date: 2009-12-19 18:13:48 +0000 (Sat, 19 Dec 2009) New Revision: 135 Modified: trunk/suiviobsmer-business/pom.xml Log: update eugene 2.0.0 configuration Modified: trunk/suiviobsmer-business/pom.xml =================================================================== --- trunk/suiviobsmer-business/pom.xml 2009-12-18 12:34:07 UTC (rev 134) +++ trunk/suiviobsmer-business/pom.xml 2009-12-19 18:13:48 UTC (rev 135) @@ -99,9 +99,7 @@ <phase>generate-sources</phase>  <configuration> - <inputs> - <input>zargo</input> - </inputs> + <inputs>zargo</inputs>  <fullPackagePath>fr.ifremer.suiviobsmer</fullPackagePath>

1 0

[Suiviobsmer-commits] r134 - trunk
by fdesbois＠users.labs.libre-entreprise.org 18 Dec '09

18 Dec '09

Author: fdesbois Date: 2009-12-18 12:34:07 +0000 (Fri, 18 Dec 2009) New Revision: 134 Modified: trunk/changelog.txt Log: Update changelog Modified: trunk/changelog.txt =================================================================== --- trunk/changelog.txt 2009-12-18 11:21:29 UTC (rev 133) +++ trunk/changelog.txt 2009-12-18 12:34:07 UTC (rev 134) @@ -1,24 +1,51 @@ 0.0.1-alpha-2 ------------- -[10-12-2009] [fdesbois] EVO #1938 (Boats / BoatInfos) +[18-12-2009] [fdesbois] EVO METIER #1957 (Boats / BoatInfos) + Ajout d'un attribut tideNbDays dans l'entité Contact (calculé automatiquement à chaque changement de date) + +[17-12-2009] [fdesbois] EVO TECHNIQUE + * Mise à jour de la configuration de génération pour ToPIA 2.3 et EUGene 2.0 + * Ajout d'un index sur l'attribut "immatriculation" de l'entité Boat + +[16-12-2009] [tchemit] EVO TECHNIQUE + Migration version ChenilleKit vers 1.2.0 +[16-12-2009] [fdesbois] EVO IHM #1941 (Boats / BoatActivityCalendar) + Ajout page BoatActivityCalendar pour l'affichage d'un calendrier d'activité pour un navire +[16-12-2009] [fdesbois] EVO TECHNIQUE + Utilisation d'ApplicationConfig de nuiton-utils pour gérer les fichiers de configuration + +[15-12-2009] [fdesbois] EVO IHM #1958 (Boats / BoatInfos) + Ajout du dernier contact du navire pour la société +[15-12-2009] [fdesbois] EVO IHM (Contacts) + Ajout d'une liste déroulante pour choisir l'observateur en mode édition d'un contact +[15-12-2009] [fdesbois] EVO IHM #1953 (Contacts) + Validations pour les changements d'état d'un contact + calcul des jours réels d'embarquements +[15-12-2009] [fdesbois] EVO IHM #1941 (Boats / BoatActivityCalendar) + Ajout du champ d'import pour les calendriers d'activité + accès au fichier de log des imports + +[13-12-2009] [fdesbois] EVO METIER + * Renommage classe SuiviObsmerUtils par SuiviObsmerContext plus approprié + * Ajout gestion import des calendriers d'activité (Lancé en arrière-plan) + +[10-12-2009] [fdesbois] EVO IHM #1938 (Boats / BoatInfos) * Ajout d'un message lorsque l'utilisateur vient de la page "SamplingPlan" pour sélection d'un navire * Ajout d'un texte en bas des informations sur le navire sélectionnée pour informer l'utilisateur de la confidentialité de ses saisies * Le code de l'armateur n'est plus visible -[09-12-2009] [fdesbois] EVO #1951 (SamplingPlan) +[09-12-2009] [fdesbois] EVO IHM #1951 (SamplingPlan) Ajout d'un lien sur les programmes pour filtrer la période -[08-12-2009] [fdesbois] ANO (BoatInfos) +[08-12-2009] [fdesbois] ANO IHM (BoatInfos) En mode admin le champ de sélection des sociétés ne charge pas les données -[08-12-2009] [fdesbois] EVO +[08-12-2009] [fdesbois] EVO TECHNIQUE Ajout d'une config pour logger les erreurs/debugs dans un fichier -[08-12-2009] [fdesbois] ANO (SamplingPlan) +[08-12-2009] [fdesbois] ANO IHM (SamplingPlan) Caractère de fin manquant sur l'affichage des zones de pêche -[08-12-2009] [fdesbois] EVO (Contacts) +[08-12-2009] [fdesbois] EVO IHM (Contacts) Renommage colonne "Mammifères" en "Observations et captures accidentelles" -[08-12-2009] [fdesbois] EVO (BoatInfos) +[08-12-2009] [fdesbois] EVO IHM (BoatInfos) Renomage texte "... embarquements dont X dans votre société..." par "... embarquements dont X pour votre société..." -[08-12-2009] [fdesbois] ANO (BoatInfos) +[08-12-2009] [fdesbois] ANO IHM (BoatInfos) Lien présent pour la création d'un contact lorsque la ligne du plan est barré

1 0

[Suiviobsmer-commits] r133 - in trunk/suiviobsmer-business: . src/main/java/fr/ifremer/suiviobsmer/entity src/main/xmi
by fdesbois＠users.labs.libre-entreprise.org 18 Dec '09

18 Dec '09

Author: fdesbois Date: 2009-12-18 11:21:29 +0000 (Fri, 18 Dec 2009) New Revision: 133 Added: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/entity/ContactImpl.java Modified: trunk/suiviobsmer-business/pom.xml trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/entity/SampleRowImpl.java trunk/suiviobsmer-business/src/main/xmi/suiviobsmer.zargo Log: - Add tideNbDays attribute in Contact entity to save calculate value from difference between tide dates - Refactor save realTideValues in SampleRowImpl - Use a protected (calculTideNbDays) method in model to not generate ContactImpl and implemented it by hand Modified: trunk/suiviobsmer-business/pom.xml =================================================================== --- trunk/suiviobsmer-business/pom.xml 2009-12-17 18:58:07 UTC (rev 132) +++ trunk/suiviobsmer-business/pom.xml 2009-12-18 11:21:29 UTC (rev 133) @@ -99,12 +99,13 @@ <phase>generate-sources</phase>  <configuration> - <inputFiles> - <inputFile>zargo</inputFile> - </inputFiles> - + <inputs> + <input>zargo</input> + </inputs> +  + <fullPackagePath>fr.ifremer.suiviobsmer</fullPackagePath> +  <defaultPackage>fr.ifremer.suiviobsmer</defaultPackage> - <fullPackagePath>fr.ifremer.suiviobsmer</fullPackagePath> <templates> org.nuiton.topia.generator.TopiaMetaGenerator, org.nuiton.topia.generator.InterfaceTransformer, @@ -112,8 +113,7 @@ </templates> </configuration> <goals> - <goal>generate-model-files</goal> - <goal>generate-from-models</goal> + <goal>smart-generate</goal> </goals> </execution> </executions> Added: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/entity/ContactImpl.java =================================================================== --- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/entity/ContactImpl.java (rev 0) +++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/entity/ContactImpl.java 2009-12-18 11:21:29 UTC (rev 133) @@ -0,0 +1,55 @@ + +package fr.ifremer.suiviobsmer.entity; + +import java.io.Serializable; +import java.util.Date; +import org.nuiton.util.DateUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * ContactImpl + * + * Created: 18 déc. 2009 + * + * @author fdesbois + * @version $Revision$ + * + * Mise a jour: $Date$ + * par : $Author$ + */ +public class ContactImpl extends ContactAbstract implements Serializable, Contact { + + private static final Logger log = LoggerFactory.getLogger(ContactImpl.class); + + private static final long serialVersionUID = 1L; + + @Override + public void setTideBeginDate(Date beginDate) { + super.setTideBeginDate(beginDate); + calculTideNbDays(); + } + + @Override + public void setTideEndDate(Date beginDate) { + super.setTideEndDate(beginDate); + calculTideNbDays(); + } + + /** + * Calculate the number of days between the tideBeginDate and the tideEndDate. + * Automatically called when tideBeginDate or tideEndDate are modified. + * The value of tideNbDays is always up to date. + */ + @Override + protected void calculTideNbDays() { + Date beginDate = getTideBeginDate(); + Date endDate = getTideEndDate(); + if (beginDate != null && endDate != null) { + int nbDays = DateUtils.getDifferenceInDays(beginDate, endDate); + // nbDays + 1 to have the first day + setTideNbDays(nbDays + 1); + } + } + +} Property changes on: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/entity/ContactImpl.java ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL" Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/entity/SampleRowImpl.java =================================================================== --- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/entity/SampleRowImpl.java 2009-12-17 18:58:07 UTC (rev 132) +++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/entity/SampleRowImpl.java 2009-12-18 11:21:29 UTC (rev 133) @@ -178,7 +178,7 @@ if (contact.getTideEndDate() == null || contact.getTideBeginDate() == null) { return; } - int nbDays = getDifferenceDays(contact); + int nbDays = contact.getTideNbDays(); //getDifferenceDays(contact); SampleMonth month = getSampleMonth(contact.getTideBeginDate()); if (log.isDebugEnabled()) { log.debug("Add tide time " + nbDays + " for " + @@ -192,7 +192,7 @@ if (contact.getTideEndDate() == null || contact.getTideBeginDate() == null) { return; } - int nbDays = getDifferenceDays(contact); + int nbDays = contact.getTideNbDays(); //getDifferenceDays(contact); SampleMonth month = getSampleMonth(contact.getTideBeginDate()); if (log.isDebugEnabled()) { log.debug("Remove tide time " + nbDays + " for " + @@ -201,11 +201,11 @@ month.addRealTideTime(-nbDays); } - protected int getDifferenceDays(Contact contact) { - int nbDays = DateUtils.getDifferenceInDays(contact.getTideBeginDate(), contact.getTideEndDate()); - // difference nbDays + 1 for the first day - nbDays++; - return nbDays; - } +// protected int getDifferenceDays(Contact contact) { +// int nbDays = DateUtils.getDifferenceInDays(contact.getTideBeginDate(), contact.getTideEndDate()); +// // difference nbDays + 1 for the first day +// nbDays++; +// return nbDays; +// } } Modified: trunk/suiviobsmer-business/src/main/xmi/suiviobsmer.zargo =================================================================== (Binary files differ)

1 0

[Suiviobsmer-commits] r132 - in trunk/suiviobsmer-ui/src/main: java/fr/ifremer/suiviobsmer/ui/pages webapp
by fdesbois＠users.labs.libre-entreprise.org 17 Dec '09

17 Dec '09

Author: fdesbois Date: 2009-12-17 18:58:07 +0000 (Thu, 17 Dec 2009) New Revision: 132 Modified: trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/SampleRowForm.java trunk/suiviobsmer-ui/src/main/webapp/SampleRowForm.tml Log: Refactor form in proceed... Tapestry problem on refreshing zone with sampleMonths table 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 2009-12-17 18:57:17 UTC (rev 131) +++ trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/SampleRowForm.java 2009-12-17 18:58:07 UTC (rev 132) @@ -21,10 +21,7 @@ package fr.ifremer.suiviobsmer.ui.pages; -import org.nuiton.util.PeriodDates; import fr.ifremer.suiviobsmer.SuiviObsmerException; -import fr.ifremer.suiviobsmer.entity.Boat; -import fr.ifremer.suiviobsmer.entity.Company; import fr.ifremer.suiviobsmer.entity.FishingZone; import fr.ifremer.suiviobsmer.entity.Profession; import fr.ifremer.suiviobsmer.entity.ProfessionImpl; @@ -44,16 +41,21 @@ import java.util.Date; import java.util.List; import org.apache.commons.lang.StringUtils; -import org.apache.tapestry5.Block; +import org.apache.tapestry5.ComponentResources; import org.apache.tapestry5.EventContext; +import org.apache.tapestry5.Field; import org.apache.tapestry5.annotations.IncludeStylesheet; import org.apache.tapestry5.annotations.InjectComponent; import org.apache.tapestry5.annotations.Log; import org.apache.tapestry5.annotations.Persist; import org.apache.tapestry5.annotations.Property; -import org.apache.tapestry5.corelib.components.Zone; +import org.apache.tapestry5.beaneditor.BeanModel; +import org.apache.tapestry5.corelib.components.Form; import org.apache.tapestry5.ioc.annotations.Inject; import org.apache.tapestry5.ioc.services.PropertyAccess; +import org.apache.tapestry5.services.BeanModelSource; +import org.nuiton.util.DateUtils; +import org.nuiton.util.PeriodDates; import org.slf4j.Logger; /** @@ -109,26 +111,32 @@ // load models for select professionSelectModel = null; getProfessionSelectModel(); - programSelectModel = null; - getProgramSelectModel(); +// programSelectModel = null; +// getProgramSelectModel(); fishingZoneSelectModel = null; getFishingZoneSelectModel(); // load main sampleRow (use of sampleRowId in url) sampleRow = null; getSampleRow(); + + if (!isCreateMode()) { + programId = getSampleRow().getProgram().getTopiaId(); + } + + // initialize companyId if exist for companySelect - Company company = getSampleRow().getCompany(); - if (company != null) { - companyId = company.getTopiaId(); - } - immatriculations = getSampleRow().getMainElligibleBoatsAsString(); +// Company company = getSampleRow().getCompany(); +// if (company != null) { +// companyId = company.getTopiaId(); +// } +// immatriculations = getSampleRow().getMainElligibleBoatsAsString(); // Initialize fishingZones, programPeriod and sampleMonths for edition - fishingZones = null; - getFishingZones(); - period = null; - getPeriod(); - sampleMonths = null; - getSampleMonths(); +// fishingZones = null; +// getFishingZones(); +// period = null; +// getPeriod(); +// sampleMonths = null; +// getSampleMonths(); } /*************************** PROFESSION ***********************************/ @@ -136,11 +144,17 @@ @Persist private GenericSelectModel<Profession> professionSelectModel; + @Inject + private BeanModelSource beanModelSource; + + @Inject + private ComponentResources resources; + @Property private String professionId; - @InjectComponent - private Zone professionZone; +// @InjectComponent +// private Zone professionZone; public GenericSelectModel<Profession> getProfessionSelectModel() throws SuiviObsmerException { if (professionSelectModel == null) { @@ -154,25 +168,36 @@ return professionSelectModel; } - void onSelectedFromSearchProfession() throws SuiviObsmerException { - if (log.isDebugEnabled()) { - log.debug("professionId : " + professionId); - } - Profession professionSelected = getProfessionSelectModel().findObject(professionId); - sampleRow.setProfession(professionSelected); + public BeanModel<Profession> getProfessionModel() { + return beanModelSource.createDisplayModel(Profession.class, resources.getMessages()); } - void onSelectedFromAddNewProfession() { - if (log.isDebugEnabled()) { - log.debug("Add new profession"); +// void onSelectedFromSearchProfession() throws SuiviObsmerException { +// if (log.isDebugEnabled()) { +// log.debug("professionId : " + professionId); +// } +// Profession professionSelected = getProfessionSelectModel().findObject(professionId); +// sampleRow.setProfession(professionSelected); +// } + + void onSelectedFromAddNewProfession() throws SuiviObsmerException { + Profession profession = new ProfessionImpl(); + if (!StringUtils.isEmpty(professionId)) { + profession = getProfessionSelectModel().findObject(professionId); + if (log.isDebugEnabled()) { + log.debug("Add new profession from : " + profession); + } + // TODO add this method in Business to copy attributes from the profession in + // argument to a new one + //serviceSampling.getNewProfession(profession); } - sampleRow.setProfession(new ProfessionImpl()); - professionId = null; + getSampleRow().setProfession(profession); + edited = true; } - Block onSuccessFromProfessionForm() throws SuiviObsmerException { - return professionZone.getBody(); - } +// Block onSuccessFromProfessionForm() throws SuiviObsmerException { +// return professionZone.getBody(); +// } /*************************** FISHING ZONE *********************************/ @@ -182,13 +207,13 @@ @Property private String fishingZoneId; - @InjectComponent - private Zone fishingZoneZone; +// @InjectComponent +// private Zone fishingZoneZone; @Property private FishingZone fishingZone; - @Persist + //@Persist private List<FishingZone> fishingZones; @Property @@ -199,16 +224,16 @@ if (log.isInfoEnabled()) { log.info("BUSINESS REQUEST [getFishingZones]"); } - List<FishingZone> fishingZones = serviceReferential.getFishingZones(); - fishingZoneSelectModel = new GenericSelectModel<FishingZone>(fishingZones, FishingZone.class, + List<FishingZone> zones = serviceReferential.getFishingZones(); + fishingZoneSelectModel = new GenericSelectModel<FishingZone>(zones, FishingZone.class, "code", "topiaId", propertyAccess); } return fishingZoneSelectModel; } - public List<FishingZone> getFishingZones() { + public List<FishingZone> getFishingZones() throws SuiviObsmerException { if (fishingZones == null) { - fishingZones = sampleRow.getFishingZone(); + fishingZones = getSampleRow().getFishingZone(); } return fishingZones; } @@ -224,7 +249,7 @@ edited = true; } - void onSelectedFromRemoveFishingZone(int index) { + void onSelectedFromRemoveFishingZone(int index) throws SuiviObsmerException { if (log.isDebugEnabled()) { log.debug("Remove fishingZone at position : " + index); } @@ -232,12 +257,12 @@ edited = true; } - Block onSuccessFromFishingZoneForm() { - if (!edited) { - sampleRow.setFishingZone(fishingZones); - } - return fishingZoneZone.getBody(); - } +// Block onSuccessFromFishingZoneForm() { +// if (!edited) { +// sampleRow.setFishingZone(fishingZones); +// } +// return fishingZoneZone.getBody(); +// } /*************************** PROGRAM & MONTHS *****************************/ @@ -250,23 +275,32 @@ @Property private String programId; - @InjectComponent - private Zone periodZone; +// @InjectComponent +// private Zone periodZone; + /** Program to saved **/ private Program program; @Property private Date month; - @Persist + //@Persist private PeriodDates period; - @Persist + //@Persist private List<SampleMonth> sampleMonths; @Property private SampleMonth sampleMonth; + @InjectComponent + private Field programPeriodBegin; + + @InjectComponent + private Field programPeriodEnd; + + private boolean programChanged; + public GenericSelectModel<Program> getProgramSelectModel() throws SuiviObsmerException { if (programSelectModel == null) { if (log.isInfoEnabled()) { @@ -280,17 +314,23 @@ } public List<Date> getMonths() throws SuiviObsmerException { - return period.getMonths(); + return getPeriod().getMonths(); } + public Program getProgram() throws SuiviObsmerException { + return getSampleRow().getProgram(); + } + public PeriodDates getPeriod() throws SuiviObsmerException { if (period == null) { - program = getSampleRow().getProgram(); - if (program.getPeriodBegin() != null && program.getPeriodEnd() != null) { - period = new PeriodDates(program.getPeriodBegin(), program.getPeriodEnd()); - } else { - period = new PeriodDates(); - } + Date begin = getProgram().getPeriodBegin(); + Date end = getProgram().getPeriodEnd(); + period = new PeriodDates(begin, end); +// if (begin != null && end != null) { +// period = new PeriodDates(begin, end); +// } else { +// period = new PeriodDates(); +// } } return period; } @@ -313,60 +353,97 @@ return new SimpleDateFormat("MM/yyyy"); } + /** + * Search a program from the list. + * The program will be set from the one selected. If no selection, a new one will be set. + * @throws SuiviObsmerException + */ void onSelectedFromSearchProgram() throws SuiviObsmerException { - // Reset programName - programName = null; + program = new ProgramImpl(); + if (!StringUtils.isEmpty(programId)) { + program = getProgramSelectModel().findObject(programId); + } + // Period will be reinitialized from program params + //getSampleRow().setProgram(program); + + + // SampleMonths ?? + + //programName = null; // Reset period to get the one from selected program - period = null; + //period = null; // Reset sampleMonths for new period - sampleMonths = null; - edited = true; + //sampleMonths = null; + //saveProgramAndSampleMonths(); + programChanged = true; } + /** + * Refresh months from program period. + * If the programName is not empty, a new program will be set. + * The period dates will be saved in program (validation will be done in onSuccess). + * @throws SuiviObsmerException + */ void onSelectedFromRefreshMonths() throws SuiviObsmerException { - // Reset sampleMonths cause of period modification - sampleMonths = null; - edited = true; - } - - Block onSuccessFromPeriodForm() throws SuiviObsmerException { - // New program - if (isCreateMode()) { - // Name not empty : suppress programId for select - if (!StringUtils.isEmpty(programName)) { - programId = null; - } - - Program currentProgram = getSampleRow().getProgram(); - // Name changed : init new program with current periodBegin and periodEnd - if (!StringUtils.isEmpty(programName) && !programName.equals(currentProgram.getName())) { - program = new ProgramImpl(); - program.setName(programName); - // ProgramId not empty in select : find program with id in selectModel - } else if (!StringUtils.isEmpty(programId)) { - program = getProgramSelectModel().findObject(programId); - // Nor programId neither programName : reinit program object - } else { - program = new ProgramImpl(); - } - // Set program to session with sampleRow - getSampleRow().setProgram(program); - } - // Save sampleMonth - if (sampleMonths != null) { - getSampleRow().setSampleMonth(sampleMonths); - } - if (!edited) { - // Save period dates + if (!StringUtils.isEmpty(programName)) { + // New program + program = new ProgramImpl(); + program.setName(programName); + //getSampleRow().setProgram(program); + //programId = null; + } else { program = getSampleRow().getProgram(); - program.setPeriodBegin(period.getFromDate()); - program.setPeriodEnd(period.getThruDate()); } - return periodZone.getBody(); + program.setPeriodBegin(period.getFromDate()); + program.setPeriodEnd(period.getThruDate()); + + // SampleMonths ?? + + // Reset sampleMonths cause of period modification + //sampleMonths = null; + //saveProgramAndSampleMonths(); + programChanged = true; } +// private void saveProgramAndSampleMonths() throws SuiviObsmerException { +// // New program +// if (!getSampleRow().hasSampleMonthRealTideTime()) { +// // Name not empty : suppress programId for select +// if (!StringUtils.isEmpty(programName)) { +// programId = null; +// } +// +// Program currentProgram = getSampleRow().getProgram(); +// // Name changed : init new program with current periodBegin and periodEnd +// if (!StringUtils.isEmpty(programName) && !programName.equals(currentProgram.getName())) { +// program = new ProgramImpl(); +// program.setName(programName); +// // ProgramId not empty in select : find program with id in selectModel +// } else if (!StringUtils.isEmpty(programId)) { +// program = getProgramSelectModel().findObject(programId); +// // Nor programId neither programName : reinit program object +// } else { +// program = new ProgramImpl(); +// } +// // Set program to session with sampleRow +// getSampleRow().setProgram(program); +// } +// // Save sampleMonth +// if (sampleMonths != null) { +// getSampleRow().setSampleMonth(sampleMonths); +// } +//// if (!edited) { +//// // Save period dates +//// program = getSampleRow().getProgram(); +//// program.setPeriodBegin(period.getFromDate()); +//// program.setPeriodEnd(period.getThruDate()); +//// } +//// +//// return periodZone.getBody(); +// } + /*************************** SAMPLE ROW ***********************************/ private String sampleRowId; @@ -374,17 +451,20 @@ @Persist private SampleRow sampleRow; - @Property - private String updateComment; + @InjectComponent + private Form sampleRowForm; - @Property - private String immatriculations; +// @Property +// private String updateComment; +// +// @Property +// private String immatriculations; +// +// @Property +// private String companyId; +// +// private GenericSelectModel<Company> companySelectModel; - @Property - private String companyId; - - private GenericSelectModel<Company> companySelectModel; - public SampleRow getSampleRow() throws SuiviObsmerException { if (sampleRow == null) { if (!StringUtils.isEmpty(sampleRowId)) { @@ -395,21 +475,21 @@ } else { sampleRow = serviceSampling.getNewSampleRow(); } - } + } return sampleRow; } - public GenericSelectModel<Company> getCompanySelectModel() throws SuiviObsmerException { - if (companySelectModel == null) { - if (log.isInfoEnabled()) { - log.info("BUSINESS REQUEST [getCompanies]"); - } - List<Company> companies = serviceUser.getCompanies(); - companySelectModel = new GenericSelectModel<Company>(companies, Company.class, - "name", "topiaId", propertyAccess); - } - return companySelectModel; - } +// public GenericSelectModel<Company> getCompanySelectModel() throws SuiviObsmerException { +// if (companySelectModel == null) { +// if (log.isInfoEnabled()) { +// log.info("BUSINESS REQUEST [getCompanies]"); +// } +// List<Company> companies = serviceUser.getCompanies(); +// companySelectModel = new GenericSelectModel<Company>(companies, Company.class, +// "name", "topiaId", propertyAccess); +// } +// return companySelectModel; +// } public boolean isCreateMode() throws SuiviObsmerException { return StringUtils.isEmpty(getSampleRow().getTopiaId()); @@ -421,21 +501,76 @@ @Log Object onSuccessFromSampleRowForm() throws SuiviObsmerException { - if (!edited) { + sampleRowForm.clearErrors(); + if (programChanged) { + String programTopiaId = program.getTopiaId(); + // Reinitialize programId for select if it's not the current one + if (programTopiaId != null && !programTopiaId.equals(programId)) { + programId = null; + // Reinitialize programName, period and sampleMonths if it's the one selected + } else { + programName = null; + period = null; + sampleMonths = null; + } - Company company = getCompanySelectModel().findObject(companyId); - getSampleRow().setCompany(company); + Date periodBegin = program.getPeriodBegin(); + Date periodEnd = program.getPeriodEnd(); - List<Boat> boats = serviceBoat.getBoats(immatriculations); + // Validation for period dates + if (periodBegin == null) { + sampleRowForm.recordError(programPeriodBegin, + "Vous ne pouvez pas rafraîchir les mois avec une date de début de programme vide"); + } + if (periodEnd == null) { + sampleRowForm.recordError(programPeriodEnd, + "Vous ne pouvez pas rafraîchir les mois avec une date de fin de programme vide"); + } - serviceSampling.createUpdateSampleRow(sampleRow, boats); + if (periodBegin != null && periodEnd != null) { - return SamplingPlan.class; + int size = getSampleMonths().size(); - } else { - sampleRow = null; + SampleMonth firstMonth = getSampleMonths().get(0); + SampleMonth lastMonth = getSampleMonths().get(size-1); + + Date firstDate = DateUtils.createDate( + 1, firstMonth.getPeriodMonth(), firstMonth.getPeriodYear()); + + if (periodBegin.after(firstDate) && firstMonth.getRealTidesValue() != 0) { + sampleRowForm.recordError(programPeriodBegin, + "Vous ne pouvez pas réduire la période du programme. " + + "Il existe des enregistrements de marées réels."); + } + } + + if (!sampleRowForm.getHasErrors()) { + // Save program + getSampleRow().setProgram(program); + // Save sampleMonths + //getSampleRow().setSampleMonth(sampleMonths); + } + } else if (!edited) { + //sampleRow.setFishingZone(fishingZones); USEFUL ? + + // Save period dates + //program = getSampleRow().getProgram(); + //program.setPeriodBegin(period.getFromDate()); + //program.setPeriodEnd(period.getThruDate()); + return null; +// Company company = getCompanySelectModel().findObject(companyId); +// getSampleRow().setCompany(company); +// +// List<Boat> boats = serviceBoat.getBoats(immatriculations); +// +// serviceSampling.createUpdateSampleRow(sampleRow, boats); +// +// return SamplingPlan.class; + } else { + // Reinitialize professionId for select to avoid selection from existing Profession + professionId = null; } - return null; + return sampleRowForm; } Modified: trunk/suiviobsmer-ui/src/main/webapp/SampleRowForm.tml =================================================================== --- trunk/suiviobsmer-ui/src/main/webapp/SampleRowForm.tml 2009-12-17 18:57:17 UTC (rev 131) +++ trunk/suiviobsmer-ui/src/main/webapp/SampleRowForm.tml 2009-12-17 18:58:07 UTC (rev 132) @@ -1,6 +1,127 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <t:layout t:pageTitle="Modification d'une ligne du plan" t:contentId="so-samplerow-form" xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" xmlns:p="tapestry:parameter"> + + <t:zone t:id="globalZone"> + <form t:type="form" t:id="sampleRowForm" t:zone="globalZone"> + + <p> LIGNE DU PLAN : ${sampleRow.code} </p> + <t:errors /> + +  + <fieldset> + <legend>Métier</legend> + <t:if t:test="sampleRow.hasSampleMonthRealTideTime()"> +  + <t:beandisplay t:id="professionDisplay" t:model="professionModel" t:object="sampleRow.profession" + t:include="codeDCF5, meshSize, size, other, libelle, species" /> + <p:else> +  + <div class="select"> + <t:label t:for="professionSelect" /> : + <input t:type="select" t:id="professionSelect" t:model="professionSelectModel" + t:value="professionId" />  + <input t:type="submit" class="ico add" + t:id="addNewProfession" value="Ajouter un nouveau métier" /> + </div> + <div class="t-beaneditor"> + <t:beaneditor t:id="professionEditor" t:object="sampleRow.profession" + t:include="codeDCF5, meshSize, size, other, libelle, species" /> + </div> + </p:else> + </t:if> + </fieldset> + +  + <fieldset> + <legend>Zone(s) de pêche</legend> + <t:if t:test="sampleRow.hasSampleMonthRealTideTime()"> +  + <ul> + <li t:type="loop" t:source="fishingZones" t:volatile="true" t:value="fishingZone"> + ${fishingZone.code} + </li> + </ul> + <p:else> +  + <div class="select"> + <t:label t:for="fishingZoneSelect" /> : + <input t:type="select" t:id="fishingZoneSelect" t:model="fishingZoneSelectModel" + t:value="fishingZoneId" />  + <input t:type="submit" class="ico add" t:id="addFishingZone" value="Add" + title="Ajouter la zone sélectionnée à la ligne d'échantillonnage" /> + </div> + <div class="clearfix fishingzone-row" t:type="loop" volatile="true" t:source="fishingZones" + t:value="fishingZone" t:index="indexFishingZone"> + <div class="fleft width50"> + <input t:type="submitContext" class="ico remove" t:context="indexFishingZone" + t:id="removeFishingZone" value="Remove" title="Retirer cette zone de la liste liée à la ligne d'échantillonnage"/> + </div> + <div class="fleft"> + ${fishingZone.code} + </div> + </div> + <div class="select"> + <t:label t:for="fishingZonesInfos" /> : + <input t:type="textfield" class="width300" t:id="fishingZonesInfos" value="sampleRow.fishingZonesInfos" /> + </div> + </p:else> + </t:if> + </fieldset> + +  + <fieldset> + <legend>Programme et données des marées par mois</legend> + <div class="select"> + <t:if t:test="sampleRow.hasSampleMonthRealTideTime()"> +  + Programme : ${sampleRow.program.name} + <p:else> +  + <div class="select"> + <t:label t:for="program"/> : + <input t:type="select" t:id="program" t:model="programSelectModel" value="programId" />  + <input t:type="submit" class="ico search" t:id="searchProgram" value="Search" + title="Afficher les détails du programme"/> + ou <input t:type="textfield" t:id="programName" value="programName" /> + </div> + </p:else> + </t:if> + </div> +  + <div class="select"> + <t:label t:for="programPeriodBegin"/> : + du <input t:type="datefield" t:id="programPeriodBegin" value="period.fromDate" /> + jusqu'au <input t:type="datefield" t:id="programPeriodEnd" value="period.thruDate" />  + <input t:type="submit" class="ico refresh" t:id="refreshMonths" value="Refresh" title="Rafraîchir les mois"/> + </div> +  + <div class="acenter"> + <table id="so-samplerow-form-months"> + <tr class="firstRow"> + <td t:type="loop" t:source="months" t:value="month" volatile="true"> + <t:output value="month" format="dateFormat" /> + </td> + </tr> + <tr> + <td t:type="loop" class="acenter" volatile="true" t:source="sampleMonths" t:value="sampleMonth"> + <input t:type="textfield" class="width40" t:id="sampleMonth" value="sampleMonth.expectedTidesValue" /> + </td> + </tr> + </table> + </div> + </fieldset> + + <div class="actions"> + <input t:type="submit" t:id="saveData" class="ico save" value="Save" /> + <input t:type="submit" t:id="cancelSave" class="ico undo" value="Undo" /> + </div> + </form> + </t:zone> + + + + </fieldset </p:else> </t:if> <t:if t:test="createMode"> @@ -62,7 +183,7 @@ </fieldset> </form> </div> -  + TODO else show fishingZone + fishingZoneInfos </t:if> <div t:type="zone" t:id="periodZone" class="formPart" id="so-samplerow-form-period"> <form t:type="form" t:id="periodForm" t:zone="so-samplerow-form-period"> @@ -105,7 +226,7 @@ </fieldset> </form> </div> -  + -div t:type="zone" t:id="sampleRowZone" class="formPart" id="so-samplerow-form-other" t:update="show" <form t:type="form" t:id="sampleRowForm"> <fieldset class="user-form"> <legend>Autres données de la ligne d'échantillonnage</legend> @@ -132,8 +253,8 @@ </div> </fieldset> </form> -  - <!--t:zone t:id="sampleRowZone"> + /div + t:zone t:id="sampleRowZone"> <form t:type="form" t:id="sampleRowForm" t:zone="sampleRowZone"> <p>

1 0

[Suiviobsmer-commits] r131 - in trunk/suiviobsmer-ui/src/main/webapp: . css
by fdesbois＠users.labs.libre-entreprise.org 17 Dec '09

17 Dec '09

Author: fdesbois Date: 2009-12-17 18:57:17 +0000 (Thu, 17 Dec 2009) New Revision: 131 Modified: trunk/suiviobsmer-ui/src/main/webapp/SamplingPlan.tml trunk/suiviobsmer-ui/src/main/webapp/css/contacts.css Log: Minor corrections of style/template Modified: trunk/suiviobsmer-ui/src/main/webapp/SamplingPlan.tml =================================================================== --- trunk/suiviobsmer-ui/src/main/webapp/SamplingPlan.tml 2009-12-17 18:55:43 UTC (rev 130) +++ trunk/suiviobsmer-ui/src/main/webapp/SamplingPlan.tml 2009-12-17 18:57:17 UTC (rev 131) @@ -163,16 +163,6 @@ </tbody> </table> </t:zone> - <t:if t:test="user.admin"> - <div class="actions aright"> - <span> - <img src="${asset:context:}/img/undo.png" alt="Annuler" title="Annuler les modifications"/> - </span> - <span> - <img src="${asset:context:}/img/save.png" alt="Enregistrer" title="Enregistrer les modifications"/> - </span> - </div> - </t:if> </div> Modified: trunk/suiviobsmer-ui/src/main/webapp/css/contacts.css =================================================================== --- trunk/suiviobsmer-ui/src/main/webapp/css/contacts.css 2009-12-17 18:55:43 UTC (rev 130) +++ trunk/suiviobsmer-ui/src/main/webapp/css/contacts.css 2009-12-17 18:57:17 UTC (rev 131) @@ -63,6 +63,7 @@ div#so-contacts table.t-data-grid thead tr th.mammals { white-space: normal; + width: 100px; } div#so-contacts table.t-data-grid thead tr th.actions {

1 0

[Suiviobsmer-commits] r130 - in trunk/suiviobsmer-business/src/main: java/fr/ifremer/suiviobsmer/entity java/fr/ifremer/suiviobsmer/impl xmi
by fdesbois＠users.labs.libre-entreprise.org 17 Dec '09

17 Dec '09

Author: fdesbois Date: 2009-12-17 18:55:43 +0000 (Thu, 17 Dec 2009) New Revision: 130 Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/entity/BoatImpl.java trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ActivityCalendarImport.java trunk/suiviobsmer-business/src/main/xmi/suiviobsmer.zargo Log: - Add index on immatriculation attribute in Boat entity - All data from ActivityCalendar is always updated (even they already exist) - Change default return value for canCreateContact method : waiting for business validation on create contact conditions. Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/entity/BoatImpl.java =================================================================== --- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/entity/BoatImpl.java 2009-12-17 09:35:21 UTC (rev 129) +++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/entity/BoatImpl.java 2009-12-17 18:55:43 UTC (rev 130) @@ -142,10 +142,13 @@ @Override public boolean canCreateContact(Company company, SampleRow row) throws SuiviObsmerException { TopiaContext transaction = null; - boolean result = true; + // FIXME depends on condition over double creation on the same sampleRow for the same company. + // Normally, the default value is true (if no contact exist for this boat, it's possible to create one) + boolean result = false; try { transaction = SuiviObsmerContext.getTopiaRootContext().beginTransaction(); + // Return the last contact for this boat, sampleRow and company List results = transaction.find( "FROM ContactImpl C1" + " WHERE C1.user.company = :company" + 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 2009-12-17 09:35:21 UTC (rev 129) +++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ActivityCalendarImport.java 2009-12-17 18:55:43 UTC (rev 130) @@ -96,8 +96,6 @@ Boat boat = boatDAO.findByImmatriculation(boatImmatriculation); - - if (boat != null) { ActivityCalendarDAO dao = SuiviObsmerModelDAOHelper.getActivityCalendarDAO(transaction); @@ -118,123 +116,130 @@ calendar.setActivityMonth(new ArrayList<ActivityMonth>()); - info("Création d'un calendrier " + year + + if (log.isDebugEnabled()) { + info("Création d'un calendrier " + year + " pour le navire immatriculé " + boatImmatriculation, currRow); - - //transaction.commitTransaction(); + } } String calendarCode = "[ calendrier " + year + ", navire " + boatImmatriculation + " ]"; int monthNum = Integer.parseInt(reader.get("SYNA_MOI").trim()); String harbourCode = reader.get("SYNA_POR_COD").trim(); + boolean active = !harbourCode.equals("INA"); ActivityMonth month = calendar.getActivityMonth(monthNum); if (month == null) { - boolean active = !harbourCode.equals("INA"); - ActivityMonthDAO monthDAO = SuiviObsmerModelDAOHelper.getActivityMonthDAO(transaction); month = monthDAO.create( ActivityMonth.ACTIVITY_CALENDAR, calendar, - ActivityMonth.MONTH, monthNum, - ActivityMonth.ACTIVE, active); + ActivityMonth.MONTH, monthNum); month.setActivityProfession(new ArrayList<ActivityProfession>()); - info("Création du mois " + monthNum + " actif(" + active + ") " + calendarCode, currRow); + if (log.isDebugEnabled()) { + info("Création du mois " + monthNum + " actif(" + active + ") " + calendarCode, currRow); + } - if (active) { - String nbSeaDaysString = reader.get("SYNA_NOMJDM").trim(); - Integer nbSeaDays = !nbSeaDaysString.equals("NA") ? - Integer.valueOf(nbSeaDaysString) : null; + calendar.addActivityMonth(month); + } - String nbFishingDaysString = reader.get("SYNA_NOMJDP").trim(); - Integer nbFishingDays = !nbFishingDaysString.equals("NA") ? - Integer.valueOf(nbFishingDaysString) : null; + month.setActive(active); - String nbBoardingPersonsString = reader.get("SYNA_NOMHE").trim(); - Integer nbBoardingPersons = !nbBoardingPersonsString.equals("NA") ? - Integer.valueOf(nbBoardingPersonsString) : null; + if (active) { + String nbSeaDaysString = reader.get("SYNA_NOMJDM").trim(); + Integer nbSeaDays = !nbSeaDaysString.equals("NA") ? + Integer.valueOf(nbSeaDaysString) : null; - int harbourId = Integer.parseInt(reader.get("SYNA_TPOR_COD").trim()); - String harbourLibelle = reader.get("SYNA_POR_LIB").trim(); - //String harbourCode = reader.get("SYNA_POR_COD").trim(); + String nbFishingDaysString = reader.get("SYNA_NOMJDP").trim(); + Integer nbFishingDays = !nbFishingDaysString.equals("NA") ? + Integer.valueOf(nbFishingDaysString) : null; - month.setHarbourId(harbourId); - month.setHarbourCode(harbourCode); - month.setHarbourLibelle(harbourLibelle); - month.setNbBoardingPersons(nbBoardingPersons); - month.setNbFishingDays(nbFishingDays); - month.setNbSeaDays(nbSeaDays); - } else { - result++; - } + String nbBoardingPersonsString = reader.get("SYNA_NOMHE").trim(); + Integer nbBoardingPersons = !nbBoardingPersonsString.equals("NA") ? + Integer.valueOf(nbBoardingPersonsString) : null; - calendar.addActivityMonth(month); + int harbourId = Integer.parseInt(reader.get("SYNA_TPOR_COD").trim()); + String harbourLibelle = reader.get("SYNA_POR_LIB").trim(); + //String harbourCode = reader.get("SYNA_POR_COD").trim(); - //transaction.commitTransaction(); - } + month.setHarbourId(harbourId); + month.setHarbourCode(harbourCode); + month.setHarbourLibelle(harbourLibelle); + month.setNbBoardingPersons(nbBoardingPersons); + month.setNbFishingDays(nbFishingDays); + month.setNbSeaDays(nbSeaDays); - if (month.getActive()) { + int professionOrder = Integer.parseInt(reader.get("META_ORDRE").trim()); + String professionCode = reader.get("MET_COD").trim(); + int professionId = Integer.parseInt(reader.get("MET_ID").trim()); + String professionLibelle = reader.get("MET_LIB").trim(); - int professionOrder = Integer.parseInt(reader.get("META_ORDRE").trim()); ActivityProfession profession = month.getActivityProfession(professionOrder); if (profession == null) { - String professionCode = reader.get("MET_COD").trim(); - int professionId = Integer.parseInt(reader.get("MET_ID").trim()); - String professionLibelle = reader.get("MET_LIB").trim(); ActivityProfessionDAO professionDAO = SuiviObsmerModelDAOHelper.getActivityProfessionDAO(transaction); profession = professionDAO.create( ActivityProfession.ACTIVITY_MONTH, month, - ActivityProfession.PROFESSION_ORDER, professionOrder, - ActivityProfession.ID, professionId, - ActivityProfession.CODE, professionCode, - ActivityProfession.LIBELLE, professionLibelle); + ActivityProfession.PROFESSION_ORDER, professionOrder); profession.setActivityZone(new ArrayList<ActivityZone>()); - info("Création du métier " + professionOrder + " code(" + professionCode + ") " + + if (log.isDebugEnabled()) { + info("Création du métier " + professionOrder + " code(" + professionCode + ") " + "[ mois " + monthNum + " ] " + calendarCode, currRow); + } month.addActivityProfession(profession); } + profession.setId(professionId); + profession.setCode(professionCode); + profession.setLibelle(professionLibelle); + String zoneCode = reader.get("SECT_COD").trim(); + int gradiantCode = Integer.parseInt(reader.get("GRA_COD").trim()); + String gradiantLibelle = reader.get("GRA_LIB").trim(); + int zoneId = Integer.parseInt(reader.get("TSECT_COD").trim()); + String zoneLibelle = reader.get("SECT_LIB").trim(); ActivityZone zone = profession.getActivityZone(zoneCode); if (zone == null) { - int gradiantCode = Integer.parseInt(reader.get("GRA_COD").trim()); - String gradiantLibelle = reader.get("GRA_LIB").trim(); - int zoneId = Integer.parseInt(reader.get("TSECT_COD").trim()); - String zoneLibelle = reader.get("SECT_LIB").trim(); - ActivityZoneDAO zoneDAO = SuiviObsmerModelDAOHelper.getActivityZoneDAO(transaction); zone = zoneDAO.create( - ActivityZone.ACTIVITY_PROFESSION, profession, - ActivityZone.ZONE_ID, zoneId, - ActivityZone.GRADIANT_CODE, gradiantCode, - ActivityZone.GRADIANT_LIBELLE, gradiantLibelle, ActivityZone.ZONE_CODE, zoneCode, - ActivityZone.ZONE_LIBELLE, zoneLibelle); + ActivityZone.ACTIVITY_PROFESSION, profession); - info("Création de la zone " + zoneCode + " [ mois " + monthNum + " ] " + + if (log.isDebugEnabled()) { + info("Création de la zone " + zoneCode + " [ mois " + monthNum + " ] " + calendarCode, currRow); + } profession.addActivityZone(zone); - result++; } else { - warn("Zone déjà existante [" + zoneCode + "] ! :: " + Arrays.toString(reader.getValues()), currRow); + if (log.isDebugEnabled()) { + info("Ecrasement de la zone " + zoneCode + " [ mois " + monthNum + " ] " + + calendarCode, currRow); + } + //warn("Zone déjà existante [" + zoneCode + "] ! :: " + Arrays.toString(reader.getValues()), currRow); } + + zone.setZoneId(zoneId); + zone.setZoneLibelle(zoneLibelle); + zone.setGradiantCode(gradiantCode); + zone.setGradiantLibelle(gradiantLibelle); + } else { + info("Ligne inactif", currRow); } + result++; } else { warn("Navire inexistant dans le référentiel : " + boatImmatriculation, currRow); } @@ -244,10 +249,12 @@ log.debug("Time : " + DurationFormatUtils.formatDurationHMS(tic - firstTic)); } - transaction.commitTransaction(); - writer.flush(); + if (result%500 == 0 && log.isInfoEnabled()) { + log.info("RUNNING... Import calendrier d'activité ligne " + currRow); + } } + transaction.commitTransaction(); long stopTime = System.currentTimeMillis(); @@ -293,6 +300,7 @@ String ligne = numRow != -1 ? "Ligne (" + numRow + ") : " : ""; String msg = "[" + dateString + "] " + ligne + message; writer.write(msg + "\n"); + writer.flush(); if (log.isDebugEnabled()) { log.debug("write log activityCalendar : " + msg); } Modified: trunk/suiviobsmer-business/src/main/xmi/suiviobsmer.zargo =================================================================== (Binary files differ)

1 0