November 2018 - Observe-commits - mailman.cloud.codelutin.com

[Git][ultreiaio/ird-observe][develop] 2 commits: Mise à jour des objectmaterial - Closes #1170
by Tony CHEMIT 14 Nov '18

14 Nov '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 5bf26d97 by tchemit at 2018-11-14T13:09:06Z Mise à jour des objectmaterial - Closes #1170 - - - - - 7df49f73 by tchemit at 2018-11-14T13:28:05Z Après insertion de #1170 - Closes #1171 - - - - - 5 changed files: - persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_6_1.java - persistence/src/main/resources/db/migration/6.1/09_fill_object_material-common.sql - − persistence/src/main/resources/db/migration/6.1/10_update_objectMaterial-common.sql - persistence/src/main/resources/db/migration/6.1/11_update_object_operation-common.sql → persistence/src/main/resources/db/migration/6.1/10_update_object_operation-common.sql - − persistence/src/main/resources/db/migration/6.1/12_update_object_material-common.sql Changes: ===================================== persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_6_1.java ===================================== @@ -69,11 +69,7 @@ public class DataSourceMigrationForVersion_6_1 extends MigrationVersionResource executor.addScript("07", "drop_table_sizemeasuretype"); executor.addScript("08", "add_floating_object_fields"); executor.addScript("09", "fill_object_material"); - // was in version 7.2 - executor.addScript("10", "update_objectMaterial"); - // was in version 7.4 - executor.addScript("11", "update_object_operation"); - executor.addScript("12", "update_object_material"); + executor.addScript("10", "update_object_operation"); } ===================================== persistence/src/main/resources/db/migration/6.1/09_fill_object_material-common.sql ===================================== The diff for this file was not included because it is too large. ===================================== persistence/src/main/resources/db/migration/6.1/10_update_objectMaterial-common.sql deleted ===================================== @@ -1,112 +0,0 @@ ---- --- #%L --- ObServe :: Persistence --- %% --- Copyright (C) 2008 - 2018 IRD, Code Lutin, Ultreia.io --- %% --- 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% ---- --- Le nœud 1-12 n'est pas rattaché au bon père (1-1) -update observe_seine.objectmaterial set parent ='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.2', topiaversion = topiaversion + 1 where topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.4'; --- Supprimer 1-1-1-1-3 -delete from observe_seine.objectmaterial WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.84'; --- Supprimer 1-1-2-7 -delete from observe_seine.objectmaterial WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.37'; --- Supprimer 1-1-2-8 -delete from observe_seine.objectmaterial WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.38'; --- Supprimer 1-1-3-7 -delete from observe_seine.objectmaterial WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.45'; --- Supprimer 1-1-1-2-1 et mettre 1-1-1-2-1-1 et 1-1-1-2-1-2 au niveau supérieur --- parent fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.9 (1-1-1-2) --- fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.11 (1-1-1-2-1-1) → (1-1-1-2-1) -update observe_seine.objectmaterial set code='1-1-1-2-1', parent='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.9', topiaversion=topiaversion+1 WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.11'; --- fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.12 (1-1-1-2-1-1) → (1-1-1-2-2) -update observe_seine.objectmaterial set code='1-1-1-2-2', parent='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.9', topiaversion=topiaversion+1 WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.12'; --- fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.13 was (1-1-1-2-2) → (1-1-1-2-3) -update observe_seine.objectmaterial set code='1-1-1-2-3', topiaversion=topiaversion+1 WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.13'; --- fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.14 was (1-1-1-2-3) → (1-1-1-2-4) -update observe_seine.objectmaterial set code='1-1-1-2-4', topiaversion=topiaversion+1 WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.14'; --- fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.15 (1-1-1-2-4) → (1-1-1-2-5) -update observe_seine.objectmaterial set code='1-1-1-2-5', topiaversion=topiaversion+1 WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.15'; --- fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.10 (remove) -delete from observe_seine.objectmaterial WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.10'; - --- Supprimer 1-1-1-3-1 et mettre 1-1-1-3-1-1 et 1-1-1-3-1-2 au niveau supérieur --- parent fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.16 (1-1-1-3) --- fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.18 (1-1-1-3-1-1) → (1-1-1-3-1) -update observe_seine.objectmaterial set code='1-1-1-3-1', parent='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.16', topiaversion=topiaversion+1 WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.18'; --- fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.19 (1-1-1-3-1-1) → (1-1-1-3-2) -update observe_seine.objectmaterial set code='1-1-1-3-2', parent='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.16', topiaversion=topiaversion+1 WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.19'; --- fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.20 was (1-1-1-3-2) → (1-1-1-3-3) -update observe_seine.objectmaterial set code='1-1-1-3-3', topiaversion=topiaversion+1 WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.20'; --- fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.21 was (1-1-1-3-3) → (1-1-1-3-4) -update observe_seine.objectmaterial set code='1-1-1-3-4', topiaversion=topiaversion+1 WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.21'; --- fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.22 (1-1-1-3-4) → (1-1-1-3-5) -update observe_seine.objectmaterial set code='1-1-1-3-5', topiaversion=topiaversion+1 WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.22'; --- fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.17 (remove) -delete from observe_seine.objectmaterial WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.17'; - --- 1-1-3 other components (tous les fils sont sélectionnables non exclusif) ? deja fait ? -update observe_seine.objectmaterial set childrenmultiselectable = TRUE , topiaversion=topiaversion+1 WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.5'; - --- pour 1.1.2 (fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.4) --- * not structure (1-1-2-6) -> (1-1-2-1) fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.36 -update observe_seine.objectmaterial set code = '1-1-2-1', topiaversion=topiaversion+1 WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.36'; --- * not visible (1-1-2-6) -> (1-1-2-2) fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.35 -update observe_seine.objectmaterial set code = '1-1-2-2', topiaversion=topiaversion+1 WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.35'; --- * rope/no mesh (1-1-2-6) -> (1-1-2-3) fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.34 -update observe_seine.objectmaterial set code = '1-1-2-3', topiaversion=topiaversion+1 WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.34'; --- * mesh (5 fils non exclusif) (new node) (1-1-2-4) -INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#1.1', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL, NULL, '1-1-2-4' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.4' , 'Mesh', 'Maille', 'Malla', false, true , false, NULL, NULL, false, false); --- * net in sausage (1-1-2-1) → (1-1-2-4-1) fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.25 -update observe_seine.objectmaterial set code = '1-1-2-4-1', parent='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#1.1',topiaversion=topiaversion+1 WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.25'; --- * open net < 7 (1-1-2-2-1) → (1-1-2-4-2) fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.29 -update observe_seine.objectmaterial set code = '1-1-2-4-2', parent='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#1.1',topiaversion=topiaversion+1 WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.29'; --- * open net > 7 (1-1-2-2-2) → (1-1-2-4-3) fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.30 -update observe_seine.objectmaterial set code = '1-1-2-4-3', parent='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#1.1',topiaversion=topiaversion+1 WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.30'; --- * single net < 7 (1-1-2-3-1) → (1-1-2-4-4) fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.32 -update observe_seine.objectmaterial set code = '1-1-2-4-4', parent='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#1.1',topiaversion=topiaversion+1 WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.32'; --- * single net > 7 (1-1-2-3-2) → (1-1-2-4-5) fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.33 -update observe_seine.objectmaterial set code = '1-1-2-4-5', parent='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#1.1', topiaversion=topiaversion+1 WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.33'; - --- remove 1-1-2-1-1 fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.26 -delete from observe_seine.objectmaterial WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.26'; --- remove 1-1-2-1-2 fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.27 -delete from observe_seine.objectmaterial WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.27'; --- remove 1-1-2-2 fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.28 -delete from observe_seine.objectmaterial WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.28'; --- remove 1-1-2-3 fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.31 -delete from observe_seine.objectmaterial WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.31'; - --- Passage en disabled 4-1 -update observe_seine.objectmaterial set status=0, topiaversion=topiaversion+1 WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.69'; --- Passage en disabled 4-2 -update observe_seine.objectmaterial set status=0, topiaversion=topiaversion+1 WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.70'; --- Passage en disabled 4-3 -update observe_seine.objectmaterial set status=0, topiaversion=topiaversion+1 WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.71'; --- Mise à jour label 4-4 -update observe_seine.objectmaterial set label1='subsurface depth', label2='profondeur (partie immergée)', label3='profundidad del rabo', topiaversion=topiaversion+1 WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.72'; --- Mise à jour validation 4-6 -update observe_seine.objectmaterial set validation='x >= 5 && x <= 1000', topiaversion=topiaversion+1 WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.74'; --- Mise à jour label 4-8 -update observe_seine.objectmaterial set label2='Number of tangled FOBs', label3='Numero de FADs enmallados', topiaversion=topiaversion+1 WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.76'; --- Mise à jour formule de validation len -update observe_seine.objectmaterial set validation='x.length() >= 3 && x.length() <= 64', topiaversion=topiaversion+1 WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.75'; --- Re-add entry for FOB with '' code -INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#1.3', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL, 'FOB', '' , null , 'FOB', 'FOB', 'FOB', false, true , true, NULL, NULL, false, false); -UPDATE observe_seine.objectmaterial SET parent='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#1.3' WHERE parent IS NULL; -UPDATE observe_seine.objectmaterial SET parent= NULL WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#1.3'; -UPDATE observe_seine.objectmaterial SET SELECTABLE = TRUE WHERE parent='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#1.3' and status = '1'; ===================================== persistence/src/main/resources/db/migration/6.1/11_update_object_operation-common.sql → persistence/src/main/resources/db/migration/6.1/10_update_object_operation-common.sql ===================================== ===================================== persistence/src/main/resources/db/migration/6.1/12_update_object_material-common.sql deleted ===================================== @@ -1,44 +0,0 @@ ---- --- #%L --- ObServe :: Persistence --- %% --- Copyright (C) 2008 - 2018 IRD, Code Lutin, Ultreia.io --- %% --- 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% ---- - -UPDATE observe_seine.objectmaterial SET selectable = FALSE, childselectionmandatory = FALSE WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.1'; -UPDATE observe_seine.objectmaterial SET selectable = FALSE, childselectionmandatory = FALSE WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.50'; -UPDATE observe_seine.objectmaterial SET selectable = FALSE, childselectionmandatory = FALSE WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.68'; -UPDATE observe_seine.objectmaterial SET selectable = FALSE, childselectionmandatory = FALSE WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.77'; - -UPDATE observe_seine.objectmaterial SET childselectionmandatory = FALSE WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.3'; - -UPDATE observe_seine.objectmaterial SET childrenmultiselectable = TRUE , childselectionmandatory = FALSE WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.6'; -UPDATE observe_seine.objectmaterial SET childrenmultiselectable = FALSE , childselectionmandatory = FALSE WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.9'; -UPDATE observe_seine.objectmaterial SET childrenmultiselectable = FALSE , childselectionmandatory = FALSE WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.16'; - -UPDATE observe_seine.objectmaterial SET objectmaterialtype ='fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', selectable = TRUE WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.4'; - -UPDATE observe_seine.objectmaterial SET objectmaterialtype ='fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', selectable = TRUE , childrenmultiselectable = FALSE WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.25'; - -INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.87', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL, '', '1-1-1-1-3' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.6' , 'Not visible', 'Non visible', 'No se ve', true, false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL, false, false); - --- See https://gitlab.com/ultreiaio/ird-observe/issues/1136 -UPDATE observe_seine.objectmaterial SET legacyCode ='22*, 23*', topiaVersion = topiaVersion + 1 WHERE topiaid = 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.3'; -UPDATE observe_seine.objectmaterial SET legacyCode = NULL, topiaVersion = topiaVersion + 1 WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.2'; -INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ( 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.100', 0, CURRENT_DATE, CURRENT_TIMESTAMP, true, 0, '16', null, '6-6' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.77' , ' Raft or buoy drifting', 'Radeau ou bouée en dérive','Parilla o buoy a la deriva', true, false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL, false, false); -ALTER TABLE observe_seine.objectmaterial DROP COLUMN selectable; View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/5144d0077b4d97ce1484823256… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/5144d0077b4d97ce1484823256… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] Après insertion de #1170 - Closes #1171
by Tony CHEMIT 14 Nov '18

