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

[Git][ultreiaio/ird-observe][develop] Amélioration de la représentation des sonnées de données dans les actions longues - Closes #1582
by Tony CHEMIT 17 Jul '20

17 Jul '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 6b3bd20d by Tony Chemit at 2020-07-17T18:33:33+02:00 Amélioration de la représentation des sonnées de données dans les actions longues - Closes #1582 - - - - - 30 changed files: - client-datasource-actions/src/main/i18n/getters/java.getter - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminStep.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminTabUI.jaxx - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminTabUIHandler.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminUIHandler.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminUIModel.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/config/ConfigModel.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/config/ConfigUI.jaxx - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/config/SelectDataUI.jaxx - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/config/SelectDataUIHandler.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/consolidate/ConsolidateUI.jaxx - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/consolidate/ConsolidateUIHandler.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/export/ExportUI.jaxx - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/export/ExportUIHandler.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/longline/pairing/ActivityLonglinePairingUI.jaxx - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/longline/pairing/ActivityLonglinePairingUIHandler.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/report/ReportUI.jaxx - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/report/ReportUIHandler.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/save/SaveLocalModel.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/save/SaveLocalUI.jaxx - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/save/SaveLocalUIHandler.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/save/actions/Start.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/data/DataSynchroModel.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/data/DataSynchroUI.jaxx - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/data/DataSynchroUIHandler.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/data/tree/DataSelectionTreePaneHandler.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/data/tree/actions/DataSelectionTreePaneActionSupport.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/legacy/SynchronizeUI.jaxx - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/legacy/SynchronizeUIHandler.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/ReferentialSynchroModel.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/6b3bd20d89132c417e84bd252… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/6b3bd20d89132c417e84bd252… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Les rapports FOB ne fonctionnent pas - Closes #1581
by Tony CHEMIT 17 Jul '20

17 Jul '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: e2af824e by Tony Chemit at 2020-07-17T14:13:49+02:00 Les rapports FOB ne fonctionnent pas - Closes #1581 - - - - - 1 changed file: - services/src/main/resources/observe-reports.properties Changes: ===================================== services/src/main/resources/observe-reports.properties ===================================== @@ -137,9 +137,9 @@ report.fobUsageMinimal.repeatVariable.typeObjetId=java.lang.String|\ Where standardCode is not null \ And standardCode != '' \ And (Select Count(dcp) \ - From TripSeineImpl m \ + From fr.ird.observe.entities.data.ps.common.TripImpl m \ Join m.route r \ - Join r.activitySeine a \ + Join r.activity a \ Join a.floatingObject dcp \ Where \ m.id In :tripId \ @@ -156,70 +156,70 @@ report.fobUsageMinimal.request.1.repeat=typeObjetId|column # rencontres + peches report.fobUsageMinimal.request.2=1,0|row|\ Select Count(dcp) \ - From TripSeineImpl m \ + From fr.ird.observe.entities.data.ps.common.TripImpl m \ Join m.route r \ - Join r.activitySeine a \ + Join r.activity a \ Join a.floatingObject dcp \ Where \ m.id In :tripId \ and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ - and a.vesselActivitySeine.id = 'fr.ird.observe.entities.referentiel.seine.VesselActivitySeine#1239832675369#0.12552908048322586' \ - and (dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#2' \ - or dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#8' \ - or dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#4' \ - or dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#5' \ - or dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#7' \ - or dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#9' \ - or dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#10' \ - or dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#3') + and a.vesselActivity.id = 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' \ + and (dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#2' \ + or dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#8' \ + or dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#4' \ + or dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#5' \ + or dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#7' \ + or dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#9' \ + or dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#10' \ + or dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#3') report.fobUsageMinimal.request.2.repeat=typeObjetId|column # rencontres - peches report.fobUsageMinimal.request.3=2,0|row|\ Select Count(dcp) \ - From TripSeineImpl m \ + From fr.ird.observe.entities.data.ps.common.TripImpl m \ Join m.route r \ - Join r.activitySeine a \ + Join r.activity a \ Join a.floatingObject dcp \ Where \ m.id In :tripId \ and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ - and a.vesselActivitySeine.id != 'fr.ird.observe.entities.referentiel.seine.VesselActivitySeine#1239832675369#0.12552908048322586' -and (dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#2' \ - or dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#8' \ - or dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#4' \ - or dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#5' \ - or dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#7' \ - or dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#9' \ - or dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#10' \ - or dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#3') + and a.vesselActivity.id != 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' +and (dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#2' \ + or dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#8' \ + or dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#4' \ + or dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#5' \ + or dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#7' \ + or dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#9' \ + or dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#10' \ + or dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#3') report.fobUsageMinimal.request.3.repeat=typeObjetId|column # deployes report.fobUsageMinimal.request.4=3,0|row|\ Select Count(dcp) \ - From TripSeineImpl m \ + From fr.ird.observe.entities.data.ps.common.TripImpl m \ Join m.route r \ - Join r.activitySeine a \ + Join r.activity a \ Join a.floatingObject dcp \ Where \ m.id In :tripId \ and dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId \ - and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#1' + and dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#1' report.fobUsageMinimal.request.4.repeat=typeObjetId|column # Nombre de tortues report.fobUsageMinimal.request.5=4,0|row| \ Select Sum(efo.count) \ - From TripSeineImpl m \ + From fr.ird.observe.entities.data.ps.common.TripImpl m \ Join m.route r \ - Join r.activitySeine a \ + Join r.activity a \ Join a.floatingObject dcp \ Join dcp.objectObservedSpecies efo \ Where \ m.id In :tripId \ and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ - and efo.species.speciesGroup.id = 'fr.ird.observe.entities.referentiel.SpeciesGroup#1239832683690#0.24333033683679461' + and efo.species.speciesGroup.id = 'fr.ird.referential.common.SpeciesGroup#1239832683690#0.24333033683679461' report.fobUsageMinimal.request.5.repeat=typeObjetId|column ################################################################################ ## Utilisation des FOB, tableau detaille @@ -252,9 +252,9 @@ report.fobUsageExtended.repeatVariable.typeObjetId=java.lang.String|\ Where standardCode is not null \ And standardCode != '' \ And (Select Count(dcp) \ - From TripSeineImpl m \ + From fr.ird.observe.entities.data.ps.common.TripImpl m \ Join m.route r \ - Join r.activitySeine a \ + Join r.activity a \ Join a.floatingObject dcp \ Where \ m.id In :tripId \ @@ -271,241 +271,241 @@ report.fobUsageExtended.request.1.repeat=typeObjetId|column # visite + peche report.fobUsageExtended.request.2=1,0|row|\ Select Count(dcp) \ - From TripSeineImpl m \ + From fr.ird.observe.entities.data.ps.common.TripImpl m \ Join m.route r \ - Join r.activitySeine a \ + Join r.activity a \ Join a.floatingObject dcp \ Where \ m.id In :tripId \ and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ - and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#2' \ - and a.vesselActivitySeine.id = 'fr.ird.observe.entities.referentiel.seine.VesselActivitySeine#1239832675369#0.12552908048322586' + and dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#2' \ + and a.vesselActivity.id = 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' report.fobUsageExtended.request.2.repeat=typeObjetId|column # visite - peche report.fobUsageExtended.request.3=2,0|row|\ Select Count(dcp) \ - From TripSeineImpl m \ + From fr.ird.observe.entities.data.ps.common.TripImpl m \ Join m.route r \ - Join r.activitySeine a \ + Join r.activity a \ Join a.floatingObject dcp \ Where \ m.id In :tripId \ and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ - and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#2' \ - and a.vesselActivitySeine.id != 'fr.ird.observe.entities.referentiel.seine.VesselActivitySeine#1239832675369#0.12552908048322586' + and dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#2' \ + and a.vesselActivity.id != 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' report.fobUsageExtended.request.3.repeat=typeObjetId|column # Deploiement + peche report.fobUsageExtended.request.4=3,0|row|\ Select Count(dcp) \ - From TripSeineImpl m \ + From fr.ird.observe.entities.data.ps.common.TripImpl m \ Join m.route r \ - Join r.activitySeine a \ + Join r.activity a \ Join a.floatingObject dcp \ Where \ m.id In :tripId \ and dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId \ - and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#1' \ - and a.vesselActivitySeine.id = 'fr.ird.observe.entities.referentiel.seine.VesselActivitySeine#1239832675369#0.12552908048322586' + and dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#1' \ + and a.vesselActivity.id = 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' report.fobUsageExtended.request.4.repeat=typeObjetId|column # Deploiement - peche report.fobUsageExtended.request.5=4,0|row|\ Select Count(dcp) \ - From TripSeineImpl m \ + From fr.ird.observe.entities.data.ps.common.TripImpl m \ Join m.route r \ - Join r.activitySeine a \ + Join r.activity a \ Join a.floatingObject dcp \ Where \ m.id In :tripId \ and dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId \ - and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#1' \ - and a.vesselActivitySeine.id != 'fr.ird.observe.entities.referentiel.seine.VesselActivitySeine#1239832675369#0.12552908048322586' + and dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#1' \ + and a.vesselActivity.id != 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' report.fobUsageExtended.request.5.repeat=typeObjetId|column # Modifie + peche report.fobUsageExtended.request.6=5,0|row|\ Select Count(dcp) \ - From TripSeineImpl m \ + From fr.ird.observe.entities.data.ps.common.TripImpl m \ Join m.route r \ - Join r.activitySeine a \ + Join r.activity a \ Join a.floatingObject dcp \ Where \ m.id In :tripId \ and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ - and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#8' \ - and a.vesselActivitySeine.id = 'fr.ird.observe.entities.referentiel.seine.VesselActivitySeine#1239832675369#0.12552908048322586' + and dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#8' \ + and a.vesselActivity.id = 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' report.fobUsageExtended.request.6.repeat=typeObjetId|column # Modifie - peche report.fobUsageExtended.request.7=6,0|row|\ Select Count(dcp) \ - From TripSeineImpl m \ + From fr.ird.observe.entities.data.ps.common.TripImpl m \ Join m.route r \ - Join r.activitySeine a \ + Join r.activity a \ Join a.floatingObject dcp \ Where \ m.id In :tripId \ and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ - and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#8' \ - and a.vesselActivitySeine.id != 'fr.ird.observe.entities.referentiel.seine.VesselActivitySeine#1239832675369#0.12552908048322586' + and dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#8' \ + and a.vesselActivity.id != 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' report.fobUsageExtended.request.7.repeat=typeObjetId|column # Retire + peche report.fobUsageExtended.request.8=7,0|row|\ Select Count(dcp) \ - From TripSeineImpl m \ + From fr.ird.observe.entities.data.ps.common.TripImpl m \ Join m.route r \ - Join r.activitySeine a \ + Join r.activity a \ Join a.floatingObject dcp \ Where \ m.id In :tripId \ and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ - and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#4' \ - and a.vesselActivitySeine.id = 'fr.ird.observe.entities.referentiel.seine.VesselActivitySeine#1239832675369#0.12552908048322586' + and dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#4' \ + and a.vesselActivity.id = 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' report.fobUsageExtended.request.8.repeat=typeObjetId|column # Retire - peche report.fobUsageExtended.request.9=8,0|row|\ Select Count(dcp) \ - From TripSeineImpl m \ + From fr.ird.observe.entities.data.ps.common.TripImpl m \ Join m.route r \ - Join r.activitySeine a \ + Join r.activity a \ Join a.floatingObject dcp \ Where \ m.id In :tripId \ and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ - and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#4' \ - and a.vesselActivitySeine.id != 'fr.ird.observe.entities.referentiel.seine.VesselActivitySeine#1239832675369#0.12552908048322586' + and dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#4' \ + and a.vesselActivity.id != 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' report.fobUsageExtended.request.9.repeat=typeObjetId|column # Abandonne + peche report.fobUsageExtended.request.10=9,0|row|\ Select Count(dcp) \ - From TripSeineImpl m \ + From fr.ird.observe.entities.data.ps.common.TripImpl m \ Join m.route r \ - Join r.activitySeine a \ + Join r.activity a \ Join a.floatingObject dcp \ Where \ m.id In :tripId \ and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ - and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#5' \ - and a.vesselActivitySeine.id = 'fr.ird.observe.entities.referentiel.seine.VesselActivitySeine#1239832675369#0.12552908048322586' + and dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#5' \ + and a.vesselActivity.id = 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' report.fobUsageExtended.request.10.repeat=typeObjetId|column # Abandonne - peche report.fobUsageExtended.request.11=10,0|row|\ Select Count(dcp) \ - From TripSeineImpl m \ + From fr.ird.observe.entities.data.ps.common.TripImpl m \ Join m.route r \ - Join r.activitySeine a \ + Join r.activity a \ Join a.floatingObject dcp \ Where \ m.id In :tripId \ and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ - and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#5' \ - and a.vesselActivitySeine.id != 'fr.ird.observe.entities.referentiel.seine.VesselActivitySeine#1239832675369#0.12552908048322586' + and dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#5' \ + and a.vesselActivity.id != 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' report.fobUsageExtended.request.11.repeat=typeObjetId|column # Coule + peche report.fobUsageExtended.request.12=11,0|row|\ Select Count(dcp) \ - From TripSeineImpl m \ + From fr.ird.observe.entities.data.ps.common.TripImpl m \ Join m.route r \ - Join r.activitySeine a \ + Join r.activity a \ Join a.floatingObject dcp \ Where \ m.id In :tripId \ and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ - and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#7' \ - and a.vesselActivitySeine.id = 'fr.ird.observe.entities.referentiel.seine.VesselActivitySeine#1239832675369#0.12552908048322586' + and dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#7' \ + and a.vesselActivity.id = 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' report.fobUsageExtended.request.12.repeat=typeObjetId|column # Coule - peche report.fobUsageExtended.request.13=12,0|row|\ Select Count(dcp) \ - From TripSeineImpl m \ + From fr.ird.observe.entities.data.ps.common.TripImpl m \ Join m.route r \ - Join r.activitySeine a \ + Join r.activity a \ Join a.floatingObject dcp \ Where \ m.id In :tripId \ and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ - and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#7' \ - and a.vesselActivitySeine.id != 'fr.ird.observe.entities.referentiel.seine.VesselActivitySeine#1239832675369#0.12552908048322586' + and dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#7' \ + and a.vesselActivity.id != 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' report.fobUsageExtended.request.13.repeat=typeObjetId|column # Remplace + peche report.fobUsageExtended.request.14=13,0|row|\ Select Count(dcp) \ - From TripSeineImpl m \ + From fr.ird.observe.entities.data.ps.common.TripImpl m \ Join m.route r \ - Join r.activitySeine a \ + Join r.activity a \ Join a.floatingObject dcp \ Where \ m.id In :tripId \ and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ - and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#9' \ - and a.vesselActivitySeine.id = 'fr.ird.observe.entities.referentiel.seine.VesselActivitySeine#1239832675369#0.12552908048322586' + and dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#9' \ + and a.vesselActivity.id = 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' report.fobUsageExtended.request.14.repeat=typeObjetId|column # Remplace - peche report.fobUsageExtended.request.15=14,0|row|\ Select Count(dcp) \ - From TripSeineImpl m \ + From fr.ird.observe.entities.data.ps.common.TripImpl m \ Join m.route r \ - Join r.activitySeine a \ + Join r.activity a \ Join a.floatingObject dcp \ Where \ m.id In :tripId \ and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ - and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#9' \ - and a.vesselActivitySeine.id != 'fr.ird.observe.entities.referentiel.seine.VesselActivitySeine#1239832675369#0.12552908048322586' + and dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#9' \ + and a.vesselActivity.id != 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' report.fobUsageExtended.request.15.repeat=typeObjetId|column # Autre ou ancien peche + peche report.fobUsageExtended.request.16=15,0|row|\ Select Count(dcp) \ - From TripSeineImpl m \ + From fr.ird.observe.entities.data.ps.common.TripImpl m \ Join m.route r \ - Join r.activitySeine a \ + Join r.activity a \ Join a.floatingObject dcp \ Where \ m.id In :tripId \ and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ - and (dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#10' \ - or dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#3') \ - and a.vesselActivitySeine.id = 'fr.ird.observe.entities.referentiel.seine.VesselActivitySeine#1239832675369#0.12552908048322586' + and (dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#10' \ + or dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#3') \ + and a.vesselActivity.id = 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' report.fobUsageExtended.request.16.repeat=typeObjetId|column # Autre ou ancien peche - peche report.fobUsageExtended.request.17=16,0|row|\ Select Count(dcp) \ - From TripSeineImpl m \ + From fr.ird.observe.entities.data.ps.common.TripImpl m \ Join m.route r \ - Join r.activitySeine a \ + Join r.activity a \ Join a.floatingObject dcp \ Where \ m.id In :tripId \ and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ - and (dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#10' \ - or dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#3') \ - and a.vesselActivitySeine.id != 'fr.ird.observe.entities.referentiel.seine.VesselActivitySeine#1239832675369#0.12552908048322586' + and (dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#10' \ + or dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#3') \ + and a.vesselActivity.id != 'fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586' report.fobUsageExtended.request.17.repeat=typeObjetId|column # Nombre de tortues report.fobUsageExtended.request.18=17,0|row| \ Select Sum(efo.count) \ - From TripSeineImpl m \ + From fr.ird.observe.entities.data.ps.common.TripImpl m \ Join m.route r \ - Join r.activitySeine a \ + Join r.activity a \ Join a.floatingObject dcp \ Join dcp.objectObservedSpecies efo \ Where \ m.id In :tripId \ and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ - and efo.species.speciesGroup.id = 'fr.ird.observe.entities.referentiel.SpeciesGroup#1239832683690#0.24333033683679461' + and efo.species.speciesGroup.id = 'fr.ird.referential.common.SpeciesGroup#1239832683690#0.24333033683679461' report.fobUsageExtended.request.18.repeat=typeObjetId|column ################################################################################ ## Nombre des cal\u00e9es selon le type d'association View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/e2af824ecbf88127e5e9fe9b9… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/e2af824ecbf88127e5e9fe9b9… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] update pom
by Tony CHEMIT 17 Jul '20

17 Jul '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 77a92938 by Tony Chemit at 2020-07-17T10:07:23+02:00 update pom - - - - - 1 changed file: - pom.xml Changes: ===================================== pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2020.40</version> + <version>2020.41</version> </parent> <groupId>fr.ird.observe</groupId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/77a929382bf8d437f95eda612… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/77a929382bf8d437f95eda612… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 7 commits: Ajout contrôle de borne 0 à 100 sur la proportion déprédaté sur une capture ll...
by Tony CHEMIT 15 Jul '20

15 Jul '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 02b07c8f by Tony Chemit at 2020-07-15T17:14:40+02:00 Ajout contrôle de borne 0 à 100 sur la proportion déprédaté sur une capture ll logbook - Closes #1579 - - - - - cc7b92e8 by Tony Chemit at 2020-07-15T17:14:42+02:00 Clean i18n keys - - - - - cd3100bd by Tony Chemit at 2020-07-15T17:14:42+02:00 Optimize i18n keys - - - - - a6d10f20 by Tony Chemit at 2020-07-15T17:14:42+02:00 Optimize i18n keys (make better categories) - - - - - 9bb2049b by Tony Chemit at 2020-07-15T17:14:42+02:00 La suppresion de la date de début de l'opération de peche fait planter le calcul des activités candidates - - - - - 35dd83dd by Tony Chemit at 2020-07-15T17:14:42+02:00 Correction des listes qui ne sont pas active - - - - - 547b1107 by Tony Chemit at 2020-07-15T17:14:42+02:00 Simplification des composents applicatifs (il en reste très peu et on fera une seconde passe qui va encore simplifier : un component par couche sera bien suffisant et simple à gérer) - - - - - 30 changed files: - client-configuration/src/main/config/Client.ini - client-configuration/src/main/i18n/getters/config.getter - client-configuration/src/main/i18n/getters/java.getter - client-configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client-configuration/src/main/java/fr/ird/observe/client/datasource/dcp/FloatingObjectPresetsManager.java - client-core/src/main/i18n/getters/java.getter - client-core/src/main/i18n/getters/jaxx.getter - client-core/src/main/java/fr/ird/observe/client/ClientUIContext.java - client-core/src/main/java/fr/ird/observe/client/ObserveSwingApplicationContext.java - client-core/src/main/java/fr/ird/observe/client/action/api/FeedBackBuilder.java - client-core/src/main/java/fr/ird/observe/client/datasource/api/ObserveDataSourcesManager.java - client-core/src/main/java/fr/ird/observe/client/datasource/api/ObserveSwingDataSource.java - client-core/src/main/java/fr/ird/observe/client/datasource/h2/backup/BackupsManager.java - client-core/src/main/java/fr/ird/observe/client/datasource/h2/backup/LocalDatabaseBackupTaskSupport.java - client-core/src/main/java/fr/ird/observe/client/datasource/h2/backup/LocalDatabaseBackupTimer.java - client-core/src/main/java/fr/ird/observe/client/datasource/h2/server/H2ServerBodyContent.java - client-core/src/main/java/fr/ird/observe/client/datasource/h2/server/H2ServerUI.jcss - client-core/src/main/java/fr/ird/observe/client/datasource/h2/server/actions/StartH2WebServer.java - client-core/src/main/java/fr/ird/observe/client/datasource/h2/server/actions/StopH2WebServer.java - client-core/src/main/java/fr/ird/observe/client/datasource/h2/server/actions/StopServerMode.java - client-core/src/main/java/fr/ird/observe/client/main/ObserveMainUI.jcss - client-core/src/main/java/fr/ird/observe/client/main/ObserveMainUIHandler.java - client-core/src/main/java/fr/ird/observe/client/main/actions/ChangeLanguageToEnglishAction.java - client-core/src/main/java/fr/ird/observe/client/main/actions/ChangeLanguageToFrenchAction.java - client-core/src/main/java/fr/ird/observe/client/main/actions/ChangeLanguageToSpanishAction.java - client-core/src/main/java/fr/ird/observe/client/main/actions/CloseApplicationAction.java - client-core/src/main/java/fr/ird/observe/client/main/actions/GotoSiteAction.java - client-core/src/main/java/fr/ird/observe/client/main/actions/MainUIActionSupport.java - client-core/src/main/java/fr/ird/observe/client/main/actions/OpenLastFeedBackAction.java - client-core/src/main/java/fr/ird/observe/client/main/actions/ReloadApplicationAction.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/78793b28f9f44d84ad217092… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/78793b28f9f44d84ad217092… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 7 commits: Ajout contrôle de borne 0 à 100 sur la proportion déprédaté sur une capture ll...
by Tony CHEMIT 15 Jul '20

15 Jul '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 7fede0aa by Tony Chemit at 2020-07-15T17:04:38+02:00 Ajout contrôle de borne 0 à 100 sur la proportion déprédaté sur une capture ll logbook - Closes #1579 - - - - - 93d62035 by Tony Chemit at 2020-07-15T17:04:39+02:00 Clean i18n keys - - - - - dbdb609d by Tony Chemit at 2020-07-15T17:04:39+02:00 Optimize i18n keys - - - - - 7dfac522 by Tony Chemit at 2020-07-15T17:04:39+02:00 Optimize i18n keys (make better categories) - - - - - 133424a2 by Tony Chemit at 2020-07-15T17:04:39+02:00 La suppresion de la date de début de l'opération de peche fait planter le calcul des activités candidates - - - - - 3e04a49a by Tony Chemit at 2020-07-15T17:04:39+02:00 Correction des listes qui ne sont pas active - - - - - 78793b28 by Tony Chemit at 2020-07-15T17:04:39+02:00 Simplification des composents applicatifs (il en reste très peu et on fera une seconde passe qui va encore simplifier : un component par couche sera bien suffisant et simple à gérer) - - - - - 30 changed files: - client-configuration/src/main/config/Client.ini - client-configuration/src/main/i18n/getters/config.getter - client-configuration/src/main/i18n/getters/java.getter - client-configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client-configuration/src/main/java/fr/ird/observe/client/datasource/dcp/FloatingObjectPresetsManager.java - client-core/src/main/i18n/getters/java.getter - client-core/src/main/i18n/getters/jaxx.getter - client-core/src/main/java/fr/ird/observe/client/ClientUIContext.java - client-core/src/main/java/fr/ird/observe/client/ObserveSwingApplicationContext.java - client-core/src/main/java/fr/ird/observe/client/action/api/FeedBackBuilder.java - client-core/src/main/java/fr/ird/observe/client/datasource/api/ObserveDataSourcesManager.java - client-core/src/main/java/fr/ird/observe/client/datasource/api/ObserveSwingDataSource.java - client-core/src/main/java/fr/ird/observe/client/datasource/h2/backup/BackupsManager.java - client-core/src/main/java/fr/ird/observe/client/datasource/h2/backup/LocalDatabaseBackupTaskSupport.java - client-core/src/main/java/fr/ird/observe/client/datasource/h2/backup/LocalDatabaseBackupTimer.java - client-core/src/main/java/fr/ird/observe/client/datasource/h2/server/H2ServerBodyContent.java - client-core/src/main/java/fr/ird/observe/client/datasource/h2/server/H2ServerUI.jcss - client-core/src/main/java/fr/ird/observe/client/datasource/h2/server/actions/StartH2WebServer.java - client-core/src/main/java/fr/ird/observe/client/datasource/h2/server/actions/StopH2WebServer.java - client-core/src/main/java/fr/ird/observe/client/datasource/h2/server/actions/StopServerMode.java - client-core/src/main/java/fr/ird/observe/client/main/ObserveMainUI.jcss - client-core/src/main/java/fr/ird/observe/client/main/ObserveMainUIHandler.java - client-core/src/main/java/fr/ird/observe/client/main/actions/ChangeLanguageToEnglishAction.java - client-core/src/main/java/fr/ird/observe/client/main/actions/ChangeLanguageToFrenchAction.java - client-core/src/main/java/fr/ird/observe/client/main/actions/ChangeLanguageToSpanishAction.java - client-core/src/main/java/fr/ird/observe/client/main/actions/CloseApplicationAction.java - client-core/src/main/java/fr/ird/observe/client/main/actions/GotoSiteAction.java - client-core/src/main/java/fr/ird/observe/client/main/actions/MainUIActionSupport.java - client-core/src/main/java/fr/ird/observe/client/main/actions/OpenLastFeedBackAction.java - client-core/src/main/java/fr/ird/observe/client/main/actions/ReloadApplicationAction.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/57b88df8f2aa99930352fe79… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/57b88df8f2aa99930352fe79… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: Correction des listes qui ne sont pas active
by Tony CHEMIT 15 Jul '20

15 Jul '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 26321405 by Tony Chemit at 2020-07-15T17:00:49+02:00 Correction des listes qui ne sont pas active - - - - - 57b88df8 by Tony Chemit at 2020-07-15T17:01:47+02:00 Simplification des composents applicatifs (il en reste très peu et on fera une seconde passe qui va encore simplifier : un component par couche sera bien suffisant et simple à gérer) - - - - - 30 changed files: - client-configuration/src/main/java/fr/ird/observe/client/datasource/dcp/FloatingObjectPresetsManager.java - client-core/src/main/java/fr/ird/observe/client/ClientUIContext.java - client-core/src/main/java/fr/ird/observe/client/ObserveSwingApplicationContext.java - client-core/src/main/java/fr/ird/observe/client/datasource/api/ObserveDataSourcesManager.java - client-core/src/main/java/fr/ird/observe/client/datasource/h2/backup/BackupsManager.java - client-core/src/main/java/fr/ird/observe/client/datasource/h2/backup/LocalDatabaseBackupTimer.java - client-core/src/main/java/fr/ird/observe/client/main/actions/MainUIActionSupport.java - client-core/src/main/java/fr/ird/observe/client/main/actions/ReloadApplicationAction.java - client-core/src/main/java/fr/ird/observe/client/main/body/ClientConfigBodyContent.java - client-core/src/main/java/fr/ird/observe/client/util/UIHelper.java - client-core/src/main/java/fr/ird/observe/client/util/action/ObserveExecutorService.java - client-core/src/main/java/fr/ird/observe/client/util/session/ObserveSwingSessionHelper.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminActionModel.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/config/ConfigModel.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/DataSourceEditorBodyContent.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/DataSourceEditorHandler.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/MainDataSourceListener.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/actions/DataSourceEditorActionSupport.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/ContentUIHandler.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/ContentUIModel.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/actions/ContentUIActionSupport.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/edit/actions/DeleteActionSupport.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/edit/actions/SaveActionSupport.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/list/ContentListUI.jcss - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/list/ContentListUIModel.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/list/actions/TripUIMoveMultipleActionSupport.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/open/actions/Close.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/open/actions/Open.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/open/actions/TripUIMoveSingleActionSupport.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/simple/ContentSimpleUIModel.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/f15111ef5832b1cc484e085f… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/f15111ef5832b1cc484e085f… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: Optimize i18n keys (make better categories)
by Tony CHEMIT 15 Jul '20

15 Jul '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: ed557d28 by Tony Chemit at 2020-07-15T13:59:00+02:00 Optimize i18n keys (make better categories) - - - - - f15111ef by Tony Chemit at 2020-07-15T14:17:34+02:00 La suppresion de la date de début de l'opération de peche fait planter le calcul des activités candidates - - - - - 30 changed files: - client-configuration/src/main/config/Client.ini - client-configuration/src/main/i18n/getters/config.getter - client-configuration/src/main/i18n/getters/java.getter - client-configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client-core/src/main/i18n/getters/java.getter - client-core/src/main/i18n/getters/jaxx.getter - client-core/src/main/java/fr/ird/observe/client/ClientUIContext.java - client-core/src/main/java/fr/ird/observe/client/action/api/FeedBackBuilder.java - client-core/src/main/java/fr/ird/observe/client/datasource/api/ObserveSwingDataSource.java - client-core/src/main/java/fr/ird/observe/client/datasource/h2/backup/LocalDatabaseBackupTaskSupport.java - client-core/src/main/java/fr/ird/observe/client/datasource/h2/server/H2ServerBodyContent.java - client-core/src/main/java/fr/ird/observe/client/datasource/h2/server/H2ServerUI.jcss - client-core/src/main/java/fr/ird/observe/client/datasource/h2/server/actions/StartH2WebServer.java - client-core/src/main/java/fr/ird/observe/client/datasource/h2/server/actions/StopH2WebServer.java - client-core/src/main/java/fr/ird/observe/client/datasource/h2/server/actions/StopServerMode.java - client-core/src/main/java/fr/ird/observe/client/main/ObserveMainUI.jcss - client-core/src/main/java/fr/ird/observe/client/main/ObserveMainUIHandler.java - client-core/src/main/java/fr/ird/observe/client/main/actions/ChangeLanguageToEnglishAction.java - client-core/src/main/java/fr/ird/observe/client/main/actions/ChangeLanguageToFrenchAction.java - client-core/src/main/java/fr/ird/observe/client/main/actions/ChangeLanguageToSpanishAction.java - client-core/src/main/java/fr/ird/observe/client/main/actions/CloseApplicationAction.java - client-core/src/main/java/fr/ird/observe/client/main/actions/GotoSiteAction.java - client-core/src/main/java/fr/ird/observe/client/main/actions/OpenLastFeedBackAction.java - client-core/src/main/java/fr/ird/observe/client/main/actions/ReloadApplicationAction.java - client-core/src/main/java/fr/ird/observe/client/main/actions/ReloadDefaultConfigurationAction.java - client-core/src/main/java/fr/ird/observe/client/main/actions/ReloadResourcesAction.java - client-core/src/main/java/fr/ird/observe/client/main/actions/ShowAboutAction.java - client-core/src/main/java/fr/ird/observe/client/main/actions/ShowConfigAction.java - client-core/src/main/java/fr/ird/observe/client/main/actions/TranslateAction.java - client-core/src/main/java/fr/ird/observe/client/main/body/ClientConfigUI.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/01ef1ec9a508926b3b82b3a7… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/01ef1ec9a508926b3b82b3a7… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: Clean i18n keys
by Tony CHEMIT 15 Jul '20

15 Jul '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 20fa0bb1 by Tony Chemit at 2020-07-15T12:00:53+02:00 Clean i18n keys - - - - - 01ef1ec9 by Tony Chemit at 2020-07-15T12:35:55+02:00 Optimize i18n keys - - - - - 13 changed files: - client-datasource-actions/src/main/i18n/getters/java.getter - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/ReferentialSynchronizeResources.java - client-datasource-editor-api/pom.xml - client-datasource-editor-api/src/main/i18n/getters/java-enumeration.getter - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/ContentMode.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/ContentUI.jaxx - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/ContentUIHandler.java - client-datasource-editor-ll/src/main/i18n/getters/jaxx.getter - client-datasource-editor-ps/src/main/i18n/getters/jaxx.getter - observe-i18n/src/main/i18n/translations/observe_en_GB.properties - observe-i18n/src/main/i18n/translations/observe_es_ES.properties - observe-i18n/src/main/i18n/translations/observe_fr_FR.properties - validation/src/main/i18n/getters/validation-fields.getter Changes: ===================================== client-datasource-actions/src/main/i18n/getters/java.getter ===================================== @@ -124,10 +124,10 @@ observe.actions.synchro.referential.replaceBeforeDeactivate.title observe.actions.synchro.referential.replaceBeforeDelete.title observe.actions.synchro.referential.task.addToLeft observe.actions.synchro.referential.task.addToRight -observe.actions.synchro.referential.task.deactivateWithReplaceFromLeft -observe.actions.synchro.referential.task.deactivateWithReplaceFromLeftWithReplacement -observe.actions.synchro.referential.task.deactivateWithReplaceFromRight -observe.actions.synchro.referential.task.deactivateWithReplaceFromRightWithReplacement +observe.actions.synchro.referential.task.deactivateFromLeft +observe.actions.synchro.referential.task.deactivateFromLeftWithReplacement +observe.actions.synchro.referential.task.deactivateFromRight +observe.actions.synchro.referential.task.deactivateFromRightWithReplacement observe.actions.synchro.referential.task.deleteFromLeft observe.actions.synchro.referential.task.deleteFromRight observe.actions.synchro.referential.task.include.properties ===================================== client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/ReferentialSynchronizeResources.java ===================================== @@ -142,8 +142,8 @@ public enum ReferentialSynchronizeResources { DEACTIVATE( "deactivateFromLeft", "deactivateFromRight", - n("observe.actions.synchro.referential.task.deactivateWithReplaceFromLeft"), - n("observe.actions.synchro.referential.task.deactivateWithReplaceFromRight"), + n("observe.actions.synchro.referential.task.deactivateFromLeft"), + n("observe.actions.synchro.referential.task.deactivateFromRight"), n("observe.actions.synchro.referential.action.deactivateFromLeft.tip"), n("observe.actions.synchro.referential.action.deactivateFromRight.tip"), ReferentialSynchroModel.DEACTIVATE_LEFT_PROPERTY_NAME, @@ -155,8 +155,8 @@ public enum ReferentialSynchronizeResources { DEACTIVATE_WITH_REPLACEMENT( "deactivateFromLeft", "deactivateFromRight", - n("observe.actions.synchro.referential.task.deactivateWithReplaceFromLeftWithReplacement"), - n("observe.actions.synchro.referential.task.deactivateWithReplaceFromRightWithReplacement"), + n("observe.actions.synchro.referential.task.deactivateFromLeftWithReplacement"), + n("observe.actions.synchro.referential.task.deactivateFromRightWithReplacement"), n("observe.actions.synchro.referential.action.deactivateFromLeftWithReplacement.tip"), n("observe.actions.synchro.referential.action.deactivateFromRightWithReplacement.tip"), ReferentialSynchroModel.DEACTIVATE_LEFT_PROPERTY_NAME, ===================================== client-datasource-editor-api/pom.xml ===================================== @@ -280,6 +280,14 @@ <enum>fr.ird.observe.client.datasource.editor.wizard.ObstunaAdminAction</enum> </enums> </enumerationSet> + <enumerationSet> + <name>tip</name> +  + <pattern>observe.Id.mode.@NAME@.tip</pattern> + <enums> + <enum>fr.ird.observe.client.datasource.editor.content.ContentMode</enum> + </enums> + </enumerationSet> </enumerationSets> </configuration> </execution> ===================================== client-datasource-editor-api/src/main/i18n/getters/java-enumeration.getter ===================================== @@ -1,3 +1,6 @@ +observe.Id.mode.CREATE.tip +observe.Id.mode.READ.tip +observe.Id.mode.UPDATE.tip observe.constant.ObstunaAdminAction.CREATE observe.constant.ObstunaAdminAction.CREATE.description observe.constant.ObstunaAdminAction.SECURITY ===================================== client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/ContentMode.java ===================================== @@ -21,6 +21,8 @@ */ package fr.ird.observe.client.datasource.editor.content; +import fr.ird.observe.dto.I18nEnumHelper; +import io.ultreia.java4all.i18n.I18n; import org.nuiton.jaxx.runtime.swing.SwingUtil; import javax.swing.Icon; @@ -46,6 +48,10 @@ public enum ContentMode { return icon == null ? icon = SwingUtil.createActionIcon("mode-" + name().toLowerCase()) : icon; } + public String getTip() { + return I18n.t(String.format("observe.Id.mode.%s.tip", name())); + } + public String getValidationContext() { return name().toLowerCase(); } ===================================== client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/ContentUI.jaxx ===================================== @@ -22,10 +22,7 @@ abstract='true' contentContainer='{contentContainer}' leftDecoration='{titleLeft}' - rightDecoration='{titleRightToolBar}' - _READTip='t("observe.Id.mode.read.tip")' - _CREATERip='t("observe.Id.mode.create.tip")' - _UPDATETip='t("observe.Id.mode.update.tip")'> + rightDecoration='{titleRightToolBar}'> <import> fr.ird.observe.client.configuration.ClientConfig ===================================== client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/ContentUIHandler.java ===================================== @@ -541,14 +541,12 @@ public abstract class ContentUIHandler<U extends ContentUI> implements ObserveSe protected final void onModeChanged(ContentMode mode) { String tip = null; - if (mode != null) { - tip = (String) ui.getClientProperty(mode.name() + "Tip"); - } - ui.getTitleRight().setToolTipText(tip); Icon icon = null; if (mode != null) { + tip = mode.getTip(); icon = mode.getIcon(); } + ui.getTitleRight().setToolTipText(tip); ui.getTitleRight().setIcon(icon); getModel().setFormFocusOwner(null); } ===================================== client-datasource-editor-ll/src/main/i18n/getters/jaxx.getter ===================================== @@ -24,7 +24,6 @@ observe.data.Data.timerTimeOnBoard observe.data.Data.traceCutOff observe.data.Data.vessel observe.data.Data.weightMeasureMethod -observe.data.Sample.action.resetDefaultSizeMeasureType.tip observe.data.ll.common.GearUseFeatures.gear observe.data.ll.common.GearUseFeatures.generalTab observe.data.ll.common.GearUseFeatures.measurementsTab @@ -97,7 +96,6 @@ observe.data.ll.logbook.Activity.titles observe.data.ll.logbook.Activity.vesselActivity observe.data.ll.logbook.Activity.wind observe.data.ll.logbook.Activity.windDirection -observe.data.ll.logbook.Activity.windSpeed observe.data.ll.logbook.BaitsComposition.action.create observe.data.ll.logbook.BaitsComposition.action.create.tip observe.data.ll.logbook.BaitsComposition.baitSettingStatus ===================================== client-datasource-editor-ps/src/main/i18n/getters/jaxx.getter ===================================== @@ -22,7 +22,6 @@ observe.data.Data.speciesFate observe.data.Data.startDate observe.data.Data.vessel observe.data.Data.weightMeasureMethod -observe.data.Sample.action.resetDefaultSizeMeasureType.tip observe.data.ps.common.GearUseFeatures.action.create.tip observe.data.ps.common.GearUseFeatures.action.create.tip.tip observe.data.ps.common.GearUseFeatures.gear ===================================== observe-i18n/src/main/i18n/translations/observe_en_GB.properties ===================================== The diff for this file was not included because it is too large. ===================================== observe-i18n/src/main/i18n/translations/observe_es_ES.properties ===================================== The diff for this file was not included because it is too large. ===================================== observe-i18n/src/main/i18n/translations/observe_fr_FR.properties ===================================== The diff for this file was not included because it is too large. ===================================== validation/src/main/i18n/getters/validation-fields.getter ===================================== @@ -58,7 +58,6 @@ observe.data.ll.logbook.Activity.startTimeStamp observe.data.ll.logbook.Activity.vesselActivity observe.data.ll.logbook.Activity.wind observe.data.ll.logbook.Activity.windDirection -observe.data.ll.logbook.Activity.windSpeed observe.data.ll.logbook.BaitsComposition.baitSettingStatus observe.data.ll.logbook.BaitsComposition.baitType observe.data.ll.logbook.BaitsComposition.individualSize View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/149ef8af9d5e00bc630b8aea… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/149ef8af9d5e00bc630b8aea… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Ajout contrôle de borne 0 à 100 sur la proportion déprédaté sur une capture ll...
by Tony CHEMIT 15 Jul '20

15 Jul '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 149ef8af by Tony Chemit at 2020-07-15T11:20:04+02:00 Ajout contrôle de borne 0 à 100 sur la proportion déprédaté sur une capture ll logbook - Closes #1579 - - - - - 1 changed file: - validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/CatchDto-update-error-validation.xml Changes: ===================================== validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/CatchDto-update-error-validation.xml ===================================== @@ -31,6 +31,12 @@ </param> <message>observe.validation.catchLongline.required.count.when.acquisitionModeIsGrouped</message> </field-validator> - + </field> + <field name="depredatedProportion"> + <field-validator type="boundNumber" short-circuit="true"> + <param name="min">0.0</param> + <param name="max">100.0</param> + <message/> + </field-validator> </field> </validators> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/149ef8af9d5e00bc630b8aea7… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/149ef8af9d5e00bc630b8aea7… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Improve Exception API :
by Tony CHEMIT 15 Jul '20

15 Jul '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 26d2c33b by Tony Chemit at 2020-07-15T10:34:28+02:00 Improve Exception API : * now have nice message in exception, instead of dummy exception ith data but no message! Thanks to Bavencoff (go to hell bad coder) - - - - - 30 changed files: - client-core/src/main/java/fr/ird/observe/client/datasource/api/ObserveDataSourcesManager.java - client-core/src/main/java/fr/ird/observe/client/datasource/api/ObserveSwingDataSource.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/actions/AdminTabUIActionSupport.java - client-datasource-editor-api/src/main/i18n/getters/java.getter - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/wizard/ObstunaAdminAction.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/wizard/StorageUIModel.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/wizard/connexion/DataSourceSelectorModel.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/wizard/presets/actions/TestRemote.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/wizard/presets/actions/TestServer.java - client-runner/src/test/java/fr/ird/observe/client/ClientTestClassResource.java - common-persistence/src/main/java/fr/ird/observe/entities/DataAssociationParentNotFoundException.java - common-persistence/src/main/java/fr/ird/observe/entities/DataNotFoundException.java - common-persistence/src/main/java/fr/ird/observe/spi/context/DataDtoEntityContext.java - common-persistence/src/main/java/fr/ird/observe/spi/context/DtoEntityContext.java - common-persistence/src/main/java/fr/ird/observe/spi/context/ReferentialDtoEntityContext.java - common-service/src/main/i18n/getters/java.getter - common-service/src/main/java/fr/ird/observe/services/configuration/DataSourceCreateConfigurationDto.java - common-service/src/main/java/fr/ird/observe/services/configuration/DataSourceCreateWithNoReferentialImportException.java - common-service/src/main/java/fr/ird/observe/services/configuration/IncompatibleDataSourceCreateConfigurationException.java - common-service/src/main/java/fr/ird/observe/services/service/BabModelVersionException.java - common-service/src/main/java/fr/ird/observe/services/service/ConcurrentModificationException.java - common-service/src/main/java/fr/ird/observe/services/service/DataFileNotFoundException.java - common-service/src/main/java/fr/ird/observe/services/service/DatabaseConnexionNotAuthorizedException.java - common-service/src/main/java/fr/ird/observe/services/service/DatabaseDestroyNotAuthorizedException.java - common-service/src/main/java/fr/ird/observe/services/service/DatabaseNotFoundException.java - − common-service/src/main/java/fr/ird/observe/services/service/DatabaseOpenException.java - observe-i18n/src/main/i18n/translations/observe_en_GB.properties - observe-i18n/src/main/i18n/translations/observe_es_ES.properties - observe-i18n/src/main/i18n/translations/observe_fr_FR.properties - persistence/src/main/java/fr/ird/observe/entities/ObserveTopiaPersistenceContext.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/26d2c33bbbfab360f4da5ddc7… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/26d2c33bbbfab360f4da5ddc7… You're receiving this email because of your account on gitlab.com.

1 0