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

Jenkins build is back to normal : wao-nightly » Wao :: Web #45
by admin+ci-codelutin.com＠codelutin.com May 12, 2014

May 12, 2014

See <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-web/45/>

1 0

Jenkins build is back to normal : wao-nightly » Wao #45
by admin+ci-codelutin.com＠codelutin.com May 12, 2014

May 12, 2014

See <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao/45/>

1 0

r1927 - in trunk: wao-persistence/src/main/xmi wao-services/src/main/java/fr/ifremer/wao/services/service/administration
by bleny＠users.forge.codelutin.com May 12, 2014

May 12, 2014

Author: bleny Date: 2014-05-12 15:42:35 +0200 (Mon, 12 May 2014) New Revision: 1927 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1927 Log: refs #4481 add unique on WaoUser#canReadBoats and WaoUser#allegroWallet Modified: trunk/wao-persistence/src/main/xmi/wao-model.zargo trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/WaoUsersService.java Modified: trunk/wao-persistence/src/main/xmi/wao-model.zargo =================================================================== (Binary files differ) Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/WaoUsersService.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/WaoUsersService.java 2014-05-12 13:26:09 UTC (rev 1926) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/WaoUsersService.java 2014-05-12 13:42:35 UTC (rev 1927) @@ -46,8 +46,10 @@ import org.nuiton.topia.persistence.TopiaQueryBuilderAddCriteriaOrRunQueryStep; import org.nuiton.util.StringUtil; +import java.util.HashSet; import java.util.List; import java.util.Map; +import java.util.Set; public class WaoUsersService extends WaoServiceSupport { @@ -161,7 +163,7 @@ waoUser.clearCanReadBoats(); if (waoUser.hasUserRole(UserRole.PROFESSIONAL, obsProgram)) { - List<Boat> boatsFromImmatriculations = getReferentialService().getBoatsFromImmatriculations(updateWaoUserCommand.getCanReadBoats()); + Set<Boat> boatsFromImmatriculations = new HashSet<>(getReferentialService().getBoatsFromImmatriculations(updateWaoUserCommand.getCanReadBoats())); waoUser.setCanReadBoats(boatsFromImmatriculations); }

1 0

r1926 - trunk/wao-persistence/src/main/xmi
by bleny＠users.forge.codelutin.com May 12, 2014

May 12, 2014

Author: bleny Date: 2014-05-12 15:26:09 +0200 (Mon, 12 May 2014) New Revision: 1926 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1926 Log: move model version from zargo to wao-model.properties Modified: trunk/wao-persistence/src/main/xmi/wao-model.properties trunk/wao-persistence/src/main/xmi/wao-model.zargo Modified: trunk/wao-persistence/src/main/xmi/wao-model.properties =================================================================== --- trunk/wao-persistence/src/main/xmi/wao-model.properties 2014-05-12 13:19:15 UTC (rev 1925) +++ trunk/wao-persistence/src/main/xmi/wao-model.properties 2014-05-12 13:26:09 UTC (rev 1926) @@ -27,6 +27,8 @@ model.tagValue.useEnumerationName=true model.tagValue.indexForeignKeys=true +model.tagValue.version=4.0 + # orderBy tagValues fr.ifremer.wao.entity.SampleRow.attribute.sampleMonth.tagValue.orderBy=periodDate fr.ifremer.wao.entity.SampleRow.attribute.sampleRowLog.tagValue.orderBy=topiaCreateDate desc Modified: trunk/wao-persistence/src/main/xmi/wao-model.zargo =================================================================== (Binary files differ)

1 0

r1925 - trunk/wao-persistence/src/main/xmi
by bleny＠users.forge.codelutin.com May 12, 2014

May 12, 2014

