Author: bleny Date: 2011-02-17 17:27:22 +0000 (Thu, 17 Feb 2011) New Revision: 1028 Log: misc fixes Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java 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/Cartography.tml trunk/wao-ui/src/main/webapp/SamplingPlan.tml 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-17 15:33:11 UTC (rev 1027) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java 2011-02-17 17:27:22 UTC (rev 1028) @@ -234,7 +234,7 @@ // FishingZone filter (sectorName OR facadeName) if (logger.isDebugEnabled()) { - logger.debug("CollectionUtils.isNotEmpty(filter.getSampleRows())" + + logger.debug("CollectionUtils.isNotEmpty(filter.getSampleRows()) == " + CollectionUtils.isNotEmpty(filter.getSampleRows())); } @@ -242,7 +242,7 @@ if (logger.isDebugEnabled()) { for (SampleRow row : filter.getSampleRows()) { - logger.debug("sampleRows contains row " + row); + logger.debug("sampleRows contains row " + row.getCode()); } } 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-17 15:33:11 UTC (rev 1027) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java 2011-02-17 17:27:22 UTC (rev 1028) @@ -262,7 +262,7 @@ public SamplingFilter getFilter() throws WaoException { if (dataSamplingFilter == null) { dataSamplingFilter = new SamplingFilterImpl(); - if (!user.isAdmin()) { + if (user.isCoordinatorOrObserver()) { dataSamplingFilter.setCompany(user.getCompany()); } dataSamplingFilter.setObsProgram(user.getProfile().getObsProgram()); 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-17 15:33:11 UTC (rev 1027) +++ trunk/wao-ui/src/main/resources/i18n/wao-ui_en_GB.properties 2011-02-17 17:27:22 UTC (rev 1028) @@ -44,6 +44,7 @@ wao.ui.boatinfo.title=Infos about %s wao.ui.boats.associatedLine=Sample row(s) associated with this boat wao.ui.boats.nbObservations=%s observation(s), %s with your company (all programs considered) +wao.ui.cartography.help=Click on the graphs to get the details. 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.chart.boardingsSince=Queries since %s 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-17 15:33:11 UTC (rev 1027) +++ trunk/wao-ui/src/main/resources/i18n/wao-ui_fr_FR.properties 2011-02-17 17:27:22 UTC (rev 1028) @@ -44,6 +44,7 @@ wao.ui.boatinfo.title=Informations sur %s wao.ui.boats.associatedLine=Ligne(s) du plan associ\u00E9e(s) \u00E0 ce navire wao.ui.boats.nbObservations=%s observation(s) dont %s avec votre soci\u00E9t\u00E9 +wao.ui.cartography.help=Cliquez sur les graphiques pour avoir le d\u00E9tail. 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.chart.boardingsSince=Nombre de sollicitations depuis le %s Modified: trunk/wao-ui/src/main/webapp/Cartography.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Cartography.tml 2011-02-17 15:33:11 UTC (rev 1027) +++ trunk/wao-ui/src/main/webapp/Cartography.tml 2011-02-17 17:27:22 UTC (rev 1028) @@ -94,13 +94,17 @@ <!--</t:nuiton.subForm>--> </t:zone> - <p class="mtop5"> + <p class="mtop10"> <input t:type="submit" class="ico search" value="Search" t:title="${message:wao.ui.action.filter}" /> <input t:type="submit" class="ico undo22px" t:id="reset" value="Reset" title="${message:wao.ui.action.resetFields}" /> </p> </form> </div> + <p class="mtop30" style="text-align: center; font-size: 80%;"> + ${message:wao.ui.cartography.help} + </p> + <t:if test="user.obsMer"> <div class="acenter mtop30"> <a href="mailto:obsmer at ifremer.fr" title="${message:wao.ui.action.contactAdmin}"> Modified: trunk/wao-ui/src/main/webapp/SamplingPlan.tml =================================================================== --- trunk/wao-ui/src/main/webapp/SamplingPlan.tml 2011-02-17 15:33:11 UTC (rev 1027) +++ trunk/wao-ui/src/main/webapp/SamplingPlan.tml 2011-02-17 17:27:22 UTC (rev 1028) @@ -226,9 +226,11 @@ </a> <t:if test="rowModified"> <t:unless test="user.observer"> - <a t:type="pagelink" t:page="sampleRowHistoric" t:context="row.code"> - <img src="${asset:context:}/img/clock-22px.png" class="fright" alt=" * " title="Cette ligne a été modifiée (voir l'historique)"/> - </a> + <t:unless test="user.professional"> + <a t:type="pagelink" t:page="sampleRowHistoric" t:context="row.code"> + <img src="${asset:context:}/img/clock-22px.png" class="fright" alt=" * " title="Cette ligne a été modifiée (voir l'historique)"/> + </a> + </t:unless> </t:unless> </t:if> </td>