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

r1971 - trunk/wao-web/src/main/webapp
by bleny＠users.forge.codelutin.com 20 May '14

20 May '14

Author: bleny Date: 2014-05-20 14:14:21 +0200 (Tue, 20 May 2014) New Revision: 1971 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1971 Log: fix filter refreshing selected option after applying filters Modified: trunk/wao-web/src/main/webapp/wao.css trunk/wao-web/src/main/webapp/wao.js Modified: trunk/wao-web/src/main/webapp/wao.css =================================================================== --- trunk/wao-web/src/main/webapp/wao.css 2014-05-19 14:53:37 UTC (rev 1970) +++ trunk/wao-web/src/main/webapp/wao.css 2014-05-20 12:14:21 UTC (rev 1971) @@ -391,6 +391,11 @@ margin-right: 30px; } + .selected-options-container ul { + list-style-type: none; + margin: 0; + } + /** * Les boutons */ Modified: trunk/wao-web/src/main/webapp/wao.js =================================================================== --- trunk/wao-web/src/main/webapp/wao.js 2014-05-19 14:53:37 UTC (rev 1970) +++ trunk/wao-web/src/main/webapp/wao.js 2014-05-20 12:14:21 UTC (rev 1971) @@ -334,11 +334,12 @@ var selectedOptions = []; var filterValues = WAO.getNestedPropertyValue(this.filterMapping.filterName, filter); if (filterValues) { + this.updateOptions(); + // XXX brendan 19/05/14 on a pas encore le label, ce sera mis à jour par le updateOptions $.each(filterValues, function (index, filterValue) { selectedOptions.push({ value: filterValue, - // TODO brendan 16/05/14 get label - label: filterValue, + label: '' }); }); } @@ -409,7 +410,6 @@ this.$openButton.hide(); this.$selectContainer.show(); if (this.useSelect2) { -// this.$select.hide(); this.$select.select2(); } }; @@ -425,7 +425,6 @@ this.lockSelection = function () { if (this.useSelect2) { - //this.$select.select2('destroy'); this.$select.select2('readonly', true); } else { this.$select.attr('readonly', 'readonly'); @@ -434,11 +433,6 @@ this.unlockSelection = function () { if (this.useSelect2) { - var val = []; - $.each(this.model.selectedOptions, function (index, selectedOption) { - val.push(selectedOption.value); - }); - this.$select.val(val).trigger('change'); this.$select.select2('readonly', false); this.$select.select2('open'); } else { @@ -452,6 +446,14 @@ var optionHtml = '<option value="' + option.value + '">' + option.label + '</option>'; self.$select.append(optionHtml); }); + if (this.useSelect2) { + var val = []; + $.each(this.model.selectedOptions, function (index, selectedOption) { + val.push(selectedOption.value); + }); + this.$select.val(val).trigger('change'); + } + this.updateSelectedOptions(); this.unlockSelection(); };

1 0

r1970 - trunk/wao-web/src/main/webapp
by bleny＠users.forge.codelutin.com 19 May '14

19 May '14

Author: bleny Date: 2014-05-19 16:53:37 +0200 (Mon, 19 May 2014) New Revision: 1970 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1970 Log: fix filter (un)locking Modified: trunk/wao-web/src/main/webapp/wao.js Modified: trunk/wao-web/src/main/webapp/wao.js =================================================================== --- trunk/wao-web/src/main/webapp/wao.js 2014-05-19 14:10:22 UTC (rev 1969) +++ trunk/wao-web/src/main/webapp/wao.js 2014-05-19 14:53:37 UTC (rev 1970) @@ -438,8 +438,9 @@ $.each(this.model.selectedOptions, function (index, selectedOption) { val.push(selectedOption.value); }); + this.$select.val(val).trigger('change'); this.$select.select2('readonly', false); - this.$select.val(val).select2('open'); + this.$select.select2('open'); } else { this.$select.removeAttr('readonly'); }

1 0

r1969 - trunk/wao-persistence/src/main/resources/db/migration
by bleny＠users.forge.codelutin.com 19 May '14

19 May '14