Author: bleny Date: 2014-05-12 15:19:15 +0200 (Mon, 12 May 2014) New Revision: 1925 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1925 Log: cleaning model tagValues Modified: trunk/wao-persistence/src/main/xmi/wao-model.properties Modified: trunk/wao-persistence/src/main/xmi/wao-model.properties =================================================================== --- trunk/wao-persistence/src/main/xmi/wao-model.properties 2014-05-12 13:15:04 UTC (rev 1924) +++ trunk/wao-persistence/src/main/xmi/wao-model.properties 2014-05-12 13:19:15 UTC (rev 1925) @@ -48,6 +48,6 @@ #fr.ifremer.wao.entity.Boat.attribute.shipOwner.tagValue.lazy=false #fr.ifremer.wao.entity.Boat.attribute.elligibleBoat.tagValue.lazy=false #fr.ifremer.wao.entity.SampleRow.attribute.elligibleBoat.tagValue.lazy=false - -fr.ifremer.wao.entity.SampleRow.attribute.observers.tagValue.inverse=false -fr.ifremer.wao.entity.WaoUser.attribute.SampleRow.tagValue.inverse=true +# +#fr.ifremer.wao.entity.SampleRow.attribute.observers.tagValue.inverse=false +#fr.ifremer.wao.entity.WaoUser.attribute.SampleRow.tagValue.inverse=true

1 0

r1924 - trunk/wao-persistence/src/main/xmi
by bleny＠users.forge.codelutin.com May 12, 2014

May 12, 2014

Author: bleny Date: 2014-05-12 15:15:04 +0200 (Mon, 12 May 2014) New Revision: 1924 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1924 Log: cleaning model tagValues Modified: trunk/wao-persistence/src/main/xmi/wao-model.properties Modified: trunk/wao-persistence/src/main/xmi/wao-model.properties =================================================================== --- trunk/wao-persistence/src/main/xmi/wao-model.properties 2014-05-12 12:57:51 UTC (rev 1923) +++ trunk/wao-persistence/src/main/xmi/wao-model.properties 2014-05-12 13:15:04 UTC (rev 1924) @@ -27,45 +27,27 @@ model.tagValue.useEnumerationName=true model.tagValue.indexForeignKeys=true -# model.tagValue.doNotGenerateBooleanGetMethods=true - -#model.tagValue.useLegacyDAO=true - -fr.ifremer.wao.entity.WaoUser.attribute.userProfile.tagValue.lazy=false - +# orderBy tagValues fr.ifremer.wao.entity.SampleRow.attribute.sampleMonth.tagValue.orderBy=periodDate -fr.ifremer.wao.entity.SampleRow.attribute.fishingZone.tagValue.lazy=false -fr.ifremer.wao.entity.SampleRow.attribute.fishingZone.tagValue.orderBy=facadeName,sectorName,districtCode -fr.ifremer.wao.entity.SampleRow.attribute.company.tagValue.lazy=false -fr.ifremer.wao.entity.SampleRow.attribute.profession.tagValue.lazy=false -fr.ifremer.wao.entity.SampleRow.attribute.dCF5Code.tagValue.lazy=false -fr.ifremer.wao.entity.DCF5Code.attribute.fishingGearDCF.tagValue.lazy=false -fr.ifremer.wao.entity.DCF5Code.attribute.targetSpeciesDCF.tagValue.lazy=false -#fr.ifremer.wao.entity.SampleRow.attribute.elligibleBoat.tagValue.lazy=false -fr.ifremer.wao.entity.SampleRow.attribute.elligibleBoat.tagValue.orderBy=companyActive -#fr.ifremer.wao.entity.SampleRow.attribute.sampleRowLog.tagValue.lazy=false fr.ifremer.wao.entity.SampleRow.attribute.sampleRowLog.tagValue.orderBy=topiaCreateDate desc +fr.ifremer.wao.entity.SampleRow.attribute.fishingZone.tagValue.orderBy=facadeName,sectorName,districtCode -fr.ifremer.wao.entity.SampleRowLog.attribute.author.tagValue.lazy=false - -fr.ifremer.wao.entity.FishingZone.attribute.sampleRow.tagValue.orderBy=code - +# Hibernate eagerness +#fr.ifremer.wao.entity.WaoUser.attribute.userProfile.tagValue.lazy=false +#fr.ifremer.wao.entity.SampleRow.attribute.fishingZone.tagValue.lazy=false +#fr.ifremer.wao.entity.SampleRow.attribute.company.tagValue.lazy=false +#fr.ifremer.wao.entity.SampleRow.attribute.profession.tagValue.lazy=false +#fr.ifremer.wao.entity.SampleRow.attribute.dCF5Code.tagValue.lazy=false +#fr.ifremer.wao.entity.DCF5Code.attribute.fishingGearDCF.tagValue.lazy=false +#fr.ifremer.wao.entity.DCF5Code.attribute.targetSpeciesDCF.tagValue.lazy=false +#fr.ifremer.wao.entity.ElligibleBoat.attribute.boat.tagValue.lazy=false +#fr.ifremer.wao.entity.ElligibleBoat.attribute.sampleRow.tagValue.lazy=false +#fr.ifremer.wao.entity.Contact.attribute.sampleRow.tagValue.lazy=false +#fr.ifremer.wao.entity.Contact.attribute.boat.tagValue.lazy=false +# #fr.ifremer.wao.entity.Boat.attribute.shipOwner.tagValue.lazy=false -fr.ifremer.wao.entity.Boat.attribute.boatDistrict.tagValue.lazy=false -fr.ifremer.wao.entity.Boat.attribute.elligibleBoat.tagValue.orderBy=companyActive +#fr.ifremer.wao.entity.Boat.attribute.elligibleBoat.tagValue.lazy=false +#fr.ifremer.wao.entity.SampleRow.attribute.elligibleBoat.tagValue.lazy=false -fr.ifremer.wao.entity.ElligibleBoat.attribute.boat.tagValue.lazy=false - -fr.ifremer.wao.entity.Contact.attribute.sampleRow.tagValue.lazy=false -fr.ifremer.wao.entity.Contact.attribute.boat.tagValue.lazy=false - -fr.ifremer.wao.entity.TerrestrialDivision.attribute.regionIfremer.tagValue.lazy=false - -fr.ifremer.wao.entity.Indicator.attribute.indicatorLevel.tagValue.lazy=false -fr.ifremer.wao.entity.IndicatorLog.attribute.author.tagValue.lazy=false -fr.ifremer.wao.entity.Indicator.attribute.indicatorLevel.tagValue.orderBy=level - fr.ifremer.wao.entity.SampleRow.attribute.observers.tagValue.inverse=false fr.ifremer.wao.entity.WaoUser.attribute.SampleRow.tagValue.inverse=true - -fr.ifremer.wao.entity.WaoUser.attribute.allegroWallet.tagValue.unique=true

