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

r1633 - in trunk/wao-business/src/test: java/fr/ifremer/wao/business/fixtures java/fr/ifremer/wao/service resources/import
by bleny＠users.forge.codelutin.com Nov. 22, 2012

Nov. 22, 2012

Author: bleny Date: 2012-11-22 22:45:18 +0100 (Thu, 22 Nov 2012) New Revision: 1633 Url: http://forge.codelutin.com/repositories/revision/wao/1633 Log: fix tests Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/business/fixtures/ObsMerFixtures.java trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactTest.java trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSamplingTest.java trunk/wao-business/src/test/resources/import/echantillonnage.csv Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/business/fixtures/ObsMerFixtures.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/business/fixtures/ObsMerFixtures.java 2012-11-22 21:10:18 UTC (rev 1632) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/business/fixtures/ObsMerFixtures.java 2012-11-22 21:45:18 UTC (rev 1633) @@ -96,6 +96,10 @@ return getWaoUser("jmichmuche", "mdp", "Jean", "Michmuche", tartanpion()); } + public WaoUser jacquesMichmuche() { + return getWaoUser("j.michmuche", "mdp", "Jacques", "Michmuche", tartanpion()); + } + public WaoUser billMurray() { return getWaoUser("BillMurray", "mdp", "Bill", "Murray", bis()); } Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactTest.java 2012-11-22 21:10:18 UTC (rev 1632) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactTest.java 2012-11-22 21:45:18 UTC (rev 1633) @@ -85,7 +85,7 @@ Contact contact = obsMerFixtures.defaultContact(); WaoUser observer1 = obsMerFixtures.jeanMichmuche(); - WaoUser observer2 = obsMerFixtures.billMurray(); + WaoUser observer2 = obsMerFixtures.jacquesMichmuche(); contact.addSecondaryObservers(observer1); contact.addSecondaryObservers(observer2); Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSamplingTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSamplingTest.java 2012-11-22 21:10:18 UTC (rev 1632) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSamplingTest.java 2012-11-22 21:45:18 UTC (rev 1633) @@ -154,6 +154,7 @@ } SampleRow row = serviceSampling.newSampleRow(obsMerFixtures.jeanMichmucheAsAdmin()); + row.setCompany(obsMerFixtures.homerSimpson().getCompany()); row.setCode("2010_03"); row.setNbObservants(3); row.setAverageTideTime(2.5); Modified: trunk/wao-business/src/test/resources/import/echantillonnage.csv =================================================================== --- trunk/wao-business/src/test/resources/import/echantillonnage.csv 2012-11-22 21:10:18 UTC (rev 1632) +++ trunk/wao-business/src/test/resources/import/echantillonnage.csv 2012-11-22 21:45:18 UTC (rev 1633) @@ -1,6 +1,6 @@ "PLAN_CODE";"SOCIETE_NOM";"PECHE_DIVISION";"PECHE_AUTRE";"METIER_CODE_DCF5";"METIER_MAILLAGE";"METIER_TAILLE";"METIER_AUTRE";"METIER_LIBELLE";"METIER_ESPECES";"PROGRAMME_CODE";"PROGRAMME_DEBUT";"PROGRAMME_FIN";"12/2009";"01/2010";"02/2010";"03/2010";"04/2010";"05/2010";"06/2010";"07/2010";"08/2010";"09/2010";"10/2010";"11/2010";"12/2010";"01/2011";"02/2011";"03/2011";"PLAN_DUREE_MOY";"PLAN_NB_OBSERV";"PLAN_COMMENT";"TAUX_COUVERTURE_APPLIQUE" "2010_M0001";"TARTANPION";"IId / I";;"DRB_ALG";;;;;;"MA-2009";"03/2010";"01/2011";;;;0;0;0;0;0;0;0;2;0;0;4;;;"1.5";1;"Un petit commentaire";5 -"2010_M0002";;"IId";;"DRH_CAT et DRH_CRU";;;;"Fileyage";"poissons tubes";"MANY";"01/2008";"12/2008";;20;0;0;21;0;0;21;0;0;21;0;0;;;;1;1;;5 +"2010_M0002";"TARTANPION";"IId";;"DRH_CAT et DRH_CRU";;;;"Fileyage";"poissons tubes";"MANY";"01/2008";"12/2008";;20;0;0;21;0;0;21;0;0;21;0;0;;;;1;1;;5 "2010_M0003";;"IId / IV";;"DRH";;;;"balottage en plein air";"divers choses visqueuses";"MA-2009";"03/2010";"01/2011";;;;0;22;0;0;25;0;0;21;0;0;25;;;2;1;;5 "2009_M0001";;"IId / IV";;"GTR_DEF et GNS_DEF";"110-119";;;"Fileyage à poissons tubes";"poissons plats";"PPP2010";"12/2009";"10/2010";0;1;1;1;2;1;1;1;1;1;2;;;;;;1;1;;5 "2009_M0002";;"IId";;"GTR_DEF et GNS_DEF";"9888-99";;;"Fileyage à sirènes ";"nymphes";"PPP2010";"12/2009";"10/2010";1;1;1;2;3;4;4;4;4;3;3;;;;;;1;1;;10

1 0

r1632 - trunk/wao-business/src/main/java/fr/ifremer/wao/service
by bleny＠users.forge.codelutin.com Nov. 22, 2012

