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

[Suiviobsmer-commits] r603 - in trunk: . src/site/rst wao-business/src/main/filters wao-business/src/main/java/fr/ifremer/wao wao-business/src/main/java/fr/ifremer/wao/bean 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/webapp
by fdesbois＠users.labs.libre-entreprise.org 09 Jul '10

09 Jul '10

Author: fdesbois Date: 2010-07-09 11:20:47 +0000 (Fri, 09 Jul 2010) New Revision: 603 Log: - Evo #2362 : Filters for contacts comments - Evo #2361 : Add documentation Modified: trunk/changelog.txt trunk/src/site/rst/business-rules.rst trunk/src/site/rst/installation.rst trunk/src/site/rst/model.rst trunk/wao-business/src/main/filters/Wao.properties trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactFilterImpl.java trunk/wao-business/src/main/xmi/wao.zargo trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Contacts.properties trunk/wao-ui/src/main/webapp/Contacts.tml Modified: trunk/changelog.txt =================================================================== --- trunk/changelog.txt 2010-07-09 10:00:24 UTC (rev 602) +++ trunk/changelog.txt 2010-07-09 11:20:47 UTC (rev 603) @@ -9,6 +9,7 @@ Evolutions ++++++++++ +- [fdesbois] Evo #2362 : Filtres sur commentaires contacts. - [fdesbois] Evo #2352 ; Cartographie des contacts. - [fdesbois] Evo #2361 : Mail automatique suite à un embarquement réalisé. Modified: trunk/src/site/rst/business-rules.rst =================================================================== --- trunk/src/site/rst/business-rules.rst 2010-07-09 10:00:24 UTC (rev 602) +++ trunk/src/site/rst/business-rules.rst 2010-07-09 11:20:47 UTC (rev 603) @@ -93,6 +93,7 @@ * possible uniquement si aucune validation n'a été faites * "Embarquement programmé" -> aucune contrainte * "Embarquement réalisé" -> les champs "date de début de la marée", "date de fin de la marée" et "nb observateurs" sont obligatoires + Envoie d'un email automatique à la demande de l'utilisateur (uniquement s'il n'a pas été déjà envoyé). * "Non abouti", "Refus", "Refus définitif" -> champs commentaire obligatoire, le changement d'état efface tous les autres champs - Contraintes sur les dates : Modified: trunk/src/site/rst/installation.rst =================================================================== --- trunk/src/site/rst/installation.rst 2010-07-09 10:00:24 UTC (rev 602) +++ trunk/src/site/rst/installation.rst 2010-07-09 11:20:47 UTC (rev 603) @@ -81,8 +81,12 @@ wao.server.path=localhost:8080/wao ## Version (not necessary to override it) - wao.version=1.1 + wao.version=${project.version} + ###### Since 1.5 + ## Email used when contact is set to BOARDING_DONE state + wao.contactDone.email=admin at wao.org + Par défaut la base de données utilise le SGBD H2 qui créera un fichier dans le dossier $HOME/.local/wao nommé **h2data.h2.db**. Il est possible d'utiliser une base de données postgresql en écrasant la configuration pour hibernate :: Modified: trunk/src/site/rst/model.rst =================================================================== --- trunk/src/site/rst/model.rst 2010-07-09 10:00:24 UTC (rev 602) +++ trunk/src/site/rst/model.rst 2010-07-09 11:20:47 UTC (rev 603) @@ -192,6 +192,7 @@ + tideNbDays : nombre de jours de marées effectuées + commentAdmin : commentaire en plus enregistré par un administrateur + commentCoordinator : commentaire en plus enregistré par un coordinateur + + emailSent : indique qu'un email a été envoyé lors du passage à l'état "Embarquement réalisé" + [lien] observer : observateur qui s'occupe du contact faisant parti de la société concerné par le métier (ligne du plan d'échantillonnage) + [lien] boat : navire concerné par le contact @@ -286,3 +287,8 @@ - [News] Création de la clé étrangère company (varchar) - [Contact] Création des champs commentAdmin et commentCoordinator (text) +Version 1.5 +~~~~~~~~~~~ + +- [Contact] Création champs emailSent (boolean) mis à TRUE si le contact possède + une date d'enregistrement des données (dataInputDate) et mis à FALSE sinon. Modified: trunk/wao-business/src/main/filters/Wao.properties =================================================================== --- trunk/wao-business/src/main/filters/Wao.properties 2010-07-09 10:00:24 UTC (rev 602) +++ trunk/wao-business/src/main/filters/Wao.properties 2010-07-09 11:20:47 UTC (rev 603) @@ -43,14 +43,17 @@ wao.email.host=smtp wao.email.port=25 wao.email.from=admin at wao.org -wao.contactDone.email=admin at wao.org ## Server path for link in mails (must be override) wao.server.path=localhost:8080/wao -## Server path for chart generation -chart.server.path= - ## Version (not necessary to override it) filters no working anymore wao.version=1.5 #wao.version=${project.version} + +###### Since 1.5 +## Email used when contact is set to BOARDING_DONE state +wao.contactDone.email=admin at wao.org + +## Server path for chart generation +chart.server.path= Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java 2010-07-09 10:00:24 UTC (rev 602) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java 2010-07-09 11:20:47 UTC (rev 603) @@ -390,15 +390,18 @@ WaoUser observer = filter.getObserver(); Company company = filter.getCompany(); Date fromDate = filter.getFromDate(); - Boolean mammalsObservation = filter.getMammalsObservation(); - Boolean mammalsCapture = filter.getMammalsCapture(); - Boolean programAccepted = filter.getProgramAccepted(); - Boolean programRefused = filter.getProgramRefused(); - Boolean programUndefined = filter.getProgramUndefined(); - Boolean companyAccepted = filter.getCompanyAccepted(); - Boolean companyRefused = filter.getCompanyRefused(); - Boolean companyUndefined = filter.getCompanyUndefined(); + boolean mammalsObservation = filter.getMammalsObservation(); + boolean mammalsCapture = filter.getMammalsCapture(); + boolean programAccepted = filter.getProgramAccepted(); + boolean programRefused = filter.getProgramRefused(); + boolean programUndefined = filter.getProgramUndefined(); + boolean companyAccepted = filter.getCompanyAccepted(); + boolean companyRefused = filter.getCompanyRefused(); + boolean companyUndefined = filter.getCompanyUndefined(); ContactState contactState = filter.getState(); + boolean comment = filter.isComment(); + boolean commentAdmin = filter.isCommentAdmin(); + boolean commentCompany = filter.isCommentCompany(); // OBSERVER if (observer != null) { @@ -465,6 +468,19 @@ query.addEquals(contactProperty.state(), contactState.ordinal()); } + // COMMENTS + if (comment) { + addNotEmpty(contactProperty.comment()); + } + + if (commentAdmin) { + addNotEmpty(contactProperty.commentAdmin()); + } + + if (commentCompany) { + addNotEmpty(contactProperty.commentCoordinator()); + } + // FROM_DATE if (fromDate != null) { query.addWhere(contactProperty.topiaCreateDate(), TopiaQuery.Op.GE, fromDate); @@ -478,4 +494,9 @@ return query; } + + public TopiaQuery addNotEmpty(String property) { + return query.addNotNull(property). + addWhere(property, TopiaQuery.Op.NEQ, ""); + } } Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactFilterImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactFilterImpl.java 2010-07-09 10:00:24 UTC (rev 602) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactFilterImpl.java 2010-07-09 11:20:47 UTC (rev 603) @@ -33,122 +33,23 @@ * @author fdesbois <fdesbois at codelutin.com> */ public class ContactFilterImpl extends ContactFilter { -// -// @Override -// public TopiaQuery prepareQueryForContact(TopiaQuery query) { -// -// String contactAlias = query.getMainAlias(); -// -// // OBSERVER -// if (getObserver() != null) { -// String observerProperty = -// TopiaQuery.getProperty(contactAlias, Contact.OBSERVER); -// query.add(observerProperty, getObserver()); -// } -// -// // Company filter is managed by SamplingFilter because the company is -// // linked with the sampleRow instead of contact user -// -// Date fromDate = getFromDate(); -// // Ano #2327 : Reset fromDate, don't manage it in prepareQueryForSampling -// this.fromDate = null; -// if (isSamplingFiltered() || getCompany() != null) { -// String sampleRowProperty = -// TopiaQuery.getProperty(contactAlias, Contact.SAMPLE_ROW); -// -// query = prepareQueryForSampling(query, sampleRowProperty); -// } -// -// String boatProperty = TopiaQuery.getProperty(contactAlias, Contact.BOAT); -// query = prepareQueryForBoat(query, boatProperty); -// -// // MAMMALS_OBSERVATION and MAMMALS_CAPTURE -// String mammalsObsProperty = -// TopiaQuery.getProperty(contactAlias, Contact.MAMMALS_OBSERVATION); -// String mammalsCaptProperty = -// TopiaQuery.getProperty(contactAlias, Contact.MAMMALS_CAPTURE); -// -// if (getMammalsObservation() && getMammalsCapture()) { -// query.add(mammalsObsProperty + " = :mammals OR " -// + mammalsCaptProperty + " = :mammals"). -// addParam("mammals", Boolean.TRUE); -// } else if (getMammalsObservation()) { -// query.add(mammalsObsProperty, Boolean.TRUE); -// } else if (getMammalsCapture()) { -// query.add(mammalsCaptProperty, Boolean.TRUE); -// } -// -// // VALIDATION_PROGRAM -// List<Object> programValidValues = new ArrayList<Object>(); -// if (getProgramAccepted()) { -// programValidValues.add(Boolean.TRUE); -// } -// if (getProgramRefused()) { -// programValidValues.add(Boolean.FALSE); -// } -// if (getProgramUndefined()) { -// programValidValues.add(null); -// } -// String programValidProperty = -// TopiaQuery.getProperty(contactAlias, Contact.VALIDATION_PROGRAM); -// query.add(programValidProperty, programValidValues.toArray()); -// -// // VALIDATION_COMPANY -// List<Object> companyValidValues = new ArrayList<Object>(); -// if (getCompanyAccepted()) { -// companyValidValues.add(Boolean.TRUE); -// } -// if (getCompanyRefused()) { -// companyValidValues.add(Boolean.FALSE); -// } -// if (getCompanyUndefined()) { -// companyValidValues.add(null); -// } -// String companyValidProperty = -// TopiaQuery.getProperty(contactAlias, Contact.VALIDATION_COMPANY); -// query.add(companyValidProperty, companyValidValues.toArray()); -// -// // STATE -// if (getState() != null) { -// String stateProperty = -// TopiaQuery.getProperty(contactAlias, Contact.STATE); -// query.add(stateProperty, getState().ordinal()); -// } -// -// // FROM_DATE -// if (fromDate != null) { -// String tideBeginDateProperty = -// TopiaQuery.getProperty(contactAlias, Contact.TIDE_BEGIN_DATE); -// String createDateProperty = -// TopiaQuery.getProperty(contactAlias, TopiaEntity.TOPIA_CREATE_DATE); -//// query.add("(" + tideBeginDateProperty + " IS NOT NULL AND " -//// + tideBeginDateProperty + " >= :fromDate)" + -//// " OR (" + tideBeginDateProperty + " IS NULL AND " -//// + createDateProperty + " >= :fromDate)"); -//// query.addParam("fromDate", getFromDate()); -// -// query.add(createDateProperty, TopiaQuery.Op.GE, fromDate); -// } -// -// // Reinitialize fromDate of the filter, don't know if it's really needed -// this.fromDate = fromDate; -// -// return query; -// } @Override public boolean isFiltered() { return isBoatFiltered() || isSamplingFiltered() || getObserver() != null || - getMammalsObservation() || - getMammalsCapture() || - getProgramAccepted() || - getProgramRefused() || - getProgramUndefined() || - getCompanyAccepted() || - getCompanyRefused() || - getCompanyUndefined() || - getState() != null; + isMammalsObservation() || + isMammalsCapture() || + isProgramAccepted() || + isProgramRefused() || + isProgramUndefined() || + isCompanyAccepted() || + isCompanyRefused() || + isCompanyUndefined() || + getState() != null || + isComment() || + isCommentAdmin() || + isCommentCompany(); } } Modified: trunk/wao-business/src/main/xmi/wao.zargo =================================================================== (Binary files differ) 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 2010-07-09 10:00:24 UTC (rev 602) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java 2010-07-09 11:20:47 UTC (rev 603) @@ -185,6 +185,10 @@ return true; } + public boolean canFilterExtraComments() { + return user.isAdmin() || user.isCoordinator(); + } + Object onActionFromShowFilters() { // Initialize filters initSelectFilters(true, true, true); Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Contacts.properties =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Contacts.properties 2010-07-09 10:00:24 UTC (rev 602) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Contacts.properties 2010-07-09 11:20:47 UTC (rev 603) @@ -47,7 +47,7 @@ boatDistrictCode-label: CQ mammals-label: Observations et captures accidentelles dataInputDate-label: Saisie des donn\u00e9es dans Allegro -comment-label: Com. +comment-label: Commentaire observateur program-label: Programme professionCode-label: Code m\u00e9tier professionLibelle-label: Libell\u00e9 m\u00e9tier @@ -56,8 +56,8 @@ fishingZoneSector-label: Zone fishingZoneDivision-label: Division validation-label: Validations -commentAdmin-label: Com. admin -commentCoordinator-label: Com. soci\u00e9t\u00e9 +commentAdmin-label: Commentaire programme +commentCoordinator-label: Commentaire soci\u00e9t\u00e9 # Form labels contactsForm-errors-banner: Le contact n'a pas \u00e9t\u00e9 sauvegard\u00e9 \u00e0 cause des erreurs suivantes : Modified: trunk/wao-ui/src/main/webapp/Contacts.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Contacts.tml 2010-07-09 10:00:24 UTC (rev 602) +++ trunk/wao-ui/src/main/webapp/Contacts.tml 2010-07-09 11:20:47 UTC (rev 603) @@ -126,20 +126,29 @@ <t:label t:for="companyUndefined"> <img src="${asset:context:img/help-22px.png}" title="Non validé par la société" /> </t:label> -  - <label>Validation programme: </label> - <input t:type="checkbox" t:id="programAccepted" value="contactFilter.programAccepted" /> - <t:label t:for="programAccepted"> - <img src="${asset:context:img/true-22px.png}" title="Accepté par le programme" /> - </t:label>  - <input t:type="checkbox" t:id="programRefused" value="contactFilter.programRefused" /> - <t:label t:for="programRefused"> - <img src="${asset:context:img/false-22px.png}" title="Refusé par le programme" /> - </t:label>  - <input t:type="checkbox" t:id="programUndefined" value="contactFilter.programUndefined" /> - <t:label t:for="programUndefined"> - <img src="${asset:context:img/help-22px.png}" title="Non validé par le programme" /> - </t:label> + <label>Validation programme: </label> + <input t:type="checkbox" t:id="programAccepted" value="contactFilter.programAccepted" /> + <t:label t:for="programAccepted"> + <img src="${asset:context:img/true-22px.png}" title="Accepté par le programme" /> + </t:label>  + <input t:type="checkbox" t:id="programRefused" value="contactFilter.programRefused" /> + <t:label t:for="programRefused"> + <img src="${asset:context:img/false-22px.png}" title="Refusé par le programme" /> + </t:label>  + <input t:type="checkbox" t:id="programUndefined" value="contactFilter.programUndefined" /> + <t:label t:for="programUndefined"> + <img src="${asset:context:img/help-22px.png}" title="Non validé par le programme" /> + </t:label> + <span>Commentaires: </span> + <input t:type="checkbox" t:id="commentFilter" value="contactFilter.comment" />  + <label for="commentFilter">observateur</label> + <t:if t:test="canFilterExtraComments()"> +   + <input t:type="checkbox" t:id="commentCompany" value="contactFilter.commentCompany" />  + <label for="commentCompany">société</label>  + <input t:type="checkbox" t:id="commentAdmin" value="contactFilter.commentAdmin" />  + <label for="commentAdmin">programme</label> + </t:if>  </div> <div class="t-beaneditor-row aright">

