- Wao-commits - mailman.cloud.codelutin.com

[Suiviobsmer-commits] r663 - in trunk: . wao-business wao-ui
by tchemit＠users.labs.libre-entreprise.org Oct. 6, 2010

Oct. 6, 2010

Author: tchemit Date: 2010-10-06 23:57:41 +0000 (Wed, 06 Oct 2010) New Revision: 663 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml trunk/wao-business/pom.xml trunk/wao-ui/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-10-06 23:57:38 UTC (rev 662) +++ trunk/pom.xml 2010-10-06 23:57:41 UTC (rev 663) @@ -15,7 +15,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>1.5.3</version> + <version>1.6-SNAPSHOT</version> <modules> <module>wao-ui</module> @@ -308,9 +308,9 @@  <scm> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.5.3</connection> - <developerConnection>scm:svn:svn+ssh://${userame}@labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.5.3</developerConnection> - <url>http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-1.5.3?root=suiviob…</url> + <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk</connection> + <developerConnection>scm:svn:svn+ssh://${username}@labs.libre-entreprise.org/svnroot/suiviobsmer/trunk</developerConnection> + <url>http://labs.libre-entreprise.org/scm/viewvc.php/trunk/?root=suiviobsmer</url> </scm> <build> Modified: trunk/wao-business/pom.xml =================================================================== --- trunk/wao-business/pom.xml 2010-10-06 23:57:38 UTC (rev 662) +++ trunk/wao-business/pom.xml 2010-10-06 23:57:41 UTC (rev 663) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>1.5.3</version> + <version>1.6-SNAPSHOT</version> </parent> <groupId>fr.ifremer.wao</groupId> @@ -204,9 +204,9 @@ </build> <scm> - <url>http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-1.5.3/?root=suivio…</url> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.5.3/wao-business</connection> - <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.5.3/wao-business</developerConnection> + <url>http://labs.libre-entreprise.org/scm/viewvc.php/trunk/wao-business/?root=su…</url> + <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-business</connection> + <developerConnection>scm:svn:svn+ssh://${username}@labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-business</developerConnection> </scm>  Modified: trunk/wao-ui/pom.xml =================================================================== --- trunk/wao-ui/pom.xml 2010-10-06 23:57:38 UTC (rev 662) +++ trunk/wao-ui/pom.xml 2010-10-06 23:57:41 UTC (rev 663) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>1.5.3</version> + <version>1.6-SNAPSHOT</version> </parent> <groupId>fr.ifremer.wao</groupId> @@ -227,9 +227,9 @@ </repositories> <scm> - <url>http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-1.5.3/?root=suivio…</url> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.5.3/wao-ui</connection> - <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.5.3/wao-ui</developerConnection> + <url>http://labs.libre-entreprise.org/scm/viewvc.php/trunk/wao-ui/?root=suiviobs…</url> + <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-ui</connection> + <developerConnection>scm:svn:svn+ssh://tchemit at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-ui</developerConnection> </scm> </project>

1 0

[Suiviobsmer-commits] r662 - tags
by tchemit＠users.labs.libre-entreprise.org Oct. 6, 2010

Oct. 6, 2010

Author: tchemit Date: 2010-10-06 23:57:38 +0000 (Wed, 06 Oct 2010) New Revision: 662 Log: [maven-release-plugin] copy for tag wao-1.5.3 Added: tags/wao-1.5.3/

1 0

[Suiviobsmer-commits] r661 - trunk
by tchemit＠users.labs.libre-entreprise.org Oct. 6, 2010

Oct. 6, 2010

Author: tchemit Date: 2010-10-06 23:54:27 +0000 (Wed, 06 Oct 2010) New Revision: 661 Log: use generic scm username Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-10-06 23:51:38 UTC (rev 660) +++ trunk/pom.xml 2010-10-06 23:54:27 UTC (rev 661) @@ -309,7 +309,7 @@ <scm> <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.5.3</connection> - <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.5.3</developerConnection> + <developerConnection>scm:svn:svn+ssh://${userame}@labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.5.3</developerConnection> <url>http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-1.5.3?root=suiviob…</url> </scm>

