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

r1788 - in trunk/wao-web/src/main: java/fr/ifremer/wao/web/action/obsmer resources/i18n webapp webapp/WEB-INF/content/obsmer webapp/WEB-INF/decorators
by bleny＠users.forge.codelutin.com April 1, 2014

April 1, 2014

Author: bleny Date: 2014-04-01 15:34:10 +0200 (Tue, 01 Apr 2014) New Revision: 1788 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1788 Log: refs #4483 move delete row action button to edit-sample-row form Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/DeleteSampleRowAction.java trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/edit-sample-row-input.jsp trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp trunk/wao-web/src/main/webapp/wao.js Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/DeleteSampleRowAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/DeleteSampleRowAction.java 2014-04-01 10:33:15 UTC (rev 1787) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/DeleteSampleRowAction.java 2014-04-01 13:34:10 UTC (rev 1788) @@ -7,8 +7,8 @@ import org.apache.struts2.convention.annotation.Results; @Results({ - @Result(name="error", type="redirectAction", params = { "actionName", "sampling-plan" }), - @Result(name="success", type="redirectAction", params = { "actionName", "sampling-plan" }) + @Result(name="error", type="redirectAction", params = { "actionName", "edit-sample-row!input", "sampleRowId", "%{sampleRowId}" }), + @Result(name="success", type="redirectAction", params = { "actionName", "edit-sample-row!input", "sampleRowId", "%{sampleRowId}" }) }) public class DeleteSampleRowAction extends WaoJspActionSupport { @@ -50,4 +50,7 @@ } + public String getSampleRowId() { + return sampleRowId; + } } \ No newline at end of file Modified: trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties =================================================================== --- trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties 2014-04-01 10:33:15 UTC (rev 1787) +++ trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties 2014-04-01 13:34:10 UTC (rev 1788) @@ -50,6 +50,7 @@ wao.ui.action.deleteWaoUser.failure=The user cannot be deleted wao.ui.action.deleteWaoUser.success=User deleted successfully wao.ui.action.edit=Edit +wao.ui.action.editOrDeleteSampleRow=Edit or delete sample row wao.ui.action.enlargeView=Enlarge view wao.ui.action.exportBoats=Export boats with private infos wao.ui.action.filter=Filter Modified: trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties =================================================================== --- trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties 2014-04-01 10:33:15 UTC (rev 1787) +++ trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties 2014-04-01 13:34:10 UTC (rev 1788) @@ -50,6 +50,7 @@ wao.ui.action.deleteWaoUser.failure=La suppression de l'utilisateur a échoué wao.ui.action.deleteWaoUser.success=L'utilisateur a bien été supprimé wao.ui.action.edit=Modifier +wao.ui.action.editOrDeleteSampleRow=Modifier ou supprimer la ligne wao.ui.action.enlargeView=Agrandir la vue wao.ui.action.exportBoats=Exporter les $s navires avec leurs informations privées wao.ui.action.filter=Filtrer Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/edit-sample-row-input.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/edit-sample-row-input.jsp 2014-04-01 10:33:15 UTC (rev 1787) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/edit-sample-row-input.jsp 2014-04-01 13:34:10 UTC (rev 1788) @@ -248,6 +248,12 @@ <s:submit type="button" cssClass="btn"> <i class="icon-hdd"></i> <s:text name="wao.ui.action.save" /> </s:submit> + <s:url action="delete-sample-row" id="deleteSampleRowUrl"> + <s:param name="sampleRowId" value="sampleRowId" /> + </s:url> + <s:a href="%{deleteSampleRowUrl}" cssClass="btn pull-right"> + <i class="icon-trash"></i> <s:text name="wao.ui.action.deleteSampleRow" /> + </s:a> </div> </s:form> 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-04-01 10:33:15 UTC (rev 1787) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp 2014-04-01 13:34:10 UTC (rev 1788) @@ -427,17 +427,9 @@ <s:param name="sampleRowId" value="sampleRowId" /> </s:url> <s:a href="%{editSampleRowUrl}"> - <i class="icon-edit"></i> <s:text name="wao.ui.action.edit" /> + <i class="icon-edit"></i> <s:text name="wao.ui.action.editOrDeleteSampleRow" /> </s:a> </li> - <li> - <s:url action="delete-sample-row" id="deleteSampleRowUrl"> - <s:param name="sampleRowId" value="sampleRowId" /> - </s:url> - <s:a href="%{deleteSampleRowUrl}"> - <i class="icon-trash"></i> <s:text name="wao.ui.action.deleteSampleRow" /> - </s:a> - </li> </s:if> <li> <s:url action="sample-row-log" id="sampleRowLogUrl"> 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-01 10:33:15 UTC (rev 1787) +++ trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp 2014-04-01 13:34:10 UTC (rev 1788) @@ -169,6 +169,7 @@ <s:actionerror theme="bootstrap" /> <s:actionmessage theme="bootstrap" /> <s:fielderror theme="bootstrap" /> + <div id="notifications"></div> <decorator:body /> </main> Modified: trunk/wao-web/src/main/webapp/wao.js =================================================================== --- trunk/wao-web/src/main/webapp/wao.js 2014-04-01 10:33:15 UTC (rev 1787) +++ trunk/wao-web/src/main/webapp/wao.js 2014-04-01 13:34:10 UTC (rev 1788) @@ -133,10 +133,55 @@ }; +var Notifications = function () { + + this.$notifications = $('#notifications'); + + this.info = function (message) { + this._notify('info', message); + } + + this.warn = function (message) { + this._notify('warn', message); + } + + this.error = function (message) { + this._notify('error', message); + } + + this.success = function (message) { + this._notify('success', message); + } + + this._notify = function (level, message) { + var cssClasses = 'alert alert-' + level; + if (level === 'warn') { + var cssClasses = 'alert'; + } + var html = '<div class="' + cssClasses + '">' + + ' <button type="button" class="close" data-dismiss="alert">×</button>' + + ' ' + message + + '</div>'; + this.$notifications.append(html); + } + +} + +var Wao = function () { + + var self = this; + + this.notifications = new Notifications(); + +} + + $(document).ready(function () { // $('select').select2(); - $('a[data-toggle="popover"]').popover(); + // $('a[data-toggle="popover"]').popover(); + WAO = new Wao(); + }); \ No newline at end of file

1 0

r1787 - trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity
by tchemit＠users.forge.codelutin.com April 1, 2014

April 1, 2014

Author: tchemit Date: 2014-04-01 12:33:15 +0200 (Tue, 01 Apr 2014) New Revision: 1787 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1787 Log: avoid cast Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/SampleRowTopiaDao.java Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/SampleRowTopiaDao.java =================================================================== --- trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/SampleRowTopiaDao.java 2014-04-01 10:19:00 UTC (rev 1786) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/SampleRowTopiaDao.java 2014-04-01 10:33:15 UTC (rev 1787) @@ -45,9 +45,9 @@ String hql = "select max(sr.code) " + newFromClause("sr") + " where sr.code like :sampleRowCodePattern"; - ImmutableMap<String, String> hqlParameters = - ImmutableMap.of("sampleRowCodePattern", sampleRowCodePrefix + "%"); - Optional<String> optionalMaxSampleRowCode = tryFindUnique(hql, (ImmutableMap) hqlParameters); + ImmutableMap<String, Object> hqlParameters = + ImmutableMap.<String, Object>of("sampleRowCodePattern", sampleRowCodePrefix + "%"); + Optional<String> optionalMaxSampleRowCode = tryFindUnique(hql, hqlParameters); return optionalMaxSampleRowCode; }