Author: bleny Date: 2014-05-19 16:10:22 +0200 (Mon, 19 May 2014) New Revision: 1969 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1969 Log: fixes #4983 migrate to cm for boat length Modified: trunk/wao-persistence/src/main/resources/db/migration/V4_0__clean_database.sql Modified: trunk/wao-persistence/src/main/resources/db/migration/V4_0__clean_database.sql =================================================================== --- trunk/wao-persistence/src/main/resources/db/migration/V4_0__clean_database.sql 2014-05-19 14:09:48 UTC (rev 1968) +++ trunk/wao-persistence/src/main/resources/db/migration/V4_0__clean_database.sql 2014-05-19 14:10:22 UTC (rev 1969) @@ -19,4 +19,6 @@ alter table waouser add constraint login_uniqueness unique (login); +-- On mesure les navires en centimètres et non plus en mètres + update boat set boatlength = boatlength * 100;

1 0

r1968 - in trunk: wao-persistence/src/main/resources/db/migration wao-web/src/main/webapp/WEB-INF/content/obsmer
by bleny＠users.forge.codelutin.com 19 May '14

19 May '14

Author: bleny Date: 2014-05-19 16:09:48 +0200 (Mon, 19 May 2014) New Revision: 1968 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1968 Log: fixes #4983 migrate to cm for boat length Modified: trunk/wao-persistence/src/main/resources/db/migration/V4_0__clean_database.sql trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boats.jsp trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp Modified: trunk/wao-persistence/src/main/resources/db/migration/V4_0__clean_database.sql =================================================================== --- trunk/wao-persistence/src/main/resources/db/migration/V4_0__clean_database.sql 2014-05-19 14:02:14 UTC (rev 1967) +++ trunk/wao-persistence/src/main/resources/db/migration/V4_0__clean_database.sql 2014-05-19 14:09:48 UTC (rev 1968) @@ -18,3 +18,5 @@ where login in (select login from waoUser group by login having count(topiaId) > 1); alter table waouser add constraint login_uniqueness unique (login); + +update boat set boatlength = boatlength * 100; Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boats.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boats.jsp 2014-05-19 14:02:14 UTC (rev 1967) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boats.jsp 2014-05-19 14:09:48 UTC (rev 1968) @@ -253,7 +253,7 @@ <s:text name="wao.ui.boats.boatName"/> </th> <th> - <s:text name="wao.ui.boats.boatLength"/> (m) + <s:text name="wao.ui.boats.boatLength"/> (cm) </th> <th> <s:text name="wao.ui.boats.buildYear"/> Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp 2014-05-19 14:02:14 UTC (rev 1967) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp 2014-05-19 14:09:48 UTC (rev 1968) @@ -357,7 +357,7 @@ <td> <s:set name="boatTooltip"> <s:text name="wao.ui.boats.registrationCode"/> <s:property value="%{'' + boat.immatriculation}" escapeHtml="false"/> - <s:text name="wao.ui.boats.boatLength"/> <s:property value="boat.boatLength" escapeHtml="false"/> m + <s:text name="wao.ui.boats.boatLength"/> <s:property value="boat.boatLength" escapeHtml="false"/> cm <s:text name="wao.ui.boats.buildYear"/> <s:property value="%{'' + boat.buildYear}" escapeHtml="false"/> <s:text name="wao.ui.boats.district"/> <s:property value="boat.district.districtName" escapeHtml="false"/> (<s:property value="boat.district.districtCode" escapeHtml="false"/>) </s:set>

1 0

r1967 - in trunk: wao-persistence/src/main/java/fr/ifremer/wao/entity wao-persistence/src/main/resources/i18n wao-services/src/main/java/fr/ifremer/wao/services/service/administration
by bleny＠users.forge.codelutin.com 19 May '14

19 May '14

