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

[Git][ultreiaio/ird-observe][develop] 2 commits: Bug requête tableau synthèse DCP - Closes #1244
by Tony CHEMIT 30 Apr '19

30 Apr '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 568fb6ac by tchemit at 2019-04-30T11:16:37Z Bug requête tableau synthèse DCP - Closes #1244 - - - - - 1d93b093 by tchemit at 2019-04-30T11:16:38Z update pom - - - - - 3 changed files: - pom.xml - services-local/src/test/java/fr/ird/observe/services/local/service/actions/report/ReportDcpUsageTest.java - services/src/main/resources/observe-reports.properties Changes: ===================================== pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2019.8.14</version> + <version>2019.8.15</version> </parent> <groupId>fr.ird.observe</groupId> ===================================== services-local/src/test/java/fr/ird/observe/services/local/service/actions/report/ReportDcpUsageTest.java ===================================== @@ -45,8 +45,8 @@ public class ReportDcpUsageTest extends AbstractReportServiceLocalTest { Assert.assertNotNull(report); assertReportName( report, - "Utilisation des DCP", - "Tableau récapitulatif du nombre de DCP visités selon l’action effectuée (visites avec et sans pêche, mis à l’eau, récuperation), et tortues observées" + "Utilisation des FOB", + "Tableau récapitulatif du nombre de FOB visités selon l’action effectuée (visites avec et sans pêche, mis à l’eau, récuperation), et tortues observées" ); /* @@ -56,15 +56,15 @@ public class ReportDcpUsageTest extends AbstractReportServiceLocalTest { report, -1, 11, - new String[]{"Type de DCP (Tableau 8)", - "Visités", + new String[]{"Type de FOB (Tableau 8)", + "Visités sans pêche", "Pêchés", "Mis à l’eau seuls", - "Modifications ou renforcements", - "Retaits", + "Modifiés ou renforcés", + "Retirés", "Abandonnés (sans balise ou non détruit ou non coulé)", "Coulés", - "Remplacements", + "Remplacés", "Autre (péciser dans les notes)", "Tortues associées" } ===================================== services/src/main/resources/observe-reports.properties ===================================== @@ -119,12 +119,12 @@ report.dailySetAndCatch.request.1=0,0|row|\ Group By r.date \ Order By r.date ################################################################################ -## Utilisation des DCP +## Utilisation des FOB ################################################################################ report.dcpUsage.modelType=PS -report.dcpUsage.name=Utilisation des DCP -report.dcpUsage.description=Tableau r\u00e9capitulatif du nombre de DCP visit\u00e9s selon l\u2019action effectu\u00e9e (visites avec et sans p\u00eache, mis \u00e0 l\u2019eau, r\u00e9cuperation), et tortues observ\u00e9es -report.dcpUsage.columns=Type de DCP (Tableau 8),Visit\u00e9s,P\u00each\u00e9s,Mis \u00e0 l\u2019eau seuls,Modifications ou renforcements,Retaits,Abandonn\u00e9s (sans balise ou non d\u00e9truit ou non coul\u00e9),Coul\u00e9s,Remplacements,Autre (p\u00e9ciser dans les notes),Tortues associ\u00e9es +report.dcpUsage.name=Utilisation des FOB +report.dcpUsage.description=Tableau r\u00e9capitulatif du nombre de FOB visit\u00e9s selon l\u2019action effectu\u00e9e (visites avec et sans p\u00eache, mis \u00e0 l\u2019eau, r\u00e9cuperation), et tortues observ\u00e9es +report.dcpUsage.columns=Type de FOB (Tableau 8),Visit\u00e9s sans p\u00eache,P\u00each\u00e9s,Mis \u00e0 l\u2019eau seuls,Modifi\u00e9s ou renforc\u00e9s,Retir\u00e9s,Abandonn\u00e9s (sans balise ou non d\u00e9truit ou non coul\u00e9),Coul\u00e9s,Remplac\u00e9s,Autre (p\u00e9ciser dans les notes),Tortues associ\u00e9es report.dcpUsage.repeatVariable.typeObjetId=java.lang.String|\ Select distinct (om.standardCode) \ From ObjectMaterialImpl om \ @@ -137,13 +137,14 @@ report.dcpUsage.repeatVariable.typeObjetId=java.lang.String|\ Join a.floatingObject dcp \ Where \ m.id In :tripId \ - and (dcp.computedWhenLeavingSimplifiedObjectType = om.standardCode Or dcp.computedWhenArrivingSimplifiedObjectType = om.standardCode) \ + and (dcp.computedWhenArrivingSimplifiedObjectType = om.standardCode Or dcp.computedWhenLeavingSimplifiedObjectType = om.standardCode) \ ) > 0 report.dcpUsage.request.1=0,0|row|\ - Select concat(str(to.standardCode) , ' - ', to.label2) \ - From ObjectMaterialImpl to \ + Select concat(str(om.standardCode) , ' - ', om.label2) \ + From ObjectMaterialImpl om \ Where \ - to.standardCode = :typeObjetId + om.standardCode = :typeObjetId \ + And om.status != 0 report.dcpUsage.request.1.repeat=typeObjetId|column # visite report.dcpUsage.request.2=1,0|row|\ @@ -154,8 +155,9 @@ report.dcpUsage.request.2=1,0|row|\ Join a.floatingObject dcp \ Where \ m.id In :tripId \ - and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \ - and dcp.objectOperation.id = 'fr.ird.referential.ps.observation.ObjectOperation#0#2' + and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ + and dcp.objectOperation.id = 'fr.ird.referential.ps.observation.ObjectOperation#0#2' \ + and a.vesselActivitySeine.id != 'fr.ird.referential.ps.observation.VesselActivitySeine#1239832675369#0.12552908048322586' report.dcpUsage.request.2.repeat=typeObjetId|column # peche report.dcpUsage.request.3=2,0|row|\ @@ -166,8 +168,8 @@ report.dcpUsage.request.3=2,0|row|\ Join a.floatingObject dcp \ Where \ m.id In :tripId \ - and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \ - and (dcp.objectOperation.id = 'fr.ird.referential.ps.observation.ObjectOperation#0#3' Or a.vesselActivitySeine.id = 'fr.ird.referential.ps.common.VesselActivitySeine#1239832675369#0.12552908048322586') + and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ + and (dcp.objectOperation.id = 'fr.ird.referential.ps.observation.ObjectOperation#0#3' Or a.vesselActivitySeine.id = 'fr.ird.referential.ps.observation.VesselActivitySeine#1239832675369#0.12552908048322586') report.dcpUsage.request.3.repeat=typeObjetId|column # mis a l'eau report.dcpUsage.request.4=3,0|row|\ @@ -178,10 +180,10 @@ report.dcpUsage.request.4=3,0|row|\ Join a.floatingObject dcp \ Where \ m.id In :tripId \ - and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \ + and dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId \ and dcp.objectOperation.id = 'fr.ird.referential.ps.observation.ObjectOperation#0#1' report.dcpUsage.request.4.repeat=typeObjetId|column -# modification ou rneforcement +# modification ou renforcement #FIXME Supprime de la requete du dessous #FIXME and dcp.objectFate.id = 'fr.ird.referential.ps.ObjectFate#1396860761530#0.8869464242156488' \ report.dcpUsage.request.5=4,0|row|\ @@ -192,7 +194,7 @@ report.dcpUsage.request.5=4,0|row|\ Join a.floatingObject dcp \ Where \ m.id In :tripId \ - and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \ + and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ and dcp.objectOperation.id = 'fr.ird.referential.ps.observation.ObjectOperation#0#8' report.dcpUsage.request.5.repeat=typeObjetId|column # Retrait @@ -204,7 +206,7 @@ report.dcpUsage.request.6=5,0|row|\ Join a.floatingObject dcp \ Where \ m.id In :tripId \ - and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \ + and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ and dcp.objectOperation.id = 'fr.ird.referential.ps.observation.ObjectOperation#0#4' report.dcpUsage.request.6.repeat=typeObjetId|column # abondonne @@ -216,7 +218,7 @@ report.dcpUsage.request.7=6,0|row|\ Join a.floatingObject dcp \ Where \ m.id In :tripId \ - and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \ + and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ and dcp.objectOperation.id = 'fr.ird.referential.ps.observation.ObjectOperation#0#5' report.dcpUsage.request.7.repeat=typeObjetId|column # coule @@ -228,7 +230,7 @@ report.dcpUsage.request.8=7,0|row|\ Join a.floatingObject dcp \ Where \ m.id In :tripId \ - and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \ + and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ and dcp.objectOperation.id = 'fr.ird.referential.ps.observation.ObjectOperation#0#7' report.dcpUsage.request.8.repeat=typeObjetId|column # remplacement @@ -240,7 +242,7 @@ report.dcpUsage.request.9=8,0|row|\ Join a.floatingObject dcp \ Where \ m.id In :tripId \ - and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \ + and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ and dcp.objectOperation.id = 'fr.ird.referential.ps.observation.ObjectOperation#0#09' report.dcpUsage.request.9.repeat=typeObjetId|column # autre @@ -252,7 +254,7 @@ report.dcpUsage.request.10=9,0|row|\ Join a.floatingObject dcp \ Where \ m.id In :tripId \ - and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \ + and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ and dcp.objectOperation.id = 'fr.ird.referential.ps.observation.ObjectOperation#0#10' report.dcpUsage.request.10.repeat=typeObjetId|column # tortues @@ -265,7 +267,7 @@ report.dcpUsage.request.11=10,0|row| \ Join dcp.objectObservedSpecies efo \ Where \ m.id In :tripId \ - and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \ + and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ and efo.species.speciesGroup.id = 'fr.ird.referential.common.SpeciesGroup#1239832683690#0.24333033683679461' report.dcpUsage.request.11.repeat=typeObjetId|column View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/1513125bae3c62ec0b4603034a… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/1513125bae3c62ec0b4603034a… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] 3 commits: Bug requête tableau synthèse DCP - Closes #1244
by Tony CHEMIT 30 Apr '19