1 0

r1786 - trunk/wao-web/src/main/webapp
by bleny＠users.forge.codelutin.com April 1, 2014

April 1, 2014

Author: bleny Date: 2014-04-01 12:19:00 +0200 (Tue, 01 Apr 2014) New Revision: 1786 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1786 Log: refs #4483 review event binding to know when update filter values Modified: trunk/wao-web/src/main/webapp/wao.js Modified: trunk/wao-web/src/main/webapp/wao.js =================================================================== --- trunk/wao-web/src/main/webapp/wao.js 2014-04-01 09:50:30 UTC (rev 1785) +++ trunk/wao-web/src/main/webapp/wao.js 2014-04-01 10:19:00 UTC (rev 1786) @@ -104,18 +104,31 @@ this.model = new SampleRowsFilterModel(filterValuesUrl); this.view = new SampleRowsFilterView(this.model, $filtersForm); - this.onFilterChange = function () { + this.updateFilterValues = function () { var filter = this.view.getFilter(); this.model.updateFilterValues(filter); }; this.init = function () { - this.view.$selects.blur(function () { - self.onFilterChange(); - }); - this.view.$inputs.blur(function () { - self.onFilterChange(); - }); + + var markChange = function () { + $(this).data('value-changed', true); + } + var updateFilterValuesIfValueChanged = function () { + if ($(this).data('value-changed')) { + $(this).data('value-changed', false); + self.updateFilterValues(); + } + } + + this.view.$selects.change(markChange); + this.view.$inputs.change(markChange); + + this.view.$selects.blur(updateFilterValuesIfValueChanged); + this.view.$inputs.blur(updateFilterValuesIfValueChanged); + this.view.$selects.mouseleave(updateFilterValuesIfValueChanged); + this.view.$inputs.mouseleave(updateFilterValuesIfValueChanged); + } };

1 0

r1785 - in trunk: wao-services/src/main/java/fr/ifremer/wao/services/service wao-services/src/test/java/fr/ifremer/wao/services/service wao-web/src/main/java/fr/ifremer/wao/web wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer wao-web/src/main/resources/i18n wao-web/src/main/webapp/WEB-INF/content/obsmer
by bleny＠users.forge.codelutin.com April 1, 2014

April 1, 2014

