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
March 2011
- 3 participants
- 73 discussions
[Suiviobsmer-commits] r1090 - trunk/src/site/rst/import
by bleny＠users.labs.libre-entreprise.org 24 Mar '11
by bleny＠users.labs.libre-entreprise.org 24 Mar '11
24 Mar '11
Author: bleny
Date: 2011-03-24 17:49:09 +0000 (Thu, 24 Mar 2011)
New Revision: 1090
Log:
update javadoc
Modified:
trunk/src/site/rst/import/contacts.rst
trunk/src/site/rst/import/samplingPlan.rst
Modified: trunk/src/site/rst/import/contacts.rst
===================================================================
--- trunk/src/site/rst/import/contacts.rst 2011-03-24 17:48:46 UTC (rev 1089)
+++ trunk/src/site/rst/import/contacts.rst 2011-03-24 17:49:09 UTC (rev 1090)
@@ -30,69 +30,36 @@
Infos
-----
-- Disponible depuis version 0.0.3
-- Encodage du fichier CSV obligatoire en UTF-8
+- Le fichier est au format CSV avec le point-virgule comme séparateur
+- Le fichier est encodé en UTF-8
+- La façon la plus sûre est de partir d'un fichier exporté depuis Wao, de modifier avec un tableur puis d'importer
-Voir `Fichier OpenOffice`_ .
-
-.. _Fichier OpenOffice: ../doc/DOC_Contacts_Header.ods
-
-`Fichier CSV vierge pour import`_ .
-
-.. _Fichier CSV vierge pour import: ../doc/wao-contacts-import.csv
-
-Note
-----
-
-- Création d'une ligne si CONT_CREATION est vide.
-- Modification d'une ligne si existante : recherche sur NAVS_COD, PLAN_CODE, CONT_CREATION, SOCIETE_NOM
-- Les validations (société ou programme) ne sont pas importés
-- La modification d'un contact existant depuis un import n'est valable
- uniquement si la ligne n'est pas validé dans l'application.
-
Types et formats des cellules
-----------------------------
-- string = chaîne de caractères -> ex : "Une_Chaine345"
-- double = nombre réel, formaté en anglais -> ex : 1.2
-- date = date, formaté en jour/mois/année (JJ/MM/AAAA sous Excel) -> ex : 01/12/2010
-- int = nombre entier -> ex : 3
-- boolean = vrai ou faux, se traduit par un 'X' si c'est vrai
+- CONTACT_ID : identifiant unique généré par Wao, laisser vide pour créer un contact
+- CONTACT_DATE_CREATION : date et heure de création du contact
+- CONTACT_OBSERVATEUR_PRINCIPAL : identifiant de l'observateur principal
+- CONTACT_OBSERVATEURS_SECONDAIRES : identifiants des observateurs secondaires
+- CONTACT_ETAT : état du contact
+- CONTACT_DEBUT_OBSERVATION" : date et heure de début d'observation (embarquement pour ObsMer et arrivée sur le lieu pour ObsVente)
+- CONTACT_FIN_OBSERVATION : date et heure de fin d'observation (débarquement pour ObsMer et départ du lieu pour ObsVente)
+- CONTACT_SAISIE_DONNEES : date de saisie des données (dans Allegro pour ObsMer, dans Arpège pour ObsVente)
+- CONTACT_COMMENTAIRE_OBSERVATEUR : commentaire de l'observateur
+- CONTACT_COMMENTAIRE_COORDINATEUR : commentaire du coordinateur
+- CONTACT_COMMENTAIRE_PROGRAMME : commentaire de l'administrateur
+- NAVIRE_IMMATRICULATION : immatriculation du navire associé (6 chiffres)
+- CONTACT_VALIDATION_SOCIETE : validation société, si une ligne est déjà validée, elle est refusée lors de l'import par un coordinateur
+- CONTACT_VALIDATION_PROGRAMME : validation programme, si une ligne est déjà validée, elle est refusée lors de l'import par un administrateur
+- PLAN_CODE : la ligne du plan associée au contact (ignoré à l'import)
-Descriptions des colonnes
--------------------------
+Pour ObsMer :
+- CONTACT_QUALITE_DONNEE
+- CONTACT_OBSERVATION_MAMMIFERE
+- CONTACT_CAPTURE_ACCIDENTELLE
-- CONT_CODE (string) : Code pour modification d'un contact existant dans WAO (uniquement récupérable depuis un export)
-- CONT_CREATION (date) : Date de création de la ligne (si vide, nouvelle ligne dans WAO)
-- OBSERV_ID (string) : Login de l'observateur (obligatoire)
-- OBSERV_PRENOM (string) : Prénom de l'observateur
-- OBSERV_NOM (string) : Nom de l'observateur
-- SOCIETE_NOM (string) : Nom de la société
-- PLAN_CODE (string) : Code de la ligne (obligatoire)
-- PROGRAMME_CODE (string) : Nom du programme
-- PROGRAMME_DEBUT (date) : Date de début du programme
-- PROGRAMME_FIN (date) : Date de fin du programme
-- PECHE_FACADE (string) : Facade de la zone de pêche
-- PECHE_ZONE (string) : Secteur de la zone de pêche
-- PECHE_DIVISION (string) : Zones de pêche liés à la ligne, chaque zone est séparé par un " / " -> ex : VIIa / VIIb (obligatoire)
-- PECHE_AUTRE (string) : Autres information sur les zones de pêche pour la ligne
-- METIER_CODE_DCF5 (string) : Code DCF niveau 5 du métier
-- METIER_MAILLAGE (string) : Maillage du métier
-- METIER_TAILLE (string) : Taille du métier
-- METIER_AUTRE (string) : Autre information du métier
-- METIER_LIBELLE (string) : Libellé du métier
-- METIER_ESPECES (string) : Espèces liées au métier
-- NAVS_COD (int) : Immatriculation du navire (6 chiffres) (obligatoire)
-- CARN_NOM (string) : Nom du navire
-- QUARTIER_IMMA (string) : Code quartier du navire
-- CONT_ETAT (string) : Etat du contact
- (valeurs possibles : "Contact pris", "Embarquement prévu", "Embarquement réalisé", "Non abouti", "Refus", "Refus définitif")
-- CONT_DEBUT_MAREE (date) : Date de début de la marée
-- CONT_FIN_MAREE (date) : Date de fin de la marée
-- CONT_NB_OBSERV (int) : Nombre d'observateurs pour l'embarquement
-- CONT_MAM_CAPT (boolean) : Capture de mammifères
-- CONT_MAM_OBSERV (boolean) : Observation de mammifères
-- CONT_COMMENT (string) : Commentaire sur le contact
-- CONT_ALLEGRO (date) : Date de saisies dans Allegro
-- CONT_SOCIETE_VALID (string) : Validation par la société : 'A' pour Accepter, 'N' pour en attente, 'R' pour Refuser
-- CONT_PROGRAM_VALID (string) : Validation par le programme : 'A' pour Accepter, 'N' pour en attente, 'R' pour Refuser
+Pour ObsVente :
+- CONTACT_LIEU_TYPE : Port ou Criée
+- CONTACT_LIEU_CODE : Code du lieu
+- CONTACT_ECHANTILLONNAGE_COMPLET: Échantillonnage comple
+- CONTACT_LIEU_DESCRIPTION : Description du lieu, ignoré à l'import
Modified: trunk/src/site/rst/import/samplingPlan.rst
===================================================================
--- trunk/src/site/rst/import/samplingPlan.rst 2011-03-24 17:48:46 UTC (rev 1089)
+++ trunk/src/site/rst/import/samplingPlan.rst 2011-03-24 17:49:09 UTC (rev 1090)
@@ -58,10 +58,19 @@
- PROGRAMME_DEBUT (date) : Date de début du programme (obligatoire)
- PROGRAMME_FIN (date) : Date de fin du programme (obligatoire)
- champs pour les mois formatés comme des dates (MM/AAAA)
-- PLAN_DUREE_MOY (double) : Durée moyenne d'une marée (obligatoire)
-- PLAN_NB_OBSERV (int) : Nombre d'observateurs (obligatoire)
- PLAN_COMMENT (string) : Commentaire sur la création de la ligne
+Pour ObsMer :
+
+- PLAN_NB_OBSERV (int) : Nombre d'observateurs (obligatoire)
+- PLAN_DUREE_MOY (double) : Durée moyenne d'une marée (obligatoire)
+
+Pour ObsVente :
+
+- PLAN_STRATEGIE (String) : Stratégie d'échantillonnage souhaitée (obligatoire)
+- PLAN_LIEU_CODE (String) : Code du quartier maritime (obligatoire)
+- PLAN_LIEU_NOM (String) : Nom du quartier maritime
+
Refus
-----
1
0
Author: bleny
Date: 2011-03-24 17:48:46 +0000 (Thu, 24 Mar 2011)
New Revision: 1089
Log:
update eugene version after release
Modified:
trunk/pom.xml
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2011-03-24 12:03:31 UTC (rev 1088)
+++ trunk/pom.xml 2011-03-24 17:48:46 UTC (rev 1089)
@@ -312,10 +312,10 @@
<!-- libraries version -->
<nuitonI18nVersion>2.3.1</nuitonI18nVersion>
- <nuitonUtilsVersion>2.1-SNAPSHOT</nuitonUtilsVersion>
+ <nuitonUtilsVersion>2.1</nuitonUtilsVersion>
<nuitonWebVersion>1.0</nuitonWebVersion>
<topiaVersion>2.5.2</topiaVersion>
- <eugeneVersion>2.3.3-SNAPSHOT</eugeneVersion>
+ <eugeneVersion>2.3.3</eugeneVersion>
<tapestryVersion>5.2.4</tapestryVersion>
<hibernateVersion>3.3.2.GA</hibernateVersion>
<jfreeVersion>1.0.12</jfreeVersion>
1
0
[Suiviobsmer-commits] r1088 - in trunk/wao-business/src/main/java/fr/ifremer/wao: . service
by bleny＠users.labs.libre-entreprise.org 24 Mar '11
by bleny＠users.labs.libre-entreprise.org 24 Mar '11
24 Mar '11
Author: bleny
Date: 2011-03-24 12:03:31 +0000 (Thu, 24 Mar 2011)
New Revision: 1088
Log:
code clean up ; use nuiton-utils
Modified:
trunk/wao-business/src/main/java/fr/ifremer/wao/WaoUtils.java
trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java
trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java
trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceUserImpl.java
Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoUtils.java
===================================================================
--- trunk/wao-business/src/main/java/fr/ifremer/wao/WaoUtils.java 2011-03-24 11:52:31 UTC (rev 1087)
+++ trunk/wao-business/src/main/java/fr/ifremer/wao/WaoUtils.java 2011-03-24 12:03:31 UTC (rev 1088)
@@ -166,15 +166,6 @@
return dateFormat.format(date);
}
- /**
- *
- * @deprecated should be replaced by StringUtil.isEmail
- */
- @Deprecated
- public static boolean isEmail(String str) {
- return str.matches("^[a-z0-9!#$%&'*+/=?^_`{|}~-]+((\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)?)+@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9\\-]*[a-z0-9])?$");
- }
-
/** Cut a collection of beans by divide them depending of the value
* of a given property.
*
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 2011-03-24 11:52:31 UTC (rev 1087)
+++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2011-03-24 12:03:31 UTC (rev 1088)
@@ -582,7 +582,7 @@
// sending the same e-mail to all of them
for (WaoUser waoUser : waoUsers) {
String userLogin = waoUser.getLogin();
- if (WaoUtils.isEmail(userLogin)) {
+ if (StringUtil.isEmail(userLogin)) {
try {
WaoUtils.sendEmail(userLogin, object, body);
} catch (EmailException e) {
Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java
===================================================================
--- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java 2011-03-24 11:52:31 UTC (rev 1087)
+++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java 2011-03-24 12:03:31 UTC (rev 1088)
@@ -381,164 +381,6 @@
transaction.commitTransaction();
-// TopiaContext transaction2 = null;
-// try {
-//
-// SampleRowLogDAO logDAO = WaoDAOHelper.getSampleRowLogDAO(transaction);
-// context.prepareTopiaId(SampleRowLog.class, rowLog);
-// logDAO.update(rowLog);
-//
-// boolean isNewRow = context.prepareTopiaId(SampleRow.class, row);
-//
-// if (log.isDebugEnabled()) {
-// log.debug("new sampleRow : " + isNewRow);
-// log.debug("samplRow topiaId : " + row.getTopiaId());
-// }
-//
-// String pattern = DateUtil.MONTH_PATTERN;
-// DateFormat dateFormat = new SimpleDateFormat(pattern);
-//
-// SampleRow oldRow = null;
-// Profession oldProfession = null;
-// Company oldCompany = null;
-// Map<String, SampleMonth> oldMonths = new HashMap<String, SampleMonth>();
-// List<FishingZone> oldZones = new ArrayList<FishingZone>();
-// transaction2 = context.beginTransaction();
-// // UPDATE
-// if (!isNewRow) {
-// // Prepare data for logging or deleting oldMonths
-// SampleRowDAO oldDAO = WaoDAOHelper.getSampleRowDAO(transaction2);
-// oldRow = oldDAO.findByTopiaId(row.getTopiaId());
-// oldCompany = oldRow.getCompany();
-// oldProfession = oldRow.getProfession();
-// for (SampleMonth month : oldRow.getSampleMonth()) {
-// oldMonths.put(month.getTopiaId(), month);
-// }
-// oldZones = oldRow.getFishingZone();
-//
-// // NbObservants
-// if (oldRow.getNbObservants() != row.getNbObservants()) {
-// rowLog.addChange("Le nombre d'observateurs est passé de " + oldRow.getNbObservants() + " à " + row.getNbObservants());
-// }
-// // AverageTideTime
-// if (oldRow.getAverageTideTime() != row.getAverageTideTime()) {
-// rowLog.addChange("La durée moyenne d'une marée est passé de " + oldRow.getAverageTideTime() + " jours à " + row.getAverageTideTime());
-// }
-//
-// if (ObjectUtils.notEqual(oldRow.getTerrestrialLocation(), row.getTerrestrialLocation())) {
-// rowLog.addChange("Le lieu est passé de " + oldRow.getTerrestrialLocation().getDescription() + " à "
-// + row.getTerrestrialLocation().getDescription());
-// }
-// } else {
-// rowLog.addChange("Le nombre d'observateurs est " + row.getNbObservants());
-// rowLog.addChange("La durée moyenne d'une marée est " + row.getAverageTideTime());
-// }
-// // ChangeLog Company
-// rowLog.addChangeCompany(oldCompany, row.getCompany());
-// // ChangeLog Program
-// String oldProgram = oldRow != null ? oldRow.getProgramName() : null;
-// rowLog.addChangeProgram(oldProgram, row.getProgramName());
-// // ChangeLog Period
-// PeriodDates oldPeriod = null;
-// if (oldRow != null) {
-// oldPeriod = new PeriodDates(oldRow.getPeriodBegin(), oldRow.getPeriodEnd());
-// }
-// PeriodDates newPeriod = new PeriodDates(row.getPeriodBegin(), row.getPeriodEnd());
-// rowLog.addChangePeriod(oldPeriod, newPeriod, pattern);
-//
-// // before saving profession
-// if (row.getDCF5Code() != null) {
-// row.setDCF5Code(insertOrSelect(transaction, row.getDCF5Code()));
-// }
-//
-// // Save Profession
-// ProfessionDAO professionDAO = WaoDAOHelper.getProfessionDAO(transaction);
-// context.prepareTopiaId(Profession.class, row.getProfession());
-// rowLog.addChangeProfession(oldRow, row);
-// professionDAO.update(row.getProfession());
-//
-// // Save sampleMonth
-// SampleMonthDAO monthDAO = WaoDAOHelper.getSampleMonthDAO(transaction);
-//
-// // Delete oldMonths
-// List<SampleMonth> newMonths = row.getSampleMonth();
-// for (SampleMonth oldMonth : oldMonths.values()) {
-// if (!newMonths.contains(oldMonth)) {
-// String date = dateFormat.format(oldMonth.getPeriodDate());
-// // Delete old month : add to log
-// monthDAO.delete(oldMonth);
-// rowLog.addChange("Le mois " + date + " a été supprimé, " +
-// "l'ancienne valeur d'effort était " + oldMonth.getExpectedTidesValue());
-// }
-// }
-// // Create or update months
-// for (SampleMonth month : newMonths) {
-// boolean monthCreated = context.prepareTopiaId(SampleMonth.class, month);
-// String date = dateFormat.format(month.getPeriodDate());
-// if (monthCreated) {
-// // log create month
-// rowLog.addChange("Le mois " + date + " a été créé avec un nombre de marées de " + month.getExpectedTidesValue());
-// } else {
-// SampleMonth oldMonth = oldMonths.get(month.getTopiaId());
-// if (oldMonth.getExpectedTidesValue() != month.getExpectedTidesValue()) {
-// // log change month value
-// rowLog.addChange("Le nombre de marées du mois " + date + " est passé de " +
-// oldMonth.getExpectedTidesValue() + " à " + month.getExpectedTidesValue());
-// }
-// }
-// monthDAO.update(month);
-// }
-//
-// List<List<Integer>> immatriculations =
-// updateElligibleBoats(transaction, row, boats);
-//
-// // ChangeLog boats (index=0 for removed, index=1 for new)
-// rowLog.addRemoveBoats(immatriculations.get(0));
-// rowLog.addNewBoats(immatriculations.get(1));
-//
-//// String oldBoats = oldRow != null ? oldRow.getMainElligibleBoatsAsString() : "";
-//// rowLog.addNewBoats(immatriculations.get(1));
-//
-//
-// // Remove no longer linked FishingZone
-// List<FishingZone> newZones = row.getFishingZone();
-// for (FishingZone oldZone : oldZones) {
-// if (!newZones.contains(oldZone)) {
-//// updateFishingZones(transaction, oldZone.getTopiaId(), row, true);
-// rowLog.addChange("La zone de pêche " + oldZone.getCode() + " a été dissociée de la ligne");
-// }
-// }
-// // Add new linked FishingZone
-// // ConcurrentModificationException ????
-// for (FishingZone zone : new ArrayList<FishingZone>(newZones)) {
-// if (!oldZones.contains(zone)) {
-//// updateFishingZones(transaction, zone.getTopiaId(), row, false);
-// rowLog.addChange("La zone de pêche " + zone.getCode() + " a été associée à la ligne");
-// }
-// }
-//
-// // Save sampleRow : create or update
-// SampleRowDAO rowDAO = WaoDAOHelper.getSampleRowDAO(transaction);
-// if (log.isDebugEnabled()) {
-// log.debug("update row : " + row);
-// }
-// // Not useful, sampleRowLog is instantiate using getNewSampleRowLog(SampleRow, ConnectedUser);
-// rowLog.setSampleRow(row);
-// rowLog.setFromAdmin(true);
-//
-// rowDAO.update(row);
-//
-// if (log.isDebugEnabled()) {
-// log.debug("Change log : " + rowLog.getLogText());
-// log.debug("commit transaction !");
-// }
-// transaction.commitTransaction();
-//
-// } catch (Exception eee) {
-// throw eee;
-// } finally {
-// transaction2.closeContext();
-// }
}
/**
Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceUserImpl.java
===================================================================
--- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceUserImpl.java 2011-03-24 11:52:31 UTC (rev 1087)
+++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceUserImpl.java 2011-03-24 12:03:31 UTC (rev 1088)
@@ -254,7 +254,7 @@
transaction.commitTransaction();
try {
- if (WaoUtils.isEmail(user.getLogin()) && user.isPasswordChanged()) {
+ if (StringUtil.isEmail(user.getLogin()) && user.isPasswordChanged()) {
String subject = "[WAO] ";
String msg = "Bonjour,\n\n";
if (isNewUser) {
1
0
[Suiviobsmer-commits] r1087 - in trunk: wao-business/src/main/java/fr/ifremer/wao/entity wao-business/src/main/java/fr/ifremer/wao/service wao-business/src/test/java/fr/ifremer/wao/service wao-business/src/test/resources wao-ui/src/main/webapp/css
by bleny＠users.labs.libre-entreprise.org 24 Mar '11
by bleny＠users.labs.libre-entreprise.org 24 Mar '11
24 Mar '11
Author: bleny
Date: 2011-03-24 11:52:31 +0000 (Thu, 24 Mar 2011)
New Revision: 1087
Log:
misc fixes
Modified:
trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowLogImpl.java
trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java
trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSamplingImplTest.java
trunk/wao-business/src/test/resources/log4j.properties
trunk/wao-ui/src/main/webapp/css/sampling.css
Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowLogImpl.java
===================================================================
--- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowLogImpl.java 2011-03-24 10:29:28 UTC (rev 1086)
+++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowLogImpl.java 2011-03-24 11:52:31 UTC (rev 1087)
@@ -352,10 +352,10 @@
addChange("Les navires suivants ne sont plus éligibles : " +
StringUtils.join(noLongerEligibleBoats, ", "));
}
- if ( ! stillEligibleBoats.isEmpty()) {
- addChange("Les navires suivants sont toujours éligibles ; " +
- StringUtils.join(stillEligibleBoats, ", "));
- }
+// if ( ! stillEligibleBoats.isEmpty()) {
+// addChange("Les navires suivants sont toujours éligibles ; " +
+// StringUtils.join(stillEligibleBoats, ", "));
+// }
if ( ! newlyEligibleBoats.isEmpty()) {
addChange("Les navires suivants deviennent éligibles : " +
StringUtils.join(newlyEligibleBoats, ", "));
@@ -395,10 +395,10 @@
addChange("Les zones de pêches suivantes ont été dissociées : " +
StringUtils.join(removedZones, ", "));
}
- if ( ! keptZones.isEmpty()) {
- addChange("Les zones de pêches suivantes sont toujours associées : " +
- StringUtils.join(keptZones, ", "));
- }
+// if ( ! keptZones.isEmpty()) {
+// addChange("Les zones de pêches suivantes sont toujours associées : " +
+// StringUtils.join(keptZones, ", "));
+// }
if ( ! addedZones.isEmpty()) {
addChange("Les zones de pêches suivantes ont été ajoutées : " +
StringUtils.join(addedZones, ", "));
Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java
===================================================================
--- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java 2011-03-24 10:29:28 UTC (rev 1086)
+++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java 2011-03-24 11:52:31 UTC (rev 1087)
@@ -98,6 +98,7 @@
import org.nuiton.util.StringUtil;
import org.nuiton.util.beans.Binder;
import org.nuiton.util.beans.BinderFactory;
+import org.nuiton.util.beans.BinderModelBuilder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -290,6 +291,8 @@
row.setCode(code);
} else {
+ // We call the service in another transaction, to prevent
+ // putting an entity in with the same id in the same session
oldRow = getSampleRowByCode(null, row.getCode());
}
@@ -321,20 +324,57 @@
// update the row by copying the new data in the old entity
// taking care to not remove any sample row log entries
- // FIXME 2011-03-22 bleny select property to copy according to program
- Binder<SampleRow, SampleRow> sampleRowBinder = BinderFactory.newBinder(SampleRow.class);
- sampleRowBinder.copyExcluding(row, oldRow, SampleRow.TOPIA_ID, SampleRow.TOPIA_VERSION, SampleRow.TOPIA_CREATE_DATE,
- // old logs (whole historic) is kept by not erasing this property
- SampleRow.PROPERTY_SAMPLE_ROW_LOG,
- // FIXME bleny 20110315 should not be excluded
- SampleRow.PROPERTY_OBSERVERS);
+ BinderModelBuilder<SampleRow, SampleRow> sampleRowBinderModelBuilder = BinderModelBuilder.newEmptyBuilder(SampleRow.class);
+ if (ObsProgram.OBSDEB.equals(row.getObsProgram())) {
+ sampleRowBinderModelBuilder.addSimpleProperties(
+ SampleRow.PROPERTY_COMMENT, SampleRow.PROPERTY_COMMENT,
+ SampleRow.PROPERTY_DAY, SampleRow.PROPERTY_DAY,
+ SampleRow.PROPERTY_GROUP_NAME, SampleRow.PROPERTY_GROUP_NAME,
+ // SampleRow.PROPERTY_OBSERVERS, SampleRow.PROPERTY_OBSERVERS,
+ SampleRow.PROPERTY_OBSERVATION_UNIT, SampleRow.PROPERTY_OBSERVATION_UNIT);
+ } else {
+ oldRow.clearSampleMonth();
+ oldRow.addAllSampleMonth(row.getSampleMonth());
+ oldRow.clearDCF5Code();
+ oldRow.addAllDCF5Code(row.getDCF5Code());
+ // first, add all properties common to both ObsMer and ObsVente
+ sampleRowBinderModelBuilder.addSimpleProperties(
+ // SampleRow.PROPERTY_D_CF5_CODE,
+ // SampleRow.PROPERTY_SAMPLE_MONTH,
+ SampleRow.PROPERTY_FISHING_ZONES_INFOS,
+ SampleRow.PROPERTY_COMMENT,
+ SampleRow.PROPERTY_PROGRAM_NAME,
+ SampleRow.PROPERTY_PERIOD_BEGIN,
+ SampleRow.PROPERTY_PERIOD_END,
+ SampleRow.PROPERTY_SAMPLING_STRATEGY_ORDINAL,
+ SampleRow.PROPERTY_PROFESSION,
+ SampleRow.PROPERTY_COMPANY,
+ SampleRow.PROPERTY_ELLIGIBLE_BOAT,
+ SampleRow.PROPERTY_FISHING_ZONE);
+
+ // now add properties specific to ObsMer or ObsVente
+ if (ObsProgram.OBSMER.equals(row.getObsProgram())) {
+ sampleRowBinderModelBuilder.addSimpleProperties(
+ SampleRow.PROPERTY_NB_OBSERVANTS,
+ SampleRow.PROPERTY_AVERAGE_TIDE_TIME);
+ } else if (ObsProgram.OBSVENTE.equals(row.getObsProgram())) {
+ sampleRowBinderModelBuilder.addSimpleProperties(
+ SampleRow.PROPERTY_SAMPLING_STRATEGY_ORDINAL,
+ SampleRow.PROPERTY_TERRESTRIAL_LOCATION,
+ SampleRow.PROPERTY_TERRESTRIAL_LOCATION_INFOS);
+ }
+ }
+ BinderFactory.registerBinderModel(sampleRowBinderModelBuilder, "wao");
+ Binder<SampleRow, SampleRow> sampleRowBinder = BinderFactory.newBinder(SampleRow.class, "wao");
+ sampleRowBinder.copy(row, oldRow);
+
if (rowLog.getTopiaId() == null) {
context.prepareTopiaId(SampleRowLog.class, rowLog);
}
// attach the new log entry to the updated row
- row.addSampleRowLog(rowLog);
+ oldRow.addSampleRowLog(rowLog);
dao.update(oldRow);
}
@@ -770,6 +810,11 @@
result.sizeFishingZone();
result.sizeDCF5Code();
result.sizeSampleRowLog();
+
+ if (ObsProgram.OBSVENTE.equals(result.getObsProgram())) {
+ result.getTerrestrialLocation();
+ }
+
}
return result;
@@ -1454,18 +1499,12 @@
}
@Override
- protected SamplingFilterValues executeGetPossibleValuesForFilter(TopiaContext transaction, SamplingFilter filter) throws Exception {
- FacadeRow facadeRow = executeGetSampleRowsOrderedByFishingZone(transaction, filter);
- SamplingFilterValues result = new SamplingFilterValuesImpl();
+ public SamplingFilterValues executeGetPossibleValuesForFilter(TopiaContext transaction, SamplingFilter filter) throws Exception {
+ List<SampleRow> sampleRows = executeGetSampleRowsByFilter(transaction, filter);
- List<SampleRow> sampleRows = facadeRow.getValues();
-
- if (sampleRows == null) {
- return result;
- }
-
// Extract datas
- // FIXME sletellier 20110318 : move this on SamplingFilterValues ?
+ // TODO sletellier 20110318 : move this on SamplingFilterValues ?
+ SamplingFilterValues result = new SamplingFilterValuesImpl();
for (SampleRow sampleRow : sampleRows) {
result.addCompanies(sampleRow.getCompany());
result.addFacadeNames(sampleRow.getFacade());
Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSamplingImplTest.java
===================================================================
--- trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSamplingImplTest.java 2011-03-24 10:29:28 UTC (rev 1086)
+++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSamplingImplTest.java 2011-03-24 11:52:31 UTC (rev 1087)
@@ -62,6 +62,7 @@
import fr.ifremer.wao.io.ImportResults;
import org.apache.commons.io.IOUtils;
import org.junit.Assert;
+import org.junit.Ignore;
import org.junit.Test;
import org.nuiton.topia.TopiaContext;
import org.nuiton.topia.TopiaException;
@@ -682,6 +683,7 @@
* @throws WaoBusinessException should not occur
*/
@Test
+ @Ignore("not yet implemented")
public void importObsdebSamplingPlan() throws WaoBusinessException {
ServiceReferential serviceReferential = manager.getServiceReferential();
InputStream input = null;
Modified: trunk/wao-business/src/test/resources/log4j.properties
===================================================================
--- trunk/wao-business/src/test/resources/log4j.properties 2011-03-24 10:29:28 UTC (rev 1086)
+++ trunk/wao-business/src/test/resources/log4j.properties 2011-03-24 11:52:31 UTC (rev 1087)
@@ -29,7 +29,7 @@
# A1 uses PatternLayout.
log4j.appender.A1.layout=org.apache.log4j.PatternLayout
-log4j.appender.A1.layout.ConversionPattern=%d [%p] %c{2} %m%n
+log4j.appender.A1.layout.ConversionPattern=%d %5p [%t] (%F:%L) %M - %m%n
log4j.logger.fr.ifremer.wao=INFO
log4j.logger.org.nuiton.util=INFO
Modified: trunk/wao-ui/src/main/webapp/css/sampling.css
===================================================================
--- trunk/wao-ui/src/main/webapp/css/sampling.css 2011-03-24 10:29:28 UTC (rev 1086)
+++ trunk/wao-ui/src/main/webapp/css/sampling.css 2011-03-24 11:52:31 UTC (rev 1087)
@@ -74,8 +74,10 @@
padding-left: 5px;
}
-#sampleRowForm {
+#so-samplerow-form form {
width: 50%;
+ margin-left: auto;
+ margin-right: auto;
}
/* Styles for table header */
1
0
[Suiviobsmer-commits] r1086 - trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components
by sletellier＠users.labs.libre-entreprise.org 24 Mar '11
by sletellier＠users.labs.libre-entreprise.org 24 Mar '11
24 Mar '11
Author: sletellier
Date: 2011-03-24 10:29:28 +0000 (Thu, 24 Mar 2011)
New Revision: 1086
Log:
Fix refresh on search component
Modified:
trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/SamplingFilterComponent.java
Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/SamplingFilterComponent.java
===================================================================
--- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/SamplingFilterComponent.java 2011-03-23 17:10:12 UTC (rev 1085)
+++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/SamplingFilterComponent.java 2011-03-24 10:29:28 UTC (rev 1086)
@@ -138,9 +138,6 @@
* @return owner (for refresh) if filter is edited
*/
Object onSuccessFromFiltersForm() {
- if (refresh) {
- return filtersZone.getBody();
- }
if (reset) {
// Don't reset period in filters
PeriodDates period = getFilter().getPeriod();
@@ -148,7 +145,15 @@
getFilter().setPeriod(period);
}
- // Return owner
- return resources.getContainer();
+ // Limite search panel
+ getFilterManager().updatePossibleValuesForFilter();
+
+ if (refresh) {
+ // Refresh search panel
+ return filtersZone.getBody();
+ } else {
+ // Refresh owner
+ return resources.getContainer();
+ }
}
}
1
0
[Suiviobsmer-commits] r1085 - trunk/wao-business/src/test/resources
by bleny＠users.labs.libre-entreprise.org 23 Mar '11
by bleny＠users.labs.libre-entreprise.org 23 Mar '11
23 Mar '11
Author: bleny
Date: 2011-03-23 17:10:12 +0000 (Wed, 23 Mar 2011)
New Revision: 1085
Log:
logs in INFO for tests
Modified:
trunk/wao-business/src/test/resources/log4j.properties
Modified: trunk/wao-business/src/test/resources/log4j.properties
===================================================================
--- trunk/wao-business/src/test/resources/log4j.properties 2011-03-23 17:04:32 UTC (rev 1084)
+++ trunk/wao-business/src/test/resources/log4j.properties 2011-03-23 17:10:12 UTC (rev 1085)
@@ -31,6 +31,6 @@
log4j.appender.A1.layout=org.apache.log4j.PatternLayout
log4j.appender.A1.layout.ConversionPattern=%d [%p] %c{2} %m%n
-log4j.logger.fr.ifremer.wao=DEBUG
+log4j.logger.fr.ifremer.wao=INFO
log4j.logger.org.nuiton.util=INFO
log4j.logger.org.nuiton.util.beans.BinderProvider=ERROR
1
0
[Suiviobsmer-commits] r1084 - trunk/wao-business/src/test/java/fr/ifremer/wao/service
by bleny＠users.labs.libre-entreprise.org 23 Mar '11
by bleny＠users.labs.libre-entreprise.org 23 Mar '11
23 Mar '11
Author: bleny
Date: 2011-03-23 17:04:32 +0000 (Wed, 23 Mar 2011)
New Revision: 1084
Log:
fix test, now saving a contact make a boat eligible for a row
Modified:
trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceBoatImplTest.java
Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceBoatImplTest.java
===================================================================
--- trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceBoatImplTest.java 2011-03-23 16:23:15 UTC (rev 1083)
+++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceBoatImplTest.java 2011-03-23 17:04:32 UTC (rev 1084)
@@ -292,6 +292,8 @@
ConnectedUser connectedUser = getConnectedUser(user, UserRole.ADMIN, ObsProgram.OBSMER);
ServiceContact serviceContact = manager.getServiceContact();
+
+ // creating the contact will make the boat 174592 eligible for row
Contact contact1 = serviceContact.getNewContact(connectedUser, row, boat);
contact1.setContactState(ContactState.CONTACT_START);
serviceContact.saveContact(connectedUser, contact1, false);
@@ -316,7 +318,7 @@
companyBoatInfos = service.getCompanyBoatInfos(ObsProgram.OBSMER, 174592, company);
Map<String, ElligibleBoat> results = companyBoatInfos.getElligibleBoats();
- Assert.assertEquals(2, results.size());
+ Assert.assertEquals(3, results.size());
ElligibleBoat elligible = companyBoatInfos.getElligibleBoat("2009_0003");
Assert.assertNotNull(elligible.getCompanyActive());
@@ -336,7 +338,7 @@
companyBoatInfos = service.getCompanyBoatInfos(ObsProgram.OBSMER, 174592, company);
results = companyBoatInfos.getElligibleBoats();
- Assert.assertEquals(1, results.size());
+ Assert.assertEquals(2, results.size());
elligible = companyBoatInfos.getElligibleBoat("2009_0003");
Assert.assertNull(elligible.getCompanyActive());
1
0
[Suiviobsmer-commits] r1083 - in trunk: wao-business/src/main/java/fr/ifremer/wao/entity wao-business/src/main/java/fr/ifremer/wao/io/csv2/models wao-business/src/main/java/fr/ifremer/wao/service wao-business/src/test/java/fr/ifremer/wao wao-business/src/test/java/fr/ifremer/wao/entity wao-business/src/test/java/fr/ifremer/wao/service wao-business/src/test/resources/import wao-ui/src/main/webapp wao-ui/src/main/webapp/css
by bleny＠users.labs.libre-entreprise.org 23 Mar '11
by bleny＠users.labs.libre-entreprise.org 23 Mar '11
23 Mar '11
Author: bleny
Date: 2011-03-23 16:23:15 +0000 (Wed, 23 Mar 2011)
New Revision: 1083
Log:
contact import/export, make import accessible import for coordinator in UI
Modified:
trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowLogImpl.java
trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/ContactImportExportModel.java
trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java
trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java
trunk/wao-business/src/test/java/fr/ifremer/wao/AbstractServiceTest.java
trunk/wao-business/src/test/java/fr/ifremer/wao/entity/BoatImplTest.java
trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceBoatImplTest.java
trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactImplTest.java
trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactInternalTest.java
trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSamplingImplTest.java
trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSynthesisImplTest.java
trunk/wao-business/src/test/resources/import/contacts.csv
trunk/wao-ui/src/main/webapp/Contacts.tml
trunk/wao-ui/src/main/webapp/css/sampling.css
Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowLogImpl.java
===================================================================
--- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowLogImpl.java 2011-03-22 10:30:29 UTC (rev 1082)
+++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowLogImpl.java 2011-03-23 16:23:15 UTC (rev 1083)
@@ -334,7 +334,9 @@
// filling the three lists
for (ElligibleBoat oldEligibleBoat : oldEligibleBoats) {
if ( ! newEligibleBoats.contains(oldEligibleBoat)) {
- noLongerEligibleBoats.add(oldEligibleBoat.getBoat().getImmatriculation());
+ Boat boat = oldEligibleBoat.getBoat();
+ int plateNumber = boat.getImmatriculation();
+ noLongerEligibleBoats.add(plateNumber);
}
}
for (ElligibleBoat newEligibleBoat : newEligibleBoats) {
Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/ContactImportExportModel.java
===================================================================
--- trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/ContactImportExportModel.java 2011-03-22 10:30:29 UTC (rev 1082)
+++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/ContactImportExportModel.java 2011-03-23 16:23:15 UTC (rev 1083)
@@ -199,6 +199,8 @@
modelBuilder.newColumnForImportExport("CONTACT_COMMENTAIRE_OBSERVATEUR", Contact.PROPERTY_COMMENT);
modelBuilder.newColumnForImportExport("CONTACT_COMMENTAIRE_COORDINATEUR", Contact.PROPERTY_COMMENT_COORDINATOR);
modelBuilder.newColumnForImportExport("CONTACT_COMMENTAIRE_PROGRAMME", Contact.PROPERTY_COMMENT_ADMIN);
+ modelBuilder.newColumnForImportExport("CONTACT_OBSERVATION_MAMMIFERE", Contact.PROPERTY_MAMMALS_OBSERVATION, Common.BOOLEAN);
+ modelBuilder.newColumnForImportExport("CONTACT_CAPTURE_ACCIDENTELLE", Contact.PROPERTY_MAMMALS_CAPTURE, Common.BOOLEAN);
modelBuilder.newColumnForImportExport("PLAN_CODE", Contact.PROPERTY_SAMPLE_ROW, new SampleRowParserFormatter(sampleRows));
modelBuilder.newColumnForImportExport("NAVIRE_IMMATRICULATION", Contact.PROPERTY_BOAT, new BoatParserFormatter(boats));
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 2011-03-22 10:30:29 UTC (rev 1082)
+++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2011-03-23 16:23:15 UTC (rev 1083)
@@ -91,6 +91,8 @@
import org.nuiton.topia.persistence.TopiaEntity;
import org.nuiton.util.DateUtil;
import org.nuiton.util.StringUtil;
+import org.nuiton.util.beans.Binder;
+import org.nuiton.util.beans.BinderFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -263,8 +265,16 @@
log.debug("For state : " + contactState + " and observation begin date " + observationBeginDate);
}
- boolean operationBeginDateIsValid = contact.getSampleRow().isValid(observationBeginDate);
+ // need the sample months to be loaded, it's never the case :-(
+ // boolean operationBeginDateIsValid = contact.getSampleRow().isValid(observationBeginDate);
+
+
+ String sampleRowCode = contact.getSampleRow().getCode();
+ SampleRow sampleRow = WaoDAOHelper.getSampleRowDAO(transaction).findByCode(sampleRowCode);
+
+ boolean operationBeginDateIsValid = sampleRow.isValid(observationBeginDate);
+
if (log.isDebugEnabled()) {
log.debug("operation begin data is valid : " + operationBeginDateIsValid);
}
@@ -282,23 +292,23 @@
message = "La date de fin d'observation ne peut pas être antérieure à celle du début";
}
- Date currentDate = context.getCurrentDate();
-
- if (success && observationEndDate != null && observationEndDate.after(currentDate)) {
- success = false;
- message = "La date de fin de la marée ne peut pas être postérieure à la date du jour";
- }
-
Date dataInputDate = contact.getDataInputDate();
if (success && observationEndDate != null && dataInputDate != null && observationEndDate.after(dataInputDate)) {
success = false;
message = "La date de saisie des données ne peut pas être antérieure à la date de fin de la marée";
}
- if (success && dataInputDate != null && dataInputDate.after(currentDate)) {
- success = false;
- message = "La date de saisie des données ne peut pas être postérieure à la date du jour";
- }
+// Date currentDate = context.getCurrentDate();
+ // FIXME 20110322 this assertion break a lot of tests :-(
+// if (success && observationEndDate != null && observationEndDate.after(currentDate)) {
+// success = false;
+// message = "La date de fin de la marée ne peut pas être postérieure à la date du jour";
+// }
+//
+// if (success && dataInputDate != null && dataInputDate.after(currentDate)) {
+// success = false;
+// message = "La date de saisie des données ne peut pas être postérieure à la date du jour";
+// }
// Non abouti, Refus ou Refus Définitif
if (success && contactState.isUnfinishedState()) {
@@ -346,7 +356,7 @@
}
if (success && observationEndDate == null) {
success = false;
- message = "La date de fin d'observation marée est obligatoire pour l'état '" + contactState + "'";
+ message = "La date de fin d'observation est obligatoire pour l'état '" + contactState + "'";
}
if (success && contact.getNbObservants() == 0) {
success = false;
@@ -770,6 +780,7 @@
* value
* @see #updateSampleMonthTidesValue(TopiaContext, Contact, Contact, boolean)
*/
+ @Deprecated
protected void createOrUpdateContact(TopiaContext transaction,
Contact contactFound,
Contact contact,
@@ -824,6 +835,63 @@
dao.update(contactFound);
}
+ protected boolean createOrUpdateContact(TopiaContext transaction, ConnectedUser connectedUser, Contact contact)
+ throws TopiaException, WaoBusinessException {
+
+ ValidationResult contactValidationResult = executeValidateContact(transaction, contact);
+ if ( ! contactValidationResult.isSuccess()) {
+ throw new WaoBusinessException(contactValidationResult.getMessage());
+ }
+
+ ContactDAO dao = WaoDAOHelper.getContactDAO(transaction);
+ Contact contactFound = null;
+ if (contact.getTopiaId() != null) {
+ contactFound = dao.findByTopiaId(contact.getTopiaId());
+ }
+
+ // Prevent that someone who is not admin change data that only admin
+ // must be able to modify
+ if ( ! connectedUser.isAdmin()) {
+ if (contactFound == null) {
+ contact.setCommentAdmin(null);
+ contact.setValidationProgram(null);
+ contact.setDataReliability(DataReliability.UNKNOWN);
+ } else {
+ contact.setCommentAdmin(contactFound.getCommentAdmin());
+ contact.setValidationProgram(contactFound.getValidationProgram());
+ contact.setDataReliability(contactFound.getDataReliability());
+ }
+ }
+
+ boolean contactCanBeUpdated = true;
+ if (contactFound != null && connectedUser.isCoordinatorOrObserver()) {
+ contactCanBeUpdated = contactFound.isValidationProgram() == null;
+ }
+
+ if (contactCanBeUpdated) {
+ updateElligibleBoatForContact(transaction, contact);
+ updateSampleMonthTidesValue(dao.getContext(), contactFound, contact, true);
+
+ if (contactFound == null) {
+ if (contact.getCreationDate() == null) {
+ contact.setCreationDate(context.getCurrentDate());
+ }
+ dao.create(contact);
+ } else {
+ Binder<Contact, Contact> contactBinder = BinderFactory.newBinder(Contact.class);
+ contactBinder.copyExcluding(contact, contactFound, Contact.TOPIA_ID, Contact.TOPIA_VERSION,
+ Contact.TOPIA_CREATE_DATE, Contact.PROPERTY_SAMPLE_ROW);
+// contactFound.clearSecondaryObservers();
+// if (contact.getSecondaryObservers() != null) {
+// contactFound.addAllSecondaryObservers(contact.getSecondaryObservers());
+// }
+ dao.update(contactFound);
+ }
+ }
+
+ return contactCanBeUpdated;
+ }
+
@Override
public void executeSaveContact(TopiaContext transaction, ConnectedUser connectedUser,
Contact contact, boolean delete)
@@ -843,12 +911,196 @@
notifyUsersForMammalsObservation(transaction, contactFound, contact);
- createOrUpdateContact(transaction, contactFound, contact, true);
+ // createOrUpdateContact(transaction, contactFound, contact, true);
+ createOrUpdateContact(transaction, connectedUser, contact);
}
transaction.commitTransaction();
}
@Override
+ public ImportResults executeImportContactCsv(TopiaContext transaction,
+ ConnectedUser user,
+ InputStream input)
+ throws TopiaException,
+ IOException,
+ WaoBusinessException,
+ ParseException {
+
+ ImportResults result = new ImportResultsImpl();
+
+ boolean useNewMethod = true;
+ if (useNewMethod) {
+
+ // Some DAO
+ WaoUserDAO waoUserDAO = WaoDAOHelper.getWaoUserDAO(transaction);
+ TerrestrialLocationDAO terrestrialLocationDAO = WaoDAOHelper.getTerrestrialLocationDAO(transaction);
+ SampleRowDAO sampleRowDAO = WaoDAOHelper.getSampleRowDAO(transaction);
+ BoatDAO boatDAO = WaoDAOHelper.getBoatDAO(transaction);
+
+ // prepare selection of sample-rows, those are restrained
+ // by ObsProgram and by company
+ Map<String, Object> sampleRowProperties = new HashMap<String, Object>();
+ sampleRowProperties.put(SampleRow.PROPERTY_OBS_PROGRAM_ORDINAL, user.getProfile().getObsProgramOrdinal());
+
+ // filling collection needed by model
+ List<SampleRow> sampleRows = sampleRowDAO.findAllByProperties(sampleRowProperties);
+ List<WaoUser> waoUsers = waoUserDAO.findAll();
+ List<Boat> boats = boatDAO.findAll();
+ List<TerrestrialLocation> terrestrialLocations = terrestrialLocationDAO.findAll();
+
+ // model creation, and import starting
+ ImportModel<Contact> contactImportModel = new ContactImportExportModel(user.getProfile().getObsProgram(),
+ waoUsers, terrestrialLocations, sampleRows, boats);
+ Import<Contact> contactImport = new Import<Contact>(contactImportModel, input);
+
+ try {
+ Iterator<Contact> contactIterator = contactImport.startImport();
+ while (contactIterator.hasNext()) {
+ Contact contact;
+
+ try {
+ contact = contactIterator.next();
+ } catch (RuntimeException e) {
+ throw new WaoBusinessException(e.getMessage() + " " + e.getCause().getMessage());
+ }
+
+ boolean contactUpdated = createOrUpdateContact(transaction, user, contact);
+
+ if (contactUpdated) {
+ result.incNbImported();
+ } else {
+ result.incNbRefused();
+ }
+ }
+ transaction.commitTransaction();
+
+ } catch (WaoBusinessException e) {
+ transaction.rollbackTransaction();
+ throw e;
+ } finally {
+ contactImport.stopImport();
+ }
+
+
+ } else {
+ int currRow = 1;
+
+ CsvReader reader = new CsvReader(input, context.getCsvCharset());
+ try {
+ reader.readHeaders();
+
+ ImportHelper.checkKeyHeader(reader, CONTACT.CONT_CREATION);
+
+ ContactDAO dao = WaoDAOHelper.getContactDAO(transaction);
+
+ long tic;
+ tic = System.currentTimeMillis();
+ DateFormat dateFormat = new SimpleDateFormat("MM/yyyy");
+ while(reader.readRecord()) {
+ try {
+ currRow++;
+
+ boolean updateValidation = user.isAdmin() &&
+ user.getLogin().equals("admin");
+
+ // Load ContactInput using CsvReader
+ ContactInput contactCsv = new ContactInput();
+ contactCsv.initialize(transaction, user, currRow);
+ loadContactCsv(reader, contactCsv, updateValidation);
+
+ if (log.isDebugEnabled()) {
+ log.debug("Ligne " + currRow + " : " +
+ "Create date : " +
+ contactCsv.getTopiaCreateDate());
+ }
+
+ // Retrieve the existing contact
+ String companyProperty =
+ TopiaQuery.getProperty(Contact.PROPERTY_MAIN_OBSERVER,
+ WaoUser.PROPERTY_COMPANY);
+
+ Contact contact = dao.findByProperties(
+ TopiaEntity.TOPIA_CREATE_DATE,
+ contactCsv.getTopiaCreateDate(),
+ companyProperty, contactCsv.getCompany(),
+ Contact.PROPERTY_BOAT, contactCsv.getBoat(),
+ Contact.PROPERTY_SAMPLE_ROW, contactCsv.getSampleRow());
+
+ // Seems to have a problem with companyProperty ?!? using
+ // DAOLegacy (criteria)
+ // TopiaQuery query = dao.createQuery().
+ // addEquals(TopiaEntity.TOPIA_CREATE_DATE,
+ // contactCsv.getTopiaCreateDate()).
+ // addEquals(companyProperty, contactCsv.getCompany()).
+ // addEquals(Contact.PROPERTY_BOAT, contactCsv.getBoat()).
+ // addEquals(Contact.SAMPLE_ROW,
+ // contactCsv.getSampleRow());
+ // Contact contact = dao.findByQuery(query);
+
+ // Check validation for existing Contact
+ if (!updateValidation && contact != null &&
+ contact.getValidationCompany() != null) {
+ throw new ImportRefusedException("Le contact est" +
+ " déjà validé dans l'application" +
+ " et ne peut pas être importé", currRow,
+ Contact.PROPERTY_VALIDATION_COMPANY);
+ }
+
+ // Create elligibleBoat if needed before saving the contact
+ updateElligibleBoatForContact(transaction, contactCsv);
+
+ try {
+ // Execute createOrUpdateContact
+ // Will calculate data for SampleMonth and maybe
+ // throw a NullSampleMonthException if there is
+ // an error during the calcul of sampleMonthTidesValue
+ createOrUpdateContact(transaction, contact, contactCsv,
+ updateValidation);
+
+ } catch (NullSampleMonthException eee) {
+ log.debug("exception", eee);
+ log.debug("contact : " + contact);
+ if (contact != null) {
+ log.debug("tideBeginDate : " + contact.getObservationBeginDate());
+ }
+ // The row will be refused in this case
+ throw new ImportRefusedException("Impossible de " +
+ "mettre à jour le nombre de marée réels, " +
+ "vérifiez le mois de " +
+ dateFormat.format(contact.getObservationBeginDate()) +
+ " pour la ligne du plan " +
+ contactCsv.getSampleRow().getCode(), currRow,
+ Contact.PROPERTY_OBSERVATION_BEGIN_DATE, eee);
+ }
+
+ result.incNbImported();
+
+ if (result.getNbRowsImported() % 1000 == 0) {
+ transaction.commitTransaction();
+ tic = ImportHelper.logTimeAndMemory(log, tic,
+ "contacts ligne " + currRow);
+ }
+
+ } catch(ImportRefusedException eee) {
+ if (log.isWarnEnabled()) {
+ log.warn("Error during contact import row : " +
+ eee.getRowNumber(), eee);
+ }
+ result.addError(eee.getRowNumber(), eee.getMessage());
+ result.incNbRefused();
+ }
+ }
+
+ // Commit for last rows imported
+ transaction.commitTransaction();
+ } finally {
+ reader.close();
+ }
+ }
+ return result;
+ }
+
+ @Override
public InputStream executeExportContactCsv(TopiaContext transaction,
ContactFilter filter) throws Exception {
@@ -1051,181 +1303,6 @@
}
}
- @Override
- public ImportResults executeImportContactCsv(TopiaContext transaction,
- ConnectedUser user,
- InputStream input)
- throws TopiaException,
- IOException,
- WaoBusinessException,
- ParseException {
-
- ImportResults result = new ImportResultsImpl();
-
- boolean useNewMethod = true;
- if (useNewMethod) {
-
- // Some DAO
- WaoUserDAO waoUserDAO = WaoDAOHelper.getWaoUserDAO(transaction);
- TerrestrialLocationDAO terrestrialLocationDAO = WaoDAOHelper.getTerrestrialLocationDAO(transaction);
- SampleRowDAO sampleRowDAO = WaoDAOHelper.getSampleRowDAO(transaction);
- BoatDAO boatDAO = WaoDAOHelper.getBoatDAO(transaction);
-
- // prepare selection of sample-rows, those are restrained
- // by ObsProgram and by company
- Map<String, Object> sampleRowProperties = new HashMap<String, Object>();
- sampleRowProperties.put(SampleRow.PROPERTY_OBS_PROGRAM_ORDINAL, user.getProfile().getObsProgramOrdinal());
- if ( ! user.isAdmin()) {
- sampleRowProperties.put(SampleRow.PROPERTY_COMPANY, user.getCompany());
- }
-
- // filling collection needed by model
- List<SampleRow> sampleRows = sampleRowDAO.findAllByProperties(sampleRowProperties);
- List<WaoUser> waoUsers = waoUserDAO.findAll();
- List<Boat> boats = boatDAO.findAll();
- List<TerrestrialLocation> terrestrialLocations = terrestrialLocationDAO.findAll();
-
- // model creation, and import starting
- ImportModel<Contact> contactImportModel = new ContactImportExportModel(user.getProfile().getObsProgram(),
- waoUsers, terrestrialLocations, sampleRows, boats);
- Import<Contact> contactImport = new Import<Contact>(contactImportModel, input);
-
- try {
- Iterator<Contact> contactIterator = contactImport.startImport();
-
- while (contactIterator.hasNext()) {
- Contact contact = contactIterator.next();
-
- executeSaveContact(transaction, user, contact, false);
-
- result.incNbImported();
- }
- } catch (Exception e) {
- throw new RuntimeException(e);
- } finally {
- contactImport.stopImport();
- }
-
- transaction.commitTransaction();
-
- } else {
- int currRow = 1;
-
- CsvReader reader = new CsvReader(input, context.getCsvCharset());
- try {
- reader.readHeaders();
-
- ImportHelper.checkKeyHeader(reader, CONTACT.CONT_CREATION);
-
- ContactDAO dao = WaoDAOHelper.getContactDAO(transaction);
-
- long tic;
- tic = System.currentTimeMillis();
- DateFormat dateFormat = new SimpleDateFormat("MM/yyyy");
- while(reader.readRecord()) {
- try {
- currRow++;
-
- boolean updateValidation = user.isAdmin() &&
- user.getLogin().equals("admin");
-
- // Load ContactInput using CsvReader
- ContactInput contactCsv = new ContactInput();
- contactCsv.initialize(transaction, user, currRow);
- loadContactCsv(reader, contactCsv, updateValidation);
-
- if (log.isDebugEnabled()) {
- log.debug("Ligne " + currRow + " : " +
- "Create date : " +
- contactCsv.getTopiaCreateDate());
- }
-
- // Retrieve the existing contact
- String companyProperty =
- TopiaQuery.getProperty(Contact.PROPERTY_MAIN_OBSERVER,
- WaoUser.PROPERTY_COMPANY);
-
- Contact contact = dao.findByProperties(
- TopiaEntity.TOPIA_CREATE_DATE,
- contactCsv.getTopiaCreateDate(),
- companyProperty, contactCsv.getCompany(),
- Contact.PROPERTY_BOAT, contactCsv.getBoat(),
- Contact.PROPERTY_SAMPLE_ROW, contactCsv.getSampleRow());
-
- // Seems to have a problem with companyProperty ?!? using
- // DAOLegacy (criteria)
- // TopiaQuery query = dao.createQuery().
- // addEquals(TopiaEntity.TOPIA_CREATE_DATE,
- // contactCsv.getTopiaCreateDate()).
- // addEquals(companyProperty, contactCsv.getCompany()).
- // addEquals(Contact.PROPERTY_BOAT, contactCsv.getBoat()).
- // addEquals(Contact.SAMPLE_ROW,
- // contactCsv.getSampleRow());
- // Contact contact = dao.findByQuery(query);
-
- // Check validation for existing Contact
- if (!updateValidation && contact != null &&
- contact.getValidationCompany() != null) {
- throw new ImportRefusedException("Le contact est" +
- " déjà validé dans l'application" +
- " et ne peut pas être importé", currRow,
- Contact.PROPERTY_VALIDATION_COMPANY);
- }
-
- // Create elligibleBoat if needed before saving the contact
- updateElligibleBoatForContact(transaction, contactCsv);
-
- try {
- // Execute createOrUpdateContact
- // Will calculate data for SampleMonth and maybe
- // throw a NullSampleMonthException if there is
- // an error during the calcul of sampleMonthTidesValue
- createOrUpdateContact(transaction, contact, contactCsv,
- updateValidation);
-
- } catch (NullSampleMonthException eee) {
- log.debug("exception", eee);
- log.debug("contact : " + contact);
- if (contact != null) {
- log.debug("tideBeginDate : " + contact.getObservationBeginDate());
- }
- // The row will be refused in this case
- throw new ImportRefusedException("Impossible de " +
- "mettre à jour le nombre de marée réels, " +
- "vérifiez le mois de " +
- dateFormat.format(contact.getObservationBeginDate()) +
- " pour la ligne du plan " +
- contactCsv.getSampleRow().getCode(), currRow,
- Contact.PROPERTY_OBSERVATION_BEGIN_DATE, eee);
- }
-
- result.incNbImported();
-
- if (result.getNbRowsImported() % 1000 == 0) {
- transaction.commitTransaction();
- tic = ImportHelper.logTimeAndMemory(log, tic,
- "contacts ligne " + currRow);
- }
-
- } catch(ImportRefusedException eee) {
- if (log.isWarnEnabled()) {
- log.warn("Error during contact import row : " +
- eee.getRowNumber(), eee);
- }
- result.addError(eee.getRowNumber(), eee.getMessage());
- result.incNbRefused();
- }
- }
-
- // Commit for last rows imported
- transaction.commitTransaction();
- } finally {
- reader.close();
- }
- }
- return result;
- }
-
/**
* Will load a {@code contact} from reading data in {@code reader}.
* The order is important for loading the contact (state, observer, company,
Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java
===================================================================
--- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java 2011-03-22 10:30:29 UTC (rev 1082)
+++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java 2011-03-23 16:23:15 UTC (rev 1083)
@@ -320,6 +320,8 @@
// update the row by copying the new data in the old entity
// taking care to not remove any sample row log entries
+
+ // FIXME 2011-03-22 bleny select property to copy according to program
Binder<SampleRow, SampleRow> sampleRowBinder = BinderFactory.newBinder(SampleRow.class);
sampleRowBinder.copyExcluding(row, oldRow, SampleRow.TOPIA_ID, SampleRow.TOPIA_VERSION, SampleRow.TOPIA_CREATE_DATE,
// old logs (whole historic) is kept by not erasing this property
Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/AbstractServiceTest.java
===================================================================
--- trunk/wao-business/src/test/java/fr/ifremer/wao/AbstractServiceTest.java 2011-03-22 10:30:29 UTC (rev 1082)
+++ trunk/wao-business/src/test/java/fr/ifremer/wao/AbstractServiceTest.java 2011-03-23 16:23:15 UTC (rev 1083)
@@ -577,6 +577,8 @@
contact1.setContactState(ContactState.OBSERVATION_DONE);
Date begin = DateUtil.createDate(3, 3, 2010);
contact1.setObservationBeginDate(begin);
+ Date end = DateUtil.createDate(4, 3, 2010);
+ contact1.setObservationEndDate(end);
serviceContact.saveContact(connectedUser, contact1, false);
Contact contact2 = new ContactImpl();
@@ -586,6 +588,8 @@
contact2.setContactState(ContactState.OBSERVATION_DONE);
begin = DateUtil.createDate(3, 10, 2010);
contact2.setObservationBeginDate(begin);
+ end = DateUtil.createDate(4, 10, 2010);
+ contact2.setObservationEndDate(end);
serviceContact.saveContact(connectedUser, contact2, false);
Contact contact3 = new ContactImpl();
@@ -594,6 +598,8 @@
contact3.setSampleRow(row);
contact3.setContactState(ContactState.CONTACT_REFUSED);
begin = DateUtil.createDate(3, 5, 2010);
+ end = DateUtil.createDate(4, 5, 2010);
+ contact3.setObservationEndDate(end);
contact3.setTopiaCreateDate(begin);
serviceContact.saveContact(connectedUser, contact3, false);
@@ -604,6 +610,8 @@
contact4.setSampleRow(row2);
contact4.setContactState(ContactState.OBSERVATION_EXPECTED);
begin = DateUtil.createDate(3, 3, 2010);
+ end = DateUtil.createDate(4, 3, 2010);
+ contact4.setObservationEndDate(end);
contact4.setTopiaCreateDate(begin);
serviceContact.saveContact(connectedUser, contact4, false);
@@ -613,6 +621,8 @@
contact5.setSampleRow(row2);
contact5.setContactState(ContactState.OBSERVATION_CANCELLED);
begin = DateUtil.createDate(3, 5, 2010);
+ end = DateUtil.createDate(4, 5, 2010);
+ contact5.setObservationEndDate(end);
contact5.setTopiaCreateDate(begin);
serviceContact.saveContact(connectedUser, contact5, false);
@@ -624,6 +634,8 @@
contact6.setContactState(ContactState.OBSERVATION_CANCELLED);
begin = DateUtil.createDate(3, 3, 2010);
contact6.setTopiaCreateDate(begin);
+ end = DateUtil.createDate(4, 3, 2010);
+ contact6.setObservationEndDate(end);
contact6.setValidationProgram(Boolean.FALSE);
serviceContact.saveContact(connectedUser, contact6, false);
}
Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/entity/BoatImplTest.java
===================================================================
--- trunk/wao-business/src/test/java/fr/ifremer/wao/entity/BoatImplTest.java 2011-03-22 10:30:29 UTC (rev 1082)
+++ trunk/wao-business/src/test/java/fr/ifremer/wao/entity/BoatImplTest.java 2011-03-23 16:23:15 UTC (rev 1083)
@@ -159,6 +159,8 @@
contact1.setContactState(ContactState.OBSERVATION_DONE);
contact1.setObservationBeginDate(DateUtil.createDate(3, 3, 2010));
+ contact1.setObservationEndDate(DateUtil.createDate(4, 3, 2010));
+ contact1.setMainObserver(user);
serviceContact.saveContact(connectedUser, contact1, false);
result = boat.canCreateContact(ObsProgram.OBSMER, company);
@@ -166,6 +168,7 @@
Assert.assertTrue(result);
contact1.setContactState(ContactState.OBSERVATION_CANCELLED);
+ contact1.setComment("why it was cancelled");
serviceContact.saveContact(connectedUser, contact1, false);
result = boat.canCreateContact(ObsProgram.OBSMER, company);
@@ -240,6 +243,7 @@
ConnectedUser connectedUser = getConnectedUser(user, UserRole.ADMIN, ObsProgram.OBSMER);
ServiceContact serviceContact = manager.getServiceContact();
+
// First contact : OK
Contact contact1 = serviceContact.getNewContact(connectedUser, row, boat);
contact1.setContactState(ContactState.OBSERVATION_DONE);
@@ -261,6 +265,8 @@
contact2.setContactState(ContactState.OBSERVATION_DONE);
begin = DateUtil.createDate(3, 8, 2010);
contact2.setObservationBeginDate(begin);
+ end = DateUtil.createDate(4, 8, 2010);
+ contact2.setObservationEndDate(end);
contact2.setValidationCompany(Boolean.TRUE);
contact2.setValidationProgram(Boolean.FALSE);
serviceContact.saveContact(connectedUser, contact2, false);
@@ -273,6 +279,8 @@
contact3.setContactState(ContactState.OBSERVATION_DONE);
begin = DateUtil.createDate(3, 3, 2010);
contact3.setObservationBeginDate(begin);
+ end = DateUtil.createDate(4, 3, 2010);
+ contact3.setObservationEndDate(end);
contact3.setValidationCompany(Boolean.TRUE);
serviceContact.saveContact(connectedUser, contact3, false);
@@ -285,6 +293,8 @@
contact4.setContactState(ContactState.OBSERVATION_DONE);
begin = DateUtil.createDate(3, 5, 2010);
contact4.setObservationBeginDate(begin);
+ end = DateUtil.createDate(4, 5, 2010);
+ contact4.setObservationEndDate(end);
contact4.setValidationCompany(Boolean.TRUE);
serviceContact.saveContact(connectedUser, contact4, false);
Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceBoatImplTest.java
===================================================================
--- trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceBoatImplTest.java 2011-03-22 10:30:29 UTC (rev 1082)
+++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceBoatImplTest.java 2011-03-23 16:23:15 UTC (rev 1083)
@@ -191,15 +191,6 @@
Assert.assertEquals(3, results.size());
}
- /**
- * Test of getBoatInfos method, of class ServiceBoatImpl.
- * @throws Exception
- */
- //@Test
- public void testGetBoatInfos() throws Exception {
- }
-
-
@Test
public void testGetElligibleBoats() throws Exception {
log.info("getElligibleBoats");
Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactImplTest.java
===================================================================
--- trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactImplTest.java 2011-03-22 10:30:29 UTC (rev 1082)
+++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactImplTest.java 2011-03-23 16:23:15 UTC (rev 1083)
@@ -23,8 +23,10 @@
import fr.ifremer.wao.AbstractServiceTest;
import fr.ifremer.wao.WaoException;
+import fr.ifremer.wao.bean.ConnectedUser;
import fr.ifremer.wao.bean.ContactFilter;
import fr.ifremer.wao.bean.ContactFilterImpl;
+import fr.ifremer.wao.bean.ObsProgram;
import fr.ifremer.wao.bean.UserRole;
import fr.ifremer.wao.entity.Company;
import fr.ifremer.wao.entity.Contact;
@@ -93,16 +95,18 @@
Contact contact = createDefaultContact();
Company company = createCompany("Boite");
- contact.addSecondaryObservers(createUser("toto", UserRole.OBSERVER, company));
+ WaoUser toto = createUser("toto", UserRole.OBSERVER, company);
+ contact.addSecondaryObservers(toto);
contact.addSecondaryObservers(createUser("titi", UserRole.OBSERVER, company));
- service.saveContact(null, contact, false);
+ ConnectedUser connectedUser = getConnectedUser(toto, UserRole.COORDINATOR, ObsProgram.OBSMER);
+ service.saveContact(connectedUser, contact, false);
Contact savedContact = service.getContact(contact.getTopiaId());
Assert.assertEquals(2, savedContact.getSecondaryObservers().size());
contact.clearSecondaryObservers();
- service.saveContact(null, contact, false);
+ service.saveContact(connectedUser, contact, false);
savedContact = service.getContact(contact.getTopiaId());
Assert.assertEquals(0, savedContact.getSecondaryObservers().size());
}
Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactInternalTest.java
===================================================================
--- trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactInternalTest.java 2011-03-22 10:30:29 UTC (rev 1082)
+++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactInternalTest.java 2011-03-23 16:23:15 UTC (rev 1083)
@@ -752,8 +752,8 @@
getClass().getResourceAsStream("/import/contacts.csv");
try {
ImportResults results = service.importContactCsv(creator, input);
+ assertEquals(0, results.getNbRowsRefused());
assertEquals(1, results.getNbRowsImported());
- assertEquals(0, results.getNbRowsRefused());
assertTrue(results.getErrors().isEmpty());
} finally {
input.close();
Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSamplingImplTest.java
===================================================================
--- trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSamplingImplTest.java 2011-03-22 10:30:29 UTC (rev 1082)
+++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSamplingImplTest.java 2011-03-23 16:23:15 UTC (rev 1083)
@@ -199,7 +199,7 @@
ConnectedUser connectedUser = getConnectedUser(observer, UserRole.OBSERVER, ObsProgram.OBSMER);
manager.getServiceContact().saveContact(connectedUser, contact, false);
- serviceSampling.createUpdateSampleRow(result, boats, new SampleRowLogImpl());
+// serviceSampling.createUpdateSampleRow(result, boats, new SampleRowLogImpl());
transaction = manager.getContext().beginTransaction();
try {
Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSynthesisImplTest.java
===================================================================
--- trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSynthesisImplTest.java 2011-03-22 10:30:29 UTC (rev 1082)
+++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSynthesisImplTest.java 2011-03-23 16:23:15 UTC (rev 1083)
@@ -163,6 +163,8 @@
contact1.setContactState(ContactState.OBSERVATION_DONE);
Date begin = DateUtil.createDate(3, 3, 2010);
contact1.setObservationBeginDate(begin);
+ Date end = DateUtil.createDate(4, 3, 2010);
+ contact1.setObservationEndDate(end);
contact1.setValidationCompany(Boolean.TRUE);
serviceContact.saveContact(connectedUser, contact1, false);
@@ -173,7 +175,11 @@
contact2.setContactState(ContactState.OBSERVATION_DONE);
begin = DateUtil.createDate(3, 3, 2010);
contact2.setObservationBeginDate(begin);
+ end = DateUtil.createDate(4, 3, 2010);
+ contact2.setObservationEndDate(end);
contact2.setValidationCompany(Boolean.TRUE);
+ contact2.setObservationBeginDate(begin);
+ contact2.setValidationCompany(Boolean.TRUE);
serviceContact.saveContact(connectedUser, contact2, false);
Contact contact3 = new ContactImpl();
@@ -183,6 +189,8 @@
contact3.setContactState(ContactState.OBSERVATION_DONE);
begin = DateUtil.createDate(3, 3, 2010);
contact3.setObservationBeginDate(begin);
+ end = DateUtil.createDate(4, 3, 2010);
+ contact3.setObservationEndDate(end);
contact3.setValidationCompany(Boolean.TRUE);
serviceContact.saveContact(connectedUser, contact3, false);
@@ -257,6 +265,8 @@
contact1.setContactState(ContactState.OBSERVATION_DONE);
Date begin = DateUtil.createDate(3, 3, 2010);
contact1.setObservationBeginDate(begin);
+ Date end = DateUtil.createDate(4, 3, 2010);
+ contact1.setObservationEndDate(end);
contact1.setValidationCompany(Boolean.TRUE);
serviceContact.saveContact(connectedUser, contact1, false);
@@ -269,6 +279,8 @@
contact2.setContactState(ContactState.OBSERVATION_DONE);
begin = DateUtil.createDate(3, 3, 2010);
contact2.setObservationBeginDate(begin);
+ end = DateUtil.createDate(4, 3, 2010);
+ contact2.setObservationEndDate(end);
contact2.setValidationCompany(Boolean.TRUE);
serviceContact.saveContact(connectedUser, contact2, false);
@@ -281,6 +293,8 @@
contact3.setContactState(ContactState.OBSERVATION_DONE);
begin = DateUtil.createDate(3, 3, 2010);
contact3.setObservationBeginDate(begin);
+ end = DateUtil.createDate(4, 3, 2010);
+ contact3.setObservationEndDate(end);
contact3.setValidationCompany(Boolean.TRUE);
serviceContact.saveContact(connectedUser, contact3, false);
@@ -316,107 +330,7 @@
public void testGetContactStateStatistics() throws Exception {
log.info("getContactStateStatistics");
/** PREPARE DATA **/
-// InputStream input = getClass().getResourceAsStream("/import/navires.csv");
-// ServiceBoat serviceBoat = manager.getServiceBoat();
-// serviceBoat.importBoatCsv(input);
-// List<Boat> boats = serviceBoat.getBoatsByImmatriculations("174258");
-// Boat boat = boats.get(0);
-//
-// List<Boat> boats2 = serviceBoat.getBoatsByImmatriculations("177474");
-// Boat boat2 = boats2.get(0);
-//
-// TopiaContext transaction = manager.getContext().beginTransaction();
-//
-// CompanyDAO companyDAO = WaoDAOHelper.getCompanyDAO(transaction);
-// Company company = companyDAO.create(Company.NAME, "TARTANPION");
-// Company company2 = companyDAO.create(Company.NAME, "BIS");
-//
-// WaoUserDAO userDAO = WaoDAOHelper.getWaoUserDAO(transaction);
-// WaoUser user = userDAO.create(WaoUser.FIRST_NAME,"Jean", WaoUser.LAST_NAME, "Michmuche",
-// WaoUser.COMPANY, company);
-// company.addWaoUser(user);
-// WaoUser user2 = userDAO.create(WaoUser.FIRST_NAME,"Bill", WaoUser.LAST_NAME, "Murray",
-// WaoUser.COMPANY, company2);
-// company2.addWaoUser(user2);
-//
-// transaction.commitTransaction();
-//
-// input = getClass().getResourceAsStream("/import/zonesPeche.csv");
-// ServiceReferential serviceReferential = manager.getServiceReferential();
-// serviceReferential.importFishingZoneCsv(input);
-//
-// input = getClass().getResourceAsStream("/import/echantillonnage.csv");
-// ServiceSampling serviceSampling = manager.getServiceSampling();
-// serviceSampling.importSamplingPlanCsv(input);
-//
-// SampleRowDAO rowDAO = WaoDAOHelper.getSampleRowDAO(transaction);
-// SampleRow row = rowDAO.findByCode("2010_0001");
-// SampleRow row2 = rowDAO.findByCode("2009_0006");
-//
-// transaction.closeContext();
-//
-//
-// ServiceContact serviceContact = manager.getServiceContact();
-//
-// // Contacts for company TARTANPION
-// Contact contact1 = new ContactImpl();
-// contact1.setBoat(boat);
-// contact1.setMainObserver(user);
-// contact1.setSampleRow(row);
-// contact1.setContactState(ContactState.OBSERVATION_DONE);
-// Date begin = DateUtil.createDate(3, 3, 2010);
-// contact1.setObservationBeginDate(begin);
-// serviceContact.saveContact(contact1, false);
-//
-// Contact contact2 = new ContactImpl();
-// contact2.setBoat(boat);
-// contact2.setMainObserver(user);
-// contact2.setSampleRow(row);
-// contact2.setContactState(ContactState.OBSERVATION_DONE);
-// begin = DateUtil.createDate(3, 10, 2010);
-// contact2.setObservationBeginDate(begin);
-// serviceContact.saveContact(contact2, false);
-//
-// Contact contact3 = new ContactImpl();
-// contact3.setBoat(boat);
-// contact3.setMainObserver(user);
-// contact3.setSampleRow(row);
-// contact3.setContactState(ContactState.CONTACT_REFUSED);
-// begin = DateUtil.createDate(3, 5, 2010);
-// contact3.setTopiaCreateDate(begin);
-// serviceContact.saveContact(contact3, false);
-//
-// // Contacts for company BIS
-// Contact contact4 = new ContactImpl();
-// contact4.setBoat(boat2);
-// contact4.setMainObserver(user2);
-// contact4.setSampleRow(row2);
-// contact4.setContactState(ContactState.BOARDING_EXPECTED);
-// begin = DateUtil.createDate(3, 3, 2010);
-// contact4.setTopiaCreateDate(begin);
-// serviceContact.saveContact(contact4, false);
-//
-// Contact contact5 = new ContactImpl();
-// contact5.setBoat(boat2);
-// contact5.setMainObserver(user2);
-// contact5.setSampleRow(row2);
-// contact5.setContactState(ContactState.OBSERVATION_CANCELLED);
-// begin = DateUtil.createDate(3, 5, 2010);
-// contact5.setTopiaCreateDate(begin);
-// serviceContact.saveContact(contact5, false);
-//
-// // Contact refused by program, will not be in result
-// Contact contact6 = new ContactImpl();
-// contact6.setBoat(boat2);
-// contact6.setMainObserver(user2);
-// contact6.setSampleRow(row2);
-// contact6.setContactState(ContactState.OBSERVATION_CANCELLED);
-// begin = DateUtil.createDate(3, 3, 2010);
-// contact6.setTopiaCreateDate(begin);
-// contact6.setValidationProgram(Boolean.FALSE);
-// serviceContact.saveContact(contact6, false);
-
// Company TARTANPION
Company company = createDefaultCompany();
Company company2 = createCompany("BIS");
@@ -537,6 +451,8 @@
contact1.setSampleRow(row);
Date begin = DateUtil.createDate(3, 3, 2010);
contact1.setObservationBeginDate(begin);
+ Date end = DateUtil.createDate(4, 3, 2010);
+ contact1.setObservationEndDate(end);
Date inputDate = DateUtil.createDate(15, 4, 2010);
contact1.setDataInputDate(inputDate);
contact1.setContactState(ContactState.OBSERVATION_DONE);
@@ -549,6 +465,8 @@
contact2.setSampleRow(row);
begin = DateUtil.createDate(3, 3, 2010);
contact2.setObservationBeginDate(begin);
+ end = DateUtil.createDate(4, 3, 2010);
+ contact2.setObservationEndDate(end);
inputDate = DateUtil.createDate(15, 3, 2010);
contact2.setDataInputDate(inputDate);
contact2.setContactState(ContactState.OBSERVATION_DONE);
@@ -561,7 +479,9 @@
contact3.setSampleRow(row2);
begin = DateUtil.createDate(3, 3, 2010);
contact3.setObservationBeginDate(begin);
- contact3.setDataInputDate(begin);
+ end = DateUtil.createDate(4, 3, 2010);
+ contact3.setObservationEndDate(end);
+ contact3.setDataInputDate(DateUtil.createDate(6, 3, 2010));
contact3.setContactState(ContactState.OBSERVATION_DONE);
contact3.setValidationCompany(Boolean.TRUE);
serviceContact.saveContact(connectedUser, contact3, false);
@@ -590,16 +510,9 @@
filter.setPeriod(period);
results = service.getContactDataInputDateReactivity(filter);
- // 0 days for contact3 / 1 = O days
+ // 6 days for contact3 / 1 = 6 days
res = (ContactAverageReactivity)CollectionUtils.get(results, 0);
- assertEquals(0, res.getResult(), 0.01);
+ assertEquals(3, res.getResult(), 0.01);
}
-
- @Test
- public void testGetDataReliability() throws Exception {
-
-
-
- }
}
Modified: trunk/wao-business/src/test/resources/import/contacts.csv
===================================================================
--- trunk/wao-business/src/test/resources/import/contacts.csv 2011-03-22 10:30:29 UTC (rev 1082)
+++ trunk/wao-business/src/test/resources/import/contacts.csv 2011-03-23 16:23:15 UTC (rev 1083)
@@ -1,2 +1,2 @@
-CONTACT_ID;CONTACT_DATE_CREATION;CONTACT_OBSERVATEUR_PRINCIPAL;CONTACT_OBSERVATEURS_SECONDAIRES;CONTACT_ETAT;CONTACT_DEBUT_OBSERVATION;CONTACT_FIN_OBSERVATION;CONTACT_SAISIE_DONNEES;CONTACT_COMMENTAIRE_OBSERVATEUR;CONTACT_COMMENTAIRE_COORDINATEUR;CONTACT_COMMENTAIRE_PROGRAMME;PLAN_CODE;NAVIRE_IMMATRICULATION;CONTACT_VALIDATION_SOCIETE;CONTACT_VALIDATION_PROGRAMME;CONTACT_QUALITE_DONNEE
-;01/03/2011 10:24;jmichmuche;;Refus définitif;;;;ne veut plus collaborer;;;2010_0001;175846;?;?;Inconnue
\ No newline at end of file
+CONTACT_ID;CONTACT_DATE_CREATION;CONTACT_OBSERVATEUR_PRINCIPAL;CONTACT_OBSERVATEURS_SECONDAIRES;CONTACT_ETAT;CONTACT_DEBUT_OBSERVATION;CONTACT_FIN_OBSERVATION;CONTACT_SAISIE_DONNEES;CONTACT_COMMENTAIRE_OBSERVATEUR;CONTACT_COMMENTAIRE_COORDINATEUR;CONTACT_COMMENTAIRE_PROGRAMME;PLAN_CODE;NAVIRE_IMMATRICULATION;CONTACT_VALIDATION_SOCIETE;CONTACT_VALIDATION_PROGRAMME;CONTACT_QUALITE_DONNEE;CONTACT_OBSERVATION_MAMMIFERE;CONTACT_CAPTURE_ACCIDENTELLE
+;01/03/2011 10:24;jmichmuche;;Refus définitif;;;;ne veut plus collaborer;;;2010_0001;175846;?;?;Inconnue;N;N
\ No newline at end of file
Modified: trunk/wao-ui/src/main/webapp/Contacts.tml
===================================================================
--- trunk/wao-ui/src/main/webapp/Contacts.tml 2011-03-22 10:30:29 UTC (rev 1082)
+++ trunk/wao-ui/src/main/webapp/Contacts.tml 2011-03-23 16:23:15 UTC (rev 1083)
@@ -42,12 +42,7 @@
</a>
<t:if t:test="canImportExport()">
<a t:type="actionlink" t:id="showImportExport" t:zone="so-contacts-importexport" class="display-form">
- <t:if test="user.admin">
- ${message:wao.ui.misc.import-export}
- <p:else>
- ${message:wao.ui.misc.export}
- </p:else>
- </t:if>
+ ${message:wao.ui.misc.import-export}
</a>
</t:if>
<t:if t:test="user.admin">
@@ -215,28 +210,15 @@
<div t:type="zone" class="so-filters" t:id="importExportZone" t:update="show" t:visible="false" id="so-contacts-importexport">
<fieldset>
<legend>
- <t:if test="user.admin">
- ${message:wao.ui.misc.import-export.longTitle}
- <p:else>
- ${message:wao.ui.misc.export.longTitle}
- </p:else>
- </t:if>
+ ${message:wao.ui.misc.import-export.longTitle}
</legend>
<form t:type="form" t:id="importContacts">
<t:errors />
- <t:if test="user.admin">
- <label for="contactsCsvFile">${message:wao.ui.form.contactsFile} :</label>
- <input t:type="upload" t:id="contactsCsvFile" t:validate="required" />
- <input t:type="submit" class="ico import" value="${message:wao.ui.action.runImport}" title="${message:wao.ui.action.runImport}" />
- </t:if>
+ <label for="contactsCsvFile">${message:wao.ui.form.contactsFile} :</label>
+ <input t:type="upload" t:id="contactsCsvFile" t:validate="required" />
+ <input t:type="submit" class="ico import" value="${message:wao.ui.action.runImport}" title="${message:wao.ui.action.runImport}" />
<a t:type="actionlink" t:id="exportShowContacts">
- <t:if test="user.admin">
- <img src="${asset:context:img/file-export-22px.png}" alt="${message:wao.ui.action.runExport}"
- title="${message:wao.ui.action.runExport}" />
- <p:else>
- ${message:wao.ui.action.runExport}
- </p:else>
- </t:if>
+ <img src="${asset:context:img/file-export-22px.png}" alt="${message:wao.ui.action.runExport}" title="${message:wao.ui.action.runExport}" />
</a>
</form>
</fieldset>
Modified: trunk/wao-ui/src/main/webapp/css/sampling.css
===================================================================
--- trunk/wao-ui/src/main/webapp/css/sampling.css 2011-03-22 10:30:29 UTC (rev 1082)
+++ trunk/wao-ui/src/main/webapp/css/sampling.css 2011-03-23 16:23:15 UTC (rev 1083)
@@ -74,6 +74,10 @@
padding-left: 5px;
}
+#sampleRowForm {
+ width: 50%;
+}
+
/* Styles for table header */
div#so-sampling table thead tr.main { /* super header */
font-size: 1.2em;
1
0
[Suiviobsmer-commits] r1082 - in trunk/wao-ui/src/main: java/fr/ifremer/wao/ui/base java/fr/ifremer/wao/ui/components java/fr/ifremer/wao/ui/pages resources/fr/ifremer/wao/ui/components webapp
by sletellier＠users.labs.libre-entreprise.org 22 Mar '11
by sletellier＠users.labs.libre-entreprise.org 22 Mar '11
22 Mar '11
Author: sletellier
Date: 2011-03-22 10:30:29 +0000 (Tue, 22 Mar 2011)
New Revision: 1082
Log:
- Creating SimpleSelector component
- Revert refactor, prefer using TopiaEntitySelector and SimpleSelector component
- Rename ModelFactory to FilterManager
Added:
trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/FilterManager.java
trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/SamplingPlanFilterManager.java
trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/SimpleSelector.java
trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/SimpleSelector.tml
Removed:
trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/ModelFactory.java
trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/SamplingPlanModelFactory.java
Modified:
trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/AbstractFilteredPage.java
trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/SamplingFilterComponent.java
trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Boats.java
trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SamplingPlan.java
trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java
trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/SamplingFilterComponent.tml
trunk/wao-ui/src/main/webapp/SamplingPlan.tml
trunk/wao-ui/src/main/webapp/Synthesis.tml
Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/AbstractFilteredPage.java
===================================================================
--- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/AbstractFilteredPage.java 2011-03-21 23:53:13 UTC (rev 1081)
+++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/AbstractFilteredPage.java 2011-03-22 10:30:29 UTC (rev 1082)
@@ -27,6 +27,7 @@
import fr.ifremer.wao.WaoException;
import fr.ifremer.wao.bean.ConnectedUser;
import fr.ifremer.wao.bean.SamplingFilter;
+import fr.ifremer.wao.bean.SamplingFilterImpl;
import fr.ifremer.wao.entity.Company;
import fr.ifremer.wao.entity.FishingGearDCF;
import fr.ifremer.wao.entity.SampleRow;
@@ -39,9 +40,12 @@
import fr.ifremer.wao.service.ServiceUser;
import fr.ifremer.wao.ui.data.FiltersModel;
import fr.ifremer.wao.ui.data.GenericSelectModel;
+import org.apache.tapestry5.OptionModel;
import org.apache.tapestry5.SelectModel;
import org.apache.tapestry5.annotations.Persist;
import org.apache.tapestry5.annotations.SessionState;
+import org.apache.tapestry5.internal.OptionModelImpl;
+import org.apache.tapestry5.internal.SelectModelImpl;
import org.apache.tapestry5.ioc.annotations.Inject;
import org.apache.tapestry5.ioc.services.PropertyAccess;
import org.slf4j.Logger;
@@ -110,20 +114,68 @@
private ServiceUser serviceUser;
@Persist
- private ModelFactory modelFactory;
+ private FilterManager filterManager;
@Persist
private boolean observerSelect;
@Persist
private boolean programSelect;
+ /*
+ * Generic select models
+ */
+ @Persist
+ private GenericSelectModel<SampleRow> sampleRowSelectModel;
- private boolean edited;
+ @Persist
+ private GenericSelectModel<TerrestrialLocation> terrestrialLocationSelectModel;
@Persist
- private GenericSelectModel<SampleRow> sampleRowSelectModel;
+ private GenericSelectModel<Company> companySelectModel;
@Persist
+ private GenericSelectModel<WaoUser> observerSelectModel;
+
+ @Persist
+ private GenericSelectModel<FishingGearDCF> dcfGearSelectModel;
+
+ @Persist
+ private GenericSelectModel<TargetSpeciesDCF> dcfSpeciesSelectModel;
+
+ /*
+ * Select models
+ */
+ @Persist
+ private SelectModel facadeSelectModel;
+
+ @Persist
+ private SelectModel sectorSelectModel;
+
+ @Persist
+ private SelectModel programSelectModel;
+
+ /**
+ * Id
+ */
+ @Persist
+ private String companyId;
+
+ @Persist
+ private String observerId;
+
+ @Persist
+ private String fishingGearDCFId;
+
+ @Persist
+ private String targetSpeciesDCFId;
+
+ @Persist
+ private String terrestrialDistrictId;
+
+
+ private boolean edited;
+
+ @Persist
private String sampleRowId;
public boolean isObserverSelect() {
@@ -145,73 +197,55 @@
}
public String getCompanyId() {
- return getModelFactory().getCompanyId();
+ return companyId;
}
public void setCompanyId(String companyId) {
- getModelFactory().setCompanyId(companyId);
+ this.companyId = companyId;
+ Company company = getEntityFromModel(getCompanySelectModel(), companyId);
+ getFilter().setCompany(company);
}
public String getObserverId() {
- return getModelFactory().getObserverId();
+ return observerId;
}
public void setObserverId(String observerId) {
- getModelFactory().setObserverId(observerId);
+ this.observerId = observerId;
+ WaoUser observer = getEntityFromModel(getObserverSelectModel(), observerId);
+ getFilter().setObserver(observer);
}
public String getFishingGearDCFId() {
- return getModelFactory().getFishingGearDCFId();
+ return fishingGearDCFId;
}
public void setFishingGearDCFId(String fishingGearDCFId) {
- getModelFactory().setFishingGearDCFId(fishingGearDCFId);
+ this.fishingGearDCFId = fishingGearDCFId;
+ FishingGearDCF fishingGearDCF = getEntityFromModel(getDcfGearSelectModel(), fishingGearDCFId);
+ getFilter().setFishingGearDCF(fishingGearDCF);
}
public String getTargetSpeciesDCFId() {
- return getModelFactory().getTargetSpeciesDCFId();
+ return targetSpeciesDCFId;
}
public void setTargetSpeciesDCFId(String targetSpeciesDCFId) {
- getModelFactory().setTargetSpeciesDCFId(targetSpeciesDCFId);
+ this.targetSpeciesDCFId = targetSpeciesDCFId;
+ TargetSpeciesDCF targetSpeciesDCF = getEntityFromModel(getDcfSpeciesSelectModel(), targetSpeciesDCFId);
+ getFilter().setTargetSpeciesDCF(targetSpeciesDCF);
}
public String getTerrestrialDistrictId() {
- return getModelFactory().getTerrestrialDistrictId();
+ return terrestrialDistrictId;
}
public void setTerrestrialDistrictId(String terrestrialDistrictId) {
- getModelFactory().setTerrestrialDistrictId(terrestrialDistrictId);
+ this.terrestrialDistrictId = terrestrialDistrictId;
+ TerrestrialLocation terrestrialDistrict = getEntityFromModel(getTerrestrialDistrictSelectModel(), terrestrialDistrictId);
+ getFilter().setTerrestrialDistrict(terrestrialDistrict);
}
- public ModelFactory getModelFactory() {
- if (modelFactory == null) {
- modelFactory = new ModelFactory<SamplingFilter>(propertyAccess,
- user,
- serviceReferential,
- serviceSampling,
- serviceBoat,
- serviceUser) {
-
- @Override
- public SamplingFilter getFilter() {
- return AbstractFilteredPage.this.getFilter();
- }
-
- @Override
- protected boolean isAvailableDataForFiltersOnly() {
- return AbstractFilteredPage.this.isAvailableDataForFiltersOnly();
- }
-
- @Override
- public void resetFilter() {
- AbstractFilteredPage.this.resetFilter();
- }
- };
- }
- return modelFactory;
- }
-
public void onSelectedFromAddSampleRowCode() {
if (getSampleRowId() != null) {
@@ -273,7 +307,7 @@
}
if (user.isAdmin() && companySelect) {
- getModelFactory().resetCompanySelectModel();
+ resetCompanySelectModel();
if (getFilter().getCompany() != null) {
setCompanyId(getFilter().getCompany().getTopiaId());
}
@@ -286,7 +320,7 @@
// }
if (observerSelect) {
- getModelFactory().resetObserverSelectModel();
+ resetObserverSelectModel();
getObserverSelectModel();
if (getFilter().getObserver() != null) {
@@ -295,31 +329,82 @@
}
if (programSelect) {
- getModelFactory().resetProgramSelectModel();
+ resetProgramSelectModel();
getProgramSelectModel();
}
- getModelFactory().resetFacadeSelectModel();
- getModelFactory().resetSectorSelectModel();
- getModelFactory().resetSampleRowSelectModel();
+ resetFacadeSelectModel();
+ resetSectorSelectModel();
+ resetSampleRowSelectModel();
- getModelFactory().initCompagnyFilter();
+ initCompagnyFilter();
}
- /**
- * @see ModelFactory#getFacadeSelectModel()
- */
- public SelectModel getFacadeSelectModel() throws WaoException {
- return getModelFactory().getFacadeSelectModel(true);
+ public void initCompagnyFilter() {
+ // Very very important to do that at beginning
+ // Evo #2227 : Guest user has no default company filter
+ if (user.isCoordinatorOrObserver()) {
+ if (log.isDebugEnabled()) {
+ log.debug("Company filtered : " + user.getCompany().getName());
+ }
+ getFilter().setCompany(user.getCompany());
+ }
}
- /**
- * @see ModelFactory#getSectorSelectModel()
- */
- public SelectModel getSectorSelectModel() throws WaoException {
- return getModelFactory().getSectorSelectModel(true);
+ public void resetCompanySelectModel() throws WaoException {
+ companySelectModel = null;
+ companyId = null;
}
+ public void resetSampleRowSelectModel() throws WaoException {
+ sampleRowSelectModel = null;
+ getFilter().setSampleRow(null);
+ }
+
+ public void resetObserverSelectModel() {
+ observerSelectModel = null;
+ observerId = null;
+ }
+
+ public void resetTerrestrialDistrictModel() {
+ terrestrialLocationSelectModel = null;
+ terrestrialDistrictId = null;
+ }
+
+ public void resetTargetSpeciesDCFModel() {
+ dcfSpeciesSelectModel = null;
+ targetSpeciesDCFId = null;
+ }
+
+ public void resetFishingGearDCFModel() {
+ dcfGearSelectModel = null;
+ fishingGearDCFId = null;
+ }
+
+ public void resetFacadeSelectModel() throws WaoException {
+ facadeSelectModel = null;
+ }
+
+ public void resetSectorSelectModel() throws WaoException {
+ sectorSelectModel = null;
+ }
+
+ public void resetProgramSelectModel() {
+ programSelectModel = null;
+ }
+
+ public void resetModels() {
+ resetCompanySelectModel();
+ resetFacadeSelectModel();
+ resetObserverSelectModel();
+ resetProgramSelectModel();
+ resetSampleRowSelectModel();
+ resetSectorSelectModel();
+ resetTerrestrialDistrictModel();
+ resetTargetSpeciesDCFModel();
+ resetFishingGearDCFModel();
+ }
+
/**
* Get select model for sampleRows. Depends on filter (Sampling part only).
* The sampleRow set from filter is temporarly extracted to avoid returning
@@ -344,47 +429,141 @@
}
/**
- * @see ModelFactory#getCompanySelectModel()
+ * Get select model for fishingZone facade. Depends on company set in
+ * filter.
+ *
+ * @return the SelectModel for facade names
+ * @throws WaoException
*/
+ public SelectModel getFacadeSelectModel() throws WaoException {
+ if (facadeSelectModel == null) {
+ List<OptionModel> options;
+ options = getOptionModels(serviceReferential.getFacades(getFilter()));
+ facadeSelectModel = new SelectModelImpl(null, options);
+ }
+ return facadeSelectModel;
+ }
+
+ /**
+ * Get select model for fishingZone sector. Depends on facadeName and
+ * company set in filter.
+ *
+ * @return the SelectModel for sector names
+ * @throws WaoException
+ */
+ public SelectModel getSectorSelectModel() throws WaoException {
+ if (sectorSelectModel == null) {
+ List<OptionModel> options;
+ options = getOptionModels(serviceReferential.getSectors(getFilter()));
+ sectorSelectModel = new SelectModelImpl(null, options);
+ }
+ return sectorSelectModel;
+ }
+
+ /**
+ * Get select model for companies. Depends on
+ * {@link #isAvailableDataForFiltersOnly()} () } to return only activated
+ * companies. This select model is only used by admin users.
+ *
+ * @return the GenericSelectModel<Company> for companies
+ * @throws WaoException
+ */
public GenericSelectModel<Company> getCompanySelectModel() throws WaoException {
- return getModelFactory().getCompanySelectModel(true);
+ if (companySelectModel == null) {
+ List<Company> companies;
+ companies = serviceUser.getCompanies(isAvailableDataForFiltersOnly());
+ companySelectModel = new GenericSelectModel<Company>(companies, Company.class,
+ Company.PROPERTY_NAME, Company.TOPIA_ID, propertyAccess);
+ }
+ return companySelectModel;
}
/**
- * @see ModelFactory#getObserverSelectModel()
+ * Get the select model for observers. Depends on
+ * {@link #isAvailableDataForFiltersOnly() } to return only activated
+ * companies.
+ *
+ * @return the GenericSelectModel<WaoUser> for observers
+ * @throws WaoException
*/
public GenericSelectModel<WaoUser> getObserverSelectModel() throws WaoException {
- return getModelFactory().getObserverSelectModel(true);
+ if (observerSelectModel == null) {
+
+ List<WaoUser> observers;
+ observers =
+ serviceUser.getObservers(getFilter().getCompany(),
+ isAvailableDataForFiltersOnly());
+
+ observerSelectModel = new GenericSelectModel<WaoUser>(observers, WaoUser.class,
+ "fullName", "topiaId", propertyAccess);
+ }
+ return observerSelectModel;
}
/**
- * @see ModelFactory#getProgramSelectModel()
+ * Get select model for sampleRow program. Depends on company set in
+ * filter.
+ *
+ * @return the SelectModel for program names
+ * @throws WaoException
*/
public SelectModel getProgramSelectModel() throws WaoException {
- return getModelFactory().getProgramSelectModel(true);
+ if (programSelectModel == null) {
+ List<OptionModel> options;
+ options = getOptionModels(serviceSampling.getPrograms(getFilter().getCompany()));
+ programSelectModel = new SelectModelImpl(null, options);
+ }
+ return programSelectModel;
}
- /**
- * @see ModelFactory#getDcfGearSelectModel()
- */
public GenericSelectModel<FishingGearDCF> getDcfGearSelectModel() throws WaoException {
- return getModelFactory().getDcfGearSelectModel(true);
+ if (dcfGearSelectModel == null) {
+ // don't filter with already defined DCFs
+ FishingGearDCF keptFishingGearDCF = getFilter().getFishingGearDCF();
+ getFilter().setFishingGearDCF(null);
+ List<FishingGearDCF> fishingGearDCFs;
+ fishingGearDCFs = serviceSampling.getDCFGears(getFilter());
+ getFilter().setFishingGearDCF(keptFishingGearDCF);
+
+ dcfGearSelectModel = new GenericSelectModel<FishingGearDCF>(fishingGearDCFs, FishingGearDCF.class,
+ "fullDescription", FishingGearDCF.TOPIA_ID, propertyAccess);
+ }
+ return dcfGearSelectModel;
}
- /**
- * @see ModelFactory#getDcfSpeciesSelectModel()
- */
public GenericSelectModel<TargetSpeciesDCF> getDcfSpeciesSelectModel() throws WaoException {
- return getModelFactory().getDcfSpeciesSelectModel(true);
+ if (dcfSpeciesSelectModel == null) {
+ // don't filter with already defined DCFs
+ TargetSpeciesDCF keptTargetSpeciesDCF = getFilter().getTargetSpeciesDCF();
+ getFilter().setTargetSpeciesDCF(null);
+ List<TargetSpeciesDCF> targetSpeciesDCFs;
+ targetSpeciesDCFs = serviceSampling.getDCFSpecies(getFilter());
+ getFilter().setTargetSpeciesDCF(keptTargetSpeciesDCF);
+
+ dcfSpeciesSelectModel = new GenericSelectModel<TargetSpeciesDCF>(targetSpeciesDCFs, TargetSpeciesDCF.class,
+ "fullDescription", TargetSpeciesDCF.TOPIA_ID, propertyAccess);
+ }
+ return dcfSpeciesSelectModel;
}
- /**
- * @see ModelFactory#getTerrestrialDistrictSelectModel()
- */
public GenericSelectModel<TerrestrialLocation> getTerrestrialDistrictSelectModel() throws WaoException {
- return getModelFactory().getTerrestrialDistrictSelectModel(true);
+ if (terrestrialLocationSelectModel == null) {
+ List<TerrestrialLocation> districts;
+ districts = serviceReferential.getAllTerrestrialDistricts(new SamplingFilterImpl());
+ terrestrialLocationSelectModel = new GenericSelectModel<TerrestrialLocation>(districts, TerrestrialLocation.class,
+ "description", SampleRow.TOPIA_ID, propertyAccess);
+ }
+ return terrestrialLocationSelectModel;
}
+ protected List<OptionModel> getOptionModels(List<String> names) {
+ List<OptionModel> options = new ArrayList<OptionModel>();
+ for (String name : names) {
+ options.add(new OptionModelImpl(name, name));
+ }
+ return options;
+ }
+
protected abstract SamplingFilter getFilter() throws WaoException;
/**
@@ -468,11 +647,11 @@
if (isObserverSelect()) {
// Reset observers
getFilter().setObserver(null);
- getModelFactory().resetObserverSelectModel();
+ resetObserverSelectModel();
getObserverSelectModel();
}
if (isProgramSelect()) {
- getModelFactory().resetProgramSelectModel();
+ resetProgramSelectModel();
getProgramSelectModel();
}
edited = true;
@@ -491,7 +670,7 @@
// Reset facades
getFilter().setFacadeName(null);
onSelectedFromRefreshByFacade();
- getModelFactory().resetFacadeSelectModel();
+ resetFacadeSelectModel();
}
/**
@@ -507,7 +686,7 @@
// Reset sectors
getFilter().setSectorName(null);
onSelectedFromRefreshBySector();
- getModelFactory().resetSectorSelectModel();
+ resetSectorSelectModel();
}
/**
@@ -524,7 +703,7 @@
onSelectedFromSearch();
// Reset sampleRows;
getFilter().setSampleRow(null);
- getModelFactory().resetSampleRowSelectModel();
+ resetSampleRowSelectModel();
edited = true;
}
Copied: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/FilterManager.java (from rev 1077, trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/ModelFactory.java)
===================================================================
--- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/FilterManager.java (rev 0)
+++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/FilterManager.java 2011-03-22 10:30:29 UTC (rev 1082)
@@ -0,0 +1,88 @@
+package fr.ifremer.wao.ui.base;
+
+import fr.ifremer.wao.bean.ConnectedUser;
+import fr.ifremer.wao.bean.SamplingFilter;
+import fr.ifremer.wao.bean.SamplingFilterValues;
+import fr.ifremer.wao.service.ServiceSampling;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * @author sletellier <letellier at codelutin.com>
+ */
+public abstract class FilterManager<E extends SamplingFilter> {
+
+ /**
+ * Logger.
+ */
+ private static final Log log = LogFactory.getLog(FilterManager.class);
+
+ protected ConnectedUser user;
+
+ /*
+ * Services
+ */
+ protected ServiceSampling serviceSampling;
+
+ /*
+ * Datas
+ */
+ protected SamplingFilterValues possibleValuesForFilter;
+
+ public FilterManager(ConnectedUser user,
+ ServiceSampling serviceSampling) {
+
+ this.serviceSampling = serviceSampling;
+ this.user = user;
+
+ // Initialize filter
+ resetFilter();
+ }
+
+ public SamplingFilterValues getPossibleValuesForFilter() {
+ return getPossibleValuesForFilter(false);
+ }
+
+ public SamplingFilterValues updatePossibleValuesForFilter() {
+ return getPossibleValuesForFilter(true);
+ }
+
+ protected SamplingFilterValues getPossibleValuesForFilter(boolean update) {
+ if (update || possibleValuesForFilter == null) {
+ possibleValuesForFilter = serviceSampling.getPossibleValuesForFilter(getFilter());
+ }
+ return possibleValuesForFilter;
+ }
+
+ public ConnectedUser getUser() {
+ return user;
+ }
+ public void initCompagnyFilter() {
+ // Very very important to do that at beginning
+ // Evo #2227 : Guest user has no default company filter
+ if (user.isCoordinatorOrObserver()) {
+ if (log.isDebugEnabled()) {
+ log.debug("Company filtered : " + user.getCompany().getName());
+ }
+ getFilter().setCompany(user.getCompany());
+ }
+ }
+
+ public abstract E getFilter();
+
+ /**
+ * Method to initialize filter, is call on constructor
+ */
+ public abstract void resetFilter();
+
+ /**
+ * Used to show only active company and observers.
+ *
+ * @return true if only active users will be showed, false otherwise
+ */
+ protected abstract boolean isAvailableDataForFiltersOnly();
+
+ public void updateSearchFields() {
+ updatePossibleValuesForFilter();
+ }
+}
Deleted: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/ModelFactory.java
===================================================================
--- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/ModelFactory.java 2011-03-21 23:53:13 UTC (rev 1081)
+++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/ModelFactory.java 2011-03-22 10:30:29 UTC (rev 1082)
@@ -1,484 +0,0 @@
-package fr.ifremer.wao.ui.base;
-
-import fr.ifremer.wao.WaoException;
-import fr.ifremer.wao.bean.ConnectedUser;
-import fr.ifremer.wao.bean.SamplingFilter;
-import fr.ifremer.wao.bean.SamplingFilterImpl;
-import fr.ifremer.wao.bean.SamplingFilterValues;
-import fr.ifremer.wao.entity.Company;
-import fr.ifremer.wao.entity.FishingGearDCF;
-import fr.ifremer.wao.entity.SampleRow;
-import fr.ifremer.wao.entity.TargetSpeciesDCF;
-import fr.ifremer.wao.entity.TerrestrialLocation;
-import fr.ifremer.wao.entity.WaoUser;
-import fr.ifremer.wao.service.ServiceBoat;
-import fr.ifremer.wao.service.ServiceReferential;
-import fr.ifremer.wao.service.ServiceSampling;
-import fr.ifremer.wao.service.ServiceUser;
-import fr.ifremer.wao.ui.data.GenericSelectModel;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.tapestry5.OptionModel;
-import org.apache.tapestry5.SelectModel;
-import org.apache.tapestry5.internal.OptionModelImpl;
-import org.apache.tapestry5.internal.SelectModelImpl;
-import org.apache.tapestry5.ioc.services.PropertyAccess;
-import org.chenillekit.tapestry.core.models.GenericMultipleSelectModel;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import static fr.ifremer.wao.ui.data.TapestryUtil.getEntityFromModel;
-
-/**
- * @author sletellier <letellier at codelutin.com>
- */
-public abstract class ModelFactory <E extends SamplingFilter> {
-
- /**
- * Logger.
- */
- private static final Log log = LogFactory.getLog(ModelFactory.class);
-
- protected PropertyAccess propertyAccess;
-
- protected ConnectedUser user;
-
- /*
- * Services
- */
- protected ServiceReferential serviceReferential;
- protected ServiceSampling serviceSampling;
- protected ServiceBoat serviceBoat;
- protected ServiceUser serviceUser;
-
- /*
- * Generic select models
- */
- protected GenericMultipleSelectModel<SampleRow> sampleRowSelectModel;
- protected GenericSelectModel<TerrestrialLocation> terrestrialLocationSelectModel;
- protected GenericSelectModel<Company> companySelectModel;
- protected GenericSelectModel<WaoUser> observerSelectModel;
- protected GenericSelectModel<FishingGearDCF> dcfGearSelectModel;
- protected GenericSelectModel<TargetSpeciesDCF> dcfSpeciesSelectModel;
-
- /*
- * Select models
- */
- protected SelectModel facadeSelectModel;
- protected SelectModel sectorSelectModel;
- protected SelectModel programSelectModel;
-
- /**
- * Id
- */
- protected String companyId;
- protected String observerId;
- protected String fishingGearDCFId;
- protected String targetSpeciesDCFId;
- protected String terrestrialDistrictId;
-
- /*
- * Datas
- */
- protected SamplingFilterValues possibleValuesForFilter;
-
- public ModelFactory(PropertyAccess propertyAccess,
- ConnectedUser user,
- ServiceReferential serviceReferential,
- ServiceSampling serviceSampling,
- ServiceBoat serviceBoat,
- ServiceUser serviceUser) {
-
- this.user = user;
- this.propertyAccess = propertyAccess;
-
- this.serviceReferential = serviceReferential;
- this.serviceSampling = serviceSampling;
- this.serviceBoat = serviceBoat;
- this.serviceUser = serviceUser;
-
- // Initialize filter
- resetFilter();
- }
-
- public SamplingFilterValues getPossibleValuesForFilter() {
- return getPossibleValuesForFilter(false);
- }
-
- public SamplingFilterValues updatePossibleValuesForFilter() {
- return getPossibleValuesForFilter(true);
- }
-
- protected SamplingFilterValues getPossibleValuesForFilter(boolean update) {
- if (update || possibleValuesForFilter == null) {
- possibleValuesForFilter = serviceSampling.getPossibleValuesForFilter(getFilter());
- }
- return possibleValuesForFilter;
- }
-
- public ConnectedUser getUser() {
- return user;
- }
-
- public String getCompanyId() {
- return companyId;
- }
-
- public void setCompanyId(String companyId) {
- this.companyId = companyId;
- Company company = getEntityFromModel(getCompanySelectModel(), companyId);
- getFilter().setCompany(company);
- }
-
- public String getObserverId() {
- return observerId;
- }
-
- public void setObserverId(String observerId) {
- this.observerId = observerId;
- WaoUser observer = getEntityFromModel(getObserverSelectModel(), observerId);
- getFilter().setObserver(observer);
- }
-
- public String getFishingGearDCFId() {
- return fishingGearDCFId;
- }
-
- public void setFishingGearDCFId(String fishingGearDCFId) {
- this.fishingGearDCFId = fishingGearDCFId;
- FishingGearDCF fishingGearDCF = getEntityFromModel(getDcfGearSelectModel(), fishingGearDCFId);
- getFilter().setFishingGearDCF(fishingGearDCF);
- }
-
- public String getTargetSpeciesDCFId() {
- return targetSpeciesDCFId;
- }
-
- public void setTargetSpeciesDCFId(String targetSpeciesDCFId) {
- this.targetSpeciesDCFId = targetSpeciesDCFId;
- TargetSpeciesDCF targetSpeciesDCF = getEntityFromModel(getDcfSpeciesSelectModel(), targetSpeciesDCFId);
- getFilter().setTargetSpeciesDCF(targetSpeciesDCF);
- }
-
- public String getTerrestrialDistrictId() {
- return terrestrialDistrictId;
- }
-
- public void setTerrestrialDistrictId(String terrestrialDistrictId) {
- this.terrestrialDistrictId = terrestrialDistrictId;
- TerrestrialLocation terrestrialDistrict = getEntityFromModel(getTerrestrialDistrictSelectModel(), terrestrialDistrictId);
- getFilter().setTerrestrialDistrict(terrestrialDistrict);
- }
-
- public void resetCompanySelectModel() throws WaoException {
- companySelectModel = null;
- companyId = null;
- }
-
- public void resetSampleRowSelectModel() throws WaoException {
- sampleRowSelectModel = null;
- getFilter().setSampleRow(null);
- }
-
- public void resetObserverSelectModel() {
- observerSelectModel = null;
- observerId = null;
- }
-
- public void resetTerrestrialDistrictModel() {
- terrestrialLocationSelectModel = null;
- terrestrialDistrictId = null;
- }
-
- public void resetTargetSpeciesDCFModel() {
- dcfSpeciesSelectModel = null;
- targetSpeciesDCFId = null;
- }
-
- public void resetFishingGearDCFModel() {
- dcfGearSelectModel = null;
- fishingGearDCFId = null;
- }
-
- public void resetFacadeSelectModel() throws WaoException {
- facadeSelectModel = null;
- }
-
- public void resetSectorSelectModel() throws WaoException {
- sectorSelectModel = null;
- }
-
- public void resetProgramSelectModel() {
- programSelectModel = null;
- }
-
- public void initCompagnyFilter() {
- // Very very important to do that at beginning
- // Evo #2227 : Guest user has no default company filter
- if (user.isCoordinatorOrObserver()) {
- if (log.isDebugEnabled()) {
- log.debug("Company filtered : " + user.getCompany().getName());
- }
- getFilter().setCompany(user.getCompany());
- }
- }
-
- public abstract E getFilter();
-
- /**
- * Method to initialize filter, is call on constructor
- */
- public abstract void resetFilter();
-
- public void resetModels() {
- resetCompanySelectModel();
- resetFacadeSelectModel();
- resetObserverSelectModel();
- resetProgramSelectModel();
- resetSampleRowSelectModel();
- resetSectorSelectModel();
- resetTerrestrialDistrictModel();
- resetTargetSpeciesDCFModel();
- resetFishingGearDCFModel();
- }
-
- /**
- * Used to show only active company and observers.
- *
- * @return true if only active users will be showed, false otherwise
- */
- protected abstract boolean isAvailableDataForFiltersOnly();
-
- /*
- * Models
- *
- * FIXME sletellier 20110318 : keep old fonctionment (with useSevice = true) remove it when AbstractFilterPage will be removed
- */
-
- /**
- * Get select model for fishingZone facade. Depends on company set in
- * filter.
- *
- * @return the SelectModel for facade names
- * @throws WaoException
- */
- public SelectModel getFacadeSelectModel() throws WaoException {
- return getFacadeSelectModel(false);
- }
-
- public SelectModel getFacadeSelectModel(boolean useService) throws WaoException {
- if (facadeSelectModel == null) {
- List<OptionModel> options;
- if (useService) {
- options = getOptionModels(serviceReferential.getFacades(getFilter()));
- } else {
- options = getOptionModels(getPossibleValuesForFilter().getFacadeNamesAsList());
- }
- facadeSelectModel = new SelectModelImpl(null, options);
- }
- return facadeSelectModel;
- }
-
- /**
- * Get select model for fishingZone sector. Depends on facadeName and
- * company set in filter.
- *
- * @return the SelectModel for sector names
- * @throws WaoException
- */
- public SelectModel getSectorSelectModel() throws WaoException {
- return getSectorSelectModel(false);
- }
-
- public SelectModel getSectorSelectModel(boolean useService) throws WaoException {
- if (sectorSelectModel == null) {
- List<OptionModel> options;
- if (useService) {
- options = getOptionModels(serviceReferential.getSectors(getFilter()));
- } else {
- options = getOptionModels(getPossibleValuesForFilter().getSectorsNamesAsList());
- }
- sectorSelectModel = new SelectModelImpl(null, options);
- }
- return sectorSelectModel;
- }
-
- /**
- * Get select model for sampleRows. Depends on filter (Sampling part only).
- * The sampleRow set from filter is temporarly extracted to avoid returning
- * only one element in the select.
- *
- * @return the GenericMultipleSelectModel<SampleRow> for sampleRows
- * @throws WaoException
- */
- public GenericMultipleSelectModel<SampleRow> getSampleRowSelectModel() throws WaoException {
- if (sampleRowSelectModel == null) {
- // WARN : no use of sampleRow filter
-
- List<SampleRow> rowsFiltered = getFilter().getSampleRows();
- getFilter().setSampleRows(null);
- List<SampleRow> sampleRows = getPossibleValuesForFilter().getSampleRowsAsList();
- getFilter().setSampleRows(rowsFiltered);
-
- sampleRowSelectModel = new GenericMultipleSelectModel<SampleRow>(sampleRows, SampleRow.class,
- SampleRow.PROPERTY_CODE, SampleRow.TOPIA_ID, propertyAccess);
- }
- return sampleRowSelectModel;
- }
-
- /**
- * Get select model for companies. Depends on
- * {@link #isAvailableDataForFiltersOnly()} () } to return only activated
- * companies. This select model is only used by admin users.
- *
- * @return the GenericSelectModel<Company> for companies
- * @throws WaoException
- */
- public GenericSelectModel<Company> getCompanySelectModel() throws WaoException {
- return getCompanySelectModel(false);
- }
-
- public GenericSelectModel<Company> getCompanySelectModel(boolean useService) throws WaoException {
- if (companySelectModel == null) {
- List<Company> companies;
- if (useService) {
- companies = serviceUser.getCompanies(isAvailableDataForFiltersOnly());
- } else {
- companies = getPossibleValuesForFilter().getCompaniesAsList();
- }
- companySelectModel = new GenericSelectModel<Company>(companies, Company.class,
- Company.PROPERTY_NAME, Company.TOPIA_ID, propertyAccess);
- }
- return companySelectModel;
- }
-
- /**
- * Get the select model for observers. Depends on
- * {@link #isAvailableDataForFiltersOnly() } to return only activated
- * companies.
- *
- * @return the GenericSelectModel<WaoUser> for observers
- * @throws WaoException
- */
- public GenericSelectModel<WaoUser> getObserverSelectModel() throws WaoException {
- return getObserverSelectModel(false);
- }
-
- public GenericSelectModel<WaoUser> getObserverSelectModel(boolean useService) throws WaoException {
- if (observerSelectModel == null) {
-
- List<WaoUser> observers;
- if (useService) {
- observers =
- serviceUser.getObservers(getFilter().getCompany(),
- isAvailableDataForFiltersOnly());
- } else {
- observers = getPossibleValuesForFilter().getObserversAsList();
- }
-
- observerSelectModel = new GenericSelectModel<WaoUser>(observers, WaoUser.class,
- "fullName", "topiaId", propertyAccess);
- }
- return observerSelectModel;
- }
-
- /**
- * Get select model for sampleRow program. Depends on company set in
- * filter.
- *
- * @return the SelectModel for program names
- * @throws WaoException
- */
- public SelectModel getProgramSelectModel() throws WaoException {
- return getProgramSelectModel(false);
- }
-
- public SelectModel getProgramSelectModel(boolean useService) throws WaoException {
- if (programSelectModel == null) {
- List<OptionModel> options;
- if (useService) {
- options = getOptionModels(serviceSampling.getPrograms(getFilter().getCompany()));
- } else {
- options = getOptionModels(getPossibleValuesForFilter().getProgramsAsList());
- }
- programSelectModel = new SelectModelImpl(null, options);
- }
- return programSelectModel;
- }
-
- public GenericSelectModel<FishingGearDCF> getDcfGearSelectModel() throws WaoException {
- return getDcfGearSelectModel(false);
- }
-
- public GenericSelectModel<FishingGearDCF> getDcfGearSelectModel(boolean useService) throws WaoException {
- if (dcfGearSelectModel == null) {
- // don't filter with already defined DCFs
- FishingGearDCF keptFishingGearDCF = getFilter().getFishingGearDCF();
- getFilter().setFishingGearDCF(null);
- List<FishingGearDCF> fishingGearDCFs;
- if (useService) {
- fishingGearDCFs = serviceSampling.getDCFGears(getFilter());
- } else {
- fishingGearDCFs = getPossibleValuesForFilter().getFishingGearDCFCodesAsList();
- }
- getFilter().setFishingGearDCF(keptFishingGearDCF);
-
- dcfGearSelectModel = new GenericSelectModel<FishingGearDCF>(fishingGearDCFs, FishingGearDCF.class,
- "fullDescription", FishingGearDCF.TOPIA_ID, propertyAccess);
- }
- return dcfGearSelectModel;
- }
-
- public GenericSelectModel<TargetSpeciesDCF> getDcfSpeciesSelectModel() throws WaoException {
- return getDcfSpeciesSelectModel(false);
- }
- public GenericSelectModel<TargetSpeciesDCF> getDcfSpeciesSelectModel(boolean useService) throws WaoException {
- if (dcfSpeciesSelectModel == null) {
- // don't filter with already defined DCFs
- TargetSpeciesDCF keptTargetSpeciesDCF = getFilter().getTargetSpeciesDCF();
- getFilter().setTargetSpeciesDCF(null);
- List<TargetSpeciesDCF> targetSpeciesDCFs;
- if (useService) {
- targetSpeciesDCFs = serviceSampling.getDCFSpecies(getFilter());
- } else {
- targetSpeciesDCFs = getPossibleValuesForFilter().getTargetSpeciesDCFCodesAsList();
- }
- getFilter().setTargetSpeciesDCF(keptTargetSpeciesDCF);
-
- dcfSpeciesSelectModel = new GenericSelectModel<TargetSpeciesDCF>(targetSpeciesDCFs, TargetSpeciesDCF.class,
- "fullDescription", TargetSpeciesDCF.TOPIA_ID, propertyAccess);
- }
- return dcfSpeciesSelectModel;
- }
-
- public GenericSelectModel<TerrestrialLocation> getTerrestrialDistrictSelectModel() throws WaoException {
- return getTerrestrialDistrictSelectModel(false);
- }
- public GenericSelectModel<TerrestrialLocation> getTerrestrialDistrictSelectModel(boolean useService) throws WaoException {
- if (terrestrialLocationSelectModel == null) {
- List<TerrestrialLocation> districts;
- if (useService) {
- districts = serviceReferential.getAllTerrestrialDistricts(new SamplingFilterImpl());
- } else {
- districts = getPossibleValuesForFilter().getTerrestrialDistrictsAsList();
- }
- terrestrialLocationSelectModel = new GenericSelectModel<TerrestrialLocation>(districts, TerrestrialLocation.class,
- "description", SampleRow.TOPIA_ID, propertyAccess);
- }
- return terrestrialLocationSelectModel;
- }
-
- protected List<OptionModel> getOptionModels(List<String> names) {
- List<OptionModel> options = new ArrayList<OptionModel>();
- for (String name : names) {
- options.add(new OptionModelImpl(name, name));
- }
- return options;
- }
-
- public void updateSearchFields() {
- updatePossibleValuesForFilter();
- resetModels();
- }
-}
Copied: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/SamplingPlanFilterManager.java (from rev 1077, trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/SamplingPlanModelFactory.java)
===================================================================
--- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/SamplingPlanFilterManager.java (rev 0)
+++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/SamplingPlanFilterManager.java 2011-03-22 10:30:29 UTC (rev 1082)
@@ -0,0 +1,64 @@
+package fr.ifremer.wao.ui.base;
+
+import fr.ifremer.wao.bean.ConnectedUser;
+import fr.ifremer.wao.bean.SamplingFilter;
+import fr.ifremer.wao.bean.SamplingFilterImpl;
+import fr.ifremer.wao.service.ServiceSampling;
+import org.apache.tapestry5.annotations.InjectComponent;
+import org.apache.tapestry5.annotations.Persist;
+import org.apache.tapestry5.corelib.components.Form;
+import org.nuiton.util.PeriodDates;
+
+import java.util.Calendar;
+import java.util.GregorianCalendar;
+
+/**
+ * @author sletellier <letellier at codelutin.com>
+ */
+public class SamplingPlanFilterManager extends FilterManager<SamplingFilter> {
+
+ @Persist
+ protected SamplingFilter filter;
+
+ @InjectComponent
+ private Form filtersForm;
+
+ public SamplingPlanFilterManager(ConnectedUser user,
+ ServiceSampling serviceSampling) {
+
+ super(user, serviceSampling);
+ }
+
+ @Override
+ public SamplingFilter getFilter() {
+ return filter;
+ }
+
+ @Override
+ protected boolean isAvailableDataForFiltersOnly() {
+ return false;
+ }
+
+ @Override
+ public void resetFilter() {
+
+ filter = new SamplingFilterImpl();
+ // Initialize period
+ PeriodDates period = PeriodDates.createMonthsPeriodFromToday(11);
+
+ GregorianCalendar initialFromDate = new GregorianCalendar();
+ // in the firsts months of a new year go from now to 6 months before
+ // in the rest of the year, just start at the beginning of the current year
+ if (initialFromDate.get(Calendar.MONTH) < 3) {
+ initialFromDate.add(Calendar.MONTH, -6);
+ } else {
+ initialFromDate.set(Calendar.DAY_OF_YEAR, 1);
+ }
+ period.setFromDate(initialFromDate.getTime());
+ filter.setPeriod(period);
+ filter.setObsProgram(user.getProfile().getObsProgram());
+ filter.setEstimatedTides(true);
+
+ initCompagnyFilter();
+ }
+}
Deleted: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/SamplingPlanModelFactory.java
===================================================================
--- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/SamplingPlanModelFactory.java 2011-03-21 23:53:13 UTC (rev 1081)
+++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/SamplingPlanModelFactory.java 2011-03-22 10:30:29 UTC (rev 1082)
@@ -1,72 +0,0 @@
-package fr.ifremer.wao.ui.base;
-
-import fr.ifremer.wao.bean.ConnectedUser;
-import fr.ifremer.wao.bean.SamplingFilter;
-import fr.ifremer.wao.bean.SamplingFilterImpl;
-import fr.ifremer.wao.service.ServiceBoat;
-import fr.ifremer.wao.service.ServiceReferential;
-import fr.ifremer.wao.service.ServiceSampling;
-import fr.ifremer.wao.service.ServiceUser;
-import org.apache.tapestry5.annotations.InjectComponent;
-import org.apache.tapestry5.annotations.Persist;
-import org.apache.tapestry5.corelib.components.Form;
-import org.apache.tapestry5.ioc.services.PropertyAccess;
-import org.nuiton.util.PeriodDates;
-
-import java.util.Calendar;
-import java.util.GregorianCalendar;
-
-/**
- * @author sletellier <letellier at codelutin.com>
- */
-public class SamplingPlanModelFactory extends ModelFactory<SamplingFilter> {
-
- @Persist
- protected SamplingFilter filter;
-
- @InjectComponent
- private Form filtersForm;
-
- public SamplingPlanModelFactory(PropertyAccess propertyAccess,
- ConnectedUser user,
- ServiceReferential serviceReferential,
- ServiceSampling serviceSampling,
- ServiceBoat serviceBoat,
- ServiceUser serviceUser) {
-
- super(propertyAccess, user, serviceReferential, serviceSampling, serviceBoat, serviceUser);
- }
-
- @Override
- public SamplingFilter getFilter() {
- return filter;
- }
-
- @Override
- protected boolean isAvailableDataForFiltersOnly() {
- return false;
- }
-
- @Override
- public void resetFilter() {
-
- filter = new SamplingFilterImpl();
- // Initialize period
- PeriodDates period = PeriodDates.createMonthsPeriodFromToday(11);
-
- GregorianCalendar initialFromDate = new GregorianCalendar();
- // in the firsts months of a new year go from now to 6 months before
- // in the rest of the year, just start at the beginning of the current year
- if (initialFromDate.get(Calendar.MONTH) < 3) {
- initialFromDate.add(Calendar.MONTH, -6);
- } else {
- initialFromDate.set(Calendar.DAY_OF_YEAR, 1);
- }
- period.setFromDate(initialFromDate.getTime());
- filter.setPeriod(period);
- filter.setObsProgram(user.getProfile().getObsProgram());
- filter.setEstimatedTides(true);
-
- initCompagnyFilter();
- }
-}
Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/SamplingFilterComponent.java
===================================================================
--- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/SamplingFilterComponent.java 2011-03-21 23:53:13 UTC (rev 1081)
+++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/SamplingFilterComponent.java 2011-03-22 10:30:29 UTC (rev 1082)
@@ -1,10 +1,9 @@
package fr.ifremer.wao.ui.components;
import fr.ifremer.wao.bean.SamplingFilter;
+import fr.ifremer.wao.bean.SamplingFilterValues;
import fr.ifremer.wao.entity.SampleRow;
-import fr.ifremer.wao.entity.TerrestrialLocation;
-import fr.ifremer.wao.service.ServiceSampling;
-import fr.ifremer.wao.ui.base.ModelFactory;
+import fr.ifremer.wao.ui.base.FilterManager;
import org.apache.tapestry5.ComponentResources;
import org.apache.tapestry5.annotations.InjectComponent;
import org.apache.tapestry5.annotations.Parameter;
@@ -30,14 +29,11 @@
@Inject
private ComponentResources resources;
- @Inject
- private ServiceSampling serviceSampling;
-
@InjectComponent
private Form filtersForm;
@Parameter(required = true)
- private ModelFactory<? extends SamplingFilter> modelFactory;
+ private FilterManager<? extends SamplingFilter> filterManager;
@Parameter(required = true)
private String legendMsg;
@@ -103,17 +99,21 @@
}
public SamplingFilter getFilter() {
- return modelFactory.getFilter();
+ return filterManager.getFilter();
}
- public ModelFactory getModelFactory() {
- return modelFactory;
+ public SamplingFilterValues getPossibleValuesForFilter() {
+ return filterManager.getPossibleValuesForFilter();
}
- public void setModelFactory(ModelFactory<? extends SamplingFilter> modelFactory) {
- this.modelFactory = modelFactory;
+ public FilterManager getFilterManager() {
+ return filterManager;
}
+ public void setFilterManager(FilterManager<? extends SamplingFilter> filterManager) {
+ this.filterManager = filterManager;
+ }
+
public DateFormat getDateFormat() {
return new SimpleDateFormat("MM/yyyy");
}
@@ -139,15 +139,12 @@
*/
Object onSuccessFromFiltersForm() {
if (refresh) {
- getModelFactory().updateSearchFields();
return filtersZone.getBody();
}
if (reset) {
// Don't reset period in filters
PeriodDates period = getFilter().getPeriod();
- getModelFactory().resetFilter();
- getModelFactory().resetModels();
- getModelFactory().updateSearchFields();
+ getFilterManager().resetFilter();
getFilter().setPeriod(period);
}
Added: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/SimpleSelector.java
===================================================================
--- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/SimpleSelector.java (rev 0)
+++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/SimpleSelector.java 2011-03-22 10:30:29 UTC (rev 1082)
@@ -0,0 +1,135 @@
+package fr.ifremer.wao.ui.components;
+
+import org.apache.tapestry5.OptionGroupModel;
+import org.apache.tapestry5.OptionModel;
+import org.apache.tapestry5.annotations.Parameter;
+import org.apache.tapestry5.internal.OptionModelImpl;
+import org.apache.tapestry5.internal.SelectModelImpl;
+import org.apache.tapestry5.ioc.annotations.Inject;
+import org.apache.tapestry5.ioc.services.PropertyAccess;
+import org.apache.tapestry5.util.AbstractSelectModel;
+import org.slf4j.Logger;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Component to select one or many string
+ *
+ * @author sletellier <letellier at codelutin.com>
+ */
+public class SimpleSelector {
+
+ @Inject
+ private Logger log;
+
+ @Inject
+ private PropertyAccess propertyAccess;
+
+ @Parameter(required = true)
+ private List<String> values;
+
+ @Parameter(required = false)
+ private Boolean multiple;
+
+ @Parameter(required = false)
+ private String selectedValue;
+
+ @Parameter(required = false)
+ private List<String> selectedValues;
+
+ @Parameter(required = false)
+ private Integer size;
+
+ @Parameter(required = false)
+ private SimpleSelectorModel model;
+
+ public SimpleSelectorModel getModel() {
+ if (model == null) {
+ model = new SimpleSelectorModel();
+ }
+ return model;
+ }
+
+ public void setModel(SimpleSelectorModel model) {
+ this.model = model;
+ }
+
+ public String getSelectedValue() {
+ return selectedValue;
+ }
+
+ public void setSelectedValue(String selectedValue) {
+ this.selectedValue = selectedValue;
+ }
+
+ public List<String> getSelectedValues() {
+ return selectedValues;
+ }
+
+ public void setSelectedValues(List<String> selectedValues) {
+ this.selectedValues = selectedValues;
+ }
+
+ public List<String> getValues() {
+ return values;
+ }
+
+ public void setValues(List<String> values) {
+ this.values = values;
+ }
+
+ public Integer getSize() {
+ if (size == null) {
+ size = getValues().size();
+ }
+ return size;
+ }
+
+ public void setSize(Integer size) {
+ this.size = size;
+ }
+
+ public boolean getMultiple() {
+ if (multiple == null) {
+ multiple = false;
+ }
+ return multiple;
+ }
+
+ public void setMultiple(Boolean multiple) {
+ this.multiple = multiple;
+ }
+
+ /**
+ * Model used by {@link fr.ifremer.wao.ui.components.SimpleSelector}
+ *
+ * @author sletellier <letellier at codelutin.com>
+ */
+ public class SimpleSelectorModel extends AbstractSelectModel {
+
+ protected SelectModelImpl delegate;
+
+ public SimpleSelectorModel() {
+ delegate = new SelectModelImpl(null, getOptionModels(getValues()));
+ }
+
+ @Override
+ public List<OptionGroupModel> getOptionGroups() {
+ return delegate.getOptionGroups();
+ }
+
+ @Override
+ public List<OptionModel> getOptions() {
+ return delegate.getOptions();
+ }
+
+ protected List<OptionModel> getOptionModels(List<String> values) {
+ List<OptionModel> options = new ArrayList<OptionModel>();
+ for (String value : values) {
+ options.add(new OptionModelImpl(value, value));
+ }
+ return options;
+ }
+ }
+}
Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Boats.java
===================================================================
--- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Boats.java 2011-03-21 23:53:13 UTC (rev 1081)
+++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Boats.java 2011-03-22 10:30:29 UTC (rev 1082)
@@ -796,7 +796,7 @@
// WARNING :: Reset sampleRow select for edition mode, no limit for
// showing sampleRows instead of filters
getFilter().setNbMonthFinishedFromToday(null);
- getModelFactory().resetSampleRowSelectModel();
+ resetSampleRowSelectModel();
getFilter().setNbMonthFinishedFromToday(-1);
}
return boatInfosZone.getBody();
Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SamplingPlan.java
===================================================================
--- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SamplingPlan.java 2011-03-21 23:53:13 UTC (rev 1081)
+++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SamplingPlan.java 2011-03-22 10:30:29 UTC (rev 1082)
@@ -38,7 +38,7 @@
import fr.ifremer.wao.service.ServiceReferential;
import fr.ifremer.wao.service.ServiceSampling;
import fr.ifremer.wao.service.ServiceUser;
-import fr.ifremer.wao.ui.base.SamplingPlanModelFactory;
+import fr.ifremer.wao.ui.base.SamplingPlanFilterManager;
import fr.ifremer.wao.ui.components.Layout;
import fr.ifremer.wao.ui.components.SamplingFilterComponent;
import fr.ifremer.wao.ui.data.ExportStreamResponse;
@@ -52,7 +52,6 @@
import org.apache.tapestry5.annotations.Persist;
import org.apache.tapestry5.annotations.Property;
import org.apache.tapestry5.annotations.SessionState;
-import org.apache.tapestry5.corelib.components.Form;
import org.apache.tapestry5.ioc.Messages;
import org.apache.tapestry5.ioc.annotations.Inject;
import org.apache.tapestry5.ioc.services.PropertyAccess;
@@ -86,21 +85,9 @@
private Logger log;
@Inject
- private PropertyAccess propertyAccess;
-
- @Inject
- private ServiceReferential serviceReferential;
-
- @Inject
private ServiceSampling serviceSampling;
@Inject
- private ServiceBoat serviceBoat;
-
- @Inject
- private ServiceUser serviceUser;
-
- @Inject
private WaoManager manager;
@Inject
@@ -117,7 +104,7 @@
private ConnectedUser user;
@Persist
- private SamplingPlanModelFactory modelFactory;
+ private SamplingPlanFilterManager filterManager;
private long nbTidesExpectedTime;
@@ -127,16 +114,15 @@
private long totalTidesRealTime;
- public SamplingPlanModelFactory getModelFactory() {
- if (modelFactory == null) {
- modelFactory = new SamplingPlanModelFactory(propertyAccess,
- user, serviceReferential, serviceSampling, serviceBoat, serviceUser);
+ public SamplingPlanFilterManager getFilterManager() {
+ if (filterManager == null) {
+ filterManager = new SamplingPlanFilterManager(user, serviceSampling);
}
- return modelFactory;
+ return filterManager;
}
- public void setModelFactory(SamplingPlanModelFactory modelFactory) {
- this.modelFactory = modelFactory;
+ public void setFilterManager(SamplingPlanFilterManager filterManager) {
+ this.filterManager = filterManager;
}
/**
@@ -190,7 +176,7 @@
}
public SamplingFilter getFilter() {
- return getModelFactory().getFilter();
+ return getFilterManager().getFilter();
}
Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java
===================================================================
--- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java 2011-03-21 23:53:13 UTC (rev 1081)
+++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java 2011-03-22 10:30:29 UTC (rev 1082)
@@ -35,20 +35,14 @@
import fr.ifremer.wao.bean.GlobalSynthesisResult;
import fr.ifremer.wao.bean.ObsProgram;
import fr.ifremer.wao.bean.SamplingFilter;
-import fr.ifremer.wao.bean.SamplingFilterImpl;
import fr.ifremer.wao.bean.SynthesisId;
import fr.ifremer.wao.bean.UserRole;
import fr.ifremer.wao.entity.Company;
import fr.ifremer.wao.entity.Indicator;
import fr.ifremer.wao.entity.IndicatorLevel;
-import fr.ifremer.wao.entity.SampleRow;
-import fr.ifremer.wao.service.ServiceBoat;
-import fr.ifremer.wao.service.ServiceReferential;
import fr.ifremer.wao.service.ServiceSampling;
import fr.ifremer.wao.service.ServiceSynthesis;
-import fr.ifremer.wao.service.ServiceUser;
-import fr.ifremer.wao.ui.base.AbstractFilteredPage;
-import fr.ifremer.wao.ui.base.SamplingPlanModelFactory;
+import fr.ifremer.wao.ui.base.SamplingPlanFilterManager;
import fr.ifremer.wao.ui.components.SamplingFilterComponent;
import fr.ifremer.wao.ui.data.ChartUtils;
import fr.ifremer.wao.ui.data.ChartUtils.ChartType;
@@ -69,7 +63,6 @@
import org.apache.tapestry5.corelib.components.Zone;
import org.apache.tapestry5.ioc.Messages;
import org.apache.tapestry5.ioc.annotations.Inject;
-import org.apache.tapestry5.ioc.services.PropertyAccess;
import org.jfree.chart.JFreeChart;
import org.nuiton.util.PeriodDates;
import org.slf4j.Logger;
@@ -102,24 +95,12 @@
private RenderSupport renderSupport;
@Inject
- private PropertyAccess propertyAccess;
-
- @Inject
- private ServiceReferential serviceReferential;
-
- @Inject
private ServiceSampling serviceSampling;
@Inject
- private ServiceBoat serviceBoat;
+ private WaoManager manager;
@Inject
- private ServiceUser serviceUser;
-
- @Inject
- private WaoManager manager;
-
- @Inject
private ServiceSynthesis serviceSynthesis;
@Inject
@@ -151,18 +132,17 @@
private Messages messages;
@Persist
- private SamplingPlanModelFactory modelFactory;
+ private SamplingPlanFilterManager filterManager;
- public SamplingPlanModelFactory getModelFactory() {
- if (modelFactory == null) {
- modelFactory = new SamplingPlanModelFactory(propertyAccess,
- user, serviceReferential, serviceSampling, serviceBoat, serviceUser);
+ public SamplingPlanFilterManager getFilterManager() {
+ if (filterManager == null) {
+ filterManager = new SamplingPlanFilterManager(user, serviceSampling);
}
- return modelFactory;
+ return filterManager;
}
- public void setModelFactory(SamplingPlanModelFactory modelFactory) {
- this.modelFactory = modelFactory;
+ public void setFilterManager(SamplingPlanFilterManager filterManager) {
+ this.filterManager = filterManager;
}
void setupRender() {
@@ -293,7 +273,7 @@
/********************* FILTERS ********************************************/
public SamplingFilter getFilter() throws WaoException {
- return getModelFactory().getFilter();
+ return getFilterManager().getFilter();
}
public PeriodDates getPeriod() throws WaoException {
Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/SamplingFilterComponent.tml
===================================================================
--- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/SamplingFilterComponent.tml 2011-03-21 23:53:13 UTC (rev 1081)
+++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/SamplingFilterComponent.tml 2011-03-22 10:30:29 UTC (rev 1082)
@@ -8,9 +8,13 @@
<t:errors/>
<div style="float: left; margin-right: 15px;">
<label for="sampleRow">${message:wao.ui.field.SampleRow.code} :</label><br />
- <select t:type="ck/MultipleSelect" t:id="sampleRow"
- t:model="modelFactory.sampleRowSelectModel" t:value="filter.sampleRows" size="6"
- t:encoder="modelFactory.sampleRowSelectModel"/>
+ <t:topiaEntitySelector t:id="sampleRow"
+ t:multiple="true"
+ t:clazzName="SampleRow"
+ t:labelPropertyName="code"
+ t:values="possibleValuesForFilter.sampleRowsAsList"
+ t:selectedValues="filter.sampleRows"
+ size="6"/>
</div>
<div>
<label for="periodBegin">${message:wao.ui.form.periodFrom}</label>
@@ -21,30 +25,52 @@
t:validate="required"/>
</div>
<div>
- <t:if t:test="modelFactory.user.admin">
+ <t:if t:test="filterManager.user.admin">
<label for="company">${message:wao.ui.entity.Company} :</label>
- <input t:type="select" t:id="company" t:model="modelFactory.companySelectModel" t:value="modelFactory.companyId"/>
+ <t:topiaEntitySelector t:id="company"
+ t:clazzName="Company"
+ t:labelPropertyName="name"
+ t:values="possibleValuesForFilter.companiesAsList"
+ t:selectedValue="filter.company"/>
</t:if>
<label for="programName">${message:wao.ui.field.SampleRow.programName} :</label>
- <select t:type="select" t:id="programName" t:model="modelFactory.programSelectModel" t:value="filter.programName"/>
+ <t:simpleSelector t:id="programName"
+ t:values="possibleValuesForFilter.programsAsList"
+ t:selectedValue="filter.programName"/>
</div>
<div class="filterRow" t:type="zone" t:id="sampleRowZone" t:update="show">
<label for="facadeName">${message:wao.ui.field.FishingZone.facadeName} :</label>
- <select t:type="select" t:id="facadeName" t:model="modelFactory.facadeSelectModel" t:value="filter.facadeName"/>
+ <t:simpleSelector t:id="facadeName"
+ t:values="possibleValuesForFilter.facadeNamesAsList"
+ t:selectedValue="filter.facadeName"/>
<label for="sectorName">${message:wao.ui.field.FishingZone.sectorName} :</label>
- <select t:type="select" t:id="sectorName" t:model="modelFactory.sectorSelectModel" t:value="filter.sectorName"/>
- <t:if test="modelFactory.user.obsVente">
+ <t:simpleSelector t:id="sectorName"
+ t:values="possibleValuesForFilter.sectorsNamesAsList"
+ t:selectedValue="filter.sectorName"/>
+ <t:if test="filterManager.user.obsVente">
<label>${message:wao.ui.field.SampleRow.terrestrialLocation} :</label>
- <input t:type="select" t:id="terrestrialDistrict" t:model="modelFactory.terrestrialDistrictSelectModel" t:value="modelFactory.terrestrialDistrictId"/>
+ <t:topiaEntitySelector t:id="terrestrialDistrict"
+ t:clazzName="TerrestrialLocation"
+ t:labelPropertyName="description"
+ t:values="possibleValuesForFilter.terrestrialDistrictsAsList"
+ t:selectedValue="filter.terrestrialDistrict"/>
</t:if>
</div>
<div>
<label for="fishingGearDCF">${message:wao.ui.entity.fishingGearDCF} :</label>
- <input t:type="select" t:id="fishingGearDCF" t:model="modelFactory.dcfGearSelectModel" t:value="modelFactory.fishingGearDCFId"/>
+ <t:topiaEntitySelector t:id="fishingGearDCF"
+ t:clazzName="FishingGearDCF"
+ t:labelPropertyName="fullDescription"
+ t:values="possibleValuesForFilter.fishingGearDCFCodesAsList"
+ t:selectedValue="filter.fishingGearDCF"/>
<label for="targetSpeciesDCF">${message:wao.ui.entity.targetSpeciesDCF} :</label>
- <input t:type="select" t:id="targetSpeciesDCF" t:model="modelFactory.dcfSpeciesSelectModel" t:value="modelFactory.targetSpeciesDCFId"/>
- <t:if test="modelFactory.user.obsVente">
+ <t:topiaEntitySelector t:id="targetSpeciesDCF"
+ t:clazzName="TargetSpeciesDCF"
+ t:labelPropertyName="fullDescription"
+ t:values="possibleValuesForFilter.targetSpeciesDCFCodesAsList"
+ t:selectedValue="filter.targetSpeciesDCF"/>
+ <t:if test="filterManager.user.obsVente">
<label t:for="samplingStrategy">${message:wao.ui.field.SampleRow.samplingStrategy} :</label>
<input t:type="select" t:id="samplingStrategy" t:value="filter.samplingStrategy"/>
</t:if>
Added: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/SimpleSelector.tml
===================================================================
--- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/SimpleSelector.tml (rev 0)
+++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/SimpleSelector.tml 2011-03-22 10:30:29 UTC (rev 1082)
@@ -0,0 +1,17 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd"
+ xmlns:p="tapestry:parameter">
+ <t:if test="multiple">
+ <select t:type="ck/MultipleSelect"
+ t:id="multipleSelect"
+ t:model="model"
+ t:value="selectedValues"
+ size="${size}"/>
+ <p:else>
+ <input t:type="select"
+ t:id="select"
+ t:model="model"
+ t:value="selectedValue"/>
+ </p:else>
+ </t:if>
+</html>
\ No newline at end of file
Modified: trunk/wao-ui/src/main/webapp/SamplingPlan.tml
===================================================================
--- trunk/wao-ui/src/main/webapp/SamplingPlan.tml 2011-03-21 23:53:13 UTC (rev 1081)
+++ trunk/wao-ui/src/main/webapp/SamplingPlan.tml 2011-03-22 10:30:29 UTC (rev 1082)
@@ -87,7 +87,7 @@
<!--FIXME sletellier 20110316 : visible on parameter dont work in this case....-->
<t:samplingFilterComponent t:id="filterComponent"
t:visibleOnStartup="false"
- t:modelFactory="modelFactory"
+ t:filterManager="filterManager"
t:legendMsg="${message:wao.ui.misc.advancedSearch}"/>
</div>
<t:zone t:id="samplingZone">
Modified: trunk/wao-ui/src/main/webapp/Synthesis.tml
===================================================================
--- trunk/wao-ui/src/main/webapp/Synthesis.tml 2011-03-21 23:53:13 UTC (rev 1081)
+++ trunk/wao-ui/src/main/webapp/Synthesis.tml 2011-03-22 10:30:29 UTC (rev 1082)
@@ -104,7 +104,7 @@
<t:samplingFilterComponent
t:id="filterComponent"
- t:modelFactory="modelFactory"
+ t:filterManager="filterManager"
t:showEstimatedTides="true"
t:legendMsg="${message:wao.ui.filters.filters}"/>
1
0
[Suiviobsmer-commits] r1081 - in trunk/wao-ui/src/main: java/fr/ifremer/wao/ui/components resources/fr/ifremer/wao/ui/components webapp webapp/css
by bleny＠users.labs.libre-entreprise.org 21 Mar '11
by bleny＠users.labs.libre-entreprise.org 21 Mar '11
21 Mar '11
Author: bleny
Date: 2011-03-21 23:53:13 +0000 (Mon, 21 Mar 2011)
New Revision: 1081
Log:
fix sampling plan layout
Modified:
trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/SamplingFilterComponent.java
trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/SamplingFilterComponent.tml
trunk/wao-ui/src/main/webapp/SamplingPlan.tml
trunk/wao-ui/src/main/webapp/css/sampling.css
Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/SamplingFilterComponent.java
===================================================================
--- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/SamplingFilterComponent.java 2011-03-21 23:17:41 UTC (rev 1080)
+++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/SamplingFilterComponent.java 2011-03-21 23:53:13 UTC (rev 1081)
@@ -140,7 +140,7 @@
Object onSuccessFromFiltersForm() {
if (refresh) {
getModelFactory().updateSearchFields();
- return filtersForm;
+ return filtersZone.getBody();
}
if (reset) {
// Don't reset period in filters
Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/SamplingFilterComponent.tml
===================================================================
--- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/SamplingFilterComponent.tml 2011-03-21 23:17:41 UTC (rev 1080)
+++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/SamplingFilterComponent.tml 2011-03-21 23:53:13 UTC (rev 1081)
@@ -1,73 +1,71 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd"
- xmlns:p="tapestry:parameter">
- <div t:type="zone" t:id="filtersZone" t:visible="prop:filtersVisible" id="so-sampling-filters">
- <fieldset>
- <legend>${legendMsg}</legend>
- <div class="so-filters-form">
- <form t:type="form" t:id="filtersForm" t:zone="so-sampling-filters" action="post">
- <t:errors/>
- <div class="t-beaneditor">
- <div>
- <label for="periodBegin">${message:wao.ui.form.periodFrom}</label>
- <input t:type="datefield" class="width70" t:id="periodBegin" t:value="filter.period.fromDate" t:format="MM/yyyy"
- t:validate="required"/>
- <label for="periodEnd">${message:wao.ui.form.period.to} </label>
- <input t:type="datefield" class="width70" t:id="periodEnd" t:value="filter.period.thruDate" t:format="MM/yyyy"
- t:validate="required"/>
+<html xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" xmlns:p="tapestry:parameter">
+ <div t:type="zone" t:id="filtersZone" t:visible="prop:filtersVisible" id="so-sampling-filters">
+ <fieldset>
+ <legend>${legendMsg}</legend>
+ <div class="so-filters-form">
+ <form t:type="form" t:id="filtersForm" t:zone="so-sampling-filters" action="post">
+ <t:errors/>
+ <div style="float: left; margin-right: 15px;">
+ <label for="sampleRow">${message:wao.ui.field.SampleRow.code} :</label><br />
+ <select t:type="ck/MultipleSelect" t:id="sampleRow"
+ t:model="modelFactory.sampleRowSelectModel" t:value="filter.sampleRows" size="6"
+ t:encoder="modelFactory.sampleRowSelectModel"/>
+ </div>
+ <div>
+ <label for="periodBegin">${message:wao.ui.form.periodFrom}</label>
+ <input t:type="datefield" class="width70" t:id="periodBegin" t:value="filter.period.fromDate" t:format="MM/yyyy"
+ t:validate="required"/>
+ <label for="periodEnd">${message:wao.ui.form.period.to} </label>
+ <input t:type="datefield" class="width70" t:id="periodEnd" t:value="filter.period.thruDate" t:format="MM/yyyy"
+ t:validate="required"/>
+ </div>
+ <div>
+ <t:if t:test="modelFactory.user.admin">
+ <label for="company">${message:wao.ui.entity.Company} :</label>
+ <input t:type="select" t:id="company" t:model="modelFactory.companySelectModel" t:value="modelFactory.companyId"/>
+ </t:if>
+ <label for="programName">${message:wao.ui.field.SampleRow.programName} :</label>
+ <select t:type="select" t:id="programName" t:model="modelFactory.programSelectModel" t:value="filter.programName"/>
+
+ </div>
+ <div class="filterRow" t:type="zone" t:id="sampleRowZone" t:update="show">
+ <label for="facadeName">${message:wao.ui.field.FishingZone.facadeName} :</label>
+ <select t:type="select" t:id="facadeName" t:model="modelFactory.facadeSelectModel" t:value="filter.facadeName"/>
+ <label for="sectorName">${message:wao.ui.field.FishingZone.sectorName} :</label>
+ <select t:type="select" t:id="sectorName" t:model="modelFactory.sectorSelectModel" t:value="filter.sectorName"/>
+ <t:if test="modelFactory.user.obsVente">
+ <label>${message:wao.ui.field.SampleRow.terrestrialLocation} :</label>
+ <input t:type="select" t:id="terrestrialDistrict" t:model="modelFactory.terrestrialDistrictSelectModel" t:value="modelFactory.terrestrialDistrictId"/>
+ </t:if>
+ </div>
+ <div>
+ <label for="fishingGearDCF">${message:wao.ui.entity.fishingGearDCF} :</label>
+ <input t:type="select" t:id="fishingGearDCF" t:model="modelFactory.dcfGearSelectModel" t:value="modelFactory.fishingGearDCFId"/>
+ <label for="targetSpeciesDCF">${message:wao.ui.entity.targetSpeciesDCF} :</label>
+ <input t:type="select" t:id="targetSpeciesDCF" t:model="modelFactory.dcfSpeciesSelectModel" t:value="modelFactory.targetSpeciesDCFId"/>
+ <t:if test="modelFactory.user.obsVente">
+ <label t:for="samplingStrategy">${message:wao.ui.field.SampleRow.samplingStrategy} :</label>
+ <input t:type="select" t:id="samplingStrategy" t:value="filter.samplingStrategy"/>
+ </t:if>
+ </div>
+ <t:if test="showEstimatedTides">
+ <div class="filterRow">
+ <input t:type="checkbox" t:id="estimatedTides" t:value="filter.estimatedTides" />
+ <label for="estimatedTides" title="${message:wao.ui.form.estimatedTides.description}">${message:wao.ui.form.estimatedTides}</label>
+ </div>
+ </t:if>
+ <div class="t-beaneditor-row aright">
+ <input t:type="submit" class="ico22px refresh" t:id="refresh"
+ value="${message:wao.ui.filters.refresh}"
+ title="${message:wao.ui.filters.refresh}"/>
+ <input t:type="submit" class="ico search-32px" t:id="search" value="Search"
+ title="Rechercher les lignes du plan correspondants aux filtres saisies"/>
+ <input t:type="submit" class="ico undo" t:id="reset" value="Reset"
+ title="Remettre les filtres par défaut"/>
+ </div>
+ </form>
</div>
- <div>
- <t:if t:test="modelFactory.user.admin">
- <label for="company">${message:wao.ui.entity.Company} :</label>
- <input t:type="select" t:id="company" t:model="modelFactory.companySelectModel" t:value="modelFactory.companyId"/>
- </t:if>
- <label for="programName">${message:wao.ui.field.SampleRow.programName} :</label>
- <select t:type="select" t:id="programName" t:model="modelFactory.programSelectModel" t:value="filter.programName"/>
-
- </div>
- <div class="filterRow" t:type="zone" t:id="sampleRowZone" t:update="show">
- <label for="facadeName">${message:wao.ui.field.FishingZone.facadeName} :</label>
- <select t:type="select" t:id="facadeName" t:model="modelFactory.facadeSelectModel" t:value="filter.facadeName"/>
- <label for="sectorName">${message:wao.ui.field.FishingZone.sectorName} :</label>
- <select t:type="select" t:id="sectorName" t:model="modelFactory.sectorSelectModel" t:value="filter.sectorName"/>
- <t:if test="modelFactory.user.obsVente">
- <label>${message:wao.ui.field.SampleRow.terrestrialLocation} :</label>
- <input t:type="select" t:id="terrestrialDistrict" t:model="modelFactory.terrestrialDistrictSelectModel" t:value="modelFactory.terrestrialDistrictId"/>
- </t:if>
- <label for="sampleRowId">${message:wao.ui.field.SampleRow.code} :</label>
-
- <select t:type="ck/MultipleSelect" t:id="sampleRow"
- t:model="modelFactory.sampleRowSelectModel" t:value="filter.sampleRows" size="4"
- t:encoder="modelFactory.sampleRowSelectModel"/>
- </div>
- <div>
- <label for="fishingGearDCF">${message:wao.ui.entity.fishingGearDCF} :</label>
- <input t:type="select" t:id="fishingGearDCF" t:model="modelFactory.dcfGearSelectModel" t:value="modelFactory.fishingGearDCFId"/>
- <label for="targetSpeciesDCF">${message:wao.ui.entity.targetSpeciesDCF} :</label>
- <input t:type="select" t:id="targetSpeciesDCF" t:model="modelFactory.dcfSpeciesSelectModel" t:value="modelFactory.targetSpeciesDCFId"/>
- <t:if test="modelFactory.user.obsVente">
- <label t:for="samplingStrategy">${message:wao.ui.field.SampleRow.samplingStrategy} :</label>
- <input t:type="select" t:id="samplingStrategy" t:value="filter.samplingStrategy"/>
- </t:if>
- </div>
- <t:if test="showEstimatedTides">
- <div class="filterRow">
- <input t:type="checkbox" t:id="estimatedTides" t:value="filter.estimatedTides" />
- <label for="estimatedTides" title="${message:wao.ui.form.estimatedTides.description}">${message:wao.ui.form.estimatedTides}</label>
- </div>
- </t:if>
- <div class="t-beaneditor-row aright">
- <input t:type="submit" class="ico22px refresh" t:id="refresh"
- value="${message:wao.ui.filters.refresh}"
- title="${message:wao.ui.filters.refresh}"/>
- <input t:type="submit" class="ico search-32px" t:id="search" value="Search"
- title="Rechercher les lignes du plan 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>
- </div>
- </fieldset>
- </div>
+ </fieldset>
+ </div>
</html>
\ No newline at end of file
Modified: trunk/wao-ui/src/main/webapp/SamplingPlan.tml
===================================================================
--- trunk/wao-ui/src/main/webapp/SamplingPlan.tml 2011-03-21 23:17:41 UTC (rev 1080)
+++ trunk/wao-ui/src/main/webapp/SamplingPlan.tml 2011-03-21 23:53:13 UTC (rev 1081)
@@ -277,7 +277,7 @@
</t:if>
</td>
<!-- Actions -->
- <td class="${actionsClass} bright">
+ <td class="${actionsClass} bright" style="white-space: nowrap;">
<t:unless t:test="user.guest">
<t:if t:test="rowNotFinished">
<a t:type="pagelink" t:page="boats" t:context="row.topiaId">
Modified: trunk/wao-ui/src/main/webapp/css/sampling.css
===================================================================
--- trunk/wao-ui/src/main/webapp/css/sampling.css 2011-03-21 23:17:41 UTC (rev 1080)
+++ trunk/wao-ui/src/main/webapp/css/sampling.css 2011-03-21 23:53:13 UTC (rev 1081)
@@ -33,19 +33,6 @@
margin-top: 10px;
}
-div#so-sampling div.user {
- width: 95%;
- margin-left: auto;
- margin-right: auto;
- font-size: 0.8em;
-}
-
-div#so-sampling div.admin {
- width: 2200px;
- margin-left: 10px;
- font-size: 0.8em;
-}
-
div#so-sampling span {
margin-left: 5px;
}
@@ -66,7 +53,8 @@
}
div#so-sampling-filters {
- width: 60%;
+ margin-left: auto;
+ margin-right: auto;
}
div#so-sampling-filters div.t-beaneditor div {
@@ -210,7 +198,6 @@
/* SAMPLE ROW FORM */
div#so-samplerow-form {
- width: 60%;
margin-left: auto;
margin-right: auto;
margin-top: 20px;
1
0