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

[Suiviobsmer-commits] r723 - in trunk/wao-business/src/main/java/fr/ifremer/wao: bean entity service
by bleny＠users.labs.libre-entreprise.org Nov. 2, 2010

Nov. 2, 2010

Author: bleny Date: 2010-11-02 16:41:38 +0000 (Tue, 02 Nov 2010) New Revision: 723 Log: bugfix synthesis indicators when using complex filter Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/GlobalSynthesisResultImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/IndicatorImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/IndicatorLevelImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/GlobalSynthesisResultImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/bean/GlobalSynthesisResultImpl.java 2010-11-02 16:38:53 UTC (rev 722) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/GlobalSynthesisResultImpl.java 2010-11-02 16:41:38 UTC (rev 723) @@ -48,10 +48,13 @@ log.debug("in values : " + value.getKey() + " -> " + value.getValue()); } } + Double value = values.get(synthesisId); - - Indicator indicator = findIndicator(synthesisId); - IndicatorLevel result = indicator.getLevelForValue(value); + IndicatorLevel result = null; + if (value != null) { + Indicator indicator = findIndicator(synthesisId); + result = indicator.getLevelForValue(value); + } return result; } @@ -63,8 +66,15 @@ double totalCoefficients = 0.0; for (Indicator indicator : globalSynthesisParameters) { - double value = values.get(indicator.getSynthesisId()); - double level = indicator.getLevelForValue(value).getLevel(); + IndicatorLevel indicatorLevel = getLevelForIndicator(indicator.getSynthesisId()); + + if (indicatorLevel == null) { + // since we can't compute a level for this indicator, + // it's not possible to consider a coherent global level value + return null; + } + + double level = indicatorLevel.getLevel(); double coefficient = indicator.getCoefficient(); totalLevels += level * coefficient; Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/IndicatorImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/IndicatorImpl.java 2010-11-02 16:38:53 UTC (rev 722) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/IndicatorImpl.java 2010-11-02 16:41:38 UTC (rev 723) @@ -1,12 +1,17 @@ package fr.ifremer.wao.entity; import fr.ifremer.wao.bean.SynthesisId; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * */ public class IndicatorImpl extends IndicatorAbstract { + private static final Logger log = + LoggerFactory.getLogger(IndicatorImpl.class); + @Override public SynthesisId getSynthesisId() { return SynthesisId.valueOf(getIndicatorId()); @@ -25,6 +30,9 @@ return level; } } + if (log.isWarnEnabled()) { + log.warn("no level found for value " + value); + } return null; } } Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/IndicatorLevelImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/IndicatorLevelImpl.java 2010-11-02 16:38:53 UTC (rev 722) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/IndicatorLevelImpl.java 2010-11-02 16:41:38 UTC (rev 723) @@ -11,6 +11,8 @@ /** the upperBound of the lower level */ protected double lowerBound; + protected boolean upperBoundIncluded = false; + @Override public double getLowerBound() { return lowerBound; @@ -44,8 +46,11 @@ */ @Override public boolean containsValue(double value) { - boolean containsValue; - if (lowerEqualsUpperBounds()) { + boolean containsValue = false; + + if (upperBoundIncluded && value == upperBound) { + containsValue = true; + } else if (lowerEqualsUpperBounds()) { containsValue = value == getUpperBound(); } else { if (getLowerBound() < getUpperBound()) { @@ -65,4 +70,11 @@ return containsValue; } + public boolean isUpperBoundIncluded() { + return upperBoundIncluded; + } + + public void setUpperBoundIncluded(boolean upperBoundIncluded) { + this.upperBoundIncluded = upperBoundIncluded; + } } 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-11-02 16:38:53 UTC (rev 722) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java 2010-11-02 16:41:38 UTC (rev 723) @@ -254,6 +254,14 @@ Long maxValue = (Long)max.get(countAlias); result.setMaxBoardingValue(maxValue.intValue()); } + + if (log.isDebugEnabled()) { + log.debug("results in data from getBoardingBoat "); + for (Map.Entry<String, Integer> entry : result.getData().entrySet()) { + log.debug(entry.getKey() + " -> " + entry.getValue()); + } + } + return result; } @@ -369,6 +377,13 @@ Double compliance = 1.0 - nonCompliance.getValue(); compliances.put(nonCompliance.getKey(), compliance); } + + if (log.isDebugEnabled()) { + log.debug("getComplianceBoarding return values"); + for (Map.Entry<String, Double> compliance : compliances.entrySet()) { + log.debug(compliance.getKey() + " -> " + compliance.getValue()); + } + } return compliances; } @@ -624,6 +639,18 @@ } } + // + if (filter.getCompany() != null && ! results.containsKey(filter.getCompany().getName())) { + results.put(filter.getCompany().getName(), 1.0); + } + + + if (log.isDebugEnabled()) { + for (Map.Entry<String, Double> result : results.entrySet()) { + log.debug("result : " + result.getKey() + " -> " + result.getValue()); + } + } + return results; } @@ -722,6 +749,7 @@ return percentRealized; } + /** return null if 0 boarding */ protected Double getIndicatorValueForBoarding(SamplingFilter filter) { BoardingResult boardingResult = getBoardingBoats(filter); int numberOfBoatWithOneBoarding = boardingResult.getData().get("1"); @@ -729,8 +757,11 @@ for (Integer numberOfBoarding : boardingResult.getData().values()) { totalNumberOfBoarding += numberOfBoarding; } - double rate = ((double) numberOfBoatWithOneBoarding / - (double) totalNumberOfBoarding) * 100.0; + Double rate = null; + if (totalNumberOfBoarding > 0) { + rate = ((double) numberOfBoatWithOneBoarding / + (double) totalNumberOfBoarding) * 100.0; + } return rate; } @@ -741,7 +772,11 @@ for (Double compliance : complianceBoarding.values()) { total += compliance; } - double indicatorValue = 100 * (total / numberOfCompanies); + + Double indicatorValue = null; + if (numberOfCompanies > 0) { + indicatorValue = 100 * (total / numberOfCompanies); + } return indicatorValue; } @@ -766,7 +801,10 @@ for (Double reliabilityRate : dataReliability.values()) { total += reliabilityRate; } - double indicatorValue = 100 * (total / numberOfCompanies); + Double indicatorValue = null; + if (numberOfCompanies > 0) { + indicatorValue = 100 * (total / numberOfCompanies); + } return indicatorValue; } @@ -792,11 +830,13 @@ value = getIndicatorValueForDataReliability(filter); indicatorValues.put(SynthesisId.IND_DATA_RELIABILITY, value); + GlobalSynthesisResultImpl result = null; + + result = new GlobalSynthesisResultImpl(); List<Indicator> indicators = executeGetGlobalSynthesisParameters(transaction); - - GlobalSynthesisResultImpl result = new GlobalSynthesisResultImpl(); result.setIndicatorValues(indicatorValues); result.setGlobalSynthesisParameters(indicators); + return result; } @@ -827,11 +867,12 @@ } // Finally, adding a last level - IndicatorLevel lastIndicatorLevel = new IndicatorLevelImpl(); + IndicatorLevelImpl lastIndicatorLevel = new IndicatorLevelImpl(); int nextLevelNumber = levels.size() + 1; lastIndicatorLevel.setLevel(nextLevelNumber); lastIndicatorLevel.setLowerBound(lowerBound); lastIndicatorLevel.setUpperBound(lastUpperBound); + lastIndicatorLevel.setUpperBoundIncluded(true); indicator.getIndicatorLevel().add(lastIndicatorLevel); // we don't store nor commit anything, those modification are only @@ -948,3 +989,4 @@ } } +

1 0

[Suiviobsmer-commits] r722 - trunk/wao-ui/src/main/webapp
by bleny＠users.labs.libre-entreprise.org Nov. 2, 2010

Nov. 2, 2010

Author: bleny Date: 2010-11-02 16:38:53 +0000 (Tue, 02 Nov 2010) New Revision: 722 Log: add fixme in data reliability ui Modified: trunk/wao-ui/src/main/webapp/Contacts.tml Modified: trunk/wao-ui/src/main/webapp/Contacts.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Contacts.tml 2010-11-02 16:36:49 UTC (rev 721) +++ trunk/wao-ui/src/main/webapp/Contacts.tml 2010-11-02 16:38:53 UTC (rev 722) @@ -295,6 +295,7 @@ <t:if t:test="contact.validationProgram"> ${contact.dataReliability.label} <p:else> +  <input t:type="select" t:id="dataReliability" t:value="contact.dataReliability" validate="required" /> </p:else> </t:if>

1 0

[Suiviobsmer-commits] r721 - trunk/wao-ui/src/main/webapp/img
by bleny＠users.labs.libre-entreprise.org Nov. 2, 2010

Nov. 2, 2010

Author: bleny Date: 2010-11-02 16:36:49 +0000 (Tue, 02 Nov 2010) New Revision: 721 Log: add icon for global synthesis Added: trunk/wao-ui/src/main/webapp/img/synthesis-global-synthesis.png Added: trunk/wao-ui/src/main/webapp/img/synthesis-global-synthesis.png =================================================================== (Binary files differ) Property changes on: trunk/wao-ui/src/main/webapp/img/synthesis-global-synthesis.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream

1 0

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

Oct. 29, 2010

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 Oct. 28, 2010

Oct. 28, 2010

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 Oct. 28, 2010

Oct. 28, 2010

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 Oct. 28, 2010

Oct. 28, 2010

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 Oct. 27, 2010

Oct. 27, 2010

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 Oct. 27, 2010

Oct. 27, 2010

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 Oct. 27, 2010

Oct. 27, 2010

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