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 April 30, 2019

April 30, 2019

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 April 30, 2019

April 30, 2019

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 April 30, 2019

April 30, 2019

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 April 28, 2019

April 28, 2019

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 April 28, 2019

April 28, 2019

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 April 28, 2019

April 28, 2019

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 April 28, 2019

April 28, 2019

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 April 22, 2019

April 22, 2019

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 April 22, 2019

April 22, 2019

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 April 22, 2019

April 22, 2019

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

[Git][ultreiaio/ird-observe][develop] [PS][FOB] Le calcul du type simplifié et des propriétés maillant/biodégradable...
by Tony CHEMIT April 15, 2019

April 15, 2019

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: b135087c by tchemit at 2019-04-15T16:33:02Z [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 - - - - - 3 changed files: - 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 - services-local/src/main/java/fr/ird/observe/services/local/service/actions/consolidate/ConsolidateDataServiceLocal.java Changes: ===================================== persistence/src/main/java/fr/ird/observe/entities/data/ps/observation/ActivitySeineImpl.java ===================================== @@ -39,7 +39,7 @@ public class ActivitySeineImpl extends ActivitySeineAbstract { @Override public boolean isDCPOperation() { - return vesselActivitySeine != null && ActivitySeines.DCP_OPERATIONS.contains(vesselActivitySeine.getCode()); + return vesselActivitySeine != null && vesselActivitySeine.isAllowFad(); } @Override ===================================== 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); ===================================== services-local/src/main/java/fr/ird/observe/services/local/service/actions/consolidate/ConsolidateDataServiceLocal.java ===================================== @@ -227,9 +227,14 @@ public class ConsolidateDataServiceLocal extends ObserveServiceLocal implements String activityPrefix = String.format("%s - Activity [%s/%s] ", routePrefix, ++activityIndex, activityMax); + boolean floatingObjectNotEmpty = activitySeine.isFloatingObjectNotEmpty(); if (!activitySeine.isSetOperation() && !activitySeine.isDCPOperation()) { - log.info(String.format("%s Skip activity (No set nor dcp): %s", activityPrefix, activitySeine.getTopiaId())); - continue; + if (floatingObjectNotEmpty) { + log.warn(String.format("%s Use activity with some FOB but his activity does not allow FAD (vessel activity code: %s) : %s", activityPrefix, activitySeine.getVesselActivitySeine().getCode(), activitySeine.getTopiaId())); + } else { + log.info(String.format("%s Skip activity (No set nor dcp): %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/commit/b135087c920de7be5f49e078e75… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/b135087c920de7be5f49e078e75… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] [PS][FOB] Le calcul du type simplifié et des propriétés maillant/biodégradable...
by Tony CHEMIT April 15, 2019

April 15, 2019

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 9d6e9d5e by tchemit at 2019-04-15T16:30:07Z [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 - - - - - 2 changed files: - persistence/src/main/java/fr/ird/observe/entities/seine/ActivitySeineImpl.java - services-local/src/main/java/fr/ird/observe/services/local/service/actions/consolidate/ConsolidateDataServiceLocal.java Changes: ===================================== persistence/src/main/java/fr/ird/observe/entities/seine/ActivitySeineImpl.java ===================================== @@ -48,15 +48,13 @@ 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()); + return vesselActivitySeine != null && vesselActivitySeine.isAllowFad(); } @Override @@ -163,6 +161,4 @@ public class ActivitySeineImpl extends ActivitySeineAbstract { .toString(); } -} - - +} \ No newline at end of file ===================================== services-local/src/main/java/fr/ird/observe/services/local/service/actions/consolidate/ConsolidateDataServiceLocal.java ===================================== @@ -225,9 +225,14 @@ public class ConsolidateDataServiceLocal extends ObserveServiceLocal implements String activityPrefix =String.format("%s - Activity [%s/%s] ", routePrefix, ++activityIndex, activityMax); + boolean floatingObjectNotEmpty = activitySeine.isFloatingObjectNotEmpty(); if (!activitySeine.isSetOperation() && !activitySeine.isDCPOperation()) { - log.info(String.format("%s Skip activity (No set nor dcp): %s", activityPrefix, activitySeine.getTopiaId())); - continue; + if (floatingObjectNotEmpty) { + log.warn(String.format("%s Use activity with some FOB but his activity does not allow FAD (vessel activity code: %s) : %s", activityPrefix, activitySeine.getVesselActivitySeine().getCode(), activitySeine.getTopiaId())); + } else { + log.info(String.format("%s Skip activity (No set nor dcp): %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/commit/9d6e9d5ec129ee0285262de37fa… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/9d6e9d5ec129ee0285262de37fa… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] update pom
by Tony CHEMIT April 15, 2019

April 15, 2019

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 249701f7 by tchemit at 2019-04-15T14:12:33Z 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.13</version> + <version>2019.8.14</version> </parent> <groupId>fr.ird.observe</groupId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/249701f705659ba74b36432e464… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/249701f705659ba74b36432e464… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] update pom
by Tony CHEMIT April 15, 2019

April 15, 2019

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: f6d6b3ef by tchemit at 2019-04-15T14:12:14Z 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.13</version> + <version>2019.8.14</version> </parent> <groupId>fr.ird.observe</groupId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/f6d6b3ef6582e5e13ad90093132… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/f6d6b3ef6582e5e13ad90093132… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] update templates
by Tony CHEMIT April 11, 2019

April 11, 2019

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 0c1bbe51 by tchemit at 2019-04-11T11:46:24Z update templates - - - - - 21 changed files: - − .gitlab/issue_templates/Evolution future.md - .gitlab/issue_templates/Contrat-CodeLutin-2016-Anomalie.md → .gitlab/issue_templates/M01-RECOLAP-2019-Anomalie.md - + .gitlab/issue_templates/M01-RECOLAP-2019-Évolution.md - + .gitlab/issue_templates/M02-RECOLAP-2019-Anomalie.md - + .gitlab/issue_templates/M02-RECOLAP-2019-Évolution.md - + .gitlab/issue_templates/M03-RECOLAP-2019-Anomalie.md - + .gitlab/issue_templates/M03-RECOLAP-2019-Évolution.md - + .gitlab/issue_templates/M04-RECOLAP-2019-Anomalie.md - + .gitlab/issue_templates/M04-RECOLAP-2019-Évolution.md - + .gitlab/issue_templates/M05-RECOLAP-2019-Anomalie.md - + .gitlab/issue_templates/M05-RECOLAP-2019-Évolution.md - + .gitlab/issue_templates/M06-RECOLAP-2019-Anomalie.md - + .gitlab/issue_templates/M06-RECOLAP-2019-Évolution.md - + .gitlab/issue_templates/M07-RECOLAP-2019-Anomalie.md - + .gitlab/issue_templates/M07-RECOLAP-2019-Évolution.md - + .gitlab/issue_templates/M08-RECOLAP-2019-Anomalie.md - + .gitlab/issue_templates/M08-RECOLAP-2019-Évolution.md - + .gitlab/issue_templates/M09-RECOLAP-2019-Anomalie.md - + .gitlab/issue_templates/M09-RECOLAP-2019-Évolution.md - + .gitlab/issue_templates/M10-RECOLAP-2019-Anomalie.md - + .gitlab/issue_templates/M10-RECOLAP-2019-Évolution.md Changes: ===================================== .gitlab/issue_templates/Evolution future.md deleted ===================================== @@ -1,5 +0,0 @@ - - -/label ~"Evolution" -/milestone %"Backlog" -/assign @tchemit \ No newline at end of file ===================================== .gitlab/issue_templates/Contrat-CodeLutin-2016-Anomalie.md → .gitlab/issue_templates/M01-RECOLAP-2019-Anomalie.md ===================================== @@ -8,7 +8,10 @@ ``` + + /label ~"Anomalie" -/label ~"Contrat Code Lutin-2016" -/milestone %"Contrat Code Lutin-2016" +/label ~"Module 1" +/label ~"IRD-2018-02-V9" +/milestone %"Contrat RECOLAPE 2019" /assign @tchemit \ No newline at end of file ===================================== .gitlab/issue_templates/M01-RECOLAP-2019-Évolution.md ===================================== @@ -0,0 +1,9 @@ + + + + +/label ~"Evolution" +/milestone %"Contrat RECOLAPE 2019" +/label ~"IRD-2018-02-V9" +/label ~"Module 1" +/assign @tchemit \ No newline at end of file ===================================== .gitlab/issue_templates/M02-RECOLAP-2019-Anomalie.md ===================================== @@ -0,0 +1,17 @@ +## Quelle est la cause de bogue ? + +## Comment reproduire le bogue ? + +## Logs + +``` + +``` + + + +/label ~"Anomalie" +/label ~"Module 2" +/label ~"IRD-2018-02-V9" +/milestone %"Contrat RECOLAPE 2019" +/assign @tchemit \ No newline at end of file ===================================== .gitlab/issue_templates/M02-RECOLAP-2019-Évolution.md ===================================== @@ -0,0 +1,9 @@ + + + + +/label ~"Evolution" +/milestone %"Contrat RECOLAPE 2019" +/label ~"IRD-2018-02-V9" +/label ~"Module 2" +/assign @tchemit \ No newline at end of file ===================================== .gitlab/issue_templates/M03-RECOLAP-2019-Anomalie.md ===================================== @@ -0,0 +1,17 @@ +## Quelle est la cause de bogue ? + +## Comment reproduire le bogue ? + +## Logs + +``` + +``` + + + +/label ~"Anomalie" +/label ~"Module 3" +/label ~"IRD-2018-02-V9" +/milestone %"Contrat RECOLAPE 2019" +/assign @tchemit \ No newline at end of file ===================================== .gitlab/issue_templates/M03-RECOLAP-2019-Évolution.md ===================================== @@ -0,0 +1,9 @@ + + + + +/label ~"Evolution" +/milestone %"Contrat RECOLAPE 2019" +/label ~"IRD-2018-02-V9" +/label ~"Module 3" +/assign @tchemit \ No newline at end of file ===================================== .gitlab/issue_templates/M04-RECOLAP-2019-Anomalie.md ===================================== @@ -0,0 +1,17 @@ +## Quelle est la cause de bogue ? + +## Comment reproduire le bogue ? + +## Logs + +``` + +``` + + + +/label ~"Anomalie" +/label ~"Module 4" +/label ~"IRD-2018-02-V9" +/milestone %"Contrat RECOLAPE 2019" +/assign @tchemit \ No newline at end of file ===================================== .gitlab/issue_templates/M04-RECOLAP-2019-Évolution.md ===================================== @@ -0,0 +1,9 @@ + + + + +/label ~"Evolution" +/milestone %"Contrat RECOLAPE 2019" +/label ~"IRD-2018-02-V9" +/label ~"Module 4" +/assign @tchemit \ No newline at end of file ===================================== .gitlab/issue_templates/M05-RECOLAP-2019-Anomalie.md ===================================== @@ -0,0 +1,17 @@ +## Quelle est la cause de bogue ? + +## Comment reproduire le bogue ? + +## Logs + +``` + +``` + + + +/label ~"Anomalie" +/label ~"Module 5" +/label ~"IRD-2018-02-V9" +/milestone %"Contrat RECOLAPE 2019" +/assign @tchemit \ No newline at end of file ===================================== .gitlab/issue_templates/M05-RECOLAP-2019-Évolution.md ===================================== @@ -0,0 +1,9 @@ + + + + +/label ~"Evolution" +/milestone %"Contrat RECOLAPE 2019" +/label ~"IRD-2018-02-V9" +/label ~"Module 5" +/assign @tchemit \ No newline at end of file ===================================== .gitlab/issue_templates/M06-RECOLAP-2019-Anomalie.md ===================================== @@ -0,0 +1,17 @@ +## Quelle est la cause de bogue ? + +## Comment reproduire le bogue ? + +## Logs + +``` + +``` + + + +/label ~"Anomalie" +/label ~"Module 6" +/label ~"IRD-2018-02-V9" +/milestone %"Contrat RECOLAPE 2019" +/assign @tchemit \ No newline at end of file ===================================== .gitlab/issue_templates/M06-RECOLAP-2019-Évolution.md ===================================== @@ -0,0 +1,9 @@ + + + + +/label ~"Evolution" +/milestone %"Contrat RECOLAPE 2019" +/label ~"IRD-2018-02-V9" +/label ~"Module 6" +/assign @tchemit \ No newline at end of file ===================================== .gitlab/issue_templates/M07-RECOLAP-2019-Anomalie.md ===================================== @@ -0,0 +1,17 @@ +## Quelle est la cause de bogue ? + +## Comment reproduire le bogue ? + +## Logs + +``` + +``` + + + +/label ~"Anomalie" +/label ~"Module 7" +/label ~"IRD-2018-02-V9" +/milestone %"Contrat RECOLAPE 2019" +/assign @tchemit \ No newline at end of file ===================================== .gitlab/issue_templates/M07-RECOLAP-2019-Évolution.md ===================================== @@ -0,0 +1,9 @@ + + + + +/label ~"Evolution" +/milestone %"Contrat RECOLAPE 2019" +/label ~"IRD-2018-02-V9" +/label ~"Module 7" +/assign @tchemit \ No newline at end of file ===================================== .gitlab/issue_templates/M08-RECOLAP-2019-Anomalie.md ===================================== @@ -0,0 +1,17 @@ +## Quelle est la cause de bogue ? + +## Comment reproduire le bogue ? + +## Logs + +``` + +``` + + + +/label ~"Anomalie" +/label ~"Module 8" +/label ~"IRD-2018-02-V9" +/milestone %"Contrat RECOLAPE 2019" +/assign @tchemit \ No newline at end of file ===================================== .gitlab/issue_templates/M08-RECOLAP-2019-Évolution.md ===================================== @@ -0,0 +1,9 @@ + + + + +/label ~"Evolution" +/milestone %"Contrat RECOLAPE 2019" +/label ~"IRD-2018-02-V9" +/label ~"Module 8" +/assign @tchemit \ No newline at end of file ===================================== .gitlab/issue_templates/M09-RECOLAP-2019-Anomalie.md ===================================== @@ -0,0 +1,17 @@ +## Quelle est la cause de bogue ? + +## Comment reproduire le bogue ? + +## Logs + +``` + +``` + + + +/label ~"Anomalie" +/label ~"Module 9" +/label ~"IRD-2018-02-V9" +/milestone %"Contrat RECOLAPE 2019" +/assign @tchemit \ No newline at end of file ===================================== .gitlab/issue_templates/M09-RECOLAP-2019-Évolution.md ===================================== @@ -0,0 +1,9 @@ + + + + +/label ~"Evolution" +/milestone %"Contrat RECOLAPE 2019" +/label ~"IRD-2018-02-V9" +/label ~"Module 9" +/assign @tchemit \ No newline at end of file ===================================== .gitlab/issue_templates/M10-RECOLAP-2019-Anomalie.md ===================================== @@ -0,0 +1,17 @@ +## Quelle est la cause de bogue ? + +## Comment reproduire le bogue ? + +## Logs + +``` + +``` + + + +/label ~"Anomalie" +/label ~"Module 10" +/label ~"IRD-2018-02-V9" +/milestone %"Contrat RECOLAPE 2019" +/assign @tchemit \ No newline at end of file ===================================== .gitlab/issue_templates/M10-RECOLAP-2019-Évolution.md ===================================== @@ -0,0 +1,9 @@ + + + + +/label ~"Evolution" +/milestone %"Contrat RECOLAPE 2019" +/label ~"IRD-2018-02-V9" +/label ~"Module 10" +/assign @tchemit \ No newline at end of file View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/0c1bbe518395a5f7426fb583910… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/0c1bbe518395a5f7426fb583910… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] update templates
by Tony CHEMIT April 11, 2019

April 11, 2019

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 116ff039 by tchemit at 2019-04-11T11:37:23Z update templates - - - - - 21 changed files: - .gitlab/issue_templates/Contrat-CodeLutin-2016-Anomalie.md → .gitlab/issue_templates/Contrat-RECOLAP-2019-Anomalie-M1.md - + .gitlab/issue_templates/Contrat-RECOLAP-2019-Anomalie-M10.md - + .gitlab/issue_templates/Contrat-RECOLAP-2019-Anomalie-M2.md - + .gitlab/issue_templates/Contrat-RECOLAP-2019-Anomalie-M3.md - + .gitlab/issue_templates/Contrat-RECOLAP-2019-Anomalie-M4.md - + .gitlab/issue_templates/Contrat-RECOLAP-2019-Anomalie-M5.md - + .gitlab/issue_templates/Contrat-RECOLAP-2019-Anomalie-M6.md - + .gitlab/issue_templates/Contrat-RECOLAP-2019-Anomalie-M7.md - + .gitlab/issue_templates/Contrat-RECOLAP-2019-Anomalie-M8.md - + .gitlab/issue_templates/Contrat-RECOLAP-2019-Anomalie-M9.md - + .gitlab/issue_templates/Contrat-RECOLAP-2019-Évolution-M1.md - + .gitlab/issue_templates/Contrat-RECOLAP-2019-Évolution-M10.md - + .gitlab/issue_templates/Contrat-RECOLAP-2019-Évolution-M2.md - + .gitlab/issue_templates/Contrat-RECOLAP-2019-Évolution-M3.md - + .gitlab/issue_templates/Contrat-RECOLAP-2019-Évolution-M4.md - + .gitlab/issue_templates/Contrat-RECOLAP-2019-Évolution-M5.md - + .gitlab/issue_templates/Contrat-RECOLAP-2019-Évolution-M6.md - + .gitlab/issue_templates/Contrat-RECOLAP-2019-Évolution-M7.md - + .gitlab/issue_templates/Contrat-RECOLAP-2019-Évolution-M8.md - + .gitlab/issue_templates/Contrat-RECOLAP-2019-Évolution-M9.md - − .gitlab/issue_templates/Evolution future.md Changes: ===================================== .gitlab/issue_templates/Contrat-CodeLutin-2016-Anomalie.md → .gitlab/issue_templates/Contrat-RECOLAP-2019-Anomalie-M1.md ===================================== @@ -8,7 +8,10 @@ ``` + + /label ~"Anomalie" -/label ~"Contrat Code Lutin-2016" -/milestone %"Contrat Code Lutin-2016" +/label ~"Module 1" +/label ~"IRD-2018-02-V9" +/milestone %"Contrat RECOLAPE 2019" /assign @tchemit \ No newline at end of file ===================================== .gitlab/issue_templates/Contrat-RECOLAP-2019-Anomalie-M10.md ===================================== @@ -0,0 +1,17 @@ +## Quelle est la cause de bogue ? + +## Comment reproduire le bogue ? + +## Logs + +``` + +``` + + + +/label ~"Anomalie" +/label ~"Module 10" +/label ~"IRD-2018-02-V9" +/milestone %"Contrat RECOLAPE 2019" +/assign @tchemit \ No newline at end of file ===================================== .gitlab/issue_templates/Contrat-RECOLAP-2019-Anomalie-M2.md ===================================== @@ -0,0 +1,17 @@ +## Quelle est la cause de bogue ? + +## Comment reproduire le bogue ? + +## Logs + +``` + +``` + + + +/label ~"Anomalie" +/label ~"Module 2" +/label ~"IRD-2018-02-V9" +/milestone %"Contrat RECOLAPE 2019" +/assign @tchemit \ No newline at end of file ===================================== .gitlab/issue_templates/Contrat-RECOLAP-2019-Anomalie-M3.md ===================================== @@ -0,0 +1,17 @@ +## Quelle est la cause de bogue ? + +## Comment reproduire le bogue ? + +## Logs + +``` + +``` + + + +/label ~"Anomalie" +/label ~"Module 3" +/label ~"IRD-2018-02-V9" +/milestone %"Contrat RECOLAPE 2019" +/assign @tchemit \ No newline at end of file ===================================== .gitlab/issue_templates/Contrat-RECOLAP-2019-Anomalie-M4.md ===================================== @@ -0,0 +1,17 @@ +## Quelle est la cause de bogue ? + +## Comment reproduire le bogue ? + +## Logs + +``` + +``` + + + +/label ~"Anomalie" +/label ~"Module 4" +/label ~"IRD-2018-02-V9" +/milestone %"Contrat RECOLAPE 2019" +/assign @tchemit \ No newline at end of file ===================================== .gitlab/issue_templates/Contrat-RECOLAP-2019-Anomalie-M5.md ===================================== @@ -0,0 +1,17 @@ +## Quelle est la cause de bogue ? + +## Comment reproduire le bogue ? + +## Logs + +``` + +``` + + + +/label ~"Anomalie" +/label ~"Module 5" +/label ~"IRD-2018-02-V9" +/milestone %"Contrat RECOLAPE 2019" +/assign @tchemit \ No newline at end of file ===================================== .gitlab/issue_templates/Contrat-RECOLAP-2019-Anomalie-M6.md ===================================== @@ -0,0 +1,17 @@ +## Quelle est la cause de bogue ? + +## Comment reproduire le bogue ? + +## Logs + +``` + +``` + + + +/label ~"Anomalie" +/label ~"Module 6" +/label ~"IRD-2018-02-V9" +/milestone %"Contrat RECOLAPE 2019" +/assign @tchemit \ No newline at end of file ===================================== .gitlab/issue_templates/Contrat-RECOLAP-2019-Anomalie-M7.md ===================================== @@ -0,0 +1,17 @@ +## Quelle est la cause de bogue ? + +## Comment reproduire le bogue ? + +## Logs + +``` + +``` + + + +/label ~"Anomalie" +/label ~"Module 7" +/label ~"IRD-2018-02-V9" +/milestone %"Contrat RECOLAPE 2019" +/assign @tchemit \ No newline at end of file ===================================== .gitlab/issue_templates/Contrat-RECOLAP-2019-Anomalie-M8.md ===================================== @@ -0,0 +1,17 @@ +## Quelle est la cause de bogue ? + +## Comment reproduire le bogue ? + +## Logs + +``` + +``` + + + +/label ~"Anomalie" +/label ~"Module 8" +/label ~"IRD-2018-02-V9" +/milestone %"Contrat RECOLAPE 2019" +/assign @tchemit \ No newline at end of file ===================================== .gitlab/issue_templates/Contrat-RECOLAP-2019-Anomalie-M9.md ===================================== @@ -0,0 +1,17 @@ +## Quelle est la cause de bogue ? + +## Comment reproduire le bogue ? + +## Logs + +``` + +``` + + + +/label ~"Anomalie" +/label ~"Module 9" +/label ~"IRD-2018-02-V9" +/milestone %"Contrat RECOLAPE 2019" +/assign @tchemit \ No newline at end of file ===================================== .gitlab/issue_templates/Contrat-RECOLAP-2019-Évolution-M1.md ===================================== @@ -0,0 +1,9 @@ + + + + +/label ~"Evolution" +/milestone %"Contrat RECOLAPE 2019" +/label ~"IRD-2018-02-V9" +/label ~"Module 1" +/assign @tchemit \ No newline at end of file ===================================== .gitlab/issue_templates/Contrat-RECOLAP-2019-Évolution-M10.md ===================================== @@ -0,0 +1,9 @@ + + + + +/label ~"Evolution" +/milestone %"Contrat RECOLAPE 2019" +/label ~"IRD-2018-02-V9" +/label ~"Module 10" +/assign @tchemit \ No newline at end of file ===================================== .gitlab/issue_templates/Contrat-RECOLAP-2019-Évolution-M2.md ===================================== @@ -0,0 +1,9 @@ + + + + +/label ~"Evolution" +/milestone %"Contrat RECOLAPE 2019" +/label ~"IRD-2018-02-V9" +/label ~"Module 2" +/assign @tchemit \ No newline at end of file ===================================== .gitlab/issue_templates/Contrat-RECOLAP-2019-Évolution-M3.md ===================================== @@ -0,0 +1,9 @@ + + + + +/label ~"Evolution" +/milestone %"Contrat RECOLAPE 2019" +/label ~"IRD-2018-02-V9" +/label ~"Module 3" +/assign @tchemit \ No newline at end of file ===================================== .gitlab/issue_templates/Contrat-RECOLAP-2019-Évolution-M4.md ===================================== @@ -0,0 +1,9 @@ + + + + +/label ~"Evolution" +/milestone %"Contrat RECOLAPE 2019" +/label ~"IRD-2018-02-V9" +/label ~"Module 4" +/assign @tchemit \ No newline at end of file ===================================== .gitlab/issue_templates/Contrat-RECOLAP-2019-Évolution-M5.md ===================================== @@ -0,0 +1,9 @@ + + + + +/label ~"Evolution" +/milestone %"Contrat RECOLAPE 2019" +/label ~"IRD-2018-02-V9" +/label ~"Module 5" +/assign @tchemit \ No newline at end of file ===================================== .gitlab/issue_templates/Contrat-RECOLAP-2019-Évolution-M6.md ===================================== @@ -0,0 +1,9 @@ + + + + +/label ~"Evolution" +/milestone %"Contrat RECOLAPE 2019" +/label ~"IRD-2018-02-V9" +/label ~"Module 6" +/assign @tchemit \ No newline at end of file ===================================== .gitlab/issue_templates/Contrat-RECOLAP-2019-Évolution-M7.md ===================================== @@ -0,0 +1,9 @@ + + + + +/label ~"Evolution" +/milestone %"Contrat RECOLAPE 2019" +/label ~"IRD-2018-02-V9" +/label ~"Module 7" +/assign @tchemit \ No newline at end of file ===================================== .gitlab/issue_templates/Contrat-RECOLAP-2019-Évolution-M8.md ===================================== @@ -0,0 +1,9 @@ + + + + +/label ~"Evolution" +/milestone %"Contrat RECOLAPE 2019" +/label ~"IRD-2018-02-V9" +/label ~"Module 8" +/assign @tchemit \ No newline at end of file ===================================== .gitlab/issue_templates/Contrat-RECOLAP-2019-Évolution-M9.md ===================================== @@ -0,0 +1,9 @@ + + + + +/label ~"Evolution" +/milestone %"Contrat RECOLAPE 2019" +/label ~"IRD-2018-02-V9" +/label ~"Module 9" +/assign @tchemit \ No newline at end of file ===================================== .gitlab/issue_templates/Evolution future.md deleted ===================================== @@ -1,5 +0,0 @@ - - -/label ~"Evolution" -/milestone %"Backlog" -/assign @tchemit \ No newline at end of file View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/116ff039d00dd998be63ee4a592… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/116ff039d00dd998be63ee4a592… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] update templates
by Tony CHEMIT April 11, 2019

April 11, 2019

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 509bd6be by tchemit at 2019-04-11T11:29:23Z update templates - - - - - 3 changed files: - .gitlab/issue_templates/Contrat-CodeLutin-2016-Anomalie.md → .gitlab/issue_templates/Contrat-RECOLAP-2019-Anomalie.md - + .gitlab/issue_templates/Contrat-RECOLAP-2019-Évolution.md - − .gitlab/issue_templates/Evolution future.md Changes: ===================================== .gitlab/issue_templates/Contrat-CodeLutin-2016-Anomalie.md → .gitlab/issue_templates/Contrat-RECOLAP-2019-Anomalie.md ===================================== @@ -9,6 +9,9 @@ ``` /label ~"Anomalie" -/label ~"Contrat Code Lutin-2016" -/milestone %"Contrat Code Lutin-2016" + +/milestone %"Contrat RECOLAPE 2019" + +/label ~"IRD-2018-02-V9" + /assign @tchemit \ No newline at end of file ===================================== .gitlab/issue_templates/Contrat-RECOLAP-2019-Évolution.md ===================================== @@ -0,0 +1,8 @@ + +/label ~"Evolution" + +/milestone %"Contrat RECOLAPE 2019" + +/label ~"IRD-2018-02-V9" + +/assign @tchemit \ No newline at end of file ===================================== .gitlab/issue_templates/Evolution future.md deleted ===================================== @@ -1,5 +0,0 @@ - - -/label ~"Evolution" -/milestone %"Backlog" -/assign @tchemit \ No newline at end of file View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/509bd6be122a1304c951ef1cdee… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/509bd6be122a1304c951ef1cdee… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] update changelog
by Tony CHEMIT April 11, 2019

April 11, 2019

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: a719ce45 by tchemit at 2019-04-11T08:32:25Z update changelog - - - - - 3 changed files: - .mvn/gitlab-cache/milestones/796341-issues.json - .mvn/gitlab-cache/milestones/796341.json - CHANGELOG.md Changes: ===================================== .mvn/gitlab-cache/milestones/796341-issues.json ===================================== @@ -1,4 +1,67 @@ [ + { + "id": 19149533, + "iid": 1244, + "projectId": 2722779, + "title": "Bug requête tableau synthèse DCP", + "description": "Il semblerait que la requête qui permet de générer le tableau de synthèse \"Utilisation des DCP\" ait un souci car elle retourne toujours **un nombre de DCP pêchés égal à 0**. Exemple en PJ.[Tableau_synthese_DCP.xlsx](/uploads/34dc4cd2db770bc354a3e01c815b4ade/Tableau_synthese_DCP.xlsx)", + "labels": [ + "Anomalie", + "Senne", + "À corriger", + "À facturer" + ], + "milestone": { + "id": 796341, + "iid": 137, + "projectId": 2722779, + "groupId": 0, + "title": "7.0.6", + "description": "", + "dueDate": "Apr 11, 2019 2:00:00 AM", + "startDate": "Feb 20, 2019 1:00:00 AM", + "state": "closed" + }, + "assignees": [ + { + "_id": 1111318, + "_username": "pcauquil", + "_name": "Pascal Cauquil", + "_state": "active", + "_external": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" + } + ], + "assignee": { + "_id": 1111318, + "_username": "pcauquil", + "_name": "Pascal Cauquil", + "_state": "active", + "_external": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" + }, + "author": { + "_id": 1111294, + "_username": "psabarros", + "_name": "Philippe Sabarros", + "_state": "active", + "_external": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/0d688d854bbc8b3a3a7f97f6730ac563?s\u003d…" + }, + "userNotesCount": 12, + "upVotes": 0, + "downVotes": 0, + "confidential": false, + "timeStats": { + "timeEstimate": 0, + "totalTimeSpent": 0 + }, + "state": "closed", + "updatedAt": "Apr 11, 2019 10:27:07 AM", + "createdAt": "Mar 15, 2019 12:13:36 PM", + "closedAt": "Apr 11, 2019 10:26:36 AM", + "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/1244" + }, { "id": 18835616, "iid": 1243, @@ -16,7 +79,7 @@ "groupId": 0, "title": "7.0.6", "description": "", - "dueDate": "Mar 10, 2019 1:00:00 AM", + "dueDate": "Apr 11, 2019 2:00:00 AM", "startDate": "Feb 20, 2019 1:00:00 AM", "state": "closed" }, @@ -85,7 +148,7 @@ "groupId": 0, "title": "7.0.6", "description": "", - "dueDate": "Mar 10, 2019 1:00:00 AM", + "dueDate": "Apr 11, 2019 2:00:00 AM", "startDate": "Feb 20, 2019 1:00:00 AM", "state": "closed" }, @@ -154,7 +217,7 @@ "groupId": 0, "title": "7.0.6", "description": "", - "dueDate": "Mar 10, 2019 1:00:00 AM", + "dueDate": "Apr 11, 2019 2:00:00 AM", "startDate": "Feb 20, 2019 1:00:00 AM", "state": "closed" }, @@ -222,7 +285,7 @@ "groupId": 0, "title": "7.0.6", "description": "", - "dueDate": "Mar 10, 2019 1:00:00 AM", + "dueDate": "Apr 11, 2019 2:00:00 AM", "startDate": "Feb 20, 2019 1:00:00 AM", "state": "closed" }, @@ -282,7 +345,7 @@ "groupId": 0, "title": "7.0.6", "description": "", - "dueDate": "Mar 10, 2019 1:00:00 AM", + "dueDate": "Apr 11, 2019 2:00:00 AM", "startDate": "Feb 20, 2019 1:00:00 AM", "state": "closed" }, ===================================== .mvn/gitlab-cache/milestones/796341.json ===================================== @@ -5,7 +5,7 @@ "groupId": 0, "title": "7.0.6", "description": "", - "dueDate": "Mar 10, 2019 1:00:00 AM", + "dueDate": "Apr 11, 2019 2:00:00 AM", "startDate": "Feb 20, 2019 1:00:00 AM", "state": "closed" } \ No newline at end of file ===================================== CHANGELOG.md ===================================== @@ -1,7 +1,7 @@ # ObServe changelog * Author [Tony Chemit](mailto:dev@tchemit.fr) - * Last generated at 2019-03-10 14:28. + * Last generated at 2019-04-11 10:29. ## Version [8.0-alpha-4](https://gitlab.com/ultreiaio/ird-observe/milestones/115) Seconde partie du troisième lot du contrat IRD-2018-01-V8.
contient fonctionnalités avancées. @@ -115,7 +115,7 @@ Premier lot du contrat IRD-2018-01-V8 ## Version [7.0.6](https://gitlab.com/ultreiaio/ird-observe/milestones/137) -**Closed at 2019-03-10.** +**Closed at 2019-04-11.** ### Download * [Application (observe-7.0.6-SNAPSHOT.zip)](https://ultreia.io/release/observe-7.0.6-SNAPSHOT.zip) @@ -127,6 +127,7 @@ Premier lot du contrat IRD-2018-01-V8 * [[Anomalie 1241]](https://gitlab.com/ultreiaio/ird-observe/issues/1241) **Libellés manquants sur formulaire édition espèces** (Thanks to Tony CHEMIT) (Reported by Philippe Sabarros) * [[Anomalie 1242]](https://gitlab.com/ultreiaio/ird-observe/issues/1242) **Incohérence "type de mensuration" dans formulaire "echantillons"** (Thanks to Tony CHEMIT) (Reported by Philippe Sabarros) * [[Anomalie 1243]](https://gitlab.com/ultreiaio/ird-observe/issues/1243) **Sauvegarde hors de .observe/backup plus possible** (Thanks to Tony CHEMIT) (Reported by Philippe Sabarros) + * [[Anomalie 1244]](https://gitlab.com/ultreiaio/ird-observe/issues/1244) **Bug requête tableau synthèse DCP** (Thanks to Pascal Cauquil) (Reported by Philippe Sabarros) ## Version [7.0.5](https://gitlab.com/ultreiaio/ird-observe/milestones/136) View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/a719ce4547d175417c05e9d1844… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/a719ce4547d175417c05e9d1844… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: update pom
by Tony CHEMIT April 11, 2019

April 11, 2019

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: e5f32fd5 by tchemit at 2019-04-11T08:21:18Z update pom - - - - - 30426268 by tchemit at 2019-04-11T08:26:23Z Bug requête tableau synthèse DCP - Closes #1244 - - - - - 18 changed files: - client-configuration/src/license/THIRD-PARTY.properties - client-core/src/license/THIRD-PARTY.properties - client-runner/src/license/THIRD-PARTY.properties - dto/src/license/THIRD-PARTY.properties - + observe-i18n/src/license/THIRD-PARTY.properties - persistence/pom.xml - persistence/src/license/THIRD-PARTY.properties - pom.xml - server-configuration/src/license/THIRD-PARTY.properties - server-core/src/license/THIRD-PARTY.properties - server-runner/src/license/THIRD-PARTY.properties - services-client/src/license/THIRD-PARTY.properties - services-local/src/license/THIRD-PARTY.properties - services-validation/src/license/THIRD-PARTY.properties - services/src/license/THIRD-PARTY.properties - services/src/main/resources/observe-reports.properties - + test/src/license/THIRD-PARTY.properties - validation/src/license/THIRD-PARTY.properties Changes: ===================================== client-configuration/src/license/THIRD-PARTY.properties ===================================== @@ -6,14 +6,18 @@ # - Apache License, version 2.0 # - BSD 3-clause New License # - BSD License +# - CDDL 1.1 +# - CDDL+GPL License +# - CDDL/GPLv2+CE # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Common Development and Distribution License -# - Eclipse Distribution License (EDL), Version 1.0 -# - Eclipse Public License (EPL), Version 1.0 +# - Dual license consisting of the CDDL v1.1 and GPL v2 +# - Eclipse Distribution License v. 1.0 # - Eclipse Public License 1.0 -# - Eclipse Public License, Version 1.0 +# - Eclipse Public License v1.0 # - GNU General Public License, Version 2 with the Classpath Exception -# - GNU Lesser General Public License, Version 2.1 +# - GNU Library General Public License v2.1 or later +# - GPL2 w/ CPE # - General Public License (GPL) # - Indiana University Extreme! Lab Software License, version 1.1.1 # - Lesser General Public License (LGPL) @@ -30,5 +34,6 @@ # Please fill the missing licenses for dependencies : # # -#Mon Feb 04 13:59:54 CET 2019 -commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 +#Wed Apr 10 14:53:37 CEST 2019 +commons-collections--commons-collections--20040616=The Apache Software License, Version 2.0 +commons-primitives--commons-primitives--20041207.202534=The Apache Software License, Version 2.0 ===================================== client-core/src/license/THIRD-PARTY.properties ===================================== @@ -9,20 +9,18 @@ # - BSD License # - BSD License for HSQL # - CDDL 1.1 -# - CDDL+GPL License # - CDDL/GPLv2+CE # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Common Development and Distribution License -# - Dual license consisting of the CDDL v1.1 and GPL v2 +# - EDL 1.0 # - EPSG database distribution license -# - Eclipse Distribution License (EDL), Version 1.0 # - Eclipse Distribution License - v 1.0 -# - Eclipse Public License (EPL), Version 1.0 +# - Eclipse Distribution License v. 1.0 # - Eclipse Public License 1.0 -# - Eclipse Public License, Version 1.0 +# - Eclipse Public License v1.0 # - Eclipse Publish License, Version 1.0 # - GNU General Public License, Version 2 with the Classpath Exception -# - GNU Lesser General Public License, Version 2.1 +# - GNU Library General Public License v2.1 or later # - GPL2 w/ CPE # - General Public License (GPL) # - HSQLDB License, a BSD open source license @@ -49,6 +47,7 @@ # Please fill the missing licenses for dependencies : # # -#Mon Feb 04 14:00:16 CET 2019 -commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 +#Wed Apr 10 16:18:22 CEST 2019 +commons-collections--commons-collections--20040616=The Apache Software License, Version 2.0 +commons-primitives--commons-primitives--20041207.202534=The Apache Software License, Version 2.0 javax.media--jai_core--1.1.3=JDL (Java Distribution License) ===================================== client-runner/src/license/THIRD-PARTY.properties ===================================== @@ -14,15 +14,13 @@ # - Common Development and Distribution License # - Dual license consisting of the CDDL v1.1 and GPL v2 # - EPSG database distribution license -# - Eclipse Distribution License (EDL), Version 1.0 # - Eclipse Distribution License - v 1.0 -# - Eclipse Public License (EPL), Version 1.0 +# - Eclipse Distribution License v. 1.0 # - Eclipse Public License 1.0 -# - Eclipse Public License, Version 1.0 +# - Eclipse Public License v1.0 # - Eclipse Publish License, Version 1.0 # - GNU General Public License, Version 2 with the Classpath Exception -# - GNU Lesser General Public License -# - GNU Lesser General Public License, Version 2.1 +# - GNU Library General Public License v2.1 or later # - GPL2 w/ CPE # - General Public License (GPL) # - HSQLDB License, a BSD open source license @@ -48,6 +46,7 @@ # Please fill the missing licenses for dependencies : # # -#Sun Feb 03 20:51:50 CET 2019 -commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 +#Wed Apr 10 14:45:39 CEST 2019 +commons-collections--commons-collections--20040616=The Apache Software License, Version 2.0 +commons-primitives--commons-primitives--20041207.202534=The Apache Software License, Version 2.0 javax.media--jai_core--1.1.3=JDL (Java Distribution License) ===================================== dto/src/license/THIRD-PARTY.properties ===================================== @@ -1,12 +1,13 @@ # Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : +# - Apache 2.0 # - Apache License 2.0 # - BSD License # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Eclipse Public License 1.0 # - General Public License (GPL) -# - Indiana University Extreme! Lab Software License, vesion 1.1.1 +# - Indiana University Extreme! Lab Software License, version 1.1.1 # - Lesser General Public License (LGPL) # - Lesser General Public License (LGPL) v 3.0 # - Lesser General Public License (LPGL) @@ -15,9 +16,11 @@ # - MPL 1.1 # - New BSD License # - The Apache Software License, Version 2.0 +# - The MIT License #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Mon Sep 07 10:22:53 CEST 2015 -commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 +#Wed Apr 10 16:20:09 CEST 2019 +commons-collections--commons-collections--20040616=The Apache Software License, Version 2.0 +commons-primitives--commons-primitives--20041207.202534=The Apache Software License, Version 2.0 ===================================== observe-i18n/src/license/THIRD-PARTY.properties ===================================== @@ -0,0 +1,19 @@ +# Generated by org.codehaus.mojo.license.AddThirdPartyMojo +#------------------------------------------------------------------------------- +# Already used licenses in project : +# - Apache 2.0 +# - BSD License +# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +# - Indiana University Extreme! Lab Software License, version 1.1.1 +# - Lesser General Public License (LGPL) v 3.0 +# - Lesser General Public License (LPGL) +# - Lesser General Public License (LPGL) v 2.1 +# - MIT License +# - The Apache Software License, Version 2.0 +# - The MIT License +#------------------------------------------------------------------------------- +# Please fill the missing licenses for dependencies : +# +# +#Wed Apr 10 14:54:15 CEST 2019 +commons-collections--commons-collections--20040616=The Apache Software License, Version 2.0 ===================================== persistence/pom.xml ===================================== @@ -135,6 +135,16 @@ <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-core</artifactId> + <exclusions> + <exclusion> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + </exclusion> + <exclusion> + <groupId>javax.activation</groupId> + <artifactId>javax.activation-api</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>net.bytebuddy</groupId> @@ -182,11 +192,11 @@ <artifactId>postgresql</artifactId> <scope>test</scope> </dependency> - <dependency> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> - <scope>runtime</scope> - </dependency> + + + + + <dependency> <groupId>org.glassfish.jaxb</groupId> <artifactId>jaxb-runtime</artifactId> ===================================== persistence/src/license/THIRD-PARTY.properties ===================================== @@ -12,12 +12,11 @@ # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Common Development and Distribution License # - Dual license consisting of the CDDL v1.1 and GPL v2 -# - Eclipse Distribution License (EDL), Version 1.0 -# - Eclipse Public License (EPL), Version 1.0 +# - Eclipse Distribution License v. 1.0 # - Eclipse Public License 1.0 -# - Eclipse Public License, Version 1.0 +# - Eclipse Public License v1.0 # - GNU General Public License, Version 2 with the Classpath Exception -# - GNU Lesser General Public License, Version 2.1 +# - GNU Library General Public License v2.1 or later # - GNU Library or Lesser General Public License # - GPL2 w/ CPE # - General Public License (GPL) @@ -37,5 +36,6 @@ # Please fill the missing licenses for dependencies : # # -#Mon Feb 04 13:56:32 CET 2019 -commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 +#Wed Apr 10 14:50:08 CEST 2019 +commons-collections--commons-collections--20040616=The Apache Software License, Version 2.0 +commons-primitives--commons-primitives--20041207.202534=The Apache Software License, Version 2.0 ===================================== pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2019.8.12</version> + <version>2019.8.13</version> </parent> <groupId>fr.ird.observe</groupId> @@ -163,7 +163,7 @@   - <lib.version.java4all.jaxx>3.0-alpha-50</lib.version.java4all.jaxx> +    @@ -238,11 +238,11 @@ <version>1.08</version> </dependency> - <dependency> - <groupId>org.glassfish.jaxb</groupId> - <artifactId>jaxb-runtime</artifactId> - <version>2.3.1</version> - </dependency> + + + + + <dependency> <groupId>org.nuiton.topia</groupId> ===================================== server-configuration/src/license/THIRD-PARTY.properties ===================================== @@ -21,5 +21,6 @@ # Please fill the missing licenses for dependencies : # # -#Fri Oct 19 16:06:54 CEST 2018 -commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 +#Wed Apr 10 14:53:30 CEST 2019 +commons-collections--commons-collections--20040616=The Apache Software License, Version 2.0 +commons-primitives--commons-primitives--20041207.202534=The Apache Software License, Version 2.0 ===================================== server-core/src/license/THIRD-PARTY.properties ===================================== @@ -17,12 +17,11 @@ # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Common Development and Distribution License # - Dual license consisting of the CDDL v1.1 and GPL v2 -# - Eclipse Distribution License (EDL), Version 1.0 -# - Eclipse Public License (EPL), Version 1.0 +# - Eclipse Distribution License v. 1.0 # - Eclipse Public License 1.0 -# - Eclipse Public License, Version 1.0 +# - Eclipse Public License v1.0 # - GNU General Public License, Version 2 with the Classpath Exception -# - GNU Lesser General Public License, Version 2.1 +# - GNU Library General Public License v2.1 or later # - GPL2 w/ CPE # - General Public License (GPL) # - Indiana University Extreme! Lab Software License, version 1.1.1 @@ -44,6 +43,7 @@ # Please fill the missing licenses for dependencies : # # -#Mon Feb 04 13:59:51 CET 2019 -commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 +#Wed Apr 10 14:53:34 CEST 2019 +commons-collections--commons-collections--20040616=The Apache Software License, Version 2.0 +commons-primitives--commons-primitives--20041207.202534=The Apache Software License, Version 2.0 org.antlr--antlr-runtime--3.3=The Apache Software License, Version 2.0 ===================================== server-runner/src/license/THIRD-PARTY.properties ===================================== @@ -11,17 +11,16 @@ # - BSD licence # - Bouncy Castle Licence # - CDDL 1.1 -# - CDDL+GPL License # - CDDL/GPLv2+CE # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Common Development and Distribution License -# - Dual license consisting of the CDDL v1.1 and GPL v2 -# - Eclipse Distribution License (EDL), Version 1.0 -# - Eclipse Public License (EPL), Version 1.0 +# - EDL 1.0 +# - Eclipse Distribution License - v 1.0 +# - Eclipse Distribution License v. 1.0 # - Eclipse Public License 1.0 -# - Eclipse Public License, Version 1.0 +# - Eclipse Public License v1.0 # - GNU General Public License, Version 2 with the Classpath Exception -# - GNU Lesser General Public License, Version 2.1 +# - GNU Library General Public License v2.1 or later # - GPL2 w/ CPE # - General Public License (GPL) # - Indiana University Extreme! Lab Software License, version 1.1.1 @@ -43,6 +42,7 @@ # Please fill the missing licenses for dependencies : # # -#Mon Feb 04 14:00:38 CET 2019 -commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 +#Wed Apr 10 16:40:05 CEST 2019 +commons-collections--commons-collections--20040616=The Apache Software License, Version 2.0 +commons-primitives--commons-primitives--20041207.202534=The Apache Software License, Version 2.0 org.antlr--antlr-runtime--3.3=The Apache Software License, Version 2.0 ===================================== services-client/src/license/THIRD-PARTY.properties ===================================== @@ -6,14 +6,18 @@ # - Apache License, version 2.0 # - BSD 3-clause New License # - BSD License +# - CDDL 1.1 +# - CDDL+GPL License +# - CDDL/GPLv2+CE # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Common Development and Distribution License -# - Eclipse Distribution License (EDL), Version 1.0 -# - Eclipse Public License (EPL), Version 1.0 +# - Dual license consisting of the CDDL v1.1 and GPL v2 +# - Eclipse Distribution License v. 1.0 # - Eclipse Public License 1.0 -# - Eclipse Public License, Version 1.0 +# - Eclipse Public License v1.0 # - GNU General Public License, Version 2 with the Classpath Exception -# - GNU Lesser General Public License, Version 2.1 +# - GNU Library General Public License v2.1 or later +# - GPL2 w/ CPE # - General Public License (GPL) # - Indiana University Extreme! Lab Software License, version 1.1.1 # - Lesser General Public License (LGPL) @@ -30,5 +34,6 @@ # Please fill the missing licenses for dependencies : # # -#Mon Feb 04 13:59:43 CET 2019 -commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 +#Wed Apr 10 14:53:26 CEST 2019 +commons-collections--commons-collections--20040616=The Apache Software License, Version 2.0 +commons-primitives--commons-primitives--20041207.202534=The Apache Software License, Version 2.0 ===================================== services-local/src/license/THIRD-PARTY.properties ===================================== @@ -12,12 +12,11 @@ # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Common Development and Distribution License # - Dual license consisting of the CDDL v1.1 and GPL v2 -# - Eclipse Distribution License (EDL), Version 1.0 -# - Eclipse Public License (EPL), Version 1.0 +# - Eclipse Distribution License v. 1.0 # - Eclipse Public License 1.0 -# - Eclipse Public License, Version 1.0 +# - Eclipse Public License v1.0 # - GNU General Public License, Version 2 with the Classpath Exception -# - GNU Lesser General Public License, Version 2.1 +# - GNU Library General Public License v2.1 or later # - GPL2 w/ CPE # - General Public License (GPL) # - Indiana University Extreme! Lab Software License, version 1.1.1 @@ -36,5 +35,6 @@ # Please fill the missing licenses for dependencies : # # -#Mon Feb 04 13:56:50 CET 2019 -commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 +#Wed Apr 10 14:50:27 CEST 2019 +commons-collections--commons-collections--20040616=The Apache Software License, Version 2.0 +commons-primitives--commons-primitives--20041207.202534=The Apache Software License, Version 2.0 ===================================== services-validation/src/license/THIRD-PARTY.properties ===================================== @@ -6,14 +6,18 @@ # - Apache License, version 2.0 # - BSD 3-clause New License # - BSD License +# - CDDL 1.1 +# - CDDL+GPL License +# - CDDL/GPLv2+CE # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Common Development and Distribution License -# - Eclipse Distribution License (EDL), Version 1.0 -# - Eclipse Public License (EPL), Version 1.0 +# - Dual license consisting of the CDDL v1.1 and GPL v2 +# - Eclipse Distribution License v. 1.0 # - Eclipse Public License 1.0 -# - Eclipse Public License, Version 1.0 +# - Eclipse Public License v1.0 # - GNU General Public License, Version 2 with the Classpath Exception -# - GNU Lesser General Public License, Version 2.1 +# - GNU Library General Public License v2.1 or later +# - GPL2 w/ CPE # - General Public License (GPL) # - Indiana University Extreme! Lab Software License, version 1.1.1 # - Lesser General Public License (LGPL) @@ -30,5 +34,6 @@ # Please fill the missing licenses for dependencies : # # -#Mon Feb 04 13:56:01 CET 2019 -commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 +#Wed Apr 10 14:49:43 CEST 2019 +commons-collections--commons-collections--20040616=The Apache Software License, Version 2.0 +commons-primitives--commons-primitives--20041207.202534=The Apache Software License, Version 2.0 ===================================== services/src/license/THIRD-PARTY.properties ===================================== @@ -6,14 +6,18 @@ # - Apache License, version 2.0 # - BSD 3-clause New License # - BSD License +# - CDDL 1.1 +# - CDDL+GPL License +# - CDDL/GPLv2+CE # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Common Development and Distribution License -# - Eclipse Distribution License (EDL), Version 1.0 -# - Eclipse Public License (EPL), Version 1.0 +# - Dual license consisting of the CDDL v1.1 and GPL v2 +# - Eclipse Distribution License v. 1.0 # - Eclipse Public License 1.0 -# - Eclipse Public License, Version 1.0 +# - Eclipse Public License v1.0 # - GNU General Public License, Version 2 with the Classpath Exception -# - GNU Lesser General Public License, Version 2.1 +# - GNU Library General Public License v2.1 or later +# - GPL2 w/ CPE # - General Public License (GPL) # - Indiana University Extreme! Lab Software License, version 1.1.1 # - Lesser General Public License (LGPL) @@ -30,5 +34,6 @@ # Please fill the missing licenses for dependencies : # # -#Mon Feb 04 13:56:01 CET 2019 -commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 +#Wed Apr 10 14:49:38 CEST 2019 +commons-collections--commons-collections--20040616=The Apache Software License, Version 2.0 +commons-primitives--commons-primitives--20041207.202534=The Apache Software License, Version 2.0 ===================================== services/src/main/resources/observe-reports.properties ===================================== @@ -167,7 +167,7 @@ report.dcpUsage.request.3=2,0|row|\ 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' + 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 report.dcpUsage.request.4=3,0|row|\ ===================================== test/src/license/THIRD-PARTY.properties ===================================== @@ -0,0 +1,21 @@ +# Generated by org.codehaus.mojo.license.AddThirdPartyMojo +#------------------------------------------------------------------------------- +# Already used licenses in project : +# - Apache 2.0 +# - BSD License +# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +# - Eclipse Public License 1.0 +# - Indiana University Extreme! Lab Software License, version 1.1.1 +# - Lesser General Public License (LGPL) v 3.0 +# - Lesser General Public License (LPGL) +# - Lesser General Public License (LPGL) v 2.1 +# - MIT License +# - New BSD License +# - The Apache Software License, Version 2.0 +# - The MIT License +#------------------------------------------------------------------------------- +# Please fill the missing licenses for dependencies : +# +# +#Wed Apr 10 14:48:37 CEST 2019 +commons-collections--commons-collections--20040616=The Apache Software License, Version 2.0 ===================================== validation/src/license/THIRD-PARTY.properties ===================================== @@ -6,14 +6,18 @@ # - Apache License, version 2.0 # - BSD 3-clause New License # - BSD License +# - CDDL 1.1 +# - CDDL+GPL License +# - CDDL/GPLv2+CE # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Common Development and Distribution License -# - Eclipse Distribution License (EDL), Version 1.0 -# - Eclipse Public License (EPL), Version 1.0 +# - Dual license consisting of the CDDL v1.1 and GPL v2 +# - Eclipse Distribution License v. 1.0 # - Eclipse Public License 1.0 -# - Eclipse Public License, Version 1.0 +# - Eclipse Public License v1.0 # - GNU General Public License, Version 2 with the Classpath Exception -# - GNU Lesser General Public License, Version 2.1 +# - GNU Library General Public License v2.1 or later +# - GPL2 w/ CPE # - General Public License (GPL) # - Indiana University Extreme! Lab Software License, version 1.1.1 # - Lesser General Public License (LGPL) @@ -30,5 +34,6 @@ # Please fill the missing licenses for dependencies : # # -#Mon Feb 04 13:56:12 CET 2019 -commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 +#Wed Apr 10 14:49:51 CEST 2019 +commons-collections--commons-collections--20040616=The Apache Software License, Version 2.0 +commons-primitives--commons-primitives--20041207.202534=The Apache Software License, Version 2.0 View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/2eed594b04069551eda98f00f1… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/2eed594b04069551eda98f00f1… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] 2 commits: Bug requête tableau synthèse DCP - Closes #1244
by Tony CHEMIT April 11, 2019

April 11, 2019

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 73e6cd20 by tchemit at 2019-04-10T15:19:13Z Bug requête tableau synthèse DCP - Closes #1244 - - - - - da17f0c0 by tchemit at 2019-04-10T15:19:48Z update pom - - - - - 16 changed files: - client-configuration/src/license/THIRD-PARTY.properties - client-core/src/license/THIRD-PARTY.properties - client-runner/src/license/THIRD-PARTY.properties - dto/src/license/THIRD-PARTY.properties - + observe-i18n/src/license/THIRD-PARTY.properties - persistence/src/license/THIRD-PARTY.properties - pom.xml - server-configuration/src/license/THIRD-PARTY.properties - server-core/src/license/THIRD-PARTY.properties - server-runner/src/license/THIRD-PARTY.properties - services-client/src/license/THIRD-PARTY.properties - services-local/src/license/THIRD-PARTY.properties - services/src/license/THIRD-PARTY.properties - services/src/main/resources/observe-reports.properties - + test/src/license/THIRD-PARTY.properties - validation/src/license/THIRD-PARTY.properties Changes: ===================================== client-configuration/src/license/THIRD-PARTY.properties ===================================== @@ -14,9 +14,7 @@ # - Eclipse Distribution License v. 1.0 # - Eclipse Public License 1.0 # - Eclipse Public License v1.0 -# - Eclipse Public License, Version 1.0 # - GNU General Public License, Version 2 with the Classpath Exception -# - GNU Lesser General Public License, Version 2.1 # - GNU Library General Public License v2.1 or later # - GPL2 w/ CPE # - General Public License (GPL) @@ -35,5 +33,6 @@ # Please fill the missing licenses for dependencies : # # -#Tue Feb 05 15:34:55 CET 2019 -commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 +#Wed Apr 10 17:16:56 CEST 2019 +commons-collections--commons-collections--20040616=The Apache Software License, Version 2.0 +commons-primitives--commons-primitives--20041207.202534=The Apache Software License, Version 2.0 ===================================== client-core/src/license/THIRD-PARTY.properties ===================================== @@ -17,10 +17,8 @@ # - Eclipse Distribution License v. 1.0 # - Eclipse Public License 1.0 # - Eclipse Public License v1.0 -# - Eclipse Public License, Version 1.0 # - Eclipse Publish License, Version 1.0 # - GNU General Public License, Version 2 with the Classpath Exception -# - GNU Lesser General Public License, Version 2.1 # - GNU Library General Public License v2.1 or later # - GPL2 w/ CPE # - General Public License (GPL) @@ -48,6 +46,7 @@ # Please fill the missing licenses for dependencies : # # -#Tue Feb 05 15:35:14 CET 2019 -commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 +#Wed Apr 10 17:17:14 CEST 2019 +commons-collections--commons-collections--20040616=The Apache Software License, Version 2.0 +commons-primitives--commons-primitives--20041207.202534=The Apache Software License, Version 2.0 javax.media--jai_core--1.1.3=JDL (Java Distribution License) ===================================== client-runner/src/license/THIRD-PARTY.properties ===================================== @@ -16,11 +16,8 @@ # - Eclipse Distribution License v. 1.0 # - Eclipse Public License 1.0 # - Eclipse Public License v1.0 -# - Eclipse Public License, Version 1.0 # - Eclipse Publish License, Version 1.0 # - GNU General Public License, Version 2 with the Classpath Exception -# - GNU Lesser General Public License -# - GNU Lesser General Public License, Version 2.1 # - GNU Library General Public License v2.1 or later # - GPL2 w/ CPE # - General Public License (GPL) @@ -47,6 +44,7 @@ # Please fill the missing licenses for dependencies : # # -#Tue Feb 05 15:35:42 CET 2019 -commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 +#Wed Apr 10 17:17:43 CEST 2019 +commons-collections--commons-collections--20040616=The Apache Software License, Version 2.0 +commons-primitives--commons-primitives--20041207.202534=The Apache Software License, Version 2.0 javax.media--jai_core--1.1.3=JDL (Java Distribution License) ===================================== dto/src/license/THIRD-PARTY.properties ===================================== @@ -1,12 +1,13 @@ # Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : +# - Apache 2.0 # - Apache License 2.0 # - BSD License # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Eclipse Public License 1.0 # - General Public License (GPL) -# - Indiana University Extreme! Lab Software License, vesion 1.1.1 +# - Indiana University Extreme! Lab Software License, version 1.1.1 # - Lesser General Public License (LGPL) # - Lesser General Public License (LGPL) v 3.0 # - Lesser General Public License (LPGL) @@ -15,9 +16,11 @@ # - MPL 1.1 # - New BSD License # - The Apache Software License, Version 2.0 +# - The MIT License #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Mon Sep 07 10:22:53 CEST 2015 -commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 +#Wed Apr 10 17:12:33 CEST 2019 +commons-collections--commons-collections--20040616=The Apache Software License, Version 2.0 +commons-primitives--commons-primitives--20041207.202534=The Apache Software License, Version 2.0 ===================================== observe-i18n/src/license/THIRD-PARTY.properties ===================================== @@ -0,0 +1,19 @@ +# Generated by org.codehaus.mojo.license.AddThirdPartyMojo +#------------------------------------------------------------------------------- +# Already used licenses in project : +# - Apache 2.0 +# - BSD License +# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +# - Indiana University Extreme! Lab Software License, version 1.1.1 +# - Lesser General Public License (LGPL) v 3.0 +# - Lesser General Public License (LPGL) +# - Lesser General Public License (LPGL) v 2.1 +# - MIT License +# - The Apache Software License, Version 2.0 +# - The MIT License +#------------------------------------------------------------------------------- +# Please fill the missing licenses for dependencies : +# +# +#Wed Apr 10 15:52:17 CEST 2019 +commons-collections--commons-collections--20040616=The Apache Software License, Version 2.0 ===================================== persistence/src/license/THIRD-PARTY.properties ===================================== @@ -14,9 +14,7 @@ # - Eclipse Distribution License v. 1.0 # - Eclipse Public License 1.0 # - Eclipse Public License v1.0 -# - Eclipse Public License, Version 1.0 # - GNU General Public License, Version 2 with the Classpath Exception -# - GNU Lesser General Public License, Version 2.1 # - GNU Library General Public License v2.1 or later # - GNU Library or Lesser General Public License # - GPL2 w/ CPE @@ -37,5 +35,6 @@ # Please fill the missing licenses for dependencies : # # -#Tue Feb 05 15:31:54 CET 2019 -commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 +#Wed Apr 10 17:13:35 CEST 2019 +commons-collections--commons-collections--20040616=The Apache Software License, Version 2.0 +commons-primitives--commons-primitives--20041207.202534=The Apache Software License, Version 2.0 ===================================== pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2019.8.12</version> + <version>2019.8.13</version> </parent> <groupId>fr.ird.observe</groupId> @@ -159,7 +159,6 @@  <lib.version.nuiton.validation>3.1</lib.version.nuiton.validation>  - <xworkVersion>2.3.35</xworkVersion>  <lib.version.h2>1.4.196</lib.version.h2> @@ -235,7 +234,7 @@ <dependency> <groupId>org.apache.struts.xwork</groupId> <artifactId>xwork-core</artifactId> - <version>${xworkVersion}</version> + <version>${lib.xwork.version}</version> <exclusions> <exclusion> <groupId>javassist</groupId> ===================================== server-configuration/src/license/THIRD-PARTY.properties ===================================== @@ -21,5 +21,6 @@ # Please fill the missing licenses for dependencies : # # -#Fri Oct 19 16:06:54 CEST 2018 -commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 +#Wed Apr 10 17:16:51 CEST 2019 +commons-collections--commons-collections--20040616=The Apache Software License, Version 2.0 +commons-primitives--commons-primitives--20041207.202534=The Apache Software License, Version 2.0 ===================================== server-core/src/license/THIRD-PARTY.properties ===================================== @@ -19,9 +19,7 @@ # - Eclipse Distribution License v. 1.0 # - Eclipse Public License 1.0 # - Eclipse Public License v1.0 -# - Eclipse Public License, Version 1.0 # - GNU General Public License, Version 2 with the Classpath Exception -# - GNU Lesser General Public License, Version 2.1 # - GNU Library General Public License v2.1 or later # - GPL2 w/ CPE # - General Public License (GPL) @@ -44,6 +42,7 @@ # Please fill the missing licenses for dependencies : # # -#Tue Feb 05 15:34:51 CET 2019 -commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 +#Wed Apr 10 17:16:54 CEST 2019 +commons-collections--commons-collections--20040616=The Apache Software License, Version 2.0 +commons-primitives--commons-primitives--20041207.202534=The Apache Software License, Version 2.0 org.antlr--antlr-runtime--3.3=The Apache Software License, Version 2.0 ===================================== server-runner/src/license/THIRD-PARTY.properties ===================================== @@ -17,9 +17,7 @@ # - Eclipse Distribution License - v 1.0 # - Eclipse Distribution License v. 1.0 # - Eclipse Public License v1.0 -# - Eclipse Public License, Version 1.0 # - GNU General Public License, Version 2 with the Classpath Exception -# - GNU Lesser General Public License, Version 2.1 # - GNU Library General Public License v2.1 or later # - GPL2 w/ CPE # - General Public License (GPL) @@ -42,6 +40,7 @@ # Please fill the missing licenses for dependencies : # # -#Tue Feb 05 15:35:38 CET 2019 -commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 +#Wed Apr 10 17:17:40 CEST 2019 +commons-collections--commons-collections--20040616=The Apache Software License, Version 2.0 +commons-primitives--commons-primitives--20041207.202534=The Apache Software License, Version 2.0 org.antlr--antlr-runtime--3.3=The Apache Software License, Version 2.0 ===================================== services-client/src/license/THIRD-PARTY.properties ===================================== @@ -14,9 +14,7 @@ # - Eclipse Distribution License v. 1.0 # - Eclipse Public License 1.0 # - Eclipse Public License v1.0 -# - Eclipse Public License, Version 1.0 # - GNU General Public License, Version 2 with the Classpath Exception -# - GNU Lesser General Public License, Version 2.1 # - GNU Library General Public License v2.1 or later # - GPL2 w/ CPE # - General Public License (GPL) @@ -35,5 +33,6 @@ # Please fill the missing licenses for dependencies : # # -#Tue Feb 05 15:34:44 CET 2019 -commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 +#Wed Apr 10 17:16:48 CEST 2019 +commons-collections--commons-collections--20040616=The Apache Software License, Version 2.0 +commons-primitives--commons-primitives--20041207.202534=The Apache Software License, Version 2.0 ===================================== services-local/src/license/THIRD-PARTY.properties ===================================== @@ -14,9 +14,7 @@ # - Eclipse Distribution License v. 1.0 # - Eclipse Public License 1.0 # - Eclipse Public License v1.0 -# - Eclipse Public License, Version 1.0 # - GNU General Public License, Version 2 with the Classpath Exception -# - GNU Lesser General Public License, Version 2.1 # - GNU Library General Public License v2.1 or later # - GPL2 w/ CPE # - General Public License (GPL) @@ -36,5 +34,6 @@ # Please fill the missing licenses for dependencies : # # -#Tue Feb 05 15:32:12 CET 2019 -commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 +#Wed Apr 10 17:13:47 CEST 2019 +commons-collections--commons-collections--20040616=The Apache Software License, Version 2.0 +commons-primitives--commons-primitives--20041207.202534=The Apache Software License, Version 2.0 ===================================== services/src/license/THIRD-PARTY.properties ===================================== @@ -14,9 +14,7 @@ # - Eclipse Distribution License v. 1.0 # - Eclipse Public License 1.0 # - Eclipse Public License v1.0 -# - Eclipse Public License, Version 1.0 # - GNU General Public License, Version 2 with the Classpath Exception -# - GNU Lesser General Public License, Version 2.1 # - GNU Library General Public License v2.1 or later # - GPL2 w/ CPE # - General Public License (GPL) @@ -35,5 +33,6 @@ # Please fill the missing licenses for dependencies : # # -#Tue Feb 05 15:32:08 CET 2019 -commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 +#Wed Apr 10 17:13:44 CEST 2019 +commons-collections--commons-collections--20040616=The Apache Software License, Version 2.0 +commons-primitives--commons-primitives--20041207.202534=The Apache Software License, Version 2.0 ===================================== services/src/main/resources/observe-reports.properties ===================================== @@ -167,7 +167,7 @@ report.dcpUsage.request.3=2,0|row|\ 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#3' + 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 report.dcpUsage.request.4=3,0|row|\ ===================================== test/src/license/THIRD-PARTY.properties ===================================== @@ -0,0 +1,21 @@ +# Generated by org.codehaus.mojo.license.AddThirdPartyMojo +#------------------------------------------------------------------------------- +# Already used licenses in project : +# - Apache 2.0 +# - BSD License +# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +# - Eclipse Public License 1.0 +# - Indiana University Extreme! Lab Software License, version 1.1.1 +# - Lesser General Public License (LGPL) v 3.0 +# - Lesser General Public License (LPGL) +# - Lesser General Public License (LPGL) v 2.1 +# - MIT License +# - New BSD License +# - The Apache Software License, Version 2.0 +# - The MIT License +#------------------------------------------------------------------------------- +# Please fill the missing licenses for dependencies : +# +# +#Wed Apr 10 15:47:11 CEST 2019 +commons-collections--commons-collections--20040616=The Apache Software License, Version 2.0 ===================================== validation/src/license/THIRD-PARTY.properties ===================================== @@ -21,5 +21,6 @@ # Please fill the missing licenses for dependencies : # # -#Fri Oct 19 15:55:38 CEST 2018 -commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 +#Wed Apr 10 17:13:22 CEST 2019 +commons-collections--commons-collections--20040616=The Apache Software License, Version 2.0 +commons-primitives--commons-primitives--20041207.202534=The Apache Software License, Version 2.0 View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/f10649bb1d1d621003c877c1cb… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/f10649bb1d1d621003c877c1cb… You're receiving this email because of your account on gitlab.com.

1 0