1 0

[Suiviobsmer-commits] r602 - in trunk/src/site: . resources/admin resources/user rst/admin rst/user
by jcouteau＠users.labs.libre-entreprise.org 09 Jul '10

09 Jul '10

Author: jcouteau Date: 2010-07-09 10:00:24 +0000 (Fri, 09 Jul 2010) New Revision: 602 Log: Add doc about how to see contacts on map Added: trunk/src/site/resources/admin/icone_quartier.png trunk/src/site/resources/admin/map_quartier.png trunk/src/site/resources/admin/zoom_quartier.png trunk/src/site/resources/user/icone_quartier.png trunk/src/site/resources/user/map_quartier.png trunk/src/site/resources/user/zoom_quartier.png trunk/src/site/rst/admin/seeContacts.rst trunk/src/site/rst/user/seeContacts.rst Modified: trunk/src/site/site_fr.xml Added: trunk/src/site/resources/admin/icone_quartier.png =================================================================== (Binary files differ) Property changes on: trunk/src/site/resources/admin/icone_quartier.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/site/resources/admin/map_quartier.png =================================================================== (Binary files differ) Property changes on: trunk/src/site/resources/admin/map_quartier.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/site/resources/admin/zoom_quartier.png =================================================================== (Binary files differ) Property changes on: trunk/src/site/resources/admin/zoom_quartier.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/site/resources/user/icone_quartier.png =================================================================== (Binary files differ) Property changes on: trunk/src/site/resources/user/icone_quartier.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/site/resources/user/map_quartier.png =================================================================== (Binary files differ) Property changes on: trunk/src/site/resources/user/map_quartier.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/site/resources/user/zoom_quartier.png =================================================================== (Binary files differ) Property changes on: trunk/src/site/resources/user/zoom_quartier.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/site/rst/admin/seeContacts.rst =================================================================== --- trunk/src/site/rst/admin/seeContacts.rst (rev 0) +++ trunk/src/site/rst/admin/seeContacts.rst 2010-07-09 10:00:24 UTC (rev 602) @@ -0,0 +1,24 @@ +Visualiser les contacts +----------------------- + +Un administrateur peut visualiser sur une carte la répartition des contacts par +quartier des navires pour toutes les sociétés. Pour cela il lui suffit +de cliquer sur l'icone représentant une planète. + +.. image:: icone_quartier.png + +Cela ouvre un nouvel onglet dans le navigateur, avec une carte sur laquelle il +est possible de naviguer. Des graphes camemberts, représentent la répartition +des contacts pour chaque quartier. + +.. image:: map_quartier.png + :width: 800px + +Pour obtenir plus d'informations sur un quartier, il suffit de cliquer sur le +graphe correspondant. + +.. image:: zoom_quartier.png + :width: 800px + +Pour changer de société, il suffit de choisir la société souhaitée dans la liste +déroulante. Added: trunk/src/site/rst/user/seeContacts.rst =================================================================== --- trunk/src/site/rst/user/seeContacts.rst (rev 0) +++ trunk/src/site/rst/user/seeContacts.rst 2010-07-09 10:00:24 UTC (rev 602) @@ -0,0 +1,21 @@ +Visualiser les contacts +----------------------- + +Un utilisateur ou un coordianteur peut visualiser sur une carte la répartition +des contacts par quartier des navires pour sa société. Pour cela il lui suffit +de cliquer sur l'icone représentant une planète. + +.. image:: icone_quartier.png + +Cela ouvre un nouvel onglet dans le navigateur, avec une carte sur laquelle il +est possible de naviguer. Des graphes camemberts, représentent la répartition +des contacts pour chaque quartier. + +.. image:: map_quartier.png + :width: 800px + +Pour obtenir plus d'informations sur un quartier, il suffit de cliquer sur le +graphe correspondant. + +.. image:: zoom_quartier.png + :width: 800px Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2010-07-09 09:37:56 UTC (rev 601) +++ trunk/src/site/site_fr.xml 2010-07-09 10:00:24 UTC (rev 602) @@ -59,43 +59,54 @@ <item name="Administrateur" href="admin/firstlaunch.html"> <item name="Premier lancement" href="admin/firstlaunch.html"/> <item name="La base d'utilisateurs" href="admin/users.html"/> - <item name="Le plan d'échantillonage" href="admin/echantillonage.html"/> + <item name="Le plan d'échantillonage" + href="admin/echantillonage.html"/> <item name="La base des navires" href="admin/boats.html"/> <item name="Les contacts" href="admin/contacts.html"/> <item name="Les synthèses" href="admin/syntheses.html"/> <item name="Gérer la page d'accueil" href="admin/news.html"/> + <item name="Visualiser les contacts" + href="admin/seeContacts.html"/> </item> <item name="Utilisateur" href="user.html"> <item name="Se connecter" href="user/authentication.html"/> <item name="Mon compte utilisateur" href="user/account.html"/> <item name="La page d'accueil" href="user/news.html"/> - </item> <item name="Invité" href="guest.html"> - <item name="Le plan d'échantillonage" href="guest/echantillonage.html"/> + <item name="Le plan d'échantillonage" + href="guest/echantillonage.html"/> </item> <item name="Observateur" href="observer.html"> - <item name="Le plan d'échantillonage" href="user/echantillonage.html"/> + <item name="Le plan d'échantillonage" + href="user/echantillonage.html"/> <item name="La base des navires" href="user/boats.html"/> <item name="Les contacts" href="user/contacts.html"/> <item name="Les synthèses" href="user/syntheses.html"/> <item name="Créer un contact" href="user/createAContact.html"/> + <item name="Visualiser les contacts" + href="user/seeContacts.html"/> </item> <item name="Coordinateur" href="coordinator.html"> - <item name="Le plan d'échantillonage" href="coordinator/echantillonage.html"/> + <item name="Le plan d'échantillonage" + href="coordinator/echantillonage.html"/> <item name="La base des navires" href="coordinator/boats.html"/> <item name="Les contacts" href="coordinator/contacts.html"/> <item name="Les synthèses" href="coordinator/syntheses.html"/> - <item name="Gérer la page d'accueil" href="coordinator/news.html"/> + <item name="Gérer la page d'accueil" + href="coordinator/news.html"/> <item name="Les observateurs" href="coordinator/users.html"/> + <item name="Visualiser les contacts" + href="user/seeContacts.html"/> </item> <item name="Import/Export" href="import/samplingPlan.html"> - <item name="Plan d'échantillonnage" href="import/samplingPlan.html"/> + <item name="Plan d'échantillonnage" + href="import/samplingPlan.html"/> <item name="Navires" href="import/boats.html"/> <item name="Contacts" href="import/contacts.html"/>  @@ -110,10 +121,12 @@ <menu name ="Projet"> <item name="Historique des versions" href="release-note.html" /> - <item name="Téléchargement" href="http://labs.libre-entreprise.org/frs/?group_id=154" /> + <item name="Téléchargement" + href="http://labs.libre-entreprise.org/frs/?group_id=154" /> <item name="Installation" href="installation.html"/> <item name="Demo" href="http://demo.codelutin.com/suiviobsmer"/> - <item name="Tracker" href="http://labs.libre-entreprise.org/tracker/?group_id=154"/> + <item name="Tracker" + href="http://labs.libre-entreprise.org/tracker/?group_id=154"/> </menu>

