February 2011 - Coser-commits - mailman.cloud.codelutin.com

r722 - trunk/src/site/en/rst/user
by chatellier＠users.labs.libre-entreprise.org 08 Feb '11

08 Feb '11

1 0

r721 - trunk/src/site/en/rst/user
by chatellier＠users.labs.libre-entreprise.org 08 Feb '11

08 Feb '11

Author: chatellier Date: 2011-02-08 17:35:53 +0000 (Tue, 08 Feb 2011) New Revision: 721 Log: Fix mistakes Modified: trunk/src/site/en/rst/user/guide_control.rst Modified: trunk/src/site/en/rst/user/guide_control.rst =================================================================== --- trunk/src/site/en/rst/user/guide_control.rst 2011-02-08 17:31:39 UTC (rev 720) +++ trunk/src/site/en/rst/user/guide_control.rst 2011-02-08 17:35:53 UTC (rev 721) @@ -87,18 +87,18 @@ Coser can also generate charts to ease the decision taking (specifically regarding warning errors). -The button ``Comparaison Captures/Tailles`` displays an interface where a chart +The button ``Comparison Catch/Length`` displays an interface where a chart is generated for each species. The data corresponds to the sum of the ``Number``s in the catch and length per year files. A difference can show an error in the original data. .. image:: ../../images/en/13-controlgraphdiff.png -The button``Structures en taille`` displays an interface that can generate +The button``Length structures`` displays an interface that can generate charts on a subset of data. It is for example possible to display the length structure but only for a -stratum, or a specy, or get the sum… +stratum, or a species, or get the sum… .. image:: ../../images/en/14-controlgraphlength.png @@ -109,8 +109,8 @@ Modifications report ~~~~~~~~~~~~~~~~~~~~ -The modifications report, reachable through the ``Rapport de modifications`` -button, is generated in HTML and shoud open in a web browser. You can visualize +The modifications report, reachable through the ``Modifications report`` +button, is generated in HTML and should open in a web browser. You can visualize and print the report in/from the browser. Controls report @@ -121,7 +121,7 @@ .. image:: ../../images/en/12-controlmenu2.png -This report contains the same errors thant the one displayed in the tree and the +This report contains the same errors that the one displayed in the tree and the Catch/length comparison charts. Save and validation @@ -129,9 +129,9 @@ You can save whenever you want the state of the data while fixing data. -After the data verification, and if this one ended with ** no errors** the -``Valider le contrôle`` button become active and allows you to validate. +After the data verification, and if this one ended with **no errors** the +``Valid control`` button become active and allows you to validate. -The validation of the control step is encessary to go the `selection step`_. +The validation of the control step is necessary to go the `selection step`_. .. _selection step: guide_selection.html

1 0

r720 - trunk/src/site/en/rst/user
by chatellier＠users.labs.libre-entreprise.org 08 Feb '11

08 Feb '11

Author: chatellier Date: 2011-02-08 17:31:39 +0000 (Tue, 08 Feb 2011) New Revision: 720 Log: Fix mistake Modified: trunk/src/site/en/rst/user/guide_control.rst Modified: trunk/src/site/en/rst/user/guide_control.rst =================================================================== --- trunk/src/site/en/rst/user/guide_control.rst 2011-02-08 17:31:18 UTC (rev 719) +++ trunk/src/site/en/rst/user/guide_control.rst 2011-02-08 17:31:39 UTC (rev 720) @@ -42,7 +42,7 @@ * verification by cross-checking files * verification by cross-checking with the taxonomic referential -After the 10 verificatiosn steps, a tree with all the errors is displayed with +After the 10 verifications steps, a tree with all the errors is displayed with all the errors detected. For more information on the errors : `controls list`_.

1 0

r719 - trunk/src/site/en/rst/user
by chatellier＠users.labs.libre-entreprise.org 08 Feb '11

08 Feb '11

