Author: tchemit Date: 2013-10-01 14:43:32 +0200 (Tue, 01 Oct 2013) New Revision: 1261 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1261 Log: fixes #3338: [RAPPORT] ajouter sur onglet R?\195?\169sum?\195?\169 un bouton pour obtenir la composition de la capture Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ExportCruiseForSumatraAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SendCruiseReportAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.jaxx trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ExportCruiseForSumatraAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ExportCruiseForSumatraAction.java 2013-10-01 12:24:29 UTC (rev 1260) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ExportCruiseForSumatraAction.java 2013-10-01 12:43:32 UTC (rev 1261) @@ -27,7 +27,8 @@ import com.google.common.base.Preconditions; import fr.ifremer.tutti.persistence.entities.data.Cruise; import fr.ifremer.tutti.service.sumatra.CatchesSumatraExportService; -import fr.ifremer.tutti.ui.swing.util.action.AbstractTuttiAction; +import fr.ifremer.tutti.ui.swing.content.AbstractMainUITuttiAction; +import fr.ifremer.tutti.ui.swing.content.MainUIHandler; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.DateUtil; @@ -43,7 +44,7 @@ * @author kmorin <morin@codelutin.com> * @since 1.0 */ -public class ExportCruiseForSumatraAction extends AbstractTuttiAction<SelectCruiseUIModel, SelectCruiseUI, SelectCruiseUIHandler> { +public class ExportCruiseForSumatraAction extends AbstractMainUITuttiAction { /** Logger. */ private static final Log log = @@ -51,7 +52,7 @@ protected File file; - public ExportCruiseForSumatraAction(SelectCruiseUIHandler handler) { + public ExportCruiseForSumatraAction(MainUIHandler handler) { super(handler, false); } @@ -84,7 +85,7 @@ @Override public void doAction() throws Exception { - Cruise cruise = getModel().getCruise(); + Cruise cruise = getDataContext().getCruise(); Preconditions.checkNotNull(cruise); Preconditions.checkNotNull(file); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SendCruiseReportAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SendCruiseReportAction.java 2013-10-01 12:24:29 UTC (rev 1260) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SendCruiseReportAction.java 2013-10-01 12:43:32 UTC (rev 1261) @@ -28,8 +28,9 @@ import fr.ifremer.tutti.TuttiTechnicalException; import fr.ifremer.tutti.persistence.entities.data.Cruise; import fr.ifremer.tutti.service.catches.ExportCatchesReportService; +import fr.ifremer.tutti.ui.swing.content.AbstractMainUITuttiAction; +import fr.ifremer.tutti.ui.swing.content.MainUIHandler; import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; -import fr.ifremer.tutti.ui.swing.util.action.AbstractTuttiAction; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -44,7 +45,7 @@ * @author kmorin <morin@codelutin.com> * @since 1.0 */ -public class SendCruiseReportAction extends AbstractTuttiAction<SelectCruiseUIModel, SelectCruiseUI, SelectCruiseUIHandler> { +public class SendCruiseReportAction extends AbstractMainUITuttiAction { /** Logger. */ private static final Log log = @@ -52,7 +53,7 @@ protected File file; - public SendCruiseReportAction(SelectCruiseUIHandler handler) { + public SendCruiseReportAction(MainUIHandler handler) { super(handler, true); } @@ -63,7 +64,7 @@ if (doAction) { - Cruise cruise = getModel().getCruise(); + Cruise cruise = getDataContext().getCruise(); // choose file to export file = saveFile( "exportCruise-" + cruise.getName(), @@ -85,7 +86,7 @@ @Override public void doAction() throws Exception { - Cruise cruise = getModel().getCruise(); + Cruise cruise = getDataContext().getCruise(); Preconditions.checkNotNull(cruise); Preconditions.checkNotNull(file); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.css 2013-10-01 12:24:29 UTC (rev 1260) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.css 2013-10-01 12:43:32 UTC (rev 1261) @@ -327,6 +327,23 @@ border: {BorderFactory.createTitledBorder(_("tutti.editCatchBatch.legend.individualObservation"))}; } +#sendCruiseReportButton { + actionIcon: email; + text: "tutti.selectCruise.action.sendCruiseReport"; + toolTipText: "tutti.selectCruise.action.sendCruiseReport.tip"; + _tuttiAction: {SendCruiseReportAction.class}; + _help: {"tutti.selectCruise.action.sendCruiseReport.help"}; +} + +#exportCruiseForSumatraButton { + actionIcon: export; + text: "tutti.selectCruise.action.exportCruiseForSumatra"; + toolTipText: "tutti.selectCruise.action.exportCruiseForSumatra.tip"; + _tuttiAction: {ExportCruiseForSumatraAction.class}; + _help: {"tutti.selectCruise.action.exportCruiseForSumatra.help"}; +} + + #saveButton { actionIcon: save; text: "tutti.editCatchBatch.action.saveCatchBatch"; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.jaxx 2013-10-01 12:24:29 UTC (rev 1260) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.jaxx 2013-10-01 12:43:32 UTC (rev 1261) @@ -27,6 +27,9 @@ <import> fr.ifremer.tutti.ui.swing.TuttiHelpBroker + fr.ifremer.tutti.ui.swing.content.home.SendCruiseReportAction + fr.ifremer.tutti.ui.swing.content.home.ExportCruiseForSumatraAction + fr.ifremer.tutti.ui.swing.content.operation.FishingOperationsUI fr.ifremer.tutti.ui.swing.content.operation.catches.accidental.AccidentalBatchUI fr.ifremer.tutti.ui.swing.content.operation.catches.accidental.create.CreateAccidentalBatchUI @@ -39,7 +42,6 @@ fr.ifremer.tutti.ui.swing.content.operation.catches.marinelitter.MarineLitterBatchUI fr.ifremer.tutti.ui.swing.content.operation.catches.individualobservation.IndividualObservationBatchUI fr.ifremer.tutti.ui.swing.content.operation.catches.individualobservation.create.CreateIndividualObservationBatchUI - fr.ifremer.tutti.ui.swing.util.caracteristics.CaracteristicMapEditorUI fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchUI fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.SpeciesFrequencyUI fr.ifremer.tutti.ui.swing.content.operation.catches.species.create.CreateSpeciesBatchUI @@ -47,6 +49,7 @@ fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUI fr.ifremer.tutti.ui.swing.util.attachment.ButtonAttachment + fr.ifremer.tutti.ui.swing.util.caracteristics.CaracteristicMapEditorUI fr.ifremer.tutti.ui.swing.util.editor.TuttiComputedOrNotDataEditor org.jdesktop.swingx.JXTitledPanel @@ -112,6 +115,8 @@ <TuttiHelpBroker id='broker' constructorParams='"tutti.editCatchBatch.help"'/> <JToolBar id='catchesCaracteristicsTabToolBar'> + <JButton id='sendCruiseReportButton'/> + <JButton id='exportCruiseForSumatraButton'/> <ButtonAttachment id='catchesCaracteristicsAttachmentsButton' constructorParams='getHandler().getContext(), getModel()'/> </JToolBar> Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties =================================================================== --- trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-10-01 12:24:29 UTC (rev 1260) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-10-01 12:43:32 UTC (rev 1261) @@ -512,9 +512,15 @@ tutti.editCatchBatch.action.computeWeights.replaceTotalSortedWeight.message.species=Le Poids total VRAC saisi sur les espèces est supérieur de moins de %s%% au Poids total Vrac trié. tutti.editCatchBatch.action.computeWeights.replaceTotalSortedWeight.title=Poids total VRAC peu différent du Poids total Vrac trié tutti.editCatchBatch.action.computeWeights.tip=Élever les poids +tutti.editCatchBatch.action.exportCruiseForSumatra=Sumatra +tutti.editCatchBatch.action.exportCruiseForSumatra.mnemonic=u +tutti.editCatchBatch.action.exportCruiseForSumatra.tip=Exporter la campagne sélectionnée pour Sumatra tutti.editCatchBatch.action.saveCatchBatch=Enregistrer tutti.editCatchBatch.action.saveCatchBatch.mnemonic=S tutti.editCatchBatch.action.saveCatchBatch.tip=Enregistrer la capture +tutti.editCatchBatch.action.sendCruiseReport=Envoyer +tutti.editCatchBatch.action.sendCruiseReport.mnemonic=E +tutti.editCatchBatch.action.sendCruiseReport.tip=Envoyer le rapport de la campagne tutti.editCatchBatch.askCancelEditBeforeLeaving.cancelEditCatchBatch=La capture n'est pas valide et ne peut pas être enregistrée tutti.editCatchBatch.askSaveBeforeLeaving.saveCatchBatch=Des modifications sur la capture n'ont pas été enregistrées tutti.editCatchBatch.field.benthosTotalSampleSortedWeight=Poids VRAC trié