30 Apr '19

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 45c57bed by tchemit at 2019-04-30T10:49:13Z Bug requête tableau synthèse DCP - Closes #1244 - - - - - 39873c4c by tchemit at 2019-04-30T10:49:14Z update pom - - - - - 53e7aae3 by tchemit at 2019-04-30T10:49:14Z Il manques des traductions... - - - - - 9 changed files: - client-core/src/main/i18n/getters/jaxx.getter - client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/TargetCatchUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/TargetDiscardCatchUI.jcss - 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 - pom.xml - services-local/src/test/java/fr/ird/observe/services/local/service/actions/report/ReportDcpUsageTest.java - services/src/main/resources/observe-reports.properties Changes: ===================================== client-core/src/main/i18n/getters/jaxx.getter ===================================== @@ -570,6 +570,7 @@ observe.common.TargetCatchDto.table.deleteExtraMessage observe.common.TargetCatchDto.table.speciesThon.tip observe.common.TargetCatchDto.table.weightCategory.tip observe.common.TargetCatchDto.table.well.tip +observe.common.TargetCatchDto.targetCatchCompositionEstimatedByObserver observe.common.TargetCatchDto.title observe.common.TargetCatchDto.weightCategory observe.common.TargetCatchDto.well @@ -581,6 +582,7 @@ observe.common.TargetDiscardDto.table.deleteExtraMessage observe.common.TargetDiscardDto.table.reasonForDiscard.tip observe.common.TargetDiscardDto.table.species.tip observe.common.TargetDiscardDto.table.weightCategory.tip +observe.common.TargetDiscardDto.targetDiscardCatchCompositionEstimatedByObserver observe.common.TargetLengthDto.count observe.common.TargetLengthDto.length observe.common.TargetLengthDto.tagNumber ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/TargetCatchUI.jcss ===================================== @@ -69,6 +69,7 @@ horizontalTextPosition:{JCheckBox.LEFT}; _propertyName:{SetSeineTargetCatchDto.PROPERTY_TARGET_CATCH_COMPOSITION_ESTIMATED_BY_OBSERVER}; selected:{BooleanUtils.isTrue(bean.isTargetCatchCompositionEstimatedByObserver())}; + text:"observe.common.TargetCatchDto.targetCatchCompositionEstimatedByObserver"; } #moveUp { ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/TargetDiscardCatchUI.jcss ===================================== @@ -75,6 +75,7 @@ horizontalTextPosition:{JCheckBox.LEFT}; _propertyName:{SetSeineTargetCatchDto.PROPERTY_TARGET_DISCARD_CATCH_COMPOSITION_ESTIMATED_BY_OBSERVER}; selected:{BooleanUtils.isTrue(bean.isTargetDiscardCatchCompositionEstimatedByObserver())}; + text:"observe.common.TargetDiscardDto.targetDiscardCatchCompositionEstimatedByObserver"; } #moveUp { ===================================== observe-i18n/src/main/i18n/translations/observe_en_GB.properties ===================================== @@ -1253,8 +1253,6 @@ observe.common.SetLonglineDto.settingVesselSpeed=Vessel speed (kts) observe.common.SetLonglineDto.shooterSpeed=Shooter speed (kts) observe.common.SetLonglineDto.snapWeight=Snap weight (kg) observe.common.SetLonglineDto.swivelWeight=swivel weight (kg) -observe.common.SetLonglineDto.targetCatchCompositionEstimatedByObserver=Composition estimated by observer? -observe.common.SetLonglineDto.targetDiscardCatchCompositionEstimatedByObserver=Composition estimated by observer? observe.common.SetLonglineDto.timeBetweenHooks=time between hooks observe.common.SetLonglineDto.title=Fishing operation observe.common.SetLonglineDto.totalBasketsCount=Total baskets count @@ -1387,6 +1385,7 @@ observe.common.TargetCatchDto.table.weightCategory=Weight category observe.common.TargetCatchDto.table.weightCategory.tip=Weight category observe.common.TargetCatchDto.table.well=Well observe.common.TargetCatchDto.table.well.tip=Well +observe.common.TargetCatchDto.targetCatchCompositionEstimatedByObserver=Composition estimated by observer? observe.common.TargetCatchDto.title=Target catch observe.common.TargetCatchDto.type=Target catch observe.common.TargetCatchDto.types=Target catches @@ -1410,6 +1409,7 @@ observe.common.TargetDiscardDto.table.weight=Weight (in t) observe.common.TargetDiscardDto.table.weight.tip=Weight (in t) observe.common.TargetDiscardDto.table.weightCategory=Weight category observe.common.TargetDiscardDto.table.weightCategory.tip=Weight category +observe.common.TargetDiscardDto.targetDiscardCatchCompositionEstimatedByObserver=Composition estimated by observer? observe.common.TargetLengthDto.count=Count observe.common.TargetLengthDto.length=Length (cm) observe.common.TargetLengthDto.table.count=Count ===================================== observe-i18n/src/main/i18n/translations/observe_es_ES.properties ===================================== @@ -1253,8 +1253,6 @@ observe.common.SetLonglineDto.settingVesselSpeed=Velocidad del barco (nd) observe.common.SetLonglineDto.shooterSpeed=Velocidad virador (nd) observe.common.SetLonglineDto.snapWeight=Peso mosquetón (kg) observe.common.SetLonglineDto.swivelWeight=Peso destorcedor (kg) -observe.common.SetLonglineDto.targetCatchCompositionEstimatedByObserver=¿Composición estimada por el observador? -observe.common.SetLonglineDto.targetDiscardCatchCompositionEstimatedByObserver=¿Composición estimada por el observador? observe.common.SetLonglineDto.timeBetweenHooks=Tiempo entre anzuelos (s) observe.common.SetLonglineDto.title=Operación de pesca observe.common.SetLonglineDto.totalBasketsCount=Número total de canastas @@ -1387,6 +1385,7 @@ observe.common.TargetCatchDto.table.weightCategory=Categoría de peso observe.common.TargetCatchDto.table.weightCategory.tip=Categoría de peso observe.common.TargetCatchDto.table.well=Cuba observe.common.TargetCatchDto.table.well.tip=Cuba +observe.common.TargetCatchDto.targetCatchCompositionEstimatedByObserver=¿Composición estimada por el observador? observe.common.TargetCatchDto.title=Captura de túnidos observe.common.TargetCatchDto.type=Captura de túnidos observe.common.TargetCatchDto.types=Capturas de túnidos @@ -1410,6 +1409,7 @@ observe.common.TargetDiscardDto.table.weight=Peso observe.common.TargetDiscardDto.table.weight.tip=Peso (en t) observe.common.TargetDiscardDto.table.weightCategory=Categoría de peso observe.common.TargetDiscardDto.table.weightCategory.tip=Categoría de peso +observe.common.TargetDiscardDto.targetDiscardCatchCompositionEstimatedByObserver=¿Composición estimada por el observador? observe.common.TargetLengthDto.count=Número observe.common.TargetLengthDto.length=Talla (cm) observe.common.TargetLengthDto.table.count=Número ===================================== observe-i18n/src/main/i18n/translations/observe_fr_FR.properties ===================================== @@ -1253,8 +1253,6 @@ observe.common.SetLonglineDto.settingVesselSpeed=Vitesse bateau (nd) observe.common.SetLonglineDto.shooterSpeed=Vitesse shooter (nd) observe.common.SetLonglineDto.snapWeight=Poids snap (kg) observe.common.SetLonglineDto.swivelWeight=Poids de l'émerillon (kg) -observe.common.SetLonglineDto.targetCatchCompositionEstimatedByObserver=Composition estimée par l'observateur ? -observe.common.SetLonglineDto.targetDiscardCatchCompositionEstimatedByObserver=Composition estimée par l'observateur ? observe.common.SetLonglineDto.timeBetweenHooks=Temps entre hameçons (s) observe.common.SetLonglineDto.title=Opération de pêche observe.common.SetLonglineDto.totalBasketsCount=Nombre total de paniers @@ -1387,6 +1385,7 @@ observe.common.TargetCatchDto.table.weightCategory=Catégorie de poids observe.common.TargetCatchDto.table.weightCategory.tip=Catégorie de poids observe.common.TargetCatchDto.table.well=Cuve observe.common.TargetCatchDto.table.well.tip=Cuve +observe.common.TargetCatchDto.targetCatchCompositionEstimatedByObserver=Composition estimée par l'observateur ? observe.common.TargetCatchDto.title=Thons conservés observe.common.TargetCatchDto.type=Thons conservés observe.common.TargetCatchDto.types=Thons conservés @@ -1410,6 +1409,7 @@ observe.common.TargetDiscardDto.table.weight=Poids observe.common.TargetDiscardDto.table.weight.tip=Poids (en t) observe.common.TargetDiscardDto.table.weightCategory=Catégorie de poids observe.common.TargetDiscardDto.table.weightCategory.tip=Catégorie de poids +observe.common.TargetDiscardDto.targetDiscardCatchCompositionEstimatedByObserver=Composition estimée par l'observateur ? observe.common.TargetLengthDto.count=Nombre observe.common.TargetLengthDto.length=Taille (en cm) observe.common.TargetLengthDto.table.count=Effectif ===================================== pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2019.8.14</version> + <version>2019.8.15</version> </parent> <groupId>fr.ird.observe</groupId> ===================================== services-local/src/test/java/fr/ird/observe/services/local/service/actions/report/ReportDcpUsageTest.java ===================================== @@ -45,8 +45,8 @@ public class ReportDcpUsageTest extends AbstractReportServiceLocalTest { Assert.assertNotNull(report); assertReportName( report, - "Utilisation des DCP", - "Tableau récapitulatif du nombre de DCP visités selon l’action effectuée (visites avec et sans pêche, mis à l’eau, récuperation), et tortues observées" + "Utilisation des FOB", + "Tableau récapitulatif du nombre de FOB visités selon l’action effectuée (visites avec et sans pêche, mis à l’eau, récuperation), et tortues observées" ); /* @@ -56,15 +56,15 @@ public class ReportDcpUsageTest extends AbstractReportServiceLocalTest { report, -1, 11, - new String[]{"Type de DCP (Tableau 8)", - "Visités", + new String[]{"Type de FOB (Tableau 8)", + "Visités sans pêche", "Pêchés", "Mis à l’eau seuls", - "Modifications ou renforcements", - "Retaits", + "Modifiés ou renforcés", + "Retirés", "Abandonnés (sans balise ou non détruit ou non coulé)", "Coulés", - "Remplacements", + "Remplacés", "Autre (péciser dans les notes)", "Tortues associées" } ===================================== services/src/main/resources/observe-reports.properties ===================================== @@ -119,12 +119,12 @@ report.dailySetAndCatch.request.1=0,0|row|\ Group By r.date \ Order By r.date ################################################################################ -## Utilisation des DCP +## Utilisation des FOB ################################################################################ report.dcpUsage.modelType=PS -report.dcpUsage.name=Utilisation des DCP -report.dcpUsage.description=Tableau r\u00e9capitulatif du nombre de DCP visit\u00e9s selon l\u2019action effectu\u00e9e (visites avec et sans p\u00eache, mis \u00e0 l\u2019eau, r\u00e9cuperation), et tortues observ\u00e9es -report.dcpUsage.columns=Type de DCP (Tableau 8),Visit\u00e9s,P\u00each\u00e9s,Mis \u00e0 l\u2019eau seuls,Modifications ou renforcements,Retaits,Abandonn\u00e9s (sans balise ou non d\u00e9truit ou non coul\u00e9),Coul\u00e9s,Remplacements,Autre (p\u00e9ciser dans les notes),Tortues associ\u00e9es +report.dcpUsage.name=Utilisation des FOB +report.dcpUsage.description=Tableau r\u00e9capitulatif du nombre de FOB visit\u00e9s selon l\u2019action effectu\u00e9e (visites avec et sans p\u00eache, mis \u00e0 l\u2019eau, r\u00e9cuperation), et tortues observ\u00e9es +report.dcpUsage.columns=Type de FOB (Tableau 8),Visit\u00e9s sans p\u00eache,P\u00each\u00e9s,Mis \u00e0 l\u2019eau seuls,Modifi\u00e9s ou renforc\u00e9s,Retir\u00e9s,Abandonn\u00e9s (sans balise ou non d\u00e9truit ou non coul\u00e9),Coul\u00e9s,Remplac\u00e9s,Autre (p\u00e9ciser dans les notes),Tortues associ\u00e9es report.dcpUsage.repeatVariable.typeObjetId=java.lang.String|\ Select distinct (om.standardCode) \ From ObjectMaterialImpl om \ @@ -137,13 +137,14 @@ report.dcpUsage.repeatVariable.typeObjetId=java.lang.String|\ Join a.floatingObject dcp \ Where \ m.id In :tripId \ - and (dcp.computedWhenLeavingSimplifiedObjectType = om.standardCode Or dcp.computedWhenArrivingSimplifiedObjectType = om.standardCode) \ + and (dcp.computedWhenArrivingSimplifiedObjectType = om.standardCode Or dcp.computedWhenLeavingSimplifiedObjectType = om.standardCode) \ ) > 0 report.dcpUsage.request.1=0,0|row|\ - Select concat(str(to.standardCode) , ' - ', to.label2) \ - From ObjectMaterialImpl to \ + Select concat(str(om.standardCode) , ' - ', om.label2) \ + From ObjectMaterialImpl om \ Where \ - to.standardCode = :typeObjetId + om.standardCode = :typeObjetId \ + And om.status != 0 report.dcpUsage.request.1.repeat=typeObjetId|column # visite report.dcpUsage.request.2=1,0|row|\ @@ -154,8 +155,9 @@ report.dcpUsage.request.2=1,0|row|\ Join a.floatingObject dcp \ Where \ m.id In :tripId \ - and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \ - and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#2' + 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' report.dcpUsage.request.2.repeat=typeObjetId|column # peche report.dcpUsage.request.3=2,0|row|\ @@ -166,7 +168,7 @@ report.dcpUsage.request.3=2,0|row|\ Join a.floatingObject dcp \ Where \ m.id In :tripId \ - and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \ + and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ and (dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#3' Or a.vesselActivitySeine.id = 'fr.ird.observe.entities.referentiel.seine.VesselActivitySeine#1239832675369#0.12552908048322586') report.dcpUsage.request.3.repeat=typeObjetId|column # mis a l'eau @@ -178,10 +180,10 @@ report.dcpUsage.request.4=3,0|row|\ Join a.floatingObject dcp \ Where \ m.id In :tripId \ - and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \ + and dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId \ and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#1' report.dcpUsage.request.4.repeat=typeObjetId|column -# modification ou rneforcement +# modification ou renforcement #FIXME Supprime de la requete du dessous #FIXME and dcp.objectFate.id = 'fr.ird.observe.entities.referentiel.seine.ObjectFate#1396860761530#0.8869464242156488' \ report.dcpUsage.request.5=4,0|row|\ @@ -192,7 +194,7 @@ report.dcpUsage.request.5=4,0|row|\ Join a.floatingObject dcp \ Where \ m.id In :tripId \ - and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \ + and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#8' report.dcpUsage.request.5.repeat=typeObjetId|column # Retrait @@ -204,7 +206,7 @@ report.dcpUsage.request.6=5,0|row|\ Join a.floatingObject dcp \ Where \ m.id In :tripId \ - and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \ + and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#4' report.dcpUsage.request.6.repeat=typeObjetId|column # abondonne @@ -216,7 +218,7 @@ report.dcpUsage.request.7=6,0|row|\ Join a.floatingObject dcp \ Where \ m.id In :tripId \ - and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \ + and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#5' report.dcpUsage.request.7.repeat=typeObjetId|column # coule @@ -228,7 +230,7 @@ report.dcpUsage.request.8=7,0|row|\ Join a.floatingObject dcp \ Where \ m.id In :tripId \ - and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \ + and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#7' report.dcpUsage.request.8.repeat=typeObjetId|column # remplacement @@ -240,7 +242,7 @@ report.dcpUsage.request.9=8,0|row|\ Join a.floatingObject dcp \ Where \ m.id In :tripId \ - and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \ + and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#09' report.dcpUsage.request.9.repeat=typeObjetId|column # autre @@ -252,7 +254,7 @@ report.dcpUsage.request.10=9,0|row|\ Join a.floatingObject dcp \ Where \ m.id In :tripId \ - and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \ + and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#10' report.dcpUsage.request.10.repeat=typeObjetId|column # tortues @@ -265,7 +267,7 @@ report.dcpUsage.request.11=10,0|row| \ Join dcp.objectObservedSpecies efo \ Where \ m.id In :tripId \ - and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \ + and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ and efo.species.speciesGroup.id = 'fr.ird.observe.entities.referentiel.SpeciesGroup#1239832683690#0.24333033683679461' report.dcpUsage.request.11.repeat=typeObjetId|column View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/a4c230a99687cc621d574bfc2a… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/a4c230a99687cc621d574bfc2a… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] 3 commits: Bug requête tableau synthèse DCP - Closes #1244
by Tony CHEMIT 30 Apr '19

