February 2011 - Wao-commits - mailman.cloud.codelutin.com

[Suiviobsmer-commits] r997 - trunk/wao-business/src/main/java/fr/ifremer/wao/service
by bleny＠users.labs.libre-entreprise.org 08 Feb '11

08 Feb '11

Author: bleny Date: 2011-02-08 15:45:10 +0000 (Tue, 08 Feb 2011) New Revision: 997 Log: use entrySet for iter on map Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceCartographyImpl.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceCartographyImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceCartographyImpl.java 2011-02-08 15:20:03 UTC (rev 996) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceCartographyImpl.java 2011-02-08 15:45:10 UTC (rev 997) @@ -173,10 +173,10 @@ // Only 2 digits maximum after the comma numberFormat.setMaximumFractionDigits(2); - for (String districtId : districts.keySet()) { + for (Map.Entry<String, PieChartData> entry : districts.entrySet()) { + String districtId = entry.getKey(); + PieChartData data = entry.getValue(); - PieChartData data = districts.get(districtId); - int nbRealized = (int)getSeriesValue(data, ContactPieChartConstant.REALIZED); int nbOther = (int)getSeriesValue(data, ContactPieChartConstant.OTHER);

1 0

[Suiviobsmer-commits] r996 - trunk/wao-business/src/main/java/fr/ifremer/wao/service
by bleny＠users.labs.libre-entreprise.org 08 Feb '11

08 Feb '11

