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

[Suiviobsmer-commits] r720 - trunk
by tchemit＠users.labs.libre-entreprise.org 29 Oct '10

29 Oct '10

Author: tchemit Date: 2010-10-29 08:26:47 +0000 (Fri, 29 Oct 2010) New Revision: 720 Log: Update mavenpom4labs to 2.4. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-10-28 13:48:40 UTC (rev 719) +++ trunk/pom.xml 2010-10-29 08:26:47 UTC (rev 720) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4labs</artifactId> - <version>2.4-SNAPSHOT</version> + <version>2.4</version> </parent> <groupId>fr.ifremer</groupId>

1 0

[Suiviobsmer-commits] r719 - trunk/wao-business/src/main/java/fr/ifremer/wao/service
by bleny＠users.labs.libre-entreprise.org 28 Oct '10

28 Oct '10

Author: bleny Date: 2010-10-28 13:48:40 +0000 (Thu, 28 Oct 2010) New Revision: 719 Log: add FIXME Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java 2010-10-28 13:47:52 UTC (rev 718) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java 2010-10-28 13:48:40 UTC (rev 719) @@ -519,6 +519,7 @@ protected Map<String, Double> executeGetDataReliability (TopiaContext transaction, SamplingFilter filter) throws Exception { + // FIXME bleny 20101028 exception if company is not in the DB results WaoQueryBuilder builder = context.newQueryBuilder(); ContactProperty contactProperty = builder.initializeForContact();

1 0

[Suiviobsmer-commits] r718 - in trunk/wao-ui/src/main: java/fr/ifremer/wao/ui/pages webapp
by bleny＠users.labs.libre-entreprise.org 28 Oct '10

28 Oct '10

Author: bleny Date: 2010-10-28 13:47:52 +0000 (Thu, 28 Oct 2010) New Revision: 718 Log: better presentation of global synthesis result Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java trunk/wao-ui/src/main/webapp/Synthesis.tml 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 2010-10-28 09:51:54 UTC (rev 717) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java 2010-10-28 13:47:52 UTC (rev 718) @@ -24,6 +24,7 @@ package fr.ifremer.wao.ui.pages; +import fr.ifremer.wao.bean.GlobalIndicatorValue; import fr.ifremer.wao.bean.GlobalSynthesisResult; import fr.ifremer.wao.bean.SynthesisId; import fr.ifremer.wao.WaoException; @@ -511,4 +512,18 @@ return getDataReliability().get(user.getCompany()); } + /********************* GLOBAL SYNTHESIS ***********************************/ + + @Property + private GlobalIndicatorValue globalLevels[] = GlobalIndicatorValue.values(); + + /* variable used in template */ + @Property + private GlobalIndicatorValue globalLevel; + + public boolean highlightGlobalLevel() { + return globalLevel == getGlobalSynthesisResult().getGlobalLevel(); + } + + } \ No newline at end of file Modified: trunk/wao-ui/src/main/webapp/Synthesis.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Synthesis.tml 2010-10-28 09:51:54 UTC (rev 717) +++ trunk/wao-ui/src/main/webapp/Synthesis.tml 2010-10-28 13:47:52 UTC (rev 718) @@ -362,7 +362,25 @@ <t:indicatorLevels t:indicator="activeIndicator" t:highlightLevel="activeIndicatorLevel" /> </t:loop> - Bilan de la synthèse globale : ${globalSynthesisResult.globalLevel} + <table class="indicatorLevels"> + <tbody> + <tr> + <t:loop t:source="globalLevels" t:value="globalLevel"> + <t:if test="highlightGlobalLevel()"> + <td class="highlight selected"> + ${globalLevel} + </td> + <p:else> + <td> + ${globalLevel} + </td> + </p:else> + </t:if> + </t:loop> + </tr> + </tbody> + </table> + </div> </t:block> </t:layout>

1 0

[Suiviobsmer-commits] r717 - in trunk: 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/base
by bleny＠users.labs.libre-entreprise.org 28 Oct '10

28 Oct '10

