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

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

21 Oct '10

Author: bleny Date: 2010-10-21 10:21:30 +0000 (Thu, 21 Oct 2010) New Revision: 700 Log: include default values for the coefficient in migration Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java 2010-10-20 15:04:23 UTC (rev 699) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java 2010-10-21 10:21:30 UTC (rev 700) @@ -330,19 +330,24 @@ String insertIntoIndicator = "INSERT INTO Indicator (topiaId, topiaVersion, topiaCreateDate, indicatorId, coefficient) " + "VALUES ('%s', %s, %s, %s, %s);"; - SynthesisId[] synthesisIds = { SynthesisId.GRAPH_SAMPLING, - SynthesisId.IND_COMPLIANCE_BOARDING, - SynthesisId.GRAPH_BOARDING, - SynthesisId.IND_ALLEGRO_REACTIVITY, - SynthesisId.IND_DATA_RELIABILITY }; + // all the criterias for global synthesis + default coefficient values + Map<SynthesisId, Double> synthesisIds = new HashMap<SynthesisId, Double>(); + synthesisIds.put(SynthesisId.GRAPH_SAMPLING, 0.35); + synthesisIds.put(SynthesisId.IND_COMPLIANCE_BOARDING, 0.1); + synthesisIds.put(SynthesisId.GRAPH_BOARDING, 0.2); + synthesisIds.put(SynthesisId.IND_ALLEGRO_REACTIVITY, 0.15); + synthesisIds.put(SynthesisId.IND_DATA_RELIABILITY, 0.2); - double coefficientValue = 1.0; - Map <SynthesisId, String> indicatorsTopiaIds = new HashMap<SynthesisId, String>(); - for (SynthesisId synthesisId : synthesisIds) { - String topiaId = topiaIndicatorIdPrefix + synthesisId.ordinal(); + for (Map.Entry<SynthesisId, Double> indicatorAndCoeff : synthesisIds.entrySet()) { + + SynthesisId synthesisId = indicatorAndCoeff.getKey(); + Double coefficientValue = indicatorAndCoeff.getValue(); + + String topiaId = topiaIndicatorIdPrefix + indicatorAndCoeff.getKey().ordinal(); indicatorsTopiaIds.put(synthesisId, topiaId); + queries.add(String.format(insertIntoIndicator, topiaId, topiaVersion, topiaCreateDateValue,

1 0

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

20 Oct '10

