branch develop updated (99c0502 -> ed0767c)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See http://git.codelutin.com/tutti.git from 99c0502 fixes #6794: [IMPORT GENERIQUE] Améliorer les messages de validation lorsque les catégories ne sont pas valides new 95c702e refs #6847 modification aussi du département temporaire pour la persistence des personnes temporaires new 4bd9c93 correction des mises à jour de référentiels new d43dc20 correction d'un test erronne lors de l'import de navires new 00c676b amelioration de la cinematique lors de l'ouverture de l'ui de remplacement des referentiels new 8d4b9cb correction des actions simples manquantes new 9547ab1 refs #6805 recharcher les données après un remplacement de donnée temporaire new 1955721 refs #6805 Correction du non import de personne si existe déjà new 0f362ec refs #6805 Bien rafraichir les ecrans suite à un import new ed0767c fixes #6805: [REFERENTIEL] Incohérences lors de la modification des référentiels temporaires Merge branch 'feature/6805' into develop The 9 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit ed0767c1d07d3c2d914db9519f55b86c82dbf168 Merge: 95c702e 0f362ec Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Mar 25 11:21:27 2015 +0100 fixes #6805: [REFERENTIEL] Incohérences lors de la modification des référentiels temporaires Merge branch 'feature/6805' into develop commit 0f362eca833e5b5d5aec8eda4ea4324e95ab13dc Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Mar 25 11:15:23 2015 +0100 refs #6805 Bien rafraichir les ecrans suite à un import commit 1955721439bc71898b7d4453baa58eada4b1ff59 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Mar 25 11:14:46 2015 +0100 refs #6805 Correction du non import de personne si existe déjà commit 9547ab18ccd9f458f8af63aab51cdb8e7cccb66c Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Mar 25 10:31:31 2015 +0100 refs #6805 recharcher les données après un remplacement de donnée temporaire commit 95c702ee38c69ddde920b51c55f8bfda45264326 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Mar 25 09:43:25 2015 +0100 refs #6847 modification aussi du département temporaire pour la persistence des personnes temporaires commit 8d4b9cb80a5450ee11da3b0f09811fe7d6a24ea0 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Mar 11 22:30:05 2015 +0100 correction des actions simples manquantes commit 00c676b8c23ae4ea9c15a4201a9e5b4fd1411f7b Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Mar 11 22:29:41 2015 +0100 amelioration de la cinematique lors de l'ouverture de l'ui de remplacement des referentiels commit d43dc2009c62045497796f6ef349dfe7722e17a4 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Mar 11 22:29:03 2015 +0100 correction d'un test erronne lors de l'import de navires commit 4bd9c93772190bfb5e289cc35510fd14e34c3901 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Mar 11 22:28:44 2015 +0100 correction des mises à jour de référentiels Summary of changes: .../persistence/entities/referential/Persons.java | 8 +- .../referential/GearPersistenceServiceImpl.java | 33 +++++--- .../referential/PersonPersistenceServiceImpl.java | 11 +++ .../referential/VesselPersistenceServiceImpl.java | 41 ++++++++-- .../resources/tutti-db-enumerations.properties | 4 +- .../fr/ifremer/tutti/service/TuttiDataContext.java | 13 ++- .../consumer/CsvConsumerForTemporaryPerson.java | 3 +- .../consumer/CsvConsumerForTemporaryVessel.java | 2 +- .../operation/catches/MultiPostImportLogDialog.css | 2 +- .../catches/MultiPostImportLogDialog.jaxx | 3 +- .../catches/species/ImportPupitriPopupUI.css | 2 + .../catches/species/ImportPupitriPopupUI.jaxx | 4 +- .../species/ImportPupitriPopupUIHandler.java | 26 +----- .../species/actions/ImportPupitriAction.java | 3 +- .../actions/ImportPupitriPopupCancelAction.java | 28 +++++++ .../actions/ImportPupitriPopupValidateAction.java | 45 ++++++++++ .../MultiPostImportLogCloseDialogAction.java | 24 ++++++ .../AbstractOpenReplaceTemporaryUIAction.java | 64 ++++++++------- .../actions/ImportTemporaryActionSupport.java | 95 ++++++++++++++++++++++ .../actions/ImportTemporaryGearAction.java | 64 +++++---------- .../actions/ImportTemporaryPersonAction.java | 66 +++++---------- .../actions/ImportTemporarySpeciesAction.java | 62 ++++---------- .../actions/ImportTemporaryVesselAction.java | 62 ++++---------- .../replace/AbstractReplaceTemporaryUI.css | 1 + .../replace/AbstractReplaceTemporaryUI.jaxx | 2 +- .../actions/AbstractReplaceTemporaryUIAction.java | 13 +++ .../replace/actions/CloseReplaceUIAction.java | 27 ++++++ .../actions/ReplaceTemporaryGearAction.java | 7 ++ .../actions/ReplaceTemporaryPersonAction.java | 7 ++ .../actions/ReplaceTemporarySpeciesAction.java | 6 ++ .../actions/ReplaceTemporaryVesselAction.java | 7 ++ 31 files changed, 462 insertions(+), 273 deletions(-) create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/ImportPupitriPopupCancelAction.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/ImportPupitriPopupValidateAction.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/MultiPostImportLogCloseDialogAction.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/actions/ImportTemporaryActionSupport.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/actions/CloseReplaceUIAction.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit 4bd9c93772190bfb5e289cc35510fd14e34c3901 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Mar 11 22:28:44 2015 +0100 correction des mises à jour de référentiels --- .../referential/GearPersistenceServiceImpl.java | 33 ++++++++++------- .../referential/PersonPersistenceServiceImpl.java | 11 ++++++ .../referential/VesselPersistenceServiceImpl.java | 41 +++++++++++++++++----- 3 files changed, 65 insertions(+), 20 deletions(-) diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/GearPersistenceServiceImpl.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/GearPersistenceServiceImpl.java index 91191b4..45b9aeb 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/GearPersistenceServiceImpl.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/GearPersistenceServiceImpl.java @@ -30,6 +30,7 @@ import fr.ifremer.adagio.core.dao.referential.StatusCode; import fr.ifremer.adagio.core.dao.referential.gear.FishingGearExtendDao; import fr.ifremer.adagio.core.dao.referential.gear.GearClassification; import fr.ifremer.adagio.core.dao.referential.gear.GearClassificationId; +import fr.ifremer.adagio.core.dao.referential.gear.GearClassificationImpl; import fr.ifremer.tutti.persistence.entities.referential.Gear; import fr.ifremer.tutti.persistence.entities.referential.Gears; import org.hibernate.type.IntegerType; @@ -213,12 +214,7 @@ public class GearPersistenceServiceImpl extends ReferentialPersistenceServiceSup Preconditions.checkNotNull(source.getLabel()); Preconditions.checkNotNull(source.getName()); - Integer gearClassificationId; - if (source.isScientificGear()) { - gearClassificationId = GearClassificationId.SCIENTIFIC_CRUISE.getValue(); - } else { - gearClassificationId = GearClassificationId.FAO.getValue(); - } + Integer gearClassificationId = getGearClassificationId(source); Gear result; if (source.getId() != null) { @@ -246,12 +242,7 @@ public class GearPersistenceServiceImpl extends ReferentialPersistenceServiceSup Preconditions.checkNotNull(source.getName()); Preconditions.checkArgument(source.getId() == null || Gears.isTemporaryId(source.getIdAsInt())); - Integer gearClassificationId; - if (source.isScientificGear()) { - gearClassificationId = GearClassificationId.SCIENTIFIC_CRUISE.getValue(); - } else { - gearClassificationId = GearClassificationId.FAO.getValue(); - } + Integer gearClassificationId = getGearClassificationId(source); fr.ifremer.adagio.core.dao.referential.gear.Gear target = fishingGearDao.createAsTemporary(source.getLabel(), source.getName(), gearClassificationId); Gear result = Gears.newGear(); @@ -281,10 +272,28 @@ public class GearPersistenceServiceImpl extends ReferentialPersistenceServiceSup result.setName(source.getName()); result.setScientificGear(source.isScientificGear()); setStatus(status, result); + + fr.ifremer.adagio.core.dao.referential.gear.FishingGear toUpdate = fishingGearDao.load(source.getIdAsInt()); + toUpdate.setLabel(result.getLabel()); + toUpdate.setName(result.getName()); + Integer gearClassificationId = getGearClassificationId(source); + toUpdate.setGearClassification(load(GearClassificationImpl.class, gearClassificationId)); + fishingGearDao.update(toUpdate); + return result; } + private Integer getGearClassificationId(Gear source) { + Integer gearClassificationId; + if (source.isScientificGear()) { + gearClassificationId = GearClassificationId.SCIENTIFIC_CRUISE.getValue(); + } else { + gearClassificationId = GearClassificationId.FAO.getValue(); + } + return gearClassificationId; + } + protected Gear linkTemporaryGear(Gear source) { Preconditions.checkNotNull(source); diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/PersonPersistenceServiceImpl.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/PersonPersistenceServiceImpl.java index 6e2081f..0c52656 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/PersonPersistenceServiceImpl.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/PersonPersistenceServiceImpl.java @@ -30,6 +30,7 @@ import fr.ifremer.adagio.core.dao.administration.user.DepartmentId; import fr.ifremer.adagio.core.dao.administration.user.PersonExtendDao; import fr.ifremer.adagio.core.dao.administration.user.UserProfilId; import fr.ifremer.adagio.core.dao.referential.StatusCode; +import fr.ifremer.adagio.core.vo.administration.user.PersonVO; import fr.ifremer.tutti.persistence.entities.referential.Person; import fr.ifremer.tutti.persistence.entities.referential.Persons; import org.hibernate.type.IntegerType; @@ -252,6 +253,16 @@ public class PersonPersistenceServiceImpl extends ReferentialPersistenceServiceS result.setLastName(source.getLastName()); result.setFirstName(source.getFirstName()); setStatus(status, result); + + PersonVO toUpdate = new PersonVO(); + toUpdate.setId(source.getIdAsInt()); + toUpdate.setLastname(source.getLastName()); + toUpdate.setFirstname(source.getFirstName()); + toUpdate.setDepartmentId(DepartmentId.UNKNOWN_RECORDER_DEPARTMENT.getValue()); + toUpdate.setCreationDate(personDao.load(source.getIdAsInt()).getCreationDate()); + toUpdate.setStatusCode(status.getCode()); + personDao.save(toUpdate); + return result; } diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/VesselPersistenceServiceImpl.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/VesselPersistenceServiceImpl.java index e77f8d8..fb6e7bc 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/VesselPersistenceServiceImpl.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/VesselPersistenceServiceImpl.java @@ -217,12 +217,20 @@ public class VesselPersistenceServiceImpl extends ReferentialPersistenceServiceS @Override public List<Vessel> updateTemporaryVessels(List<Vessel> vessels) { + Integer countryLocationId = + locationDao.getLocationIdByLabelAndLocationLevel( + LocationLabel.FRANCE.getValue(), + new Integer[]{LocationLevelId.PAYS_ISO3.getValue()}); + if (countryLocationId == null) { + throw new DataIntegrityViolationException("Default country location not found, with label=" + LocationLabel.FRANCE.getValue()); + } + fr.ifremer.adagio.core.dao.referential.Status status = statusDao.load(StatusCode.TEMPORARY.getValue()); List<Vessel> result = Lists.newArrayList(); for (Vessel source : vessels) { - Vessel updated = updateTemporaryVessel(source, status); + Vessel updated = updateTemporaryVessel(source, countryLocationId, status); result.add(updated); } return Collections.unmodifiableList(result); @@ -330,12 +338,7 @@ public class VesselPersistenceServiceImpl extends ReferentialPersistenceServiceS Preconditions.checkNotNull(source.getInternationalRegistrationCode()); Preconditions.checkArgument(StringUtils.isBlank(source.getId()) || Vessels.isTemporaryId(source.getId())); - Integer vesselTypeId; - if (source.isScientificVessel()) { - vesselTypeId = VesselTypeId.SCIENTIFIC_RESEARCH_VESSEL.getValue(); - } else { - vesselTypeId = VesselTypeId.FISHING_VESSEL.getValue(); - } + Integer vesselTypeId = getVesselTypeId(source); fr.ifremer.adagio.core.dao.data.vessel.Vessel target = vesselExtendDao.createAsTemporary( @@ -357,7 +360,7 @@ public class VesselPersistenceServiceImpl extends ReferentialPersistenceServiceS } - protected Vessel updateTemporaryVessel(Vessel source, Status status) { + protected Vessel updateTemporaryVessel(Vessel source, Integer countryLocationId, Status status) { Preconditions.checkNotNull(source); Preconditions.checkNotNull(source.getId()); @@ -372,10 +375,32 @@ public class VesselPersistenceServiceImpl extends ReferentialPersistenceServiceS result.setInternationalRegistrationCode(source.getInternationalRegistrationCode()); result.setScientificVessel(source.isScientificVessel()); setStatus(status, result); + + Integer vesselTypeId = getVesselTypeId(source); + + vesselExtendDao.updateTemporaryVessel( + source.getId(), + source.getRegistrationCode(), + source.getInternationalRegistrationCode(), + countryLocationId, + source.getName(), + vesselTypeId, + false); + return result; } + private Integer getVesselTypeId(Vessel source) { + Integer vesselTypeId; + if (source.isScientificVessel()) { + vesselTypeId = VesselTypeId.SCIENTIFIC_RESEARCH_VESSEL.getValue(); + } else { + vesselTypeId = VesselTypeId.FISHING_VESSEL.getValue(); + } + return vesselTypeId; + } + protected Vessel linkTemporaryVessel(Vessel source) { Preconditions.checkNotNull(source); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit d43dc2009c62045497796f6ef349dfe7722e17a4 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Mar 11 22:29:03 2015 +0100 correction d'un test erronne lors de l'import de navires --- .../service/referential/consumer/CsvConsumerForTemporaryVessel.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/consumer/CsvConsumerForTemporaryVessel.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/consumer/CsvConsumerForTemporaryVessel.java index 29c03ac..b5ec8cd 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/consumer/CsvConsumerForTemporaryVessel.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/consumer/CsvConsumerForTemporaryVessel.java @@ -223,7 +223,7 @@ public class CsvConsumerForTemporaryVessel extends CsvComsumer<VesselRow, Vessel throw new ApplicationBusinessException(t("tutti.service.referential.import.vessel.error.noRegistrationCode", id)); } - if (!internationalRegistrationCode.equals(vessel.getName()) && !requestResult.addExistingNaturalId(internationalRegistrationCode)) { + if (!internationalRegistrationCode.equals(vessel.getInternationalRegistrationCode()) && !requestResult.addExistingNaturalId(internationalRegistrationCode)) { throw new ApplicationBusinessException(t("tutti.service.referential.import.vessel.error.existingRegistrationCode", internationalRegistrationCode)); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit 00c676b8c23ae4ea9c15a4201a9e5b4fd1411f7b Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Mar 11 22:29:41 2015 +0100 amelioration de la cinematique lors de l'ouverture de l'ui de remplacement des referentiels --- .../AbstractOpenReplaceTemporaryUIAction.java | 64 ++++++++++++---------- 1 file changed, 35 insertions(+), 29 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/actions/AbstractOpenReplaceTemporaryUIAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/actions/AbstractOpenReplaceTemporaryUIAction.java index 4950ce7..c36268a 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/actions/AbstractOpenReplaceTemporaryUIAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/actions/AbstractOpenReplaceTemporaryUIAction.java @@ -27,7 +27,6 @@ package fr.ifremer.tutti.ui.swing.content.referential.actions; import fr.ifremer.tutti.persistence.ProgressionModel; import fr.ifremer.tutti.persistence.entities.referential.TuttiReferentialEntity; import fr.ifremer.tutti.service.PersistenceService; -import fr.ifremer.tutti.ui.swing.util.actions.LongActionSupport; import fr.ifremer.tutti.ui.swing.content.MainUI; import fr.ifremer.tutti.ui.swing.content.referential.ManageTemporaryReferentialUI; import fr.ifremer.tutti.ui.swing.content.referential.ManageTemporaryReferentialUIHandler; @@ -36,13 +35,13 @@ import fr.ifremer.tutti.ui.swing.content.referential.replace.AbstractReplaceTemp import fr.ifremer.tutti.ui.swing.content.referential.replace.AbstractReplaceTemporaryUIModel; import fr.ifremer.tutti.ui.swing.util.TuttiUI; import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; +import fr.ifremer.tutti.ui.swing.util.actions.LongActionSupport; import jaxx.runtime.SwingUtil; import jaxx.runtime.context.JAXXInitialContext; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import javax.swing.JButton; -import javax.swing.SwingUtilities; import java.util.List; import static org.nuiton.i18n.I18n.t; @@ -73,6 +72,10 @@ public abstract class AbstractOpenReplaceTemporaryUIAction<E extends TuttiRefere protected E target; + protected List<E> targetList; + + protected List<E> sourceList; + protected AbstractOpenReplaceTemporaryUIAction(ManageTemporaryReferentialUIHandler handler) { super(handler, true); } @@ -96,78 +99,81 @@ public abstract class AbstractOpenReplaceTemporaryUIAction<E extends TuttiRefere @Override public void releaseAction() { source = target = null; + targetList = sourceList = null; super.releaseAction(); } @Override public void doAction() throws Exception { - // Load model - - M model = createNewModel(); - PersistenceService persistenceService = getContext().getPersistenceService(); String entityLabel = getEntityLabel(); - getProgressionModel().increments(t("tutti.openReplaceTemporaryUI.loading.target", entityLabel)); - // Get target list - List<E> targetList = getTargetList(persistenceService); + getProgressionModel().increments(t("tutti.openReplaceTemporaryUI.loading.target", entityLabel)); + targetList = getTargetList(persistenceService); + log.info("Loaded official referentials: " + targetList.size()); + // Get source list getProgressionModel().increments(t("tutti.openReplaceTemporaryUI.loading.source", entityLabel)); + sourceList = retainTemporaryList(persistenceService, targetList); + log.info("Loaded temporary referentials: " + sourceList.size()); - // Get source list - List<E> sourceList = retainTemporaryList(persistenceService, targetList); + } - log.info("Loaded temporary referentials: " + sourceList.size()); - log.info("Loaded official referentials: " + targetList.size()); + @Override + public void postSuccessAction() { boolean showDialog = true; + String entityLabel = getEntityLabel(); + + M model = createNewModel(); + if (targetList.isEmpty()) { + showDialog = false; displayWarningMessage(t("tutti.title.openReplaceTemporaryUI.noTarget", entityLabel), t("tutti.message.openReplaceTemporaryUI.noTarget", entityLabel)); - showDialog = false; + } else { + + model.setTargetList(targetList); + } if (sourceList.isEmpty()) { + showDialog = false; + displayWarningMessage(t("tutti.title.openReplaceTemporaryUI.noSource", entityLabel), t("tutti.message.openReplaceTemporaryUI.noSource", entityLabel)); - showDialog = false; + } else { + + model.setSourceList(sourceList); + } if (showDialog) { getProgressionModel().increments(t("tutti.openReplaceTemporaryUI.open.dialog")); - model.setTargetList(targetList); - model.setSourceList(sourceList); - JAXXInitialContext ctx = new JAXXInitialContext(); ctx.add(getUI()); ctx.add(model); - final UI dialog = createUI(ctx); + UI dialog = createUI(ctx); MainUI mainUI = TuttiUIUtil.getApplicationContext(dialog).getMainUI(); SwingUtil.setComponentHeight(dialog, 400); SwingUtil.setComponentWidth(dialog, mainUI.getWidth() - 100); SwingUtil.center(mainUI, dialog); - SwingUtilities.invokeLater( - new Runnable() { - @Override - public void run() { - dialog.setContextValue(getUI(), "owner"); - dialog.setVisible(true); - ((TuttiUI) dialog).getHandler().onCloseUI(); - } - } - ); + dialog.setContextValue(getUI(), "owner"); + dialog.setVisible(true); + ((TuttiUI) dialog).getHandler().onCloseUI(); + } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit 8d4b9cb80a5450ee11da3b0f09811fe7d6a24ea0 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Mar 11 22:30:05 2015 +0100 correction des actions simples manquantes --- .../operation/catches/MultiPostImportLogDialog.css | 2 +- .../catches/MultiPostImportLogDialog.jaxx | 3 +- .../catches/species/ImportPupitriPopupUI.css | 2 + .../catches/species/ImportPupitriPopupUI.jaxx | 4 +- .../species/ImportPupitriPopupUIHandler.java | 26 +------------ .../species/actions/ImportPupitriAction.java | 3 +- .../actions/ImportPupitriPopupCancelAction.java | 28 ++++++++++++++ .../actions/ImportPupitriPopupValidateAction.java | 45 ++++++++++++++++++++++ .../MultiPostImportLogCloseDialogAction.java | 24 ++++++++++++ .../replace/AbstractReplaceTemporaryUI.css | 1 + .../replace/AbstractReplaceTemporaryUI.jaxx | 2 +- .../replace/actions/CloseReplaceUIAction.java | 27 +++++++++++++ 12 files changed, 134 insertions(+), 33 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/MultiPostImportLogDialog.css b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/MultiPostImportLogDialog.css index ed02da0..0bc6201 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/MultiPostImportLogDialog.css +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/MultiPostImportLogDialog.css @@ -45,5 +45,5 @@ text: "tutti.multiPostImportLog.close"; toolTipText: "tutti.multiPostImportLog.close.tip"; i18nMnemonic: "tutti.multiPostImportLog.close.mnemonic"; - _skipAction: true; + _simpleaction: {fr.ifremer.tutti.ui.swing.content.operation.catches.species.actions.MultiPostImportLogCloseDialogAction.class}; } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/MultiPostImportLogDialog.jaxx b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/MultiPostImportLogDialog.jaxx index ff4ea83..6039ed1 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/MultiPostImportLogDialog.jaxx +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/MultiPostImportLogDialog.jaxx @@ -27,7 +27,6 @@ <JTextArea id="batchList"/> </JScrollPane> - <JButton id="closeButton" constraints='BorderLayout.SOUTH' - onActionPerformed='dispose();'/> + <JButton id="closeButton" constraints='BorderLayout.SOUTH'/> </JDialog> diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriPopupUI.css b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriPopupUI.css index 4630a75..3b0de25 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriPopupUI.css +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriPopupUI.css @@ -56,6 +56,7 @@ FileEditor { text: "tutti.common.cancel"; toolTipText: "tutti.common.cancel"; i18nMnemonic: "tutti.common.cancel.mnemonic"; + _simpleAction: {fr.ifremer.tutti.ui.swing.content.operation.catches.species.actions.ImportPupitriPopupCancelAction.class}; } #validateButton { @@ -63,5 +64,6 @@ FileEditor { text: "tutti.common.validate"; toolTipText: "tutti.common.validate"; i18nMnemonic: "tutti.common.validate.mnemonic"; + _simpleAction: {fr.ifremer.tutti.ui.swing.content.operation.catches.species.actions.ImportPupitriPopupValidateAction.class}; } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriPopupUI.jaxx b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriPopupUI.jaxx index c6db5c9..1e88b04 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriPopupUI.jaxx +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriPopupUI.jaxx @@ -63,8 +63,8 @@ public void open() { <row> <cell columns='2'> <JPanel layout='{new GridLayout(1,0)}'> - <JButton id='cancelButton' onActionPerformed='handler.cancel()'/> - <JButton id='validateButton' onActionPerformed='handler.validate()'/> + <JButton id='cancelButton'/> + <JButton id='validateButton'/> </JPanel> </cell> </row> diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriPopupUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriPopupUIHandler.java index 0cb0e8a..304ad95 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriPopupUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriPopupUIHandler.java @@ -29,11 +29,8 @@ import jaxx.runtime.spi.UIHandler; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import javax.swing.JOptionPane; import java.io.File; -import static org.nuiton.i18n.I18n.t; - /** * @author kmorin <morin@codelutin.com> * @author tchemit <chemit@codelutin.com> @@ -133,28 +130,7 @@ public class ImportPupitriPopupUIHandler implements UIHandler<ImportPupitriPopup ui.setVisible(true); } - public void cancel() { - resetFields(); - ui.dispose(); - } - - public void validate() { - if (ui.getTrunkFile().getSelectedFile() != null - && ui.getTrunkFile().getSelectedFile().exists() - && ui.getCarrouselFile().getSelectedFile() != null - && ui.getCarrouselFile().getSelectedFile().exists()) { - - ui.dispose(); - - } else { - JOptionPane.showMessageDialog(ui, - t("tutti.importPupitri.error.fileMissing.message"), - t("tutti.importPupitri.error.fileMissing.title"), - JOptionPane.ERROR_MESSAGE); - } - } - - protected void resetFields() { + public void resetFields() { ui.getTrunkFile().setSelectedFilePath(null); ui.getCarrouselFile().setSelectedFilePath(null); } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/ImportPupitriAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/ImportPupitriAction.java index 17b3ea3..74162aa 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/ImportPupitriAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/ImportPupitriAction.java @@ -140,8 +140,7 @@ public class ImportPupitriAction extends LongActionSupport<SpeciesBatchUIModel, importPupitriDialog.open(); importedTrunkFile = importPupitriDialog.getTrunkFile().getSelectedFile(); importedCarrouselFile = importPupitriDialog.getCarrouselFile().getSelectedFile(); - result = importedTrunkFile != null - && importedCarrouselFile != null; + result = importedTrunkFile != null && importedCarrouselFile != null; } return result; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/ImportPupitriPopupCancelAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/ImportPupitriPopupCancelAction.java new file mode 100644 index 0000000..4aef8ba --- /dev/null +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/ImportPupitriPopupCancelAction.java @@ -0,0 +1,28 @@ +package fr.ifremer.tutti.ui.swing.content.operation.catches.species.actions; + +import fr.ifremer.tutti.ui.swing.content.operation.catches.species.ImportPupitriPopupUI; +import fr.ifremer.tutti.ui.swing.util.actions.SimpleActionSupport; + +/** + * Created on 3/11/15. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 3.15 + */ +public class ImportPupitriPopupCancelAction extends SimpleActionSupport<ImportPupitriPopupUI> { + + private static final long serialVersionUID = 1L; + + public ImportPupitriPopupCancelAction(ImportPupitriPopupUI ui) { + super(ui); + } + + @Override + protected void onActionPerformed(ImportPupitriPopupUI ui) { + + ui.getTrunkFile().setSelectedFilePath(null); + ui.getCarrouselFile().setSelectedFilePath(null); + ui.dispose(); + + } +} diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/ImportPupitriPopupValidateAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/ImportPupitriPopupValidateAction.java new file mode 100644 index 0000000..3404580 --- /dev/null +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/ImportPupitriPopupValidateAction.java @@ -0,0 +1,45 @@ +package fr.ifremer.tutti.ui.swing.content.operation.catches.species.actions; + +import fr.ifremer.tutti.ui.swing.content.operation.catches.species.ImportPupitriPopupUI; +import fr.ifremer.tutti.ui.swing.util.actions.SimpleActionSupport; + +import javax.swing.JOptionPane; + +import java.io.File; + +import static org.nuiton.i18n.I18n.t; + +/** + * Created on 3/11/15. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 3.15 + */ +public class ImportPupitriPopupValidateAction extends SimpleActionSupport<ImportPupitriPopupUI> { + + private static final long serialVersionUID = 1L; + + public ImportPupitriPopupValidateAction(ImportPupitriPopupUI ui) { + super(ui); + } + + @Override + protected void onActionPerformed(ImportPupitriPopupUI ui) { + + File trunkFile = ui.getTrunkFile().getSelectedFile(); + File carousselFile = ui.getCarrouselFile().getSelectedFile(); + if (trunkFile != null && trunkFile.exists() && carousselFile != null && carousselFile.exists()) { + + ui.dispose(); + + } else { + + JOptionPane.showMessageDialog(ui, + t("tutti.importPupitri.error.fileMissing.message"), + t("tutti.importPupitri.error.fileMissing.title"), + JOptionPane.ERROR_MESSAGE); + + } + + } +} diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/MultiPostImportLogCloseDialogAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/MultiPostImportLogCloseDialogAction.java new file mode 100644 index 0000000..61ef6b9 --- /dev/null +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/MultiPostImportLogCloseDialogAction.java @@ -0,0 +1,24 @@ +package fr.ifremer.tutti.ui.swing.content.operation.catches.species.actions; + +import fr.ifremer.tutti.ui.swing.content.operation.catches.MultiPostImportLogDialog; +import fr.ifremer.tutti.ui.swing.util.actions.SimpleActionSupport; + +/** + * Created on 3/11/15. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 3.15 + */ +public class MultiPostImportLogCloseDialogAction extends SimpleActionSupport<MultiPostImportLogDialog> { + + private static final long serialVersionUID = 1L; + + public MultiPostImportLogCloseDialogAction(MultiPostImportLogDialog ui) { + super(ui); + } + + @Override + protected void onActionPerformed(MultiPostImportLogDialog ui) { + ui.dispose(); + } +} diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/AbstractReplaceTemporaryUI.css b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/AbstractReplaceTemporaryUI.css index 82bcf0c..0213e8b 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/AbstractReplaceTemporaryUI.css +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/AbstractReplaceTemporaryUI.css @@ -80,5 +80,6 @@ BeanFilterableComboBox { text: "tutti.replaceTemporaryReferential.action.cancel"; toolTipText: "tutti.replaceTemporaryReferential.action.cancel.tip"; i18nMnemonic: "tutti.replaceTemporaryReferential.action.cancel.mnemonic"; + _simpleAction:{fr.ifremer.tutti.ui.swing.content.referential.replace.actions.CloseReplaceUIAction.class}; _help: {"tutti.replaceTemporaryReferential.action.cancel.help"}; } \ No newline at end of file diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/AbstractReplaceTemporaryUI.jaxx b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/AbstractReplaceTemporaryUI.jaxx index 18e8810..63313dd 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/AbstractReplaceTemporaryUI.jaxx +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/AbstractReplaceTemporaryUI.jaxx @@ -87,7 +87,7 @@ <row anchor='south'> <cell columns='2' fill="both"> <JPanel layout='{new GridLayout(1, 0)}'> - <JButton id='cancelButton' onActionPerformed='model.setValid(false); dispose();'/> + <JButton id='cancelButton'/> <JButton id='replaceButton'/> </JPanel> </cell> diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/actions/CloseReplaceUIAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/actions/CloseReplaceUIAction.java new file mode 100644 index 0000000..ff9e20d --- /dev/null +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/actions/CloseReplaceUIAction.java @@ -0,0 +1,27 @@ +package fr.ifremer.tutti.ui.swing.content.referential.replace.actions; + +import fr.ifremer.tutti.ui.swing.content.referential.replace.AbstractReplaceTemporaryUI; +import fr.ifremer.tutti.ui.swing.util.actions.SimpleActionSupport; + +/** + * Created on 3/11/15. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 3.15 + */ +public class CloseReplaceUIAction extends SimpleActionSupport<AbstractReplaceTemporaryUI>{ + + private static final long serialVersionUID = 1L; + + public CloseReplaceUIAction(AbstractReplaceTemporaryUI ui) { + super(ui); + } + + @Override + protected void onActionPerformed(AbstractReplaceTemporaryUI ui) { + + ui.getModel().setValid(false); + ui.dispose(); + + } +} -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit 95c702ee38c69ddde920b51c55f8bfda45264326 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Mar 25 09:43:25 2015 +0100 refs #6847 modification aussi du département temporaire pour la persistence des personnes temporaires --- tutti-persistence/src/main/resources/tutti-db-enumerations.properties | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tutti-persistence/src/main/resources/tutti-db-enumerations.properties b/tutti-persistence/src/main/resources/tutti-db-enumerations.properties index 5658481..1171fa6 100644 --- a/tutti-persistence/src/main/resources/tutti-db-enumerations.properties +++ b/tutti-persistence/src/main/resources/tutti-db-enumerations.properties @@ -26,4 +26,6 @@ # Depuis 03/2015, il s'agit du prefix de département à utiliser # Voir https://forge.codelutin.com/issues/6847 -DepartmentCode.INSIDE_PREFIX=IFREMER \ No newline at end of file +DepartmentCode.INSIDE_PREFIX=IFREMER +# Pour que l'import des personnes temporaires fonctionne +DepartmentId.UNKNOWN_RECORDER_DEPARTMENT=407 \ No newline at end of file -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit 9547ab18ccd9f458f8af63aab51cdb8e7cccb66c Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Mar 25 10:31:31 2015 +0100 refs #6805 recharcher les données après un remplacement de donnée temporaire --- .../java/fr/ifremer/tutti/service/TuttiDataContext.java | 13 ++++++++++++- .../replace/actions/AbstractReplaceTemporaryUIAction.java | 13 +++++++++++++ .../replace/actions/ReplaceTemporaryGearAction.java | 7 +++++++ .../replace/actions/ReplaceTemporaryPersonAction.java | 7 +++++++ .../replace/actions/ReplaceTemporarySpeciesAction.java | 6 ++++++ .../replace/actions/ReplaceTemporaryVesselAction.java | 7 +++++++ 6 files changed, 52 insertions(+), 1 deletion(-) diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiDataContext.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiDataContext.java index fb6f415..52b26f8 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiDataContext.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiDataContext.java @@ -505,7 +505,7 @@ public class TuttiDataContext extends AbstractBean implements Closeable { Preconditions.checkState(isCruiseFilled()); String id = getCruiseId(); if (log.isInfoEnabled()) { - log.info("Loading cruise: " + id); + log.info("Reloading cruise: " + id); } cruise = service.getCruise(id); return cruise; @@ -550,6 +550,17 @@ public class TuttiDataContext extends AbstractBean implements Closeable { return fishingOperation; } + public FishingOperation reloadFishingOperation() { + checkOpened(); + Preconditions.checkState(isFishingOperationFilled()); + String id = getFishingOperationId(); + if (log.isInfoEnabled()) { + log.info("Reloading fishingOperation: " + id); + } + fishingOperation = service.getFishingOperation(id); + return fishingOperation ; + } + public List<Caracteristic> getCaracteristics() { checkOpened(); if (caracteristics == null) { diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/actions/AbstractReplaceTemporaryUIAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/actions/AbstractReplaceTemporaryUIAction.java index a1a212f..6365ec4 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/actions/AbstractReplaceTemporaryUIAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/actions/AbstractReplaceTemporaryUIAction.java @@ -130,4 +130,17 @@ public abstract class AbstractReplaceTemporaryUIAction<E extends TuttiReferentia } + + protected void reloadCruise() { + if (getDataContext().isCruiseFilled()) { + getDataContext().reloadCruise(); + } + } + + protected void reloadFishingOperation() { + if (getDataContext().isFishingOperationFilled()) { + getDataContext().reloadFishingOperation(); + } + } + } \ No newline at end of file diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/actions/ReplaceTemporaryGearAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/actions/ReplaceTemporaryGearAction.java index a4b06d5..6cbbd66 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/actions/ReplaceTemporaryGearAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/actions/ReplaceTemporaryGearAction.java @@ -62,4 +62,11 @@ public class ReplaceTemporaryGearAction extends AbstractReplaceTemporaryUIAction persistenceService.replaceGear(source, target, delete); } + @Override + public void postSuccessAction() { + super.postSuccessAction(); + reloadCruise(); + reloadFishingOperation(); + } + } \ No newline at end of file diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/actions/ReplaceTemporaryPersonAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/actions/ReplaceTemporaryPersonAction.java index 0428e77..716a882 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/actions/ReplaceTemporaryPersonAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/actions/ReplaceTemporaryPersonAction.java @@ -62,4 +62,11 @@ public class ReplaceTemporaryPersonAction extends AbstractReplaceTemporaryUIActi persistenceService.replacePerson(source, target, delete); } + @Override + public void postSuccessAction() { + super.postSuccessAction(); + reloadCruise(); + reloadFishingOperation(); + } + } \ No newline at end of file diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/actions/ReplaceTemporarySpeciesAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/actions/ReplaceTemporarySpeciesAction.java index aeb8449..651d871 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/actions/ReplaceTemporarySpeciesAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/actions/ReplaceTemporarySpeciesAction.java @@ -63,4 +63,10 @@ public class ReplaceTemporarySpeciesAction extends AbstractReplaceTemporaryUIAct } + @Override + public void postSuccessAction() { + super.postSuccessAction(); + reloadFishingOperation(); + } + } \ No newline at end of file diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/actions/ReplaceTemporaryVesselAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/actions/ReplaceTemporaryVesselAction.java index 6d8f22a..9f548dc 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/actions/ReplaceTemporaryVesselAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/actions/ReplaceTemporaryVesselAction.java @@ -62,4 +62,11 @@ public class ReplaceTemporaryVesselAction extends AbstractReplaceTemporaryUIActi persistenceService.replaceVessel(source, target, delete); } + @Override + public void postSuccessAction() { + super.postSuccessAction(); + reloadCruise(); + reloadFishingOperation(); + } + } \ No newline at end of file -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit 1955721439bc71898b7d4453baa58eada4b1ff59 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Mar 25 11:14:46 2015 +0100 refs #6805 Correction du non import de personne si existe déjà --- .../ifremer/tutti/persistence/entities/referential/Persons.java | 8 ++------ .../referential/consumer/CsvConsumerForTemporaryPerson.java | 3 ++- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/Persons.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/Persons.java index 7846cd4..b82527f 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/Persons.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/Persons.java @@ -27,12 +27,8 @@ package fr.ifremer.tutti.persistence.entities.referential; import com.google.common.base.Function; import com.google.common.base.Preconditions; import com.google.common.base.Predicate; -import com.google.common.collect.Maps; import org.apache.commons.lang3.StringUtils; -import java.util.List; -import java.util.Map; - public class Persons extends AbstractPersons { /** @@ -65,8 +61,8 @@ public class Persons extends AbstractPersons { } - public static Map<String, Person> splitByFullName(List<Person> persons) { - return Maps.uniqueIndex(persons, GET_FULL_NAME); + public static String getFullName(Person person) { + return GET_FULL_NAME.apply(person); } public static final Predicate<Person> IS_TEMPORARY = new Predicate<Person>() { diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/consumer/CsvConsumerForTemporaryPerson.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/consumer/CsvConsumerForTemporaryPerson.java index e19a69e..e9c7543 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/consumer/CsvConsumerForTemporaryPerson.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/consumer/CsvConsumerForTemporaryPerson.java @@ -220,7 +220,8 @@ public class CsvConsumerForTemporaryPerson extends CsvComsumer<PersonRow, Person throw new ApplicationBusinessException(t("tutti.service.referential.import.person.error.noName", id)); } - if (!name.equals(person.getName()) && !requestResult.addExistingNaturalId(name)) { + String previousFullName = Persons.getFullName(person); + if (!previousFullName.equals(name) && !requestResult.addExistingNaturalId(name)) { throw new ApplicationBusinessException(t("tutti.service.referential.import.person.error.existingName", name)); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit 0f362eca833e5b5d5aec8eda4ea4324e95ab13dc Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Mar 25 11:15:23 2015 +0100 refs #6805 Bien rafraichir les ecrans suite à un import --- .../actions/ImportTemporaryActionSupport.java | 95 ++++++++++++++++++++++ .../actions/ImportTemporaryGearAction.java | 64 +++++---------- .../actions/ImportTemporaryPersonAction.java | 66 +++++---------- .../actions/ImportTemporarySpeciesAction.java | 62 ++++---------- .../actions/ImportTemporaryVesselAction.java | 62 ++++---------- 5 files changed, 168 insertions(+), 181 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/actions/ImportTemporaryActionSupport.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/actions/ImportTemporaryActionSupport.java new file mode 100644 index 0000000..e80c0eb --- /dev/null +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/actions/ImportTemporaryActionSupport.java @@ -0,0 +1,95 @@ +package fr.ifremer.tutti.ui.swing.content.referential.actions; + +import com.google.common.base.Preconditions; +import fr.ifremer.tutti.persistence.entities.referential.TuttiReferentialEntity; +import fr.ifremer.tutti.service.referential.ReferentialImportResult; +import fr.ifremer.tutti.ui.swing.content.referential.ManageTemporaryReferentialUI; +import fr.ifremer.tutti.ui.swing.content.referential.ManageTemporaryReferentialUIHandler; +import fr.ifremer.tutti.ui.swing.content.referential.ManageTemporaryReferentialUIModel; +import fr.ifremer.tutti.ui.swing.util.actions.LongActionSupport; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import java.io.File; + +/** + * Created on 3/25/15. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 3.15 + */ +public abstract class ImportTemporaryActionSupport<E extends TuttiReferentialEntity> extends LongActionSupport<ManageTemporaryReferentialUIModel, ManageTemporaryReferentialUI, ManageTemporaryReferentialUIHandler> { + + /** Logger. */ + private static final Log log = LogFactory.getLog(ImportTemporaryActionSupport.class); + + private File file; + + private ReferentialImportResult<E> result; + + protected abstract File chooseImportFile(); + + protected abstract ReferentialImportResult<E> doImport(File file); + + protected abstract void postSuccessAction(File file, ReferentialImportResult<E> result) ; + + public ImportTemporaryActionSupport(ManageTemporaryReferentialUIHandler handler) { + super(handler, true); + } + + @Override + public boolean prepareAction() throws Exception { + + boolean doAction = super.prepareAction(); + + if (doAction) { + + // choose file to import + file = chooseImportFile(); + + doAction = file != null; + } + return doAction; + + } + + @Override + public void releaseAction() { + file = null; + result = null; + super.releaseAction(); + } + + @Override + public void doAction() throws Exception { + Preconditions.checkNotNull(file); + if (log.isInfoEnabled()) { + log.info("Will import temporary referential from file: " + file); + } + + result = doImport(file); + + } + + @Override + public void postSuccessAction() { + + super.postSuccessAction(); + + postSuccessAction(file, result); + + } + + protected void reloadCruise() { + if (getDataContext().isCruiseFilled()) { + getDataContext().reloadCruise(); + } + } + + protected void reloadFishingOperation() { + if (getDataContext().isFishingOperationFilled()) { + getDataContext().reloadFishingOperation(); + } + } + +} diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/actions/ImportTemporaryGearAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/actions/ImportTemporaryGearAction.java index 452a5d3..2d74181 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/actions/ImportTemporaryGearAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/actions/ImportTemporaryGearAction.java @@ -22,16 +22,10 @@ package fr.ifremer.tutti.ui.swing.content.referential.actions; * #L% */ -import com.google.common.base.Preconditions; import fr.ifremer.tutti.persistence.entities.referential.Gear; import fr.ifremer.tutti.service.referential.ReferentialImportResult; import fr.ifremer.tutti.service.referential.ReferentialTemporaryGearService; -import fr.ifremer.tutti.ui.swing.util.actions.LongActionSupport; -import fr.ifremer.tutti.ui.swing.content.referential.ManageTemporaryReferentialUI; import fr.ifremer.tutti.ui.swing.content.referential.ManageTemporaryReferentialUIHandler; -import fr.ifremer.tutti.ui.swing.content.referential.ManageTemporaryReferentialUIModel; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import java.io.File; @@ -43,54 +37,35 @@ import static org.nuiton.i18n.I18n.t; * @author tchemit <chemit@codelutin.com> * @since 1.0 */ -public class ImportTemporaryGearAction extends LongActionSupport<ManageTemporaryReferentialUIModel, ManageTemporaryReferentialUI, ManageTemporaryReferentialUIHandler> { +public class ImportTemporaryGearAction extends ImportTemporaryActionSupport<Gear> { - /** Logger. */ - private static final Log log = - LogFactory.getLog(ImportTemporaryGearAction.class); - - private File file; - - private ReferentialImportResult<Gear> result; public ImportTemporaryGearAction(ManageTemporaryReferentialUIHandler handler) { - super(handler, true); + super(handler); } @Override - public boolean prepareAction() throws Exception { - - boolean doAction = super.prepareAction(); - - if (doAction) { + protected File chooseImportFile() { - // choose file to import - file = chooseFile( - t("tutti.manageTemporaryReferential.title.choose.importTemporaryGearFile"), - t("tutti.manageTemporaryReferential.action.chooseReferentialGearFile.import"), - "^.*\\.csv", t("tutti.common.file.csv")); + File file = chooseFile( + t("tutti.manageTemporaryReferential.title.choose.importTemporaryGearFile"), + t("tutti.manageTemporaryReferential.action.chooseReferentialGearFile.import"), + "^.*\\.csv", t("tutti.common.file.csv")); + return file; - doAction = file != null; - } - return doAction; } @Override - public void releaseAction() { - file = null; - super.releaseAction(); + protected ReferentialImportResult<Gear> doImport(File file) { + + ReferentialTemporaryGearService service = getContext().getReferentialTemporaryGearService(); + ReferentialImportResult<Gear> importResult = service.importTemporaryGear(file); + return importResult; + } @Override - public void doAction() throws Exception { - Preconditions.checkNotNull(file); - if (log.isInfoEnabled()) { - log.info("Will import gear temporary " + - "referential from file: " + file); - } - - ReferentialTemporaryGearService service = getContext().getReferentialTemporaryGearService(); - result = service.importTemporaryGear(file); + protected void postSuccessAction(File file, ReferentialImportResult<Gear> result) { int nbRef = getModel().getNbTemporaryGears(); getModel().setNbTemporaryGears(nbRef + result.getNbRefAdded() - result.getNbRefDeleted()); @@ -98,12 +73,10 @@ public class ImportTemporaryGearAction extends LongActionSupport<ManageTemporary // reset ui cache getDataContext().resetGears(); - getHandler().resetExportGearsAction(); - } + reloadCruise(); + reloadFishingOperation(); - @Override - public void postSuccessAction() { - super.postSuccessAction(); + getHandler().resetExportGearsAction(); String title = t("tutti.manageTemporaryReferential.action.chooseReferentialGearFile.import.dialog.title"); String message = t("tutti.manageTemporaryReferential.action.chooseReferentialGearFile.import.dialog.message", @@ -112,4 +85,5 @@ public class ImportTemporaryGearAction extends LongActionSupport<ManageTemporary sendMessage(t("tutti.manageTemporaryReferential.action.chooseReferentialGearFile.import.success", file)); } + } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/actions/ImportTemporaryPersonAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/actions/ImportTemporaryPersonAction.java index af82a0b..992f7b5 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/actions/ImportTemporaryPersonAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/actions/ImportTemporaryPersonAction.java @@ -22,16 +22,10 @@ package fr.ifremer.tutti.ui.swing.content.referential.actions; * #L% */ -import com.google.common.base.Preconditions; import fr.ifremer.tutti.persistence.entities.referential.Person; import fr.ifremer.tutti.service.referential.ReferentialImportResult; import fr.ifremer.tutti.service.referential.ReferentialTemporaryPersonService; -import fr.ifremer.tutti.ui.swing.util.actions.LongActionSupport; -import fr.ifremer.tutti.ui.swing.content.referential.ManageTemporaryReferentialUI; import fr.ifremer.tutti.ui.swing.content.referential.ManageTemporaryReferentialUIHandler; -import fr.ifremer.tutti.ui.swing.content.referential.ManageTemporaryReferentialUIModel; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import java.io.File; @@ -43,68 +37,44 @@ import static org.nuiton.i18n.I18n.t; * @author tchemit <chemit@codelutin.com> * @since 1.0 */ -public class ImportTemporaryPersonAction extends LongActionSupport<ManageTemporaryReferentialUIModel, ManageTemporaryReferentialUI, ManageTemporaryReferentialUIHandler> { - - /** Logger. */ - private static final Log log = - LogFactory.getLog(ImportTemporaryPersonAction.class); - - private File file; - - private ReferentialImportResult<Person> result; +public class ImportTemporaryPersonAction extends ImportTemporaryActionSupport<Person> { public ImportTemporaryPersonAction(ManageTemporaryReferentialUIHandler handler) { - super(handler, true); + super(handler); } @Override - public boolean prepareAction() throws Exception { - - boolean doAction = super.prepareAction(); + protected File chooseImportFile() { - if (doAction) { + File file = chooseFile( + t("tutti.manageTemporaryReferential.title.choose.importTemporaryPersonFile"), + t("tutti.manageTemporaryReferential.action.chooseReferentialPersonFile.import"), + "^.*\\.csv", t("tutti.common.file.csv")); + return file; - // choose file to import - file = chooseFile( - t("tutti.manageTemporaryReferential.title.choose.importTemporaryPersonFile"), - t("tutti.manageTemporaryReferential.action.chooseReferentialPersonFile.import"), - "^.*\\.csv", t("tutti.common.file.csv")); - - doAction = file != null; - } - return doAction; - } - - @Override - public void releaseAction() { - file = null; - super.releaseAction(); } @Override - public void doAction() throws Exception { - Preconditions.checkNotNull(file); - if (log.isInfoEnabled()) { - log.info("Will import person temporary " + - "referential from file: " + file); - } + protected ReferentialImportResult<Person> doImport(File file) { ReferentialTemporaryPersonService service = getContext().getReferentialTemporaryPersonService(); + ReferentialImportResult<Person> importResult = service.importTemporaryPerson(file); + return importResult; - result = service.importTemporaryPerson(file); + } + + @Override + public void postSuccessAction(File file, ReferentialImportResult<Person> result) { int nbRef = getModel().getNbTemporaryPersons(); getModel().setNbTemporaryPersons(nbRef + result.getNbRefAdded() - result.getNbRefDeleted()); // reset ui cache getDataContext().resetPersons(); + reloadCruise(); + reloadFishingOperation(); getHandler().resetExportPersonAction(); - } - - @Override - public void postSuccessAction() { - super.postSuccessAction(); String title = t("tutti.manageTemporaryReferential.action.chooseReferentialPersonFile.import.dialog.title"); String message = t("tutti.manageTemporaryReferential.action.chooseReferentialPersonFile.import.dialog.message", @@ -112,5 +82,7 @@ public class ImportTemporaryPersonAction extends LongActionSupport<ManageTempora displayInfoMessage(title, message); sendMessage(t("tutti.manageTemporaryReferential.action.chooseReferentialPersonFile.import.success", file)); + } + } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/actions/ImportTemporarySpeciesAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/actions/ImportTemporarySpeciesAction.java index b2ccb06..e06e89f 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/actions/ImportTemporarySpeciesAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/actions/ImportTemporarySpeciesAction.java @@ -22,16 +22,10 @@ package fr.ifremer.tutti.ui.swing.content.referential.actions; * #L% */ -import com.google.common.base.Preconditions; import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.service.referential.ReferentialImportResult; import fr.ifremer.tutti.service.referential.ReferentialTemporarySpeciesService; -import fr.ifremer.tutti.ui.swing.util.actions.LongActionSupport; -import fr.ifremer.tutti.ui.swing.content.referential.ManageTemporaryReferentialUI; import fr.ifremer.tutti.ui.swing.content.referential.ManageTemporaryReferentialUIHandler; -import fr.ifremer.tutti.ui.swing.content.referential.ManageTemporaryReferentialUIModel; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import java.io.File; @@ -43,72 +37,50 @@ import static org.nuiton.i18n.I18n.t; * @author tchemit <chemit@codelutin.com> * @since 1.0 */ -public class ImportTemporarySpeciesAction extends LongActionSupport<ManageTemporaryReferentialUIModel, ManageTemporaryReferentialUI, ManageTemporaryReferentialUIHandler> { +public class ImportTemporarySpeciesAction extends ImportTemporaryActionSupport<Species> { - /** Logger. */ - private static final Log log = - LogFactory.getLog(ImportTemporarySpeciesAction.class); - - private File file; - - private ReferentialImportResult<Species> result; public ImportTemporarySpeciesAction(ManageTemporaryReferentialUIHandler handler) { - super(handler, true); + super(handler); } @Override - public boolean prepareAction() throws Exception { + protected File chooseImportFile() { - boolean doAction = super.prepareAction(); + File file = chooseFile( + t("tutti.manageTemporaryReferential.title.choose.importTemporarySpeciesFile"), + t("tutti.manageTemporaryReferential.action.chooseReferentialSpeciesFile.import"), + "^.*\\.csv", t("tutti.common.file.csv")); + return file; - if (doAction) { - // choose file to import - file = chooseFile( - t("tutti.manageTemporaryReferential.title.choose.importTemporarySpeciesFile"), - t("tutti.manageTemporaryReferential.action.chooseReferentialSpeciesFile.import"), - "^.*\\.csv", t("tutti.common.file.csv")); - - doAction = file != null; - } - return doAction; } @Override - public void releaseAction() { - file = null; - super.releaseAction(); + protected ReferentialImportResult<Species> doImport(File file) { + + ReferentialTemporarySpeciesService service = getContext().getReferentialTemporarySpeciesService(); + ReferentialImportResult<Species> result = service.importTemporarySpecies(file); + return result; + } @Override - public void doAction() throws Exception { - Preconditions.checkNotNull(file); - if (log.isInfoEnabled()) { - log.info("Will import species temporary " + - "referential from file: " + file); - } - - ReferentialTemporarySpeciesService service = getContext().getReferentialTemporarySpeciesService(); - result = service.importTemporarySpecies(file); + protected void postSuccessAction(File file, ReferentialImportResult<Species> result) { int nbRef = getModel().getNbTemporarySpecies(); getModel().setNbTemporarySpecies(nbRef + result.getNbRefAdded() - result.getNbRefDeleted()); // reset ui cache getDataContext().resetSpecies(); + reloadFishingOperation(); getHandler().resetExportSpeciesAction(); - } - - @Override - public void postSuccessAction() { - super.postSuccessAction(); - String title = t("tutti.manageTemporaryReferential.action.chooseReferentialSpeciesFile.import.dialog.title"); String message = t("tutti.manageTemporaryReferential.action.chooseReferentialSpeciesFile.import.dialog.message", result.getNbRefAdded(), result.getNbRefUpdated(), result.getNbRefDeleted()); displayInfoMessage(title, message); sendMessage(t("tutti.manageTemporaryReferential.action.chooseReferentialSpeciesFile.import.success", file)); + } } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/actions/ImportTemporaryVesselAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/actions/ImportTemporaryVesselAction.java index f93a316..035f298 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/actions/ImportTemporaryVesselAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/actions/ImportTemporaryVesselAction.java @@ -22,16 +22,10 @@ package fr.ifremer.tutti.ui.swing.content.referential.actions; * #L% */ -import com.google.common.base.Preconditions; import fr.ifremer.tutti.persistence.entities.referential.Vessel; import fr.ifremer.tutti.service.referential.ReferentialImportResult; import fr.ifremer.tutti.service.referential.ReferentialTemporaryVesselService; -import fr.ifremer.tutti.ui.swing.util.actions.LongActionSupport; -import fr.ifremer.tutti.ui.swing.content.referential.ManageTemporaryReferentialUI; import fr.ifremer.tutti.ui.swing.content.referential.ManageTemporaryReferentialUIHandler; -import fr.ifremer.tutti.ui.swing.content.referential.ManageTemporaryReferentialUIModel; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import java.io.File; @@ -43,66 +37,45 @@ import static org.nuiton.i18n.I18n.t; * @author tchemit <chemit@codelutin.com> * @since 1.0 */ -public class ImportTemporaryVesselAction extends LongActionSupport<ManageTemporaryReferentialUIModel, ManageTemporaryReferentialUI, ManageTemporaryReferentialUIHandler> { +public class ImportTemporaryVesselAction extends ImportTemporaryActionSupport<Vessel> { - /** Logger. */ - private static final Log log = - LogFactory.getLog(ImportTemporaryVesselAction.class); - - private File file; - - private ReferentialImportResult<Vessel> result; public ImportTemporaryVesselAction(ManageTemporaryReferentialUIHandler handler) { - super(handler, true); + super(handler); } @Override - public boolean prepareAction() throws Exception { - - boolean doAction = super.prepareAction(); + protected File chooseImportFile() { - if (doAction) { - // choose file to import - file = chooseFile( - t("tutti.manageTemporaryReferential.title.choose.importTemporaryVesselFile"), - t("tutti.manageTemporaryReferential.action.chooseReferentialVesselFile.import"), - "^.*\\.csv", t("tutti.common.file.csv")); + File file = chooseFile( + t("tutti.manageTemporaryReferential.title.choose.importTemporaryVesselFile"), + t("tutti.manageTemporaryReferential.action.chooseReferentialVesselFile.import"), + "^.*\\.csv", t("tutti.common.file.csv")); + return file; - doAction = file != null; - } - return doAction; } @Override - public void releaseAction() { - file = null; - super.releaseAction(); + protected ReferentialImportResult<Vessel> doImport(File file) { + + ReferentialTemporaryVesselService service = getContext().getReferentialTemporaryVesselService(); + ReferentialImportResult<Vessel> result = service.importTemporaryVessel(file); + return result; + } @Override - public void doAction() throws Exception { - Preconditions.checkNotNull(file); - if (log.isInfoEnabled()) { - log.info("Will import vessel temporary " + - "referential from file: " + file); - } - - ReferentialTemporaryVesselService service = getContext().getReferentialTemporaryVesselService(); - result = service.importTemporaryVessel(file); + protected void postSuccessAction(File file, ReferentialImportResult<Vessel> result) { int nbRef = getModel().getNbTemporaryVessels(); getModel().setNbTemporaryVessels(nbRef + result.getNbRefAdded() - result.getNbRefDeleted()); // reset ui cache getDataContext().resetVessels(); + reloadCruise(); + reloadFishingOperation(); getHandler().resetExportVesselsAction(); - } - - @Override - public void postSuccessAction() { - super.postSuccessAction(); String title = t("tutti.manageTemporaryReferential.action.chooseReferentialVesselFile.import.dialog.title"); String message = t("tutti.manageTemporaryReferential.action.chooseReferentialVesselFile.import.dialog.message", @@ -110,5 +83,6 @@ public class ImportTemporaryVesselAction extends LongActionSupport<ManageTempora displayInfoMessage(title, message); sendMessage(t("tutti.manageTemporaryReferential.action.chooseReferentialVesselFile.import.success", file)); + } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit ed0767c1d07d3c2d914db9519f55b86c82dbf168 Merge: 95c702e 0f362ec Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Mar 25 11:21:27 2015 +0100 fixes #6805: [REFERENTIEL] Incohérences lors de la modification des référentiels temporaires Merge branch 'feature/6805' into develop .../persistence/entities/referential/Persons.java | 8 +- .../referential/GearPersistenceServiceImpl.java | 33 +++++--- .../referential/PersonPersistenceServiceImpl.java | 11 +++ .../referential/VesselPersistenceServiceImpl.java | 41 ++++++++-- .../fr/ifremer/tutti/service/TuttiDataContext.java | 13 ++- .../consumer/CsvConsumerForTemporaryPerson.java | 3 +- .../consumer/CsvConsumerForTemporaryVessel.java | 2 +- .../operation/catches/MultiPostImportLogDialog.css | 2 +- .../catches/MultiPostImportLogDialog.jaxx | 3 +- .../catches/species/ImportPupitriPopupUI.css | 2 + .../catches/species/ImportPupitriPopupUI.jaxx | 4 +- .../species/ImportPupitriPopupUIHandler.java | 26 +----- .../species/actions/ImportPupitriAction.java | 3 +- .../actions/ImportPupitriPopupCancelAction.java | 28 +++++++ .../actions/ImportPupitriPopupValidateAction.java | 45 ++++++++++ .../MultiPostImportLogCloseDialogAction.java | 24 ++++++ .../AbstractOpenReplaceTemporaryUIAction.java | 64 ++++++++------- .../actions/ImportTemporaryActionSupport.java | 95 ++++++++++++++++++++++ .../actions/ImportTemporaryGearAction.java | 64 +++++---------- .../actions/ImportTemporaryPersonAction.java | 66 +++++---------- .../actions/ImportTemporarySpeciesAction.java | 62 ++++---------- .../actions/ImportTemporaryVesselAction.java | 62 ++++---------- .../replace/AbstractReplaceTemporaryUI.css | 1 + .../replace/AbstractReplaceTemporaryUI.jaxx | 2 +- .../actions/AbstractReplaceTemporaryUIAction.java | 13 +++ .../replace/actions/CloseReplaceUIAction.java | 27 ++++++ .../actions/ReplaceTemporaryGearAction.java | 7 ++ .../actions/ReplaceTemporaryPersonAction.java | 7 ++ .../actions/ReplaceTemporarySpeciesAction.java | 6 ++ .../actions/ReplaceTemporaryVesselAction.java | 7 ++ 30 files changed, 459 insertions(+), 272 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm