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

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

Nov. 18, 2010

Author: bleny Date: 2010-11-18 11:39:01 +0000 (Thu, 18 Nov 2010) New Revision: 787 Log: global synthesis tells when it's based on estimated data Modified: trunk/wao-ui/src/main/webapp/Synthesis.tml Modified: trunk/wao-ui/src/main/webapp/Synthesis.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Synthesis.tml 2010-11-18 11:37:57 UTC (rev 786) +++ trunk/wao-ui/src/main/webapp/Synthesis.tml 2010-11-18 11:39:01 UTC (rev 787) @@ -326,7 +326,7 @@ <h2>Qualité de la donnée</h2> <br /> <p> - Pourcentage du nombre de marées exploitables par rapport nombre de marée réalisées + Pourcentage du nombre de marées exploitables par rapport nombre de marée réalisées. </p> <table class="t-data-grid"> <thead> @@ -356,7 +356,7 @@ <t:block t:id="globalSynthesis"> <t:if test="user.indicatorsViewer"> <div class="print acenter"> - <h2>Synthèse globale</h2> + <h2>Synthèse globale <t:if test="filter.getEstimatedTides()">(selon estimations)</t:if></h2> <br /> <t:loop t:source="globalSynthesisParameters.parameters" t:value="activeIndicator">

1 0

[Suiviobsmer-commits] r786 - trunk/wao-business/src/main/java/fr/ifremer/wao/service
by bleny＠users.labs.libre-entreprise.org Nov. 18, 2010

Nov. 18, 2010

Author: bleny Date: 2010-11-18 11:37:57 +0000 (Thu, 18 Nov 2010) New Revision: 786 Log: no average reactivity when company never returned data Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java 2010-11-18 10:45:27 UTC (rev 785) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java 2010-11-18 11:37:57 UTC (rev 786) @@ -519,27 +519,33 @@ List<Object[]> res = transaction.findByQuery(query); for (Object[] row : res) { - String rowCompanyName = (String)row[0]; - Date rowDataInputDate = (Date)row[1]; - Date rowTideBeginDate = (Date)row[2]; + String rowCompanyName = (String) row[0]; + Date rowDataInputDate = (Date) row[1]; + Date rowTideBeginDate = (Date) row[2]; - int nbDays = DateUtil.getDifferenceInDays(rowTideBeginDate, rowDataInputDate); - if (log.isDebugEnabled()) { log.debug("Company : " + rowCompanyName); log.debug("tideBegin : " + rowTideBeginDate); log.debug("dataInput : " + rowDataInputDate); - log.debug("nbDays : " + nbDays); } - ContactAverageReactivity avg = results.get(rowCompanyName); - if (avg == null) { - avg = new ContactAverageReactivityImpl(); - avg.setCompanyName(rowCompanyName); - results.put(rowCompanyName, avg); + if (rowDataInputDate != null) { + + int nbDays = DateUtil.getDifferenceInDays(rowTideBeginDate, rowDataInputDate); + + if (log.isDebugEnabled()) { + log.debug("nbDays : " + nbDays); + } + + ContactAverageReactivity avg = results.get(rowCompanyName); + if (avg == null) { + avg = new ContactAverageReactivityImpl(); + avg.setCompanyName(rowCompanyName); + results.put(rowCompanyName, avg); + } + + avg.addValue(nbDays); } - - avg.addValue(nbDays); } return results.values(); }

1 0

[Suiviobsmer-commits] r785 - in trunk/wao-ui/src/main: java/fr/ifremer/wao/ui/pages java/fr/ifremer/wao/ui/services webapp/css
by bleny＠users.labs.libre-entreprise.org Nov. 18, 2010

Nov. 18, 2010