Author: bleny Date: 2014-05-19 16:02:14 +0200 (Mon, 19 May 2014) New Revision: 1967 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1967 Log: fixes #5083 add CEP to target species referential Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/TargetSpeciesDCFImpl.java trunk/wao-persistence/src/main/resources/i18n/wao-persistence_en_GB.properties trunk/wao-persistence/src/main/resources/i18n/wao-persistence_fr_FR.properties trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/ReferentialService.java Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/TargetSpeciesDCFImpl.java =================================================================== --- trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/TargetSpeciesDCFImpl.java 2014-05-19 13:57:46 UTC (rev 1966) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/TargetSpeciesDCFImpl.java 2014-05-19 14:02:14 UTC (rev 1967) @@ -38,6 +38,7 @@ n("fr.ifremer.wao.entity.TargetSpeciesDCF.ALG"); n("fr.ifremer.wao.entity.TargetSpeciesDCF.ANA"); n("fr.ifremer.wao.entity.TargetSpeciesDCF.CAT"); + n("fr.ifremer.wao.entity.TargetSpeciesDCF.CEP"); n("fr.ifremer.wao.entity.TargetSpeciesDCF.CRU"); n("fr.ifremer.wao.entity.TargetSpeciesDCF.CRW"); n("fr.ifremer.wao.entity.TargetSpeciesDCF.CSJ"); Modified: trunk/wao-persistence/src/main/resources/i18n/wao-persistence_en_GB.properties =================================================================== --- trunk/wao-persistence/src/main/resources/i18n/wao-persistence_en_GB.properties 2014-05-19 13:57:46 UTC (rev 1966) +++ trunk/wao-persistence/src/main/resources/i18n/wao-persistence_en_GB.properties 2014-05-19 14:02:14 UTC (rev 1967) @@ -124,6 +124,7 @@ fr.ifremer.wao.entity.TargetSpeciesDCF.ALG=Algae fr.ifremer.wao.entity.TargetSpeciesDCF.ANA=Espèces anadromes fr.ifremer.wao.entity.TargetSpeciesDCF.CAT=Catadromous species +fr.ifremer.wao.entity.TargetSpeciesDCF.CEP=Cephalopods fr.ifremer.wao.entity.TargetSpeciesDCF.CRU=Crustacean fr.ifremer.wao.entity.TargetSpeciesDCF.CRW=Langouste fr.ifremer.wao.entity.TargetSpeciesDCF.CSJ=Scallop Modified: trunk/wao-persistence/src/main/resources/i18n/wao-persistence_fr_FR.properties =================================================================== --- trunk/wao-persistence/src/main/resources/i18n/wao-persistence_fr_FR.properties 2014-05-19 13:57:46 UTC (rev 1966) +++ trunk/wao-persistence/src/main/resources/i18n/wao-persistence_fr_FR.properties 2014-05-19 14:02:14 UTC (rev 1967) @@ -124,6 +124,7 @@ fr.ifremer.wao.entity.TargetSpeciesDCF.ALG=Algues fr.ifremer.wao.entity.TargetSpeciesDCF.ANA=Espèces anadromes fr.ifremer.wao.entity.TargetSpeciesDCF.CAT=Espèces catadromes +fr.ifremer.wao.entity.TargetSpeciesDCF.CEP=Céphalopodes fr.ifremer.wao.entity.TargetSpeciesDCF.CRU=Crustacés fr.ifremer.wao.entity.TargetSpeciesDCF.CRW=Langouste fr.ifremer.wao.entity.TargetSpeciesDCF.CSJ=Coquilles Saint-Jacques Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/ReferentialService.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/ReferentialService.java 2014-05-19 13:57:46 UTC (rev 1966) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/ReferentialService.java 2014-05-19 14:02:14 UTC (rev 1967) @@ -663,7 +663,7 @@ "TBB", "TBN", "TBS", "TMS"}; final String[] speciesCodesBase = {"ALG", "ANA", "CAT", "CRU", - "DEF", "DWS", "LPF", "MOL", "SPF", "FIF"}; + "DEF", "DWS", "LPF", "MOL", "SPF", "FIF", "CEP"}; long nbCodes = fishingGearDCFDao.count() + targetSpeciesDCFDao.count();

1 0

r1966 - trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer
by bleny＠users.forge.codelutin.com 19 May '14

19 May '14