30 Apr '19

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 747bdbb8 by tchemit at 2019-04-30T10:40:42Z Bug requête tableau synthèse DCP - Closes #1244 - - - - - 8c479471 by tchemit at 2019-04-30T10:40:44Z update pom - - - - - a4c230a9 by tchemit at 2019-04-30T10:40:44Z Il manques des traductions... - - - - - 8 changed files: - client-core/src/main/i18n/getters/jaxx.getter - client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/TargetCatchUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/TargetDiscardCatchUI.jcss - 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 - pom.xml - services/src/main/resources/observe-reports.properties Changes: ===================================== client-core/src/main/i18n/getters/jaxx.getter ===================================== @@ -570,6 +570,7 @@ observe.common.TargetCatchDto.table.deleteExtraMessage observe.common.TargetCatchDto.table.speciesThon.tip observe.common.TargetCatchDto.table.weightCategory.tip observe.common.TargetCatchDto.table.well.tip +observe.common.TargetCatchDto.targetCatchCompositionEstimatedByObserver observe.common.TargetCatchDto.title observe.common.TargetCatchDto.weightCategory observe.common.TargetCatchDto.well @@ -581,6 +582,7 @@ observe.common.TargetDiscardDto.table.deleteExtraMessage observe.common.TargetDiscardDto.table.reasonForDiscard.tip observe.common.TargetDiscardDto.table.species.tip observe.common.TargetDiscardDto.table.weightCategory.tip +observe.common.TargetDiscardDto.targetDiscardCatchCompositionEstimatedByObserver observe.common.TargetLengthDto.count observe.common.TargetLengthDto.length observe.common.TargetLengthDto.tagNumber ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/TargetCatchUI.jcss ===================================== @@ -69,6 +69,7 @@ horizontalTextPosition:{JCheckBox.LEFT}; _propertyName:{SetSeineTargetCatchDto.PROPERTY_TARGET_CATCH_COMPOSITION_ESTIMATED_BY_OBSERVER}; selected:{BooleanUtils.isTrue(bean.isTargetCatchCompositionEstimatedByObserver())}; + text:"observe.common.TargetCatchDto.targetCatchCompositionEstimatedByObserver"; } #moveUp { ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/TargetDiscardCatchUI.jcss ===================================== @@ -75,6 +75,7 @@ horizontalTextPosition:{JCheckBox.LEFT}; _propertyName:{SetSeineTargetCatchDto.PROPERTY_TARGET_DISCARD_CATCH_COMPOSITION_ESTIMATED_BY_OBSERVER}; selected:{BooleanUtils.isTrue(bean.isTargetDiscardCatchCompositionEstimatedByObserver())}; + text:"observe.common.TargetDiscardDto.targetDiscardCatchCompositionEstimatedByObserver"; } #moveUp { ===================================== observe-i18n/src/main/i18n/translations/observe_en_GB.properties ===================================== @@ -1253,8 +1253,6 @@ observe.common.SetLonglineDto.settingVesselSpeed=Vessel speed (kts) observe.common.SetLonglineDto.shooterSpeed=Shooter speed (kts) observe.common.SetLonglineDto.snapWeight=Snap weight (kg) observe.common.SetLonglineDto.swivelWeight=swivel weight (kg) -observe.common.SetLonglineDto.targetCatchCompositionEstimatedByObserver=Composition estimated by observer? -observe.common.SetLonglineDto.targetDiscardCatchCompositionEstimatedByObserver=Composition estimated by observer? observe.common.SetLonglineDto.timeBetweenHooks=time between hooks observe.common.SetLonglineDto.title=Fishing operation observe.common.SetLonglineDto.totalBasketsCount=Total baskets count @@ -1387,6 +1385,7 @@ observe.common.TargetCatchDto.table.weightCategory=Weight category observe.common.TargetCatchDto.table.weightCategory.tip=Weight category observe.common.TargetCatchDto.table.well=Well observe.common.TargetCatchDto.table.well.tip=Well +observe.common.TargetCatchDto.targetCatchCompositionEstimatedByObserver=Composition estimated by observer? observe.common.TargetCatchDto.title=Target catch observe.common.TargetCatchDto.type=Target catch observe.common.TargetCatchDto.types=Target catches @@ -1410,6 +1409,7 @@ observe.common.TargetDiscardDto.table.weight=Weight (in t) observe.common.TargetDiscardDto.table.weight.tip=Weight (in t) observe.common.TargetDiscardDto.table.weightCategory=Weight category observe.common.TargetDiscardDto.table.weightCategory.tip=Weight category +observe.common.TargetDiscardDto.targetDiscardCatchCompositionEstimatedByObserver=Composition estimated by observer? observe.common.TargetLengthDto.count=Count observe.common.TargetLengthDto.length=Length (cm) observe.common.TargetLengthDto.table.count=Count ===================================== observe-i18n/src/main/i18n/translations/observe_es_ES.properties ===================================== @@ -1253,8 +1253,6 @@ observe.common.SetLonglineDto.settingVesselSpeed=Velocidad del barco (nd) observe.common.SetLonglineDto.shooterSpeed=Velocidad virador (nd) observe.common.SetLonglineDto.snapWeight=Peso mosquetón (kg) observe.common.SetLonglineDto.swivelWeight=Peso destorcedor (kg) -observe.common.SetLonglineDto.targetCatchCompositionEstimatedByObserver=¿Composición estimada por el observador? -observe.common.SetLonglineDto.targetDiscardCatchCompositionEstimatedByObserver=¿Composición estimada por el observador? observe.common.SetLonglineDto.timeBetweenHooks=Tiempo entre anzuelos (s) observe.common.SetLonglineDto.title=Operación de pesca observe.common.SetLonglineDto.totalBasketsCount=Número total de canastas @@ -1387,6 +1385,7 @@ observe.common.TargetCatchDto.table.weightCategory=Categoría de peso observe.common.TargetCatchDto.table.weightCategory.tip=Categoría de peso observe.common.TargetCatchDto.table.well=Cuba observe.common.TargetCatchDto.table.well.tip=Cuba +observe.common.TargetCatchDto.targetCatchCompositionEstimatedByObserver=¿Composición estimada por el observador? observe.common.TargetCatchDto.title=Captura de túnidos observe.common.TargetCatchDto.type=Captura de túnidos observe.common.TargetCatchDto.types=Capturas de túnidos @@ -1410,6 +1409,7 @@ observe.common.TargetDiscardDto.table.weight=Peso observe.common.TargetDiscardDto.table.weight.tip=Peso (en t) observe.common.TargetDiscardDto.table.weightCategory=Categoría de peso observe.common.TargetDiscardDto.table.weightCategory.tip=Categoría de peso +observe.common.TargetDiscardDto.targetDiscardCatchCompositionEstimatedByObserver=¿Composición estimada por el observador? observe.common.TargetLengthDto.count=Número observe.common.TargetLengthDto.length=Talla (cm) observe.common.TargetLengthDto.table.count=Número ===================================== observe-i18n/src/main/i18n/translations/observe_fr_FR.properties ===================================== @@ -1253,8 +1253,6 @@ observe.common.SetLonglineDto.settingVesselSpeed=Vitesse bateau (nd) observe.common.SetLonglineDto.shooterSpeed=Vitesse shooter (nd) observe.common.SetLonglineDto.snapWeight=Poids snap (kg) observe.common.SetLonglineDto.swivelWeight=Poids de l'émerillon (kg) -observe.common.SetLonglineDto.targetCatchCompositionEstimatedByObserver=Composition estimée par l'observateur ? -observe.common.SetLonglineDto.targetDiscardCatchCompositionEstimatedByObserver=Composition estimée par l'observateur ? observe.common.SetLonglineDto.timeBetweenHooks=Temps entre hameçons (s) observe.common.SetLonglineDto.title=Opération de pêche observe.common.SetLonglineDto.totalBasketsCount=Nombre total de paniers @@ -1387,6 +1385,7 @@ observe.common.TargetCatchDto.table.weightCategory=Catégorie de poids observe.common.TargetCatchDto.table.weightCategory.tip=Catégorie de poids observe.common.TargetCatchDto.table.well=Cuve observe.common.TargetCatchDto.table.well.tip=Cuve +observe.common.TargetCatchDto.targetCatchCompositionEstimatedByObserver=Composition estimée par l'observateur ? observe.common.TargetCatchDto.title=Thons conservés observe.common.TargetCatchDto.type=Thons conservés observe.common.TargetCatchDto.types=Thons conservés @@ -1410,6 +1409,7 @@ observe.common.TargetDiscardDto.table.weight=Poids observe.common.TargetDiscardDto.table.weight.tip=Poids (en t) observe.common.TargetDiscardDto.table.weightCategory=Catégorie de poids observe.common.TargetDiscardDto.table.weightCategory.tip=Catégorie de poids +observe.common.TargetDiscardDto.targetDiscardCatchCompositionEstimatedByObserver=Composition estimée par l'observateur ? observe.common.TargetLengthDto.count=Nombre observe.common.TargetLengthDto.length=Taille (en cm) observe.common.TargetLengthDto.table.count=Effectif ===================================== pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2019.8.14</version> + <version>2019.8.15</version> </parent> <groupId>fr.ird.observe</groupId> ===================================== services/src/main/resources/observe-reports.properties ===================================== @@ -119,12 +119,12 @@ report.dailySetAndCatch.request.1=0,0|row|\ Group By r.date \ Order By r.date ################################################################################ -## Utilisation des DCP +## Utilisation des FOB ################################################################################ report.dcpUsage.modelType=PS -report.dcpUsage.name=Utilisation des DCP -report.dcpUsage.description=Tableau r\u00e9capitulatif du nombre de DCP visit\u00e9s selon l\u2019action effectu\u00e9e (visites avec et sans p\u00eache, mis \u00e0 l\u2019eau, r\u00e9cuperation), et tortues observ\u00e9es -report.dcpUsage.columns=Type de DCP (Tableau 8),Visit\u00e9s,P\u00each\u00e9s,Mis \u00e0 l\u2019eau seuls,Modifications ou renforcements,Retaits,Abandonn\u00e9s (sans balise ou non d\u00e9truit ou non coul\u00e9),Coul\u00e9s,Remplacements,Autre (p\u00e9ciser dans les notes),Tortues associ\u00e9es +report.dcpUsage.name=Utilisation des FOB +report.dcpUsage.description=Tableau r\u00e9capitulatif du nombre de FOB visit\u00e9s selon l\u2019action effectu\u00e9e (visites avec et sans p\u00eache, mis \u00e0 l\u2019eau, r\u00e9cuperation), et tortues observ\u00e9es +report.dcpUsage.columns=Type de FOB (Tableau 8),Visit\u00e9s sans p\u00eache,P\u00each\u00e9s,Mis \u00e0 l\u2019eau seuls,Modifi\u00e9s ou renforc\u00e9s,Retir\u00e9s,Abandonn\u00e9s (sans balise ou non d\u00e9truit ou non coul\u00e9),Coul\u00e9s,Remplac\u00e9s,Autre (p\u00e9ciser dans les notes),Tortues associ\u00e9es report.dcpUsage.repeatVariable.typeObjetId=java.lang.String|\ Select distinct (om.standardCode) \ From ObjectMaterialImpl om \ @@ -137,13 +137,14 @@ report.dcpUsage.repeatVariable.typeObjetId=java.lang.String|\ Join a.floatingObject dcp \ Where \ m.id In :tripId \ - and (dcp.computedWhenLeavingSimplifiedObjectType = om.standardCode Or dcp.computedWhenArrivingSimplifiedObjectType = om.standardCode) \ + and (dcp.computedWhenArrivingSimplifiedObjectType = om.standardCode Or dcp.computedWhenLeavingSimplifiedObjectType = om.standardCode) \ ) > 0 report.dcpUsage.request.1=0,0|row|\ - Select concat(str(to.standardCode) , ' - ', to.label2) \ - From ObjectMaterialImpl to \ + Select concat(str(om.standardCode) , ' - ', om.label2) \ + From ObjectMaterialImpl om \ Where \ - to.standardCode = :typeObjetId + om.standardCode = :typeObjetId \ + And om.status != 0 report.dcpUsage.request.1.repeat=typeObjetId|column # visite report.dcpUsage.request.2=1,0|row|\ @@ -154,8 +155,9 @@ report.dcpUsage.request.2=1,0|row|\ Join a.floatingObject dcp \ Where \ m.id In :tripId \ - and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \ - and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#2' + 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' report.dcpUsage.request.2.repeat=typeObjetId|column # peche report.dcpUsage.request.3=2,0|row|\ @@ -166,7 +168,7 @@ report.dcpUsage.request.3=2,0|row|\ Join a.floatingObject dcp \ Where \ m.id In :tripId \ - and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \ + and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ and (dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#3' Or a.vesselActivitySeine.id = 'fr.ird.observe.entities.referentiel.seine.VesselActivitySeine#1239832675369#0.12552908048322586') report.dcpUsage.request.3.repeat=typeObjetId|column # mis a l'eau @@ -178,10 +180,10 @@ report.dcpUsage.request.4=3,0|row|\ Join a.floatingObject dcp \ Where \ m.id In :tripId \ - and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \ + and dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId \ and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#1' report.dcpUsage.request.4.repeat=typeObjetId|column -# modification ou rneforcement +# modification ou renforcement #FIXME Supprime de la requete du dessous #FIXME and dcp.objectFate.id = 'fr.ird.observe.entities.referentiel.seine.ObjectFate#1396860761530#0.8869464242156488' \ report.dcpUsage.request.5=4,0|row|\ @@ -192,7 +194,7 @@ report.dcpUsage.request.5=4,0|row|\ Join a.floatingObject dcp \ Where \ m.id In :tripId \ - and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \ + and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#8' report.dcpUsage.request.5.repeat=typeObjetId|column # Retrait @@ -204,7 +206,7 @@ report.dcpUsage.request.6=5,0|row|\ Join a.floatingObject dcp \ Where \ m.id In :tripId \ - and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \ + and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#4' report.dcpUsage.request.6.repeat=typeObjetId|column # abondonne @@ -216,7 +218,7 @@ report.dcpUsage.request.7=6,0|row|\ Join a.floatingObject dcp \ Where \ m.id In :tripId \ - and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \ + and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#5' report.dcpUsage.request.7.repeat=typeObjetId|column # coule @@ -228,7 +230,7 @@ report.dcpUsage.request.8=7,0|row|\ Join a.floatingObject dcp \ Where \ m.id In :tripId \ - and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \ + and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#7' report.dcpUsage.request.8.repeat=typeObjetId|column # remplacement @@ -240,7 +242,7 @@ report.dcpUsage.request.9=8,0|row|\ Join a.floatingObject dcp \ Where \ m.id In :tripId \ - and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \ + and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#09' report.dcpUsage.request.9.repeat=typeObjetId|column # autre @@ -252,7 +254,7 @@ report.dcpUsage.request.10=9,0|row|\ Join a.floatingObject dcp \ Where \ m.id In :tripId \ - and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \ + and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#10' report.dcpUsage.request.10.repeat=typeObjetId|column # tortues @@ -265,7 +267,7 @@ report.dcpUsage.request.11=10,0|row| \ Join dcp.objectObservedSpecies efo \ Where \ m.id In :tripId \ - and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \ + and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ and efo.species.speciesGroup.id = 'fr.ird.observe.entities.referentiel.SpeciesGroup#1239832683690#0.24333033683679461' report.dcpUsage.request.11.repeat=typeObjetId|column View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/c3206aa8fec058c7fcaae635ef… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/c3206aa8fec058c7fcaae635ef… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] 2 commits: update pom
by Tony CHEMIT 28 Apr '19

