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

r1562 - trunk/wao-business/src/main/java/fr/ifremer/wao/service
by bleny＠users.forge.codelutin.com March 13, 2012

March 13, 2012

Author: bleny Date: 2012-03-13 15:31:25 +0100 (Tue, 13 Mar 2012) New Revision: 1562 Url: http://forge.codelutin.com/repositories/revision/wao/1562 Log: correction test suite ?\195?\160 changement des r?\195?\168gles de validation contact Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 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 2012-03-13 10:57:45 UTC (rev 1561) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2012-03-13 14:31:25 UTC (rev 1562) @@ -376,37 +376,10 @@ message = "La date de saisie des données ne peut pas être postérieure à la date du jour"; } - // Non abouti, Refus ou Refus Définitif - if (success && contactState.isUnfinishedState()) { - - if (oldContact != null) { - - String newComment = contact.getComment(); - - boolean commentDefined = StringUtils.isNotEmpty(newComment); - boolean commentChanged = commentDefined && - !newComment.equals(oldContact.getComment()); - - // Ano #2540 : NPE on oldState, extract boolean for - // previous unfinishedState case - boolean previousUnfinishedState = commentDefined && - oldContact.getContactState() != null && oldContact.getContactState().isUnfinishedState(); - - // Ano #2440 : no restriction if previous state is unfinished - if (previousUnfinishedState || commentChanged) { - - // RAZ des champs - contact.setObservationBeginDate(null); - contact.setObservationEndDate(null); - contact.setMammalsCapture(false); - contact.setMammalsObservation(false); - contact.setDataInputDate(null); - - } else { - success = false; - message = WaoUtils._("wao.business.contact.validation.commentMissingForState", contact.getContactState().toString()); - } - } + // Non abouti + if (success && contactState == ContactState.OBSERVATION_CANCELLED && StringUtils.isBlank(contact.getComment())) { + success = false; + message = WaoUtils._("wao.business.contact.validation.commentMissingForState", contact.getContactState().toString()); // Observation réalisée } else if (success && contactState.equals(ContactState.OBSERVATION_DONE)) {

1 0

r1561 - in trunk/wao-ui/src/main: java/fr/ifremer/wao/ui/pages webapp
by bleny＠users.forge.codelutin.com March 13, 2012

March 13, 2012

Author: bleny Date: 2012-03-13 11:57:45 +0100 (Tue, 13 Mar 2012) New Revision: 1561 Url: http://forge.codelutin.com/repositories/revision/wao/1561 Log: Evolution #602 Rendre visible l'information saisie par l'observateur en cas de capture accidentelle : afficher ce texte dans une info-bulle au survol de l'ic?\195?\180ne "chalut" 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 2012-03-13 10:28:19 UTC (rev 1560) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java 2012-03-13 10:57:45 UTC (rev 1561) @@ -26,6 +26,7 @@ import fr.ifremer.wao.WaoBusinessException; import fr.ifremer.wao.WaoException; +import fr.ifremer.wao.WaoUtils; import fr.ifremer.wao.bean.ConnectedUser; import fr.ifremer.wao.bean.ContactFilter; import fr.ifremer.wao.bean.ContactState; @@ -429,6 +430,10 @@ return manager.getTooltipSampleRow(contact.getSampleRow()); } + public String getMammalsInfo() { + return WaoUtils.escapeForToolTip(contact.getMammalsInfo()); + } + public String getBoatDescription() { return manager.getTooltipBoat(contact.getBoat()); } Modified: trunk/wao-ui/src/main/webapp/Contacts.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Contacts.tml 2012-03-13 10:28:19 UTC (rev 1560) +++ trunk/wao-ui/src/main/webapp/Contacts.tml 2012-03-13 10:57:45 UTC (rev 1561) @@ -147,7 +147,14 @@ <img src="${asset:context:img/eye-22px.png}" alt="${message:wao.ui.field.Contact.mammalsObservation}" />  </t:if> <t:if t:test="contact.mammalsCapture"> - <img src="${asset:context:img/fishing-net-22px.png}" alt="${message:wao.ui.field.Contact.mammalsCapture}" /> + <t:if t:test="contact.mammalsInfo"> + <span t:type="ck/Tooltip" title="${message:wao.ui.field.Contact.mammalsInfo}" t:value="prop:mammalsInfo" t:effect="appear"> + <img src="${asset:context:img/fishing-net-22px.png}" alt="${message:wao.ui.field.Contact.mammalsCapture}" /> + </span> + <p:else> + <img src="${asset:context:img/fishing-net-22px.png}" alt="${message:wao.ui.field.Contact.mammalsCapture}" /> + </p:else> + </t:if> </t:if> </p:mammalsCell> <p:validationCell>