Author: chatellier Date: 2011-02-08 17:31:18 +0000 (Tue, 08 Feb 2011) New Revision: 719 Log: Fix images Modified: trunk/src/site/en/rst/user/configuration.rst trunk/src/site/en/rst/user/controls.rst trunk/src/site/en/rst/user/dataformat.rst trunk/src/site/en/rst/user/guide_control.rst Modified: trunk/src/site/en/rst/user/configuration.rst =================================================================== --- trunk/src/site/en/rst/user/configuration.rst 2011-02-08 17:28:30 UTC (rev 718) +++ trunk/src/site/en/rst/user/configuration.rst 2011-02-08 17:31:18 UTC (rev 719) @@ -33,7 +33,7 @@ Paths ----- -.. image:: ../images/90-configurationpath.png +.. image:: ../../images/en/90-configurationpath.png In this wizard, you can define following options: @@ -55,7 +55,7 @@ Control step configuration -------------------------- -.. image:: ../images/91-configurationvalues.png +.. image:: ../../images/en/91-configurationvalues.png In this view, you can define configuration values used during control step : Modified: trunk/src/site/en/rst/user/controls.rst =================================================================== --- trunk/src/site/en/rst/user/controls.rst 2011-02-08 17:28:30 UTC (rev 718) +++ trunk/src/site/en/rst/user/controls.rst 2011-02-08 17:31:18 UTC (rev 719) @@ -60,7 +60,7 @@ Example ------- -Example of the startas validation file (error level) :: +Example of the strata validation file (error level) :: <validators> <field name="survey"> Modified: trunk/src/site/en/rst/user/dataformat.rst =================================================================== --- trunk/src/site/en/rst/user/dataformat.rst 2011-02-08 17:28:30 UTC (rev 718) +++ trunk/src/site/en/rst/user/dataformat.rst 2011-02-08 17:31:18 UTC (rev 719) @@ -58,8 +58,8 @@ EVHOE_TOT;1997;B1008;ARNOTHO;1.00;0.03 -stratas -~~~~~~~ +strata +~~~~~~ French headers:: @@ -69,7 +69,7 @@ Survey;Stratum;Surface -Sample (stratas.csv):: +Sample (strata.csv):: Survey;Stratum;Surface EVHOE_TOT;Gn1;8201.69199214 Modified: trunk/src/site/en/rst/user/guide_control.rst =================================================================== --- trunk/src/site/en/rst/user/guide_control.rst 2011-02-08 17:28:30 UTC (rev 718) +++ trunk/src/site/en/rst/user/guide_control.rst 2011-02-08 17:31:18 UTC (rev 719) @@ -28,7 +28,7 @@ The control step goal is to detect errors on the 4 data tables and possibly correct them if possible. -.. image:: ../images/10-controlmain.png +.. image:: ../../images/en/10-controlmain.png Data check ---------- @@ -74,7 +74,7 @@ * delete several selected lines. * find a pattern and replace it by another one -.. image:: ../images/11-controlmenu1.png +.. image:: ../../images/en/11-controlmenu1.png For example, if all the numbers got a comma (,) instead of a point (.) for @@ -92,7 +92,7 @@ ``Number``s in the catch and length per year files. A difference can show an error in the original data. -.. image:: ../images/13-controlgraphdiff.png +.. image:: ../../images/en/13-controlgraphdiff.png The button``Structures en taille`` displays an interface that can generate charts on a subset of data. @@ -100,7 +100,7 @@ It is for example possible to display the length structure but only for a stratum, or a specy, or get the sum… -.. image:: ../images/14-controlgraphlength.png +.. image:: ../../images/en/14-controlgraphlength.png Reports ------- @@ -119,7 +119,7 @@ This report is reachable by right clic on the errors tree after verifying the errors in the data. -.. image:: ../images/12-controlmenu2.png +.. image:: ../../images/en/12-controlmenu2.png This report contains the same errors thant the one displayed in the tree and the Catch/length comparison charts.

1 0

r718 - trunk/src/site/en/rst/user
by chatellier＠users.labs.libre-entreprise.org 08 Feb '11

08 Feb '11

Author: chatellier Date: 2011-02-08 17:28:30 +0000 (Tue, 08 Feb 2011) New Revision: 718 Log: Fix title Modified: trunk/src/site/en/rst/user/guide_control.rst Modified: trunk/src/site/en/rst/user/guide_control.rst =================================================================== --- trunk/src/site/en/rst/user/guide_control.rst 2011-02-08 17:27:08 UTC (rev 717) +++ trunk/src/site/en/rst/user/guide_control.rst 2011-02-08 17:28:30 UTC (rev 718) @@ -61,7 +61,7 @@ then validate the modification. Bulk fixing -------- +----------- In the case of the same error on several lines :

1 0

r717 - in trunk/src/site: . en en/rst rst
by chatellier＠users.labs.libre-entreprise.org 08 Feb '11

08 Feb '11

