Author: bleny Date: 2011-01-28 12:26:12 +0000 (Fri, 28 Jan 2011) New Revision: 959 Log: fix misc UI issues ; fix similarity in contacts for ObsVente Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ConnectedUserImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceReferentialImpl.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/components/Footer.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/Layout.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Cartography.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/services/ContactModelFactory.java trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/Footer.tml trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/Layout.tml 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/Boats.tml trunk/wao-ui/src/main/webapp/Cartography.tml trunk/wao-ui/src/main/webapp/ContactForm.tml trunk/wao-ui/src/main/webapp/Contacts.tml 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-01-28 09:33:14 UTC (rev 958) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ConnectedUserImpl.java 2011-01-28 12:26:12 UTC (rev 959) @@ -100,4 +100,18 @@ public boolean isAdminAndCanWrite() { return ! isReadOnly() && isAdmin(); } + + protected boolean isProgram(ObsProgram obsProgram) { + return getProfile() != null && getProfile().getObsProgram().equals(obsProgram); + } + + @Override + public boolean isObsMer() { + return isProgram(ObsProgram.OBSMER); + } + + @Override + public boolean isObsVente() { + return isProgram(ObsProgram.OBSVENTE); + } } 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-01-28 09:33:14 UTC (rev 958) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2011-01-28 12:26:12 UTC (rev 959) @@ -261,17 +261,28 @@ properties.put(Contact.PROPERTY_OBS_PROGRAM_ORDINAL, ObsProgram.OBSVENTE.ordinal()); properties.put(Contact.PROPERTY_SAMPLE_ROW, row); properties.put(Contact.PROPERTY_MAIN_OBSERVER, user); - Date now = context.getCurrentDate(); - Date today = DateUtil.setMinTimeOfDay(now); - properties.put(Contact.TOPIA_CREATE_DATE, today); - Contact similarContact = dao.findByProperties(properties); + List<Contact> candidates = dao.findAllByProperties(properties); + Contact similarContact = null; // to be found among candidates + for (Contact candidate : candidates) { + if (DateUtil.getDifferenceInDays(candidate.getTopiaCreateDate(), context.getCurrentDate()) <= 1) { + similarContact = candidate; + } + } + + if (log.isDebugEnabled()) { + String logMessage; + if (similarContact == null) { + logMessage = "no similar contact found"; + } else { + logMessage = "similar contact found to pre-fill values of contact : " + + similarContact.getTopiaId() + " boat = " + similarContact.getBoat().getName(); + } + log.debug(logMessage); + } + if (similarContact != null) { - if (log.isDebugEnabled()) { - log.debug("similar contact found to pre-fill values of contact : " - + contact.getTopiaId()); - } newContact.setObservationBeginDate(similarContact.getObservationBeginDate()); newContact.setObservationEndDate(similarContact.getObservationEndDate()); newContact.setTerrestrialLocation(similarContact.getTerrestrialLocation()); Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceReferentialImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceReferentialImpl.java 2011-01-28 09:33:14 UTC (rev 958) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceReferentialImpl.java 2011-01-28 12:26:12 UTC (rev 959) @@ -222,22 +222,23 @@ protected void executeImportDCFcodes(TopiaContext transaction) throws TopiaException { - final String[] gearCodesBase = {"DRB", "DRH", "FAR", "FCN", "FG", - "FIX", "FPN", "FPO", "FSN", "FWR", "FYK", "GEN", "GES", "GN", "GNC", - "GND", "GNF", "GNS", "GT", "GTN", "GTR", "HAR", "HMD", "HMP", "HMX", - "LA", "LHM", "LHP", "LL", "LLD", "LLS", "LN", "LNB", "LNP", "LNS", - "LTL", "LX", "MIS", "NK", "OT", "OTB", "OTM", "OTT", "PS", "PS1", - "PS2", "PT", "PTB", "PTM", "RG", "SB", "SDN", "SPR", "SSC", "SV", - "SW", "TB", "TBB", "TBN", "TBS", "TM", "TMS", "TX"}; - final String[] speciesCodesBase = {"ALG", "CAT", "CRU", "CSJ", - "DEF", "DWS", "FIN", "LPF", "MOL", "SPF"}; - FishingGearDCFDAO fishingGearDCFDAO = WaoDAOHelper.getFishingGearDCFDAO(transaction); TargetSpeciesDCFDAO targetSpeciesDCFDAO = WaoDAOHelper.getTargetSpeciesDCFDAO(transaction); long nbCodes = fishingGearDCFDAO.count() + targetSpeciesDCFDAO.count(); if (nbCodes == 0) { + + final String[] gearCodesBase = {"DRB", "DRH", "FAR", "FCN", "FG", + "FIX", "FPN", "FPO", "FSN", "FWR", "FYK", "GEN", "GES", "GN", "GNC", + "GND", "GNF", "GNS", "GT", "GTN", "GTR", "HAR", "HMD", "HMP", "HMX", + "LA", "LHM", "LHP", "LL", "LLD", "LLS", "LN", "LNB", "LNP", "LNS", + "LTL", "LX", "MIS", "NK", "OT", "OTB", "OTM", "OTT", "PS", "PS1", + "PS2", "PT", "PTB", "PTM", "RG", "SB", "SDN", "SPR", "SSC", "SV", + "SW", "TB", "TBB", "TBN", "TBS", "TM", "TMS", "TX"}; + final String[] speciesCodesBase = {"ALG", "CAT", "CRU", "CSJ", + "DEF", "DWS", "FIN", "LPF", "MOL", "SPF"}; + for (String code : gearCodesBase) { fishingGearDCFDAO.create(FishingGearDCF.PROPERTY_CODE, code); } 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-01-28 09:33:14 UTC (rev 958) +++ trunk/wao-business/src/main/resources/i18n/wao-business_en_GB.properties 2011-01-28 12:26:12 UTC (rev 959) @@ -1,12 +1,12 @@ ContactPieChartConstant.OTHER=Others ContactPieChartConstant.REALIZED=Realized ContactPieChartConstant.REFUSED=Refused -ContactState.BOARDING_DONE=Boarding done -ContactState.BOARDING_EXPECTED=Boarding expected -ContactState.BOAT_DEFINITIVE_REFUSED=Boarding definitely refused -ContactState.BOAT_REFUSED=Boarding refused +ContactState.BOARDING_DONE=Observation done +ContactState.BOARDING_EXPECTED=Observation expected +ContactState.BOAT_DEFINITIVE_REFUSED=Observation definitely refused +ContactState.BOAT_REFUSED=Refused ContactState.BOAT_UNAVAILABLE=Not completed -ContactState.CONTACT_START=Contact started +ContactState.CONTACT_START=Observation asked DataReliability.CORRECTION_ASKED=Correction asked DataReliability.DOUBTFUL=Doubtful DataReliability.NOT_PROVIDED=Not provided 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-01-28 09:33:14 UTC (rev 958) +++ trunk/wao-business/src/main/resources/i18n/wao-business_fr_FR.properties 2011-01-28 12:26:12 UTC (rev 959) @@ -1,12 +1,12 @@ ContactPieChartConstant.OTHER=Autres ContactPieChartConstant.REALIZED=R\u00E9alis\u00E9s ContactPieChartConstant.REFUSED=Refus\u00E9s -ContactState.BOARDING_DONE=Embarquement r\u00E9alis\u00E9 -ContactState.BOARDING_EXPECTED=Embarquement programm\u00E9 +ContactState.BOARDING_DONE=Observation r\u00E9alis\u00E9e +ContactState.BOARDING_EXPECTED=Observation programm\u00E9e ContactState.BOAT_DEFINITIVE_REFUSED=Refus d\u00E9finitif ContactState.BOAT_REFUSED=Refus ContactState.BOAT_UNAVAILABLE=Non abouti -ContactState.CONTACT_START=Contact pris +ContactState.CONTACT_START=Observation demand\u00E9e DataReliability.CORRECTION_ASKED=Correction demand\u00E9e DataReliability.DOUBTFUL=Douteuse DataReliability.NOT_PROVIDED=Non contr\u00F4l\u00E9e Modified: trunk/wao-business/src/main/xmi/wao.zargo =================================================================== (Binary files differ) Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/Footer.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/Footer.java 2011-01-28 09:33:14 UTC (rev 958) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/Footer.java 2011-01-28 12:26:12 UTC (rev 959) @@ -21,6 +21,9 @@ package fr.ifremer.wao.ui.components; import fr.ifremer.wao.WaoProperty; +import fr.ifremer.wao.bean.ConnectedUser; +import org.apache.tapestry5.annotations.Parameter; +import org.apache.tapestry5.annotations.Property; import java.util.Calendar; @@ -32,6 +35,10 @@ */ public class Footer { + @Parameter + @Property + private ConnectedUser connectedUser; + public String getVersion() { return WaoProperty.APP_VERSION.getValue(); } Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/Layout.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/Layout.java 2011-01-28 09:33:14 UTC (rev 958) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/Layout.java 2011-01-28 12:26:12 UTC (rev 959) @@ -130,7 +130,7 @@ return request.getContextPath(); } - public ConnectedUser getCurrentUser() { + public ConnectedUser getConnectedUser() { return serviceAuthentication.getConnectedUser(); } Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Cartography.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Cartography.java 2011-01-28 09:33:14 UTC (rev 958) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Cartography.java 2011-01-28 12:26:12 UTC (rev 959) @@ -37,6 +37,7 @@ import org.apache.tapestry5.annotations.Property; import org.apache.tapestry5.annotations.SessionState; 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.apache.tapestry5.services.PageRenderLinkSource; @@ -109,6 +110,8 @@ PeriodDates period = PeriodDates.createMonthsPeriodFromToday(-12); getFilter().setPeriod(period); + getFilter().setObsProgram(user.getProfile().getObsProgram()); + // push in SessionState the filter cartographyFilter = getFilter(); } @@ -168,13 +171,5 @@ public String getTitle() { return "Contacts"; } - - public String getPageTitle() { - String title = "Répartition des contacts par quartier des navires"; - if (getCompany() != null) { - title += " pour la société " + getCompany().getName(); - } - return title; - } } 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-01-28 09:33:14 UTC (rev 958) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/ContactForm.java 2011-01-28 12:26:12 UTC (rev 959) @@ -299,10 +299,6 @@ return result; } - public boolean showObsVente() { - return connectedUser.getProfile().getObsProgram() == ObsProgram.OBSVENTE; - } - @Inject private ServiceReferential serviceReferential; 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-01-28 09:33:14 UTC (rev 958) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java 2011-01-28 12:26:12 UTC (rev 959) @@ -228,10 +228,6 @@ } } - public boolean showObsVente() { - return user.getProfile().getObsProgram() == ObsProgram.OBSVENTE; - } - /**************************** CONTACT IMPORT/EXPORT ***********************/ @Property Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/ContactModelFactory.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/ContactModelFactory.java 2011-01-28 09:33:14 UTC (rev 958) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/ContactModelFactory.java 2011-01-28 12:26:12 UTC (rev 959) @@ -119,7 +119,6 @@ } if (obsProgram == ObsProgram.OBSVENTE) { - model.exclude(Contact.PROPERTY_STATE); model.exclude("mammals"); model.exclude("dataReliability"); } Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/Footer.tml =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/Footer.tml 2011-01-28 09:33:14 UTC (rev 958) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/Footer.tml 2011-01-28 12:26:12 UTC (rev 959) @@ -22,24 +22,26 @@ <html xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" xmlns:p="tapestry:parameter"> <div id="so-footer"> <p> - <a href="http://suiviobsmer.labs.libre-entreprise.org/wao/" title="Documentation de l'application" target="blank"> + <a href="http://suiviobsmer.labs.libre-entreprise.org/wao/" target="_blank"> WAO </a> - <a href="http://suiviobsmer.labs.libre-entreprise.org/wao/release-note.html" title="Modifications faites pour cette version" target="blank"> + <a href="http://suiviobsmer.labs.libre-entreprise.org/wao/release-note.html" target="_blank"> ${version} </a> - - <a href="mailto:obsmer at ifremer.fr" title="Contacter un responsable Obsmer" target="blank"> - Obsmer - </a> - - <a href="http://www.ifremer.fr/sih" title="Page d'accueil du SIH" target="blank"> + <t:if test="connectedUser.obsMer"> + <a href="mailto:obsmer at ifremer.fr" title="Contacter un responsable Obsmer"> + Obsmer + </a> - + </t:if> + <a href="http://www.ifremer.fr/sih" title="Page d'accueil du SIH" target="_blank"> Ifremer SIH </a> - - <a href="http://www.gnu.org/licenses/agpl.html" title="License AGPL v3" target="blank"> + <a href="http://www.gnu.org/licenses/agpl.html" title="License AGPL v3" target="_blank"> AGPLv3 </a> - Copyright 2009-${currentYear} - <a href="http://www.ifremer.fr" title="Ifremer" target="blank"> + <a href="http://www.ifremer.fr" title="Ifremer" target="_blank"> Ifremer</a>, - <a href="http://www.codelutin.com" title="Code Lutin" target="blank"> + <a href="http://www.codelutin.com" title="Code Lutin" target="_blank"> Code Lutin </a> <!-- - Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/Layout.tml =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/Layout.tml 2011-01-28 09:33:14 UTC (rev 958) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/Layout.tml 2011-01-28 12:26:12 UTC (rev 959) @@ -57,13 +57,15 @@ <img src="${asset:context:img/logo-wao-48px.png}" alt="{$mesage:wao.ui.page.Index.title}" title="{$mesage:wao.ui.page.Index.title}"/> </a> </div> - <div class="fleft"> - <a href="mailto:obsmer at ifremer.fr" title="${message:wao.ui.action.contactAdmin}"> - <img src="${asset:context:img/MiniLogo.jpg}" alt="Obsmer logo"/> - </a> - </div> + <t:if test="connectedUser.obsMer"> + <div class="fleft"> + <a href="mailto:obsmer at ifremer.fr" title="${message:wao.ui.action.contactAdmin}"> + <img src="${asset:context:img/MiniLogo.jpg}" alt="Obsmer logo"/> + </a> + </div> + </t:if> <div id="user-infos" class="fleft"> - ${format:wao.ui.layout.userDescription=currentUser.fullName,currentUser.company.name,currentUser.profile.description} + ${format:wao.ui.layout.userDescription=connectedUser.fullName,connectedUser.company.name,connectedUser.profile.description} </div> <div id="user-actions" class="fright"> <a t:type="actionlink" t:id="changeLocale" title="${message:wao.ui.action.changeLocale}"> @@ -72,7 +74,7 @@ <a t:type="pagelink" t:page="index" title="${message:wao.ui.page.Index.title}"> <img src="${asset:context:img/home.png}" alt="${message:wao.ui.page.Index.title}" /> </a> - <t:unless t:test="currentUser.guest"> + <t:unless t:test="connectedUser.guest"> <a t:type="pagelink" t:page="cartography" title="${message:wao.ui.page.Cartography.title}" target="_blank"> <img src="${asset:context:img/cartography.png}" alt="${message:wao.ui.page.Cartography.title}" /> </a> @@ -99,7 +101,7 @@ </t:if> </div> - <t:footer /> + <t:footer connectedUser="connectedUser" /> </body> </html> 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-01-28 09:33:14 UTC (rev 958) +++ trunk/wao-ui/src/main/resources/i18n/wao-ui_en_GB.properties 2011-01-28 12:26:12 UTC (rev 959) @@ -43,8 +43,11 @@ wao.ui.boatList=List of %s boats wao.ui.boatinfo.title=Infos about %s wao.ui.boats.associatedLine=Sample row(s) associated with this boat -wao.ui.boats.nbBoarding=%s boarding(s), %s with your company -wao.ui.contact.lastContact=Last contact with this boat for your company +wao.ui.boats.nbBoarding=%s observation(s), %s with your company +wao.ui.boats.nbObservations= +wao.ui.cartography.title=Dispatching of the contacts among boat districts +wao.ui.cartography.title.company=Dispatching of the contacts among boat districts for company %s +wao.ui.contact.lastContact=Last observation with this boat for your company wao.ui.contacts.createFromBoat=Create a new contact for this boat and this sample row wao.ui.contacts.createFromBoat.fail=Contact creation failed wao.ui.contacts.createFromBoat.warn=Warning \:this sample-row is out of date, are your sure you want to create a new contact ? @@ -84,7 +87,7 @@ wao.ui.field.Contact.nbObservants=Observers number wao.ui.field.Contact.samplingStrategy=Sampling strategy followed wao.ui.field.Contact.secondaryObservers=Observers -wao.ui.field.Contact.terrestrialLocation=Place +wao.ui.field.Contact.terrestrialLocation=Observation's place wao.ui.field.Contact.validationCompany=Company validation wao.ui.field.Contact.validationProgram=Program validation wao.ui.field.FishingZone.facadeName=Facade 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-01-28 09:33:14 UTC (rev 958) +++ trunk/wao-ui/src/main/resources/i18n/wao-ui_fr_FR.properties 2011-01-28 12:26:12 UTC (rev 959) @@ -43,8 +43,10 @@ wao.ui.boatList=Liste de %s navires wao.ui.boatinfo.title=Informations sur %s wao.ui.boats.associatedLine=Ligne(s) du plan associ\u00E9e(s) \u00E0 ce navire -wao.ui.boats.nbBoarding=%s embarquement(s) dont %s dans votre soci\u00E9t\u00E9 -wao.ui.contact.lastContact=Dernier contact avec le navire pour votre soci\u00E9t\u00E9 +wao.ui.boats.nbObservations=%s observation(s) dont %s avec votre soci\u00E9t\u00E9 +wao.ui.cartography.title=R\u00E9partition des contacts par quartier des navires +wao.ui.cartography.title.company=R\u00E9partition des contacts par quartier des navires pour la soci\u00E9t\u00E9 %s +wao.ui.contact.lastContact=Derni\u00E8re observation concernant ce navire pour votre soci\u00E9t\u00E9 (tous programmes confondus) wao.ui.contacts.createFromBoat=Cr\u00E9er un nouveau contact pour ce navire et cette ligne du plan wao.ui.contacts.createFromBoat.fail=Cr\u00E9ation d'un nouveau contact impossible wao.ui.contacts.createFromBoat.warn=Attention \: cette ligne du plan est arriv\u00E9e \u00E0 \u00E9ch\u00E9ance, \u00EAtes-vous s\u00FBr de vouloir cr\u00E9er un nouveau contact ? @@ -72,7 +74,7 @@ wao.ui.field.Contact.comment=Commentaire observateur wao.ui.field.Contact.commentAdmin=Commentaire programme wao.ui.field.Contact.commentCoordinator=Commentaire coordinateur -wao.ui.field.Contact.completeSampling=\u00C9chantillonnage compl\u00E9t\u00E9 +wao.ui.field.Contact.completeSampling=\u00C9chantillonnage complet wao.ui.field.Contact.contactState=\u00C9tat du contact wao.ui.field.Contact.creationDate=Date de cr\u00E9ation du contact wao.ui.field.Contact.dataInputDate=Saisie des donn\u00E9es dans Allegro @@ -84,7 +86,7 @@ wao.ui.field.Contact.nbObservants=Nombre d'observateurs wao.ui.field.Contact.samplingStrategy=Strat\u00E9gie d'\u00E9chantillonnage suivie wao.ui.field.Contact.secondaryObservers=Observateurs -wao.ui.field.Contact.terrestrialLocation=Lieu +wao.ui.field.Contact.terrestrialLocation=Lieu d'observation wao.ui.field.Contact.validationCompany=Validation soci\u00E9t\u00E9 wao.ui.field.Contact.validationProgram=Validation programme wao.ui.field.FishingZone.facadeName=Fa\u00E7ade @@ -216,9 +218,9 @@ wao.ui.samplingPlan.title=Plan d'\u00E9chantillonnage wao.ui.synthesis.allegroReactivity.description=Ce r\u00E9sultat est une moyenne du nombre de jours entre la date de saisie dans Allegro et la date de fin de la mar\u00E9e. wao.ui.synthesis.allegroReactivity.title=R\u00E9activit\u00E9 de la saisie dans Allegro par rapport \u00E0 la date de fin de la mar\u00E9e -wao.ui.synthesis.boarding.boardingCount=Au total, %s embarquements invalides sur %s embarquements. +wao.ui.synthesis.boarding.boardingCount=Au total, %s observations invalides sur %s observations. wao.ui.synthesis.boarding.description=Ces r\u00E9sultats ne concernent que les lignes du plan d'\u00E9chantillonnage ayant une dur\u00E9e moyenne de mar\u00E9es inf\u00E9rieure ou \u00E9gale \u00E0 48h. -wao.ui.synthesis.boarding.mostUsedBoat=Navire le plus sollicit\u00E9 avec %s embarquements \: %s (%s) +wao.ui.synthesis.boarding.mostUsedBoat=Navire le plus sollicit\u00E9 avec %s observations (tous programmes confondus) \: %s (%s) wao.ui.synthesis.boarding.title=Sollicitations des navires wao.ui.synthesis.complianceBoarding.description=Respect du nombre pr\u00E9vu d'observateurs pour chaque mar\u00E9e r\u00E9alis\u00E9e. wao.ui.synthesis.complianceBoarding.title=Respect du nombre d'observateurs embarqu\u00E9s Modified: trunk/wao-ui/src/main/webapp/Boats.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Boats.tml 2011-01-28 09:33:14 UTC (rev 958) +++ trunk/wao-ui/src/main/webapp/Boats.tml 2011-01-28 12:26:12 UTC (rev 959) @@ -236,7 +236,7 @@ </form> </p> <p> - ${format:wao.ui.boats.nbBoarding=boatInfos.boat.getNbBoarding(boardingFromDate),boatInfos.getNbBoardingForCompany(boardingFromDate)} + ${format:wao.ui.boats.nbObservations=boatInfos.boat.getNbBoarding(boardingFromDate),boatInfos.getNbBoardingForCompany(boardingFromDate)} </p> <t:if t:test="companyBoatInfos.elligibleBoatsValues.size()"> <p class="sep"> </p> Modified: trunk/wao-ui/src/main/webapp/Cartography.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Cartography.tml 2011-01-28 09:33:14 UTC (rev 958) +++ trunk/wao-ui/src/main/webapp/Cartography.tml 2011-01-28 12:26:12 UTC (rev 959) @@ -48,7 +48,14 @@ </a> </div> - <h1>${pageTitle}</h1> + <h1> + <t:if test="company"> + ${format:wao.ui.cartography.title.company=company.name} + <p:else> + ${message:wao.ui.cartography.title} + </p:else> + </t:if> + </h1> <div id="so-cartography-filters"> @@ -94,11 +101,13 @@ </form> </div> - <div class="acenter mtop30"> - <a href="mailto:obsmer at ifremer.fr" title="${message:wao.ui.action.contactAdmin}"> - <img style="height: 22px;" src="${asset:context:img/MiniLogo.jpg}" alt="Obsmer logo"/> - </a> - </div> + <t:if test="user.obsMer"> + <div class="acenter mtop30"> + <a href="mailto:obsmer at ifremer.fr" title="${message:wao.ui.action.contactAdmin}"> + <img style="height: 22px;" src="${asset:context:img/MiniLogo.jpg}" alt="Obsmer logo"/> + </a> + </div> + </t:if> </div> <div id="so-cartography-map" class="fleft" style="margin: 10px;"/> Modified: trunk/wao-ui/src/main/webapp/ContactForm.tml =================================================================== --- trunk/wao-ui/src/main/webapp/ContactForm.tml 2011-01-28 09:33:14 UTC (rev 958) +++ trunk/wao-ui/src/main/webapp/ContactForm.tml 2011-01-28 12:26:12 UTC (rev 959) @@ -116,26 +116,24 @@ <label>${message:wao.ui.field.Contact.endDate}</label> <t:output value="contact.observationEndDate" format="dateTimeFormat" /> </div> - <div> - <label> - ${message:wao.ui.field.Contact.mammalsObservation} - <img src="${asset:context:img/eye-22px.png}" alt="${message:wao.ui.field.Contact.mammalsObservation}" /> - </label> - <t:booleanImage t:value="contact.mammalsObservation" /> - </div> - <div> - <label> - ${message:wao.ui.field.Contact.mammalsCapture} - <img src="${asset:context:img/fishing-net-22px.png}" alt="${message:wao.ui.field.Contact.mammalsCapture}" /> - </label> - <t:booleanImage t:value="contact.mammalsCapture" /> - </div> - <div> - <label>${message:wao.ui.field.Contact.dataInputDate}</label> - <t:output value="contact.dataInputDate" format="dateFormat" /> - </div> - <t:if test="showObsVente()"> + <t:if test="connectedUser.obsMer"> <div> + <label> + ${message:wao.ui.field.Contact.mammalsObservation} + <img src="${asset:context:img/eye-22px.png}" alt="${message:wao.ui.field.Contact.mammalsObservation}" /> + </label> + <t:booleanImage t:value="contact.mammalsObservation" /> + </div> + <div> + <label> + ${message:wao.ui.field.Contact.mammalsCapture} + <img src="${asset:context:img/fishing-net-22px.png}" alt="${message:wao.ui.field.Contact.mammalsCapture}" /> + </label> + <t:booleanImage t:value="contact.mammalsCapture" /> + </div> + </t:if> + <t:if test="connectedUser.obsVente"> + <div> <label for="terrestrialLocation">${message:wao.ui.field.SampleRow.terrestrialLocation}</label> ${contact.terrestrialLocation.name} (${getLabelForEnum(contact.terrestrialLocation.locationType)}) </div> @@ -145,11 +143,19 @@ </div> <div> <label>${message:wao.ui.field.Contact.completeSampling}</label> - ${contact.completeSampling} + <t:if test="contact.completeSampling"> + ${message:wao.ui.misc.yes} + <p:else> + ${message:wao.ui.misc.no} + </p:else> + </t:if> </div> </t:if> - <div> + <label>${message:wao.ui.field.Contact.dataInputDate}</label> + <t:output value="contact.dataInputDate" format="dateFormat" /> + </div> + <div> <label>${message:wao.ui.field.Contact.comment}</label> <t:if t:test="contact.comment"> <div class="value"> <!-- make no line return under the label --> @@ -187,26 +193,24 @@ <label for="endDate">${message:wao.ui.field.Contact.endDate}</label> <input t:id="endDate" value="contact.observationEndDate" datePattern="${dateTimeFormatPattern}" timePicker="true" timePickerAdjacent="true" use24hrs="true" /> </div> - <div> - <label for="mammalsObservation"> - ${message:wao.ui.field.Contact.mammalsObservation} - <img src="${asset:context:img/eye-22px.png}" alt="${message:wao.ui.field.Contact.mammalsObservation}" /> - </label> - <input t:type="checkbox" t:id="mammalsObservation" value="contact.mammalsObservation"/> - </div> - <div> - <label for="mammalsCapture"> - ${message:wao.ui.field.Contact.mammalsCapture} - <img src="${asset:context:img/fishing-net-22px.png}" alt="${message:wao.ui.field.Contact.mammalsCapture}" /> - </label> - <input t:type="checkbox" t:id="mammalsCapture" value="contact.mammalsCapture" /> - </div> - <div> - <label for="inputDate">${message:wao.ui.field.Contact.dataInputDate}</label> - <input t:type="datefield" t:id="inputDate" class="date" value="contact.dataInputDate" /> - </div> - <t:if test="showObsVente()"> + <t:if test="connectedUser.obsMer"> <div> + <label for="mammalsObservation"> + ${message:wao.ui.field.Contact.mammalsObservation} + <img src="${asset:context:img/eye-22px.png}" alt="${message:wao.ui.field.Contact.mammalsObservation}" /> + </label> + <input t:type="checkbox" t:id="mammalsObservation" value="contact.mammalsObservation"/> + </div> + <div> + <label for="mammalsCapture"> + ${message:wao.ui.field.Contact.mammalsCapture} + <img src="${asset:context:img/fishing-net-22px.png}" alt="${message:wao.ui.field.Contact.mammalsCapture}" /> + </label> + <input t:type="checkbox" t:id="mammalsCapture" value="contact.mammalsCapture" /> + </div> + </t:if> + <t:if test="connectedUser.obsVente"> + <div> <label for="terrestrialLocation"> ${message:wao.ui.field.Contact.terrestrialLocation} </label> @@ -225,7 +229,10 @@ <input t:type="checkbox" t:id="completeSampling" value="contact.completeSampling" /> </div> </t:if> - + <div> <!-- this field must be just before contact.comment --> + <label for="inputDate">${message:wao.ui.field.Contact.dataInputDate}</label> + <input t:type="datefield" t:id="inputDate" class="date" value="contact.dataInputDate" /> + </div> <div> <label for="comment">${message:wao.ui.field.Contact.comment}</label> <t:if t:test="connectedUser.observer"> Modified: trunk/wao-ui/src/main/webapp/Contacts.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Contacts.tml 2011-01-28 09:33:14 UTC (rev 958) +++ trunk/wao-ui/src/main/webapp/Contacts.tml 2011-01-28 12:26:12 UTC (rev 959) @@ -103,16 +103,18 @@ </div> <p> </p> <div> - <label>${message:wao.ui.misc.observations} :</label> - <input t:type="checkbox" t:id="mammalsObservation" value="contactFilter.mammalsObservation" /> - <label for="mammalsObservation"> - <img src="${asset:context:img/eye-22px.png}" alt="${message:wao.ui.field.Contact.mammalsObservation}" /> - </label> - <label>${message:wao.ui.field.Contact.mammalsCapture} :</label> - <input t:type="checkbox" t:id="mammalsCapture" value="contactFilter.mammalsCapture" /> - <label for="mammalsCapture"> - <img src="${asset:context:img/fishing-net-22px.png}" alt="${message:wao.ui.field.Contact.mammalsCapture}" /> - </label> + <t:if test="user.obsMer"> + <label>${message:wao.ui.misc.observations} :</label> + <input t:type="checkbox" t:id="mammalsObservation" value="contactFilter.mammalsObservation" /> + <label for="mammalsObservation"> + <img src="${asset:context:img/eye-22px.png}" alt="${message:wao.ui.field.Contact.mammalsObservation}" /> + </label> + <label>${message:wao.ui.field.Contact.mammalsCapture} :</label> + <input t:type="checkbox" t:id="mammalsCapture" value="contactFilter.mammalsCapture" /> + <label for="mammalsCapture"> + <img src="${asset:context:img/fishing-net-22px.png}" alt="${message:wao.ui.field.Contact.mammalsCapture}" /> + </label> + </t:if> <label>${message:wao.ui.field.Contact.validationCompany} :</label> <input t:type="checkbox" t:id="companyAccepted" value="contactFilter.companyAccepted" /> <label for="companyAccepted"> @@ -139,10 +141,12 @@ <label t:for="programUndefined"> <img src="${asset:context:img/help-22px.png}" alt="${message:wao.ui.misc.undefined}" /> </label> - <t:unless t:test="user.observer"> - <label for="reliabilityFilter">${message:wao.ui.field.Contact.dataReliability} :</label> - <select t:type="select" t:id="reliabilityFilter" value="contactFilter.dataReliability"/> - </t:unless> + <t:if test="user.obsMer"> + <t:unless t:test="user.observer"> + <label for="reliabilityFilter">${message:wao.ui.field.Contact.dataReliability} :</label> + <select t:type="select" t:id="reliabilityFilter" value="contactFilter.dataReliability"/> + </t:unless> + </t:if> <span>${message:wao.ui.misc.comments} :</span> <input t:type="checkbox" t:id="commentFilter" value="contactFilter.comment" /> <label for="commentFilter">${message:wao.ui.field.Contact.mainObserver}</label> @@ -151,7 +155,7 @@ <input t:type="checkbox" t:id="commentAdmin" value="contactFilter.commentAdmin" /> <label for="commentAdmin">${message:wao.ui.form.program}</label> </div> - <t:if t:test="showObsVente()"> + <t:if t:test="user.obsVente"> <label for="samplingStrategy">${message:wao.ui.field.SampleRow.samplingStrategy}</label> <input t:type="select" t:id="samplingStrategy" value="contactFilter.samplingStrategy" /> <label for="actualSamplingStrategy">${message:wao.ui.field.Contact.samplingStrategy}</label> @@ -257,6 +261,15 @@ <p:nbObservantsCell> ${contact.nbObservants} </p:nbObservantsCell> + <p:completeSampling> + ${contact.completeSampling} + <t:if test="contact.completeSampling"> + ${message:wao.ui.misc.yes}y + <p:else> + ${message:wao.ui.misc.no}n + </p:else> + </t:if> + </p:completeSampling> <p:mammalsCell> <t:if t:test="contact.mammalsObservation"> <img src="${asset:context:img/eye-22px.png}" alt="${message:wao.ui.field.Contact.mammalsObservation}" />