1 0

r1560 - trunk/wao-business/src/main/java/fr/ifremer/wao/service
by bleny＠users.forge.codelutin.com March 13, 2012

March 13, 2012

Author: bleny Date: 2012-03-13 11:28:19 +0100 (Tue, 13 Mar 2012) New Revision: 1560 Url: http://forge.codelutin.com/repositories/revision/wao/1560 Log: Anomalie #964 controles au remplissage du formulaire par l'observateur : motifs de refus Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 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 2012-03-13 09:48:53 UTC (rev 1559) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2012-03-13 10:28:19 UTC (rev 1560) @@ -379,50 +379,32 @@ // Non abouti, Refus ou Refus Définitif if (success && contactState.isUnfinishedState()) { - boolean contactMustHaveAMotif = contact.getObsProgram() == ObsProgram.OBSMER - && (contactState == ContactState.CONTACT_REFUSED - || contactState == ContactState.CONTACT_DEFINITELY_REFUSED); - if (contactMustHaveAMotif) { + if (oldContact != null) { - if (contact.getContactStateMotif() == null) { - success = false; - message = WaoUtils._("wao.business.contact.validation.contactStateMotifMissing"); - } + String newComment = contact.getComment(); - } else { + boolean commentDefined = StringUtils.isNotEmpty(newComment); + boolean commentChanged = commentDefined && + !newComment.equals(oldContact.getComment()); - if (contact.getContactStateMotif() != null) { - success = false; - message = WaoUtils._("wao.business.contact.validation.contactStateMotifUnwanted"); - } + // Ano #2540 : NPE on oldState, extract boolean for + // previous unfinishedState case + boolean previousUnfinishedState = commentDefined && + oldContact.getContactState() != null && oldContact.getContactState().isUnfinishedState(); - if (oldContact != null) { + // Ano #2440 : no restriction if previous state is unfinished + if (previousUnfinishedState || commentChanged) { - String newComment = contact.getComment(); + // RAZ des champs + contact.setObservationBeginDate(null); + contact.setObservationEndDate(null); + contact.setMammalsCapture(false); + contact.setMammalsObservation(false); + contact.setDataInputDate(null); - boolean commentDefined = StringUtils.isNotEmpty(newComment); - boolean commentChanged = commentDefined && - !newComment.equals(oldContact.getComment()); - - // Ano #2540 : NPE on oldState, extract boolean for - // previous unfinishedState case - boolean previousUnfinishedState = commentDefined && - oldContact.getContactState() != null && oldContact.getContactState().isUnfinishedState(); - - // Ano #2440 : no restriction if previous state is unfinished - if (previousUnfinishedState || commentChanged) { - - // RAZ des champs - contact.setObservationBeginDate(null); - contact.setObservationEndDate(null); - contact.setMammalsCapture(false); - contact.setMammalsObservation(false); - contact.setDataInputDate(null); - - } else { - success = false; - message = WaoUtils._("wao.business.contact.validation.commentMissingForState", contact.getContactState().toString()); - } + } else { + success = false; + message = WaoUtils._("wao.business.contact.validation.commentMissingForState", contact.getContactState().toString()); } } // Observation réalisée @@ -451,6 +433,19 @@ // Ici, les contrôle spécifique à ObsMer if (success && contact.getObsProgram() == ObsProgram.OBSMER) { + boolean contactMustHaveAMotif = contact.getObsProgram() == ObsProgram.OBSMER + && (contactState == ContactState.CONTACT_REFUSED + || contactState == ContactState.CONTACT_DEFINITELY_REFUSED); + if (contactMustHaveAMotif && contact.getContactStateMotif() == null) { + success = false; + message = WaoUtils._("wao.business.contact.validation.contactStateMotifMissing"); + } + + if ( ! contactMustHaveAMotif && contact.getContactStateMotif() != null) { + success = false; + message = WaoUtils._("wao.business.contact.validation.contactStateMotifUnwanted"); + } + if (log.isDebugEnabled()) { log.debug("validationProgram = " + contact.getValidationProgram()); }

