Author: kmorin Date: 2013-03-29 11:51:23 +0100 (Fri, 29 Mar 2013) New Revision: 711 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/711 Log: refs #1987 [PROTOCOLE] - Gestion dex contr?\195?\180les/infos obligatoires en validation use the font style for JLabels instead of html text for performance reason 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/EditFishingOperationUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java 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/util/AbstractTuttiUIHandler.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-03-29 00:30:05 UTC (rev 710) +++ trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-en.properties 2013-03-29 10:51:23 UTC (rev 711) @@ -1,5 +1,5 @@ #Generated by org.nuiton.jaxx.plugin.GenerateHelpIdsMojo -#Tue Mar 26 18:46:47 CET 2013 +#Fri Mar 29 10:09:57 CET 2013 tutti.createBenthosBatch.action.addSpecies.help=createBenthosBatch.html\#actions tutti.createBenthosBatch.action.cancel.help=createBenthosBatch.html\#actions tutti.createBenthosBatch.action.save.help=createBenthosBatch.html\#actions @@ -61,6 +61,7 @@ tutti.editCatchBatch.field.catchTotalSortedWeight.help=editCatchBatch.html\#fields tutti.editCatchBatch.field.catchTotalUnsortedWeight.help=editCatchBatch.html\#fields tutti.editCatchBatch.field.catchTotalWeight.help=editCatchBatch.html\#fields +tutti.editCatchBatch.field.macroWasteTotalWeight.help= tutti.editCatchBatch.field.marineLitterTotalWeight.help=editCatchBatch.html\#fields tutti.editCatchBatch.field.speciesTotalSampleSortedWeight.help=editCatchBatch.html\#fields tutti.editCatchBatch.field.speciesTotalSortedWeight.help=editCatchBatch.html\#fields @@ -239,5 +240,6 @@ tutti.splitSpeciesBatch.help=splitSpeciesBatch.html tuttihelp.config.help=config.help tuttihelp.editAccidentalBatch.help=editAccidentalBatch.html +tuttihelp.editMacroWasteBatch.help= tuttihelp.editMarineLitterBatch.help=editMarineLitterBatch.html tuttihelp.editPlanktonBatch.help=editPlanktonBatch.html 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-03-29 00:30:05 UTC (rev 710) +++ trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties 2013-03-29 10:51:23 UTC (rev 711) @@ -1,5 +1,5 @@ #Generated by org.nuiton.jaxx.plugin.GenerateHelpIdsMojo -#Tue Mar 26 18:46:47 CET 2013 +#Fri Mar 29 10:09:57 CET 2013 tutti.createBenthosBatch.action.addSpecies.help=createBenthosBatch.html\#actions tutti.createBenthosBatch.action.cancel.help=createBenthosBatch.html\#actions tutti.createBenthosBatch.action.save.help=createBenthosBatch.html\#actions @@ -70,6 +70,7 @@ tutti.editCatchBatch.field.catchTotalSortedWeight.help=editCatchBatch.html\#fields tutti.editCatchBatch.field.catchTotalUnsortedWeight.help=editCatchBatch.html\#fields tutti.editCatchBatch.field.catchTotalWeight.help=editCatchBatch.html\#fields +tutti.editCatchBatch.field.macroWasteTotalWeight.help= tutti.editCatchBatch.field.marineLitterTotalWeight.help=editCatchBatch.html\#fields tutti.editCatchBatch.field.speciesTotalSampleSortedWeight.help=editCatchBatch.html\#fields tutti.editCatchBatch.field.speciesTotalSortedWeight.help=editCatchBatch.html\#fields @@ -248,5 +249,6 @@ tutti.splitSpeciesBatch.help=splitSpeciesBatch.html tuttihelp.config.help=config.help tuttihelp.editAccidentalBatch.help=editAccidentalBatch.html +tuttihelp.editMacroWasteBatch.help= tuttihelp.editMarineLitterBatch.help=editMarineLitterBatch.html tuttihelp.editPlanktonBatch.help=editPlanktonBatch.html Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.css 2013-03-29 00:30:05 UTC (rev 710) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.css 2013-03-29 10:51:23 UTC (rev 711) @@ -205,6 +205,7 @@ #vesselField { text: {handler.decorateVessel(model.getVessel())}; + _strongStyle: true; } #gearLabel { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java 2013-03-29 00:30:05 UTC (rev 710) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java 2013-03-29 10:51:23 UTC (rev 711) @@ -643,13 +643,6 @@ } public String decorateVessel(Vessel vessel) { - String result; - if (vessel == null) { - result = ""; - } else { - result = "<html><strong>" + decorate(vessel) + - "</strong></html>"; - } - return result; + return decorate(vessel); } } 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 2013-03-29 00:30:05 UTC (rev 710) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java 2013-03-29 10:51:23 UTC (rev 711) @@ -34,9 +34,12 @@ import fr.ifremer.tutti.persistence.entities.data.SampleCategoryEnum; import fr.ifremer.tutti.persistence.entities.data.SpeciesBatch; import fr.ifremer.tutti.persistence.entities.data.SpeciesBatchFrequency; +import fr.ifremer.tutti.persistence.entities.protocol.SpeciesProtocol; +import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol; 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.ui.swing.TuttiUIContext; import fr.ifremer.tutti.ui.swing.content.operation.AbstractTuttiBatchTableUIHandler; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUIHandler; @@ -262,7 +265,30 @@ // a row is valid if species category is not empty and valid // then if any of none empty category is valid - boolean result = row.getSpecies() != null; + Species species = row.getSpecies(); + boolean result = species != null; + if (result) { + if (TuttiUIContext.VALIDATION_CONTEXT_VALIDATE.equals(getContext().getValidationContext())) { + TuttiProtocol protocol = getDataContext().getProtocol(); + if (protocol != null) { + List<SpeciesProtocol> speciesProtocols = protocol.getSpecies(); + for (SpeciesProtocol speciesProtocol : speciesProtocols) { + if (species.getReferenceTaxonId().equals( + speciesProtocol.getSpeciesReferenceTaxonId())) { + + // TODO kmorin 20130329 check with Vincent what are exactly the countIfNoFrequencyEnabled + // and weight properties + result = (!speciesProtocol.isSizeEnabled() || row.getSizeCategoryValue() != null) + && (!speciesProtocol.isSexEnabled() || row.getSexCategoryValue() != null) + && (!speciesProtocol.isMaturityEnabled() || row.getMaturityCategoryValue() != null) + && (!speciesProtocol.isAgeEnabled() || row.getAgeCategoryValue() != null) + && (!speciesProtocol.isCountIfNoFrequencyEnabled() || !CollectionUtils.isEmpty(row.getFrequency())); + } + } + } + } + } + return result; } @@ -859,7 +885,7 @@ SpeciesBatchRowModel row = tableModel.getEntry(rowIndex); int selectedRowCount = getTable().getSelectedRowCount(); - if (row.isValid()) { + if (row.getSpecies() != null) { // must have at least species filled in row // otherwise nothing can be done Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java 2013-03-29 00:30:05 UTC (rev 710) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java 2013-03-29 10:51:23 UTC (rev 711) @@ -424,17 +424,15 @@ protected void initLabel(JLabel jLabel) { Boolean strongStyle = (Boolean) jLabel.getClientProperty("strongStyle"); Boolean italicStyle = (Boolean) jLabel.getClientProperty("italicStyle"); - boolean addHtml = strongStyle != null && strongStyle || italicStyle != null && italicStyle; - if (addHtml) { - String text = jLabel.getText(); - if (strongStyle != null && strongStyle) { - text = "<strong>" + text + "</strong>"; - } - if (italicStyle != null && italicStyle) { - text = "<em>" + text + "</em>"; - } - jLabel.setText("<html>" + text + "</html>"); + Font font = jLabel.getFont(); + int style = font.getStyle(); + if (strongStyle != null && strongStyle) { + style |= Font.BOLD; } + if (italicStyle != null && italicStyle) { + style |= Font.ITALIC; + } + jLabel.setFont(font.deriveFont(style)); } protected void initButtonAttachment(ButtonAttachment component) {