Author: kmorin Date: 2013-04-15 18:12:04 +0200 (Mon, 15 Apr 2013) New Revision: 781 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/781 Log: refs #1866 [CAPTURE] - Captures accidentelles refs #1867 [CAPTURE] - Observations individuelles 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/EditCatchesUIHandler.java trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties 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/operation/catches/EditCatchesUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.jaxx 2013-04-15 15:54:09 UTC (rev 780) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.jaxx 2013-04-15 16:12:04 UTC (rev 781) @@ -378,7 +378,7 @@ </JXTitledPanel--> </tab> - <tab id='accidentalTab' title='tutti.label.tab.accidentel'> + <tab id='accidentalTab'> <JPanel id='accidentalTabPanel'> <JXTitledPanel id='accidentalTabFishingOperationReminderLabel' constraints='EditCatchesUIHandler.MAIN_CARD'> @@ -392,8 +392,7 @@ </JXTitledPanel> </JPanel> </tab> - <tab id='individualObservationTab' - title='tutti.label.tab.individualObservation'> + <tab id='individualObservationTab'> <JPanel id='individualObservationTabPanel'> <JXTitledPanel id='individualObservationTabFishingOperationReminderLabel' Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java 2013-04-15 15:54:09 UTC (rev 780) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java 2013-04-15 16:12:04 UTC (rev 781) @@ -121,6 +121,8 @@ setCustomTab(1, ui.getSpeciesTabContent().getModel()); setCustomTab(2, ui.getBenthosTabContent().getModel()); setCustomTab(3, ui.getMarineLitterTabContent().getModel()); + setCustomTab(4, ui.getAccidentalTabContent().getModel()); + setCustomTab(5, ui.getIndividualObservationTabContent().getModel()); } Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties =================================================================== --- trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties 2013-04-15 15:54:09 UTC (rev 780) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties 2013-04-15 16:12:04 UTC (rev 781) @@ -1053,6 +1053,9 @@ tutti.selectCruise.action.validateCatches= tutti.selectCruise.action.validateCatches.mnemonic= tutti.selectCruise.action.validateCatches.tip= +tutti.selectCruise.action.validateCruise= +tutti.selectCruise.action.validateCruise.mnemonic= +tutti.selectCruise.action.validateCruise.tip= tutti.selectCruise.field.cruise= tutti.selectCruise.field.cruise.tip= tutti.selectCruise.field.program= 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-04-15 15:54:09 UTC (rev 780) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-04-15 16:12:04 UTC (rev 781) @@ -870,12 +870,12 @@ tutti.importPupitri.trunkFile.extension.description=Fichier du trémie (.tnk) tutti.label.catches.planktonTotalSampleWeight=Poids total échantillonné tutti.label.catches.planktonTotalWeight=Poids total -tutti.label.tab.accidentel=Captures accidentelles +tutti.label.tab.accidental=Captures accidentelles tutti.label.tab.benthos=Benthos tutti.label.tab.catches=Captures tutti.label.tab.catchesCaracteristics=Résumé tutti.label.tab.fishingOperation=Trait -tutti.label.tab.individualObservation=Observations individuelles +tutti.label.tab.individualObservations=Observations individuelles tutti.label.tab.marineLitter=Macro déchets tutti.label.tab.plancton=Plancton tutti.label.tab.species=Espèces @@ -1051,6 +1051,9 @@ tutti.selectCruise.action.validateCatches=Valider les captures tutti.selectCruise.action.validateCatches.mnemonic=V tutti.selectCruise.action.validateCatches.tip=Valider les captures +tutti.selectCruise.action.validateCruise=Valider la campagne +tutti.selectCruise.action.validateCruise.mnemonic=d +tutti.selectCruise.action.validateCruise.tip=Valider la campagne tutti.selectCruise.field.cruise=Campagne tutti.selectCruise.field.cruise.tip= tutti.selectCruise.field.program=Série de campagne