1 0

r1923 - trunk/wao-services/src/main/java/fr/ifremer/wao/services/service
by bleny＠users.forge.codelutin.com May 12, 2014

May 12, 2014

Author: bleny Date: 2014-05-12 14:57:51 +0200 (Mon, 12 May 2014) New Revision: 1923 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1923 Log: refs #4493 optimize query for computing sampling plan actual days Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanService.java Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanService.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanService.java 2014-05-07 08:58:32 UTC (rev 1922) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanService.java 2014-05-12 12:57:51 UTC (rev 1923) @@ -427,14 +427,9 @@ periodTo, sampleRow); - // calcul effort réalisé et estimé - SampleRowsFilter sampleRowsFilter1 = new SampleRowsFilter(); - sampleRowsFilter1.setPeriodFrom(periodFrom); - sampleRowsFilter1.setPeriodTo(periodTo); - sampleRowsFilter1.setSampleRowIds(ImmutableSet.of(sampleRow.getTopiaId())); - Pair<Long, Long> realAndEstimated = - getSampleRowObservationTimesInDayRealAndEstimated(sampleRowsFilter1); + getSampleRowObservationTimesInDayRealAndEstimated( + sampleRow.getTopiaId(), periodFrom, periodTo); Long observationTimesInDaysReal = realAndEstimated.getLeft(); Long observationTimesInDaysEstimated = realAndEstimated.getRight(); @@ -638,22 +633,24 @@ * Récupérer l'effort d'observation en nombre de jours réalisé (partie gauche) et estimé (partie droite) * pour le filtre d'échantillonnage donné. * - * @param sampleRowsFilter la filtre du plan d'échantillonnage + * @param sampleRowId la sample row pour laquelle il faut calculer l'effor réalisé + * @param periodFrom la date à partir de laquelle on compte les contacts + * @param periodTo la date jusqu'à laquelle on compte les contacts * @return la paire (effort réalisé - effort estimé) calculée */ - public Pair<Long, Long> getSampleRowObservationTimesInDayRealAndEstimated(SampleRowsFilter sampleRowsFilter) { + public Pair<Long, Long> getSampleRowObservationTimesInDayRealAndEstimated(String sampleRowId, Date periodFrom, Date periodTo) { // D'abord, on a besoin de récupérer toutes les observations réalisées // pour cette ligne du plan ContactsFilter contactFilter = new ContactsFilter(); + contactFilter.getSampleRowFilter().setSampleRowIds(ImmutableSet.of(sampleRowId)); + contactFilter.setFilterOnObservationBeginDate(true); - contactFilter.setPeriodFrom(sampleRowsFilter.getPeriodFrom()); - contactFilter.setPeriodTo(sampleRowsFilter.getPeriodTo()); - contactFilter.setSampleRowFilter(sampleRowsFilter); + contactFilter.setPeriodFrom(periodFrom); + contactFilter.setPeriodTo(periodTo); - contactFilter.setContactStates(ImmutableSet.of(ContactState.OBSERVATION_DONE)); // on exclue les contacts qui sont invalidés par le programme contactFilter.setProgramAcceptations(Sets.newHashSet(true, null));