Author: bleny Date: 2014-05-19 15:57:46 +0200 (Mon, 19 May 2014) New Revision: 1966 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1966 Log: refs #4487 review accept/refuse js code Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp 2014-05-19 13:28:44 UTC (rev 1965) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp 2014-05-19 13:57:46 UTC (rev 1966) @@ -40,22 +40,22 @@ $('table.contacts-list').toggleClass('full-view').toggleClass('compact-view'); }); - $('.validation-action').click(function() { + $('.validation-action').click(function(e) { + e.preventDefault(); var $action = $(this); - var url = $action.attr('data'); + var url = $action.attr('href'); var successCallback = function (data) { - var succesful = data['successful']; - - if (!succesful) { + var successful = data['successful']; + if (successful) { + var success = data['successMessage']; + WAO.notifications.success(success); + // TODO Update line and data actions + } else { var error = data['errorMessage']; WAO.notifications.error(error); - } else { - var success = data['successMessage']; - WAO.notifications.success(success); - //TODO Update line and data actions } }; - WAO.get(url, null, successCallback); + WAO.post(url, {}, successCallback); }); // Do not expose any struts internal input fields @@ -553,7 +553,7 @@ <s:param name="contactId" value="topiaId"/> <s:param name="validationState">true</s:param> </s:url> - <s:a cssClass='validation-action' href="#notifications" data="%{acceptContactUrl}"> + <s:a cssClass="validation-action" href="%{acceptContactUrl}"> <s:text name="wao.ui.action.acceptContact"/> </s:a> </li> @@ -562,7 +562,7 @@ <s:param name="contactId" value="topiaId"/> <s:param name="validationState">false</s:param> </s:url> - <s:a cssClass='validation-action' href="#notifications" data="%{refuseContactUrl}"> + <s:a cssClass="validation-action" href="%{refuseContactUrl}"> <s:text name="wao.ui.action.refuseContact"/> </s:a> </li> @@ -572,7 +572,7 @@ <s:url action="validate-contact-json" id="unvalidateContactUrl"> <s:param name="contactId" value="topiaId"/> </s:url> - <s:a cssClass='validation-action' href="#notifications" data="%{unvalidateContactUrl}"> + <s:a cssClass="validation-action" href="%{unvalidateContactUrl}"> <s:text name="wao.ui.action.unvalidateContact"/> </s:a> </li>

1 0

r1965 - in trunk/wao-services/src/main/java/fr/ifremer/wao/services/service: . csv csv/operations
by bleny＠users.forge.codelutin.com 19 May '14

19 May '14

Author: bleny Date: 2014-05-19 15:28:44 +0200 (Mon, 19 May 2014) New Revision: 1965 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1965 Log: fixes #5099 fix wrong tests and add missing export data Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerContactsService.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/ObsMerContactImportExportModel.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/BoatParserFormatter.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/SampleRowParserFormatter.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/UserParserFormatter.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/UsersParserFormatter.java Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerContactsService.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerContactsService.java 2014-05-19 12:56:03 UTC (rev 1964) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerContactsService.java 2014-05-19 13:28:44 UTC (rev 1965) @@ -678,8 +678,40 @@ updateAllegroWalletIfNecessary(updateContactCommand); + notifyMammalsObservationIfNecessary(updateContactCommand); + } + protected void notifyMammalsObservationIfNecessary(UpdateContactCommand updateContactCommand) { + + if (updateContactCommand.isMammalsInfosChanged()) { + + Contact contact = updateContactCommand.getContact(); + + MammalsObservationEmail email = getEmailService().newMammalsObservationEmail(); + email.setContact(contact); + + // now trying to find to what user we need to send the mail + WaoUserTopiaDao userDao = getWaoUserDao(); + // users contains all the user we need to notify for the capture + List<WaoUser> waoUsers = userDao.forMammalsNotificationsEquals(true).addEquals(WaoUser.PROPERTY_ACTIVE, true).findAll(); + + for (WaoUser waoUser : waoUsers) { + if (StringUtil.isEmail(waoUser.getLogin())) { + email.addBcc(waoUser); + } else { + if (log.isWarnEnabled()) { + log.warn("will not send mammals capture notification to user " + waoUser + ". login is not an email"); + } + } + } + + getEmailService().send(email); + + } + + } + public void delete(String contactId) throws IllegalDeletionException { Contact contact = getContact(contactId); @@ -742,23 +774,6 @@ samplingPlanService.recomputeSampleRowEstimatedAndRealTides(contact.getSampleRow()); - if (updateContactCommand.isMammalsInfosChanged()) { - - MammalsObservationEmail email = getEmailService().newMammalsObservationEmail(); - email.setContact(contact); - - // now trying to find to what user we need to send the mail - WaoUserTopiaDao userDao = getWaoUserDao(); - // users contains all the user we need to notify for the capture - List<WaoUser> waoUsers = userDao.forMammalsNotificationsEquals(true).findAll(); - - for (WaoUser waoUser : waoUsers) { - email.addTo(waoUser); - } - - getEmailService().send(email); - } - dao.update(contact); } Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/ObsMerContactImportExportModel.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/ObsMerContactImportExportModel.java 2014-05-19 12:56:03 UTC (rev 1964) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/ObsMerContactImportExportModel.java 2014-05-19 13:28:44 UTC (rev 1965) @@ -124,10 +124,8 @@ ModelBuilder<Contact> modelBuilder = new ModelBuilder<>(); modelBuilder.newColumnForImportExport("CONTACT_ID", Contact.PROPERTY_TOPIA_ID); modelBuilder.newColumnForImportExport("CONTACT_DATE_CREATION", Contact.PROPERTY_CREATION_DATE, Common.DAY_TIME); - if (waoUsers != null) { - modelBuilder.newColumnForImportExport("CONTACT_OBSERVATEUR_PRINCIPAL", Contact.PROPERTY_MAIN_OBSERVER, new UserParserFormatter(locale, waoUsers)); - modelBuilder.newColumnForImportExport("CONTACT_OBSERVATEURS_SECONDAIRES", Contact.PROPERTY_SECONDARY_OBSERVERS, new UsersParserFormatter(locale, waoUsers)); - } + modelBuilder.newColumnForImportExport("CONTACT_OBSERVATEUR_PRINCIPAL", Contact.PROPERTY_MAIN_OBSERVER, new UserParserFormatter(locale, waoUsers)); + modelBuilder.newColumnForImportExport("CONTACT_OBSERVATEURS_SECONDAIRES", Contact.PROPERTY_SECONDARY_OBSERVERS, new UsersParserFormatter(locale, waoUsers)); modelBuilder.newIgnoredColumn("CONTACT_OBSERVATEURS_NOMS"); modelBuilder.newColumnForExport( @@ -163,9 +161,7 @@ modelBuilder.newColumnForImportExport("CONTACT_COMMENTAIRE_COORDINATEUR", Contact.PROPERTY_COMMENT_COORDINATOR); modelBuilder.newColumnForImportExport("CONTACT_COMMENTAIRE_PROGRAMME", Contact.PROPERTY_COMMENT_ADMIN); - if (boats != null) { - modelBuilder.newColumnForImportExport("NAVIRE_IMMATRICULATION", Contact.PROPERTY_BOAT, new BoatParserFormatter(boats, locale)); - } + modelBuilder.newColumnForImportExport("NAVIRE_IMMATRICULATION", Contact.PROPERTY_BOAT, new BoatParserFormatter(boats, locale)); modelBuilder.newIgnoredColumn("NAVIRE_NOM"); modelBuilder.newColumnForExport("NAVIRE_NOM", new ValueGetter<Contact, String>() { @Override @@ -176,9 +172,7 @@ modelBuilder.newColumnForImportExport("CONTACT_VALIDATION_SOCIETE", Contact.PROPERTY_VALIDATION_COMPANY, Common.BOOLEAN); modelBuilder.newColumnForImportExport("CONTACT_VALIDATION_PROGRAMME", Contact.PROPERTY_VALIDATION_PROGRAM, Common.BOOLEAN); - if (sampleRows != null) { - modelBuilder.newColumnForImportExport("PLAN_CODE", Contact.PROPERTY_SAMPLE_ROW, new SampleRowParserFormatter(locale, sampleRows)); - } + modelBuilder.newColumnForImportExport("PLAN_CODE", Contact.PROPERTY_SAMPLE_ROW, new SampleRowParserFormatter(locale, sampleRows)); modelBuilder.newColumnForImportExport("CONTACT_QUALITE_DONNEE", "dataReliability", new I18nAbleParserFormatter<>(locale, DataReliability.values())); @@ -186,9 +180,7 @@ modelBuilder.newColumnForImportExport("CONTACT_CAPTURE_ACCIDENTELLE", Contact.PROPERTY_MAMMALS_CAPTURE, Common.BOOLEAN); modelBuilder.newIgnoredColumn("CONTACT_CAPTURE_ACCIDENTELLE_DETAILS"); modelBuilder.newColumnForExport("CONTACT_CAPTURE_ACCIDENTELLE_DETAILS", Contact.PROPERTY_MAMMALS_INFO); - if (motives != null) { - modelBuilder.newColumnForImportExport("CONTACT_ETAT_MOTIF_CODE", Contact.PROPERTY_CONTACT_STATE_MOTIF, new ContactStateMotivesParserFormatter(locale, motives)); - } + modelBuilder.newColumnForImportExport("CONTACT_ETAT_MOTIF_CODE", Contact.PROPERTY_CONTACT_STATE_MOTIF, new ContactStateMotivesParserFormatter(locale, motives)); modelBuilder.newIgnoredColumn("CONTACT_ETAT_MOTIF_NOM"); modelBuilder.newColumnForExport("CONTACT_ETAT_MOTIF_NOM", new ValueGetter<Contact, String>() { @Override Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/BoatParserFormatter.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/BoatParserFormatter.java 2014-05-19 12:56:03 UTC (rev 1964) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/BoatParserFormatter.java 2014-05-19 13:28:44 UTC (rev 1965) @@ -43,7 +43,9 @@ public BoatParserFormatter(List<Boat> boats, Locale locale) { this.locale = locale; - indexedBoats = Maps.uniqueIndex(boats, Boats.getImmatriculation()); + if (boats != null) { + indexedBoats = Maps.uniqueIndex(boats, Boats.getImmatriculation()); + } } @Override Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/SampleRowParserFormatter.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/SampleRowParserFormatter.java 2014-05-19 12:56:03 UTC (rev 1964) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/SampleRowParserFormatter.java 2014-05-19 13:28:44 UTC (rev 1965) @@ -43,7 +43,9 @@ public SampleRowParserFormatter(Locale locale, List<SampleRow> sampleRows) { this.locale = locale; - indexedSampleRows = Maps.uniqueIndex(sampleRows, SampleRows.getCode()); + if (sampleRows != null) { + indexedSampleRows = Maps.uniqueIndex(sampleRows, SampleRows.getCode()); + } } @Override Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/UserParserFormatter.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/UserParserFormatter.java 2014-05-19 12:56:03 UTC (rev 1964) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/UserParserFormatter.java 2014-05-19 13:28:44 UTC (rev 1965) @@ -44,7 +44,9 @@ public UserParserFormatter(Locale locale, List<WaoUser> waoUsers) { this.locale = locale; - this.indexedWaoUsers = Maps.uniqueIndex(waoUsers, WaoUsers.getLogin()); + if (waoUsers != null) { + this.indexedWaoUsers = Maps.uniqueIndex(waoUsers, WaoUsers.getLogin()); + } } @Override Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/UsersParserFormatter.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/UsersParserFormatter.java 2014-05-19 12:56:03 UTC (rev 1964) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/UsersParserFormatter.java 2014-05-19 13:28:44 UTC (rev 1965) @@ -49,7 +49,9 @@ public UsersParserFormatter(Locale locale, List<WaoUser> waoUsers) { this.locale = locale; - this.indexedWaoUsers = Maps.uniqueIndex(waoUsers, WaoUsers.getLogin()); + if (waoUsers != null) { + this.indexedWaoUsers = Maps.uniqueIndex(waoUsers, WaoUsers.getLogin()); + } } @Override

