This is an automated email from the git hooks/post-receive script. New commit to branch feature/8404 in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 63eb6c05c52a3fd8f43f7c44b65adad9a8b2da79 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Nov 5 15:29:23 2016 +0100 Ajout LengthLengthParameter et revue de LWParameter (persistence) --- .../DataSourceMigrationForVersion_5_1.java | 1 + .../V5_1_18_evol_8404_lengthLengthParameter-H2.sql | 14 + .../V5_1_18_evol_8404_lengthLengthParameter-PG.sql | 14 + .../java/fr/ird/observe/entities/Entities.java | 1 + .../AbstractObserveMigrationCallBack.java | 2 +- .../entities/referentiel/FormulaHelper.java | 169 +++++++++++ .../entities/referentiel/FormulaSupportImpl.java | 88 ++++++ .../referentiel/LengthLengthParameterImpl.java | 55 ++++ .../referentiel/LengthLengthParameters.java | 12 + .../referentiel/LengthWeightParameterImpl.java | 110 +------ .../referentiel/LengthWeightParameters.java | 199 +----------- .../referentiel/LengthWeightParemeterHelper.java | 332 --------------------- entities/src/main/xmi/observe-common.zargo | Bin 42084 -> 45678 bytes entities/src/main/xmi/observe-seine.zargo | Bin 86910 -> 87124 bytes entities/src/main/xmi/observe.ini | 9 +- .../entities/referentiel/FormulaHelperTest.java | 27 ++ .../LengthWeightParemeterHelperTest.java | 48 --- 17 files changed, 414 insertions(+), 667 deletions(-) diff --git a/entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_5_1.java b/entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_5_1.java index 4b2ce80..683af4d 100644 --- a/entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_5_1.java +++ b/entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_5_1.java @@ -83,6 +83,7 @@ public class DataSourceMigrationForVersion_5_1 extends AbstractObserveMigrationC addScript("15", "evol_8578_nonTargetLength_add_speciesFate", queries); addScript("16", "evol_8377_speciesFate_add_discard", queries); addScript("17", "evol_8376_vesselActivitySeine_add_allowFad", queries); + addScript("18", "evol_8404_lengthLengthParameter", queries); } private void evol8391(TopiaSqlSupport topiaSqlSupport, List<String> queries) { diff --git a/entities-migration/src/main/resources/db/migration/5.1/V5_1_18_evol_8404_lengthLengthParameter-H2.sql b/entities-migration/src/main/resources/db/migration/5.1/V5_1_18_evol_8404_lengthLengthParameter-H2.sql new file mode 100644 index 0000000..0f7a390 --- /dev/null +++ b/entities-migration/src/main/resources/db/migration/5.1/V5_1_18_evol_8404_lengthLengthParameter-H2.sql @@ -0,0 +1,14 @@ +ALTER TABLE observe_seine.nontargetlength ADD COLUMN sizeMeasureType VARCHAR(255); +ALTER TABLE observe_seine.nontargetlength ADD CONSTRAINT FK_NON_TARGET_LENGTH_SIZE_MEASURE_TYPE FOREIGN KEY(sizeMeasureType) REFERENCES OBSERVE_COMMON.sizemeasuretype(topiaid); + +ALTER TABLE observe_common.lengthweightparameter ADD COLUMN sizeMeasureType VARCHAR(255); +ALTER TABLE observe_common.lengthweightparameter ADD CONSTRAINT FK_LENGTH_WEIGHT_PARAMETER_SIZE_MEASURE_TYPE FOREIGN KEY(sizeMeasureType) REFERENCES OBSERVE_COMMON.sizemeasuretype(topiaid); +UPDATE observe_common.lengthweightparameter SET sizeMeasureType = ( SELECT sizeMeasureType FROM observe_common.species s WHERE s.topiaId = species); + +CREATE TABLE observe_common.lengthlengthparameter ( topiaid VARCHAR(255) PRIMARY KEY NOT NULL, topiaversion BIGINT NOT NULL, inputSizeMeasureType VARCHAR(255) NOT NULL, outputSizeMeasureType VARCHAR(255) NOT NULL, topiacreatedate TIMESTAMP, uri VARCHAR(255), status INTEGER DEFAULT 1, coefficients VARCHAR(255), inputOutputFormula VARCHAR(255), outputInputFormula VARCHAR(255), code VARCHAR(255) DEFAULT 0, needcomment BOOLEAN DEFAULT false, lastupdatedate TIMESTAMP DEFAULT CURRENT_TIMESTAMP [...] +ALTER TABLE observe_common.lengthlengthparameter ADD CONSTRAINT fk_lengthlengthparameter_inputSizeMeasureType FOREIGN KEY (inputSizeMeasureType) REFERENCES observe_common.sizeMeasureType (topiaid); +ALTER TABLE observe_common.lengthlengthparameter ADD CONSTRAINT fk_lengthlengthparameter_outputSizeMeasureType FOREIGN KEY (outputSizeMeasureType) REFERENCES observe_common.sizeMeasureType (topiaid); + +CREATE INDEX index_observe_common_lengthlengthparameter_lastupdatedate ON observe_common.lengthlengthparameter (lastupdatedate); + +INSERT INTO observe_common.LASTUPDATEDATE (topiaId, topiaversion, topiacreatedate, TYPE , LASTUPDATEDATE) values ('fr.ird.observe.entities.referentiel.LastUpdateDate#666#2', 0,CURRENT_DATE, 'fr.ird.observe.entities.referentiel.LengthLengthParameter', CURRENT_TIMESTAMP); diff --git a/entities-migration/src/main/resources/db/migration/5.1/V5_1_18_evol_8404_lengthLengthParameter-PG.sql b/entities-migration/src/main/resources/db/migration/5.1/V5_1_18_evol_8404_lengthLengthParameter-PG.sql new file mode 100644 index 0000000..54f8d18 --- /dev/null +++ b/entities-migration/src/main/resources/db/migration/5.1/V5_1_18_evol_8404_lengthLengthParameter-PG.sql @@ -0,0 +1,14 @@ +ALTER TABLE observe_seine.nontargetlength ADD COLUMN sizeMeasureType character varying(255); +ALTER TABLE observe_seine.nontargetlength ADD CONSTRAINT FK_NON_TARGET_LENGTH_SIZE_MEASURE_TYPE FOREIGN KEY(sizeMeasureType) REFERENCES OBSERVE_COMMON.sizemeasuretype(topiaid); + +ALTER TABLE observe_common.lengthweightparameter ADD COLUMN sizeMeasureType character varying(255); +ALTER TABLE observe_common.lengthweightparameter ADD CONSTRAINT FK_LENGTH_WEIGHT_PARAMETER_SIZE_MEASURE_TYPE FOREIGN KEY(sizeMeasureType) REFERENCES OBSERVE_COMMON.sizemeasuretype(topiaid); +UPDATE observe_common.lengthweightparameter SET sizeMeasureType = ( SELECT sizeMeasureType FROM observe_common.species s WHERE s.topiaId = species); + +CREATE TABLE observe_common.lengthlengthparameter ( topiaid character varying(255) PRIMARY KEY NOT NULL, topiaversion BIGINT NOT NULL, inputSizeMeasureType character varying(255) NOT NULL, outputSizeMeasureType character varying(255) NOT NULL, topiacreatedate TIMESTAMP, uri character varying(255), status INTEGER DEFAULT 1, coefficients character varying(255), inputOutputFormula character varying(255), outputInputFormula character varying(255), code character varying(255) DEFAULT 0, needc [...] +ALTER TABLE observe_common.lengthlengthparameter ADD CONSTRAINT fk_lengthlengthparameter_inputSizeMeasureType FOREIGN KEY (inputSizeMeasureType) REFERENCES observe_common.sizeMeasureType (topiaid); +ALTER TABLE observe_common.lengthlengthparameter ADD CONSTRAINT fk_lengthlengthparameter_outputSizeMeasureType FOREIGN KEY (outputSizeMeasureType) REFERENCES observe_common.sizeMeasureType (topiaid); + +CREATE INDEX index_observe_common_lengthlengthparameter_lastupdatedate ON lengthlengthparameter (lastupdatedate); + +INSERT INTO observe_common.LASTUPDATEDATE (topiaId, topiaversion, topiacreatedate, TYPE , LASTUPDATEDATE) values ('fr.ird.observe.entities.referentiel.LastUpdateDate#666#2', 0,CURRENT_DATE, 'fr.ird.observe.entities.referentiel.LengthLengthParameter', CURRENT_TIMESTAMP); diff --git a/entities/src/main/java/fr/ird/observe/entities/Entities.java b/entities/src/main/java/fr/ird/observe/entities/Entities.java index bf66220..33f3682 100644 --- a/entities/src/main/java/fr/ird/observe/entities/Entities.java +++ b/entities/src/main/java/fr/ird/observe/entities/Entities.java @@ -65,6 +65,7 @@ public class Entities { ObserveEntityEnum.SpeciesList, ObserveEntityEnum.Person, ObserveEntityEnum.Organism, + ObserveEntityEnum.LengthLengthParameter, ObserveEntityEnum.LengthWeightParameter, ObserveEntityEnum.Program, ObserveEntityEnum.GearCaracteristicType, diff --git a/entities/src/main/java/fr/ird/observe/entities/migration/AbstractObserveMigrationCallBack.java b/entities/src/main/java/fr/ird/observe/entities/migration/AbstractObserveMigrationCallBack.java index 7dfdcfa..f5838ab 100644 --- a/entities/src/main/java/fr/ird/observe/entities/migration/AbstractObserveMigrationCallBack.java +++ b/entities/src/main/java/fr/ird/observe/entities/migration/AbstractObserveMigrationCallBack.java @@ -92,7 +92,7 @@ public abstract class AbstractObserveMigrationCallBack extends TopiaMigrationCal String migrationScript = prefix + "-" + scriptSuffix + ".sql"; String scriptPath = "/db/migration/"; if (getClass().getName().contains(".old.")) { - scriptPath += "/old/"; + scriptPath += "old/"; } scriptPath += this.version + "/V" + version.getValidName() + "_" + rank + "_" + migrationScript; diff --git a/entities/src/main/java/fr/ird/observe/entities/referentiel/FormulaHelper.java b/entities/src/main/java/fr/ird/observe/entities/referentiel/FormulaHelper.java new file mode 100644 index 0000000..10ea378 --- /dev/null +++ b/entities/src/main/java/fr/ird/observe/entities/referentiel/FormulaHelper.java @@ -0,0 +1,169 @@ +package fr.ird.observe.entities.referentiel; + +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.util.NumberUtil; + +import javax.script.Bindings; +import javax.script.ScriptContext; +import javax.script.ScriptEngine; +import javax.script.ScriptEngineManager; +import javax.script.ScriptException; +import java.util.Map; +import java.util.TreeMap; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +/** + * Created on 05/11/16. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 5.1 + */ +public class FormulaHelper { + + /** Logger */ + private static final Log log = LogFactory.getLog(FormulaHelper.class); + + private static final Pattern COEFFICIENTS_PATTERN = Pattern.compile("(.+)=(.+)"); + + /** variable weight à utiliser dans la relation taille */ + public static final String VARIABLE_WEIGHT = "P"; + + /** variable taille à utiliser dans la relation weight */ + public static final String VARIABLE_LENGTH = "L"; + + public static final String VARIABLE_INPUT = "I"; + + public static final String VARIABLE_OUTPUT = "O"; + + public static final String COEFFICIENT_A = "a"; + + public static final String COEFFICIENT_B = "b"; + + /** moteur d'évaluation d'expression */ + protected static ScriptEngine scriptEngine; + + + protected static ScriptEngine getScriptEngine() { + if (scriptEngine == null) { + ScriptEngineManager factory = new ScriptEngineManager(); + + scriptEngine = factory.getEngineByExtension("js"); + } + return scriptEngine; + } + + public static Map<String, Double> getCoefficientValues(FormulaSupport parametrage) { + + Map<String, Double> result = new TreeMap<>(); + String coefficients = parametrage.getCoefficients(); + if (coefficients != null) { + for (String coefficientDef : coefficients.split(":")) { + Matcher matcher = COEFFICIENTS_PATTERN.matcher(coefficientDef.trim()); + if (log.isDebugEnabled()) { + log.debug("constant to test = " + coefficientDef); + } + if (matcher.matches()) { + + String key = matcher.group(1); + String val = matcher.group(2); + try { + Double d = Double.valueOf(val); + result.put(key, d); + if (log.isDebugEnabled()) { + log.debug("detects coefficient " + key + '=' + val); + } + } catch (NumberFormatException e) { + // pas pu recupere le count... + if (log.isWarnEnabled()) { + log.warn("could not parse double " + val + " for coefficient " + key); + } + } + } + } + } + return result; + } + + protected static boolean validateRelation(FormulaSupport parametrage, String relation, String variable) { + boolean result = false; + if (!StringUtils.isEmpty(relation)) { + + Map<String, Double> coeffs = parametrage.getCoefficientValues(); + + ScriptEngine engine = getScriptEngine(); + Bindings bindings = engine.createBindings(); + for (Map.Entry<String, Double> entry : coeffs.entrySet()) { + String key = entry.getKey(); + Double value = entry.getValue(); + bindings.put(key, value); + + if (log.isDebugEnabled()) { + log.debug("add constant " + key + '=' + value); + } + } + bindings.put(variable, 1); + + try { + engine.setBindings(bindings, ScriptContext.ENGINE_SCOPE); + Double o = (Double) engine.eval("parseFloat(" + relation + ")"); + if (log.isDebugEnabled()) { + log.debug("evaluation ok : " + relation + " (" + variable + "=1) = " + o); + } + result = true; + } catch (Exception e) { + if (log.isDebugEnabled()) { + log.debug("evalution ko : " + relation + ", reason : " + e.getMessage()); + } + } + } + return result; + } + + public static Float computeValue(FormulaSupport parametrage, String formula, String coefficientName, String variableName, float data) { + if (coefficientName!=null) { + Double b = parametrage.getCoefficientValue(coefficientName); + if (b == 0) { + + // ce cas limite ne permet pas de calculer la taille a partir du weight + return null; + } + } + Float o = computeValue(parametrage, formula, variableName, data); + + if (o != null) { + o = NumberUtil.roundOneDigit(o); + } + return o; + } + + private static Float computeValue(FormulaSupport parametrage, String relation, String variable, float taille) { + Map<String, Double> coeffs = parametrage.getCoefficientValues(); + ScriptEngine engine = getScriptEngine(); + Bindings bindings = engine.createBindings(); + for (Map.Entry<String, Double> entry : coeffs.entrySet()) { + String key = entry.getKey(); + Double value = entry.getValue(); + bindings.put(key, value); + + if (log.isDebugEnabled()) { + log.debug("add constant " + key + '=' + value); + } + } + bindings.put(variable, taille); + engine.setBindings(bindings, ScriptContext.ENGINE_SCOPE); + Double o = null; + try { + o = (Double) engine.eval("parseFloat(" + relation + ")"); + } catch (ScriptException e) { + if (log.isErrorEnabled()) { + log.error("Could not compute value from " + relation); + } + } + return o == null ? null : o.floatValue(); + } + + +} diff --git a/entities/src/main/java/fr/ird/observe/entities/referentiel/FormulaSupportImpl.java b/entities/src/main/java/fr/ird/observe/entities/referentiel/FormulaSupportImpl.java new file mode 100644 index 0000000..e724013 --- /dev/null +++ b/entities/src/main/java/fr/ird/observe/entities/referentiel/FormulaSupportImpl.java @@ -0,0 +1,88 @@ +package fr.ird.observe.entities.referentiel; + +import org.apache.commons.lang3.BooleanUtils; + +import java.util.Map; +import java.util.Set; + +/** + * Created on 05/11/16. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 5.1 + */ +public abstract class FormulaSupportImpl extends FormulaSupportAbstract { + + private static final long serialVersionUID = 1L; + + private Map<String, Double> coefficientValues; + private Boolean formulaOneValid; + private Boolean formulaTwoValid; + + @Override + public String getCode() { + // pas utilise + return null; + } + + @Override + public void setCode(String code) { + // pas utilise + } + + @Override + public void setCoefficients(String value) { + super.setCoefficients(value); + coefficientValues = null; + revalidateFormulaOne(); + revalidateFormulaTwo(); + } + + @Override + public Set<String> getCoefficientNames() { + return getCoefficientValues().keySet(); + } + + @Override + public Double getCoefficientValue(String coefficientName) { + return getCoefficientValues().get(coefficientName); + } + + @Override + public Map<String, Double> getCoefficientValues() { + if (coefficientValues == null) { + coefficientValues = FormulaHelper.getCoefficientValues(this); + } + return coefficientValues; + } + + + @Override + public boolean isFormulaOneValid() { + if (formulaOneValid == null) { + revalidateFormulaOne(); + } + return BooleanUtils.isTrue(formulaOneValid); + } + + @Override + public boolean isFormulaTwoValid() { + if (formulaTwoValid == null) { + revalidateFormulaTwo(); + } + return BooleanUtils.isTrue(formulaTwoValid); + } + + @Override + public void setFormulaOneValid(boolean formulaOneValid) { + this.formulaOneValid = formulaOneValid; + fireOnPostWrite(PROPERTY_FORMULA_ONE_VALID, null, formulaOneValid); + } + + @Override + public void setFormulaTwoValid(boolean formulaTwoValid) { + this.formulaTwoValid = formulaTwoValid; + fireOnPostWrite(PROPERTY_FORMULA_TWO_VALID, null, formulaTwoValid); + } + +} diff --git a/entities/src/main/java/fr/ird/observe/entities/referentiel/LengthLengthParameterImpl.java b/entities/src/main/java/fr/ird/observe/entities/referentiel/LengthLengthParameterImpl.java new file mode 100644 index 0000000..4be7a2f --- /dev/null +++ b/entities/src/main/java/fr/ird/observe/entities/referentiel/LengthLengthParameterImpl.java @@ -0,0 +1,55 @@ +package fr.ird.observe.entities.referentiel; + +/** + * Created on 05/11/16. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 5.1 + */ +public class LengthLengthParameterImpl extends LengthLengthParameterAbstract { + + @Override + public void setInputOutputFormula(String inputOutputFormula) { + super.setInputOutputFormula(inputOutputFormula); + revalidateFormulaOne(); + } + + @Override + public void setOutputInputFormula(String outputInputFormula) { + super.setOutputInputFormula(outputInputFormula); + revalidateFormulaTwo(); + } + + @Override + public Float computeFromFomulaOne(float data) { + return FormulaHelper.computeValue(this, inputOutputFormula, null, FormulaHelper.VARIABLE_INPUT, data); + } + + @Override + public Float computeFromFomulaTwo(float data) { + return FormulaHelper.computeValue(this, outputInputFormula, FormulaHelper.COEFFICIENT_B, FormulaHelper.VARIABLE_OUTPUT, data); + } + + @Override + public String getFormulaOne() { + return inputOutputFormula; + } + + @Override + public String getFormulaTwo() { + return outputInputFormula; + } + + @Override + public void revalidateFormulaOne() { + boolean result = FormulaHelper.validateRelation(this, inputOutputFormula, FormulaHelper.VARIABLE_INPUT); + setFormulaOneValid(result); + } + + @Override + public void revalidateFormulaTwo() { + boolean result = FormulaHelper.validateRelation(this, outputInputFormula, FormulaHelper.VARIABLE_OUTPUT); + setFormulaTwoValid(result); + } + +} diff --git a/entities/src/main/java/fr/ird/observe/entities/referentiel/LengthLengthParameters.java b/entities/src/main/java/fr/ird/observe/entities/referentiel/LengthLengthParameters.java new file mode 100644 index 0000000..d24f086 --- /dev/null +++ b/entities/src/main/java/fr/ird/observe/entities/referentiel/LengthLengthParameters.java @@ -0,0 +1,12 @@ +package fr.ird.observe.entities.referentiel; + +/** + * Created on 05/11/16. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 5.1 + */ +public class LengthLengthParameters { + + +} diff --git a/entities/src/main/java/fr/ird/observe/entities/referentiel/LengthWeightParameterImpl.java b/entities/src/main/java/fr/ird/observe/entities/referentiel/LengthWeightParameterImpl.java index 72ba143..8b1c687 100644 --- a/entities/src/main/java/fr/ird/observe/entities/referentiel/LengthWeightParameterImpl.java +++ b/entities/src/main/java/fr/ird/observe/entities/referentiel/LengthWeightParameterImpl.java @@ -21,127 +21,49 @@ */ package fr.ird.observe.entities.referentiel; -import java.util.Map; -import java.util.Set; - public class LengthWeightParameterImpl extends LengthWeightParameterAbstract { - private static final long serialVersionUID = 1L; - - protected Map<String, Double> coefficientValues; - - protected Boolean lengthWeightFormulaValid; - - protected Boolean weightLengthFormulaValid; - - //FIXME not generated with maven-release ? - public static final String PROPERTY_LENGTH_WEIGHT_FORMULA_VALID = "lengthWeightFormulaValid"; - - //FIXME not generated with maven-release ? - public static final String PROPERTY_WEIGHT_LENGTH_FORMULA_VALID = "weightLengthFormulaValid"; - - @Override - public String getCode() { - // pas utilise - return null; - } - - @Override - public void setCode(String code) { - // pas utilise - } - - @Override - public void setCoefficients(String value) { - super.setCoefficients(value); - coefficientValues = null; - revalidateRelationPoids(); - revalidateRelationTaille(); - } - - @Override - public Set<String> getCoefficientNames() { - return getCoefficientValues().keySet(); - } - - @Override - public Double getCoefficientValue(String coefficientName) { - return getCoefficientValues().get(coefficientName); - } - - @Override - public Map<String, Double> getCoefficientValues() { - if (coefficientValues == null) { - coefficientValues = - LengthWeightParemeterHelper.getCoefficientValues(this); - } - return coefficientValues; - } - @Override public void setLengthWeightFormula(String value) { super.setLengthWeightFormula(value); - revalidateRelationPoids(); + revalidateFormulaOne(); } @Override public void setWeightLengthFormula(String value) { super.setWeightLengthFormula(value); - revalidateRelationTaille(); + revalidateFormulaTwo(); } @Override - public boolean isLengthWeightFormulaValid() { - if (lengthWeightFormulaValid == null) { - revalidateRelationPoids(); - } - return lengthWeightFormulaValid != null && lengthWeightFormulaValid; + public void revalidateFormulaOne() { + boolean result = FormulaHelper.validateRelation(this, getLengthWeightFormula(), FormulaHelper.VARIABLE_LENGTH); + setFormulaOneValid(result); } @Override - public boolean isWeightLengthFormulaValid() { - if (weightLengthFormulaValid == null) { - revalidateRelationTaille(); - } - return weightLengthFormulaValid != null && weightLengthFormulaValid; + public void revalidateFormulaTwo() { + boolean result = FormulaHelper.validateRelation(this, getWeightLengthFormula(), FormulaHelper.VARIABLE_WEIGHT); + setFormulaTwoValid(result); } @Override - public void setLengthWeightFormulaValid(boolean lengthWeightFormulaValid) { - this.lengthWeightFormulaValid = lengthWeightFormulaValid; - fireOnPostWrite(PROPERTY_LENGTH_WEIGHT_FORMULA_VALID, null, lengthWeightFormulaValid); + public String getFormulaOne() { + return lengthWeightFormula; } @Override - public void setWeightLengthFormulaValid(boolean weightLengthFormulaValid) { - this.weightLengthFormulaValid = weightLengthFormulaValid; - fireOnPostWrite(PROPERTY_WEIGHT_LENGTH_FORMULA_VALID, null, weightLengthFormulaValid); + public String getFormulaTwo() { + return weightLengthFormula; } @Override - public Float computeWeight(float length) { - return LengthWeightParemeterHelper.computeWeight(this, length); + public Float computeFromFomulaOne(float data) { + return FormulaHelper.computeValue(this, lengthWeightFormula, null, FormulaHelper.VARIABLE_LENGTH, data); } @Override - public Float computeLength(float weight) { - return LengthWeightParemeterHelper.computeLength(this, weight); - } - - protected void revalidateRelationPoids() { - lengthWeightFormulaValid = null; - - // validate equation - boolean result = LengthWeightParemeterHelper.validateWeightRelation(this); - setLengthWeightFormulaValid(result); + public Float computeFromFomulaTwo(float data) { + return FormulaHelper.computeValue(this, weightLengthFormula, FormulaHelper.COEFFICIENT_B, FormulaHelper.VARIABLE_WEIGHT, data); } - - protected void revalidateRelationTaille() { - weightLengthFormulaValid = null; - - // validate equation - boolean result = LengthWeightParemeterHelper.validateLengthRelation(this); - setWeightLengthFormulaValid(result); - } - } diff --git a/entities/src/main/java/fr/ird/observe/entities/referentiel/LengthWeightParameters.java b/entities/src/main/java/fr/ird/observe/entities/referentiel/LengthWeightParameters.java index 0a83fee..a8c3c76 100644 --- a/entities/src/main/java/fr/ird/observe/entities/referentiel/LengthWeightParameters.java +++ b/entities/src/main/java/fr/ird/observe/entities/referentiel/LengthWeightParameters.java @@ -24,25 +24,12 @@ package fr.ird.observe.entities.referentiel; import fr.ird.observe.ObserveTopiaDaoSupplier; import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.lang3.StringUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.util.NumberUtil; - -import javax.script.Bindings; -import javax.script.ScriptContext; -import javax.script.ScriptEngine; -import javax.script.ScriptEngineManager; -import javax.script.ScriptException; + import java.util.ArrayList; import java.util.Date; import java.util.Iterator; import java.util.List; -import java.util.Map; import java.util.Objects; -import java.util.TreeMap; -import java.util.regex.Matcher; -import java.util.regex.Pattern; /** * Created on 28/08/15. @@ -51,33 +38,6 @@ import java.util.regex.Pattern; */ public class LengthWeightParameters { - /** Logger. */ - private static final Log log = LogFactory.getLog(LengthWeightParameters.class); - - private static final Pattern COEFFICIENTS_PATTERN = Pattern.compile("(.+)=(.+)"); - - /** moteur d'évaluation d'expression */ - protected static ScriptEngine scriptEngine; - - /** variable weight à utiliser dans la relation taille */ - public static final String VARIABLE_POIDS = "P"; - - /** variable taille à utiliser dans la relation weight */ - public static final String VARIABLE_TAILLE = "L"; - - private static final String COEFFICIENT_A = "a"; - - private static final String COEFFICIENT_B = "b"; - - protected static ScriptEngine getScriptEngine() { - if (scriptEngine == null) { - ScriptEngineManager factory = new ScriptEngineManager(); - - scriptEngine = factory.getEngineByExtension("js"); - } - return scriptEngine; - } - /** * Recherche d'un {@link LengthWeightParameter} à partir des paramètres donnés. * @@ -149,6 +109,7 @@ public class LengthWeightParameters { return list.get(0); } + /** * Recherche de la liste des {@link LengthWeightParameter} à partir des paramètres donnés. * @@ -237,90 +198,7 @@ public class LengthWeightParameters { return daoSupplier.getSexDao().forCodeEquals("0").findUnique(); } - public static Map<String, Double> getCoefficientValues(LengthWeightParameter parametrage) { - - Map<String, Double> result = new TreeMap<>(); - String coefficients = parametrage.getCoefficients(); - if (coefficients != null) { - for (String coefficientDef : coefficients.split(":")) { - Matcher matcher = COEFFICIENTS_PATTERN.matcher(coefficientDef.trim()); - if (log.isDebugEnabled()) { - log.debug("constant to test = " + coefficientDef); - } - if (matcher.matches()) { - - String key = matcher.group(1); - String val = matcher.group(2); - try { - Double d = Double.valueOf(val); - result.put(key, d); - if (log.isDebugEnabled()) { - log.debug("detects coefficient " + key + '=' + val); - } - } catch (NumberFormatException e) { - // pas pu recupere le count... - if (log.isWarnEnabled()) { - log.warn("could not parse dou" + COEFFICIENT_B + "le " + val + " for coefficient " + key); - } - } - } - } - } - return result; - } - - public static boolean validateWeightRelation(LengthWeightParameter parametrage) { - return validateRelation(parametrage, - parametrage.getLengthWeightFormula(), - VARIABLE_TAILLE - ); - } - - public static boolean validateLengthRelation(LengthWeightParameter parametrage) { - return validateRelation(parametrage, - parametrage.getWeightLengthFormula(), - VARIABLE_POIDS - ); - } - - public static Float computeLength(LengthWeightParameter parametrage, - float weight) { - Double b = parametrage.getCoefficientValue(COEFFICIENT_B); - if (b == 0) { - - // ce cas limite ne permet pas de calculer la taille a partir du weight - return null; - } - Float o = computeValue(parametrage, - parametrage.getWeightLengthFormula(), - VARIABLE_POIDS, - weight - ); - - if (o != null) { - o = NumberUtil.roundOneDigit(o); - } - return o; - } - - public static Float computeWeight(LengthWeightParameter parametrage, - float taille) { - - Float o = computeValue(parametrage, - parametrage.getLengthWeightFormula(), - VARIABLE_TAILLE, - taille - ); - - if (o != null) { - o = NumberUtil.roundTwoDigits(o); - } - return o; - } - - @SuppressWarnings({"unchecked"}) - public static List<LengthWeightParameter> findBySpecies(ObserveTopiaDaoSupplier daoSupplier, - Species species) { + public static List<LengthWeightParameter> findBySpecies(ObserveTopiaDaoSupplier daoSupplier, Species species) { LengthWeightParameterTopiaDao dao = daoSupplier.getLengthWeightParameterDao(); @@ -330,13 +208,13 @@ public class LengthWeightParameters { Iterator<LengthWeightParameter> itr = list.iterator(); while (itr.hasNext()) { LengthWeightParameter p = itr.next(); - Double a = p.getCoefficientValue(COEFFICIENT_A); + Double a = p.getCoefficientValue(FormulaHelper.COEFFICIENT_A); if (a == null || a == 0) { itr.remove(); continue; } - Double b = p.getCoefficientValue(COEFFICIENT_B); + Double b = p.getCoefficientValue(FormulaHelper.COEFFICIENT_B); // on autorise d'avoir b à 0 (mais cela ne permet plus de calculer la taille à partir du poids) // if (b == null || b == 0) { if (b == null) { @@ -384,7 +262,7 @@ public class LengthWeightParameters { for (LengthWeightParameter parametrageLengthWeight : list) { if (parametrageLengthWeight.getStartDate().before(startDate) || - parametrageLengthWeight.getStartDate().equals(startDate)) { + parametrageLengthWeight.getStartDate().equals(startDate)) { result.add(parametrageLengthWeight); } } @@ -412,8 +290,8 @@ public class LengthWeightParameters { Date date = parametrageLengthWeight.getEndDate(); if (date == null || - date.after(endDate) || - date.equals(endDate)) { + date.after(endDate) || + date.equals(endDate)) { result.add(parametrageLengthWeight); } } @@ -421,65 +299,4 @@ public class LengthWeightParameters { return result; } - protected static boolean validateRelation(LengthWeightParameter parametrage, String relation, String variable) { - boolean result = false; - if (!StringUtils.isEmpty(relation)) { - - Map<String, Double> coeffs = parametrage.getCoefficientValues(); - - ScriptEngine engine = getScriptEngine(); - Bindings bindings = engine.createBindings(); - for (Map.Entry<String, Double> entry : coeffs.entrySet()) { - String key = entry.getKey(); - Double value = entry.getValue(); - bindings.put(key, value); - - if (log.isDebugEnabled()) { - log.debug("add constant " + key + '=' + value); - } - } - bindings.put(variable, 1); - - try { - engine.setBindings(bindings, ScriptContext.ENGINE_SCOPE); - Double o = (Double) engine.eval("parseFloat(" + relation + ")"); - if (log.isDebugEnabled()) { - log.debug("evaluation ok : " + relation + " (" + variable + "=1) = " + o); - } - result = true; - } catch (Exception e) { - if (log.isDebugEnabled()) { - log.debug("evalution ko : " + relation + ", reason : " + e.getMessage()); - } - } - } - return result; - } - - public static Float computeValue(LengthWeightParameter parametrage, String relation, String variable, float taille) { - Map<String, Double> coeffs = parametrage.getCoefficientValues(); - ScriptEngine engine = getScriptEngine(); - Bindings bindings = engine.createBindings(); - for (Map.Entry<String, Double> entry : coeffs.entrySet()) { - String key = entry.getKey(); - Double value = entry.getValue(); - bindings.put(key, value); - - if (log.isDebugEnabled()) { - log.debug("add constant " + key + '=' + value); - } - } - bindings.put(variable, taille); - engine.setBindings(bindings, ScriptContext.ENGINE_SCOPE); - Double o = null; - try { - o = (Double) engine.eval("parseFloat(" + relation + ")"); - } catch (ScriptException e) { - if (log.isErrorEnabled()) { - log.error("Could not compute value from " + relation); - } - } - return o == null ? null : o.floatValue(); - } - } diff --git a/entities/src/main/java/fr/ird/observe/entities/referentiel/LengthWeightParemeterHelper.java b/entities/src/main/java/fr/ird/observe/entities/referentiel/LengthWeightParemeterHelper.java deleted file mode 100644 index 7460c18..0000000 --- a/entities/src/main/java/fr/ird/observe/entities/referentiel/LengthWeightParemeterHelper.java +++ /dev/null @@ -1,332 +0,0 @@ -/* - * #%L - * ObServe :: Entities - * %% - * Copyright (C) 2008 - 2016 IRD, Code Lutin, Tony Chemit - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ -package fr.ird.observe.entities.referentiel; - -import fr.ird.observe.ObserveTopiaPersistenceContext; -import org.apache.commons.lang3.StringUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.topia.persistence.TopiaDao; -import org.nuiton.util.NumberUtil; - -import javax.script.Bindings; -import javax.script.ScriptContext; -import javax.script.ScriptEngine; -import javax.script.ScriptEngineManager; -import javax.script.ScriptException; -import java.util.ArrayList; -import java.util.Date; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.TreeMap; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -/** - * Classe utilitaire pour les traitements communs des implantations de - * {@link LengthWeightParameter}. - * - * @author Tony Chemit - chemit@codelutin.com - * @since 1.5 - * @deprecated Utiliser à la place LengthWeightParemeters - */ -@Deprecated -public class LengthWeightParemeterHelper { - - private static final Pattern COEFFICIENTS_PATTERN = - Pattern.compile("(.+)=(.+)"); - - /** Logger */ - private static final Log log = - LogFactory.getLog(LengthWeightParemeterHelper.class); - - /** moteur d'évaluation d'expression */ - protected static ScriptEngine scriptEngine; - - /** variable weight à utiliser dans la relation taille */ - public static final String VARIABLE_POIDS = "P"; - - /** variable taille à utiliser dans la relation weight */ - public static final String VARIABLE_TAILLE = "L"; - - private static final String COEFFICIENT_A = "a"; - - private static final String COEFFICIENT_B = "b"; - - protected static ScriptEngine getScriptEngine() { - if (scriptEngine == null) { - ScriptEngineManager factory = new ScriptEngineManager(); - - scriptEngine = factory.getEngineByExtension("js"); - } - return scriptEngine; - } - - public static Map<String, Double> getCoefficientValues(LengthWeightParameter parametrage) { - - Map<String, Double> result = new TreeMap<>(); - String coefficients = parametrage.getCoefficients(); - if (coefficients != null) { - for (String coefficientDef : coefficients.split(":")) { - Matcher matcher = COEFFICIENTS_PATTERN.matcher(coefficientDef.trim()); - if (log.isDebugEnabled()) { - log.debug("constant to test = " + coefficientDef); - } - if (matcher.matches()) { - - String key = matcher.group(1); - String val = matcher.group(2); - try { - Double d = Double.valueOf(val); - result.put(key, d); - if (log.isDebugEnabled()) { - log.debug("detects coefficient " + key + '=' + val); - } - } catch (NumberFormatException e) { - // pas pu recupere le count... - if (log.isWarnEnabled()) { - log.warn("could not parse dou" + COEFFICIENT_B + "le " + val + " for coefficient " + key); - } - } - } - } - } - return result; - } - - public static boolean validateWeightRelation(LengthWeightParameter parametrage) { - return validateRelation(parametrage, - parametrage.getLengthWeightFormula(), - VARIABLE_TAILLE - ); - } - - public static boolean validateLengthRelation(LengthWeightParameter parametrage) { - return validateRelation(parametrage, - parametrage.getWeightLengthFormula(), - VARIABLE_POIDS - ); - } - - public static Float computeLength(LengthWeightParameter parametrage, - float weight) { - Double b = parametrage.getCoefficientValue(COEFFICIENT_B); - if (b == 0) { - - // ce cas limite ne permet pas de calculer la taille a partir du weight - return null; - } - Float o = computeValue(parametrage, - parametrage.getWeightLengthFormula(), - VARIABLE_POIDS, - weight - ); - - if (o != null) { - o = NumberUtil.roundOneDigit(o); - } - return o; - } - - public static Float computeWeight(LengthWeightParameter parametrage, - float taille) { - - Float o = computeValue(parametrage, - parametrage.getLengthWeightFormula(), - VARIABLE_TAILLE, - taille - ); - - if (o != null) { - o = NumberUtil.roundTwoDigits(o); - } - return o; - } - - @SuppressWarnings({"unchecked"}) - public static <P extends LengthWeightParameter> List<P> findBySpecies(ObserveTopiaPersistenceContext tx, - Species taillePoidsAble) { - - // le type de resultat recherche - Class<P> entityClass = (Class<P>) LengthWeightParameter.class; - - TopiaDao<P> dao = tx.getDao(entityClass); - - List<P> list = dao.forProperties(LengthWeightParameter.PROPERTY_SPECIES, taillePoidsAble).findAll(); - - // on supprime les paramétrages qui ont a=0 ou a=null ou b=0 ou b = null - Iterator<P> itr = list.iterator(); - while (itr.hasNext()) { - P p = itr.next(); - Double a = p.getCoefficientValue(COEFFICIENT_A); - if (a == null || a == 0) { - itr.remove(); - continue; - } - - Double b = p.getCoefficientValue(COEFFICIENT_B); - // on autorise d'avoir b à 0 (mais cela ne permet plus de calculer la taille à partir du poids) -// if (b == null || b == 0) { - if (b == null) { - itr.remove(); - } - } - return list; - - } - - public static <P extends LengthWeightParameter> List<P> filterByOcean(List<P> list, Ocean ocean) { - List<P> result = new ArrayList<>(); - if (ocean == null) { - - // on n'accepte que les parametrage sans ocean - for (P parametrageLengthWeight : list) { - if (parametrageLengthWeight.getOcean() == null) { - result.add(parametrageLengthWeight); - } - } - } else { - for (P parametrageLengthWeight : list) { - if (ocean.equals(parametrageLengthWeight.getOcean())) { - result.add(parametrageLengthWeight); - } - } - } - return result; - } - - public static <P extends LengthWeightParameter> List<P> filterBySexe(List<P> list, Sex sex) { - List<P> result = new ArrayList<>(); - - for (P parametrageLengthWeight : list) { - if (parametrageLengthWeight.getSex() == sex) { - result.add(parametrageLengthWeight); - } - } - return result; - } - - public static <P extends LengthWeightParameter> List<P> filterByDateDebutValidite(List<P> list, Date startDate) { - List<P> result = new ArrayList<>(); - - for (P parametrageLengthWeight : list) { - - if (parametrageLengthWeight.getStartDate().before(startDate) || - parametrageLengthWeight.getStartDate().equals(startDate)) { - result.add(parametrageLengthWeight); - } - } - return result; - } - - public static <P extends LengthWeightParameter> List<P> filterByDateFinValidite(List<P> list, Date endDate) { - List<P> result = new ArrayList<>(); - - if (endDate == null) { - // on n'accepte que les parametrages selon les critères suivants : - // - sans date de fin (i.e en cours de validite) - for (P parametrageLengthWeight : list) { - - Date date = parametrageLengthWeight.getEndDate(); - if (date == null) { - result.add(parametrageLengthWeight); - } - } - } else { - // on n'accepte que les parametrages selon les critères suivants : - // - sans date de fin (i.e en cours de validite) - // - ceux dont la date de fin est avant la date de fin donnée - for (P parametrageLengthWeight : list) { - - Date date = parametrageLengthWeight.getEndDate(); - if (date == null || - date.after(endDate) || - date.equals(endDate)) { - result.add(parametrageLengthWeight); - } - } - } - return result; - } - - protected static boolean validateRelation(LengthWeightParameter parametrage, String relation, String variable) { - boolean result = false; - if (!StringUtils.isEmpty(relation)) { - - Map<String, Double> coeffs = parametrage.getCoefficientValues(); - - ScriptEngine engine = getScriptEngine(); - Bindings bindings = engine.createBindings(); - for (Map.Entry<String, Double> entry : coeffs.entrySet()) { - String key = entry.getKey(); - Double value = entry.getValue(); - bindings.put(key, value); - - if (log.isDebugEnabled()) { - log.debug("add constant " + key + '=' + value); - } - } - bindings.put(variable, 1); - - try { - engine.setBindings(bindings, ScriptContext.ENGINE_SCOPE); - Double o = (Double) engine.eval("parseFloat(" + relation + ")"); - if (log.isDebugEnabled()) { - log.debug("evaluation ok : " + relation + " (" + variable + "=1) = " + o); - } - result = true; - } catch (Exception e) { - if (log.isDebugEnabled()) { - log.debug("evalution ko : " + relation + ", reason : " + e.getMessage()); - } - } - } - return result; - } - - public static Float computeValue(LengthWeightParameter parametrage, String relation, String variable, float taille) { - Map<String, Double> coeffs = parametrage.getCoefficientValues(); - ScriptEngine engine = getScriptEngine(); - Bindings bindings = engine.createBindings(); - for (Map.Entry<String, Double> entry : coeffs.entrySet()) { - String key = entry.getKey(); - Double value = entry.getValue(); - bindings.put(key, value); - - if (log.isDebugEnabled()) { - log.debug("add constant " + key + '=' + value); - } - } - bindings.put(variable, taille); - engine.setBindings(bindings, ScriptContext.ENGINE_SCOPE); - Double o = null; - try { - o = (Double) engine.eval("parseFloat(" + relation + ")"); - } catch (ScriptException e) { - if (log.isErrorEnabled()) { - log.error("Could not compute value from " + relation); - } - } - return o == null ? null : o.floatValue(); - } -} diff --git a/entities/src/main/xmi/observe-common.zargo b/entities/src/main/xmi/observe-common.zargo index 40415f1..17d14db 100644 Binary files a/entities/src/main/xmi/observe-common.zargo and b/entities/src/main/xmi/observe-common.zargo differ diff --git a/entities/src/main/xmi/observe-seine.zargo b/entities/src/main/xmi/observe-seine.zargo index 7886e18..f87b2aa 100644 Binary files a/entities/src/main/xmi/observe-seine.zargo and b/entities/src/main/xmi/observe-seine.zargo differ diff --git a/entities/src/main/xmi/observe.ini b/entities/src/main/xmi/observe.ini index f1ca6ad..51d0247 100644 --- a/entities/src/main/xmi/observe.ini +++ b/entities/src/main/xmi/observe.ini @@ -152,14 +152,21 @@ gearCaracteristic.lazy = false [class fr.ird.observe.entities.referentiel.GearCaracteristic] gearCaracteristicType.lazy = false +[class fr.ird.observe.entities.referentiel.FormulaSupport] +source.hibernateAttributeType = text + +[class fr.ird.observe.entities.referentiel.LengthLengthParameter] +inputSizeMeasureType.lazy = false +outputSizeMeasureType.lazy = false + [class fr.ird.observe.entities.referentiel.LengthWeightParameter] ocean.lazy = false ocean.notNull = true sex.lazy = false sex.notNull = true -source.hibernateAttributeType = text species.lazy = false species.notNull = true +sizeMeasureType.lazy = false [class fr.ird.observe.entities.referentiel.ObserveReferentialEntity] needComment.notNull = true diff --git a/entities/src/test/java/fr/ird/observe/entities/referentiel/FormulaHelperTest.java b/entities/src/test/java/fr/ird/observe/entities/referentiel/FormulaHelperTest.java new file mode 100644 index 0000000..18e9195 --- /dev/null +++ b/entities/src/test/java/fr/ird/observe/entities/referentiel/FormulaHelperTest.java @@ -0,0 +1,27 @@ +package fr.ird.observe.entities.referentiel; + +import org.junit.Assert; +import org.junit.Test; + +/** + * Created on 05/11/16. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 5.1 + */ +public class FormulaHelperTest { + + @Test + public void testComputeValue() { + + LengthWeightParameterImpl parametrage = new LengthWeightParameterImpl(); + parametrage.setCoefficients("a=3.8e-5:b=2.78 "); + parametrage.setLengthWeightFormula("a * Math.pow(L, b)"); + Assert.assertTrue(parametrage.isFormulaOneValid()); + Float weight = FormulaHelper.computeValue(parametrage, "a * Math.pow(L, b)", null, "L", 84.0f); + Assert.assertNotNull(weight); + + Float excepted = (float) (Math.pow(84.0, 2.78) * 3.8e-5); + Assert.assertEquals(excepted, weight, 2); + } +} diff --git a/entities/src/test/java/fr/ird/observe/entities/referentiel/LengthWeightParemeterHelperTest.java b/entities/src/test/java/fr/ird/observe/entities/referentiel/LengthWeightParemeterHelperTest.java deleted file mode 100644 index 9498cef..0000000 --- a/entities/src/test/java/fr/ird/observe/entities/referentiel/LengthWeightParemeterHelperTest.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * #%L - * ObServe :: Entities - * %% - * Copyright (C) 2008 - 2016 IRD, Code Lutin, Tony Chemit - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ -package fr.ird.observe.entities.referentiel; - -import org.junit.Assert; -import org.junit.Test; - -/** - * Test de la classe {@link LengthWeightParemeterHelper}. - * - * @author Tony Chemit - chemit@codelutin.com - * @since 1.8 - */ -public class LengthWeightParemeterHelperTest { - - @Test - public void testComputeValue() { - Float weight; - - LengthWeightParameter parametrage = new LengthWeightParameterImpl(); - parametrage.setCoefficients("a=3.8e-5:b=2.78 "); - parametrage.setLengthWeightFormula("a * Math.pow(L, b)"); - Assert.assertTrue(parametrage.isLengthWeightFormulaValid()); - weight = LengthWeightParemeterHelper.computeWeight(parametrage, 84.0f); - - Double excepted = Math.pow(84.0, 2.78) * 3.8e-5; - Assert.assertEquals(excepted, weight, 2); - } -} -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.

This is an automated email from the git hooks/post-receive script. New commit to branch feature/8404 in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 30ae2b5f97dd1da5007d387b404e508fa0dab75b Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Nov 5 15:30:32 2016 +0100 Ajout LengthLengthParameter et revue de LWParameter (ui) --- .../swing/decoration/DecoratorService.java | 11 +- .../decorators/LengthLengthParameterDecorator.java | 54 ++++++++ .../application-swing-decoration_en_GB.properties | 5 +- .../application-swing-decoration_es_ES.properties | 3 + .../application-swing-decoration_fr_FR.properties | 3 + ...ngthParameterDto-ui-create-error-validation.xml | 108 ++++++++++++++++ ...hParameterDto-ui-create-warning-validation.xml} | 21 +--- ...ngthParameterDto-ui-update-error-validation.xml | 72 +++++++++++ ...hParameterDto-ui-update-warning-validation.xml} | 23 ---- ...ightParameterDto-ui-create-error-validation.xml | 17 ++- ...htParameterDto-ui-create-warning-validation.xml | 8 ++ .../application-swing-validation_en_GB.properties | 14 +++ .../application-swing-validation_es_ES.properties | 14 +++ .../application-swing-validation_fr_FR.properties | 14 +++ ...rameterUI.jaxx => LengthLengthParameterUI.jaxx} | 139 ++++----------------- ...rameterUI.jcss => LengthLengthParameterUI.jcss} | 100 +++++---------- .../ref/impl/LengthLengthParameterUIHandler.java | 102 +++++++++++++++ ...odel.java => LengthLengthParameterUIModel.java} | 55 ++++---- .../content/ref/impl/LengthWeightParameterUI.jaxx | 38 +++--- .../content/ref/impl/LengthWeightParameterUI.jcss | 17 +++ .../ref/impl/LengthWeightParameterUIModel.java | 3 + .../i18n/application-swing_en_GB.properties | 8 ++ .../i18n/application-swing_es_ES.properties | 8 ++ .../i18n/application-swing_fr_FR.properties | 8 ++ 24 files changed, 573 insertions(+), 272 deletions(-) diff --git a/application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/DecoratorService.java b/application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/DecoratorService.java index a924d6c..9190d0f 100644 --- a/application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/DecoratorService.java +++ b/application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/DecoratorService.java @@ -22,6 +22,7 @@ package fr.ird.observe.application.swing.decoration; import fr.ird.observe.application.swing.decoration.decorators.DataReferenceDecorator; +import fr.ird.observe.application.swing.decoration.decorators.LengthLengthParameterDecorator; import fr.ird.observe.application.swing.decoration.decorators.LengthWeightParameterDecorator; import fr.ird.observe.application.swing.decoration.decorators.NonTargetCatchDecorator; import fr.ird.observe.application.swing.decoration.decorators.NonTargetLengthDecorator; @@ -54,6 +55,7 @@ import fr.ird.observe.services.dto.referential.GearCaracteristicDto; import fr.ird.observe.services.dto.referential.GearCaracteristicTypeDto; import fr.ird.observe.services.dto.referential.GearDto; import fr.ird.observe.services.dto.referential.HarbourDto; +import fr.ird.observe.services.dto.referential.LengthLengthParameterDto; import fr.ird.observe.services.dto.referential.LengthWeightParameterDto; import fr.ird.observe.services.dto.referential.OceanDto; import fr.ird.observe.services.dto.referential.OrganismDto; @@ -265,6 +267,11 @@ public class DecoratorService extends DecoratorProvider { registerDecorator(new SpeciesDecorator()); registerReferentialReferenceDecorator(SpeciesDto.class, "${faoCode}$s##${scientificLabel}$s"); + // LengthLengthParameter decorator + registerDecorator(new LengthLengthParameterDecorator()); + registerReferentialReferenceDecorator(LengthLengthParameterDto.class,"${inputSizeMeasureType}$s##${outputSizeMeasureType}$s##"+ + t("observe.common.inputOutputFormula") + " ${inputOutputFormula}$s"); + // LengthWeightParameter decorator registerDecorator(new LengthWeightParameterDecorator()); registerReferentialReferenceDecorator(LengthWeightParameterDto.class, @@ -423,8 +430,8 @@ public class DecoratorService extends DecoratorProvider { " - "); registerDataAndDataReferenceDecorator(SensorUsedDto.class, - "${sensorType/label}$s", - "${sensorType}$s"); + "${sensorType/label}$s", + "${sensorType}$s"); // gps decorators diff --git a/application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/LengthLengthParameterDecorator.java b/application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/LengthLengthParameterDecorator.java new file mode 100644 index 0000000..92d1530 --- /dev/null +++ b/application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/LengthLengthParameterDecorator.java @@ -0,0 +1,54 @@ +/* + * #%L + * ObServe :: Application Swing Decoration + * %% + * Copyright (C) 2008 - 2016 IRD, Code Lutin, Tony Chemit + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ +package fr.ird.observe.application.swing.decoration.decorators; + +import fr.ird.observe.services.dto.referential.LengthLengthParameterDto; + +import static org.nuiton.i18n.I18n.t; + +/** + * Decorator of {@link LengthLengthParameterDto}. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 2.4 + */ +public class LengthLengthParameterDecorator extends ObserveDecorator<LengthLengthParameterDto> { + + private static final long serialVersionUID = 1L; + + public LengthLengthParameterDecorator() throws IllegalArgumentException, NullPointerException { + super(LengthLengthParameterDto.class, "${inputSizeMeasureType}$s##${outputSizeMeasureType}$s##" + + t("observe.common.inputOutputFormula") + " ${inputOutputFormula}$s" + ); + } + + @Override + protected Comparable<?> getDefaultUndefinedValue(String token) { + if (token.startsWith(LengthLengthParameterDto.PROPERTY_INPUT_SIZE_MEASURE_TYPE) + || token.startsWith(LengthLengthParameterDto.PROPERTY_OUTPUT_SIZE_MEASURE_TYPE) + ) { + return t("observe.common.inconnu"); + } + return super.getDefaultUndefinedValue(token); + } + +} diff --git a/application-swing-decoration/src/main/resources/i18n/application-swing-decoration_en_GB.properties b/application-swing-decoration/src/main/resources/i18n/application-swing-decoration_en_GB.properties index ef91476..663fdae 100644 --- a/application-swing-decoration/src/main/resources/i18n/application-swing-decoration_en_GB.properties +++ b/application-swing-decoration/src/main/resources/i18n/application-swing-decoration_en_GB.properties @@ -4,6 +4,7 @@ observe.common.gps.gpsPoint=Gps point observe.common.haulingIdentifier=Hauling identifier observe.common.homeId=Home id observe.common.inconnu=Unknown +observe.common.inputOutputFormula=Input to Output formula observe.common.label=Label observe.common.lengthWeightFormula=Length weight formula observe.common.nocode=Nocode @@ -121,8 +122,10 @@ observe.type.keptTargetCatch=Target catch observe.type.keptTargetCatches=Target catches observe.type.keptTargetSample=Target sample observe.type.keptTargetSamples=Target samples +observe.type.lengthLengthParameter=Length length parameter +observe.type.lengthLengthParameters=Length length parameters observe.type.lengthWeightParameter=Length weight parameter -observe.type.lengthWeightParameters=Lengths weight parameter +observe.type.lengthWeightParameters=Length weight parameters observe.type.lightsticksColor=Lightsticks color observe.type.lightsticksColors=Lightstickss color observe.type.lightsticksType=Lightsticks type diff --git a/application-swing-decoration/src/main/resources/i18n/application-swing-decoration_es_ES.properties b/application-swing-decoration/src/main/resources/i18n/application-swing-decoration_es_ES.properties index e459f93..306751d 100644 --- a/application-swing-decoration/src/main/resources/i18n/application-swing-decoration_es_ES.properties +++ b/application-swing-decoration/src/main/resources/i18n/application-swing-decoration_es_ES.properties @@ -4,6 +4,7 @@ observe.common.gps.gpsPoint=Punto GPS observe.common.haulingIdentifier=Arrastre observe.common.homeId=Identificador observe.common.inconnu=desconocido +observe.common.inputOutputFormula=Formule Entrée vers Sortie \#TODO observe.common.label=Título observe.common.lengthWeightFormula=Relación Peso observe.common.nocode=codigo ausente @@ -121,6 +122,8 @@ observe.type.keptTargetCatch=Captura de atún observe.type.keptTargetCatches=Capturas de atún observe.type.keptTargetSample=Muestreo de atún capturado observe.type.keptTargetSamples=Muestreos de atún capturado +observe.type.lengthLengthParameter=Relación Tamaño-Tamaño +observe.type.lengthLengthParameters=Relaciones Tamaño-Tamaño observe.type.lengthWeightParameter=Relación Tamaño-Peso observe.type.lengthWeightParameters=Relaciones Tamaño-Peso observe.type.lightsticksColor=Color de barrita de luz diff --git a/application-swing-decoration/src/main/resources/i18n/application-swing-decoration_fr_FR.properties b/application-swing-decoration/src/main/resources/i18n/application-swing-decoration_fr_FR.properties index 84164e5..60b1621 100644 --- a/application-swing-decoration/src/main/resources/i18n/application-swing-decoration_fr_FR.properties +++ b/application-swing-decoration/src/main/resources/i18n/application-swing-decoration_fr_FR.properties @@ -4,6 +4,7 @@ observe.common.gps.gpsPoint=Point GPS observe.common.haulingIdentifier=Virage observe.common.homeId=Identifiant observe.common.inconnu=inconnu +observe.common.inputOutputFormula=Formule Entrée vers Sortie observe.common.label=Libellé observe.common.lengthWeightFormula=Relation Poids observe.common.nocode=code absent @@ -121,6 +122,8 @@ observe.type.keptTargetCatch=Capture cible observe.type.keptTargetCatches=Captures cible observe.type.keptTargetSample=Echantillon thon capturé observe.type.keptTargetSamples=Echantillons thon capturés +observe.type.lengthLengthParameter=Relation Taille-Taille +observe.type.lengthLengthParameters=Relations Taille-Taille observe.type.lengthWeightParameter=Relation Taille-Poids observe.type.lengthWeightParameters=Relations Taille-Poids observe.type.lightsticksColor=Couleur de baton lumineux diff --git a/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/LengthLengthParameterDto-ui-create-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/LengthLengthParameterDto-ui-create-error-validation.xml new file mode 100644 index 0000000..54b0e35 --- /dev/null +++ b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/LengthLengthParameterDto-ui-create-error-validation.xml @@ -0,0 +1,108 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Application Swing Validation + %% + Copyright (C) 2008 - 2016 IRD, Code Lutin, Tony Chemit + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public + License along with this program. If not, see + <http://www.gnu.org/licenses/gpl-3.0.html>. + #L% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="code"> + + <!-- clef unique sur le code --> + <field-validator type="collectionUniqueKeyDto" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">code</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.ui.referentiel.invalid.code.uniqueKey##${code}</message> + </field-validator> + + </field> + + <field name="inputSizeMeasureType"> + + <!-- intputSizeMeasureType desactive --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ intputSizeMeasureType == null || intputSizeMeasureType.enabled ]]> + </param> + <message>validator.ui.lengthLengthParameter.disabled.inputSizeMeasureType</message> + </field-validator> + </field> + + + <field name="outputSizeMeasureType"> + + <!-- outputSizeMeasureType desactive --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ outputSizeMeasureType == null || outputSizeMeasureType.enabled ]]> + </param> + <message>validator.ui.lengthLengthParameter.disabled.inputSizeMeasureType</message> + </field-validator> + </field> + + <field name="inputOutputFormula"> + <!-- pas de relation inputOutputFormula renseignee --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.ui.lengthLengthParameter.required.inputOutputFormula + </message> + </field-validator> + + <!-- relation inputOutputFormula invalide --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ inputOutputFormulaValid ]]> + </param> + <message>validator.ui.lengthLengthParameter.invalid.inputOutputFormula + </message> + </field-validator> + + </field> + + <field name="outputInputFormula"> + <!-- pas de relation outputInputFormula renseignee --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.ui.lengthLengthParameter.required.outputInputFormula + </message> + </field-validator> + + <!-- relation outputInputFormula invalide --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ outputInputFormulaValid ]]> + </param> + <message>validator.ui.lengthLengthParameter.invalid.outputInputFormula + </message> + </field-validator> + + </field> + + <field name="coefficients"> + <!-- pas de coefficients renseigne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.ui.lengthLengthParameter.required.coefficients + </message> + </field-validator> + </field> +</validators> diff --git a/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/LengthWeightParameterDto-ui-create-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/LengthLengthParameterDto-ui-create-warning-validation.xml similarity index 76% copy from application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/LengthWeightParameterDto-ui-create-warning-validation.xml copy to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/LengthLengthParameterDto-ui-create-warning-validation.xml index 097c4dc..b325b75 100644 --- a/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/LengthWeightParameterDto-ui-create-warning-validation.xml +++ b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/LengthLengthParameterDto-ui-create-warning-validation.xml @@ -43,26 +43,17 @@ </field-validator> </field> - <field name="ocean"> - <!-- pas de ocean renseigne --> + <field name="inputSizeMeasureType"> + <!-- pas de inputSizeMeasureType renseigne --> <field-validator type="required"> - <message>validator.ui.lengthWeightParameter.null.ocean</message> + <message>validator.ui.lengthLengthParameter.null.inputSizeMeasureType</message> </field-validator> </field> - <field name="startDate"> - <!-- pas de startDate renseigne --> + <field name="outputSizeMeasureType"> + <!-- pas de outputSizeMeasureType renseigne --> <field-validator type="required"> - <message>validator.ui.lengthWeightParameter.required.startDate - </message> - </field-validator> - </field> - - <field name="endDate"> - <!-- pas de endDate renseigne --> - <field-validator type="required"> - <message>validator.ui.lengthWeightParameter.required.endDate - </message> + <message>validator.ui.lengthLengthParameter.null.outputSizeMeasureType</message> </field-validator> </field> diff --git a/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/LengthLengthParameterDto-ui-update-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/LengthLengthParameterDto-ui-update-error-validation.xml new file mode 100644 index 0000000..d335ede --- /dev/null +++ b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/LengthLengthParameterDto-ui-update-error-validation.xml @@ -0,0 +1,72 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Application Swing Validation + %% + Copyright (C) 2008 - 2016 IRD, Code Lutin, Tony Chemit + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public + License along with this program. If not, see + <http://www.gnu.org/licenses/gpl-3.0.html>. + #L% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="inputOutputFormula"> + <!-- pas de relation inputOutputFormula renseignee --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.ui.lengthLengthParameter.required.inputOutputFormula + </message> + </field-validator> + + <!-- relation inputOutputFormula invalide --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ inputOutputFormulaValid ]]> + </param> + <message>validator.ui.lengthLengthParameter.invalid.inputOutputFormula + </message> + </field-validator> + + </field> + + <field name="outputInputFormula"> + <!-- pas de relation outputInputFormula renseignee --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.ui.lengthLengthParameter.required.outputInputFormula + </message> + </field-validator> + + <!-- relation outputInputFormula invalide --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ outputInputFormulaValid ]]> + </param> + <message>validator.ui.lengthLengthParameter.invalid.outputInputFormula + </message> + </field-validator> + + </field> + + <field name="coefficients"> + <!-- pas de coefficients renseigne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.ui.lengthLengthParameter.required.coefficients + </message> + </field-validator> + </field> +</validators> diff --git a/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/LengthWeightParameterDto-ui-create-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/LengthLengthParameterDto-ui-update-warning-validation.xml similarity index 69% copy from application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/LengthWeightParameterDto-ui-create-warning-validation.xml copy to application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/LengthLengthParameterDto-ui-update-warning-validation.xml index 097c4dc..75a6bc1 100644 --- a/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/LengthWeightParameterDto-ui-create-warning-validation.xml +++ b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/LengthLengthParameterDto-ui-update-warning-validation.xml @@ -43,27 +43,4 @@ </field-validator> </field> - <field name="ocean"> - <!-- pas de ocean renseigne --> - <field-validator type="required"> - <message>validator.ui.lengthWeightParameter.null.ocean</message> - </field-validator> - </field> - - <field name="startDate"> - <!-- pas de startDate renseigne --> - <field-validator type="required"> - <message>validator.ui.lengthWeightParameter.required.startDate - </message> - </field-validator> - </field> - - <field name="endDate"> - <!-- pas de endDate renseigne --> - <field-validator type="required"> - <message>validator.ui.lengthWeightParameter.required.endDate - </message> - </field-validator> - </field> - </validators> diff --git a/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/LengthWeightParameterDto-ui-create-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/LengthWeightParameterDto-ui-create-error-validation.xml index 258ca27..40f6fef 100644 --- a/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/LengthWeightParameterDto-ui-create-error-validation.xml +++ b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/LengthWeightParameterDto-ui-create-error-validation.xml @@ -54,6 +54,17 @@ </field-validator> </field> + <field name="sizeMeasureType"> + + <!-- sizeMeasureType desactive --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ sizeMeasureType == null || sizeMeasureType.enabled ]]> + </param> + <message>validator.ui.lengthWeightParameter.disabled.sizeMeasureType</message> + </field-validator> + </field> + <field name="ocean"> <!-- clef unique species - gender - ocean - startDate --> <field-validator type="observeCollectionUniqueKeyDto" short-circuit="true"> @@ -126,12 +137,6 @@ <message>validator.ui.lengthWeightParameter.required.coefficients </message> </field-validator> - - <!-- syntaxe coefficients invalide FIXME chemit 2010_08-21 Il faut autoriser les ecritures scientifique E[+-][0-9]+--> - <!--field-validator type="regex"> - <param name="expression">\w+=[0-9]+(\.[0-9]+(E[+-]*[0-9]+)*)*(:\w+=[0-9]+(\.[0-9]+(E[+-]*[0-9]+)*)*)*</param> - <message>validator.ui.lengthWeightParameter.invalid.coefficients</message> - </field-validator--> </field> </validators> diff --git a/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/LengthWeightParameterDto-ui-create-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/LengthWeightParameterDto-ui-create-warning-validation.xml index 097c4dc..431020a 100644 --- a/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/LengthWeightParameterDto-ui-create-warning-validation.xml +++ b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/LengthWeightParameterDto-ui-create-warning-validation.xml @@ -50,6 +50,14 @@ </field-validator> </field> + <field name="sizeMeasureType"> + <!-- pas de sizeMeasureType renseigne --> + <field-validator type="required"> + <message>validator.ui.lengthWeightParameter.null.sizeMeasureType</message> + </field-validator> + </field> + + <field name="startDate"> <!-- pas de startDate renseigne --> <field-validator type="required"> diff --git a/application-swing-validation/src/main/resources/i18n/application-swing-validation_en_GB.properties b/application-swing-validation/src/main/resources/i18n/application-swing-validation_en_GB.properties index bd95896..9f9426d 100644 --- a/application-swing-validation/src/main/resources/i18n/application-swing-validation_en_GB.properties +++ b/application-swing-validation/src/main/resources/i18n/application-swing-validation_en_GB.properties @@ -83,6 +83,8 @@ observe.common.hooksComposition=hooks composition observe.common.hooksCompositionProportionSum=hooks composition proportion sum observe.common.individualSize=Individual size observe.common.individualWeight=Individual weight +observe.common.inputOutputFormula=Input to Output formula +observe.common.inputSizeMeasureType=Input size measure type observe.common.iso2Code=Iso 2 code observe.common.iso3Code=Iso 3 code observe.common.itemHorizontalPosition=Item horizontal position @@ -120,6 +122,8 @@ observe.common.observedSystemDistance=Observed system distance observe.common.observer=Observed observe.common.ocean=Ocean observe.common.organism=Organism +observe.common.outputInputFormula=Output to Input formula +observe.common.outputSizeMeasureType=Ouput size measure type observe.common.power=Power observe.common.previousFpaZone=Previous fpa zone observe.common.proportion=Proportion @@ -330,10 +334,20 @@ validator.ui.hooksComposition.desactivated.hookSize=Selected hook size is disabl validator.ui.hooksComposition.desactivated.hookType=Selected hook type is disabled. validator.ui.hooksComposition.required.hookType=Hook type must be filled. validator.ui.hooksComposition.required.proportion=Proportion must be filled. +validator.ui.lengthLengthParameter.disabled.inputSizeMeasureType=Selected Input Size measure type is disabled +validator.ui.lengthLengthParameter.invalid.inputOutputFormula=Formula is not valid. +validator.ui.lengthLengthParameter.invalid.outputInputFormula=Formula is not valid. +validator.ui.lengthLengthParameter.null.inputSizeMeasureType=Input size measure type is not filled. +validator.ui.lengthLengthParameter.null.outputSizeMeasureType=Output size measure type is not filled. +validator.ui.lengthLengthParameter.required.coefficients=Coefficiens are required. +validator.ui.lengthLengthParameter.required.inputOutputFormula=Formula is required. +validator.ui.lengthLengthParameter.required.outputInputFormula=Formula is required. +validator.ui.lengthWeightParameter.disabled.sizeMeasureType=Selected size measure type is disabled. validator.ui.lengthWeightParameter.invalid.lengthWeightFormula=Formula is not valid. validator.ui.lengthWeightParameter.invalid.uniqueKey=Tuple (gender/ocean/species/startDate) must be unique. validator.ui.lengthWeightParameter.invalid.weightLengthFormula=Formula is not valid. validator.ui.lengthWeightParameter.null.ocean=Ocean is not filled. +validator.ui.lengthWeightParameter.null.sizeMeasureType=Size measure type is not filled. validator.ui.lengthWeightParameter.required.coefficients=Coefficients must be filled. validator.ui.lengthWeightParameter.required.endDate=End date must be filled. validator.ui.lengthWeightParameter.required.lengthWeightFormula=Length weight formula must be filled. diff --git a/application-swing-validation/src/main/resources/i18n/application-swing-validation_es_ES.properties b/application-swing-validation/src/main/resources/i18n/application-swing-validation_es_ES.properties index 0c96771..51bdabd 100644 --- a/application-swing-validation/src/main/resources/i18n/application-swing-validation_es_ES.properties +++ b/application-swing-validation/src/main/resources/i18n/application-swing-validation_es_ES.properties @@ -83,6 +83,8 @@ observe.common.hooksComposition=Anzuelos observe.common.hooksCompositionProportionSum=Suma de los proporciónes de anzuelos (%) observe.common.individualSize=Tamaño (cm) observe.common.individualWeight=Peso (kg) +observe.common.inputOutputFormula=Formule Entrée vers Sortie \#TODO +observe.common.inputSizeMeasureType=Type de mensuration d'entrée \#TODO observe.common.iso2Code=Código ISO-2 observe.common.iso3Code=Código ISO-3 observe.common.itemHorizontalPosition=Localización del elemento sobre la línea principal @@ -120,6 +122,8 @@ observe.common.observedSystemDistance=Distancia al sistema observado (millas con observe.common.observer=Observador observe.common.ocean=Oceano observe.common.organism=Organismo +observe.common.outputInputFormula=Formule Sortie vers Entrée \#TODO +observe.common.outputSizeMeasureType=Type de mensuration de sortie \#TODO observe.common.power=Potencia del motor principal observe.common.previousFpaZone=La zona FPA de que se salió observe.common.proportion=Proporción (%) @@ -330,10 +334,20 @@ validator.ui.hooksComposition.desactivated.hookSize=El tamaño de avanzuelo sele validator.ui.hooksComposition.desactivated.hookType=El tipo de avanzuelo seleccionado está desactivado. validator.ui.hooksComposition.required.hookType=La selección de un tipo de avanzuelo es mandatoria. validator.ui.hooksComposition.required.proportion=La proporción está vacía. +validator.ui.lengthLengthParameter.disabled.inputSizeMeasureType=Le type de mensuration d'entrée sélectionné est désactivé. \#TODO +validator.ui.lengthLengthParameter.invalid.inputOutputFormula=La formule n'est pas valide. \#TODO +validator.ui.lengthLengthParameter.invalid.outputInputFormula=La formule n'est pas valide. \#TODO +validator.ui.lengthLengthParameter.null.inputSizeMeasureType=Le type de mensuration d'entrée n'est pas renseigné. \#TODO +validator.ui.lengthLengthParameter.null.outputSizeMeasureType=Le type de mensuration de sortie n'est pas renseigné. \#TODO +validator.ui.lengthLengthParameter.required.coefficients=Les coefficients sont obligatoires. \#TODO +validator.ui.lengthLengthParameter.required.inputOutputFormula=La formule est obligatoire. \#TODO +validator.ui.lengthLengthParameter.required.outputInputFormula=La formule est obligatoire. \#TODO +validator.ui.lengthWeightParameter.disabled.sizeMeasureType=Le type de mensuration sélectionné est désactivé. \#TODO validator.ui.lengthWeightParameter.invalid.lengthWeightFormula=Relación de peso introducida no es coherente. validator.ui.lengthWeightParameter.invalid.uniqueKey=Tupla (sexo/océano/especie) debe ser única, la tupla ya se ha usado. validator.ui.lengthWeightParameter.invalid.weightLengthFormula=Relación de talla introducida no es coherente. validator.ui.lengthWeightParameter.null.ocean=No se ha seleccionado oceano. +validator.ui.lengthWeightParameter.null.sizeMeasureType=Type de mensuration non renseigné. \#TODO validator.ui.lengthWeightParameter.required.coefficients=Coeficientes deben ser especificados. validator.ui.lengthWeightParameter.required.endDate=Fecha de fin de validez debe ser especificada. validator.ui.lengthWeightParameter.required.lengthWeightFormula=Relación de peso debe ser especificada. diff --git a/application-swing-validation/src/main/resources/i18n/application-swing-validation_fr_FR.properties b/application-swing-validation/src/main/resources/i18n/application-swing-validation_fr_FR.properties index 4dbebdf..fb6e9ea 100644 --- a/application-swing-validation/src/main/resources/i18n/application-swing-validation_fr_FR.properties +++ b/application-swing-validation/src/main/resources/i18n/application-swing-validation_fr_FR.properties @@ -83,6 +83,8 @@ observe.common.hooksComposition=Hameçons observe.common.hooksCompositionProportionSum=Somme des proportions d'hameçons (%) observe.common.individualSize=Taille (cm) observe.common.individualWeight=Poids (kg) +observe.common.inputOutputFormula=Formule Entrée vers Sortie +observe.common.inputSizeMeasureType=Type de mensuration d'entrée observe.common.iso2Code=code ISO-2 observe.common.iso3Code=Code ISO-3 observe.common.itemHorizontalPosition=Position sur la ligne @@ -120,6 +122,8 @@ observe.common.observedSystemDistance=Distance système observé (en milles avec observe.common.observer=Observateur observe.common.ocean=Océan observe.common.organism=Organisme +observe.common.outputInputFormula=Formule Sortie vers Entrée +observe.common.outputSizeMeasureType=Type de mensuration de sortie observe.common.power=Puissance moteur principal observe.common.previousFpaZone=Zone Fpa précédente observe.common.proportion=Proportion (%) @@ -330,10 +334,20 @@ validator.ui.hooksComposition.desactivated.hookSize=La taille d'hameçon sélect validator.ui.hooksComposition.desactivated.hookType=Le type d'hameçon sélectionné est désactivée. validator.ui.hooksComposition.required.hookType=La sélection d'un type d'hameçon est obligatoire. validator.ui.hooksComposition.required.proportion=Proportion non renseignée. +validator.ui.lengthLengthParameter.disabled.inputSizeMeasureType=Le type de mensuration d'entrée sélectionné est désactivé. +validator.ui.lengthLengthParameter.invalid.inputOutputFormula=La formule n'est pas valide. +validator.ui.lengthLengthParameter.invalid.outputInputFormula=La formule n'est pas valide. +validator.ui.lengthLengthParameter.null.inputSizeMeasureType=Le type de mensuration d'entrée n'est pas renseigné. +validator.ui.lengthLengthParameter.null.outputSizeMeasureType=Le type de mensuration de sortie n'est pas renseigné. +validator.ui.lengthLengthParameter.required.coefficients=Les coefficients sont obligatoires. +validator.ui.lengthLengthParameter.required.inputOutputFormula=La formule est obligatoire. +validator.ui.lengthLengthParameter.required.outputInputFormula=La formule est obligatoire. +validator.ui.lengthWeightParameter.disabled.sizeMeasureType=Le type de mensuration sélectionné est désactivé. validator.ui.lengthWeightParameter.invalid.lengthWeightFormula=La relation poids saisie n'est pas cohérente. validator.ui.lengthWeightParameter.invalid.uniqueKey=Le tuple (gender/ocean/species/startDate) doit être unique, le tuple est déjà utilisé. validator.ui.lengthWeightParameter.invalid.weightLengthFormula=La relation taille saisie n'est pas cohérente. validator.ui.lengthWeightParameter.null.ocean=Aucun océan sélectionné. +validator.ui.lengthWeightParameter.null.sizeMeasureType=Type de mensuration non renseigné. validator.ui.lengthWeightParameter.required.coefficients=Les coefficients ne sont pas renseignés. validator.ui.lengthWeightParameter.required.endDate=Date de fin de validité non renseignée. validator.ui.lengthWeightParameter.required.lengthWeightFormula=La relation poids n'est pas renseignée. diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthWeightParameterUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthLengthParameterUI.jaxx similarity index 55% copy from application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthWeightParameterUI.jaxx copy to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthLengthParameterUI.jaxx index 8ffa384..860bf89 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthWeightParameterUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthLengthParameterUI.jaxx @@ -20,25 +20,21 @@ #L% --> -<fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI superGenericType='LengthWeightParameterDto'> +<fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI superGenericType='LengthLengthParameterDto'> <style source="ReferenceEntity.jcss"/> <import> fr.ird.observe.services.dto.constants.ReferenceStatus fr.ird.observe.services.dto.referential.ReferentialReference - fr.ird.observe.services.dto.referential.SexDto - fr.ird.observe.services.dto.referential.SpeciesDto - fr.ird.observe.services.dto.referential.OceanDto - fr.ird.observe.services.dto.referential.LengthWeightParameterDto + fr.ird.observe.services.dto.referential.SizeMeasureTypeDto + fr.ird.observe.services.dto.referential.LengthLengthParameterDto fr.ird.observe.application.swing.ui.UIHelper fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIModel jaxx.runtime.swing.editor.NumberEditor jaxx.runtime.swing.editor.bean.BeanComboBox - org.jdesktop.swingx.JXDatePicker - javax.swing.JScrollPane javax.swing.JTable javax.swing.table.TableCellRenderer @@ -48,37 +44,17 @@ </import> <!-- validator --> - <BeanValidator id='validator' autoField='true' - beanClass='fr.ird.observe.services.dto.referential.LengthWeightParameterDto' - context='ui-create' - errorTableModel='{getErrorTableModel()}'/> + <BeanValidator id='validator' autoField='true' context='ui-create' errorTableModel='{getErrorTableModel()}' + beanClass='fr.ird.observe.services.dto.referential.LengthLengthParameterDto'/> <!-- model --> - <LengthWeightParameterUIModel id='model'/> + <LengthLengthParameterUIModel id='model'/> <!-- handler --> - <LengthWeightParameterUIHandler id='handler' constructorParams="this"/> + <LengthLengthParameterUIHandler id='handler' constructorParams="this"/> <!-- edit bean --> - <LengthWeightParameterDto id='bean'/> - - <script><![CDATA[ -@Override -public void decorateUniqueKeyTable(JTable table, - TableCellRenderer renderer, - JScrollPane pane) { - - UIHelper.fixTableColumnWidth(table, 0, 250); - UIHelper.fixTableColumnWidth(table, 1, 100); - UIHelper.fixTableColumnWidth(table, 2, 100); - UIHelper.fixTableColumnWidth(table, 3, 200); - - table.setAutoResizeMode(JTable.AUTO_RESIZE_OFF); - - UIHelper.setTableColumnRenderer(table, 1, - UIHelper.newDecorateTableCellRenderer(renderer, SexDto.class)); -} -]]></script> + <LengthLengthParameterDto id='bean'/> <Table id="editView" insets="0" fill="both"> <row> @@ -87,51 +63,25 @@ public void decorateUniqueKeyTable(JTable table, <tab id='generalTab'> <Table fill="both"> - <!-- sex --> - <row> - <cell anchor="west"> - <JLabel id='sexLabel'/> - </cell> - <cell anchor='east' weightx="1" fill="both"> - <BeanComboBox id='sex' constructorParams='this' - genericType='ReferentialReference<SexDto>' _entityClass='SexDto.class'/> - </cell> - </row> - - <!-- species --> + <!-- inputSizeMeasureType --> <row> <cell anchor='west'> - <JLabel id='speciesLabel'/> + <JLabel id='inputSizeMeasureTypeLabel'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <BeanComboBox id='species' constructorParams='this' - genericType='ReferentialReference<SpeciesDto>' _entityClass='SpeciesDto.class'/> + <BeanComboBox id='inputSizeMeasureType' constructorParams='this' + genericType='ReferentialReference<SizeMeasureTypeDto>'/> </cell> </row> - <!-- ocean --> + <!-- outputSizeMeasureType --> <row> <cell anchor='west'> - <JLabel id='oceanLabel'/> + <JLabel id='outputSizeMeasureTypeLabel'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <BeanComboBox id='ocean' constructorParams='this' - genericType='ReferentialReference<OceanDto>' _entityClass='OceanDto.class'/> - </cell> - </row> - - <!-- date debut - fin de validite --> - <row> - <cell anchor='west'> - <JLabel id='startDateFinValiditeLabel'/> - </cell> - <cell anchor='west' weightx="1" fill="both"> - <JPanel layout='{new GridLayout()}'> - <JXDatePicker id='startDate' - onActionPerformed='getBean().setStartDate(startDate.getDate())'/> - <JXDatePicker id='endDate' - onActionPerformed='getBean().setEndDate(endDate.getDate())'/> - </JPanel> + <BeanComboBox id='outputSizeMeasureType' constructorParams='this' + genericType='ReferentialReference<SizeMeasureTypeDto>'/> </cell> </row> @@ -151,8 +101,7 @@ public void decorateUniqueKeyTable(JTable table, <JLabel id='statusLabel'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <EnumEditor id='status' constructorParams='ReferenceStatus.class' - genericType='ReferenceStatus' + <EnumEditor id='status' constructorParams='ReferenceStatus.class' genericType='ReferenceStatus' onItemStateChanged='getBean().setStatus((ReferenceStatus)status.getSelectedItem())'/> </cell> </row> @@ -160,8 +109,7 @@ public void decorateUniqueKeyTable(JTable table, <!-- needComment --> <row> <cell anchor='east' weightx="1" fill="both" columns="2"> - <JCheckBox id='needComment' - onItemStateChanged='getBean().setNeedComment(needComment.isSelected())'/> + <JCheckBox id='needComment' onItemStateChanged='getBean().setNeedComment(needComment.isSelected())'/> </cell> </row> @@ -210,34 +158,34 @@ public void decorateUniqueKeyTable(JTable table, <!-- relation weight --> <row> <cell anchor='west' columns="2"> - <JLabel id='lengthWeightFormulaInformation'/> + <JLabel id='inputOutputFormulaInformation'/> </cell> </row> <row> <cell anchor='west'> - <JLabel id='lengthWeightFormulaLabel'/> + <JLabel id='inputOutputFormulaLabel'/> </cell> <cell weightx="1" fill="both"> - <JTextField id='lengthWeightFormula' - onKeyReleased='getBean().setLengthWeightFormula(lengthWeightFormula.getText())'/> + <JTextField id='inputOutputFormula' + onKeyReleased='getBean().setInputOutputFormula(inputOutputFormula.getText())'/> </cell> </row> <!-- relation taille --> <row> <cell anchor='west' columns="2"> - <JLabel id='weightLengthFormulaInformation'/> + <JLabel id='outputInputFormulaInformation'/> </cell> </row> <row> <cell anchor='west'> - <JLabel id='weightLengthFormulaLabel'/> + <JLabel id='outputInputFormulaLabel'/> </cell> <cell weightx="1" fill="both"> - <JTextField id='weightLengthFormula' - onKeyReleased='getBean().setWeightLengthFormula(weightLengthFormula.getText())'/> + <JTextField id='outputInputFormula' + onKeyReleased='getBean().setOutputInputFormula(outputInputFormula.getText())'/> </cell> </row> </Table> @@ -245,41 +193,6 @@ public void decorateUniqueKeyTable(JTable table, </row> <row> - <cell weightx="1"> - - <Table id='meanValuesTable' fill='both' insets="1"> - - <!-- tailleMoyen --> - <row> - <cell anchor="west"> - <JLabel id='meanLengthLabel'/> - </cell> - <cell anchor='east' weightx="1" fill="both"> - <NumberEditor id='meanLength' constructorParams='this' styleClass="float2"/> - </cell> - </row> - - <!-- meanWeight --> - <row> - <cell anchor="west"> - <JLabel id='meanWeightLabel'/> - </cell> - <cell anchor='east' weightx="1" fill="both"> - <NumberEditor id='meanWeight' constructorParams='this' styleClass="float2"/> - </cell> - </row> - <row> - <cell> - <javax.swing.Box.Filler id='filler' - constructorParams='UIHelper.newMinDimension(), UIHelper.newMinDimension(), UIHelper.newMaxXDimension()'/> - </cell> - </row> - </Table> - - </cell> - </row> - - <row> <cell columns="2" weighty="1"> <JLabel/> </cell> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthWeightParameterUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthLengthParameterUI.jcss similarity index 52% copy from application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthWeightParameterUI.jcss copy to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthLengthParameterUI.jcss index 2657acf..e247d52 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthWeightParameterUI.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthLengthParameterUI.jcss @@ -21,12 +21,12 @@ */ #generalTab { - title:{t("observe.content.lengthWeightParameter.tab.general")}; + title:{t("observe.content.lengthLengthParameter.tab.general")}; icon:{getHandler().getErrorIconIfFalse(model.isGeneralTabValid())}; } #otherTab { - title:{t("observe.content.lengthWeightParameter.tab.other")}; + title:{t("observe.content.lengthLengthParameter.tab.other")}; icon:{getHandler().getErrorIconIfFalse(model.isOtherTabValid())}; } @@ -36,80 +36,70 @@ labelFor:{species}; } -#sexLabel { - text:"observe.common.sex"; - font-style:"italic"; - labelFor:{sex}; -} - -#sex { - property:{LengthWeightParameterDto.PROPERTY_SEX}; - selectedItem:{bean.getSex()}; - enabled:{model.isCreatingMode()}; -} - #species { - property:{LengthWeightParameterDto.PROPERTY_SPECIES}; + property:{LengthLengthParameterDto.PROPERTY_SPECIES}; selectedItem:{bean.getSpecies()}; enabled:{model.isCreatingMode()}; + _entityClass:{SpeciesDto.class}; } -#oceanLabel { - text:"observe.common.ocean"; +#inputSizeMeasureTypeLabel { + text:"observe.common.inputSizeMeasureType"; font-style:"italic"; - labelFor:{ocean}; + labelFor:{inputSizeMeasureType}; } -#ocean { - property:{LengthWeightParameterDto.PROPERTY_OCEAN}; - selectedItem:{bean.getOcean()}; +#inputSizeMeasureType { + property:{LengthLengthParameterDto.PROPERTY_INPUT_SIZE_MEASURE_TYPE}; + selectedItem:{getBean().getInputSizeMeasureType()}; enabled:{model.isCreatingMode()}; + _entityClass:{SizeMeasureTypeDto.class}; } -#startDateFinValiditeLabel { - text:"observe.common.startDateFinValidite"; +#outputSizeMeasureTypeLabel { + text:"observe.common.outputSizeMeasureType"; font-style:"italic"; + labelFor:{outputSizeMeasureType}; } -#startDate { - date:{bean.getStartDate()}; -} - -#endDate { - date:{bean.getEndDate()}; +#outputSizeMeasureType { + property:{LengthLengthParameterDto.PROPERTY_OUTPUT_SIZE_MEASURE_TYPE}; + selectedItem:{getBean().getOutputSizeMeasureType()}; + enabled:{model.isCreatingMode()}; + _entityClass:{SizeMeasureTypeDto.class}; } #relationTable { border:{new TitledBorder(t("observe.common.equation"))}; } -#lengthWeightFormulaInformation { +#inputOutputFormulaInformation { font-size:11; - text:"observe.content.label.lengthWeightFormula.info"; + text:"observe.content.label.inputOutputFormula.info"; actionIcon:"information"; } -#lengthWeightFormulaLabel { - text:"observe.common.lengthWeightFormula"; - labelFor:{lengthWeightFormula}; +#inputOutputFormulaLabel { + text:"observe.common.inputOutputFormula"; + labelFor:{inputOutputFormula}; } -#lengthWeightFormula { - text:{getStringValue(bean.getLengthWeightFormula())}; +#inputOutputFormula { + text:{getStringValue(getBean().getInputOutputFormula())}; } -#weightLengthFormulaInformation { +#outputInputFormulaInformation { font-size:11; - text:"observe.content.label.weightLengthFormula.info"; + text:"observe.content.label.outputInputFormula.info"; actionIcon:"information"; } -#weightLengthFormulaLabel { - text:"observe.common.weightLengthFormula"; - labelFor:{weightLengthFormula}; +#outputInputFormulaLabel { + text:"observe.common.outputInputFormula"; + labelFor:{outputInputFormula}; } -#weightLengthFormula { - text:{getStringValue(bean.getWeightLengthFormula())}; +#outputInputFormula { + text:{getStringValue(getBean().getOutputInputFormula())}; } #coefficientsInformation { @@ -126,30 +116,6 @@ text:{getStringValue(bean.getCoefficients())}; } -#meanValuesTable { - border:{new TitledBorder(t("observe.common.meanValues"))}; -} - -#meanLengthLabel { - text:"observe.common.meanLength"; - labelFor:{meanLength}; -} - -#meanLength { - property:{LengthWeightParameterDto.PROPERTY_MEAN_LENGTH}; - model:{bean.getMeanLength()}; -} - -#meanWeightLabel { - text:"observe.common.meanWeight"; - labelFor:{meanWeight}; -} - -#meanWeight { - property:{LengthWeightParameterDto.PROPERTY_MEAN_WEIGHT}; - model:{bean.getMeanWeight()}; -} - #sourceLabel { text:"observe.common.source"; labelFor:{sourceField}; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthLengthParameterUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthLengthParameterUIHandler.java new file mode 100644 index 0000000..b0a645b --- /dev/null +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthLengthParameterUIHandler.java @@ -0,0 +1,102 @@ +package fr.ird.observe.application.swing.ui.content.ref.impl; + +/* + * #%L + * ObServe :: Application Swing + * %% + * Copyright (C) 2008 - 2016 IRD, Code Lutin, Tony Chemit + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI; +import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler; +import fr.ird.observe.services.dto.referential.LengthLengthParameterDto; +import fr.ird.observe.services.dto.referential.ReferentialReference; +import jaxx.runtime.validator.swing.SwingValidatorMessage; +import jaxx.runtime.validator.swing.SwingValidatorMessageTableModel; +import org.nuiton.validator.NuitonValidatorScope; + +import javax.swing.event.TableModelListener; +import java.util.HashSet; +import java.util.Set; + +/** + * Created on 9/11/16. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 5.1 + */ +public class LengthLengthParameterUIHandler extends ContentReferenceUIHandler<LengthLengthParameterDto> { + + // Compute valid state of tab from the error table + protected final TableModelListener computeTabValidStateListener; + + public LengthLengthParameterUIHandler(ContentReferenceUI<LengthLengthParameterDto> ui) { + super(ui); + computeTabValidStateListener = e -> { + + SwingValidatorMessageTableModel source = (SwingValidatorMessageTableModel) e.getSource(); + computeTabValidState(source); + + }; + } + + @Override + public void initUI() { + + super.initUI(); + + // To be sure always remove listener (could prevent some leaks) + getUi().getErrorTableModel().removeTableModelListener(computeTabValidStateListener); + // listen messages to see if required to add + getUi().getErrorTableModel().addTableModelListener(computeTabValidStateListener); + + } + + @Override + public void selectBean(ReferentialReference<LengthLengthParameterDto> selectedBean) { + + super.selectBean(selectedBean); + + SwingValidatorMessageTableModel errorTableModel = getUi().getErrorTableModel(); + computeTabValidState(errorTableModel); + + ((LengthLengthParameterUI) getUi()).getTabPane().setSelectedIndex(0); + + } + + protected void computeTabValidState(SwingValidatorMessageTableModel errorTableModel) { + + Set<String> errorProperties = new HashSet<>(); + int rowCount = errorTableModel.getRowCount(); + for (int i = 0; i < rowCount; i++) { + + SwingValidatorMessage row = errorTableModel.getRow(i); + if (NuitonValidatorScope.ERROR.equals(row.getScope())) { + errorProperties.add(row.getField()); + } + } + + boolean generalTabValid = !errorProperties.removeAll(LengthLengthParameterUIModel.GENERAL_TAB_PROPERTIES); + boolean otherTabValid = !errorProperties.removeAll(LengthLengthParameterUIModel.OTHER_TAB_PROPERTIES); + + LengthLengthParameterUIModel model = (LengthLengthParameterUIModel) getModel(); + model.setGeneralTabValid(generalTabValid); + model.setOtherTabValid(otherTabValid); + + } +} diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthWeightParameterUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthLengthParameterUIModel.java similarity index 53% copy from application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthWeightParameterUIModel.java copy to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthLengthParameterUIModel.java index 505551c..cb487f5 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthWeightParameterUIModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthLengthParameterUIModel.java @@ -23,43 +23,38 @@ package fr.ird.observe.application.swing.ui.content.ref.impl; */ import com.google.common.collect.ImmutableSet; -import fr.ird.observe.services.dto.referential.LengthWeightParameterDto; import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIModel; +import fr.ird.observe.services.dto.referential.LengthLengthParameterDto; import java.util.Set; /** - * Created on 9/27/14. + * Created on 11/5/16. * * @author Tony Chemit - chemit@codelutin.com - * @since XXX + * @since 5.1 */ -public class LengthWeightParameterUIModel extends ContentReferenceUIModel<LengthWeightParameterDto> { +public class LengthLengthParameterUIModel extends ContentReferenceUIModel<LengthLengthParameterDto> { public static final String PROPERTY_GENERAL_TAB_VALID = "generalTabValid"; public static final String PROPERTY_OTHER_TAB_VALID = "otherTabValid"; public static final Set<String> GENERAL_TAB_PROPERTIES = - ImmutableSet.<String>builder().add(LengthWeightParameterDto.PROPERTY_URI, - LengthWeightParameterDto.PROPERTY_CODE, - LengthWeightParameterDto.PROPERTY_STATUS, - LengthWeightParameterDto.PROPERTY_SEX, - LengthWeightParameterDto.PROPERTY_OCEAN, - LengthWeightParameterDto.PROPERTY_SPECIES, - LengthWeightParameterDto.PROPERTY_NEED_COMMENT, - LengthWeightParameterDto.PROPERTY_SOURCE, - LengthWeightParameterDto.PROPERTY_START_DATE, - LengthWeightParameterDto.PROPERTY_END_DATE).build(); + ImmutableSet.<String>builder().add(LengthLengthParameterDto.PROPERTY_URI, + LengthLengthParameterDto.PROPERTY_CODE, + LengthLengthParameterDto.PROPERTY_STATUS, + LengthLengthParameterDto.PROPERTY_NEED_COMMENT, + LengthLengthParameterDto.PROPERTY_SOURCE, + LengthLengthParameterDto.PROPERTY_OUTPUT_SIZE_MEASURE_TYPE, + LengthLengthParameterDto.PROPERTY_INPUT_SIZE_MEASURE_TYPE).build(); public static final Set<String> OTHER_TAB_PROPERTIES = - ImmutableSet.<String>builder().add(LengthWeightParameterDto.PROPERTY_MEAN_LENGTH, - LengthWeightParameterDto.PROPERTY_MEAN_WEIGHT, - LengthWeightParameterDto.PROPERTY_WEIGHT_LENGTH_FORMULA, - LengthWeightParameterDto.PROPERTY_WEIGHT_LENGTH_FORMULA_VALID, - LengthWeightParameterDto.PROPERTY_LENGTH_WEIGHT_FORMULA, - LengthWeightParameterDto.PROPERTY_LENGTH_WEIGHT_FORMULA_VALID, - LengthWeightParameterDto.PROPERTY_COEFFICIENTS).build(); + ImmutableSet.<String>builder().add(LengthLengthParameterDto.PROPERTY_INPUT_OUTPUT_FORMULA, + LengthLengthParameterDto.PROPERTY_INPUT_OUTPUT_FORMULA_VALID, + LengthLengthParameterDto.PROPERTY_OUTPUT_INPUT_FORMULA, + LengthLengthParameterDto.PROPERTY_OUTPUT_INPUT_FORMULA_VALID, + LengthLengthParameterDto.PROPERTY_COEFFICIENTS).build(); private static final long serialVersionUID = 1L; @@ -67,16 +62,20 @@ public class LengthWeightParameterUIModel extends ContentReferenceUIModel<Length protected boolean otherTabValid; - public LengthWeightParameterUIModel() { - super(LengthWeightParameterDto.class, + public LengthLengthParameterUIModel() { + super(LengthLengthParameterDto.class, null, new String[]{ - LengthWeightParameterDto.PROPERTY_SEX, - LengthWeightParameterDto.PROPERTY_OCEAN, - LengthWeightParameterDto.PROPERTY_SPECIES, - LengthWeightParameterDto.PROPERTY_START_DATE, + LengthLengthParameterDto.PROPERTY_INPUT_SIZE_MEASURE_TYPE, + LengthLengthParameterDto.PROPERTY_OUTPUT_SIZE_MEASURE_TYPE, }, - null + new String[]{ + LengthLengthParameterUI.BINDING_INPUT_SIZE_MEASURE_TYPE_SELECTED_ITEM, + LengthLengthParameterUI.BINDING_INPUT_OUTPUT_FORMULA_TEXT, + LengthLengthParameterUI.BINDING_OUTPUT_SIZE_MEASURE_TYPE_SELECTED_ITEM, + LengthLengthParameterUI.BINDING_OUTPUT_INPUT_FORMULA_TEXT, + } + ); } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthWeightParameterUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthWeightParameterUI.jaxx index 8ffa384..f6bf375 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthWeightParameterUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthWeightParameterUI.jaxx @@ -28,6 +28,7 @@ fr.ird.observe.services.dto.constants.ReferenceStatus fr.ird.observe.services.dto.referential.ReferentialReference fr.ird.observe.services.dto.referential.SexDto + fr.ird.observe.services.dto.referential.SizeMeasureTypeDto fr.ird.observe.services.dto.referential.SpeciesDto fr.ird.observe.services.dto.referential.OceanDto fr.ird.observe.services.dto.referential.LengthWeightParameterDto @@ -48,10 +49,8 @@ </import> <!-- validator --> - <BeanValidator id='validator' autoField='true' - beanClass='fr.ird.observe.services.dto.referential.LengthWeightParameterDto' - context='ui-create' - errorTableModel='{getErrorTableModel()}'/> + <BeanValidator id='validator' autoField='true' context='ui-create' errorTableModel='{getErrorTableModel()}' + beanClass='fr.ird.observe.services.dto.referential.LengthWeightParameterDto'/> <!-- model --> <LengthWeightParameterUIModel id='model'/> @@ -93,8 +92,7 @@ public void decorateUniqueKeyTable(JTable table, <JLabel id='sexLabel'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <BeanComboBox id='sex' constructorParams='this' - genericType='ReferentialReference<SexDto>' _entityClass='SexDto.class'/> + <BeanComboBox id='sex' constructorParams='this' genericType='ReferentialReference<SexDto>'/> </cell> </row> @@ -105,7 +103,7 @@ public void decorateUniqueKeyTable(JTable table, </cell> <cell anchor='east' weightx="1" fill="both"> <BeanComboBox id='species' constructorParams='this' - genericType='ReferentialReference<SpeciesDto>' _entityClass='SpeciesDto.class'/> + genericType='ReferentialReference<SpeciesDto>'/> </cell> </row> @@ -115,8 +113,18 @@ public void decorateUniqueKeyTable(JTable table, <JLabel id='oceanLabel'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <BeanComboBox id='ocean' constructorParams='this' - genericType='ReferentialReference<OceanDto>' _entityClass='OceanDto.class'/> + <BeanComboBox id='ocean' constructorParams='this' genericType='ReferentialReference<OceanDto>'/> + </cell> + </row> + + <!-- sizeMeasuretype --> + <row> + <cell anchor='west'> + <JLabel id='sizeMeasureTypeLabel'/> + </cell> + <cell anchor='east' weightx="1" fill="both"> + <BeanComboBox id='sizeMeasureType' constructorParams='this' + genericType='ReferentialReference<SizeMeasureTypeDto>'/> </cell> </row> @@ -127,10 +135,8 @@ public void decorateUniqueKeyTable(JTable table, </cell> <cell anchor='west' weightx="1" fill="both"> <JPanel layout='{new GridLayout()}'> - <JXDatePicker id='startDate' - onActionPerformed='getBean().setStartDate(startDate.getDate())'/> - <JXDatePicker id='endDate' - onActionPerformed='getBean().setEndDate(endDate.getDate())'/> + <JXDatePicker id='startDate' onActionPerformed='getBean().setStartDate(startDate.getDate())'/> + <JXDatePicker id='endDate' onActionPerformed='getBean().setEndDate(endDate.getDate())'/> </JPanel> </cell> </row> @@ -151,8 +157,7 @@ public void decorateUniqueKeyTable(JTable table, <JLabel id='statusLabel'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <EnumEditor id='status' constructorParams='ReferenceStatus.class' - genericType='ReferenceStatus' + <EnumEditor id='status' constructorParams='ReferenceStatus.class' genericType='ReferenceStatus' onItemStateChanged='getBean().setStatus((ReferenceStatus)status.getSelectedItem())'/> </cell> </row> @@ -160,8 +165,7 @@ public void decorateUniqueKeyTable(JTable table, <!-- needComment --> <row> <cell anchor='east' weightx="1" fill="both" columns="2"> - <JCheckBox id='needComment' - onItemStateChanged='getBean().setNeedComment(needComment.isSelected())'/> + <JCheckBox id='needComment' onItemStateChanged='getBean().setNeedComment(needComment.isSelected())'/> </cell> </row> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthWeightParameterUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthWeightParameterUI.jcss index 2657acf..0857dbd 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthWeightParameterUI.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthWeightParameterUI.jcss @@ -46,12 +46,14 @@ property:{LengthWeightParameterDto.PROPERTY_SEX}; selectedItem:{bean.getSex()}; enabled:{model.isCreatingMode()}; + _entityClass:{SexDto.class}; } #species { property:{LengthWeightParameterDto.PROPERTY_SPECIES}; selectedItem:{bean.getSpecies()}; enabled:{model.isCreatingMode()}; + _entityClass:{SpeciesDto.class}; } #oceanLabel { @@ -64,8 +66,23 @@ property:{LengthWeightParameterDto.PROPERTY_OCEAN}; selectedItem:{bean.getOcean()}; enabled:{model.isCreatingMode()}; + _entityClass:{OceanDto.class}; } +#sizeMeasureTypeLabel { + text:"observe.common.sizeMeasureType"; + font-style:"italic"; + labelFor:{sizeMeasureType}; +} + +#sizeMeasureType { + property:{LengthWeightParameterDto.PROPERTY_SIZE_MEASURE_TYPE}; + selectedItem:{bean.getSizeMeasureType()}; + enabled:{model.isCreatingMode()}; + _entityClass:{SizeMeasureTypeDto.class}; +} + + #startDateFinValiditeLabel { text:"observe.common.startDateFinValidite"; font-style:"italic"; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthWeightParameterUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthWeightParameterUIModel.java index 505551c..49a61c1 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthWeightParameterUIModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthWeightParameterUIModel.java @@ -25,6 +25,7 @@ package fr.ird.observe.application.swing.ui.content.ref.impl; import com.google.common.collect.ImmutableSet; import fr.ird.observe.services.dto.referential.LengthWeightParameterDto; import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIModel; +import fr.ird.observe.services.dto.referential.SpeciesDto; import java.util.Set; @@ -49,6 +50,7 @@ public class LengthWeightParameterUIModel extends ContentReferenceUIModel<Length LengthWeightParameterDto.PROPERTY_SPECIES, LengthWeightParameterDto.PROPERTY_NEED_COMMENT, LengthWeightParameterDto.PROPERTY_SOURCE, + LengthWeightParameterDto.PROPERTY_SIZE_MEASURE_TYPE, LengthWeightParameterDto.PROPERTY_START_DATE, LengthWeightParameterDto.PROPERTY_END_DATE).build(); @@ -74,6 +76,7 @@ public class LengthWeightParameterUIModel extends ContentReferenceUIModel<Length LengthWeightParameterDto.PROPERTY_SEX, LengthWeightParameterDto.PROPERTY_OCEAN, LengthWeightParameterDto.PROPERTY_SPECIES, + LengthWeightParameterDto.PROPERTY_SIZE_MEASURE_TYPE, LengthWeightParameterDto.PROPERTY_START_DATE, }, null diff --git a/application-swing/src/main/resources/i18n/application-swing_en_GB.properties b/application-swing/src/main/resources/i18n/application-swing_en_GB.properties index 7427f4e..c8d7047 100644 --- a/application-swing/src/main/resources/i18n/application-swing_en_GB.properties +++ b/application-swing/src/main/resources/i18n/application-swing_en_GB.properties @@ -401,6 +401,8 @@ observe.common.homeId=Home id observe.common.homeIdFAOWormsId=Home id / Fao / Worms observe.common.iattcId=ICCAT Id observe.common.imoId=IMO Id +observe.common.inputOutputFormula=Input to Output formula +observe.common.inputSizeMeasureType=Input size measure type observe.common.iso2Code=Iso 2 code observe.common.iso3Code=Iso 3 code observe.common.keelCodeFlotte=Keel / Flotte @@ -462,6 +464,8 @@ observe.common.ocean=Ocean observe.common.oceanForSpecies=oceans list observe.common.operation.resume=Summary of operations observe.common.organism=Organism +observe.common.outputInputFormula=Ouput to Input formula +observe.common.outputSizeMeasureType=output size measure type observe.common.ownership=Ownership observe.common.picturesReferences=Pictures references observe.common.power=Power @@ -906,10 +910,14 @@ observe.content.hooksComposition.table.proportion=Proportion observe.content.hooksComposition.table.proportion.tip=Proportion observe.content.hooksComposition.title=Hooks observe.content.label.coefficients.info=Coefficients of relations msut follow the syntax name\=value and are separated by \: (example \: a\=1\:b\=2\:c\=3) +observe.content.label.inputOutputFormula.info=Input to Ouput formula permits to compute output length from the input length, must contains variable I observe.content.label.lengthWeightFormula.info=Length weight formula permits to compute weight from the length, must contains variable L +observe.content.label.outputInputFormula.info=Ouput to Input formula permits to compute input length from the output length, must contains variable O observe.content.label.usage.data.title=Data '%1$s' (%2$d occurrences) observe.content.label.usage.referentiel.title=Referentiel '%1$s' (%2$d occurrences) observe.content.label.weightLengthFormula.info=Weight length formula permits to compute length from the weight, must contains variable P +observe.content.lengthLengthParameter.tab.general=General caracteristics +observe.content.lengthLengthParameter.tab.other=Other caracteristics observe.content.lengthWeightParameter.tab.general=General caracteristics observe.content.lengthWeightParameter.tab.other=Other caracteristics observe.content.longlineDetailComposition.action.deleteAllSections=Remove all diff --git a/application-swing/src/main/resources/i18n/application-swing_es_ES.properties b/application-swing/src/main/resources/i18n/application-swing_es_ES.properties index d4ee3ba..ebc5a15 100644 --- a/application-swing/src/main/resources/i18n/application-swing_es_ES.properties +++ b/application-swing/src/main/resources/i18n/application-swing_es_ES.properties @@ -401,6 +401,8 @@ observe.common.homeId=Identificador observe.common.homeIdFAOWormsId=Código 3L / FAO / Worms observe.common.iattcId=Id CICAA observe.common.imoId=Id IMO +observe.common.inputOutputFormula=Formule entrée -> sortie \#TODO +observe.common.inputSizeMeasureType=Type de mensuration d'entrée \#TODO observe.common.iso2Code=Código ISO-2 observe.common.iso3Code=Código ISO-3 observe.common.keelCodeFlotte=Código de Quilla / Flota @@ -462,6 +464,8 @@ observe.common.ocean=Océano observe.common.oceanForSpecies=Lista de los oceanos observe.common.operation.resume=Resumen de operaciones observe.common.organism=Organismo +observe.common.outputInputFormula=Formule sortie -> entrée \#TODO +observe.common.outputSizeMeasureType=Type de mensuration de sortie \#TODO observe.common.ownership=Pertenece a observe.common.picturesReferences=Referencia de foto observe.common.power=Potencia del motor principal @@ -906,10 +910,14 @@ observe.content.hooksComposition.table.proportion=Proporción (%) observe.content.hooksComposition.table.proportion.tip=Proporción (%) observe.content.hooksComposition.title=Composición de los anzuelos observe.content.label.coefficients.info=Los coeficientes de relaciones son de la forma lastName\=valor y están separados por \: (ejemplo \: a\=1\:b\=2\:c\=3) +observe.content.label.inputOutputFormula.info=La relation poids permet de calculer la taille de sortie à partir de la taille d'entrée, elle doit contenir la variable I \#TODO observe.content.label.lengthWeightFormula.info=La relación talla-peso permite calcular el peso a partir de la talla, debe contener la variable L +observe.content.label.outputInputFormula.info=La relation poids permet de calculer la taille d'entrée à partir de la taille de sortie, elle doit contenir la variable O \#TODO observe.content.label.usage.data.title=Datos '%1$s' (%2$d ocurrencias) observe.content.label.usage.referentiel.title=Referencial '%1$s' (%2$d ocurrencias) observe.content.label.weightLengthFormula.info=la relación talla-peso permite calcular la talla a partir del peso, debe contener la varible P +observe.content.lengthLengthParameter.tab.general=Características generales +observe.content.lengthLengthParameter.tab.other=Otras características observe.content.lengthWeightParameter.tab.general=Características generales observe.content.lengthWeightParameter.tab.other=Otras características observe.content.longlineDetailComposition.action.deleteAllSections=Eliminar todo diff --git a/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties b/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties index 0212c82..e629cda 100644 --- a/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties +++ b/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties @@ -401,6 +401,8 @@ observe.common.homeId=Identifiant observe.common.homeIdFAOWormsId=Code 3L / FAO / Worms observe.common.iattcId=Id CICTA observe.common.imoId=Id IMO +observe.common.inputOutputFormula=Formule entrée -> sortie +observe.common.inputSizeMeasureType=Type de mensuration d'entrée observe.common.iso2Code=code ISO-2 observe.common.iso3Code=Code ISO-3 observe.common.keelCodeFlotte=Code quille /Code flotte @@ -462,6 +464,8 @@ observe.common.ocean=Océan observe.common.oceanForSpecies=Liste des océans observe.common.operation.resume=Résumé des opérations observe.common.organism=Organisme +observe.common.outputInputFormula=Formule sortie -> entrée +observe.common.outputSizeMeasureType=Type de mensuration de sortie observe.common.ownership=Appartenance observe.common.picturesReferences=Référence Photo observe.common.power=Puissance moteur principal @@ -906,10 +910,14 @@ observe.content.hooksComposition.table.proportion=Proportion (%) observe.content.hooksComposition.table.proportion.tip=Proportion (%) observe.content.hooksComposition.title=Composition des hameçons observe.content.label.coefficients.info=Les coefficients des relations sont de la forme nom\=valeur et sont séparé par des \: (exemple \: a\=1\:b\=2\:c\=3) +observe.content.label.inputOutputFormula.info=La relation poids permet de calculer la taille de sortie à partir de la taille d'entrée, elle doit contenir la variable I observe.content.label.lengthWeightFormula.info=La relation poids permet de calculer le poids à partir de la taille, elle doit contenir la variable L +observe.content.label.outputInputFormula.info=La relation poids permet de calculer la taille d'entrée à partir de la taille de sortie, elle doit contenir la variable O observe.content.label.usage.data.title=Donnée '%1$s' (%2$d occurrences) observe.content.label.usage.referentiel.title=Référentiel '%1$s' (%2$d occurrences) observe.content.label.weightLengthFormula.info=La relation taille permet de calculer la taille à partir du poids, elle doit contenir la variable P +observe.content.lengthLengthParameter.tab.general=Caractéristiques générales +observe.content.lengthLengthParameter.tab.other=Autres caractéristiques observe.content.lengthWeightParameter.tab.general=Caractéristiques générales observe.content.lengthWeightParameter.tab.other=Autres caractéristiques observe.content.longlineDetailComposition.action.deleteAllSections=Tout supprimer -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.

This is an automated email from the git hooks/post-receive script. New commit to branch feature/8404 in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit b10613f57eca0986bdea7ce9fcf5bc924e0397c4 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Nov 5 16:43:17 2016 +0100 il se peut que la date max n'existe pas. --- .../ird/observe/services/topia/service/LastUpdateDateServiceTopia.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/LastUpdateDateServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/LastUpdateDateServiceTopia.java index 354d8b5..8c2312c 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/LastUpdateDateServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/LastUpdateDateServiceTopia.java @@ -99,7 +99,7 @@ public class LastUpdateDateServiceTopia extends ObserveServiceTopia implements L } }); - if (lastUpdateDate.getLastUpdateDate().before(maxLastUpdateDate)) { + if (maxLastUpdateDate != null && lastUpdateDate.getLastUpdateDate().before(maxLastUpdateDate)) { if (log.isInfoEnabled()) { log.info("Update LastUpdateDate for " + entityType.getName() + " with value: " + maxLastUpdateDate); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.

This is an automated email from the git hooks/post-receive script. New commit to branch feature/8404 in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 6ad0fd792a750f9ee834aee4ed45d6f67efe69d8 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Nov 5 16:44:50 2016 +0100 correction scripts de migration --- .../db/migration/5.1/V5_1_13_evol_7901_add_armateur_table-H2.sql | 2 +- .../db/migration/5.1/V5_1_13_evol_7901_add_armateur_table-PG.sql | 2 +- .../db/migration/5.1/V5_1_18_evol_8404_lengthLengthParameter-H2.sql | 2 +- .../db/migration/5.1/V5_1_18_evol_8404_lengthLengthParameter-PG.sql | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/entities-migration/src/main/resources/db/migration/5.1/V5_1_13_evol_7901_add_armateur_table-H2.sql b/entities-migration/src/main/resources/db/migration/5.1/V5_1_13_evol_7901_add_armateur_table-H2.sql index 48fb398..b489d99 100644 --- a/entities-migration/src/main/resources/db/migration/5.1/V5_1_13_evol_7901_add_armateur_table-H2.sql +++ b/entities-migration/src/main/resources/db/migration/5.1/V5_1_13_evol_7901_add_armateur_table-H2.sql @@ -52,7 +52,7 @@ INSERT INTO observe_common.shipOwner (topiaid, topiaversion, topiacreatedate, la INSERT INTO observe_common.shipOwner (topiaid, topiaversion, topiacreatedate, lastupdatedate, status, code, label, country, needComment) values ('fr.ird.observe.entities.referentiel.ShipOwner#0#25', 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, '26','NICRA', 'fr.ird.observe.entities.referentiel.Country#1239832675584#0.0783072255559325', false); INSERT INTO observe_common.shipOwner (topiaid, topiaversion, topiacreatedate, lastupdatedate, status, code, label, needComment) values ('fr.ird.observe.entities.referentiel.ShipOwner#0#26', 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, '999','UND', true); -INSERT INTO observe_common.LASTUPDATEDATE (topiaId, topiaversion, topiacreatedate, TYPE , LASTUPDATEDATE) values ('fr.ird.observe.entities.referentiel.LastUpdateDate#666#1', 0,CURRENT_DATE, 'fr.ird.observe.entities.referentiel.ShipOwner', CURRENT_TIMESTAMP); +INSERT INTO observe_common.LASTUPDATEDATE (topiaId, topiaversion, topiacreatedate, TYPE , LASTUPDATEDATE) values ('fr.ird.observe.entities.LastUpdateDate#666#1', 0,CURRENT_DATE, 'fr.ird.observe.entities.referentiel.ShipOwner', CURRENT_TIMESTAMP); ALTER TABLE observe_common.vessel ADD COLUMN shipOwner VARCHAR(255); ALTER TABLE observe_common.vessel ADD CONSTRAINT FK_VESSEL_SHIP_OWNER FOREIGN KEY(shipOwner) REFERENCES observe_common.shipOwner(topiaid); diff --git a/entities-migration/src/main/resources/db/migration/5.1/V5_1_13_evol_7901_add_armateur_table-PG.sql b/entities-migration/src/main/resources/db/migration/5.1/V5_1_13_evol_7901_add_armateur_table-PG.sql index 4093e02..c97f4e4 100644 --- a/entities-migration/src/main/resources/db/migration/5.1/V5_1_13_evol_7901_add_armateur_table-PG.sql +++ b/entities-migration/src/main/resources/db/migration/5.1/V5_1_13_evol_7901_add_armateur_table-PG.sql @@ -52,7 +52,7 @@ INSERT INTO observe_common.shipOwner (topiaid, topiaversion, topiacreatedate, la INSERT INTO observe_common.shipOwner (topiaid, topiaversion, topiacreatedate, lastupdatedate, status, code, label, country) values ('fr.ird.observe.entities.referentiel.ShipOwner#0#25', 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, '26','NICRA', 'fr.ird.observe.entities.referentiel.Country#1239832675584#0.0783072255559325'); INSERT INTO observe_common.shipOwner (topiaid, topiaversion, topiacreatedate, lastupdatedate, status, code, label, needComment) values ('fr.ird.observe.entities.referentiel.ShipOwner#0#26', 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, '999','UND', true); -INSERT INTO observe_common.LASTUPDATEDATE (topiaId, topiaversion, topiacreatedate, TYPE , LASTUPDATEDATE) values ('fr.ird.observe.entities.referentiel.LastUpdateDate#666#1', 0,CURRENT_DATE, 'fr.ird.observe.entities.referentiel.ShipOwner', CURRENT_TIMESTAMP); +INSERT INTO observe_common.LASTUPDATEDATE (topiaId, topiaversion, topiacreatedate, TYPE , LASTUPDATEDATE) values ('fr.ird.observe.entities.LastUpdateDate#666#1', 0,CURRENT_DATE, 'fr.ird.observe.entities.referentiel.ShipOwner', CURRENT_TIMESTAMP); ALTER TABLE observe_common.vessel ADD COLUMN shipOwner character varying(255); ALTER TABLE observe_common.vessel ADD CONSTRAINT FK_VESSEL_SHIP_OWNER FOREIGN KEY(shipOwner) REFERENCES observe_common.shipOwner(topiaid); diff --git a/entities-migration/src/main/resources/db/migration/5.1/V5_1_18_evol_8404_lengthLengthParameter-H2.sql b/entities-migration/src/main/resources/db/migration/5.1/V5_1_18_evol_8404_lengthLengthParameter-H2.sql index 0f7a390..a69fca5 100644 --- a/entities-migration/src/main/resources/db/migration/5.1/V5_1_18_evol_8404_lengthLengthParameter-H2.sql +++ b/entities-migration/src/main/resources/db/migration/5.1/V5_1_18_evol_8404_lengthLengthParameter-H2.sql @@ -11,4 +11,4 @@ ALTER TABLE observe_common.lengthlengthparameter ADD CONSTRAINT fk_lengthlengthp CREATE INDEX index_observe_common_lengthlengthparameter_lastupdatedate ON observe_common.lengthlengthparameter (lastupdatedate); -INSERT INTO observe_common.LASTUPDATEDATE (topiaId, topiaversion, topiacreatedate, TYPE , LASTUPDATEDATE) values ('fr.ird.observe.entities.referentiel.LastUpdateDate#666#2', 0,CURRENT_DATE, 'fr.ird.observe.entities.referentiel.LengthLengthParameter', CURRENT_TIMESTAMP); +INSERT INTO observe_common.LASTUPDATEDATE (topiaId, topiaversion, topiacreatedate, TYPE , LASTUPDATEDATE) values ('fr.ird.observe.entities.LastUpdateDate#666#2', 0,CURRENT_DATE, 'fr.ird.observe.entities.referentiel.LengthLengthParameter', CURRENT_TIMESTAMP); diff --git a/entities-migration/src/main/resources/db/migration/5.1/V5_1_18_evol_8404_lengthLengthParameter-PG.sql b/entities-migration/src/main/resources/db/migration/5.1/V5_1_18_evol_8404_lengthLengthParameter-PG.sql index 54f8d18..eee685e 100644 --- a/entities-migration/src/main/resources/db/migration/5.1/V5_1_18_evol_8404_lengthLengthParameter-PG.sql +++ b/entities-migration/src/main/resources/db/migration/5.1/V5_1_18_evol_8404_lengthLengthParameter-PG.sql @@ -11,4 +11,4 @@ ALTER TABLE observe_common.lengthlengthparameter ADD CONSTRAINT fk_lengthlengthp CREATE INDEX index_observe_common_lengthlengthparameter_lastupdatedate ON lengthlengthparameter (lastupdatedate); -INSERT INTO observe_common.LASTUPDATEDATE (topiaId, topiaversion, topiacreatedate, TYPE , LASTUPDATEDATE) values ('fr.ird.observe.entities.referentiel.LastUpdateDate#666#2', 0,CURRENT_DATE, 'fr.ird.observe.entities.referentiel.LengthLengthParameter', CURRENT_TIMESTAMP); +INSERT INTO observe_common.LASTUPDATEDATE (topiaId, topiaversion, topiacreatedate, TYPE , LASTUPDATEDATE) values ('fr.ird.observe.entities.LastUpdateDate#666#2', 0,CURRENT_DATE, 'fr.ird.observe.entities.referentiel.LengthLengthParameter', CURRENT_TIMESTAMP); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.