1 0

[Suiviobsmer-commits] r601 - trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages
by fdesbois＠users.labs.libre-entreprise.org 09 Jul '10

09 Jul '10

Author: fdesbois Date: 2010-07-09 09:37:56 +0000 (Fri, 09 Jul 2010) New Revision: 601 Log: Evo #2352 : Cartography for contacts : - Missing space for title Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Cartography.java 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 2010-07-09 09:37:01 UTC (rev 600) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Cartography.java 2010-07-09 09:37:56 UTC (rev 601) @@ -109,7 +109,7 @@ public String getPageTitle() { String title = "Répartition des contacts par quartier des navires"; if (company != null) { - title += "pour la société " + company.getName(); + title += " pour la société " + company.getName(); } return title; }

1 0

[Suiviobsmer-commits] r600 - in trunk: wao-business/src/main/java/fr/ifremer/wao/service wao-ui/src/main/java/fr/ifremer/wao/ui/pages wao-ui/src/main/java/fr/ifremer/wao/ui/services wao-ui/src/main/resources/fr/ifremer/wao/ui/components wao-ui/src/main/webapp wao-ui/src/main/webapp/css wao-ui/src/main/webapp/js
by fdesbois＠users.labs.libre-entreprise.org 09 Jul '10

09 Jul '10