1 0

r1964 - in trunk: wao-persistence/src/main/java/fr/ifremer/wao/entity wao-services/src/main/java/fr/ifremer/wao/services/service
by bleny＠users.forge.codelutin.com 19 May '14

19 May '14

Author: bleny Date: 2014-05-19 14:56:03 +0200 (Mon, 19 May 2014) New Revision: 1964 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1964 Log: refs #4487 move datareliability validation rule Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/DataReliability.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerContactsService.java Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/DataReliability.java =================================================================== --- trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/DataReliability.java 2014-05-19 12:53:26 UTC (rev 1963) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/DataReliability.java 2014-05-19 12:56:03 UTC (rev 1964) @@ -20,6 +20,8 @@ */ package fr.ifremer.wao.entity; +import com.google.common.collect.ImmutableSet; + import static org.nuiton.i18n.I18n.n; /** @@ -51,6 +53,9 @@ /** Information has not been provided */ NOT_PROVIDED(n("DataReliability.NOT_PROVIDED")); + protected static final ImmutableSet<DataReliability> DATA_RELIABILITIES_THAT_REQUIRE_COMMENT = + ImmutableSet.of(DOUBTFUL, NOT_RELIABLE, CORRECTION_ASKED, NOT_PROVIDED); + /** An i18n key to make enumeration printable in logs and UI. */ protected String i18nKey; @@ -67,6 +72,9 @@ return null; } + public boolean isCommentRequired() { + return DATA_RELIABILITIES_THAT_REQUIRE_COMMENT.contains(this); + } @Override public String getI18nKey() { Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerContactsService.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerContactsService.java 2014-05-19 12:53:26 UTC (rev 1963) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerContactsService.java 2014-05-19 12:56:03 UTC (rev 1964) @@ -644,6 +644,12 @@ } } + DataReliability dataReliability = contact.getDataReliability(); + + if (dataReliability != null && dataReliability.isCommentRequired() && StringUtils.isBlank(contact.getCommentAdmin())) { + throw new MissingContactCommentAdminException(contact); + } + if (BooleanUtils.isTrue(contact.getValidationProgram())) { //--- @@ -652,13 +658,8 @@ // it's an admin validation, data-reliability field must be filled - DataReliability dataReliability = contact.getDataReliability(); - if (dataReliability == null || DataReliability.UNKNOWN == dataReliability) { throw new MissingContactDataReliabilityException(contact); - } else if (DataReliability.RELIABLE != dataReliability - && StringUtils.isEmpty(contact.getCommentAdmin())) { - throw new MissingContactCommentAdminException(contact); } } }