Author: bleny Date: 2010-10-20 15:04:23 +0000 (Wed, 20 Oct 2010) New Revision: 699 Log: removing business code from UI Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/GlobalSynthesisResultImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.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-10-20 13:01:31 UTC (rev 698) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/GlobalSynthesisResultImpl.java 2010-10-20 15:04:23 UTC (rev 699) @@ -2,12 +2,17 @@ import fr.ifremer.wao.entity.Indicator; import fr.ifremer.wao.entity.IndicatorLevel; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.util.List; import java.util.Map; public class GlobalSynthesisResultImpl extends GlobalSynthesisResult { + private static final Logger log = + LoggerFactory.getLogger(GlobalSynthesisResultImpl.class); + protected Map<SynthesisId, Double> values; protected List<Indicator> indicators; @@ -32,8 +37,15 @@ @Override public IndicatorLevel getLevelForIndicator(SynthesisId synthesisId) { + if (log.isDebugEnabled()) { + log.debug("looking for value of " + synthesisId); + for (Map.Entry<SynthesisId, Double> value : values.entrySet()) { + log.debug("in values : " + value.getKey() + " -> " + value.getValue()); + } + } + Double value = values.get(synthesisId); + Indicator indicator = findIndicator(synthesisId); - Double value = values.get(indicator); IndicatorLevel result = indicator.getLevelForValue(value); return result; } 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-20 13:01:31 UTC (rev 698) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java 2010-10-20 15:04:23 UTC (rev 699) @@ -735,8 +735,6 @@ (TopiaContext transaction, Company company, PeriodDates period) throws Exception { - GlobalSynthesisResultImpl result = new GlobalSynthesisResultImpl(); - Double value = 30.0; Map<SynthesisId, Double> indicatorValues = new HashMap<SynthesisId, Double>(); @@ -755,9 +753,10 @@ // add data reliability indicator here + List<Indicator> indicators = executeGetGlobalSynthesisParameters(transaction); + GlobalSynthesisResultImpl result = new GlobalSynthesisResultImpl(); result.setIndicatorValues(indicatorValues); - List<Indicator> indicators = executeGetGlobalSynthesisParameters(transaction); result.setIndicators(indicators); return result; } 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-20 13:01:31 UTC (rev 698) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java 2010-10-20 15:04:23 UTC (rev 699) @@ -24,6 +24,7 @@ package fr.ifremer.wao.ui.pages; +import fr.ifremer.wao.bean.GlobalSynthesisResult; import fr.ifremer.wao.bean.SynthesisId; import fr.ifremer.wao.WaoException; import fr.ifremer.wao.bean.BoardingResult; @@ -143,6 +144,18 @@ return globalSynthesisParameters; } + private GlobalSynthesisResult globalSynthesisResult; + + public GlobalSynthesisResult getGlobalSynthesisResult() { + if (globalSynthesisResult == null) { + PeriodDates period = PeriodDates.createMonthsPeriodFromToday(-12); + Company company = !user.isAdmin() ? user.getCompany() : null; + globalSynthesisResult = serviceSynthesis.getGlobalSynthesisResult( + company, period); + } + return globalSynthesisResult; + } + /** update activeIndicator to the indicator corresponding to activeSynthesis. * @return the value of activeIndicator field, after modification */ @@ -154,6 +167,7 @@ } public IndicatorLevel getActiveIndicatorLevel() { + activeIndicatorLevel = getGlobalSynthesisResult().getLevelForIndicator(getActiveSynthesis()); return activeIndicatorLevel; } @@ -252,45 +266,6 @@ getFilter().getEstimatedTides() ? "Estimé" : "Réalisé"; data.put(realText, res.get(1)); String title = manager.getDataSamplingTitle(getFilter()); - - - - // FIXME 20101015 bleny business code, should be moved in business - // computing level for indicator - int totalNumberOfRealized = 0; - int totalNumberOfPlanned = 0; - for (Map.Entry<Date, Integer> entry : res.get(1).entrySet()) { - // res.get(1) contains number of realized - // while res.get(0) contains planned - - Date date = entry.getKey(); - // both variables will contains planned and realized at the same date - int numberOfRealized = entry.getValue(); - int numberOfPlanned = res.get(0).get(date); - - totalNumberOfPlanned += numberOfPlanned; - totalNumberOfRealized += numberOfRealized; - - if (log.isDebugEnabled()) { - log.debug(String.format( - "number of planed %s (%s), number of realized %s (%s)", - numberOfPlanned, totalNumberOfPlanned, - numberOfRealized, totalNumberOfRealized)); - } - } - - double percentRealized = ((double) totalNumberOfRealized / - (double) totalNumberOfPlanned) * 100.0; - - if (log.isDebugEnabled()) { - log.debug(String.format("percent realized %f %%", percentRealized)); - } - - activeIndicatorLevel = getActiveIndicator().getLevelForValue(percentRealized); - if (log.isDebugEnabled()) { - log.debug("activeIndicatorLevel = " + activeIndicatorLevel.getLevel()); - } - return ChartUtils.createCategoryChart(title, "Nb marées", "Mois", getDataSamplingChartType(), data); } @@ -362,18 +337,6 @@ if (boardingResult == null) { boardingResult = serviceSynthesis.getBoardingBoats( getCompanyForBoarding(), getFromDate()); - - // FIXME 20101015 bleny business code, should be moved in business - // computing level for indicator - int numberOfBoatWithOneBoarding = boardingResult.getData().get("1"); - int totalNumberOfBoarding = 0; - for (Integer numberOfBoarding : boardingResult.getData().values()) { - totalNumberOfBoarding += numberOfBoarding; - } - double rate = ((double) numberOfBoatWithOneBoarding / - (double) totalNumberOfBoarding) * 100.0; - activeIndicator = getActiveIndicator(); - activeIndicatorLevel = activeIndicator.getLevelForValue(rate); } return boardingResult; } @@ -419,19 +382,6 @@ Company company = !user.isAdmin() ? user.getCompany() : null; complianceBoarding = serviceSynthesis.getComplianceBoardingIndicator(company); - - // FIXME 20101015 bleny business code, should be moved in business - // computing level for indicator - double total = 0.0; - int numberOfCompanies = complianceBoarding.size(); - for (Double compliance : complianceBoarding.values()) { - total += compliance; - } - double indicatorValue = 100 * (total / numberOfCompanies); - - activeSynthesis = SynthesisId.IND_COMPLIANCE_BOARDING; - activeIndicator = getActiveIndicator(); - activeIndicatorLevel = activeIndicator.getLevelForValue(indicatorValue); } return complianceBoarding; @@ -535,19 +485,6 @@ allegroReactivity = serviceSynthesis.getContactDataInputDateReactivity(company, getPeriodForAllegroReactivity()); - - // FIXME 20101015 bleny business code, should be moved in business - // computing level for indicator - double sumAverages = 0.0; - for (ContactAverageReactivity reactivity : allegroReactivity) { - sumAverages += reactivity.getResult(); - } - - double numberOfCompanies = (double) allegroReactivity.size(); - double totalAverages = sumAverages / numberOfCompanies; - - activeIndicator = getActiveIndicator(); - activeIndicatorLevel = activeIndicator.getLevelForValue(totalAverages); } return allegroReactivity; }

1 0

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

20 Oct '10

Author: bleny Date: 2010-10-20 13:01:31 +0000 (Wed, 20 Oct 2010) New Revision: 698 Log: WIP ; moved to business global synthesis in business Added: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/GlobalIndicatorValue.java trunk/wao-business/src/main/java/fr/ifremer/wao/bean/GlobalSynthesisResultImpl.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactState.java 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-business/src/main/xmi/wao.zargo trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/IndicatorLevels.java trunk/wao-ui/src/main/webapp/Contacts.tml Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactState.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactState.java 2010-10-19 15:58:34 UTC (rev 697) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactState.java 2010-10-20 13:01:31 UTC (rev 698) @@ -49,18 +49,29 @@ BOAT_DEFINITIVE_REFUSED("Refus définitif", true, true); + /** @deprecated I18N should be done properly by tapestry */ + @Deprecated private String libelle; private boolean finalState; private boolean unfinishedState; + /** @deprecated I18N should be done properly by tapestry */ + @Deprecated ContactState(String value, boolean finalState, boolean unfinishedState) { this.libelle = value; this.finalState = finalState; this.unfinishedState = unfinishedState; } + ContactState(boolean finalState, boolean unfinishedState) { + this.finalState = finalState; + this.unfinishedState = unfinishedState; + } + + /** @deprecated I18N should be done properly by tapestry */ + @Deprecated public String libelle() { return this.libelle; } Added: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/GlobalIndicatorValue.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/bean/GlobalIndicatorValue.java (rev 0) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/GlobalIndicatorValue.java 2010-10-20 13:01:31 UTC (rev 698) @@ -0,0 +1,16 @@ +package fr.ifremer.wao.bean; + +public enum GlobalIndicatorValue { + + VERY_BAD, + + BAD, + + NEUTRAL, + + GOOD, + + VERY_GOOD; + + +} Added: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/GlobalSynthesisResultImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/bean/GlobalSynthesisResultImpl.java (rev 0) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/GlobalSynthesisResultImpl.java 2010-10-20 13:01:31 UTC (rev 698) @@ -0,0 +1,72 @@ +package fr.ifremer.wao.bean; + +import fr.ifremer.wao.entity.Indicator; +import fr.ifremer.wao.entity.IndicatorLevel; + +import java.util.List; +import java.util.Map; + +public class GlobalSynthesisResultImpl extends GlobalSynthesisResult { + + protected Map<SynthesisId, Double> values; + + protected List<Indicator> indicators; + + public void setIndicatorValues(Map<SynthesisId, Double> indicatorValues) { + this.values = indicatorValues; + } + + public void setIndicators(List<Indicator> indicators) { + this.indicators = indicators; + } + + /** in the list of indicators, find the one with given synthesisId. */ + protected Indicator findIndicator(SynthesisId id) { + for (Indicator indicator : indicators) { + if (indicator.getSynthesisId().equals(id)) { + return indicator; + } + } + return null; + } + + @Override + public IndicatorLevel getLevelForIndicator(SynthesisId synthesisId) { + Indicator indicator = findIndicator(synthesisId); + Double value = values.get(indicator); + IndicatorLevel result = indicator.getLevelForValue(value); + return result; + } + + /** return a value between 1 and 6 */ + @Override + public GlobalIndicatorValue getGlobalLevel() { + // compute an average with coefficients + double totalValues = 0.0; + double totalCoefficients = 0.0; + + for (Indicator indicator : indicators) { + Double value = values.get(indicator.getSynthesisId()); + Double coefficient = indicator.getCoefficient(); + + totalValues += value * coefficient; + totalCoefficients += coefficient; + } + + double value = totalValues / totalCoefficients; + + GlobalIndicatorValue result = null; + if (value >= 1.0 && value < 2.0) { + result = GlobalIndicatorValue.VERY_BAD; + } else if (value >= 2.0 && value < 3.0) { + result = GlobalIndicatorValue.BAD; + } else if (value >= 3.0 && value < 5.0) { + result = GlobalIndicatorValue.NEUTRAL; + } else if (value >= 5.0 && value < 5.5) { + result = GlobalIndicatorValue.GOOD; + } else if (value >= 5.5 && value <= 6.0) { + result = GlobalIndicatorValue.VERY_GOOD; + } + return result; + } +} 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-19 15:58:34 UTC (rev 697) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java 2010-10-20 13:01:31 UTC (rev 698) @@ -64,7 +64,7 @@ */ public class ServiceSynthesisImpl extends ServiceSynthesisAbstract { - private static final Logger logger = + private static final Logger log = LoggerFactory.getLogger(ServiceSynthesisImpl.class); private WaoContext context; @@ -146,8 +146,8 @@ // builder.setSampleRowProperty("M." + SampleMonth.SAMPLE_ROW); // builder.applySamplingFilter(filter); - if (logger.isTraceEnabled()) { - logger.trace("Exec query : " + query); + if (log.isTraceEnabled()) { + log.trace("Exec query : " + query); } List<Object[]> res = transaction.findByQuery(query); @@ -158,10 +158,10 @@ int sumExpected = ((Long)tab[2]).intValue(); serie1.put(date, sumExpected); serie2.put(date, sumReal); - if (logger.isTraceEnabled()) { + if (log.isTraceEnabled()) { DateFormat dateFormat = new SimpleDateFormat(period.getPattern()); - logger.trace("Res : " + dateFormat.format(date) + " : " + log.trace("Res : " + dateFormat.format(date) + " : " + sumReal + " / " + sumExpected); } } @@ -231,8 +231,8 @@ addGroup(contact + "." + Contact.BOAT). addOrderDesc("COUNT(*)"); - if (logger.isTraceEnabled()) { - logger.trace("Exec query : " + query); + if (log.isTraceEnabled()) { + log.trace("Exec query : " + query); } List<Map<String, Object>> nbBoardingsByBoat = transaction.findByQuery(query); @@ -302,8 +302,8 @@ query.setSelect(companyNameProperty, "COUNT(*)"). addGroup(companyNameProperty); - if (logger.isDebugEnabled()) { - logger.debug("Query for total : " + query); + if (log.isDebugEnabled()) { + log.debug("Query for total : " + query); } List<Object[]> totalResults = transaction.findByQuery(query); @@ -318,8 +318,8 @@ toString() ); - if (logger.isDebugEnabled()) { - logger.debug("Query for result : " + query); + if (log.isDebugEnabled()) { + log.debug("Query for result : " + query); } List<Object[]> diffResults = transaction.findByQuery(query); @@ -328,8 +328,8 @@ for (Object[] row : diffResults) { String rowCompanyName = (String)row[0]; Long rowCount = (Long)row[1]; - if (logger.isDebugEnabled()) { - logger.debug("result row : " + rowCompanyName + " = " + rowCount); + if (log.isDebugEnabled()) { + log.debug("result row : " + rowCompanyName + " = " + rowCount); } results.put(rowCompanyName, rowCount.doubleValue()); } @@ -340,8 +340,8 @@ for (Object[] row : totalResults) { String rowCompanyName = (String)row[0]; Long rowCount = (Long)row[1]; - if (logger.isDebugEnabled()) { - logger.debug("total row : " + rowCompanyName + " = " + rowCount); + if (log.isDebugEnabled()) { + log.debug("total row : " + rowCompanyName + " = " + rowCount); } Double value = results.get(rowCompanyName); if (value == null) { @@ -486,8 +486,8 @@ int rowState = (Integer)row[1]; ContactState state = ContactState.valueOf(rowState); Long rowCount = (Long)row[2]; - if (logger.isDebugEnabled()) { - logger.debug("res : " + rowCompanyName + " _ " + state + " _ " + rowCount); + if (log.isDebugEnabled()) { + log.debug("res : " + rowCompanyName + " _ " + state + " _ " + rowCount); } ContactStateStatistics stats = results.get(rowCompanyName); if (stats == null) { @@ -535,8 +535,8 @@ query.setSelect(companyNameProperty, dataInputProperty, tideBeginDateProperty); - if (logger.isDebugEnabled()) { - logger.debug("Query : " + query); + if (log.isDebugEnabled()) { + log.debug("Query : " + query); } List<Object[]> res = transaction.findByQuery(query); @@ -548,11 +548,11 @@ int nbDays = DateUtil.getDifferenceInDays(rowTideBeginDate, rowDataInputDate); - if (logger.isDebugEnabled()) { - logger.debug("Company : " + rowCompanyName); - logger.debug("tideBegin : " + rowTideBeginDate); - logger.debug("dataInput : " + rowDataInputDate); - logger.debug("nbDays : " + nbDays); + if (log.isDebugEnabled()) { + log.debug("Company : " + rowCompanyName); + log.debug("tideBegin : " + rowTideBeginDate); + log.debug("dataInput : " + rowDataInputDate); + log.debug("nbDays : " + nbDays); } ContactAverageReactivity avg = results.get(rowCompanyName); @@ -652,7 +652,117 @@ return results; } + protected Double getIndicatorValueForDataSampling + (TopiaContext transaction, SamplingFilter filter) { + + List<SortedMap<Date, Integer>> res = getDataSampling(filter); + + int totalNumberOfRealized = 0; + int totalNumberOfPlanned = 0; + for (Map.Entry<Date, Integer> entry : res.get(1).entrySet()) { + // res.get(1) contains number of realized + // while res.get(0) contains planned + + Date date = entry.getKey(); + // both variables will contains planned and realized at the same date + int numberOfRealized = entry.getValue(); + int numberOfPlanned = res.get(0).get(date); + + totalNumberOfPlanned += numberOfPlanned; + totalNumberOfRealized += numberOfRealized; + + if (log.isDebugEnabled()) { + log.debug(String.format( + "number of planed %s (%s), number of realized %s (%s)", + numberOfPlanned, totalNumberOfPlanned, + numberOfRealized, totalNumberOfRealized)); + } + } + + double percentRealized = ((double) totalNumberOfRealized / + (double) totalNumberOfPlanned) * 100.0; + + if (log.isDebugEnabled()) { + log.debug(String.format("percent realized %f %%", percentRealized)); + } + + return percentRealized; + } + + protected Double getIndicatorValueForBoarding + (TopiaContext transaction, Company company, Date fromDate) { + + BoardingResult boardingResult = getBoardingBoats(company, fromDate); + + int numberOfBoatWithOneBoarding = boardingResult.getData().get("1"); + int totalNumberOfBoarding = 0; + for (Integer numberOfBoarding : boardingResult.getData().values()) { + totalNumberOfBoarding += numberOfBoarding; + } + double rate = ((double) numberOfBoatWithOneBoarding / + (double) totalNumberOfBoarding) * 100.0; + return rate; + } + + protected Double getIndicatorValueForComplianceBoarding + (TopiaContext transaction, Company company) { + Map<String, Double> complianceBoarding = getComplianceBoardingIndicator(company); + double total = 0.0; + int numberOfCompanies = complianceBoarding.size(); + for (Double compliance : complianceBoarding.values()) { + total += compliance; + } + double indicatorValue = 100 * (total / numberOfCompanies); + return indicatorValue; + } + + protected Double getIndicatorValueForAllegroReactivity + (TopiaContext transaction, Company company, PeriodDates periodDates) { + Collection<ContactAverageReactivity> allegroReactivity = getContactDataInputDateReactivity(company, periodDates); + + double sumAverages = 0.0; + for (ContactAverageReactivity reactivity : allegroReactivity) { + sumAverages += reactivity.getResult(); + } + + double numberOfCompanies = (double) allegroReactivity.size(); + double totalAverages = sumAverages / numberOfCompanies; + return totalAverages; + } + @Override + protected GlobalSynthesisResult executeGetGlobalSynthesisResult + (TopiaContext transaction, Company company, PeriodDates period) + throws Exception { + + GlobalSynthesisResultImpl result = new GlobalSynthesisResultImpl(); + + Double value = 30.0; + Map<SynthesisId, Double> indicatorValues = new HashMap<SynthesisId, Double>(); + + // value = getIndicatorValueForDataSampling(transaction, samplingFilter); + indicatorValues.put(SynthesisId.GRAPH_SAMPLING, value); + + // value = getIndicatorValueForBoarding(transaction, company, fromDate); + indicatorValues.put(SynthesisId.GRAPH_BOARDING, value); + + value = getIndicatorValueForComplianceBoarding(transaction, company); + indicatorValues.put(SynthesisId.IND_COMPLIANCE_BOARDING, value); + + value = getIndicatorValueForAllegroReactivity(transaction, company, period); + indicatorValues.put(SynthesisId.IND_ALLEGRO_REACTIVITY, value); + + // add data reliability indicator here + + + + result.setIndicatorValues(indicatorValues); + List<Indicator> indicators = executeGetGlobalSynthesisParameters(transaction); + result.setIndicators(indicators); + return result; + } + + @Override protected List<Indicator> executeGetGlobalSynthesisParameters(TopiaContext transaction) throws Exception { IndicatorDAO indicatorDAO = WaoDAOHelper.getIndicatorDAO(transaction); List<Indicator> indicators = indicatorDAO.findAll(); 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-19 15:58:34 UTC (rev 697) +++ trunk/wao-business/src/main/resources/i18n/wao-business-en_GB.properties 2010-10-20 13:01:31 UTC (rev 698) @@ -81,6 +81,7 @@ wao.error.serviceSynthesis.getContactStateStatistics= wao.error.serviceSynthesis.getDataSampling= wao.error.serviceSynthesis.getGlobalSynthesisParameters=Unable to get data about global synthesis parameters +wao.error.serviceSynthesis.getGlobalSynthesisResult= wao.error.serviceSynthesis.getNonComplianceBoardingIndicator= wao.error.serviceUser.connect= wao.error.serviceUser.createDefaultAdmin= 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-19 15:58:34 UTC (rev 697) +++ trunk/wao-business/src/main/resources/i18n/wao-business-fr_FR.properties 2010-10-20 13:01:31 UTC (rev 698) @@ -80,6 +80,7 @@ wao.error.serviceSynthesis.getContactStateStatistics=Impossible de r\u00E9cup\u00E9rer les statistiques sur les \u00E9tats des contacts wao.error.serviceSynthesis.getDataSampling=Impossible de r\u00E9cup\u00E9rer les donn\u00E9es pour le graphique dynamique des efforts de mar\u00E9es 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.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 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-19 15:58:34 UTC (rev 697) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/IndicatorLevels.java 2010-10-20 13:01:31 UTC (rev 698) @@ -46,7 +46,7 @@ } public Boolean isWithLegend() { - if (withLegend = null) { + if (withLegend == null) { withLegend = false; } return withLegend; Modified: trunk/wao-ui/src/main/webapp/Contacts.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Contacts.tml 2010-10-19 15:58:34 UTC (rev 697) +++ trunk/wao-ui/src/main/webapp/Contacts.tml 2010-10-20 13:01:31 UTC (rev 698) @@ -295,9 +295,7 @@ <t:if t:test="contact.validationProgram"> ${contact.dataReliability.label} <p:else> - <t:if t:test="canValidate()"> - <input t:type="select" t:id="dataReliability" t:value="contact.dataReliability" validate="required" /> --> - </t:if> + <input t:type="select" t:id="dataReliability" t:value="contact.dataReliability" validate="required" /> </p:else> </t:if> </t:if>

1 0

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

19 Oct '10

Author: bleny Date: 2010-10-19 15:58:34 +0000 (Tue, 19 Oct 2010) New Revision: 697 Log: bugfix ano2540 (from branch) ; data reliability form in contact lists + validation Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java trunk/wao-ui/src/main/webapp/Contacts.tml Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java 2010-10-19 13:42:47 UTC (rev 696) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java 2010-10-19 15:58:34 UTC (rev 697) @@ -30,6 +30,7 @@ import fr.ifremer.wao.bean.ContactFilter; import fr.ifremer.wao.bean.ContactFilterImpl; import fr.ifremer.wao.bean.ContactState; +import fr.ifremer.wao.bean.DataReliability; import fr.ifremer.wao.bean.SamplingFilter; import fr.ifremer.wao.bean.UserRole; import fr.ifremer.wao.entity.Boat; @@ -414,6 +415,10 @@ return validation == null; } + public boolean isBoardingDone() { + return contact.getContactState() == ContactState.BOARDING_DONE; + } + /**************************** CONTACT ROW ACTION **************************/ /** @@ -684,29 +689,21 @@ " du jour"); } - if (logger.isDebugEnabled()) { - logger.debug("IsUnfinished : " + contactState.isUnfinishedState()); - logger.debug("OldUnfinished : " + oldState.isUnfinishedState()); - - String newComment = contactEdited.getComment(); - boolean commentDefined = StringUtils.isNotEmpty(newComment); - boolean commentChanged = commentDefined && !newComment.equals(oldComment); - - logger.debug("commentDefined : " + commentDefined); - logger.debug("commentChanged : " + commentChanged); - } - // Non abouti, Refus ou Refus Définitif if (contactState.isUnfinishedState()) { String newComment = contactEdited.getComment(); - boolean commentChanged = - StringUtils.isNotEmpty(newComment) && + boolean commentDefined = StringUtils.isNotEmpty(newComment); + boolean commentChanged = commentDefined && !newComment.equals(oldComment); + // Ano #2540 : NPE on oldState, extract boolean for + // previous unfinishedState case + boolean previousUnfinishedState = commentDefined && + oldState != null && oldState.isUnfinishedState(); + // Ano #2440 : no restriction if previous state is unfinished - if (oldState.isUnfinishedState() && - StringUtils.isNotEmpty(newComment) || commentChanged) { + if (previousUnfinishedState || commentChanged) { // RAZ des champs contactEdited.setTideBeginDate(null); @@ -715,6 +712,7 @@ contactEdited.setMammalsCapture(false); contactEdited.setMammalsObservation(false); contactEdited.setDataInputDate(null); + } else { contactsForm.recordError(comment, "Vous devez ajouter" + " un commentaire pour l'état" + @@ -737,6 +735,19 @@ " avoir aucun observateur pour l'état" + " '" + contactState.libelle() + "'"); } + + if (contactEdited.isValidationProgram()) { + + // it's an admin validation, data-reliability field must be filled + if (logger.isDebugEnabled()) { + logger.debug("field data reliability is " + contactEdited.getDataReliability()); + } + + if (contactEdited.getDataReliability() == null || + contactEdited.getDataReliability() == DataReliability.UNKNOWN) { + contactsForm.recordError("Il faut préciser la qualité des données avant de valider"); + } + } } } } Modified: trunk/wao-ui/src/main/webapp/Contacts.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Contacts.tml 2010-10-19 13:42:47 UTC (rev 696) +++ trunk/wao-ui/src/main/webapp/Contacts.tml 2010-10-19 15:58:34 UTC (rev 697) @@ -290,12 +290,18 @@ </t:if> </p:commentCell> <p:dataReliabilityCell> - <t:if t:test="editionMode"> - <input t:type="select" t:id="dataReliability" t:value="contactEdited.dataReliability" /> - <p:else> - ${contact.dataReliability.label} - </p:else> - </t:if> + <t:if t:test="boardingDone"> + <t:if t:test="contact.validationCompany"> + <t:if t:test="contact.validationProgram"> + ${contact.dataReliability.label} + <p:else> + <t:if t:test="canValidate()"> + <input t:type="select" t:id="dataReliability" t:value="contact.dataReliability" validate="required" /> --> + </t:if> + </p:else> + </t:if> + </t:if> + </t:if> </p:dataReliabilityCell> <p:commentCoordinatorCell> <span t:type="ck/Tooltip" title="Commentaire société" t:value="${getCommentTooltip(contact.commentCoordinator)}" t:effect="appear">

1 0

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

19 Oct '10

Author: bleny Date: 2010-10-19 13:42:47 +0000 (Tue, 19 Oct 2010) New Revision: 696 Log: fix broken build, test was not up to date Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSynthesisImplTest.java Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSynthesisImplTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSynthesisImplTest.java 2010-10-19 12:13:06 UTC (rev 695) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSynthesisImplTest.java 2010-10-19 13:42:47 UTC (rev 696) @@ -194,8 +194,8 @@ * Test of getBoardingBoats method, of class ServiceSynthesisImpl. */ @Test - public void testGetNonComplianceBoardingIndicator() throws Exception { - log.info("getNonComplianceBoardingIndicator"); + public void testGetComplianceBoardingIndicator() throws Exception { + log.info("getComplianceBoardingIndicator"); /** PREPARE DATA **/ InputStream input = getClass().getResourceAsStream("/import/navires.csv"); ServiceBoat serviceBoat = manager.getServiceBoat(); @@ -279,22 +279,22 @@ // result for company TARTANPION Map<String, Double> results = - service.getNonComplianceBoardingIndicator(company); + service.getComplianceBoardingIndicator(company); assertEquals(1, results.size()); // 0% of non compliance Double value = results.get(company.getName()); - assertEquals(0., value, 0); + assertEquals(1., value, 0); // result for company BIS using admin mode (no company filtered) - results = service.getNonComplianceBoardingIndicator(null); + results = service.getComplianceBoardingIndicator(null); assertEquals(2, results.size()); // 100% of non compliance value = results.get(company2.getName()); - assertEquals(1., value, 0); + assertEquals(0., value, 0); } /**

1 0

[Suiviobsmer-commits] r695 - in tags/wao-1.5.4: wao-business/src/main/resources/i18n wao-ui/src/license
by bleny＠users.labs.libre-entreprise.org 19 Oct '10

19 Oct '10

Author: bleny Date: 2010-10-19 12:13:06 +0000 (Tue, 19 Oct 2010) New Revision: 695 Log: add missing third-party licence Modified: tags/wao-1.5.4/wao-business/src/main/resources/i18n/wao-business-en_GB.properties tags/wao-1.5.4/wao-business/src/main/resources/i18n/wao-business-fr_FR.properties tags/wao-1.5.4/wao-ui/src/license/THIRD-PARTY.properties Modified: tags/wao-1.5.4/wao-business/src/main/resources/i18n/wao-business-en_GB.properties =================================================================== --- tags/wao-1.5.4/wao-business/src/main/resources/i18n/wao-business-en_GB.properties 2010-10-19 09:01:38 UTC (rev 694) +++ tags/wao-1.5.4/wao-business/src/main/resources/i18n/wao-business-en_GB.properties 2010-10-19 12:13:06 UTC (rev 695) @@ -1,3 +1,26 @@ +### +# #%L +# Wao :: Business +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2009 - 2010 Ifremer +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# #L% +### wao.error.boat.canCreateContact= wao.error.boat.getNbBoarding= wao.error.boatInfos.getNbBoardingForCompany= Modified: tags/wao-1.5.4/wao-business/src/main/resources/i18n/wao-business-fr_FR.properties =================================================================== --- tags/wao-1.5.4/wao-business/src/main/resources/i18n/wao-business-fr_FR.properties 2010-10-19 09:01:38 UTC (rev 694) +++ tags/wao-1.5.4/wao-business/src/main/resources/i18n/wao-business-fr_FR.properties 2010-10-19 12:13:06 UTC (rev 695) @@ -1,3 +1,26 @@ +### +# #%L +# Wao :: Business +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2009 - 2010 Ifremer +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# #L% +### wao.error.boat.canCreateContact=Impossible de cr\u00E9er un nouveau contact pour la soci\u00E9t\u00E9 %1$s et le navire %2$s (%3$d) wao.error.boat.getNbBoarding=Impossible de r\u00E9cup\u00E9rer le nombre d'embarquements r\u00E9els depuis le %1$s wao.error.boatInfos.getNbBoardingForCompany=Impossible de r\u00E9cup\u00E9rer le nombre d'embarquements r\u00E9els depuis le %1$s pour la soci\u00E9t\u00E9 %2$s Modified: tags/wao-1.5.4/wao-ui/src/license/THIRD-PARTY.properties =================================================================== --- tags/wao-1.5.4/wao-ui/src/license/THIRD-PARTY.properties 2010-10-19 09:01:38 UTC (rev 694) +++ tags/wao-1.5.4/wao-ui/src/license/THIRD-PARTY.properties 2010-10-19 12:13:06 UTC (rev 695) @@ -1,8 +1,8 @@ # Generated by org.nuiton.license.plugin.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : +# - Affero General Public License (AGPL) # - Apache Software License 2.0 -# - BSD # - BSD License # - BSD license # - BSD style @@ -17,8 +17,6 @@ # - GNU Lesser General Public License version 2.1 # - GNU Library or Lesser General Public License # - GPL, LGPL, MPL -# - General Public License (GPL) v 3.0 -# - Lesser General Public License (LGPL) v 2.1 # - Lesser General Public License (LGPL) v 3.0 # - MIT License # - Public Domain @@ -32,7 +30,7 @@ # Please fill the missing licenses for dependencies : # # -#Sun Jul 11 22:47:24 CEST 2010 +#Tue Oct 19 12:44:22 CEST 2010 antlr--antlr--2.7.6=BSD com.formos.tapestry--tapestry-testify--1.0.2=The Apache Software License, Version 2.0 com.sun.xml.bind--jaxb-impl--2.2=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 & GNU General Public License (GPL) Version 2 @@ -40,6 +38,7 @@ commons-beanutils--commons-beanutils-core--1.7.0=The Apache Software License, Version 2.0 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=BSD +javassist--javassist--3.8.0.GA=Lesser General Public Licence (LGPL) v 2.1 javassist--javassist--3.9.0.GA=Lesser General Public License (LGPL) v 2.1 javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 javax.xml.bind--jaxb-api--2.2=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 & GNU General Public License (GPL) Version 2

1 0

[Suiviobsmer-commits] r694 - in branches/wao-1.5.x: . wao-business wao-ui
by bleny＠users.labs.libre-entreprise.org 19 Oct '10

19 Oct '10

Author: bleny Date: 2010-10-19 09:01:38 +0000 (Tue, 19 Oct 2010) New Revision: 694 Log: [maven-release-plugin] prepare for next development iteration Modified: branches/wao-1.5.x/pom.xml branches/wao-1.5.x/wao-business/pom.xml branches/wao-1.5.x/wao-ui/pom.xml Modified: branches/wao-1.5.x/pom.xml =================================================================== --- branches/wao-1.5.x/pom.xml 2010-10-19 09:01:35 UTC (rev 693) +++ branches/wao-1.5.x/pom.xml 2010-10-19 09:01:38 UTC (rev 694) @@ -15,7 +15,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>1.5.4</version> + <version>1.5.5-SNAPSHOT</version> <modules> <module>wao-ui</module> @@ -308,9 +308,9 @@  <scm> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.5.4</connection> - <developerConnection>scm:svn:svn+ssh://${username}@labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.5.4</developerConnection> - <url>http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-1.5.4?root=suiviob…</url> + <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/branches/wao-1.5.x</connection> + <developerConnection>scm:svn:svn+ssh://bleny at labs.libre-entreprise.org/svnroot/suiviobsmer/branches/wao-1.5.x</developerConnection> + <url>http://labs.libre-entreprise.org/scm/viewvc.php/branches/wao-1.5.x?root=sui…</url> </scm> <build> Modified: branches/wao-1.5.x/wao-business/pom.xml =================================================================== --- branches/wao-1.5.x/wao-business/pom.xml 2010-10-19 09:01:35 UTC (rev 693) +++ branches/wao-1.5.x/wao-business/pom.xml 2010-10-19 09:01:38 UTC (rev 694) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>1.5.4</version> + <version>1.5.5-SNAPSHOT</version> </parent> <groupId>fr.ifremer.wao</groupId> @@ -204,9 +204,9 @@ </build> <scm> - <url>http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-1.5.4/?root=suivio…</url> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.5.4/wao-business</connection> - <developerConnection>scm:svn:svn+ssh://${username}@labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.5.4/wao-business</developerConnection> + <url>http://labs.libre-entreprise.org/scm/viewvc.php/branches/wao-1.5.x/?root=su…</url> + <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/branches/wao-1.5.x/wao-busine…</connection> + <developerConnection>scm:svn:svn+ssh://bleny at labs.libre-entreprise.org/svnroot/suiviobsmer/branches/wao-1.5.x/wao-busine…</developerConnection> </scm>  Modified: branches/wao-1.5.x/wao-ui/pom.xml =================================================================== --- branches/wao-1.5.x/wao-ui/pom.xml 2010-10-19 09:01:35 UTC (rev 693) +++ branches/wao-1.5.x/wao-ui/pom.xml 2010-10-19 09:01:38 UTC (rev 694) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>1.5.4</version> + <version>1.5.5-SNAPSHOT</version> </parent> <groupId>fr.ifremer.wao</groupId> @@ -227,9 +227,9 @@ </repositories> <scm> - <url>http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-1.5.4/?root=suivio…</url> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.5.4/wao-ui</connection> - <developerConnection>scm:svn:svn+ssh://${username}@labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.5.4/wao-ui</developerConnection> + <url>http://labs.libre-entreprise.org/scm/viewvc.php/branches/wao-1.5.x/?root=su…</url> + <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/branches/wao-1.5.x/wao-ui</connection> + <developerConnection>scm:svn:svn+ssh://bleny at labs.libre-entreprise.org/svnroot/suiviobsmer/branches/wao-1.5.x/wao-ui</developerConnection> </scm> </project>

1 0

[Suiviobsmer-commits] r693 - tags
by bleny＠users.labs.libre-entreprise.org 19 Oct '10

19 Oct '10

Author: bleny Date: 2010-10-19 09:01:35 +0000 (Tue, 19 Oct 2010) New Revision: 693 Log: [maven-release-plugin] copy for tag wao-1.5.4 Added: tags/wao-1.5.4/

1 0

[Suiviobsmer-commits] r692 - in branches/wao-1.5.x: . wao-business wao-ui
by bleny＠users.labs.libre-entreprise.org 19 Oct '10

19 Oct '10

Author: bleny Date: 2010-10-19 08:56:07 +0000 (Tue, 19 Oct 2010) New Revision: 692 Log: retrograde mavenpom version Modified: branches/wao-1.5.x/pom.xml branches/wao-1.5.x/wao-business/pom.xml branches/wao-1.5.x/wao-ui/pom.xml Modified: branches/wao-1.5.x/pom.xml =================================================================== --- branches/wao-1.5.x/pom.xml 2010-10-19 08:53:09 UTC (rev 691) +++ branches/wao-1.5.x/pom.xml 2010-10-19 08:56:07 UTC (rev 692) @@ -10,12 +10,12 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4labs</artifactId> - <version>2.3.2</version> + <version>2.3</version> </parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>1.5.4-SNAPSHOT</version> + <version>1.5.4</version> <modules> <module>wao-ui</module> @@ -308,9 +308,9 @@  <scm> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/branches/wao-1.5.x</connection> - <developerConnection>scm:svn:svn+ssh://${username}@labs.libre-entreprise.org/svnroot/suiviobsmer/branches/wao-1.5.x</developerConnection> - <url>http://labs.libre-entreprise.org/scm/viewvc.php/branches/wao-1.5.x?root=sui…</url> + <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.5.4</connection> + <developerConnection>scm:svn:svn+ssh://${username}@labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.5.4</developerConnection> + <url>http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-1.5.4?root=suiviob…</url> </scm> <build> Modified: branches/wao-1.5.x/wao-business/pom.xml =================================================================== --- branches/wao-1.5.x/wao-business/pom.xml 2010-10-19 08:53:09 UTC (rev 691) +++ branches/wao-1.5.x/wao-business/pom.xml 2010-10-19 08:56:07 UTC (rev 692) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>1.5.4-SNAPSHOT</version> + <version>1.5.4</version> </parent> <groupId>fr.ifremer.wao</groupId> @@ -204,9 +204,9 @@ </build> <scm> - <url>http://labs.libre-entreprise.org/scm/viewvc.php/branches/wao-1.5.x/?root=su…</url> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/branches/wao-1.5.x/wao-busine…</connection> - <developerConnection>scm:svn:svn+ssh://${username}@labs.libre-entreprise.org/svnroot/suiviobsmer/branches/wao-1.5.x/wao-business</developerConnection> + <url>http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-1.5.4/?root=suivio…</url> + <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.5.4/wao-business</connection> + <developerConnection>scm:svn:svn+ssh://${username}@labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.5.4/wao-business</developerConnection> </scm>  Modified: branches/wao-1.5.x/wao-ui/pom.xml =================================================================== --- branches/wao-1.5.x/wao-ui/pom.xml 2010-10-19 08:53:09 UTC (rev 691) +++ branches/wao-1.5.x/wao-ui/pom.xml 2010-10-19 08:56:07 UTC (rev 692) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>1.5.4-SNAPSHOT</version> + <version>1.5.4</version> </parent> <groupId>fr.ifremer.wao</groupId> @@ -227,9 +227,9 @@ </repositories> <scm> - <url>http://labs.libre-entreprise.org/scm/viewvc.php/branches/wao-1.5.x/?root=su…</url> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/branches/wao-1.5.x/wao-ui</connection> - <developerConnection>scm:svn:svn+ssh://${username}@labs.libre-entreprise.org/svnroot/suiviobsmer/branches/wao-1.5.x/wao-ui</developerConnection> + <url>http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-1.5.4/?root=suivio…</url> + <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.5.4/wao-ui</connection> + <developerConnection>scm:svn:svn+ssh://${username}@labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.5.4/wao-ui</developerConnection> </scm> </project>

1 0

[Suiviobsmer-commits] r691 - in branches/wao-1.5.x: . wao-business wao-ui
by bleny＠users.labs.libre-entreprise.org 19 Oct '10

19 Oct '10

Author: bleny Date: 2010-10-19 08:53:09 +0000 (Tue, 19 Oct 2010) New Revision: 691 Log: fix scm Modified: branches/wao-1.5.x/pom.xml branches/wao-1.5.x/wao-business/pom.xml branches/wao-1.5.x/wao-ui/pom.xml Modified: branches/wao-1.5.x/pom.xml =================================================================== --- branches/wao-1.5.x/pom.xml 2010-10-19 08:49:50 UTC (rev 690) +++ branches/wao-1.5.x/pom.xml 2010-10-19 08:53:09 UTC (rev 691) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4labs</artifactId> - <version>2.3</version> + <version>2.3.2</version> </parent> <groupId>fr.ifremer</groupId> Modified: branches/wao-1.5.x/wao-business/pom.xml =================================================================== --- branches/wao-1.5.x/wao-business/pom.xml 2010-10-19 08:49:50 UTC (rev 690) +++ branches/wao-1.5.x/wao-business/pom.xml 2010-10-19 08:53:09 UTC (rev 691) @@ -204,9 +204,9 @@ </build> <scm> - <url>http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-1.5.3/?root=suivio…</url> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.5.3/wao-business</connection> - <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.5.3/wao-business</developerConnection> + <url>http://labs.libre-entreprise.org/scm/viewvc.php/branches/wao-1.5.x/?root=su…</url> + <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/branches/wao-1.5.x/wao-busine…</connection> + <developerConnection>scm:svn:svn+ssh://${username}@labs.libre-entreprise.org/svnroot/suiviobsmer/branches/wao-1.5.x/wao-business</developerConnection> </scm>  Modified: branches/wao-1.5.x/wao-ui/pom.xml =================================================================== --- branches/wao-1.5.x/wao-ui/pom.xml 2010-10-19 08:49:50 UTC (rev 690) +++ branches/wao-1.5.x/wao-ui/pom.xml 2010-10-19 08:53:09 UTC (rev 691) @@ -227,9 +227,9 @@ </repositories> <scm> - <url>http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-1.5.3/?root=suivio…</url> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.5.3/wao-ui</connection> - <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.5.3/wao-ui</developerConnection> + <url>http://labs.libre-entreprise.org/scm/viewvc.php/branches/wao-1.5.x/?root=su…</url> + <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/branches/wao-1.5.x/wao-ui</connection> + <developerConnection>scm:svn:svn+ssh://${username}@labs.libre-entreprise.org/svnroot/suiviobsmer/branches/wao-1.5.x/wao-ui</developerConnection> </scm> </project>

1 0