Author: bleny Date: 2014-04-01 11:50:30 +0200 (Tue, 01 Apr 2014) New Revision: 1785 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1785 Log: refs #4483 implements sample row deletion Added: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/DeleteSampleRowAction.java Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlan.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanService.java trunk/wao-services/src/test/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanServiceTest.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoInterceptor.java trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlan.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlan.java 2014-03-31 16:34:14 UTC (rev 1784) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlan.java 2014-04-01 09:50:30 UTC (rev 1785) @@ -152,7 +152,7 @@ } public String getTotalEstimatedRatio(Date month) { - String result = totalsPerMonth.get(month).getRealRatio("-"); + String result = totalsPerMonth.get(month).getEstimatedRatio("-"); return result; } 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-03-31 16:34:14 UTC (rev 1784) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanService.java 2014-04-01 09:50:30 UTC (rev 1785) @@ -49,6 +49,7 @@ import fr.ifremer.wao.entity.LocationType; import fr.ifremer.wao.entity.ObsProgram; import fr.ifremer.wao.entity.ProfessionImpl; +import fr.ifremer.wao.entity.ProfessionTopiaDao; import fr.ifremer.wao.entity.SampleMonth; import fr.ifremer.wao.entity.SampleMonthImpl; import fr.ifremer.wao.entity.SampleMonthTopiaDao; @@ -56,6 +57,7 @@ import fr.ifremer.wao.entity.SampleRowImpl; import fr.ifremer.wao.entity.SampleRowLog; import fr.ifremer.wao.entity.SampleRowLogImpl; +import fr.ifremer.wao.entity.SampleRowLogTopiaDao; import fr.ifremer.wao.entity.SampleRowTopiaDao; import fr.ifremer.wao.entity.SamplingStrategy; import fr.ifremer.wao.entity.TerrestrialLocation; @@ -79,6 +81,7 @@ import org.nuiton.csv.ImportModel; import org.nuiton.csv.ImportRuntimeException; import org.nuiton.topia.persistence.TopiaEntities; +import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.util.DateUtil; import java.io.InputStream; @@ -682,4 +685,47 @@ return Pair.of(real, estimated); } + public void deleteSampleRow(String sampleRowId) throws IllegalDeletionException { + + SampleRowTopiaDao dao = getSampleRowDao(); + + SampleRow sampleRow = dao.findByTopiaId(sampleRowId); + + SampleMonthTopiaDao sampleMonthDao = getSampleMonthDao(); + for (SampleMonth sampleMonth : sampleRow.getSampleMonth()) { + sampleMonthDao.delete(sampleMonth); + } + sampleRow.clearSampleMonth(); + + SampleRowLogTopiaDao sampleRowLogDao = getSampleRowLogDao(); + for (SampleRowLog sampleRowLog : sampleRow.getSampleRowLog()) { + sampleRowLogDao.delete(sampleRowLog); + } + sampleRow.clearSampleRowLog(); + + ElligibleBoatTopiaDao elligibleBoatDao = getElligibleBoatDao(); + for (ElligibleBoat elligibleBoat : sampleRow.getElligibleBoat()) { + elligibleBoatDao.delete(elligibleBoat); + } + sampleRow.clearElligibleBoat(); + + sampleRow.clearFishingZone(); + + if (sampleRow.getProfession() != null) { + ProfessionTopiaDao professionDao = getProfessionDao(); + professionDao.delete(sampleRow.getProfession()); + sampleRow.setProfession(null); + } + + Map<Class<? extends TopiaEntity>, List<? extends TopiaEntity>> allUsages = dao.findAllUsages(sampleRow); + + if (allUsages.isEmpty()) { + dao.delete(sampleRow); + } else { + throw new IllegalDeletionException(allUsages); + } + + commit(); + + } } Modified: trunk/wao-services/src/test/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanServiceTest.java =================================================================== --- trunk/wao-services/src/test/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanServiceTest.java 2014-03-31 16:34:14 UTC (rev 1784) +++ trunk/wao-services/src/test/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanServiceTest.java 2014-04-01 09:50:30 UTC (rev 1785) @@ -35,10 +35,10 @@ import java.io.IOException; import java.io.InputStream; -import java.util.ArrayList; -import java.util.List; -import static fr.ifremer.wao.services.service.ObsMerSamplingPlan.*; +import static fr.ifremer.wao.services.service.ObsMerSamplingPlan.ObsMerSamplingPlanFacadePart; +import static fr.ifremer.wao.services.service.ObsMerSamplingPlan.ObsMerSamplingPlanSampleRowPart; +import static fr.ifremer.wao.services.service.ObsMerSamplingPlan.ObsMerSamplingPlanSectorPart; public class ObsMerSamplingPlanServiceTest extends AbstractWaoServiceTest { @@ -137,4 +137,18 @@ } + @Test + public void testDeleteSampleRow() { + + fixtures.samplingPlan(); + + String sampleRowId = serviceContext.getPersistenceContext().getSampleRowDao().forCodeEquals("2010_M0011").findUnique().getTopiaId(); + + try { + service.deleteSampleRow(sampleRowId); + } catch (IllegalDeletionException e) { + Assert.fail("no exception should have been raised but " + e.getAllUsages() + " found"); + } + + } } Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoInterceptor.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoInterceptor.java 2014-03-31 16:34:14 UTC (rev 1784) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoInterceptor.java 2014-04-01 09:50:30 UTC (rev 1785) @@ -83,7 +83,7 @@ boolean loginCheat = getWaoApplicationContext(invocation).getApplicationConfig().isDevMode(); if (loginCheat) { // login à l'arrache - WaoUser admin = serviceContext.getPersistenceContext().getWaoUserDao().forLoginEquals("admin").findUnique(); + WaoUser admin = serviceContext.getPersistenceContext().getWaoUserDao().forLoginEquals("vincent.badts(a)ifremer.fr").findUnique(); admin.sizeUserProfile(); admin.sizeCanReadBoats(); admin.getCompany().getTopiaId(); Added: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/DeleteSampleRowAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/DeleteSampleRowAction.java (rev 0) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/DeleteSampleRowAction.java 2014-04-01 09:50:30 UTC (rev 1785) @@ -0,0 +1,53 @@ +package fr.ifremer.wao.web.action.obsmer; + +import fr.ifremer.wao.services.service.IllegalDeletionException; +import fr.ifremer.wao.services.service.ObsMerSamplingPlanService; +import fr.ifremer.wao.web.WaoJspActionSupport; +import org.apache.struts2.convention.annotation.Result; +import org.apache.struts2.convention.annotation.Results; + +@Results({ + @Result(name="error", type="redirectAction", params = { "actionName", "sampling-plan" }), + @Result(name="success", type="redirectAction", params = { "actionName", "sampling-plan" }) +}) +public class DeleteSampleRowAction extends WaoJspActionSupport { + + private static final long serialVersionUID = 1L; + + protected transient ObsMerSamplingPlanService service; + + protected String sampleRowId; + + public void setService(ObsMerSamplingPlanService service) { + this.service = service; + } + + public void setSampleRowId(String sampleRowId) { + this.sampleRowId = sampleRowId; + } + + @Override + public String execute() { + + String sampleRowCode = service.getSampleRow(sampleRowId).getCode(); + + try { + + service.deleteSampleRow(sampleRowId); + + session.addMessage(t("wao.ui.action.deleteSampleRow.success", sampleRowCode)); + + return SUCCESS; + + } catch (IllegalDeletionException e) { + + // TODO brendan 04/03/14 préciser le problème + session.addErrorMessages(t("wao.ui.action.deleteSampleRow.failure", sampleRowCode)); + + return ERROR; + + } + + } + +} \ No newline at end of file Modified: trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties =================================================================== --- trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties 2014-03-31 16:34:14 UTC (rev 1784) +++ trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties 2014-04-01 09:50:30 UTC (rev 1785) @@ -43,6 +43,8 @@ wao.ui.action.deleteNews.confirm=Are you sure you want to delete this news ? wao.ui.action.deleteSampleRow=Delete this sample row wao.ui.action.deleteSampleRow.confirm=Are you sure your want to delete this sample row ? +wao.ui.action.deleteSampleRow.failure=Sample row %s cannot be deleted +wao.ui.action.deleteSampleRow.success=Sample row %s deleted successfully wao.ui.action.deleteUser=Delete this user wao.ui.action.deleteUser.confirm=Are your sure you want to delete this user ? wao.ui.action.deleteWaoUser.failure=The user cannot be deleted Modified: trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties =================================================================== --- trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties 2014-03-31 16:34:14 UTC (rev 1784) +++ trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties 2014-04-01 09:50:30 UTC (rev 1785) @@ -43,6 +43,8 @@ wao.ui.action.deleteNews.confirm=Êtes-vous sûr de vouloir supprimer définitivement cette nouvelle ? wao.ui.action.deleteSampleRow=Supprimer la ligne du plan wao.ui.action.deleteSampleRow.confirm=Êtes-vous sûr de vouloir supprimer la ligne %s du plan ? +wao.ui.action.deleteSampleRow.failure=Impossible de supprimer la ligne %s +wao.ui.action.deleteSampleRow.success=La ligne %s a bien été supprimée wao.ui.action.deleteUser=Supprimer l'utilisateur wao.ui.action.deleteUser.confirm=Êtes-vous sûr de vouloir supprimer l'utilisateur ? wao.ui.action.deleteWaoUser.failure=La suppression de l'utilisateur a échoué 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-03-31 16:34:14 UTC (rev 1784) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp 2014-04-01 09:50:30 UTC (rev 1785) @@ -435,7 +435,7 @@ <s:param name="sampleRowId" value="sampleRowId" /> </s:url> <s:a href="%{deleteSampleRowUrl}"> - <i class="icon-trash"></i> <s:text name="wao.ui.action.delete" /> + <i class="icon-trash"></i> <s:text name="wao.ui.action.deleteSampleRow" /> </s:a> </li> </s:if>

1 0

r1784 - trunk/wao-web/src/main/webapp/WEB-INF/decorators
by tchemit＠users.forge.codelutin.com March 31, 2014

March 31, 2014

Author: tchemit Date: 2014-03-31 18:34:14 +0200 (Mon, 31 Mar 2014) New Revision: 1784 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1784 Log: use loadAtOnce jquery struts2 directive instead of loadFromGoogle Modified: trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp Modified: trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp 2014-03-31 15:52:19 UTC (rev 1783) +++ trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp 2014-03-31 16:34:14 UTC (rev 1784) @@ -28,7 +28,7 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <title><decorator:title default="Wao"/> - Wao</title> - <sj:head locale="fr" loadFromGoogle="true" jqueryui="true" /> + <sj:head locale="fr" jqueryui="true" loadAtOnce="true"/> <sb:head /> <script type="text/javascript" src="<s:url value="/moment-js-2.5.1/moment-with-langs.js" />"></script> <script type="text/javascript" src="<s:url value="/select2-3.4.5/select2.min.js" />"></script>

1 0

r1783 - trunk/wao-web/src/main/java/fr/ifremer/wao/web/action
by tchemit＠users.forge.codelutin.com March 31, 2014

March 31, 2014