28 Apr '19

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: f3437ba3 by tchemit at 2019-04-28T12:51:05Z update pom - - - - - c3206aa8 by tchemit at 2019-04-28T13:18:16Z Il manques des traductions... - - - - - 7 changed files: - client-core/src/main/i18n/getters/jaxx.getter - client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/TargetCatchUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/TargetDiscardCatchUI.jcss - 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 - pom.xml Changes: ===================================== client-core/src/main/i18n/getters/jaxx.getter ===================================== @@ -570,6 +570,7 @@ observe.common.TargetCatchDto.table.deleteExtraMessage observe.common.TargetCatchDto.table.speciesThon.tip observe.common.TargetCatchDto.table.weightCategory.tip observe.common.TargetCatchDto.table.well.tip +observe.common.TargetCatchDto.targetCatchCompositionEstimatedByObserver observe.common.TargetCatchDto.title observe.common.TargetCatchDto.weightCategory observe.common.TargetCatchDto.well @@ -581,6 +582,7 @@ observe.common.TargetDiscardDto.table.deleteExtraMessage observe.common.TargetDiscardDto.table.reasonForDiscard.tip observe.common.TargetDiscardDto.table.species.tip observe.common.TargetDiscardDto.table.weightCategory.tip +observe.common.TargetDiscardDto.targetDiscardCatchCompositionEstimatedByObserver observe.common.TargetLengthDto.count observe.common.TargetLengthDto.length observe.common.TargetLengthDto.tagNumber ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/TargetCatchUI.jcss ===================================== @@ -69,6 +69,7 @@ horizontalTextPosition:{JCheckBox.LEFT}; _propertyName:{SetSeineTargetCatchDto.PROPERTY_TARGET_CATCH_COMPOSITION_ESTIMATED_BY_OBSERVER}; selected:{BooleanUtils.isTrue(bean.isTargetCatchCompositionEstimatedByObserver())}; + text:"observe.common.TargetCatchDto.targetCatchCompositionEstimatedByObserver"; } #moveUp { ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/TargetDiscardCatchUI.jcss ===================================== @@ -75,6 +75,7 @@ horizontalTextPosition:{JCheckBox.LEFT}; _propertyName:{SetSeineTargetCatchDto.PROPERTY_TARGET_DISCARD_CATCH_COMPOSITION_ESTIMATED_BY_OBSERVER}; selected:{BooleanUtils.isTrue(bean.isTargetDiscardCatchCompositionEstimatedByObserver())}; + text:"observe.common.TargetDiscardDto.targetDiscardCatchCompositionEstimatedByObserver"; } #moveUp { ===================================== observe-i18n/src/main/i18n/translations/observe_en_GB.properties ===================================== @@ -1253,8 +1253,6 @@ observe.common.SetLonglineDto.settingVesselSpeed=Vessel speed (kts) observe.common.SetLonglineDto.shooterSpeed=Shooter speed (kts) observe.common.SetLonglineDto.snapWeight=Snap weight (kg) observe.common.SetLonglineDto.swivelWeight=swivel weight (kg) -observe.common.SetLonglineDto.targetCatchCompositionEstimatedByObserver=Composition estimated by observer? -observe.common.SetLonglineDto.targetDiscardCatchCompositionEstimatedByObserver=Composition estimated by observer? observe.common.SetLonglineDto.timeBetweenHooks=time between hooks observe.common.SetLonglineDto.title=Fishing operation observe.common.SetLonglineDto.totalBasketsCount=Total baskets count @@ -1387,6 +1385,7 @@ observe.common.TargetCatchDto.table.weightCategory=Weight category observe.common.TargetCatchDto.table.weightCategory.tip=Weight category observe.common.TargetCatchDto.table.well=Well observe.common.TargetCatchDto.table.well.tip=Well +observe.common.TargetCatchDto.targetCatchCompositionEstimatedByObserver=Composition estimated by observer? observe.common.TargetCatchDto.title=Target catch observe.common.TargetCatchDto.type=Target catch observe.common.TargetCatchDto.types=Target catches @@ -1410,6 +1409,7 @@ observe.common.TargetDiscardDto.table.weight=Weight (in t) observe.common.TargetDiscardDto.table.weight.tip=Weight (in t) observe.common.TargetDiscardDto.table.weightCategory=Weight category observe.common.TargetDiscardDto.table.weightCategory.tip=Weight category +observe.common.TargetDiscardDto.targetDiscardCatchCompositionEstimatedByObserver=Composition estimated by observer? observe.common.TargetLengthDto.count=Count observe.common.TargetLengthDto.length=Length (cm) observe.common.TargetLengthDto.table.count=Count ===================================== observe-i18n/src/main/i18n/translations/observe_es_ES.properties ===================================== @@ -1253,8 +1253,6 @@ observe.common.SetLonglineDto.settingVesselSpeed=Velocidad del barco (nd) observe.common.SetLonglineDto.shooterSpeed=Velocidad virador (nd) observe.common.SetLonglineDto.snapWeight=Peso mosquetón (kg) observe.common.SetLonglineDto.swivelWeight=Peso destorcedor (kg) -observe.common.SetLonglineDto.targetCatchCompositionEstimatedByObserver=¿Composición estimada por el observador? -observe.common.SetLonglineDto.targetDiscardCatchCompositionEstimatedByObserver=¿Composición estimada por el observador? observe.common.SetLonglineDto.timeBetweenHooks=Tiempo entre anzuelos (s) observe.common.SetLonglineDto.title=Operación de pesca observe.common.SetLonglineDto.totalBasketsCount=Número total de canastas @@ -1387,6 +1385,7 @@ observe.common.TargetCatchDto.table.weightCategory=Categoría de peso observe.common.TargetCatchDto.table.weightCategory.tip=Categoría de peso observe.common.TargetCatchDto.table.well=Cuba observe.common.TargetCatchDto.table.well.tip=Cuba +observe.common.TargetCatchDto.targetCatchCompositionEstimatedByObserver=¿Composición estimada por el observador? observe.common.TargetCatchDto.title=Captura de túnidos observe.common.TargetCatchDto.type=Captura de túnidos observe.common.TargetCatchDto.types=Capturas de túnidos @@ -1410,6 +1409,7 @@ observe.common.TargetDiscardDto.table.weight=Peso observe.common.TargetDiscardDto.table.weight.tip=Peso (en t) observe.common.TargetDiscardDto.table.weightCategory=Categoría de peso observe.common.TargetDiscardDto.table.weightCategory.tip=Categoría de peso +observe.common.TargetDiscardDto.targetDiscardCatchCompositionEstimatedByObserver=¿Composición estimada por el observador? observe.common.TargetLengthDto.count=Número observe.common.TargetLengthDto.length=Talla (cm) observe.common.TargetLengthDto.table.count=Número ===================================== observe-i18n/src/main/i18n/translations/observe_fr_FR.properties ===================================== @@ -1253,8 +1253,6 @@ observe.common.SetLonglineDto.settingVesselSpeed=Vitesse bateau (nd) observe.common.SetLonglineDto.shooterSpeed=Vitesse shooter (nd) observe.common.SetLonglineDto.snapWeight=Poids snap (kg) observe.common.SetLonglineDto.swivelWeight=Poids de l'émerillon (kg) -observe.common.SetLonglineDto.targetCatchCompositionEstimatedByObserver=Composition estimée par l'observateur ? -observe.common.SetLonglineDto.targetDiscardCatchCompositionEstimatedByObserver=Composition estimée par l'observateur ? observe.common.SetLonglineDto.timeBetweenHooks=Temps entre hameçons (s) observe.common.SetLonglineDto.title=Opération de pêche observe.common.SetLonglineDto.totalBasketsCount=Nombre total de paniers @@ -1387,6 +1385,7 @@ observe.common.TargetCatchDto.table.weightCategory=Catégorie de poids observe.common.TargetCatchDto.table.weightCategory.tip=Catégorie de poids observe.common.TargetCatchDto.table.well=Cuve observe.common.TargetCatchDto.table.well.tip=Cuve +observe.common.TargetCatchDto.targetCatchCompositionEstimatedByObserver=Composition estimée par l'observateur ? observe.common.TargetCatchDto.title=Thons conservés observe.common.TargetCatchDto.type=Thons conservés observe.common.TargetCatchDto.types=Thons conservés @@ -1410,6 +1409,7 @@ observe.common.TargetDiscardDto.table.weight=Poids observe.common.TargetDiscardDto.table.weight.tip=Poids (en t) observe.common.TargetDiscardDto.table.weightCategory=Catégorie de poids observe.common.TargetDiscardDto.table.weightCategory.tip=Catégorie de poids +observe.common.TargetDiscardDto.targetDiscardCatchCompositionEstimatedByObserver=Composition estimée par l'observateur ? observe.common.TargetLengthDto.count=Nombre observe.common.TargetLengthDto.length=Taille (en cm) observe.common.TargetLengthDto.table.count=Effectif ===================================== pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2019.8.14</version> + <version>2019.8.15</version> </parent> <groupId>fr.ird.observe</groupId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/f4054443251e66d6b148550236… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/f4054443251e66d6b148550236… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] update pom
by Tony CHEMIT 28 Apr '19

