Author: tchemit Date: 2012-12-27 07:39:32 +0100 (Thu, 27 Dec 2012) New Revision: 108 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/108 Log: fixes #1902: [Onglet Poisson] Ajout de la caract?\195?\169ristique du type de mesure Modified: trunk/tutti-persistence-dev/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceDevFixtures.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesFrequencyUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesFrequencyUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesFrequencyUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesFrequencyUIModel.java trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties Modified: trunk/tutti-persistence-dev/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceDevFixtures.java =================================================================== --- trunk/tutti-persistence-dev/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceDevFixtures.java 2012-12-21 21:48:13 UTC (rev 107) +++ trunk/tutti-persistence-dev/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceDevFixtures.java 2012-12-27 06:39:32 UTC (rev 108) @@ -37,7 +37,6 @@ import fr.ifremer.tutti.persistence.entities.referential.Vessel; import fr.ifremer.tutti.persistence.entities.referential.Zone; -import java.util.ArrayList; import java.util.List; import java.util.UUID; @@ -303,7 +302,23 @@ createNumberCaracteristic("Average Bottom Salinity", CaracteristicEnum.FishingOperationHydrologic.name()); + createNumberCaracteristic("Mesure au cm par un observateur (carapace)", + CaracteristicEnum.SpeciesFrequency.name()); + createNumberCaracteristic("Mesure au cm par un observateur (totale)", + CaracteristicEnum.SpeciesFrequency.name()); + + createNumberCaracteristic("Mesure au cm par un observateur (céphalothorax)", + CaracteristicEnum.SpeciesFrequency.name()); + createNumberCaracteristic("Mesure au 1/2 cm par un observateur (totale)", + CaracteristicEnum.SpeciesFrequency.name()); + createNumberCaracteristic("Mesure au 1/100 mm par un observateur (queue de langoustine)", + CaracteristicEnum.SpeciesFrequency.name()); + createNumberCaracteristic("Mesure au 1/2 cm par un observateur (manteau)", + CaracteristicEnum.SpeciesFrequency.name()); + createNumberCaracteristic("Mesure au cm par un observateur (manteau)", + CaracteristicEnum.SpeciesFrequency.name()); + Species sp; sp = new Species(); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUI.jaxx 2012-12-21 21:48:13 UTC (rev 107) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUI.jaxx 2012-12-27 06:39:32 UTC (rev 108) @@ -77,8 +77,7 @@ component='speciesTotalUnsortedWeightField'/> </BeanValidator> - <SpeciesFrequencyUI id='frequencyEditor' - constructorParams='handler.getContext()'/> + <SpeciesFrequencyUI id='frequencyEditor' constructorParams='this'/> <LongTextEditorUI id='longTextEditor'/> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java 2012-12-21 21:48:13 UTC (rev 107) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java 2012-12-27 06:39:32 UTC (rev 108) @@ -36,6 +36,7 @@ import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativeValue; import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.service.DecoratorService; +import fr.ifremer.tutti.service.PersistenceService; import fr.ifremer.tutti.ui.swing.TuttiUI; import fr.ifremer.tutti.ui.swing.content.operation.AbstractTuttiBatchTableUIHandler; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUIModel; @@ -422,7 +423,7 @@ showInformationMessage( "[ Captures - Espèces ] " + - "Sauvegarde des modifications de " + decorate(bean) + + "Sauvegarde des modifications de " + bean + "."); saveRow(bean); @@ -462,6 +463,8 @@ SpeciesBatch catchBean = row.toBean(); FishingOperation fishingOperation = getModel().getFishingOperation(); + Preconditions.checkNotNull(fishingOperation); + catchBean.setFishingOperation(fishingOperation); if (log.isInfoEnabled()) { log.info("Selected fishingOperation: " + fishingOperation.getId()); @@ -540,6 +543,8 @@ //-- AbstractTuttiUIHandler methods --// //------------------------------------------------------------------------// + public static final String SPECIES_FREQUENCY_LENGHTS = "SPECIES_FREQUENCY_LENGHTS"; + @Override public void beforeInitUI() { @@ -552,6 +557,12 @@ SpeciesBatchUIModel model = new SpeciesBatchUIModel(catchesUIModel); ui.setContextValue(model); + + PersistenceService service = + context.getService(PersistenceService.class); + List<Caracteristic> lengthCaracterics = + service.getAllSpeciesFrequencyCaracteristic(); + ui.setContextValue(lengthCaracterics, SPECIES_FREQUENCY_LENGHTS); } @Override Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesFrequencyUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesFrequencyUI.css 2012-12-21 21:48:13 UTC (rev 107) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesFrequencyUI.css 2012-12-27 06:39:32 UTC (rev 108) @@ -22,6 +22,12 @@ * #L% */ +BeanComboBox { + showReset: true; + i18nPrefix: "tutti.property."; + bean: {model}; +} + NumberEditor { autoPopup: {handler.getConfig().isAutoPopupNumberEditor()}; showPopupButton: {handler.getConfig().isShowNumberEditorButton()}; @@ -40,6 +46,16 @@ bean: {model}; } +#lenghtStepCaracteristicLabel { + text: "tutti.label.frequencyConfiguration.lengthStepCaracteristic"; + labelFor: {lenghtStepCaracteristicComboBox}; +} + +#lenghtStepCaracteristicComboBox { + property: "lengthStepCaracteristic"; + selectedItem: {model.getLengthStepCaracteristic()}; +} + #minStepLabel { text: "tutti.label.frequencyConfiguration.minStep"; labelFor: {minStepField}; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesFrequencyUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesFrequencyUI.jaxx 2012-12-21 21:48:13 UTC (rev 107) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesFrequencyUI.jaxx 2012-12-27 06:39:32 UTC (rev 108) @@ -25,6 +25,8 @@ implements='fr.ifremer.tutti.ui.swing.TuttiUI<SpeciesFrequencyUIModel, SpeciesFrequencyUIHandler>'> <import> + fr.ifremer.tutti.persistence.entities.referential.Caracteristic + fr.ifremer.tutti.ui.swing.TuttiUIContext fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchRowModel @@ -46,8 +48,9 @@ <script><![CDATA[ - public SpeciesFrequencyUI(TuttiUIContext context) { - SpeciesFrequencyUIHandler handler = new SpeciesFrequencyUIHandler(context, this); + public SpeciesFrequencyUI(SpeciesBatchUI parentUI) { + JAXXUtil.initContext(this, parentUI); + SpeciesFrequencyUIHandler handler = new SpeciesFrequencyUIHandler(parentUI.getHandler().getContext(), this); setContextValue(handler); handler.beforeInitUI(); } @@ -70,7 +73,8 @@ <CardLayout2Ext id='modeConfigurationLayout' constructorParams='this, "modeConfigurationPanel"'/> - <JPanel id='configurationPanel' layout='{new BorderLayout()}' constraints='BorderLayout.NORTH'> + <JPanel id='configurationPanel' layout='{new BorderLayout()}' + constraints='BorderLayout.NORTH'> <JPanel layout='{new BorderLayout()}' constraints='BorderLayout.CENTER'> <VBox id='modePanel' constraints='BorderLayout.WEST' @@ -142,6 +146,17 @@ <JSeparator/> </cell> </row> + <!-- length step caracteristic --> + <row> + <cell anchor='west'> + <JLabel id='lenghtStepCaracteristicLabel'/> + </cell> + <cell weightx='1.0'> + <BeanComboBox id='lenghtStepCaracteristicComboBox' + constructorParams='this' + genericType='Caracteristic'/> + </cell> + </row> <!-- Step --> <row> <cell anchor='west'> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesFrequencyUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesFrequencyUIHandler.java 2012-12-21 21:48:13 UTC (rev 107) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesFrequencyUIHandler.java 2012-12-27 06:39:32 UTC (rev 108) @@ -24,7 +24,9 @@ * #L% */ +import com.ezware.oxbow.swingbits.util.Preconditions; import com.google.common.collect.Lists; +import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.ui.swing.TuttiUI; import fr.ifremer.tutti.ui.swing.TuttiUIContext; import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; @@ -163,13 +165,23 @@ initUI(ui); + List<Caracteristic> lengthStepCaracterics = + ui.getContextValue( + List.class, + SpeciesBatchUIHandler.SPECIES_FREQUENCY_LENGHTS); + Preconditions.checkNotNull(lengthStepCaracterics); + + SpeciesFrequencyUIModel model = getModel(); + + initBeanComboBox(ui.getLenghtStepCaracteristicComboBox(), + lengthStepCaracterics, + model.getLengthStepCaracteristic()); + JXTable table = getTable(); // create table column model TableColumnModel columnModel = createTableColumnModel(); - SpeciesFrequencyUIModel model = getModel(); - // create table model SpeciesFrequencyTableModel tableModel = new SpeciesFrequencyTableModel(columnModel, model); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesFrequencyUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesFrequencyUIModel.java 2012-12-21 21:48:13 UTC (rev 107) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesFrequencyUIModel.java 2012-12-27 06:39:32 UTC (rev 108) @@ -24,6 +24,7 @@ * #L% */ +import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.ui.swing.util.table.AbstractTuttiTableUIModel; /** @@ -50,6 +51,8 @@ public static final String PROPERTY_RAFALE_MODE = "rafaleMode"; + public static final String PROPERTY_LENGHT_STEP_CARACTERISTIC = "lengthStepCaracteristic"; + public static enum ConfigurationMode { SIMPLE, AUTO_GEN, @@ -91,6 +94,8 @@ */ protected Float maxStep; + protected Caracteristic lengthStepCaracteristic; + public SpeciesFrequencyUIModel() { super(SpeciesBatchRowModel.class, null, null); } @@ -118,6 +123,16 @@ firePropertyChange(PROPERTY_STEP, oldValue, step); } + public Caracteristic getLengthStepCaracteristic() { + return lengthStepCaracteristic; + } + + public void setLengthStepCaracteristic(Caracteristic lengthStepCaracteristic) { + Object oldValue = getLengthStepCaracteristic(); + this.lengthStepCaracteristic = lengthStepCaracteristic; + firePropertyChange(PROPERTY_LENGHT_STEP_CARACTERISTIC, oldValue, lengthStepCaracteristic); + } + public Float getMinStep() { return minStep; } 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 2012-12-21 21:48:13 UTC (rev 107) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2012-12-27 06:39:32 UTC (rev 108) @@ -111,6 +111,7 @@ tutti.label.fishingOperation.subStrata=Sous strate tutti.label.fishingOperation.systemeFermetureCul=Système de fermeture de cul tutti.label.fishingOperation.windDirection=Direction du vent +tutti.label.frequencyConfiguration.lengthStepCaracteristic=Type de mesure tutti.label.frequencyConfiguration.maxStep=Classe max tutti.label.frequencyConfiguration.minStep=Classe min tutti.label.frequencyConfiguration.mode.autoGen=Génération des classes