1 0

r1559 - trunk/wao-business/src/main/java/fr/ifremer/wao
by bleny＠users.forge.codelutin.com March 13, 2012

March 13, 2012

Author: bleny Date: 2012-03-13 10:48:53 +0100 (Tue, 13 Mar 2012) New Revision: 1559 Url: http://forge.codelutin.com/repositories/revision/wao/1559 Log: la migration ne se d?\195?\169clenche pas : ordre dans la d?\195?\169claration des versions Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoMigrationCallBack.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoMigrationCallBack.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/WaoMigrationCallBack.java 2012-03-12 17:03:56 UTC (rev 1558) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/WaoMigrationCallBack.java 2012-03-13 09:48:53 UTC (rev 1559) @@ -190,8 +190,8 @@ VersionUtil.valueOf("2.1.1"), VersionUtil.valueOf("3.0"), VersionUtil.valueOf("3.1"), - VersionUtil.valueOf("3.3"), - VersionUtil.valueOf("3.2") + VersionUtil.valueOf("3.2"), + VersionUtil.valueOf("3.3") }; @Override

1 0

r1558 - in trunk/wao-business/src/main/java/fr/ifremer/wao: entity service
by bleny＠users.forge.codelutin.com March 12, 2012

March 12, 2012

Author: bleny Date: 2012-03-12 18:03:56 +0100 (Mon, 12 Mar 2012) New Revision: 1558 Url: http://forge.codelutin.com/repositories/revision/wao/1558 Log: Anomalie #959 Mauvais calcul du nombre de strates dans le r?\195?\169f?\195?\169rentiel Added: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/TerrestrialDivisionDAOImpl.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceReferentialImpl.java Added: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/TerrestrialDivisionDAOImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/TerrestrialDivisionDAOImpl.java (rev 0) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/TerrestrialDivisionDAOImpl.java 2012-03-12 17:03:56 UTC (rev 1558) @@ -0,0 +1,16 @@ +package fr.ifremer.wao.entity; + +import org.nuiton.topia.TopiaException; +import org.nuiton.topia.framework.TopiaQuery; + +public class TerrestrialDivisionDAOImpl<E extends TerrestrialDivision> extends TerrestrialDivisionDAOAbstract<E> { + + public long countDistinctTerrestrialDivision() throws TopiaException { + TopiaQuery query = createQuery() + .setSelect(TerrestrialDivision.PROPERTY_CODE) + .addDistinct() + .addNotNull(TerrestrialDivision.PROPERTY_CODE); + return countByQuery(query); + } + +} Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceReferentialImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceReferentialImpl.java 2012-03-12 16:48:34 UTC (rev 1557) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceReferentialImpl.java 2012-03-12 17:03:56 UTC (rev 1558) @@ -836,9 +836,19 @@ if ( ! TopiaEntity.class.isAssignableFrom(entityClass)) { throw new IllegalArgumentException("il faut passer le FQN d'une classe d'entité"); } - TopiaDAO dao = WaoDAOHelper.getDAO(transaction, (Class<? extends TopiaEntity>) entityClass); - long count = dao.count(); + long count; + if (TerrestrialDivision.class.equals(entityClass)) { + // Pour les stratification géographique, on compte le nombre de strate + // (on ne compte pas les unités d'observations, etc qui prennent + // des lignes en base) + TerrestrialDivisionDAO dao = WaoDAOHelper.getTerrestrialDivisionDAO(transaction); + count = dao.countDistinctTerrestrialDivision(); + } else { + TopiaDAO dao = WaoDAOHelper.getDAO(transaction, (Class<? extends TopiaEntity>) entityClass); + count = dao.count(); + } + ReferentialMetaDAO referentialMetaDAO = WaoDAOHelper.getReferentialMetaDAO(transaction); ReferentialMeta referentialMeta = referentialMetaDAO.findByEntityClassFqn(entityClassFqn); if (referentialMeta == null) {