Author: bleny Date: 2011-02-08 15:20:03 +0000 (Tue, 08 Feb 2011) New Revision: 996 Log: add some comments Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2011-02-08 14:48:56 UTC (rev 995) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2011-02-08 15:20:03 UTC (rev 996) @@ -362,10 +362,32 @@ if (sendNotification) { + // we will send a mail with a body like + //Bonjour, + // + //Un observateur du programme Obsmer a renseigné dans WAO l'information suivante : + // + //Navire : L'ARMILANT (487836) + //Marée : 25/10/2010 00:00 - 26/10/2010 00:00 + //Métier : 2010_0037 Manche Ouest (Manche, Mer du Nord) Secteur Brest Granville centré autour de St malo OTB_DEF 80-90 Chalutage de fond côtier sole, seiche + // + //Capture accidentelle : + //deux tritons et une sirène + // + //Cordialement, + // + //Le programme Obsmer + //http://www.ifremer.fr/wao + String object = WaoUtils.translate(n_("wao.business.mammalsCapture.mail.subject")); + // building 3 string, components of the body + + // the boat and its number String boat = contact.getBoat().getName() + " (" + contact.getBoat().getImmatriculation() + ")"; + + // the time of the capture (it's between tide begin and end) String time = ""; if (contact.getObservationBeginDate() != null) { time = WaoUtils.formatDateTime(contact.getObservationBeginDate()) + " "; @@ -373,8 +395,9 @@ if (contact.getObservationEndDate() != null) { time += WaoUtils.formatDateTime(contact.getObservationEndDate()); } + + // some details from the sample row, facade, etc. SampleRow sampleRow = contact.getSampleRow(); - List<String> facadesNames = new ArrayList<String>(); for (FishingZone fishingZone : sampleRow.getFishingZone()) { facadesNames.add(fishingZone.getSectorName() + " (" + fishingZone.getFacadeName() + ")"); @@ -386,6 +409,7 @@ + " " + sampleRow.getProfession().getLibelle() + " " + sampleRow.getProfession().getSpecies(); + // constructing the whole mail String body = WaoUtils.translate(n_("wao.business.mammalsCapture.mail.message"), boat, time, profession, contact.getMammalsInfo()); @@ -393,7 +417,7 @@ log.debug("will send email with object '" + object + "' and body \n" + body); } - + // now trying to find to what user we need to send the mail WaoUserDAO userDao = WaoDAOHelper.getWaoUserDAO(transaction); // users contains all the user we need to notify for the capture List<WaoUser> waoUsers = userDao.findAllByMammalsNotifications(true); @@ -402,6 +426,7 @@ log.debug("notification will be sent to " + waoUsers.size() + " users"); } + // sending the same e-mail to all of them for (WaoUser waoUser : waoUsers) { String userLogin = waoUser.getLogin(); if (StringUtil.isEmail(userLogin)) {

1 0

[Suiviobsmer-commits] r995 - in trunk: wao-business/src/main/java/fr/ifremer/wao wao-business/src/main/java/fr/ifremer/wao/service wao-business/src/main/resources/i18n wao-business/src/main/xmi wao-ui/src/main/java/fr/ifremer/wao/ui/pages wao-ui/src/main/resources/fr/ifremer/wao/ui/pages wao-ui/src/main/resources/i18n wao-ui/src/main/webapp wao-ui/src/main/webapp/css
by bleny＠users.labs.libre-entreprise.org 08 Feb '11

08 Feb '11

Author: bleny Date: 2011-02-08 14:48:56 +0000 (Tue, 08 Feb 2011) New Revision: 995 Log: evol #2605 : email for accidental captures Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java trunk/wao-business/src/main/java/fr/ifremer/wao/WaoMigrationCallBack.java trunk/wao-business/src/main/java/fr/ifremer/wao/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 trunk/wao-business/src/main/resources/i18n/wao-business_en_GB.properties trunk/wao-business/src/main/resources/i18n/wao-business_fr_FR.properties trunk/wao-business/src/main/xmi/wao.zargo trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Administration.java trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Administration_fr.properties trunk/wao-ui/src/main/resources/i18n/wao-ui_en_GB.properties trunk/wao-ui/src/main/resources/i18n/wao-ui_fr_FR.properties trunk/wao-ui/src/main/webapp/Administration.tml trunk/wao-ui/src/main/webapp/ContactForm.tml trunk/wao-ui/src/main/webapp/css/contacts.css Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java 2011-02-08 14:47:37 UTC (rev 994) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java 2011-02-08 14:48:56 UTC (rev 995) @@ -755,4 +755,10 @@ queries.add("ALTER TABLE SampleRow ADD terrestrialLocationInfos TEXT;"); } + + @Override + protected void addMammalsNotificationsColumns_2_1(List<String> queries) { + queries.add("ALTER TABLE WaoUser ADD mammalsNotifications BOOLEAN DEFAULT FALSE;"); + queries.add("ALTER TABLE Contact ADD mammalsInfo TEXT"); + } } Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoMigrationCallBack.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/WaoMigrationCallBack.java 2011-02-08 14:47:37 UTC (rev 994) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/WaoMigrationCallBack.java 2011-02-08 14:48:56 UTC (rev 995) @@ -123,6 +123,8 @@ protected abstract void addTerrestrialLocationOnSampleRowAndContact_2_0(List<String> queries); + protected abstract void addMammalsNotificationsColumns_2_1(List<String> queries); + protected static final Version[] VERSIONS = new Version[] { VersionUtil.valueOf("1.0"), VersionUtil.valueOf("1.1"), @@ -131,7 +133,8 @@ VersionUtil.valueOf("1.4"), VersionUtil.valueOf("1.5"), VersionUtil.valueOf("1.6"), - VersionUtil.valueOf("2.0") + VersionUtil.valueOf("2.0"), + VersionUtil.valueOf("2.1") }; @Override @@ -336,7 +339,7 @@ } String[] strings = queries.toArray(new String[queries.size()]); - executeSQL(tx, true, true, strings); + executeSQL(tx, showSql, showProgression, strings); } /** given "XXX_YYY et ZZZ_", will split with " et " and with "_" to extract @@ -432,7 +435,20 @@ addTerrestrialLocationOnSampleRowAndContact_2_0(queries); String[] strings = queries.toArray(new String[queries.size()]); - executeSQL(tx, true, true, strings); + executeSQL(tx, showSql, showProgression, strings); } + public void migrateTo_2_1(TopiaContextImplementor tx, + boolean showSql, + boolean showProgression) throws TopiaException { + + List<String> queries = new LinkedList<String>(); + + addMammalsNotificationsColumns_2_1(queries); + + String[] strings = queries.toArray(new String[queries.size()]); + executeSQL(tx, showSql, showProgression, strings); + } + + } Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoUtils.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/WaoUtils.java 2011-02-08 14:47:37 UTC (rev 994) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/WaoUtils.java 2011-02-08 14:48:56 UTC (rev 995) @@ -30,8 +30,9 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.text.DateFormat; +import java.text.SimpleDateFormat; import java.util.Date; -import java.util.Locale; import static org.nuiton.i18n.I18n.l_; @@ -120,4 +121,30 @@ public static String translate(String i18nKey, Object... args) { return l_(context.getLocale(), i18nKey, args); } + + public static final String monthPattern = "MM/yyyy"; + public static final String datePattern = "dd/MM/yyyy"; + public static final String dateTimePattern = "dd/MM/yyyy HH:mm"; + public static final String timePattern = "HH:mm"; + + public static String formatMonthTime(Date date) { + return formatDate(date, monthPattern); + } + + public static String formatDate(Date date) { + return formatDate(date, datePattern); + } + + public static String formatDateTime(Date date) { + return formatDate(date, dateTimePattern); + } + + public static String formatTime(Date date) { + return formatDate(date, timePattern); + } + + protected static String formatDate(Date date, String pattern) { + DateFormat dateFormat = new SimpleDateFormat(pattern, context.getLocale()); + return dateFormat.format(date); + } } 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-02-08 14:47:37 UTC (rev 994) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2011-02-08 14:48:56 UTC (rev 995) @@ -58,6 +58,7 @@ import fr.ifremer.wao.entity.SampleMonth; import fr.ifremer.wao.entity.SampleRow; import fr.ifremer.wao.entity.WaoUser; +import fr.ifremer.wao.entity.WaoUserDAO; import fr.ifremer.wao.io.ContactInput; import fr.ifremer.wao.io.ImportRefusedException; import fr.ifremer.wao.io.ImportResults; @@ -71,6 +72,7 @@ import fr.ifremer.wao.io.csv.WaoCsvHeader.FISHING_ZONE; import fr.ifremer.wao.io.csv.WaoCsvHeader.SAMPLING; import org.apache.commons.lang.BooleanUtils; +import org.apache.commons.lang.ObjectUtils; import org.apache.commons.lang.StringUtils; import org.apache.commons.mail.EmailException; import org.apache.commons.mail.SimpleEmail; @@ -91,6 +93,7 @@ import java.text.DateFormat; import java.text.ParseException; import java.text.SimpleDateFormat; +import java.util.ArrayList; import java.util.Date; import java.util.HashMap; import java.util.List; @@ -311,7 +314,7 @@ @Override public void executeSaveContact(TopiaContext transaction, Contact contact, boolean delete) - throws TopiaException, NullSampleMonthException { + throws TopiaException, NullSampleMonthException, EmailException { checkObserver(contact); checkSampleRow(contact); @@ -333,11 +336,87 @@ // Execute delete dao.delete(contactFound); } else { + notifyUsersForMammalsObservation(transaction, contactFound, contact); createOrUpdateContact(dao, contact, contactFound, true); } transaction.commitTransaction(); } + protected void notifyUsersForMammalsObservation(TopiaContext transaction, + Contact contactFound, Contact contact) throws TopiaException { + + boolean sendNotification = false; + + // we send notifications if there is mammals Capture and + // we prevent re-send of multiple identical messages + if (contact.getMammalsCapture()) { + String oldMessage = null; + if (contactFound != null) { + oldMessage = contactFound.getMammalsInfo(); + } + boolean messageChanged = ObjectUtils.notEqual(contact.getMammalsInfo(), oldMessage); + if (messageChanged) { + sendNotification = true; + } + } + + if (sendNotification) { + + String object = WaoUtils.translate(n_("wao.business.mammalsCapture.mail.subject")); + + String boat = contact.getBoat().getName() + " (" + + contact.getBoat().getImmatriculation() + ")"; + String time = ""; + if (contact.getObservationBeginDate() != null) { + time = WaoUtils.formatDateTime(contact.getObservationBeginDate()) + " "; + } + if (contact.getObservationEndDate() != null) { + time += WaoUtils.formatDateTime(contact.getObservationEndDate()); + } + SampleRow sampleRow = contact.getSampleRow(); + + List<String> facadesNames = new ArrayList<String>(); + for (FishingZone fishingZone : sampleRow.getFishingZone()) { + facadesNames.add(fishingZone.getSectorName() + " (" + fishingZone.getFacadeName() + ")"); + } + String profession = sampleRow.getCode() + " " + + " " + StringUtil.join(facadesNames, ", ", true) + + " " + sampleRow.getFishingZonesInfos() + + " " + sampleRow.getProfessionDescription() + + " " + sampleRow.getProfession().getLibelle() + + " " + sampleRow.getProfession().getSpecies(); + + String body = WaoUtils.translate(n_("wao.business.mammalsCapture.mail.message"), + boat, time, profession, contact.getMammalsInfo()); + + if (log.isDebugEnabled()) { + log.debug("will send email with object '" + object + "' and body \n" + body); + } + + + WaoUserDAO userDao = WaoDAOHelper.getWaoUserDAO(transaction); + // users contains all the user we need to notify for the capture + List<WaoUser> waoUsers = userDao.findAllByMammalsNotifications(true); + + if (log.isDebugEnabled()) { + log.debug("notification will be sent to " + waoUsers.size() + " users"); + } + + for (WaoUser waoUser : waoUsers) { + String userLogin = waoUser.getLogin(); + if (StringUtil.isEmail(userLogin)) { + try { + WaoUtils.sendEmail(userLogin, object, body); + } catch (EmailException e) { + if (log.isErrorEnabled()) { + log.error("unable to send email to " + userLogin, e); + } + } + } + } + } + } + protected void checkObserver(Contact contact) throws WaoException { // Ano #2287 Temporary fix to avoid saving a null observer if (contact.getMainObserver() == null) { 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-02-08 14:47:37 UTC (rev 994) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java 2011-02-08 14:48:56 UTC (rev 995) @@ -35,7 +35,13 @@ import fr.ifremer.wao.WaoProperty; import fr.ifremer.wao.WaoQueryBuilder; import fr.ifremer.wao.WaoQueryHelper; -import fr.ifremer.wao.bean.*; +import fr.ifremer.wao.bean.ConnectedUser; +import fr.ifremer.wao.bean.FacadeRow; +import fr.ifremer.wao.bean.FacadeRowImpl; +import fr.ifremer.wao.bean.ObsProgram; +import fr.ifremer.wao.bean.SamplingFilter; +import fr.ifremer.wao.bean.SamplingStrategy; +import fr.ifremer.wao.bean.UserRole; import fr.ifremer.wao.entity.Boat; import fr.ifremer.wao.entity.Company; import fr.ifremer.wao.entity.CompanyDAO; @@ -77,7 +83,6 @@ import org.nuiton.topia.framework.TopiaQuery; import org.nuiton.topia.framework.TopiaQuery.Op; import org.nuiton.util.DateUtil; -import org.nuiton.util.ObjectUtil; import org.nuiton.util.PeriodDates; import org.nuiton.util.StringUtil; import org.slf4j.Logger; 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-02-08 14:47:37 UTC (rev 994) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceUserImpl.java 2011-02-08 14:48:56 UTC (rev 995) @@ -39,7 +39,6 @@ import fr.ifremer.wao.bean.UserRole; import fr.ifremer.wao.entity.Company; import fr.ifremer.wao.entity.CompanyDAO; -import fr.ifremer.wao.entity.Contact; import fr.ifremer.wao.entity.ContactDAO; import fr.ifremer.wao.entity.News; import fr.ifremer.wao.entity.SampleRow; @@ -51,11 +50,11 @@ import fr.ifremer.wao.entity.WaoUser; import fr.ifremer.wao.entity.WaoUserDAO; import fr.ifremer.wao.entity.WaoUserImpl; -import org.apache.commons.lang.StringUtils; import org.apache.commons.mail.EmailException; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; import org.nuiton.topia.framework.TopiaQuery; +import org.nuiton.util.StringUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -254,8 +253,7 @@ transaction.commitTransaction(); try { - // FIXME-JC20100122 Use REGEX instead of @ to test if the login is a valid email - if (user.getLogin().contains("@") && user.isPasswordChanged()) { + if (StringUtil.isEmail(user.getLogin()) && user.isPasswordChanged()) { String subject = "[WAO] "; String msg = "Bonjour,\n\n"; if (isNewUser) { Modified: trunk/wao-business/src/main/resources/i18n/wao-business_en_GB.properties =================================================================== --- trunk/wao-business/src/main/resources/i18n/wao-business_en_GB.properties 2011-02-08 14:47:37 UTC (rev 994) +++ trunk/wao-business/src/main/resources/i18n/wao-business_en_GB.properties 2011-02-08 14:48:56 UTC (rev 995) @@ -103,6 +103,8 @@ wao.business.contact.validation.commentAdminNecessaryForDataReliability=You must precise in admin comment why data reliability is '%s' wao.business.contact.validation.dataReliabilityMissingForValidation=You must provide data reliability before validating wao.business.entity.UserProfile.description=%s on %s%s +wao.business.mammalsCapture.mail.message=Hello,\n\nAn observer of the ObsMer program provided to WAO the following information\:\n\nBoat\: %s\nTide\: %s\nProfession\: %s\n\nAccidental capture\:\n%s\n\nBest regards,\n\nObsmer program\nhttp\://www.ifremer.fr/wao +wao.business.mammalsCapture.mail.subject=Obsmer WAO\: Information about an accidental capture wao.business.other=Other wao.business.readOnly=(read-only) wao.error.boat.canCreateContact= Modified: trunk/wao-business/src/main/resources/i18n/wao-business_fr_FR.properties =================================================================== --- trunk/wao-business/src/main/resources/i18n/wao-business_fr_FR.properties 2011-02-08 14:47:37 UTC (rev 994) +++ trunk/wao-business/src/main/resources/i18n/wao-business_fr_FR.properties 2011-02-08 14:48:56 UTC (rev 995) @@ -115,6 +115,8 @@ wao.business.contact.validation.commentAdminNecessaryForDataReliability=Il faut pr\u00E9ciser dans le commentaire administrateur pourquoi la donn\u00E9e est '%s' wao.business.contact.validation.dataReliabilityMissingForValidation=Il faut pr\u00E9ciser la qualit\u00E9 de la donn\u00E9e avant de valider wao.business.entity.UserProfile.description=%s sur %s%s +wao.business.mammalsCapture.mail.message=Bonjour,\n\nUn observateur du programme Obsmer a renseign\u00E9 dans WAO l'information suivante \:\n\nNavire \: %s\nMar\u00E9e \: %s\nM\u00E9tier \: %s\n\nCapture accidentelle \:\n%s\n\nCordialement,\n\nLe programme Obsmer\nhttp\://www.ifremer.fr/wao +wao.business.mammalsCapture.mail.subject=Obsmer WAO\: Information sur capture accidentelle wao.business.other=Autre wao.business.readOnly=(lecture seule) wao.error.boat.canCreateContact=Impossible de cr\u00E9er un nouveau contact pour la soci\u00E9t\u00E9 %1$s et le navire %2$s (%3$d) Modified: trunk/wao-business/src/main/xmi/wao.zargo =================================================================== (Binary files differ) Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Administration.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Administration.java 2011-02-08 14:47:37 UTC (rev 994) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Administration.java 2011-02-08 14:48:56 UTC (rev 995) @@ -500,6 +500,7 @@ "generatePassword", WaoUser.PROPERTY_PASSWORD, WaoUser.PROPERTY_PHONE_NUMBER, + WaoUser.PROPERTY_MAMMALS_NOTIFICATIONS, WaoUser.PROPERTY_ACTIVE, "userRole" ); Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Administration_fr.properties =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Administration_fr.properties 2011-02-08 14:47:37 UTC (rev 994) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Administration_fr.properties 2011-02-08 14:48:56 UTC (rev 995) @@ -31,5 +31,4 @@ city-label: Ville phoneNumber-label: T\u00e9l\u00e9phone email-label: E-mail - active-label: Actif Modified: trunk/wao-ui/src/main/resources/i18n/wao-ui_en_GB.properties =================================================================== --- trunk/wao-ui/src/main/resources/i18n/wao-ui_en_GB.properties 2011-02-08 14:47:37 UTC (rev 994) +++ trunk/wao-ui/src/main/resources/i18n/wao-ui_en_GB.properties 2011-02-08 14:48:56 UTC (rev 995) @@ -84,6 +84,7 @@ wao.ui.field.Contact.endDate=Observation end wao.ui.field.Contact.mainObserver=Main observer wao.ui.field.Contact.mammalsCapture=Accidental capture +wao.ui.field.Contact.mammalsInfo= wao.ui.field.Contact.mammalsObservation=Exceptional observation wao.ui.field.Contact.nbObservants=Observers number wao.ui.field.Contact.samplingStrategy=Sampling strategy followed @@ -115,6 +116,7 @@ wao.ui.field.User.login=Login wao.ui.field.UserProfile.userRole=Role wao.ui.field.WaoUser.login=Identifier +wao.ui.field.WaoUser.mammalsNotifications=Receive notifications about mammals captures wao.ui.field.WaoUser.password=Password wao.ui.filters.filters=Search filters wao.ui.filters.refresh=Refresh filters Modified: trunk/wao-ui/src/main/resources/i18n/wao-ui_fr_FR.properties =================================================================== --- trunk/wao-ui/src/main/resources/i18n/wao-ui_fr_FR.properties 2011-02-08 14:47:37 UTC (rev 994) +++ trunk/wao-ui/src/main/resources/i18n/wao-ui_fr_FR.properties 2011-02-08 14:48:56 UTC (rev 995) @@ -84,6 +84,7 @@ wao.ui.field.Contact.endDate=Fin d'observation wao.ui.field.Contact.mainObserver=Observateur r\u00E9f\u00E9rent wao.ui.field.Contact.mammalsCapture=Capture accidentelle +wao.ui.field.Contact.mammalsInfo=Noms scientifiques et nombres d'individus des esp\u00E8ces captur\u00E9es wao.ui.field.Contact.mammalsObservation=Observation exceptionnelle wao.ui.field.Contact.nbObservants=Nombre d'observateurs wao.ui.field.Contact.samplingStrategy=Strat\u00E9gie d'\u00E9chantillonnage suivie @@ -115,6 +116,7 @@ wao.ui.field.User.login=Identifiant wao.ui.field.UserProfile.userRole=R\u00F4le wao.ui.field.WaoUser.login=Identifiant +wao.ui.field.WaoUser.mammalsNotifications=Recevoir les notifications de captures accidentelles wao.ui.field.WaoUser.password=Mot de passe wao.ui.filters.filters=Filtres de recherche wao.ui.filters.refresh=Rafra\u00EEchir les champs du filtre Modified: trunk/wao-ui/src/main/webapp/Administration.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Administration.tml 2011-02-08 14:47:37 UTC (rev 994) +++ trunk/wao-ui/src/main/webapp/Administration.tml 2011-02-08 14:48:56 UTC (rev 995) @@ -139,6 +139,14 @@ </ul> </t:zone> </p:userRole> + <p:mammalsNotifications> + <t:if t:test="currentUser.obsMer"> + <t:if t:test="currentUser.admin"> + <label t:for="mammalsNotifications">${message:wao.ui.field.WaoUser.mammalsNotifications}</label> + <input t:type="checkbox" t:id="mammalsNotifications" value="userEdited.mammalsNotifications" /> + </t:if> + </t:if> + </p:mammalsNotifications> </form> </t:zone> </fieldset> Modified: trunk/wao-ui/src/main/webapp/ContactForm.tml =================================================================== --- trunk/wao-ui/src/main/webapp/ContactForm.tml 2011-02-08 14:47:37 UTC (rev 994) +++ trunk/wao-ui/src/main/webapp/ContactForm.tml 2011-02-08 14:48:56 UTC (rev 995) @@ -235,6 +235,12 @@ </label> <input t:type="checkbox" t:id="mammalsCapture" value="contact.mammalsCapture" /> </div> + <div> + <label for="mammalsInfo"> + ${message:wao.ui.field.Contact.mammalsInfo} + </label> + <input t:type="textarea" t:id="mammalsInfo" value="contact.mammalsInfo" /> + </div> </t:if> <t:if test="connectedUser.obsVente"> <div> Modified: trunk/wao-ui/src/main/webapp/css/contacts.css =================================================================== --- trunk/wao-ui/src/main/webapp/css/contacts.css 2011-02-08 14:47:37 UTC (rev 994) +++ trunk/wao-ui/src/main/webapp/css/contacts.css 2011-02-08 14:48:56 UTC (rev 995) @@ -114,9 +114,10 @@ div#so-contacts td.observationBeginDate, div#so-contacts td.observationEndDate, div#so-contacts td.nbObservants, +div#so-contacts td.mammals, div#so-contacts td.actualSamplingStrategy, div#so-contacts td.completeSampling, div#so-contacts td.dataInputDate, -div#so-contacts td.validations { +div#so-contacts td.validation { text-align: center; }

1 0

[Suiviobsmer-commits] r994 - trunk
by bleny＠users.labs.libre-entreprise.org 08 Feb '11

08 Feb '11

Author: bleny Date: 2011-02-08 14:47:37 +0000 (Tue, 08 Feb 2011) New Revision: 994 Log: dependencies updates Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-02-07 15:48:21 UTC (rev 993) +++ trunk/pom.xml 2011-02-08 14:47:37 UTC (rev 994) @@ -170,12 +170,12 @@ <dependency> <groupId>com.sun.xml.bind</groupId> <artifactId>jaxb-impl</artifactId> - <version>2.2</version> + <version>${jaxbVersion}</version> </dependency> <dependency> <groupId>com.sun.xml.bind</groupId> <artifactId>jaxb-xjc</artifactId> - <version>2.2</version> + <version>${jaxbVersion}</version> </dependency>  <nuitonI18nVersion>2.3</nuitonI18nVersion> - <nuitonUtilsVersion>1.5.3</nuitonUtilsVersion> + <nuitonUtilsVersion>2.1-SNAPSHOT</nuitonUtilsVersion> <nuitonWebVersion>1.0</nuitonWebVersion> <topiaVersion>2.5.1</topiaVersion> <eugeneVersion>2.3</eugeneVersion> <tapestryVersion>5.2.4</tapestryVersion> <hibernateVersion>3.3.2.GA</hibernateVersion> - <jfreeVersion>1.0.12</jfreeVersion> + <jaxbVersion>2.2.3-1</jaxbVersion> </properties>

1 0

[Suiviobsmer-commits] r993 - in trunk: wao-business/src/main/filters wao-business/src/main/java/fr/ifremer/wao/bean wao-business/src/main/java/fr/ifremer/wao/entity wao-business/src/main/resources/i18n wao-business/src/main/xmi wao-ui/src/main/java/fr/ifremer/wao/ui/data wao-ui/src/main/java/fr/ifremer/wao/ui/pages wao-ui/src/main/webapp
by bleny＠users.labs.libre-entreprise.org 07 Feb '11

07 Feb '11

Author: bleny Date: 2011-02-07 15:48:21 +0000 (Mon, 07 Feb 2011) New Revision: 993 Log: add 'professional' user profile Modified: trunk/wao-business/src/main/filters/Wao.properties trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ConnectedUserImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/bean/UserRole.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/UserProfileImpl.java trunk/wao-business/src/main/resources/i18n/wao-business_en_GB.properties trunk/wao-business/src/main/resources/i18n/wao-business_fr_FR.properties trunk/wao-business/src/main/xmi/wao.zargo trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/RequiresAuthentication.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Administration.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/ContactForm.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java trunk/wao-ui/src/main/webapp/Boats.tml trunk/wao-ui/src/main/webapp/Synthesis.tml Modified: trunk/wao-business/src/main/filters/Wao.properties =================================================================== --- trunk/wao-business/src/main/filters/Wao.properties 2011-02-07 14:39:59 UTC (rev 992) +++ trunk/wao-business/src/main/filters/Wao.properties 2011-02-07 15:48:21 UTC (rev 993) @@ -60,5 +60,5 @@ ###### Since 1.6 # By default make indicators not visible -wao.indicators.show=false +wao.indicators.show=true Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ConnectedUserImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ConnectedUserImpl.java 2011-02-07 14:39:59 UTC (rev 992) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ConnectedUserImpl.java 2011-02-07 15:48:21 UTC (rev 993) @@ -58,6 +58,11 @@ } @Override + public boolean isProfessional() { + return getProfile().isProfessional(); + } + + @Override public boolean isReadOnly() { return getProfile().isReadOnly(); } Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/UserRole.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/bean/UserRole.java 2011-02-07 14:39:59 UTC (rev 992) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/UserRole.java 2011-02-07 15:48:21 UTC (rev 993) @@ -27,6 +27,9 @@ import fr.ifremer.wao.WaoUtils; import fr.ifremer.wao.entity.WaoUser; +import java.util.ArrayList; +import java.util.List; + import static org.nuiton.i18n.I18n.n_; /** @@ -47,7 +50,9 @@ /** Coordinator role **/ COORDINATOR(n_("UserRole.COORDINATOR")), /** Guest role **/ - GUEST(n_("UserRole.GUEST")); + GUEST(n_("UserRole.GUEST")), + /** Professional role **/ + PROFESSIONAL(n_("UserRole.PROFESSIONAL")); protected String i18nKey; @@ -72,4 +77,24 @@ return WaoUtils.translate(i18nKey); } + /** for a given program, return the roles that can be assigned by someone + * who own the role <code>userRole</code> + * @param obsProgram available roles depends on the program + * @param userRole role of the user who want to grant rights + * @return roles that the user can affect + */ + public static UserRole[] getAllowedRoles(ObsProgram obsProgram, UserRole userRole) { + List<UserRole> allowedRoles = new ArrayList<UserRole>(); + allowedRoles.add(UserRole.COORDINATOR); + allowedRoles.add(UserRole.OBSERVER); + if (userRole.equals(UserRole.ADMIN)) { + allowedRoles.add(UserRole.ADMIN); + allowedRoles.add(UserRole.GUEST); + if (obsProgram.equals(ObsProgram.OBSMER)) { + allowedRoles.add(UserRole.PROFESSIONAL); + } + } + UserRole[] result = allowedRoles.toArray(new UserRole[allowedRoles.size()]); + return result; + } } Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/UserProfileImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/UserProfileImpl.java 2011-02-07 14:39:59 UTC (rev 992) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/UserProfileImpl.java 2011-02-07 15:48:21 UTC (rev 993) @@ -77,6 +77,11 @@ } @Override + public boolean isProfessional() { + return getUserRole() == UserRole.PROFESSIONAL; + } + + @Override public boolean isGuest() { return getUserRole() == UserRole.GUEST; } Modified: trunk/wao-business/src/main/resources/i18n/wao-business_en_GB.properties =================================================================== --- trunk/wao-business/src/main/resources/i18n/wao-business_en_GB.properties 2011-02-07 14:39:59 UTC (rev 992) +++ trunk/wao-business/src/main/resources/i18n/wao-business_en_GB.properties 2011-02-07 15:48:21 UTC (rev 993) @@ -36,6 +36,7 @@ UserRole.COORDINATOR=Coordinator UserRole.GUEST=Guest UserRole.OBSERVER=Observer +UserRole.PROFESSIONAL=Professional fr.ifremer.wao.entity.FishingGearDCF.=Not specified fr.ifremer.wao.entity.FishingGearDCF.DRB=Boat dredges fr.ifremer.wao.entity.FishingGearDCF.DRH=Hand dredges Modified: trunk/wao-business/src/main/resources/i18n/wao-business_fr_FR.properties =================================================================== --- trunk/wao-business/src/main/resources/i18n/wao-business_fr_FR.properties 2011-02-07 14:39:59 UTC (rev 992) +++ trunk/wao-business/src/main/resources/i18n/wao-business_fr_FR.properties 2011-02-07 15:48:21 UTC (rev 993) @@ -36,6 +36,7 @@ UserRole.COORDINATOR=Coordinateur UserRole.GUEST=Invit\u00E9 UserRole.OBSERVER=Observateur +UserRole.PROFESSIONAL=Professionnel fr.ifremer.wao.entity.FishingGearDCF.=Non sp\u00E9cifi\u00E9 fr.ifremer.wao.entity.FishingGearDCF.DRB=Dragues remorqu\u00E9es par bateau fr.ifremer.wao.entity.FishingGearDCF.DRH=Dragues \u00E0 main Modified: trunk/wao-business/src/main/xmi/wao.zargo =================================================================== (Binary files differ) Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/RequiresAuthentication.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/RequiresAuthentication.java 2011-02-07 14:39:59 UTC (rev 992) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/RequiresAuthentication.java 2011-02-07 15:48:21 UTC (rev 993) @@ -46,7 +46,7 @@ // By default everybody can access UserRole[] allowedRoles() default - {UserRole.OBSERVER, UserRole.ADMIN, UserRole.COORDINATOR, UserRole.GUEST}; + {UserRole.OBSERVER, UserRole.ADMIN, UserRole.COORDINATOR, UserRole.GUEST, UserRole.PROFESSIONAL}; ObsProgram[] allowedPrograms() default {ObsProgram.OBSMER, ObsProgram.OBSVENTE}; Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Administration.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Administration.java 2011-02-07 14:39:59 UTC (rev 992) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Administration.java 2011-02-07 15:48:21 UTC (rev 993) @@ -78,6 +78,7 @@ import org.apache.tapestry5.ioc.services.PropertyAccess; import org.apache.tapestry5.ioc.services.TypeCoercer; import org.apache.tapestry5.services.BeanModelSource; +import org.apache.tapestry5.util.EnumSelectModel; import org.slf4j.Logger; import java.io.FileNotFoundException; @@ -602,15 +603,10 @@ @Log public SelectModel getUserRoleSelectModel() { if (userRoleSelectModel == null) { - List<OptionModel> options = new ArrayList<OptionModel>(); - options.add(newUserRoleOption(UserRole.OBSERVER)); - options.add(newUserRoleOption(UserRole.COORDINATOR)); - // Only admin can set ADMIN and GUEST role - if (currentUser.isAdmin()) { - options.add(newUserRoleOption(UserRole.ADMIN)); - options.add(newUserRoleOption(UserRole.GUEST)); - } - userRoleSelectModel = new SelectModelImpl(null, options); + UserRole[] allowedRoles = UserRole.getAllowedRoles( + currentUser.getProfile().getObsProgram(), + currentUser.getProfile().getUserRole()); + return new EnumSelectModel(UserRole.class, messages, allowedRoles); } return userRoleSelectModel; } 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-02-07 14:39:59 UTC (rev 992) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Boats.java 2011-02-07 15:48:21 UTC (rev 993) @@ -87,7 +87,7 @@ * * @author fdesbois <fdesbois at codelutin.com> */ - at RequiresAuthentication(allowedRoles = {UserRole.ADMIN, UserRole.COORDINATOR, UserRole.OBSERVER}) + at RequiresAuthentication(allowedRoles = {UserRole.ADMIN, UserRole.COORDINATOR, UserRole.OBSERVER, UserRole.PROFESSIONAL}) @Import(stylesheet = "context:css/boats.css") public class Boats extends AbstractFilteredPage { @@ -532,7 +532,7 @@ } public boolean canCreateNewContactFromList() throws WaoException { - if (!user.isAdmin() && !user.isReadOnly() && isSampleRowExists()) { + if (!user.isAdmin() && !user.isProfessional() && !user.isReadOnly() && isSampleRowExists()) { return boat.canCreateContact(user.getProfile().getObsProgram(), user.getCompany()); } return false; Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/ContactForm.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/ContactForm.java 2011-02-07 14:39:59 UTC (rev 992) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/ContactForm.java 2011-02-07 15:48:21 UTC (rev 993) @@ -38,12 +38,10 @@ import fr.ifremer.wao.ui.data.GenericSelectModel; import fr.ifremer.wao.ui.data.RequiresAuthentication; import fr.ifremer.wao.ui.services.WaoManager; -import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.BooleanUtils; import org.apache.commons.lang.StringUtils; import org.apache.tapestry5.Block; import org.apache.tapestry5.EventContext; -import org.apache.tapestry5.RenderSupport; import org.apache.tapestry5.SelectModel; import org.apache.tapestry5.annotations.Component; import org.apache.tapestry5.annotations.Environmental; @@ -59,9 +57,9 @@ import org.apache.tapestry5.ioc.Messages; import org.apache.tapestry5.ioc.annotations.Inject; import org.apache.tapestry5.ioc.services.PropertyAccess; +import org.apache.tapestry5.services.javascript.JavaScriptSupport; import org.apache.tapestry5.util.EnumSelectModel; import org.chenillekit.tapestry.core.components.DateTimeField; -import org.nuiton.util.CollectionUtil; import org.slf4j.Logger; import java.text.DateFormat; @@ -103,7 +101,7 @@ private ServiceUser serviceUser; @Environmental - private RenderSupport renderSupport; + private JavaScriptSupport javascriptSupport; @InjectComponent private Zone globalZone; @@ -154,12 +152,12 @@ "saisir les données ?"; // TODO-fdesbois-2010-07-27 : manage array of states in JavaScript - renderSupport.addScript("new ContactSendEmail('%s', '%s');", + javascriptSupport.addScript("new ContactSendEmail('%s', '%s');", confirmMessage, // Check state OBSERVATION_DONE ContactState.OBSERVATION_DONE.name()); - renderSupport.addScript("new ContactSendEmail('%s', '%s');", + javascriptSupport.addScript("new ContactSendEmail('%s', '%s');", confirmMessage, // Check state BOARDING_EXPECTED ContactState.OBSERVATION_EXPECTED.name()); Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java 2011-02-07 14:39:59 UTC (rev 992) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java 2011-02-07 15:48:21 UTC (rev 993) @@ -51,7 +51,6 @@ import org.apache.commons.lang.BooleanUtils; import org.apache.commons.lang.StringUtils; import org.apache.tapestry5.ComponentResources; -import org.apache.tapestry5.RenderSupport; import org.apache.tapestry5.StreamResponse; import org.apache.tapestry5.annotations.Environmental; import org.apache.tapestry5.annotations.Import; @@ -66,6 +65,7 @@ import org.apache.tapestry5.ioc.annotations.Inject; import org.apache.tapestry5.ioc.services.PropertyAccess; import org.apache.tapestry5.services.BeanModelSource; +import org.apache.tapestry5.services.javascript.JavaScriptSupport; import org.apache.tapestry5.upload.services.UploadedFile; import org.slf4j.Logger; @@ -105,7 +105,7 @@ private ServiceContact serviceContact; @Environmental - private RenderSupport renderSupport; + private JavaScriptSupport javascriptSupport; @Inject private WaoManager manager; 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-02-07 14:39:59 UTC (rev 992) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java 2011-02-07 15:48:21 UTC (rev 993) @@ -85,7 +85,7 @@ * * @author fdesbois <fdesbois at codelutin.com> */ - at RequiresAuthentication(allowedRoles = {UserRole.ADMIN, UserRole.COORDINATOR, UserRole.OBSERVER}) + at RequiresAuthentication(allowedRoles = {UserRole.ADMIN, UserRole.COORDINATOR, UserRole.OBSERVER, UserRole.PROFESSIONAL}) @Import(stylesheet = "context:css/synthesis.css") public class Synthesis extends AbstractFilteredPage { Modified: trunk/wao-ui/src/main/webapp/Boats.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Boats.tml 2011-02-07 14:39:59 UTC (rev 992) +++ trunk/wao-ui/src/main/webapp/Boats.tml 2011-02-07 15:48:21 UTC (rev 993) @@ -103,7 +103,12 @@ <img src="${asset:context:}/img/contact-22px.png" title="${message:wao.ui.action.addNewContactFromBoat}"/> </a>  </t:if> - <a t:type="actionlink" t:id="showBoatInfos" t:context="boat.immatriculation" t:zone="boatsZone">${boat.name}</a> ${boatInactive} + <t:unless test="user.professional"> + <a t:type="actionlink" t:id="showBoatInfos" t:context="boat.immatriculation" t:zone="boatsZone">${boat.name}</a> ${boatInactive} + <p:else> + ${boat.name} ${boatInactive} + </p:else> + </t:unless> </p:nameCell> <p:boatLengthCell> ${boat.boatLength} m Modified: trunk/wao-ui/src/main/webapp/Synthesis.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Synthesis.tml 2011-02-07 14:39:59 UTC (rev 992) +++ trunk/wao-ui/src/main/webapp/Synthesis.tml 2011-02-07 15:48:21 UTC (rev 993) @@ -120,42 +120,44 @@ title="Graphique des sollicitations des navires" /> </a> </li> - <t:if test="showObsMer()"> + <t:unless test="user.professional"> + <t:if test="showObsMer()"> + <li> + <a t:type="actionlink" t:context="[actionSynthesisId,'IND_COMPLIANCE_BOARDING']" t:zone="so-synthesis-main"> + <img src="${asset:context:}/img/synthesis-ind-non-compliance-boarding.png" alt="Indicateur de non respect du nombre d'observateurs embarqués" + title="Indicateur de non respect du nombre d'observateurs embarqués" /> + </a> + </li> + </t:if> <li> - <a t:type="actionlink" t:context="[actionSynthesisId,'IND_COMPLIANCE_BOARDING']" t:zone="so-synthesis-main"> - <img src="${asset:context:}/img/synthesis-ind-non-compliance-boarding.png" alt="Indicateur de non respect du nombre d'observateurs embarqués" - title="Indicateur de non respect du nombre d'observateurs embarqués" /> + <a t:type="actionlink" t:context="[actionSynthesisId,'IND_ALLEGRO_REACTIVITY']" t:zone="so-synthesis-main"> + <img src="${asset:context:}/img/synthesis-ind-allegro-reactivity.png" alt="Indicateur de réactivité sur la saisie des données dans Allegro" + title="Indicateur de réactivité sur la saisie des données dans Allegro" /> </a> </li> - </t:if> - <li> - <a t:type="actionlink" t:context="[actionSynthesisId,'IND_ALLEGRO_REACTIVITY']" t:zone="so-synthesis-main"> - <img src="${asset:context:}/img/synthesis-ind-allegro-reactivity.png" alt="Indicateur de réactivité sur la saisie des données dans Allegro" - title="Indicateur de réactivité sur la saisie des données dans Allegro" /> - </a> - </li> - <t:if test="showObsMer()"> + <t:if test="showObsMer()"> + <li> + <a t:type="actionlink" t:context="[actionSynthesisId,'IND_DATA_RELIABILITY']" t:zone="so-synthesis-main"> + <img src="${asset:context:}/img/synthesis-ind-data-reliability.png" alt="Indicateur de la qualité des données" + title="Indicateur de la qualité des données" /> + </a> + </li> + </t:if> + <t:if test="user.indicatorsViewer"> + <li> + <a t:type="actionlink" t:context="[actionShowGlobalSynthesis,'']" t:zone="so-synthesis-main"> + <img src="${asset:context:}/img/synthesis-global-synthesis.png" alt="Synthèse globale des indicateurs" + title="Synthèse globale des indicateurs" /> + </a> + </li> + </t:if> <li> - <a t:type="actionlink" t:context="[actionSynthesisId,'IND_DATA_RELIABILITY']" t:zone="so-synthesis-main"> - <img src="${asset:context:}/img/synthesis-ind-data-reliability.png" alt="Indicateur de la qualité des données" - title="Indicateur de la qualité des données" /> + <a t:type="actionlink" t:context="[actionSynthesisId,'IND_CONTACT_STATE']" t:zone="so-synthesis-main"> + <img src="${asset:context:}/img/synthesis-ind-contact-states.png" alt="Indicateur sur les états des contacts" + title="Indicateur sur les états des contacts" /> </a> </li> - </t:if> - <t:if test="user.indicatorsViewer"> - <li> - <a t:type="actionlink" t:context="[actionShowGlobalSynthesis,'']" t:zone="so-synthesis-main"> - <img src="${asset:context:}/img/synthesis-global-synthesis.png" alt="Synthèse globale des indicateurs" - title="Synthèse globale des indicateurs" /> - </a> - </li> - </t:if> - <li> - <a t:type="actionlink" t:context="[actionSynthesisId,'IND_CONTACT_STATE']" t:zone="so-synthesis-main"> - <img src="${asset:context:}/img/synthesis-ind-contact-states.png" alt="Indicateur sur les états des contacts" - title="Indicateur sur les états des contacts" /> - </a> - </li> + </t:unless> </ul> </div> <div t:type="zone" t:id="delegator" class="fleft" t:update="show" id="so-synthesis-main">

1 0

[Suiviobsmer-commits] r992 - trunk/wao-business/src/main/java/fr/ifremer/wao
by bleny＠users.labs.libre-entreprise.org 07 Feb '11

07 Feb '11

Author: bleny Date: 2011-02-07 14:39:59 +0000 (Mon, 07 Feb 2011) New Revision: 992 Log: fix warning Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java 2011-02-07 10:18:36 UTC (rev 991) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java 2011-02-07 14:39:59 UTC (rev 992) @@ -246,9 +246,9 @@ } } - query.addEquals(sampleRowProperty.$alias(), - filter.getSampleRows().toArray( - new SampleRow[filter.getSampleRows().size()])); + query.addEquals(sampleRowProperty.$alias(), new Object[]{ + filter.getSampleRows().toArray( + new SampleRow[filter.getSampleRows().size()])}); // another implementation for above line : (not tested) // List<String> sampleRowsCodes = new ArrayList<String>(sampleRows.size()); // for (SampleRow row : sampleRows) {

1 0

[Suiviobsmer-commits] r991 - in trunk: . wao-business wao-ui
by bleny＠users.labs.libre-entreprise.org 07 Feb '11

07 Feb '11

Author: bleny Date: 2011-02-07 10:18:36 +0000 (Mon, 07 Feb 2011) New Revision: 991 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml trunk/wao-business/pom.xml trunk/wao-ui/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-02-07 10:18:34 UTC (rev 990) +++ trunk/pom.xml 2011-02-07 10:18:36 UTC (rev 991) @@ -15,7 +15,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>2.0</version> + <version>2.1-SNAPSHOT</version> <modules> <module>wao-ui</module> @@ -355,12 +355,12 @@ <scm> <connection> - scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-2.0 + scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk </connection> <developerConnection> - scm:svn:svn+ssh://${user.name}@labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-2.0 + scm:svn:svn+ssh://bleny at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk </developerConnection> - <url>http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-2.0?root=suiviobsm… + <url>http://labs.libre-entreprise.org/scm/viewvc.php/trunk/?root=suiviobsmer </url> </scm> Modified: trunk/wao-business/pom.xml =================================================================== --- trunk/wao-business/pom.xml 2011-02-07 10:18:34 UTC (rev 990) +++ trunk/wao-business/pom.xml 2011-02-07 10:18:36 UTC (rev 991) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>2.0</version> + <version>2.1-SNAPSHOT</version> </parent> <groupId>fr.ifremer.wao</groupId> @@ -244,13 +244,13 @@ <scm> <url> - http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-2.0/?root=suiviobs… + http://labs.libre-entreprise.org/scm/viewvc.php/trunk/wao-business/?root=su… </url> <connection> - scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-2.0/wao-business + scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-business </connection> <developerConnection> - scm:svn:svn+ssh://${user.name}@labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-2.0/wao-business + scm:svn:svn+ssh://bleny at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-business </developerConnection> </scm> Modified: trunk/wao-ui/pom.xml =================================================================== --- trunk/wao-ui/pom.xml 2011-02-07 10:18:34 UTC (rev 990) +++ trunk/wao-ui/pom.xml 2011-02-07 10:18:36 UTC (rev 991) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>2.0</version> + <version>2.1-SNAPSHOT</version> </parent> <groupId>fr.ifremer.wao</groupId> @@ -310,13 +310,13 @@ <scm> <url> - http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-2.0/?root=suiviobs… + http://labs.libre-entreprise.org/scm/viewvc.php/trunk/wao-ui/?root=suiviobs… </url> <connection> - scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-2.0/wao-ui + scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-ui </connection> <developerConnection> - scm:svn:svn+ssh://${user.name}@labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-2.0/wao-ui + scm:svn:svn+ssh://bleny at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-ui </developerConnection> </scm>