Author: bleny Date: 2010-11-18 10:45:27 +0000 (Thu, 18 Nov 2010) New Revision: 785 Log: coordinator can see data reliability Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/ContactModelFactory.java trunk/wao-ui/src/main/webapp/css/contacts.css 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-11-18 10:17:08 UTC (rev 784) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java 2010-11-18 10:45:27 UTC (rev 785) @@ -423,7 +423,8 @@ /**************************** CONTACT ROW ACTION **************************/ public boolean isDataReliabilityAsked() { - boolean result = contact.getValidationProgram() == null; + boolean result = user.isAdmin() && ! user.isReadOnly() && + contact.getValidationProgram() == null; return result; } Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/ContactModelFactory.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/ContactModelFactory.java 2010-11-18 10:17:08 UTC (rev 784) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/ContactModelFactory.java 2010-11-18 10:45:27 UTC (rev 785) @@ -95,6 +95,8 @@ contactModel.add(RelativePosition.AFTER, Contact.COMMENT_COORDINATOR, Contact.COMMENT_ADMIN, getCommentAdminPropertyConduit()); contactModel.get(Contact.COMMENT_COORDINATOR).sortable(false); contactModel.get(Contact.COMMENT_ADMIN).sortable(false); + contactModel.add(RelativePosition.BEFORE, "actions", "dataReliability", getDataReliabilityPropertyConduit()); + contactModel.get("dataReliability").sortable(false); return contactModel; } @@ -112,7 +114,6 @@ contactModel.add(RelativePosition.AFTER, "fishingZoneSector", "fishingZoneDivision", getFishingZoneDivisionPropertyConduit()); contactModel.add(RelativePosition.AFTER, Contact.BOAT, "boatImmatriculation", getBoatImmatriculationPropertyConduit()); contactModel.add(RelativePosition.AFTER, "boatImmatriculation", "boatDistrictCode", getBoatDistrictCodePropertyConduit()); - contactModel.add(RelativePosition.AFTER, "validation", "dataReliability", getDataReliabilityPropertyConduit()); contactModel.get("observer").sortable(false); contactModel.get(WaoUser.COMPANY).sortable(false); @@ -125,7 +126,6 @@ contactModel.get("fishingZoneDivision").sortable(false); contactModel.get("boatImmatriculation").sortable(false); contactModel.get("boatDistrictCode").sortable(false); - contactModel.get("dataReliability").sortable(false); // contactModel.add(RelativePosition.AFTER, TopiaEntity.TOPIA_CREATE_DATE, "observer", null); // contactModel.add(RelativePosition.AFTER, "observer", User.COMPANY, null); Modified: trunk/wao-ui/src/main/webapp/css/contacts.css =================================================================== --- trunk/wao-ui/src/main/webapp/css/contacts.css 2010-11-18 10:17:08 UTC (rev 784) +++ trunk/wao-ui/src/main/webapp/css/contacts.css 2010-11-18 10:45:27 UTC (rev 785) @@ -146,7 +146,8 @@ div#so-contacts table.t-data-grid tbody tr td.comment, div#so-contacts table.t-data-grid thead tr th.comment, div#so-contacts table.t-data-grid thead tr th.commentCoordinator, -div#so-contacts table.t-data-grid thead tr th.commentAdmin { +div#so-contacts table.t-data-grid thead tr th.commentAdmin +div#so-contacts table.t-data-grid thead tr th.dataReliability { white-space: normal; width: 100px; text-align: center;

1 0

[Suiviobsmer-commits] r784 - trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages
by bleny＠users.labs.libre-entreprise.org Nov. 18, 2010

Nov. 18, 2010

Author: bleny Date: 2010-11-18 10:17:08 +0000 (Thu, 18 Nov 2010) New Revision: 784 Log: update form label Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Contacts.properties Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Contacts.properties =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Contacts.properties 2010-11-18 10:16:16 UTC (rev 783) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Contacts.properties 2010-11-18 10:17:08 UTC (rev 784) @@ -59,7 +59,7 @@ commentAdmin-label: Commentaire programme commentCoordinator-label: Commentaire soci\u00e9t\u00e9 dataReliability-label: Qualit\u00e9 de la donn\u00e9e -sortedByBoardingDate-label: Trier les contacts (ordre anti-chronologique) +sortedByBoardingDate-label: Trier par date de d\u00e9but de mar\u00e9e (du plus r\u00e9cent au plus ancien) # Form labels contactsForm-errors-banner: Le contact n'a pas \u00e9t\u00e9 sauvegard\u00e9 \u00e0 cause des erreurs suivantes :

1 0

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

Nov. 18, 2010

Author: bleny Date: 2010-11-18 10:16:16 +0000 (Thu, 18 Nov 2010) New Revision: 783 Log: fix contact grid layout 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-18 10:15:40 UTC (rev 782) +++ trunk/wao-ui/src/main/webapp/Contacts.tml 2010-11-18 10:16:16 UTC (rev 783) @@ -151,7 +151,7 @@ <label for="commentAdmin">programme</label> </t:if> </div> - <div> + <div style="margin-top: 15px;"> <input t:type="checkbox" t:id="sortedByBoardingDate" value="contactFilter.sortedByBoardingDate" /> <t:label t:for="sortedByBoardingDate" /> </div> <div class="t-beaneditor-row aright">