Author: tchemit Date: 2014-03-31 17:52:19 +0200 (Mon, 31 Mar 2014) New Revision: 1783 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1783 Log: refs #4483 fix locale change Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/MonthConverter.java Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/MonthConverter.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/MonthConverter.java 2014-03-31 15:36:31 UTC (rev 1782) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/MonthConverter.java 2014-03-31 15:52:19 UTC (rev 1783) @@ -58,16 +58,20 @@ Locale locale = (Locale) map.get(ActionContext.LOCALE); Preconditions.checkNotNull(locale, "No locale found in ActionContext"); - try { - parsedValue = WaoUtils.parseMonth(locale, string); - } catch (ParseException e) { - if (log.isErrorEnabled()) { - log.error("Could not format parse date " + string, e); + + parsedValue = parseDate(locale, string, strings, true); + + if (parsedValue == null) { + + //FIXME If action is changing language, then date are not in good format + //FIXME Let's try why other locale... + if (Locale.FRENCH.equals(locale)) { + locale = Locale.ENGLISH; + } else { + locale = Locale.FRENCH; } - //FIXME Find out why we don't see the error - throw new TypeConversionException("strings=" + Arrays.toString(strings)); + parsedValue = parseDate(locale, string, strings, false); } - } return parsedValue; @@ -75,7 +79,22 @@ } else { throw new TypeConversionException("strings=" + Arrays.toString(strings)); } + } + protected Date parseDate(Locale locale, String string, String[] strings, boolean swallonError) { + Preconditions.checkNotNull(locale); + try { + return WaoUtils.parseMonth(locale, string); + } catch (ParseException e) { + if (swallonError) { + return null; + } + //FIXME See why we don't see the error + if (log.isErrorEnabled()) { + log.error("Could not format parse date " + string, e); + } + throw new TypeConversionException("strings=" + Arrays.toString(strings)); + } } @Override

1 0

r1782 - in trunk: wao-persistence/src/main/java/fr/ifremer/wao wao-persistence/src/main/resources/i18n wao-services/src/main/java/fr/ifremer/wao/services/service wao-web/src/main/java/fr/ifremer/wao/web wao-web/src/main/java/fr/ifremer/wao/web/action wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer wao-web/src/main/resources/i18n wao-web/src/main/webapp/WEB-INF/content/obsmer wao-web/src/main/webapp/WEB-INF/decorators
by tchemit＠users.forge.codelutin.com March 31, 2014

March 31, 2014

Author: tchemit Date: 2014-03-31 17:36:31 +0200 (Mon, 31 Mar 2014) New Revision: 1782 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1782 Log: refs #4483 fix I18n + date month parser - format Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/WaoUtils.java trunk/wao-persistence/src/main/resources/i18n/wao-persistence_en_GB.properties trunk/wao-persistence/src/main/resources/i18n/wao-persistence_fr_FR.properties trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlan.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanBuilder.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoJspActionSupport.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/MonthConverter.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/SamplingPlanAction.java trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/WaoUtils.java =================================================================== --- trunk/wao-persistence/src/main/java/fr/ifremer/wao/WaoUtils.java 2014-03-31 15:20:49 UTC (rev 1781) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/WaoUtils.java 2014-03-31 15:36:31 UTC (rev 1782) @@ -32,8 +32,11 @@ import java.util.Date; import java.util.LinkedList; import java.util.List; +import java.util.Locale; import java.util.regex.Pattern; +import static org.nuiton.i18n.I18n.l; + public class WaoUtils { protected static final String MONTH_PATTERN = "MM/yyyy"; @@ -65,8 +68,13 @@ return dateFormat.format(date); } - public static Date parseMonth(String monthYear) throws ParseException { - DateFormat dateFormat = new SimpleDateFormat(MONTH_PATTERN); + public static String formatMonth(Locale locale, Date date) { + return l(locale, "wao.month.formatter", date); + } + + public static Date parseMonth(Locale locale, String monthYear) throws ParseException { + String pattern = l(locale, "wao.month.pattern"); + DateFormat dateFormat = new SimpleDateFormat(pattern); return dateFormat.parse(monthYear); } @@ -82,15 +90,6 @@ return ordinals; } - //TODO use I18n - protected static final SimpleDateFormat dateFormat = new SimpleDateFormat("MM/yyyy"); - - public static boolean isCurrentMonth(Date month) { - String currentStr = dateFormat.format(new Date()); - String monthStr = dateFormat.format(month); - return currentStr.equals(monthStr); - } - public static Date getEndOfMonth(Date month) { return DateUtils.addMilliseconds( DateUtils.addMonths(month, 1), -1); Modified: trunk/wao-persistence/src/main/resources/i18n/wao-persistence_en_GB.properties =================================================================== --- trunk/wao-persistence/src/main/resources/i18n/wao-persistence_en_GB.properties 2014-03-31 15:20:49 UTC (rev 1781) +++ trunk/wao-persistence/src/main/resources/i18n/wao-persistence_en_GB.properties 2014-03-31 15:36:31 UTC (rev 1782) @@ -138,3 +138,5 @@ fr.ifremer.wao.entity.TerrestrialDivision=Terrestrial divisions fr.ifremer.wao.entity.TerrestrialLocation=Terrestrial locations wao.business.other= +wao.month.formatter=%1$tm-%1$tY +wao.month.pattern=MM-yyyy Modified: trunk/wao-persistence/src/main/resources/i18n/wao-persistence_fr_FR.properties =================================================================== --- trunk/wao-persistence/src/main/resources/i18n/wao-persistence_fr_FR.properties 2014-03-31 15:20:49 UTC (rev 1781) +++ trunk/wao-persistence/src/main/resources/i18n/wao-persistence_fr_FR.properties 2014-03-31 15:36:31 UTC (rev 1782) @@ -137,3 +137,5 @@ fr.ifremer.wao.entity.TerrestrialDivision=Stratification géographique fr.ifremer.wao.entity.TerrestrialLocation=Lieux terrestres wao.business.other= +wao.month.formatter=%1$tm/%1$tY +wao.month.pattern=MM/yyyy Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlan.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlan.java 2014-03-31 15:20:49 UTC (rev 1781) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlan.java 2014-03-31 15:36:31 UTC (rev 1782) @@ -21,7 +21,6 @@ * #L% */ -import com.google.common.collect.Range; import fr.ifremer.wao.WaoUtils; import fr.ifremer.wao.entity.DCF5Code; import fr.ifremer.wao.entity.FishingZone; @@ -30,7 +29,6 @@ import fr.ifremer.wao.entity.SampleRowLog; import fr.ifremer.wao.entity.TerrestrialLocation; import org.apache.commons.collections4.CollectionUtils; -import org.nuiton.util.DateUtil; import java.io.Serializable; import java.text.NumberFormat; @@ -39,8 +37,11 @@ import java.util.Iterator; import java.util.LinkedHashMap; import java.util.List; +import java.util.Locale; import java.util.Map; +import static org.nuiton.i18n.I18n.l; + public class ObsMerSamplingPlan implements Iterable<ObsMerSamplingPlan.ObsMerSamplingPlanFacadePart>, Serializable { private static final long serialVersionUID = 1L; @@ -342,16 +343,22 @@ protected Date latestSampleLogCreateDate; /** - * Sample month range (from the first sample month to the last one). + * First sample month date. */ - protected Range<Date> sampleRowMonthPeriod; + protected Date firstSampleMonthDate; /** + * Last sample month date. + */ + protected Date lastSampleMonthDate; + + /** * Last sample month end of month. */ protected Date lastSampleMonthEndOfMonth; - public ObsMerSamplingPlanSampleRowPart(Map<Date, ObsMerSamplingPlanStatistics> nbTidesPerMonth, + public ObsMerSamplingPlanSampleRowPart(Locale locale, + Map<Date, ObsMerSamplingPlanStatistics> nbTidesPerMonth, SampleRow sampleRow, Double observationTimesInDaysExpected, Long observationTimesInDaysReal, @@ -409,9 +416,9 @@ dcf5CodesAndDescriptions = new LinkedHashMap<>(); for (DCF5Code dcf5Code : sampleRow.getdCF5Code()) { String key = dcf5Code.getCode(); - String description = dcf5Code.getFishingGearCode() + " - " + dcf5Code.getFishingGearDCF().getI18nKey(); + String description = dcf5Code.getFishingGearCode() + " - " + l(locale, dcf5Code.getFishingGearDCF().getI18nKey()); if (dcf5Code.getTargetSpeciesCode() != null) { - description += " ; " + dcf5Code.getTargetSpeciesCode() + " - " + dcf5Code.getTargetSpeciesDCF().getI18nKey(); + description += " ; " + dcf5Code.getTargetSpeciesCode() + " - " + l(locale, dcf5Code.getTargetSpeciesDCF().getI18nKey()); } dcf5CodesAndDescriptions.put(key, description); } @@ -440,11 +447,10 @@ // compute sampleRowPeriod List<SampleMonth> sampleMonth = sampleRow.getSampleMonth(); - Date dateFrom = sampleMonth.get(0).getPeriodDate(); - Date dateTo = sampleMonth.get(sampleMonth.size() - 1).getPeriodDate(); - sampleRowMonthPeriod = Range.closed(dateFrom, dateTo); + firstSampleMonthDate = sampleMonth.get(0).getPeriodDate(); + lastSampleMonthDate = sampleMonth.get(sampleMonth.size() - 1).getPeriodDate(); - lastSampleMonthEndOfMonth = WaoUtils.getEndOfMonth(dateTo); + lastSampleMonthEndOfMonth = WaoUtils.getEndOfMonth(lastSampleMonthDate); } public String getSamplingStrategy() { @@ -455,10 +461,22 @@ return sampleRowId; } - public Range<Date> getSampleRowMonthPeriod() { - return sampleRowMonthPeriod; + public Date getLatestSampleLogCreateDate() { + return latestSampleLogCreateDate; } + public Date getFirstSampleMonthDate() { + return firstSampleMonthDate; + } + + public Date getLastSampleMonthDate() { + return lastSampleMonthDate; + } + + public Date getLastSampleMonthEndOfMonth() { + return lastSampleMonthEndOfMonth; + } + public int getNbObservants() { return nbObservants; } @@ -600,27 +618,17 @@ return observationTimesInDaysEstimated; } - public boolean hasNbTidesReal(Date month) { - Date current = new Date(); - boolean validMonth = month.before(current) || WaoUtils.isCurrentMonth(month); - return validMonth && getNbTidesReal(month) != null; - } - - public boolean hasNbTidesEstimated(Date month) { - Date current = new Date(); - boolean validMonth = month.before(current) || WaoUtils.isCurrentMonth(month); - return validMonth && getNbTidesEstimated(month) != null; - } - - public boolean isRecentlyUpdated() { - boolean isRecentlyUpdated = DateUtil.getDifferenceInDays(latestSampleLogCreateDate, new Date()) <= 2 * 7; - return isRecentlyUpdated; - } - - public boolean isNewContactCreatable() { - boolean isNewContactCreatable = new Date().before(lastSampleMonthEndOfMonth); - return isNewContactCreatable; - } +// public boolean hasNbTidesReal(Date month) { +// Date current = new Date(); +// boolean validMonth = month.before(current) || WaoUtils.isCurrentMonth(month); +// return validMonth && getNbTidesReal(month) != null; +// } +// +// public boolean hasNbTidesEstimated(Date month) { +// Date current = new Date(); +// boolean validMonth = month.before(current) || WaoUtils.isCurrentMonth(month); +// return validMonth && getNbTidesEstimated(month) != null; +// } } public static class ObsMerSamplingPlanStatistics implements Serializable { Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanBuilder.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanBuilder.java 2014-03-31 15:20:49 UTC (rev 1781) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanBuilder.java 2014-03-31 15:36:31 UTC (rev 1782) @@ -133,7 +133,8 @@ */ protected Map<Date, MutableInt> totalRealForMonths; - public ObsMerSamplingPlanBuilder(Locale locale, SampleRowsFilter sampleRowsFilter) { + public ObsMerSamplingPlanBuilder(Locale locale, + SampleRowsFilter sampleRowsFilter) { this.sampleRowsFilter = sampleRowsFilter; this.sampleRowsFilterValues = new SampleRowsFilterValues(locale); this.facadeMap = new TreeMap<>(); @@ -173,7 +174,8 @@ Map<Date, ObsMerSamplingPlan.ObsMerSamplingPlanStatistics> nbTidesPerMonth = computeNbTidesPerMonth(sampleRow); // add sample row - sectorPart.addSampleRow(sampleRow, + sectorPart.addSampleRow(sampleRowsFilterValues.getLocale(), + sampleRow, nbTidesPerMonth, observationTimesInDaysExpected, observationTimesInDaysReal, @@ -324,14 +326,16 @@ this.rows = new ArrayList<>(); } - protected ObsMerSamplingPlan.ObsMerSamplingPlanSampleRowPart addSampleRow(SampleRow row, + protected ObsMerSamplingPlan.ObsMerSamplingPlanSampleRowPart addSampleRow(Locale locale, + SampleRow row, Map<Date, ObsMerSamplingPlan.ObsMerSamplingPlanStatistics> nbTidesPerMonth, Double observationTimesInDaysExpected, Long observationTimesInDaysReal, Long observationTimesInDaysEstimated) { ObsMerSamplingPlan.ObsMerSamplingPlanSampleRowPart rowPart = - new ObsMerSamplingPlan.ObsMerSamplingPlanSampleRowPart(nbTidesPerMonth, + new ObsMerSamplingPlan.ObsMerSamplingPlanSampleRowPart(locale, + nbTidesPerMonth, row, observationTimesInDaysExpected, observationTimesInDaysReal, Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoJspActionSupport.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoJspActionSupport.java 2014-03-31 15:20:49 UTC (rev 1781) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoJspActionSupport.java 2014-03-31 15:36:31 UTC (rev 1782) @@ -21,6 +21,7 @@ * #L% */ +import fr.ifremer.wao.WaoUtils; import fr.ifremer.wao.entity.ObsProgram; import fr.ifremer.wao.services.AuthenticatedWaoUser; @@ -63,7 +64,7 @@ } public String formatMonth(Date date) { - return t("wao.ui.misc.month", date); + return WaoUtils.formatMonth(getLocale(), date); } public boolean isGoogleAnalyticsEnabled() { Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/MonthConverter.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/MonthConverter.java 2014-03-31 15:20:49 UTC (rev 1781) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/MonthConverter.java 2014-03-31 15:36:31 UTC (rev 1782) @@ -21,18 +21,26 @@ * #L% */ +import com.google.common.base.Preconditions; +import com.opensymphony.xwork2.ActionContext; import com.opensymphony.xwork2.conversion.TypeConversionException; import fr.ifremer.wao.WaoUtils; import org.apache.commons.lang3.StringUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.apache.struts2.util.StrutsTypeConverter; import java.text.ParseException; import java.util.Arrays; import java.util.Date; +import java.util.Locale; import java.util.Map; public class MonthConverter extends StrutsTypeConverter { + /** Logger. */ + private static final Log log = LogFactory.getLog(MonthConverter.class); + @Override public Date convertFromString(Map map, String[] strings, Class aClass) { @@ -48,9 +56,15 @@ } else { + Locale locale = (Locale) map.get(ActionContext.LOCALE); + Preconditions.checkNotNull(locale, "No locale found in ActionContext"); try { - parsedValue = WaoUtils.parseMonth(string); + parsedValue = WaoUtils.parseMonth(locale, string); } catch (ParseException e) { + if (log.isErrorEnabled()) { + log.error("Could not format parse date " + string, e); + } + //FIXME Find out why we don't see the error throw new TypeConversionException("strings=" + Arrays.toString(strings)); } @@ -79,8 +93,9 @@ Date date = (Date) o; - str = WaoUtils.formatMonth(date); - + Locale locale = (Locale) map.get(ActionContext.LOCALE); + Preconditions.checkNotNull(locale, "No locale found in ActionContext"); + str = WaoUtils.formatMonth(locale, date); } else { throw new UnsupportedOperationException("cannot convert to month " + o); } Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/SamplingPlanAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/SamplingPlanAction.java 2014-03-31 15:20:49 UTC (rev 1781) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/SamplingPlanAction.java 2014-03-31 15:36:31 UTC (rev 1782) @@ -27,7 +27,11 @@ import fr.ifremer.wao.services.service.ObsMerSamplingPlanService; import fr.ifremer.wao.services.service.SampleRowsFilterValues; import fr.ifremer.wao.web.WaoJspActionSupport; +import org.apache.commons.lang3.time.DateUtils; +import java.text.SimpleDateFormat; +import java.util.Date; + public class SamplingPlanAction extends WaoJspActionSupport implements Preparable { private static final long serialVersionUID = 1L; @@ -38,6 +42,8 @@ protected ObsMerSamplingPlan samplingPlan; + private Date now; + public void setService(ObsMerSamplingPlanService service) { this.service = service; } @@ -52,6 +58,7 @@ @Override public void prepare() { + now = new Date(); filter = service.newSampleRowsFilter(getAuthenticatedWaoUser()); } @@ -81,4 +88,23 @@ boolean fullView = getAuthenticatedWaoUser().isAdmin() || getAuthenticatedWaoUser().isProfessional(); return fullView; } + + protected SimpleDateFormat dateFormat = new SimpleDateFormat("MM/yyyy"); + + public boolean isCurrentMonth(Date month) { + + String currentStr = dateFormat.format(now); + String monthStr = dateFormat.format(month); + return currentStr.equals(monthStr); + } + + public String getFilterPeriodFromPlaceholder() { + String placeholder = formatMonth(DateUtils.addMonths(now, 1)); + return placeholder; + } + + public String getFilterPeriodToPlaceholder() { + String placeholder = formatMonth(DateUtils.addYears(now, 1)); + return placeholder; + } } Modified: trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties =================================================================== --- trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties 2014-03-31 15:20:49 UTC (rev 1781) +++ trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties 2014-03-31 15:36:31 UTC (rev 1782) @@ -80,6 +80,7 @@ wao.ui.action.viewIndicatorsHistory=View indicators historic wao.ui.action.viewReal=View real observation effort wao.ui.action.viewSampleRowLog=View sample row log +wao.ui.action.zoomOnSampleRowPeriod=Use as filter dates the one of this sample row wao.ui.actions=Actions wao.ui.boatList=List of %s boats wao.ui.boatinfo.title=Infos about %s @@ -344,7 +345,6 @@ wao.ui.misc.information=Information wao.ui.misc.infosAbout=Infos about %s wao.ui.misc.logFile.description=Show log file for %s -wao.ui.misc.month=%1$tm-%1$tY wao.ui.misc.no=no wao.ui.misc.noComment=no comment wao.ui.misc.notValidated=Not validated Modified: trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties =================================================================== --- trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties 2014-03-31 15:20:49 UTC (rev 1781) +++ trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties 2014-03-31 15:36:31 UTC (rev 1782) @@ -80,6 +80,7 @@ wao.ui.action.viewIndicatorsHistory=Voir l'historique des modifications des indicateurs wao.ui.action.viewReal=Voir l'effort d'observation réalisé wao.ui.action.viewSampleRowLog=Consulter l'historique de cette ligne +wao.ui.action.zoomOnSampleRowPeriod=Changer les dates de la période par rapport à celles de la ligne wao.ui.actions=Actions wao.ui.boatList=Liste de %s navires wao.ui.boatinfo.title=Informations sur %s @@ -344,7 +345,6 @@ wao.ui.misc.information=Informations wao.ui.misc.infosAbout=Informations sur %s wao.ui.misc.logFile.description=Afficher le fichier de log de %s -wao.ui.misc.month=%1$tm/%1$tY wao.ui.misc.no=Non wao.ui.misc.noComment=aucun commentaire wao.ui.misc.notValidated=Non validé 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-03-31 15:20:49 UTC (rev 1781) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp 2014-03-31 15:36:31 UTC (rev 1782) @@ -37,8 +37,6 @@ var sampleRowsFilterController = new SampleRowsFilterController(SAMPLE_ROWS_FILTER_VALUES_JSON_URL, $('#sampling-plan-filters-form')); sampleRowsFilterController.init(); - var fullView = <s:property value="fullView" />; - $('#switch-estimated-real').click(function () { $('#switch-estimated-real').toggleClass('show-estimated').toggleClass('show-real'); $('table.sampling-plan').toggleClass('show-estimated').toggleClass('show-real'); @@ -64,12 +62,12 @@ <s:textfield name="filter.periodFrom" label="%{getText('wao.ui.form.periodFrom')}" - placeholder="04/2014" + placeholder="%{getFilterPeriodFromPlaceholder()}" cssClass="input-small" /> <s:textfield name="filter.periodTo" label="%{getText('wao.ui.form.period.to')}" - placeholder="03/2015" + placeholder="%{getFilterPeriodToPlaceholder()}" cssClass="input-small" /> </fieldset> @@ -253,7 +251,7 @@  <s:iterator value="samplingPlan.months" var="month"> - <th class="effort <s:if test="@fr.ifremer.wao.WaoUtils@isCurrentMonth(#month)"> now</s:if>"> + <th class="effort <s:if test="isCurrentMonth(#month)"> now</s:if>"> <s:property value="%{formatMonth(#month)}"/> </th> </s:iterator> @@ -353,7 +351,7 @@ <s:set var="expected" value="%{getNbTidesExpected(#month)}"/> <s:set var="estimated" value="%{getNbTidesEstimated(#month)}"/> <s:set var="real" value="%{getNbTidesReal(#month)}"/> - <td class="effort <s:if test="@fr.ifremer.wao.WaoUtils@isCurrentMonth(#month)"> now</s:if><s:if test="#estimated != #real"> estimated-differ-from-real</s:if>"> + <td class="effort <s:if test="isCurrentMonth(#month)"> now</s:if><s:if test="#estimated != #real"> estimated-differ-from-real</s:if>"> <s:if test="#expected != null"> <s:if test="authenticatedWaoUser.authorizedToViewSamplingPlanReal"> <span class="estimated<s:if test="#estimated < #expected"> lower-than-expected</s:if><s:if test="#estimated > #expected"> higher-than-expected</s:if>"> @@ -434,7 +432,7 @@ </li> <li> <s:url action="delete-sample-row" id="deleteSampleRowUrl"> - <s:param name="companyId" value="sampleRowId" /> + <s:param name="sampleRowId" value="sampleRowId" /> </s:url> <s:a href="%{deleteSampleRowUrl}"> <i class="icon-trash"></i> <s:text name="wao.ui.action.delete" /> @@ -450,6 +448,22 @@ </s:a> </li> <li> + <s:url action="sampling-plan" id="sampleRowZoomUrl"> + <s:param name="filter.periodFrom" value="%{formatMonth(firstSampleMonthDate)}"/> + <s:param name="filter.periodTo" value="%{formatMonth(lastSampleMonthDate)}"/> + <s:param name="filter.companyIds" value="%{filter.companyIds}"/> + <s:param name="filter.programNames" value="%{filter.programNames}"/> + <s:param name="filter.sampleRowCodes" value="%{filter.sampleRowCodes}"/> + <s:param name="filter.fishingZoneFacadeNames" value="%{filter.targetSpeciesDcfIds}"/> + <s:param name="filter.fishingZoneSectorNames" value="%{filter.targetSpeciesDcfIds}"/> + <s:param name="filter.fishingGearDcfIds" value="%{filter.targetSpeciesDcfIds}"/> + <s:param name="filter.targetSpeciesDcfIds" value="%{filter.targetSpeciesDcfIds}"/> + </s:url> + <s:a href="%{sampleRowZoomUrl}"> +  <s:text name="wao.ui.action.zoomOnSampleRowPeriod" /> + </s:a> + </li> + <li> <s:url action="boats" id="viewElligibleBoatsUrl"> <s:param name="sampleRowIds" value="sampleRowId" /> </s:url> @@ -496,7 +510,7 @@ </th>  <s:iterator value="samplingPlan.months" var="month"> - <td class="effort<s:if test="@fr.ifremer.wao.WaoUtils@isCurrentMonth(#month)"> now</s:if>"> + <td class="effort<s:if test="isCurrentMonth(#month)"> now</s:if>"> <s:set var="expected" value="%{samplingPlan.getTotalExpected(#month)}"/> <s:set var="estimated" value="%{samplingPlan.getTotalEstimated(#month)}"/> <s:set var="real" value="%{samplingPlan.getTotalReal(#month)}"/> Modified: trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp 2014-03-31 15:20:49 UTC (rev 1781) +++ trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp 2014-03-31 15:36:31 UTC (rev 1782) @@ -131,7 +131,7 @@ </a> <ul class="dropdown-menu"> <li> - <s:url id="changeLocaleUrl"> + <s:url id="changeLocaleUrl" includeParams="get"> <s:param name="request_locale"> <s:if test="\"fr\".equals(locale.toLanguageTag())"> en

1 0

r1781 - trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer
by bleny＠users.forge.codelutin.com March 31, 2014

March 31, 2014

Author: bleny Date: 2014-03-31 17:20:49 +0200 (Mon, 31 Mar 2014) New Revision: 1781 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1781 Log: refs #4483 show link to create contact only when it's possible: fix icon 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-03-31 15:17:20 UTC (rev 1780) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp 2014-03-31 15:20:49 UTC (rev 1781) @@ -471,7 +471,7 @@ <s:param name="sampleRowIds" value="sampleRowId" /> </s:url> <s:a href="%{createAssociatedContactUrl}"> - <i class="icon-add"></i> <s:text name="wao.ui.action.createAssociatedContact" /> + <i class="icon-plus"></i> <s:text name="wao.ui.action.createAssociatedContact" /> </s:a> </li> </s:if>

1 0

r1780 - trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer
by bleny＠users.forge.codelutin.com March 31, 2014

March 31, 2014

Author: bleny Date: 2014-03-31 17:17:20 +0200 (Mon, 31 Mar 2014) New Revision: 1780 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1780 Log: refs #4483 show link to create contact only when it's possible 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-03-31 15:11:56 UTC (rev 1779) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp 2014-03-31 15:17:20 UTC (rev 1780) @@ -465,7 +465,7 @@ <s:text name="wao.ui.action.viewAssociatedContacts" /> </s:a> </li> - <s:if test="authenticatedWaoUser.authorizedToCreateContact && isNewContactCreatable"> + <s:if test="authenticatedWaoUser.authorizedToCreateContact && newContactCreatable"> <li> <s:url action="contacts" id="createAssociatedContactUrl"> <s:param name="sampleRowIds" value="sampleRowId" />