14 Nov '18

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 32ce9aff by tchemit at 2018-11-14T13:28:31Z Après insertion de #1170 - Closes #1171 - - - - - 1 changed file: - persistence/src/main/resources/db/migration/6.1/09_fill_object_material-common.sql Changes: ===================================== persistence/src/main/resources/db/migration/6.1/09_fill_object_material-common.sql ===================================== @@ -104,14 +104,14 @@ INSERT INTO observe_seine.objectmaterial (topiaid, topiaversion, topiacreatedate INSERT INTO observe_seine.objectmaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, legacycode, standardcode, parent, status, needcomment, uri, objectmaterialtype, biodegradable, nonentangling, label1, label2, label3, label4, label5, label6, label7, label8, childrenmultiselectable, childselectionmandatory, validation) VALUES ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.66',0,'2018-11-12','2018-11-12 17:27:06.06232','2-2-4-3',null,null,'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.63',1,false,null,'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0',false,true,'Inert plastic buoy','Bouée plastique inerte','Boya de plástico inerte',null,null,null,null,null,false,false,null); INSERT INTO observe_seine.objectmaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, legacycode, standardcode, parent, status, needcomment, uri, objectmaterialtype, biodegradable, nonentangling, label1, label2, label3, label4, label5, label6, label7, label8, childrenmultiselectable, childselectionmandatory, validation) VALUES ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.67',0,'2018-11-12','2018-11-12 17:27:06.06232','2-2-5',null,'HALOG','fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.59',1,false,null,'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0',false,false,'HALOG (not fishing ALOG)','HALOG (ALOG non pêche)','HALOG (HALOG no pesca)',null,null,null,null,null,true,false,null); INSERT INTO observe_seine.objectmaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, legacycode, standardcode, parent, status, needcomment, uri, objectmaterialtype, biodegradable, nonentangling, label1, label2, label3, label4, label5, label6, label7, label8, childrenmultiselectable, childselectionmandatory, validation) VALUES ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.68',0,'2018-11-12','2018-11-12 17:27:06.06232','4',null,null,'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#1.3',1,false,null,null,false,false,'Other properties','Autres propriétés','Otras propiedades',null,null,null,null,null,true,false,null); -INSERT INTO observe_seine.objectmaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, legacycode, standardcode, parent, status, needcomment, uri, objectmaterialtype, biodegradable, nonentangling, label1, label2, label3, label4, label5, label6, label7, label8, childrenmultiselectable, childselectionmandatory, validation) VALUES ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.69',1,'2018-11-12','2018-11-12 17:27:06.06232','4-1',null,null,'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.68',0,false,null,'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0',true,false,'Biodegradable','Matériaux','Materiales',null,null,null,null,null,false,false,null); +INSERT INTO observe_seine.objectmaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, legacycode, standardcode, parent, status, needcomment, uri, objectmaterialtype, biodegradable, nonentangling, label1, label2, label3, label4, label5, label6, label7, label8, childrenmultiselectable, childselectionmandatory, validation) VALUES ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.69',1,'2018-11-12','2018-11-12 17:27:06.06232','4-1',null,null,'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.68',0,false,null,'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0',true,false,'Biodegradable materials','Matériaux biodégradables','Materiales biodegradables',null,null,null,null,null,false,false,null); INSERT INTO observe_seine.objectmaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, legacycode, standardcode, parent, status, needcomment, uri, objectmaterialtype, biodegradable, nonentangling, label1, label2, label3, label4, label5, label6, label7, label8, childrenmultiselectable, childselectionmandatory, validation) VALUES ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.70',1,'2018-11-12','2018-11-12 17:27:06.06232','4-2','22*',null,'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.68',0,false,null,'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0',false,true,'Non entangling','Non maillant',null,null,null,null,null,null,false,false,null); INSERT INTO observe_seine.objectmaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, legacycode, standardcode, parent, status, needcomment, uri, objectmaterialtype, biodegradable, nonentangling, label1, label2, label3, label4, label5, label6, label7, label8, childrenmultiselectable, childselectionmandatory, validation) VALUES ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.71',1,'2018-11-12','2018-11-12 17:27:06.06232','4-3','23*',null,'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.68',0,false,null,'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0',false,false,'Entangling','Maillant','Enmallante',null,null,null,null,null,false,false,null); INSERT INTO observe_seine.objectmaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, legacycode, standardcode, parent, status, needcomment, uri, objectmaterialtype, biodegradable, nonentangling, label1, label2, label3, label4, label5, label6, label7, label8, childrenmultiselectable, childselectionmandatory, validation) VALUES ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.72',1,'2018-11-12','2018-11-12 17:27:06.06232','4-4',null,null,'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.68',1,false,null,'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#2',false,false,'subsurface depth','profondeur (partie immergée)','profundidad del rabo',null,null,null,null,null,false,false,'x >= 0 && x <= 100'); INSERT INTO observe_seine.objectmaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, legacycode, standardcode, parent, status, needcomment, uri, objectmaterialtype, biodegradable, nonentangling, label1, label2, label3, label4, label5, label6, label7, label8, childrenmultiselectable, childselectionmandatory, validation) VALUES ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.73',0,'2018-11-12','2018-11-12 17:27:06.06232','4-5',null,null,'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.68',1,false,null,'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#1',false,false,'Area (in m2)','Surface (en m2)','Superficie (en m2)',null,null,null,null,null,false,false,'x >= 0.5 && x <= 50'); INSERT INTO observe_seine.objectmaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, legacycode, standardcode, parent, status, needcomment, uri, objectmaterialtype, biodegradable, nonentangling, label1, label2, label3, label4, label5, label6, label7, label8, childrenmultiselectable, childselectionmandatory, validation) VALUES ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.74',1,'2018-11-12','2018-11-12 17:27:06.06232','4-6',null,null,'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.68',1,false,null,'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#2',false,false,'Size of largest mesh','Taille de la maille la plus grande (en mm)','Talla de la malla más grandes (en mm)',null,null,null,null,null,false,false,'x >= 5 && x <= 1000'); INSERT INTO observe_seine.objectmaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, legacycode, standardcode, parent, status, needcomment, uri, objectmaterialtype, biodegradable, nonentangling, label1, label2, label3, label4, label5, label6, label7, label8, childrenmultiselectable, childselectionmandatory, validation) VALUES ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.75',1,'2018-11-12','2018-11-12 17:27:06.06232','4-7',null,null,'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.68',1,false,null,'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#3',false,false,'FOB identifier','Identifiant du FOB','Identificador del FOB',null,null,null,null,null,false,false,'x.length() >= 3 && x.length() <= 64'); -INSERT INTO observe_seine.objectmaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, legacycode, standardcode, parent, status, needcomment, uri, objectmaterialtype, biodegradable, nonentangling, label1, label2, label3, label4, label5, label6, label7, label8, childrenmultiselectable, childselectionmandatory, validation) VALUES ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.76',1,'2018-11-12','2018-11-12 17:27:06.06232','4-8',null,null,'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.68',1,false,null,'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#2',false,false,'Number of FOBs tangled','Nombre de FOBs emmêlés','Numero de FOBs enmallados',null,null,null,null,null,false,false,'x >= 2 && x <= 100'); +INSERT INTO observe_seine.objectmaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, legacycode, standardcode, parent, status, needcomment, uri, objectmaterialtype, biodegradable, nonentangling, label1, label2, label3, label4, label5, label6, label7, label8, childrenmultiselectable, childselectionmandatory, validation) VALUES ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.76',1,'2018-11-12','2018-11-12 17:27:06.06232','4-8',null,null,'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.68',1,false,null,'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#2',false,false,'Number of FOBs entangled', 'Nombre de FOBs emmêlés','Numero de FOBs enmallados',null,null,null,null,null,false,false,'x >= 2 && x <= 100'); INSERT INTO observe_seine.objectmaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, legacycode, standardcode, parent, status, needcomment, uri, objectmaterialtype, biodegradable, nonentangling, label1, label2, label3, label4, label5, label6, label7, label8, childrenmultiselectable, childselectionmandatory, validation) VALUES ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.77',0,'2018-11-12','2018-11-12 17:27:06.06232','6',null,null,'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#1.3',0,false,null,null,false,false,'Legacy codes','Anciens codes','Códigos antiguos',null,null,null,null,null,true,false,null); INSERT INTO observe_seine.objectmaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, legacycode, standardcode, parent, status, needcomment, uri, objectmaterialtype, biodegradable, nonentangling, label1, label2, label3, label4, label5, label6, label7, label8, childrenmultiselectable, childselectionmandatory, validation) VALUES ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.78',0,'2018-11-12','2018-11-12 17:27:06.06232','6-1','99',null,'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.77',0,false,null,'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0',false,false,'Other, unknown','Autre, inconnu','Otro, desconocido',null,null,null,null,null,false,false,null); INSERT INTO observe_seine.objectmaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, legacycode, standardcode, parent, status, needcomment, uri, objectmaterialtype, biodegradable, nonentangling, label1, label2, label3, label4, label5, label6, label7, label8, childrenmultiselectable, childselectionmandatory, validation) VALUES ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.79',0,'2018-11-12','2018-11-12 17:27:06.06232','6-2','14','ALOG','fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.77',0,false,null,'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0',false,false,'One of the previous (10, 11, 12, 13) tagged','Un des antérieurs (10, 11, 12, 13) balisé','Una de los anterior (10, 11, 12, 13) con Baliza',null,null,null,null,null,false,false,null); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/32ce9affe75a56f8586d7e31d92… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/32ce9affe75a56f8586d7e31d92… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] 2 commits: Mise à jour des objectmaterial - Closes #1170
by Tony CHEMIT 14 Nov '18