1 0

[Suiviobsmer-commits] r660 - in trunk: . wao-business wao-ui
by tchemit＠users.labs.libre-entreprise.org Oct. 6, 2010

Oct. 6, 2010

Author: tchemit Date: 2010-10-06 23:51:38 +0000 (Wed, 06 Oct 2010) New Revision: 660 Log: [maven-release-plugin] prepare release wao-1.5.3 Modified: trunk/pom.xml trunk/wao-business/pom.xml trunk/wao-ui/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-10-06 19:36:05 UTC (rev 659) +++ trunk/pom.xml 2010-10-06 23:51:38 UTC (rev 660) @@ -15,7 +15,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>1.5.3-SNAPSHOT</version> + <version>1.5.3</version> <modules> <module>wao-ui</module> @@ -308,9 +308,9 @@  <scm> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk</connection> - <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk</developerConnection> - <url>http://labs.libre-entreprise.org/scm/viewvc.php/trunk/?root=suiviobsmer</url> + <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.5.3</connection> + <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.5.3</developerConnection> + <url>http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-1.5.3?root=suiviob…</url> </scm> <build> Modified: trunk/wao-business/pom.xml =================================================================== --- trunk/wao-business/pom.xml 2010-10-06 19:36:05 UTC (rev 659) +++ trunk/wao-business/pom.xml 2010-10-06 23:51:38 UTC (rev 660) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>1.5.3-SNAPSHOT</version> + <version>1.5.3</version> </parent> <groupId>fr.ifremer.wao</groupId> @@ -204,9 +204,9 @@ </build> <scm> - <url>http://labs.libre-entreprise.org/scm/viewvc.php/trunk/wao-business/?root=su…</url> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-business</connection> - <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-business</developerConnection> + <url>http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-1.5.3/?root=suivio…</url> + <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.5.3/wao-business</connection> + <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.5.3/wao-business</developerConnection> </scm>  Modified: trunk/wao-ui/pom.xml =================================================================== --- trunk/wao-ui/pom.xml 2010-10-06 19:36:05 UTC (rev 659) +++ trunk/wao-ui/pom.xml 2010-10-06 23:51:38 UTC (rev 660) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>1.5.3-SNAPSHOT</version> + <version>1.5.3</version> </parent> <groupId>fr.ifremer.wao</groupId> @@ -227,9 +227,9 @@ </repositories> <scm> - <url>http://labs.libre-entreprise.org/scm/viewvc.php/trunk/wao-ui/?root=suiviobs…</url> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-ui</connection> - <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-ui</developerConnection> + <url>http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-1.5.3/?root=suivio…</url> + <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.5.3/wao-ui</connection> + <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.5.3/wao-ui</developerConnection> </scm> </project>

1 0

[Suiviobsmer-commits] r659 - trunk/src/announcement
by fdesbois＠users.labs.libre-entreprise.org Oct. 6, 2010

Oct. 6, 2010

