branch develop updated (2a8b5c2 -> b01220f)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See http://git.codelutin.com/tutti.git from 2a8b5c2 [jgitflow-maven-plugin]Updating develop poms back to pre merge state new ce22aff Specifications version 0.6 new b01220f Add comments to queries-failsafe.hbm.xml The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit b01220f436a639e68b689cc653946f80a1e859da Author: Léo Kaufmann <kaufmann@codelutin.com> Date: Fri Oct 2 17:11:41 2015 +0200 Add comments to queries-failsafe.hbm.xml commit ce22aff160227ae9afa4d7aa50bffe164098a789 Author: Léo Kaufmann <kaufmann@codelutin.com> Date: Fri Oct 2 17:06:58 2015 +0200 Specifications version 0.6 Summary of changes: .../AllegroCampagne-Specifications.odt | Bin 841456 -> 982028 bytes .../AllegroCampagne-Specifications.pdf | Bin 1494390 -> 1776041 bytes .../src/main/resources/queries-failsafe.hbm.xml | 27 ++++++++++++++++++--- .../resources/i18n/tutti-ui-swing_fr_FR.properties | 2 +- 4 files changed, 25 insertions(+), 4 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit ce22aff160227ae9afa4d7aa50bffe164098a789 Author: Léo Kaufmann <kaufmann@codelutin.com> Date: Fri Oct 2 17:06:58 2015 +0200 Specifications version 0.6 --- .../AllegroCampagne-Specifications.odt | Bin 841456 -> 982028 bytes .../AllegroCampagne-Specifications.pdf | Bin 1494390 -> 1776041 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/src/conception/specifications/AllegroCampagne-Specifications.odt b/src/conception/specifications/AllegroCampagne-Specifications.odt index 7e8e0cb..150d06f 100644 Binary files a/src/conception/specifications/AllegroCampagne-Specifications.odt and b/src/conception/specifications/AllegroCampagne-Specifications.odt differ diff --git a/src/conception/specifications/AllegroCampagne-Specifications.pdf b/src/conception/specifications/AllegroCampagne-Specifications.pdf index 001af79..9ee27f4 100644 Binary files a/src/conception/specifications/AllegroCampagne-Specifications.pdf and b/src/conception/specifications/AllegroCampagne-Specifications.pdf differ -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit b01220f436a639e68b689cc653946f80a1e859da Author: Léo Kaufmann <kaufmann@codelutin.com> Date: Fri Oct 2 17:11:41 2015 +0200 Add comments to queries-failsafe.hbm.xml --- .../src/main/resources/queries-failsafe.hbm.xml | 27 +++++++++++++++++++--- .../resources/i18n/tutti-ui-swing_fr_FR.properties | 2 +- 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/tutti-persistence/src/main/resources/queries-failsafe.hbm.xml b/tutti-persistence/src/main/resources/queries-failsafe.hbm.xml index 3c862d6..86c9e11 100644 --- a/tutti-persistence/src/main/resources/queries-failsafe.hbm.xml +++ b/tutti-persistence/src/main/resources/queries-failsafe.hbm.xml @@ -167,6 +167,7 @@ <query-param name="cruiseId" type="java.lang.Integer"/> </query> + <!-- [DAT-06] Get all gears for a given cruise --> <query cacheable="true" name="allCruiseGears"> <![CDATA[ SELECT @@ -194,6 +195,7 @@ <query-param name="pmfmIdTrawlNet" type="java.lang.Integer"/> </query> + <!-- [DAT-07] Update vessel for one cruise operations --> <query cacheable="true" name="updateOperationsVessel"> <![CDATA[ UPDATE FishingOperationImpl o @@ -208,6 +210,7 @@ <query-param name="vesselId" type="java.lang.String"/> </query> + <!-- [DAT-08] Get the gear caracteristics of a cruise --> <query cacheable="true" name="gearCaracteristics"> <![CDATA[ SELECT @@ -228,6 +231,7 @@ <query-param name="rankOrder" type="java.lang.Short"/> </query> + <!-- [DAT-09] Get all the secondary vessels of a cruise --> <query cacheable="true" name="allCruiseSecondaryVessels"> <![CDATA[ SELECT @@ -244,7 +248,8 @@ ]]> <query-param name="cruiseId" type="java.lang.Integer"/> </query> - + + <!-- [DAT-10] Get all the fishing operations ID of a cruise --> <query cacheable="true" name="allFishingOperationIds"> <![CDATA[ SELECT @@ -259,6 +264,7 @@ <query-param name="cruiseId" type="java.lang.Integer"/> </query> + <!-- [DAT-11] Get all the fishing operations of a cruise --> <query cacheable="true" name="allFishingOperations"> <![CDATA[ SELECT @@ -283,6 +289,7 @@ <query-param name="pmfmIdMultirigAggregation" type="java.lang.Integer"/> </query> + <!-- [DAT-12] Get all the fishing operations of a cruise using given gears --> <query cacheable="true" name="allFishingOperationsWithGear"> <![CDATA[ SELECT @@ -300,6 +307,7 @@ <query-param name="gearIds" type="java.lang.Integer"/> </query> + <!-- [DAT-13] Update a operation gear rank of a cruise --> <query cacheable="true" name="updateOperationsGear"> <![CDATA[ UPDATE GearUseFeaturesImpl guf @@ -323,6 +331,7 @@ <query-param name="newRankOrder" type="java.lang.Short"/> </query> + <!-- [DAT-14] Get a fishing operation --> <query cacheable="true" name="fishingOperation"> <![CDATA[ SELECT @@ -358,6 +367,7 @@ <query-param name="locationLevelIdLocalite" type="java.lang.Integer"/> </query> + <!-- [DAT-15] Get all the secondary vessels of a fishing operation --> <query cacheable="true" name="fishingOperationSecondaryVessel"> <![CDATA[ SELECT @@ -372,6 +382,7 @@ <query-param name="fishingOperationId" type="java.lang.Integer"/> </query> + <!-- [DAT-16] Get the rank of a fishing operation in a campaign --> <query cacheable="true" name="fishingOperationRankOrder"> <![CDATA[ SELECT @@ -387,6 +398,7 @@ <query-param name="fishingOperationId" type="java.lang.Integer"/> </query> + <!-- [DAT-17] Get the vessel use measurements of a fishing operation --> <query cacheable="true" name="fishingOperationVesselUseFeatures"> <![CDATA[ SELECT @@ -402,7 +414,8 @@ ]]> <query-param name="fishingOperationId" type="java.lang.Integer"/> </query> - + + <!-- [DAT-18] Get the gear use measurements of a fishing operation --> <query cacheable="true" name="fishingOperationGearUseFeatures"> <![CDATA[ SELECT @@ -419,7 +432,7 @@ <query-param name="fishingOperationId" type="java.lang.Integer"/> </query> - <!-- Get all vesselPersonFeatures for a given fishing operation --> + <!-- [DAT-19] Get all vesselPersonFeatures for a given fishing operation --> <query cacheable="true" name="fishingOperationVesselPersonFeatures"> <![CDATA[ SELECT @@ -436,6 +449,7 @@ <query-param name="fishingOperationId" type="java.lang.Integer"/> </query> + <!-- [DAT-20] Update the catch batch of a fishing operation --> <query cacheable="true" name="updateFishingOperationCatchBatch"> <![CDATA[ UPDATE FishingOperationImpl o @@ -447,6 +461,7 @@ <query-param name="catchBatchId" type="java.lang.Integer"/> </query> + <!-- [DAT-21] Update quantification measurements --> <query cacheable="true" name="updateQuantificationMeasurementsForBatchNodes"> <![CDATA[ UPDATE QuantificationMeasurementImpl qm @@ -457,6 +472,7 @@ </query> + <!-- [DAT-22] Get all fishing operations samples without batch --> <query cacheable="true" name="allFishingOperationSamplesWithoutBatch"> <![CDATA[ SELECT @@ -475,6 +491,7 @@ <query-param name="fishingOperationId" type="java.lang.Integer"/> </query> + <!-- [DAT-23] Get all fishing operations samples with a giben batch --> <query cacheable="true" name="allFishingOperationSamplesWithBatch"> <![CDATA[ SELECT @@ -494,6 +511,7 @@ <query-param name="batchId" type="java.lang.Integer"/> </query> + <!-- [DAT-24] Get sample measurements --> <query cacheable="true" name="sampleMeasurements"> <![CDATA[ SELECT @@ -540,6 +558,7 @@ <query-param name="pmfmIdSortingType" type="java.lang.Integer"/> </query--> + <!-- [DAT-25] Get batch frequencies --> <query cacheable="true" name="allSpeciesBatchFrequency"> <![CDATA[ SELECT @@ -567,6 +586,7 @@ <query-param name="parentBatchId" type="java.lang.Integer"/> </query> + <!-- [DAT-26] Get all attachment files --> <query cacheable="true" name="allAttachment"> <![CDATA[ SELECT @@ -587,6 +607,7 @@ <query-param name="objectTypeCode" type="java.lang.Integer"/> </query> + <!-- [DAT-27] Get a attachment file --> <query cacheable="true" name="attachment"> <![CDATA[ SELECT diff --git a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties index 66d0922..301f339 100644 --- a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties +++ b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties @@ -1518,7 +1518,7 @@ tutti.genericformat.overrideData.conflict.title=Confirmer l'écrasement de donn tutti.genericformat.protocol.action.add=Ajouter tutti.genericformat.protocol.action.cancel=Annuler tutti.genericformat.protocol.action.override=Remplacer -tutti.genericformat.protocolName.conflict.help=Que voulez-vous faire ?<ul><li><strong>Annuler</strong> pour annuler l'import</li><li><strong>Remplacer</strong> pour supprimer le protocol et le remplacer par le protocole à importer</li><li><strong>Ajouter</strong> pour importer le protocole en le renommant en <i>%s</i></li></ul> +tutti.genericformat.protocolName.conflict.help=Que voulez-vous faire ?<ul><li><strong>Annuler</strong> pour annuler l'import</li><li><strong>Remplacer</strong> pour supprimer le protocole et le remplacer par le protocole à importer</li><li><strong>Ajouter</strong> pour importer le protocole en le renommant en <i>%s</i></li></ul> tutti.genericformat.protocolName.conflict.message=Le protocole à importer existe déjà avec le même nom (<i>%s</i>) tutti.genericformat.protocolName.conflict.title=Conflit sur le nom du protocole à importer tutti.help.mkDir.error=Erreur à la création du dossier d'aide -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm