This is an automated email from the git hooks/post-receive script. New commit to branch feature/6688 in repository tutti. See http://git.codelutin.com/tutti.git commit 63d7e0852e5fc1dd58808af623dde1a904b36af3 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Feb 25 09:27:40 2015 +0100 update TODO in doc --- .../filtered-resources/tutti-help-fr.properties | 96 ++++++++++------------ .../fr/{genericExport.html => genericFormat.html} | 20 ++++- tutti-ui-swing/src/main/help/fr/index.html | 2 +- .../main/help/fr/manageTemporaryReferential.html | 2 + tutti-ui-swing/src/main/help/fr/menu.html | 2 + tutti-ui-swing/src/main/help/fr/navbar.js | 2 +- 6 files changed, 69 insertions(+), 55 deletions(-) diff --git a/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties b/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties index 69e5e3b..7a68687 100644 --- a/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties +++ b/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties @@ -1,29 +1,5 @@ -### -# #%L -# Tutti :: UI -# $Id:$ -# $HeadURL:$ -# %% -# Copyright (C) 2012 - 2015 Ifremer -# %% -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public -# License along with this program. If not, see -# <http://www.gnu.org/licenses/gpl-3.0.html>. -# #L% -### #Generated by org.nuiton.jaxx.plugin.GenerateHelpIdsMojo -#Mon Feb 16 09:45:58 CET 2015 -\ "tutti.editProtocol.action.addCaracteristicMapping.help"\ = +#Wed Feb 25 08:38:59 CET 2015 tutti.config.help=config.html tutti.createAccidentalBatch.action.cancel.help=editFishingOperation.html\#captureCapturesAccidentellesActions tutti.createAccidentalBatch.action.saveAndClose.help=editFishingOperation.html\#captureCapturesAccidentellesActions @@ -145,10 +121,8 @@ tutti.editCatchBatch.action.cleanWeights.help=editFishingOperation.html\#capture tutti.editCatchBatch.action.computeWeights.help=editFishingOperation.html\#captureResumeActions tutti.editCatchBatch.action.exportFishingOperationReport.help=editFishingOperation.html\#captureResumeActions tutti.editCatchBatch.action.exportFishingOperationReportForSumatra.help=editFishingOperation.html\#captureResumeActions -tutti.editCatchBatch.action.exportFishingOperationReportForSumatra2.help=editFishingOperation.html\#captureResumeActions -tutti.editCatchBatch.action.exportFishingOperationReportForSumatraV2.help= -tutti.editCatchBatch.action.exportMultiPost.help= -tutti.editCatchBatch.action.importMultiPost.help= +tutti.editCatchBatch.action.exportMultiPost.help=editFishingOperation.html\#captureResumeActions +tutti.editCatchBatch.action.importMultiPost.help=editFishingOperation.html\#captureResumeActions tutti.editCatchBatch.action.saveCatchBatch.help=editFishingOperation.html\#captureResumeActions tutti.editCatchBatch.field.benthosTotalSampleSortedWeight.help=editFishingOperation.html\#captureResumeFields tutti.editCatchBatch.field.benthosTotalSortedWeight.help=editFishingOperation.html\#captureResumeFields @@ -249,7 +223,7 @@ tutti.editProgram.field.name.help=editProgram.html\#fields tutti.editProgram.field.zone.help=editProgram.html\#fields tutti.editProgram.help=editProgram.html tutti.editProtocol.action.addBenthosProtocol.help=editProtocol.html\#actionsBenthos -tutti.editProtocol.action.addCaracteristicMapping.help= +tutti.editProtocol.action.addCaracteristicMapping.help=editProtocol.html\#actions tutti.editProtocol.action.addSpeciesProtocol.help=editProtocol.html\#actionsSpecies tutti.editProtocol.action.closeEditProtocol.help=editProtocol.html\#actions tutti.editProtocol.action.exportProtocolAllCaracteristic.help=editProtocol.html\#actionsCaracteristics @@ -334,6 +308,23 @@ tutti.fishingOperations.action.deleteFishingOperation.help=editFishingOperation. tutti.fishingOperations.action.newFishingOperation.help=editFishingOperation.html\#traitActions tutti.fishingOperations.field.fishingOperation.help=editFishingOperation.html\#fields tutti.fishingOperations.help=editFishingOperation.html +tutti.genericFormatImport.action.closeGenericFormatImport.help=genericFormat.html#generic_format_import_actions +tutti.genericFormatImport.action.generateReport.help=genericFormat.html#generic_format_import_actions +tutti.genericFormatImport.action.import.help=genericFormat.html#generic_format_import_actions +tutti.genericFormatImport.action.openImportReport.help=genericFormat.html#generic_format_import_actions +tutti.genericFormatImport.action.openValidateReport.help=genericFormat.html#generic_format_import_actions +tutti.genericFormatImport.action.saveValidateReport.help=genericFormat.html#generic_format_import_actions +tutti.genericFormatImport.action.saveImportReport.help=genericFormat.html#generic_format_import_actions +tutti.genericFormatImport.action.showReport.help=genericFormat.html#generic_format_import_actions +tutti.genericFormatImport.action.validate.help=genericFormat.html#generic_format_import_actions +tutti.genericFormatImport.field.checkWeights.help=genericFormat.html#generic_format_import_fields +tutti.genericFormatImport.field.cleanWeights.help=genericFormat.html#generic_format_import_fields +tutti.genericFormatImport.field.importResult.help=genericFormat.html#generic_format_import_fields +tutti.genericFormatImport.field.overrideData.help=genericFormat.html#generic_format_import_fields +tutti.genericFormatImport.field.program.help=genericFormat.html#generic_format_import_fields +tutti.genericFormatImport.field.validateResult.help=genericFormat.html#generic_format_import_fields +tutti.genericFormatImport.field.validationResult.help=genericFormat.html#generic_format_import_fields +tutti.genericFormatImport.help=genericFormat.html#generic_format_import tutti.index.help=index.html tutti.main.action.changeLocale.help=menu.html\#menu_aide tutti.main.action.changeLocaleFR.help=menu.html\#menu_aide @@ -351,10 +342,11 @@ tutti.main.menu.action.editCatches.help=menu.html\#menu_action tutti.main.menu.action.editCruise.help=menu.html\#menu_action tutti.main.menu.action.editProgram.help=menu.html\#menu_action tutti.main.menu.action.editProtocol.help=menu.html\#menu_action -tutti.main.menu.action.editSampleCategoryModel.help= +tutti.main.menu.action.editSampleCategoryModel.help=menu.html\#menu_administration tutti.main.menu.action.exit.help=menu.html\#menu_fichier tutti.main.menu.action.generateCruiseReport.help=menu.html\#menu_action tutti.main.menu.action.generateSelectedCruiseReport.help=menu.html\#menu_action +tutti.main.menu.action.genericFormatImport.help=menu.html\#menu_action tutti.main.menu.action.importTemporaryReferential.help=menu.html\#menu_administration tutti.main.menu.action.manageDb.help=menu.html\#menu_fichier tutti.main.menu.action.selectCruise.help=menu.html\#menu_action @@ -365,10 +357,10 @@ tutti.main.menu.action.updateReport.help=menu.html\#menu_fichier tutti.main.menu.action.validateCatches.help=menu.html\#menu_action tutti.main.status.ichtyometer.help=menu.html\#status tutti.main.status.validation.help=menu.html\#status -tutti.manageTemporaryReferential.action.exportExistingTemporaryGear.help= -tutti.manageTemporaryReferential.action.exportExistingTemporaryPerson.help= -tutti.manageTemporaryReferential.action.exportExistingTemporarySpecies.help= -tutti.manageTemporaryReferential.action.exportExistingTemporaryVessel.help= +tutti.manageTemporaryReferential.action.exportExistingTemporaryGear.help=menu.html\#menu_administration_referentiel +tutti.manageTemporaryReferential.action.exportExistingTemporaryPerson.help=menu.html\#menu_administration_referentiel +tutti.manageTemporaryReferential.action.exportExistingTemporarySpecies.help=menu.html\#menu_administration_referentiel +tutti.manageTemporaryReferential.action.exportExistingTemporaryVessel.help=menu.html\#menu_administration_referentiel tutti.manageTemporaryReferential.action.exportTemporaryGearExample.help=menu.html\#menu_administration_referentiel tutti.manageTemporaryReferential.action.exportTemporaryPersonExample.help=menu.html\#menu_administration_referentiel tutti.manageTemporaryReferential.action.exportTemporarySpeciesExample.help=menu.html\#menu_administration_referentiel @@ -377,24 +369,24 @@ tutti.manageTemporaryReferential.action.importTemporaryGear.help=menu.html\#menu tutti.manageTemporaryReferential.action.importTemporaryPerson.help=menu.html\#menu_administration_referentiel tutti.manageTemporaryReferential.action.importTemporarySpecies.help=menu.html\#menu_administration_referentiel tutti.manageTemporaryReferential.action.importTemporaryVessel.help=menu.html\#menu_administration_referentiel -tutti.manageTemporaryReferential.action.replaceTemporaryGear.help= -tutti.manageTemporaryReferential.action.replaceTemporaryPerson.help= -tutti.manageTemporaryReferential.action.replaceTemporarySpecies.help= -tutti.manageTemporaryReferential.action.replaceTemporaryVessel.help= +tutti.manageTemporaryReferential.action.replaceTemporaryGear.help=menu.html\#menu_administration_referentiel +tutti.manageTemporaryReferential.action.replaceTemporaryPerson.help=menu.html\#menu_administration_referentiel +tutti.manageTemporaryReferential.action.replaceTemporarySpecies.help=menu.html\#menu_administration_referentiel +tutti.manageTemporaryReferential.action.replaceTemporaryVessel.help=menu.html\#menu_administration_referentiel tutti.manageTemporaryReferential.help=menu.html\#menu_administration_referentiel -tutti.replaceTemporaryGear.action.replace.help= -tutti.replaceTemporaryGear.help= -tutti.replaceTemporaryPerson.action.replace.help= -tutti.replaceTemporaryPerson.help= -tutti.replaceTemporaryReferential.action.cancel.help= -tutti.replaceTemporaryReferential.field.sourceList.help= -tutti.replaceTemporaryReferential.field.targetList.help= -tutti.replaceTemporarySpecies.action.replace.help= -tutti.replaceTemporarySpecies.help= -tutti.replaceTemporaryVessel.action.cancel.help= -tutti.replaceTemporaryVessel.action.replace.help= -tutti.replaceTemporaryVessel.field.sourceList.help= -tutti.replaceTemporaryVessel.help= +tutti.replaceTemporaryGear.action.replace.help=menu.html\#menu_administration_referentiel +tutti.replaceTemporaryGear.help=menu.html\#menu_administration_referentiel +tutti.replaceTemporaryPerson.action.replace.help=menu.html\#menu_administration_referentiel +tutti.replaceTemporaryPerson.help=menu.html\#menu_administration_referentiel +tutti.replaceTemporaryReferential.action.cancel.help=menu.html\#menu_administration_referentiel +tutti.replaceTemporaryReferential.field.sourceList.help=menu.html\#menu_administration_referentiel +tutti.replaceTemporaryReferential.field.targetList.help=menu.html\#menu_administration_referentiel +tutti.replaceTemporarySpecies.action.replace.help=menu.html\#menu_administration_referentiel +tutti.replaceTemporarySpecies.help=menu.html\#menu_administration_referentiel +tutti.replaceTemporaryVessel.action.cancel.help=menu.html\#menu_administration_referentiel +tutti.replaceTemporaryVessel.action.replace.help=menu.html\#menu_administration_referentiel +tutti.replaceTemporaryVessel.field.sourceList.help=menu.html\#menu_administration_referentiel +tutti.replaceTemporaryVessel.help=menu.html\#menu_administration_referentiel tutti.report.action.cancel.help=report.html\#actions tutti.report.action.chooseOutputFile.help=report.html\#actions tutti.report.action.generate.help=report.html\#actions diff --git a/tutti-ui-swing/src/main/help/fr/genericExport.html b/tutti-ui-swing/src/main/help/fr/genericFormat.html similarity index 98% rename from tutti-ui-swing/src/main/help/fr/genericExport.html rename to tutti-ui-swing/src/main/help/fr/genericFormat.html index 1f9d435..a78daa2 100644 --- a/tutti-ui-swing/src/main/help/fr/genericExport.html +++ b/tutti-ui-swing/src/main/help/fr/genericFormat.html @@ -21,7 +21,7 @@ --> <meta charset="utf-8"> - <title>Allegro Campagne - Export générique</title> + <title>Allegro Campagne - Import / Export générique</title> <link href="../css/bootstrap.min.css" rel="stylesheet"> <link href="../css/style.css" rel="stylesheet"> <script type="text/javascript" src="../js/jquery-2.0.3.min.js"></script> @@ -32,6 +32,8 @@ <div class="container"> + <strong>TODO Update doc with generic import specs</strong> + <div class="page-header"> <h1>Export générique</h1> </div> @@ -60,6 +62,7 @@ exportCruise-100000 ├── parameter.csv ├── species.csv └── survey.csv</pre> + <p>Vous pouvez télécharger <a href="../export/exportCruise-example.zip" target="export">un exemple d'export générique.</a></p> <h2>Fichier accidentalCatch.csv</h2> @@ -473,6 +476,21 @@ Annee;Serie;Serie_Partielle;Navire;Pays;Zone_Etude;Campagne;Id_Sismer;Date_Deb_C <tr><td>Commentaire</td><td>Campagne</td><td>Commentaire</td><td></td></tr> </tbody> </table> + + <h1>Import générique<a name="generic_format_import"></a></h1> + + <h2>Description des champs<a name="generic_format_import_fields"></a></h2> + <dl> + <dt>Champs</dt> + <dd>Description TODO + </dd> + </dl> + <h2>Description des actions<a name="generic_format_import_actions"></a></h2> + <dl> + <dt>Action</dt> + <dd>Description TODO + </dd> + </dl> </div> </body> </html> diff --git a/tutti-ui-swing/src/main/help/fr/index.html b/tutti-ui-swing/src/main/help/fr/index.html index eb7e1a3..218f0fb 100644 --- a/tutti-ui-swing/src/main/help/fr/index.html +++ b/tutti-ui-swing/src/main/help/fr/index.html @@ -148,7 +148,7 @@ <li><a href="config.html">Configuration</a></li> <li><a href="manageTemporaryReferential.html">Gestionnaire de référentiels temporaires</a></li> <li><a href="report.html">Générer des rapports</a></li> - <li><a href="genericExport.html">Export générique</a></li> + <li><a href="genericFormat.html">Export générique</a></li> <li><a href="dbMapping.html">Mapping des écrans / base de données</a></li> <li><a href="validation.html">Règles de validation</a></li> </ul> diff --git a/tutti-ui-swing/src/main/help/fr/manageTemporaryReferential.html b/tutti-ui-swing/src/main/help/fr/manageTemporaryReferential.html index 169d50e..e5fe73d 100644 --- a/tutti-ui-swing/src/main/help/fr/manageTemporaryReferential.html +++ b/tutti-ui-swing/src/main/help/fr/manageTemporaryReferential.html @@ -37,6 +37,8 @@ <h1>Gérer les référentiels temporaires</h1> </div> + <strong>TODO Update this doc with new referential actions (replace, delete, ...)</strong> + <p>Sur cette écran on peut gérer les référentiels temporaires.<br>L'accès à cet écran est protégé par un mot de passe afin d'éviter un usage abusif des références temporaires. En effet, l'utilisation de diff --git a/tutti-ui-swing/src/main/help/fr/menu.html b/tutti-ui-swing/src/main/help/fr/menu.html index 2ed6de1..a373332 100644 --- a/tutti-ui-swing/src/main/help/fr/menu.html +++ b/tutti-ui-swing/src/main/help/fr/menu.html @@ -228,6 +228,8 @@ Pour faire un nouvel import, procédez ainsi: <h4>Description des actions</h4> + <strong>TODO Update this doc with new referential actions (replace, delete, ...)</strong> + <dl> <dt>Exporter</dt> <dd>permet d'exporter un fichier d'exemple (format .csv, encodage UTF8, diff --git a/tutti-ui-swing/src/main/help/fr/navbar.js b/tutti-ui-swing/src/main/help/fr/navbar.js index bc05940..0b8ea18 100644 --- a/tutti-ui-swing/src/main/help/fr/navbar.js +++ b/tutti-ui-swing/src/main/help/fr/navbar.js @@ -102,7 +102,7 @@ document.write(' <li><a href="dbManager.html">Gestionnaire de bas document.write(' <li><a href="config.html">Configuration</a></li>'); document.write(' <li><a href="manageTemporaryReferential.html">Gestionnaire de référentiels temporaires</a></li>'); document.write(' <li><a href="report.html">Générer des rapports</a></li>'); -document.write(' <li><a href="genericExport.html">Export générique</a></li>'); +document.write(' <li><a href="genericFormat.html">Format générique d\'import - export</a></li>'); document.write(' <li><a href="dbMapping.html">Mapping des écrans / base de données</a></li>'); document.write(' <li><a href="validation.html">Règles de validation</a></li>'); document.write(' </ul>'); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.