Nov. 22, 2012

Author: bleny Date: 2012-11-22 22:10:18 +0100 (Thu, 22 Nov 2012) New Revision: 1632 Url: http://forge.codelutin.com/repositories/revision/wao/1632 Log: fixes #1680 import des contacts, on verifie que tous les observateurs font bien parti de la societe indiquee dans le plan Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2012-11-22 20:53:53 UTC (rev 1631) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2012-11-22 21:10:18 UTC (rev 1632) @@ -248,6 +248,14 @@ message = "L'utilisateur référant ne doit pas se trouver aussi parmi les observateurs secondaires"; } + for (WaoUser observer : contact.getAllObservers()) { + boolean observerWorksForCompanyInSampleRow = observer.getCompany().equals(contact.getSampleRow().getCompany()); + if ( ! observerWorksForCompanyInSampleRow) { + success = false; + message = "L'observateur " + observer.getLogin() + " n'est pas membre de la société " + contact.getSampleRow().getCompany().getName(); + } + } + if (contact.getObsProgram() == ObsProgram.OBSDEB) { if (contact.getLandingDate() != null) {

1 0

r1631 - trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services
by bleny＠users.forge.codelutin.com Nov. 22, 2012

Nov. 22, 2012

Author: bleny Date: 2012-11-22 21:53:53 +0100 (Thu, 22 Nov 2012) New Revision: 1631 Url: http://forge.codelutin.com/repositories/revision/wao/1631 Log: refs #1680 dans les contacts on indique la societe associ?\195?\169e ?\195?\160 la ligne du plan plutot que la societe de l'observateur Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/ContactModelFactory.java Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/ContactModelFactory.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/ContactModelFactory.java 2012-11-22 20:31:12 UTC (rev 1630) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/ContactModelFactory.java 2012-11-22 20:53:53 UTC (rev 1631) @@ -219,7 +219,7 @@ return new ContactReaderPropertyConduit() { @Override public String getValue(Contact contact) { - return contact.getMainObserver().getCompany().getName(); + return contact.getSampleRow().getCompany().getName(); } }; }

1 0

r1630 - trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components
by bleny＠users.forge.codelutin.com Nov. 22, 2012

Nov. 22, 2012

Author: bleny Date: 2012-11-22 21:31:12 +0100 (Thu, 22 Nov 2012) New Revision: 1630 Url: http://forge.codelutin.com/repositories/revision/wao/1630 Log: fixes #1608 Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/FilterComponent.java Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/FilterComponent.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/FilterComponent.java 2012-11-22 19:48:26 UTC (rev 1629) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/FilterComponent.java 2012-11-22 20:31:12 UTC (rev 1630) @@ -34,6 +34,7 @@ import org.apache.tapestry5.annotations.Persist; import org.apache.tapestry5.corelib.components.Zone; import org.apache.tapestry5.ioc.annotations.Inject; +import org.nuiton.util.DateUtil; import org.nuiton.util.PeriodDates; import org.slf4j.Logger; @@ -173,6 +174,9 @@ period = ((SamplingFilter) getFilter()).getPeriod(); } else if (getFilter() instanceof ContactFilter) { period = ((ContactFilter) getFilter()).getPeriod(); + if (period != null) { + period.setThruDate(DateUtil.setMaxTimeOfDay(period.getThruDate())); + } } // if user entered a non-chronological time interval, invert it

1 0

r1629 - trunk/wao-business/src/main/java/fr/ifremer/wao/service
by bleny＠users.forge.codelutin.com Nov. 22, 2012

Nov. 22, 2012

Author: bleny Date: 2012-11-22 20:48:26 +0100 (Thu, 22 Nov 2012) New Revision: 1629 Url: http://forge.codelutin.com/repositories/revision/wao/1629 Log: fixes #1581 Le programme mentionn?\195?\169 dans le mail d'ajout au portefeuille est faux Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2012-11-22 19:44:24 UTC (rev 1628) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2012-11-22 19:48:26 UTC (rev 1629) @@ -1164,7 +1164,8 @@ String observerEmail = observer.getLogin(); String subject = String.format( - "Obsmer : ajout navire \"%d\" sur portefeuille ALLEGRO de %s", + "%s : ajout navire \"%d\" sur portefeuille ALLEGRO de %s", + contact.getObsProgram().toString(), boat.getImmatriculation(), observerEmail );

1 0

r1628 - trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components
by bleny＠users.forge.codelutin.com Nov. 22, 2012

Nov. 22, 2012

Author: bleny Date: 2012-11-22 20:44:24 +0100 (Thu, 22 Nov 2012) New Revision: 1628 Url: http://forge.codelutin.com/repositories/revision/wao/1628 Log: fixes #1580 Modifier le lien vers le SIH Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/Footer.tml Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/Footer.tml =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/Footer.tml 2012-10-30 07:46:58 UTC (rev 1627) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/Footer.tml 2012-11-22 19:44:24 UTC (rev 1628) @@ -33,7 +33,7 @@ Obsmer </a> - </t:if> - <a href="http://www.ifremer.fr/sih" title="Page d'accueil du SIH" target="_blank"> + <a href="http://sih.ifremer.fr/" title="Page d'accueil du SIH" target="_blank"> Ifremer SIH </a> - <a href="http://www.gnu.org/licenses/agpl.html" title="License AGPL v3" target="_blank">

1 0