1 0

r1779 - in trunk: wao-services/src/main/java/fr/ifremer/wao/services wao-services/src/main/java/fr/ifremer/wao/services/service wao-web/src/main/resources/i18n wao-web/src/main/webapp wao-web/src/main/webapp/WEB-INF/content/obsmer
by bleny＠users.forge.codelutin.com March 31, 2014

March 31, 2014

Author: bleny Date: 2014-03-31 17:11:56 +0200 (Mon, 31 Mar 2014) New Revision: 1779 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1779 Log: refs #4483 highligh recently modified sample row allow user to change company in filters only if authorized Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/AuthenticatedWaoUser.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlan.java trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp trunk/wao-web/src/main/webapp/wao.css Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/AuthenticatedWaoUser.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/AuthenticatedWaoUser.java 2014-03-31 13:27:37 UTC (rev 1778) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/AuthenticatedWaoUser.java 2014-03-31 15:11:56 UTC (rev 1779) @@ -216,4 +216,8 @@ return ! userProfile.isGuest(); } + public boolean isAuthorizedToViewOtherCompanies() { + return ! userProfile.isCoordinatorOrObserver(); + } + } Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlan.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlan.java 2014-03-31 13:27:37 UTC (rev 1778) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlan.java 2014-03-31 15:11:56 UTC (rev 1779) @@ -30,6 +30,7 @@ import fr.ifremer.wao.entity.SampleRowLog; import fr.ifremer.wao.entity.TerrestrialLocation; import org.apache.commons.collections4.CollectionUtils; +import org.nuiton.util.DateUtil; import java.io.Serializable; import java.text.NumberFormat; @@ -454,18 +455,10 @@ return sampleRowId; } - public Date getLatestSampleLogCreateDate() { - return latestSampleLogCreateDate; - } - public Range<Date> getSampleRowMonthPeriod() { return sampleRowMonthPeriod; } - public Date getLastSampleMonthEndOfMonth() { - return lastSampleMonthEndOfMonth; - } - public int getNbObservants() { return nbObservants; } @@ -618,6 +611,16 @@ boolean validMonth = month.before(current) || WaoUtils.isCurrentMonth(month); return validMonth && getNbTidesEstimated(month) != null; } + + public boolean isRecentlyUpdated() { + boolean isRecentlyUpdated = DateUtil.getDifferenceInDays(latestSampleLogCreateDate, new Date()) <= 2 * 7; + return isRecentlyUpdated; + } + + public boolean isNewContactCreatable() { + boolean isNewContactCreatable = new Date().before(lastSampleMonthEndOfMonth); + return isNewContactCreatable; + } } public static class ObsMerSamplingPlanStatistics implements Serializable { Modified: trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties =================================================================== --- trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties 2014-03-31 13:27:37 UTC (rev 1778) +++ trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties 2014-03-31 15:11:56 UTC (rev 1779) @@ -357,6 +357,7 @@ wao.ui.misc.other=Other wao.ui.misc.otherInfos=Others information wao.ui.misc.others=Others +wao.ui.misc.recentUpdate=Recent update wao.ui.misc.refused=Refused wao.ui.misc.since=since wao.ui.misc.total=Total Modified: trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties =================================================================== --- trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties 2014-03-31 13:27:37 UTC (rev 1778) +++ trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties 2014-03-31 15:11:56 UTC (rev 1779) @@ -357,6 +357,7 @@ wao.ui.misc.other=Autre wao.ui.misc.otherInfos=Autre information wao.ui.misc.others=Autres +wao.ui.misc.recentUpdate=MàJ récente wao.ui.misc.refused=Réfusé wao.ui.misc.since=depuis le wao.ui.misc.total=Total 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-03-31 13:27:37 UTC (rev 1778) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp 2014-03-31 15:11:56 UTC (rev 1779) @@ -76,14 +76,18 @@ <fieldset> - <s:select name="filter.companyIds" - label="%{getText('wao.ui.entity.Company')}" - list="filterValues.companies" - listKey="value" - listValue="label" - multiple="true" - dataBinding="companies" /> + <s:if test="authenticatedWaoUser.authorizedToViewOtherCompanies"> + <s:select name="filter.companyIds" + label="%{getText('wao.ui.entity.Company')}" + list="filterValues.companies" + listKey="value" + listValue="label" + multiple="true" + dataBinding="companies" /> + + </s:if> + <s:select name="filter.programNames" label="%{getText('wao.ui.field.SampleRow.programName')}" list="filterValues.programNames" @@ -186,7 +190,12 @@ <s:set var="fullView" value="%{fullView}" /> <s:set var="displayTidesReal" value="true" /> -<s:set var="nbColumnsForProfessionInFullView" value="13" /> +<s:if test="authenticatedWaoUser.authorizedToViewOtherCompanies"> + <s:set var="nbColumnsForProfessionInFullView" value="13" /> +</s:if> +<s:else> + <s:set var="nbColumnsForProfessionInFullView" value="12" /> +</s:else> <s:set var="nbColumnsForProfessionInCompactView" value="5" /> <s:set var="nbColumnsForMonths" value="%{samplingPlan.months.size() + 1}" /> <s:set var="nbColumnsForOther" value="6" /> @@ -224,7 +233,11 @@  <th><s:text name="wao.ui.field.SampleRow.code"/></th> <th><s:text name="wao.ui.samplingPlan.program"/></th> - <th class="only-in-full-view"><s:text name="wao.ui.entity.Company"/></th> + <s:if test="authenticatedWaoUser.authorizedToViewOtherCompanies"> + <th class="only-in-full-view"> + <s:text name="wao.ui.entity.Company"/> + </th> + </s:if> <th><s:text name="wao.ui.entity.FishingZone"/></th> <th class="only-in-full-view"><s:text name="wao.ui.samplingPlan.fishingZoneInfo"/></th> <th class="only-in-full-view"><s:text name="wao.ui.misc.METIER"/> <br/> <s:text name="wao.ui.field.SampleRow.dcf5Code"/></th> @@ -289,19 +302,32 @@ </tr> <%--Iterate on SampleRows --%> <s:iterator value="samplingPlanSector" var="samplingPlanRow"> - <tr class="sample-row-row<s:if test="sampleRowToHighlightId.equals(topiaId)"> highlight</s:if>"> + <tr class="sample-row-row<s:if test="sampleRowId.equals(sampleRowToHighlightId)"> highlight</s:if>"> <th> <s:property value="code" /> + <s:if test="recentlyUpdated"> + <span class="label label-important"> + <s:text name="wao.ui.misc.recentUpdate" /> + </span> + </s:if> </th> <td><s:property value="programName" /></td> - <td class="only-in-full-view"><s:property value="companyName" /></td> + <s:if test="authenticatedWaoUser.authorizedToViewOtherCompanies"> + <td class="only-in-full-view"> + <s:property value="companyName" /> + </td> + </s:if> <td class="only-in-full-view"><s:property value="fishingZones" /></td> <td class="only-in-compact-view"> <s:property value="fishingZones" /> - (<s:property value="fishingZonesInfos" />) + <s:if test=" ! fishingZonesInfos.empty"> + (<s:property value="fishingZonesInfos" />) + </s:if> </td> - <td class="only-in-full-view"><s:property value="fishingZonesInfos" /></td> <td class="only-in-full-view"> + <s:property value="fishingZonesInfos" /> + </td> + <td class="only-in-full-view"> <s:iterator value="dcf5CodesAndDescriptions"> <abbr title="<s:property value="value"/>"><s:property value="key"/></abbr> </s:iterator> @@ -348,7 +374,7 @@ <s:property value="totalTidesEstimated" /> </span> <span class="real<s:if test="totalTidesReal < totalTidesExpected"> lower-than-expected</s:if><s:if test="totalTidesReal > totalTidesExpected"> higher-than-expected</s:if>"> - <s:property value="totalTidesReal" /> (Total sur la période du ... au ...) + <s:property value="totalTidesReal" /> </span> / </s:if> @@ -439,7 +465,7 @@ <s:text name="wao.ui.action.viewAssociatedContacts" /> </s:a> </li> - <s:if test="authenticatedWaoUser.authorizedToCreateContact"> + <s:if test="authenticatedWaoUser.authorizedToCreateContact && isNewContactCreatable"> <li> <s:url action="contacts" id="createAssociatedContactUrl"> <s:param name="sampleRowIds" value="sampleRowId" /> Modified: trunk/wao-web/src/main/webapp/wao.css =================================================================== --- trunk/wao-web/src/main/webapp/wao.css 2014-03-31 13:27:37 UTC (rev 1778) +++ trunk/wao-web/src/main/webapp/wao.css 2014-03-31 15:11:56 UTC (rev 1779) @@ -243,6 +243,10 @@ background-color: #e6e6e6; } +table.sampling-plan tbody tr.sample-row-row.highlight { + background-color: #ffff99; +} + table.sampling-plan tbody tr.sample-row-row:hover { background-color: tan; background-color: antiquewhite;

1 0