28 Apr '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 1513125b by tchemit at 2019-04-28T12:57:53Z update pom - - - - - 1 changed file: - pom.xml Changes: ===================================== pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2019.8.14</version> + <version>2019.8.15</version> </parent> <groupId>fr.ird.observe</groupId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/1513125bae3c62ec0b4603034a5… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/1513125bae3c62ec0b4603034a5… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Bug requête tableau synthèse DCP - Closes #1244
by Tony CHEMIT 28 Apr '19

28 Apr '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 200e1417 by tchemit at 2019-04-28T12:15:50Z Bug requête tableau synthèse DCP - Closes #1244 - - - - - 1 changed file: - services/src/main/resources/observe-reports.properties Changes: ===================================== services/src/main/resources/observe-reports.properties ===================================== @@ -137,13 +137,14 @@ report.dcpUsage.repeatVariable.typeObjetId=java.lang.String|\ Join a.floatingObject dcp \ Where \ m.id In :tripId \ - and (dcp.computedWhenLeavingSimplifiedObjectType = om.standardCode Or dcp.computedWhenArrivingSimplifiedObjectType = om.standardCode) \ + and dcp.computedWhenArrivingSimplifiedObjectType = om.standardCode \ ) > 0 report.dcpUsage.request.1=0,0|row|\ - Select concat(str(to.standardCode) , ' - ', to.label2) \ - From ObjectMaterialImpl to \ + Select concat(str(om.standardCode) , ' - ', om.label2) \ + From ObjectMaterialImpl om \ Where \ - to.standardCode = :typeObjetId + om.standardCode = :typeObjetId \ + And om.status != 0 report.dcpUsage.request.1.repeat=typeObjetId|column # visite report.dcpUsage.request.2=1,0|row|\ @@ -154,7 +155,7 @@ report.dcpUsage.request.2=1,0|row|\ Join a.floatingObject dcp \ Where \ m.id In :tripId \ - and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \ + and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ and dcp.objectOperation.id = 'fr.ird.referential.ps.observation.ObjectOperation#0#2' report.dcpUsage.request.2.repeat=typeObjetId|column # peche @@ -166,7 +167,7 @@ report.dcpUsage.request.3=2,0|row|\ Join a.floatingObject dcp \ Where \ m.id In :tripId \ - and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \ + and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ and (dcp.objectOperation.id = 'fr.ird.referential.ps.observation.ObjectOperation#0#3' Or a.vesselActivitySeine.id = 'fr.ird.referential.ps.common.VesselActivitySeine#1239832675369#0.12552908048322586') report.dcpUsage.request.3.repeat=typeObjetId|column # mis a l'eau @@ -178,7 +179,7 @@ report.dcpUsage.request.4=3,0|row|\ Join a.floatingObject dcp \ Where \ m.id In :tripId \ - and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \ + and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ and dcp.objectOperation.id = 'fr.ird.referential.ps.observation.ObjectOperation#0#1' report.dcpUsage.request.4.repeat=typeObjetId|column # modification ou rneforcement @@ -192,7 +193,7 @@ report.dcpUsage.request.5=4,0|row|\ Join a.floatingObject dcp \ Where \ m.id In :tripId \ - and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \ + and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ and dcp.objectOperation.id = 'fr.ird.referential.ps.observation.ObjectOperation#0#8' report.dcpUsage.request.5.repeat=typeObjetId|column # Retrait @@ -204,7 +205,7 @@ report.dcpUsage.request.6=5,0|row|\ Join a.floatingObject dcp \ Where \ m.id In :tripId \ - and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \ + and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ and dcp.objectOperation.id = 'fr.ird.referential.ps.observation.ObjectOperation#0#4' report.dcpUsage.request.6.repeat=typeObjetId|column # abondonne @@ -216,7 +217,7 @@ report.dcpUsage.request.7=6,0|row|\ Join a.floatingObject dcp \ Where \ m.id In :tripId \ - and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \ + and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ and dcp.objectOperation.id = 'fr.ird.referential.ps.observation.ObjectOperation#0#5' report.dcpUsage.request.7.repeat=typeObjetId|column # coule @@ -228,7 +229,7 @@ report.dcpUsage.request.8=7,0|row|\ Join a.floatingObject dcp \ Where \ m.id In :tripId \ - and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \ + and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ and dcp.objectOperation.id = 'fr.ird.referential.ps.observation.ObjectOperation#0#7' report.dcpUsage.request.8.repeat=typeObjetId|column # remplacement @@ -240,7 +241,7 @@ report.dcpUsage.request.9=8,0|row|\ Join a.floatingObject dcp \ Where \ m.id In :tripId \ - and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \ + and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ and dcp.objectOperation.id = 'fr.ird.referential.ps.observation.ObjectOperation#0#09' report.dcpUsage.request.9.repeat=typeObjetId|column # autre @@ -252,7 +253,7 @@ report.dcpUsage.request.10=9,0|row|\ Join a.floatingObject dcp \ Where \ m.id In :tripId \ - and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \ + and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ and dcp.objectOperation.id = 'fr.ird.referential.ps.observation.ObjectOperation#0#10' report.dcpUsage.request.10.repeat=typeObjetId|column # tortues @@ -265,7 +266,7 @@ report.dcpUsage.request.11=10,0|row| \ Join dcp.objectObservedSpecies efo \ Where \ m.id In :tripId \ - and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \ + and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ and efo.species.speciesGroup.id = 'fr.ird.referential.common.SpeciesGroup#1239832683690#0.24333033683679461' report.dcpUsage.request.11.repeat=typeObjetId|column View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/200e1417d430b49a1e34afd61c1… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/200e1417d430b49a1e34afd61c1… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] Bug requête tableau synthèse DCP - Closes #1244
by Tony CHEMIT 28 Apr '19