1 0

r1557 - in trunk: wao-business/src/main/java/fr/ifremer/wao/service wao-ui/src/main/java/fr/ifremer/wao/ui/components wao-ui/src/main/resources/fr/ifremer/wao/ui/components
by bleny＠users.forge.codelutin.com March 12, 2012

March 12, 2012

Author: bleny Date: 2012-03-12 17:48:34 +0100 (Mon, 12 Mar 2012) New Revision: 1557 Url: http://forge.codelutin.com/repositories/revision/wao/1557 Log: Anomalie #963 liste des navires incompl?\195?\168te Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceBoatImpl.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/BoatFilterComponent.java trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/BoatFilterComponent.tml Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceBoatImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceBoatImpl.java 2012-03-12 15:20:40 UTC (rev 1556) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceBoatImpl.java 2012-03-12 16:48:34 UTC (rev 1557) @@ -39,7 +39,6 @@ import fr.ifremer.wao.bean.ConnectedUser; import fr.ifremer.wao.bean.LocationType; import fr.ifremer.wao.bean.ObsProgram; -import fr.ifremer.wao.bean.SamplingFilter; import fr.ifremer.wao.entity.Boat; import fr.ifremer.wao.entity.BoatDAO; import fr.ifremer.wao.entity.BoatGroup; @@ -550,15 +549,7 @@ @Override protected BoatFilter executeNewBoatFilter(TopiaContext transaction, ConnectedUser connectedUser) throws Exception { - SamplingFilter samplingFilter = context.getServiceFactory().getServiceSampling().newSamplingFilter(connectedUser); - - // Only rows which are not finished nearly one month - if (connectedUser.isObsMer() || connectedUser.isObsVente()) { - samplingFilter.setNbMonthFinishedFromToday(-1); - } - BoatFilter boatFilter = new BoatFilterImpl(); - boatFilter.setSamplingFilter(samplingFilter); boatFilter.setObsProgram(connectedUser.getProfile().getObsProgram()); if (connectedUser.isProfessional()) { Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/BoatFilterComponent.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/BoatFilterComponent.java 2012-03-12 15:20:40 UTC (rev 1556) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/BoatFilterComponent.java 2012-03-12 16:48:34 UTC (rev 1557) @@ -27,6 +27,7 @@ import fr.ifremer.wao.bean.BoatFilter; import fr.ifremer.wao.bean.BoatFilterValues; import fr.ifremer.wao.bean.ConnectedUser; +import fr.ifremer.wao.bean.ObsProgram; import fr.ifremer.wao.entity.SampleRow; import fr.ifremer.wao.service.ServiceBoat; import org.apache.tapestry5.annotations.InjectComponent; @@ -35,6 +36,8 @@ import org.apache.tapestry5.annotations.SessionState; import org.apache.tapestry5.ioc.annotations.Inject; +import java.util.Date; +import java.util.LinkedList; import java.util.List; /** @@ -109,4 +112,22 @@ public String[] onProvideCompletionsFromBoatName(String input) throws WaoException { return getBoatNamesStartWith(input); } + + public List<SampleRow> getSampleRows() { + // On ne propose pas à l'utilisateur tout, on filtre pour qu'il ne puisse + // voir que les lignes de son programme (sécu) et uniquement les lignes + // dont le programme n'est pas terminé + List<SampleRow> sampleRows = new LinkedList<SampleRow>(); + for (SampleRow sampleRow : getPossibleValuesForFilter().getSamplingFilterValues().getSampleRows()) { + ObsProgram obsProgram = connectedUser.getProfile().getObsProgram(); + boolean addSampleRow = sampleRow.getObsProgram().equals(obsProgram); + if (obsProgram != ObsProgram.OBSDEB) { + addSampleRow &= sampleRow.getPeriodEnd().after(new Date()); + } + if (addSampleRow) { + sampleRows.add(sampleRow); + } + } + return sampleRows; + } } Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/BoatFilterComponent.tml =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/BoatFilterComponent.tml 2012-03-12 15:20:40 UTC (rev 1556) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/BoatFilterComponent.tml 2012-03-12 16:48:34 UTC (rev 1557) @@ -64,7 +64,7 @@ <t:topiaEntitySelector t:id="sampleRow" t:clazzName="SampleRow" t:labelPropertyName="code" - t:values="possibleValuesForFilter.samplingFilterValues.sampleRowsAsList" + t:values="sampleRows" t:selectedValue="filter.samplingFilter.sampleRow" />  </div> <div class="acenter" style="white-space: nowrap;">

1 0

r1556 - in trunk/wao-business/src/main/java/fr/ifremer/wao: entity service
by bleny＠users.forge.codelutin.com March 12, 2012

March 12, 2012

Author: bleny Date: 2012-03-12 16:20:40 +0100 (Mon, 12 Mar 2012) New Revision: 1556 Url: http://forge.codelutin.com/repositories/revision/wao/1556 Log: Evolution #664 Passer la synth?\195?\168se sur un filtrage au niveau contacts : NPE sur certaines dates Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ContactDAOImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowDAOImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ContactDAOImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ContactDAOImpl.java 2012-03-12 11:39:12 UTC (rev 1555) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ContactDAOImpl.java 2012-03-12 15:20:40 UTC (rev 1556) @@ -344,10 +344,6 @@ SortedMap<Date, Integer> actualObservationsMyMonths = new TreeMap<Date,Integer>(); - for (Date month : monthsPeriod.getMonths()) { - actualObservationsMyMonths.put(month, 0); - } - TopiaQuery query = toTopiaQuery(filter); query.addEquals(query.getMainAlias() + "." + Contact.PROPERTY_STATE, ContactState.OBSERVATION_DONE.ordinal()) .addEquals(query.getMainAlias() + "." + Contact.PROPERTY_VALIDATION_COMPANY, true) @@ -359,6 +355,10 @@ Integer count = actualObservationsMyMonths.get(month); + if (count == null) { + count = 0; + } + count += 1; actualObservationsMyMonths.put(month, count); Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowDAOImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowDAOImpl.java 2012-03-12 11:39:12 UTC (rev 1555) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowDAOImpl.java 2012-03-12 15:20:40 UTC (rev 1556) @@ -212,10 +212,6 @@ SortedMap<Date, Integer> expectedObservationsByMonths = new TreeMap<Date,Integer>(); - for (Date month : monthsPeriod.getMonths()) { - expectedObservationsByMonths.put(month, 0); - } - WaoQueryHelper.SampleRowProperty sampleRowProperty = WaoQueryHelper.newSampleRowProperty(); WaoQueryHelper.SampleMonthProperty sampleMonthProperty = WaoQueryHelper.newSampleMonthProperty(); String sampleMonthDateProperty = sampleMonthProperty.periodDate(); 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 2012-03-12 11:39:12 UTC (rev 1555) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java 2012-03-12 15:20:40 UTC (rev 1556) @@ -318,15 +318,16 @@ Date date = entry.getKey(); // both variables will contains planned and realized at the same date - int numberOfRealized = entry.getValue(); - int numberOfPlanned = res.getLeft().get(date); + Integer numberOfPlanned = res.getLeft().get(date); + Integer numberOfRealized = entry.getValue(); - totalNumberOfPlanned += numberOfPlanned; - totalNumberOfRealized += numberOfRealized; + totalNumberOfPlanned += numberOfPlanned == null ? 0 : numberOfPlanned; + totalNumberOfRealized += numberOfRealized == null ? 0 : numberOfRealized; if (log.isDebugEnabled()) { log.debug(String.format( - "number of planed %s (%s), number of realized %s (%s)", + "at month %s:number of planed %s (%s), number of realized %s (%s)", + date, numberOfPlanned, totalNumberOfPlanned, numberOfRealized, totalNumberOfRealized)); }