1 0

r1922 - trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer
by lkaufmann＠users.forge.codelutin.com May 7, 2014

May 7, 2014

Author: lkaufmann Date: 2014-05-07 10:58:32 +0200 (Wed, 07 May 2014) New Revision: 1922 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1922 Log: Refs #4997 add icon in dropdown menu Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp 2014-05-07 08:31:44 UTC (rev 1921) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp 2014-05-07 08:58:32 UTC (rev 1922) @@ -464,7 +464,7 @@ <s:param name="filter.targetSpeciesDcfIds" value="%{filter.targetSpeciesDcfIds}"/> </s:url> <s:a href="%{sampleRowZoomUrl}"> -  <s:text name="wao.ui.action.zoomOnSampleRowPeriod" /> + <s:text name="wao.ui.action.zoomOnSampleRowPeriod" /> </s:a> </li> <s:if test="elligibleBoatsProvided"> @@ -473,7 +473,7 @@ <s:param name="filter.elligibleForSampleRowsFilter.sampleRowCodes" value="code" /> </s:url> <s:a href="%{viewElligibleBoatsUrl}"> - <s:text name="wao.ui.action.viewElligibleBoats" /> + <s:text name="wao.ui.action.viewElligibleBoats" /> </s:a> </li> </s:if> @@ -484,7 +484,7 @@ <s:param name="filter.periodTo" /> </s:url> <s:a href="%{viewAssociatedContactsUrl}"> - <s:text name="wao.ui.action.viewAssociatedContacts" /> + <s:text name="wao.ui.action.viewAssociatedContacts" /> </s:a> </li> <s:if test="authenticatedWaoUser.authorizedToCreateContact && newContactCreatable">

1 0

r1921 - in trunk/wao-web/src/main/webapp: . WEB-INF/content/obsmer WEB-INF/decorators fonts
by lkaufmann＠users.forge.codelutin.com May 7, 2014

May 7, 2014