28 Apr '19

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: f4054443 by tchemit at 2019-04-28T12:08:16Z Bug requête tableau synthèse DCP - Closes #1244 - - - - - 1 changed file: - services/src/main/resources/observe-reports.properties Changes: ===================================== services/src/main/resources/observe-reports.properties ===================================== @@ -137,13 +137,14 @@ report.dcpUsage.repeatVariable.typeObjetId=java.lang.String|\ Join a.floatingObject dcp \ Where \ m.id In :tripId \ - and (dcp.computedWhenLeavingSimplifiedObjectType = om.standardCode Or dcp.computedWhenArrivingSimplifiedObjectType = om.standardCode) \ + and dcp.computedWhenArrivingSimplifiedObjectType = om.standardCode \ ) > 0 report.dcpUsage.request.1=0,0|row|\ - Select concat(str(to.standardCode) , ' - ', to.label2) \ - From ObjectMaterialImpl to \ + Select concat(str(om.standardCode) , ' - ', om.label2) \ + From ObjectMaterialImpl om \ Where \ - to.standardCode = :typeObjetId + om.standardCode = :typeObjetId \ + And om.status != 0 report.dcpUsage.request.1.repeat=typeObjetId|column # visite report.dcpUsage.request.2=1,0|row|\ @@ -154,7 +155,7 @@ report.dcpUsage.request.2=1,0|row|\ Join a.floatingObject dcp \ Where \ m.id In :tripId \ - and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \ + and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#2' report.dcpUsage.request.2.repeat=typeObjetId|column # peche @@ -166,7 +167,7 @@ report.dcpUsage.request.3=2,0|row|\ Join a.floatingObject dcp \ Where \ m.id In :tripId \ - and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \ + and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ and (dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#3' Or a.vesselActivitySeine.id = 'fr.ird.observe.entities.referentiel.seine.VesselActivitySeine#1239832675369#0.12552908048322586') report.dcpUsage.request.3.repeat=typeObjetId|column # mis a l'eau @@ -178,7 +179,7 @@ report.dcpUsage.request.4=3,0|row|\ Join a.floatingObject dcp \ Where \ m.id In :tripId \ - and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \ + and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#1' report.dcpUsage.request.4.repeat=typeObjetId|column # modification ou rneforcement @@ -192,7 +193,7 @@ report.dcpUsage.request.5=4,0|row|\ Join a.floatingObject dcp \ Where \ m.id In :tripId \ - and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \ + and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#8' report.dcpUsage.request.5.repeat=typeObjetId|column # Retrait @@ -204,7 +205,7 @@ report.dcpUsage.request.6=5,0|row|\ Join a.floatingObject dcp \ Where \ m.id In :tripId \ - and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \ + and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#4' report.dcpUsage.request.6.repeat=typeObjetId|column # abondonne @@ -216,7 +217,7 @@ report.dcpUsage.request.7=6,0|row|\ Join a.floatingObject dcp \ Where \ m.id In :tripId \ - and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \ + and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#5' report.dcpUsage.request.7.repeat=typeObjetId|column # coule @@ -228,7 +229,7 @@ report.dcpUsage.request.8=7,0|row|\ Join a.floatingObject dcp \ Where \ m.id In :tripId \ - and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \ + and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#7' report.dcpUsage.request.8.repeat=typeObjetId|column # remplacement @@ -240,7 +241,7 @@ report.dcpUsage.request.9=8,0|row|\ Join a.floatingObject dcp \ Where \ m.id In :tripId \ - and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \ + and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#09' report.dcpUsage.request.9.repeat=typeObjetId|column # autre @@ -252,7 +253,7 @@ report.dcpUsage.request.10=9,0|row|\ Join a.floatingObject dcp \ Where \ m.id In :tripId \ - and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \ + and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#10' report.dcpUsage.request.10.repeat=typeObjetId|column # tortues @@ -265,7 +266,7 @@ report.dcpUsage.request.11=10,0|row| \ Join dcp.objectObservedSpecies efo \ Where \ m.id In :tripId \ - and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \ + and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ and efo.species.speciesGroup.id = 'fr.ird.observe.entities.referentiel.SpeciesGroup#1239832683690#0.24333033683679461' report.dcpUsage.request.11.repeat=typeObjetId|column View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/f4054443251e66d6b148550236b… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/f4054443251e66d6b148550236b… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: [PS][FOB] Le calcul du type simplifié et des propriétés maillant/biodégradable...
by Tony CHEMIT 22 Apr '19