Author: fdesbois Date: 2010-07-09 09:37:01 +0000 (Fri, 09 Jul 2010) New Revision: 600 Log: Evo #2352 : Cartography for contacts : - Improve css and style Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceCartographyImpl.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Cartography.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/ServiceChartServlet.java trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/Layout.tml trunk/wao-ui/src/main/webapp/Cartography.tml trunk/wao-ui/src/main/webapp/css/cartography.css trunk/wao-ui/src/main/webapp/js/cartography.js 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 2010-07-08 17:46:54 UTC (rev 599) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceCartographyImpl.java 2010-07-09 09:37:01 UTC (rev 600) @@ -172,9 +172,9 @@ district.getCode(); StringBuilder description = new StringBuilder("\n"). - append(" <p>"). + append(" <h3>"). append(title). - append("</p>\n"). + append("</h3>\n"). append(" <p>"). append(serviceChart.getHtmlImgTag(data, title, false)). append("</p>\n"). 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 2010-07-08 17:46:54 UTC (rev 599) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Cartography.java 2010-07-09 09:37:01 UTC (rev 600) @@ -2,6 +2,7 @@ import fr.ifremer.wao.WaoException; import fr.ifremer.wao.bean.ConnectedUser; +import fr.ifremer.wao.bean.UserRole; import fr.ifremer.wao.entity.Company; import fr.ifremer.wao.service.ServiceCartography; import fr.ifremer.wao.service.ServiceUser; @@ -26,7 +27,7 @@ * @author fdesbois <fdesbois at codelutin.com> * @version $Id$ */ - at RequiresAuthentication + at RequiresAuthentication({UserRole.ADMIN, UserRole.COORDINATOR, UserRole.OBSERVER}) public class Cartography { @SessionState @@ -114,6 +115,11 @@ } void onSuccessFromFilters() { + if (!user.isAdmin()) { + throw new WaoException("Vous n'avez pas les droits nécessaires" + + " pour filtrer sur une société", null); + } + company = companySelectModel.findObject(companyId); } } Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/ServiceChartServlet.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/ServiceChartServlet.java 2010-07-08 17:46:54 UTC (rev 599) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/ServiceChartServlet.java 2010-07-09 09:37:01 UTC (rev 600) @@ -41,7 +41,7 @@ private static final String PIE_CHART_MINI_TYPE = PROPERTY_TYPE + "p3"; private static final String PIE_CHART_MAXI_TYPE = PROPERTY_TYPE + "p3"; - private static final String PIE_CHART_MINI_SIZE = PROPERTY_SIZE + "32x32"; + private static final String PIE_CHART_MINI_SIZE = PROPERTY_SIZE + "28x28"; private static final String PIE_CHART_MAXI_SIZE = PROPERTY_SIZE + PIE_CHART_MAXI_WIDTH + "x" + PIE_CHART_MAXI_HEIGHT; 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 2010-07-08 17:46:54 UTC (rev 599) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/Layout.tml 2010-07-09 09:37:01 UTC (rev 600) @@ -71,9 +71,11 @@ <a t:type="pagelink" t:page="index" title="Page d'accueil"> <img src="${asset:context:img/home.png}" alt="Accueil" title="Page d'accueil" /> </a> - <a t:type="pagelink" t:page="cartography" title="Cartes" target="blank"> - <img src="${asset:context:img/cartography.png}" alt="Cartes" title="Cartes"/> - </a> + <t:unless t:test="currentUser.guest"> + <a t:type="pagelink" t:page="cartography" title="Cartes" target="blank"> + <img src="${asset:context:img/cartography.png}" alt="Cartes" title="Cartes"/> + </a> + </t:unless> <a t:type="pagelink" t:page="userProfile" title="Gestion profil"> <img src="${asset:context:img/user.png}" alt="Preferences" title="Gestion profil"/> </a> Modified: trunk/wao-ui/src/main/webapp/Cartography.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Cartography.tml 2010-07-08 17:46:54 UTC (rev 599) +++ trunk/wao-ui/src/main/webapp/Cartography.tml 2010-07-09 09:37:01 UTC (rev 600) @@ -39,7 +39,6 @@ </head> <body id="so-cartography" onload="init('${url}', '${title}');"> - <div class="clearfix"> <div id="so-cartography-border" class="fleft"> Modified: trunk/wao-ui/src/main/webapp/css/cartography.css =================================================================== --- trunk/wao-ui/src/main/webapp/css/cartography.css 2010-07-08 17:46:54 UTC (rev 599) +++ trunk/wao-ui/src/main/webapp/css/cartography.css 2010-07-09 09:37:01 UTC (rev 600) @@ -34,10 +34,20 @@ } #so-cartography-map { - width: 1024px; - height: 768px; + width: 700px; + height: 700px; } +#so-cartography-map h3 { + font-size: 0.9em; + font-weight: normal; +} + +#so-cartography-map p { + font-size: 0.7em; +} + + #so-footer { color: white; } Modified: trunk/wao-ui/src/main/webapp/js/cartography.js =================================================================== --- trunk/wao-ui/src/main/webapp/js/cartography.js 2010-07-08 17:46:54 UTC (rev 599) +++ trunk/wao-ui/src/main/webapp/js/cartography.js 2010-07-09 09:37:01 UTC (rev 600) @@ -49,7 +49,8 @@ // Center on Chateauroux var center = new OpenLayers.LonLat(1.032715,46.637368); - map.setCenter(center, 7); + map.setCenter(center, 6); +// map.zoomToMaxExtent(); } function onPopupClose(event) {