1 0

r1555 - trunk/wao-ui/src/main/webapp
by bleny＠users.forge.codelutin.com March 12, 2012

March 12, 2012

Author: bleny Date: 2012-03-12 12:39:12 +0100 (Mon, 12 Mar 2012) New Revision: 1555 Url: http://forge.codelutin.com/repositories/revision/wao/1555 Log: Il faut pouvoir aussi modifier le code de ligne sous ObsDeb Modified: trunk/wao-ui/src/main/webapp/SampleRowForm.tml Modified: trunk/wao-ui/src/main/webapp/SampleRowForm.tml =================================================================== --- trunk/wao-ui/src/main/webapp/SampleRowForm.tml 2012-03-12 11:38:27 UTC (rev 1554) +++ trunk/wao-ui/src/main/webapp/SampleRowForm.tml 2012-03-12 11:39:12 UTC (rev 1555) @@ -47,14 +47,25 @@ <fieldset class="t-beaneditor"> <legend>${message:wao.ui.misc.information}</legend> <t:if test="user.admin"> - <div class="t-beaneditor-row"> + <div class="t-beaneditor-row"> + <label for="code2"> + ${message:wao.ui.field.SampleRow.code} + </label> + <t:if t:test="createMode"> + <t:textfield t:id="code2" t:value="sampleRow.code" size="9" /> + <p:else> + ${sampleRow.code} + </p:else> + </t:if> + </div> + <div class="t-beaneditor-row"> <label for="company2">${message:wao.ui.field.SampleRow.company}</label> <t:topiaEntitySelector t:id="company2" t:clazzName="Company" - t:labelPropertyName="name" - t:values="companies" - t:selectedValue="sampleRow.company" /> - </div> + t:labelPropertyName="name" + t:values="companies" + t:selectedValue="sampleRow.company" /> + </div> </t:if> <div class="t-beaneditor-row"> <label for="observers">${message:wao.ui.field.SampleRow.observers}</label> @@ -257,7 +268,7 @@ <t:beaneditor t:id="sampleRowEditor" t:object="sampleRow" t:model="sampleRowModel"> <p:code> <label for="code"> - ${message:wao.ui.field.SampleRow.code} + ${message:wao.ui.field.SampleRow.code} </label> <t:if t:test="createMode"> <t:textfield t:id="code" t:value="sampleRow.code" size="9" />

1 0

r1554 - in trunk/wao-business/src/main/java/fr/ifremer/wao: bean io/csv2/models
by bleny＠users.forge.codelutin.com March 12, 2012

March 12, 2012

