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

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

08 Nov '10

Author: bleny Date: 2010-11-08 15:44:00 +0000 (Mon, 08 Nov 2010) New Revision: 747 Log: misc UI fixes Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/GlobalSynthesisResultImpl.java 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/resources/fr/ifremer/wao/ui/components/IndicatorLevels.tml trunk/wao-ui/src/main/webapp/SamplingPlan.tml trunk/wao-ui/src/main/webapp/Synthesis.tml 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-08 10:13:56 UTC (rev 746) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/GlobalSynthesisResultImpl.java 2010-11-08 15:44:00 UTC (rev 747) @@ -36,9 +36,8 @@ return result; } - /** return a value between 1 and 6 */ @Override - public GlobalIndicatorValue getGlobalLevel() { + public Double getGlobalResult() { // compute an average with coefficients double totalLevels = 0.0; double totalCoefficients = 0.0; @@ -70,6 +69,13 @@ log.debug("value for global indicator = " + value); } + return value; + } + + /** return a value between 1 and 6 */ + @Override + public GlobalIndicatorValue getGlobalLevel() { + // in this indicator, the level is the ordinal of GlobalIndicatorValue Indicator globalIndicator = getGlobalSynthesisParameters().getGlobalIndicator(); @@ -81,7 +87,7 @@ } } - int globalIndicatorValueOrdinal = globalIndicator.getLevelForValue(value).getLevel(); + int globalIndicatorValueOrdinal = globalIndicator.getLevelForValue(getGlobalResult()).getLevel(); GlobalIndicatorValue result = GlobalIndicatorValue.valueOf(globalIndicatorValueOrdinal); if (log.isDebugEnabled()) { log.debug("global indicator value is " + result); 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-11-08 10:13:56 UTC (rev 746) +++ trunk/wao-business/src/main/resources/i18n/wao-business-fr_FR.properties 2010-11-08 15:44:00 UTC (rev 747) @@ -2,11 +2,11 @@ wao.business.bean.DataReliability.not_reliable=non exploitable wao.business.bean.DataReliability.reliable=exploitable wao.business.bean.DataReliability.unknown=non renseign\u00E9e -wao.business.bean.GlobalIndicatorValue.bad=P\u00E9nalit\u00E9 1 -wao.business.bean.GlobalIndicatorValue.good=Bonus 1 -wao.business.bean.GlobalIndicatorValue.neutral=Rien \u00E0 signaler -wao.business.bean.GlobalIndicatorValue.very_bad=P\u00E9nalit\u00E9 2 -wao.business.bean.GlobalIndicatorValue.very_good=Bonus 2 +wao.business.bean.GlobalIndicatorValue.bad=P\u00E9nalit\u00E9 de niveau 1 +wao.business.bean.GlobalIndicatorValue.good=Bonus de niveau 1 +wao.business.bean.GlobalIndicatorValue.neutral=Conforme au cahier des charges +wao.business.bean.GlobalIndicatorValue.very_bad=P\u00E9nalit\u00E9 de niveau 2 +wao.business.bean.GlobalIndicatorValue.very_good=Bonus de niveau 2 wao.business.bean.SynthesisId.allegro_reactivity=D\u00E9lais de transmission des donn\u00E9es wao.business.bean.SynthesisId.compliance_boarding=Respect du nombre d'observateurs embarqu\u00E9s wao.business.bean.SynthesisId.contact_state=\u00C9tats des contacts Modified: trunk/wao-business/src/main/xmi/wao.zargo =================================================================== (Binary files differ) 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-11-08 10:13:56 UTC (rev 746) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/IndicatorLevels.tml 2010-11-08 15:44:00 UTC (rev 747) @@ -27,7 +27,7 @@ <tr> <th /> <th colspan="${indicator.indicatorLevel.size()}">Indicateur : ${indicator.synthesisId.label}</th> - <th>coefficient</th> + <th>Pondération</th> </tr> <tr> <th>Niveaux</th> @@ -86,7 +86,9 @@ </tbody> </table> <t:if test="isWithLegend()"> - En jaune, la position actuelle de la société selon cet indicateur. + <div class="acenter"> + En jaune, la position actuelle de la société selon cet indicateur. + </div> </t:if> </html> \ No newline at end of file Modified: trunk/wao-ui/src/main/webapp/SamplingPlan.tml =================================================================== --- trunk/wao-ui/src/main/webapp/SamplingPlan.tml 2010-11-08 10:13:56 UTC (rev 746) +++ trunk/wao-ui/src/main/webapp/SamplingPlan.tml 2010-11-08 15:44:00 UTC (rev 747) @@ -327,13 +327,9 @@ </tr> </t:loop> <tr> - <td colspan="${nbColumnsTotal}" class="facade"> + <td colspan="${nbColumnsForProfession}" /> Totaux </td> - </tr> - <tr> - <td colspan="${nbColumnsForProfession}" /> - <t:loop source="months" value="month"> <td class="width50 acenter ${monthCurrentClass}"> ${totalExpectedForMonth} Modified: trunk/wao-ui/src/main/webapp/Synthesis.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Synthesis.tml 2010-11-08 10:13:56 UTC (rev 746) +++ trunk/wao-ui/src/main/webapp/Synthesis.tml 2010-11-08 15:44:00 UTC (rev 747) @@ -111,12 +111,6 @@ </a> </li> <li> - <a t:type="actionlink" t:context="[actionSynthesisId,'IND_CONTACT_STATE']" t:zone="so-synthesis-main"> - <img src="${asset:context:}/img/synthesis-ind-contact-states.png" alt="Indicateur sur les états des contacts" - title="Indicateur sur les états des contacts" /> - </a> - </li> - <li> <a t:type="actionlink" t:context="[actionSynthesisId,'IND_ALLEGRO_REACTIVITY']" t:zone="so-synthesis-main"> <img src="${asset:context:}/img/synthesis-ind-allegro-reactivity.png" alt="Indicateur de réactivité sur la saisie des données dans Allegro" title="Indicateur de réactivité sur la saisie des données dans Allegro" /> @@ -136,6 +130,12 @@ </a> </li> </t:if> + <li> + <a t:type="actionlink" t:context="[actionSynthesisId,'IND_CONTACT_STATE']" t:zone="so-synthesis-main"> + <img src="${asset:context:}/img/synthesis-ind-contact-states.png" alt="Indicateur sur les états des contacts" + title="Indicateur sur les états des contacts" /> + </a> + </li> </ul> </div> <div t:type="zone" t:id="delegator" class="fleft" t:update="show" id="so-synthesis-main"> @@ -193,15 +193,14 @@ </t:block>  <t:block t:id="ind2"> - <h2>Respect du nombre d'observateurs embarqués</h2> - <br /> - <div class="ind-table acenter" id="so-noncomplianceboarding"> + <h2>Respect du nombre d'observateurs embarqués</h2> + <br /> + <p> + Respect du nombre prévu d'observateurs pour chaque marée réalisée. + </p> + <t:if t:test="user.admin"> - <p> - Ces résultats concernent l'ensemble des contrats en cours - ayant des données réelles (contacts validés). - </p> <table class="t-data-grid"> <thead> <tr> @@ -219,10 +218,6 @@ </tbody> </table> <p:else> - <p> - Ce résultat concerne l'ensemble des contrats en cours - pour votre société ayant des données réelles (contacts validés). - </p> <div class="indicator"> <p class="number"> <span t:type="output" t:value="complianceBoardingValue" t:format="percentFormat"> @@ -243,7 +238,7 @@  <t:block t:id="ind3"> <div class="ind-table acenter" id="so-contactstate"> - <h2>Etats des contacts</h2> + <h2>États des contacts</h2> <br /> <p> Ces résultats concernent l'ensemble des états des contacts<br /> excepté @@ -289,7 +284,7 @@ <h2>Réactivité de la saisie dans Allegro par rapport à la date de fin de la marée</h2> <br /> <p> - Ce résultat est une moyenne du nombre de jours entre la date de saisie dans Allegro et la date de fin de la marée des contacts validés. + Ce résultat est une moyenne du nombre de jours entre la date de saisie dans Allegro et la date de fin de la marée. </p> <br /> <t:if t:test="user.admin"> @@ -330,33 +325,25 @@ <div class="ind-table acenter" id="so-datareliability"> <h2>Qualité de la donnée</h2> <br /> - <t:if t:test="user.admin"> - <table class="t-data-grid"> - <thead> - <tr> - <th class="company">Société</th> - <th>Indicateur</th> - </tr> - </thead> - <tbody> - <tr t:type="loop" t:source="dataReliability.entrySet()" t:value="dataReliabilityEntry"> - <td class="company">${dataReliabilityEntry.key}</td> - <td class="number"> - <t:output t:value="dataReliabilityEntry.value" t:format="percentFormat"/> - </td> - </tr> - </tbody> - </table> - <p:else> - <div class="indicator"> - <p class="number"> - <span t:type="output" t:value="complianceBoardingValue" t:format="percentFormat"> - ${complianceBoardingValue} - </span> - </p> - </div> - </p:else> - </t:if> + <p> + Pourcentage du nombre de marées exploitables par rapport nombre de marée réalisées + </p> + <table class="t-data-grid"> + <thead> + <tr> + <th class="company">Société</th> + <th>Indicateur</th> + </tr> + </thead> + <tbody> + <tr t:type="loop" t:source="dataReliability.entrySet()" t:value="dataReliabilityEntry"> + <td class="company">${dataReliabilityEntry.key}</td> + <td class="number"> + <t:output t:value="dataReliabilityEntry.value" t:format="percentFormat"/> + </td> + </tr> + </tbody> + </table> <t:if test="user.indicatorsViewer">  @@ -368,7 +355,7 @@  <t:block t:id="globalSynthesis"> <t:if test="user.indicatorsViewer"> - <div class="print"> + <div class="print acenter"> <h2>Synthèse globale</h2> <br /> @@ -379,6 +366,12 @@ <table class="indicatorLevels"> <tbody> <tr> + <td colspan="5"> + Bilan de la synthèse global : + <t:output t:value="globalSynthesisResult.globalResult" t:format="numberFormat" /> + </td> + </tr> + <tr> <t:loop t:source="globalLevels" t:value="globalLevel"> <t:if test="highlightGlobalLevel()"> <td class="highlight selected">

1 0

[Suiviobsmer-commits] r746 - trunk/wao-ui/src/main/webapp
by bleny＠users.labs.libre-entreprise.org 08 Nov '10

08 Nov '10

Author: bleny Date: 2010-11-08 10:13:56 +0000 (Mon, 08 Nov 2010) New Revision: 746 Log: remaining bug : data reliability is printed enven if not admin 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-05 16:04:40 UTC (rev 745) +++ trunk/wao-ui/src/main/webapp/Contacts.tml 2010-11-08 10:13:56 UTC (rev 746) @@ -292,10 +292,12 @@ <p:dataReliabilityCell> <t:if t:test="boardingDone"> <t:if t:test="contact.validationCompany"> - <t:if test="dataReliabilityAsked"> - <input t:type="select" t:id="dataReliability" t:value="contact.dataReliability" validate="required" /> + <t:if test="contact.validationProgram"> + ${contact.dataReliability.label} <p:else> - ${contact.dataReliability.label} + <t:if test="dataReliabilityAsked"> + <input t:type="select" t:id="dataReliability" t:value="contact.dataReliability" validate="required" /> + </t:if> </p:else> </t:if> </t:if>

1 0

[Suiviobsmer-commits] r745 - in trunk: wao-business/src/main/java/fr/ifremer/wao/bean wao-business/src/main/xmi wao-ui/src/main/java/fr/ifremer/wao/ui/base wao-ui/src/main/java/fr/ifremer/wao/ui/pages wao-ui/src/main/resources/fr/ifremer/wao/ui/pages wao-ui/src/main/webapp
by bleny＠users.labs.libre-entreprise.org 05 Nov '10

05 Nov '10

Author: bleny Date: 2010-11-05 16:04:40 +0000 (Fri, 05 Nov 2010) New Revision: 745 Log: better filter on multiple codes in sampling plan ; still not working :-( Modified: 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 trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SamplingPlan.java trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/SamplingPlan.properties trunk/wao-ui/src/main/webapp/SamplingPlan.tml 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-11-05 13:56:46 UTC (rev 744) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SamplingFilterImpl.java 2010-11-05 16:04:40 UTC (rev 745) @@ -31,7 +31,7 @@ import org.slf4j.LoggerFactory; import java.util.ArrayList; -import java.util.Collection; +import java.util.List; /** * SamplingFilterImpl @@ -77,7 +77,7 @@ if (sampleRow == null) { setSampleRows(null); } else { - Collection<SampleRow> tempSampleRows = new ArrayList<SampleRow>(); + List<SampleRow> tempSampleRows = new ArrayList<SampleRow>(); tempSampleRows.add(sampleRow); setSampleRows(tempSampleRows); } @@ -93,7 +93,7 @@ public SampleRow getSampleRow() { SampleRow sampleRow = null; if (CollectionUtils.isNotEmpty(getSampleRows())) { - sampleRow = getSampleRows(0); + sampleRow = getSampleRows().get(0); if (getSampleRows().size() > 1) { log.warn("other sample rows in the filter will be ignored"); } 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-11-05 13:56:46 UTC (rev 744) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/AbstractFilteredPage.java 2010-11-05 16:04:40 UTC (rev 745) @@ -36,7 +36,6 @@ 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; @@ -277,11 +276,19 @@ public GenericSelectModel<SampleRow> getSampleRowSelectModel() throws WaoException { if (sampleRowSelectModel == null) { // WARN : no use of sampleRow filter + + /* SampleRow rowFiltered = getFilter().getSampleRow(); getFilter().setSampleRow(null); List<SampleRow> sampleRows = serviceSampling.getSampleRowsByFilter(getFilter()); getFilter().setSampleRow(rowFiltered); - + */ + + //List<SampleRow> rowsFiltered = getFilter().getSampleRows(); + //getFilter().setSampleRows(null); + List<SampleRow> sampleRows = serviceSampling.getSampleRowsByFilter(getFilter()); + //getFilter().setSampleRows(rowsFiltered); + sampleRowSelectModel = new GenericSelectModel<SampleRow>(sampleRows, SampleRow.class, "code", "topiaId", propertyAccess); } @@ -367,8 +374,8 @@ log.debug("REFRESH FILTERS DATA"); log.debug("observerSelect : " + observerSelect); } - SampleRow row = getSampleRowSelectModel().findObject(sampleRowId); - getFilter().setSampleRow(row); + //SampleRow row = getSampleRowSelectModel().findObject(sampleRowId); + // getFilter().setSampleRow(row); if (user.isAdmin()) { Company company = getCompanySelectModel().findObject(companyId); getFilter().setCompany(company); 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-11-05 13:56:46 UTC (rev 744) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SamplingPlan.java 2010-11-05 16:04:40 UTC (rev 745) @@ -244,7 +244,7 @@ private boolean refreshSampleRowCodeZone; @Property - private String sampleRowCodeIndex; + private int sampleRowCodeIndex; @Persist @Property @@ -260,28 +260,33 @@ } public Object onActionFromAddSampleRowCode() { - refreshSampleRowCodeZone = true; - if (logger.isDebugEnabled()) { - logger.debug("added filter on code " + selectedSampleRow.getCode()); - } if (getFilter().getSampleRows() == null) { getFilter().setSampleRows(new ArrayList<SampleRow>()); } - getFilter().addSampleRows(selectedSampleRow); + getFilter().getSampleRows().add(selectedSampleRow); + if (logger.isDebugEnabled()) { + logger.debug("added filter on code " + selectedSampleRow.getCode()); + } + selectedSampleRow = null; - + refreshSampleRowCodeZone = true; return sampleRowZone; } - public Object onActionFromRemoveSampleRowCode(String sampleRowCodeIndex) { - refreshSampleRowCodeZone = true; + public Object onActionFromRemoveSampleRowCode(int sampleRowCodeIndex) { - logger.debug("should remove" + sampleRowCodeIndex); + logger.debug("should remove " + sampleRowCodeIndex); - getFilter().getSampleRows().remove(selectedSampleRow); + SampleRow sampleRowToRemove = getFilter().getSampleRows().get(sampleRowCodeIndex); + logger.debug("will remove " + sampleRowToRemove.getCode()); + + boolean result = getFilter().getSampleRows().remove(sampleRowToRemove); + logger.debug("removed " + result); + + refreshSampleRowCodeZone = true; return sampleRowZone; } @@ -294,7 +299,7 @@ /** * ACTION:: Used to change the display mode of the samplingPlan table. * This change affect the loading of the css style over the main table. - * + * * @see #getMainClass() */ void onActionFromToggleDisplayMode() { Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/SamplingPlan.properties =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/SamplingPlan.properties 2010-11-05 13:56:46 UTC (rev 744) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/SamplingPlan.properties 2010-11-05 16:04:40 UTC (rev 745) @@ -30,6 +30,6 @@ codeDCF5-label: M\u00e9tier code DCF5 facadeName-label: Fa\u00e7ade sectorName-label: Zone -sampleRow-label: Code ligne +selectedSampleRow-label: Code ligne -sampleRow-delete-confirmMessage: Etes-vous s\u00fbr de vouloir supprimer d\u00e9finitivement la ligne %1$s du plan d\'\u00e9chantillonnage ? +sampleRow-delete-confirmMessage: \u00cates-vous s\u00fbr de vouloir supprimer d\u00e9finitivement la ligne %1$s du plan d\'\u00e9chantillonnage ? Modified: trunk/wao-ui/src/main/webapp/SamplingPlan.tml =================================================================== --- trunk/wao-ui/src/main/webapp/SamplingPlan.tml 2010-11-05 13:56:46 UTC (rev 744) +++ trunk/wao-ui/src/main/webapp/SamplingPlan.tml 2010-11-05 16:04:40 UTC (rev 745) @@ -140,14 +140,14 @@ <a t:type="actionlink" t:id="addSampleRowCode" title="Ajouter un code de ligne" t:zone="so-sampling-sampleRowZone"> <img src="${asset:context:img/add-16px.png}" /> </a>  -  + </ul> </t:nuiton.subForm> </t:zone>

1 0

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

05 Nov '10

Author: bleny Date: 2010-11-05 13:56:46 +0000 (Fri, 05 Nov 2010) New Revision: 744 Log: add an icons for modified lines in sampling plan Modified: 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/SamplingPlan.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SamplingPlan.java 2010-11-05 12:46:28 UTC (rev 743) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SamplingPlan.java 2010-11-05 13:56:46 UTC (rev 744) @@ -129,7 +129,6 @@ // * Fichier CSV contenant un plan d'échantillonnage // */ // @Property -// private UploadedFile samplingPlanCsvFile; // // public boolean canImportSamplingPlan() { // return user.isAdmin() && !user.isReadOnly(); @@ -683,5 +682,12 @@ // Test if the row isFinished with a gap of 1 month (today - 1 month) return !row.isFinished(-1); } + + public boolean isRowModified() { + // XXX bleny 20101105 this is a dirty hack. Actually, we should test + // CollectionUtils.isEmpty(row.getSampleRowLog()) + // but it's not initialized by hibernate + return row.getTopiaVersion() > 1; + } } Modified: trunk/wao-ui/src/main/webapp/SamplingPlan.tml =================================================================== --- trunk/wao-ui/src/main/webapp/SamplingPlan.tml 2010-11-05 12:46:28 UTC (rev 743) +++ trunk/wao-ui/src/main/webapp/SamplingPlan.tml 2010-11-05 13:56:46 UTC (rev 744) @@ -232,6 +232,13 @@ title="Changer les dates de la période par rapport à celles de la ligne"> ${row.code} </a> + <t:if t:test="canEditSampleRow()"> + <t:if test="rowModified"> + <a t:type="pagelink" t:page="sampleRowHistoric" t:context="row.code"> + <img src="${asset:context:}/img/edit.png" class="fright" alt=" * " title="Cette ligne a été modifiée (voir l'historique)"/> + </a> + </t:if> + </t:if> </td> <td class="width150">${row.programName}</td> <t:if t:test="fullView">

1 0

[Suiviobsmer-commits] r743 - trunk/wao-business/src/main/xmi
by bleny＠users.labs.libre-entreprise.org 05 Nov '10

05 Nov '10

Author: bleny Date: 2010-11-05 12:46:28 +0000 (Fri, 05 Nov 2010) New Revision: 743 Log: add orderBy relation in model to make indicators have their levels sorted by level number Modified: trunk/wao-business/src/main/xmi/wao.zargo Modified: trunk/wao-business/src/main/xmi/wao.zargo =================================================================== (Binary files differ)

1 0

[Suiviobsmer-commits] r742 - trunk/wao-ui/src/main/webapp
by bleny＠users.labs.libre-entreprise.org 05 Nov '10

05 Nov '10

Author: bleny Date: 2010-11-05 12:45:49 +0000 (Fri, 05 Nov 2010) New Revision: 742 Log: fix build Modified: trunk/wao-ui/src/main/webapp/Administration.tml Modified: trunk/wao-ui/src/main/webapp/Administration.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Administration.tml 2010-11-05 12:04:34 UTC (rev 741) +++ trunk/wao-ui/src/main/webapp/Administration.tml 2010-11-05 12:45:49 UTC (rev 742) @@ -172,7 +172,7 @@ <div class="mtop10" /> - <t:if test="user.indicatorsViewer"> + <t:if test="currentUser.indicatorsViewer"> <t:if t:test="currentUser.admin">

1 0

[Suiviobsmer-commits] r741 - in trunk: wao-business/src/main/filters 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/webapp
by bleny＠users.labs.libre-entreprise.org 05 Nov '10

05 Nov '10

Author: bleny Date: 2010-11-05 12:04:34 +0000 (Fri, 05 Nov 2010) New Revision: 741 Log: add configuration option to hide indicators or not in Wao.properties Modified: trunk/wao-business/src/main/filters/Wao.properties trunk/wao-business/src/main/java/fr/ifremer/wao/WaoProperty.java trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ConnectedUserImpl.java trunk/wao-business/src/main/xmi/wao.zargo trunk/wao-ui/src/main/webapp/Administration.tml trunk/wao-ui/src/main/webapp/Synthesis.tml Modified: trunk/wao-business/src/main/filters/Wao.properties =================================================================== --- trunk/wao-business/src/main/filters/Wao.properties 2010-11-04 22:57:53 UTC (rev 740) +++ trunk/wao-business/src/main/filters/Wao.properties 2010-11-05 12:04:34 UTC (rev 741) @@ -56,3 +56,9 @@ ## Server path for chart generation chart.server.path= + +###### Since 1.6 + +# By default make indicators not visible +wao.indicators.show=false + Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoProperty.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/WaoProperty.java 2010-11-04 22:57:53 UTC (rev 740) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/WaoProperty.java 2010-11-05 12:04:34 UTC (rev 741) @@ -51,7 +51,9 @@ /** Path for Eastwood */ CHART_SERVER_PATH("chart.server.path"), /** Email address to use when contact is done */ - CONTACT_DONE_EMAIL("wao.contactDone.email"); + CONTACT_DONE_EMAIL("wao.contactDone.email"), + /** Will indicators be shown in UI or not */ + SHOW_INDICATORS("wao.indicators.show"); private String key; Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ConnectedUserImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ConnectedUserImpl.java 2010-11-04 22:57:53 UTC (rev 740) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ConnectedUserImpl.java 2010-11-05 12:04:34 UTC (rev 741) @@ -20,6 +20,7 @@ */ package fr.ifremer.wao.bean; +import fr.ifremer.wao.WaoProperty; import fr.ifremer.wao.entity.Company; /** @@ -68,4 +69,10 @@ public Company getCompany() { return user.getCompany(); } + + @Override + public boolean isIndicatorsViewer() { + Boolean test = Boolean.parseBoolean(WaoProperty.SHOW_INDICATORS.getValue()); + return test; + } } Modified: trunk/wao-business/src/main/xmi/wao.zargo =================================================================== (Binary files differ) Modified: trunk/wao-ui/src/main/webapp/Administration.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Administration.tml 2010-11-04 22:57:53 UTC (rev 740) +++ trunk/wao-ui/src/main/webapp/Administration.tml 2010-11-05 12:04:34 UTC (rev 741) @@ -172,61 +172,65 @@ <div class="mtop10" /> - <t:if t:test="currentUser.admin">  + <t:if test="user.indicatorsViewer"> - <t:zone t:id="synthesisParametersFormZone" t:update="show"> - <h2>Indicateurs qualités prestataires</h2> + <t:if t:test="currentUser.admin">  - <form t:type="form" t:id="synthesisParametersForm" t:zone="synthesisParametersFormZone"> + <t:zone t:id="synthesisParametersFormZone" t:update="show"> + <h2>Indicateurs qualités prestataires</h2> - <t:errors t:banner="message:errors-banner" /> + <form t:type="form" t:id="synthesisParametersForm" t:zone="synthesisParametersFormZone"> -  - <t:loop t:source="globalSynthesisParameters.parameters" t:value="indicator" t:volatile="true"> - <t:indicatorLevels t:indicator="indicator" editable="true" /> - </t:loop> + <t:errors t:banner="message:errors-banner" /> - <table class="indicatorLevels"> - <tr> - <th>Total coefficients : </th> - <td>${globalSynthesisParameters.totalCoefficients}</td> - </tr> - </table> +  + <t:loop t:source="globalSynthesisParameters.parameters" t:value="indicator" t:volatile="true"> + <t:indicatorLevels t:indicator="indicator" editable="true" /> + </t:loop> - <table class="indicatorLevels"> - <tr> - <td t:type="loop" t:source="globalSynthesisParameters.globalIndicator.indicatorLevel" t:value="indicatorLevel" t:volatile="true"> - ${globalIndicatorValue.label} - </td> - </tr> - <tr> - <td t:type="loop" t:source="globalSynthesisParameters.globalIndicator.indicatorLevel" t:value="indicatorLevel" volatile="true"> - [ <input type="text" size="3" value="${indicatorLevel.lowerBound}" disabled="disabled" /> ; - <input t:type="textfield" value="indicatorLevel.upperBound" size="3" /> - <t:if test="indicatorLevel.upperBoundIncluded"> - ] - <p:else> - [ - </p:else> - </t:if> - </td> - </tr> - </table> + <table class="indicatorLevels"> + <tr> + <th>Total coefficients : </th> + <td>${globalSynthesisParameters.totalCoefficients}</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> + <table class="indicatorLevels"> + <tr> + <td t:type="loop" t:source="globalSynthesisParameters.globalIndicator.indicatorLevel" t:value="indicatorLevel" t:volatile="true"> + ${globalIndicatorValue.label} + </td> + </tr> + <tr> + <td t:type="loop" t:source="globalSynthesisParameters.globalIndicator.indicatorLevel" t:value="indicatorLevel" volatile="true"> + [ <input type="text" size="3" value="${indicatorLevel.lowerBound}" disabled="disabled" /> ; + <input t:type="textfield" value="indicatorLevel.upperBound" size="3" /> + <t:if test="indicatorLevel.upperBoundIncluded"> + ] + <p:else> + [ + </p:else> + </t:if> + </td> + </tr> + </table> - <div class="fright"> - <a t:type="pagelink" page="IndicatorsHistory"> - <img src="${asset:context:/img/clock.png}" alt="Historique" title="Voir l'historique des modifications des indicateurs" /> - </a> - <input t:type="submit" t:id="saveData" class="ico save" value="Save" title="Enregistrer les modifications" /> - <input type="reset" class="ico undo" value="Annuler les modificationss" title="Annuler les modifications" /> - </div> - </form> - </t:zone> + <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"> + <a t:type="pagelink" page="IndicatorsHistory"> + <img src="${asset:context:/img/clock.png}" alt="Historique" title="Voir l'historique des modifications des indicateurs" /> + </a> + <input t:type="submit" t:id="saveData" class="ico save" value="Save" title="Enregistrer les modifications" /> + <input type="reset" class="ico undo" value="Annuler les modificationss" title="Annuler les modifications" /> + </div> + </form> + </t:zone> + </t:if> + </t:if> </t:layout> Modified: trunk/wao-ui/src/main/webapp/Synthesis.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Synthesis.tml 2010-11-04 22:57:53 UTC (rev 740) +++ trunk/wao-ui/src/main/webapp/Synthesis.tml 2010-11-05 12:04:34 UTC (rev 741) @@ -128,12 +128,14 @@ title="Indicateur de la qualité des données" /> </a> </li> - <li> - <a t:type="actionlink" t:context="[actionShowGlobalSynthesis,'']" t:zone="so-synthesis-main"> - <img src="${asset:context:}/img/synthesis-global-synthesis.png" alt="Synthèse globale des indicateurs" - title="Synthèse globale des indicateurs" /> - </a> - </li> + <t:if test="user.indicatorsViewer"> + <li> + <a t:type="actionlink" t:context="[actionShowGlobalSynthesis,'']" t:zone="so-synthesis-main"> + <img src="${asset:context:}/img/synthesis-global-synthesis.png" alt="Synthèse globale des indicateurs" + title="Synthèse globale des indicateurs" /> + </a> + </li> + </t:if> </ul> </div> <div t:type="zone" t:id="delegator" class="fleft" t:update="show" id="so-synthesis-main"> @@ -160,9 +162,11 @@ <t:chart t:width="600" t:height="400" t:chart="dataSamplingChart" />  -  - <br /> - <t:indicatorLevels t:indicator="activeIndicator" t:highlightLevel="activeIndicatorLevel" withLegend="true" /> + <t:if test="user.indicatorsViewer"> +  + <br /> + <t:indicatorLevels t:indicator="activeIndicator" t:highlightLevel="activeIndicatorLevel" withLegend="true" /> + </t:if> </div> </t:block>  @@ -180,9 +184,11 @@ </p> </t:if> -  - <br /> - <t:indicatorLevels t:indicator="activeIndicator" t:highlightLevel="activeIndicatorLevel" withLegend="true" /> + <t:if test="user.indicatorsViewer"> +  + <br /> + <t:indicatorLevels t:indicator="activeIndicator" t:highlightLevel="activeIndicatorLevel" withLegend="true" /> + </t:if> </div> </t:block>  @@ -228,9 +234,11 @@ </t:if> </div> -  - <br /> - <t:indicatorLevels t:indicator="activeIndicator" t:highlightLevel="activeIndicatorLevel" withLegend="true" /> + <t:if test="user.indicatorsViewer"> +  + <br /> + <t:indicatorLevels t:indicator="activeIndicator" t:highlightLevel="activeIndicatorLevel" withLegend="true" /> + </t:if> </t:block>  <t:block t:id="ind3"> @@ -310,9 +318,11 @@ </p:else> </t:if> -  - <br /> - <t:indicatorLevels t:indicator="activeIndicator" t:highlightLevel="activeIndicatorLevel" withLegend="true" /> + <t:if test="user.indicatorsViewer"> +  + <br /> + <t:indicatorLevels t:indicator="activeIndicator" t:highlightLevel="activeIndicatorLevel" withLegend="true" /> + </t:if> </div> </t:block>  @@ -348,40 +358,43 @@ </p:else> </t:if> -  - <br /> - <t:indicatorLevels t:indicator="activeIndicator" t:highlightLevel="activeIndicatorLevel" withLegend="true" /> + <t:if test="user.indicatorsViewer"> +  + <br /> + <t:indicatorLevels t:indicator="activeIndicator" t:highlightLevel="activeIndicatorLevel" withLegend="true" /> + </t:if> </div> </t:block>  <t:block t:id="globalSynthesis"> - <div class="print"> - <h2>Synthèse globale</h2> - <br /> + <t:if test="user.indicatorsViewer"> + <div class="print"> + <h2>Synthèse globale</h2> + <br /> - <t:loop t:source="globalSynthesisParameters.parameters" t:value="activeIndicator"> - <t:indicatorLevels t:indicator="activeIndicator" t:highlightLevel="activeIndicatorLevel" /> - </t:loop> + <t:loop t:source="globalSynthesisParameters.parameters" t:value="activeIndicator"> + <t:indicatorLevels t:indicator="activeIndicator" t:highlightLevel="activeIndicatorLevel" /> + </t:loop> - <table class="indicatorLevels"> - <tbody> - <tr> - <t:loop t:source="globalLevels" t:value="globalLevel"> - <t:if test="highlightGlobalLevel()"> - <td class="highlight selected"> - ${globalLevel.label} - </td> - <p:else> - <td> + <table class="indicatorLevels"> + <tbody> + <tr> + <t:loop t:source="globalLevels" t:value="globalLevel"> + <t:if test="highlightGlobalLevel()"> + <td class="highlight selected"> ${globalLevel.label} </td> - </p:else> - </t:if> - </t:loop> - </tr> - </tbody> - </table> - - </div> + <p:else> + <td> + ${globalLevel.label} + </td> + </p:else> + </t:if> + </t:loop> + </tr> + </tbody> + </table> + </div> + </t:if> </t:block> </t:layout>

1 0

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

04 Nov '10

Author: bleny Date: 2010-11-04 22:57:53 +0000 (Thu, 04 Nov 2010) New Revision: 740 Log: refactoring totals by columns in sampling plan ; start filter by multiple codes Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.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-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java 2010-11-04 22:55:02 UTC (rev 739) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java 2010-11-04 22:57:53 UTC (rev 740) @@ -225,8 +225,20 @@ // sectorName and facadeName are the two FishingZone filters known // FishingZone filter (sectorName OR facadeName) + + if (logger.isDebugEnabled()) { + logger.debug("CollectionUtils.isNotEmpty(filter.getSampleRows())" + + CollectionUtils.isNotEmpty(filter.getSampleRows())); + } + if (CollectionUtils.isNotEmpty(filter.getSampleRows())) { + if (logger.isDebugEnabled()) { + for (SampleRow row : filter.getSampleRows()) { + logger.debug("sampleRows contains row " + row); + } + } + query.addEquals(sampleRowProperty.$alias(), filter.getSampleRows().toArray( new SampleRow[filter.getSampleRows().size()])); 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-11-04 22:55:02 UTC (rev 739) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SamplingPlan.java 2010-11-04 22:57:53 UTC (rev 740) @@ -62,7 +62,9 @@ import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; +import java.util.HashMap; import java.util.List; +import java.util.Map; /** * SampingPlan @@ -239,6 +241,51 @@ return this; } + @Property + private boolean refreshSampleRowCodeZone; + + @Property + private String sampleRowCodeIndex; + + @Persist + @Property + private SampleRow selectedSampleRow; + + @InjectComponent + private Zone sampleRowZone; + + public void onChangeFromSelectedSampleRow(String sampleRowCode) { + selectedSampleRow = getSampleRowSelectModel().findObject(sampleRowCode); + + logger.debug("selectedSampleRow " + selectedSampleRow.getCode()); + } + + public Object onActionFromAddSampleRowCode() { + refreshSampleRowCodeZone = true; + if (logger.isDebugEnabled()) { + logger.debug("added filter on code " + selectedSampleRow.getCode()); + } + + if (getFilter().getSampleRows() == null) { + getFilter().setSampleRows(new ArrayList<SampleRow>()); + } + getFilter().addSampleRows(selectedSampleRow); + + selectedSampleRow = null; + + return sampleRowZone; + } + + public Object onActionFromRemoveSampleRowCode(String sampleRowCodeIndex) { + refreshSampleRowCodeZone = true; + + logger.debug("should remove" + sampleRowCodeIndex); + + getFilter().getSampleRows().remove(selectedSampleRow); + + return sampleRowZone; + } + /**************************** MAIN ACTIONS ********************************/ @Persist @@ -297,6 +344,11 @@ */ public List<SampleRow> getData() throws WaoException { if (data == null) { + if (logger.isDebugEnabled()) { + logger.debug("sampleRows filter sent to service : " + + getFilter().getSampleRows()); + } + FacadeRow facade = serviceSampling.getSampleRowsOrderedByFishingZone(getFilter()); data = facade.getValues(); @@ -401,19 +453,26 @@ return NumberFormat.getNumberInstance(); } - private List<String> totals; + private Map<Date, Integer> totalExpectedForMonths; + private Map<Date, Integer> totalRealForMonths; + private Integer highTotalExpected; + private Integer highTotalReal; - @Property - private String total; + /** Set totalExpectedForMonths, totalRealForMonths, highTotalExpected and + * highTotalReal values. + */ + protected void setTotalsForMonths() { - public List<String> getTotals() { + // to prevent a side-effect, keep month value + Date keptMonth = month; - List<String> totals = new ArrayList<String>(); + totalExpectedForMonths = new HashMap<Date, Integer>(); + totalRealForMonths = new HashMap<Date, Integer>(); - // high totals are the total... of the totals, it will appear + // high totals is 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; + highTotalExpected = 0; + highTotalReal = 0; for (Date month : getMonths()) { this.month = month; @@ -423,37 +482,95 @@ 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)); + logger.debug( String.format("for month %s and row %s : expected = %s, real = %s", + getDateFormat().format(month), row.getCode(), expected, real)); } if (expected != null) { totalExpected += expected; } - if (real != null) { + if (real != null && canDisplayTidesReal()) { totalReal += real; } } - String total = totalExpected.toString(); - if (canDisplayTidesReal() && totalReal != 0) { - total += " (" + totalReal + ")"; + totalExpectedForMonths.put(month, totalExpected); + totalRealForMonths.put(month, totalReal); + + if (logger.isDebugEnabled()) { + logger.debug( String.format("totals for month %s : expected = %s, actual = %s", + getDateFormat().format(month), totalExpected, totalReal)); } - totals.add(total); - highTotalExpected += totalExpected; highTotalReal += totalReal; } + + if (logger.isDebugEnabled()) { + for (Map.Entry<Date, Integer> expected : totalExpectedForMonths.entrySet()) { + logger.debug( String.format("totals for month %s : expected = %s, actual = %s", + getDateFormat().format(expected.getKey()), expected.getValue(), + totalRealForMonths.get(expected.getKey()))); + } + } - totals.add(highTotalExpected + " (" + highTotalReal + ")"); + // to prevent side-effect, restore month value + month = keptMonth; + } - return totals; + public Integer getTotalExpectedForMonth() { + if (totalExpectedForMonths == null) { + setTotalsForMonths(); + } + Integer total = totalExpectedForMonths.get(month); + if (logger.isDebugEnabled()) { + logger.debug(String.format("total for month %s is %s", getDateFormat().format(month), total)); + } + return total; } + public Integer getTotalRealForMonth() { + if (totalExpectedForMonths == null) { + setTotalsForMonths(); + } + return totalRealForMonths.get(month); + } + + public String getRatioForMonth() { + String ratio = ""; + if (getTotalExpectedForMonth() > 0) { + double percent = ((double) getTotalRealForMonth() / getTotalExpectedForMonth()); + ratio = NumberFormat.getPercentInstance().format(percent); + } + return ratio; + } + + public Integer getHighTotalExpected() { + if (highTotalExpected == null) { + setTotalsForMonths(); + } + return highTotalExpected; + } + + public Integer getHighTotalReal() { + if (highTotalReal == null) { + setTotalsForMonths(); + } + return highTotalReal; + } + + public String getHighTotalRatio() { + String ratio = ""; + if (getHighTotalExpected() > 0) { + double percent = ((double) getHighTotalReal() / getHighTotalExpected()); + ratio = NumberFormat.getPercentInstance().format(percent); + } + return ratio; + } + /** ------------------------- HTML & STYLE ----------------------------- **/ @Property @@ -512,6 +629,16 @@ return result; } + public String getRealTidesClassForTotal() { + String result = "real-warning"; + if (getTotalRealForMonth() < getTotalExpectedForMonth()) { + result += "-inf"; + } else if (getTotalExpectedForMonth() > getTotalRealForMonth()) { + result += "-sup"; + } + return result; + } + public String getMonthCurrentClass() { return isCurrentMonth() ? "selected" : ""; } Modified: trunk/wao-ui/src/main/webapp/SamplingPlan.tml =================================================================== --- trunk/wao-ui/src/main/webapp/SamplingPlan.tml 2010-11-04 22:55:02 UTC (rev 739) +++ trunk/wao-ui/src/main/webapp/SamplingPlan.tml 2010-11-04 22:57:53 UTC (rev 740) @@ -128,8 +128,31 @@ <select t:type="select" t:id="sectorName" t:model="sectorSelectModel" t:value="filter.sectorName" />  <input t:type="submit" class="ico22px refresh" t:id="refreshBySector" value="Refresh" title="Rafraîchir les métiers en fonction de la zone sélectionnée"/>  - <t:label t:for="sampleRow" />: - <input t:type="select" t:id="sampleRow" t:model="sampleRowSelectModel" value="sampleRowId" /> +  + + + <t:zone id="so-sampling-sampleRowZone" t:id="sampleRowZone" t:update="show"> + <t:nuiton.subForm t:visible="refreshSampleRowCodeZone"> + <t:label t:for="selectedSampleRow" />: + <select t:type="select" t:id="selectedSampleRow" t:value="selectedSampleRow" t:model="sampleRowSelectModel" + t:mixins="ck/onEvent" t:event="change"/> + <a t:type="actionlink" t:id="addSampleRowCode" title="Ajouter un code de ligne" t:zone="so-sampling-sampleRowZone"> + <img src="${asset:context:img/add-16px.png}" /> + </a>  +  + </t:nuiton.subForm> + </t:zone> + + + </div> <div class="t-beaneditor-row aright"> <input t:type="submit" class="ico search-32px" t:id="search" value="Search" title="Rechercher les lignes du plan correspondants aux filtres saisies" />  @@ -303,11 +326,25 @@ </tr> <tr> <td colspan="${nbColumnsForProfession}" /> - <t:loop source="totals" value="total"> + + <t:loop source="months" value="month"> <td class="width50 acenter ${monthCurrentClass}"> - ${total} + ${totalExpectedForMonth} +  + <span class="${realTidesClassForTotal}"><em>(${totalRealForMonth})</em></span> + <br /> + ${ratioForMonth} +  </td> </t:loop> + <td class="width50 acenter bright"> + <span t:type="ck/Tooltip" title="Infos" t:value="Total sur la période du mois ${dateFormat.format(month)}" t:effect="appear"> + ${highTotalExpected} + <t:unless t:test="user.guest"> + <em>(${highTotalReal})</em><br /><strong>${highTotalRatio}</strong> + </t:unless> + </span> + </td> <td colspan="${nbColumnsForOther}" /> </tr> </tbody>

1 0

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

04 Nov '10

Author: bleny Date: 2010-11-04 22:55:02 +0000 (Thu, 04 Nov 2010) New Revision: 739 Log: update migration code to make it coherent with model 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-11-04 20:22:38 UTC (rev 738) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java 2010-11-04 22:55:02 UTC (rev 739) @@ -303,17 +303,11 @@ "topiaCreateDate TIMESTAMP WITHOUT TIME ZONE NOT NULL," + "logText TEXT," + "\"comment\" TEXT," + - "indicator CHARACTER VARYING(255)," + "author CHARACTER VARYING(255)," + "CONSTRAINT author_fkey FOREIGN KEY (author) " + "REFERENCES WaoUser (topiaid) MATCH SIMPLE " + - "ON UPDATE NO ACTION ON DELETE NO ACTION, " + - "CONSTRAINT indicator_fkey FOREIGN KEY (indicator) " + - "REFERENCES Indicator (topiaid) MATCH SIMPLE " + "ON UPDATE NO ACTION ON DELETE NO ACTION);"); - - } /** Insert initial data specified in newly created tables about indicators. */

1 0

[Suiviobsmer-commits] r738 - trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages
by bleny＠users.labs.libre-entreprise.org 04 Nov '10

04 Nov '10

Author: bleny Date: 2010-11-04 20:22:38 +0000 (Thu, 04 Nov 2010) New Revision: 738 Log: make company field value kept between submission in synthesis filter Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java 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-11-04 20:21:42 UTC (rev 737) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java 2010-11-04 20:22:38 UTC (rev 738) @@ -117,9 +117,11 @@ private Zone delegator; void setupRender() { - // The company of connected user will be contributed to abstractFilteredPage - initCompanyFilter(); + // make filters keep company between submissions + initSelectFilters(true, false, true); + // add a special CSS to make global synthesis page printable without + // menu, filters, etc. renderSupport.addStylesheetLink("css/synthesis-print.css", "print"); } @@ -171,10 +173,6 @@ } public Block getActiveBlock() throws WaoException { - switch (getActiveSynthesis()) { - case GRAPH_SAMPLING : initSamplingBlock(); break; - case GRAPH_BOARDING : initBoardingBlock(); - } Block activeBlock; if (BooleanUtils.isTrue(showGlobalSynthesis)) { @@ -299,11 +297,7 @@ private boolean reset; - private void initSamplingBlock() throws WaoException { - initSelectFilters(true, false, true); - } - - public JFreeChart getDataSamplingChart() throws WaoException { + public JFreeChart getDataSamplingChart() throws WaoException { List<SortedMap<Date, Integer>> res = serviceSynthesis.getDataSampling(getFilter()); Map<String, Map<?, Integer>> data = new HashMap<String, Map<?, Integer>>(); data.put("Planifié", res.get(0)); @@ -329,25 +323,6 @@ private BoardingResult boardingResult; - @Persist - private Company companyForBoarding; - - @Property - private String companyIdForBoarding; - - private void initBoardingBlock() throws WaoException { - resetCompanySelect(); - // Set the companyIdForBoarding is only necessary for an admin which - // have access to a select with all active companies (from Filters : - // getCompanySelectModel()) - if (companyForBoarding != null && user.isAdmin()) { - companyIdForBoarding = companyForBoarding.getTopiaId(); - if (log.isDebugEnabled()) { - log.debug("companyId init : " + companyIdForBoarding); - } - } - } - public JFreeChart getBoardingBoatsChart() throws WaoException { Map<String, Map<?, Integer>> data = new HashMap<String, Map<?, Integer>>(); @@ -356,6 +331,7 @@ String title = "Sollicitations des navires depuis le " + getDateFormat().format(getFilter().getPeriod().getFromDate()); + Company companyForBoarding = getFilter().getCompany(); if (companyForBoarding != null) { title += "\nSociété " + companyForBoarding.getName(); }

1 0