1 0

[Suiviobsmer-commits] r599 - trunk
by fdesbois＠users.labs.libre-entreprise.org 08 Jul '10

08 Jul '10

Author: fdesbois Date: 2010-07-08 17:46:54 +0000 (Thu, 08 Jul 2010) New Revision: 599 Log: Update changelog Modified: trunk/changelog.txt Modified: trunk/changelog.txt =================================================================== --- trunk/changelog.txt 2010-07-08 17:46:41 UTC (rev 598) +++ trunk/changelog.txt 2010-07-08 17:46:54 UTC (rev 599) @@ -9,6 +9,7 @@ Evolutions ++++++++++ +- [fdesbois] Evo #2352 ; Cartographie des contacts. - [fdesbois] Evo #2361 : Mail automatique suite à un embarquement réalisé. Mise à jour librairies @@ -20,6 +21,7 @@ - **JavaApiforKml** 2.2.0 [http://code.google.com/p/javaapiforkml/] - **H2** 1.2.132 -> 1.2.137 [http://www.h2database.com/html/main.html] +- **ToPIA** 2.3.4 -> 2.3.5 [http://maven-site.nuiton.org/topia/topia-persistence] - **EUGene** 2.0.2 -> 2.1 [http://maven-site.nuiton.org/eugene] - **mavenpom4labs** 2.2 -> 2.2.2.1 [http://maven-site.nuiton.org/mavenpom/mavenpom4labs]

1 0

[Suiviobsmer-commits] r598 - trunk/wao-business/src/main/java/fr/ifremer/wao
by fdesbois＠users.labs.libre-entreprise.org 08 Jul '10

08 Jul '10

Author: fdesbois Date: 2010-07-08 17:46:41 +0000 (Thu, 08 Jul 2010) New Revision: 598 Log: Evo #2352 : Cartography for contacts : - Use fixed topiaId for BoatDistrict creation in migration Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java 2010-07-08 17:18:49 UTC (rev 597) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java 2010-07-08 17:46:41 UTC (rev 598) @@ -39,6 +39,7 @@ import java.util.Date; import java.util.HashMap; import java.util.HashSet; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.Set; @@ -169,10 +170,10 @@ @Override protected Map<String, List<String>> retrieveBoatDistrictCodes_1_5a(TopiaContextImplementor tx) throws TopiaException { - Map<String, List<String>> boatDistrictCodes = new HashMap<String, List<String>>(); + Map<String, List<String>> boatDistrictCodes = new LinkedHashMap<String, List<String>>(); SQLQuery query = tx.getHibernate(). - createSQLQuery("SELECT topiaId, districtCode FROM Boat"); + createSQLQuery("SELECT topiaId, districtCode FROM Boat ORDER BY topiaCreateDate"); List<Object[]> results = query.list(); @@ -205,6 +206,10 @@ ");"); } + protected static final long BOAT_DISTRICT_ID_TIMESTAMP = 1239832675584l; + + protected static final double BOAT_DISTRICT_ID_RANDOM = 0.7208429105932204; + @Override protected Map<String, String> insertBoatDistricts_1_5c(List<String> queries, Map<String, List<String>> boatDistrictCodes) { @@ -218,9 +223,13 @@ StringBuilder query = new StringBuilder("INSERT INTO BoatDistrict VALUES "); String separator = ""; + double random = BOAT_DISTRICT_ID_RANDOM; for (String code : codes) { - // FIXME-fdesbois-2010-06-29 : Seems dangerous to use class, maybe it's better to use full qualified name 'fr.ifremer.wao.entity.BoatDistrict' - String districtId = TopiaId.create(BoatDistrict.class); + + random++; + String districtId = "fr.ifremer.wao.entity.BoatDistrict#" + + BOAT_DISTRICT_ID_TIMESTAMP + "#" + random; + String createDate = dateFormat.format(new Date()); query.append(separator).append(String.format( "('%s', %d, '%s', '%s', null, null, null)",