Author: lkaufmann Date: 2014-05-07 10:31:44 +0200 (Wed, 07 May 2014) New Revision: 1921 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1921 Log: Refs #4997 Adds Roboto font and update news display Added: trunk/wao-web/src/main/webapp/fonts/Roboto-Black.ttf trunk/wao-web/src/main/webapp/fonts/Roboto-Bold.ttf trunk/wao-web/src/main/webapp/fonts/Roboto-Regular.ttf Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/news.jsp trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp trunk/wao-web/src/main/webapp/wao.css Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/news.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/news.jsp 2014-04-30 16:36:52 UTC (rev 1920) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/news.jsp 2014-05-07 08:31:44 UTC (rev 1921) @@ -64,15 +64,15 @@ <s:url action="delete-news" id="deleteNewsUrl"> <s:param name="newsId" value="topiaId" /> </s:url> - <s:a href="%{deleteNewsUrl}"> - <s:text name="wao.ui.action.delete" /> + <s:a href="%{deleteNewsUrl}" cssClass="btn-delete" title="%{getText('wao.ui.action.delete')}" > + </s:a> <s:url action="edit-news!input" id="editNewsUrl"> <s:param name="newsId" value="topiaId" /> </s:url> - <s:a href="%{editNewsUrl}"> - <s:text name="wao.ui.action.edit" /> + <s:a href="%{editNewsUrl}" cssClass="btn-edit" title="%{getText('wao.ui.action.edit')}"> + </s:a> </s:if> Modified: trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp 2014-04-30 16:36:52 UTC (rev 1920) +++ trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp 2014-05-07 08:31:44 UTC (rev 1921) @@ -52,7 +52,7 @@ <div class="navbar"> <div class="navbar-inner"> - <a class="brand" href="#">Wao <s:text name="%{obsProgram.getI18nKey()}"/></a> + <a class="brand" href="#">WAO <s:text name="%{obsProgram.getI18nKey()}"/></a> <%--<a class="brand" href="#">Wao <s:property value="%{getText(#obsProgram.getI18nKey())}" /></a>--%> <ul class="nav"> Added: trunk/wao-web/src/main/webapp/fonts/Roboto-Black.ttf =================================================================== (Binary files differ) Property changes on: trunk/wao-web/src/main/webapp/fonts/Roboto-Black.ttf ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/wao-web/src/main/webapp/fonts/Roboto-Bold.ttf =================================================================== (Binary files differ) Property changes on: trunk/wao-web/src/main/webapp/fonts/Roboto-Bold.ttf ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/wao-web/src/main/webapp/fonts/Roboto-Regular.ttf =================================================================== (Binary files differ) Property changes on: trunk/wao-web/src/main/webapp/fonts/Roboto-Regular.ttf ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/wao-web/src/main/webapp/wao.css =================================================================== --- trunk/wao-web/src/main/webapp/wao.css 2014-04-30 16:36:52 UTC (rev 1920) +++ trunk/wao-web/src/main/webapp/wao.css 2014-05-07 08:31:44 UTC (rev 1921) @@ -38,6 +38,24 @@ } /****************************************************************************** + * Fonts + *****************************************************************************/ +@font-face { + font-family: "Roboto"; + src: url('fonts/Roboto-Regular.ttf'); +} +@font-face { + font-family: "Roboto"; + font-weight: bold; + src: url('fonts/Roboto-Bold.ttf'); +} +@font-face { + font-family: "Roboto"; + font-weight: 900; + src: url('fonts/Roboto-Black.ttf'); +} + +/****************************************************************************** * Des classes à usage transverse *****************************************************************************/ @@ -259,7 +277,7 @@ } .large-table tbody th, .large-table td { - border: solid 1px #aaaaaa; + border: none !important; border-left-style: dashed; border-right-style: dashed; padding: 2px; @@ -356,13 +374,13 @@ } .btn-primary { - background-color: #2f4f4f; - background-image: linear-gradient(to bottom, #446f6f, #2f4f4f); + background-color: #008A8A; + background-image: linear-gradient(to bottom, #008A8A, #007070); color: #FFF !important; text-decoration: none !important; } .btn-primary:hover { - background-color: #2f4f4f; + background-color: #007070; } /****************************************************************************** @@ -517,6 +535,19 @@ color: #434343; } +main.home .news a { + color: #0d9898; +} +main.home .news a:hover, +main.home .news a:active { + color: #2f4f4f; +} + +/* Fix a 1px gap between icons in fontawesome */ +main.home .news a.btn-edit { + padding-top: 1px; +} + main.home .news p.publication { color: #cdcdcd; font-size: 14px; @@ -527,6 +558,8 @@ margin-left: 10px; text-decoration: none; color: #2f4f4f; + font-weight: bold; + font-size: 15px; } main.home .news p.publication > a i.fa { color: #2f4f4f;

1 0