14 Nov '18

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: a8d6f5a2 by tchemit at 2018-11-14T11:57:06Z Mise à jour des objectmaterial - Closes #1170 - - - - - 8f3cb485 by tchemit at 2018-11-14T11:57:35Z Mise à jour des objectmaterial - Closes #1170 (update tests) - - - - - 8 changed files: - persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_6_1.java - persistence/src/main/resources/db/migration/6.1/09_fill_object_material-common.sql - − persistence/src/main/resources/db/migration/6.1/10_update_objectMaterial-common.sql - persistence/src/main/resources/db/migration/6.1/11_update_object_operation-common.sql → persistence/src/main/resources/db/migration/6.1/10_update_object_operation-common.sql - − persistence/src/main/resources/db/migration/6.1/12_update_object_material-common.sql - test/src/main/resources/db/7.0/dataForTestLongline.sql.gz - test/src/main/resources/db/7.0/dataForTestSeine.sql.gz - test/src/main/resources/db/7.0/referentiel.sql.gz Changes: ===================================== persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_6_1.java ===================================== @@ -69,11 +69,7 @@ public class DataSourceMigrationForVersion_6_1 extends MigrationVersionResource executor.addScript("07", "drop_table_sizemeasuretype"); executor.addScript("08", "add_floating_object_fields"); executor.addScript("09", "fill_object_material"); - // was in version 7.2 - executor.addScript("10", "update_objectMaterial"); - // was in version 7.4 - executor.addScript("11", "update_object_operation"); - executor.addScript("12", "update_object_material"); + executor.addScript("10", "update_object_operation"); } ===================================== persistence/src/main/resources/db/migration/6.1/09_fill_object_material-common.sql ===================================== The diff for this file was not included because it is too large. ===================================== persistence/src/main/resources/db/migration/6.1/10_update_objectMaterial-common.sql deleted ===================================== @@ -1,112 +0,0 @@ ---- --- #%L --- ObServe :: Persistence --- %% --- Copyright (C) 2008 - 2018 IRD, Code Lutin, Ultreia.io --- %% --- 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% ---- --- Le nœud 1-12 n'est pas rattaché au bon père (1-1) -update observe_seine.objectmaterial set parent ='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.2', topiaversion = topiaversion + 1 where topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.4'; --- Supprimer 1-1-1-1-3 -delete from observe_seine.objectmaterial WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.84'; --- Supprimer 1-1-2-7 -delete from observe_seine.objectmaterial WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.37'; --- Supprimer 1-1-2-8 -delete from observe_seine.objectmaterial WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.38'; --- Supprimer 1-1-3-7 -delete from observe_seine.objectmaterial WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.45'; --- Supprimer 1-1-1-2-1 et mettre 1-1-1-2-1-1 et 1-1-1-2-1-2 au niveau supérieur --- parent fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.9 (1-1-1-2) --- fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.11 (1-1-1-2-1-1) → (1-1-1-2-1) -update observe_seine.objectmaterial set code='1-1-1-2-1', parent='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.9', topiaversion=topiaversion+1 WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.11'; --- fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.12 (1-1-1-2-1-1) → (1-1-1-2-2) -update observe_seine.objectmaterial set code='1-1-1-2-2', parent='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.9', topiaversion=topiaversion+1 WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.12'; --- fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.13 was (1-1-1-2-2) → (1-1-1-2-3) -update observe_seine.objectmaterial set code='1-1-1-2-3', topiaversion=topiaversion+1 WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.13'; --- fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.14 was (1-1-1-2-3) → (1-1-1-2-4) -update observe_seine.objectmaterial set code='1-1-1-2-4', topiaversion=topiaversion+1 WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.14'; --- fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.15 (1-1-1-2-4) → (1-1-1-2-5) -update observe_seine.objectmaterial set code='1-1-1-2-5', topiaversion=topiaversion+1 WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.15'; --- fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.10 (remove) -delete from observe_seine.objectmaterial WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.10'; - --- Supprimer 1-1-1-3-1 et mettre 1-1-1-3-1-1 et 1-1-1-3-1-2 au niveau supérieur --- parent fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.16 (1-1-1-3) --- fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.18 (1-1-1-3-1-1) → (1-1-1-3-1) -update observe_seine.objectmaterial set code='1-1-1-3-1', parent='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.16', topiaversion=topiaversion+1 WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.18'; --- fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.19 (1-1-1-3-1-1) → (1-1-1-3-2) -update observe_seine.objectmaterial set code='1-1-1-3-2', parent='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.16', topiaversion=topiaversion+1 WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.19'; --- fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.20 was (1-1-1-3-2) → (1-1-1-3-3) -update observe_seine.objectmaterial set code='1-1-1-3-3', topiaversion=topiaversion+1 WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.20'; --- fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.21 was (1-1-1-3-3) → (1-1-1-3-4) -update observe_seine.objectmaterial set code='1-1-1-3-4', topiaversion=topiaversion+1 WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.21'; --- fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.22 (1-1-1-3-4) → (1-1-1-3-5) -update observe_seine.objectmaterial set code='1-1-1-3-5', topiaversion=topiaversion+1 WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.22'; --- fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.17 (remove) -delete from observe_seine.objectmaterial WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.17'; - --- 1-1-3 other components (tous les fils sont sélectionnables non exclusif) ? deja fait ? -update observe_seine.objectmaterial set childrenmultiselectable = TRUE , topiaversion=topiaversion+1 WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.5'; - --- pour 1.1.2 (fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.4) --- * not structure (1-1-2-6) -> (1-1-2-1) fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.36 -update observe_seine.objectmaterial set code = '1-1-2-1', topiaversion=topiaversion+1 WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.36'; --- * not visible (1-1-2-6) -> (1-1-2-2) fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.35 -update observe_seine.objectmaterial set code = '1-1-2-2', topiaversion=topiaversion+1 WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.35'; --- * rope/no mesh (1-1-2-6) -> (1-1-2-3) fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.34 -update observe_seine.objectmaterial set code = '1-1-2-3', topiaversion=topiaversion+1 WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.34'; --- * mesh (5 fils non exclusif) (new node) (1-1-2-4) -INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#1.1', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL, NULL, '1-1-2-4' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.4' , 'Mesh', 'Maille', 'Malla', false, true , false, NULL, NULL, false, false); --- * net in sausage (1-1-2-1) → (1-1-2-4-1) fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.25 -update observe_seine.objectmaterial set code = '1-1-2-4-1', parent='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#1.1',topiaversion=topiaversion+1 WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.25'; --- * open net < 7 (1-1-2-2-1) → (1-1-2-4-2) fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.29 -update observe_seine.objectmaterial set code = '1-1-2-4-2', parent='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#1.1',topiaversion=topiaversion+1 WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.29'; --- * open net > 7 (1-1-2-2-2) → (1-1-2-4-3) fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.30 -update observe_seine.objectmaterial set code = '1-1-2-4-3', parent='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#1.1',topiaversion=topiaversion+1 WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.30'; --- * single net < 7 (1-1-2-3-1) → (1-1-2-4-4) fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.32 -update observe_seine.objectmaterial set code = '1-1-2-4-4', parent='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#1.1',topiaversion=topiaversion+1 WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.32'; --- * single net > 7 (1-1-2-3-2) → (1-1-2-4-5) fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.33 -update observe_seine.objectmaterial set code = '1-1-2-4-5', parent='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#1.1', topiaversion=topiaversion+1 WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.33'; - --- remove 1-1-2-1-1 fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.26 -delete from observe_seine.objectmaterial WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.26'; --- remove 1-1-2-1-2 fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.27 -delete from observe_seine.objectmaterial WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.27'; --- remove 1-1-2-2 fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.28 -delete from observe_seine.objectmaterial WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.28'; --- remove 1-1-2-3 fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.31 -delete from observe_seine.objectmaterial WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.31'; - --- Passage en disabled 4-1 -update observe_seine.objectmaterial set status=0, topiaversion=topiaversion+1 WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.69'; --- Passage en disabled 4-2 -update observe_seine.objectmaterial set status=0, topiaversion=topiaversion+1 WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.70'; --- Passage en disabled 4-3 -update observe_seine.objectmaterial set status=0, topiaversion=topiaversion+1 WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.71'; --- Mise à jour label 4-4 -update observe_seine.objectmaterial set label1='subsurface depth', label2='profondeur (partie immergée)', label3='profundidad del rabo', topiaversion=topiaversion+1 WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.72'; --- Mise à jour validation 4-6 -update observe_seine.objectmaterial set validation='x >= 5 && x <= 1000', topiaversion=topiaversion+1 WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.74'; --- Mise à jour label 4-8 -update observe_seine.objectmaterial set label2='Number of tangled FOBs', label3='Numero de FADs enmallados', topiaversion=topiaversion+1 WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.76'; --- Mise à jour formule de validation len -update observe_seine.objectmaterial set validation='x.length() >= 3 && x.length() <= 64', topiaversion=topiaversion+1 WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.75'; --- Re-add entry for FOB with '' code -INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#1.3', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL, 'FOB', '' , null , 'FOB', 'FOB', 'FOB', false, true , true, NULL, NULL, false, false); -UPDATE observe_seine.objectmaterial SET parent='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#1.3' WHERE parent IS NULL; -UPDATE observe_seine.objectmaterial SET parent= NULL WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#1.3'; -UPDATE observe_seine.objectmaterial SET SELECTABLE = TRUE WHERE parent='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#1.3' and status = '1'; ===================================== persistence/src/main/resources/db/migration/6.1/11_update_object_operation-common.sql → persistence/src/main/resources/db/migration/6.1/10_update_object_operation-common.sql ===================================== ===================================== persistence/src/main/resources/db/migration/6.1/12_update_object_material-common.sql deleted ===================================== @@ -1,44 +0,0 @@ ---- --- #%L --- ObServe :: Persistence --- %% --- Copyright (C) 2008 - 2018 IRD, Code Lutin, Ultreia.io --- %% --- 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% ---- - -UPDATE observe_seine.objectmaterial SET selectable = FALSE, childselectionmandatory = FALSE WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.1'; -UPDATE observe_seine.objectmaterial SET selectable = FALSE, childselectionmandatory = FALSE WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.50'; -UPDATE observe_seine.objectmaterial SET selectable = FALSE, childselectionmandatory = FALSE WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.68'; -UPDATE observe_seine.objectmaterial SET selectable = FALSE, childselectionmandatory = FALSE WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.77'; - -UPDATE observe_seine.objectmaterial SET childselectionmandatory = FALSE WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.3'; - -UPDATE observe_seine.objectmaterial SET childrenmultiselectable = TRUE , childselectionmandatory = FALSE WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.6'; -UPDATE observe_seine.objectmaterial SET childrenmultiselectable = FALSE , childselectionmandatory = FALSE WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.9'; -UPDATE observe_seine.objectmaterial SET childrenmultiselectable = FALSE , childselectionmandatory = FALSE WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.16'; - -UPDATE observe_seine.objectmaterial SET objectmaterialtype ='fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', selectable = TRUE WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.4'; - -UPDATE observe_seine.objectmaterial SET objectmaterialtype ='fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', selectable = TRUE , childrenmultiselectable = FALSE WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.25'; - -INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.87', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL, '', '1-1-1-1-3' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.6' , 'Not visible', 'Non visible', 'No se ve', true, false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL, false, false); - --- See https://gitlab.com/ultreiaio/ird-observe/issues/1136 -UPDATE observe_seine.objectmaterial SET legacyCode ='22*, 23*', topiaVersion = topiaVersion + 1 WHERE topiaid = 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.3'; -UPDATE observe_seine.objectmaterial SET legacyCode = NULL, topiaVersion = topiaVersion + 1 WHERE topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.2'; -INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ( 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.100', 0, CURRENT_DATE, CURRENT_TIMESTAMP, true, 0, '16', null, '6-6' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.77' , ' Raft or buoy drifting', 'Radeau ou bouée en dérive','Parilla o buoy a la deriva', true, false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL, false, false); -ALTER TABLE observe_seine.objectmaterial DROP COLUMN selectable; ===================================== test/src/main/resources/db/7.0/dataForTestLongline.sql.gz ===================================== The diff for this file was not included because it is too large. ===================================== test/src/main/resources/db/7.0/dataForTestSeine.sql.gz ===================================== The diff for this file was not included because it is too large. ===================================== test/src/main/resources/db/7.0/referentiel.sql.gz ===================================== The diff for this file was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/2c21fc3e8e761df7c0183f3040… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/2c21fc3e8e761df7c0183f3040… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] [FOB] Affichage bizarre - Closes #1169
by Tony CHEMIT 14 Nov '18

14 Nov '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 5144d007 by tchemit at 2018-11-14T10:20:50Z [FOB] Affichage bizarre - Closes #1169 - - - - - 1 changed file: - client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/dcp/FloatingObjectPartsTableCellRenderer.java Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/dcp/FloatingObjectPartsTableCellRenderer.java ===================================== @@ -61,9 +61,13 @@ public class FloatingObjectPartsTableCellRenderer implements TableCellRenderer { TableCellRenderer renderer = objectRenderer; Object newValue = value; boolean enabled = node.isEditable() && table.isCellEditable(row, column) && node.isEnabled(); - if (node.isBoolean() && node.isColumnEditable(column)) { - newValue = value == null ? null : Boolean.valueOf(String.valueOf(value)); - renderer = node.isExclusive() ? booleanExclusiveRenderer : booleanInclusiveRenderer; + if (node.isBoolean()) { + if (node.isColumnEditable(column)) { + newValue = value == null ? null : Boolean.valueOf(String.valueOf(value)); + renderer = node.isExclusive() ? booleanExclusiveRenderer : booleanInclusiveRenderer; + } else { + newValue=""; + } } Component component = renderer.getTableCellRendererComponent(table, newValue, isSelected, hasFocus, row, column); component.setEnabled(enabled); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/5144d0077b4d97ce1484823256c… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/5144d0077b4d97ce1484823256c… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] [FOB] Affichage bizarre - Closes #1169
by Tony CHEMIT 14 Nov '18

14 Nov '18

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 2c21fc3e by tchemit at 2018-11-14T10:17:13Z [FOB] Affichage bizarre - Closes #1169 - - - - - 1 changed file: - client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/dcp/FloatingObjectPartsTableCellRenderer.java Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/dcp/FloatingObjectPartsTableCellRenderer.java ===================================== @@ -61,9 +61,13 @@ public class FloatingObjectPartsTableCellRenderer implements TableCellRenderer { TableCellRenderer renderer = objectRenderer; Object newValue = value; boolean enabled = node.isEditable() && table.isCellEditable(row, column) && node.isEnabled(); - if (node.isBoolean() && node.isColumnEditable(column)) { - newValue = value == null ? null : Boolean.valueOf(String.valueOf(value)); - renderer = node.isExclusive() ? booleanExclusiveRenderer : booleanInclusiveRenderer; + if (node.isBoolean()) { + if (node.isColumnEditable(column)) { + newValue = value == null ? null : Boolean.valueOf(String.valueOf(value)); + renderer = node.isExclusive() ? booleanExclusiveRenderer : booleanInclusiveRenderer; + } else { + newValue=""; + } } Component component = renderer.getTableCellRendererComponent(table, newValue, isSelected, hasFocus, row, column); component.setEnabled(enabled); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/2c21fc3e8e761df7c0183f30409… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/2c21fc3e8e761df7c0183f30409… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] 2 commits: Traductions espagnoles - update i18n editor (See #1165)
by Tony CHEMIT 14 Nov '18