Author: bleny Date: 2010-10-28 09:51:54 +0000 (Thu, 28 Oct 2010) New Revision: 717 Log: add multiplicity on field SampleRow in SamplingFilter to allow filtering on multiple row ; back-ward compatibility with existing code maintened Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SamplingFilterImpl.java trunk/wao-business/src/main/xmi/wao.zargo trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/AbstractFilteredPage.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java 2010-10-27 13:39:34 UTC (rev 716) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java 2010-10-28 09:51:54 UTC (rev 717) @@ -28,6 +28,7 @@ import fr.ifremer.wao.entity.Company; import fr.ifremer.wao.entity.SampleRow; import fr.ifremer.wao.entity.WaoUser; +import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; import org.nuiton.topia.framework.TopiaQuery; import org.nuiton.util.PeriodDates; @@ -222,10 +223,24 @@ // SampleRow filter depends on SampleRow OR sectorName OR facadeName // sectorName and facadeName are the two FishingZone filters known - if (sampleRow != null) { - query.addEquals(sampleRowProperty.$alias(), sampleRow); // FishingZone filter (sectorName OR facadeName) + if (CollectionUtils.isNotEmpty(filter.getSampleRows())) { + + query.addEquals(sampleRowProperty.$alias(), + filter.getSampleRows().toArray( + new SampleRow[filter.getSampleRows().size()])); + // another implementation for above line : (not tested) + // List<String> sampleRowsCodes = new ArrayList<String>(sampleRows.size()); + // for (SampleRow row : sampleRows) { + // sampleRowsCodes.add(row.getCode()); + // } + // query.addEquals(SampleRow.CODE, sampleRowsCodes.toArray(new String[sampleRowsCodes.size()])); + + if (logger.isDebugEnabled()) { + logger.debug("query for filtering multiple rows is " + query); + } + } else if (StringUtils.isNotEmpty(filter.getSectorName()) || StringUtils.isNotEmpty(filter.getFacadeName())) { Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SamplingFilterImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SamplingFilterImpl.java 2010-10-27 13:39:34 UTC (rev 716) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SamplingFilterImpl.java 2010-10-28 09:51:54 UTC (rev 717) @@ -24,8 +24,15 @@ package fr.ifremer.wao.bean; +import fr.ifremer.wao.entity.SampleRow; +import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import java.util.ArrayList; +import java.util.Collection; + /** * SamplingFilterImpl * @@ -35,10 +42,14 @@ */ public class SamplingFilterImpl extends SamplingFilter { + private static final Logger log = + LoggerFactory.getLogger(SamplingFilterImpl.class); + + @Override public boolean isSamplingFiltered() { // all field except fromDate and nbMonthsFinishedFromToday - boolean result = getSampleRow() != null || + boolean result = getSampleRows() != null || StringUtils.isNotEmpty(getSectorName()) || StringUtils.isNotEmpty(getFacadeName()) || StringUtils.isNotEmpty(getProgramName()) || @@ -50,7 +61,7 @@ @Override public boolean isPeriodFilteredOnly() { boolean periodNotNull = getPeriod() != null; - boolean othersNull = getSampleRow() == null && + boolean othersNull = getSampleRows() == null && StringUtils.isEmpty(getSectorName()) && StringUtils.isEmpty(getFacadeName()) && StringUtils.isEmpty(getProgramName()) && @@ -60,4 +71,33 @@ return periodNotNull && othersNull; } + /** Help method similar to setSampleRows when filtering on a single row. */ + @Override + public void setSampleRow(SampleRow sampleRow) { + if (sampleRow == null) { + setSampleRows(null); + } else { + Collection<SampleRow> tempSampleRows = new ArrayList<SampleRow>(); + tempSampleRows.add(sampleRow); + setSampleRows(tempSampleRows); + } + } + + /** Help method similar to getSampleRows when filtering on a single row. + * Use this method only if you're sure there is a single row filtered. + * It is always safer to user getSampleRows but this method is provided + * to make this bean back-ward compatible with code written when + * sampleRow has no multiplicity and was not a collection. + */ + @Override + public SampleRow getSampleRow() { + SampleRow sampleRow = null; + if (CollectionUtils.isNotEmpty(getSampleRows())) { + sampleRow = getSampleRows(0); + if (getSampleRows().size() > 1) { + log.warn("other sample rows in the filter will be ignored"); + } + } + return sampleRow; + } } Modified: trunk/wao-business/src/main/xmi/wao.zargo =================================================================== (Binary files differ) Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/AbstractFilteredPage.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/AbstractFilteredPage.java 2010-10-27 13:39:34 UTC (rev 716) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/AbstractFilteredPage.java 2010-10-28 09:51:54 UTC (rev 717) @@ -36,6 +36,7 @@ import fr.ifremer.wao.service.ServiceUser; import fr.ifremer.wao.ui.data.FiltersModel; import fr.ifremer.wao.ui.data.GenericSelectModel; +import org.apache.commons.collections.CollectionUtils; import org.apache.tapestry5.OptionModel; import org.apache.tapestry5.SelectModel; import org.apache.tapestry5.annotations.Persist;

1 0