1 0

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

Nov. 18, 2010

Author: bleny Date: 2010-11-18 10:15:40 +0000 (Thu, 18 Nov 2010) New Revision: 782 Log: fix contact grid layout Modified: trunk/wao-ui/src/main/webapp/css/contacts.css Modified: trunk/wao-ui/src/main/webapp/css/contacts.css =================================================================== --- trunk/wao-ui/src/main/webapp/css/contacts.css 2010-11-17 17:30:06 UTC (rev 781) +++ trunk/wao-ui/src/main/webapp/css/contacts.css 2010-11-18 10:15:40 UTC (rev 782) @@ -143,7 +143,10 @@ div#so-contacts table.t-data-grid tbody tr td.commentCoordinator, div#so-contacts table.t-data-grid tbody tr td.commentAdmin, -div#so-contacts table.t-data-grid tbody tr td.comment { +div#so-contacts table.t-data-grid tbody tr td.comment, +div#so-contacts table.t-data-grid thead tr th.comment, +div#so-contacts table.t-data-grid thead tr th.commentCoordinator, +div#so-contacts table.t-data-grid thead tr th.commentAdmin { white-space: normal; width: 100px; text-align: center;

1 0

[Suiviobsmer-commits] r781 - trunk/wao-business/src/test/java/fr/ifremer/wao/service
by bleny＠users.labs.libre-entreprise.org Nov. 17, 2010

Nov. 17, 2010

Author: bleny Date: 2010-11-17 17:30:06 +0000 (Wed, 17 Nov 2010) New Revision: 781 Log: fixed FIXME Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactImplTest.java Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactImplTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactImplTest.java 2010-11-17 17:27:27 UTC (rev 780) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactImplTest.java 2010-11-17 17:30:06 UTC (rev 781) @@ -31,7 +31,6 @@ import fr.ifremer.wao.entity.WaoUser; import org.junit.Assert; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.nuiton.topia.TopiaException; import org.slf4j.Logger; @@ -61,8 +60,6 @@ } @Test - // FIXME-fdesbois-2010-11-14 : NPE on ServiceContactImpl when loading dcf5code - @Ignore public void testGetContactsFilteredByObserver() throws TopiaException { log.info("getContactsFilteredByObserver");

1 0

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

Nov. 17, 2010

Author: bleny Date: 2010-11-17 17:27:27 +0000 (Wed, 17 Nov 2010) New Revision: 780 Log: i18n for DataReliability in forms Modified: trunk/wao-ui/src/main/webapp/WEB-INF/app.properties Modified: trunk/wao-ui/src/main/webapp/WEB-INF/app.properties =================================================================== --- trunk/wao-ui/src/main/webapp/WEB-INF/app.properties 2010-11-17 17:25:39 UTC (rev 779) +++ trunk/wao-ui/src/main/webapp/WEB-INF/app.properties 2010-11-17 17:27:27 UTC (rev 780) @@ -32,3 +32,8 @@ ContactState.BOARDING_EXPECTED: Embarquement programm\u00e9 ContactState.CONTACT_START: Contact pris +DataReliability.UNKNOWN: Inconnue +DataReliability.NOT_RELIABLE: Non-exploitable +DataReliability.DOUBTFUL: Douteuse +DataReliability.RELIABLE: Exploitable +

1 0

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

Nov. 17, 2010

