Author: tchemit Date: 2013-09-19 11:41:01 +0200 (Thu, 19 Sep 2013) New Revision: 1191 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1191 Log: fixes #3291: [CAPTURE] Permettre la saisie de plusieurs macro-d?\195?\169chets sans avoir ?\195?\160 fermer l'?\195?\169cran de cr?\195?\169ation fixes #3292: [CAPTURE] Permettre la saisie de plusieurs captures accidentelles sans avoir ?\195?\160 fermer l'?\195?\169cran de cr?\195?\169ation Modified: trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-en.properties trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/create/CreateAccidentalBatchUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/create/CreateAccidentalBatchUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/create/CreateAccidentalBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/CreateMarineLitterBatchUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/CreateMarineLitterBatchUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/CreateMarineLitterBatchUIHandler.java Modified: trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-en.properties =================================================================== --- trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-en.properties 2013-09-19 08:53:29 UTC (rev 1190) +++ trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-en.properties 2013-09-19 09:41:01 UTC (rev 1191) @@ -1,8 +1,9 @@ #Generated by org.nuiton.jaxx.plugin.GenerateHelpIdsMojo -#Wed Sep 18 18:37:46 CEST 2013 +#Thu Sep 19 11:22:41 CEST 2013 tutti.config.help=config.html tutti.createAccidentalBatch.action.cancel.help=editFishingOperation.html\#captureCapturesAccidentellesActions -tutti.createAccidentalBatch.action.save.help=editFishingOperation.html\#captureCapturesAccidentellesActions +tutti.createAccidentalBatch.action.saveAndClose.help=editFishingOperation.html\#captureCapturesAccidentellesActions +tutti.createAccidentalBatch.action.saveAndContinue.help=editFishingOperation.html\#captureCapturesAccidentellesActions tutti.createAccidentalBatch.field.accidentalDeadOrAlive.help=editFishingOperation.html\#captureCapturesAccidentellesFields tutti.createAccidentalBatch.field.accidentalGender.help=editFishingOperation.html\#captureCapturesAccidentellesFields tutti.createAccidentalBatch.field.accidentalLengthStepCaracteristic.help=editFishingOperation.html\#captureCapturesAccidentellesFields @@ -31,7 +32,8 @@ tutti.createIndividualObservationBatch.field.individualObservationWeight.help=editFishingOperation.html\#captureObservationsIndividuellesFields tutti.createIndividualObservationBatch.help=editFishingOperation.html\#captureObservationsIndividuelles tutti.createMarineLitterBatch.action.cancel.help=editFishingOperation.html\#captureMacroDechetsActions -tutti.createMarineLitterBatch.action.save.help=editFishingOperation.html\#captureMacroDechetsActions +tutti.createMarineLitterBatch.action.saveAndClose.help=editFishingOperation.html\#captureMacroDechetsActions +tutti.createMarineLitterBatch.action.saveAndContinue.help=editFishingOperation.html\#captureMacroDechetsActions tutti.createMarineLitterBatch.field.marineLitterCategory.help=editFishingOperation.html\#captureMacroDechetsFields tutti.createMarineLitterBatch.field.marineLitterSizeCategory.help=editFishingOperation.html\#captureMacroDechetsFields tutti.createMarineLitterBatch.field.number.help=editFishingOperation.html\#captureMacroDechetsFields Modified: trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties =================================================================== --- trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties 2013-09-19 08:53:29 UTC (rev 1190) +++ trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties 2013-09-19 09:41:01 UTC (rev 1191) @@ -1,8 +1,9 @@ #Generated by org.nuiton.jaxx.plugin.GenerateHelpIdsMojo -#Wed Sep 18 18:37:46 CEST 2013 +#Thu Sep 19 11:22:41 CEST 2013 tutti.config.help=config.html tutti.createAccidentalBatch.action.cancel.help=editFishingOperation.html\#captureCapturesAccidentellesActions -tutti.createAccidentalBatch.action.save.help=editFishingOperation.html\#captureCapturesAccidentellesActions +tutti.createAccidentalBatch.action.saveAndClose.help=editFishingOperation.html\#captureCapturesAccidentellesActions +tutti.createAccidentalBatch.action.saveAndContinue.help=editFishingOperation.html\#captureCapturesAccidentellesActions tutti.createAccidentalBatch.field.accidentalDeadOrAlive.help=editFishingOperation.html\#captureCapturesAccidentellesFields tutti.createAccidentalBatch.field.accidentalGender.help=editFishingOperation.html\#captureCapturesAccidentellesFields tutti.createAccidentalBatch.field.accidentalLengthStepCaracteristic.help=editFishingOperation.html\#captureCapturesAccidentellesFields @@ -31,7 +32,8 @@ tutti.createIndividualObservationBatch.field.individualObservationWeight.help=editFishingOperation.html\#captureObservationsIndividuellesFields tutti.createIndividualObservationBatch.help=editFishingOperation.html\#captureObservationsIndividuelles tutti.createMarineLitterBatch.action.cancel.help=editFishingOperation.html\#captureMacroDechetsActions -tutti.createMarineLitterBatch.action.save.help=editFishingOperation.html\#captureMacroDechetsActions +tutti.createMarineLitterBatch.action.saveAndClose.help=editFishingOperation.html\#captureMacroDechetsActions +tutti.createMarineLitterBatch.action.saveAndContinue.help=editFishingOperation.html\#captureMacroDechetsActions tutti.createMarineLitterBatch.field.marineLitterCategory.help=editFishingOperation.html\#captureMacroDechetsFields tutti.createMarineLitterBatch.field.marineLitterSizeCategory.help=editFishingOperation.html\#captureMacroDechetsFields tutti.createMarineLitterBatch.field.number.help=editFishingOperation.html\#captureMacroDechetsFields Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/create/CreateAccidentalBatchUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/create/CreateAccidentalBatchUI.css 2013-09-19 08:53:29 UTC (rev 1190) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/create/CreateAccidentalBatchUI.css 2013-09-19 09:41:01 UTC (rev 1191) @@ -113,15 +113,24 @@ selectedItem: {model.getDeadOrAlive()}; } -#saveButton { +#saveAndContinueButton { actionIcon: save; - text: "tutti.createAccidentalBatch.action.save"; - toolTipText: "tutti.createAccidentalBatch.action.save.tip"; - i18nMnemonic: "tutti.createAccidentalBatch.action.save.mnemonic"; + text: "tutti.createAccidentalBatch.action.saveAndContinue"; + toolTipText: "tutti.createAccidentalBatch.action.saveAndContinue.tip"; + i18nMnemonic: "tutti.createAccidentalBatch.action.saveAndContinue.mnemonic"; enabled: {model.isValid()}; - _help: {"tutti.createAccidentalBatch.action.save.help"}; + _help: {"tutti.createAccidentalBatch.action.saveAndContinue.help"}; } +#saveAndCloseButton { + actionIcon: save; + text: "tutti.createAccidentalBatch.action.saveAndClose"; + toolTipText: "tutti.createAccidentalBatch.action.saveAndClose.tip"; + i18nMnemonic: "tutti.createAccidentalBatch.action.saveAndClose.mnemonic"; + enabled: {model.isValid()}; + _help: {"tutti.createAccidentalBatch.action.saveAndClose.help"}; +} + #cancelButton { actionIcon: cancel; text: "tutti.createAccidentalBatch.action.cancel"; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/create/CreateAccidentalBatchUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/create/CreateAccidentalBatchUI.jaxx 2013-09-19 08:53:29 UTC (rev 1190) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/create/CreateAccidentalBatchUI.jaxx 2013-09-19 09:41:01 UTC (rev 1191) @@ -150,6 +150,7 @@ <!-- Form Actions --> <JPanel layout='{new GridLayout(1, 0)}' constraints='BorderLayout.SOUTH'> <JButton id='cancelButton' onActionPerformed='handler.cancel()'/> - <JButton id='saveButton' onActionPerformed='handler.save()'/> + <JButton id='saveAndContinueButton' onActionPerformed='handler.saveAndContinue()'/> + <JButton id='saveAndCloseButton' onActionPerformed='handler.saveAndClose()'/> </JPanel> </JPanel> \ No newline at end of file Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/create/CreateAccidentalBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/create/CreateAccidentalBatchUIHandler.java 2013-09-19 08:53:29 UTC (rev 1190) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/create/CreateAccidentalBatchUIHandler.java 2013-09-19 09:41:01 UTC (rev 1191) @@ -26,6 +26,7 @@ import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUIHandler; +import fr.ifremer.tutti.ui.swing.content.operation.catches.accidental.AccidentalBatchUI; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiUIHandler; import fr.ifremer.tutti.ui.swing.util.Cancelable; import fr.ifremer.tutti.ui.swing.util.TuttiUI; @@ -144,13 +145,27 @@ } - public void save() { + public void saveAndContinue() { if (log.isDebugEnabled()) { - log.debug("Save UI " + ui); + log.debug("Save And Continue UI " + ui); } EditCatchesUI parent = SwingUtil.getParentContainer(ui, EditCatchesUI.class); + AccidentalBatchUI accidentalTabContent = parent.getAccidentalTabContent(); + accidentalTabContent.getHandler().addBatch(getModel()); + + // reopen ui + openUI(); + } + + public void saveAndClose() { + + if (log.isDebugEnabled()) { + log.debug("Save And Close UI " + ui); + } + + EditCatchesUI parent = SwingUtil.getParentContainer(ui, EditCatchesUI.class); parent.getAccidentalTabContent().getHandler().addBatch(getModel()); // close dialog Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/CreateMarineLitterBatchUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/CreateMarineLitterBatchUI.css 2013-09-19 08:53:29 UTC (rev 1190) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/CreateMarineLitterBatchUI.css 2013-09-19 09:41:01 UTC (rev 1191) @@ -76,15 +76,24 @@ bean: {model}; } -#saveButton { +#saveAndContinueButton { actionIcon: save; - text: "tutti.createMarineLitterBatch.action.save"; - toolTipText: "tutti.createMarineLitterBatch.action.save.tip"; - i18nMnemonic: "tutti.createMarineLitterBatch.action.save.mnemonic"; + text: "tutti.createMarineLitterBatch.action.saveAndContinue"; + toolTipText: "tutti.createMarineLitterBatch.action.saveAndContinue.tip"; + i18nMnemonic: "tutti.createMarineLitterBatch.action.saveAndContinue.mnemonic"; enabled: {model.isValid()}; - _help: {"tutti.createMarineLitterBatch.action.save.help"}; + _help: {"tutti.createMarineLitterBatch.action.saveAndContinue.help"}; } +#saveAndCloseButton { + actionIcon: save; + text: "tutti.createMarineLitterBatch.action.saveAndClose"; + toolTipText: "tutti.createMarineLitterBatch.action.saveAndClose.tip"; + i18nMnemonic: "tutti.createMarineLitterBatch.action.saveAndClose.mnemonic"; + enabled: {model.isValid()}; + _help: {"tutti.createMarineLitterBatch.action.saveAndClose.help"}; +} + #cancelButton { actionIcon: cancel; text: "tutti.createMarineLitterBatch.action.cancel"; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/CreateMarineLitterBatchUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/CreateMarineLitterBatchUI.jaxx 2013-09-19 08:53:29 UTC (rev 1190) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/CreateMarineLitterBatchUI.jaxx 2013-09-19 09:41:01 UTC (rev 1191) @@ -108,6 +108,7 @@ <!-- Form Actions --> <JPanel layout='{new GridLayout(1, 0)}' constraints='BorderLayout.SOUTH'> <JButton id='cancelButton' onActionPerformed='handler.cancel()'/> - <JButton id='saveButton' onActionPerformed='handler.save()'/> + <JButton id='saveAndContinueButton' onActionPerformed='handler.saveAndContinue()'/> + <JButton id='saveAndCloseButton' onActionPerformed='handler.saveAndClose()'/> </JPanel> </JPanel> \ No newline at end of file Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/CreateMarineLitterBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/CreateMarineLitterBatchUIHandler.java 2013-09-19 08:53:29 UTC (rev 1190) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/CreateMarineLitterBatchUIHandler.java 2013-09-19 09:41:01 UTC (rev 1191) @@ -32,6 +32,7 @@ import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUIHandler; +import fr.ifremer.tutti.ui.swing.content.operation.catches.marinelitter.MarineLitterBatchUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.marinelitter.MarineLitterBatchUIModel; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiUIHandler; import fr.ifremer.tutti.ui.swing.util.Cancelable; @@ -159,13 +160,27 @@ } - public void save() { + public void saveAndContinue() { if (log.isDebugEnabled()) { - log.debug("Save UI " + ui); + log.debug("Save And Continue UI " + ui); } EditCatchesUI parent = SwingUtil.getParentContainer(ui, EditCatchesUI.class); + MarineLitterBatchUI marineLitterTabContent = parent.getMarineLitterTabContent(); + marineLitterTabContent.getHandler().addBatch(getModel()); + + // reopen this ui + openUI(marineLitterTabContent.getModel()); + } + + public void saveAndClose() { + + if (log.isDebugEnabled()) { + log.debug("Save And Close UI " + ui); + } + + EditCatchesUI parent = SwingUtil.getParentContainer(ui, EditCatchesUI.class); parent.getMarineLitterTabContent().getHandler().addBatch(getModel()); // close dialog