branch feature/6855 updated (8980667 -> 078d4d5)
This is an automated email from the git hooks/post-receive script. New change to branch feature/6855 in repository observe. See http://git.codelutin.com/observe.git discards 8980667 i18n discards cdd899d refs #6855 ecran autonome pour les equipements d'une marée seine discards 3d4f947 utilisation de clefs i18n specifiques pour les noeuds de l'arbre de navigation discards 1664d37 pouvoir decorer les propriétés avec un autre prefixe + passage en méthode statique discards 260d44f correction du calcul des données dans le contexte discards bcac9e7 correction du warning sur le nombre d'équipements d'une marée seine discards 689034b ajout d'une validation sur le pays d'un balise discards 11dd926 refs #6855: debut d'interface graphique discards 4b99b40 refs #6855: pas possible d'avoir des not-null sur les relations inverses discards efa7bed refs #6855: ajout données equipements pour la seine des traductions + correction du la dll discards 5f2ad23 refs #6855: add seine gear data + remove old seine data discards 1c1665e refs #6855: add seine gear data + remove old seine data discards ab86358 refs #6855: add referentials adds 5e5dc08 add .gitignore adds 4165eb4 passage sous git et utilisation de codelutinpom adds cb365f6 refs #6904 correction de la disposition adds 8946a1d fixes #6904: Mauvais disposition sur l'écran des activités senne Merge branch 'feature/6904' into develop adds dcf8ebd passage sous git et utilisation de codelutinpom adds 55e94f8 refs #6875 correction de la mise en page du formulaire détail avançon adds 3832e63 fixes #6875: Mise en page du formulaireComposition détaillée/Détail avançon Merge branch 'feature/6875' into develop new 875eee4 refs #6855: add referentials new ac39262 refs #6855: add seine gear data + remove old seine data new 991e8cd refs #6855: add seine gear data + remove old seine data new e563e3b refs #6855: ajout données equipements pour la seine des traductions + correction du la dll new 5fc039a refs #6855: pas possible d'avoir des not-null sur les relations inverses new 48b30c8 refs #6855: debut d'interface graphique new de9e812 ajout d'une validation sur le pays d'un balise new 6ceee17 correction du warning sur le nombre d'équipements d'une marée seine new 441cee8 correction du calcul des données dans le contexte new 38fdbc9 pouvoir decorer les propriétés avec un autre prefixe + passage en méthode statique new 1847c06 utilisation de clefs i18n specifiques pour les noeuds de l'arbre de navigation new 3d15ec0 refs #6855 ecran autonome pour les equipements d'une marée seine new 078d4d5 i18n This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (8980667) \ N -- N -- N refs/heads/feature/6855 (078d4d5) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omits" are not gone; other references still refer to them. Any revisions marked "discards" are gone forever. The 13 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 078d4d575128a1c95bbff918d400cab4efc6dac0 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Apr 6 19:15:39 2015 +0200 i18n commit 3d15ec0b19d16a306ad622aa840bb99e9cd61fcd Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Apr 6 19:15:22 2015 +0200 refs #6855 ecran autonome pour les equipements d'une marée seine commit 1847c06a85add11eb5a305cd046d0bd59a4ca5bf Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Apr 6 19:14:00 2015 +0200 utilisation de clefs i18n specifiques pour les noeuds de l'arbre de navigation commit 38fdbc9f1ed01b1fc45bb668caa72c5384813ff9 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Apr 6 19:12:36 2015 +0200 pouvoir decorer les propriétés avec un autre prefixe + passage en méthode statique commit 441cee8d47de35050efa34297af97c76eb5986e5 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Apr 6 19:10:18 2015 +0200 correction du calcul des données dans le contexte commit 6ceee17c5600d8eabe43387e99ab61c6d264cdf3 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Apr 6 19:08:51 2015 +0200 correction du warning sur le nombre d'équipements d'une marée seine commit de9e8127e601b321d2ec1d404f2c9950d817289d Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Apr 6 19:08:31 2015 +0200 ajout d'une validation sur le pays d'un balise commit 48b30c868253f39ba71c8f418677ddcfd57febed Author: Tony Chemit <chemit@codelutin.com> Date: Tue Mar 24 16:39:13 2015 +0000 refs #6855: debut d'interface graphique commit 5fc039a4aa40cf1caa6ea0966f469b95037a991f Author: Tony Chemit <chemit@codelutin.com> Date: Tue Mar 24 16:38:22 2015 +0000 refs #6855: pas possible d'avoir des not-null sur les relations inverses commit e563e3b7800331be2515b0f39d921fe1f16e5eb5 Author: Tony Chemit <chemit@codelutin.com> Date: Tue Mar 24 14:21:38 2015 +0000 refs #6855: ajout données equipements pour la seine des traductions + correction du la dll commit 991e8cdcbb3cf4ef1238647b20e3539ac0c366ba Author: Tony Chemit <chemit@codelutin.com> Date: Tue Mar 24 09:03:10 2015 +0000 refs #6855: add seine gear data + remove old seine data commit ac3926208390b66ed609fae187d0905b9e676aff Author: Tony Chemit <chemit@codelutin.com> Date: Tue Mar 24 09:03:00 2015 +0000 refs #6855: add seine gear data + remove old seine data commit 875eee4dc4ccc18b7c879cfd18a6739378fe7dff Author: Tony Chemit <chemit@codelutin.com> Date: Mon Mar 23 19:14:21 2015 +0000 refs #6855: add referentials Summary of changes: .gitignore | 12 +++ observe-business/pom.xml | 60 +----------- observe-entities/pom.xml | 108 +-------------------- observe-swing/pom.xml | 3 +- .../ui/content/impl/longline/BranchlineUI.jaxx | 15 +-- .../impl/longline/LonglineDetailCompositionUI.jaxx | 9 +- .../LonglineDetailCompositionUIInitializer.java | 6 +- .../content/open/impl/seine/ActivitySeineUI.jaxx | 6 +- observe-validation/pom.xml | 4 +- pom.xml | 34 +++---- src/site/site_fr.xml | 48 +++------ 11 files changed, 63 insertions(+), 242 deletions(-) create mode 100644 .gitignore -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/6855 in repository observe. See http://git.codelutin.com/observe.git commit 875eee4dc4ccc18b7c879cfd18a6739378fe7dff Author: Tony Chemit <chemit@codelutin.com> Date: Mon Mar 23 19:14:21 2015 +0000 refs #6855: add referentials --- .../main/java/fr/ird/observe/DecoratorService.java | 9 + .../i18n/observe-business_en_GB.properties | 3 + .../i18n/observe-business_es_ES.properties | 3 + .../i18n/observe-business_fr_FR.properties | 3 + .../java/fr/ird/observe/entities/Entities.java | 40 +---- .../migration/AbstractDataSourceMigration.java | 4 +- .../DataSourceMigrationForVersion_3_16.java | 50 ++++++ .../resources/db/3.16/add-gear-referential-H2.sql | 120 +++++++++++++ .../resources/db/3.16/add-gear-referential-PG.sql | 120 +++++++++++++ .../src/main/xmi/observe-common.properties | 3 +- observe-entities/src/main/xmi/observe-common.zargo | Bin 33078 -> 35711 bytes .../src/main/xmi/observe-longline.properties | 4 +- .../src/main/xmi/observe-seine.properties | 2 +- .../content/ref/impl/GearCaracteristicTypeUI.jaxx | 162 +++++++++++++++++ .../ref/impl/GearCaracteristicTypeUIModel.java | 20 +++ .../ui/content/ref/impl/GearCaracteristicUI.css | 42 +++++ .../ui/content/ref/impl/GearCaracteristicUI.jaxx | 186 +++++++++++++++++++ .../content/ref/impl/GearCaracteristicUIModel.java | 27 +++ .../fr/ird/observe/ui/content/ref/impl/GearUI.css | 49 ++++++ .../fr/ird/observe/ui/content/ref/impl/GearUI.jaxx | 196 +++++++++++++++++++++ .../observe/ui/content/ref/impl/GearUIHandler.java | 82 +++++++++ .../observe/ui/content/ref/impl/GearUIModel.java | 70 ++++++++ .../resources/i18n/observe-swing_en_GB.properties | 32 +++- .../resources/i18n/observe-swing_es_ES.properties | 29 +++ .../resources/i18n/observe-swing_fr_FR.properties | 41 ++++- .../Gear-n1-create-error-validation.xml | 75 ++++++++ .../Gear-n1-create-warning-validation.xml | 67 +++++++ .../Gear-n1-update-error-validation.xml | 75 ++++++++ .../Gear-n1-update-warning-validation.xml | 67 +++++++ ...earCaracteristic-n1-create-error-validation.xml | 90 ++++++++++ ...rCaracteristic-n1-create-warning-validation.xml | 67 +++++++ ...earCaracteristic-n1-update-error-validation.xml | 90 ++++++++++ ...rCaracteristic-n1-update-warning-validation.xml | 67 +++++++ ...aracteristicType-n1-create-error-validation.xml | 75 ++++++++ ...acteristicType-n1-create-warning-validation.xml | 67 +++++++ ...aracteristicType-n1-update-error-validation.xml | 75 ++++++++ ...acteristicType-n1-update-warning-validation.xml | 67 +++++++ .../i18n/observe-validation_en_GB.properties | 2 + .../i18n/observe-validation_es_ES.properties | 2 + .../i18n/observe-validation_fr_FR.properties | 2 + .../validation/BeanValidatorDetectorTest.java | 11 +- 41 files changed, 2150 insertions(+), 46 deletions(-) diff --git a/observe-business/src/main/java/fr/ird/observe/DecoratorService.java b/observe-business/src/main/java/fr/ird/observe/DecoratorService.java index aa2e375..a3f2538 100644 --- a/observe-business/src/main/java/fr/ird/observe/DecoratorService.java +++ b/observe-business/src/main/java/fr/ird/observe/DecoratorService.java @@ -40,6 +40,9 @@ import fr.ird.observe.entities.longline.SetLongline; import fr.ird.observe.entities.longline.Tdr; import fr.ird.observe.entities.referentiel.Country; import fr.ird.observe.entities.referentiel.FpaZone; +import fr.ird.observe.entities.referentiel.Gear; +import fr.ird.observe.entities.referentiel.GearCaracteristic; +import fr.ird.observe.entities.referentiel.GearCaracteristicType; import fr.ird.observe.entities.referentiel.Harbour; import fr.ird.observe.entities.referentiel.Ocean; import fr.ird.observe.entities.referentiel.Organism; @@ -363,6 +366,9 @@ public class DecoratorService extends DecoratorProvider { n("observe.common.floatlineLengths"); n("observe.common.locode"); n("observe.common.name"); + n("observe.common.gearCaracteristicType"); + n("observe.common.gearCaracteristic"); + n("observe.common.gear"); n("observe.common.floatline1Length"); n("observe.common.floatline2Length"); @@ -454,6 +460,9 @@ public class DecoratorService extends DecoratorProvider { registerDefaultReferenceEntityDecorator(TripType.class, libelle); registerDefaultReferenceEntityDecorator(VesselActivityLongline.class, libelle); registerDefaultReferenceEntityDecorator(WeightMeasureType.class, libelle); + registerDefaultReferenceEntityDecorator(GearCaracteristicType.class, libelle); + registerDefaultReferenceEntityDecorator(GearCaracteristic.class, libelle); + registerDefaultReferenceEntityDecorator(Gear.class, libelle); registerReferenceEntityDecorator(Harbour.class, "${code}$s##${name}$s##${locode}$s"); diff --git a/observe-business/src/main/resources/i18n/observe-business_en_GB.properties b/observe-business/src/main/resources/i18n/observe-business_en_GB.properties index 84f1cf1..e0ae654 100644 --- a/observe-business/src/main/resources/i18n/observe-business_en_GB.properties +++ b/observe-business/src/main/resources/i18n/observe-business_en_GB.properties @@ -25,6 +25,9 @@ observe.common.floatline2Length= observe.common.floatlineLengths= observe.common.floatlinesComposition= observe.common.fpaZone= +observe.common.gear=Gear +observe.common.gearCaracteristic=Gear caracteristic +observe.common.gearCaracteristicType=Gear caracteristic type observe.common.gps.activity= observe.common.gps.gpsPoint= observe.common.gps.gpsPointInterval= diff --git a/observe-business/src/main/resources/i18n/observe-business_es_ES.properties b/observe-business/src/main/resources/i18n/observe-business_es_ES.properties index e89dc83..c5a6a02 100644 --- a/observe-business/src/main/resources/i18n/observe-business_es_ES.properties +++ b/observe-business/src/main/resources/i18n/observe-business_es_ES.properties @@ -25,6 +25,9 @@ observe.common.floatline2Length= observe.common.floatlineLengths= observe.common.floatlinesComposition= observe.common.fpaZone= +observe.common.gear= +observe.common.gearCaracteristic= +observe.common.gearCaracteristicType= observe.common.gps.activity=Actividad observe.common.gps.gpsPoint=Punto GPS observe.common.gps.gpsPointInterval=Intervalo de puntos diff --git a/observe-business/src/main/resources/i18n/observe-business_fr_FR.properties b/observe-business/src/main/resources/i18n/observe-business_fr_FR.properties index 5dc2f60..698dfd9 100644 --- a/observe-business/src/main/resources/i18n/observe-business_fr_FR.properties +++ b/observe-business/src/main/resources/i18n/observe-business_fr_FR.properties @@ -25,6 +25,9 @@ observe.common.floatline2Length=Orin 2 (m) observe.common.floatlineLengths=Template observe.common.floatlinesComposition=Composition des orins observe.common.fpaZone=Zone FPA +observe.common.gear=Équipement +observe.common.gearCaracteristic=Caractéristique d'un équipement +observe.common.gearCaracteristicType=Type de caractéristique d'équipement observe.common.gps.activity=Activité observe.common.gps.gpsPoint=Point GPS observe.common.gps.gpsPointInterval=Intervalle de points diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/Entities.java b/observe-entities/src/main/java/fr/ird/observe/entities/Entities.java index df81451..da63dac 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/Entities.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/Entities.java @@ -59,6 +59,9 @@ public class Entities { ObserveEntityEnum.Organism, ObserveEntityEnum.LengthWeightParameter, ObserveEntityEnum.Program, + ObserveEntityEnum.GearCaracteristicType, + ObserveEntityEnum.GearCaracteristic, + ObserveEntityEnum.Gear, ObserveEntityEnum.VesselActivitySeine, ObserveEntityEnum.SurroundingActivity, @@ -104,19 +107,6 @@ public class Entities { ObserveEntityEnum.WeightMeasureType }; - /** - * FIXME : cela n'est pas vrai !!! (voir l'algortihme de replication qui - * detecte tout seul l'ordre a utiliser). - * <p/> - * la liste des entités du réferentiel dans l'ordre de précédence. - * <p/> - * Ainsi on pourra lors des duplications de base parcourir cet ordre sans - * avoir à se préoccuper d'éventuels viloations d'intégrités en base (sur - * les clef étrangères des associations). - */ - public static final List<ObserveEntityEnum> REFERENCE_ENTITIES_LIST = - Collections.unmodifiableList(Arrays.asList(REFERENCE_ENTITIES)); - public static final ObserveEntityEnum[] REFERENCE_COMMON_ENTITIES = new ObserveEntityEnum[]{ ObserveEntityEnum.VesselSizeCategory, @@ -133,7 +123,10 @@ public class Entities { ObserveEntityEnum.Ocean, ObserveEntityEnum.Organism, ObserveEntityEnum.LengthWeightParameter, - ObserveEntityEnum.Program + ObserveEntityEnum.Program, + ObserveEntityEnum.GearCaracteristicType, + ObserveEntityEnum.GearCaracteristic, + ObserveEntityEnum.Gear }; public static final List<ObserveEntityEnum> REFERENCE_COMMON_ENTITIES_LIST = @@ -269,9 +262,6 @@ public class Entities { ObserveEntityEnum.TripSeine }; - public static final List<ObserveEntityEnum> DATA_SEINE_ENTITIES_LIST = - Collections.unmodifiableList(Arrays.asList(DATA_SEINE_ENTITIES)); - public static final ObserveEntityEnum[] DATA_LONGLINE_ENTITIES = new ObserveEntityEnum[]{ ObserveEntityEnum.ActivityLongline, @@ -293,9 +283,6 @@ public class Entities { ObserveEntityEnum.WeightMeasure }; - public static final List<ObserveEntityEnum> DATA_LONGLINE_ENTITIES_LIST = - Collections.unmodifiableList(Arrays.asList(DATA_LONGLINE_ENTITIES)); - public static final ObserveEntityEnum[] ALL_ENTITIES = ObserveEntityEnum.values(); @@ -331,19 +318,6 @@ public class Entities { } /** - * @param constant le type d'entite a tester - * @return {@code true} si c'est une classe de donnée. - */ - public static boolean isDataClass(ObserveEntityEnum constant) { - for (ObserveEntityEnum c : DATA_ENTITIES_LIST) { - if (c.equals(constant)) { - return true; - } - } - return false; - } - - /** * @param klass le type d'entite a tester * @return {@code true} si c'est une classe de donnée. */ diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/AbstractDataSourceMigration.java b/observe-entities/src/main/java/fr/ird/observe/entities/migration/AbstractDataSourceMigration.java index 443608a..c06246a 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/AbstractDataSourceMigration.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/migration/AbstractDataSourceMigration.java @@ -73,9 +73,11 @@ public abstract class AbstractDataSourceMigration extends TopiaMigrationCallback public static final Version V_3_15 = Versions.valueOf("3.15"); + public static final Version V_3_16 = Versions.valueOf("3.16"); + /** Les versions de mise à jour disponibles. */ public static final Version[] availableVersions = new Version[]{ - V_3_1, V_3_5, V_3_7, V_3_8, V_3_9, V_3_10, V_3_11, V_3_12, V_3_14, V_3_15 + V_3_1, V_3_5, V_3_7, V_3_8, V_3_9, V_3_10, V_3_11, V_3_12, V_3_14, V_3_15, V_3_16 }; private static Supplier<ApplicationConfig> applicationConfigSupplier; diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_16.java b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_16.java new file mode 100644 index 0000000..52a29a2 --- /dev/null +++ b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_16.java @@ -0,0 +1,50 @@ +package fr.ird.observe.entities.migration.versions; + +import fr.ird.observe.entities.migration.AbstractDataSourceMigration; +import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; +import fr.ird.observe.entities.migration.H2DataSourceMigration; +import fr.ird.observe.entities.migration.PGDataSourceMigration; +import org.nuiton.topia.TopiaException; +import org.nuiton.topia.framework.TopiaContextImplementor; + +import java.util.List; + +/** + * Created on 3/23/15. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 3.16 + */ +public class DataSourceMigrationForVersion_3_16 extends AbstractObserveMigrationCallBack { + + public DataSourceMigrationForVersion_3_16(AbstractDataSourceMigration callBack, String scriptSuffix) { + super(AbstractDataSourceMigration.V_3_16, callBack, scriptSuffix); + } + + @Override + protected void prepareMigrationScript(TopiaContextImplementor tx, + List<String> queries, + boolean showSql, + boolean showProgression) throws TopiaException { + + addScript("add-gear-referential", queries); + + } + + public static class H2DataSourceMigrationForVersion extends DataSourceMigrationForVersion_3_16 { + + public H2DataSourceMigrationForVersion(AbstractDataSourceMigration callBack) { + super(callBack, H2DataSourceMigration.TYPE); + } + + } + + public static class PGDataSourceMigrationForVersion extends DataSourceMigrationForVersion_3_16 { + + public PGDataSourceMigrationForVersion(AbstractDataSourceMigration callBack) { + super(callBack, PGDataSourceMigration.TYPE); + } + + } + +} \ No newline at end of file diff --git a/observe-entities/src/main/resources/db/3.16/add-gear-referential-H2.sql b/observe-entities/src/main/resources/db/3.16/add-gear-referential-H2.sql new file mode 100644 index 0000000..db7a2c7 --- /dev/null +++ b/observe-entities/src/main/resources/db/3.16/add-gear-referential-H2.sql @@ -0,0 +1,120 @@ +-- +-- Gear caracteristic type Definition +-- +CREATE TABLE OBSERVE_COMMON.GEARCARACTERISTICTYPE(topiaid VARCHAR(255) NOT NULL,topiaversion BIGINT NOT NULL, topiacreatedate DATE, code VARCHAR(255), status INTEGER DEFAULT 1, uri VARCHAR(255), needcomment boolean, label1 VARCHAR(255), label2 VARCHAR(255), label3 VARCHAR(255), label4 VARCHAR(255), label5 VARCHAR(255), label6 VARCHAR(255), label7 VARCHAR(255), label8 VARCHAR(255), unit VARCHAR(255) ); +ALTER TABLE OBSERVE_COMMON.GEARCARACTERISTICTYPE ADD CONSTRAINT PK_GEARCARACTERISTICTYPE PRIMARY KEY(TOPIAID); +-- +-- Gear caracteristic type Data +-- +INSERT INTO OBSERVE_COMMON.GEARCARACTERISTICTYPE(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.1', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Texte'),STRINGDECODE('Text'),STRINGDECODE('Texte')); +INSERT INTO OBSERVE_COMMON.GEARCARACTERISTICTYPE(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.2', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Boolean'),STRINGDECODE('Boolean'),STRINGDECODE('Boolean')); +INSERT INTO OBSERVE_COMMON.GEARCARACTERISTICTYPE(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.3', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Entier signé'),STRINGDECODE('Signed Integer'),STRINGDECODE('Signed Integer')); +INSERT INTO OBSERVE_COMMON.GEARCARACTERISTICTYPE(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.4', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Décimal signé'),STRINGDECODE('Signed Decimal'),STRINGDECODE('Signed Decimal')); +INSERT INTO OBSERVE_COMMON.GEARCARACTERISTICTYPE(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.5', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Entier non signé'),STRINGDECODE('Unsigned Integer'),STRINGDECODE('Unsigned Integer')); +INSERT INTO OBSERVE_COMMON.GEARCARACTERISTICTYPE(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.6', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Décimal non signé'),STRINGDECODE('Unsigned Decimal'),STRINGDECODE('Unsigned Decimal')); +-- +-- Gear caracteristic Definition +-- +CREATE TABLE OBSERVE_COMMON.GEARCARACTERISTIC(topiaid VARCHAR(255) NOT NULL,topiaversion BIGINT NOT NULL, topiacreatedate DATE, code VARCHAR(255), status INTEGER DEFAULT 1, uri VARCHAR(255), needcomment boolean, label1 VARCHAR(255), label2 VARCHAR(255), label3 VARCHAR(255), label4 VARCHAR(255), label5 VARCHAR(255), label6 VARCHAR(255), label7 VARCHAR(255), label8 VARCHAR(255), unit VARCHAR(255), gearCaracteristicType VARCHAR(255)); +ALTER TABLE OBSERVE_COMMON.GEARCARACTERISTIC ADD CONSTRAINT PK_GEARCARACTERISTIC PRIMARY KEY(TOPIAID); +ALTER TABLE OBSERVE_COMMON.GEARCARACTERISTIC ADD CONSTRAINT FK_GEARCARACTERISTIC_GEARCARACTERISTICTYPE FOREIGN KEY(GEARCARACTERISTICTYPE) REFERENCES OBSERVE_COMMON.GEARCARACTERISTICTYPE(topiaid); +CREATE INDEX FK_GEARCARACTERISTIC_GEARCARACTERISTICTYPE_IDX ON OBSERVE_COMMON.GEARCARACTERISTIC(GEARCARACTERISTICTYPE); +-- +-- Gear caracteristic Data +-- +INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.1', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Portée'), null, null, 'm', 'fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.5'); +INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.2', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Puissance moteur'), null, null, 'cv', 'fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.5'); +INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.3', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Fréquence'), null, null, 'Hz', 'fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.5'); +INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.4', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Fréquence basse'), null, null, 'Hz', 'fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.5'); +INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.5', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Fréquence haute'), null, null, 'Hz', 'fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.5'); +INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.6', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Type'), null, null, null, 'fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.1'); +INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.7', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Circonférence surface'), null, null, 'm', 'fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.5'); +INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.8', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Circonference fond'), null, null, 'm', 'fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.5'); +INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.9', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Profondeur'), null, null, 'm', 'fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.5'); +INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.10', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Poids du lest'), null, null, 'kg', 'fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.5'); +INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.11', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Maille de poche'), null, null, 'mm', 'fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.5'); +INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.12', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Autre maillage'), null, null, 'mm', 'fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.5'); +INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.13', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Capacité en volume'), null, null, 'm³', 'fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.5'); +INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.14', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Capacité en masse'), null, null, 't', 'fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.5'); +INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.15', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Diamètre'), null, null, 'm', 'fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.5'); +INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.16', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Rapport d''armement'), null, null, '%', 'fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.5'); +INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.17', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Fournisseur/marque'), null, null, null, 'fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.1'); +INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.18', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Fréquence d''interrogation'), null, null, 'fois / jour', 'fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.5'); +INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.19', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Nombre de mises à l''eau'), null, null, null, 'fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.5'); +INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.20', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Hauteur'), null, null, 'm', 'fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.5'); +INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.21', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Non maillant'), null, null, null, 'fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.2'); +INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.22', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Matériau écologique'), null, null, null, 'fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.2'); +-- +-- Gear Definition +-- +CREATE TABLE OBSERVE_COMMON.GEAR(topiaid VARCHAR(255) NOT NULL,topiaversion BIGINT NOT NULL, topiacreatedate DATE, code VARCHAR(255), status INTEGER DEFAULT 1, uri VARCHAR(255), needcomment boolean, label1 VARCHAR(255), label2 VARCHAR(255), label3 VARCHAR(255), label4 VARCHAR(255), label5 VARCHAR(255), label6 VARCHAR(255), label7 VARCHAR(255), label8 VARCHAR(255) ); +ALTER TABLE OBSERVE_COMMON.GEAR ADD CONSTRAINT PK_GEAR PRIMARY KEY(TOPIAID); +-- +-- Gear Data +-- +INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.1', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Sondeur vertical'), null, null); +INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.2', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Sondeur latéral'), null, null); +INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.3', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Radar de route'), null, null); +INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.4', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Radar oiseaux'), null, null); +INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.5', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Sonar'), null, null); +INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.6', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Thermomètre'), null, null); +INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.7', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Courantomètre'), null, null); +INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.8', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Grandes jumelles en veille'), null, null); +INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.9', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Petites jumelles'), null, null); +INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.10', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Téléphonie'), null, null); +INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.11', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Radio BLU'), null, null); +INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.12', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Radio VHF'), null, null); +INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.13', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Logiciel cartographique'), null, null); +INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.14', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Logiciel météo'), null, null); +INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.15', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Autre logiciel'), null, null); +INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.16', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Skiff'), null, null); +INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.17', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Vedette'), null, null); +INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.18', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Speed boat'), null, null); +INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.19', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('AIS'), null, null); +INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.20', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Senne'), null, null); +INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.21', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Salabarde'), null, null); +INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.22', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Compas satellitaire'), null, null); +INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.23', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Sonde de profondeur de senne'), null, null); +INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.24', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Balise émettrice pour DCP'), null, null); +INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.25', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Radeau'), null, null); +INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.26', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Autre'), null, null); +-- +-- Gear GearCaracteristics Definition +-- +CREATE TABLE OBSERVE_COMMON.GEAR_GEARCARACTERISTIC (GEAR VARCHAR(255) NOT NULL, GEARCARACTERISTIC VARCHAR(255) NOT NULL); +ALTER TABLE OBSERVE_COMMON.GEAR_GEARCARACTERISTIC ADD CONSTRAINT FK_GEAR_GEARCARACTERISTIC_GEAR FOREIGN KEY(GEAR) REFERENCES OBSERVE_COMMON.GEAR(topiaid); +ALTER TABLE OBSERVE_COMMON.GEAR_GEARCARACTERISTIC ADD CONSTRAINT FK_GEAR_GEARCARACTERISTIC_GEARCARACTERISTIC FOREIGN KEY(GEARCARACTERISTIC) REFERENCES OBSERVE_COMMON.GEARCARACTERISTIC(topiaid); +CREATE INDEX FK_GEAR_GEARCARACTERISTIC_GEAR_IDX ON OBSERVE_COMMON.GEAR_GEARCARACTERISTIC(GEAR); +CREATE INDEX FK_GEAR_GEARCARACTERISTIC_GEARCARACTERISTIC_IDX ON OBSERVE_COMMON.GEAR_GEARCARACTERISTIC(GEARCARACTERISTIC); +-- +-- Gear GearCaracteristics Data +-- +INSERT INTO OBSERVE_COMMON.GEAR_GEARCARACTERISTIC(GEAR, GEARCARACTERISTIC ) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.1', 'fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.1'); +INSERT INTO OBSERVE_COMMON.GEAR_GEARCARACTERISTIC(GEAR, GEARCARACTERISTIC ) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.2', 'fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.1'); +INSERT INTO OBSERVE_COMMON.GEAR_GEARCARACTERISTIC(GEAR, GEARCARACTERISTIC ) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.3', 'fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.1'); +INSERT INTO OBSERVE_COMMON.GEAR_GEARCARACTERISTIC(GEAR, GEARCARACTERISTIC ) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.4', 'fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.1'); +INSERT INTO OBSERVE_COMMON.GEAR_GEARCARACTERISTIC(GEAR, GEARCARACTERISTIC ) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.8', 'fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.1'); +INSERT INTO OBSERVE_COMMON.GEAR_GEARCARACTERISTIC(GEAR, GEARCARACTERISTIC ) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.9', 'fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.1'); +INSERT INTO OBSERVE_COMMON.GEAR_GEARCARACTERISTIC(GEAR, GEARCARACTERISTIC ) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.16', 'fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.2'); +INSERT INTO OBSERVE_COMMON.GEAR_GEARCARACTERISTIC(GEAR, GEARCARACTERISTIC ) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.17', 'fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.2'); +INSERT INTO OBSERVE_COMMON.GEAR_GEARCARACTERISTIC(GEAR, GEARCARACTERISTIC ) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.18', 'fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.2'); +INSERT INTO OBSERVE_COMMON.GEAR_GEARCARACTERISTIC(GEAR, GEARCARACTERISTIC ) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.20', 'fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.7'); +INSERT INTO OBSERVE_COMMON.GEAR_GEARCARACTERISTIC(GEAR, GEARCARACTERISTIC ) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.20', 'fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.8'); +INSERT INTO OBSERVE_COMMON.GEAR_GEARCARACTERISTIC(GEAR, GEARCARACTERISTIC ) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.20', 'fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.9'); +INSERT INTO OBSERVE_COMMON.GEAR_GEARCARACTERISTIC(GEAR, GEARCARACTERISTIC ) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.20', 'fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.10'); +INSERT INTO OBSERVE_COMMON.GEAR_GEARCARACTERISTIC(GEAR, GEARCARACTERISTIC ) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.20', 'fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.11'); +INSERT INTO OBSERVE_COMMON.GEAR_GEARCARACTERISTIC(GEAR, GEARCARACTERISTIC ) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.20', 'fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.12'); +INSERT INTO OBSERVE_COMMON.GEAR_GEARCARACTERISTIC(GEAR, GEARCARACTERISTIC ) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.20', 'fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.16'); +INSERT INTO OBSERVE_COMMON.GEAR_GEARCARACTERISTIC(GEAR, GEARCARACTERISTIC ) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.20', 'fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.17'); +INSERT INTO OBSERVE_COMMON.GEAR_GEARCARACTERISTIC(GEAR, GEARCARACTERISTIC ) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.21', 'fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.13'); +INSERT INTO OBSERVE_COMMON.GEAR_GEARCARACTERISTIC(GEAR, GEARCARACTERISTIC ) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.21', 'fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.14'); +INSERT INTO OBSERVE_COMMON.GEAR_GEARCARACTERISTIC(GEAR, GEARCARACTERISTIC ) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.21', 'fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.15'); +INSERT INTO OBSERVE_COMMON.GEAR_GEARCARACTERISTIC(GEAR, GEARCARACTERISTIC ) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.23', 'fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.17'); +INSERT INTO OBSERVE_COMMON.GEAR_GEARCARACTERISTIC(GEAR, GEARCARACTERISTIC ) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.23', 'fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.6'); +INSERT INTO OBSERVE_COMMON.GEAR_GEARCARACTERISTIC(GEAR, GEARCARACTERISTIC ) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.24', 'fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.17'); +INSERT INTO OBSERVE_COMMON.GEAR_GEARCARACTERISTIC(GEAR, GEARCARACTERISTIC ) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.24', 'fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.6'); +INSERT INTO OBSERVE_COMMON.GEAR_GEARCARACTERISTIC(GEAR, GEARCARACTERISTIC ) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.24', 'fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.18'); +INSERT INTO OBSERVE_COMMON.GEAR_GEARCARACTERISTIC(GEAR, GEARCARACTERISTIC ) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.24', 'fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.19'); +INSERT INTO OBSERVE_COMMON.GEAR_GEARCARACTERISTIC(GEAR, GEARCARACTERISTIC ) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.25', 'fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.20'); +INSERT INTO OBSERVE_COMMON.GEAR_GEARCARACTERISTIC(GEAR, GEARCARACTERISTIC ) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.25', 'fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.21'); +INSERT INTO OBSERVE_COMMON.GEAR_GEARCARACTERISTIC(GEAR, GEARCARACTERISTIC ) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.25', 'fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.22'); diff --git a/observe-entities/src/main/resources/db/3.16/add-gear-referential-PG.sql b/observe-entities/src/main/resources/db/3.16/add-gear-referential-PG.sql new file mode 100644 index 0000000..bf8c99d --- /dev/null +++ b/observe-entities/src/main/resources/db/3.16/add-gear-referential-PG.sql @@ -0,0 +1,120 @@ +-- +-- Gear caracteristic type Definition +-- +CREATE TABLE OBSERVE_COMMON.GEARCARACTERISTICTYPE(topiaid character varying(255) NOT NULL,topiaversion BIGINT NOT NULL, topiacreatedate DATE, code character varying(255), status INTEGER DEFAULT 1, uri character varying(255), needcomment boolean, label1 character varying(255), label2 character varying(255), label3 character varying(255), label4 character varying(255), label5 character varying(255), label6 character varying(255), label7 character varying(255), label8 character varying(255) [...] +ALTER TABLE OBSERVE_COMMON.GEARCARACTERISTICTYPE ADD CONSTRAINT PK_GEARCARACTERISTICTYPE PRIMARY KEY(TOPIAID); +-- +-- Gear caracteristic type Data +-- +INSERT INTO OBSERVE_COMMON.GEARCARACTERISTICTYPE(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.1', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Texte','Text','Texte'); +INSERT INTO OBSERVE_COMMON.GEARCARACTERISTICTYPE(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.2', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Boolean','Boolean','Boolean'); +INSERT INTO OBSERVE_COMMON.GEARCARACTERISTICTYPE(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.3', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Entier signé','Signed Integer','Signed Integer'); +INSERT INTO OBSERVE_COMMON.GEARCARACTERISTICTYPE(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.4', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Décimal signé','Signed Decimal','Signed Decimal'); +INSERT INTO OBSERVE_COMMON.GEARCARACTERISTICTYPE(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.5', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Entier non signé','Unsigned Integer','Unsigned Integer'); +INSERT INTO OBSERVE_COMMON.GEARCARACTERISTICTYPE(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.6', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Décimal non signé','Unsigned Decimal','Unsigned Decimal'); +-- +-- Gear caracteristic Definition +-- +CREATE TABLE OBSERVE_COMMON.GEARCARACTERISTIC(topiaid character varying(255) NOT NULL,topiaversion BIGINT NOT NULL, topiacreatedate DATE, code character varying(255), status INTEGER DEFAULT 1, uri character varying(255), needcomment boolean, label1 character varying(255), label2 character varying(255), label3 character varying(255), label4 character varying(255), label5 character varying(255), label6 character varying(255), label7 character varying(255), label8 character varying(255), un [...] +ALTER TABLE OBSERVE_COMMON.GEARCARACTERISTIC ADD CONSTRAINT PK_GEARCARACTERISTIC PRIMARY KEY(TOPIAID); +ALTER TABLE OBSERVE_COMMON.GEARCARACTERISTIC ADD CONSTRAINT FK_GEARCARACTERISTIC_GEARCARACTERISTICTYPE FOREIGN KEY(GEARCARACTERISTICTYPE) REFERENCES OBSERVE_COMMON.GEARCARACTERISTICTYPE(topiaid); +CREATE INDEX FK_GEARCARACTERISTIC_GEARCARACTERISTICTYPE_IDX ON OBSERVE_COMMON.GEARCARACTERISTIC(GEARCARACTERISTICTYPE); +-- +-- Gear caracteristic Data +-- +INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.1', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Portée', null, null, 'm', 'fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.5'); +INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.2', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Puissance moteur', null, null, 'cv', 'fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.5'); +INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.3', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Fréquence', null, null, 'Hz', 'fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.5'); +INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.4', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Fréquence basse', null, null, 'Hz', 'fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.5'); +INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.5', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Fréquence haute', null, null, 'Hz', 'fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.5'); +INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.6', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Type', null, null, null, 'fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.1'); +INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.7', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Circonférence surface', null, null, 'm', 'fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.5'); +INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.8', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Circonference fond', null, null, 'm', 'fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.5'); +INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.9', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Profondeur', null, null, 'm', 'fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.5'); +INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.10', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Poids du lest', null, null, 'kg', 'fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.5'); +INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.11', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Maille de poche', null, null, 'mm', 'fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.5'); +INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.12', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Autre maillage', null, null, 'mm', 'fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.5'); +INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.13', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Capacité en volume', null, null, 'm³', 'fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.5'); +INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.14', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Capacité en masse', null, null, 't', 'fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.5'); +INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.15', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Diamètre', null, null, 'm', 'fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.5'); +INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.16', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Rapport d''armement', null, null, '%', 'fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.5'); +INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.17', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Fournisseur/marque', null, null, null, 'fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.1'); +INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.18', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Fréquence d''interrogation', null, null, 'fois / jour', 'fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.5'); +INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.19', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Nombre de mises à l''eau', null, null, null, 'fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.5'); +INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.20', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Hauteur', null, null, 'm', 'fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.5'); +INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.21', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Non maillant', null, null, null, 'fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.2'); +INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.22', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Matériau écologique', null, null, null, 'fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.2'); +-- +-- Gear Definition +-- +CREATE TABLE OBSERVE_COMMON.GEAR(topiaid character varying(255) NOT NULL,topiaversion BIGINT NOT NULL, topiacreatedate DATE, code character varying(255), status INTEGER DEFAULT 1, uri character varying(255), needcomment boolean, label1 character varying(255), label2 character varying(255), label3 character varying(255), label4 character varying(255), label5 character varying(255), label6 character varying(255), label7 character varying(255), label8 character varying(255) ); +ALTER TABLE OBSERVE_COMMON.GEAR ADD CONSTRAINT PK_GEAR PRIMARY KEY(TOPIAID); +-- +-- Gear Data +-- +INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.1', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Sondeur vertical', null, null); +INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.2', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Sondeur latéral', null, null); +INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.3', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Radar de route', null, null); +INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.4', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Radar oiseaux', null, null); +INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.5', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Sonar', null, null); +INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.6', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Thermomètre', null, null); +INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.7', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Courantomètre', null, null); +INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.8', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Grandes jumelles en veille', null, null); +INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.9', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Petites jumelles', null, null); +INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.10', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Téléphonie', null, null); +INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.11', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Radio BLU', null, null); +INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.12', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Radio VHF', null, null); +INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.13', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Logiciel cartographique', null, null); +INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.14', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Logiciel météo', null, null); +INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.15', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Autre logiciel', null, null); +INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.16', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Skiff', null, null); +INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.17', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Vedette', null, null); +INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.18', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Speed boat', null, null); +INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.19', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'AIS', null, null); +INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.20', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Senne', null, null); +INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.21', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Salabarde', null, null); +INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.22', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Compas satellitaire', null, null); +INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.23', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Sonde de profondeur de senne', null, null); +INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.24', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Balise émettrice pour DCP', null, null); +INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.25', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Radeau', null, null); +INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.26', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Autre', null, null); +-- +-- Gear GearCaracteristics Definition +-- +CREATE TABLE OBSERVE_COMMON.GEAR_GEARCARACTERISTIC (GEAR character varying(255) NOT NULL, GEARCARACTERISTIC character varying(255) NOT NULL); +ALTER TABLE OBSERVE_COMMON.GEAR_GEARCARACTERISTIC ADD CONSTRAINT FK_GEAR_GEARCARACTERISTIC_GEAR FOREIGN KEY(GEAR) REFERENCES OBSERVE_COMMON.GEAR(topiaid); +ALTER TABLE OBSERVE_COMMON.GEAR_GEARCARACTERISTIC ADD CONSTRAINT FK_GEAR_GEARCARACTERISTIC_GEARCARACTERISTIC FOREIGN KEY(GEARCARACTERISTIC) REFERENCES OBSERVE_COMMON.GEARCARACTERISTIC(topiaid); +CREATE INDEX FK_GEAR_GEARCARACTERISTIC_GEAR_IDX ON OBSERVE_COMMON.GEAR_GEARCARACTERISTIC(GEAR); +CREATE INDEX FK_GEAR_GEARCARACTERISTIC_GEARCARACTERISTIC_IDX ON OBSERVE_COMMON.GEAR_GEARCARACTERISTIC(GEARCARACTERISTIC); +-- +-- Gear GearCaracteristics Data +-- +INSERT INTO OBSERVE_COMMON.GEAR_GEARCARACTERISTIC(GEAR, GEARCARACTERISTIC ) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.1', 'fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.1'); +INSERT INTO OBSERVE_COMMON.GEAR_GEARCARACTERISTIC(GEAR, GEARCARACTERISTIC ) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.2', 'fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.1'); +INSERT INTO OBSERVE_COMMON.GEAR_GEARCARACTERISTIC(GEAR, GEARCARACTERISTIC ) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.3', 'fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.1'); +INSERT INTO OBSERVE_COMMON.GEAR_GEARCARACTERISTIC(GEAR, GEARCARACTERISTIC ) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.4', 'fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.1'); +INSERT INTO OBSERVE_COMMON.GEAR_GEARCARACTERISTIC(GEAR, GEARCARACTERISTIC ) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.8', 'fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.1'); +INSERT INTO OBSERVE_COMMON.GEAR_GEARCARACTERISTIC(GEAR, GEARCARACTERISTIC ) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.9', 'fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.1'); +INSERT INTO OBSERVE_COMMON.GEAR_GEARCARACTERISTIC(GEAR, GEARCARACTERISTIC ) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.16', 'fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.2'); +INSERT INTO OBSERVE_COMMON.GEAR_GEARCARACTERISTIC(GEAR, GEARCARACTERISTIC ) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.17', 'fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.2'); +INSERT INTO OBSERVE_COMMON.GEAR_GEARCARACTERISTIC(GEAR, GEARCARACTERISTIC ) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.18', 'fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.2'); +INSERT INTO OBSERVE_COMMON.GEAR_GEARCARACTERISTIC(GEAR, GEARCARACTERISTIC ) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.20', 'fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.7'); +INSERT INTO OBSERVE_COMMON.GEAR_GEARCARACTERISTIC(GEAR, GEARCARACTERISTIC ) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.20', 'fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.8'); +INSERT INTO OBSERVE_COMMON.GEAR_GEARCARACTERISTIC(GEAR, GEARCARACTERISTIC ) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.20', 'fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.9'); +INSERT INTO OBSERVE_COMMON.GEAR_GEARCARACTERISTIC(GEAR, GEARCARACTERISTIC ) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.20', 'fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.10'); +INSERT INTO OBSERVE_COMMON.GEAR_GEARCARACTERISTIC(GEAR, GEARCARACTERISTIC ) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.20', 'fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.11'); +INSERT INTO OBSERVE_COMMON.GEAR_GEARCARACTERISTIC(GEAR, GEARCARACTERISTIC ) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.20', 'fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.12'); +INSERT INTO OBSERVE_COMMON.GEAR_GEARCARACTERISTIC(GEAR, GEARCARACTERISTIC ) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.20', 'fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.16'); +INSERT INTO OBSERVE_COMMON.GEAR_GEARCARACTERISTIC(GEAR, GEARCARACTERISTIC ) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.20', 'fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.17'); +INSERT INTO OBSERVE_COMMON.GEAR_GEARCARACTERISTIC(GEAR, GEARCARACTERISTIC ) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.21', 'fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.13'); +INSERT INTO OBSERVE_COMMON.GEAR_GEARCARACTERISTIC(GEAR, GEARCARACTERISTIC ) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.21', 'fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.14'); +INSERT INTO OBSERVE_COMMON.GEAR_GEARCARACTERISTIC(GEAR, GEARCARACTERISTIC ) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.21', 'fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.15'); +INSERT INTO OBSERVE_COMMON.GEAR_GEARCARACTERISTIC(GEAR, GEARCARACTERISTIC ) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.23', 'fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.17'); +INSERT INTO OBSERVE_COMMON.GEAR_GEARCARACTERISTIC(GEAR, GEARCARACTERISTIC ) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.23', 'fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.6'); +INSERT INTO OBSERVE_COMMON.GEAR_GEARCARACTERISTIC(GEAR, GEARCARACTERISTIC ) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.24', 'fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.17'); +INSERT INTO OBSERVE_COMMON.GEAR_GEARCARACTERISTIC(GEAR, GEARCARACTERISTIC ) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.24', 'fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.6'); +INSERT INTO OBSERVE_COMMON.GEAR_GEARCARACTERISTIC(GEAR, GEARCARACTERISTIC ) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.24', 'fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.18'); +INSERT INTO OBSERVE_COMMON.GEAR_GEARCARACTERISTIC(GEAR, GEARCARACTERISTIC ) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.24', 'fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.19'); +INSERT INTO OBSERVE_COMMON.GEAR_GEARCARACTERISTIC(GEAR, GEARCARACTERISTIC ) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.25', 'fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.20'); +INSERT INTO OBSERVE_COMMON.GEAR_GEARCARACTERISTIC(GEAR, GEARCARACTERISTIC ) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.25', 'fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.21'); +INSERT INTO OBSERVE_COMMON.GEAR_GEARCARACTERISTIC(GEAR, GEARCARACTERISTIC ) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.25', 'fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.22'); diff --git a/observe-entities/src/main/xmi/observe-common.properties b/observe-entities/src/main/xmi/observe-common.properties index 94b641f..1a1328d 100644 --- a/observe-entities/src/main/xmi/observe-common.properties +++ b/observe-entities/src/main/xmi/observe-common.properties @@ -19,7 +19,7 @@ # <http://www.gnu.org/licenses/gpl-3.0.html>. # #L% ### -model.tagvalue.version=3.15 +model.tagvalue.version=3.16 model.tagvalue.notGenerateToString=true model.tagvalue.generateOperatorForDAOHelper=true model.tagvalue.generateStandaloneEnumForDAOHelper=true @@ -61,6 +61,7 @@ fr.ird.observe.entities.referentiel.Species.attribute.maxLength.tagvalue.sqlType ### Données lazy ############################################################## ############################################################################### +fr.ird.observe.entities.referentiel.Gear.attribute.gearCaracteristic.tagvalue.lazy=false fr.ird.observe.entities.referentiel.Vessel.attribute.flagCountry.tagvalue.lazy=false fr.ird.observe.entities.referentiel.Vessel.attribute.vesselType.tagvalue.lazy=false fr.ird.observe.entities.referentiel.Vessel.attribute.vesselSizeCategory.tagvalue.lazy=false diff --git a/observe-entities/src/main/xmi/observe-common.zargo b/observe-entities/src/main/xmi/observe-common.zargo index 48f5235..b5a60fe 100644 Binary files a/observe-entities/src/main/xmi/observe-common.zargo and b/observe-entities/src/main/xmi/observe-common.zargo differ diff --git a/observe-entities/src/main/xmi/observe-longline.properties b/observe-entities/src/main/xmi/observe-longline.properties index 87a8fc9..37f3b3f 100644 --- a/observe-entities/src/main/xmi/observe-longline.properties +++ b/observe-entities/src/main/xmi/observe-longline.properties @@ -19,7 +19,7 @@ # <http://www.gnu.org/licenses/gpl-3.0.html>. # #L% ### -model.tagvalue.version=3.15 +model.tagvalue.version=3.16 model.tagvalue.notGenerateToString=true model.tagvalue.generateOperatorForDAOHelper=true model.tagvalue.generateStandaloneEnumForDAOHelper=true @@ -62,7 +62,7 @@ fr.ird.observe.entities.longline.SetLongline.attribute.tdr.tagvalue.reverseDbNam fr.ird.observe.entities.longline.SetLongline.attribute.catchLongline.tagvalue.reverseDbName=set fr.ird.observe.entities.longline.SetLongline.attribute.branchlinesComposition.tagvalue.reverseDbName=set fr.ird.observe.entities.longline.SetLongline.attribute.mitigationType.tagvalue.reverseDbName=set - fr.ird.observe.entities.longline.SetLongline.attribute.mitigationType.tagvalue.manyToManyTableName=mitigationtype_set +fr.ird.observe.entities.longline.SetLongline.attribute.mitigationType.tagvalue.manyToManyTableName=mitigationtype_set fr.ird.observe.entities.longline.Section.attribute.setLongline.tagvalue.dbName=set diff --git a/observe-entities/src/main/xmi/observe-seine.properties b/observe-entities/src/main/xmi/observe-seine.properties index 421f917..682f25b 100644 --- a/observe-entities/src/main/xmi/observe-seine.properties +++ b/observe-entities/src/main/xmi/observe-seine.properties @@ -20,7 +20,7 @@ # #L% ### -model.tagvalue.version=3.15 +model.tagvalue.version=3.16 model.tagvalue.notGenerateToString=true model.tagvalue.generateOperatorForDAOHelper=true model.tagvalue.generateStandaloneEnumForDAOHelper=true diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearCaracteristicTypeUI.jaxx b/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearCaracteristicTypeUI.jaxx new file mode 100644 index 0000000..978a079 --- /dev/null +++ b/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearCaracteristicTypeUI.jaxx @@ -0,0 +1,162 @@ +<!-- + #%L + ObServe :: Swing + %% + Copyright (C) 2008 - 2010 IRD, Codelutin, 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% + --> + +<fr.ird.observe.ui.content.ref.ContentReferenceUI + superGenericType='GearCaracteristicType' + contentTitle='{n("observe.title.content.gearCaracteristicTypes")}' + listText='{n("observe.list.gearCaracteristicType")}' + createToolTip='{n("observe.action.gearCaracteristicType.create.tip")}' + detailToolTip='{n("observe.action.gearCaracteristicType.detail.tip")}' + modifyToolTip='{n("observe.action.gearCaracteristicType.modify.tip")}' + deleteToolTip='{n("observe.action.gearCaracteristicType.delete.tip")}' + saveToolTip='{n("observe.action.gearCaracteristicType.save.tip")}'> + + <style source="ReferenceEntity.css"/> + <style source="I18nReferenceEntity.css"/> + + <import> + fr.ird.observe.entities.constants.ReferenceStatus + fr.ird.observe.entities.referentiel.GearCaracteristicType + fr.ird.observe.ui.content.ref.ContentReferenceUIModel + + static fr.ird.observe.ui.UIHelper.getStringValue + static org.nuiton.i18n.I18n.n + </import> + + <!-- validator --> + <BeanValidator id='validator' autoField='true' + beanClass='fr.ird.observe.entities.referentiel.GearCaracteristicType' + context='n1-create' + errorTableModel='{getErrorTableModel()}'/> + + <!-- model --> + <GearCaracteristicTypeUIModel id='model'/> + + <!-- edit bean --> + <GearCaracteristicType id='bean'/> + + <Table id='editTable'> + + <!-- uri --> + <row> + <cell anchor="west"> + <JLabel id="uriLabel"/> + </cell> + <cell anchor='east' weightx="1" fill="both"> + <JTextField id='uri' onKeyReleased='getBean().setUri(uri.getText())'/> + </cell> + </row> + + <!-- code / status --> + <row> + <cell anchor="west"> + <JLabel id='codeStatusLabel'/> + </cell> + <cell anchor='east' weightx="1" fill="both"> + <JPanel id='codeStatusPanel' layout='{new BorderLayout()}'> + <JTextField id='code' constraints='BorderLayout.WEST' + onKeyReleased='getBean().setCode(code.getText())'/> + <EnumEditor id='status' constraints='BorderLayout.CENTER' + constructorParams='ReferenceStatus.class' + genericType='ReferenceStatus' + onItemStateChanged='getBean().setStatus((ReferenceStatus)status.getSelectedItem())'/> + </JPanel> + </cell> + </row> + + <!-- needComment --> + <row> + <cell anchor='east' weightx="1" fill="both" columns="2"> + <JCheckBox id='needComment' + onItemStateChanged='getBean().setNeedComment(needComment.isSelected())'/> + </cell> + </row> + </Table> + + + <Table id='editI18nTable'> + <row> + <cell anchor="west"> + <JLabel id='label1Label'/> + </cell> + <cell anchor='east' weightx="1" fill="both"> + <JTextField id='label1' + onKeyReleased='getBean().setLabel1(label1.getText())'/> + </cell> + <cell anchor="west"> + <JLabel id='label2Label'/> + </cell> + <cell anchor='east' weightx="1" fill="both"> + <JTextField id='label2' + onKeyReleased='getBean().setLabel2(label2.getText())'/> + </cell> + </row> + <row> + <cell anchor="west"> + <JLabel id='label3Label'/> + </cell> + <cell anchor='east' weightx="1" fill="both"> + <JTextField id='label3' + onKeyReleased='getBean().setLabel3(label3.getText())'/> + </cell> + <cell anchor="west"> + <JLabel id='label4Label'/> + </cell> + <cell anchor='east' weightx="1" fill="both"> + <JTextField id='label4' + onKeyReleased='getBean().setLabel4(label4.getText())'/> + </cell> + </row> + <row> + <cell anchor="west"> + <JLabel id='label5Label'/> + </cell> + <cell anchor='east' weightx="1" fill="both"> + <JTextField id='label5' + onKeyReleased='getBean().setLabel5(label5.getText())'/> + </cell> + <cell anchor="west"> + <JLabel id='label6Label'/> + </cell> + <cell anchor='east' weightx="1" fill="both"> + <JTextField id='label6' + onKeyReleased='getBean().setLabel6(label6.getText())'/> + </cell> + </row> + <row> + <cell anchor="west"> + <JLabel id='label7Label'/> + </cell> + <cell anchor='east' weightx="1" fill="both"> + <JTextField id='label7' + onKeyReleased='getBean().setLabel7(label7.getText())'/> + </cell> + <cell anchor="west"> + <JLabel id='label8Label'/> + </cell> + <cell anchor='east' weightx="1" fill="both"> + <JTextField id='label8' + onKeyReleased='getBean().setLabel8(label8.getText())'/> + </cell> + </row> + </Table> +</fr.ird.observe.ui.content.ref.ContentReferenceUI> diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearCaracteristicTypeUIModel.java b/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearCaracteristicTypeUIModel.java new file mode 100644 index 0000000..b2c6404 --- /dev/null +++ b/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearCaracteristicTypeUIModel.java @@ -0,0 +1,20 @@ +package fr.ird.observe.ui.content.ref.impl; + +import fr.ird.observe.entities.referentiel.GearCaracteristicType; +import fr.ird.observe.ui.content.ref.ContentReferenceUIModel; + +/** + * Created on 3/23/15. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 3.16 + */ +public class GearCaracteristicTypeUIModel extends ContentReferenceUIModel<GearCaracteristicType> { + + private static final long serialVersionUID = 1L; + + public GearCaracteristicTypeUIModel() { + super(GearCaracteristicType.class); + } + +} \ No newline at end of file diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearCaracteristicUI.css b/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearCaracteristicUI.css new file mode 100644 index 0000000..9d50757 --- /dev/null +++ b/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearCaracteristicUI.css @@ -0,0 +1,42 @@ +/* + * #%L + * ObServe :: Swing + * %% + * Copyright (C) 2008 - 2015 IRD, Codelutin, 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% + */ + +#gearCaracteristicTypeLabel { + text:"observe.gear.gearCaracteristicType"; + labelFor:{gearCaracteristicType}; +} + +#gearCaracteristicType { + property:{GearCaracteristic.PROPERTY_GEAR_CARACTERISTIC_TYPE}; + bean:{bean}; + selectedItem:{bean.getGearCaracteristicType()}; + showReset:{true}; +} + +#unitLabel { + text:"observe.gear.unit"; + labelFor:{unit}; +} + +#unit { + text:{getStringValue(bean.getUnit())}; +} \ No newline at end of file diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearCaracteristicUI.jaxx b/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearCaracteristicUI.jaxx new file mode 100644 index 0000000..1b7692a --- /dev/null +++ b/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearCaracteristicUI.jaxx @@ -0,0 +1,186 @@ +<!-- + #%L + ObServe :: Swing + %% + Copyright (C) 2008 - 2010 IRD, Codelutin, 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% + --> + +<fr.ird.observe.ui.content.ref.ContentReferenceUI + superGenericType='GearCaracteristic' + contentTitle='{n("observe.title.content.gearCaracteristics")}' + listText='{n("observe.list.gearCaracteristic")}' + createToolTip='{n("observe.action.gearCaracteristic.create.tip")}' + detailToolTip='{n("observe.action.gearCaracteristic.detail.tip")}' + modifyToolTip='{n("observe.action.gearCaracteristic.modify.tip")}' + deleteToolTip='{n("observe.action.gearCaracteristic.delete.tip")}' + saveToolTip='{n("observe.action.gearCaracteristic.save.tip")}'> + + <style source="ReferenceEntity.css"/> + <style source="I18nReferenceEntity.css"/> + + <import> + fr.ird.observe.entities.constants.ReferenceStatus + fr.ird.observe.entities.referentiel.GearCaracteristic + fr.ird.observe.entities.referentiel.GearCaracteristicType + fr.ird.observe.ui.content.ref.ContentReferenceUIModel + + jaxx.runtime.swing.editor.bean.BeanComboBox + + static fr.ird.observe.ui.UIHelper.getStringValue + static org.nuiton.i18n.I18n.n + </import> + + <!-- validator --> + <BeanValidator id='validator' autoField='true' + beanClass='fr.ird.observe.entities.referentiel.GearCaracteristic' + context='n1-create' + errorTableModel='{getErrorTableModel()}'/> + + <!-- model --> + <GearCaracteristicUIModel id='model'/> + + <!-- edit bean --> + <GearCaracteristic id='bean'/> + + <Table id='editTable'> + + <!-- uri --> + <row> + <cell anchor="west"> + <JLabel id="uriLabel"/> + </cell> + <cell anchor='east' weightx="1" fill="both"> + <JTextField id='uri' onKeyReleased='getBean().setUri(uri.getText())'/> + </cell> + </row> + + <!-- code / status --> + <row> + <cell anchor="west"> + <JLabel id='codeStatusLabel'/> + </cell> + <cell anchor='east' weightx="1" fill="both"> + <JPanel id='codeStatusPanel' layout='{new BorderLayout()}'> + <JTextField id='code' constraints='BorderLayout.WEST' + onKeyReleased='getBean().setCode(code.getText())'/> + <EnumEditor id='status' constraints='BorderLayout.CENTER' + constructorParams='ReferenceStatus.class' + genericType='ReferenceStatus' + onItemStateChanged='getBean().setStatus((ReferenceStatus)status.getSelectedItem())'/> + </JPanel> + </cell> + </row> + + <!-- needComment --> + <row> + <cell anchor='east' weightx="1" fill="both" columns="2"> + <JCheckBox id='needComment' + onItemStateChanged='getBean().setNeedComment(needComment.isSelected())'/> + </cell> + </row> + + <!-- gearCaracteristicType --> + <row> + <cell anchor='west'> + <JLabel id='gearCaracteristicTypeLabel'/> + </cell> + <cell anchor='east' weightx="1" fill="both"> + <BeanComboBox id='gearCaracteristicType' constructorParams='this' genericType='GearCaracteristicType'/> + </cell> + </row> + + <!-- unit --> + <row> + <cell anchor='west'> + <JLabel id='unitLabel'/> + </cell> + <cell anchor='east' weightx="1" fill="both"> + <JTextField id='unit' onKeyReleased='getBean().setUnit(unit.getText())'/> + </cell> + </row> + + </Table> + + + <Table id='editI18nTable'> + <row> + <cell anchor="west"> + <JLabel id='label1Label'/> + </cell> + <cell anchor='east' weightx="1" fill="both"> + <JTextField id='label1' + onKeyReleased='getBean().setLabel1(label1.getText())'/> + </cell> + <cell anchor="west"> + <JLabel id='label2Label'/> + </cell> + <cell anchor='east' weightx="1" fill="both"> + <JTextField id='label2' + onKeyReleased='getBean().setLabel2(label2.getText())'/> + </cell> + </row> + <row> + <cell anchor="west"> + <JLabel id='label3Label'/> + </cell> + <cell anchor='east' weightx="1" fill="both"> + <JTextField id='label3' + onKeyReleased='getBean().setLabel3(label3.getText())'/> + </cell> + <cell anchor="west"> + <JLabel id='label4Label'/> + </cell> + <cell anchor='east' weightx="1" fill="both"> + <JTextField id='label4' + onKeyReleased='getBean().setLabel4(label4.getText())'/> + </cell> + </row> + <row> + <cell anchor="west"> + <JLabel id='label5Label'/> + </cell> + <cell anchor='east' weightx="1" fill="both"> + <JTextField id='label5' + onKeyReleased='getBean().setLabel5(label5.getText())'/> + </cell> + <cell anchor="west"> + <JLabel id='label6Label'/> + </cell> + <cell anchor='east' weightx="1" fill="both"> + <JTextField id='label6' + onKeyReleased='getBean().setLabel6(label6.getText())'/> + </cell> + </row> + <row> + <cell anchor="west"> + <JLabel id='label7Label'/> + </cell> + <cell anchor='east' weightx="1" fill="both"> + <JTextField id='label7' + onKeyReleased='getBean().setLabel7(label7.getText())'/> + </cell> + <cell anchor="west"> + <JLabel id='label8Label'/> + </cell> + <cell anchor='east' weightx="1" fill="both"> + <JTextField id='label8' + onKeyReleased='getBean().setLabel8(label8.getText())'/> + </cell> + </row> + </Table> +</fr.ird.observe.ui.content.ref.ContentReferenceUI> diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearCaracteristicUIModel.java b/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearCaracteristicUIModel.java new file mode 100644 index 0000000..7c02e74 --- /dev/null +++ b/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearCaracteristicUIModel.java @@ -0,0 +1,27 @@ +package fr.ird.observe.ui.content.ref.impl; + +import fr.ird.observe.entities.referentiel.GearCaracteristic; +import fr.ird.observe.ui.content.ref.ContentReferenceUIModel; + +/** + * Created on 3/23/15. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 3.16 + */ +public class GearCaracteristicUIModel extends ContentReferenceUIModel<GearCaracteristic> { + + private static final long serialVersionUID = 1L; + + public GearCaracteristicUIModel() { + super(GearCaracteristic.class, + new String[]{ + GearCaracteristic.PROPERTY_GEAR_CARACTERISTIC_TYPE, + GearCaracteristic.PROPERTY_UNIT, + }, + new String[]{GearCaracteristic.PROPERTY_GEAR_CARACTERISTIC_TYPE + SUFFIX_SELECTED_ITEM, + GearCaracteristic.PROPERTY_UNIT + SUFFIX_TEXT} + ); + } + +} \ No newline at end of file diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearUI.css b/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearUI.css new file mode 100644 index 0000000..731fe9d --- /dev/null +++ b/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearUI.css @@ -0,0 +1,49 @@ +/* + * #%L + * ObServe :: Swing + * %% + * Copyright (C) 2008 - 2014 IRD, Codelutin, 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% + */ + +#generalTab { + title:{t("observe.gear.tab.general")}; + icon:{getHandler().getErrorIconIfFalse(model.isGeneralTabValid())}; +} + +#gearCaracteristicTab { + title:{t("observe.gear.tab.gearCaracteristic")}; + icon:{getHandler().getErrorIconIfFalse(model.isGearCaracteristicTabValid())}; +} + +#editI18nTable2 { + border:{new TitledBorder(t("observe.common.libelles"))}; +} + +#gearCaracteristicPane { + verticalScrollBarPolicy:{JScrollPane.VERTICAL_SCROLLBAR_NEVER}; + horizontalScrollBarPolicy:{JScrollPane.HORIZONTAL_SCROLLBAR_NEVER}; +} + +#gearCaracteristic { + property:{Gear.PROPERTY_GEAR_CARACTERISTIC}; + selected:{bean.getGearCaracteristic()}; + _validatorLabel: {t("observe.gear.gearCaracteristic")}; + showListLabel: true; + universeLabel:{t("observe.gear.availableGearCaracteristic")}; + selectedLabel:{t("observe.gear.selectedGearCaracteristic")}; +} diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearUI.jaxx b/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearUI.jaxx new file mode 100644 index 0000000..6b96511 --- /dev/null +++ b/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearUI.jaxx @@ -0,0 +1,196 @@ +<!-- + #%L + ObServe :: Swing + %% + Copyright (C) 2008 - 2010 IRD, Codelutin, 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% + --> + +<fr.ird.observe.ui.content.ref.ContentReferenceUI + superGenericType='Gear' + contentTitle='{n("observe.title.content.gears")}' + listText='{n("observe.list.gear")}' + createToolTip='{n("observe.action.gear.create.tip")}' + detailToolTip='{n("observe.action.gear.detail.tip")}' + modifyToolTip='{n("observe.action.gear.modify.tip")}' + deleteToolTip='{n("observe.action.gear.delete.tip")}' + saveToolTip='{n("observe.action.gear.save.tip")}'> + + <style source="ReferenceEntity.css"/> + <style source="I18nReferenceEntity.css"/> + + <import> + fr.ird.observe.entities.constants.ReferenceStatus + fr.ird.observe.entities.referentiel.Gear + fr.ird.observe.entities.referentiel.GearCaracteristic + fr.ird.observe.ui.content.ref.ContentReferenceUIModel + + org.nuiton.jaxx.widgets.select.FilterableDoubleList + + static fr.ird.observe.ui.UIHelper.getStringValue + static org.nuiton.i18n.I18n.n + </import> + + <!-- validator --> + <BeanValidator id='validator' autoField='true' + beanClass='fr.ird.observe.entities.referentiel.Gear' + context='n1-create' + errorTableModel='{getErrorTableModel()}'/> + + <!-- model --> + <GearUIModel id='model'/> + + <!-- edit bean --> + <Gear id='bean'/> + + <!-- handler --> + <GearUIHandler id='handler' constructorParams="this"/> + + <Table id="editView" insets="0" fill="both"> + <row> + <cell anchor="north" weightx="1"> + <JTabbedPane id='tabPane'> + <tab id='generalTab'> + <Table fill="both"> + + <!-- uri --> + <row> + <cell anchor="west"> + <JLabel id='uriLabel'/> + </cell> + <cell anchor='east' weightx="1" fill="both"> + <JTextField id='uri' onKeyReleased='getBean().setUri(uri.getText())'/> + </cell> + </row> + + <!-- code / status --> + <row> + <cell anchor="west"> + <JLabel id='codeStatusLabel'/> + </cell> + <cell anchor='east' weightx="1" fill="both"> + <JPanel id='codeStatusPanel' layout='{new BorderLayout()}'> + <JTextField id='code' constraints='BorderLayout.WEST' + onKeyReleased='getBean().setCode(code.getText())'/> + <EnumEditor id='status' constraints='BorderLayout.CENTER' + constructorParams='ReferenceStatus.class' + genericType='ReferenceStatus' + onItemStateChanged='getBean().setStatus((ReferenceStatus)status.getSelectedItem())'/> + </JPanel> + </cell> + </row> + + <!-- needComment --> + <row> + <cell anchor='east' weightx="1" fill="both" columns="2"> + <JCheckBox id='needComment' onItemStateChanged='getBean().setNeedComment(needComment.isSelected())'/> + </cell> + </row> + + <row> + <cell columns="2"> + <Table id='editI18nTable2'> + <row> + <cell anchor="west"> + <JLabel id='label1Label'/> + </cell> + <cell anchor='east' weightx="1" fill="both"> + <JTextField id='label1' onKeyReleased='getBean().setLabel1(label1.getText())'/> + </cell> + <cell anchor="west"> + <JLabel id='label2Label'/> + </cell> + <cell anchor='east' weightx="1" fill="both"> + <JTextField id='label2' onKeyReleased='getBean().setLabel2(label2.getText())'/> + </cell> + </row> + <row> + <cell anchor="west"> + <JLabel id='label3Label'/> + </cell> + <cell anchor='east' weightx="1" fill="both"> + <JTextField id='label3' onKeyReleased='getBean().setLabel3(label3.getText())'/> + </cell> + <cell anchor="west"> + <JLabel id='label4Label'/> + </cell> + <cell anchor='east' weightx="1" fill="both"> + <JTextField id='label4' onKeyReleased='getBean().setLabel4(label4.getText())'/> + </cell> + </row> + <row> + <cell anchor="west"> + <JLabel id='label5Label'/> + </cell> + <cell anchor='east' weightx="1" fill="both"> + <JTextField id='label5' onKeyReleased='getBean().setLabel5(label5.getText())'/> + </cell> + <cell anchor="west"> + <JLabel id='label6Label'/> + </cell> + <cell anchor='east' weightx="1" fill="both"> + <JTextField id='label6' onKeyReleased='getBean().setLabel6(label6.getText())'/> + </cell> + </row> + <row> + <cell anchor="west"> + <JLabel id='label7Label'/> + </cell> + <cell anchor='east' weightx="1" fill="both"> + <JTextField id='label7' onKeyReleased='getBean().setLabel7(label7.getText())'/> + </cell> + <cell anchor="west"> + <JLabel id='label8Label'/> + </cell> + <cell anchor='east' weightx="1" fill="both"> + <JTextField id='label8' onKeyReleased='getBean().setLabel8(label8.getText())'/> + </cell> + </row> + </Table> + </cell> + </row> + <row> + <cell columns="2" weighty="1"> + <JLabel/> + </cell> + </row> + </Table> + </tab> + + <tab id='gearCaracteristicTab'> + <Table fill="both" weightx="1"> + <!-- gearCaracteristic --> + <row> + <cell weightx="1" weighty="1"> + <JScrollPane id='gearCaracteristicPane' layout='{new GridLayout(1,1)}'> + <FilterableDoubleList id='gearCaracteristic' genericType='GearCaracteristic'/> + </JScrollPane> + </cell> + </row> + </Table> + </tab> + </JTabbedPane> + </cell> + </row> + <row> + <cell columns="2" weighty="1"> + <JLabel/> + </cell> + </row> + </Table> + +</fr.ird.observe.ui.content.ref.ContentReferenceUI> diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearUIHandler.java b/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearUIHandler.java new file mode 100644 index 0000000..ba5a33e --- /dev/null +++ b/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearUIHandler.java @@ -0,0 +1,82 @@ +package fr.ird.observe.ui.content.ref.impl; + +import fr.ird.observe.entities.referentiel.Gear; +import fr.ird.observe.ui.content.ref.ContentReferenceUI; +import fr.ird.observe.ui.content.ref.ContentReferenceUIHandler; +import jaxx.runtime.validator.swing.SwingValidatorMessage; +import jaxx.runtime.validator.swing.SwingValidatorMessageTableModel; +import org.nuiton.validator.NuitonValidatorScope; + +import javax.swing.event.TableModelEvent; +import javax.swing.event.TableModelListener; +import java.util.HashSet; +import java.util.Set; + +/** + * Created on 3/23/15. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 3.16 + */ +public class GearUIHandler extends ContentReferenceUIHandler<Gear> { + + // Compute valid state of tab from the error table + protected final TableModelListener computeTabValidStateListener = new TableModelListener() { + @Override + public void tableChanged(TableModelEvent e) { + + SwingValidatorMessageTableModel source = (SwingValidatorMessageTableModel) e.getSource(); + computeTabValidState(source); + + } + }; + + public GearUIHandler(ContentReferenceUI<Gear> ui) { + super(ui); + } + + @Override + public void initUI() throws Exception { + + 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(Gear selectedBean) { + + super.selectBean(selectedBean); + + SwingValidatorMessageTableModel errorTableModel = getUi().getErrorTableModel(); + computeTabValidState(errorTableModel); + + ((GearUI) getUi()).getTabPane().setSelectedIndex(0); + + } + + protected void computeTabValidState(SwingValidatorMessageTableModel errorTableModel) { + + Set<String> errorProperties = new HashSet<String>(); + 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(GearUIModel.GENERAL_TAB_PROPERTIES); + boolean gearCaracteristicTabValid = !errorProperties.removeAll(GearUIModel.GEAR_CARACTERISTIC_TAB_PROPERTIES); + + GearUIModel model = (GearUIModel) getModel(); + model.setGeneralTabValid(generalTabValid); + model.setGearCaracteristicTabValid(gearCaracteristicTabValid); + + } +} \ No newline at end of file diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearUIModel.java b/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearUIModel.java new file mode 100644 index 0000000..96682f2 --- /dev/null +++ b/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearUIModel.java @@ -0,0 +1,70 @@ +package fr.ird.observe.ui.content.ref.impl; + +import com.google.common.collect.ImmutableSet; +import fr.ird.observe.entities.referentiel.Gear; +import fr.ird.observe.ui.content.ref.ContentReferenceUIModel; + +import java.util.Set; + +/** + * Created on 3/23/15. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 3.16 + */ +public class GearUIModel extends ContentReferenceUIModel<Gear> { + + private static final long serialVersionUID = 1L; + + public static final String PROPERTY_GENERAL_TAB_VALID = "generalTabValid"; + + public static final String PROPERTY_GEAR_CARACTERISTIC_TAB_VALID = "gearCaracteristicTabValid"; + + public static final Set<String> GENERAL_TAB_PROPERTIES = + ImmutableSet.<String>builder().add(Gear.PROPERTY_URI, + Gear.PROPERTY_CODE, + Gear.PROPERTY_STATUS, + Gear.PROPERTY_NEED_COMMENT, + Gear.PROPERTY_LABEL1, + Gear.PROPERTY_LABEL2, + Gear.PROPERTY_LABEL3, + Gear.PROPERTY_LABEL4, + Gear.PROPERTY_LABEL5, + Gear.PROPERTY_LABEL6, + Gear.PROPERTY_LABEL7, + Gear.PROPERTY_LABEL8).build(); + + public static final Set<String> GEAR_CARACTERISTIC_TAB_PROPERTIES = + ImmutableSet.<String>builder().add(Gear.PROPERTY_GEAR_CARACTERISTIC).build(); + + protected boolean generalTabValid; + + protected boolean gearCaracteristicTabValid; + + public GearUIModel() { + super(Gear.class, + new String[]{Gear.PROPERTY_GEAR_CARACTERISTIC}, + new String[]{Gear.PROPERTY_GEAR_CARACTERISTIC + SUFFIX_SELECTED}); + } + + public boolean isGearCaracteristicTabValid() { + return gearCaracteristicTabValid; + } + + public void setGearCaracteristicTabValid(boolean gearCaracteristicTabValid) { + Object oldValue = isGearCaracteristicTabValid(); + this.gearCaracteristicTabValid = gearCaracteristicTabValid; + firePropertyChange(PROPERTY_GEAR_CARACTERISTIC_TAB_VALID, oldValue, gearCaracteristicTabValid); + } + + public boolean isGeneralTabValid() { + return generalTabValid; + } + + public void setGeneralTabValid(boolean generalTabValid) { + Object oldValue = isGeneralTabValid(); + this.generalTabValid = generalTabValid; + firePropertyChange(PROPERTY_GENERAL_TAB_VALID, oldValue, generalTabValid); + } + +} \ No newline at end of file diff --git a/observe-swing/src/main/resources/i18n/observe-swing_en_GB.properties b/observe-swing/src/main/resources/i18n/observe-swing_en_GB.properties index 92d874b..d9c0ea4 100644 --- a/observe-swing/src/main/resources/i18n/observe-swing_en_GB.properties +++ b/observe-swing/src/main/resources/i18n/observe-swing_en_GB.properties @@ -147,6 +147,21 @@ observe.action.fpaZone.delete.tip=Delete the selected FPA zone observe.action.fpaZone.detail.tip=View details about the selected FPA zone observe.action.fpaZone.modify.tip=Edit the selected FPA zone observe.action.fpaZone.save.tip=Save modifications +observe.action.gear.create.tip=Create an gear +observe.action.gear.delete.tip=Delete the selected gear +observe.action.gear.detail.tip=View details about the selected gear +observe.action.gear.modify.tip=Edit the selected gear +observe.action.gear.save.tip=Save modifications +observe.action.gearCaracteristic.create.tip=Create an gear caracteristic +observe.action.gearCaracteristic.delete.tip=Delete the selected gear caracteristic +observe.action.gearCaracteristic.detail.tip=View details about the selected gear caracteristic +observe.action.gearCaracteristic.modify.tip=Edit the selected gear caracteristic +observe.action.gearCaracteristic.save.tip=Save modifications +observe.action.gearCaracteristicType.create.tip=Create an gear caracteristic type +observe.action.gearCaracteristicType.delete.tip=Delete the selected gear caracteristic type +observe.action.gearCaracteristicType.detail.tip=View details about the selected gear caracteristic type +observe.action.gearCaracteristicType.modify.tip=Edit the selected gear caracteristic type +observe.action.gearCaracteristicType.save.tip=Save modifications observe.action.goDown=Down... observe.action.goDown.tip=Go down in navigation tree observe.action.goUp=Up... @@ -749,7 +764,9 @@ observe.common.flagCountry= observe.common.floatingObject.unsaved=New DCP observe.common.formsUrl= observe.common.gaugeLabel= -observe.common.gearType= +observe.common.gear=Gear +observe.common.gearCaracteristic=Gear caracteristic +observe.common.gearType=Gear caracteristic type observe.common.generateReport= observe.common.global.progression.description= observe.common.heureobservation= @@ -1032,6 +1049,13 @@ observe.floatlinesComposition.table.lineType.tip=Line type observe.floatlinesComposition.table.proportion=Proportion observe.floatlinesComposition.table.proportion.tip=Proportion observe.floatlinesComposition.title=Floatines +observe.gear.availableGearCaracteristic=Available caracteristics +observe.gear.gearCaracteristic= +observe.gear.gearCaracteristicType= +observe.gear.selectedGearCaracteristic=Selected caracteristics +observe.gear.tab.gearCaracteristic=Caracteristics of the gear +observe.gear.tab.general=General caracteristics +observe.gear.unit= observe.harbour.coordinates= observe.harbour.locode= observe.harbour.name= @@ -1072,6 +1096,9 @@ observe.list.country= observe.list.detectionMode= observe.list.encounterType= observe.list.fpaZone= +observe.list.gear= +observe.list.gearCaracteristic= +observe.list.gearCaracteristicType= observe.list.harbour= observe.list.healthness= observe.list.hookPosition= @@ -1846,6 +1873,9 @@ observe.title.content.country= observe.title.content.detectionModes= observe.title.content.encounterTypes= observe.title.content.fpaZones= +observe.title.content.gearCaracteristicTypes= +observe.title.content.gearCaracteristics= +observe.title.content.gears= observe.title.content.harbours= observe.title.content.healthnesss= observe.title.content.hookPositions= diff --git a/observe-swing/src/main/resources/i18n/observe-swing_es_ES.properties b/observe-swing/src/main/resources/i18n/observe-swing_es_ES.properties index 4d5d44b..fb64e19 100644 --- a/observe-swing/src/main/resources/i18n/observe-swing_es_ES.properties +++ b/observe-swing/src/main/resources/i18n/observe-swing_es_ES.properties @@ -147,6 +147,21 @@ observe.action.fpaZone.delete.tip= observe.action.fpaZone.detail.tip= observe.action.fpaZone.modify.tip= observe.action.fpaZone.save.tip= +observe.action.gear.create.tip= +observe.action.gear.delete.tip= +observe.action.gear.detail.tip= +observe.action.gear.modify.tip= +observe.action.gear.save.tip= +observe.action.gearCaracteristic.create.tip= +observe.action.gearCaracteristic.delete.tip= +observe.action.gearCaracteristic.detail.tip= +observe.action.gearCaracteristic.modify.tip= +observe.action.gearCaracteristic.save.tip= +observe.action.gearCaracteristicType.create.tip= +observe.action.gearCaracteristicType.delete.tip= +observe.action.gearCaracteristicType.detail.tip= +observe.action.gearCaracteristicType.modify.tip= +observe.action.gearCaracteristicType.save.tip= observe.action.goDown=Descender hacia ... observe.action.goDown.tip=Descender hacia etapas porteriores observe.action.goUp=Ascender hacia... @@ -749,6 +764,7 @@ observe.common.flagCountry=Badera observe.common.floatingObject.unsaved=Nuevo DCP observe.common.formsUrl=URL de los formularios observe.common.gaugeLabel=Texto «Capacidad» +observe.common.gearCaracteristic= observe.common.gearType= observe.common.generateReport=Generar un informe de validación observe.common.global.progression.description=Progresión global @@ -1032,6 +1048,13 @@ observe.floatlinesComposition.table.lineType.tip= observe.floatlinesComposition.table.proportion= observe.floatlinesComposition.table.proportion.tip= observe.floatlinesComposition.title= +observe.gear.availableGearCaracteristic= +observe.gear.gearCaracteristic= +observe.gear.gearCaracteristicType= +observe.gear.selectedGearCaracteristic= +observe.gear.tab.gearCaracteristic= +observe.gear.tab.general= +observe.gear.unit= observe.harbour.coordinates= observe.harbour.locode= observe.harbour.name= @@ -1072,6 +1095,9 @@ observe.list.country=Paíises registrados observe.list.detectionMode=Modos de detección registradas observe.list.encounterType= observe.list.fpaZone= +observe.list.gear= +observe.list.gearCaracteristic= +observe.list.gearCaracteristicType= observe.list.harbour= observe.list.healthness= observe.list.hookPosition= @@ -1846,6 +1872,9 @@ observe.title.content.country= observe.title.content.detectionModes= observe.title.content.encounterTypes= observe.title.content.fpaZones= +observe.title.content.gearCaracteristicTypes= +observe.title.content.gearCaracteristics= +observe.title.content.gears= observe.title.content.harbours= observe.title.content.healthnesss= observe.title.content.hookPositions= diff --git a/observe-swing/src/main/resources/i18n/observe-swing_fr_FR.properties b/observe-swing/src/main/resources/i18n/observe-swing_fr_FR.properties index 975b607..53d04b2 100644 --- a/observe-swing/src/main/resources/i18n/observe-swing_fr_FR.properties +++ b/observe-swing/src/main/resources/i18n/observe-swing_fr_FR.properties @@ -147,6 +147,21 @@ observe.action.fpaZone.delete.tip=Supprimer la zone FPA sélectionnée observe.action.fpaZone.detail.tip=Voir les détails de la zone FPA sélectionnée observe.action.fpaZone.modify.tip=Modifier la zone FPA sélectionnée observe.action.fpaZone.save.tip=Sauver les modifications de la zone FPA +observe.action.gear.create.tip=Créer un nouvel équipment +observe.action.gear.delete.tip=Supprimer l'équipment sélectionné +observe.action.gear.detail.tip=Voir les détails de l'équipment sélectionné +observe.action.gear.modify.tip=Modifier l'équipment sélectionné +observe.action.gear.save.tip=Sauver les modifications de l'équipment +observe.action.gearCaracteristic.create.tip=Créer une nouvelle caractéristique +observe.action.gearCaracteristic.delete.tip=Supprimer la caractéristique sélectionnée +observe.action.gearCaracteristic.detail.tip=Voir les détails de la caractéristique sélectionnée +observe.action.gearCaracteristic.modify.tip=Modifier la caractéristique sélectionnée +observe.action.gearCaracteristic.save.tip=Sauver les modifications de la caractéristique +observe.action.gearCaracteristicType.create.tip=Créer un nouveau type de caractéristique +observe.action.gearCaracteristicType.delete.tip=Supprimer le type de caractéristique sélectionné +observe.action.gearCaracteristicType.detail.tip=Voir les détails du type de caractéristique sélectionné +observe.action.gearCaracteristicType.modify.tip=Modifier le type de caractéristique sélectionné +observe.action.gearCaracteristicType.save.tip=Sauver les modifications du type de caractéristique observe.action.goDown=Descendre vers ... observe.action.goDown.tip=Descendre dans la navigation observe.action.goUp=Remonter vers ... @@ -182,12 +197,12 @@ observe.action.goto.selected.maree=Accéder à la marée observe.action.goto.selected.maree.tip=Accéder à la marée sélectionnée observe.action.goto.selected.route=Accéder à la route observe.action.goto.selected.route.tip=Accéder à la route sélectionnée -observe.action.harbour.create.tip= -observe.action.harbour.delete.tip= -observe.action.harbour.detail.tip= -observe.action.harbour.modify.tip= -observe.action.harbour.save.tip= -observe.action.healthness.create.tip=Créer un nouveal état de santé +observe.action.harbour.create.tip=Créer un nouveau port +observe.action.harbour.delete.tip=Supprimer le port sélectionné +observe.action.harbour.detail.tip=Voir les détails du port sélectionné +observe.action.harbour.modify.tip=Modifier le port sélectionné +observe.action.harbour.save.tip=Sauver les modifications du port +observe.action.healthness.create.tip=Créer un nouveau état de santé observe.action.healthness.delete.tip=Supprimer l'état de santé sélectionné observe.action.healthness.detail.tip=Voir les détails de l'état de santé sélectionné observe.action.healthness.modify.tip=Modifier l'état de santé sélectionné @@ -749,6 +764,7 @@ observe.common.flagCountry=Pavillon observe.common.floatingObject.unsaved=Nouveau DCP observe.common.formsUrl=URL des formulaires observe.common.gaugeLabel=Libellé jauge +observe.common.gearCaracteristic=Caractétistique d'un équipement observe.common.gearType=Type d'engin observe.common.generateReport=Générer un rapport de validation observe.common.global.progression.description=Progression globale @@ -1032,6 +1048,13 @@ observe.floatlinesComposition.table.lineType.tip=Type observe.floatlinesComposition.table.proportion=Proportion observe.floatlinesComposition.table.proportion.tip=Proportion observe.floatlinesComposition.title=Composition des orins +observe.gear.availableGearCaracteristic=Caractéristiques disponibles +observe.gear.gearCaracteristic=Caractéristiques +observe.gear.gearCaracteristicType=Type de caractéristique +observe.gear.selectedGearCaracteristic=Caractéristiques utilisées +observe.gear.tab.gearCaracteristic=Caractéristiques de l'équipement +observe.gear.tab.general=Caractéristiques générales +observe.gear.unit=Unité observe.harbour.coordinates=Nom observe.harbour.locode=Locode observe.harbour.name=Nom @@ -1072,6 +1095,9 @@ observe.list.country=Liste des pays enregistrés observe.list.detectionMode=Liste des modes de détection enregistrés observe.list.encounterType=Liste des types de rencontre enregistrés observe.list.fpaZone=Liste des zones FPA enregistrées +observe.list.gear=Liste des équipements enregistrées +observe.list.gearCaracteristic=Liste des caractéristiques d'équipement enregistrées +observe.list.gearCaracteristicType=Liste des types de caractéristique enregistrés observe.list.harbour=Liste des ports enregistrés observe.list.healthness=Liste des états de santé enregistrés observe.list.hookPosition=Liste des positions d'hameçon enregistrées @@ -1846,6 +1872,9 @@ observe.title.content.country=Gestion des pays observe.title.content.detectionModes=Gestion des modes de détection observe.title.content.encounterTypes=Gestion des types de rencontre observe.title.content.fpaZones=Gestion des zones FPA +observe.title.content.gearCaracteristicTypes=Gestion des types de caractéristiques +observe.title.content.gearCaracteristics=Gestion des caractéristiques d'équipement +observe.title.content.gears=Gestion des équipements observe.title.content.harbours=GEstion des ports observe.title.content.healthnesss=Gestion des états de santé observe.title.content.hookPositions=Gestion des positions d'hameçon diff --git a/observe-validation/src/main/resources/fr/ird/observe/entities/referentiel/Gear-n1-create-error-validation.xml b/observe-validation/src/main/resources/fr/ird/observe/entities/referentiel/Gear-n1-create-error-validation.xml new file mode 100644 index 0000000..7bf463a --- /dev/null +++ b/observe-validation/src/main/resources/fr/ird/observe/entities/referentiel/Gear-n1-create-error-validation.xml @@ -0,0 +1,75 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 IRD, Codelutin, 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="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielList</param> + <param name="keys">code</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> + </field-validator> + + </field> + + <field name="uri"> + + <!-- clef unique sur l'uri --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielList</param> + <param name="keys">uri</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> + </field-validator> + </field> + + <field name="label1"> + <!-- pas de libelle 1 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label1</message> + </field-validator> + </field> + + <field name="label2"> + <!-- pas de libelle 2 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label2</message> + </field-validator> + </field> + + <field name="label3"> + <!-- pas de libelle 3 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-validation/src/main/resources/fr/ird/observe/entities/referentiel/Gear-n1-create-warning-validation.xml b/observe-validation/src/main/resources/fr/ird/observe/entities/referentiel/Gear-n1-create-warning-validation.xml new file mode 100644 index 0000000..fddb53e --- /dev/null +++ b/observe-validation/src/main/resources/fr/ird/observe/entities/referentiel/Gear-n1-create-warning-validation.xml @@ -0,0 +1,67 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 IRD, Codelutin, 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="status"> + <!-- objet desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ enabled ]]> + </param> + <message>validator.referentiel.status.desactivated</message> + </field-validator> + </field> + + <field name="uri"> + <!-- pas d'uri selectionne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.referentiel.null.uri</message> + </field-validator> + </field> + + <field name="label1"> + + <!-- libelle 1 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label1</message> + </field-validator> + </field> + + <field name="label3"> + <!-- libelle 3 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-validation/src/main/resources/fr/ird/observe/entities/referentiel/Gear-n1-update-error-validation.xml b/observe-validation/src/main/resources/fr/ird/observe/entities/referentiel/Gear-n1-update-error-validation.xml new file mode 100644 index 0000000..7bf463a --- /dev/null +++ b/observe-validation/src/main/resources/fr/ird/observe/entities/referentiel/Gear-n1-update-error-validation.xml @@ -0,0 +1,75 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 IRD, Codelutin, 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="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielList</param> + <param name="keys">code</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> + </field-validator> + + </field> + + <field name="uri"> + + <!-- clef unique sur l'uri --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielList</param> + <param name="keys">uri</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> + </field-validator> + </field> + + <field name="label1"> + <!-- pas de libelle 1 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label1</message> + </field-validator> + </field> + + <field name="label2"> + <!-- pas de libelle 2 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label2</message> + </field-validator> + </field> + + <field name="label3"> + <!-- pas de libelle 3 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-validation/src/main/resources/fr/ird/observe/entities/referentiel/Gear-n1-update-warning-validation.xml b/observe-validation/src/main/resources/fr/ird/observe/entities/referentiel/Gear-n1-update-warning-validation.xml new file mode 100644 index 0000000..fddb53e --- /dev/null +++ b/observe-validation/src/main/resources/fr/ird/observe/entities/referentiel/Gear-n1-update-warning-validation.xml @@ -0,0 +1,67 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 IRD, Codelutin, 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="status"> + <!-- objet desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ enabled ]]> + </param> + <message>validator.referentiel.status.desactivated</message> + </field-validator> + </field> + + <field name="uri"> + <!-- pas d'uri selectionne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.referentiel.null.uri</message> + </field-validator> + </field> + + <field name="label1"> + + <!-- libelle 1 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label1</message> + </field-validator> + </field> + + <field name="label3"> + <!-- libelle 3 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-validation/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristic-n1-create-error-validation.xml b/observe-validation/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristic-n1-create-error-validation.xml new file mode 100644 index 0000000..f340882 --- /dev/null +++ b/observe-validation/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristic-n1-create-error-validation.xml @@ -0,0 +1,90 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 IRD, Codelutin, 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="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielList</param> + <param name="keys">code</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> + </field-validator> + + </field> + + <field name="uri"> + + <!-- clef unique sur l'uri --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielList</param> + <param name="keys">uri</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> + </field-validator> + </field> + + <field name="gearCaracteristicType"> + + <!-- pas de gearCaracteristicType renseigne --> + <field-validator type="required" short-circuit="true"> + <message>validator.gearCaracteristic.required.gearCaracteristicType</message> + </field-validator> + + <!-- gearCaracteristicType desactivee --> + <field-validator type="fieldexpression"> + <param name="expression"><![CDATA[ disabled || gearCaracteristicType.enabled ]]> + </param> + <message>validator.gearCaracteristic.desactivated.gearCaracteristicType</message> + </field-validator> + </field> + + <field name="label1"> + <!-- pas de libelle 1 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label1</message> + </field-validator> + </field> + + <field name="label2"> + <!-- pas de libelle 2 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label2</message> + </field-validator> + </field> + + <field name="label3"> + <!-- pas de libelle 3 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-validation/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristic-n1-create-warning-validation.xml b/observe-validation/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristic-n1-create-warning-validation.xml new file mode 100644 index 0000000..fddb53e --- /dev/null +++ b/observe-validation/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristic-n1-create-warning-validation.xml @@ -0,0 +1,67 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 IRD, Codelutin, 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="status"> + <!-- objet desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ enabled ]]> + </param> + <message>validator.referentiel.status.desactivated</message> + </field-validator> + </field> + + <field name="uri"> + <!-- pas d'uri selectionne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.referentiel.null.uri</message> + </field-validator> + </field> + + <field name="label1"> + + <!-- libelle 1 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label1</message> + </field-validator> + </field> + + <field name="label3"> + <!-- libelle 3 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-validation/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristic-n1-update-error-validation.xml b/observe-validation/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristic-n1-update-error-validation.xml new file mode 100644 index 0000000..f340882 --- /dev/null +++ b/observe-validation/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristic-n1-update-error-validation.xml @@ -0,0 +1,90 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 IRD, Codelutin, 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="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielList</param> + <param name="keys">code</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> + </field-validator> + + </field> + + <field name="uri"> + + <!-- clef unique sur l'uri --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielList</param> + <param name="keys">uri</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> + </field-validator> + </field> + + <field name="gearCaracteristicType"> + + <!-- pas de gearCaracteristicType renseigne --> + <field-validator type="required" short-circuit="true"> + <message>validator.gearCaracteristic.required.gearCaracteristicType</message> + </field-validator> + + <!-- gearCaracteristicType desactivee --> + <field-validator type="fieldexpression"> + <param name="expression"><![CDATA[ disabled || gearCaracteristicType.enabled ]]> + </param> + <message>validator.gearCaracteristic.desactivated.gearCaracteristicType</message> + </field-validator> + </field> + + <field name="label1"> + <!-- pas de libelle 1 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label1</message> + </field-validator> + </field> + + <field name="label2"> + <!-- pas de libelle 2 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label2</message> + </field-validator> + </field> + + <field name="label3"> + <!-- pas de libelle 3 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-validation/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristic-n1-update-warning-validation.xml b/observe-validation/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristic-n1-update-warning-validation.xml new file mode 100644 index 0000000..fddb53e --- /dev/null +++ b/observe-validation/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristic-n1-update-warning-validation.xml @@ -0,0 +1,67 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 IRD, Codelutin, 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="status"> + <!-- objet desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ enabled ]]> + </param> + <message>validator.referentiel.status.desactivated</message> + </field-validator> + </field> + + <field name="uri"> + <!-- pas d'uri selectionne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.referentiel.null.uri</message> + </field-validator> + </field> + + <field name="label1"> + + <!-- libelle 1 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label1</message> + </field-validator> + </field> + + <field name="label3"> + <!-- libelle 3 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-validation/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristicType-n1-create-error-validation.xml b/observe-validation/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristicType-n1-create-error-validation.xml new file mode 100644 index 0000000..7bf463a --- /dev/null +++ b/observe-validation/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristicType-n1-create-error-validation.xml @@ -0,0 +1,75 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 IRD, Codelutin, 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="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielList</param> + <param name="keys">code</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> + </field-validator> + + </field> + + <field name="uri"> + + <!-- clef unique sur l'uri --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielList</param> + <param name="keys">uri</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> + </field-validator> + </field> + + <field name="label1"> + <!-- pas de libelle 1 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label1</message> + </field-validator> + </field> + + <field name="label2"> + <!-- pas de libelle 2 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label2</message> + </field-validator> + </field> + + <field name="label3"> + <!-- pas de libelle 3 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-validation/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristicType-n1-create-warning-validation.xml b/observe-validation/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristicType-n1-create-warning-validation.xml new file mode 100644 index 0000000..fddb53e --- /dev/null +++ b/observe-validation/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristicType-n1-create-warning-validation.xml @@ -0,0 +1,67 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 IRD, Codelutin, 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="status"> + <!-- objet desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ enabled ]]> + </param> + <message>validator.referentiel.status.desactivated</message> + </field-validator> + </field> + + <field name="uri"> + <!-- pas d'uri selectionne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.referentiel.null.uri</message> + </field-validator> + </field> + + <field name="label1"> + + <!-- libelle 1 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label1</message> + </field-validator> + </field> + + <field name="label3"> + <!-- libelle 3 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-validation/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristicType-n1-update-error-validation.xml b/observe-validation/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristicType-n1-update-error-validation.xml new file mode 100644 index 0000000..7bf463a --- /dev/null +++ b/observe-validation/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristicType-n1-update-error-validation.xml @@ -0,0 +1,75 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 IRD, Codelutin, 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="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielList</param> + <param name="keys">code</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> + </field-validator> + + </field> + + <field name="uri"> + + <!-- clef unique sur l'uri --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielList</param> + <param name="keys">uri</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> + </field-validator> + </field> + + <field name="label1"> + <!-- pas de libelle 1 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label1</message> + </field-validator> + </field> + + <field name="label2"> + <!-- pas de libelle 2 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label2</message> + </field-validator> + </field> + + <field name="label3"> + <!-- pas de libelle 3 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-validation/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristicType-n1-update-warning-validation.xml b/observe-validation/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristicType-n1-update-warning-validation.xml new file mode 100644 index 0000000..fddb53e --- /dev/null +++ b/observe-validation/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristicType-n1-update-warning-validation.xml @@ -0,0 +1,67 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 IRD, Codelutin, 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="status"> + <!-- objet desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ enabled ]]> + </param> + <message>validator.referentiel.status.desactivated</message> + </field-validator> + </field> + + <field name="uri"> + <!-- pas d'uri selectionne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.referentiel.null.uri</message> + </field-validator> + </field> + + <field name="label1"> + + <!-- libelle 1 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label1</message> + </field-validator> + </field> + + <field name="label3"> + <!-- libelle 3 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-validation/src/main/resources/i18n/observe-validation_en_GB.properties b/observe-validation/src/main/resources/i18n/observe-validation_en_GB.properties index b052275..b449fbf 100644 --- a/observe-validation/src/main/resources/i18n/observe-validation_en_GB.properties +++ b/observe-validation/src/main/resources/i18n/observe-validation_en_GB.properties @@ -113,6 +113,8 @@ validator.floatlinesComposition.desactivated.lineType= validator.floatlinesComposition.required.length= validator.floatlinesComposition.required.lineType= validator.floatlinesComposition.required.proportion= +validator.gearCaracteristic.desactivated.gearCaracteristicType= +validator.gearCaracteristic.required.gearCaracteristicType= validator.harbour.desactivated.country= validator.harbour.null.latitude= validator.harbour.null.locode= diff --git a/observe-validation/src/main/resources/i18n/observe-validation_es_ES.properties b/observe-validation/src/main/resources/i18n/observe-validation_es_ES.properties index 93e5c58..051d68f 100644 --- a/observe-validation/src/main/resources/i18n/observe-validation_es_ES.properties +++ b/observe-validation/src/main/resources/i18n/observe-validation_es_ES.properties @@ -113,6 +113,8 @@ validator.floatlinesComposition.desactivated.lineType= validator.floatlinesComposition.required.length= validator.floatlinesComposition.required.lineType= validator.floatlinesComposition.required.proportion= +validator.gearCaracteristic.desactivated.gearCaracteristicType= +validator.gearCaracteristic.required.gearCaracteristicType= validator.harbour.desactivated.country= validator.harbour.null.latitude= validator.harbour.null.locode= diff --git a/observe-validation/src/main/resources/i18n/observe-validation_fr_FR.properties b/observe-validation/src/main/resources/i18n/observe-validation_fr_FR.properties index 7ab75d9..4de32e4 100644 --- a/observe-validation/src/main/resources/i18n/observe-validation_fr_FR.properties +++ b/observe-validation/src/main/resources/i18n/observe-validation_fr_FR.properties @@ -113,6 +113,8 @@ validator.floatlinesComposition.desactivated.lineType=Le type sélectionnée est validator.floatlinesComposition.required.length=Proportion non renseignée. validator.floatlinesComposition.required.lineType=La sélection d'un type est obligatoire. validator.floatlinesComposition.required.proportion=Proportion non renseignée. +validator.gearCaracteristic.desactivated.gearCaracteristicType=Le type sélectionnée est désactivée. +validator.gearCaracteristic.required.gearCaracteristicType=Le type sélectionnée est obligatoire. validator.harbour.desactivated.country=Le pays sélectionné est désactivé. validator.harbour.null.latitude=La latitude n'est pas renseignée. validator.harbour.null.locode=Le locode n'est pas renseigné. diff --git a/observe-validation/src/test/java/fr/ird/observe/validation/BeanValidatorDetectorTest.java b/observe-validation/src/test/java/fr/ird/observe/validation/BeanValidatorDetectorTest.java index 5e4c4e2..707ed05 100644 --- a/observe-validation/src/test/java/fr/ird/observe/validation/BeanValidatorDetectorTest.java +++ b/observe-validation/src/test/java/fr/ird/observe/validation/BeanValidatorDetectorTest.java @@ -38,6 +38,9 @@ import fr.ird.observe.entities.longline.Tdr; import fr.ird.observe.entities.longline.TripLongline; import fr.ird.observe.entities.referentiel.Country; import fr.ird.observe.entities.referentiel.FpaZone; +import fr.ird.observe.entities.referentiel.Gear; +import fr.ird.observe.entities.referentiel.GearCaracteristic; +import fr.ird.observe.entities.referentiel.GearCaracteristicType; import fr.ird.observe.entities.referentiel.Harbour; import fr.ird.observe.entities.referentiel.LengthWeightParameter; import fr.ird.observe.entities.referentiel.Ocean; @@ -151,7 +154,7 @@ public class BeanValidatorDetectorTest extends AbstractValidatorDetectorTest { SortedSet<NuitonValidator<?>> validators = detectValidators(ALL_TYPES); assertFalse(validators.isEmpty()); - assertEquals(166, validators.size()); + assertEquals(172, validators.size()); } @@ -175,6 +178,9 @@ public class BeanValidatorDetectorTest extends AbstractValidatorDetectorTest { EncounterType.class, FloatingObject.class, FpaZone.class, + Gear.class, + GearCaracteristic.class, + GearCaracteristicType.class, Harbour.class, Healthness.class, HookPosition.class, @@ -255,6 +261,9 @@ public class BeanValidatorDetectorTest extends AbstractValidatorDetectorTest { FloatingObject.class, FloatlinesComposition.class, FpaZone.class, + Gear.class, + GearCaracteristic.class, + GearCaracteristicType.class, Harbour.class, Healthness.class, HookPosition.class, -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/6855 in repository observe. See http://git.codelutin.com/observe.git commit ac3926208390b66ed609fae187d0905b9e676aff Author: Tony Chemit <chemit@codelutin.com> Date: Tue Mar 24 09:03:00 2015 +0000 refs #6855: add seine gear data + remove old seine data --- .../DataSourceMigrationForVersion_3_16.java | 90 ++++++++++++++++++++- .../main/resources/db/3.16/add-gear-data-H2.sql | 18 +++++ .../main/resources/db/3.16/add-gear-data-PG.sql | 18 +++++ .../db/3.16/remove-tripSeine-seine-H2.sql | 3 + .../db/3.16/remove-tripSeine-seine-PG.sql | 3 + observe-entities/src/main/xmi/observe-seine.zargo | Bin 82186 -> 85886 bytes .../ui/content/open/impl/seine/TripSeineUI.css | 34 -------- .../ui/content/open/impl/seine/TripSeineUI.jaxx | 78 +++++++++--------- .../open/impl/seine/TripSeineUIHandler.java | 3 - .../content/open/impl/seine/TripSeineUIModel.java | 10 +-- .../TripSeine-n1-create-warning-validation.xml | 39 --------- .../TripSeine-n1-update-warning-validation.xml | 40 --------- .../i18n/observe-validation_en_GB.properties | 3 - .../i18n/observe-validation_es_ES.properties | 3 - .../i18n/observe-validation_fr_FR.properties | 3 - 15 files changed, 174 insertions(+), 171 deletions(-) diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_16.java b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_16.java index 52a29a2..f9b46b0 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_16.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_16.java @@ -4,10 +4,19 @@ import fr.ird.observe.entities.migration.AbstractDataSourceMigration; import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; import fr.ird.observe.entities.migration.H2DataSourceMigration; import fr.ird.observe.entities.migration.PGDataSourceMigration; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.hibernate.jdbc.Work; import org.nuiton.topia.TopiaException; import org.nuiton.topia.framework.TopiaContextImplementor; +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.util.HashSet; import java.util.List; +import java.util.Set; /** * Created on 3/23/15. @@ -17,6 +26,9 @@ import java.util.List; */ public class DataSourceMigrationForVersion_3_16 extends AbstractObserveMigrationCallBack { + /** Logger. */ + private static final Log log = LogFactory.getLog(DataSourceMigrationForVersion_3_16.class); + public DataSourceMigrationForVersion_3_16(AbstractDataSourceMigration callBack, String scriptSuffix) { super(AbstractDataSourceMigration.V_3_16, callBack, scriptSuffix); } @@ -27,8 +39,84 @@ public class DataSourceMigrationForVersion_3_16 extends AbstractObserveMigration boolean showSql, boolean showProgression) throws TopiaException { - addScript("add-gear-referential", queries); +// addScript("add-gear-referential", queries); + addScript("add-gear-data", queries); + migrateTripSenneData(tx, queries); + addScript("remove-tripSeine-seine", queries); + } + + private void migrateTripSenneData(TopiaContextImplementor tx, List<String> queries) throws TopiaException { + + String gearUseFeaturesIdPrefix = "fr.ird.observe.entities.seine.GearUseFeatures#1427183650941#"; + + int gearUseFeaturesCount = -1; + Set<SenneData> senneData = getSenneData(tx); + for (SenneData senne : senneData) { + + String gearUseFeaturesId = gearUseFeaturesIdPrefix + (++gearUseFeaturesCount); + if (log.isInfoEnabled()) { + log.info(String.format("Transform senne from trip: %s to: %s", senne.tripId, gearUseFeaturesId)); + } + // Create GearUseFeatures + queries.add(String.format("INSERT INTO OBSERVE_SEINE.GEARUSEFEATURES(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, TRIP, GEAR) VALUES ('%s', 0, TIMESTAMP '2015-03-24 00:00:00.00', '%s', 'fr.ird.observe.entities.referentiel.Gear#1239832686125#0.20' );", gearUseFeaturesId, senne.tripId)); + + // Create GearUseFeaturesMeasurements + String gearUseFeatureMeasurementIdPrefix = "fr.ird.observe.entities.seine.GearUseFeaturesMeasurement#1427183650941#" + gearUseFeaturesCount; + if (senne.seineCircumference != null) { + String gearUseFeatureMeasurementId = gearUseFeatureMeasurementIdPrefix + 0; + queries.add(String.format("INSERT INTO OBSERVE_SEINE.GEARUSEFEATURESMEASUREMENT(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, GEARCARACTERISTIC, GEARUSEFEATURES, MEASUREMENTVALUE) VALUES ('%s', 0, TIMESTAMP '2015-03-24 00:00:00.00', 'fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.7', '%s', '%s' );", gearUseFeatureMeasurementId, gearUseFeaturesId, senne.seineCircumference)); + } + if (senne.seineDepth != null) { + String gearUseFeatureMeasurementId = gearUseFeatureMeasurementIdPrefix + 1; + queries.add(String.format("INSERT INTO OBSERVE_SEINE.GEARUSEFEATURESMEASUREMENT(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, GEARCARACTERISTIC, GEARUSEFEATURES, MEASUREMENTVALUE) VALUES ('%s', 0, TIMESTAMP '2015-03-24 00:00:00.00', 'fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.10', '%s', '%s' );", gearUseFeatureMeasurementId, gearUseFeaturesId, senne.seineBallastWeight)); + } + if (senne.seineBallastWeight != null) { + String gearUseFeatureMeasurementId = gearUseFeatureMeasurementIdPrefix + 2; + queries.add(String.format("INSERT INTO OBSERVE_SEINE.GEARUSEFEATURESMEASUREMENT(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, GEARCARACTERISTIC, GEARUSEFEATURES, MEASUREMENTVALUE) VALUES ('%s', 0, TIMESTAMP '2015-03-24 00:00:00.00', 'fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.9', '%s', '%s' );", gearUseFeatureMeasurementId, gearUseFeaturesId, senne.seineDepth)); + } + } + } + + private static class SenneData { + + String tripId; + + Integer seineCircumference; + + Integer seineDepth; + + Integer seineBallastWeight; + } + + protected Set<SenneData> getSenneData(TopiaContextImplementor tx) throws TopiaException { + + final Set<SenneData> result = new HashSet<SenneData>(); + + tx.getHibernate().doWork(new Work() { + + @Override + public void execute(Connection connection) throws SQLException { + String sql = "SELECT topiaId, seineCircumference, seineDepth, seineBallastWeight FROM OBSERVE_SEINE.TRIP WHERE seineDepth IS NOT NULL OR seineDepth IS NOT NULL OR seineBallastWeight IS NOT NULL;"; + PreparedStatement ps = connection.prepareStatement(sql); + try { + ResultSet set = ps.executeQuery(); + while (set.next()) { + SenneData senneData = new SenneData(); + senneData.tripId = set.getString(1); + senneData.seineCircumference = set.getInt(2); + senneData.seineDepth = set.getInt(3); + senneData.seineBallastWeight = set.getInt(4); + result.add(senneData); + } + } catch (Exception e) { + throw new SQLException("Could not obtain trip senne data", e); + } finally { + ps.close(); + } + } + }); + return result; } public static class H2DataSourceMigrationForVersion extends DataSourceMigrationForVersion_3_16 { diff --git a/observe-entities/src/main/resources/db/3.16/add-gear-data-H2.sql b/observe-entities/src/main/resources/db/3.16/add-gear-data-H2.sql new file mode 100644 index 0000000..5128dc8 --- /dev/null +++ b/observe-entities/src/main/resources/db/3.16/add-gear-data-H2.sql @@ -0,0 +1,18 @@ +-- +-- GearUseFeatures Definition +-- +CREATE TABLE OBSERVE_SEINE.GEARUSEFEATURES(topiaid VARCHAR(255) NOT NULL,topiaversion BIGINT NOT NULL, topiacreatedate DATE, trip VARCHAR(255) NOT NULL, gear VARCHAR(255) NOT NULL, comment VARCHAR(1023), usedInTrip BOOLEAN); +ALTER TABLE OBSERVE_SEINE.GEARUSEFEATURES ADD CONSTRAINT PK_GEARUSEFEATURES PRIMARY KEY(TOPIAID); +ALTER TABLE OBSERVE_SEINE.GEARUSEFEATURES ADD CONSTRAINT FK_GEARUSEFEATURES_TRIP FOREIGN KEY(trip) REFERENCES OBSERVE_SEINE.TRIP(topiaid); +ALTER TABLE OBSERVE_SEINE.GEARUSEFEATURES ADD CONSTRAINT FK_GEARUSEFEATURES_GEAR FOREIGN KEY(gear) REFERENCES OBSERVE_COMMON.GEAR(topiaid); +CREATE INDEX FK_GEARUSEFEATURES_TRIP_IDX ON OBSERVE_SEINE.GEARUSEFEATURES(trip); +CREATE INDEX FK_GEARUSEFEATURES_GEAR_IDX ON OBSERVE_SEINE.GEARUSEFEATURES(gear); +-- +-- GearUseFeaturesMeasurement Definition +-- +CREATE TABLE OBSERVE_SEINE.GEARUSEFEATURESMEASUREMENT(topiaid VARCHAR(255) NOT NULL,topiaversion BIGINT NOT NULL, topiacreatedate DATE, gearCaracteristic VARCHAR(255) NOT NULL, gearUseFeatures VARCHAR(255) NOT NULL, measurementValue VARCHAR(255) NOT NULL); +ALTER TABLE OBSERVE_SEINE.GEARUSEFEATURESMEASUREMENT ADD CONSTRAINT PK_GEARUSEFEATURESMEASUREMENT PRIMARY KEY(TOPIAID); +ALTER TABLE OBSERVE_SEINE.GEARUSEFEATURESMEASUREMENT ADD CONSTRAINT FK_GEARUSEFEATURESMEASUREMENT_GEARCARACTERISTIC FOREIGN KEY(gearCaracteristic) REFERENCES OBSERVE_COMMON.GEARCARACTERISTIC(topiaid); +ALTER TABLE OBSERVE_SEINE.GEARUSEFEATURESMEASUREMENT ADD CONSTRAINT FK_GEARUSEFEATURESMEASUREMENT_GEARUSEFEATURES FOREIGN KEY(gearUseFeatures) REFERENCES OBSERVE_SEINE.GEARUSEFEATURES(topiaid); +CREATE INDEX FK_GEARUSEFEATURESMEASUREMENT_GEARCARACTERISTIC_IDX ON OBSERVE_SEINE.GEARUSEFEATURESMEASUREMENT(gearCaracteristic); +CREATE INDEX FK_GEARUSEFEATURESMEASUREMENT_GEARUSEFEATURES_IDX ON OBSERVE_SEINE.GEARUSEFEATURESMEASUREMENT(GearUseFeatures); \ No newline at end of file diff --git a/observe-entities/src/main/resources/db/3.16/add-gear-data-PG.sql b/observe-entities/src/main/resources/db/3.16/add-gear-data-PG.sql new file mode 100644 index 0000000..8a483d1 --- /dev/null +++ b/observe-entities/src/main/resources/db/3.16/add-gear-data-PG.sql @@ -0,0 +1,18 @@ +-- +-- GearUseFeatures Definition +-- +CREATE TABLE OBSERVE_SEINE.GEARUSEFEATURES(topiaid character varying(255) NOT NULL,topiaversion BIGINT NOT NULL, topiacreatedate DATE, trip character varying(255) NOT NULL, gear character varying(255) NOT NULL, comment VARCHAR(1023), usedInTrip BOOLEAN); +ALTER TABLE OBSERVE_SEINE.GEARUSEFEATURES ADD CONSTRAINT PK_GEARUSEFEATURES PRIMARY KEY(TOPIAID); +ALTER TABLE OBSERVE_SEINE.GEARUSEFEATURES ADD CONSTRAINT FK_GEARUSEFEATURES_TRIP FOREIGN KEY(trip) REFERENCES OBSERVE_SEINE.TRIP(topiaid); +ALTER TABLE OBSERVE_SEINE.GEARUSEFEATURES ADD CONSTRAINT FK_GEARUSEFEATURES_GEAR FOREIGN KEY(gear) REFERENCES OBSERVE_COMMON.GEAR(topiaid); +CREATE INDEX FK_GEARUSEFEATURES_TRIP_IDX ON OBSERVE_SEINE.GEARUSEFEATURES(trip); +CREATE INDEX FK_GEARUSEFEATURES_GEAR_IDX ON OBSERVE_SEINE.GEARUSEFEATURES(gear); +-- +-- GearUseFeaturesMeasurement Definition +-- +CREATE TABLE OBSERVE_SEINE.GEARUSEFEATURESMEASUREMENT(topiaid character varying(255) NOT NULL,topiaversion BIGINT NOT NULL, topiacreatedate DATE, gearCaracteristic character varying(255) NOT NULL, gearUseFeatures character varying(255) NOT NULL, measurementValue character varying(255) NOT NULL); +ALTER TABLE OBSERVE_SEINE.GEARUSEFEATURESMEASUREMENT ADD CONSTRAINT PK_GEARUSEFEATURESMEASUREMENT PRIMARY KEY(TOPIAID); +ALTER TABLE OBSERVE_SEINE.GEARUSEFEATURESMEASUREMENT ADD CONSTRAINT FK_GEARUSEFEATURESMEASUREMENT_GEARCARACTERISTIC FOREIGN KEY(gearCaracteristic) REFERENCES OBSERVE_COMMON.GEARCARACTERISTIC(topiaid); +ALTER TABLE OBSERVE_SEINE.GEARUSEFEATURESMEASUREMENT ADD CONSTRAINT FK_GEARUSEFEATURESMEASUREMENT_GEARUSEFEATURES FOREIGN KEY(gearUseFeatures) REFERENCES OBSERVE_SEINE.GEARUSEFEATURES(topiaid); +CREATE INDEX FK_GEARUSEFEATURESMEASUREMENT_GEARCARACTERISTIC_IDX ON OBSERVE_SEINE.GEARUSEFEATURESMEASUREMENT(gearCaracteristic); +CREATE INDEX FK_GEARUSEFEATURESMEASUREMENT_GEARUSEFEATURES_IDX ON OBSERVE_SEINE.GEARUSEFEATURESMEASUREMENT(GearUseFeatures); \ No newline at end of file diff --git a/observe-entities/src/main/resources/db/3.16/remove-tripSeine-seine-H2.sql b/observe-entities/src/main/resources/db/3.16/remove-tripSeine-seine-H2.sql new file mode 100644 index 0000000..9c8fdf3 --- /dev/null +++ b/observe-entities/src/main/resources/db/3.16/remove-tripSeine-seine-H2.sql @@ -0,0 +1,3 @@ +ALTER TABLE OBSERVE_SEINE.TRIP DROP COLUMN seineCircumference; +ALTER TABLE OBSERVE_SEINE.TRIP DROP COLUMN seineDepth; +ALTER TABLE OBSERVE_SEINE.TRIP DROP COLUMN seineBallastWeight; \ No newline at end of file diff --git a/observe-entities/src/main/resources/db/3.16/remove-tripSeine-seine-PG.sql b/observe-entities/src/main/resources/db/3.16/remove-tripSeine-seine-PG.sql new file mode 100644 index 0000000..9c8fdf3 --- /dev/null +++ b/observe-entities/src/main/resources/db/3.16/remove-tripSeine-seine-PG.sql @@ -0,0 +1,3 @@ +ALTER TABLE OBSERVE_SEINE.TRIP DROP COLUMN seineCircumference; +ALTER TABLE OBSERVE_SEINE.TRIP DROP COLUMN seineDepth; +ALTER TABLE OBSERVE_SEINE.TRIP DROP COLUMN seineBallastWeight; \ No newline at end of file diff --git a/observe-entities/src/main/xmi/observe-seine.zargo b/observe-entities/src/main/xmi/observe-seine.zargo index 750b53b..4ae6784 100644 Binary files a/observe-entities/src/main/xmi/observe-seine.zargo and b/observe-entities/src/main/xmi/observe-seine.zargo differ diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUI.css b/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUI.css index 467403c..fc43d24 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUI.css +++ b/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUI.css @@ -136,40 +136,6 @@ NumberEditor { text:{getStringValue(bean.getErsId())}; } -#senneContainer { - border:{new TitledBorder(t("observe.common.senne"))}; -} - -#seineCircumferenceLabel { - text:"observe.common.seineCircumference"; - labelFor:{seineCircumference}; -} - -#seineCircumference { - property:{TripSeine.PROPERTY_SEINE_CIRCUMFERENCE}; - model:{bean.getSeineCircumference()}; -} - -#seineDepthLabel { - text:"observe.common.seineDepth"; - labelFor:{seineDepth}; -} - -#seineDepth { - property:{TripSeine.PROPERTY_SEINE_DEPTH}; - model:{bean.getSeineDepth()}; -} - -#seineBallastWeightLabel { - text:"observe.common.seineBallastWeight"; - labelFor:{seineBallastWeight}; -} - -#seineBallastWeight { - property:{TripSeine.PROPERTY_SEINE_BALLAST_WEIGHT}; - model:{bean.getSeineBallastWeight()}; -} - #startDateLabel { text:"observe.common.startDate"; labelFor:{startDate}; diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUI.jaxx b/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUI.jaxx index e418817..0a21730 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUI.jaxx +++ b/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUI.jaxx @@ -235,45 +235,45 @@ protected boolean canEditOcean(java.util.List<Route> routes) { <tab id='caracteristicTab'> - <Table fill="both" weightx="1"> - - <!-- senne --> - <row> - <cell anchor='west' columns="2"> - <Table fill="both" id='senneContainer'> - <row> - <cell anchor='west'> - <JLabel id='seineCircumferenceLabel'/> - </cell> - <cell anchor='east' weightx="1" fill="both"> - <NumberEditor id='seineCircumference' constructorParams='this'/> - </cell> - </row> - <row> - <cell> - <JLabel id='seineDepthLabel'/> - </cell> - <cell> - <NumberEditor id='seineDepth' constructorParams='this'/> - </cell> - </row> - <row> - <cell> - <JLabel id='seineBallastWeightLabel'/> - </cell> - <cell> - <NumberEditor id='seineBallastWeight' constructorParams='this'/> - </cell> - </row> - </Table> - </cell> - </row> - <row> - <cell weighty="1"> - <JLabel/> - </cell> - </row> - </Table> + <!--<Table fill="both" weightx="1">--> + + <!--<!– senne –>--> + <!--<row>--> + <!--<cell anchor='west' columns="2">--> + <!--<Table fill="both" id='senneContainer'>--> + <!--<row>--> + <!--<cell anchor='west'>--> + <!--<JLabel id='seineCircumferenceLabel'/>--> + <!--</cell>--> + <!--<cell anchor='east' weightx="1" fill="both">--> + <!--<NumberEditor id='seineCircumference' constructorParams='this'/>--> + <!--</cell>--> + <!--</row>--> + <!--<row>--> + <!--<cell>--> + <!--<JLabel id='seineDepthLabel'/>--> + <!--</cell>--> + <!--<cell>--> + <!--<NumberEditor id='seineDepth' constructorParams='this'/>--> + <!--</cell>--> + <!--</row>--> + <!--<row>--> + <!--<cell>--> + <!--<JLabel id='seineBallastWeightLabel'/>--> + <!--</cell>--> + <!--<cell>--> + <!--<NumberEditor id='seineBallastWeight' constructorParams='this'/>--> + <!--</cell>--> + <!--</row>--> + <!--</Table>--> + <!--</cell>--> + <!--</row>--> + <!--<row>--> + <!--<cell weighty="1">--> + <!--<JLabel/>--> + <!--</cell>--> + <!--</row>--> + <!--</Table>--> </tab> </JTabbedPane> diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUIHandler.java b/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUIHandler.java index 63e6e38..a489f2c 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUIHandler.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUIHandler.java @@ -225,9 +225,6 @@ public class TripSeineUIHandler extends ContentOpenableUIHandler<TripSeine> { TripSeineUI.BINDING_CAPTAIN_SELECTED_ITEM, TripSeineUI.BINDING_DATA_ENTRY_OPERATOR_SELECTED_ITEM, TripSeineUI.BINDING_OCEAN_SELECTED_ITEM, - TripSeineUI.BINDING_SEINE_CIRCUMFERENCE_MODEL, - TripSeineUI.BINDING_SEINE_DEPTH_MODEL, - TripSeineUI.BINDING_SEINE_BALLAST_WEIGHT_MODEL, TripSeineUI.BINDING_START_DATE_DATE, TripSeineUI.BINDING_END_DATE_DATE, TripSeineUI.BINDING_COMMENT2_TEXT, diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUIModel.java b/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUIModel.java index cb68330..73bc4c5 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUIModel.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUIModel.java @@ -60,9 +60,7 @@ public class TripSeineUIModel extends ContentOpenableUIModel<TripSeine> { TripSeine.PROPERTY_REPORTS_URL).build(); public static final Set<String> CARACTERISTICS_TAB_PROPERTIES = - ImmutableSet.<String>builder().add(TripSeine.PROPERTY_SEINE_BALLAST_WEIGHT, - TripSeine.PROPERTY_SEINE_CIRCUMFERENCE, - TripSeine.PROPERTY_SEINE_DEPTH).build(); + ImmutableSet.<String>builder().add(TripSeine.PROPERTY_GEAR_USE_FEATURES).build(); private static final long serialVersionUID = 1L; @@ -105,9 +103,6 @@ public class TripSeineUIModel extends ContentOpenableUIModel<TripSeine> { TripSeine.PROPERTY_REPORTS_URL, TripSeine.PROPERTY_COMMENT, TripSeine.PROPERTY_VESSEL, - TripSeine.PROPERTY_SEINE_CIRCUMFERENCE, - TripSeine.PROPERTY_SEINE_DEPTH, - TripSeine.PROPERTY_SEINE_BALLAST_WEIGHT, TripSeine.PROPERTY_OBSERVER, TripSeine.PROPERTY_CAPTAIN, TripSeine.PROPERTY_DATA_ENTRY_OPERATOR, @@ -116,11 +111,14 @@ public class TripSeineUIModel extends ContentOpenableUIModel<TripSeine> { TripSeine.PROPERTY_LANDING_HARBOUR, TripSeine.PROPERTY_PROGRAM, TripSeine.PROPERTY_ROUTE, + TripSeine.PROPERTY_GEAR_USE_FEATURES, TripSeine.PROPERTY_ERS_ID, TripSeine.PROPERTY_OPEN); // on ajoute la recopie de l'association route builder.addCollectionStrategy(Binder.CollectionStrategy.duplicate, TripSeine.PROPERTY_ROUTE); + // on ajoute la recopie de l'association gearUseFeatues + builder.addCollectionStrategy(Binder.CollectionStrategy.duplicate, TripSeine.PROPERTY_GEAR_USE_FEATURES); return builder; diff --git a/observe-validation/src/main/resources/fr/ird/observe/entities/seine/TripSeine-n1-create-warning-validation.xml b/observe-validation/src/main/resources/fr/ird/observe/entities/seine/TripSeine-n1-create-warning-validation.xml index c17e256..a39dbb4 100644 --- a/observe-validation/src/main/resources/fr/ird/observe/entities/seine/TripSeine-n1-create-warning-validation.xml +++ b/observe-validation/src/main/resources/fr/ird/observe/entities/seine/TripSeine-n1-create-warning-validation.xml @@ -33,45 +33,6 @@ </field> - <field name="seineCircumference"> - - <!-- 0 <= seineCircumference <= 6000 --> - <field-validator type="double" short-circuit="true"> - <param name="minInclusive">0</param> - <param name="maxInclusive">6000</param> - <message> - validator.trip.bound.seineCircumference##${minInclusive}##${maxInclusive} - </message> - </field-validator> - - </field> - - <field name="seineDepth"> - - <!-- 0 <= seineDepth <= 500 --> - <field-validator type="double" short-circuit="true"> - <param name="minInclusive">0</param> - <param name="maxInclusive">500</param> - <message> - validator.trip.bound.seineDepth##${minInclusive}##${maxInclusive} - </message> - </field-validator> - - </field> - - <field name="seineBallastWeight"> - - <!-- 0 <= seineBallastWeight <= 1000 --> - <field-validator type="double" short-circuit="true"> - <param name="minInclusive">0</param> - <param name="maxInclusive">1000</param> - <message> - validator.trip.bound.seineBallastWeight##${minInclusive}##${maxInclusive} - </message> - </field-validator> - - </field> - <field name="captain"> <!-- pas de captain selectionne --> diff --git a/observe-validation/src/main/resources/fr/ird/observe/entities/seine/TripSeine-n1-update-warning-validation.xml b/observe-validation/src/main/resources/fr/ird/observe/entities/seine/TripSeine-n1-update-warning-validation.xml index b6bac7b..5162dae 100644 --- a/observe-validation/src/main/resources/fr/ird/observe/entities/seine/TripSeine-n1-update-warning-validation.xml +++ b/observe-validation/src/main/resources/fr/ird/observe/entities/seine/TripSeine-n1-update-warning-validation.xml @@ -26,7 +26,6 @@ "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> <validators> - <field name="departureHarbour"> <!-- pas de departureHarbour selectionne --> @@ -45,45 +44,6 @@ </field> - <field name="seineCircumference"> - - <!-- 0 <= seineCircumference <= 6000 --> - <field-validator type="double" short-circuit="true"> - <param name="minInclusive">0</param> - <param name="maxInclusive">6000</param> - <message> - validator.trip.bound.seineCircumference##${minInclusive}##${maxInclusive} - </message> - </field-validator> - - </field> - - <field name="seineDepth"> - - <!-- 0 <= seineDepth <= 500 --> - <field-validator type="double" short-circuit="true"> - <param name="minInclusive">0</param> - <param name="maxInclusive">500</param> - <message> - validator.trip.bound.seineDepth##${minInclusive}##${maxInclusive} - </message> - </field-validator> - - </field> - - <field name="seineBallastWeight"> - - <!-- 0 <= seineBallastWeight <= 1000 --> - <field-validator type="double" short-circuit="true"> - <param name="minInclusive">0</param> - <param name="maxInclusive">1000</param> - <message> - validator.trip.bound.seineBallastWeight##${minInclusive}##${maxInclusive} - </message> - </field-validator> - - </field> - <field name="ocean"> <!-- pas d'ocean selectionne --> diff --git a/observe-validation/src/main/resources/i18n/observe-validation_en_GB.properties b/observe-validation/src/main/resources/i18n/observe-validation_en_GB.properties index b449fbf..b1df383 100644 --- a/observe-validation/src/main/resources/i18n/observe-validation_en_GB.properties +++ b/observe-validation/src/main/resources/i18n/observe-validation_en_GB.properties @@ -360,9 +360,6 @@ validator.transmittingBuoy.desactivated.transmittingBuoyType= validator.transmittingBuoy.null.code= validator.transmittingBuoy.required.transmittingBuoyOperation= validator.transmittingBuoy.required.transmittingBuoyType= -validator.trip.bound.seineBallastWeight= -validator.trip.bound.seineCircumference= -validator.trip.bound.seineDepth= validator.trip.comment.tobig= validator.trip.desactivated.captain= validator.trip.desactivated.dataEntryOperator= diff --git a/observe-validation/src/main/resources/i18n/observe-validation_es_ES.properties b/observe-validation/src/main/resources/i18n/observe-validation_es_ES.properties index 051d68f..0665513 100644 --- a/observe-validation/src/main/resources/i18n/observe-validation_es_ES.properties +++ b/observe-validation/src/main/resources/i18n/observe-validation_es_ES.properties @@ -360,9 +360,6 @@ validator.transmittingBuoy.desactivated.transmittingBuoyType= validator.transmittingBuoy.null.code=El código de baliza no ha sido especificado. validator.transmittingBuoy.required.transmittingBuoyOperation= validator.transmittingBuoy.required.transmittingBuoyType= -validator.trip.bound.seineBallastWeight=Le weight du lest de la senne debe estar comprendido entre %1$s et %2$s. -validator.trip.bound.seineCircumference=La circonférence de la senne debe estar comprendido entre %1$s et %2$s. -validator.trip.bound.seineDepth=La profondeur de la senne debe estar comprendido entre %1$s et %2$s. validator.trip.comment.tobig=La longitud del campo de comentarios está limitado a 1024 carácteres. validator.trip.desactivated.captain= validator.trip.desactivated.dataEntryOperator= diff --git a/observe-validation/src/main/resources/i18n/observe-validation_fr_FR.properties b/observe-validation/src/main/resources/i18n/observe-validation_fr_FR.properties index 4de32e4..809099d 100644 --- a/observe-validation/src/main/resources/i18n/observe-validation_fr_FR.properties +++ b/observe-validation/src/main/resources/i18n/observe-validation_fr_FR.properties @@ -360,9 +360,6 @@ validator.transmittingBuoy.desactivated.transmittingBuoyType=Le type de balise s validator.transmittingBuoy.null.code=Le code de la balise n'est pas renseigné. validator.transmittingBuoy.required.transmittingBuoyOperation=La sélection d'une opération sur balise est obligatoire. validator.transmittingBuoy.required.transmittingBuoyType=La sélection d'une type de balise est obligatoire. -validator.trip.bound.seineBallastWeight=Le poids du lest de la senne doit être comprise entre %1$s et %2$s. -validator.trip.bound.seineCircumference=La circonférence de la senne doit être comprise entre %1$s et %2$s. -validator.trip.bound.seineDepth=La profondeur de la senne doit être comprise entre %1$s et %2$s. validator.trip.comment.tobig=La taille du commentaire est limitée à 1024 caractères. validator.trip.desactivated.captain=Le capitaine sélectionné est désactivé. validator.trip.desactivated.dataEntryOperator=Le saisisseur sélectionné est désactivé. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/6855 in repository observe. See http://git.codelutin.com/observe.git commit 991e8cdcbb3cf4ef1238647b20e3539ac0c366ba Author: Tony Chemit <chemit@codelutin.com> Date: Tue Mar 24 09:03:10 2015 +0000 refs #6855: add seine gear data + remove old seine data --- .../migration/versions/DataSourceMigrationForVersion_3_16.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_16.java b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_16.java index f9b46b0..4dd18c0 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_16.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_16.java @@ -39,10 +39,11 @@ public class DataSourceMigrationForVersion_3_16 extends AbstractObserveMigration boolean showSql, boolean showProgression) throws TopiaException { -// addScript("add-gear-referential", queries); + addScript("add-gear-referential", queries); addScript("add-gear-data", queries); migrateTripSenneData(tx, queries); addScript("remove-tripSeine-seine", queries); + } private void migrateTripSenneData(TopiaContextImplementor tx, List<String> queries) throws TopiaException { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/6855 in repository observe. See http://git.codelutin.com/observe.git commit e563e3b7800331be2515b0f39d921fe1f16e5eb5 Author: Tony Chemit <chemit@codelutin.com> Date: Tue Mar 24 14:21:38 2015 +0000 refs #6855: ajout données equipements pour la seine des traductions + correction du la dll --- .../DataSourceMigrationForVersion_3_16.java | 2 +- .../main/resources/db/3.16/add-gear-data-H2.sql | 2 +- .../main/resources/db/3.16/add-gear-data-PG.sql | 2 +- .../resources/db/3.16/add-gear-referential-H2.sql | 111 +++++++++++---------- .../resources/db/3.16/add-gear-referential-PG.sql | 109 ++++++++++---------- .../src/main/xmi/observe-seine.properties | 6 ++ observe-entities/src/main/xmi/observe-seine.zargo | Bin 85886 -> 85926 bytes 7 files changed, 120 insertions(+), 112 deletions(-) diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_16.java b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_16.java index 4dd18c0..4e679c7 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_16.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_16.java @@ -59,7 +59,7 @@ public class DataSourceMigrationForVersion_3_16 extends AbstractObserveMigration log.info(String.format("Transform senne from trip: %s to: %s", senne.tripId, gearUseFeaturesId)); } // Create GearUseFeatures - queries.add(String.format("INSERT INTO OBSERVE_SEINE.GEARUSEFEATURES(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, TRIP, GEAR) VALUES ('%s', 0, TIMESTAMP '2015-03-24 00:00:00.00', '%s', 'fr.ird.observe.entities.referentiel.Gear#1239832686125#0.20' );", gearUseFeaturesId, senne.tripId)); + queries.add(String.format("INSERT INTO OBSERVE_SEINE.GEARUSEFEATURES(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, TRIP, GEAR, NUMBER) VALUES ('%s', 0, TIMESTAMP '2015-03-24 00:00:00.00', '%s', 'fr.ird.observe.entities.referentiel.Gear#1239832686125#0.20', 1);", gearUseFeaturesId, senne.tripId)); // Create GearUseFeaturesMeasurements String gearUseFeatureMeasurementIdPrefix = "fr.ird.observe.entities.seine.GearUseFeaturesMeasurement#1427183650941#" + gearUseFeaturesCount; diff --git a/observe-entities/src/main/resources/db/3.16/add-gear-data-H2.sql b/observe-entities/src/main/resources/db/3.16/add-gear-data-H2.sql index 5128dc8..1f8f0a9 100644 --- a/observe-entities/src/main/resources/db/3.16/add-gear-data-H2.sql +++ b/observe-entities/src/main/resources/db/3.16/add-gear-data-H2.sql @@ -1,7 +1,7 @@ -- -- GearUseFeatures Definition -- -CREATE TABLE OBSERVE_SEINE.GEARUSEFEATURES(topiaid VARCHAR(255) NOT NULL,topiaversion BIGINT NOT NULL, topiacreatedate DATE, trip VARCHAR(255) NOT NULL, gear VARCHAR(255) NOT NULL, comment VARCHAR(1023), usedInTrip BOOLEAN); +CREATE TABLE OBSERVE_SEINE.GEARUSEFEATURES(topiaid VARCHAR(255) NOT NULL,topiaversion BIGINT NOT NULL, topiacreatedate DATE, trip VARCHAR(255) NOT NULL, gear VARCHAR(255) NOT NULL, number INTEGER NOT NULL, comment VARCHAR(1023), usedInTrip BOOLEAN); ALTER TABLE OBSERVE_SEINE.GEARUSEFEATURES ADD CONSTRAINT PK_GEARUSEFEATURES PRIMARY KEY(TOPIAID); ALTER TABLE OBSERVE_SEINE.GEARUSEFEATURES ADD CONSTRAINT FK_GEARUSEFEATURES_TRIP FOREIGN KEY(trip) REFERENCES OBSERVE_SEINE.TRIP(topiaid); ALTER TABLE OBSERVE_SEINE.GEARUSEFEATURES ADD CONSTRAINT FK_GEARUSEFEATURES_GEAR FOREIGN KEY(gear) REFERENCES OBSERVE_COMMON.GEAR(topiaid); diff --git a/observe-entities/src/main/resources/db/3.16/add-gear-data-PG.sql b/observe-entities/src/main/resources/db/3.16/add-gear-data-PG.sql index 8a483d1..5062e32 100644 --- a/observe-entities/src/main/resources/db/3.16/add-gear-data-PG.sql +++ b/observe-entities/src/main/resources/db/3.16/add-gear-data-PG.sql @@ -1,7 +1,7 @@ -- -- GearUseFeatures Definition -- -CREATE TABLE OBSERVE_SEINE.GEARUSEFEATURES(topiaid character varying(255) NOT NULL,topiaversion BIGINT NOT NULL, topiacreatedate DATE, trip character varying(255) NOT NULL, gear character varying(255) NOT NULL, comment VARCHAR(1023), usedInTrip BOOLEAN); +CREATE TABLE OBSERVE_SEINE.GEARUSEFEATURES(topiaid character varying(255) NOT NULL,topiaversion BIGINT NOT NULL, topiacreatedate DATE, trip character varying(255) NOT NULL, gear character varying(255) NOT NULL, number INTEGER NOT NULL, comment VARCHAR(1023), usedInTrip BOOLEAN); ALTER TABLE OBSERVE_SEINE.GEARUSEFEATURES ADD CONSTRAINT PK_GEARUSEFEATURES PRIMARY KEY(TOPIAID); ALTER TABLE OBSERVE_SEINE.GEARUSEFEATURES ADD CONSTRAINT FK_GEARUSEFEATURES_TRIP FOREIGN KEY(trip) REFERENCES OBSERVE_SEINE.TRIP(topiaid); ALTER TABLE OBSERVE_SEINE.GEARUSEFEATURES ADD CONSTRAINT FK_GEARUSEFEATURES_GEAR FOREIGN KEY(gear) REFERENCES OBSERVE_COMMON.GEAR(topiaid); diff --git a/observe-entities/src/main/resources/db/3.16/add-gear-referential-H2.sql b/observe-entities/src/main/resources/db/3.16/add-gear-referential-H2.sql index db7a2c7..2b229ab 100644 --- a/observe-entities/src/main/resources/db/3.16/add-gear-referential-H2.sql +++ b/observe-entities/src/main/resources/db/3.16/add-gear-referential-H2.sql @@ -5,13 +5,16 @@ CREATE TABLE OBSERVE_COMMON.GEARCARACTERISTICTYPE(topiaid VARCHAR(255) NOT NULL, ALTER TABLE OBSERVE_COMMON.GEARCARACTERISTICTYPE ADD CONSTRAINT PK_GEARCARACTERISTICTYPE PRIMARY KEY(TOPIAID); -- -- Gear caracteristic type Data +/* + + */ -- -INSERT INTO OBSERVE_COMMON.GEARCARACTERISTICTYPE(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.1', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Texte'),STRINGDECODE('Text'),STRINGDECODE('Texte')); -INSERT INTO OBSERVE_COMMON.GEARCARACTERISTICTYPE(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.2', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Boolean'),STRINGDECODE('Boolean'),STRINGDECODE('Boolean')); -INSERT INTO OBSERVE_COMMON.GEARCARACTERISTICTYPE(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.3', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Entier signé'),STRINGDECODE('Signed Integer'),STRINGDECODE('Signed Integer')); -INSERT INTO OBSERVE_COMMON.GEARCARACTERISTICTYPE(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.4', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Décimal signé'),STRINGDECODE('Signed Decimal'),STRINGDECODE('Signed Decimal')); -INSERT INTO OBSERVE_COMMON.GEARCARACTERISTICTYPE(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.5', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Entier non signé'),STRINGDECODE('Unsigned Integer'),STRINGDECODE('Unsigned Integer')); -INSERT INTO OBSERVE_COMMON.GEARCARACTERISTICTYPE(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.6', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Décimal non signé'),STRINGDECODE('Unsigned Decimal'),STRINGDECODE('Unsigned Decimal')); +INSERT INTO OBSERVE_COMMON.GEARCARACTERISTICTYPE(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.1', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Texte'),STRINGDECODE('Text'),STRINGDECODE('Texto')); +INSERT INTO OBSERVE_COMMON.GEARCARACTERISTICTYPE(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.2', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Boolean'),STRINGDECODE('Boolean'),STRINGDECODE('Booleano')); +INSERT INTO OBSERVE_COMMON.GEARCARACTERISTICTYPE(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.3', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Entier signé'),STRINGDECODE('Not signed whole number'),STRINGDECODE('Entero no firmado')); +INSERT INTO OBSERVE_COMMON.GEARCARACTERISTICTYPE(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.4', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Décimal signé'),STRINGDECODE('Signed Decimal'),STRINGDECODE('Decimal firmado')); +INSERT INTO OBSERVE_COMMON.GEARCARACTERISTICTYPE(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.5', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Entier non signé'),STRINGDECODE('Signed whole number'),STRINGDECODE('Entero firmado')); +INSERT INTO OBSERVE_COMMON.GEARCARACTERISTICTYPE(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.6', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Décimal non signé'),STRINGDECODE('Not signed decimal'),STRINGDECODE('Decimal no firmado')); -- -- Gear caracteristic Definition -- @@ -22,28 +25,28 @@ CREATE INDEX FK_GEARCARACTERISTIC_GEARCARACTERISTICTYPE_IDX ON OBSERVE_COMMON.GE -- -- Gear caracteristic Data -- -INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.1', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Portée'), null, null, 'm', 'fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.5'); -INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.2', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Puissance moteur'), null, null, 'cv', 'fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.5'); -INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.3', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Fréquence'), null, null, 'Hz', 'fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.5'); -INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.4', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Fréquence basse'), null, null, 'Hz', 'fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.5'); -INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.5', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Fréquence haute'), null, null, 'Hz', 'fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.5'); -INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.6', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Type'), null, null, null, 'fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.1'); -INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.7', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Circonférence surface'), null, null, 'm', 'fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.5'); -INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.8', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Circonference fond'), null, null, 'm', 'fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.5'); -INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.9', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Profondeur'), null, null, 'm', 'fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.5'); -INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.10', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Poids du lest'), null, null, 'kg', 'fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.5'); -INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.11', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Maille de poche'), null, null, 'mm', 'fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.5'); -INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.12', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Autre maillage'), null, null, 'mm', 'fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.5'); -INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.13', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Capacité en volume'), null, null, 'm³', 'fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.5'); -INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.14', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Capacité en masse'), null, null, 't', 'fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.5'); -INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.15', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Diamètre'), null, null, 'm', 'fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.5'); -INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.16', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Rapport d''armement'), null, null, '%', 'fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.5'); -INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.17', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Fournisseur/marque'), null, null, null, 'fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.1'); -INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.18', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Fréquence d''interrogation'), null, null, 'fois / jour', 'fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.5'); -INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.19', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Nombre de mises à l''eau'), null, null, null, 'fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.5'); -INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.20', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Hauteur'), null, null, 'm', 'fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.5'); -INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.21', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Non maillant'), null, null, null, 'fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.2'); -INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.22', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Matériau écologique'), null, null, null, 'fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.2'); +INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.1', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Portée'), STRINGDECODE('range'), STRINGDECODE('alcance'), 'm', 'fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.5'); +INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.2', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Puissance moteur'), STRINGDECODE('Horse power'), STRINGDECODE('potencia motriz'), 'cv', 'fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.5'); +INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.3', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Fréquence'), STRINGDECODE('frequency'), STRINGDECODE('frecuencia'), 'Hz', 'fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.5'); +INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.4', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Fréquence basse'), STRINGDECODE('low frequency'), STRINGDECODE('baja frecuencia'), 'Hz', 'fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.5'); +INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.5', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Fréquence haute'), STRINGDECODE('high frequency'), STRINGDECODE('alta frecuencia'), 'Hz', 'fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.5'); +INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.6', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Type'), STRINGDECODE('type'), STRINGDECODE('tipo'), null, 'fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.1'); +INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.7', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Circonférence surface'), STRINGDECODE('surface net circumference'), STRINGDECODE('circumferencia de la red a la superficie'), 'm', 'fr.ird.observe.entities.referentiel.GearCa [...] +INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.8', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Circonference fond'), STRINGDECODE('bottom net circumference'), STRINGDECODE('circumferencia de la red en el fondo'), 'm', 'fr.ird.observe.entities.referentiel.GearCaracteris [...] +INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.9', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Profondeur'), STRINGDECODE('depth'), STRINGDECODE('profundidad'), 'm', 'fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.5'); +INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.10', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Poids du lest'), STRINGDECODE('sinker weight'), STRINGDECODE('peso del lastre'), 'kg', 'fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.5'); +INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.11', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Maille de poche'), STRINGDECODE('sack mesh size'), STRINGDECODE('malla del saco'), 'mm', 'fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.5'); +INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.12', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Autre taille de maille'), STRINGDECODE('other mesh size'), STRINGDECODE('otro tamaño de malla'), 'mm', 'fr.ird.observe.entities.referentiel.GearCaracteristicType#123983268612 [...] +INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.13', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Capacité en volume'), STRINGDECODE('volume capacity'), STRINGDECODE('capacidad en volumen'), 'm³', 'fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.5'); +INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.14', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Capacité en masse'), STRINGDECODE( 'tonnage capacity'), STRINGDECODE('capacidad en masa'), 't', 'fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.5'); +INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.15', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Diamètre'), STRINGDECODE('diameter'), STRINGDECODE('diámetro'), 'm', 'fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.5'); +INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.16', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Rapport d''armement'), STRINGDECODE('cruise report ??? ship owner ?'), STRINGDECODE('informe del armador ???'), '%', 'fr.ird.observe.entities.referentiel.GearCaracteristicTyp [...] +INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.17', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Fournisseur/marque'), STRINGDECODE('supplier'), STRINGDECODE('proveedor'), null, 'fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.1'); +INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.18', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Fréquence d''interrogation (fois/jour)'), STRINGDECODE('test frequency (times per day)'), STRINGDECODE('frecuencia de consulta'), 'fois / jour', 'fr.ird.observe.entities.refe [...] +INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.19', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Nombre de mises à l''eau durant la marée'), STRINGDECODE('number of deployments per trip'), STRINGDECODE('?'), null, 'fr.ird.observe.entities.referentiel.GearCaracteristicTyp [...] +INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.20', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Hauteur'), STRINGDECODE('height'), STRINGDECODE('altura'), 'm', 'fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.5'); +INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.21', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Non maillant (oui/non)'), STRINGDECODE('not entangling (yes/no)'), STRINGDECODE('no enmallante (si/no)'), null, 'fr.ird.observe.entities.referentiel.GearCaracteristicType#123 [...] +INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.22', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Matériau écologique (oui/non)'), STRINGDECODE('ecological materials (yes/no)'), STRINGDECODE('material ecológico'), null, 'fr.ird.observe.entities.referentiel.GearCaracterist [...] -- -- Gear Definition -- @@ -52,32 +55,32 @@ ALTER TABLE OBSERVE_COMMON.GEAR ADD CONSTRAINT PK_GEAR PRIMARY KEY(TOPIAID); -- -- Gear Data -- -INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.1', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Sondeur vertical'), null, null); -INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.2', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Sondeur latéral'), null, null); -INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.3', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Radar de route'), null, null); -INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.4', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Radar oiseaux'), null, null); -INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.5', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Sonar'), null, null); -INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.6', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Thermomètre'), null, null); -INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.7', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Courantomètre'), null, null); -INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.8', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Grandes jumelles en veille'), null, null); -INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.9', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Petites jumelles'), null, null); -INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.10', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Téléphonie'), null, null); -INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.11', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Radio BLU'), null, null); -INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.12', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Radio VHF'), null, null); -INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.13', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Logiciel cartographique'), null, null); -INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.14', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Logiciel météo'), null, null); -INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.15', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Autre logiciel'), null, null); -INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.16', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Skiff'), null, null); -INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.17', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Vedette'), null, null); -INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.18', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Speed boat'), null, null); -INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.19', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('AIS'), null, null); -INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.20', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Senne'), null, null); -INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.21', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Salabarde'), null, null); -INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.22', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Compas satellitaire'), null, null); -INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.23', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Sonde de profondeur de senne'), null, null); -INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.24', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Balise émettrice pour DCP'), null, null); -INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.25', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Radeau'), null, null); -INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.26', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Autre'), null, null); +INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.1', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Sondeur vertical'), STRINGDECODE('vertical sonar'), STRINGDECODE('sonar vertical')); +INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.2', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Sondeur latéral'), STRINGDECODE('lateral sonar'), STRINGDECODE('sonar lateral')); +INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.3', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Radar de route'), STRINGDECODE('transit radar'), STRINGDECODE('radar de ruta')); +INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.4', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Radar oiseaux'), STRINGDECODE('bird radar'), STRINGDECODE('radar para pájaros')); +INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.5', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Sonar'), STRINGDECODE('sonar'), STRINGDECODE('sonar')); +INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.6', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Thermomètre'), STRINGDECODE('thermometer'), STRINGDECODE('termómetro')); +INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.7', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Courantomètre'), STRINGDECODE('Current meter'), STRINGDECODE('?')); +INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.8', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Grandes jumelles en veille'), STRINGDECODE('lookout binoculars'), STRINGDECODE('binoculares de gran tamaño')); +INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.9', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Petites jumelles'), STRINGDECODE('binoculars'), STRINGDECODE('binoculares')); +INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.10', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Téléphonie'), STRINGDECODE('telephony'), STRINGDECODE('telefonía')); +INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.11', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Radio BLU'), STRINGDECODE('SSB radio (Single Side Band)'), STRINGDECODE('Radio BLU')); +INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.12', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Radio VHF'), STRINGDECODE('VHF radio'), STRINGDECODE('Radio VHF')); +INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.13', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Logiciel cartographique'), STRINGDECODE('cartography software'), STRINGDECODE('software de cartografía')); +INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.14', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Logiciel météo'), STRINGDECODE('meteorological software'), STRINGDECODE('software meteorológico')); +INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.15', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Autre type de logiciel'), STRINGDECODE('other type of software'), STRINGDECODE('otro tipo de software')); +INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.16', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Skiff'), STRINGDECODE('skiff'), STRINGDECODE('panga')); +INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.17', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Vedette'), STRINGDECODE('patrol boat'), STRINGDECODE('lancha motora')); +INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.18', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Speed boat'), STRINGDECODE('speed boat'), STRINGDECODE('speed boat')); +INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.19', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('AIS (SIA système d''identification automatique)'), STRINGDECODE('AIS'), STRINGDECODE('AIS')); +INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.20', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Senne'), STRINGDECODE('purse seine'), STRINGDECODE('cerco')); +INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.21', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Salabarde'), STRINGDECODE('brail (scoop net)'), STRINGDECODE('salabarda')); +INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.22', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Compas satellitaire'), STRINGDECODE('satellite compass'), STRINGDECODE('compás por satellite')); +INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.23', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Sonde de profondeur de senne'), STRINGDECODE('net depth sounder'), STRINGDECODE('sonda de profundidad de la red')); +INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.24', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Balise émettrice pour DCP'), STRINGDECODE('emission buoy for FAD'), STRINGDECODE('boya emisora para DCP')); +INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.25', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Radeau'), STRINGDECODE('FAD'), STRINGDECODE('DCP, parilla')); +INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.26', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, STRINGDECODE('Autre'), STRINGDECODE('other'), STRINGDECODE('otro')); -- -- Gear GearCaracteristics Definition -- diff --git a/observe-entities/src/main/resources/db/3.16/add-gear-referential-PG.sql b/observe-entities/src/main/resources/db/3.16/add-gear-referential-PG.sql index bf8c99d..d861dde 100644 --- a/observe-entities/src/main/resources/db/3.16/add-gear-referential-PG.sql +++ b/observe-entities/src/main/resources/db/3.16/add-gear-referential-PG.sql @@ -6,13 +6,12 @@ ALTER TABLE OBSERVE_COMMON.GEARCARACTERISTICTYPE ADD CONSTRAINT PK_GEARCARACTERI -- -- Gear caracteristic type Data -- -INSERT INTO OBSERVE_COMMON.GEARCARACTERISTICTYPE(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.1', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Texte','Text','Texte'); -INSERT INTO OBSERVE_COMMON.GEARCARACTERISTICTYPE(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.2', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Boolean','Boolean','Boolean'); -INSERT INTO OBSERVE_COMMON.GEARCARACTERISTICTYPE(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.3', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Entier signé','Signed Integer','Signed Integer'); -INSERT INTO OBSERVE_COMMON.GEARCARACTERISTICTYPE(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.4', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Décimal signé','Signed Decimal','Signed Decimal'); -INSERT INTO OBSERVE_COMMON.GEARCARACTERISTICTYPE(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.5', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Entier non signé','Unsigned Integer','Unsigned Integer'); -INSERT INTO OBSERVE_COMMON.GEARCARACTERISTICTYPE(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.6', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Décimal non signé','Unsigned Decimal','Unsigned Decimal'); --- +INSERT INTO OBSERVE_COMMON.GEARCARACTERISTICTYPE(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.1', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Texte','Text','Texto'); +INSERT INTO OBSERVE_COMMON.GEARCARACTERISTICTYPE(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.2', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Boolean','Boolean','Booleano'); +INSERT INTO OBSERVE_COMMON.GEARCARACTERISTICTYPE(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.3', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Entier signé','Not signed whole number','Entero no firmado'); +INSERT INTO OBSERVE_COMMON.GEARCARACTERISTICTYPE(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.4', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Décimal signé','Signed Decimal','Decimal firmado'); +INSERT INTO OBSERVE_COMMON.GEARCARACTERISTICTYPE(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.5', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Entier non signé','Signed whole number','Entero firmado'); +INSERT INTO OBSERVE_COMMON.GEARCARACTERISTICTYPE(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.6', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Décimal non signé','Not signed decimal','Decimal no firmado'); -- Gear caracteristic Definition -- CREATE TABLE OBSERVE_COMMON.GEARCARACTERISTIC(topiaid character varying(255) NOT NULL,topiaversion BIGINT NOT NULL, topiacreatedate DATE, code character varying(255), status INTEGER DEFAULT 1, uri character varying(255), needcomment boolean, label1 character varying(255), label2 character varying(255), label3 character varying(255), label4 character varying(255), label5 character varying(255), label6 character varying(255), label7 character varying(255), label8 character varying(255), un [...] @@ -22,28 +21,28 @@ CREATE INDEX FK_GEARCARACTERISTIC_GEARCARACTERISTICTYPE_IDX ON OBSERVE_COMMON.GE -- -- Gear caracteristic Data -- -INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.1', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Portée', null, null, 'm', 'fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.5'); -INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.2', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Puissance moteur', null, null, 'cv', 'fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.5'); -INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.3', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Fréquence', null, null, 'Hz', 'fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.5'); -INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.4', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Fréquence basse', null, null, 'Hz', 'fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.5'); -INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.5', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Fréquence haute', null, null, 'Hz', 'fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.5'); -INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.6', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Type', null, null, null, 'fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.1'); -INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.7', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Circonférence surface', null, null, 'm', 'fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.5'); -INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.8', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Circonference fond', null, null, 'm', 'fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.5'); -INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.9', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Profondeur', null, null, 'm', 'fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.5'); -INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.10', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Poids du lest', null, null, 'kg', 'fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.5'); -INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.11', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Maille de poche', null, null, 'mm', 'fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.5'); -INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.12', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Autre maillage', null, null, 'mm', 'fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.5'); -INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.13', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Capacité en volume', null, null, 'm³', 'fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.5'); -INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.14', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Capacité en masse', null, null, 't', 'fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.5'); -INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.15', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Diamètre', null, null, 'm', 'fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.5'); -INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.16', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Rapport d''armement', null, null, '%', 'fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.5'); -INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.17', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Fournisseur/marque', null, null, null, 'fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.1'); -INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.18', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Fréquence d''interrogation', null, null, 'fois / jour', 'fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.5'); -INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.19', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Nombre de mises à l''eau', null, null, null, 'fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.5'); -INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.20', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Hauteur', null, null, 'm', 'fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.5'); -INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.21', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Non maillant', null, null, null, 'fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.2'); -INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.22', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Matériau écologique', null, null, null, 'fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.2'); +INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.1', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Portée','range','alcance', 'm', 'fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.5'); +INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.2', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Puissance moteur','Horse power','potencia motriz', 'cv', 'fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.5'); +INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.3', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Fréquence','frequency','frecuencia', 'Hz', 'fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.5'); +INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.4', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Fréquence basse','low frequency','baja frecuencia', 'Hz', 'fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.5'); +INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.5', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Fréquence haute','high frequency','alta frecuencia', 'Hz', 'fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.5'); +INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.6', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Type','type','tipo', null, 'fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.1'); +INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.7', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Circonférence surface','surface net circumference','circumferencia de la red a la superficie', 'm', 'fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.5'); +INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.8', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Circonference fond','bottom net circumference','circumferencia de la red en el fondo', 'm', 'fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.5'); +INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.9', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Profondeur','depth','profundidad', 'm', 'fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.5'); +INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.10', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Poids du lest','sinker weight','peso del lastre', 'kg', 'fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.5'); +INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.11', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Maille de poche','sack mesh size','malla del saco', 'mm', 'fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.5'); +INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.12', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Autre taille de maille','other mesh size','otro tamaño de malla', 'mm', 'fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.5'); +INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.13', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Capacité en volume','volume capacity','capacidad en volumen', 'm³', 'fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.5'); +INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.14', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Capacité en masse', 'tonnage capacity', 'capacidad en masa', 't', 'fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.5'); +INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.15', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Diamètre','diameter','diámetro', 'm', 'fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.5'); +INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.16', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Rapport d''armement','cruise report ??? ship owner ?','informe del armador ???', '%', 'fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.5'); +INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.17', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Fournisseur/marque','supplier','proveedor', null, 'fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.1'); +INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.18', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Fréquence d''interrogation (fois/jour)','test frequency (times per day)','frecuencia de consulta', 'fois / jour', 'fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.5'); +INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.19', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Nombre de mises à l''eau durant la marée','number of deployments per trip','?', null, 'fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.5'); +INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.20', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Hauteur','height','altura', 'm', 'fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.5'); +INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.21', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Non maillant (oui/non) pourquoi pas : maillant oui/non ?','not entangling (yes/no)','no enmallante (si/no)', null, 'fr.ird.observe.entities.referentiel.GearCaracteristicType#123983268612 [...] +INSERT INTO OBSERVE_COMMON.GEARCARACTERISTIC(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3, UNIT, GEARCARACTERISTICTYPE) VALUES ('fr.ird.observe.entities.referentiel.GearCaracteristic#1239832686124#0.22', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Matériau écologique (oui/non)','ecological materials (yes/no)','material ecológico', null, 'fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.2'); -- -- Gear Definition -- @@ -52,32 +51,32 @@ ALTER TABLE OBSERVE_COMMON.GEAR ADD CONSTRAINT PK_GEAR PRIMARY KEY(TOPIAID); -- -- Gear Data -- -INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.1', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Sondeur vertical', null, null); -INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.2', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Sondeur latéral', null, null); -INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.3', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Radar de route', null, null); -INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.4', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Radar oiseaux', null, null); -INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.5', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Sonar', null, null); -INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.6', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Thermomètre', null, null); -INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.7', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Courantomètre', null, null); -INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.8', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Grandes jumelles en veille', null, null); -INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.9', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Petites jumelles', null, null); -INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.10', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Téléphonie', null, null); -INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.11', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Radio BLU', null, null); -INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.12', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Radio VHF', null, null); -INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.13', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Logiciel cartographique', null, null); -INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.14', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Logiciel météo', null, null); -INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.15', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Autre logiciel', null, null); -INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.16', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Skiff', null, null); -INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.17', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Vedette', null, null); -INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.18', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Speed boat', null, null); -INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.19', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'AIS', null, null); -INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.20', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Senne', null, null); -INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.21', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Salabarde', null, null); -INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.22', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Compas satellitaire', null, null); -INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.23', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Sonde de profondeur de senne', null, null); -INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.24', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Balise émettrice pour DCP', null, null); -INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.25', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Radeau', null, null); -INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.26', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Autre', null, null); +INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.1', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Sondeur vertical','vertical sonar','sonar vertical'); +INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.2', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Sondeur latéral','lateral sonar','sonar lateral'); +INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.3', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Radar de route','transit radar','radar de ruta'); +INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.4', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Radar oiseaux','bird radar','radar para pájaros'); +INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.5', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Sonar','sonar','sonar'); +INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.6', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Thermomètre','thermometer','termómetro'); +INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.7', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Courantomètre','Current meter','?'); +INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.8', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Grandes jumelles en veille','lookout binoculars','binoculares de gran tamaño'); +INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.9', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Petites jumelles','binoculars','binoculares'); +INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.10', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Téléphonie','telephony','telefonía'); +INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.11', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Radio BLU','SSB radio (Single Side Band)','Radio BLU'); +INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.12', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Radio VHF','VHF radio','Radio VHF'); +INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.13', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Logiciel cartographique','cartography software','software de cartografía'); +INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.14', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Logiciel météo','meteorological software','software meteorológico'); +INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.15', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Autre type de logiciel','other type of software','otro tipo de software'); +INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.16', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Skiff','skiff','panga'); +INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.17', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Vedette','patrol boat','lancha motora'); +INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.18', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Speed boat','speed boat','speed boat'); +INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.19', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'AIS (SIA système d''identification automatique)','AIS','AIS'); +INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.20', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Senne','purse seine','cerco'); +INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.21', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Salabarde','brail (scoop net)','salabarda'); +INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.22', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Compas satellitaire','satellite compass','compás por satellite'); +INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.23', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Sonde de profondeur de senne','net depth sounder','sonda de profundidad de la red'); +INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.24', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Balise émettrice pour DCP','emission buoy for FAD','boya emisora para DCP'); +INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.25', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Radeau','FAD','DCP, parilla'); +INSERT INTO OBSERVE_COMMON.GEAR(TOPIAID, TOPIAVERSION, TOPIACREATEDATE, STATUS, NEEDCOMMENT,CODE, LABEL2, LABEL1, LABEL3) VALUES ('fr.ird.observe.entities.referentiel.Gear#1239832686125#0.26', 0, TIMESTAMP '2015-03-28 00:00:00.00', 1, FALSE, null, 'Autre','other','otro'); -- -- Gear GearCaracteristics Definition -- diff --git a/observe-entities/src/main/xmi/observe-seine.properties b/observe-entities/src/main/xmi/observe-seine.properties index 682f25b..021e5ab 100644 --- a/observe-entities/src/main/xmi/observe-seine.properties +++ b/observe-entities/src/main/xmi/observe-seine.properties @@ -38,6 +38,7 @@ package.fr.ird.observe.entities.seine.tagvalue.dbSchema=OBSERVE_SEINE fr.ird.observe.entities.seine.TripSeine.class.tagvalue.dbName=Trip fr.ird.observe.entities.seine.TripSeine.attribute.route.tagvalue.reverseDbName=trip +fr.ird.observe.entities.seine.TripSeine.attribute.gearUseFeaturesSeine.tagvalue.reverseDbName=trip fr.ird.observe.entities.referentiel.seine.VesselActivitySeine.class.tagvalue.dbName=VesselActivity fr.ird.observe.entities.seine.ActivitySeine.attribute.vesselActivitySeine.tagvalue.dbName=vesselActivity @@ -57,6 +58,11 @@ fr.ird.observe.entities.seine.ActivitySeine.attribute.setSeine.tagvalue.dbName=s fr.ird.observe.entities.seine.TargetCatch.attribute.setSeine.tagvalue.dbName=set fr.ird.observe.entities.seine.SchoolEstimate.attribute.setSeine.tagvalue.dbName=set +fr.ird.observe.entities.seine.GearUseFeaturesSeine.class.tagvalue.dbName=GearUseFeatures +fr.ird.observe.entities.seine.GearUseFeaturesSeine.attribute.gearUseFeaturesMeasurement.tagvalue.reverseDbName=gearUseFeatures + +fr.ird.observe.entities.seine.GearUseFeaturesMeasurementSeine.class.tagvalue.dbName=GearUseFeaturesMeasurement + ############################################################################### ### Champ Numeric (utilisation du type sql numeric) ########################### ############################################################################### diff --git a/observe-entities/src/main/xmi/observe-seine.zargo b/observe-entities/src/main/xmi/observe-seine.zargo index 4ae6784..2320287 100644 Binary files a/observe-entities/src/main/xmi/observe-seine.zargo and b/observe-entities/src/main/xmi/observe-seine.zargo differ -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/6855 in repository observe. See http://git.codelutin.com/observe.git commit 5fc039a4aa40cf1caa6ea0966f469b95037a991f Author: Tony Chemit <chemit@codelutin.com> Date: Tue Mar 24 16:38:22 2015 +0000 refs #6855: pas possible d'avoir des not-null sur les relations inverses --- observe-entities/src/main/resources/db/3.16/add-gear-data-H2.sql | 4 ++-- observe-entities/src/main/resources/db/3.16/add-gear-data-PG.sql | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/observe-entities/src/main/resources/db/3.16/add-gear-data-H2.sql b/observe-entities/src/main/resources/db/3.16/add-gear-data-H2.sql index 1f8f0a9..389df04 100644 --- a/observe-entities/src/main/resources/db/3.16/add-gear-data-H2.sql +++ b/observe-entities/src/main/resources/db/3.16/add-gear-data-H2.sql @@ -1,7 +1,7 @@ -- -- GearUseFeatures Definition -- -CREATE TABLE OBSERVE_SEINE.GEARUSEFEATURES(topiaid VARCHAR(255) NOT NULL,topiaversion BIGINT NOT NULL, topiacreatedate DATE, trip VARCHAR(255) NOT NULL, gear VARCHAR(255) NOT NULL, number INTEGER NOT NULL, comment VARCHAR(1023), usedInTrip BOOLEAN); +CREATE TABLE OBSERVE_SEINE.GEARUSEFEATURES(topiaid VARCHAR(255) NOT NULL,topiaversion BIGINT NOT NULL, topiacreatedate DATE, trip VARCHAR(255), gear VARCHAR(255) NOT NULL, number INTEGER NOT NULL, comment VARCHAR(1023), usedInTrip BOOLEAN); ALTER TABLE OBSERVE_SEINE.GEARUSEFEATURES ADD CONSTRAINT PK_GEARUSEFEATURES PRIMARY KEY(TOPIAID); ALTER TABLE OBSERVE_SEINE.GEARUSEFEATURES ADD CONSTRAINT FK_GEARUSEFEATURES_TRIP FOREIGN KEY(trip) REFERENCES OBSERVE_SEINE.TRIP(topiaid); ALTER TABLE OBSERVE_SEINE.GEARUSEFEATURES ADD CONSTRAINT FK_GEARUSEFEATURES_GEAR FOREIGN KEY(gear) REFERENCES OBSERVE_COMMON.GEAR(topiaid); @@ -10,7 +10,7 @@ CREATE INDEX FK_GEARUSEFEATURES_GEAR_IDX ON OBSERVE_SEINE.GEARUSEFEATURES(gear); -- -- GearUseFeaturesMeasurement Definition -- -CREATE TABLE OBSERVE_SEINE.GEARUSEFEATURESMEASUREMENT(topiaid VARCHAR(255) NOT NULL,topiaversion BIGINT NOT NULL, topiacreatedate DATE, gearCaracteristic VARCHAR(255) NOT NULL, gearUseFeatures VARCHAR(255) NOT NULL, measurementValue VARCHAR(255) NOT NULL); +CREATE TABLE OBSERVE_SEINE.GEARUSEFEATURESMEASUREMENT(topiaid VARCHAR(255) NOT NULL,topiaversion BIGINT NOT NULL, topiacreatedate DATE, gearCaracteristic VARCHAR(255) NOT NULL, gearUseFeatures VARCHAR(255), measurementValue VARCHAR(255) NOT NULL); ALTER TABLE OBSERVE_SEINE.GEARUSEFEATURESMEASUREMENT ADD CONSTRAINT PK_GEARUSEFEATURESMEASUREMENT PRIMARY KEY(TOPIAID); ALTER TABLE OBSERVE_SEINE.GEARUSEFEATURESMEASUREMENT ADD CONSTRAINT FK_GEARUSEFEATURESMEASUREMENT_GEARCARACTERISTIC FOREIGN KEY(gearCaracteristic) REFERENCES OBSERVE_COMMON.GEARCARACTERISTIC(topiaid); ALTER TABLE OBSERVE_SEINE.GEARUSEFEATURESMEASUREMENT ADD CONSTRAINT FK_GEARUSEFEATURESMEASUREMENT_GEARUSEFEATURES FOREIGN KEY(gearUseFeatures) REFERENCES OBSERVE_SEINE.GEARUSEFEATURES(topiaid); diff --git a/observe-entities/src/main/resources/db/3.16/add-gear-data-PG.sql b/observe-entities/src/main/resources/db/3.16/add-gear-data-PG.sql index 5062e32..aa8fd9b 100644 --- a/observe-entities/src/main/resources/db/3.16/add-gear-data-PG.sql +++ b/observe-entities/src/main/resources/db/3.16/add-gear-data-PG.sql @@ -1,7 +1,7 @@ -- -- GearUseFeatures Definition -- -CREATE TABLE OBSERVE_SEINE.GEARUSEFEATURES(topiaid character varying(255) NOT NULL,topiaversion BIGINT NOT NULL, topiacreatedate DATE, trip character varying(255) NOT NULL, gear character varying(255) NOT NULL, number INTEGER NOT NULL, comment VARCHAR(1023), usedInTrip BOOLEAN); +CREATE TABLE OBSERVE_SEINE.GEARUSEFEATURES(topiaid character varying(255) NOT NULL,topiaversion BIGINT NOT NULL, topiacreatedate DATE, trip character varying(255), gear character varying(255) NOT NULL, number INTEGER NOT NULL, comment VARCHAR(1023), usedInTrip BOOLEAN); ALTER TABLE OBSERVE_SEINE.GEARUSEFEATURES ADD CONSTRAINT PK_GEARUSEFEATURES PRIMARY KEY(TOPIAID); ALTER TABLE OBSERVE_SEINE.GEARUSEFEATURES ADD CONSTRAINT FK_GEARUSEFEATURES_TRIP FOREIGN KEY(trip) REFERENCES OBSERVE_SEINE.TRIP(topiaid); ALTER TABLE OBSERVE_SEINE.GEARUSEFEATURES ADD CONSTRAINT FK_GEARUSEFEATURES_GEAR FOREIGN KEY(gear) REFERENCES OBSERVE_COMMON.GEAR(topiaid); @@ -10,7 +10,7 @@ CREATE INDEX FK_GEARUSEFEATURES_GEAR_IDX ON OBSERVE_SEINE.GEARUSEFEATURES(gear); -- -- GearUseFeaturesMeasurement Definition -- -CREATE TABLE OBSERVE_SEINE.GEARUSEFEATURESMEASUREMENT(topiaid character varying(255) NOT NULL,topiaversion BIGINT NOT NULL, topiacreatedate DATE, gearCaracteristic character varying(255) NOT NULL, gearUseFeatures character varying(255) NOT NULL, measurementValue character varying(255) NOT NULL); +CREATE TABLE OBSERVE_SEINE.GEARUSEFEATURESMEASUREMENT(topiaid character varying(255) NOT NULL,topiaversion BIGINT NOT NULL, topiacreatedate DATE, gearCaracteristic character varying(255) NOT NULL, gearUseFeatures character varying(255), measurementValue character varying(255) NOT NULL); ALTER TABLE OBSERVE_SEINE.GEARUSEFEATURESMEASUREMENT ADD CONSTRAINT PK_GEARUSEFEATURESMEASUREMENT PRIMARY KEY(TOPIAID); ALTER TABLE OBSERVE_SEINE.GEARUSEFEATURESMEASUREMENT ADD CONSTRAINT FK_GEARUSEFEATURESMEASUREMENT_GEARCARACTERISTIC FOREIGN KEY(gearCaracteristic) REFERENCES OBSERVE_COMMON.GEARCARACTERISTIC(topiaid); ALTER TABLE OBSERVE_SEINE.GEARUSEFEATURESMEASUREMENT ADD CONSTRAINT FK_GEARUSEFEATURESMEASUREMENT_GEARUSEFEATURES FOREIGN KEY(gearUseFeatures) REFERENCES OBSERVE_SEINE.GEARUSEFEATURES(topiaid); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/6855 in repository observe. See http://git.codelutin.com/observe.git commit 48b30c868253f39ba71c8f418677ddcfd57febed Author: Tony Chemit <chemit@codelutin.com> Date: Tue Mar 24 16:39:13 2015 +0000 refs #6855: debut d'interface graphique --- .../main/java/fr/ird/observe/db/DataContext.java | 4 + .../ui/content/open/impl/seine/TripSeineUI.css | 1 + .../ui/content/open/impl/seine/TripSeineUI.jaxx | 345 ++++++++++----------- .../open/impl/seine/TripSeineUIHandler.java | 28 +- .../content/open/impl/seine/TripSeineUIModel.java | 6 +- .../ui/content/table/ContentTableUIHandler.java | 8 +- .../table/impl/seine/GearUseFeaturesSeineUI.css | 61 ++++ .../table/impl/seine/GearUseFeaturesSeineUI.jaxx | 135 ++++++++ .../impl/seine/GearUseFeaturesSeineUIHandler.java | 174 +++++++++++ .../impl/seine/GearUseFeaturesSeineUIModel.java | 79 +++++ .../resources/i18n/observe-swing_en_GB.properties | 21 +- .../resources/i18n/observe-swing_es_ES.properties | 19 ++ .../resources/i18n/observe-swing_fr_FR.properties | 15 + ...UseFeaturesSeine-n1-update-error-validation.xml | 46 +++ ...1-update-gearUseFeatures-warning-validation.xml | 41 +++ .../i18n/observe-validation_fr_FR.properties | 3 + .../validation/BeanValidatorDetectorTest.java | 7 +- 17 files changed, 792 insertions(+), 201 deletions(-) diff --git a/observe-business/src/main/java/fr/ird/observe/db/DataContext.java b/observe-business/src/main/java/fr/ird/observe/db/DataContext.java index 77c1b6b..b64f10f 100644 --- a/observe-business/src/main/java/fr/ird/observe/db/DataContext.java +++ b/observe-business/src/main/java/fr/ird/observe/db/DataContext.java @@ -199,6 +199,10 @@ public class DataContext extends AbstractSerializableBean { firePropertyChange(PROPERTY_SELECTED_TRIP_ID, oldValue, this.selectedTripId); } + public boolean isSelectedTripLongline() { + return selectedTripId != null && selectedTripId.contains("Longline"); + } + public String getSelectedRouteId() { return selectedRouteId; } diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUI.css b/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUI.css index fc43d24..4be1629 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUI.css +++ b/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUI.css @@ -44,6 +44,7 @@ NumberEditor { #caracteristicTab { title:{t("observe.tripSeine.tab.caracteristics")}; icon:{getHandler().getErrorIconIfFalse(model.isCaracteristicsTabValid())}; + enabled:{!model.isCreatingMode()}; } #observerLabel { diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUI.jaxx b/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUI.jaxx index 0a21730..49b576d 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUI.jaxx +++ b/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUI.jaxx @@ -33,6 +33,8 @@ fr.ird.observe.entities.referentiel.Person fr.ird.observe.entities.referentiel.Ocean + fr.ird.observe.ui.content.table.impl.seine.GearUseFeaturesSeineUI + org.jdesktop.swingx.JXDatePicker jaxx.runtime.swing.editor.NumberEditor @@ -82,198 +84,163 @@ protected boolean canEditOcean(java.util.List<Route> routes) { <JTabbedPane id='fishingOperationTabPane'> <tab id='generalTab'> - <Table fill="both" weightx="1"> - <!-- captain --> - <row> - <cell anchor='west'> - <JLabel id='captainLabel'/> - </cell> - <cell anchor='east'> - <BeanComboBox id='captain' constructorParams='this' genericType='Person'/> - </cell> - </row> - - <!-- observer --> - <row> - <cell anchor='west'> - <JLabel id='observerLabel'/> - </cell> - <cell anchor='east'> - <BeanComboBox id='observer' constructorParams='this' genericType='Person'/> - </cell> - </row> - - <!-- dataEntryOperator --> - <row> - <cell anchor='west'> - <JLabel id='dataEntryOperatorLabel'/> - </cell> - <cell anchor='east'> - <BeanComboBox id='dataEntryOperator' constructorParams='this' genericType='Person'/> - </cell> - </row> - - <!-- vessel --> - <row> - <cell anchor='west'> - <JLabel id='vesselLabel'/> - </cell> - <cell anchor='east' weightx="1" fill="both"> - <BeanComboBox id='vessel' constructorParams='this' genericType='Vessel'/> - </cell> - </row> - - <!-- ocean (editable uniquement si pas de route saisie) --> - <row> - <cell anchor='west'> - <JLabel id='oceanLabel'/> - </cell> - <cell anchor='east' weightx="1" fill="both"> - <BeanComboBox id='ocean' genericType='Ocean' constructorParams='this'/> - </cell> - </row> - - <!-- departureHarbour --> - <row> - <cell anchor='west'> - <JLabel id='departureHarbourLabel'/> - </cell> - <cell anchor='east' weightx="1" fill="both"> - <BeanComboBox id='departureHarbour' genericType='Harbour' constructorParams='this'/> - </cell> - </row> - - <!-- landingHarbour --> - <row> - <cell anchor='west'> - <JLabel id='landingHarbourLabel'/> - </cell> - <cell anchor='east' weightx="1" fill="both"> - <BeanComboBox id='landingHarbour' genericType='Harbour' constructorParams='this'/> - </cell> - </row> - - <!-- id ers --> - <row> - - <cell anchor='west'> - <JLabel id='ersIdLabel'/> - </cell> - <cell anchor='east' weightx="1" fill="both"> - <JPanel layout='{new BorderLayout()}'> - <JToolBar id='ersIdToolbar' constraints='BorderLayout.WEST'> - <JButton id='resetErsId' constraints='BorderLayout.WEST' styleClass='resetButton'/> - </JToolBar> - <JTextField id='ersId' constraints='BorderLayout.CENTER'/> - </JPanel> - </cell> - </row> - - <!-- startDate --> - <row> - <cell anchor='west'> - <JLabel id='startDateLabel'/> - </cell> - <cell anchor='west' weightx="0.5"> - <JXDatePicker id='startDate'/> - </cell> - </row> - - <!-- endDate --> - <row> - <cell anchor='west'> - <JLabel id='endDateLabel'/> - </cell> - <cell anchor='west' weightx="0.5"> - <JXDatePicker id='endDate'/> - </cell> - </row> - - <!-- formsUrl --> - <row> - <cell anchor="west"> - <JLabel id='formsUrlLabel'/> - </cell> - <cell anchor='east' weightx="1" fill="both"> - <JPanel layout='{new BorderLayout()}'> - <JToolBar id='formsUrlToolbar' constraints='BorderLayout.WEST'> - <JButton id='resetFormsUrl' constraints='BorderLayout.WEST' styleClass='resetButton'/> - </JToolBar> - <JTextField id='formsUrl' constraints='BorderLayout.CENTER'/> - <JToolBar id='formsUrlToolbar2' constraints='BorderLayout.EAST'> - <JButton id='openLinkFormulairesUrl' - onActionPerformed='getHandler().openLink(getModel().getBean().getFormsUrl())'/> - </JToolBar> - - </JPanel> - </cell> - </row> - - <!-- reportsUrl --> - <row> - <cell anchor="west"> - <JLabel id='reportsUrlLabel'/> - </cell> - <cell anchor='east' weightx="1" fill="both"> - <JPanel layout='{new BorderLayout()}'> - <JToolBar id='reportsUrlToolbar' constraints='BorderLayout.WEST'> - <JButton id='resetReportsUrl' constraints='BorderLayout.WEST' styleClass='resetButton'/> - </JToolBar> - <JTextField id='reportsUrl' constraints='BorderLayout.CENTER'/> - - <JToolBar id='reportsUrlToolbar2' constraints='BorderLayout.EAST'> - <JButton id='openLinkRapportsUrl' constraints='BorderLayout.EAST' - onActionPerformed='getHandler().openLink(getModel().getBean().getReportsUrl())'/> - </JToolBar> - </JPanel> - </cell> - </row> - - </Table> - + <JPanel layout="{new BorderLayout()}"> + <Table fill="both" weightx="1" constraints='BorderLayout.NORTH'> + <!-- captain --> + <row> + <cell anchor='west'> + <JLabel id='captainLabel'/> + </cell> + <cell anchor='east'> + <BeanComboBox id='captain' constructorParams='this' genericType='Person'/> + </cell> + </row> + + <!-- observer --> + <row> + <cell anchor='west'> + <JLabel id='observerLabel'/> + </cell> + <cell anchor='east'> + <BeanComboBox id='observer' constructorParams='this' genericType='Person'/> + </cell> + </row> + + <!-- dataEntryOperator --> + <row> + <cell anchor='west'> + <JLabel id='dataEntryOperatorLabel'/> + </cell> + <cell anchor='east'> + <BeanComboBox id='dataEntryOperator' constructorParams='this' genericType='Person'/> + </cell> + </row> + + <!-- vessel --> + <row> + <cell anchor='west'> + <JLabel id='vesselLabel'/> + </cell> + <cell anchor='east' weightx="1" fill="both"> + <BeanComboBox id='vessel' constructorParams='this' genericType='Vessel'/> + </cell> + </row> + + <!-- ocean (editable uniquement si pas de route saisie) --> + <row> + <cell anchor='west'> + <JLabel id='oceanLabel'/> + </cell> + <cell anchor='east' weightx="1" fill="both"> + <BeanComboBox id='ocean' genericType='Ocean' constructorParams='this'/> + </cell> + </row> + + <!-- departureHarbour --> + <row> + <cell anchor='west'> + <JLabel id='departureHarbourLabel'/> + </cell> + <cell anchor='east' weightx="1" fill="both"> + <BeanComboBox id='departureHarbour' genericType='Harbour' constructorParams='this'/> + </cell> + </row> + + <!-- landingHarbour --> + <row> + <cell anchor='west'> + <JLabel id='landingHarbourLabel'/> + </cell> + <cell anchor='east' weightx="1" fill="both"> + <BeanComboBox id='landingHarbour' genericType='Harbour' constructorParams='this'/> + </cell> + </row> + + <!-- id ers --> + <row> + + <cell anchor='west'> + <JLabel id='ersIdLabel'/> + </cell> + <cell anchor='east' weightx="1" fill="both"> + <JPanel layout='{new BorderLayout()}'> + <JToolBar id='ersIdToolbar' constraints='BorderLayout.WEST'> + <JButton id='resetErsId' constraints='BorderLayout.WEST' styleClass='resetButton'/> + </JToolBar> + <JTextField id='ersId' constraints='BorderLayout.CENTER'/> + </JPanel> + </cell> + </row> + + <!-- startDate --> + <row> + <cell anchor='west'> + <JLabel id='startDateLabel'/> + </cell> + <cell anchor='west' weightx="0.5"> + <JXDatePicker id='startDate'/> + </cell> + </row> + + <!-- endDate --> + <row> + <cell anchor='west'> + <JLabel id='endDateLabel'/> + </cell> + <cell anchor='west' weightx="0.5"> + <JXDatePicker id='endDate'/> + </cell> + </row> + + <!-- formsUrl --> + <row> + <cell anchor="west"> + <JLabel id='formsUrlLabel'/> + </cell> + <cell anchor='east' weightx="1" fill="both"> + <JPanel layout='{new BorderLayout()}'> + <JToolBar id='formsUrlToolbar' constraints='BorderLayout.WEST'> + <JButton id='resetFormsUrl' constraints='BorderLayout.WEST' styleClass='resetButton'/> + </JToolBar> + <JTextField id='formsUrl' constraints='BorderLayout.CENTER'/> + <JToolBar id='formsUrlToolbar2' constraints='BorderLayout.EAST'> + <JButton id='openLinkFormulairesUrl' + onActionPerformed='getHandler().openLink(getModel().getBean().getFormsUrl())'/> + </JToolBar> + + </JPanel> + </cell> + </row> + + <!-- reportsUrl --> + <row> + <cell anchor="west"> + <JLabel id='reportsUrlLabel'/> + </cell> + <cell anchor='east' weightx="1" fill="both"> + <JPanel layout='{new BorderLayout()}'> + <JToolBar id='reportsUrlToolbar' constraints='BorderLayout.WEST'> + <JButton id='resetReportsUrl' constraints='BorderLayout.WEST' styleClass='resetButton'/> + </JToolBar> + <JTextField id='reportsUrl' constraints='BorderLayout.CENTER'/> + + <JToolBar id='reportsUrlToolbar2' constraints='BorderLayout.EAST'> + <JButton id='openLinkRapportsUrl' constraints='BorderLayout.EAST' + onActionPerformed='getHandler().openLink(getModel().getBean().getReportsUrl())'/> + </JToolBar> + </JPanel> + </cell> + </row> + + </Table> + </JPanel> </tab> <tab id='caracteristicTab'> - - <!--<Table fill="both" weightx="1">--> - - <!--<!– senne –>--> - <!--<row>--> - <!--<cell anchor='west' columns="2">--> - <!--<Table fill="both" id='senneContainer'>--> - <!--<row>--> - <!--<cell anchor='west'>--> - <!--<JLabel id='seineCircumferenceLabel'/>--> - <!--</cell>--> - <!--<cell anchor='east' weightx="1" fill="both">--> - <!--<NumberEditor id='seineCircumference' constructorParams='this'/>--> - <!--</cell>--> - <!--</row>--> - <!--<row>--> - <!--<cell>--> - <!--<JLabel id='seineDepthLabel'/>--> - <!--</cell>--> - <!--<cell>--> - <!--<NumberEditor id='seineDepth' constructorParams='this'/>--> - <!--</cell>--> - <!--</row>--> - <!--<row>--> - <!--<cell>--> - <!--<JLabel id='seineBallastWeightLabel'/>--> - <!--</cell>--> - <!--<cell>--> - <!--<NumberEditor id='seineBallastWeight' constructorParams='this'/>--> - <!--</cell>--> - <!--</row>--> - <!--</Table>--> - <!--</cell>--> - <!--</row>--> - <!--<row>--> - <!--<cell weighty="1">--> - <!--<JLabel/>--> - <!--</cell>--> - <!--</row>--> - <!--</Table>--> + <JPanel id='caracteristicPane' layout='{new BorderLayout()}'> + <GearUseFeaturesSeineUI id='gearUseFeaturesSeineUI' constructorParams='this' + constraints='BorderLayout.NORTH'/> + </JPanel> </tab> </JTabbedPane> diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUIHandler.java b/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUIHandler.java index a489f2c..c1ec978 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUIHandler.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUIHandler.java @@ -33,6 +33,7 @@ import fr.ird.observe.entities.seine.TripSeine; import fr.ird.observe.ui.content.ContentMode; import fr.ird.observe.ui.content.open.ContentOpenableUIHandler; import fr.ird.observe.ui.content.open.ContentOpenableUIModel; +import fr.ird.observe.ui.content.table.impl.seine.GearUseFeaturesSeineUI; import jaxx.runtime.validator.swing.SwingValidatorMessage; import jaxx.runtime.validator.swing.SwingValidatorMessageTableModel; import org.apache.commons.logging.Log; @@ -118,6 +119,11 @@ public class TripSeineUIHandler extends ContentOpenableUIHandler<TripSeine> { // listen messages to see if required to add getUi().getErrorTableModel().addTableModelListener(computeTabValidStateListener); + GearUseFeaturesSeineUI gearUseFeaturesSeineUI = getUi().getGearUseFeaturesSeineUI(); + gearUseFeaturesSeineUI.init(); + getUi().getCaracteristicPane().remove(gearUseFeaturesSeineUI); + getUi().getCaracteristicPane().add(gearUseFeaturesSeineUI.getBody()); + } @Override @@ -145,11 +151,12 @@ public class TripSeineUIHandler extends ContentOpenableUIHandler<TripSeine> { // create mode + getUi().getFishingOperationTabPane().setSelectedIndex(0); + if (log.isInfoEnabled()) { log.info(prefix + "create a new trip"); } dataService.preCreate(source, programId, bean, getLoadBinder(), getPreCreateExecutor()); - } else { // update mode @@ -163,6 +170,10 @@ public class TripSeineUIHandler extends ContentOpenableUIHandler<TripSeine> { // on force le trie des routes Routes.sort(bean.getRoute()); } + + GearUseFeaturesSeineUI gearUseFeaturesSeineUI = getUi().getGearUseFeaturesSeineUI(); + gearUseFeaturesSeineUI.open(); + } SwingValidatorMessageTableModel errorTableModel = getUi().getErrorTableModel(); @@ -201,6 +212,7 @@ public class TripSeineUIHandler extends ContentOpenableUIHandler<TripSeine> { ui.getValidator().setContext(contextName); if (create) { + addInfoMessage(t("observe.tripSeine.message.creating")); } else { addInfoMessage(t("observe.tripSeine.message.updating")); @@ -208,7 +220,9 @@ public class TripSeineUIHandler extends ContentOpenableUIHandler<TripSeine> { addInfoMessage(t("observe.message.historical.data")); } + getUi().getGearUseFeaturesSeineUI().startEdit(null); } + // date is current day if (model.getMode() == ContentMode.UPDATE) { if (getBean().getEndDate() == null) { @@ -284,7 +298,9 @@ public class TripSeineUIHandler extends ContentOpenableUIHandler<TripSeine> { @Override protected TripSeine onUpdate(TopiaContext tx, Object parentBean, TripSeine beanToSave) throws TopiaException { - getLoadBinder().copyExcluding(getBean(), beanToSave, TripSeine.PROPERTY_ROUTE); + getLoadBinder().copyExcluding(getBean(), beanToSave, TripSeine.PROPERTY_ROUTE, TripSeine.PROPERTY_GEAR_USE_FEATURES_SEINE); + + getUi().getGearUseFeaturesSeineUI().getHandler().onUpdate(tx, parentBean, beanToSave); return beanToSave; } @@ -324,6 +340,14 @@ public class TripSeineUIHandler extends ContentOpenableUIHandler<TripSeine> { } + @Override + protected void afterSave(boolean refresh) { + super.afterSave(refresh); + + getUi().getGearUseFeaturesSeineUI().getHandler().afterSave(refresh); + + } + protected void computeTabValidState(SwingValidatorMessageTableModel errorTableModel) { Set<String> errorProperties = new HashSet<String>(); diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUIModel.java b/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUIModel.java index 73bc4c5..de1b92e 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUIModel.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUIModel.java @@ -60,7 +60,7 @@ public class TripSeineUIModel extends ContentOpenableUIModel<TripSeine> { TripSeine.PROPERTY_REPORTS_URL).build(); public static final Set<String> CARACTERISTICS_TAB_PROPERTIES = - ImmutableSet.<String>builder().add(TripSeine.PROPERTY_GEAR_USE_FEATURES).build(); + ImmutableSet.<String>builder().add(TripSeine.PROPERTY_GEAR_USE_FEATURES_SEINE).build(); private static final long serialVersionUID = 1L; @@ -111,14 +111,14 @@ public class TripSeineUIModel extends ContentOpenableUIModel<TripSeine> { TripSeine.PROPERTY_LANDING_HARBOUR, TripSeine.PROPERTY_PROGRAM, TripSeine.PROPERTY_ROUTE, - TripSeine.PROPERTY_GEAR_USE_FEATURES, + TripSeine.PROPERTY_GEAR_USE_FEATURES_SEINE, TripSeine.PROPERTY_ERS_ID, TripSeine.PROPERTY_OPEN); // on ajoute la recopie de l'association route builder.addCollectionStrategy(Binder.CollectionStrategy.duplicate, TripSeine.PROPERTY_ROUTE); // on ajoute la recopie de l'association gearUseFeatues - builder.addCollectionStrategy(Binder.CollectionStrategy.duplicate, TripSeine.PROPERTY_GEAR_USE_FEATURES); + builder.addCollectionStrategy(Binder.CollectionStrategy.duplicate, TripSeine.PROPERTY_GEAR_USE_FEATURES_SEINE); return builder; diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/ContentTableUIHandler.java b/observe-swing/src/main/java/fr/ird/observe/ui/content/table/ContentTableUIHandler.java index 062c97f..45375f8 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/ContentTableUIHandler.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/content/table/ContentTableUIHandler.java @@ -316,14 +316,18 @@ public abstract class ContentTableUIHandler<E extends TopiaEntity, D extends Top @Override public void startEditUI(String... binding) { + + addUpdateInfoMessage(); + super.startEditUI(binding); + } + + protected void addUpdateInfoMessage() { String message = n("observe.entity.message.updating"); ObserveNode node = getTreeHelper(getUi()).getSelectedNode(); String entityLabel = getEntityLabel(node.getParent().getInternalClass()); message = t(message, t(entityLabel)); addMessage(getUi(), NuitonValidatorScope.INFO, entityLabel, message); - - super.startEditUI(binding); } public void removeSelectedRow(int selectedRow) { diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUI.css b/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUI.css new file mode 100644 index 0000000..9b6878f --- /dev/null +++ b/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUI.css @@ -0,0 +1,61 @@ +/* + * #%L + * ObServe :: Swing + * %% + * Copyright (C) 2008 - 2010 IRD, Codelutin, 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% + */ + +#gearLabel { + text:"observe.gearUseFeaturesSeine.gear"; + labelFor:{gear}; +} + +#gear { + property:{GearUseFeaturesSeine.PROPERTY_GEAR}; + selectedItem:{tableEditBean.getGear()}; +} + +#numberLabel { + text:"observe.gearUseFeaturesSeine.number"; + labelFor:{number}; +} + +#number { + property:{GearUseFeaturesSeine.PROPERTY_NUMBER}; + model:{tableEditBean.getNumber()}; + numberPattern:{fr.ird.observe.ui.UIHelper.INT_6_DIGITS_PATTERN}; +} + +#usedInTripLabel { + text:"observe.gearUseFeaturesSeine.usedInTrip"; + labelFor:{usedInTrip}; +} + +#usedInTrip { + booleanValue:{tableEditBean.getUsedInTrip()}; + _tablePropertyName:{GearUseFeaturesSeine.PROPERTY_USED_IN_TRIP}; +} + +#comment { + columnHeaderView:{new JLabel(t("observe.gearUseFeaturesSeine.comment"))}; + minimumSize:{new Dimension(10,80)}; +} + +#comment2 { + text:{getStringValue(tableEditBean.getComment())}; +} diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUI.jaxx b/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUI.jaxx new file mode 100644 index 0000000..f1aca39 --- /dev/null +++ b/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUI.jaxx @@ -0,0 +1,135 @@ +<!-- + #%L + ObServe :: Swing + %% + Copyright (C) 2008 - 2010 IRD, Codelutin, 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% + --> + +<fr.ird.observe.ui.content.table.ContentTableUI + superGenericType='TripSeine, GearUseFeaturesSeine' + contentTitle='{n("observe.gearUseFeaturesSeine.title")}' + saveNewEntryText='{n("observe.action.create.gearUseFeaturesSeine")}' + saveNewEntryTip='{n("observe.action.create.gearUseFeaturesSeine.tip")}'> + + <style source="../../CommonTable.css"/> + + <import> + fr.ird.observe.entities.CommentableEntity + fr.ird.observe.entities.seine.TripSeine + fr.ird.observe.entities.seine.GearUseFeaturesSeine + fr.ird.observe.entities.referentiel.Gear + fr.ird.observe.ui.content.table.* + fr.ird.observe.ui.util.BooleanEditor + + jaxx.runtime.swing.editor.NumberEditor + jaxx.runtime.swing.editor.bean.BeanComboBox + + java.awt.Dimension + + static fr.ird.observe.ui.UIHelper.getStringValue + static org.nuiton.i18n.I18n.n + </import> + + <!-- handler --> + <GearUseFeaturesSeineUIHandler id='handler' constructorParams='this'/> + + <!-- model --> + <GearUseFeaturesSeineUIModel id='model' constructorParams='this'/> + + <!-- edit bean --> + <TripSeine id='bean'/> + + <!-- table edit bean --> + <GearUseFeaturesSeine id='tableEditBean'/> + + <!-- table model --> + <ContentTableModel id='tableModel'/> + + <!-- le validateur de l'écran --> + <BeanValidator id='validator' + beanClass='fr.ird.observe.entities.seine.TripSeine' + errorTableModel='{getErrorTableModel()}' + context='n1-update-gearUseFeatures'/> + + <!-- le validateur d'une entrée de tableau --> + <BeanValidator id='validatorTable' + autoField='true' + beanClass='fr.ird.observe.entities.seine.GearUseFeaturesSeine' + errorTableModel='{getErrorTableModel()}' + context='n1-update'/> + + <!--<JTabbedPane id='gearUseFeaturesTabPane'>--> + + <!--<tab id='generalTab'>--> + <!--<JPanel layout="{new BorderLayout()}">--> + <!--</JPanel>--> + <!--</tab>--> + <!--<tab id='measurementsTab'>--> + <!--<JPanel layout="{new BorderLayout()}">--> + <!--</JPanel>--> + <!--</tab>--> + <!--</JTabbedPane>--> + + <Table id='editorPanel' fill='both' insets='1'> + + <!-- gear --> + <row> + <cell> + <JLabel id='gearLabel'/> + </cell> + <cell weightx='1' anchor='east'> + <BeanComboBox id='gear' constructorParams='this' genericType='Gear'/> + </cell> + </row> + + <!-- number --> + <row> + <cell> + <JLabel id='numberLabel'/> + </cell> + <cell weightx='1' anchor='east'> + <NumberEditor id='number' constructorParams='this'/> + </cell> + </row> + + <!-- usedInTrip --> + <row> + <cell> + <JLabel id='usedInTripLabel'/> + </cell> + <cell weightx='1' anchor='east'> + <BooleanEditor id='usedInTrip'/> + </cell> + </row> + + <!-- comment --> + <row> + <cell columns='2' weighty='1'> + <JScrollPane id='comment' onFocusGained='comment2.requestFocus()'> + <JTextArea id='comment2' onKeyReleased='getTableEditBean().setComment(comment2.getText())'/> + </JScrollPane> + </cell> + </row> + + </Table> + + <Table id='extraZone' fill='both' weightx='1' insets='0'> + + </Table> + +</fr.ird.observe.ui.content.table.ContentTableUI> diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java b/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java new file mode 100644 index 0000000..76b17db --- /dev/null +++ b/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java @@ -0,0 +1,174 @@ +package fr.ird.observe.ui.content.table.impl.seine; + +import fr.ird.observe.DataService; +import fr.ird.observe.ObserveDAOHelper; +import fr.ird.observe.db.DataContext; +import fr.ird.observe.db.DataSource; +import fr.ird.observe.db.constants.DataContextType; +import fr.ird.observe.entities.referentiel.Gear; +import fr.ird.observe.entities.seine.GearUseFeaturesSeine; +import fr.ird.observe.entities.seine.TripSeine; +import fr.ird.observe.ui.UIHelper; +import fr.ird.observe.ui.content.ContentMode; +import fr.ird.observe.ui.content.table.ContentTableUIHandler; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.TopiaException; +import org.nuiton.topia.persistence.TopiaDAO; +import org.nuiton.topia.persistence.util.EntityListUpdator; +import org.nuiton.topia.persistence.util.Loador; + +import javax.swing.JTable; +import javax.swing.table.DefaultTableCellRenderer; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import java.util.Map; + +import static org.nuiton.i18n.I18n.n; +import static org.nuiton.i18n.I18n.t; + +/** + * Created on 3/24/15. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 3.16 + */ +public class GearUseFeaturesSeineUIHandler extends ContentTableUIHandler<TripSeine, GearUseFeaturesSeine> { + + /** Logger */ + static private Log log = + LogFactory.getLog(GearUseFeaturesSeineUIHandler.class); + + public GearUseFeaturesSeineUIHandler(GearUseFeaturesSeineUI ui) { + super(ui, DataContextType.SetSeine); + } + + @Override + public GearUseFeaturesSeineUI getUi() { + return (GearUseFeaturesSeineUI) super.getUi(); + } + + @Override + protected ContentMode getContentMode(DataContext dataContext) { + + // par defaut, on suppose qu'on peut afficher les données + getModel().setShowData(true); + + String selectedTripId = dataContext.getSelectedTripId(); + + if (selectedTripId.equals(dataContext.getOpenTripId())) { + + // mode mise a jour + return ContentMode.UPDATE; + } + + // mode lecture + + if (dataContext.isSelectedTripLongline()) { + + addInfoMessage(t("observe.tripLongline.message.not.open")); + + } else { + + addInfoMessage(t("observe.tripSeine.message.not.open")); + + } + + return ContentMode.READ; + } + + @Override + protected void addUpdateInfoMessage() { + // No message to display + } + + @Override + protected String getEditBeanIdToLoad(DataContext dataContext, DataService dataService, DataSource dataSource) { + return dataContext.getSelectedTripId(); + } + + @Override + protected void onSelectedRowChanged(int editingRow, GearUseFeaturesSeine bean, boolean create) { + if (log.isDebugEnabled()) { + log.debug("Row has changed to " + editingRow); + } + if (getTableModel().isEditable()) { + getUi().getGear().requestFocus(); + } + } + + @Override + protected void initTableUI(DefaultTableCellRenderer renderer) { + JTable table = getUi().getTable(); + + UIHelper.setI18nTableHeaderRenderer(table, + n("observe.gearUseFeaturesSeine.table.gear"), + n("observe.gearUseFeaturesSeine.table.gear.tip"), + n("observe.gearUseFeaturesSeine.table.number"), + n("observe.gearUseFeaturesSeine.table.number.tip"), + n("observe.gearUseFeaturesSeine.table.usedInTrip"), + n("observe.gearUseFeaturesSeine.table.usedInTrip.tip"), + n("observe.gearUseFeaturesSeine.table.comment"), + n("observe.gearUseFeaturesSeine.table.comment.tip")); + + UIHelper.setTableColumnRenderer(table, 0, UIHelper.newDecorateTableCellRenderer(renderer, Gear.class)); + UIHelper.setTableColumnRenderer(table, 1, UIHelper.newEmptyNumberTableCellRenderer(renderer)); + UIHelper.setTableColumnRenderer(table, 2, UIHelper.newBooleanTableCellRenderer(renderer)); + UIHelper.setTableColumnRenderer(table, 3, UIHelper.newStringTableCellRenderer(renderer, 10, true)); + + } + + @Override + public void afterSave(boolean refresh) { + super.afterSave(refresh); + } + + @Override + public TripSeine onUpdate(TopiaContext tx, Object parentBean, TripSeine beanToSave) throws TopiaException { + + List<GearUseFeaturesSeine> childs = getUi().getTableModel().getData(); + + Loador<GearUseFeaturesSeine> childBinder = getModel().getChildLoador(); + + EntityListUpdator<TripSeine, GearUseFeaturesSeine> childUpdator = getModel().getChildsUpdator(); + + // on conserve l'ancienne liste des fils (pour traitement ultérieure) + Collection<GearUseFeaturesSeine> oldChilds = new ArrayList<GearUseFeaturesSeine>(beanToSave.getGearUseFeaturesSeine()); + + beanToSave.clearGearUseFeaturesSeine(); + + TopiaDAO<GearUseFeaturesSeine> dao = ObserveDAOHelper.getDAO(tx, getModel().getChildType()); + + for (GearUseFeaturesSeine child : childs) { + + GearUseFeaturesSeine childToSave; + + if (child.getTopiaId() == null) { + + // creation du fils + Map<String, Object> map = childBinder.obtainProperties(child); + childToSave = dao.create(map); + + } else { + + // mise a jour du fils + + childToSave = dao.findByTopiaId(child.getTopiaId()); + + childBinder.load(child, childToSave, false); + } + + // ajout du fils au bean à sauver + childUpdator.addToList(beanToSave, childToSave); + } + + // on donne la main aux implantations pour faire des traitements + // supplémentaires + onUpdateFinalize(tx, beanToSave, oldChilds); + + return beanToSave; + } + +} \ No newline at end of file diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUIModel.java b/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUIModel.java new file mode 100644 index 0000000..0802322 --- /dev/null +++ b/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUIModel.java @@ -0,0 +1,79 @@ +package fr.ird.observe.ui.content.table.impl.seine; + +import com.google.common.collect.Lists; +import fr.ird.observe.BinderService; +import fr.ird.observe.ObserveServiceHelper; +import fr.ird.observe.entities.seine.GearUseFeaturesMeasurementSeine; +import fr.ird.observe.entities.seine.GearUseFeaturesSeine; +import fr.ird.observe.entities.seine.TripSeine; +import fr.ird.observe.ui.content.table.ContentTableMeta; +import fr.ird.observe.ui.content.table.ContentTableModel; +import fr.ird.observe.ui.content.table.ContentTableUIModel; +import org.nuiton.topia.persistence.util.TopiaEntityBinder; +import org.nuiton.util.beans.BinderModelBuilder; + +import java.util.List; + +/** + * Created on 3/24/15. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 3.16 + */ +public class GearUseFeaturesSeineUIModel extends ContentTableUIModel<TripSeine, GearUseFeaturesSeine> { + + private static final long serialVersionUID = 1L; + + private TopiaEntityBinder<GearUseFeaturesMeasurementSeine> gearUseFeaturesMeasurementLoador; + + public GearUseFeaturesSeineUIModel(GearUseFeaturesSeineUI ui) { + + super(TripSeine.class, + GearUseFeaturesSeine.class, + new String[]{TripSeine.PROPERTY_GEAR_USE_FEATURES_SEINE, TripSeine.PROPERTY_COMMENT}, + new String[]{ + GearUseFeaturesSeine.PROPERTY_COMMENT, + GearUseFeaturesSeine.PROPERTY_GEAR, + GearUseFeaturesSeine.PROPERTY_NUMBER, + GearUseFeaturesSeine.PROPERTY_USED_IN_TRIP, + GearUseFeaturesSeine.PROPERTY_GEAR_USE_FEATURES_MEASUREMENT, + }); + + List<ContentTableMeta<GearUseFeaturesSeine>> metas = Lists.newArrayList( + ContentTableModel.newTableMeta(GearUseFeaturesSeine.class, GearUseFeaturesSeine.PROPERTY_GEAR, false), + ContentTableModel.newTableMeta(GearUseFeaturesSeine.class, GearUseFeaturesSeine.PROPERTY_NUMBER, false), + ContentTableModel.newTableMeta(GearUseFeaturesSeine.class, GearUseFeaturesSeine.PROPERTY_USED_IN_TRIP, false), + ContentTableModel.newTableMeta(GearUseFeaturesSeine.class, GearUseFeaturesSeine.PROPERTY_COMMENT, false)); + + initModel(ui, metas); + + } + + @Override + protected BinderModelBuilder<GearUseFeaturesSeine, GearUseFeaturesSeine> prepareChildLoador(BinderService binderService, String binderName) { + + BinderModelBuilder<GearUseFeaturesSeine, GearUseFeaturesSeine> builder = super.prepareChildLoador(binderService, binderName); + builder.addCollectionBinder(getGearUseFeaturesMeasurementLoador(), GearUseFeaturesSeine.PROPERTY_GEAR_USE_FEATURES_MEASUREMENT); + return builder; + + } + + public TopiaEntityBinder<GearUseFeaturesMeasurementSeine> getGearUseFeaturesMeasurementLoador() { + if (gearUseFeaturesMeasurementLoador == null) { + + BinderService binderService = ObserveServiceHelper.get().getBinderService(); + + String binderName = getClass().getName() + "-open"; + + BinderModelBuilder<GearUseFeaturesMeasurementSeine, GearUseFeaturesMeasurementSeine> builder = + binderService.newBinderBuilder(GearUseFeaturesMeasurementSeine.class, + GearUseFeaturesMeasurementSeine.PROPERTY_GEAR_CARACTERISTIC, + GearUseFeaturesMeasurementSeine.PROPERTY_MEASUREMENT_VALUE); + + gearUseFeaturesMeasurementLoador = binderService.registerTopiaBinder(GearUseFeaturesMeasurementSeine.class, builder, binderName); + + } + return gearUseFeaturesMeasurementLoador; + } + +} \ No newline at end of file diff --git a/observe-swing/src/main/resources/i18n/observe-swing_en_GB.properties b/observe-swing/src/main/resources/i18n/observe-swing_en_GB.properties index d9c0ea4..faeabf7 100644 --- a/observe-swing/src/main/resources/i18n/observe-swing_en_GB.properties +++ b/observe-swing/src/main/resources/i18n/observe-swing_en_GB.properties @@ -96,6 +96,8 @@ observe.action.create=Create observe.action.create.activity=Create a new activity observe.action.create.activity.tip= observe.action.create.entry.tip= +observe.action.create.gearUseFeaturesSeine= +observe.action.create.gearUseFeaturesSeine.tip= observe.action.create.maree=Create a new maree observe.action.create.maree.tip= observe.action.create.nonTargetCatch= @@ -1050,12 +1052,25 @@ observe.floatlinesComposition.table.proportion=Proportion observe.floatlinesComposition.table.proportion.tip=Proportion observe.floatlinesComposition.title=Floatines observe.gear.availableGearCaracteristic=Available caracteristics -observe.gear.gearCaracteristic= -observe.gear.gearCaracteristicType= +observe.gear.gearCaracteristic=Gear caracteristic +observe.gear.gearCaracteristicType=Gear caracteristic type observe.gear.selectedGearCaracteristic=Selected caracteristics observe.gear.tab.gearCaracteristic=Caracteristics of the gear observe.gear.tab.general=General caracteristics -observe.gear.unit= +observe.gear.unit=Unit +observe.gearUseFeaturesSeine.comment=Comment +observe.gearUseFeaturesSeine.gear=Gear +observe.gearUseFeaturesSeine.number=Number +observe.gearUseFeaturesSeine.table.comment=Comment +observe.gearUseFeaturesSeine.table.comment.tip=Comment +observe.gearUseFeaturesSeine.table.gear=Gear +observe.gearUseFeaturesSeine.table.gear.tip=Gear +observe.gearUseFeaturesSeine.table.number=Number +observe.gearUseFeaturesSeine.table.number.tip=Number +observe.gearUseFeaturesSeine.table.usedInTrip=Used +observe.gearUseFeaturesSeine.table.usedInTrip.tip=Used in trip +observe.gearUseFeaturesSeine.title= +observe.gearUseFeaturesSeine.usedInTrip=Used in trip observe.harbour.coordinates= observe.harbour.locode= observe.harbour.name= diff --git a/observe-swing/src/main/resources/i18n/observe-swing_es_ES.properties b/observe-swing/src/main/resources/i18n/observe-swing_es_ES.properties index fb64e19..a47492c 100644 --- a/observe-swing/src/main/resources/i18n/observe-swing_es_ES.properties +++ b/observe-swing/src/main/resources/i18n/observe-swing_es_ES.properties @@ -1,3 +1,4 @@ +observe.GearUseFeaturesSeine.usedInTrip= observe.about.message=<h3>ObServe</h3><a href\="http\://www.ird.fr/informatique-scientifique/projets/observe/">Système d'Information, d'Observation et de Suivi des pêches thonières tropicales de surface.</a><hr/><p>Aplicación de adquisición Application de datos de observadores y de consulta de estos datos desde una base <i>Obstuna</i>.</p> <p>Este projecto se ha iniciado en 2009 por la unidad US 007-OSIRIS del <a href\="http\://www.ird.fr">IRD</a> dentro del marco de <a href\="http\://ww [...] observe.about.translate.content=<h2>Comment traduire ObServe</h2>Vous pouvez nous aider à traduire l'application.<hr/><br/><ul><li>Récupérer le fichier <a href\="%s">observe-i18n.csv</a> dans le répertoire <strong>i18n</strong></li><li>ouvrez le avec un tableur avec les options suivantes \: <ul><li>caractère séparateur \: <strong><i>|</i></strong></li><li>encoding <strong><i>UTF-8</i></strong></li><li>texte encapsulé par des <strong><i>"</i></strong></li></ul></li><li>Traduisez, Améliore [...] observe.about.translate.title=Traducir ObServe @@ -96,6 +97,8 @@ observe.action.create=Crear observe.action.create.activity=Crear una nueva actividad observe.action.create.activity.tip=Crear una nueva actividad para la ruta actual observe.action.create.entry.tip=Crear una nueva entrada +observe.action.create.gearUseFeaturesSeine= +observe.action.create.gearUseFeaturesSeine.tip= observe.action.create.maree=Crear nueva marea observe.action.create.maree.tip=Crear nueva marea para el programa actual observe.action.create.nonTargetCatch=Insertar esta especie/peso/objectFate @@ -1055,6 +1058,22 @@ observe.gear.selectedGearCaracteristic= observe.gear.tab.gearCaracteristic= observe.gear.tab.general= observe.gear.unit= +observe.gearUseFeaturesSeine.comment= +observe.gearUseFeaturesSeine.gear= +observe.gearUseFeaturesSeine.gearCaracteristic= +observe.gearUseFeaturesSeine.number= +observe.gearUseFeaturesSeine.table.comment= +observe.gearUseFeaturesSeine.table.comment.tip= +observe.gearUseFeaturesSeine.table.gear= +observe.gearUseFeaturesSeine.table.gear.tip= +observe.gearUseFeaturesSeine.table.gearCaracteristic= +observe.gearUseFeaturesSeine.table.gearCaracteristic.tip= +observe.gearUseFeaturesSeine.table.number= +observe.gearUseFeaturesSeine.table.number.tip= +observe.gearUseFeaturesSeine.table.usedInTrip= +observe.gearUseFeaturesSeine.table.usedInTrip.tip= +observe.gearUseFeaturesSeine.title= +observe.gearUseFeaturesSeine.usedInTrip= observe.harbour.coordinates= observe.harbour.locode= observe.harbour.name= diff --git a/observe-swing/src/main/resources/i18n/observe-swing_fr_FR.properties b/observe-swing/src/main/resources/i18n/observe-swing_fr_FR.properties index 53d04b2..09225ea 100644 --- a/observe-swing/src/main/resources/i18n/observe-swing_fr_FR.properties +++ b/observe-swing/src/main/resources/i18n/observe-swing_fr_FR.properties @@ -96,6 +96,8 @@ observe.action.create=Créer observe.action.create.activity=Créer une nouvelle activité observe.action.create.activity.tip=Créer une nouvelle activité pour la route courante observe.action.create.entry.tip=Créer une nouvelle entrée +observe.action.create.gearUseFeaturesSeine= +observe.action.create.gearUseFeaturesSeine.tip= observe.action.create.maree=Créer une nouvelle marée observe.action.create.maree.tip=Créer une nouvelle marée pour le programme courant observe.action.create.nonTargetCatch=Insérer cette espèce / poids / devenir @@ -1055,6 +1057,19 @@ observe.gear.selectedGearCaracteristic=Caractéristiques utilisées observe.gear.tab.gearCaracteristic=Caractéristiques de l'équipement observe.gear.tab.general=Caractéristiques générales observe.gear.unit=Unité +observe.gearUseFeaturesSeine.comment=Commentaire +observe.gearUseFeaturesSeine.gear=Équipement +observe.gearUseFeaturesSeine.number=Nombre +observe.gearUseFeaturesSeine.table.comment=Commentaire +observe.gearUseFeaturesSeine.table.comment.tip=Commentaire +observe.gearUseFeaturesSeine.table.gear=Équipement +observe.gearUseFeaturesSeine.table.gear.tip=Équipement +observe.gearUseFeaturesSeine.table.number=Nombre +observe.gearUseFeaturesSeine.table.number.tip=Nombre +observe.gearUseFeaturesSeine.table.usedInTrip=Utilisé +observe.gearUseFeaturesSeine.table.usedInTrip.tip=Utilisé dans la marée +observe.gearUseFeaturesSeine.title= +observe.gearUseFeaturesSeine.usedInTrip=Utilisé dans la marée observe.harbour.coordinates=Nom observe.harbour.locode=Locode observe.harbour.name=Nom diff --git a/observe-validation/src/main/resources/fr/ird/observe/entities/seine/GearUseFeaturesSeine-n1-update-error-validation.xml b/observe-validation/src/main/resources/fr/ird/observe/entities/seine/GearUseFeaturesSeine-n1-update-error-validation.xml new file mode 100644 index 0000000..5ea0400 --- /dev/null +++ b/observe-validation/src/main/resources/fr/ird/observe/entities/seine/GearUseFeaturesSeine-n1-update-error-validation.xml @@ -0,0 +1,46 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 IRD, Codelutin, 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="gear"> + + <!-- pas d'équipement selectionnee --> + <field-validator type="required" short-circuit="true"> + <message>validator.trip.required.gear</message> + </field-validator> + + <!-- équipement desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ gear.enabled ]]> + </param> + <message>validator.trip.desactivated.gear</message> + </field-validator> + + </field> + +</validators> diff --git a/observe-validation/src/main/resources/fr/ird/observe/entities/seine/TripSeine-n1-update-gearUseFeatures-warning-validation.xml b/observe-validation/src/main/resources/fr/ird/observe/entities/seine/TripSeine-n1-update-gearUseFeatures-warning-validation.xml new file mode 100644 index 0000000..dc25516 --- /dev/null +++ b/observe-validation/src/main/resources/fr/ird/observe/entities/seine/TripSeine-n1-update-gearUseFeatures-warning-validation.xml @@ -0,0 +1,41 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 IRD, Codelutin, 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="gearUseFeaturesSeine"> + + <!-- pas d'équipement --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ gearUseFeaturesSeine == null || gearUseFeaturesSeine.empty ]]> + </param> + <message>validator.trip.null.gearUseFeature</message> + </field-validator> + + </field> + +</validators> diff --git a/observe-validation/src/main/resources/i18n/observe-validation_fr_FR.properties b/observe-validation/src/main/resources/i18n/observe-validation_fr_FR.properties index 809099d..58ef142 100644 --- a/observe-validation/src/main/resources/i18n/observe-validation_fr_FR.properties +++ b/observe-validation/src/main/resources/i18n/observe-validation_fr_FR.properties @@ -17,6 +17,7 @@ validator.activity.invalid.quadrant=Le quadrant n'est pas cohérent par rapport validator.activity.invalid.seaSurfaceTemperature=La température surface (%1$s) ne peut pas varier de plus de 12° par rapport à la température surface (%2$s) de l'activité précédente %3$s. validator.activity.invalid.speed=La vitesse de l'activité courante est de %s nd, alors que la vitesse maximale autorisée est %s nd validator.activity.null.dcp=Aucun objet flottant saisi. +validator.trip.null.gearUseFeature=Vous n'avez pas saisi d'équipement (Senne conseillée). validator.activity.null.fpaZone=La sélection d'une zone FPA est obligatoire. validator.activity.null.observedSystem=Aucun système observé sélectionné. validator.activity.null.observedSystemDistance=La distance au système observé n'est pas renseignée. @@ -388,6 +389,8 @@ validator.trip.required.comment.for.observer=Un commentaire est requis pour l'ob validator.trip.required.comment.for.ocean=Un commentaire est requis pour l'ocean sélectionné. validator.trip.required.comment.for.tripType=Un commentaire est requis pour le type de marée sélectionné. validator.trip.required.comment.for.vessel=Un commentaire est requis pour le navire sélectionné. +validator.trip.required.gear=L'équipement est obligatoire. +validator.trip.desactivated.gear=L'équipement sélectionné est désactivé. validator.trip.required.departureHarbour=La sélection d'un port de départ est obligatoire. validator.trip.required.endDate=La date de fin de marée est obligatoire. validator.trip.required.observer=La sélection d'un observateur est obligatoire. diff --git a/observe-validation/src/test/java/fr/ird/observe/validation/BeanValidatorDetectorTest.java b/observe-validation/src/test/java/fr/ird/observe/validation/BeanValidatorDetectorTest.java index 707ed05..c8c27f7 100644 --- a/observe-validation/src/test/java/fr/ird/observe/validation/BeanValidatorDetectorTest.java +++ b/observe-validation/src/test/java/fr/ird/observe/validation/BeanValidatorDetectorTest.java @@ -97,6 +97,7 @@ import fr.ird.observe.entities.referentiel.seine.WeightCategory; import fr.ird.observe.entities.referentiel.seine.Wind; import fr.ird.observe.entities.seine.ActivitySeine; import fr.ird.observe.entities.seine.FloatingObject; +import fr.ird.observe.entities.seine.GearUseFeaturesSeine; import fr.ird.observe.entities.seine.NonTargetCatch; import fr.ird.observe.entities.seine.NonTargetLength; import fr.ird.observe.entities.seine.NonTargetSample; @@ -154,7 +155,7 @@ public class BeanValidatorDetectorTest extends AbstractValidatorDetectorTest { SortedSet<NuitonValidator<?>> validators = detectValidators(ALL_TYPES); assertFalse(validators.isEmpty()); - assertEquals(172, validators.size()); + assertEquals(174, validators.size()); } @@ -264,6 +265,7 @@ public class BeanValidatorDetectorTest extends AbstractValidatorDetectorTest { Gear.class, GearCaracteristic.class, GearCaracteristicType.class, + GearUseFeaturesSeine.class, Harbour.class, Healthness.class, HookPosition.class, @@ -358,7 +360,8 @@ public class BeanValidatorDetectorTest extends AbstractValidatorDetectorTest { contextName + "-targetCatch", SetSeine.class, contextName + "-targetDiscarded", SetSeine.class, contextName + "-targetCatch", TargetCatch.class, - contextName + "-targetDiscarded", TargetCatch.class + contextName + "-targetDiscarded", TargetCatch.class, + contextName + "-gearUseFeatures", TripSeine.class ); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/6855 in repository observe. See http://git.codelutin.com/observe.git commit de9e8127e601b321d2ec1d404f2c9950d817289d Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Apr 6 19:08:31 2015 +0200 ajout d'une validation sur le pays d'un balise --- .../seine/TransmittingBuoy-n1-update-error-validation.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/observe-validation/src/main/resources/fr/ird/observe/entities/seine/TransmittingBuoy-n1-update-error-validation.xml b/observe-validation/src/main/resources/fr/ird/observe/entities/seine/TransmittingBuoy-n1-update-error-validation.xml index 5944744..59aaf76 100644 --- a/observe-validation/src/main/resources/fr/ird/observe/entities/seine/TransmittingBuoy-n1-update-error-validation.xml +++ b/observe-validation/src/main/resources/fr/ird/observe/entities/seine/TransmittingBuoy-n1-update-error-validation.xml @@ -60,4 +60,16 @@ </field> + <field name="country"> + + <!-- country desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ country == null || country.enabled ]]> + </param> + <message>validator.transmittingBuoy.desactivated.country</message> + </field-validator> + + </field> + </validators> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/6855 in repository observe. See http://git.codelutin.com/observe.git commit 6ceee17c5600d8eabe43387e99ab61c6d264cdf3 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Apr 6 19:08:51 2015 +0200 correction du warning sur le nombre d'équipements d'une marée seine --- .../seine/TripSeine-n1-update-gearUseFeatures-warning-validation.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/observe-validation/src/main/resources/fr/ird/observe/entities/seine/TripSeine-n1-update-gearUseFeatures-warning-validation.xml b/observe-validation/src/main/resources/fr/ird/observe/entities/seine/TripSeine-n1-update-gearUseFeatures-warning-validation.xml index dc25516..ae611d7 100644 --- a/observe-validation/src/main/resources/fr/ird/observe/entities/seine/TripSeine-n1-update-gearUseFeatures-warning-validation.xml +++ b/observe-validation/src/main/resources/fr/ird/observe/entities/seine/TripSeine-n1-update-gearUseFeatures-warning-validation.xml @@ -31,7 +31,7 @@ <!-- pas d'équipement --> <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"> - <![CDATA[ gearUseFeaturesSeine == null || gearUseFeaturesSeine.empty ]]> + <![CDATA[ gearUseFeaturesSeine != null && !gearUseFeaturesSeine.empty ]]> </param> <message>validator.trip.null.gearUseFeature</message> </field-validator> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/6855 in repository observe. See http://git.codelutin.com/observe.git commit 441cee8d47de35050efa34297af97c76eb5986e5 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Apr 6 19:10:18 2015 +0200 correction du calcul des données dans le contexte --- .../main/java/fr/ird/observe/db/DataContext.java | 104 +++++++++++++++++++-- .../ird/observe/db/constants/DataContextType.java | 36 +++---- .../java/fr/ird/observe/entities/Entities.java | 8 ++ 3 files changed, 120 insertions(+), 28 deletions(-) diff --git a/observe-business/src/main/java/fr/ird/observe/db/DataContext.java b/observe-business/src/main/java/fr/ird/observe/db/DataContext.java index b64f10f..378a81b 100644 --- a/observe-business/src/main/java/fr/ird/observe/db/DataContext.java +++ b/observe-business/src/main/java/fr/ird/observe/db/DataContext.java @@ -23,6 +23,7 @@ package fr.ird.observe.db; */ import fr.ird.observe.db.constants.DataContextType; +import fr.ird.observe.entities.Entities; import fr.ird.observe.entities.longline.ActivityLongline; import fr.ird.observe.entities.longline.TripLongline; import fr.ird.observe.entities.referentiel.Program; @@ -135,6 +136,15 @@ public class DataContext extends AbstractSerializableBean { return openTripId; } + public String getOpenTripLonglineId() { + return isOpenTripLongline() ? getOpenTripId() : null; + } + + public String getOpenTripSeineId() { + return isOpenTripSeine() ? getOpenTripId() : null; + } + + public void setOpenTripId(String openTripId) { String oldValue = getOpenTripId(); boolean oldValue2 = isOpenTrip(); @@ -159,6 +169,14 @@ public class DataContext extends AbstractSerializableBean { return openActivityId; } + public String getOpenActivityLonglineId() { + return isOpenActivityLongline() ? getOpenActivityId() : null; + } + + public String getOpenActivitySeineId() { + return isOpenActivitySeine() ? getOpenActivityId() : null; + } + public void setOpenActivityId(String openActivityId) { String oldValue = getOpenActivityId(); boolean oldValue2 = isOpenActivity(); @@ -171,6 +189,15 @@ public class DataContext extends AbstractSerializableBean { return openSetId; } + public String getOpenSetLonglineId() { + return isOpenSetLongline() ? getOpenSetId() : null; + } + + public String getOpenSetSeineId() { + return isOpenSetSeine() ? getOpenSetId() : null; + } + + public void setOpenSetId(String openSetId) { String oldValue = getOpenSetId(); boolean oldValue2 = isOpenSet(); @@ -193,6 +220,14 @@ public class DataContext extends AbstractSerializableBean { return selectedTripId; } + public String getSelectedTripLonglineId() { + return isSelectedTripLongline() ? getSelectedTripId() : null; + } + + public String getSelectedTripSeineId() { + return isSelectedTripSeine() ? getSelectedTripId() : null; + } + public void setSelectedTripId(String selectedTripId) { String oldValue = getSelectedTripId(); this.selectedTripId = selectedTripId; @@ -200,7 +235,11 @@ public class DataContext extends AbstractSerializableBean { } public boolean isSelectedTripLongline() { - return selectedTripId != null && selectedTripId.contains("Longline"); + return selectedTripId != null && Entities.isLonglineId(selectedTripId); + } + + public boolean isSelectedTripSeine() { + return selectedTripId != null && Entities.isSeineId(selectedTripId); } public String getSelectedRouteId() { @@ -217,8 +256,20 @@ public class DataContext extends AbstractSerializableBean { return selectedActivityId; } + public String getSelectedActivityLonglineId() { + return isSelectedActivityLongline() ? getSelectedActivityId() : null; + } + + public String getSelectedActivitySeineId() { + return isSelectedActivitySeine() ? getSelectedActivityId() : null; + } + public boolean isSelectedActivityLongline() { - return selectedActivityId != null && selectedActivityId.contains("Longline"); + return selectedActivityId != null && Entities.isLonglineId(selectedActivityId); + } + + public boolean isSelectedActivitySeine() { + return selectedActivityId != null && Entities.isSeineId(selectedActivityId); } public void setSelectedActivityId(String selectedActivityId) { @@ -231,6 +282,14 @@ public class DataContext extends AbstractSerializableBean { return selectedSetId; } + public String getSelectedSetLonglineId() { + return isSelectedActivityLongline() ? getSelectedSetId() : null; + } + + public String getSelectedSetSeineId() { + return isSelectedActivitySeine() ? getSelectedSetId() : null; + } + public void setSelectedSetId(String selectedSetId) { String oldValue = getSelectedSetId(); this.selectedSetId = selectedSetId; @@ -365,10 +424,10 @@ public class DataContext extends AbstractSerializableBean { // on a seine trip if (!TripSeine.class.equals(type) && isOpenRoute()) { ids.add(getOpenRouteId()); - if (!Route.class.equals(type) && isOpenActivity()) { - ids.add(getOpenActivityId()); - if (!ActivitySeine.class.equals(type) && isOpenSet()) { - ids.add(getOpenSetId()); + if (!Route.class.equals(type) && isOpenActivitySeine()) { + ids.add(getOpenActivitySeineId()); + if (!ActivitySeine.class.equals(type) && isOpenSetSeine()) { + ids.add(getOpenSetSeineId()); } } } @@ -376,10 +435,10 @@ public class DataContext extends AbstractSerializableBean { } else { // on a longline trip - if (!TripLongline.class.equals(type) && isOpenActivity()) { - ids.add(getOpenActivityId()); - if (!ActivityLongline.class.equals(type) && isOpenSet()) { - ids.add(getOpenSetId()); + if (!TripLongline.class.equals(type) && isOpenActivityLongline()) { + ids.add(getOpenActivityLonglineId()); + if (!ActivityLongline.class.equals(type) && isOpenSetLongline()) { + ids.add(getOpenSetLonglineId()); } } @@ -403,6 +462,14 @@ public class DataContext extends AbstractSerializableBean { return openTripId != null; } + public boolean isOpenTripLongline() { + return isOpenTrip() && Entities.isLonglineId(openTripId); + } + + public boolean isOpenTripSeine() { + return isOpenTrip() && Entities.isSeineId(openTripId); + } + public boolean isOpenRoute() { return openRouteId != null; } @@ -411,10 +478,27 @@ public class DataContext extends AbstractSerializableBean { return openActivityId != null; } + public boolean isOpenActivityLongline() { + return isOpenActivity() && Entities.isLonglineId(openActivityId); + } + + public boolean isOpenActivitySeine() { + return isOpenActivity() && Entities.isSeineId(openActivityId); + } + + public boolean isOpenSet() { return openSetId != null; } + public boolean isOpenSetLongline() { + return isOpenSet() && Entities.isLonglineId(openSetId); + } + + public boolean isOpenSetSeine() { + return isOpenSet() && Entities.isSeineId(openSetId); + } + public boolean isSelectedOpen(Class<?> type) { for (DataContextType entityType : DataContextType.values()) { diff --git a/observe-business/src/main/java/fr/ird/observe/db/constants/DataContextType.java b/observe-business/src/main/java/fr/ird/observe/db/constants/DataContextType.java index 4c9522b..592b4fc 100644 --- a/observe-business/src/main/java/fr/ird/observe/db/constants/DataContextType.java +++ b/observe-business/src/main/java/fr/ird/observe/db/constants/DataContextType.java @@ -72,12 +72,12 @@ public enum DataContextType { TripSeine(TripSeine.class, DataContext.PROPERTY_OPEN_TRIP) { @Override public boolean isOpen(DataContext context) { - return context.isOpenTrip(); + return context.isOpenTripSeine(); } @Override public String getOpenId(DataContext context) { - return context.getOpenTripId(); + return context.getOpenTripSeineId(); } @Override @@ -87,7 +87,7 @@ public enum DataContextType { @Override public String getSelectedId(DataContext context) { - return context.getSelectedTripId(); + return context.getSelectedTripSeineId(); } @Override @@ -99,12 +99,12 @@ public enum DataContextType { TripLongline(TripLongline.class, DataContext.PROPERTY_OPEN_TRIP) { @Override public boolean isOpen(DataContext context) { - return context.isOpenTrip(); + return context.isOpenTripLongline(); } @Override public String getOpenId(DataContext context) { - return context.getOpenTripId(); + return context.getOpenTripLonglineId(); } @Override @@ -114,7 +114,7 @@ public enum DataContextType { @Override public String getSelectedId(DataContext context) { - return context.getSelectedTripId(); + return context.getSelectedTripLonglineId(); } @Override @@ -153,12 +153,12 @@ public enum DataContextType { ActivitySeine(ActivitySeine.class, DataContext.PROPERTY_OPEN_ACTIVITY) { @Override public boolean isOpen(DataContext context) { - return context.isOpenActivity(); + return context.isOpenActivityLongline(); } @Override public String getOpenId(DataContext context) { - return context.getOpenActivityId(); + return context.getOpenActivitySeineId(); } @Override @@ -168,7 +168,7 @@ public enum DataContextType { @Override public String getSelectedId(DataContext context) { - return context.getSelectedActivityId(); + return context.getSelectedActivitySeineId(); } @Override @@ -180,12 +180,12 @@ public enum DataContextType { ActivityLongline(ActivityLongline.class, DataContext.PROPERTY_OPEN_ACTIVITY) { @Override public boolean isOpen(DataContext context) { - return context.isOpenActivity(); + return context.isOpenActivityLongline(); } @Override public String getOpenId(DataContext context) { - return context.getOpenActivityId(); + return context.getOpenActivityLonglineId(); } @Override @@ -195,7 +195,7 @@ public enum DataContextType { @Override public String getSelectedId(DataContext context) { - return context.getSelectedActivityId(); + return context.getSelectedActivityLonglineId(); } @Override @@ -207,12 +207,12 @@ public enum DataContextType { SetSeine(SetSeine.class, DataContext.PROPERTY_OPEN_SET) { @Override public boolean isOpen(DataContext context) { - return context.isOpenSet(); + return context.isOpenSetSeine(); } @Override public String getOpenId(DataContext context) { - return context.getOpenSetId(); + return context.getOpenSetSeineId(); } @Override @@ -222,7 +222,7 @@ public enum DataContextType { @Override public String getSelectedId(DataContext context) { - return context.getSelectedSetId(); + return context.getSelectedSetSeineId(); } @Override @@ -234,12 +234,12 @@ public enum DataContextType { SetLongline(SetLongline.class, DataContext.PROPERTY_OPEN_SET) { @Override public boolean isOpen(DataContext context) { - return context.isOpenSet(); + return context.isOpenSetLongline(); } @Override public String getOpenId(DataContext context) { - return context.getOpenSetId(); + return context.getOpenSetLonglineId(); } @Override @@ -249,7 +249,7 @@ public enum DataContextType { @Override public String getSelectedId(DataContext context) { - return context.getSelectedSetId(); + return context.getSelectedSetLonglineId(); } @Override diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/Entities.java b/observe-entities/src/main/java/fr/ird/observe/entities/Entities.java index da63dac..f914e3b 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/Entities.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/Entities.java @@ -351,4 +351,12 @@ public class Entities { } + public static boolean isSeineId(String id) { + return id.contains("Seine"); + } + + public static boolean isLonglineId(String id) { + return id.contains("Longline"); + } + } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/6855 in repository observe. See http://git.codelutin.com/observe.git commit 38fdbc9f1ed01b1fc45bb668caa72c5384813ff9 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Apr 6 19:12:36 2015 +0200 pouvoir decorer les propriétés avec un autre prefixe + passage en méthode statique --- .../fr/ird/observe/ConsolidateDataService.java | 4 +-- .../src/main/java/fr/ird/observe/DataService.java | 2 +- .../main/java/fr/ird/observe/DecoratorService.java | 31 ++++++++++++---------- .../java/fr/ird/observe/db/ReplicationService.java | 2 +- .../i18n/observe-business_en_GB.properties | 1 + .../i18n/observe-business_es_ES.properties | 1 + .../i18n/observe-business_fr_FR.properties | 1 + .../fr/ird/observe/ui/ObserveMainUIHandler.java | 2 +- .../src/main/java/fr/ird/observe/ui/UIHelper.java | 10 +++---- .../ObsoleteEntityListCellRenderer.java | 2 +- .../ui/admin/synchronize/SynchronizeUIHandler.java | 8 +++--- .../validate/ValidateEntityListCellRenderer.java | 2 +- .../ui/admin/validate/ValidateUIHandler.java | 6 ++--- .../ird/observe/ui/content/ContentUIHandler.java | 4 +-- .../ui/content/ref/ContentReferenceUIHandler.java | 8 +++--- .../ui/tree/AbstractObserveTreeCellRenderer.java | 2 +- .../ui/tree/NavigationTreeCellRenderer.java | 2 ++ .../fr/ird/observe/ui/usage/UsagesUIHandler.java | 4 +-- ...ObserveSimpleValidatorMessageTableRenderer.java | 2 +- .../util/ObserveValidatorMessageTableRenderer.java | 2 +- 20 files changed, 48 insertions(+), 48 deletions(-) diff --git a/observe-business/src/main/java/fr/ird/observe/ConsolidateDataService.java b/observe-business/src/main/java/fr/ird/observe/ConsolidateDataService.java index 5111a74..ef0999e 100644 --- a/observe-business/src/main/java/fr/ird/observe/ConsolidateDataService.java +++ b/observe-business/src/main/java/fr/ird/observe/ConsolidateDataService.java @@ -132,14 +132,14 @@ public class ConsolidateDataService { public String getNonTargetCatcheLabel() { if (nonTargetCatcheLabel == null) { - nonTargetCatcheLabel = t(getDecoratorService().getEntityLabel(NonTargetCatch.class)); + nonTargetCatcheLabel = t(DecoratorService.getEntityLabel(NonTargetCatch.class)); } return nonTargetCatcheLabel; } public String getSpeciesLabel() { if (speciesLabel == null) { - speciesLabel = t(getDecoratorService().getEntityLabel(Species.class)); + speciesLabel = t(DecoratorService.getEntityLabel(Species.class)); } return speciesLabel; diff --git a/observe-business/src/main/java/fr/ird/observe/DataService.java b/observe-business/src/main/java/fr/ird/observe/DataService.java index 8400c5a..806f8b0 100644 --- a/observe-business/src/main/java/fr/ird/observe/DataService.java +++ b/observe-business/src/main/java/fr/ird/observe/DataService.java @@ -1891,7 +1891,7 @@ public class DataService { public <E extends TopiaEntity> void walk( Class<E> contractClass) throws Exception { - String s = t(getDecoratorService().getEntityLabel(contractClass)); + String s = t(DecoratorService.getEntityLabel(contractClass)); String message = t("observe.service.build.synchro.referentiel", s); if (messanger != null) { diff --git a/observe-business/src/main/java/fr/ird/observe/DecoratorService.java b/observe-business/src/main/java/fr/ird/observe/DecoratorService.java index a3f2538..92c16e7 100644 --- a/observe-business/src/main/java/fr/ird/observe/DecoratorService.java +++ b/observe-business/src/main/java/fr/ird/observe/DecoratorService.java @@ -142,13 +142,12 @@ public class DecoratorService extends DecoratorProvider { private static final Log log = LogFactory.getLog(DecoratorService.class); /** Le pattern pour utiliser les clef i18n generees dans les entites */ - protected static final Pattern LABEL_PATTERN = - Pattern.compile("observe\\.common\\.(.+)"); - - public static final String WITH_POSITION = "withPosition"; + protected static final Pattern LABEL_PATTERN = Pattern.compile("observe\\.common\\.(.+)"); public static final String HAULING_IDENTIFIER = "haulingIdentifier"; + public static final String OBSERVE_COMMON_PREFIX = "observe.common."; + /** la locale du referentiel. */ protected ReferenceLocale referentielLocale; @@ -170,22 +169,27 @@ public class DecoratorService extends DecoratorProvider { } @SuppressWarnings({"unchecked"}) - public String getEntityLabel(Class entityClass) { + public static String getEntityLabel(Class entityClass) { + return getEntityLabel(OBSERVE_COMMON_PREFIX, entityClass); + } + + public static String getEntityLabel(String prefix, Class entityClass) { if (!TopiaEntity.class.isAssignableFrom(entityClass)) { throw new IllegalArgumentException( entityClass + " is not a TopiaEntity"); } entityClass = ObserveDAOHelper.getContractClass(entityClass); - return getPropertyLabel(entityClass.getSimpleName()); + return getPropertyLabel(prefix, entityClass.getSimpleName()); } - public String getEntityLabel(TopiaEntity entity) { - return getEntityLabel(entity.getClass()); + + public static String getPropertyLabel(String propertyName) { + String type = getPropertyLabel(OBSERVE_COMMON_PREFIX, propertyName); + return type; } - public String getPropertyLabel(String propertyName) { - String type = - "observe.common." + Introspector.decapitalize(propertyName); + public static String getPropertyLabel(String prefix, String propertyName) { + String type = prefix + Introspector.decapitalize(propertyName); return type; } @@ -302,6 +306,7 @@ public class DecoratorService extends DecoratorProvider { n("observe.common.tdrRecord"); n("observe.common.tripLongline"); n("observe.common.weightMeasure"); + n("observe.common.gearUseFeaturesSeine"); n("observe.common.vesselSizeCategory"); n("observe.common.harbour"); @@ -582,9 +587,7 @@ public class DecoratorService extends DecoratorProvider { String invokerProperty = t(getPropertyLabel( ref.getInvokerProperty())); - String type = - t(getEntityLabel( - invoker.getClass())); + String type = t(getEntityLabel(invoker.getClass())); Decorator<?> decorator = getDecoratorByType(invoker.getClass()); if (invokerProperty == null) { diff --git a/observe-business/src/main/java/fr/ird/observe/db/ReplicationService.java b/observe-business/src/main/java/fr/ird/observe/db/ReplicationService.java index 4ce4695..3817c8a 100644 --- a/observe-business/src/main/java/fr/ird/observe/db/ReplicationService.java +++ b/observe-business/src/main/java/fr/ird/observe/db/ReplicationService.java @@ -232,7 +232,7 @@ public class ReplicationService { TopiaContext srcCtxt = srcService.beginTransaction("replicateData"); try { TopiaEntity e = srcCtxt.findByTopiaId(id); - String label = t(getDecoratorService().getEntityLabel(e.getClass())); + String label = t(DecoratorService.getEntityLabel(e.getClass())); srcService.fireNewMessage(t("observe.storage.message.replicate.data.entity", label, dstLabel)); } catch (TopiaException e) { diff --git a/observe-business/src/main/resources/i18n/observe-business_en_GB.properties b/observe-business/src/main/resources/i18n/observe-business_en_GB.properties index e0ae654..bd7ea60 100644 --- a/observe-business/src/main/resources/i18n/observe-business_en_GB.properties +++ b/observe-business/src/main/resources/i18n/observe-business_en_GB.properties @@ -28,6 +28,7 @@ observe.common.fpaZone= observe.common.gear=Gear observe.common.gearCaracteristic=Gear caracteristic observe.common.gearCaracteristicType=Gear caracteristic type +observe.common.gearUseFeaturesSeine= observe.common.gps.activity= observe.common.gps.gpsPoint= observe.common.gps.gpsPointInterval= diff --git a/observe-business/src/main/resources/i18n/observe-business_es_ES.properties b/observe-business/src/main/resources/i18n/observe-business_es_ES.properties index c5a6a02..21d18f0 100644 --- a/observe-business/src/main/resources/i18n/observe-business_es_ES.properties +++ b/observe-business/src/main/resources/i18n/observe-business_es_ES.properties @@ -28,6 +28,7 @@ observe.common.fpaZone= observe.common.gear= observe.common.gearCaracteristic= observe.common.gearCaracteristicType= +observe.common.gearUseFeaturesSeine= observe.common.gps.activity=Actividad observe.common.gps.gpsPoint=Punto GPS observe.common.gps.gpsPointInterval=Intervalo de puntos diff --git a/observe-business/src/main/resources/i18n/observe-business_fr_FR.properties b/observe-business/src/main/resources/i18n/observe-business_fr_FR.properties index 698dfd9..d19efc1 100644 --- a/observe-business/src/main/resources/i18n/observe-business_fr_FR.properties +++ b/observe-business/src/main/resources/i18n/observe-business_fr_FR.properties @@ -28,6 +28,7 @@ observe.common.fpaZone=Zone FPA observe.common.gear=Équipement observe.common.gearCaracteristic=Caractéristique d'un équipement observe.common.gearCaracteristicType=Type de caractéristique d'équipement +observe.common.gearUseFeaturesSeine=Équipement observe.common.gps.activity=Activité observe.common.gps.gpsPoint=Point GPS observe.common.gps.gpsPointInterval=Intervalle de points diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/ObserveMainUIHandler.java b/observe-swing/src/main/java/fr/ird/observe/ui/ObserveMainUIHandler.java index 0a4ecf0..2360afa 100755 --- a/observe-swing/src/main/java/fr/ird/observe/ui/ObserveMainUIHandler.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/ObserveMainUIHandler.java @@ -137,7 +137,7 @@ public class ObserveMainUIHandler { if (node.isStringNode()) { params = t(node.getId()); } else { - params = t(ui.getContextValue(DataService.class).getDecoratorService().getEntityLabel(node.getInternalClass())); + params = t(DecoratorService.getEntityLabel(node.getInternalClass())); } ui.getStatus().setStatus(t("observe.action.open.screen", params)); } diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/UIHelper.java b/observe-swing/src/main/java/fr/ird/observe/ui/UIHelper.java index a9f9c11..ab08ea9 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/UIHelper.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/UIHelper.java @@ -23,7 +23,6 @@ package fr.ird.observe.ui; import fr.ird.observe.DecoratorService; import fr.ird.observe.ObserveContext; -import fr.ird.observe.ObserveServiceHelper; import jaxx.runtime.FileChooserUtil; import jaxx.runtime.JAXXObject; import jaxx.runtime.SwingUtil; @@ -308,7 +307,7 @@ public class UIHelper extends SwingUtil { Decorator<E> decorator = decoratorService.getDecoratorByType(beanClass); String beanStr; String messageDelete; - String type = decoratorService.getEntityLabel(beanClass); + String type = DecoratorService.getEntityLabel(beanClass); type = t(type); if (bean == null || bean.getTopiaId() == null || decorator == null) { @@ -408,13 +407,10 @@ public class UIHelper extends SwingUtil { public static final Comparator<Class> REFERENTIEL_COMPARATOR = new Comparator<Class>() { - DecoratorService decoratorService = - ObserveServiceHelper.getDecoratorService(); - @Override public int compare(Class o1, Class o2) { - String s1 = t(decoratorService.getEntityLabel(o1)); - String s2 = t(decoratorService.getEntityLabel(o2)); + String s1 = t(DecoratorService.getEntityLabel(o1)); + String s2 = t(DecoratorService.getEntityLabel(o2)); return s1.compareTo(s2); } }; diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/ObsoleteEntityListCellRenderer.java b/observe-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/ObsoleteEntityListCellRenderer.java index 71bf7e8..45520cb 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/ObsoleteEntityListCellRenderer.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/ObsoleteEntityListCellRenderer.java @@ -60,7 +60,7 @@ public class ObsoleteEntityListCellRenderer extends DefaultListCellRenderer { List<?> val = (List<?>) entry.getValue(); DecoratorService service = getDecoratorService(); - String type = t(service.getEntityLabel(id.getClass())); + String type = t(DecoratorService.getEntityLabel(id.getClass())); Decorator<?> decorator = service.getDecoratorByType(id.getClass()); String decorated = decorator.toString(id); diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/SynchronizeUIHandler.java b/observe-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/SynchronizeUIHandler.java index 591fd49..c5671e0 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/SynchronizeUIHandler.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/SynchronizeUIHandler.java @@ -182,7 +182,7 @@ public class SynchronizeUIHandler extends AdminTabUIHandler { SynchronizeModel model = ui.getStepModel(); TopiaEntity entity = (TopiaEntity) evt.getNewValue(); DecoratorService decoratorService = getDecoratorService(); - String type = t(decoratorService.getEntityLabel(entity.getClass())); + String type = t(DecoratorService.getEntityLabel(entity.getClass())); Decorator<?> decorator = decoratorService.getDecoratorByType(entity.getClass()); String label = t("observe.synchro.obsolete.entity.label", @@ -238,7 +238,7 @@ public class SynchronizeUIHandler extends AdminTabUIHandler { List<TopiaEntityRef> refs = entry.getValue(); DecoratorService decoratorService = getDecoratorService(); - String type = decoratorService.getEntityLabel(entity.getClass()); + String type = DecoratorService.getEntityLabel(entity.getClass()); Decorator<?> decorator = decoratorService.getDecoratorByType(entity.getClass()); String label = t("observe.synchro.obsolete.entity.label", @@ -533,7 +533,7 @@ public class SynchronizeUIHandler extends AdminTabUIHandler { for (itr = obsoleteRefs.entrySet().iterator(); itr.hasNext(); ) { Map.Entry<TopiaEntity, List<TopiaEntityRef>> entry = itr.next(); for (Iterator<TopiaEntityRef> itrRef = - entry.getValue().iterator(); itrRef.hasNext(); ) { + entry.getValue().iterator(); itrRef.hasNext(); ) { TopiaEntityRef ref = itrRef.next(); TopiaEntity refInvoker = ref.getInvoker(); if (refInvoker == null) { @@ -585,7 +585,7 @@ public class SynchronizeUIHandler extends AdminTabUIHandler { constant.getContract(); List<TopiaEntity> toReplicate = new ArrayList<TopiaEntity>(); for (Iterator<TopiaEntity> itr = - obsoleteEntities.iterator(); itr.hasNext(); ) { + obsoleteEntities.iterator(); itr.hasNext(); ) { TopiaEntity e = itr.next(); if (contractClass.isAssignableFrom(e.getClass())) { if (log.isDebugEnabled()) { diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/admin/validate/ValidateEntityListCellRenderer.java b/observe-swing/src/main/java/fr/ird/observe/ui/admin/validate/ValidateEntityListCellRenderer.java index f962adf..1b71b99 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/admin/validate/ValidateEntityListCellRenderer.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/admin/validate/ValidateEntityListCellRenderer.java @@ -83,7 +83,7 @@ public class ValidateEntityListCellRenderer extends DefaultListCellRenderer impl return; } for (Class<?> klass : model.getMessageTypes()) { - String type = t(decoratorService.getEntityLabel(klass)); + String type = t(DecoratorService.getEntityLabel(klass)); renderCache.put(klass, type); } } diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/admin/validate/ValidateUIHandler.java b/observe-swing/src/main/java/fr/ird/observe/ui/admin/validate/ValidateUIHandler.java index 8860e97..82005cb 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/admin/validate/ValidateUIHandler.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/admin/validate/ValidateUIHandler.java @@ -375,7 +375,7 @@ public class ValidateUIHandler extends AdminTabUIHandler { // des validateurs ont été trouvés for (SimpleBeanValidator<?> v : validators.values()) { - String label = t(decoratorService.getEntityLabel(v.getType())); + String label = t(DecoratorService.getEntityLabel(v.getType())); sendMessage(t("observe.message.validation.detected", label)); } } else { @@ -447,8 +447,6 @@ public class ValidateUIHandler extends AdminTabUIHandler { TopiaContext ctxt, DataSelectionModel dataModel) throws DataSourceException, TopiaException { - DecoratorService decoratorService = getDecoratorService(); - DataService dataService = getDataService(); Set<Class<?>> classes = dataModel.getSelectedReferentiel(); @@ -456,7 +454,7 @@ public class ValidateUIHandler extends AdminTabUIHandler { // on recupere la liste des ids a valider Class<? extends TopiaEntity> refClass = (Class<? extends TopiaEntity>) klass; List<String> ids = dataService.getEntityIds(source, refClass); - String entityLabel = t(decoratorService.getEntityLabel(klass)); + String entityLabel = t(DecoratorService.getEntityLabel(klass)); sendMessage(t("observe.message.validation.start.referentiel", entityLabel, ids.size())); for (String id : ids) { TopiaEntity e = ctxt.findByTopiaId(id); diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ContentUIHandler.java b/observe-swing/src/main/java/fr/ird/observe/ui/content/ContentUIHandler.java index fa20409..6f5f3e3 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/content/ContentUIHandler.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/content/ContentUIHandler.java @@ -686,7 +686,7 @@ public abstract class ContentUIHandler<E extends TopiaEntity> { } protected String getEntityLabel(Class<?> klass) { - String result = getDecoratorService().getEntityLabel(klass); + String result = DecoratorService.getEntityLabel(klass); return result; } @@ -822,7 +822,7 @@ public abstract class ContentUIHandler<E extends TopiaEntity> { public String updateTitle(String title) { if (ContentReferenceUIHandler.class.isAssignableFrom(getClass())) { - return getDecoratorService().getEntityLabel(getBeanType()); + return DecoratorService.getEntityLabel(getBeanType()); } return title; } diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/ContentReferenceUIHandler.java b/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/ContentReferenceUIHandler.java index 7ceafc0..d0a9398 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/ContentReferenceUIHandler.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/content/ref/ContentReferenceUIHandler.java @@ -133,7 +133,7 @@ public class ContentReferenceUIHandler<E extends ReferenceEntity> extends Conten DecoratorService service = ObserveContext.get().getDecoratorService(); Decorator<?> decorator = service.getDecoratorByType(entity.getClass()); - String type = service.getEntityLabel(entity.getClass()); + String type = DecoratorService.getEntityLabel(entity.getClass()); type = t(type); String message = t("observe.message.show.usage.for.delete", type, @@ -160,7 +160,7 @@ public class ContentReferenceUIHandler<E extends ReferenceEntity> extends Conten DecoratorService service = ObserveContext.get().getDecoratorService(); Decorator<?> decorator = service.getDecoratorByType(entity.getClass()); - String type = service.getEntityLabel(entity.getClass()); + String type = DecoratorService.getEntityLabel(entity.getClass()); type = t(type); String message = t("observe.message.show.usage.for.desactivated", type, decorator.toString(entity)); String message2 = t("observe.message.show.usage.for.desactivated2"); @@ -308,7 +308,7 @@ public class ContentReferenceUIHandler<E extends ReferenceEntity> extends Conten JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED); String title = t("observe.title.unique.key", - t(dService.getEntityLabel(beanType))); + t(DecoratorService.getEntityLabel(beanType))); pane.setBorder(new TitledBorder(title)); @@ -345,7 +345,7 @@ public class ContentReferenceUIHandler<E extends ReferenceEntity> extends Conten } DecoratorService dService = ObserveContext.get().getDecoratorService(); Decorator<?> decorator = dService.getDecoratorByType(bean.getClass()); - String type = dService.getEntityLabel(bean.getClass()); + String type = DecoratorService.getEntityLabel(bean.getClass()); type = t(type); String message = t("observe.message.show.usages", type, decorator.toString(bean)); diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/tree/AbstractObserveTreeCellRenderer.java b/observe-swing/src/main/java/fr/ird/observe/ui/tree/AbstractObserveTreeCellRenderer.java index a882acb..0b151ef 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/tree/AbstractObserveTreeCellRenderer.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/tree/AbstractObserveTreeCellRenderer.java @@ -258,7 +258,7 @@ public abstract class AbstractObserveTreeCellRenderer extends AbstractNavTreeCel if (node.isReferentielNode()) { - text = t(getDecoratorService().getEntityLabel(beanType)); + text = t(DecoratorService.getEntityLabel(ObserveTreeHelper.TREE_NODE_PREFIX, beanType)); return text; } diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/tree/NavigationTreeCellRenderer.java b/observe-swing/src/main/java/fr/ird/observe/ui/tree/NavigationTreeCellRenderer.java index cd67a44..69a630e 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/tree/NavigationTreeCellRenderer.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/tree/NavigationTreeCellRenderer.java @@ -35,6 +35,8 @@ import java.awt.Component; */ public class NavigationTreeCellRenderer extends AbstractObserveTreeCellRenderer { + private static final long serialVersionUID = 1L; + public NavigationTreeCellRenderer() { } diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/usage/UsagesUIHandler.java b/observe-swing/src/main/java/fr/ird/observe/ui/usage/UsagesUIHandler.java index 2f8217c..7b01271 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/usage/UsagesUIHandler.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/usage/UsagesUIHandler.java @@ -80,13 +80,11 @@ public class UsagesUIHandler { t("observe.message.no.usage.for.entity"))); } else { - DecoratorService dService = - ObserveContext.get().getDecoratorService(); for (Map.Entry<Class<? extends TopiaEntity>, List<? extends TopiaEntity>> entry : usages.entrySet()) { Class<? extends TopiaEntity> type = entry.getKey(); List<? extends TopiaEntity> entitites = entry.getValue(); - String typeTitle = dService.getEntityLabel(type); + String typeTitle = DecoratorService.getEntityLabel(type); typeTitle = t(typeTitle); addUsages(ui, type, entitites, typeTitle); } diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/util/ObserveSimpleValidatorMessageTableRenderer.java b/observe-swing/src/main/java/fr/ird/observe/ui/util/ObserveSimpleValidatorMessageTableRenderer.java index 934a5b5..002ee33 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/util/ObserveSimpleValidatorMessageTableRenderer.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/util/ObserveSimpleValidatorMessageTableRenderer.java @@ -58,7 +58,7 @@ public class ObserveSimpleValidatorMessageTableRenderer extends SimpleBeanValida String fieldName = super.getFieldName(table, value, row); DecoratorService dService = getDecoratorService(); if (!dService.getPropertyMatch(fieldName).matches()) { - fieldName = dService.getPropertyLabel(fieldName); + fieldName = DecoratorService.getPropertyLabel(fieldName); } return t(fieldName); } diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/util/ObserveValidatorMessageTableRenderer.java b/observe-swing/src/main/java/fr/ird/observe/ui/util/ObserveValidatorMessageTableRenderer.java index ff2770f..c1d18af 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/util/ObserveValidatorMessageTableRenderer.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/util/ObserveValidatorMessageTableRenderer.java @@ -80,7 +80,7 @@ public class ObserveValidatorMessageTableRenderer extends SwingValidatorMessageT DecoratorService dService = getDecoratorService(); if (!dService.getPropertyMatch(fieldName).matches()) { - fieldName = dService.getPropertyLabel(fieldName); + fieldName = DecoratorService.getPropertyLabel(fieldName); } fieldName = t(fieldName); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/6855 in repository observe. See http://git.codelutin.com/observe.git commit 1847c06a85add11eb5a305cd046d0bd59a4ca5bf Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Apr 6 19:14:00 2015 +0200 utilisation de clefs i18n specifiques pour les noeuds de l'arbre de navigation --- .../fr/ird/observe/ui/tree/ObserveTreeBridge.java | 2 +- .../fr/ird/observe/ui/tree/ObserveTreeHelper.java | 31 +++++- .../loadors/ActivityLonglineNodeChildLoador.java | 19 ++-- .../tree/loadors/ActivitySeineNodeChildLoador.java | 12 +-- .../loadors/FloatingObjectNodeChildLoador.java | 18 ++-- .../loadors/ProgramLonglineNodeChildLoador.java | 13 ++- .../tree/loadors/ProgramSeineNodeChildLoador.java | 43 +++++--- .../loadors/ReferenceCommonNodeChildLoador.java | 28 ++++- .../loadors/ReferenceLonglineNodeChildLoador.java | 36 ++++++- .../loadors/ReferenceSeineNodeChildLoador.java | 28 ++++- .../ui/tree/loadors/RootNodeChildLoador.java | 6 +- .../ui/tree/loadors/RoutesNodeChildLoador.java | 13 +-- .../tree/loadors/SetLonglineNodeChildLoador.java | 24 ++--- .../ui/tree/loadors/SetSeineNodeChildLoador.java | 22 ++-- .../resources/i18n/observe-swing_en_GB.properties | 115 +++++++++++++++----- .../resources/i18n/observe-swing_es_ES.properties | 118 ++++++++++++++++----- .../resources/i18n/observe-swing_fr_FR.properties | 116 +++++++++++++++----- 17 files changed, 469 insertions(+), 175 deletions(-) diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/tree/ObserveTreeBridge.java b/observe-swing/src/main/java/fr/ird/observe/ui/tree/ObserveTreeBridge.java index 6d44d03..36257a6 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/tree/ObserveTreeBridge.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/tree/ObserveTreeBridge.java @@ -83,7 +83,7 @@ public class ObserveTreeBridge extends NavTreeBridge<ObserveNode> { String nodeId = node.getId(); ObserveNode containerNode; - if (nodeId.startsWith("observe.common.")) { + if (nodeId.startsWith(ObserveTreeHelper.TREE_NODE_PREFIX)) { containerNode = node.getParent(); } else { containerNode = node; diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/tree/ObserveTreeHelper.java b/observe-swing/src/main/java/fr/ird/observe/ui/tree/ObserveTreeHelper.java index 961ccfa..0c7b126 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/tree/ObserveTreeHelper.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/tree/ObserveTreeHelper.java @@ -22,10 +22,10 @@ package fr.ird.observe.ui.tree; import com.google.common.base.Preconditions; +import fr.ird.observe.DataService; import fr.ird.observe.DecoratorService; import fr.ird.observe.ObserveContext; import fr.ird.observe.db.DataContext; -import fr.ird.observe.DataService; import fr.ird.observe.db.DataSource; import fr.ird.observe.db.model.DataSelectionModel; import fr.ird.observe.entities.OpenableEntity; @@ -40,6 +40,7 @@ import fr.ird.observe.entities.seine.Route; import fr.ird.observe.entities.seine.SetSeine; import fr.ird.observe.entities.seine.TripSeine; import fr.ird.observe.ui.ObserveMainUI; +import fr.ird.observe.ui.tree.loadors.AbstractNodeChildLoador; import fr.ird.observe.ui.tree.loadors.ActivityLonglineNodeChildLoador; import fr.ird.observe.ui.tree.loadors.ActivityLonglinesNodeChildLoador; import fr.ird.observe.ui.tree.loadors.ActivitySeineNodeChildLoador; @@ -75,6 +76,8 @@ import static org.nuiton.i18n.I18n.n; */ public class ObserveTreeHelper extends NavTreeHelper<ObserveNode> { + public static final String TREE_NODE_PREFIX = "observe.tree."; + /** Logger. */ static private final Log log = LogFactory.getLog(ObserveTreeHelper.class); @@ -87,6 +90,27 @@ public class ObserveTreeHelper extends NavTreeHelper<ObserveNode> { super(new ObserveTreeBridge()); } + public static ObserveNode createStringNode(String context) { + + ObserveNode result = createStringNode(context, null); + return result; + + } + + public static <L extends AbstractNodeChildLoador> ObserveNode createStringNode(String context, Class<L> loadorType) { + + L childLoador = loadorType == null ? null : ObserveTreeHelper.getChildLoador(loadorType); + + String propertyLabel = DecoratorService.getPropertyLabel(TREE_NODE_PREFIX, context); + ObserveNode result = new ObserveNode(String.class, + propertyLabel, + context, + childLoador, + false); + return result; + + } + protected DataService getDataService() { if (dataService == null) { dataService = ObserveContext.get().getDataService(); @@ -349,8 +373,7 @@ public class ObserveTreeHelper extends NavTreeHelper<ObserveNode> { public ObserveNode addUnsavedNode(ObserveNode parentNode, Class<?> type) { // noeud en mode creation - DecoratorService decorator = getDataService().getDecoratorService(); - String label = decorator.getEntityLabel(type) + ".unsaved"; + String label = DecoratorService.getEntityLabel(TREE_NODE_PREFIX, type) + ".unsaved"; ObserveNode result = new ObserveNode(type, null, label, null, false); insertNode(parentNode, result); @@ -381,7 +404,7 @@ public class ObserveTreeHelper extends NavTreeHelper<ObserveNode> { return addRoute(parentNode, (Route) bean); } else if (bean instanceof ActivitySeine) { return addActivity(parentNode, (ActivitySeine) bean); - }else if (bean instanceof ActivityLongline) { + } else if (bean instanceof ActivityLongline) { return addActivity(parentNode, (ActivityLongline) bean); } throw new IllegalStateException("Can not come here!"); diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivityLonglineNodeChildLoador.java b/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivityLonglineNodeChildLoador.java index 4a727ea..9029597 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivityLonglineNodeChildLoador.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivityLonglineNodeChildLoador.java @@ -47,6 +47,11 @@ public class ActivityLonglineNodeChildLoador extends AbstractNodeChildLoador<Str private static final long serialVersionUID = 1L; + static { + n("observe.tree.encounter"); + n("observe.tree.sensorUsed"); + } + public ActivityLonglineNodeChildLoador() { super(String.class); } @@ -96,22 +101,12 @@ public class ActivityLonglineNodeChildLoador extends AbstractNodeChildLoador<Str return result; } - static { - n("observe.common.encounter"); - n("observe.common.sensorUsed"); - } - @Override public ObserveNode createNode(String data, NavDataProvider dataProvider) { - ObserveNode result = new ObserveNode( - getBeanType(), - getDecoratorService().getPropertyLabel(data), - data, - null, - false - ); + ObserveNode result = ObserveTreeHelper.createStringNode(data); return result; + } public ObserveNode createSetNode(SetLongline data) { diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivitySeineNodeChildLoador.java b/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivitySeineNodeChildLoador.java index b17d351..7c17abc 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivitySeineNodeChildLoador.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivitySeineNodeChildLoador.java @@ -43,6 +43,10 @@ public class ActivitySeineNodeChildLoador extends AbstractAssociationNodeChildLo private static final long serialVersionUID = 1L; + static { + n("observe.common.observedSystem"); + } + public ActivitySeineNodeChildLoador() { super(FloatingObject.class, ActivitySeine.PROPERTY_FLOATING_OBJECT); } @@ -60,13 +64,7 @@ public class ActivitySeineNodeChildLoador extends AbstractAssociationNodeChildLo } // Creation d'un node systeme observe - ObserveNode child = new ObserveNode( - String.class, - n("observe.common.observedSystem"), - ActivitySeine.PROPERTY_OBSERVED_SYSTEM, - null, - false - ); + ObserveNode child = ObserveTreeHelper.createStringNode(ActivitySeine.PROPERTY_OBSERVED_SYSTEM); parentNode.add(child); diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/FloatingObjectNodeChildLoador.java b/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/FloatingObjectNodeChildLoador.java index 7a7daf8..754c001 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/FloatingObjectNodeChildLoador.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/FloatingObjectNodeChildLoador.java @@ -24,11 +24,14 @@ package fr.ird.observe.ui.tree.loadors; import fr.ird.observe.db.DataSourceException; import fr.ird.observe.entities.seine.FloatingObject; import fr.ird.observe.ui.tree.ObserveNode; +import fr.ird.observe.ui.tree.ObserveTreeHelper; import jaxx.runtime.swing.nav.NavDataProvider; import java.util.ArrayList; import java.util.List; +import static org.nuiton.i18n.I18n.n; + /** * Le chargeur des noeuds de marees. * @@ -43,6 +46,12 @@ public class FloatingObjectNodeChildLoador extends AbstractNodeChildLoador<Strin super(String.class); } + static { + n("observe.tree.objectOperation"); + n("observe.tree.objectSchoolEstimate"); + n("observe.tree.objectObservedSpecies"); + } + @Override public List<String> getData(Class<?> parentClass, String parentId, @@ -58,13 +67,8 @@ public class FloatingObjectNodeChildLoador extends AbstractNodeChildLoador<Strin @Override public ObserveNode createNode(String data, NavDataProvider dataProvider) { - ObserveNode result = new ObserveNode( - getBeanType(), - getDecoratorService().getPropertyLabel(data), - data, - null, - false - ); + ObserveNode result = ObserveTreeHelper.createStringNode(data); return result; } + } diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ProgramLonglineNodeChildLoador.java b/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ProgramLonglineNodeChildLoador.java index 365dd91..b76637a 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ProgramLonglineNodeChildLoador.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ProgramLonglineNodeChildLoador.java @@ -47,6 +47,10 @@ public class ProgramLonglineNodeChildLoador extends AbstractNodeChildLoador<Trip private static final long serialVersionUID = 1L; + static { + n("observe.tree.activityLongline"); + } + public ProgramLonglineNodeChildLoador() { super(TripLongline.class); } @@ -116,13 +120,8 @@ public class ProgramLonglineNodeChildLoador extends AbstractNodeChildLoador<Trip if (addActivities) { - ObserveNode child = new ObserveNode( - String.class, - n("observe.common.activities"), - TripLongline.PROPERTY_ACTIVITY_LONGLINE, - ObserveTreeHelper.getChildLoador(ActivityLonglinesNodeChildLoador.class), - false - ); + ObserveNode child = ObserveTreeHelper.createStringNode( + TripLongline.PROPERTY_ACTIVITY_LONGLINE, ActivityLonglinesNodeChildLoador.class); result.add(child); } diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ProgramSeineNodeChildLoador.java b/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ProgramSeineNodeChildLoador.java index c18c24f..4a23ead 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ProgramSeineNodeChildLoador.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ProgramSeineNodeChildLoador.java @@ -46,23 +46,28 @@ public class ProgramSeineNodeChildLoador extends AbstractNodeChildLoador<TripSei private static final long serialVersionUID = 1L; + static { + n("observe.tree.gearUseFeaturesSeine"); + n("observe.tree.route"); + } + public ProgramSeineNodeChildLoador() { super(TripSeine.class); } - protected boolean addRoutes; + protected boolean addChilds; @Override public void loadChilds(NavTreeBridge<ObserveNode> model, ObserveNode parentNode, NavDataProvider dataProvider) throws Exception { DataSelectionModel selectionModel = getSelectionModel(dataProvider); - addRoutes = selectionModel == null; + addChilds = selectionModel == null; try { super.loadChilds(model, parentNode, dataProvider); } finally { - addRoutes = true; + addChilds = true; } } @@ -79,10 +84,10 @@ public class ProgramSeineNodeChildLoador extends AbstractNodeChildLoador<TripSei if (selectionModel != null) { result = new ArrayList<TripSeine>(); - List<String> mareeIds = selectionModel.getDatas().get(parentId); - if (!CollectionUtils.isEmpty(mareeIds)) { - for (String mareeId : mareeIds) { - result.add((TripSeine) service.loadEntity(dataSource, mareeId, true)); + List<String> tripIds = selectionModel.getDatas().get(parentId); + if (!CollectionUtils.isEmpty(tripIds)) { + for (String tripId : tripIds) { + result.add((TripSeine) service.loadEntity(dataSource, tripId, true)); } } } else { @@ -105,16 +110,20 @@ public class ProgramSeineNodeChildLoador extends AbstractNodeChildLoador<TripSei null, false ); - if (addRoutes) { - - ObserveNode child = new ObserveNode( - String.class, - n("observe.common.routes"), - TripSeine.PROPERTY_ROUTE, - ObserveTreeHelper.getChildLoador(RoutesNodeChildLoador.class), - false - ); - result.add(child); + + if (addChilds) { + + { + // Add gears + ObserveNode child = ObserveTreeHelper.createStringNode(TripSeine.PROPERTY_GEAR_USE_FEATURES_SEINE); + result.add(child); + } + + { + // Add routes + ObserveNode child = ObserveTreeHelper.createStringNode(TripSeine.PROPERTY_ROUTE, RoutesNodeChildLoador.class); + result.add(child); + } } diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ReferenceCommonNodeChildLoador.java b/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ReferenceCommonNodeChildLoador.java index cb3ed11..1c704db 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ReferenceCommonNodeChildLoador.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ReferenceCommonNodeChildLoador.java @@ -31,6 +31,8 @@ import jaxx.runtime.swing.nav.NavDataProvider; import java.util.ArrayList; import java.util.List; +import static org.nuiton.i18n.I18n.n; + /** * Le chargeur des noeuds du referentiel. * @@ -41,6 +43,29 @@ public class ReferenceCommonNodeChildLoador extends AbstractNodeChildLoador<Clas private static final long serialVersionUID = 1L; + static { + + n("observe.tree.vesselSizeCategory"); + n("observe.tree.country"); + n("observe.tree.harbour"); + n("observe.tree.vesselType"); + n("observe.tree.vessel"); + n("observe.tree.speciesGroup"); + n("observe.tree.species"); + n("observe.tree.sex"); + n("observe.tree.fpaZone"); + n("observe.tree.speciesList"); + n("observe.tree.person"); + n("observe.tree.ocean"); + n("observe.tree.organism"); + n("observe.tree.lengthWeightParameter"); + n("observe.tree.program"); + n("observe.tree.gearCaracteristicType"); + n("observe.tree.gearCaracteristic"); + n("observe.tree.gear"); + + } + public ReferenceCommonNodeChildLoador() { super(Class.class); } @@ -51,8 +76,7 @@ public class ReferenceCommonNodeChildLoador extends AbstractNodeChildLoador<Clas NavDataProvider dataProvider) throws DataSourceException { List<Class> result = new ArrayList<Class>(); - for (ObserveEntityEnum anEnum : - Entities.REFERENCE_COMMON_ENTITIES_LIST) { + for (ObserveEntityEnum anEnum : Entities.REFERENCE_COMMON_ENTITIES_LIST) { result.add(anEnum.getContract()); } UIHelper.sortReferentiel(result); diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ReferenceLonglineNodeChildLoador.java b/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ReferenceLonglineNodeChildLoador.java index 4e8594f..8181f95 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ReferenceLonglineNodeChildLoador.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ReferenceLonglineNodeChildLoador.java @@ -21,9 +21,9 @@ */ package fr.ird.observe.ui.tree.loadors; -import fr.ird.observe.entities.Entities; import fr.ird.observe.ObserveEntityEnum; import fr.ird.observe.db.DataSourceException; +import fr.ird.observe.entities.Entities; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.tree.ObserveNode; import jaxx.runtime.swing.nav.NavDataProvider; @@ -31,6 +31,8 @@ import jaxx.runtime.swing.nav.NavDataProvider; import java.util.ArrayList; import java.util.List; +import static org.nuiton.i18n.I18n.n; + /** * Le chargeur des noeuds du referentiel. * @@ -41,6 +43,35 @@ public class ReferenceLonglineNodeChildLoador extends AbstractNodeChildLoador<Cl private static final long serialVersionUID = 1L; + static { + n("observe.tree.baitHaulingStatus"); + n("observe.tree.baitSettingStatus"); + n("observe.tree.baitType"); + n("observe.tree.catchFateLongline"); + n("observe.tree.encounterType"); + n("observe.tree.healthness"); + n("observe.tree.hookPosition"); + n("observe.tree.hookSize"); + n("observe.tree.hookType"); + n("observe.tree.itemVerticalPosition"); + n("observe.tree.itemHorizontalPosition"); + n("observe.tree.lightsticksColor"); + n("observe.tree.lightsticksType"); + n("observe.tree.lineType"); + n("observe.tree.maturityStatus"); + n("observe.tree.mitigationType"); + n("observe.tree.sensorBrand"); + n("observe.tree.sensorDataFormat"); + n("observe.tree.sensorType"); + n("observe.tree.settingShape"); + n("observe.tree.sizeMeasureType"); + n("observe.tree.stomacFullness"); + n("observe.tree.tripType"); + n("observe.tree.vesselActivityLongline"); + n("observe.tree.weightMeasureType"); + + } + public ReferenceLonglineNodeChildLoador() { super(Class.class); } @@ -51,8 +82,7 @@ public class ReferenceLonglineNodeChildLoador extends AbstractNodeChildLoador<Cl NavDataProvider dataProvider) throws DataSourceException { List<Class> result = new ArrayList<Class>(); - for (ObserveEntityEnum anEnum : - Entities.REFERENCE_LONGLINE_ENTITIES_LIST) { + for (ObserveEntityEnum anEnum : Entities.REFERENCE_LONGLINE_ENTITIES_LIST) { result.add(anEnum.getContract()); } UIHelper.sortReferentiel(result); diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ReferenceSeineNodeChildLoador.java b/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ReferenceSeineNodeChildLoador.java index fcd3250..3db8f30 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ReferenceSeineNodeChildLoador.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ReferenceSeineNodeChildLoador.java @@ -21,9 +21,9 @@ */ package fr.ird.observe.ui.tree.loadors; -import fr.ird.observe.entities.Entities; import fr.ird.observe.ObserveEntityEnum; import fr.ird.observe.db.DataSourceException; +import fr.ird.observe.entities.Entities; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.tree.ObserveNode; import jaxx.runtime.swing.nav.NavDataProvider; @@ -31,6 +31,8 @@ import jaxx.runtime.swing.nav.NavDataProvider; import java.util.ArrayList; import java.util.List; +import static org.nuiton.i18n.I18n.n; + /** * Le chargeur des noeuds du referentiel. * @@ -41,6 +43,27 @@ public class ReferenceSeineNodeChildLoador extends AbstractNodeChildLoador<Class private static final long serialVersionUID = 1L; + static { + + n("observe.tree.vesselActivitySeine"); + n("observe.tree.surroundingActivity"); + n("observe.tree.reasonForNullSet"); + n("observe.tree.reasonForNoFishing"); + n("observe.tree.speciesFate"); + n("observe.tree.objectFate"); + n("observe.tree.weightCategory"); + n("observe.tree.detectionMode"); + n("observe.tree.transmittingBuoyOperation"); + n("observe.tree.objectOperation"); + n("observe.tree.reasonForDiscard"); + n("observe.tree.speciesStatus"); + n("observe.tree.observedSystem"); + n("observe.tree.transmittingBuoyType"); + n("observe.tree.objectType"); + n("observe.tree.wind"); + + } + public ReferenceSeineNodeChildLoador() { super(Class.class); } @@ -51,8 +74,7 @@ public class ReferenceSeineNodeChildLoador extends AbstractNodeChildLoador<Class NavDataProvider dataProvider) throws DataSourceException { List<Class> result = new ArrayList<Class>(); - for (ObserveEntityEnum anEnum : - Entities.REFERENCE_SEINE_ENTITIES_LIST) { + for (ObserveEntityEnum anEnum : Entities.REFERENCE_SEINE_ENTITIES_LIST) { result.add(anEnum.getContract()); } UIHelper.sortReferentiel(result); diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/RootNodeChildLoador.java b/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/RootNodeChildLoador.java index f03db1e..bcf28d7 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/RootNodeChildLoador.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/RootNodeChildLoador.java @@ -106,7 +106,7 @@ public class RootNodeChildLoador extends AbstractNodeChildLoador<Program> { { // ajout du referentiel commun ObserveNode child = new ObserveNode( String.class, - n("observe.common.reference.common"), + n("observe.tree.reference.common"), ObserveTreeHelper.getChildLoador(ReferenceCommonNodeChildLoador.class), true ); @@ -115,7 +115,7 @@ public class RootNodeChildLoador extends AbstractNodeChildLoador<Program> { { // ajout du referentiel seine ObserveNode child = new ObserveNode( String.class, - n("observe.common.reference.seine"), + n("observe.tree.reference.seine"), ObserveTreeHelper.getChildLoador(ReferenceSeineNodeChildLoador.class), true ); @@ -124,7 +124,7 @@ public class RootNodeChildLoador extends AbstractNodeChildLoador<Program> { { // ajout du referentiel longline ObserveNode child = new ObserveNode( String.class, - n("observe.common.reference.longline"), + n("observe.tree.reference.longline"), ObserveTreeHelper.getChildLoador(ReferenceLonglineNodeChildLoador.class), true ); diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/RoutesNodeChildLoador.java b/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/RoutesNodeChildLoador.java index 6204d24..b96e7af 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/RoutesNodeChildLoador.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/RoutesNodeChildLoador.java @@ -42,6 +42,9 @@ public class RoutesNodeChildLoador extends AbstractAssociationNodeChildLoador<Ro private static final long serialVersionUID = 1L; + static { + n("observe.tree.activitySeine"); + } public RoutesNodeChildLoador() { super(Route.class, TripSeine.PROPERTY_ROUTE); } @@ -70,14 +73,8 @@ public class RoutesNodeChildLoador extends AbstractAssociationNodeChildLoador<Ro false ); - // Creation d'un node activitys - ObserveNode child = new ObserveNode( - String.class, - n("observe.common.activities"), - Route.PROPERTY_ACTIVITY_SEINE, - ObserveTreeHelper.getChildLoador(ActivitySeinesNodeChildLoador.class), - false - ); + // Creation d'un node activites + ObserveNode child = ObserveTreeHelper.createStringNode(Route.PROPERTY_ACTIVITY_SEINE, ActivitySeinesNodeChildLoador.class); result.add(child); return result; } diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/SetLonglineNodeChildLoador.java b/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/SetLonglineNodeChildLoador.java index 2607b59..a671699 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/SetLonglineNodeChildLoador.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/SetLonglineNodeChildLoador.java @@ -25,6 +25,7 @@ package fr.ird.observe.ui.tree.loadors; import fr.ird.observe.db.DataSourceException; import fr.ird.observe.entities.longline.SetLongline; import fr.ird.observe.ui.tree.ObserveNode; +import fr.ird.observe.ui.tree.ObserveTreeHelper; import jaxx.runtime.swing.nav.NavDataProvider; import java.util.ArrayList; @@ -42,6 +43,13 @@ public class SetLonglineNodeChildLoador extends AbstractNodeChildLoador<String> private static final long serialVersionUID = 1L; + static { + n("observe.tree.longlineGlobalComposition"); + n("observe.tree.longlineDetailComposition"); + n("observe.tree.catchLongline"); + n("observe.tree.tdr"); + } + public SetLonglineNodeChildLoador() { super(String.class); } @@ -59,23 +67,13 @@ public class SetLonglineNodeChildLoador extends AbstractNodeChildLoador<String> return result; } - { - n("observe.common.longlineGlobalComposition"); - n("observe.common.longlineDetailComposition"); - n("observe.common.catchLongline"); - n("observe.common.tdr"); - } + @Override public ObserveNode createNode(String data, NavDataProvider dataProvider) { - ObserveNode result = new ObserveNode( - getBeanType(), - getDecoratorService().getPropertyLabel(data), - data, - null, - false - ); + ObserveNode result = ObserveTreeHelper.createStringNode(data); return result; + } } diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/SetSeineNodeChildLoador.java b/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/SetSeineNodeChildLoador.java index b41cae7..3fc38e5 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/SetSeineNodeChildLoador.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/SetSeineNodeChildLoador.java @@ -24,11 +24,14 @@ package fr.ird.observe.ui.tree.loadors; import fr.ird.observe.db.DataSourceException; import fr.ird.observe.entities.seine.SetSeine; import fr.ird.observe.ui.tree.ObserveNode; +import fr.ird.observe.ui.tree.ObserveTreeHelper; import jaxx.runtime.swing.nav.NavDataProvider; import java.util.ArrayList; import java.util.List; +import static org.nuiton.i18n.I18n.n; + /** * Le chargeur des noeuds de marees. * @@ -39,6 +42,16 @@ public class SetSeineNodeChildLoador extends AbstractNodeChildLoador<String> { private static final long serialVersionUID = 1L; + static { + n("observe.tree.schoolEstimate"); + n("observe.tree.targetCatch"); + n("observe.tree.targetDiscarded"); + n("observe.tree.targetSample"); + n("observe.tree.targetSampleCapture"); + n("observe.tree.nonTargetCatch"); + n("observe.tree.nonTargetSample"); + } + public SetSeineNodeChildLoador() { super(String.class); } @@ -62,13 +75,8 @@ public class SetSeineNodeChildLoador extends AbstractNodeChildLoador<String> { @Override public ObserveNode createNode(String data, NavDataProvider dataProvider) { - ObserveNode result = new ObserveNode( - getBeanType(), - getDecoratorService().getPropertyLabel(data), - data, - null, - false - ); + ObserveNode result = ObserveTreeHelper.createStringNode(data); return result; + } } diff --git a/observe-swing/src/main/resources/i18n/observe-swing_en_GB.properties b/observe-swing/src/main/resources/i18n/observe-swing_en_GB.properties index faeabf7..3a979a0 100644 --- a/observe-swing/src/main/resources/i18n/observe-swing_en_GB.properties +++ b/observe-swing/src/main/resources/i18n/observe-swing_en_GB.properties @@ -713,8 +713,6 @@ observe.common.acquisitionMode.individu= observe.common.activities=Activities observe.common.activities.list=List of activities observe.common.activity=Activity -observe.common.activityLongline.unsaved=New activity -observe.common.activitySeine.unsaved=New activity observe.common.baitObservation= observe.common.birdsObservation=Birds observe.common.boolean.false= @@ -727,7 +725,6 @@ observe.common.capacity= observe.common.capacityLabel= observe.common.captain= observe.common.caracteristics= -observe.common.catchLongline= observe.common.catchWeight= observe.common.catchWeightComputed.computed.tip= observe.common.catchWeightComputed.observed.tip= @@ -755,7 +752,6 @@ observe.common.description= observe.common.detailledActivitiesObservation= observe.common.detectionMode= observe.common.directory= -observe.common.encounter= observe.common.endDate= observe.common.endLogValue= observe.common.equation= @@ -763,11 +759,8 @@ observe.common.ersId= observe.common.file= observe.common.firstName= observe.common.flagCountry= -observe.common.floatingObject.unsaved=New DCP observe.common.formsUrl= observe.common.gaugeLabel= -observe.common.gear=Gear -observe.common.gearCaracteristic=Gear caracteristic observe.common.gearType=Gear caracteristic type observe.common.generateReport= observe.common.global.progression.description= @@ -793,8 +786,6 @@ observe.common.length.observed.tip= observe.common.lengthMeasureType= observe.common.lengthWeightFormula= observe.common.libelles= -observe.common.longlineDetailComposition=Detailed composition -observe.common.longlineGlobalComposition=Global composition observe.common.lowerValueUpperValue= observe.common.mammalsObservation= observe.common.meanLength= @@ -845,13 +836,8 @@ observe.common.program.observation.value.7= observe.common.program.observation.value.8= observe.common.program.observation.value.9= observe.common.reasonForDiscard= -observe.common.reference.common= -observe.common.reference.longline= -observe.common.reference.seine= observe.common.reportsUrl= observe.common.resume= -observe.common.route.unsaved=New route -observe.common.routes=Routes observe.common.routes.list=List of routes observe.common.samplesObservation= observe.common.schoolEstimate= @@ -859,9 +845,6 @@ observe.common.schoolType= observe.common.scientificLabel= observe.common.seaSurfaceTemperature= observe.common.searchMaximum= -observe.common.seineBallastWeight= -observe.common.seineCircumference= -observe.common.seineDepth= observe.common.select.gps.import.file= observe.common.select.gps.import.file.tip= observe.common.select.gps.maxDelay= @@ -877,10 +860,6 @@ observe.common.select.validate.mode.tip= observe.common.select.validate.scope= observe.common.select.validate.scope.tip= observe.common.selected.validators= -observe.common.senne= -observe.common.sensorUsed=Sensor used -observe.common.setLongline.unsaved=New fishing operation -observe.common.setSeine.unsaved=New set observe.common.sex= observe.common.species=Species observe.common.speciesFate= @@ -905,7 +884,6 @@ observe.common.targetDiscarded= observe.common.targetDiscardsObservation= observe.common.targetSample= observe.common.targetSampleCapture= -observe.common.tdr= observe.common.topiaCreateDate= observe.common.topiaId= observe.common.topiaVersion= @@ -915,8 +893,6 @@ observe.common.totalCountComputed.observed.tip= observe.common.totalWeight= observe.common.transmittingBuoyOperation= observe.common.transmittingBuoyType= -observe.common.tripLongline.unsaved=New trip -observe.common.tripSeine.unsaved=New trip observe.common.trips.list=List of trips observe.common.typeTransmittingBuoyOperation= observe.common.undefined= @@ -1965,6 +1941,95 @@ observe.title.unique.key=Unique keys used in a referentiel observe.title.validate=Validate datas observe.title.validate.tip=Validate datas of a storage observe.title.welcome.admin=Observe Admin +observe.tree.activityLongline=Activity +observe.tree.activityLongline.unsaved=New activity +observe.tree.activitySeine=Activity +observe.tree.activitySeine.unsaved=New activity +observe.tree.baitHaulingStatus=Bait hauling status +observe.tree.baitSettingStatus=Bait setting status +observe.tree.baitType=Bait type +observe.tree.catchFateLongline=Catch fate +observe.tree.catchLongline=Catches +observe.tree.country=Country +observe.tree.detectionMode=Detection mode +observe.tree.encounter=Encounter +observe.tree.encounterType= +observe.tree.floatingObject.unsaved=New DCP +observe.tree.fpaZone=Fpa zone +observe.tree.gear=Gear +observe.tree.gearCaracteristic=Gear caracteristic +observe.tree.gearCaracteristicType=Gear caracteristic type +observe.tree.gearUseFeaturesSeine=GearUseFeaturesSeine +observe.tree.harbour=Harbour +observe.tree.healthness=Healthness +observe.tree.hookPosition=Hook position +observe.tree.hookSize=Hook size +observe.tree.hookType=Hook type +observe.tree.itemHorizontalPosition=Item horizontal position +observe.tree.itemVerticalPosition=Item vertical position +observe.tree.lengthWeightParameter=Length-weight relationship +observe.tree.lightsticksColor=Lightsticks color +observe.tree.lightsticksType=Lightsticks type +observe.tree.lineType=Line type +observe.tree.longlineDetailComposition=Detailed composition +observe.tree.longlineGlobalComposition=Global composition +observe.tree.maturityStatus=Maturity status +observe.tree.mitigationType=Mitigation type +observe.tree.nonTargetCatch=Non target catch +observe.tree.nonTargetSample=Non target sample +observe.tree.objectFate=ObjectFate +observe.tree.objectObservedSpecies=Object observed species +observe.tree.objectOperation=Object operation +observe.tree.objectSchoolEstimate=Object school estimate +observe.tree.objectType=Object type +observe.tree.observedSystem=Observed system +observe.tree.ocean=Ocean +observe.tree.organism=Organisme +observe.tree.person=Person +observe.tree.program=Program +observe.tree.reasonForDiscard=Reason for discard +observe.tree.reasonForNoFishing=Reason for no fishing +observe.tree.reasonForNullSet=Reason for null set +observe.tree.reference.common=Common Referential +observe.tree.reference.longline=Longline Referential +observe.tree.reference.seine=Seine Referential +observe.tree.route=Road +observe.tree.route.unsaved=New route +observe.tree.schoolEstimate=School estimate +observe.tree.sensorBrand=Sensor brand +observe.tree.sensorDataFormat=Sensor data format +observe.tree.sensorType=Sensor type +observe.tree.sensorUsed=Sensor used +observe.tree.setLongline.unsaved=New fishing operation +observe.tree.setSeine.unsaved=New set +observe.tree.settingShape=Setting shape +observe.tree.sex=Sex +observe.tree.sizeMeasureType=Size measure type +observe.tree.species=Species +observe.tree.speciesFate=Species fate +observe.tree.speciesGroup=Species group +observe.tree.speciesList=Species list +observe.tree.speciesStatus=Species status +observe.tree.stomacFullness=Stomac fullness +observe.tree.surroundingActivity=Surrounding activity +observe.tree.targetCatch=Target catch +observe.tree.targetDiscarded=Target discarded +observe.tree.targetSample=Target sample +observe.tree.targetSampleCapture=Target sample capture +observe.tree.tdr=TDR +observe.tree.transmittingBuoyOperation=Transmitting buoy operation +observe.tree.transmittingBuoyType=Transmitting buoy type +observe.tree.tripLongline.unsaved=New trip +observe.tree.tripSeine.unsaved=New trip +observe.tree.tripType=Trip type +observe.tree.vessel=Boat +observe.tree.vesselActivityLongline=Boat activity +observe.tree.vesselActivitySeine=Boat Activity +observe.tree.vesselSizeCategory=Boat size category +observe.tree.vesselType=Boat type +observe.tree.weightCategory=Weight category +observe.tree.weightMeasureType=Weight measure type +observe.tree.wind=Wind observe.tripLongline.captain=Capitain observe.tripLongline.dataEntryOperator=Data entry operator observe.tripLongline.endDate=End date @@ -1988,8 +2053,6 @@ observe.tripSeine.message.creating=Creating a trip observe.tripSeine.message.no.active.found=No opened trip found, you can create a new one or open an existing one. observe.tripSeine.message.not.open=Current trip is not opened, no edit possible. observe.tripSeine.message.updating=Updating a trip -observe.tripSeine.tab.caracteristics=Other caracteristics -observe.tripSeine.tab.general=General caracteristics observe.tripSeine.title=Trip observe.validation.report.contextName= observe.validation.report.entities.with.messages= diff --git a/observe-swing/src/main/resources/i18n/observe-swing_es_ES.properties b/observe-swing/src/main/resources/i18n/observe-swing_es_ES.properties index a47492c..574d445 100644 --- a/observe-swing/src/main/resources/i18n/observe-swing_es_ES.properties +++ b/observe-swing/src/main/resources/i18n/observe-swing_es_ES.properties @@ -1,4 +1,3 @@ -observe.GearUseFeaturesSeine.usedInTrip= observe.about.message=<h3>ObServe</h3><a href\="http\://www.ird.fr/informatique-scientifique/projets/observe/">Système d'Information, d'Observation et de Suivi des pêches thonières tropicales de surface.</a><hr/><p>Aplicación de adquisición Application de datos de observadores y de consulta de estos datos desde una base <i>Obstuna</i>.</p> <p>Este projecto se ha iniciado en 2009 por la unidad US 007-OSIRIS del <a href\="http\://www.ird.fr">IRD</a> dentro del marco de <a href\="http\://ww [...] observe.about.translate.content=<h2>Comment traduire ObServe</h2>Vous pouvez nous aider à traduire l'application.<hr/><br/><ul><li>Récupérer le fichier <a href\="%s">observe-i18n.csv</a> dans le répertoire <strong>i18n</strong></li><li>ouvrez le avec un tableur avec les options suivantes \: <ul><li>caractère séparateur \: <strong><i>|</i></strong></li><li>encoding <strong><i>UTF-8</i></strong></li><li>texte encapsulé par des <strong><i>"</i></strong></li></ul></li><li>Traduisez, Améliore [...] observe.about.translate.title=Traducir ObServe @@ -714,8 +713,6 @@ observe.common.acquisitionMode.individu=Entrada por individuo observe.common.activities=Actividades observe.common.activities.list= observe.common.activity=Actividad -observe.common.activityLongline.unsaved= -observe.common.activitySeine.unsaved= observe.common.baitObservation=Carnada observe.common.birdsObservation=Pájaros observe.common.boolean.false=No @@ -728,7 +725,6 @@ observe.common.capacity=Capacidad de transporte observe.common.capacityLabel=Texto capacidad observe.common.captain= observe.common.caracteristics=Características -observe.common.catchLongline= observe.common.catchWeight=Peso estimado (en t) observe.common.catchWeightComputed.computed.tip=Peso estimado calculado observe.common.catchWeightComputed.observed.tip=Peso estimado observado @@ -756,7 +752,6 @@ observe.common.description=Descripción observe.common.detailledActivitiesObservation=Actividades detalladas observe.common.detectionMode=Modo de detección observe.common.directory=Carpeta -observe.common.encounter= observe.common.endDate=Fecha de fin observe.common.endLogValue=Corredera de tarde (millas) observe.common.equation=Relación talla-peso @@ -764,10 +759,8 @@ observe.common.ersId=Id ERS observe.common.file=Archivo observe.common.firstName=Número observe.common.flagCountry=Badera -observe.common.floatingObject.unsaved=Nuevo DCP observe.common.formsUrl=URL de los formularios observe.common.gaugeLabel=Texto «Capacidad» -observe.common.gearCaracteristic= observe.common.gearType= observe.common.generateReport=Generar un informe de validación observe.common.global.progression.description=Progresión global @@ -793,8 +786,6 @@ observe.common.length.observed.tip=Longitud observada observe.common.lengthMeasureType=Tipo de medida observe.common.lengthWeightFormula=Relación de peso observe.common.libelles=Textos -observe.common.longlineDetailComposition= -observe.common.longlineGlobalComposition= observe.common.lowerValueUpperValue= observe.common.mammalsObservation=Mamiferos observe.common.meanLength=Talla media (en cm) @@ -845,13 +836,8 @@ observe.common.program.observation.value.7=valor 7 no definido observe.common.program.observation.value.8=valor 8 no definido observe.common.program.observation.value.9=valor 9 no definido observe.common.reasonForDiscard=Razon de descarte -observe.common.reference.common= -observe.common.reference.longline= -observe.common.reference.seine= observe.common.reportsUrl=URL del informe observe.common.resume=Resumen de la configuración -observe.common.route.unsaved=Nueva ruta -observe.common.routes=Rutas observe.common.routes.list=Lista de rutas observe.common.samplesObservation=Medidas observe.common.schoolEstimate=Estimación del banco @@ -859,9 +845,6 @@ observe.common.schoolType=Tipo de banco observe.common.scientificLabel=Texto científico observe.common.seaSurfaceTemperature=Temperatura en superficie (°) observe.common.searchMaximum=Velocidad máxima de prospección -observe.common.seineBallastWeight=Lastre (en Kg) -observe.common.seineCircumference=Circunferencia (en m) -observe.common.seineDepth=Profundidad (en m) observe.common.select.gps.import.file=Importar archivo observe.common.select.gps.import.file.tip=Elegir el archivo de trace GPS a importar observe.common.select.gps.maxDelay=Tiempos máximos (mn) @@ -877,10 +860,6 @@ observe.common.select.validate.mode.tip=Elegir el tipo de datos a validar observe.common.select.validate.scope=Nivel de validación observe.common.select.validate.scope.tip=Elegir el o los niveles de validación observe.common.selected.validators=Número de validadores detectados \: %1$s -observe.common.senne=Cerco -observe.common.sensorUsed= -observe.common.setLongline.unsaved=Nuevo Lance -observe.common.setSeine.unsaved=Nuevo Lance observe.common.sex=Sexo observe.common.species=Especie observe.common.speciesFate=Devenir de fauna @@ -905,7 +884,6 @@ observe.common.targetDiscarded=Descarte de atún observe.common.targetDiscardsObservation=Descartes de atún observe.common.targetSample=Muestreo atún descartado observe.common.targetSampleCapture=Muestreo atún capturado -observe.common.tdr= observe.common.topiaCreateDate=Fecha de creación observe.common.topiaId=Técnicas de identificación observe.common.topiaVersion=Versión @@ -915,8 +893,6 @@ observe.common.totalCountComputed.observed.tip=El número estimado se observo observe.common.totalWeight= observe.common.transmittingBuoyOperation= observe.common.transmittingBuoyType= -observe.common.tripLongline.unsaved=Nueva marea -observe.common.tripSeine.unsaved=Nueva marea observe.common.trips.list=Lista de mareas observe.common.typeTransmittingBuoyOperation=Tipo de operación sobre baliza observe.common.undefined=- @@ -1060,14 +1036,11 @@ observe.gear.tab.general= observe.gear.unit= observe.gearUseFeaturesSeine.comment= observe.gearUseFeaturesSeine.gear= -observe.gearUseFeaturesSeine.gearCaracteristic= observe.gearUseFeaturesSeine.number= observe.gearUseFeaturesSeine.table.comment= observe.gearUseFeaturesSeine.table.comment.tip= observe.gearUseFeaturesSeine.table.gear= observe.gearUseFeaturesSeine.table.gear.tip= -observe.gearUseFeaturesSeine.table.gearCaracteristic= -observe.gearUseFeaturesSeine.table.gearCaracteristic.tip= observe.gearUseFeaturesSeine.table.number= observe.gearUseFeaturesSeine.table.number.tip= observe.gearUseFeaturesSeine.table.usedInTrip= @@ -1968,6 +1941,95 @@ observe.title.unique.key= observe.title.validate= observe.title.validate.tip= observe.title.welcome.admin= +observe.tree.activityLongline=Actividad +observe.tree.activityLongline.unsaved= +observe.tree.activitySeine=Actividad +observe.tree.activitySeine.unsaved= +observe.tree.baitHaulingStatus= +observe.tree.baitSettingStatus= +observe.tree.baitType= +observe.tree.catchFateLongline= +observe.tree.catchLongline= +observe.tree.country=País +observe.tree.detectionMode=Modo de detección +observe.tree.encounter= +observe.tree.encounterType= +observe.tree.floatingObject.unsaved=Nuevo DCP +observe.tree.fpaZone= +observe.tree.gear= +observe.tree.gearCaracteristic= +observe.tree.gearCaracteristicType= +observe.tree.gearUseFeaturesSeine= +observe.tree.harbour=Puerto +observe.tree.healthness= +observe.tree.hookPosition= +observe.tree.hookSize= +observe.tree.hookType= +observe.tree.itemHorizontalPosition= +observe.tree.itemVerticalPosition= +observe.tree.lengthWeightParameter= +observe.tree.lightsticksColor= +observe.tree.lightsticksType= +observe.tree.lineType= +observe.tree.longlineDetailComposition= +observe.tree.longlineGlobalComposition= +observe.tree.maturityStatus= +observe.tree.mitigationType= +observe.tree.nonTargetCatch=Fauna asociada conservada o descartada +observe.tree.nonTargetSample=Muestreo fauna asociada +observe.tree.objectFate=Devenir de objeto +observe.tree.objectObservedSpecies= +observe.tree.objectOperation=Operación sobre la baliza +observe.tree.objectSchoolEstimate= +observe.tree.objectType=Tipo de objeto +observe.tree.observedSystem=Sistema observado +observe.tree.ocean=Océano +observe.tree.organism=Organismo +observe.tree.person=Observador +observe.tree.program=Programa +observe.tree.reasonForDiscard=Razon de descarte +observe.tree.reasonForNoFishing=Razón de no lance de Cerco +observe.tree.reasonForNullSet=Causa de lance nulo +observe.tree.reference.common= +observe.tree.reference.longline= +observe.tree.reference.seine= +observe.tree.route=Ruta +observe.tree.route.unsaved=Nueva ruta +observe.tree.schoolEstimate=Estimación del banco +observe.tree.sensorBrand= +observe.tree.sensorDataFormat= +observe.tree.sensorType= +observe.tree.sensorUsed= +observe.tree.setLongline.unsaved=Nuevo Lance +observe.tree.setSeine.unsaved=Nuevo Lance +observe.tree.settingShape= +observe.tree.sex=Sexo +observe.tree.sizeMeasureType= +observe.tree.species=Especie +observe.tree.speciesFate=Devenir de fauna +observe.tree.speciesGroup=Grupo de especie de fauna +observe.tree.speciesList= +observe.tree.speciesStatus=Estado de especie +observe.tree.stomacFullness= +observe.tree.surroundingActivity=Actividad circundante +observe.tree.targetCatch=Captura de atún +observe.tree.targetDiscarded=Descarte de atún +observe.tree.targetSample=Muestreo atún descartado +observe.tree.targetSampleCapture=Muestreo atún capturado +observe.tree.tdr= +observe.tree.transmittingBuoyOperation= +observe.tree.transmittingBuoyType= +observe.tree.tripLongline.unsaved=Nueva marea +observe.tree.tripSeine.unsaved=Nueva marea +observe.tree.tripType= +observe.tree.vessel=Barco +observe.tree.vesselActivityLongline= +observe.tree.vesselActivitySeine=Actividad del barco +observe.tree.vesselSizeCategory=Capacidad +observe.tree.vesselType=Pesquería +observe.tree.weightCategory=Categoría de peso +observe.tree.weightMeasureType= +observe.tree.wind=Fuerza del viento observe.tripLongline.captain= observe.tripLongline.dataEntryOperator= observe.tripLongline.endDate= @@ -1991,8 +2053,6 @@ observe.tripSeine.message.creating= observe.tripSeine.message.no.active.found= observe.tripSeine.message.not.open= observe.tripSeine.message.updating= -observe.tripSeine.tab.caracteristics= -observe.tripSeine.tab.general= observe.tripSeine.title= observe.validation.report.contextName= observe.validation.report.entities.with.messages= diff --git a/observe-swing/src/main/resources/i18n/observe-swing_fr_FR.properties b/observe-swing/src/main/resources/i18n/observe-swing_fr_FR.properties index 09225ea..7d435d4 100644 --- a/observe-swing/src/main/resources/i18n/observe-swing_fr_FR.properties +++ b/observe-swing/src/main/resources/i18n/observe-swing_fr_FR.properties @@ -713,8 +713,6 @@ observe.common.acquisitionMode.individu=Saisie par individu observe.common.activities=Activités observe.common.activities.list=Liste des activités observe.common.activity=Activité -observe.common.activityLongline.unsaved=Nouvelle activité -observe.common.activitySeine.unsaved=Nouvelle activité observe.common.baitObservation=Gleure observe.common.birdsObservation=Oiseaux observe.common.boolean.false=Non @@ -727,7 +725,6 @@ observe.common.capacity=Capacité transport (m³) observe.common.capacityLabel=Libellé capacité observe.common.captain=Capitaine observe.common.caracteristics=Caractéristiques -observe.common.catchLongline= observe.common.catchWeight=Poids estimé (en t) observe.common.catchWeightComputed.computed.tip=Le poids estimé a été calculé (%s) observe.common.catchWeightComputed.observed.tip=Le poids estimé a été observé @@ -755,7 +752,6 @@ observe.common.description=Description observe.common.detailledActivitiesObservation=Activités détaillées observe.common.detectionMode=Mode détection observe.common.directory=Répertoire -observe.common.encounter= observe.common.endDate=Fin de validité observe.common.endLogValue=Loch du soir (milles) observe.common.equation=Relation taille poids @@ -763,10 +759,8 @@ observe.common.ersId=Id ERS observe.common.file=Fichier observe.common.firstName=Prénom observe.common.flagCountry=Pavillon -observe.common.floatingObject.unsaved=Nouveau DCP observe.common.formsUrl=URL des formulaires observe.common.gaugeLabel=Libellé jauge -observe.common.gearCaracteristic=Caractétistique d'un équipement observe.common.gearType=Type d'engin observe.common.generateReport=Générer un rapport de validation observe.common.global.progression.description=Progression globale @@ -792,8 +786,6 @@ observe.common.length.observed.tip=La longueur a été observée observe.common.lengthMeasureType=Type de mensuration observe.common.lengthWeightFormula=Relation Poids observe.common.libelles=Libellés -observe.common.longlineDetailComposition=Composition détaillée -observe.common.longlineGlobalComposition=Composition globale observe.common.lowerValueUpperValue=Borne min-max observe.common.mammalsObservation=Mammifères observe.common.meanLength=Taille moyenne (en cm) @@ -844,13 +836,8 @@ observe.common.program.observation.value.7=valeur 7 non définie observe.common.program.observation.value.8=valeur 8 non définie observe.common.program.observation.value.9=valeur 9 non définie observe.common.reasonForDiscard=Raison rejet -observe.common.reference.common=Référentiel commun -observe.common.reference.longline=Référentiel Palangre -observe.common.reference.seine=Référentiel Senne observe.common.reportsUrl=URL de rapport observe.common.resume=Résumé de la configuration -observe.common.route.unsaved=Nouvelle route -observe.common.routes=Routes observe.common.routes.list=Liste des routes observe.common.samplesObservation=Mensurations observe.common.schoolEstimate=Estimation banc @@ -858,9 +845,6 @@ observe.common.schoolType=Type de banc observe.common.scientificLabel=Libellé scientifique observe.common.seaSurfaceTemperature=Température surface (°) observe.common.searchMaximum=Vitesse maximale -observe.common.seineBallastWeight=Poids du lest (en Kg) -observe.common.seineCircumference=Circonférence (en m) -observe.common.seineDepth=Profondeur (en m) observe.common.select.gps.import.file=Fichier à importer observe.common.select.gps.import.file.tip=Choisir le fichier de trace GPS à importer observe.common.select.gps.maxDelay=Temps maximum (mn) @@ -876,10 +860,6 @@ observe.common.select.validate.mode.tip=Choisir le type de données à valider observe.common.select.validate.scope=Niveau de validation observe.common.select.validate.scope.tip=Choisir le ou les niveaux de validation observe.common.selected.validators=Nombre de validateurs détectés \: %1$s -observe.common.senne=Senne -observe.common.sensorUsed= -observe.common.setLongline.unsaved=Nouvelle opération de pêche -observe.common.setSeine.unsaved=Nouvelle calée observe.common.sex=Sexe observe.common.species=Espèce observe.common.speciesFate=Devenir espèce @@ -904,7 +884,6 @@ observe.common.targetDiscarded=Rejet de thon observe.common.targetDiscardsObservation=Rejets thon observe.common.targetSample=Echantillon thon rejeté observe.common.targetSampleCapture=Echantillon thon capturé -observe.common.tdr= observe.common.topiaCreateDate=Date de création observe.common.topiaId=Identifiant technique observe.common.topiaVersion=Version @@ -914,8 +893,6 @@ observe.common.totalCountComputed.observed.tip=Le nombre estimé a été observ observe.common.totalWeight=Poids observe.common.transmittingBuoyOperation=Opération balise observe.common.transmittingBuoyType=Type de balise -observe.common.tripLongline.unsaved=Nouvelle marée -observe.common.tripSeine.unsaved=Nouvelle marée observe.common.trips.list=Liste des marées observe.common.typeTransmittingBuoyOperation=Type d'opération sur balise observe.common.undefined=< non défini > @@ -1068,7 +1045,7 @@ observe.gearUseFeaturesSeine.table.number=Nombre observe.gearUseFeaturesSeine.table.number.tip=Nombre observe.gearUseFeaturesSeine.table.usedInTrip=Utilisé observe.gearUseFeaturesSeine.table.usedInTrip.tip=Utilisé dans la marée -observe.gearUseFeaturesSeine.title= +observe.gearUseFeaturesSeine.title=Équipements observe.gearUseFeaturesSeine.usedInTrip=Utilisé dans la marée observe.harbour.coordinates=Nom observe.harbour.locode=Locode @@ -1964,6 +1941,95 @@ observe.title.unique.key=Clefs métier du référentiel %1$s observe.title.validate=Validation des données observe.title.validate.tip=Valider les données d'une source de données observe.title.welcome.admin=Observe Administrateur +observe.tree.activityLongline=Activités +observe.tree.activityLongline.unsaved=Nouvelle activité +observe.tree.activitySeine=Activités +observe.tree.activitySeine.unsaved=Nouvelle activité +observe.tree.baitHaulingStatus=Status de l'appât au virage +observe.tree.baitSettingStatus=Status de l'appât au filage +observe.tree.baitType=Type d'appât +observe.tree.catchFateLongline=Devenir capture +observe.tree.catchLongline=Capture +observe.tree.country=Pays +observe.tree.detectionMode=Mode détection +observe.tree.encounter=Rencontre +observe.tree.encounterType=Type de rencontre +observe.tree.floatingObject.unsaved=Nouveau DCP +observe.tree.fpaZone=Zone FPA +observe.tree.gear=Équipement +observe.tree.gearCaracteristic=Caractéristique d'un équipement +observe.tree.gearCaracteristicType=Type de caractéristique d'équipement +observe.tree.gearUseFeaturesSeine=Équipements +observe.tree.harbour=Port +observe.tree.healthness=État de santé +observe.tree.hookPosition=Position du hameçon +observe.tree.hookSize=Taille +observe.tree.hookType=Type d'hameçon +observe.tree.itemHorizontalPosition=Localisation de l'élément sur la ligne mère +observe.tree.itemVerticalPosition=Localisation de l'élément sur l'avançon +observe.tree.lengthWeightParameter=Relation Taille-Poids +observe.tree.lightsticksColor=Couleur de baton lumineux +observe.tree.lightsticksType=Type de baton lumineux +observe.tree.lineType=Type de ligne +observe.tree.longlineDetailComposition=Composition détaillée +observe.tree.longlineGlobalComposition=Composition globale +observe.tree.maturityStatus=Maturité +observe.tree.mitigationType=Type de mesure d'atténuation +observe.tree.nonTargetCatch=Faune accessoire conservée ou rejetée +observe.tree.nonTargetSample=Echantillon faune accessoire +observe.tree.objectFate=Devenir de l'objet +observe.tree.objectObservedSpecies=Faune observée +observe.tree.objectOperation=Opération sur l'objet +observe.tree.objectSchoolEstimate=Estimation banc objet +observe.tree.objectType=Type d'objet +observe.tree.observedSystem=Système observé +observe.tree.ocean=Océan +observe.tree.organism=Organisme +observe.tree.person=Personne +observe.tree.program=Programme +observe.tree.reasonForDiscard=Raison rejet +observe.tree.reasonForNoFishing=Raison de non coup de Senne +observe.tree.reasonForNullSet=Cause coup nul +observe.tree.reference.common=Référentiel commun +observe.tree.reference.longline=Référentiel Palangre +observe.tree.reference.seine=Référentiel Senne +observe.tree.route=Routes +observe.tree.route.unsaved=Nouvelle route +observe.tree.schoolEstimate=Estimation banc +observe.tree.sensorBrand=Marque de capteur +observe.tree.sensorDataFormat=Format de données de capteur +observe.tree.sensorType=Type de capteur +observe.tree.sensorUsed=Capteur utilisé +observe.tree.setLongline.unsaved=Nouvelle opération de pêche +observe.tree.setSeine.unsaved=Nouvelle calée +observe.tree.settingShape=Forme au filage +observe.tree.sex=Sexe +observe.tree.sizeMeasureType=Type de mesure de taille +observe.tree.species=Espèce +observe.tree.speciesFate=Devenir espèce +observe.tree.speciesGroup=Groupe espèce +observe.tree.speciesList=Liste d'espèces +observe.tree.speciesStatus=Statut faune observée +observe.tree.stomacFullness=Niveau de remplissage de l'estomac +observe.tree.surroundingActivity=Activité environnante +observe.tree.targetCatch=Capture cible +observe.tree.targetDiscarded=Rejet de thon +observe.tree.targetSample=Echantillon thon rejeté +observe.tree.targetSampleCapture=Echantillon thon capturé +observe.tree.tdr=Enregistreur de profondeur +observe.tree.transmittingBuoyOperation=Opération balise +observe.tree.transmittingBuoyType=Type de balise +observe.tree.tripLongline.unsaved=Nouvelle marée +observe.tree.tripSeine.unsaved=Nouvelle marée +observe.tree.tripType=Type de marée +observe.tree.vessel=Bateau +observe.tree.vesselActivityLongline=Activité bateau +observe.tree.vesselActivitySeine=Activité bateau +observe.tree.vesselSizeCategory=Catégorie de bateau +observe.tree.vesselType=Type de pêcherie +observe.tree.weightCategory=Catégorie de poids +observe.tree.weightMeasureType=Type de mesure de poids +observe.tree.wind=Vent Beaufort observe.tripLongline.captain=Capitaine observe.tripLongline.dataEntryOperator=Opérateur de saisie observe.tripLongline.endDate=Date fin @@ -1987,8 +2053,6 @@ observe.tripSeine.message.creating=La marée est en cours de création. observe.tripSeine.message.no.active.found=Aucune marée ouverte, vous pouvez soit en créer une nouvelle, soit en réouvrir une. observe.tripSeine.message.not.open=La marée courante n'est pas ouverte, aucune modification possible. observe.tripSeine.message.updating=La maréee est en cours de modification. -observe.tripSeine.tab.caracteristics=Autres caractéristiques -observe.tripSeine.tab.general=Caractéristiques générales observe.tripSeine.title=Marée observe.validation.report.contextName=Context de validation utilisé \: %1$s observe.validation.report.entities.with.messages=Nombre d'entités avec des messages \: %1$s -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/6855 in repository observe. See http://git.codelutin.com/observe.git commit 3d15ec0b19d16a306ad622aa840bb99e9cd61fcd Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Apr 6 19:15:22 2015 +0200 refs #6855 ecran autonome pour les equipements d'une marée seine --- .../ird/observe/ui/content/ContentUIManager.java | 18 +- .../ui/content/open/impl/seine/TripSeineUI.css | 15 +- .../ui/content/open/impl/seine/TripSeineUI.jaxx | 311 ++++++++++----------- .../open/impl/seine/TripSeineUIHandler.java | 76 ----- .../content/open/impl/seine/TripSeineUIModel.java | 53 ---- .../impl/seine/GearUseFeaturesSeineUIHandler.java | 12 +- 6 files changed, 157 insertions(+), 328 deletions(-) diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ContentUIManager.java b/observe-swing/src/main/java/fr/ird/observe/ui/content/ContentUIManager.java index 90e6183..ce3da0d 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/content/ContentUIManager.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/content/ContentUIManager.java @@ -57,6 +57,7 @@ import fr.ird.observe.ui.content.table.impl.longline.CatchLonglineUI; import fr.ird.observe.ui.content.table.impl.longline.EncounterUI; import fr.ird.observe.ui.content.table.impl.longline.SensorUsedUI; import fr.ird.observe.ui.content.table.impl.longline.TdrUI; +import fr.ird.observe.ui.content.table.impl.seine.GearUseFeaturesSeineUI; import fr.ird.observe.ui.content.table.impl.seine.NonTargetCatchUI; import fr.ird.observe.ui.content.table.impl.seine.NonTargetSampleUI; import fr.ird.observe.ui.content.table.impl.seine.ObjectObservedSpeciesUI; @@ -113,19 +114,20 @@ public class ContentUIManager { addMapping(DATA, Program.class, GearType.seine.name(), TripSeinesUI.class); addMapping(DATA, TripSeine.class, TripSeineUI.class); - addMapping(DATA, TripSeine.class, n("observe.common.tripSeine.unsaved"), TripSeineUI.class); + addMapping(DATA, TripSeine.class, n("observe.tree.tripSeine.unsaved"), TripSeineUI.class); + addMapping(DATA, TripSeine.class, TripSeine.PROPERTY_GEAR_USE_FEATURES_SEINE, GearUseFeaturesSeineUI.class); addMapping(DATA, TripSeine.class, TripSeine.PROPERTY_ROUTE, RoutesUI.class); addMapping(DATA, Route.class, RouteUI.class); - addMapping(DATA, Route.class, n("observe.common.route.unsaved"), RouteUI.class); + addMapping(DATA, Route.class, n("observe.tree.route.unsaved"), RouteUI.class); addMapping(DATA, Route.class, Route.PROPERTY_ACTIVITY_SEINE, ActivitySeinesUI.class); addMapping(DATA, ActivitySeine.class, ActivitySeineUI.class); - addMapping(DATA, ActivitySeine.class, n("observe.common.activitySeine.unsaved"), ActivitySeineUI.class); + addMapping(DATA, ActivitySeine.class, n("observe.tree.activitySeine.unsaved"), ActivitySeineUI.class); addMapping(DATA, ActivitySeine.class, ActivitySeine.PROPERTY_OBSERVED_SYSTEM, ActivitySeineObservedSystemUI.class); addMapping(DATA, SetSeine.class, SetSeineUI.class); - addMapping(DATA, SetSeine.class, n("observe.common.setSeine.unsaved"), SetSeineUI.class); + addMapping(DATA, SetSeine.class, n("observe.tree.setSeine.unsaved"), SetSeineUI.class); addMapping(DATA, SetSeine.class, SetSeine.PROPERTY_SCHOOL_ESTIMATE, SchoolEstimateUI.class); addMapping(DATA, SetSeine.class, SetSeine.PROPERTY_TARGET_CATCH, TargetCatchUI.class); addMapping(DATA, SetSeine.class, SetSeine.PROPERTY_TARGET_DISCARDED, TargetDiscardCatchUI.class); @@ -135,7 +137,7 @@ public class ContentUIManager { addMapping(DATA, SetSeine.class, SetSeine.PROPERTY_NON_TARGET_SAMPLE, NonTargetSampleUI.class); addMapping(DATA, FloatingObject.class, FloatingObjectUI.class); - addMapping(DATA, FloatingObject.class, n("observe.common.floatingObject.unsaved"), FloatingObjectUI.class); + addMapping(DATA, FloatingObject.class, n("observe.tree.floatingObject.unsaved"), FloatingObjectUI.class); addMapping(DATA, FloatingObject.class, FloatingObject.PROPERTY_OBJECT_OPERATION, FloatingObjectTransmittingBuoyOperationUI.class); addMapping(DATA, FloatingObject.class, FloatingObject.PROPERTY_OBJECT_OBSERVED_SPECIES, ObjectObservedSpeciesUI.class); addMapping(DATA, FloatingObject.class, FloatingObject.PROPERTY_OBJECT_SCHOOL_ESTIMATE, ObjectSchoolEstimateUI.class); @@ -145,16 +147,16 @@ public class ContentUIManager { addMapping(DATA, Program.class, GearType.longline.name(), TripLonglinesUI.class); addMapping(DATA, TripLongline.class, TripLonglineUI.class); - addMapping(DATA, TripLongline.class, n("observe.common.tripLongline.unsaved"), TripLonglineUI.class); + addMapping(DATA, TripLongline.class, n("observe.tree.tripLongline.unsaved"), TripLonglineUI.class); addMapping(DATA, TripLongline.class, TripLongline.PROPERTY_ACTIVITY_LONGLINE, ActivityLonglinesUI.class); addMapping(DATA, ActivityLongline.class, ActivityLonglineUI.class); - addMapping(DATA, ActivityLongline.class, n("observe.common.activityLongline.unsaved"), ActivityLonglineUI.class); + addMapping(DATA, ActivityLongline.class, n("observe.tree.activityLongline.unsaved"), ActivityLonglineUI.class); addMapping(DATA, ActivityLongline.class, ActivityLongline.PROPERTY_ENCOUNTER, EncounterUI.class); addMapping(DATA, ActivityLongline.class, ActivityLongline.PROPERTY_SENSOR_USED, SensorUsedUI.class); addMapping(DATA, SetLongline.class, SetLonglineUI.class); - addMapping(DATA, SetLongline.class, n("observe.common.setLongline.unsaved"), SetLonglineUI.class); + addMapping(DATA, SetLongline.class, n("observe.tree.setLongline.unsaved"), SetLonglineUI.class); addMapping(DATA, SetLongline.class, "longlineGlobalComposition", LonglineGlobalCompositionUI.class); addMapping(DATA, SetLongline.class, "longlineDetailComposition", LonglineDetailCompositionUI.class); diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUI.css b/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUI.css index 4be1629..b747f9a 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUI.css +++ b/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUI.css @@ -36,17 +36,6 @@ NumberEditor { valid:{validator.isValid()}; } -#generalTab { - title:{t("observe.tripSeine.tab.general")}; - icon:{getHandler().getErrorIconIfFalse(model.isGeneralTabValid())}; -} - -#caracteristicTab { - title:{t("observe.tripSeine.tab.caracteristics")}; - icon:{getHandler().getErrorIconIfFalse(model.isCaracteristicsTabValid())}; - enabled:{!model.isCreatingMode()}; -} - #observerLabel { text:"observe.common.observer"; labelFor:{observer}; @@ -80,7 +69,7 @@ NumberEditor { _listPredicate:{Persons.newDataEntryOperatorPredicate()}; } -#vesselLabel{ +#vesselLabel { text:"observe.common.vessel"; labelFor:{vessel}; } @@ -91,7 +80,7 @@ NumberEditor { _listPredicate:{Vessels.newVesselByVesselTypeIdPredicate(getConfig().getSeineVesselTypeIds())}; } -#oceanLabel{ +#oceanLabel { text:"observe.common.ocean"; labelFor:{ocean}; } diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUI.jaxx b/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUI.jaxx index 49b576d..b8d2d76 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUI.jaxx +++ b/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUI.jaxx @@ -33,8 +33,6 @@ fr.ird.observe.entities.referentiel.Person fr.ird.observe.entities.referentiel.Ocean - fr.ird.observe.ui.content.table.impl.seine.GearUseFeaturesSeineUI - org.jdesktop.swingx.JXDatePicker jaxx.runtime.swing.editor.NumberEditor @@ -79,177 +77,156 @@ protected boolean canEditOcean(java.util.List<Route> routes) { <!-- formulaire --> <JPanel id="body" layout='{new BorderLayout()}'> <Table insets="0" fill="both" constraints='BorderLayout.CENTER'> + + <!-- captain --> + <row> + <cell anchor='west'> + <JLabel id='captainLabel'/> + </cell> + <cell anchor='east'> + <BeanComboBox id='captain' constructorParams='this' genericType='Person'/> + </cell> + </row> + + <!-- observer --> + <row> + <cell anchor='west'> + <JLabel id='observerLabel'/> + </cell> + <cell anchor='east'> + <BeanComboBox id='observer' constructorParams='this' genericType='Person'/> + </cell> + </row> + + <!-- dataEntryOperator --> + <row> + <cell anchor='west'> + <JLabel id='dataEntryOperatorLabel'/> + </cell> + <cell anchor='east'> + <BeanComboBox id='dataEntryOperator' constructorParams='this' genericType='Person'/> + </cell> + </row> + + <!-- vessel --> + <row> + <cell anchor='west'> + <JLabel id='vesselLabel'/> + </cell> + <cell anchor='east' weightx="1" fill="both"> + <BeanComboBox id='vessel' constructorParams='this' genericType='Vessel'/> + </cell> + </row> + + <!-- ocean (editable uniquement si pas de route saisie) --> <row> - <cell anchor="north" weightx="1"> - <JTabbedPane id='fishingOperationTabPane'> - - <tab id='generalTab'> - <JPanel layout="{new BorderLayout()}"> - <Table fill="both" weightx="1" constraints='BorderLayout.NORTH'> - <!-- captain --> - <row> - <cell anchor='west'> - <JLabel id='captainLabel'/> - </cell> - <cell anchor='east'> - <BeanComboBox id='captain' constructorParams='this' genericType='Person'/> - </cell> - </row> - - <!-- observer --> - <row> - <cell anchor='west'> - <JLabel id='observerLabel'/> - </cell> - <cell anchor='east'> - <BeanComboBox id='observer' constructorParams='this' genericType='Person'/> - </cell> - </row> - - <!-- dataEntryOperator --> - <row> - <cell anchor='west'> - <JLabel id='dataEntryOperatorLabel'/> - </cell> - <cell anchor='east'> - <BeanComboBox id='dataEntryOperator' constructorParams='this' genericType='Person'/> - </cell> - </row> - - <!-- vessel --> - <row> - <cell anchor='west'> - <JLabel id='vesselLabel'/> - </cell> - <cell anchor='east' weightx="1" fill="both"> - <BeanComboBox id='vessel' constructorParams='this' genericType='Vessel'/> - </cell> - </row> - - <!-- ocean (editable uniquement si pas de route saisie) --> - <row> - <cell anchor='west'> - <JLabel id='oceanLabel'/> - </cell> - <cell anchor='east' weightx="1" fill="both"> - <BeanComboBox id='ocean' genericType='Ocean' constructorParams='this'/> - </cell> - </row> - - <!-- departureHarbour --> - <row> - <cell anchor='west'> - <JLabel id='departureHarbourLabel'/> - </cell> - <cell anchor='east' weightx="1" fill="both"> - <BeanComboBox id='departureHarbour' genericType='Harbour' constructorParams='this'/> - </cell> - </row> - - <!-- landingHarbour --> - <row> - <cell anchor='west'> - <JLabel id='landingHarbourLabel'/> - </cell> - <cell anchor='east' weightx="1" fill="both"> - <BeanComboBox id='landingHarbour' genericType='Harbour' constructorParams='this'/> - </cell> - </row> - - <!-- id ers --> - <row> - - <cell anchor='west'> - <JLabel id='ersIdLabel'/> - </cell> - <cell anchor='east' weightx="1" fill="both"> - <JPanel layout='{new BorderLayout()}'> - <JToolBar id='ersIdToolbar' constraints='BorderLayout.WEST'> - <JButton id='resetErsId' constraints='BorderLayout.WEST' styleClass='resetButton'/> - </JToolBar> - <JTextField id='ersId' constraints='BorderLayout.CENTER'/> - </JPanel> - </cell> - </row> - - <!-- startDate --> - <row> - <cell anchor='west'> - <JLabel id='startDateLabel'/> - </cell> - <cell anchor='west' weightx="0.5"> - <JXDatePicker id='startDate'/> - </cell> - </row> - - <!-- endDate --> - <row> - <cell anchor='west'> - <JLabel id='endDateLabel'/> - </cell> - <cell anchor='west' weightx="0.5"> - <JXDatePicker id='endDate'/> - </cell> - </row> - - <!-- formsUrl --> - <row> - <cell anchor="west"> - <JLabel id='formsUrlLabel'/> - </cell> - <cell anchor='east' weightx="1" fill="both"> - <JPanel layout='{new BorderLayout()}'> - <JToolBar id='formsUrlToolbar' constraints='BorderLayout.WEST'> - <JButton id='resetFormsUrl' constraints='BorderLayout.WEST' styleClass='resetButton'/> - </JToolBar> - <JTextField id='formsUrl' constraints='BorderLayout.CENTER'/> - <JToolBar id='formsUrlToolbar2' constraints='BorderLayout.EAST'> - <JButton id='openLinkFormulairesUrl' - onActionPerformed='getHandler().openLink(getModel().getBean().getFormsUrl())'/> - </JToolBar> - - </JPanel> - </cell> - </row> - - <!-- reportsUrl --> - <row> - <cell anchor="west"> - <JLabel id='reportsUrlLabel'/> - </cell> - <cell anchor='east' weightx="1" fill="both"> - <JPanel layout='{new BorderLayout()}'> - <JToolBar id='reportsUrlToolbar' constraints='BorderLayout.WEST'> - <JButton id='resetReportsUrl' constraints='BorderLayout.WEST' styleClass='resetButton'/> - </JToolBar> - <JTextField id='reportsUrl' constraints='BorderLayout.CENTER'/> - - <JToolBar id='reportsUrlToolbar2' constraints='BorderLayout.EAST'> - <JButton id='openLinkRapportsUrl' constraints='BorderLayout.EAST' - onActionPerformed='getHandler().openLink(getModel().getBean().getReportsUrl())'/> - </JToolBar> - </JPanel> - </cell> - </row> - - </Table> - </JPanel> - </tab> - - <tab id='caracteristicTab'> - <JPanel id='caracteristicPane' layout='{new BorderLayout()}'> - <GearUseFeaturesSeineUI id='gearUseFeaturesSeineUI' constructorParams='this' - constraints='BorderLayout.NORTH'/> - </JPanel> - </tab> - - </JTabbedPane> + <cell anchor='west'> + <JLabel id='oceanLabel'/> + </cell> + <cell anchor='east' weightx="1" fill="both"> + <BeanComboBox id='ocean' genericType='Ocean' constructorParams='this'/> + </cell> + </row> + + <!-- departureHarbour --> + <row> + <cell anchor='west'> + <JLabel id='departureHarbourLabel'/> + </cell> + <cell anchor='east' weightx="1" fill="both"> + <BeanComboBox id='departureHarbour' genericType='Harbour' constructorParams='this'/> + </cell> + </row> + + <!-- landingHarbour --> + <row> + <cell anchor='west'> + <JLabel id='landingHarbourLabel'/> + </cell> + <cell anchor='east' weightx="1" fill="both"> + <BeanComboBox id='landingHarbour' genericType='Harbour' constructorParams='this'/> + </cell> + </row> + + <!-- id ers --> + <row> + + <cell anchor='west'> + <JLabel id='ersIdLabel'/> + </cell> + <cell anchor='east' weightx="1" fill="both"> + <JPanel layout='{new BorderLayout()}'> + <JToolBar id='ersIdToolbar' constraints='BorderLayout.WEST'> + <JButton id='resetErsId' constraints='BorderLayout.WEST' styleClass='resetButton'/> + </JToolBar> + <JTextField id='ersId' constraints='BorderLayout.CENTER'/> + </JPanel> + </cell> + </row> + + <!-- startDate --> + <row> + <cell anchor='west'> + <JLabel id='startDateLabel'/> + </cell> + <cell anchor='west' weightx="0.5"> + <JXDatePicker id='startDate'/> + </cell> + </row> + + <!-- endDate --> + <row> + <cell anchor='west'> + <JLabel id='endDateLabel'/> + </cell> + <cell anchor='west' weightx="0.5"> + <JXDatePicker id='endDate'/> + </cell> + </row> + + <!-- formsUrl --> + <row> + <cell anchor="west"> + <JLabel id='formsUrlLabel'/> + </cell> + <cell anchor='east' weightx="1" fill="both"> + <JPanel layout='{new BorderLayout()}'> + <JToolBar id='formsUrlToolbar' constraints='BorderLayout.WEST'> + <JButton id='resetFormsUrl' constraints='BorderLayout.WEST' styleClass='resetButton'/> + </JToolBar> + <JTextField id='formsUrl' constraints='BorderLayout.CENTER'/> + <JToolBar id='formsUrlToolbar2' constraints='BorderLayout.EAST'> + <JButton id='openLinkFormulairesUrl' + onActionPerformed='getHandler().openLink(getModel().getBean().getFormsUrl())'/> + </JToolBar> + + </JPanel> + </cell> + </row> + + <!-- reportsUrl --> + <row> + <cell anchor="west"> + <JLabel id='reportsUrlLabel'/> + </cell> + <cell anchor='east' weightx="1" fill="both"> + <JPanel layout='{new BorderLayout()}'> + <JToolBar id='reportsUrlToolbar' constraints='BorderLayout.WEST'> + <JButton id='resetReportsUrl' constraints='BorderLayout.WEST' styleClass='resetButton'/> + </JToolBar> + <JTextField id='reportsUrl' constraints='BorderLayout.CENTER'/> + + <JToolBar id='reportsUrlToolbar2' constraints='BorderLayout.EAST'> + <JButton id='openLinkRapportsUrl' constraints='BorderLayout.EAST' + onActionPerformed='getHandler().openLink(getModel().getBean().getReportsUrl())'/> + </JToolBar> + </JPanel> </cell> </row> <!-- comment --> <row> - <cell fill='both' weighty="1"> + <cell fill='both' weighty="1" columns="2"> <JScrollPane id='comment' onFocusGained='comment2.requestFocus()'> <JTextArea id='comment2' onKeyReleased='getModel().getBean().setComment(comment2.getText())'/> </JScrollPane> diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUIHandler.java b/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUIHandler.java index c1ec978..34bdd7d 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUIHandler.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUIHandler.java @@ -33,9 +33,6 @@ import fr.ird.observe.entities.seine.TripSeine; import fr.ird.observe.ui.content.ContentMode; import fr.ird.observe.ui.content.open.ContentOpenableUIHandler; import fr.ird.observe.ui.content.open.ContentOpenableUIModel; -import fr.ird.observe.ui.content.table.impl.seine.GearUseFeaturesSeineUI; -import jaxx.runtime.validator.swing.SwingValidatorMessage; -import jaxx.runtime.validator.swing.SwingValidatorMessageTableModel; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.TopiaContext; @@ -44,13 +41,8 @@ import org.nuiton.topia.persistence.TopiaDAO; import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.topia.persistence.util.TopiaEntityBinder; import org.nuiton.util.DateUtil; -import org.nuiton.validator.NuitonValidatorScope; -import javax.swing.event.TableModelEvent; -import javax.swing.event.TableModelListener; import java.util.Date; -import java.util.HashSet; -import java.util.Set; import static org.nuiton.i18n.I18n.n; import static org.nuiton.i18n.I18n.t; @@ -64,17 +56,6 @@ public class TripSeineUIHandler extends ContentOpenableUIHandler<TripSeine> { /** Logger */ static private final Log log = LogFactory.getLog(TripSeineUIHandler.class); - // Compute valid state of tab from the error table - protected final TableModelListener computeTabValidStateListener = new TableModelListener() { - @Override - public void tableChanged(TableModelEvent e) { - - SwingValidatorMessageTableModel source = (SwingValidatorMessageTableModel) e.getSource(); - computeTabValidState(source); - - } - }; - public TripSeineUIHandler(TripSeineUI ui) { super(ui, DataContextType.Program, @@ -110,23 +91,6 @@ public class TripSeineUIHandler extends ContentOpenableUIHandler<TripSeine> { } @Override - public void initUI() throws Exception { - - 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); - - GearUseFeaturesSeineUI gearUseFeaturesSeineUI = getUi().getGearUseFeaturesSeineUI(); - gearUseFeaturesSeineUI.init(); - getUi().getCaracteristicPane().remove(gearUseFeaturesSeineUI); - getUi().getCaracteristicPane().add(gearUseFeaturesSeineUI.getBody()); - - } - - @Override public void openUI() throws Exception { super.openUI(); @@ -151,8 +115,6 @@ public class TripSeineUIHandler extends ContentOpenableUIHandler<TripSeine> { // create mode - getUi().getFishingOperationTabPane().setSelectedIndex(0); - if (log.isInfoEnabled()) { log.info(prefix + "create a new trip"); } @@ -171,14 +133,8 @@ public class TripSeineUIHandler extends ContentOpenableUIHandler<TripSeine> { Routes.sort(bean.getRoute()); } - GearUseFeaturesSeineUI gearUseFeaturesSeineUI = getUi().getGearUseFeaturesSeineUI(); - gearUseFeaturesSeineUI.open(); - } - SwingValidatorMessageTableModel errorTableModel = getUi().getErrorTableModel(); - computeTabValidState(errorTableModel); - finalizeOpenUI(mode, create); } @@ -220,7 +176,6 @@ public class TripSeineUIHandler extends ContentOpenableUIHandler<TripSeine> { addInfoMessage(t("observe.message.historical.data")); } - getUi().getGearUseFeaturesSeineUI().startEdit(null); } // date is current day @@ -300,8 +255,6 @@ public class TripSeineUIHandler extends ContentOpenableUIHandler<TripSeine> { getLoadBinder().copyExcluding(getBean(), beanToSave, TripSeine.PROPERTY_ROUTE, TripSeine.PROPERTY_GEAR_USE_FEATURES_SEINE); - getUi().getGearUseFeaturesSeineUI().getHandler().onUpdate(tx, parentBean, beanToSave); - return beanToSave; } @@ -340,33 +293,4 @@ public class TripSeineUIHandler extends ContentOpenableUIHandler<TripSeine> { } - @Override - protected void afterSave(boolean refresh) { - super.afterSave(refresh); - - getUi().getGearUseFeaturesSeineUI().getHandler().afterSave(refresh); - - } - - protected void computeTabValidState(SwingValidatorMessageTableModel errorTableModel) { - - Set<String> errorProperties = new HashSet<String>(); - 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(TripSeineUIModel.GENERAL_TAB_PROPERTIES); - boolean caracteristicsTabValid = !errorProperties.removeAll(TripSeineUIModel.CARACTERISTICS_TAB_PROPERTIES); - - TripSeineUIModel model = (TripSeineUIModel) getModel(); - model.setGeneralTabValid(generalTabValid); - model.setCaracteristicsTabValid(caracteristicsTabValid); - - } - } diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUIModel.java b/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUIModel.java index de1b92e..ddaab6b 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUIModel.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUIModel.java @@ -22,15 +22,12 @@ package fr.ird.observe.ui.content.open.impl.seine; * #L% */ -import com.google.common.collect.ImmutableSet; import fr.ird.observe.BinderService; import fr.ird.observe.entities.seine.TripSeine; import fr.ird.observe.ui.content.open.ContentOpenableUIModel; import org.nuiton.util.beans.Binder; import org.nuiton.util.beans.BinderModelBuilder; -import java.util.Set; - /** * Created on 9/26/14. * @@ -39,59 +36,12 @@ import java.util.Set; */ public class TripSeineUIModel extends ContentOpenableUIModel<TripSeine> { - public static final String PROPERTY_GENERAL_TAB_VALID = "generalTabValid"; - - public static final String PROPERTY_CARACTERISTICS_TAB_VALID = "caracteristicsTabValid"; - - public static final Set<String> GENERAL_TAB_PROPERTIES = - ImmutableSet.<String>builder().add(TripSeine.PROPERTY_CAPTAIN, - TripSeine.PROPERTY_OBSERVER, - TripSeine.PROPERTY_DATA_ENTRY_OPERATOR, - - TripSeine.PROPERTY_VESSEL, - TripSeine.PROPERTY_OCEAN, - TripSeine.PROPERTY_DEPARTURE_HARBOUR, - TripSeine.PROPERTY_LANDING_HARBOUR, - - TripSeine.PROPERTY_ERS_ID, - TripSeine.PROPERTY_START_DATE, - TripSeine.PROPERTY_END_DATE, - TripSeine.PROPERTY_FORMS_URL, - TripSeine.PROPERTY_REPORTS_URL).build(); - - public static final Set<String> CARACTERISTICS_TAB_PROPERTIES = - ImmutableSet.<String>builder().add(TripSeine.PROPERTY_GEAR_USE_FEATURES_SEINE).build(); - private static final long serialVersionUID = 1L; - protected boolean generalTabValid; - - protected boolean caracteristicsTabValid; - public TripSeineUIModel() { super(TripSeine.class); } - public boolean isCaracteristicsTabValid() { - return caracteristicsTabValid; - } - - public void setCaracteristicsTabValid(boolean caracteristicsTabValid) { - Object oldValue = isCaracteristicsTabValid(); - this.caracteristicsTabValid = caracteristicsTabValid; - firePropertyChange(PROPERTY_CARACTERISTICS_TAB_VALID, oldValue, caracteristicsTabValid); - } - - public boolean isGeneralTabValid() { - return generalTabValid; - } - - public void setGeneralTabValid(boolean generalTabValid) { - Object oldValue = isGeneralTabValid(); - this.generalTabValid = generalTabValid; - firePropertyChange(PROPERTY_GENERAL_TAB_VALID, oldValue, generalTabValid); - } - @Override protected BinderModelBuilder<TripSeine, TripSeine> createOpeningBinder(BinderService binderService, String binderName) { @@ -111,14 +61,11 @@ public class TripSeineUIModel extends ContentOpenableUIModel<TripSeine> { TripSeine.PROPERTY_LANDING_HARBOUR, TripSeine.PROPERTY_PROGRAM, TripSeine.PROPERTY_ROUTE, - TripSeine.PROPERTY_GEAR_USE_FEATURES_SEINE, TripSeine.PROPERTY_ERS_ID, TripSeine.PROPERTY_OPEN); // on ajoute la recopie de l'association route builder.addCollectionStrategy(Binder.CollectionStrategy.duplicate, TripSeine.PROPERTY_ROUTE); - // on ajoute la recopie de l'association gearUseFeatues - builder.addCollectionStrategy(Binder.CollectionStrategy.duplicate, TripSeine.PROPERTY_GEAR_USE_FEATURES_SEINE); return builder; diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java b/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java index 76b17db..10eeda0 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java @@ -42,7 +42,7 @@ public class GearUseFeaturesSeineUIHandler extends ContentTableUIHandler<TripSei LogFactory.getLog(GearUseFeaturesSeineUIHandler.class); public GearUseFeaturesSeineUIHandler(GearUseFeaturesSeineUI ui) { - super(ui, DataContextType.SetSeine); + super(ui, DataContextType.TripSeine); } @Override @@ -80,11 +80,6 @@ public class GearUseFeaturesSeineUIHandler extends ContentTableUIHandler<TripSei } @Override - protected void addUpdateInfoMessage() { - // No message to display - } - - @Override protected String getEditBeanIdToLoad(DataContext dataContext, DataService dataService, DataSource dataSource) { return dataContext.getSelectedTripId(); } @@ -121,11 +116,6 @@ public class GearUseFeaturesSeineUIHandler extends ContentTableUIHandler<TripSei } @Override - public void afterSave(boolean refresh) { - super.afterSave(refresh); - } - - @Override public TripSeine onUpdate(TopiaContext tx, Object parentBean, TripSeine beanToSave) throws TopiaException { List<GearUseFeaturesSeine> childs = getUi().getTableModel().getData(); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/6855 in repository observe. See http://git.codelutin.com/observe.git commit 078d4d575128a1c95bbff918d400cab4efc6dac0 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Apr 6 19:15:39 2015 +0200 i18n --- .../src/main/resources/i18n/observe-validation_en_GB.properties | 4 ++++ .../src/main/resources/i18n/observe-validation_es_ES.properties | 4 ++++ .../src/main/resources/i18n/observe-validation_fr_FR.properties | 7 ++++--- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/observe-validation/src/main/resources/i18n/observe-validation_en_GB.properties b/observe-validation/src/main/resources/i18n/observe-validation_en_GB.properties index b1df383..8f93857 100644 --- a/observe-validation/src/main/resources/i18n/observe-validation_en_GB.properties +++ b/observe-validation/src/main/resources/i18n/observe-validation_en_GB.properties @@ -355,6 +355,7 @@ validator.tdr.desactivated.sensorBrand= validator.tdr.fishingEnd.before.deployementEnd= validator.tdr.fishingStart.before.fishingEnd= validator.tdr.required.position= +validator.transmittingBuoy.desactivated.country= validator.transmittingBuoy.desactivated.transmittingBuoyOperation= validator.transmittingBuoy.desactivated.transmittingBuoyType= validator.transmittingBuoy.null.code= @@ -364,6 +365,7 @@ validator.trip.comment.tobig= validator.trip.desactivated.captain= validator.trip.desactivated.dataEntryOperator= validator.trip.desactivated.departureHarbour= +validator.trip.desactivated.gear= validator.trip.desactivated.landingHarbour= validator.trip.desactivated.observer= validator.trip.desactivated.ocean= @@ -379,6 +381,7 @@ validator.trip.invalid.startDate= validator.trip.null.captain= validator.trip.null.dataEntryOperator= validator.trip.null.departureHarbour= +validator.trip.null.gearUseFeature= validator.trip.null.landingHarbour= validator.trip.required.comment.for.captain= validator.trip.required.comment.for.dataEntryOperator= @@ -390,6 +393,7 @@ validator.trip.required.comment.for.tripType= validator.trip.required.comment.for.vessel= validator.trip.required.departureHarbour= validator.trip.required.endDate= +validator.trip.required.gear= validator.trip.required.observer= validator.trip.required.ocean= validator.trip.required.startDate= diff --git a/observe-validation/src/main/resources/i18n/observe-validation_es_ES.properties b/observe-validation/src/main/resources/i18n/observe-validation_es_ES.properties index 0665513..17ad72d 100644 --- a/observe-validation/src/main/resources/i18n/observe-validation_es_ES.properties +++ b/observe-validation/src/main/resources/i18n/observe-validation_es_ES.properties @@ -355,6 +355,7 @@ validator.tdr.desactivated.sensorBrand= validator.tdr.fishingEnd.before.deployementEnd= validator.tdr.fishingStart.before.fishingEnd= validator.tdr.required.position= +validator.transmittingBuoy.desactivated.country= validator.transmittingBuoy.desactivated.transmittingBuoyOperation= validator.transmittingBuoy.desactivated.transmittingBuoyType= validator.transmittingBuoy.null.code=El código de baliza no ha sido especificado. @@ -364,6 +365,7 @@ validator.trip.comment.tobig=La longitud del campo de comentarios está limitado validator.trip.desactivated.captain= validator.trip.desactivated.dataEntryOperator= validator.trip.desactivated.departureHarbour= +validator.trip.desactivated.gear= validator.trip.desactivated.landingHarbour= validator.trip.desactivated.observer= validator.trip.desactivated.ocean=El oceano seleccionado está desactivado. @@ -379,6 +381,7 @@ validator.trip.invalid.startDate=La fecha de comienzo de marea debe ser inferior validator.trip.null.captain= validator.trip.null.dataEntryOperator= validator.trip.null.departureHarbour= +validator.trip.null.gearUseFeature= validator.trip.null.landingHarbour= validator.trip.required.comment.for.captain= validator.trip.required.comment.for.dataEntryOperator= @@ -390,6 +393,7 @@ validator.trip.required.comment.for.tripType= validator.trip.required.comment.for.vessel= validator.trip.required.departureHarbour= validator.trip.required.endDate=La fecha de fin de marea es obligatoria. +validator.trip.required.gear= validator.trip.required.observer= validator.trip.required.ocean=No se ha seleccionado océano. validator.trip.required.startDate=La fecha de comienzo de marea es obligatoria. diff --git a/observe-validation/src/main/resources/i18n/observe-validation_fr_FR.properties b/observe-validation/src/main/resources/i18n/observe-validation_fr_FR.properties index 58ef142..e010a5b 100644 --- a/observe-validation/src/main/resources/i18n/observe-validation_fr_FR.properties +++ b/observe-validation/src/main/resources/i18n/observe-validation_fr_FR.properties @@ -17,7 +17,6 @@ validator.activity.invalid.quadrant=Le quadrant n'est pas cohérent par rapport validator.activity.invalid.seaSurfaceTemperature=La température surface (%1$s) ne peut pas varier de plus de 12° par rapport à la température surface (%2$s) de l'activité précédente %3$s. validator.activity.invalid.speed=La vitesse de l'activité courante est de %s nd, alors que la vitesse maximale autorisée est %s nd validator.activity.null.dcp=Aucun objet flottant saisi. -validator.trip.null.gearUseFeature=Vous n'avez pas saisi d'équipement (Senne conseillée). validator.activity.null.fpaZone=La sélection d'une zone FPA est obligatoire. validator.activity.null.observedSystem=Aucun système observé sélectionné. validator.activity.null.observedSystemDistance=La distance au système observé n'est pas renseignée. @@ -356,6 +355,7 @@ validator.tdr.desactivated.sensorBrand=La marque sélectionnée est déasactivé validator.tdr.fishingEnd.before.deployementEnd=L'horodatage de fin de déploiement doit être après le début de celui de fin de pêche. validator.tdr.fishingStart.before.fishingEnd=L'horodatage de fin de pêche doit être après le début de celui de début de pêche. validator.tdr.required.position=Pas de position renseignée sur la palangre. +validator.transmittingBuoy.desactivated.country=Le pays sélectionné est désactivé. validator.transmittingBuoy.desactivated.transmittingBuoyOperation=L'operation balise sélectionnée est désactivée. validator.transmittingBuoy.desactivated.transmittingBuoyType=Le type de balise sélectionné est désactivé. validator.transmittingBuoy.null.code=Le code de la balise n'est pas renseigné. @@ -365,6 +365,7 @@ validator.trip.comment.tobig=La taille du commentaire est limitée à 1024 carac validator.trip.desactivated.captain=Le capitaine sélectionné est désactivé. validator.trip.desactivated.dataEntryOperator=Le saisisseur sélectionné est désactivé. validator.trip.desactivated.departureHarbour=Le port de départ sélectionné est désactivé. +validator.trip.desactivated.gear=L'équipement sélectionné est désactivé. validator.trip.desactivated.landingHarbour=Le port d'arrivée sélectionné est désactivé. validator.trip.desactivated.observer=L'observateur sélectionné est désactivé. validator.trip.desactivated.ocean=L'ocean sélectionné est désactivé. @@ -380,6 +381,7 @@ validator.trip.invalid.startDate=La date de début de marée doit être inférie validator.trip.null.captain=Pas de capitaine sélectionné. validator.trip.null.dataEntryOperator=Pas de saisisseur sélectionné. validator.trip.null.departureHarbour=Pas de port de départ sélectionné. +validator.trip.null.gearUseFeature=Vous n'avez pas saisi d'équipement (Senne conseillée). validator.trip.null.landingHarbour=Pas de port d'arrivée sélectionné. validator.trip.required.comment.for.captain=Un commentaire est requis pour le captiaine sélectionné. validator.trip.required.comment.for.dataEntryOperator=Un commentaire est requis pour le saisisseur sélectionné. @@ -389,10 +391,9 @@ validator.trip.required.comment.for.observer=Un commentaire est requis pour l'ob validator.trip.required.comment.for.ocean=Un commentaire est requis pour l'ocean sélectionné. validator.trip.required.comment.for.tripType=Un commentaire est requis pour le type de marée sélectionné. validator.trip.required.comment.for.vessel=Un commentaire est requis pour le navire sélectionné. -validator.trip.required.gear=L'équipement est obligatoire. -validator.trip.desactivated.gear=L'équipement sélectionné est désactivé. validator.trip.required.departureHarbour=La sélection d'un port de départ est obligatoire. validator.trip.required.endDate=La date de fin de marée est obligatoire. +validator.trip.required.gear=L'équipement est obligatoire. validator.trip.required.observer=La sélection d'un observateur est obligatoire. validator.trip.required.ocean=La sélection d'un océan est obligatoire. validator.trip.required.startDate=La date de début est obligatoire. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
participants (1)
-
codelutin.com scm