Author: chatellier Date: 2011-02-08 17:27:08 +0000 (Tue, 08 Feb 2011) New Revision: 717 Log: Refactor site locale structure Added: trunk/src/site/en/ trunk/src/site/en/rst/ trunk/src/site/en/rst/download.rst trunk/src/site/en/rst/index.rst trunk/src/site/en/rst/user/ Removed: trunk/src/site/en/download.rst trunk/src/site/en/index.rst trunk/src/site/en/user/ trunk/src/site/rst/en/ Modified: trunk/src/site/site_en.xml Deleted: trunk/src/site/en/download.rst =================================================================== --- trunk/src/site/rst/en/download.rst 2011-02-08 17:19:43 UTC (rev 716) +++ trunk/src/site/en/download.rst 2011-02-08 17:27:08 UTC (rev 717) @@ -1,48 +0,0 @@ -.. - -.. * #%L -.. * Coser -.. * -.. * $Id$ -.. * $HeadURL$ -.. * %% -.. * Copyright (C) 2010 - 2011 Ifremer, Codelutin, Chatellier Eric -.. * %% -.. * This program is free software: you can redistribute it and/or modify -.. * it under the terms of the GNU Lesser 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 Lesser Public License for more details. -.. * -.. * You should have received a copy of the GNU General Lesser Public -.. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/lgpl-3.0.html>. -.. * #L% -.. - -Launch -====== - -Prerequisites -------------- - -To run Coser, you need a Java 6 installation. You can download it at this address: -http://www.oracle.com/technetwork/java/javase/downloads/index.html - -Prefer last available version, and at least the 1.6.0_20 version. - -Online launch -------------- - -You can launch application directly from this website with Java WebStart from -`this page`_. - -Download --------- - -You can also download Coser to run it locally. `Download coser`_. - -.. _this page: ../coser-ui/en/jnlp-report.html -.. _Download coser: http://labs.libre-entreprise.org/frs/?group_id=164 Deleted: trunk/src/site/en/index.rst =================================================================== --- trunk/src/site/rst/en/index.rst 2011-02-08 17:19:43 UTC (rev 716) +++ trunk/src/site/en/index.rst 2011-02-08 17:27:08 UTC (rev 717) @@ -1,29 +0,0 @@ -.. - -.. * #%L -.. * Coser -.. * -.. * $Id$ -.. * $HeadURL$ -.. * %% -.. * Copyright (C) 2010 - 2011 Ifremer, Codelutin, Chatellier Eric -.. * %% -.. * This program is free software: you can redistribute it and/or modify -.. * it under the terms of the GNU Lesser 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 Lesser Public License for more details. -.. * -.. * You should have received a copy of the GNU General Lesser Public -.. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/lgpl-3.0.html>. -.. * #L% -.. - -Coser -===== - -Contrôle et Sélection RSufi. - Copied: trunk/src/site/en/rst/download.rst (from rev 716, trunk/src/site/rst/en/download.rst) =================================================================== --- trunk/src/site/en/rst/download.rst (rev 0) +++ trunk/src/site/en/rst/download.rst 2011-02-08 17:27:08 UTC (rev 717) @@ -0,0 +1,48 @@ +.. - +.. * #%L +.. * Coser +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2010 - 2011 Ifremer, Codelutin, Chatellier Eric +.. * %% +.. * This program is free software: you can redistribute it and/or modify +.. * it under the terms of the GNU Lesser 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 Lesser Public License for more details. +.. * +.. * You should have received a copy of the GNU General Lesser Public +.. * License along with this program. If not, see +.. * <http://www.gnu.org/licenses/lgpl-3.0.html>. +.. * #L% +.. - +Launch +====== + +Prerequisites +------------- + +To run Coser, you need a Java 6 installation. You can download it at this address: +http://www.oracle.com/technetwork/java/javase/downloads/index.html + +Prefer last available version, and at least the 1.6.0_20 version. + +Online launch +------------- + +You can launch application directly from this website with Java WebStart from +`this page`_. + +Download +-------- + +You can also download Coser to run it locally. `Download coser`_. + +.. _this page: ../coser-ui/en/jnlp-report.html +.. _Download coser: http://labs.libre-entreprise.org/frs/?group_id=164 Copied: trunk/src/site/en/rst/index.rst (from rev 716, trunk/src/site/rst/en/index.rst) =================================================================== --- trunk/src/site/en/rst/index.rst (rev 0) +++ trunk/src/site/en/rst/index.rst 2011-02-08 17:27:08 UTC (rev 717) @@ -0,0 +1,29 @@ +.. - +.. * #%L +.. * Coser +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2010 - 2011 Ifremer, Codelutin, Chatellier Eric +.. * %% +.. * This program is free software: you can redistribute it and/or modify +.. * it under the terms of the GNU Lesser 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 Lesser Public License for more details. +.. * +.. * You should have received a copy of the GNU General Lesser Public +.. * License along with this program. If not, see +.. * <http://www.gnu.org/licenses/lgpl-3.0.html>. +.. * #L% +.. - +Coser +===== + +Contrôle et Sélection RSufi. + Modified: trunk/src/site/site_en.xml =================================================================== --- trunk/src/site/site_en.xml 2011-02-08 17:19:43 UTC (rev 716) +++ trunk/src/site/site_en.xml 2011-02-08 17:27:08 UTC (rev 717) @@ -27,7 +27,7 @@ <project name="${project.name}"> <bannerLeft> - <src>/icons/logo100.png</src> + <src>../icons/logo100.png</src> <href>index.html</href> </bannerLeft> @@ -37,9 +37,9 @@ </bannerRight> <poweredBy> - <logo href="http://maven.apache.org" name="Maven" img="/images/logos/maven-feather.png"/> - <logo href="http://maven-site.nuiton.org/jrst" name="JRst" img="/images/jrst-logo.png"/> - <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText" img="/images/restructuredtext-logo.png"/> + <logo href="http://maven.apache.org" name="Maven" img="../images/logos/maven-feather.png"/> + <logo href="http://maven-site.nuiton.org/jrst" name="JRst" img="../images/jrst-logo.png"/> + <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText" img="../images/restructuredtext-logo.png"/> </poweredBy> <body>

1 0

r716 - in trunk: . coser-business coser-ui coser-web src/site/rst/en/user
by jcouteau＠users.labs.libre-entreprise.org 08 Feb '11

08 Feb '11

Author: jcouteau Date: 2011-02-08 17:19:43 +0000 (Tue, 08 Feb 2011) New Revision: 716 Log: First doc trnaslmation to english Modified: trunk/ trunk/coser-business/ trunk/coser-ui/ trunk/coser-web/ trunk/src/site/rst/en/user/configuration.rst trunk/src/site/rst/en/user/controls.rst trunk/src/site/rst/en/user/faq.rst trunk/src/site/rst/en/user/guide_control.rst trunk/src/site/rst/en/user/guide_listcontrols.rst Property changes on: trunk ___________________________________________________________________ Modified: svn:ignore - .settings .project target + .settings .project target *.iml *.ipr *.iws Property changes on: trunk/coser-business ___________________________________________________________________ Modified: svn:ignore - .classpath .project .settings target + .classpath .project .settings target *.iws *.ipr *.iml Property changes on: trunk/coser-ui ___________________________________________________________________ Modified: svn:ignore - .settings target bin .classpath + .settings target bin .classpath *.ipr *.iml *.iws Property changes on: trunk/coser-web ___________________________________________________________________ Modified: svn:ignore - .settings target .classpath .project + .settings target .classpath .project *.ipr *.iml *.iws Modified: trunk/src/site/rst/en/user/configuration.rst =================================================================== --- trunk/src/site/rst/en/user/configuration.rst 2011-02-08 16:51:05 UTC (rev 715) +++ trunk/src/site/rst/en/user/configuration.rst 2011-02-08 17:19:43 UTC (rev 716) @@ -25,8 +25,8 @@ Configuration ============= -Before using Coser, it need to be configured, especially about files not provided -with coser. +Before using Coser, it need to be configured, especially about files not +provided with it. A wizard is available with the menu *Options/Configuration* @@ -64,7 +64,7 @@ coser.control.diffcatchlength Percentage of acceptable difference between the total numbers of individual - captured in the capture file and the same amount in lenght file. + captured in the capture file and the same amount in length file. coser.control.typeFish Fish species type code name. Used by some controls to exclude some species. Modified: trunk/src/site/rst/en/user/controls.rst =================================================================== --- trunk/src/site/rst/en/user/controls.rst 2011-02-08 16:51:05 UTC (rev 715) +++ trunk/src/site/rst/en/user/controls.rst 2011-02-08 17:19:43 UTC (rev 716) @@ -22,47 +22,45 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - -Contrôles -========= -Coser dispose d'un interface permettant de personnaliser les contrôles. +Controls +======== -Cependant, leurs personnalisation est très technique et est réservé aux -utilisateurs expérimentée. +Coser provides a user interface allowing to customise the controls. -Cette interface est composé d'un arbre avec la liste des 4 fichiers (captures, -tailles, traits, strates) et pour chacun d'eux, les niveaux des erreurs -detectable. +But this customisation is quite technical and must be performed only by +advanced users. -A chaque niveau, un fichier XML décrivant les controles peut être associés -pour les décrires. +This interface is made of a tree with the list of the 4 files (catch, length, +hauls, stratas) and for each one of them, the level of error possible. +For each level, a XML file describing the controls can be associated in order +to describe them. + Documentation ------------- -Les fichiers XML sont basé sur une syntaxe utilisé par le framework Java XWork. +The XML files are based on a syntax used by the Java framework XWork. -La documentation de cette syntaxe peut être trouvé à cette adresse : +The documentation of this syntax can be found at this address : http://struts.apache.org/2.x/docs/validation.html - -Champs +Fields ------ -Pour chaque fichier, les champs sont accessible par leur nom anglais -(``survey``, ``stratum``...) dans leur type relatif (par exemple, ``number`` -est un double java). +For each file, the fields are reachable by their english name (``survey``, +``stratum``…) in their relative type (for example,``number`` is a Java double). -Pour chaque champs, il y a également un autre champs correspondant à sa -donnée sous forme de chaine de caracteres. Par exemple, le champs ``survey`` est -également accessible via le nom ``surveyAsString``. -Le champs ``number`` (de type double) est egalement accessible sous le nom -``numberAsString` (de type chaine). +For each field, there is also an other field corresponding to its data under a +String form. For example, the field ``survey`` is also reachable using the name +``surveyAsString``. +The field ``number`` (of type double) is also reachable under the name +``numberAsString`` (of string type). -Exemple +Example ------- -Exemple du fichier de validation strate (niveau erreur) :: +Example of the startas validation file (error level) :: <validators> <field name="survey"> @@ -85,9 +83,7 @@ </field> </validators> +In this example: -Dans cet exemple: - - * le champs ``survey`` est obligatoire (requiredstring) - * le champs ``surfaceAsString`` doit être un réel valide (la valeur NA étant - autorisée) + * the field ``survey`` is mandatory (requiredstring) + * the field ``surface`` must be a valid number (the value NA is valid). \ No newline at end of file Modified: trunk/src/site/rst/en/user/faq.rst =================================================================== --- trunk/src/site/rst/en/user/faq.rst 2011-02-08 16:51:05 UTC (rev 715) +++ trunk/src/site/rst/en/user/faq.rst 2011-02-08 17:19:43 UTC (rev 716) @@ -22,13 +22,13 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - -Foire aux questions -=================== +Requently Asked Questions +========================= .. contents:: -Au lancement de l'application JavaWebStart le message "Impossible de lancer l'application" apparaît ---------------------------------------------------------------------------------------------------- +When I launch the JavaWebStart application, I got the message "Cannot launch the application" +--------------------------------------------------------------------------------------------- -Si le détail de l'erreur cite une erreur de certificats, essayez de mettre à -jour java avant de recommencer. +If the detail of this error talks about certificates, try to update Java and +then start again. Modified: trunk/src/site/rst/en/user/guide_control.rst =================================================================== --- trunk/src/site/rst/en/user/guide_control.rst 2011-02-08 16:51:05 UTC (rev 715) +++ trunk/src/site/rst/en/user/guide_control.rst 2011-02-08 17:19:43 UTC (rev 716) @@ -39,109 +39,99 @@ Coser will check: * line by line errors on 4 tables - * - * vérification par croissement avec le referentiel taxonomique + * verification by cross-checking files + * verification by cross-checking with the taxonomic referential -À la fin des 10 étapes de vérification, un arbre de toutes les erreurs -s'affiche avec toutes les erreurs détectées. +After the 10 verificatiosn steps, a tree with all the errors is displayed with +all the errors detected. -Pour plus de détails concernant les erreurs : `liste des contrôles`_. +For more information on the errors : `controls list`_. -.. _liste des contrôles: guide_listcontrols.html +.. _controls list: guide_listcontrols.html -Corrections des données ------------------------ +Fixing data +----------- -Lors de la sélection d'une erreur, Coser affiche la ligne concernée par l'erreur -vous permettant d'apporter une correction. -Les lignes en rouge correspondent à des champs en erreurs. La partie droite -détaille les messages d'erreurs. +When selecting an error, Coser displays the line of the error allowing you to +fix it. +The lines in red corresponds to the fields with errors. The right part details +the error messages. -Dans l'exemple précédant, l'année est manquante, l'utilisateur peut l'ajouter -à la main et valider la modification. +In the previous example, the year is missing, the user can add it by hand and +then validate the modification. +Bulk fixing +------- -Corrections de masse --------------------- +In the case of the same error on several lines : -Dans le cas où une erreur concerne plusieurs lignes: + * either the error is caused by an export error of the 4 tables and it is + better to do the export again, fixing being impossible in coser. + * either the error can be fixed. - * soit l'erreur est dûe à une erreur d'export des 4 tables et il est - préféreable de refaire l'export en amont, la correction se reverant impossible - depuis coser - * soit l'erreur est corrigeable +The table that displays the data got a contextual menu allowing to : -Le tableau affichant toute les données comporte un menu contextuel permettant: + * delete several selected lines. + * find a pattern and replace it by another one - * de supprimer plusieurs lignes sélectionné - * de chercher un motif et de le remplacer par un autre - .. image:: ../images/11-controlmenu1.png -Par exemple, dans le cas ou tous les nombres comporterais une virgule (,) au -lieu d'un point (.), il est possible de remplacer un la virgule par un point -pour toutes les lignes sur une colonne en une seule opération. +For example, if all the numbers got a comma (,) instead of a point (.) for +decimal separation, it is possible to replace all the commas by points in one +operation. -Graphique ---------- +Charts +------ -Coser est également capable de générer des graphiques pour faciliter -la prise de décision (notement concernant les warning détectés par la -vérification globale). +Coser can also generate charts to ease the decision taking (specifically +regarding warning errors). -Le bouton ``Comparaison Captures/Tailles`` affiche une interface où un -graphique est générée pour chaque espèce. Les données correspondent à la somme -des ``Nombre``s dans les fichiers captures et tailles par année. -Une différence peut traduire une erreur dans les données d'origines. +The button ``Comparaison Captures/Tailles`` displays an interface where a chart +is generated for each species. The data corresponds to the sum of the +``Number``s in the catch and length per year files. A difference can show an +error in the original data. .. image:: ../images/13-controlgraphdiff.png -Le bouton ``Strutures en taille`` affiche une interface un peu plus compliquée -mais permettant de générer des graphiques sur des sous ensembles de données -sélectionnés. +The button``Structures en taille`` displays an interface that can generate +charts on a subset of data. -Il est par exemple possible d'afficher la struture en taille mais seulement -pour une strate, ou seulement pour une espece, de faire la somme... +It is for example possible to display the length structure but only for a +stratum, or a specy, or get the sum… .. image:: ../images/14-controlgraphlength.png - -Rapport +Reports ------- -Dans l'étape de contrôle, il est possible de générer deux rapports. +In the control step, it is possible to generate 2 reports. -Rapport de modification -~~~~~~~~~~~~~~~~~~~~~~~ +Modifications report +~~~~~~~~~~~~~~~~~~~~ +The modifications report, reachable through the ``Rapport de modifications`` +button, is generated in HTML and shoud open in a web browser. You can visualize +and print the report in/from the browser. -Le rapport des modifications, accessible via le bouton `Rapport des -modifications`, est généré sous forme de rapport HTML et doit normalement -s'ouvrir dans un nivigateur internet. Vous pouvez à partir de ce navigateur -visualisé ou imprimer ce rapport. +Controls report +~~~~~~~~~~~~~~~ -Rapport de contrôle -~~~~~~~~~~~~~~~~~~~ +This report is reachable by right clic on the errors tree after verifying the +errors in the data. -Ce rapport est accessible par clic droit sur l'arbre des erreurs après -vérification des erreurs sur les données. - .. image:: ../images/12-controlmenu2.png -Ca rapport contient les mêmes erreurs que celle affiché dans l'arbre et -les graphiques de comparaison Captures/Tailles. +This report contains the same errors thant the one displayed in the tree and the +Catch/length comparison charts. +Save and validation +------------------- -Sauvegarde et validation ------------------------- +You can save whenever you want the state of the data while fixing data. -Vous pouvez à tout moment sauvegarder l'état des données au fur et à mesure -de vos corrections. +After the data verification, and if this one ended with ** no errors** the +``Valider le contrôle`` button become active and allows you to validate. -Àprès la vérification des données, et si celle ci c'est terminée **sans erreurs** -le bouton `Valider le contôle` devient actif et vous permet de valider. +The validation of the control step is encessary to go the `selection step`_. -La validation de l'étape de contrôle est nécéssaire pour pouvoir passer -à l'`étape de sélection`_. - -.. _étape de sélection: guide_selection.html +.. _selection step: guide_selection.html Modified: trunk/src/site/rst/en/user/guide_listcontrols.rst =================================================================== --- trunk/src/site/rst/en/user/guide_listcontrols.rst 2011-02-08 16:51:05 UTC (rev 715) +++ trunk/src/site/rst/en/user/guide_listcontrols.rst 2011-02-08 17:19:43 UTC (rev 716) @@ -22,185 +22,177 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - -Liste des contrôles -=================== +Controls list +============= -Cette page détaille la liste des contrôles effectué par Coser lors -de l'étape de vérification des erreurs. +This page details the list of the controls made by Coser when verifying the +data. -Captures --------- +Catches +------- +------------+----------------------------------------------------------------+----------+ -| Champs | Vérification | Niveau | +| Field | Check | Level | +============+================================================================+==========+ -| Campagne | Champs obligatoire | Erreur | +| Campagne | Mandatory field | Error | +------------+----------------------------------------------------------------+----------+ -| | Champs composé de 4 chiffres obligatoires et 2 chiffres | | -| Année | facultatifs séparés par un point (trimestre) ex: 2002.25 | Erreur | +| | Field with 4 mandatory numbers and 2 optional numbers separated by a point (trimester) ex : 2002.25 | | +| Année | | Error | +------------+----------------------------------------------------------------+----------+ -| Traits | Composé de lettres et chiffres | Erreur | +| Traits | Made up of letters and numbers | Error | +------------+----------------------------------------------------------------+----------+ -| Especes | Champs obligatoire | Erreur | +| Especes | Mandatory field | Error | +------------+----------------------------------------------------------------+----------+ -| Nombre | Réel, vide ou NA | Erreur | +| Nombre | Number, empty or NA | Error | +------------+----------------------------------------------------------------+----------+ -| Poids | Réel, vide ou NA | Erreur | +| Poids | Number, empty or NA | Error | +------------+----------------------------------------------------------------+----------+ +-----------------------------------------------------------------------------+----------+ -| Autres vérifications | Niveau | +| Other checks | Level | +=============================================================================+==========+ -| Si le Poids est un réel différent de 0, alors le Nombre doit être | | -| également différent de 0 | Erreur | +| If the weight is a number different of 0, then the number also needs to be different from 0 | | +| | Error | +-----------------------------------------------------------------------------+----------+ -| Verification des lignes dupliquées sur la clé "Campagne", "Annee", "Trait", | | -| "Espece" | Erreur | +| Check of duplicate entries with the keys "Campagne", "Annee", "Trait", | | +| "Espece" | Error | +-----------------------------------------------------------------------------+----------+ -| Vérification du nombre minimal d'observations dans table CAPTURES$Nombre | | -| par espèce par strate par année | Warning | +| Check of the minimal number of observations in the table CAPTURES$Nombre | | +| by species by stratum by year | Warning | +-----------------------------------------------------------------------------+----------+ -Strates +Stratas ------- +------------+----------------------------------------------------------------+----------+ -| Champs | Vérification | Niveau | +| Fields | Check | Level | +============+================================================================+==========+ -| Campagne | Champs obligatoire | Erreur | +| Campagne | Mandatory field | Error | +------------+----------------------------------------------------------------+----------+ -| Strate | Champs obligatoire | Erreur | +| Strate | Mandatory field | Error | +------------+----------------------------------------------------------------+----------+ -| Surface | Réel, vide ou NA | Erreur | +| Surface | Number, empty or NA | Error | +------------+----------------------------------------------------------------+----------+ +-----------------------------------------------------------------------------+----------+ -| Autres vérifications | Niveau | +| Other Checks | Level | +=============================================================================+==========+ -| Verification des lignes dupliquées sur la clé "Campagne", "Strate" | Erreur | +| Check the duplicate lines on the keys "Campagne", "Strate" | Error | +-----------------------------------------------------------------------------+----------+ -Tailles +Lengths ------- +------------+----------------------------------------------------------------+----------+ -| Champs | Vérification | Niveau | +| Fields | Check | Level | +============+================================================================+==========+ -| Campagne | Champs obligatoire | Erreur | +| Campagne | Mandatory field | Error | +------------+----------------------------------------------------------------+----------+ -| Année | Champs composé de 4 chiffres obligatoires et 2 chiffres | | -| | facultatifs séparés par un point (trimestre) ex: 2002.25 | Erreur | +| Année | Field with 4 mandatory numbers and 2 optional numbers separated by a point (trimester) ex : 2002.25 | | +| | | Error | +------------+----------------------------------------------------------------+----------+ -| Traits | Composé de lettres et chiffres | Erreur | +| Traits | Made up of letters and numbers | Error | +------------+----------------------------------------------------------------+----------+ -| Espece | Champs obligatoire | Erreur | +| Espece | Mandatory field | Error | +------------+----------------------------------------------------------------+----------+ -| Sexe | Champs obligatoire | Erreur | +| Sexe | Mandatory field | Error | +------------+----------------------------------------------------------------+----------+ -| Maturite | Champs obligatoire | Erreur | +| Maturite | Mandatory field | Error | +------------+----------------------------------------------------------------+----------+ -| Longueur | Réel valide, vide | Erreur | +| Longueur | Number or empty | Error | +------------+----------------------------------------------------------------+----------+ -| Nombre | Réel valide, vide ou NA | Erreur | +| Nombre | Number, empty or NA | Error | +------------+----------------------------------------------------------------+----------+ -| Poids | Réel valide, vide ou NA | Erreur | +| Poids | Number, empty or NA | Error | +------------+----------------------------------------------------------------+----------+ -| Age | Réel valide, vide ou NA | Fatal | +| Age | Number, empty or NA | Fatal | +------------+----------------------------------------------------------------+----------+ +-----------------------------------------------------------------------------+----------+ -| Autres vérifications | Niveau | +| Other Checks | Level | +=============================================================================+==========+ -| Si le Poids est un réel différent de 0, alors le Nombre doit être | Erreur | -| également différent de 0 | | +| If the Weight is a number different from 0, the Number must be also different from 0 | Error | +| | | +-----------------------------------------------------------------------------+----------+ -| Verification des lignes dupliquées sur la clé "Campagne", "Annee", "Trait", | Erreur | +| Check duplicate lines on keys "Campagne", "Annee", "Trait", | Error | | "Espece", "Sexe", "Maturite", "Longueur" | | +-----------------------------------------------------------------------------+----------+ -| Vérification du nombre minimal d'observation dans table TAILLES$Nombre par | Erreur | -| espèce par strate par année | | +| Check the minimal number of observations in the table TAILLES$Nombre by | Error | +| species by stratum by year | | +-----------------------------------------------------------------------------+----------+ -Traits ------- +Hauls +----- +-----------------+----------------------------------------------------------------+----------+ -| Champs | Vérification | Niveau | +| Fields | Check | Level | +=================+================================================================+==========+ -| Campagne | Champs obligatoire | Erreur | +| Campagne | Mandatory field | Error | +-----------------+----------------------------------------------------------------+----------+ -| | Champs composé de 4 chiffres obligatoires et 2 chiffres | | -| Année | facultatifs séparés par un point (trimestre) ex: 2002.25 | Erreur | +| | Field with 4 mandatory numbers and 2 optional numbers separated by a point (trimester) ex : 2002.25 | | +| Année | | Error | +-----------------+----------------------------------------------------------------+----------+ -| Traits | Composé de lettres et chiffres | Erreur | +| Traits | Made up of letters and numbers | Error | +-----------------+----------------------------------------------------------------+----------+ -| Mois | 2 chiffres | Erreur | +| Mois | 2 numbers | Error | +-----------------+----------------------------------------------------------------+----------+ -| Strates | Champs obligatoire | Erreur | +| Strates | Mandatory field | Error | +-----------------+----------------------------------------------------------------+----------+ -| SurfaceBalayee | Champs obligatoire et réel valide ou NA | Erreur | +| SurfaceBalayee | Mandatory field and number or NA | Error | +-----------------+----------------------------------------------------------------+----------+ -| Lat | Réel valide, vide ou NA | Erreur | +| Lat | Number, empty or NA | Error | +-----------------+----------------------------------------------------------------+----------+ -| Long | Réel valide, vide ou NA | Erreur | +| Long | Number, empty or NA | Error | +-----------------+----------------------------------------------------------------+----------+ -| ProfMoy | Réel valide, vide ou NA | Erreur | +| ProfMoy | Number, empty or NA | Error | +-----------------+----------------------------------------------------------------+----------+ -| SurfaceBalayee | Composé de au moins 3 décimales | Fatal | +| SurfaceBalayee | With at least 3 decimals | Fatal | +-----------------+----------------------------------------------------------------+----------+ -| Lat | Composé de au moins 4 décimales | Warning | +| Lat | With at least 4 decimals | Warning | +-----------------+----------------------------------------------------------------+----------+ -| Long | Composé de au moins 4 décimales | Warning | +| Long | With at least 4 decimals | Warning | +-----------------+----------------------------------------------------------------+----------+ +-----------------------------------------------------------------------------+----------+ -| Autres vérifications | Niveau | +| Other Checks | Level | +=============================================================================+==========+ -| Si le Poids est un réel différent de 0, alors le Nombre doit être | | -| également différent de 0 | Erreur | +| If the Weight is a number different from 0, the Number must be also different from 0 | | +| | Error | +-----------------------------------------------------------------------------+----------+ -| Verification des lignes dupliquées sur la clé "Campagne", "Annee", "Trait", | | -| "Mois" | Erreur | +| Check duplicate lines on keys "Campagne", "Annee", "Trait", | | +| "Mois" | Error | +-----------------------------------------------------------------------------+----------+ -Coisement de fichier +Files cross-checking -------------------- +-----------------------------------------------------------------------------+----------+ -| Vérifications | Niveau | +| Checks | Level | +=============================================================================+==========+ -| Vérification que le nom de campagne est le même dans les 4 tables | Fatal | +| Check the campaign name is the same in the 4 files | Fatal | +-----------------------------------------------------------------------------+----------+ -| La liste des années doit être identique entre les fichiers Captures, | | -| tailles et Traits | Fatal | +| The list of years must be the same in the Catches, Lengthes and Hauls files | Fatal | +-----------------------------------------------------------------------------+----------+ -| Verification des lignes dupliquées sur la clé "Campagne", "Annee", "Trait", | | -| "Espece", "Sexe", "Maturite", "Longueur" | Erreur | +| For the fishes, the Length field must have a full or half step (for example: 4.0 or 4.5 but not 4.25) | | +| | Warning | +-----------------------------------------------------------------------------+----------+ -| Vérification du nombre minimal d'observation dans table TAILLES$Nombre par | | -| espèce par strate par année | Erreur | +| Check that for each species present in a haul of a year in the length file | Fatal | +| (noted Year/Haul/Species) there is a data in the catch files (the opposite | | +| is not true) | | +-----------------------------------------------------------------------------+----------+ -| Pour les poissons, le champs Longueur doit utiliser un pas entier ou un | | -| demi pas (par exemple: 4.0 ou 4.5, mais pas 4.25) | Warning | +| Check qthat for each haul present in a year (noted Year/Haul) in the lengthes files and catches, there is a data in the haul file | | +| | Fatal | +-----------------------------------------------------------------------------+----------+ -| Vérification que pour chaque espèce présent dans un trait d'une année | | -| dans le fichier tailles (noté Annee/Trait/Espece) il y a une donnée | | -| dans le fichier captures (le contraire n'est pas vraie) | Fatal | -+-----------------------------------------------------------------------------+----------+ -| Vérification que pour chaque trait présent une année (noté Annee/Trait) | | -| dans les fichiers tailles et capt il y a une donnée dans le fichier | | -| traits | Fatal | -+-----------------------------------------------------------------------------+----------+ -Croissement avec le reférentiel taxonomique -------------------------------------------- +Cross checking with the taxonomic referential +--------------------------------------------- +-----------------------------------------------------------------------------+----------+ -| Vérifications | Niveau | +| Checks | Level | +=============================================================================+==========+ -| Le champs Especes du fichier Captures doit correspondre à une espèce | | -| présente dans le référentiel taxonomique | Erreur | +| The Field Species of the catches file must corresponf to a species present in the taxonomic referential | | +| | Error | +-----------------------------------------------------------------------------+----------+ -| Le champs Especes du fichier Taille doit correspondre à une espèce | | -| présente dans le référentiel taxonomique | Erreur | +| The Field Species of the lengthes file must corresponf to a species present in the taxonomic referential | | +| | Error | +-----------------------------------------------------------------------------+----------+

1 0

r715 - trunk
by chatellier＠users.labs.libre-entreprise.org 08 Feb '11

08 Feb '11

Author: chatellier Date: 2011-02-08 16:51:05 +0000 (Tue, 08 Feb 2011) New Revision: 715 Log: Use jrst 1.2 stable Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-02-08 16:35:02 UTC (rev 714) +++ trunk/pom.xml 2011-02-08 16:51:05 UTC (rev 715) @@ -354,7 +354,7 @@ <dependency> <groupId>org.nuiton.jrst</groupId> <artifactId>doxia-module-jrst</artifactId> - <version>1.2-SNAPSHOT</version> + <version>1.2</version> </dependency> </dependencies> </plugin>

1 0

r714 - trunk
by chatellier＠users.labs.libre-entreprise.org 08 Feb '11

08 Feb '11

Author: chatellier Date: 2011-02-08 16:35:02 +0000 (Tue, 08 Feb 2011) New Revision: 714 Log: Update readme Modified: trunk/README.txt Modified: trunk/README.txt =================================================================== --- trunk/README.txt 2011-02-08 16:35:00 UTC (rev 713) +++ trunk/README.txt 2011-02-08 16:35:02 UTC (rev 714) @@ -23,4 +23,4 @@ or executable script : coser (linux) - coser.exe (windows) \ No newline at end of file + coser.exe (windows)

1 0

r713 - trunk/coser-ui
by chatellier＠users.labs.libre-entreprise.org 08 Feb '11

08 Feb '11

Author: chatellier Date: 2011-02-08 16:35:00 +0000 (Tue, 08 Feb 2011) New Revision: 713 Log: Update readme Modified: trunk/coser-ui/README.txt Modified: trunk/coser-ui/README.txt =================================================================== --- trunk/coser-ui/README.txt 2011-02-08 16:08:53 UTC (rev 712) +++ trunk/coser-ui/README.txt 2011-02-08 16:35:00 UTC (rev 713) @@ -0,0 +1,26 @@ +Coser readme +============ + +Requirements +------------ + +- Sun jre 1.6 + + +Installation +------------ + +Just unzip archive. + + +Launch +------ + +Launch coser with following command: + + java -jar coser.jar + +or executable script : + + coser (linux) + coser.exe (windows)

1 0