1 0

[Suiviobsmer-commits] r597 - trunk/wao-business/src/main/filters
by fdesbois＠users.labs.libre-entreprise.org 08 Jul '10

08 Jul '10

Author: fdesbois Date: 2010-07-08 17:18:49 +0000 (Thu, 08 Jul 2010) New Revision: 597 Log: Fix version, filtering doesn't work anymore Modified: trunk/wao-business/src/main/filters/Wao.properties Modified: trunk/wao-business/src/main/filters/Wao.properties =================================================================== --- trunk/wao-business/src/main/filters/Wao.properties 2010-07-08 17:18:16 UTC (rev 596) +++ trunk/wao-business/src/main/filters/Wao.properties 2010-07-08 17:18:49 UTC (rev 597) @@ -51,5 +51,6 @@ ## Server path for chart generation chart.server.path= -## Version (not necessary to override it) -wao.version=${project.version} +## Version (not necessary to override it) filters no working anymore +wao.version=1.5 +#wao.version=${project.version}

1 0

[Suiviobsmer-commits] r596 - trunk/wao-ui/src/main/webapp/js
by fdesbois＠users.labs.libre-entreprise.org 08 Jul '10

08 Jul '10

Author: fdesbois Date: 2010-07-08 17:18:16 +0000 (Thu, 08 Jul 2010) New Revision: 596 Log: Evo #2361 : inverse condition to display confirmation popup Modified: trunk/wao-ui/src/main/webapp/js/contacts.js Modified: trunk/wao-ui/src/main/webapp/js/contacts.js =================================================================== --- trunk/wao-ui/src/main/webapp/js/contacts.js 2010-07-08 17:17:46 UTC (rev 595) +++ trunk/wao-ui/src/main/webapp/js/contacts.js 2010-07-08 17:18:16 UTC (rev 596) @@ -113,7 +113,7 @@ this.contactForm.saveContact.observe('click', this.doConfirm.bind(this)); }, doConfirm: function(event) { - if (confirm(this.message) && $F(this.contactForm.contactState) == this.contactState) { + if ($F(this.contactForm.contactState) == this.contactState && confirm(this.message)) { this.contactForm.hiddenSendEmail.setValue(true); } }

1 0

[Suiviobsmer-commits] r595 - in trunk/wao-ui/src/main: java/fr/ifremer/wao/ui/components java/fr/ifremer/wao/ui/pages resources/fr/ifremer/wao/ui/components webapp webapp/css webapp/js
by fdesbois＠users.labs.libre-entreprise.org 08 Jul '10

08 Jul '10