Author: bleny Date: 2010-11-17 17:25:39 +0000 (Wed, 17 Nov 2010) New Revision: 779 Log: fix lazy loading issue Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java trunk/wao-business/src/main/xmi/wao.properties Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2010-11-17 16:36:44 UTC (rev 778) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2010-11-17 17:25:39 UTC (rev 779) @@ -148,11 +148,6 @@ Map<String, Contact> results = dao.findAllMappedByQuery(query); - // XXX bleny 20101112 prevent lazy loading failure - for (Contact contact : results.values()) { - contact.getSampleRow().getProfession().sizeDcf5code(); - } - return results; } Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java 2010-11-17 16:36:44 UTC (rev 778) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java 2010-11-17 17:25:39 UTC (rev 779) @@ -486,14 +486,6 @@ for (SampleRow row : results) { // use FacadeRow to complete ordering using maps result.addRow(row); - - // XXX bleny 20101110 browse code to force load it from BD - // "lazy" directive doesn't seem to work - if (row.getProfession() != null) { - for (DCFFiveCode code : row.getProfession().getDcf5code()) { - log.debug("row " + row.getCode() + " has DCF5 code " + code.toString()); - } - } } return result; } @@ -568,14 +560,6 @@ result.sizeSampleMonth(); result.sizeElligibleBoat(); - - - // XXX bleny 20101110 browse code to force load it from BD - // "lazy" directive doesn't seem to work - for (DCFFiveCode code : result.getProfession().getDcf5code()) { - log.debug("row " + result.getCode() + " has DCF5 code " + code.toString()); - } - return result; } Modified: trunk/wao-business/src/main/xmi/wao.properties =================================================================== --- trunk/wao-business/src/main/xmi/wao.properties 2010-11-17 16:36:44 UTC (rev 778) +++ trunk/wao-business/src/main/xmi/wao.properties 2010-11-17 17:25:39 UTC (rev 779) @@ -14,7 +14,7 @@ fr.ifremer.wao.entity.SampleRow.attribute.fishingZone.tagvalue.orderBy=facadeName,sectorName,districtCode fr.ifremer.wao.entity.SampleRow.attribute.company.tagvalue.lazy=false fr.ifremer.wao.entity.SampleRow.attribute.profession.tagvalue.lazy=false -fr.ifremer.wao.entity.Profession.attribute.dcf5Code.tagvalue.lazy=false +fr.ifremer.wao.entity.Profession.attribute.dcf5code.tagvalue.lazy=false #fr.ifremer.wao.entity.SampleRow.attribute.elligibleBoat.tagvalue.lazy=false fr.ifremer.wao.entity.SampleRow.attribute.elligibleBoat.tagvalue.orderBy=companyActive #fr.ifremer.wao.entity.SampleRow.attribute.sampleRowLog.tagvalue.lazy=false

1 0

[Suiviobsmer-commits] r778 - in trunk: wao-business/src/main/java/fr/ifremer/wao/entity wao-business/src/main/xmi wao-ui/src/main/webapp
by bleny＠users.labs.libre-entreprise.org Nov. 17, 2010

Nov. 17, 2010

Author: bleny Date: 2010-11-17 16:36:44 +0000 (Wed, 17 Nov 2010) New Revision: 778 Log: fix tooltip for DCF5code in sampling plan compact mode Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ProfessionImpl.java trunk/wao-business/src/main/xmi/wao.zargo trunk/wao-ui/src/main/webapp/SamplingPlan.tml Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ProfessionImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ProfessionImpl.java 2010-11-17 16:35:43 UTC (rev 777) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ProfessionImpl.java 2010-11-17 16:36:44 UTC (rev 778) @@ -46,6 +46,13 @@ @Override public String getCode() { String code = StringUtils.join(getDcf5code(), ", "); + code += getCodeWithoutDCF5(); + return code; + } + + @Override + public String getCodeWithoutDCF5() { + String code = ""; if (!StringUtils.isEmpty(getMeshSize())) { code += " " + getMeshSize(); } @@ -57,5 +64,4 @@ } return code; } - } Modified: trunk/wao-business/src/main/xmi/wao.zargo =================================================================== (Binary files differ) Modified: trunk/wao-ui/src/main/webapp/SamplingPlan.tml =================================================================== --- trunk/wao-ui/src/main/webapp/SamplingPlan.tml 2010-11-17 16:35:43 UTC (rev 777) +++ trunk/wao-ui/src/main/webapp/SamplingPlan.tml 2010-11-17 16:36:44 UTC (rev 778) @@ -274,7 +274,14 @@ ${fishingZones} </span> </td> - <td>${row.profession.code}</td> + <td> + <t:loop source="row.profession.dcf5code" value="dcf5code"> + <span t:type="ck/Tooltip" t:value="${dcf5Code.fishingGearDCF} - ${dcf5Code.fishingGearDCFDescription} ; ${dcf5Code.targetSpeciesDCF} - ${dcf5Code.targetSpeciesDCFDescription}" t:effect="appear"> + ${dcf5Code} + </span> + </t:loop> + ${row.profession.codeWithoutDCF5} + </td> <td class="bright"> <span t:type="ck/Tooltip" title="Infos" t:value="Espèces cibles : ${row.profession.species}" t:effect="appear"> ${row.profession.libelle}

1 0