Author: bleny Date: 2012-03-12 12:38:27 +0100 (Mon, 12 Mar 2012) New Revision: 1554 Url: http://forge.codelutin.com/repositories/revision/wao/1554 Log: Anomalie #958: Erreur ?\195?\160 l'export du plan ObsDeb -NPE lorsque une ligne du plan n'a pas d'unit?\195?\169 d'observation associ?\195?\169e Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SamplingFilterValuesImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/ObsDebSamplingPlanImportExportModel.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SamplingFilterValuesImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SamplingFilterValuesImpl.java 2012-03-12 11:36:36 UTC (rev 1553) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SamplingFilterValuesImpl.java 2012-03-12 11:38:27 UTC (rev 1554) @@ -124,10 +124,12 @@ addAllObservers(sampleRow.getObservers()); if (sampleRow.isFieldWorkObservation()) { TerrestrialDivision observationUnit = sampleRow.getObservationUnit(); - addObservationUnits(observationUnit); - addSkillZone(observationUnit); - addSubPopulation(observationUnit); - addRegionIfremers(observationUnit.getRegionIfremer()); + if (observationUnit != null) { + addObservationUnits(observationUnit); + addSkillZone(observationUnit); + addSubPopulation(observationUnit); + addRegionIfremers(observationUnit.getRegionIfremer()); + } } else { addRegionIfremers(sampleRow.getTerrestrialLocation()); } Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/ObsDebSamplingPlanImportExportModel.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/ObsDebSamplingPlanImportExportModel.java 2012-03-12 11:36:36 UTC (rev 1553) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/ObsDebSamplingPlanImportExportModel.java 2012-03-12 11:38:27 UTC (rev 1554) @@ -115,7 +115,11 @@ @Override public String format(TerrestrialDivision terrestrialDivision) { - return terrestrialDivision.getObservationUnitCode(); + String observationUnitCode = ""; + if (terrestrialDivision != null) { + observationUnitCode = terrestrialDivision.getObservationUnitCode(); + } + return observationUnitCode; } public void setCurrentRegionCode(String regionCode) {

1 0

r1553 - trunk/wao-business/src/main/java/fr/ifremer/wao/service
by bleny＠users.forge.codelutin.com March 12, 2012

March 12, 2012

Author: bleny Date: 2012-03-12 12:36:36 +0100 (Mon, 12 Mar 2012) New Revision: 1553 Url: http://forge.codelutin.com/repositories/revision/wao/1553 Log: Anomalie #960: Le forulaire de modification d'une ligne du plan d'?\195?\169chantillonnage sous ObsDeb est vide NPE pour les nouvelles lignes du plan sur ObsDeb suppression de code mort pour les nouvelles lignes Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java 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 2012-03-12 11:05:34 UTC (rev 1552) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java 2012-03-12 11:36:36 UTC (rev 1553) @@ -99,7 +99,6 @@ import net.fortuna.ical4j.model.property.ProdId; import net.fortuna.ical4j.model.property.Uid; import net.fortuna.ical4j.model.property.Version; -import org.apache.commons.collections.CollectionUtils; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.time.DateUtils; @@ -716,29 +715,10 @@ } } - // all rows must have a unique code, the code has a year as prefix - // like '2011_' so we must know on which year the row is active - - // the date from which year will be extracted (whatever the day of the year) - Date year; - - if (ObsProgram.OBSDEB.equals(newSampleRow.getObsProgram())) { - // this line has a precise day, let's take the - // year of this day - year = newSampleRow.getExpectedDate(); - } else { - if (CollectionUtils.isEmpty(newSampleRow.getSampleMonth())) { - // if the row has no sample months, we can't know - // we take current year by default - year = context.getCurrentDate(); - } else { - // if the row has sample months, take the first month - year = newSampleRow.getSampleMonth().get(0).getPeriodDate(); - } - } - - // now we have the year for prefix, let's get the whole new - // code (suffix depends on already used codes) + // On pré-définit un code pour la nouvelle ligne. + // au moment de la création d'une nouvelle ligne, on a aucune info donc + // on suppose que c'est pour l'année en cours + Date year = context.getCurrentDate(); String code = executeGetNewSampleRowCode(transaction, year); newSampleRow.setCode(code);

1 0