14 Nov '18

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 55e382ad by tchemit at 2018-11-14T00:07:18Z Traductions espagnoles - update i18n editor (See #1165) - - - - - 76b00ba0 by tchemit at 2018-11-14T00:13:45Z Traductions espagnoles - add first IEO es translations :) editor (See #1165) - - - - - 4 changed files: - client-configuration/src/main/resources/observe-log4j2.xml - client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/config/TranslateAction.java - observe-i18n/src/main/i18n/translations/observe_es_ES.properties - pom.xml Changes: ===================================== client-configuration/src/main/resources/observe-log4j2.xml ===================================== @@ -45,6 +45,10 @@ <AppenderRef ref="console"/> <AppenderRef ref="File"/> </Logger> + <Logger name="org.nuiton.i18n.editor" level="info" additivity="false"> + <AppenderRef ref="console"/> + <AppenderRef ref="File"/> + </Logger> <Logger name="org.nuiton.topia" level="info" additivity="false"> <AppenderRef ref="console"/> <AppenderRef ref="File"/> ===================================== client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/config/TranslateAction.java ===================================== @@ -10,12 +10,12 @@ package fr.ird.observe.client.ui.actions.main.menu.config; * 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>. @@ -23,7 +23,6 @@ package fr.ird.observe.client.ui.actions.main.menu.config; */ import fr.ird.observe.client.ObserveSwingApplicationContext; -import fr.ird.observe.client.ObserveSwingTechnicalException; import fr.ird.observe.client.configuration.ClientConfig; import fr.ird.observe.client.ui.ObserveMainUI; import fr.ird.observe.client.ui.ObserveUICallback; @@ -39,7 +38,6 @@ import java.awt.event.ActionEvent; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; import java.io.File; -import java.io.IOException; import static io.ultreia.java4all.i18n.I18n.t; @@ -67,7 +65,7 @@ public class TranslateAction extends MenuActionSupport { ClientConfig config = ObserveSwingApplicationContext.get().getConfig(); File i18nDirectory = config.getI18nDirectory(); - Project model = new Project(I18n.getLanguageProvider()); + Project model = new Project(I18n.getLanguageProvider(), i18nDirectory.toPath()); ProjectUI projectUI = new ProjectUI(getMainUI(), model); projectUI.toggleFilter(); @@ -75,12 +73,7 @@ public class TranslateAction extends MenuActionSupport { @Override public void windowClosed(WindowEvent e) { if (model.getLastExport() != null) { - log.info(String.format("Found existing i18n export, will merge it to user i18n data (%s).", i18nDirectory)); - try { - model.mergeExport(i18nDirectory); - } catch (IOException e1) { - throw new ObserveSwingTechnicalException("Can't merge i18n export", e1); - } + log.info("Found existing i18n export, will reload i18n"); UIHelper.displayInfo(t("observe.title.reload.i18n"), t("observe.message.reload.i18n")); ObserveUICallback.application.run(); } ===================================== observe-i18n/src/main/i18n/translations/observe_es_ES.properties ===================================== @@ -349,47 +349,47 @@ observe.common.ActivityDto.action.delete.tip=Eliminar la actividad observe.common.ActivityDto.action.goToOpen=Acceder a la actividad abierta observe.common.ActivityDto.action.goToOpen.short=Actividad abierta observe.common.ActivityDto.action.goToOpen.tip=Acceder a la actividad abierta -observe.common.ActivityDto.action.goToSelected=Acceder a la actividad +observe.common.ActivityDto.action.goToSelected=Acceder a la actividad seleccionada observe.common.ActivityDto.action.goToSelected.tip=Acceder a la actividad seleccionada observe.common.ActivityDto.action.reopen.tip=Reabrir la actividad observe.common.ActivityDto.action.reopenSelected=Reabrir la actividad observe.common.ActivityDto.action.reopenSelected.tip=Reabrir la actividad seleccionada -observe.common.ActivityDto.list=Lista de las actividades +observe.common.ActivityDto.list=Lista de actividades observe.common.ActivityLonglineDto.action.addSet=Añadir la operación de pesca observe.common.ActivityLonglineDto.action.addSet.tip=Añadir la operación de pesca asociada a esta actividad observe.common.ActivityLonglineDto.action.moves=Cambiar de marea observe.common.ActivityLonglineDto.action.moves.tip=Cambiar la marea de las actividades seleccionas observe.common.ActivityLonglineDto.date=Día de observación -observe.common.ActivityLonglineDto.fpaZone=Zona FPA +observe.common.ActivityLonglineDto.fpaZone=ZEE observe.common.ActivityLonglineDto.message.active.found=Actividad abierta -observe.common.ActivityLonglineDto.message.active.found.for.other.trip=Existe una actividad abierta en otra ruta. +observe.common.ActivityLonglineDto.message.active.found.for.other.trip=Existe una actividad abierta en otra marea. observe.common.ActivityLonglineDto.message.creating=Actividad en proceso de creación. observe.common.ActivityLonglineDto.message.no.active.found=Ninguna actividad abierta, puede crear una nueva o reabrir una. -observe.common.ActivityLonglineDto.message.no.active.found.for.other.trip=Ninguna actividad abierta en esta ruta. -observe.common.ActivityLonglineDto.message.nonForTrip=< Ninguna actividad por la marea actual > +observe.common.ActivityLonglineDto.message.no.active.found.for.other.trip=Ninguna actividad abierta en esta marea. +observe.common.ActivityLonglineDto.message.nonForTrip=< Ninguna actividad para la marea actual > observe.common.ActivityLonglineDto.message.not.open=La actividad no está abierta, imposible modificar. observe.common.ActivityLonglineDto.message.updating=Se está modificando la actividad actual. -observe.common.ActivityLonglineDto.seaSurfaceTemperature=Temperatura de la superficie +observe.common.ActivityLonglineDto.seaSurfaceTemperature=Temperatura de superficie observe.common.ActivityLonglineDto.time=Hora -observe.common.ActivityLonglineDto.timeStamp=Timestamp +observe.common.ActivityLonglineDto.timeStamp=FechaHora observe.common.ActivityLonglineDto.title=Actividad observe.common.ActivityLonglineDto.titles=Actividades observe.common.ActivityLonglineDto.type=Actividad observe.common.ActivityLonglineDto.types=Actividades observe.common.ActivityLonglineDto.vesselActivityLongline=Actividad barco -observe.common.ActivitySeineDto.action.addFloatingObject=Añadir un DCP +observe.common.ActivitySeineDto.action.addFloatingObject=Añadir un FOB observe.common.ActivitySeineDto.action.addFloatingObject.tip=Añadir un objeto flotante a la actividad observe.common.ActivitySeineDto.action.addSet=Añadir un lance observe.common.ActivitySeineDto.action.addSet.tip=Añadir el lance de la actividad observe.common.ActivitySeineDto.action.moves=Cambiar de ruta observe.common.ActivitySeineDto.action.moves.tip=Cambiar la ruta de las actividades seleccionadas observe.common.ActivitySeineDto.availableObservedSystem=Sistemas observados disponibles -observe.common.ActivitySeineDto.coordinates=Coordenada -observe.common.ActivitySeineDto.currentFpaZone=Zona FPA actual +observe.common.ActivitySeineDto.coordinates=Coordenadas +observe.common.ActivitySeineDto.currentFpaZone=ZEE actual observe.common.ActivitySeineDto.detectionMode=Modo de detección observe.common.ActivitySeineDto.error.no.activity.6=La actividad con código 6 no se ha encontrado en la base de datos. observe.common.ActivitySeineDto.ersId=Id ERS -observe.common.ActivitySeineDto.floatingObjectEmpty=Objeto flotante vacía +observe.common.ActivitySeineDto.floatingObjectEmpty=Objeto flotante sin registrar observe.common.ActivitySeineDto.generalTab=Actividad y Posición observe.common.ActivitySeineDto.measurementsTab=Parámetros observe.common.ActivitySeineDto.message.active.found=Actividad abierta @@ -397,16 +397,16 @@ observe.common.ActivitySeineDto.message.active.found.for.other.route=Existe una observe.common.ActivitySeineDto.message.creating=Actividad en proceso de creación. observe.common.ActivitySeineDto.message.no.active.found=Ninguna actividad abierta, puede crear una nueva o reabrir una. observe.common.ActivitySeineDto.message.no.active.found.for.other.route=Ninguna actividad abierta en esta ruta. -observe.common.ActivitySeineDto.message.noneForRoute=< Ninguna actividad por la ruta actual > +observe.common.ActivitySeineDto.message.noneForRoute=< Ninguna actividad para la ruta actual > observe.common.ActivitySeineDto.message.not.open=La actividad no está abierta, imposible modificar. observe.common.ActivitySeineDto.message.updating=Se está modificando la actividad actual. -observe.common.ActivitySeineDto.nextFpaZone=Zona FPA penetrada +observe.common.ActivitySeineDto.nextFpaZone=ZEE próxima observe.common.ActivitySeineDto.nonTargetCatchSpecies=TODO observe.common.ActivitySeineDto.observedSystem=Sistema observado observe.common.ActivitySeineDto.observedSystemDistance=Distancia al sistema observado (millas con 1 decimal) observe.common.ActivitySeineDto.observedSystemTab=Sistema observado -observe.common.ActivitySeineDto.previousFpaZone=La zona FPA de que se salió -observe.common.ActivitySeineDto.reasonForNoFishing=Razón de no pesca Senne +observe.common.ActivitySeineDto.previousFpaZone=ZEE anterior +observe.common.ActivitySeineDto.reasonForNoFishing=Razón de NO lance observe.common.ActivitySeineDto.seaSurfaceTemperature=Temperatura en superficie observe.common.ActivitySeineDto.selectedObservedSystem=Sistemas observados seleccionados observe.common.ActivitySeineDto.surroundingActivity=Actividad circundante @@ -419,10 +419,10 @@ observe.common.ActivitySeineDto.vesselActivitySeine=Actividad buque observe.common.ActivitySeineDto.vesselActivitySeine.comment=Solo la actividad %1$s permite introducir un lance observe.common.ActivitySeineDto.vesselSpeed=Velocidad del barco (nd) observe.common.ActivitySeineDto.wind=Fuerza del viento -observe.common.BaitHaulingStatusDto.type=Estatuto del cebo en el arrastre -observe.common.BaitHaulingStatusDto.types=Estatutos del cebo en el arrastre -observe.common.BaitSettingStatusDto.type=Estatuto del cebo en la calada -observe.common.BaitSettingStatusDto.types=Estatutos del cebo en la calada +observe.common.BaitHaulingStatusDto.type=Estatus del cebo en el arrastre +observe.common.BaitHaulingStatusDto.types=Estatus del cebo en el arrastre +observe.common.BaitSettingStatusDto.type=Estatus del cebo en la calada +observe.common.BaitSettingStatusDto.types=Estatus del cebo en la calada observe.common.BaitTypeDto.type=Tipo de cebo observe.common.BaitTypeDto.types=Tipos de cebo observe.common.BaitsCompositionDto.action.create=Insertar este cebo @@ -433,8 +433,8 @@ observe.common.BaitsCompositionDto.individualSize=Tamaño (cm) observe.common.BaitsCompositionDto.individualWeight=Peso (kg) observe.common.BaitsCompositionDto.proportion=Proporción (%) observe.common.BaitsCompositionDto.proportionSum=Suma de los proporciónes de cebo (%) -observe.common.BaitsCompositionDto.table.baitSettingStatus=Estatuto -observe.common.BaitsCompositionDto.table.baitSettingStatus.tip=Estatuto en la calada +observe.common.BaitsCompositionDto.table.baitSettingStatus=Estatus +observe.common.BaitsCompositionDto.table.baitSettingStatus.tip=Estatus en la calada observe.common.BaitsCompositionDto.table.baitType=Tipo de cebo observe.common.BaitsCompositionDto.table.baitType.tip=Tipo de cebo observe.common.BaitsCompositionDto.table.individualSize=Tamaño (cm) @@ -445,52 +445,52 @@ observe.common.BaitsCompositionDto.table.proportion=Proporción (%) observe.common.BaitsCompositionDto.table.proportion.tip=Proporción (%) observe.common.BaitsCompositionDto.title=Composición de los cebos observe.common.BaitsCompositionDto.type=Composición de los cebos -observe.common.BaitsCompositionDto.types=Composiciónes de los cebos +observe.common.BaitsCompositionDto.types=Composición de los cebos observe.common.BasketDto.floatline1Length=Orinque 1 (m) observe.common.BasketDto.floatline2Length=Orinque 2 (m) observe.common.BasketDto.type=Cesta observe.common.BasketDto.types=Cestas -observe.common.BranchlineDto.baitSettingStatus=Estatuto del cebo en la calada +observe.common.BranchlineDto.baitSettingStatus=Estatus del cebo en la calada observe.common.BranchlineDto.baitType=Tipo de cebo -observe.common.BranchlineDto.branchlineLength=Arponcillo (m) -observe.common.BranchlineDto.depthRecorder=Registrador de profundidad -observe.common.BranchlineDto.generalTab=Generalidad +observe.common.BranchlineDto.branchlineLength=Longitud del arponcillo (m) +observe.common.BranchlineDto.depthRecorder=Sensor de profundidad +observe.common.BranchlineDto.generalTab=Generalidades observe.common.BranchlineDto.hookAndBaitTab=Anzuelo y cebo -observe.common.BranchlineDto.hookLost=Anzuelo erdido +observe.common.BranchlineDto.hookLost=Anzuelo perdido observe.common.BranchlineDto.hookOffset=Offset anzuelo (°) observe.common.BranchlineDto.hookSize=Tamaño del anzuelo observe.common.BranchlineDto.hookType=Tipo de anzuelo -observe.common.BranchlineDto.message.modified=El arponcillo que se está modificando actualmente ha sido modificado y es valido. -observe.common.BranchlineDto.message.modified.but.invalid=El arponcillo que se está modificando actualmente ha sido modificado, pero no es valido. -observe.common.BranchlineDto.snapWeight=Peso snap (kg) -observe.common.BranchlineDto.swivelWeight=Peso de el destorcedor (kg) -observe.common.BranchlineDto.timeSinceContact=Tiempo desde el estallido +observe.common.BranchlineDto.message.modified=El arponcillo que se está modificando actualmente ha sido modificado y es válido. +observe.common.BranchlineDto.message.modified.but.invalid=El arponcillo que se está modificando actualmente ha sido modificado, pero no es válido. +observe.common.BranchlineDto.snapWeight=Peso del lastre (kg) +observe.common.BranchlineDto.swivelWeight=Peso del broche (kg) +observe.common.BranchlineDto.timeSinceContact=Hora de contacto observe.common.BranchlineDto.timer=Reloj -observe.common.BranchlineDto.timerTimeOnBoard=Timestamp de subida a bordo +observe.common.BranchlineDto.timerTimeOnBoard=FechaHora de subida a bordo observe.common.BranchlineDto.title=Detalle de arponcillo -observe.common.BranchlineDto.topType=Tipo parte superior -observe.common.BranchlineDto.traceCutOff=Bajo de línea cortada -observe.common.BranchlineDto.tracelineLength=Parte baja (m) -observe.common.BranchlineDto.tracelineType=Tipo bajo de línea +observe.common.BranchlineDto.topType=Tipo de línea superior +observe.common.BranchlineDto.traceCutOff=Base de la línea de fondo +observe.common.BranchlineDto.tracelineLength=Línea de fondo (m) +observe.common.BranchlineDto.tracelineType=Tipo de línea de fondo observe.common.BranchlineDto.type=Arponcillo observe.common.BranchlineDto.types=Arponcillos -observe.common.BranchlineDto.weightedSnap=Snap plomeado -observe.common.BranchlineDto.weightedSwivel=Destorcedor plomeado +observe.common.BranchlineDto.weightedSnap=Lastre de plomo +observe.common.BranchlineDto.weightedSwivel=Broche de plomo observe.common.BranchlinesCompositionDto.action.create=Insertar este arponcillo observe.common.BranchlinesCompositionDto.action.create.tip=Insertar este arponcillo observe.common.BranchlinesCompositionDto.length=Longitud (m) observe.common.BranchlinesCompositionDto.proportion=Proporción (%) -observe.common.BranchlinesCompositionDto.proportionSum=Suma de los proporciónes de arponcillos (%) +observe.common.BranchlinesCompositionDto.proportionSum=Suma de las proporciones de arponcillos (%) observe.common.BranchlinesCompositionDto.table.length=Longitud (m) observe.common.BranchlinesCompositionDto.table.length.tip=Longitud (m) observe.common.BranchlinesCompositionDto.table.proportion=Proporción (%) observe.common.BranchlinesCompositionDto.table.proportion.tip=Proporción (%) -observe.common.BranchlinesCompositionDto.table.topType=Tipo de la parte superior -observe.common.BranchlinesCompositionDto.table.topType.tip=Tipo de la parte superior -observe.common.BranchlinesCompositionDto.table.tracelineLength=Parte baja (m) -observe.common.BranchlinesCompositionDto.table.tracelineLength.tip=Parte baja (m) -observe.common.BranchlinesCompositionDto.table.tracelineType=Tipo bajo de línea -observe.common.BranchlinesCompositionDto.table.tracelineType.tip=Tipo bajo de línea +observe.common.BranchlinesCompositionDto.table.topType=Tipo de línea superior +observe.common.BranchlinesCompositionDto.table.topType.tip=Tipo de línea superior +observe.common.BranchlinesCompositionDto.table.tracelineLength=Longitud de la línea de fondo (m) +observe.common.BranchlinesCompositionDto.table.tracelineLength.tip=Longitud de la línea de fondo (m) +observe.common.BranchlinesCompositionDto.table.tracelineType=Tipo línea fondo +observe.common.BranchlinesCompositionDto.table.tracelineType.tip=Tipo línea de fondo observe.common.BranchlinesCompositionDto.title=Composición de arponcillos observe.common.BranchlinesCompositionDto.topType=Tipo de la parte superior observe.common.BranchlinesCompositionDto.tracelineLength=Parte baja (m) @@ -1662,8 +1662,8 @@ observe.common.species=Especie observe.common.speciesAndSizeMeasure=Especie - Tipo de medida del tamaño observe.common.step.description=Descripción de la etapa observe.common.storage.not.valid=Fuente de datos no configurada -observe.common.whenArriving=À l'arrivée \#TODO -observe.common.whenLeaving=Au départ \#TODO +observe.common.whenArriving=Al llegar +observe.common.whenLeaving=Al dejar observe.config.backup.atClose=Realizar una copia de seguridad de la base de datos local al cerrar la aplicación observe.config.backup.delay=Minutos entre cada copia de seguridad de la base de datos local observe.config.backup.use=Para activar la copia de seguridad automática ===================================== pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2018.72</version> + <version>2018.8.3</version> </parent> <groupId>fr.ird.observe</groupId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/d8ecd54855947a91acd3d239e3… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/d8ecd54855947a91acd3d239e3… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: Traductions espagnoles - update i18n editor (See #1165)
by Tony CHEMIT 14 Nov '18

14 Nov '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 9e86d544 by tchemit at 2018-11-13T23:51:34Z Traductions espagnoles - update i18n editor (See #1165) - - - - - c4dd8462 by tchemit at 2018-11-14T00:00:25Z Traductions espagnoles - add first IEO es translations :) editor (See #1165) - - - - - 4 changed files: - client-configuration/src/main/resources/observe-log4j2.xml - client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/config/TranslateAction.java - observe-i18n/src/main/i18n/translations/observe_es_ES.properties - pom.xml Changes: ===================================== client-configuration/src/main/resources/observe-log4j2.xml ===================================== @@ -43,6 +43,10 @@ <AppenderRef ref="console"/> <AppenderRef ref="File"/> </Logger> + <Logger name="org.nuiton.i18n.editor" level="info" additivity="false"> + <AppenderRef ref="console"/> + <AppenderRef ref="File"/> + </Logger> <Logger name="org.nuiton.topia" level="info" additivity="false"> <AppenderRef ref="console"/> <AppenderRef ref="File"/> ===================================== client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/config/TranslateAction.java ===================================== @@ -10,12 +10,12 @@ package fr.ird.observe.client.ui.actions.main.menu.config; * 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>. @@ -23,7 +23,6 @@ package fr.ird.observe.client.ui.actions.main.menu.config; */ import fr.ird.observe.client.ObserveSwingApplicationContext; -import fr.ird.observe.client.ObserveSwingTechnicalException; import fr.ird.observe.client.configuration.ClientConfig; import fr.ird.observe.client.ui.ObserveMainUI; import fr.ird.observe.client.ui.ObserveUICallback; @@ -39,7 +38,6 @@ import java.awt.event.ActionEvent; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; import java.io.File; -import java.io.IOException; import static io.ultreia.java4all.i18n.I18n.t; @@ -67,7 +65,7 @@ public class TranslateAction extends MenuActionSupport { ClientConfig config = ObserveSwingApplicationContext.get().getConfig(); File i18nDirectory = config.getI18nDirectory(); - Project model = new Project(I18n.getLanguageProvider()); + Project model = new Project(I18n.getLanguageProvider(), i18nDirectory.toPath()); ProjectUI projectUI = new ProjectUI(getMainUI(), model); projectUI.toggleFilter(); @@ -75,12 +73,7 @@ public class TranslateAction extends MenuActionSupport { @Override public void windowClosed(WindowEvent e) { if (model.getLastExport() != null) { - log.info(String.format("Found existing i18n export, will merge it to user i18n data (%s).", i18nDirectory)); - try { - model.mergeExport(i18nDirectory); - } catch (IOException e1) { - throw new ObserveSwingTechnicalException("Can't merge i18n export", e1); - } + log.info("Found existing i18n export, will reload i18n"); UIHelper.displayInfo(t("observe.title.reload.i18n"), t("observe.message.reload.i18n")); ObserveUICallback.application.run(); } ===================================== observe-i18n/src/main/i18n/translations/observe_es_ES.properties ===================================== @@ -367,12 +367,12 @@ observe.common.ActivityDto.action.delete.tip=Eliminar la actividad observe.common.ActivityDto.action.goToOpen=Acceder a la actividad abierta observe.common.ActivityDto.action.goToOpen.short=Actividad abierta observe.common.ActivityDto.action.goToOpen.tip=Acceder a la actividad abierta -observe.common.ActivityDto.action.goToSelected=Acceder a la actividad +observe.common.ActivityDto.action.goToSelected=Acceder a la actividad seleccionada observe.common.ActivityDto.action.goToSelected.tip=Acceder a la actividad seleccionada observe.common.ActivityDto.action.reopen.tip=Reabrir la actividad observe.common.ActivityDto.action.reopenSelected=Reabrir la actividad observe.common.ActivityDto.action.reopenSelected.tip=Reabrir la actividad seleccionada -observe.common.ActivityDto.list=Lista de las actividades +observe.common.ActivityDto.list=Lista de actividades observe.common.ActivityLogbookDto.action.goToOpen.short=Logbook - Open activity \#TODO observe.common.ActivityLogbookDto.action.goToOpen.tip=Go to open activity (Logbook) \#TODO observe.common.ActivityLonglineDto.action.addSet=Añadir la operación de pesca @@ -380,14 +380,14 @@ observe.common.ActivityLonglineDto.action.addSet.tip=Añadir la operación de pe observe.common.ActivityLonglineDto.action.moves=Cambiar de marea observe.common.ActivityLonglineDto.action.moves.tip=Cambiar la marea de las actividades seleccionas observe.common.ActivityLonglineDto.message.active.found=Actividad abierta -observe.common.ActivityLonglineDto.message.active.found.for.other.trip=Existe una actividad abierta en otra ruta. +observe.common.ActivityLonglineDto.message.active.found.for.other.trip=Existe una actividad abierta en otra marea. observe.common.ActivityLonglineDto.message.creating=Actividad en proceso de creación. observe.common.ActivityLonglineDto.message.no.active.found=Ninguna actividad abierta, puede crear una nueva o reabrir una. -observe.common.ActivityLonglineDto.message.no.active.found.for.other.trip=Ninguna actividad abierta en esta ruta. -observe.common.ActivityLonglineDto.message.nonForTrip=< Ninguna actividad por la marea actual > +observe.common.ActivityLonglineDto.message.no.active.found.for.other.trip=Ninguna actividad abierta en esta marea. +observe.common.ActivityLonglineDto.message.nonForTrip=< Ninguna actividad para la marea actual > observe.common.ActivityLonglineDto.message.not.open=La actividad no está abierta, imposible modificar. observe.common.ActivityLonglineDto.message.updating=Se está modificando la actividad actual. -observe.common.ActivityLonglineDto.timeStamp=Timestamp +observe.common.ActivityLonglineDto.timeStamp=FechaHora observe.common.ActivityLonglineDto.titles=Actividades observe.common.ActivityLonglineLogbookDto.action.addSet=Añadir la operación de pesca observe.common.ActivityLonglineLogbookDto.action.addSet.tip=Añadir la operación de pesca asociada a esta actividad @@ -401,7 +401,7 @@ observe.common.ActivityLonglineLogbookDto.currentDirection=Current direction (° observe.common.ActivityLonglineLogbookDto.currentSpeed=Current speed (kt) \#TODO observe.common.ActivityLonglineLogbookDto.dataQuality=Qualité de donnée \#TODO observe.common.ActivityLonglineLogbookDto.date=Día de observación -observe.common.ActivityLonglineLogbookDto.fpaZone=Zona FPA +observe.common.ActivityLonglineLogbookDto.fpaZone=ZEE observe.common.ActivityLonglineLogbookDto.latitude=Latitud observe.common.ActivityLonglineLogbookDto.list.message.none=< Ninguna actividad por la marea actual > observe.common.ActivityLonglineLogbookDto.longitude=Longitude @@ -414,7 +414,7 @@ observe.common.ActivityLonglineLogbookDto.message.not.open=La actividad no está observe.common.ActivityLonglineLogbookDto.message.updating=Se está modificando la actividad actual. observe.common.ActivityLonglineLogbookDto.quadrant=Quadrant observe.common.ActivityLonglineLogbookDto.relatedObservedActivity=Related observed activity \#TODO -observe.common.ActivityLonglineLogbookDto.seaSurfaceTemperature=Temperatura de la superficie +observe.common.ActivityLonglineLogbookDto.seaSurfaceTemperature=Temperatura de superficie observe.common.ActivityLonglineLogbookDto.time=Hora observe.common.ActivityLonglineLogbookDto.timeStamp=Timestamp observe.common.ActivityLonglineLogbookDto.title=Actividad @@ -432,7 +432,7 @@ observe.common.ActivityLonglineObsDto.action.moves.tip=Cambiar la marea de las a observe.common.ActivityLonglineObsDto.comment=Comentario de la actividad observe.common.ActivityLonglineObsDto.dataQuality=Qualité de donnée \#TODO observe.common.ActivityLonglineObsDto.date=Día de observación -observe.common.ActivityLonglineObsDto.fpaZone=Zona FPA +observe.common.ActivityLonglineObsDto.fpaZone=ZEE observe.common.ActivityLonglineObsDto.latitude=Latitud observe.common.ActivityLonglineObsDto.list.message.none=< Ninguna actividad por la marea actual > observe.common.ActivityLonglineObsDto.longitude=Longitude @@ -444,7 +444,7 @@ observe.common.ActivityLonglineObsDto.message.no.active.found.for.other.trip=Nin observe.common.ActivityLonglineObsDto.message.not.open=La actividad no está abierta, imposible modificar. observe.common.ActivityLonglineObsDto.message.updating=Se está modificando la actividad actual. observe.common.ActivityLonglineObsDto.quadrant=Quadrant -observe.common.ActivityLonglineObsDto.seaSurfaceTemperature=Temperatura de la superficie +observe.common.ActivityLonglineObsDto.seaSurfaceTemperature=Temperatura de superficie observe.common.ActivityLonglineObsDto.time=Hora observe.common.ActivityLonglineObsDto.timeStamp=Timestamp observe.common.ActivityLonglineObsDto.title=Actividad @@ -456,7 +456,7 @@ observe.common.ActivityLonglineObsEncounterDto.comment=Comentarios observe.common.ActivityLonglineObsSensorUsedDto.comment=Comentarios observe.common.ActivityObsDto.action.goToOpen.short=Observations - Open activity \#TODO observe.common.ActivityObsDto.action.goToOpen.tip=Go to open activity (Observations) \#TODO -observe.common.ActivitySeineDto.action.addFloatingObject=Añadir un DCP +observe.common.ActivitySeineDto.action.addFloatingObject=Añadir un FOB observe.common.ActivitySeineDto.action.addFloatingObject.tip=Añadir un objeto flotante a la actividad observe.common.ActivitySeineDto.action.addSet=Añadir un lance observe.common.ActivitySeineDto.action.addSet.tip=Añadir el lance de la actividad @@ -464,13 +464,13 @@ observe.common.ActivitySeineDto.action.moves=Cambiar de ruta observe.common.ActivitySeineDto.action.moves.tip=Cambiar la ruta de las actividades seleccionadas observe.common.ActivitySeineDto.availableObservedSystem=Sistemas observados disponibles observe.common.ActivitySeineDto.comment=Comentario de la actividad -observe.common.ActivitySeineDto.coordinates=Coordenada -observe.common.ActivitySeineDto.currentFpaZone=Zona FPA actual +observe.common.ActivitySeineDto.coordinates=Coordenadas +observe.common.ActivitySeineDto.currentFpaZone=ZEE actual observe.common.ActivitySeineDto.dataQuality=Qualité de donnée \#TODO observe.common.ActivitySeineDto.detectionMode=Modo de detección observe.common.ActivitySeineDto.error.no.activity.6=La actividad con código 6 no se ha encontrado en la base de datos. observe.common.ActivitySeineDto.ersId=Id ERS -observe.common.ActivitySeineDto.floatingObjectEmpty=Objeto flotante vacía +observe.common.ActivitySeineDto.floatingObjectEmpty=Objeto flotante sin registrar observe.common.ActivitySeineDto.generalTab=Actividad y Posición observe.common.ActivitySeineDto.latitude=Latitud observe.common.ActivitySeineDto.list.message.none=< Ninguna actividad por la ruta actual > @@ -481,17 +481,17 @@ observe.common.ActivitySeineDto.message.active.found.for.other.route=Existe una observe.common.ActivitySeineDto.message.creating=Actividad en proceso de creación. observe.common.ActivitySeineDto.message.no.active.found=Ninguna actividad abierta, puede crear una nueva o reabrir una. observe.common.ActivitySeineDto.message.no.active.found.for.other.route=Ninguna actividad abierta en esta ruta. -observe.common.ActivitySeineDto.message.noneForRoute=< Ninguna actividad por la ruta actual > +observe.common.ActivitySeineDto.message.noneForRoute=< Ninguna actividad para la ruta actual > observe.common.ActivitySeineDto.message.not.open=La actividad no está abierta, imposible modificar. observe.common.ActivitySeineDto.message.updating=Se está modificando la actividad actual. -observe.common.ActivitySeineDto.nextFpaZone=Zona FPA penetrada +observe.common.ActivitySeineDto.nextFpaZone=ZEE próxima observe.common.ActivitySeineDto.nonTargetCatchSpecies=TODO observe.common.ActivitySeineDto.observedSystem=Sistema observado observe.common.ActivitySeineDto.observedSystemDistance=Distancia al sistema observado (millas con 1 decimal) observe.common.ActivitySeineDto.observedSystemTab=Sistema observado -observe.common.ActivitySeineDto.previousFpaZone=La zona FPA de que se salió +observe.common.ActivitySeineDto.previousFpaZone=ZEE anterior observe.common.ActivitySeineDto.quadrant=Quadrant -observe.common.ActivitySeineDto.reasonForNoFishing=Razón de no pesca Senne +observe.common.ActivitySeineDto.reasonForNoFishing=Razón de NO lance observe.common.ActivitySeineDto.seaSurfaceTemperature=Temperatura en superficie observe.common.ActivitySeineDto.selectedObservedSystem=Sistemas observados seleccionados observe.common.ActivitySeineDto.surroundingActivity=Actividad circundante @@ -504,17 +504,17 @@ observe.common.ActivitySeineDto.vesselActivitySeine=Actividad buque observe.common.ActivitySeineDto.vesselActivitySeine.comment=Solo la actividad %1$s permite introducir un lance observe.common.ActivitySeineDto.vesselSpeed=Velocidad del barco (nd) observe.common.ActivitySeineDto.wind=Fuerza del viento -observe.common.BaitHaulingStatusDto.type=Estatuto del cebo en el arrastre -observe.common.BaitHaulingStatusDto.types=Estatutos del cebo en el arrastre -observe.common.BaitSettingStatusDto.type=Estatuto del cebo en la calada -observe.common.BaitSettingStatusDto.types=Estatutos del cebo en la calada +observe.common.BaitHaulingStatusDto.type=Estatus del cebo en el arrastre +observe.common.BaitHaulingStatusDto.types=Estatus del cebo en el arrastre +observe.common.BaitSettingStatusDto.type=Estatus del cebo en la calada +observe.common.BaitSettingStatusDto.types=Estatus del cebo en la calada observe.common.BaitTypeDto.type=Tipo de cebo observe.common.BaitTypeDto.types=Tipos de cebo observe.common.BaitsCompositionDto.action.create=Insertar este cebo observe.common.BaitsCompositionDto.action.create.tip=Insertar este cebo observe.common.BaitsCompositionDto.proportionSum=Suma de los proporciónes de cebo (%) -observe.common.BaitsCompositionDto.table.baitSettingStatus=Estatuto -observe.common.BaitsCompositionDto.table.baitSettingStatus.tip=Estatuto en la calada +observe.common.BaitsCompositionDto.table.baitSettingStatus=Estatus +observe.common.BaitsCompositionDto.table.baitSettingStatus.tip=Estatus en la calada observe.common.BaitsCompositionDto.table.baitType=Tipo de cebo observe.common.BaitsCompositionDto.table.baitType.tip=Tipo de cebo observe.common.BaitsCompositionDto.table.individualSize=Tamaño (cm) @@ -542,7 +542,7 @@ observe.common.BaitsCompositionLogbookDto.table.proportion=Proporción (%) observe.common.BaitsCompositionLogbookDto.table.proportion.tip=Proporción (%) observe.common.BaitsCompositionLogbookDto.title=Composición de los cebos observe.common.BaitsCompositionLogbookDto.type=Composición de los cebos -observe.common.BaitsCompositionLogbookDto.types=Composiciónes de los cebos +observe.common.BaitsCompositionLogbookDto.types=Composición de los cebos observe.common.BaitsCompositionObsDto.action.create=Insertar este cebo observe.common.BaitsCompositionObsDto.action.create.tip=Insertar este cebo observe.common.BaitsCompositionObsDto.baitSettingStatus=Estado en la calada @@ -562,29 +562,29 @@ observe.common.BaitsCompositionObsDto.table.proportion=Proporción (%) observe.common.BaitsCompositionObsDto.table.proportion.tip=Proporción (%) observe.common.BaitsCompositionObsDto.title=Composición de los cebos observe.common.BaitsCompositionObsDto.type=Composición de los cebos -observe.common.BaitsCompositionObsDto.types=Composiciónes de los cebos +observe.common.BaitsCompositionObsDto.types=Composición de los cebos observe.common.BasketObsDto.floatline1Length=Orinque 1 (m) observe.common.BasketObsDto.floatline2Length=Orinque 2 (m) observe.common.BasketObsDto.settingIdentifier=Calada observe.common.BasketObsDto.type=Cesta observe.common.BasketObsDto.types=Cestas -observe.common.BranchlineDto.depthRecorder=Registrador de profundidad -observe.common.BranchlineDto.generalTab=Generalidad +observe.common.BranchlineDto.depthRecorder=Sensor de profundidad +observe.common.BranchlineDto.generalTab=Generalidades observe.common.BranchlineDto.hookAndBaitTab=Anzuelo y cebo -observe.common.BranchlineDto.hookLost=Anzuelo erdido +observe.common.BranchlineDto.hookLost=Anzuelo perdido observe.common.BranchlineDto.hookOffset=Offset anzuelo (°) -observe.common.BranchlineDto.message.modified=El arponcillo que se está modificando actualmente ha sido modificado y es valido. -observe.common.BranchlineDto.message.modified.but.invalid=El arponcillo que se está modificando actualmente ha sido modificado, pero no es valido. -observe.common.BranchlineDto.timeSinceContact=Tiempo desde el estallido +observe.common.BranchlineDto.message.modified=El arponcillo que se está modificando actualmente ha sido modificado y es válido. +observe.common.BranchlineDto.message.modified.but.invalid=El arponcillo que se está modificando actualmente ha sido modificado, pero no es válido. +observe.common.BranchlineDto.timeSinceContact=Hora de contacto observe.common.BranchlineDto.timer=Reloj -observe.common.BranchlineDto.timerTimeOnBoard=Timestamp de subida a bordo -observe.common.BranchlineDto.traceCutOff=Bajo de línea cortada -observe.common.BranchlineDto.weightedSnap=Snap plomeado -observe.common.BranchlineDto.weightedSwivel=Destorcedor plomeado +observe.common.BranchlineDto.timerTimeOnBoard=FechaHora de subida a bordo +observe.common.BranchlineDto.traceCutOff=Base de la línea de fondo +observe.common.BranchlineDto.weightedSnap=Lastre de plomo +observe.common.BranchlineDto.weightedSwivel=Broche de plomo observe.common.BranchlineObsDto.baitHaulingStatus=Estatuto del cebo en el arrastre -observe.common.BranchlineObsDto.baitSettingStatus=Estatuto del cebo en la calada +observe.common.BranchlineObsDto.baitSettingStatus=Estatus del cebo en la calada observe.common.BranchlineObsDto.baitType=Tipo de cebo -observe.common.BranchlineObsDto.branchlineLength=Arponcillo (m) +observe.common.BranchlineObsDto.branchlineLength=Longitud del arponcillo (m) observe.common.BranchlineObsDto.depthRecorder=Registrador de profundidad observe.common.BranchlineObsDto.generalTab=Generalidad observe.common.BranchlineObsDto.hookAndBaitTab=Anzuelo y cebo @@ -595,33 +595,33 @@ observe.common.BranchlineObsDto.hookType=Tipo de anzuelo observe.common.BranchlineObsDto.message.modified=El arponcillo que se está modificando actualmente ha sido modificado y es valido. observe.common.BranchlineObsDto.message.modified.but.invalid=El arponcillo que se está modificando actualmente ha sido modificado, pero no es valido. observe.common.BranchlineObsDto.settingIdentifier=Calada -observe.common.BranchlineObsDto.snapWeight=Peso snap (kg) -observe.common.BranchlineObsDto.swivelWeight=Peso de el destorcedor (kg) +observe.common.BranchlineObsDto.snapWeight=Peso del lastre (kg) +observe.common.BranchlineObsDto.swivelWeight=Peso del broche (kg) observe.common.BranchlineObsDto.timeSinceContact=Tiempo desde el estallido observe.common.BranchlineObsDto.timer=Reloj observe.common.BranchlineObsDto.timerTimeOnBoard=Timestamp de subida a bordo observe.common.BranchlineObsDto.title=Detalle de arponcillo -observe.common.BranchlineObsDto.topType=Tipo parte superior +observe.common.BranchlineObsDto.topType=Tipo de línea superior observe.common.BranchlineObsDto.traceCutOff=Bajo de línea cortada -observe.common.BranchlineObsDto.tracelineLength=Parte baja (m) -observe.common.BranchlineObsDto.tracelineType=Tipo bajo de línea +observe.common.BranchlineObsDto.tracelineLength=Línea de fondo (m) +observe.common.BranchlineObsDto.tracelineType=Tipo de línea de fondo observe.common.BranchlineObsDto.type=Arponcillo observe.common.BranchlineObsDto.types=Arponcillos observe.common.BranchlineObsDto.weightedSnap=Snap plomeado observe.common.BranchlineObsDto.weightedSwivel=Destorcedor plomeado observe.common.BranchlinesCompositionDto.action.create=Insertar este arponcillo observe.common.BranchlinesCompositionDto.action.create.tip=Insertar este arponcillo -observe.common.BranchlinesCompositionDto.proportionSum=Suma de los proporciónes de arponcillos (%) +observe.common.BranchlinesCompositionDto.proportionSum=Suma de las proporciones de arponcillos (%) observe.common.BranchlinesCompositionDto.table.length=Longitud (m) observe.common.BranchlinesCompositionDto.table.length.tip=Longitud (m) observe.common.BranchlinesCompositionDto.table.proportion=Proporción (%) observe.common.BranchlinesCompositionDto.table.proportion.tip=Proporción (%) -observe.common.BranchlinesCompositionDto.table.topType=Tipo de la parte superior -observe.common.BranchlinesCompositionDto.table.topType.tip=Tipo de la parte superior -observe.common.BranchlinesCompositionDto.table.tracelineLength=Parte baja (m) -observe.common.BranchlinesCompositionDto.table.tracelineLength.tip=Parte baja (m) -observe.common.BranchlinesCompositionDto.table.tracelineType=Tipo bajo de línea -observe.common.BranchlinesCompositionDto.table.tracelineType.tip=Tipo bajo de línea +observe.common.BranchlinesCompositionDto.table.topType=Tipo de línea superior +observe.common.BranchlinesCompositionDto.table.topType.tip=Tipo de línea superior +observe.common.BranchlinesCompositionDto.table.tracelineLength=Longitud de la línea de fondo (m) +observe.common.BranchlinesCompositionDto.table.tracelineLength.tip=Longitud de la línea de fondo (m) +observe.common.BranchlinesCompositionDto.table.tracelineType=Tipo línea fondo +observe.common.BranchlinesCompositionDto.table.tracelineType.tip=Tipo línea de fondo observe.common.BranchlinesCompositionDto.tracelineLength=Parte baja (m) observe.common.BranchlinesCompositionLogbookDto.action.create=Insertar este arponcillo observe.common.BranchlinesCompositionLogbookDto.action.create.tip=Insertar este arponcillo @@ -2584,8 +2584,8 @@ observe.common.species/scientificLabel=Especie observe.common.speciesAndSizeMeasure=Especie - Tipo de medida del tamaño observe.common.step.description=Descripción de la etapa observe.common.storage.not.valid=Fuente de datos no configurada -observe.common.whenArriving=À l'arrivée \#TODO -observe.common.whenLeaving=Au départ \#TODO +observe.common.whenArriving=Al llegar +observe.common.whenLeaving=Al dejar observe.config.backup.atClose=Realizar una copia de seguridad de la base de datos local al cerrar la aplicación observe.config.backup.delay=Minutos entre cada copia de seguridad de la base de datos local observe.config.backup.use=Para activar la copia de seguridad automática ===================================== pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2018.8.2</version> + <version>2018.8.3</version> </parent> <groupId>fr.ird.observe</groupId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/25fc0f69dfc714a010c86818a5… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/25fc0f69dfc714a010c86818a5… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] clean some code + sue last pom
by Tony CHEMIT 13 Nov '18

13 Nov '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 25fc0f69 by tchemit at 2018-11-13T17:36:26Z clean some code + sue last pom - - - - - 9 changed files: - client-core/src/main/java/fr/ird/observe/client/backup/BackupsManager.java - dto/pom.xml - persistence/pom.xml - pom.xml - server-core/pom.xml - server-core/src/main/java/fr/ird/observe/server/ObserveWebApplicationListener.java - server-core/src/main/java/fr/ird/observe/server/controller/ConfigurationController.java - server-core/src/main/java/fr/ird/observe/server/injector/ImmutableSetInjector.java - services-client/pom.xml Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/backup/BackupsManager.java ===================================== @@ -30,8 +30,8 @@ import fr.ird.observe.client.db.ObserveDataSourcesManager; import fr.ird.observe.client.db.ObserveSwingDataSource; import fr.ird.observe.services.configuration.DataSourceCreateConfigurationDto; import org.apache.commons.lang3.StringUtils; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.nuiton.topia.persistence.script.TopiaSqlScript; import java.io.BufferedReader; @@ -181,15 +181,11 @@ public class BackupsManager implements Closeable { } public List<BackupStorage> getAutomaticBackups() { - List<BackupStorage> result = backups.stream().filter(BackupStorage::isAutomatic).collect(Collectors.toList()); - result.sort(Comparator.comparing(BackupStorage::getDate).reversed()); - return result; + return backups.stream().filter(BackupStorage::isAutomatic).sorted(Comparator.comparing(BackupStorage::getDate).reversed()).collect(Collectors.toList()); } public List<BackupStorage> getUserBackups() { - List<BackupStorage> result = backups.stream().filter(BackupStorage::isUser).collect(Collectors.toList()); - result.sort(Comparator.comparing(BackupStorage::getDate).reversed()); - return result; + return backups.stream().filter(BackupStorage::isUser).sorted(Comparator.comparing(BackupStorage::getDate).reversed()).collect(Collectors.toList()); } public void addAutomaticBackup(Path backupPath) { ===================================== dto/pom.xml ===================================== @@ -113,11 +113,7 @@ <artifactId>gson</artifactId> <scope>test</scope> </dependency> - <dependency> - <groupId>com.google.auto.service</groupId> - <artifactId>auto-service</artifactId> - <scope>provided</scope> - </dependency> +  <dependency> ===================================== persistence/pom.xml ===================================== @@ -183,6 +183,28 @@ <artifactId>postgresql</artifactId> <scope>test</scope> </dependency> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.glassfish.jaxb</groupId> + <artifactId>jaxb-runtime</artifactId> + <scope>runtime</scope> + <exclusions> + <exclusion> + <groupId>javax.activation</groupId> + <artifactId>javax.activation-api</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>javax.annotation</groupId> + <artifactId>jsr250-api</artifactId> + <scope>provided</scope> + </dependency> </dependencies> ===================================== pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2018.72</version> + <version>2018.8.2</version> </parent> <groupId>fr.ird.observe</groupId> @@ -159,7 +159,7 @@ <observeToolkitVersion>4.8-SNAPSHOT</observeToolkitVersion>   -  +     ===================================== server-core/pom.xml ===================================== @@ -90,10 +90,6 @@ <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-api</artifactId> </dependency> - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - </dependency> <dependency> <groupId>commons-beanutils</groupId> <artifactId>commons-beanutils</artifactId> @@ -186,6 +182,16 @@ <artifactId>junit</artifactId> </dependency> + <dependency> + <groupId>com.google.auto.service</groupId> + <artifactId>auto-service</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.annotation</groupId> + <artifactId>jsr250-api</artifactId> + <scope>provided</scope> + </dependency> </dependencies> <build> ===================================== server-core/src/main/java/fr/ird/observe/server/ObserveWebApplicationListener.java ===================================== @@ -34,7 +34,6 @@ import fr.ird.observe.server.injector.ObserveReferenceSetRequestInjector; import fr.ird.observe.server.injector.SqlScriptProducerRequestInjector; import fr.ird.observe.server.injector.TopiaSqlScriptInjector; import io.ultreia.java4all.http.HRequestBuilder; -import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -42,6 +41,7 @@ import org.debux.webmotion.server.WebMotionServerListener; import org.debux.webmotion.server.call.ServerContext; import org.debux.webmotion.server.mapping.Mapping; +import java.io.IOException; import java.util.Date; /** @@ -85,23 +85,19 @@ public class ObserveWebApplicationListener implements WebMotionServerListener { context.getServletContext().setAttribute(ObserveWebApplicationContext.APPLICATION_CONTEXT_PARAMETER, applicationContext); - if (log.isInfoEnabled()) { - log.info("Initializing " + ObserveWebApplicationListener.class.getName() + " done."); - } + log.info("Initializing " + ObserveWebApplicationListener.class.getName() + " done."); } @Override public void onStop(ServerContext context) { - if (log.isInfoEnabled()) { - log.info("Destroying " + ObserveWebApplicationListener.class.getName()); - } - - IOUtils.closeQuietly(applicationContext); - - if (log.isInfoEnabled()) { - log.info("Destroying " + ObserveWebApplicationListener.class.getName() + " done."); + log.info("Destroying " + ObserveWebApplicationListener.class.getName()); + try { + applicationContext.close(); + } catch (IOException e) { + log.error("Error while closing application context", e); } + log.info("Destroying " + ObserveWebApplicationListener.class.getName() + " done."); } } ===================================== server-core/src/main/java/fr/ird/observe/server/controller/ConfigurationController.java ===================================== @@ -35,12 +35,12 @@ import fr.ird.observe.server.configuration.user.ObserveWebUsers; import fr.ird.observe.server.configuration.user.ObserveWebUsersHelper; import fr.ird.observe.server.security.ObserveWebSecurityApplicationContext; import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationAndConnection; -import org.apache.commons.io.IOUtils; import org.debux.webmotion.server.WebMotionContextable; import org.debux.webmotion.server.render.RenderContent; +import java.io.BufferedReader; import java.io.IOException; -import java.io.InputStream; +import java.io.InputStreamReader; import java.io.StringWriter; import java.nio.charset.StandardCharsets; import java.util.Map; @@ -108,11 +108,13 @@ public class ConfigurationController extends ObserveWebMotionController { } { - try (InputStream mappingUrl = getClass().getResourceAsStream("/mapping")) { - String content = IOUtils.toString(mappingUrl, StandardCharsets.UTF_8); - builder.append("\n~~~ Mapping ~~~\n").append(content); + try (BufferedReader mappingUrl = new BufferedReader(new InputStreamReader(getClass().getResourceAsStream("/mapping"), StandardCharsets.UTF_8))) { + String line; + builder.append("\n~~~ Mapping ~~~\n"); + while ((line = mappingUrl.readLine()) != null) { + builder.append(line).append("\n"); + } } - } return toTextPlain(builder.toString()); ===================================== server-core/src/main/java/fr/ird/observe/server/injector/ImmutableSetInjector.java ===================================== @@ -29,8 +29,8 @@ import org.apache.logging.log4j.Logger; import org.debux.webmotion.server.call.Call; import org.debux.webmotion.server.handler.ExecutorParametersInjectorHandler; import org.debux.webmotion.server.mapping.Mapping; -import sun.reflect.generics.reflectiveObjects.ParameterizedTypeImpl; +import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; import java.util.Collection; import java.util.Objects; @@ -49,7 +49,6 @@ import java.util.Objects; */ public class ImmutableSetInjector implements ExecutorParametersInjectorHandler.Injector { - /** Logger. */ private static final Logger log = LogManager.getLogger(ImmutableSetInjector.class); private final Gson gson; @@ -74,7 +73,7 @@ public class ImmutableSetInjector implements ExecutorParametersInjectorHandler.I String[] values = (String[]) parameterTree.getValue(); StringBuilder value = new StringBuilder(values[0]); if ((value.length() > 0) && !value.toString().contains("[")) { - if (((ParameterizedTypeImpl) generic).getActualTypeArguments()[0].equals(String.class)) { + if (((ParameterizedType) generic).getActualTypeArguments()[0].equals(String.class)) { value = new StringBuilder(); for (String s : values) { value.append(", \"").append(s).append("\""); @@ -90,9 +89,7 @@ public class ImmutableSetInjector implements ExecutorParametersInjectorHandler.I } result = builder.build(); - if (log.isInfoEnabled()) { - log.info("Inject ImmutableSet: " + result); - } + log.info("Inject ImmutableSet: " + result); } ===================================== services-client/pom.xml ===================================== @@ -140,6 +140,16 @@ <artifactId>junit</artifactId> </dependency> + <dependency> + <groupId>com.google.auto.service</groupId> + <artifactId>auto-service</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.annotation</groupId> + <artifactId>jsr250-api</artifactId> + <scope>provided</scope> + </dependency> </dependencies> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/25fc0f69dfc714a010c86818a5e… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/25fc0f69dfc714a010c86818a5e… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] Le script postgresql/update.bat ne démarre pas - Closes #1163
by Tony CHEMIT 12 Nov '18

12 Nov '18

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: d8ecd548 by tchemit at 2018-11-12T20:16:52Z Le script postgresql/update.bat ne démarre pas - Closes #1163 - - - - - 1 changed file: - client-runner/src/main/assembly/dist/scripts/postgresql/update.bat Changes: ===================================== client-runner/src/main/assembly/dist/scripts/postgresql/update.bat ===================================== @@ -1,2 +1,2 @@ -java -Xmx2048M -Xms512M -jar ../../${project.project.build.finalName}.jar --obstuna-admin update \ No newline at end of file +java -Xmx2048M -Xms512M -jar ../../${applicationJarName}.jar --obstuna-admin update \ No newline at end of file View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/d8ecd54855947a91acd3d239e31… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/d8ecd54855947a91acd3d239e31… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] remove config plugin from report, it does not works very well
by Tony CHEMIT 11 Nov '18

11 Nov '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: f5e5805d by tchemit at 2018-11-11T23:30:25Z remove config plugin from report, it does not works very well - - - - - 1 changed file: - pom.xml Changes: ===================================== pom.xml ===================================== @@ -373,19 +373,19 @@ <reporting> <plugins> - <plugin> - <groupId>io.ultreia.java4all.config</groupId> - <artifactId>config-maven-plugin</artifactId> - <version>${lib.version.java4all.config}</version> - <inherited>false</inherited> - <reportSets> - <reportSet> - <reports> - <report>aggregate-report</report> - </reports> - </reportSet> - </reportSets> - </plugin> +  +  +  +  +  +  +  +  +  +  +  +  +  <plugin> <artifactId>maven-project-info-reports-plugin</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/f5e5805dc42619227fa77bfac90… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/f5e5805dc42619227fa77bfac90… You're receiving this email because of your account on gitlab.com.

1 0