1 0

[Suiviobsmer-commits] r990 - in tags: . wao-2.0
by bleny＠users.labs.libre-entreprise.org 07 Feb '11

07 Feb '11

Author: bleny Date: 2011-02-07 10:18:34 +0000 (Mon, 07 Feb 2011) New Revision: 990 Log: [maven-release-plugin] copy for tag wao-2.0 Added: tags/wao-2.0/ Property changes on: tags/wao-2.0 ___________________________________________________________________ Added: svn:ignore + *.ipr *.iws *.iml *.idea target nbactions.xml Added: svn:mergeinfo + /branches/wao-1.5.x:679-733

1 0

[Suiviobsmer-commits] r989 - in trunk: . wao-business wao-ui
by bleny＠users.labs.libre-entreprise.org 07 Feb '11

07 Feb '11

Author: bleny Date: 2011-02-07 10:18:31 +0000 (Mon, 07 Feb 2011) New Revision: 989 Log: [maven-release-plugin] prepare release wao-2.0 Modified: trunk/pom.xml trunk/wao-business/pom.xml trunk/wao-ui/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-02-07 10:13:14 UTC (rev 988) +++ trunk/pom.xml 2011-02-07 10:18:31 UTC (rev 989) @@ -15,7 +15,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>2.0-SNAPSHOT</version> + <version>2.0</version> <modules> <module>wao-ui</module> @@ -355,12 +355,12 @@ <scm> <connection> - scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk + scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-2.0 </connection> <developerConnection> - scm:svn:svn+ssh://${user.name}@labs.libre-entreprise.org/svnroot/suiviobsmer/trunk + scm:svn:svn+ssh://${user.name}@labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-2.0 </developerConnection> - <url>http://labs.libre-entreprise.org/scm/viewvc.php/trunk/?root=suiviobsmer + <url>http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-2.0?root=suiviobsm… </url> </scm> Modified: trunk/wao-business/pom.xml =================================================================== --- trunk/wao-business/pom.xml 2011-02-07 10:13:14 UTC (rev 988) +++ trunk/wao-business/pom.xml 2011-02-07 10:18:31 UTC (rev 989) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>2.0-SNAPSHOT</version> + <version>2.0</version> </parent> <groupId>fr.ifremer.wao</groupId> @@ -244,13 +244,13 @@ <scm> <url> - http://labs.libre-entreprise.org/scm/viewvc.php/trunk/wao-business/?root=su… + http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-2.0/?root=suiviobs… </url> <connection> - scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-business + scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-2.0/wao-business </connection> <developerConnection> - scm:svn:svn+ssh://${user.name}@labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-business + scm:svn:svn+ssh://${user.name}@labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-2.0/wao-business </developerConnection> </scm> Modified: trunk/wao-ui/pom.xml =================================================================== --- trunk/wao-ui/pom.xml 2011-02-07 10:13:14 UTC (rev 988) +++ trunk/wao-ui/pom.xml 2011-02-07 10:18:31 UTC (rev 989) @@ -1,7 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -12,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>2.0-SNAPSHOT</version> + <version>2.0</version> </parent> <groupId>fr.ifremer.wao</groupId> @@ -312,13 +310,13 @@ <scm> <url> - http://labs.libre-entreprise.org/scm/viewvc.php/trunk/wao-ui/?root=suiviobs… + http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-2.0/?root=suiviobs… </url> <connection> - scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-ui + scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-2.0/wao-ui </connection> <developerConnection> - scm:svn:svn+ssh://${user.name}@labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-ui + scm:svn:svn+ssh://${user.name}@labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-2.0/wao-ui </developerConnection> </scm>

1 0

[Suiviobsmer-commits] r988 - trunk
by bleny＠users.labs.libre-entreprise.org 07 Feb '11

07 Feb '11

Author: bleny Date: 2011-02-07 10:13:14 +0000 (Mon, 07 Feb 2011) New Revision: 988 Log: add missing commons-lang, should be removed when mavenpom updated Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-02-07 09:54:00 UTC (rev 987) +++ trunk/pom.xml 2011-02-07 10:13:14 UTC (rev 988) @@ -25,6 +25,11 @@ <dependencyManagement> <dependencies> <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <version>2.6</version> + </dependency> + <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-email</artifactId> <version>1.2</version>

1 0