22 Apr '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 7cf97303 by tchemit at 2019-04-22T11:16:19Z [PS][FOB] Le calcul du type simplifié et des propriétés maillant/biodégradable ne se fait pas en passant l'algorithme de calcul - Closes #1268 - - - - - 2b31018f by tchemit at 2019-04-22T11:20:15Z Try to fix navigation tree cell renderer - - - - - 5 changed files: - client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/NavigationTreeCellRenderer.java - persistence/src/main/java/fr/ird/observe/entities/data/ps/observation/ActivitySeineImpl.java - persistence/src/main/java/fr/ird/observe/entities/data/ps/observation/ActivitySeines.java - persistence/src/main/models/Observe-20-data-ps-observation.model - services-local/src/main/java/fr/ird/observe/services/local/service/actions/consolidate/ConsolidateDataServiceLocal.java Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/NavigationTreeCellRenderer.java ===================================== @@ -26,6 +26,7 @@ import fr.ird.observe.client.ui.tree.navigation.nodes.NavigationTreeNodeSupport; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.jdesktop.swingx.renderer.StringValue; +import org.jdesktop.swingx.tree.DefaultXTreeCellRenderer; import javax.swing.Icon; import javax.swing.JLabel; @@ -41,7 +42,7 @@ import java.awt.Dimension; * @author Tony Chemit - dev(a)tchemit.fr * @since 6.0 */ -public class NavigationTreeCellRenderer extends DefaultTreeCellRenderer implements StringValue { +public class NavigationTreeCellRenderer extends DefaultXTreeCellRenderer implements StringValue { /** Logger */ private static final Logger log = LogManager.getLogger(NavigationTreeCellRenderer.class); ===================================== persistence/src/main/java/fr/ird/observe/entities/data/ps/observation/ActivitySeineImpl.java ===================================== @@ -37,11 +37,6 @@ public class ActivitySeineImpl extends ActivitySeineAbstract { private static final String PROPERTY_CHANGED_ZONE_OPERATION = "changedZoneOperation"; - @Override - public boolean isDCPOperation() { - return vesselActivitySeine != null && ActivitySeines.DCP_OPERATIONS.contains(vesselActivitySeine.getCode()); - } - @Override public boolean isSetOperation() { return vesselActivitySeine != null && ActivitySeines.CALEE_OPERATIONS.contains(vesselActivitySeine.getCode()); ===================================== persistence/src/main/java/fr/ird/observe/entities/data/ps/observation/ActivitySeines.java ===================================== @@ -57,8 +57,6 @@ public class ActivitySeines { public static final String ACTIVITY_FIN_DE_PECHE = "6"; public static final List<String> CALEE_OPERATIONS = Collections.singletonList(ACTIVITY_FIN_DE_PECHE); public static final String ACTIVITY_CHANGED_ZONE = "21"; - public static final List<String> DCP_OPERATIONS = Arrays.asList("13", "14", "15"); - /** Logger. */ private static final Logger log = LogManager.getLogger(ActivitySeines.class); ===================================== persistence/src/main/models/Observe-20-data-ps-observation.model ===================================== @@ -31,7 +31,6 @@ currentFpaZone {*:0..1} referential.common.FpaZone previousFpaZone {*:0..1} referential.common.FpaZone nextFpaZone {*:0..1} referential.common.FpaZone dataQuality {*:0..1} referential.common.DataQuality -isDCPOperation() boolean isSetOperation() boolean isObservedSystemOperation() boolean getSchoolType() !fr.ird.observe.dto.data.ps.SchoolType ===================================== services-local/src/main/java/fr/ird/observe/services/local/service/actions/consolidate/ConsolidateDataServiceLocal.java ===================================== @@ -227,9 +227,10 @@ public class ConsolidateDataServiceLocal extends ObserveServiceLocal implements String activityPrefix = String.format("%s - Activity [%s/%s] ", routePrefix, ++activityIndex, activityMax); - if (!activitySeine.isSetOperation() && !activitySeine.isDCPOperation()) { - log.info(String.format("%s Skip activity (No set nor dcp): %s", activityPrefix, activitySeine.getTopiaId())); - continue; + boolean floatingObjectEmpty = activitySeine.isFloatingObjectEmpty(); + if (!activitySeine.isSetOperation() && floatingObjectEmpty) { + log.info(String.format("%s Skip activity (No set nor dcp found): %s", activityPrefix, activitySeine.getTopiaId())); + continue; } ConsolidateActivitySeineDataResultBuilder resultBuilder = new ConsolidateActivitySeineDataResultBuilder(applicationLocale, referenceLocale, activitySeine.getTopiaId(), ActivitySeines.decorate(referenceLocale.ordinal(), activitySeine)); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/b135087c920de7be5f49e078e7… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/b135087c920de7be5f49e078e7… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] do not deploy to maven on snapshot
by Tony CHEMIT 22 Apr '19