[Suiviobsmer-commits] r716 - in trunk: wao-business/src/main/java/fr/ifremer/wao/service wao-business/src/main/resources/i18n wao-ui/src/main/java/fr/ifremer/wao/ui/pages
by bleny＠users.labs.libre-entreprise.org 27 Oct '10

27 Oct '10

Author: bleny Date: 2010-10-27 13:39:34 +0000 (Wed, 27 Oct 2010) New Revision: 716 Log: fix build Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java trunk/wao-business/src/main/resources/i18n/wao-business-en_GB.properties trunk/wao-business/src/main/resources/i18n/wao-business-fr_FR.properties trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Administration.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java 2010-10-27 09:57:27 UTC (rev 715) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java 2010-10-27 13:39:34 UTC (rev 716) @@ -842,7 +842,7 @@ } @Override - protected void executeUpdateGlobalSynthesisParameters(TopiaContext transaction, + protected void executeUpdateGlobalSynthesisParameter(TopiaContext transaction, Indicator indicator, WaoUser author, String comment) throws Exception { String logText = ""; Modified: trunk/wao-business/src/main/resources/i18n/wao-business-en_GB.properties =================================================================== --- trunk/wao-business/src/main/resources/i18n/wao-business-en_GB.properties 2010-10-27 09:57:27 UTC (rev 715) +++ trunk/wao-business/src/main/resources/i18n/wao-business-en_GB.properties 2010-10-27 13:39:34 UTC (rev 716) @@ -84,6 +84,7 @@ wao.error.serviceSynthesis.getGlobalSynthesisParameters=Unable to get data about global synthesis parameters wao.error.serviceSynthesis.getGlobalSynthesisResult= wao.error.serviceSynthesis.getNonComplianceBoardingIndicator= +wao.error.serviceSynthesis.updateGlobalSynthesisParameter=Unable to update global synthesis parameters wao.error.serviceUser.connect= wao.error.serviceUser.createDefaultAdmin= wao.error.serviceUser.createUpdateCompany= Modified: trunk/wao-business/src/main/resources/i18n/wao-business-fr_FR.properties =================================================================== --- trunk/wao-business/src/main/resources/i18n/wao-business-fr_FR.properties 2010-10-27 09:57:27 UTC (rev 715) +++ trunk/wao-business/src/main/resources/i18n/wao-business-fr_FR.properties 2010-10-27 13:39:34 UTC (rev 716) @@ -83,6 +83,7 @@ wao.error.serviceSynthesis.getGlobalSynthesisParameters=Impossible de r\u00E9cup\u00E9rer les donn\u00E9es concernant les indicateurs pour la synth\u00E8se globale wao.error.serviceSynthesis.getGlobalSynthesisResult= wao.error.serviceSynthesis.getNonComplianceBoardingIndicator=Impossible de r\u00E9cup\u00E9rer l'indicateur de non respect du nombre d'observateurs embarqu\u00E9s +wao.error.serviceSynthesis.updateGlobalSynthesisParameter=Impossible de mettre \u00E0 jour les param\u00E8tres de la synth\u00E8se globale wao.error.serviceUser.connect=Une erreur est survenue lors de la demande de connexion wao.error.serviceUser.createDefaultAdmin=Impossible de cr\u00E9er l'administrateur par d\u00E9faut wao.error.serviceUser.createUpdateCompany=Impossible de cr\u00E9er ou de mettre \u00E0 jour la soci\u00E9t\u00E9 Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Administration.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Administration.java 2010-10-27 09:57:27 UTC (rev 715) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Administration.java 2010-10-27 13:39:34 UTC (rev 716) @@ -656,8 +656,8 @@ void onSuccessFromSynthesisParametersForm() { for (Indicator indicator : getIndicators()) { - serviceSynthesis.updateGlobalSynthesisParameters(indicator, - currentUser.getUser(), comment); + serviceSynthesis.updateGlobalSynthesisParameter + (indicator, currentUser.getUser(), comment); } }

1 0

[Suiviobsmer-commits] r715 - in trunk/wao-ui/src/main: java/fr/ifremer/wao/ui/pages webapp
by bleny＠users.labs.libre-entreprise.org 27 Oct '10

27 Oct '10

Author: bleny Date: 2010-10-27 09:57:27 +0000 (Wed, 27 Oct 2010) New Revision: 715 Log: add totals by column in sampling plan Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SampleRowForm.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SamplingPlan.java trunk/wao-ui/src/main/webapp/SamplingPlan.tml Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SampleRowForm.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SampleRowForm.java 2010-10-27 09:12:20 UTC (rev 714) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SampleRowForm.java 2010-10-27 09:57:27 UTC (rev 715) @@ -647,19 +647,19 @@ } if (!edited && !periodChanged) { - // No company change possible when sampleRow has real tide time - if (!getSampleRow().hasSampleMonthRealTideTime()) { - // Save company - Company company = getCompanySelectModel().findObject(companyId); - getSampleRow().setCompany(company); - } + // No company change possible when sampleRow has real tide time + if (!getSampleRow().hasSampleMonthRealTideTime()) { + // Save company + Company company = getCompanySelectModel().findObject(companyId); + getSampleRow().setCompany(company); + } - // Save sampleMonths - getSampleRow().setSampleMonth(getSampleMonths()); + // Save sampleMonths + getSampleRow().setSampleMonth(getSampleMonths()); - serviceSampling.createUpdateSampleRow(sampleRow, boats, getSampleRowLog()); + serviceSampling.createUpdateSampleRow(sampleRow, boats, getSampleRowLog()); - return SamplingPlan.class; + return SamplingPlan.class; } else { // Reinitialize professionId for select to avoid selection from existing Profession professionId = null; Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SamplingPlan.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SamplingPlan.java 2010-10-27 09:12:20 UTC (rev 714) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SamplingPlan.java 2010-10-27 09:57:27 UTC (rev 715) @@ -60,6 +60,7 @@ import java.text.DateFormat; import java.text.NumberFormat; import java.text.SimpleDateFormat; +import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -400,6 +401,59 @@ return NumberFormat.getNumberInstance(); } + private List<String> totals; + + @Property + private String total; + + public List<String> getTotals() { + + List<String> totals = new ArrayList<String>(); + + // high totals are the total... of the totals, it will appear + // in the bottom right, as the last element of the "totals" line + Integer highTotalExpected = 0; + Integer highTotalReal = 0; + + for (Date month : getMonths()) { + this.month = month; + + Integer totalExpected = 0, totalReal = 0; + + for (SampleRow row : getData()) { + this.row = row; + + + Integer expected = getNbTidesExpected(), real = getNbTidesReal(); + if (logger.isDebugEnabled()) { + logger.debug(String.format("expected = %s, real = %s", expected, real)); + } + + if (expected != null) { + totalExpected += expected; + } + if (real != null) { + totalReal += real; + } + } + + String total = totalExpected.toString(); + if (canDisplayTidesReal() && totalReal != 0) { + total += " (" + totalReal + ")"; + } + + totals.add(total); + + highTotalExpected += totalExpected; + highTotalReal += totalReal; + + } + + totals.add(highTotalExpected + " (" + highTotalReal + ")"); + + return totals; + } + /** ------------------------- HTML & STYLE ----------------------------- **/ @Property @@ -407,7 +461,7 @@ public String getRowComment() { String comment = row.getComment(); - // Problem whith " in chenilleKit ToolTip component + // Problem with " in chenilleKit ToolTip component comment = comment.replace("\n", "<br />"); return comment; } Modified: trunk/wao-ui/src/main/webapp/SamplingPlan.tml =================================================================== --- trunk/wao-ui/src/main/webapp/SamplingPlan.tml 2010-10-27 09:12:20 UTC (rev 714) +++ trunk/wao-ui/src/main/webapp/SamplingPlan.tml 2010-10-27 09:57:27 UTC (rev 715) @@ -296,6 +296,20 @@ </td> </tr> </t:loop> + <tr> + <td colspan="${nbColumnsTotal}" class="facade"> + Totaux + </td> + </tr> + <tr> + <td colspan="${nbColumnsForProfession}" /> + <t:loop source="totals" value="total"> + <td class="width50 acenter ${monthCurrentClass}"> + ${total} + </td> + </t:loop> + <td colspan="${nbColumnsForOther}" /> + </tr> </tbody> </table> </t:zone>

1 0

[Suiviobsmer-commits] r714 - trunk/wao-ui/src/main/webapp
by bleny＠users.labs.libre-entreprise.org 27 Oct '10

27 Oct '10

Author: bleny Date: 2010-10-27 09:12:20 +0000 (Wed, 27 Oct 2010) New Revision: 714 Log: french Modified: trunk/wao-ui/src/main/webapp/SampleRowForm.tml Modified: trunk/wao-ui/src/main/webapp/SampleRowForm.tml =================================================================== --- trunk/wao-ui/src/main/webapp/SampleRowForm.tml 2010-10-27 09:10:56 UTC (rev 713) +++ trunk/wao-ui/src/main/webapp/SampleRowForm.tml 2010-10-27 09:12:20 UTC (rev 714) @@ -139,7 +139,7 @@ title="Supprimer ce mois"/> <p:else> <img src="${asset:context:}/img/suppr-unavailable-16px.png" alt="Supprimer" - title="Suppression indisponible en raison de données réels existantes" /> + title="Suppression indisponible en raison de données réelles existantes" /> </p:else> </t:unless> </td>

1 0

[Suiviobsmer-commits] r713 - in trunk: wao-business/src/main/java/fr/ifremer/wao/service wao-business/src/main/xmi wao-ui/src/main/java/fr/ifremer/wao/ui/pages wao-ui/src/main/webapp
by bleny＠users.labs.libre-entreprise.org 27 Oct '10

27 Oct '10

Author: bleny Date: 2010-10-27 09:10:56 +0000 (Wed, 27 Oct 2010) New Revision: 713 Log: fix indicator administration ; add mandatory comment field Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java trunk/wao-business/src/main/xmi/wao.zargo trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Administration.java trunk/wao-ui/src/main/webapp/Administration.tml Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java 2010-10-26 17:06:43 UTC (rev 712) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java 2010-10-27 09:10:56 UTC (rev 713) @@ -851,8 +851,7 @@ // fist, find the indicator Indicator oldIndicator = WaoDAOHelper.getIndicatorDAO(transaction) - .findAllByIndicatorId(indicator.getIndicatorId()) - .iterator().next(); + .findByIndicatorId(indicator.getIndicatorId()); // find what have been changed boolean coefficientChanged = indicator.getCoefficient() @@ -868,15 +867,16 @@ indicator.getSynthesisId().getLabel(), oldIndicator.getCoefficient(), indicator.getCoefficient()); + + oldIndicator.setCoefficient(indicator.getCoefficient()); } // new compare old and new level bounds for (IndicatorLevel level : oldIndicator.getIndicatorLevel()) { IndicatorLevel newLevel = null; - // set oldLevel + // set newLevel for (IndicatorLevel tempLevel : indicator.getIndicatorLevel()) { - log.debug(tempLevel.getLevel() + " ?= " + level.getLevel()); if (tempLevel.getLevel() == level.getLevel()) { newLevel = tempLevel; } @@ -914,10 +914,10 @@ IndicatorLog indicatorLog = new IndicatorLogImpl(); indicatorLog.setAuthor(author); indicatorLog.setComment(comment); + indicatorLog.setLogText(logText.trim()); // add entity logText WaoDAOHelper.getIndicatorLogDAO(transaction).create(indicatorLog); - indicatorLog.setLogText(logText.trim()); // attach the new indicator log to the concerned indicator // Collection indicatorLogs = indicator.getIndicatorLog(); Modified: trunk/wao-business/src/main/xmi/wao.zargo =================================================================== (Binary files differ) Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Administration.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Administration.java 2010-10-26 17:06:43 UTC (rev 712) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Administration.java 2010-10-27 09:10:56 UTC (rev 713) @@ -63,6 +63,7 @@ import org.apache.tapestry5.annotations.Property; import org.apache.tapestry5.annotations.SessionState; import org.apache.tapestry5.beaneditor.BeanModel; +import org.apache.tapestry5.beaneditor.Validate; import org.apache.tapestry5.corelib.components.BeanEditForm; import org.apache.tapestry5.corelib.components.Form; import org.apache.tapestry5.corelib.components.Zone; @@ -79,6 +80,7 @@ import java.io.InputStream; import java.util.ArrayList; import java.util.Collection; +import java.util.Iterator; import java.util.List; /** @@ -639,16 +641,24 @@ @InjectComponent private Form synthesisParametersForm; - @Log + /** The comment field value of the form. */ + @Property + @Validate("required") + private String comment; + + void onValidateFromSynthesisParametersForm() { + + // TODO bleny 20101027 check that for each level, upperBound is contained + // between the upperBound of the lower level and the upperBound of + // the higher level + + } + void onSuccessFromSynthesisParametersForm() { - - // FIXME bleny 20101026 replace missing comment by something from a textarea for (Indicator indicator : getIndicators()) { serviceSynthesis.updateGlobalSynthesisParameters(indicator, - currentUser.getUser(), "missing comment"); + currentUser.getUser(), comment); } - - } Modified: trunk/wao-ui/src/main/webapp/Administration.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Administration.tml 2010-10-26 17:06:43 UTC (rev 712) +++ trunk/wao-ui/src/main/webapp/Administration.tml 2010-10-27 09:10:56 UTC (rev 713) @@ -179,16 +179,28 @@ <form t:type="form" t:id="synthesisParametersForm" t:zone="synthesisParametersFormZone"> + <t:errors t:banner="message:errors-banner" /> +  <t:loop t:source="indicators" t:value="indicator" volatile="true"> <t:indicatorLevels t:indicator="indicator" editable="true" /> </t:loop> - Total coefficients : ${totalCoefficient} + <table class="indicatorLevels"> + <tr> + <th>Total coefficients : </th> + <td>${totalCoefficient}</td> + </tr> + </table> + <div> + <p><label>Commentaire sur la modification* :</label></p> + <p><input t:type="textarea" t:id="comment" cols="50" rows="5" value="comment"/></p> + </div> + <div class="fright"> <input t:type="submit" t:id="saveData" class="ico save" value="Save" title="Enregistrer les modifications" /> - <input t:type="submit" t:id="cancelSave" class="ico undo" value="Undo" title="Annuler les modifications" /> + <input type="reset" class="ico undo" value="Annuler les modificationss" title="Annuler les modifications" /> </div> </form> </t:zone>

1 0

[Suiviobsmer-commits] r712 - in trunk: wao-business/src/main/java/fr/ifremer/wao/service wao-business/src/main/xmi wao-ui/src/main/java/fr/ifremer/wao/ui/components wao-ui/src/main/java/fr/ifremer/wao/ui/pages wao-ui/src/main/resources/fr/ifremer/wao/ui/components wao-ui/src/main/webapp
by bleny＠users.labs.libre-entreprise.org 26 Oct '10

26 Oct '10

Author: bleny Date: 2010-10-26 17:06:43 +0000 (Tue, 26 Oct 2010) New Revision: 712 Log: WIP : create form to update indicators and levels Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java trunk/wao-business/src/main/xmi/wao.zargo trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/IndicatorLevels.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Administration.java trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/IndicatorLevels.tml trunk/wao-ui/src/main/webapp/Administration.tml trunk/wao-ui/src/main/webapp/Synthesis.tml Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java 2010-10-26 12:52:54 UTC (rev 711) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java 2010-10-26 17:06:43 UTC (rev 712) @@ -841,6 +841,100 @@ return indicators; } + @Override + protected void executeUpdateGlobalSynthesisParameters(TopiaContext transaction, + Indicator indicator, WaoUser author, String comment) + throws Exception { + String logText = ""; + + boolean somethingChanged = false; + + // fist, find the indicator + Indicator oldIndicator = WaoDAOHelper.getIndicatorDAO(transaction) + .findAllByIndicatorId(indicator.getIndicatorId()) + .iterator().next(); + + // find what have been changed + boolean coefficientChanged = indicator.getCoefficient() + != oldIndicator.getCoefficient(); + if (coefficientChanged) { + somethingChanged = true; + + // add something to log + // update database + logText += String.format( + "Modification du coefficient de l'indicateur « %s » " + + "(ancienne valeur = %s, nouvelle valeur = %s)\n\n", + indicator.getSynthesisId().getLabel(), + oldIndicator.getCoefficient(), + indicator.getCoefficient()); + } + + // new compare old and new level bounds + for (IndicatorLevel level : oldIndicator.getIndicatorLevel()) { + IndicatorLevel newLevel = null; + + // set oldLevel + for (IndicatorLevel tempLevel : indicator.getIndicatorLevel()) { + log.debug(tempLevel.getLevel() + " ?= " + level.getLevel()); + if (tempLevel.getLevel() == level.getLevel()) { + newLevel = tempLevel; + } + } + + boolean upperBoundChanged = level.getUpperBound() + != newLevel.getUpperBound(); + if (upperBoundChanged) { + somethingChanged = true; + + logText += String.format( + "Modification du seuil de transition entre les niveaux " + + "%s et %s de l'indicateur « %s » (ancienne valeur = %s" + + ", nouvelle valeur = %s)\n\n", + level.getLevel(), level.getLevel() + 1, + indicator.getSynthesisId().getLabel(), + level.getUpperBound(), newLevel.getUpperBound()); + + level.setUpperBound(newLevel.getUpperBound()); + + WaoDAOHelper.getIndicatorLevelDAO(transaction).update(level); + } + + } + + if (somethingChanged) { + + // something has changed so we must store a log + + if (log.isDebugEnabled()) { + log.debug("modifications in global synthesis parameters :\n" + + logText); + } + + IndicatorLog indicatorLog = new IndicatorLogImpl(); + indicatorLog.setAuthor(author); + indicatorLog.setComment(comment); + + // add entity logText + WaoDAOHelper.getIndicatorLogDAO(transaction).create(indicatorLog); + indicatorLog.setLogText(logText.trim()); + + // attach the new indicator log to the concerned indicator + // Collection indicatorLogs = indicator.getIndicatorLog(); + Collection<IndicatorLog> indicatorLogs = oldIndicator.getIndicatorLog(); + indicatorLogs.add(indicatorLog); + oldIndicator.setIndicatorLog(indicatorLogs); + + // finally, update the indicator + WaoDAOHelper.getIndicatorDAO(transaction).update(oldIndicator); + + transaction.commitTransaction(); + } else { + log.warn("no modification were found in global synthesis " + + "parameters at updating"); + } + } + protected PieChartData createContactPieChartData() { PieChartData data = new PieChartDataImpl(); for (ContactPieChartConstant constant : ContactPieChartConstant.values()) { Modified: trunk/wao-business/src/main/xmi/wao.zargo =================================================================== (Binary files differ) Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/IndicatorLevels.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/IndicatorLevels.java 2010-10-26 12:52:54 UTC (rev 711) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/IndicatorLevels.java 2010-10-26 17:06:43 UTC (rev 712) @@ -34,6 +34,9 @@ @Parameter(required = false) private Boolean withLegend; + @Parameter + private Boolean editable; + /* variable used in view */ @Property private IndicatorLevel indicatorLevel; @@ -52,6 +55,21 @@ return withLegend; } + public void setWithLegend(Boolean withLegend) { + this.withLegend = withLegend; + } + + public void setEditable(Boolean editable) { + this.editable = editable; + } + + public Boolean getEditable() { + if (editable == null) { + editable = false; + } + return editable; + } + public boolean highLightCurrentIndicatorLevel() { if (log.isDebugEnabled()) { log.debug("indicatorLevel = " + indicatorLevel); Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Administration.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Administration.java 2010-10-26 12:52:54 UTC (rev 711) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Administration.java 2010-10-26 17:06:43 UTC (rev 712) @@ -64,6 +64,7 @@ import org.apache.tapestry5.annotations.SessionState; import org.apache.tapestry5.beaneditor.BeanModel; import org.apache.tapestry5.corelib.components.BeanEditForm; +import org.apache.tapestry5.corelib.components.Form; import org.apache.tapestry5.corelib.components.Zone; import org.apache.tapestry5.internal.OptionModelImpl; import org.apache.tapestry5.internal.SelectModelImpl; @@ -633,4 +634,22 @@ } return indicators; } + + + @InjectComponent + private Form synthesisParametersForm; + + @Log + void onSuccessFromSynthesisParametersForm() { + + // FIXME bleny 20101026 replace missing comment by something from a textarea + for (Indicator indicator : getIndicators()) { + serviceSynthesis.updateGlobalSynthesisParameters(indicator, + currentUser.getUser(), "missing comment"); + } + + + } + + } Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/IndicatorLevels.tml =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/IndicatorLevels.tml 2010-10-26 12:52:54 UTC (rev 711) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/IndicatorLevels.tml 2010-10-26 17:06:43 UTC (rev 712) @@ -23,7 +23,6 @@ xmlns:p="tapestry:parameter"> <table class="indicatorLevels"> - <caption></caption> <tbody> <tr> <th /> @@ -32,7 +31,7 @@ </tr> <tr> <th>Niveaux</th> - <t:loop t:source="indicator.indicatorLevel" t:value="indicatorLevel"> + <t:loop t:source="indicator.indicatorLevel" t:value="indicatorLevel" volatile="true"> <t:if test="highLightCurrentIndicatorLevel()"> <td class="highlight selected">${indicatorLevel.level}</td> <p:else> @@ -46,7 +45,7 @@ </tr> <tr> <th>Bornes</th> - <t:loop t:source="indicator.indicatorLevel" t:value="indicatorLevel"> + <t:loop t:source="indicator.indicatorLevel" t:value="indicatorLevel" volatile="true"> <td> <t:if test="indicatorLevel.lowerEqualsUpperBounds()"> ${indicatorLevel.upperBound} @@ -62,12 +61,31 @@ </td> </t:loop> </tr> -  - <caption> - En jaune, la position actuelle de la société selon cet indicateur. - </caption> -  + <t:if test="getEditable()"> + <tr> + <th>Modifications</th> + <t:loop t:source="indicator.indicatorLevel" t:value="indicatorLevel" volatile="true"> + <td> + <t:if test="indicatorLevel.lowerBoundPositiveInfinity"> + <input type="text" size="3" value="∞" disabled="disabled" /> + <p:else> +  + <input type="text" size="3" value="${indicatorLevel.lowerBound}" disabled="disabled" /> +  + </p:else> + </t:if> + <input t:type="textfield" value="indicatorLevel.upperBound" size="3" /> + </td> + </t:loop> + <td> + <input t:type="textfield" value="indicator.coefficient" size="3" /> + </td> + </tr> + </t:if> </tbody> </table> + <t:if test="isWithLegend()"> + En jaune, la position actuelle de la société selon cet indicateur. + </t:if> </html> \ No newline at end of file Modified: trunk/wao-ui/src/main/webapp/Administration.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Administration.tml 2010-10-26 12:52:54 UTC (rev 711) +++ trunk/wao-ui/src/main/webapp/Administration.tml 2010-10-26 17:06:43 UTC (rev 712) @@ -172,18 +172,26 @@ <div class="mtop10" /> - <t:if t:test="currentUser.admin"> + <t:if t:test="currentUser.admin">  - <h2>Indicateurs qualités prestataires</h2> + <t:zone t:id="synthesisParametersFormZone" t:update="show"> + <h2>Indicateurs qualités prestataires</h2> -  + <form t:type="form" t:id="synthesisParametersForm" t:zone="synthesisParametersFormZone"> - <t:loop t:source="indicators" t:value="indicator"> - <t:indicatorLevels t:indicator="indicator" /> - </t:loop> +  + <t:loop t:source="indicators" t:value="indicator" volatile="true"> + <t:indicatorLevels t:indicator="indicator" editable="true" /> + </t:loop> - Total coefficients : ${totalCoefficient} + Total coefficients : ${totalCoefficient} + <div class="fright"> + <input t:type="submit" t:id="saveData" class="ico save" value="Save" title="Enregistrer les modifications" /> + <input t:type="submit" t:id="cancelSave" class="ico undo" value="Undo" title="Annuler les modifications" /> + </div> + </form> + </t:zone> </t:if> </t:layout> Modified: trunk/wao-ui/src/main/webapp/Synthesis.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Synthesis.tml 2010-10-26 12:52:54 UTC (rev 711) +++ trunk/wao-ui/src/main/webapp/Synthesis.tml 2010-10-26 17:06:43 UTC (rev 712) @@ -162,7 +162,7 @@  <br /> - <t:indicatorLevels t:indicator="activeIndicator" t:highlightLevel="activeIndicatorLevel" /> + <t:indicatorLevels t:indicator="activeIndicator" t:highlightLevel="activeIndicatorLevel" withLegend="true" /> </div> </t:block>  @@ -182,7 +182,7 @@  <br /> - <t:indicatorLevels t:indicator="activeIndicator" t:highlightLevel="activeIndicatorLevel" /> + <t:indicatorLevels t:indicator="activeIndicator" t:highlightLevel="activeIndicatorLevel" withLegend="true" /> </div> </t:block>  @@ -228,7 +228,7 @@  <br /> - <t:indicatorLevels t:indicator="activeIndicator" t:highlightLevel="activeIndicatorLevel" /> + <t:indicatorLevels t:indicator="activeIndicator" t:highlightLevel="activeIndicatorLevel" withLegend="true" /> </div> </t:block>  @@ -311,7 +311,7 @@  <br /> - <t:indicatorLevels t:indicator="activeIndicator" t:highlightLevel="activeIndicatorLevel" /> + <t:indicatorLevels t:indicator="activeIndicator" t:highlightLevel="activeIndicatorLevel" withLegend="true" /> </div> </t:block>  @@ -349,7 +349,7 @@  <br /> - <t:indicatorLevels t:indicator="activeIndicator" t:highlightLevel="activeIndicatorLevel" /> + <t:indicatorLevels t:indicator="activeIndicator" t:highlightLevel="activeIndicatorLevel" withLegend="true" /> </div> </t:block>

1 0

[Suiviobsmer-commits] r711 - trunk
by tchemit＠users.labs.libre-entreprise.org 26 Oct '10

26 Oct '10

Author: tchemit Date: 2010-10-26 12:52:54 +0000 (Tue, 26 Oct 2010) New Revision: 711 Log: fix build (use inheritance from mavenpom for commons libs) Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-10-26 12:02:51 UTC (rev 710) +++ trunk/pom.xml 2010-10-26 12:52:54 UTC (rev 711) @@ -25,7 +25,7 @@ <dependencyManagement> <dependencies> - <dependency> +  <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-email</artifactId> @@ -112,11 +112,11 @@ <version>${tapestryVersion}</version> <scope>test</scope> </dependency>--> - <dependency> +  <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> @@ -203,12 +203,12 @@ <version>0.9.10-hudson-16</version> <scope>provided</scope> </dependency> - <dependency> +  <dependency> <groupId>com.formos.tapestry</groupId> <artifactId>tapestry-testify</artifactId>

1 0