Author: fdesbois Date: 2010-07-08 17:17:46 +0000 (Thu, 08 Jul 2010) New Revision: 595 Log: Evo #2352 : Cartography for contacts : - Improve css Added: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/Footer.java trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/Footer.tml Modified: 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/resources/fr/ifremer/wao/ui/components/Layout.tml trunk/wao-ui/src/main/webapp/Cartography.tml trunk/wao-ui/src/main/webapp/css/cartography.css trunk/wao-ui/src/main/webapp/js/cartography.js Added: 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 (rev 0) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/Footer.java 2010-07-08 17:17:46 UTC (rev 595) @@ -0,0 +1,23 @@ +package fr.ifremer.wao.ui.components; + +import fr.ifremer.wao.WaoProperty; + +import java.util.Calendar; + +/** + * Created: 8 juil. 2010 + * + * @author fdesbois <fdesbois at codelutin.com> + * @version $Id$ + */ +public class Footer { + + public String getVersion() { + return WaoProperty.APP_VERSION.getValue(); + } + + public int getCurrentYear() { + Calendar calendar = Calendar.getInstance(); + return calendar.get(Calendar.YEAR); + } +} 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 2010-07-08 14:24:16 UTC (rev 594) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/Layout.java 2010-07-08 17:17:46 UTC (rev 595) @@ -98,11 +98,6 @@ return true; } - public int getCurrentYear() { - Calendar calendar = Calendar.getInstance(); - return calendar.get(Calendar.YEAR); - } - public boolean isDevEnvironment() { return manager.isDevEnvironment(); } @@ -122,10 +117,6 @@ public String getContextPath() { return request.getContextPath(); } - - public String getVersion() { - return WaoProperty.APP_VERSION.getValue(); - } public ConnectedUser getCurrentUser() { 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 2010-07-08 14:24:16 UTC (rev 594) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Cartography.java 2010-07-08 17:17:46 UTC (rev 595) @@ -1,17 +1,24 @@ package fr.ifremer.wao.ui.pages; +import fr.ifremer.wao.WaoException; import fr.ifremer.wao.bean.ConnectedUser; import fr.ifremer.wao.entity.Company; import fr.ifremer.wao.service.ServiceCartography; +import fr.ifremer.wao.service.ServiceUser; +import fr.ifremer.wao.ui.data.GenericSelectModel; import fr.ifremer.wao.ui.data.RequiresAuthentication; import org.apache.commons.lang.RandomStringUtils; import org.apache.tapestry5.Link; +import org.apache.tapestry5.annotations.Persist; +import org.apache.tapestry5.annotations.Property; import org.apache.tapestry5.annotations.SessionState; import org.apache.tapestry5.ioc.annotations.Inject; +import org.apache.tapestry5.ioc.services.PropertyAccess; import org.apache.tapestry5.services.PageRenderLinkSource; import org.slf4j.Logger; import java.io.IOException; +import java.util.List; /** * Created: 6 juil. 2010 @@ -23,18 +30,44 @@ public class Cartography { @SessionState + @Property private ConnectedUser user; @Inject + private Logger logger; + + @Inject private PageRenderLinkSource pageRender; @Inject - private Logger logger; + private PropertyAccess propertyAccess; + @Inject + private ServiceUser serviceUser; + + @Persist + private GenericSelectModel<Company> companySelectModel; + + @Property + private String companyId; + + @Persist private Company company; private String url; + void setupRender() { + + if (logger.isDebugEnabled()) { + String companyName = getCompany() != null ? getCompany().getName() : null; + logger.debug("Company selected : " + companyName); + } + + if (getCompany() != null) { + companyId = getCompany().getTopiaId(); + } + } + public Company getCompany() { if (company == null && !user.isAdmin() && !user.isGuest()) { company = user.getCompany(); @@ -42,9 +75,22 @@ return company; } + public GenericSelectModel<Company> getCompanySelectModel() throws WaoException { + if (companySelectModel == null) { + List<Company> companies = serviceUser.getCompanies(true); + companySelectModel = new GenericSelectModel<Company>( + companies, + Company.class, + Company.NAME, + Company.TOPIA_ID, + propertyAccess + ); + } + return companySelectModel; + } + public String getUrl() throws IOException { if (url == null) { - String companyId = getCompany() != null ? getCompany().getTopiaId() : null; Link link = pageRender.createPageRenderLinkWithContext( KmlLoader.class, KmlLoader.StrategyValues.CONTACTS, @@ -58,4 +104,17 @@ public String getTitle() { return "Contacts"; } + + public String getPageTitle() { + String title = "Répartition des contacts par quartier des navires"; + if (company != null) { + title += "pour la société " + company.getName(); + } + return title; + } + + void onSuccessFromFilters() { + company = companySelectModel.findObject(companyId); + } } + Added: 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 (rev 0) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/Footer.tml 2010-07-08 17:17:46 UTC (rev 595) @@ -0,0 +1,37 @@ +<!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 id="so-footer"> + <p> + <a href="http://suiviobsmer.labs.libre-entreprise.org/wao/" title="Documentation de l'application" target="blank"> + WAO + </a> + <a href="http://suiviobsmer.labs.libre-entreprise.org/wao/release-note.html" title="Modifications faites pour cette version" 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"> + Ifremer SIH + </a> - + <a href="http://www.gnu.org/licenses/gpl.html" title="License GPL v3" target="blank"> + GPLv3 + </a> - Copyright 2009-${currentYear} + <a href="http://www.ifremer.fr" title="Ifremer" target="blank"> + Ifremer</a>, + <a href="http://www.codelutin.com" title="Code Lutin" target="blank"> + Code Lutin + </a> +  + </p> + <p class="cnil"> + Le site de "SUIVI DU REALISE DU PLAN D'ECHANTILLONNAGE DES OBSERVATIONS A LA MER" a fait l'objet d'une déclaration à + la CNIL sous le numéro suivant : 1414476 + </p> + </div> + + +</html> \ No newline at end of file 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 2010-07-08 14:24:16 UTC (rev 594) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/Layout.tml 2010-07-08 17:17:46 UTC (rev 595) @@ -136,37 +136,8 @@ <t:body /> </t:if> </div> - <div id="so-footer"> - <p> - <a href="http://suiviobsmer.labs.libre-entreprise.org/wao/" title="Documentation de l'application" target="blank"> - WAO - </a> - <a href="http://suiviobsmer.labs.libre-entreprise.org/wao/release-note.html" title="Modifications faites pour cette version" 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"> - Ifremer SIH - </a> - - <a href="http://www.gnu.org/licenses/gpl.html" title="License GPL v3" target="blank"> - GPLv3 - </a> - Copyright 2009-${currentYear} - <a href="http://www.ifremer.fr" title="Ifremer" target="blank"> - Ifremer</a>, - <a href="http://www.codelutin.com" title="Code Lutin" target="blank"> - Code Lutin - </a> -  - </p> - <p class="cnil"> - Le site de "SUIVI DU REALISE DU PLAN D'ECHANTILLONNAGE DES OBSERVATIONS A LA MER" a fait l'objet d'une déclaration à - la CNIL sous le numéro suivant : 1414476 - </p> - </div> + + <t:footer /> + </body> </html> Modified: trunk/wao-ui/src/main/webapp/Cartography.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Cartography.tml 2010-07-08 14:24:16 UTC (rev 594) +++ trunk/wao-ui/src/main/webapp/Cartography.tml 2010-07-08 17:17:46 UTC (rev 595) @@ -30,15 +30,50 @@ <html xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" xmlns:p="tapestry:parameter"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> - <title>WAO - Web Applicatif Obsmer : Cartes</title> + <title>WAO - Web Applicatif Obsmer : ${pageTitle}</title> <link rel="stylesheet" type="text/css" href="${asset:context:css/common.css}" /> + <link rel="stylesheet" type="text/css" href="${asset:context:css/main.css}" /> <link rel="stylesheet" type="text/css" href="${asset:context:css/cartography.css}" /> <script type="text/javascript" src="${asset:context:js/cartography.js}"/> <script type="text/javascript" src="${asset:context:js/OpenLayers/OpenLayers.js}"></script> </head> <body id="so-cartography" onload="init('${url}', '${title}');"> - <div id="map"></div> + <div class="clearfix"> + + <div id="so-cartography-border" class="fleft"> + + <div id="so-cartography-icons"> + <span> + <a t:type="pagelink" t:page="index" title="Page d'accueil"> + <img src="${asset:context:img/logo-wao-48px.png}" alt="WAO logo" title="Retourner sur l'application Wao"/> + </a>  + </span> + <span> + <a href="mailto:obsmer at ifremer.fr" title="Contacter un responsable Obsmer"> + <img src="${asset:context:img/MiniLogo.jpg}" alt="Obsmer logo"/> + </a> + </span> + </div> + + <h1>${pageTitle}</h1> + + <t:if t:test="user.admin"> + <div id="so-cartography-filters"> + <form t:type="form" t:id="filters" action="tapestry"> + <p><label for="company">Société</label> : </p> + <p><input t:type="select" t:id="company" t:model="companySelectModel" value="companyId" onchange="this.form.submit();"/></p> + </form> + </div> + </t:if> + + </div> + + <div id="so-cartography-map" class="fleft"></div> + </div> + + <t:footer /> + </body> </html> Modified: trunk/wao-ui/src/main/webapp/css/cartography.css =================================================================== --- trunk/wao-ui/src/main/webapp/css/cartography.css 2010-07-08 14:24:16 UTC (rev 594) +++ trunk/wao-ui/src/main/webapp/css/cartography.css 2010-07-08 17:17:46 UTC (rev 595) @@ -5,11 +5,47 @@ Description: Style cheets for cartography page */ -#map { + +#so-cartography { + background: url(../img/background.jpg) repeat-x top left; + background-color: #080824; +} + +#so-cartography-border { + width: 220px; +} + +#so-cartography-border h1 { + font-size: 1.2em; + text-align: center; + color: white; + margin-bottom: 20px; +} + +#so-cartography-icons { + text-align: center; + margin: 20px; + background-color: white; + border: 1px solid black; +} + +#so-cartography-filters { + color: white; +} + +#so-cartography-map { width: 1024px; height: 768px; - border: 1px solid #ccc; - /*width: 100%; - height: 100%; - border: 1px solid #ccc;*/ +} + +#so-footer { + color: white; +} + +#so-footer a { + color: grey !important; +} + +#so-footer a:hover { + color: white !important; } \ No newline at end of file Modified: trunk/wao-ui/src/main/webapp/js/cartography.js =================================================================== --- trunk/wao-ui/src/main/webapp/js/cartography.js 2010-07-08 14:24:16 UTC (rev 594) +++ trunk/wao-ui/src/main/webapp/js/cartography.js 2010-07-08 17:17:46 UTC (rev 595) @@ -4,7 +4,7 @@ var map; function init(url, title) { - map = new OpenLayers.Map('map'); + map = new OpenLayers.Map('so-cartography-map'); var wms = new OpenLayers.Layer.WMS( "OpenLayers WMS",