22 Apr '19

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 3b7f9529 by tchemit at 2019-04-22T11:07:38Z do not deploy to maven on snapshot - - - - - 1 changed file: - observe/pom.xml Changes: ===================================== observe/pom.xml ===================================== @@ -38,7 +38,7 @@ <properties>  - <maven.deploy.skip>false</maven.deploy.skip> + <maven.deploy.skip>true</maven.deploy.skip> <clientFile>client-runner-${project.version}.zip</clientFile> <serverFile>server-runner-${project.version}.war</serverFile> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/3b7f9529ca3e95a1f937b922f6e… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/3b7f9529ca3e95a1f937b922f6e… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] 2 commits: [PS][FOB] Le calcul du type simplifié et des propriétés maillant/biodégradable...
by Tony CHEMIT 22 Apr '19

22 Apr '19

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 224b4051 by tchemit at 2019-04-22T10:03:40Z [PS][FOB] Le calcul du type simplifié et des propriétés maillant/biodégradable ne se fait pas en passant l'algorithme de calcul - Closes #1268 - - - - - e2046e34 by tchemit at 2019-04-22T10:03:54Z Try to fix navigation tree cell renderer - - - - - 4 changed files: - client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/NavigationTreeCellRenderer.java - persistence/src/main/java/fr/ird/observe/entities/seine/ActivitySeineImpl.java - persistence/src/main/models/Observe.model - services-local/src/main/java/fr/ird/observe/services/local/service/actions/consolidate/ConsolidateDataServiceLocal.java Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/NavigationTreeCellRenderer.java ===================================== @@ -26,6 +26,7 @@ import fr.ird.observe.client.ui.tree.navigation.nodes.NavigationTreeNodeSupport; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; import org.jdesktop.swingx.renderer.StringValue; +import org.jdesktop.swingx.tree.DefaultXTreeCellRenderer; import javax.swing.Icon; import javax.swing.JLabel; @@ -41,7 +42,7 @@ import java.awt.Dimension; * @author Tony Chemit - dev(a)tchemit.fr * @since 6.0 */ -public class NavigationTreeCellRenderer extends DefaultTreeCellRenderer implements StringValue { +public class NavigationTreeCellRenderer extends DefaultXTreeCellRenderer implements StringValue { /** Logger */ private static final Logger log = LogManager.getLogger(NavigationTreeCellRenderer.class); ===================================== persistence/src/main/java/fr/ird/observe/entities/seine/ActivitySeineImpl.java ===================================== @@ -48,17 +48,10 @@ public class ActivitySeineImpl extends ActivitySeineAbstract { private static final List<String> CALEE_OPERATIONS = Collections.singletonList(ACTIVITY_FIN_DE_PECHE); - private static final List<String> DCP_OPERATIONS = Arrays.asList("13", "14", "15"); - private static final List<String> SYSTEM_OPERATIONS = Arrays.asList("0", "11", "11", ACTIVITY_FIN_DE_VEILLE); private static final String PROPERTY_CHANGED_ZONE_OPERATION = "changedZoneOperation"; - @Override - public boolean isDCPOperation() { - return vesselActivitySeine != null && DCP_OPERATIONS.contains(vesselActivitySeine.getCode()); - } - @Override public boolean isSetOperation() { return vesselActivitySeine != null && CALEE_OPERATIONS.contains(vesselActivitySeine.getCode()); @@ -163,6 +156,4 @@ public class ActivitySeineImpl extends ActivitySeineAbstract { .toString(); } -} - - +} \ No newline at end of file ===================================== persistence/src/main/models/Observe.model ===================================== @@ -660,7 +660,6 @@ currentFpaZone {*:0..1} referentiel.FpaZone previousFpaZone {*:0..1} referentiel.FpaZone nextFpaZone {*:0..1} referentiel.FpaZone dataQuality {*:0..1} referentiel.DataQuality -isDCPOperation() boolean isSetOperation() boolean isObservedSystemOperation() boolean getSchoolType() !fr.ird.observe.dto.data.seine.SchoolType ===================================== services-local/src/main/java/fr/ird/observe/services/local/service/actions/consolidate/ConsolidateDataServiceLocal.java ===================================== @@ -225,9 +225,10 @@ public class ConsolidateDataServiceLocal extends ObserveServiceLocal implements String activityPrefix =String.format("%s - Activity [%s/%s] ", routePrefix, ++activityIndex, activityMax); - if (!activitySeine.isSetOperation() && !activitySeine.isDCPOperation()) { - log.info(String.format("%s Skip activity (No set nor dcp): %s", activityPrefix, activitySeine.getTopiaId())); - continue; + boolean floatingObjectEmpty = activitySeine.isFloatingObjectEmpty(); + if (!activitySeine.isSetOperation() && floatingObjectEmpty) { + log.info(String.format("%s Skip activity (No set nor dcp found): %s", activityPrefix, activitySeine.getTopiaId())); + continue; } ConsolidateActivitySeineDataResultBuilder resultBuilder = new ConsolidateActivitySeineDataResultBuilder(applicationLocale, referenceLocale, activitySeine.getTopiaId(), ActivitySeines.decorate(referenceLocale.ordinal(), activitySeine)); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/9d6e9d5ec129ee0285262de37f… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/9d6e9d5ec129ee0285262de37f… You're receiving this email because of your account on gitlab.com.

1 0