Author: fdesbois Date: 2010-10-06 19:36:05 +0000 (Wed, 06 Oct 2010) New Revision: 659 Log: Add annoucement for 1.5.3 Added: trunk/src/announcement/release-email-1.5.3.txt Added: trunk/src/announcement/release-email-1.5.3.txt =================================================================== --- trunk/src/announcement/release-email-1.5.3.txt (rev 0) +++ trunk/src/announcement/release-email-1.5.3.txt 2010-10-06 19:36:05 UTC (rev 659) @@ -0,0 +1,34 @@ + +La nouvelle version 1.5.3 de l'applicatif Wao est disponible ! + +Nouveautés : + +- Changement de license vers AGPL [fdesbois-Evo #2505] + +Résolution d'anomalies : + +- Import des commentaires sur contact ne fonctionne pas. [fdesbois-Ano #2500] +- Le commentaire obligatoire sur un refus n'est pas pris en compte après un + message d'erreur. [fdesbois-Ano #2506] +- Commentaire obligatoire sur refus non abouti depuis refus définitif. + [fdesbois-Ano #2440] + +Mise à jour librairie : + +- Nuiton-utils 1.3.1 -> 1.4.2 [http://maven-site.nuiton.org/nuiton-utils] +- ToPIA 2.4.2 -> 2.4.3 [http://maven-site.nuiton.org/topia/topia-persistence] +- EUGene 2.1.1 -> 2.2 [http://maven-site.nuiton.org/eugene] +- mavenpom4labs 2.2.3 -> 2.2.6 [http://maven-site.nuiton.org/mavenpom/mavenpom4labs] + +Documentation : + +http://suiviobsmer.labs.libre-entreprise.org/wao/ + +Téléchargement : + +https://labs.libre-entreprise.org/frs/?group_id=154 + +Cordialement, + +L'équipe Wao +

1 0

[Suiviobsmer-commits] r658 - in trunk/wao-ui/src/main/webapp: . css
by fdesbois＠users.labs.libre-entreprise.org Oct. 6, 2010

Oct. 6, 2010

Author: fdesbois Date: 2010-10-06 19:35:53 +0000 (Wed, 06 Oct 2010) New Revision: 658 Log: Move imports from administration over company and user configuration Modified: trunk/wao-ui/src/main/webapp/Administration.tml trunk/wao-ui/src/main/webapp/css/common.css Modified: trunk/wao-ui/src/main/webapp/Administration.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Administration.tml 2010-10-04 20:54:16 UTC (rev 657) +++ trunk/wao-ui/src/main/webapp/Administration.tml 2010-10-06 19:35:53 UTC (rev 658) @@ -30,31 +30,8 @@ <t:layout t:pageTitle="Administration" t:contentId="so-admin" xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" xmlns:p="tapestry:parameter"> - <t:if t:test="currentUser.admin"> - <t:importFieldSet t:label="des zones de pêche" t:engine="fishingZoneImportEngine" /> - <t:importFieldSet t:label="du plan d'échantillonnage" t:engine="samplingPlanImportEngine" /> - <t:importFieldSet t:label="des navires" t:engine="boatImportEngine" /> - - <t:unless t:test="activityCalendarImportRun"> - <div class="clearfix"> - <t:importFieldSet t:label="des calendriers d'activité" t:engine="activityCalendarImportEngine"> - <t:logFile t:source="activityCalendarAccessLogFile" t:title="des accès utilisateurs aux calendriers d'activité" t:icon="context:img/text-access-32px.png" /> - <t:logFile t:source="activityCalendarLogFile" t:title="de l'import des calendriers d'activité" t:icon="context:img/text-32px.png" /> - </t:importFieldSet> - </div> - <p:else> - <div class="fb-info"> - Import des calendriers d'activité en cours. <br /> - Vous pouvez continuer à naviguer sur le site en attendant la fin du chargement. - </div> - </p:else> - </t:unless> - - <t:importFieldSet t:label="des coordonnées des quartiers des navires" t:engine="boatDistrictImportEngine" t:format="KML" /> - </t:if> - <t:if t:test="currentUser.admin"> <form class="actions clearfix" t:type="form" t:id="actionsForm"> <div class="fields fleft"> @@ -164,4 +141,33 @@ </fieldset> </t:if> + <div class="mtop30" /> + + <t:if t:test="currentUser.admin"> + <t:importFieldSet t:label="des zones de pêche" t:engine="fishingZoneImportEngine" /> + + <t:importFieldSet t:label="du plan d'échantillonnage" t:engine="samplingPlanImportEngine" /> + + <t:importFieldSet t:label="des navires" t:engine="boatImportEngine" /> + + <t:unless t:test="activityCalendarImportRun"> + <div class="clearfix"> + <t:importFieldSet t:label="des calendriers d'activité" t:engine="activityCalendarImportEngine"> + <t:logFile t:source="activityCalendarAccessLogFile" t:title="des accès utilisateurs aux calendriers d'activité" t:icon="context:img/text-access-32px.png" /> + <t:logFile t:source="activityCalendarLogFile" t:title="de l'import des calendriers d'activité" t:icon="context:img/text-32px.png" /> + </t:importFieldSet> + </div> + <p:else> + <div class="fb-info"> + Import des calendriers d'activité en cours. <br /> + Vous pouvez continuer à naviguer sur le site en attendant la fin du chargement. + </div> + </p:else> + </t:unless> + + <t:importFieldSet t:label="des coordonnées des quartiers des navires" t:engine="boatDistrictImportEngine" t:format="KML" /> + </t:if> + + <div class="mtop10" /> + </t:layout> Modified: trunk/wao-ui/src/main/webapp/css/common.css =================================================================== --- trunk/wao-ui/src/main/webapp/css/common.css 2010-10-04 20:54:16 UTC (rev 657) +++ trunk/wao-ui/src/main/webapp/css/common.css 2010-10-06 19:35:53 UTC (rev 658) @@ -120,6 +120,14 @@ margin-top: 5px; } +.mtop10 { + margin-top: 10px; +} + +.mtop30 { + margin-top: 30px; +} + /* Lien sur une image */ a.img { text-decoration:none;

1 0

[Suiviobsmer-commits] r657 - trunk
by fdesbois＠users.labs.libre-entreprise.org Oct. 4, 2010

Oct. 4, 2010

Author: fdesbois Date: 2010-10-04 20:54:16 +0000 (Mon, 04 Oct 2010) New Revision: 657 Log: Ano #2500 validated Modified: trunk/changelog.txt Modified: trunk/changelog.txt =================================================================== --- trunk/changelog.txt 2010-10-04 20:52:58 UTC (rev 656) +++ trunk/changelog.txt 2010-10-04 20:54:16 UTC (rev 657) @@ -14,6 +14,7 @@ Anomalies +++++++++ +- [fdesbois] Ano #2500 : Import des commentaires sur contact ne fonctionne pas. - [fdesbois] Ano #2506 : Le commentaire obligatoire sur un refus n'est pas pris en compte après un message d'erreur. - [fdesbois] Ano #2440 : Commentaire obligatoire sur refus non abouti depuis

1 0

[Suiviobsmer-commits] r656 - trunk
by fdesbois＠users.labs.libre-entreprise.org Oct. 4, 2010

Oct. 4, 2010

Author: fdesbois Date: 2010-10-04 20:52:58 +0000 (Mon, 04 Oct 2010) New Revision: 656 Log: Update changelog with other Ano newly created but previously resolved Modified: trunk/changelog.txt Modified: trunk/changelog.txt =================================================================== --- trunk/changelog.txt 2010-10-04 12:20:25 UTC (rev 655) +++ trunk/changelog.txt 2010-10-04 20:52:58 UTC (rev 656) @@ -14,6 +14,8 @@ Anomalies +++++++++ +- [fdesbois] Ano #2506 : Le commentaire obligatoire sur un refus n'est pas pris + en compte après un message d'erreur. - [fdesbois] Ano #2440 : Commentaire obligatoire sur refus non abouti depuis refus définitif.

1 0

[Suiviobsmer-commits] r655 - in trunk/src/site: resources/user rst/user
by jcouteau＠users.labs.libre-entreprise.org Oct. 4, 2010

Oct. 4, 2010

Author: jcouteau Date: 2010-10-04 12:20:25 +0000 (Mon, 04 Oct 2010) New Revision: 655 Log: Add PDF doc about creating and modificating a contact Added: trunk/src/site/resources/user/Guide_WAO-creer_modifier_contact_V1.pdf Modified: trunk/src/site/rst/user/createAContact.rst Added: trunk/src/site/resources/user/Guide_WAO-creer_modifier_contact_V1.pdf =================================================================== (Binary files differ) Property changes on: trunk/src/site/resources/user/Guide_WAO-creer_modifier_contact_V1.pdf ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/src/site/rst/user/createAContact.rst =================================================================== --- trunk/src/site/rst/user/createAContact.rst 2010-10-03 17:34:06 UTC (rev 654) +++ trunk/src/site/rst/user/createAContact.rst 2010-10-04 12:20:25 UTC (rev 655) @@ -64,3 +64,11 @@ :width: 800px .. _documentation: contacts.html + +4. Documentation récapitulative +------------------------------- + +Un `document PDF`_ reprend la création et la gestion de contacts, même si un +navire n'est pas associé à une ligne du plan. + +.. _document PDF: Guide_WAO-creer_modifier_contact_V1.pdf

1 0

[Suiviobsmer-commits] r654 - in trunk: . wao-ui/src/main/java/fr/ifremer/wao/ui/pages wao-ui/src/main/webapp/js
by fdesbois＠users.labs.libre-entreprise.org Oct. 3, 2010

Oct. 3, 2010

Author: fdesbois Date: 2010-10-03 17:34:06 +0000 (Sun, 03 Oct 2010) New Revision: 654 Log: Ano #2440 : Improve restriction on comment needed for unfinished state : - didn't work if errors appears in form Modified: trunk/changelog.txt trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java trunk/wao-ui/src/main/webapp/js/contacts.js Modified: trunk/changelog.txt =================================================================== --- trunk/changelog.txt 2010-10-03 16:15:23 UTC (rev 653) +++ trunk/changelog.txt 2010-10-03 17:34:06 UTC (rev 654) @@ -14,6 +14,9 @@ Anomalies +++++++++ +- [fdesbois] Ano #2440 : Commentaire obligatoire sur refus non abouti depuis + refus définitif. + Mise à jour librairies ++++++++++++++++++++++ Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java 2010-10-03 16:15:23 UTC (rev 653) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java 2010-10-03 17:34:06 UTC (rev 654) @@ -684,6 +684,18 @@ " du jour"); } + if (logger.isDebugEnabled()) { + logger.debug("IsUnfinished : " + contactState.isUnfinishedState()); + logger.debug("OldUnfinished : " + oldState.isUnfinishedState()); + + String newComment = contactEdited.getComment(); + boolean commentDefined = StringUtils.isNotEmpty(newComment); + boolean commentChanged = commentDefined && !newComment.equals(oldComment); + + logger.debug("commentDefined : " + commentDefined); + logger.debug("commentChanged : " + commentChanged); + } + // Non abouti, Refus ou Refus Définitif if (contactState.isUnfinishedState()) { String newComment = contactEdited.getComment(); @@ -693,7 +705,8 @@ !newComment.equals(oldComment); // Ano #2440 : no restriction if previous state is unfinished - if (oldState.isUnfinishedState() || commentChanged) { + if (oldState.isUnfinishedState() && + StringUtils.isNotEmpty(newComment) || commentChanged) { // RAZ des champs contactEdited.setTideBeginDate(null); @@ -785,7 +798,8 @@ private String extraComment; protected void addCommentScript() { - renderSupport.addScript("commentController = new ContactComment();"); + renderSupport.addScript("commentController = new ContactComment('" + + contactsForm.getClientId() + "');"); } /** @@ -818,6 +832,9 @@ */ public JSONObject getCommentData() { JSONObject json = new JSONObject(); + if (isEditionMode()) { + json.put("formId", contactsForm.getClientId()); + } json.put("id", contact.getId()); json.put("edited", isEditionMode()); json.put("unfinished", contact.getContactState().isUnfinishedState()); Modified: trunk/wao-ui/src/main/webapp/js/contacts.js =================================================================== --- trunk/wao-ui/src/main/webapp/js/contacts.js 2010-10-03 16:15:23 UTC (rev 653) +++ trunk/wao-ui/src/main/webapp/js/contacts.js 2010-10-03 17:34:06 UTC (rev 654) @@ -28,7 +28,6 @@ ContactComment = Class.create({ initialize: function() { this.commentForm = $('commentForm'); - this.contactForm = $('contactsForm'); this.image = $('commentImage'); this.invalidImage = $('commentInvalidImage'); @@ -39,19 +38,29 @@ /** * Open the commentWindow :: * Use JSON to initialize data from template : - * - contact.edited : if a contact is currently in edition - * - contact.comment : comment value to initialize - * - contact.unfinished : if contact is in unfinished state - * - contact.id : id of the contact (used to save directly the comment) + * - data.edited : if a contact is currently in edition + * - data.comment : comment value to initialize + * - data.unfinished : if contact is in unfinished state + * - data.id : id of the contact (used to save directly the comment) + * - data.formId : id of the contactsForm in edition mode (edited = true) */ - openWindow: function(contact) { - this.editionMode = contact.edited; - this.oldContact = contact; + openWindow: function(data) { + this.editionMode = data.edited; + this.oldUnfinished = data.unfinished; + this.oldComment = data.comment; - // Edit current comment from contactForm - this.commentForm.editComment.setValue($F(this.contactForm.comment)); - this.commentForm.hiddenContactId.setValue(contact.id); + // Init comment from argument + var comment = data.comment; + if (data.formId) { + // Init contactsForm + this.contactForm = $(data.formId); + comment = $F(this.contactForm.comment); + } + // Update commentForm + this.commentForm.editComment.setValue(comment); + this.commentForm.hiddenContactId.setValue(data.id); + this.window.showCenter(true); }, /** @@ -67,25 +76,27 @@ } else { // Refresh edition form with comment var newComment = $F(this.commentForm.editComment); - this.refreshCommentImage(newComment && this.oldContact.comment != newComment); + this.refreshCommentImage(newComment); this.contactForm.comment.setValue(newComment); } this.window.close(); }, /** - * Return true if current state has changed and becomes unfinished + * Return true if current state has changed and becomes unfinished. + * NewComment need to be defined. */ - isCommentMandatory: function() { + isCommentValid: function(newComment) { - var previouslyUnfinished = this.oldContact.unfinished; var currentState = $F(this.contactForm.contactState); - var becomesUnfinished = currentState == 'BOAT_UNAVAILABLE' || + var isUnfinished = currentState == 'BOAT_UNAVAILABLE' || currentState == 'BOAT_REFUSED' || currentState == 'BOAT_DEFINITIVE_REFUSED'; - return becomesUnfinished && !previouslyUnfinished; + var becomesUnfinished = isUnfinished && !this.oldUnfinished; + + return newComment && (isUnfinished || becomesUnfinished); }, /** * Refresh the comment image (only in edition mode) :: @@ -93,16 +104,16 @@ * provides by return value of isCommentMandatory() function. * - param : commentChanged boolean, true if comment has changed */ - refreshCommentImage: function(commentChanged) { + refreshCommentImage: function(newComment) { // VALID - if (commentChanged) { + if (newComment && this.oldComment != newComment) { this.showImage(this.validImage); this.hideImage(this.invalidImage); this.hideImage(this.image); // INVALID - } else if (this.isCommentMandatory()) { + } else if (!this.isCommentValid(newComment)) { this.showImage(this.invalidImage); this.hideImage(this.validImage); this.hideImage(this.image); @@ -129,14 +140,16 @@ ContactSendEmail = Class.create({ initialize: function(message, contactState) { - this.contactForm = $('contactsForm'); this.contactState = contactState; this.message = message; - this.contactForm.saveContact.observe('click', this.doConfirm.bind(this)); + $('contactsForm').saveContact.observe('click', this.doConfirm.bind(this)); }, doConfirm: function(event) { - if ($F(this.contactForm.contactState) == this.contactState && confirm(this.message)) { - this.contactForm.hiddenSendEmail.setValue(true); + + var contactForm = event.element().form; + + if ($F(contactForm.contactState) == this.contactState && confirm(this.message)) { + contactForm.hiddenSendEmail.setValue(true); } } });

1 0