1 0

[Suiviobsmer-commits] r594 - in trunk/wao-ui/src/main/java/fr/ifremer/wao/ui: data pages services
by fdesbois＠users.labs.libre-entreprise.org 08 Jul '10

08 Jul '10

Author: fdesbois Date: 2010-07-08 14:24:16 +0000 (Thu, 08 Jul 2010) New Revision: 594 Log: Evo #2352 : Cartography for contacts : - Add some javadoc Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/KmlStreamResponse.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/KmlLoader.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/KmlLoaderStrategy.java Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/KmlStreamResponse.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/KmlStreamResponse.java 2010-07-08 14:12:28 UTC (rev 593) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/KmlStreamResponse.java 2010-07-08 14:24:16 UTC (rev 594) @@ -1,5 +1,7 @@ package fr.ifremer.wao.ui.data; +import fr.ifremer.wao.ui.pages.KmlLoader; +import fr.ifremer.wao.ui.services.KmlLoaderStrategy; import org.apache.commons.io.FileUtils; import org.apache.tapestry5.StreamResponse; import org.apache.tapestry5.services.Response; @@ -12,10 +14,14 @@ import java.io.InputStream; /** + * StreamResponse for Kml files. + * <p /> * Created: 6 juil. 2010 * * @author fdesbois <fdesbois at codelutin.com> * @version $Id$ + * @see KmlLoaderStrategy + * @see KmlLoader */ public class KmlStreamResponse implements StreamResponse { @@ -33,6 +39,7 @@ @Override public String getContentType() { + // official mime-type for Kml file return "application/vnd.google-earth.kml+xml"; } @@ -43,6 +50,7 @@ @Override public void prepareResponse(Response response) { - response.setHeader("Content-Length", "" + length); + // need to specify the Content-Length to avoid auto chunked Transfer-Encoding + response.setHeader("Content-Length", String.valueOf(length)); } } 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 2010-07-08 14:12:28 UTC (rev 593) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Cartography.java 2010-07-08 14:24:16 UTC (rev 594) @@ -58,8 +58,4 @@ public String getTitle() { return "Contacts"; } - - public String getRandomCode() { - return RandomStringUtils.randomAlphanumeric(8); - } } Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/KmlLoader.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/KmlLoader.java 2010-07-08 14:12:28 UTC (rev 593) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/KmlLoader.java 2010-07-08 14:24:16 UTC (rev 594) @@ -12,6 +12,10 @@ import java.io.IOException; /** + * Page used directly as url for OpenLayers Kml reference. The activate method + * will return the StreamResponse with Kml data depends on {@link StrategyValues} + * defined as first element in page context. + * * Created: 6 juil. 2010 * * @author fdesbois <fdesbois at codelutin.com> @@ -20,6 +24,7 @@ @RequiresAuthentication public class KmlLoader { + /** Strategy values for loading Kml */ public enum StrategyValues { CONTACTS; } @@ -30,17 +35,37 @@ @Inject private ServiceUser serviceUser; + /** + * This method will directly return the correct Kml file depends on strategy + * from {@code activationContext}. Other elements used by strategies can + * be passed to the context (like filter values). Available strategies are + * defined in {@link StrategyValues} enumeration. + * + * @param activationContext Context of the page. + * @return the StreamResponse that contains Kml data. + * @throws IOException + * @see KmlLoaderStrategy#getStreamResponse(Object...) + */ StreamResponse onActivate(Object... activationContext) throws IOException { - + // Retrive context data String first = TapestryUtil.getFirstString(activationContext); Object[] other = TapestryUtil.getOtherContext(activationContext); - KmlLoaderStrategy strategy = getStrategy(StrategyValues.valueOf(first)); + // Create strategy depends on first value in page context. + KmlLoaderStrategy strategy = createStrategy(StrategyValues.valueOf(first)); + // Return the StreamResponse from the Strategy return strategy.getStreamResponse(other); } - KmlLoaderStrategy getStrategy(StrategyValues value) { + /** + * Instantiate the strategy depends on {@code value}. + * + * @param value StrategyValues to define wich implementation to choose. + * @return the KmlLoaderStrategy to use + * @throws IllegalArgumentException if the strategy is not supported + */ + KmlLoaderStrategy createStrategy(StrategyValues value) throws IllegalArgumentException { switch (value) { case CONTACTS: return new KmlLoaderStrategyContacts(serviceCartography, serviceUser); Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/KmlLoaderStrategy.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/KmlLoaderStrategy.java 2010-07-08 14:12:28 UTC (rev 593) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/KmlLoaderStrategy.java 2010-07-08 14:24:16 UTC (rev 594) @@ -1,17 +1,28 @@ package fr.ifremer.wao.ui.services; import fr.ifremer.wao.entity.Company; +import fr.ifremer.wao.ui.pages.KmlLoader; import org.apache.tapestry5.StreamResponse; import java.io.IOException; /** + * This Service is used to retrieve StreamResponse for KmlLoader page. + * * Created: 8 juil. 2010 * * @author fdesbois <fdesbois at codelutin.com> * @version $Id$ + * @see KmlLoader */ public interface KmlLoaderStrategy { + /** + * Retrieve the StreamResponse for this Strategy. + * + * @param context Strategy context + * @return the StreamResponse to use in KmlLoader + * @throws IOException for error on StreamResponse creation + */ StreamResponse getStreamResponse(Object... context) throws IOException; }

1 0