1 0

r1963 - trunk/wao-persistence/src/main/resources/db/migration
by bleny＠users.forge.codelutin.com 19 May '14

19 May '14

Author: bleny Date: 2014-05-19 14:53:26 +0200 (Mon, 19 May 2014) New Revision: 1963 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1963 Log: fixes #5106 change some logins and add constraint Modified: trunk/wao-persistence/src/main/resources/db/migration/V4_0__clean_database.sql Modified: trunk/wao-persistence/src/main/resources/db/migration/V4_0__clean_database.sql =================================================================== --- trunk/wao-persistence/src/main/resources/db/migration/V4_0__clean_database.sql 2014-05-19 12:39:04 UTC (rev 1962) +++ trunk/wao-persistence/src/main/resources/db/migration/V4_0__clean_database.sql 2014-05-19 12:53:26 UTC (rev 1963) @@ -13,9 +13,8 @@ -- Doublons dans la table wao user -update waouser -set login = login || '2' -where login in (select login from waoUser group by login having count(topiaId) > 1) - and company='fr.ifremer.wao.entity.Company#1264666646342#0.19971470116106205' +update waouser w +set login = login || (select count(topiaId) from waouser w2 where w.login = w2.login and w.topiaId < w2.topiaId) +where login in (select login from waoUser group by login having count(topiaId) > 1); alter table waouser add constraint login_uniqueness unique (login);

1 0

r1962 - trunk/wao-persistence/src/main/resources/db/migration
by bleny＠users.forge.codelutin.com 19 May '14

19 May '14

Author: bleny Date: 2014-05-19 14:39:04 +0200 (Mon, 19 May 2014) New Revision: 1962 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1962 Log: fixes #5106 change some logins and add constraint Modified: trunk/wao-persistence/src/main/resources/db/migration/V4_0__clean_database.sql Modified: trunk/wao-persistence/src/main/resources/db/migration/V4_0__clean_database.sql =================================================================== --- trunk/wao-persistence/src/main/resources/db/migration/V4_0__clean_database.sql 2014-05-19 12:00:44 UTC (rev 1961) +++ trunk/wao-persistence/src/main/resources/db/migration/V4_0__clean_database.sql 2014-05-19 12:39:04 UTC (rev 1962) @@ -10,3 +10,12 @@ and eb.topiaId not in (select eb2.topiaId from elligibleboat eb2 where eb2.boat = eb.boat and eb2.sampleRow = eb.sampleRow order by topiacreatedate desc limit 1)); alter table elligibleboat add constraint samplerow_boat_uniqueness unique (boat, samplerow); + +-- Doublons dans la table wao user + +update waouser +set login = login || '2' +where login in (select login from waoUser group by login having count(topiaId) > 1) + and company='fr.ifremer.wao.entity.Company#1264666646342#0.19971470116106205' + +alter table waouser add constraint login_uniqueness unique (login);

1 0