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

[Suiviobsmer-commits] r544 - in trunk/wao-ui/src/main: java/fr/ifremer/wao/ui/pages webapp/js
by fdesbois＠users.labs.libre-entreprise.org 17 Jun '10

17 Jun '10

Author: fdesbois Date: 2010-06-17 15:09:30 +0000 (Thu, 17 Jun 2010) New Revision: 544 Log: Evo #2333 : Use proper Javascript NewsHider class to hide news details Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Index.java trunk/wao-ui/src/main/webapp/js/wao.js Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Index.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Index.java 2010-06-17 13:48:37 UTC (rev 543) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Index.java 2010-06-17 15:09:30 UTC (rev 544) @@ -35,6 +35,7 @@ import org.apache.tapestry5.Asset2; import org.apache.tapestry5.PersistenceConstants; import org.apache.tapestry5.RenderSupport; +import org.apache.tapestry5.annotations.IncludeJavaScriptLibrary; import org.apache.tapestry5.annotations.IncludeStylesheet; import org.apache.tapestry5.annotations.Log; import org.apache.tapestry5.annotations.Path; @@ -58,6 +59,7 @@ */ @RequiresAuthentication @IncludeStylesheet("context:css/news.css") + at IncludeJavaScriptLibrary("context:js/NewsHider.js") public class Index { @Inject @@ -92,9 +94,10 @@ @Inject private RenderSupport renderSupport; - public void beginRender() { + public void afterRender() { // Hide news details depends on an anchor named 'details' in news.getContent() - renderSupport.addScript("hideNewsDetails();"); + renderSupport.addScript("newsHider = new NewsHider();\n" + + "newsHider.hideAllNewsDetails();"); } @Log Modified: trunk/wao-ui/src/main/webapp/js/wao.js =================================================================== --- trunk/wao-ui/src/main/webapp/js/wao.js 2010-06-17 13:48:37 UTC (rev 543) +++ trunk/wao-ui/src/main/webapp/js/wao.js 2010-06-17 15:09:30 UTC (rev 544) @@ -103,48 +103,48 @@ // } //} -function toggleNewsDetails(element) { - $(element).toggleClassName('hidden'); -} - -function hideNewsDetails() { - var allNews = $('so-news').select('div.news-content'); - // Tapestry.debug('nb news : ' + contentsArray.length); - - for (j = 0; j < allNews.length; j++) { - var news = allNews[j]; - // Select all paragraphs in the news - // Tapestry.debug('nb paragraphs in news : ' + paragraphs.length); - var paragraphs = news.select('p'); - - for (i = 0; i < paragraphs.length; i++) { - var paragraph = paragraphs[i]; - - // Check the firstDescendant in the paragraph, we take only anchor called 'details' - if (paragraph.firstDescendant() && paragraph.firstDescendant().match('a[name="details"]')) { - var anchor = paragraph.firstDescendant(); - // Tapestry.debug('find anchor : ' + anchor); - - // Prepare the hidden block - var detailsContent = document.createElement('div'); - detailsContent.id = 'news-details-content-' + j; - detailsContent.addClassName('hidden'); - - // Update params of the anchor to be clickable - anchor.update('Lire la suite...'); - anchor.addClassName('news-details-link'); - anchor.writeAttribute('onclick', 'toggleNewsDetails("' + detailsContent.id + '")'); - - // Retrieve siblings paragraphs to wrap them into the hidden detailsContent - var otherParagraphs = paragraph.nextSiblings(); - for (k = 0; k < otherParagraphs.length; k++) { - detailsContent.appendChild(otherParagraphs[k]); - } - - // append the hidden block to the news - news.appendChild(detailsContent); - break; - } - } - } -} +//function toggleNewsDetails(element) { +// $(element).toggleClassName('hidden'); +//} +// +//function hideNewsDetails() { +// var allNews = $('so-news').select('div.news-content'); +// // Tapestry.debug('nb news : ' + contentsArray.length); +// +// for (j = 0; j < allNews.length; j++) { +// var news = allNews[j]; +// // Select all paragraphs in the news +// // Tapestry.debug('nb paragraphs in news : ' + paragraphs.length); +// var paragraphs = news.select('p'); +// +// for (i = 0; i < paragraphs.length; i++) { +// var paragraph = paragraphs[i]; +// +// // Check the firstDescendant in the paragraph, we take only anchor called 'details' +// if (paragraph.firstDescendant() && paragraph.firstDescendant().match('a[name="details"]')) { +// var anchor = paragraph.firstDescendant(); +// // Tapestry.debug('find anchor : ' + anchor); +// +// // Prepare the hidden block +// var detailsContent = document.createElement('div'); +// detailsContent.id = 'news-details-content-' + j; +// detailsContent.addClassName('hidden'); +// +// // Update params of the anchor to be clickable +// anchor.update('Lire la suite...'); +// anchor.addClassName('news-details-link'); +// anchor.writeAttribute('onclick', 'toggleNewsDetails("' + detailsContent.id + '")'); +// +// // Retrieve siblings paragraphs to wrap them into the hidden detailsContent +// var otherParagraphs = paragraph.nextSiblings(); +// for (k = 0; k < otherParagraphs.length; k++) { +// detailsContent.appendChild(otherParagraphs[k]); +// } +// +// // append the hidden block to the news +// news.appendChild(detailsContent); +// break; +// } +// } +// } +//}

1 0

[Suiviobsmer-commits] r543 - in trunk/wao-ui/src/main: java/fr/ifremer/wao/ui/services resources/fr/ifremer/wao/ui/pages webapp webapp/css
by fdesbois＠users.labs.libre-entreprise.org 17 Jun '10

17 Jun '10

Author: fdesbois Date: 2010-06-17 13:48:37 +0000 (Thu, 17 Jun 2010) New Revision: 543 Log: Evo #2332 : Improve css style Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/ContactModelFactory.java trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Contacts.properties trunk/wao-ui/src/main/webapp/Contacts.tml trunk/wao-ui/src/main/webapp/css/common.css trunk/wao-ui/src/main/webapp/css/contacts.css Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/ContactModelFactory.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/ContactModelFactory.java 2010-06-17 13:07:45 UTC (rev 542) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/ContactModelFactory.java 2010-06-17 13:48:37 UTC (rev 543) @@ -91,8 +91,10 @@ public BeanModel<Contact> buildCoordinatorContactModel(BeanModelSource beanModelSource, ComponentResources resources) { BeanModel<Contact> contactModel = buildContactModel(beanModelSource, resources); - contactModel.add(RelativePosition.AFTER, "validation", "commentCoordinator", getCommentCoordinatorPropertyConduit()); - contactModel.add(RelativePosition.AFTER, "commentCoordinator", "commentAdmin", getCommentAdminPropertyConduit()); + contactModel.add(RelativePosition.AFTER, "validation", Contact.COMMENT_COORDINATOR, getCommentCoordinatorPropertyConduit()); + contactModel.add(RelativePosition.AFTER, Contact.COMMENT_COORDINATOR, Contact.COMMENT_ADMIN, getCommentAdminPropertyConduit()); + contactModel.get(Contact.COMMENT_COORDINATOR).sortable(false); + contactModel.get(Contact.COMMENT_ADMIN).sortable(false); return contactModel; } Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Contacts.properties =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Contacts.properties 2010-06-17 13:07:45 UTC (rev 542) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Contacts.properties 2010-06-17 13:48:37 UTC (rev 543) @@ -56,6 +56,8 @@ fishingZoneSector-label: Zone fishingZoneDivision-label: Division validation-label: Validations +commentAdmin-label: Com. admin +commentCoordinator-label: Com. soci\u00e9t\u00e9 # Form labels contactsForm-errors-banner: Le contact n'a pas \u00e9t\u00e9 sauvegard\u00e9 \u00e0 cause des erreurs suivantes : Modified: trunk/wao-ui/src/main/webapp/Contacts.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Contacts.tml 2010-06-17 13:07:45 UTC (rev 542) +++ trunk/wao-ui/src/main/webapp/Contacts.tml 2010-06-17 13:48:37 UTC (rev 543) @@ -322,7 +322,7 @@ <t:if t:test="editionMode"> <img src="${asset:context:img/comment-unavailable-22px.png}" alt="Add comment" /> <p:else> - <a onclick="commentController.openWindow(${commentData});"> + <a class="link" onclick="commentController.openWindow(${commentData});"> <img src="${asset:context:img/comment-22px.png}" alt="Add comment" /> </a> </p:else> @@ -333,7 +333,7 @@ </form> </t:zone> <div t:type="ck/Window" t:id="commentWindow" t:show="false" t:modal="true" - title="literal:Ajouter un commentaire" t:width="550" t:height="230"> + title="literal:Ajouter un commentaire" t:width="510" t:height="195"> <form t:type="form" t:id="commentForm" action="tapestry"> <p> <textarea t:type="textarea" t:id="editComment" t:value="extraComment" cols="50" rows="7" /> Modified: trunk/wao-ui/src/main/webapp/css/common.css =================================================================== --- trunk/wao-ui/src/main/webapp/css/common.css 2010-06-17 13:07:45 UTC (rev 542) +++ trunk/wao-ui/src/main/webapp/css/common.css 2010-06-17 13:48:37 UTC (rev 543) @@ -48,6 +48,10 @@ display:block; } +.link { + cursor: pointer; +} + .hidden { display: none; } Modified: trunk/wao-ui/src/main/webapp/css/contacts.css =================================================================== --- trunk/wao-ui/src/main/webapp/css/contacts.css 2010-06-17 13:07:45 UTC (rev 542) +++ trunk/wao-ui/src/main/webapp/css/contacts.css 2010-06-17 13:48:37 UTC (rev 543) @@ -142,6 +142,8 @@ white-space: nowrap; } +div#so-contacts table.t-data-grid tbody tr td.commentCoordinator, +div#so-contacts table.t-data-grid tbody tr td.commentAdmin, div#so-contacts table.t-data-grid tbody tr td.comment { white-space: normal; width: 100px;

1 0

[Suiviobsmer-commits] r542 - trunk/wao-ui/src/main/webapp/js
by fdesbois＠users.labs.libre-entreprise.org 17 Jun '10

17 Jun '10

Author: fdesbois Date: 2010-06-17 13:07:45 +0000 (Thu, 17 Jun 2010) New Revision: 542 Log: Ano #687 : Add test Modified: trunk/wao-ui/src/main/webapp/js/ContactComment.js Modified: trunk/wao-ui/src/main/webapp/js/ContactComment.js =================================================================== --- trunk/wao-ui/src/main/webapp/js/ContactComment.js 2010-06-16 20:43:42 UTC (rev 541) +++ trunk/wao-ui/src/main/webapp/js/ContactComment.js 2010-06-17 13:07:45 UTC (rev 542) @@ -22,7 +22,7 @@ * - 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 contact) + * - contact.id : id of the contact (used to save directly the comment) */ openWindow: function(contact) { this.editionMode = contact.edited;

1 0

[Suiviobsmer-commits] r541 - trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages
by fdesbois＠users.labs.libre-entreprise.org 16 Jun '10

16 Jun '10

Author: fdesbois Date: 2010-06-16 20:43:42 +0000 (Wed, 16 Jun 2010) New Revision: 541 Log: Evo #2332 : Add javadoc Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java 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-06-16 20:39:29 UTC (rev 540) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java 2010-06-16 20:43:42 UTC (rev 541) @@ -729,11 +729,21 @@ @Environmental private RenderSupport renderSupport; + /** + * Instantiate the commentController javascript. + */ @Log void afterRender() { renderSupport.addScript("commentController = new ContactComment();"); } + /** + * Retrieve the current contact comment depends on edition. Also a comment + * can be added separatly by admin or coordinator. + * + * @return the current contact comment used for edition in commentWindow + * @see #getCommentData() + */ public String getContactComment() { String comment = null; if (isEditionMode()) { @@ -749,6 +759,12 @@ return comment == null ? "" : comment.replace("'", "\'"); } + /** + * Prepare comment data for commentController javascript. This data is + * used to open the comment window in javascript. + * + * @return a JSONObject that contains data needed for javascript + */ public JSONObject getCommentData() { JSONObject json = new JSONObject(); json.put("id", contact.getId());

1 0

[Suiviobsmer-commits] r540 - in trunk/wao-ui/src/main: java/fr/ifremer/wao/ui/pages webapp webapp/img webapp/js
by fdesbois＠users.labs.libre-entreprise.org 16 Jun '10

16 Jun '10

Author: fdesbois Date: 2010-06-16 20:39:29 +0000 (Wed, 16 Jun 2010) New Revision: 540 Log: Evo #2332 : Clean previous code for comment popup in edition mode : use a proper ContactComment prototype class. Added: trunk/wao-ui/src/main/webapp/img/comment-unavailable-22px.png trunk/wao-ui/src/main/webapp/js/ContactComment.js Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java trunk/wao-ui/src/main/webapp/Contacts.tml trunk/wao-ui/src/main/webapp/js/wao.js 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-06-16 19:12:34 UTC (rev 539) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java 2010-06-16 20:39:29 UTC (rev 540) @@ -61,6 +61,7 @@ import org.apache.tapestry5.RenderSupport; import org.apache.tapestry5.StreamResponse; import org.apache.tapestry5.annotations.Environmental; +import org.apache.tapestry5.annotations.IncludeJavaScriptLibrary; import org.apache.tapestry5.annotations.IncludeStylesheet; import org.apache.tapestry5.annotations.InjectComponent; import org.apache.tapestry5.annotations.Log; @@ -89,6 +90,7 @@ */ @RequiresAuthentication({UserRole.ADMIN, UserRole.COORDINATOR, UserRole.OBSERVER}) @IncludeStylesheet("context:css/contacts.css") + at IncludeJavaScriptLibrary("context:js/ContactComment.js") public class Contacts extends AbstractFilteredPage { @Inject @@ -729,20 +731,33 @@ @Log void afterRender() { - renderSupport.addScript("extraComment = new ExtraComment();"); + renderSupport.addScript("commentController = new ContactComment();"); } - public String getValidationComment() { + public String getContactComment() { String comment = null; - switch (user.getRole()) { - case ADMIN: - comment = contact.getCommentAdmin(); break; - case COORDINATOR: - comment = contact.getCommentCoordinator(); + if (isEditionMode()) { + comment = contact.getComment(); + } else { + switch (user.getRole()) { + case ADMIN: + comment = contact.getCommentAdmin(); break; + case COORDINATOR: + comment = contact.getCommentCoordinator(); + } } return comment == null ? "" : comment.replace("'", "\'"); } + public JSONObject getCommentData() { + JSONObject json = new JSONObject(); + json.put("id", contact.getId()); + json.put("edited", isEditionMode()); + json.put("unfinished", contact.getContactState().isUnfinishedState()); + json.put("comment", getContactComment()); + return json; + } + @Log void onSuccessFromCommentForm() { serviceContact.saveComment(contactId, user.getRole(), extraComment); Modified: trunk/wao-ui/src/main/webapp/Contacts.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Contacts.tml 2010-06-16 19:12:34 UTC (rev 539) +++ trunk/wao-ui/src/main/webapp/Contacts.tml 2010-06-16 20:39:29 UTC (rev 540) @@ -259,29 +259,18 @@ </t:if> </p:dataInputDateCell> <p:commentCell> - <t:if t:test="editionMode"> -  - <a href="#" onclick="openCommentWindow(windowComment, 'commentPopup', 'contact-comment', ${contact.contactState.isUnfinishedState()})"> - <img src="${asset:context:img/comment-22px.png}" id="commentImg" alt="Add comment" /> - </a> -  - - <textarea t:type="textarea" t:id="comment" class="hidden contact-comment" value="contactEdited.comment" /> + <t:if t:test="editionMode"> - <div t:type="ck/Window" t:id="windowComment" show="false" modal="true" - title="literal:Ajouter un commentaire" width="500" height="215"> - <p> - <textarea id="commentPopup" cols="50" rows="7" /> - </p> - <p> </p> - <p class="aright"> - <a onclick="closeCommentWindow(windowComment, 'commentPopup', 'contact-comment', ${contact.contactState.isUnfinishedState()}, 'commentImg', '${asset:context:}')" class="save"> - <img src="${asset:context:img/save-22px.png}" alt="Save comment" title="Enregistrer le commentaire"/> - </a> -   - </p> - </div> + <a onclick="commentController.openWindow(${commentData})" title="Ajouter un commentaire"> + <img id="commentImage" src="${asset:context:img/comment-22px.png}" alt="Ajout commentaire" /> + <img id="commentInvalidImage" class="hidden" src="${asset:context:img/comment-invalid-22px.png}" + alt="Commentaire non valide" title="Le commentaire est obligatoire pour un échec" /> + <img id="commentValidImage" class="hidden" src="${asset:context:img/comment-valid-22px.png}" + alt="Commentaire valide" title="Le commentaire a bien été ajouté" /> + </a> + <textarea t:type="textarea" t:id="comment" class="hidden" value="contactEdited.comment" /> + <p:else> <t:if t:test="contact.comment"> <span t:type="ck/Tooltip" title="Commentaire" t:value="prop:commentTooltip" t:effect="appear"> @@ -330,12 +319,14 @@ <input t:type="submitContext" t:id="unvalidateContact" class="ico22px unvalidate" value="Unvalidate" t:context="contact.topiaId" title="Enlever la validation du contact" /> </t:if> -  - <a onclick="extraComment.openWindow('${validationComment}','${contact.id}');"> -  - <img src="${asset:context:img/comment-22px.png}" alt="Add comment" /> - </a> -  + <t:if t:test="editionMode"> + <img src="${asset:context:img/comment-unavailable-22px.png}" alt="Add comment" /> + <p:else> + <a onclick="commentController.openWindow(${commentData});"> + <img src="${asset:context:img/comment-22px.png}" alt="Add comment" /> + </a> + </p:else> + </t:if> </t:if> </p:actionsCell> </div> @@ -345,12 +336,12 @@ title="literal:Ajouter un commentaire" t:width="550" t:height="230"> <form t:type="form" t:id="commentForm" action="tapestry"> <p> - <textarea t:type="textarea" t:id="extraComment" t:value="extraComment" cols="50" rows="7" /> + <textarea t:type="textarea" t:id="editComment" t:value="extraComment" cols="50" rows="7" /> <input t:type="hidden" t:id="hiddenContactId" t:value="contactId" /> </p> <p> </p> <p class="aright"> - <a onclick="extraComment.saveComment()" class="save"> + <a onclick="commentController.saveComment()" class="save"> <img src="${asset:context:img/save-22px.png}" alt="Save comment"/> </a>   Added: trunk/wao-ui/src/main/webapp/img/comment-unavailable-22px.png =================================================================== (Binary files differ) Property changes on: trunk/wao-ui/src/main/webapp/img/comment-unavailable-22px.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/wao-ui/src/main/webapp/js/ContactComment.js =================================================================== --- trunk/wao-ui/src/main/webapp/js/ContactComment.js (rev 0) +++ trunk/wao-ui/src/main/webapp/js/ContactComment.js 2010-06-16 20:39:29 UTC (rev 540) @@ -0,0 +1,85 @@ +/** + * This class is used to manage comment window for contacts. Two possible cases : + * - comment from current edition + * - direct comment for coordinator or admin + * The differences are in saveComment method. The openWindow method is used + * in template using a JSONObject from Java that contains comment data. + */ +ContactComment = Class.create({ + initialize: function() { + this.commentForm = $('commentForm'); + this.contactForm = $('contactsForm'); + + this.image = $('commentImage'); + this.invalidImage = $('commentInvalidImage'); + this.validImage = $('commentValidImage'); + + this.window = commentWindow; + }, + /** + * 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 contact) + */ + openWindow: function(contact) { + this.editionMode = contact.edited; + this.oldComment = contact.comment; + this.contactUnfinished = contact.unfinished; + + this.commentForm.editComment.setValue(this.oldComment); + this.commentForm.hiddenContactId.setValue(contact.id); + + this.window.showCenter(true); + }, + /** + * Save the comment :: + * If form is in edition, the comment will be push in existing input 'comment' + * otherwise the commentForm will be submitted to save the comment + */ + saveComment: function() { + + if (!this.editionMode) { + // Execute commentForm to save directly the comment + this.commentForm.submit(); + } else { + // Refresh edition form with comment + this.newComment = $F(this.commentForm.editComment); + this.refreshCommentImage(); + this.contactForm.comment.setValue(this.newComment); + } + + this.window.close(); + }, + /** + * Refresh the comment image (only in edition mode) :: + * Depends on contactUnfinished value to know if errors can occurs on comment + */ + refreshCommentImage: function() { + if (this.contactUnfinished && (!this.newComment || this.oldComment == this.newComment)) { + this.showImage(this.invalidImage); + this.hideImage(this.validImage); + this.hideImage(this.image); + } else if (this.oldComment != this.newComment) { + this.showImage(this.validImage); + this.hideImage(this.invalidImage); + this.hideImage(this.image); + } else { + this.showImage(this.image); + this.hideImage(this.validImage); + this.hideImage(this.invalidImage); + } + }, + showImage: function(image) { + if (image.hasClassName('hidden')) { + image.removeClassName('hidden'); + } + }, + hideImage: function(image) { + if (!image.hasClassName('hidden')) { + image.addClassName('hidden'); + } + } +}); \ No newline at end of file Modified: trunk/wao-ui/src/main/webapp/js/wao.js =================================================================== --- trunk/wao-ui/src/main/webapp/js/wao.js 2010-06-16 19:12:34 UTC (rev 539) +++ trunk/wao-ui/src/main/webapp/js/wao.js 2010-06-16 20:39:29 UTC (rev 540) @@ -22,34 +22,34 @@ * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ -function openCommentWindow(window, commentPopupId, commentHiddenClass) { - window.showCenter(true); - var hidden = $$('.' + commentHiddenClass)[0]; - var value = hidden.getValue(); -// Tapestry.debug("unfinishedstate : " + unfinishedState); -// if (unfinishedState) { -// value += "\nRaison de l'échec :\n"; +//function openCommentWindow(window, commentPopupId, commentHiddenClass) { +// window.showCenter(true); +// var hidden = $$('.' + commentHiddenClass)[0]; +// var value = hidden.getValue(); +//// Tapestry.debug("unfinishedstate : " + unfinishedState); +//// if (unfinishedState) { +//// value += "\nRaison de l'échec :\n"; +//// } +// $(commentPopupId).setValue(value); +//} +// +//function closeCommentWindow(window, commentPopupId, commentHiddenClass, unfinishedState, imgId, context) { +// var hidden = $$('.' + commentHiddenClass)[0]; +// var oldValue = hidden.getValue(); +// var newValue = $F(commentPopupId); +// // TODO-fdesbois-2010-06-16 : use hidden images directly in tml instead of using context + imgId in argument +// var img = $(imgId); +// if ((unfinishedState && !newValue) || (unfinishedState && oldValue == newValue)) { +// img.setAttribute('src', context + '/img/comment-invalid-22px.png'); +// img.setAttribute('title', 'Le commentaire est obligatoire pour un échec'); +// } else if (oldValue != newValue) { +// img.setAttribute('src', context + '/img/comment-valid-22px.png'); +// img.setAttribute('title', 'Le commentaire a bien été ajouté'); // } - $(commentPopupId).setValue(value); -} +// hidden.setValue(newValue); +// window.close(); +//} -function closeCommentWindow(window, commentPopupId, commentHiddenClass, unfinishedState, imgId, context) { - var hidden = $$('.' + commentHiddenClass)[0]; - var oldValue = hidden.getValue(); - var newValue = $F(commentPopupId); - // TODO-fdesbois-2010-06-16 : use hidden images directly in tml instead of using context + imgId in argument - var img = $(imgId); - if ((unfinishedState && !newValue) || (unfinishedState && oldValue == newValue)) { - img.setAttribute('src', context + '/img/comment-invalid-22px.png'); - img.setAttribute('title', 'Le commentaire est obligatoire pour un échec'); - } else if (oldValue != newValue) { - img.setAttribute('src', context + '/img/comment-valid-22px.png'); - img.setAttribute('title', 'Le commentaire a bien été ajouté'); - } - hidden.setValue(newValue); - window.close(); -} - /** * Method used to refresh userRole select from a response. The response contains * data to create the select options : @@ -148,19 +148,3 @@ } } } - -ExtraComment = Class.create({ - initialize: function() { - this.commentForm = $('commentForm'); - this.window = commentWindow; - }, - openWindow: function(comment, contactId) { - this.commentForm.extraComment.setValue(comment); - this.commentForm.hiddenContactId.setValue(contactId); - this.window.showCenter(true); - }, - saveComment: function() { - this.commentForm.submit(); - this.window.close(); - } -});

1 0

[Suiviobsmer-commits] r539 - in trunk: wao-business/src/main/java/fr/ifremer/wao/entity wao-business/src/main/java/fr/ifremer/wao/service wao-business/src/main/resources/i18n wao-business/src/main/xmi wao-ui/src/main/java/fr/ifremer/wao/ui/pages wao-ui/src/main/java/fr/ifremer/wao/ui/services wao-ui/src/main/webapp wao-ui/src/main/webapp/js
by fdesbois＠users.labs.libre-entreprise.org 16 Jun '10

16 Jun '10

Author: fdesbois Date: 2010-06-16 19:12:34 +0000 (Wed, 16 Jun 2010) New Revision: 539 Log: Evo #2332 : - Add saveComment method in serviceContact - Add extra comments in ContactModelFactory - Use other window (better js usage) for extra comment (admin or coordinator) Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ContactImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java trunk/wao-business/src/main/resources/i18n/wao-business-en_GB.properties trunk/wao-business/src/main/resources/i18n/wao-business-fr_FR.properties trunk/wao-business/src/main/xmi/wao.zargo trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/ContactModelFactory.java trunk/wao-ui/src/main/webapp/Contacts.tml trunk/wao-ui/src/main/webapp/js/wao.js Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ContactImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ContactImpl.java 2010-06-16 13:22:34 UTC (rev 538) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ContactImpl.java 2010-06-16 19:12:34 UTC (rev 539) @@ -45,6 +45,11 @@ private static final long serialVersionUID = 1L; + @Override + public String getId() { + return getTopiaId(); + } + /** * Calculate the number of days between the tideBeginDate and the tideEndDate. * Automatically called when tideBeginDate or tideEndDate are modified. Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2010-06-16 13:22:34 UTC (rev 538) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2010-06-16 19:12:34 UTC (rev 539) @@ -39,6 +39,7 @@ import com.csvreader.CsvReader; import com.csvreader.CsvWriter; import fr.ifremer.wao.bean.ConnectedUser; +import fr.ifremer.wao.bean.UserRole; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.nuiton.topia.TopiaContext; @@ -269,6 +270,31 @@ } @Override + public Contact executeSaveComment(TopiaContext transaction, + String contactId, + UserRole userRole, + String comment) + throws TopiaException { + + ContactDAO dao = WaoDAOHelper.getContactDAO(transaction); + + Contact contactToUpdate = dao.findByTopiaId(contactId); + + switch (userRole) { + case ADMIN: + contactToUpdate.setCommentAdmin(comment); break; + case COORDINATOR: + contactToUpdate.setCommentCoordinator(comment); + } + + dao.update(contactToUpdate); + + transaction.commitTransaction(); + + return contactToUpdate; + } + + @Override public InputStream executeExportContactCsv(TopiaContext transaction, ContactFilter filter) throws Exception { Modified: trunk/wao-business/src/main/resources/i18n/wao-business-en_GB.properties =================================================================== --- trunk/wao-business/src/main/resources/i18n/wao-business-en_GB.properties 2010-06-16 13:22:34 UTC (rev 538) +++ trunk/wao-business/src/main/resources/i18n/wao-business-en_GB.properties 2010-06-16 19:12:34 UTC (rev 539) @@ -29,6 +29,7 @@ wao.error.serviceContact.getNbContacts= wao.error.serviceContact.getNewContact= wao.error.serviceContact.importContactCsv= +wao.error.serviceContact.saveComment= wao.error.serviceContact.saveContact= wao.error.serviceContact.updateSampleMonthTidesValue= wao.error.serviceNews.getNewNews= Modified: trunk/wao-business/src/main/resources/i18n/wao-business-fr_FR.properties =================================================================== --- trunk/wao-business/src/main/resources/i18n/wao-business-fr_FR.properties 2010-06-16 13:22:34 UTC (rev 538) +++ trunk/wao-business/src/main/resources/i18n/wao-business-fr_FR.properties 2010-06-16 19:12:34 UTC (rev 539) @@ -28,6 +28,7 @@ wao.error.serviceContact.getNbContacts=Impossible de compter le nombre de contacts filtr\u00E9s wao.error.serviceContact.getNewContact=Impossible d'instancier un nouveau contact wao.error.serviceContact.importContactCsv=Impossible d'importer les contacts +wao.error.serviceContact.saveComment= wao.error.serviceContact.saveContact=Impossible de sauvegarder le contact wao.error.serviceContact.updateSampleMonthTidesValue= wao.error.serviceNews.getNewNews= Modified: trunk/wao-business/src/main/xmi/wao.zargo =================================================================== (Binary files differ) 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-06-16 13:22:34 UTC (rev 538) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java 2010-06-16 19:12:34 UTC (rev 539) @@ -56,8 +56,11 @@ import org.apache.commons.lang.StringUtils; import org.apache.tapestry5.ComponentResources; import org.apache.tapestry5.Field; +import org.apache.tapestry5.Link; import org.apache.tapestry5.PersistenceConstants; +import org.apache.tapestry5.RenderSupport; import org.apache.tapestry5.StreamResponse; +import org.apache.tapestry5.annotations.Environmental; import org.apache.tapestry5.annotations.IncludeStylesheet; import org.apache.tapestry5.annotations.InjectComponent; import org.apache.tapestry5.annotations.Log; @@ -70,7 +73,9 @@ import org.apache.tapestry5.ioc.Messages; import org.apache.tapestry5.ioc.annotations.Inject; import org.apache.tapestry5.ioc.services.PropertyAccess; +import org.apache.tapestry5.json.JSONObject; import org.apache.tapestry5.services.BeanModelSource; +import org.apache.tapestry5.services.Request; import org.apache.tapestry5.upload.services.UploadedFile; import org.nuiton.util.DateUtils; import org.slf4j.Logger; @@ -312,9 +317,15 @@ public BeanModel<Contact> getContactModel() { if (contactModel == null) { - contactModel = fullView ? - contactModelFactory.buildAdminContactModel(beanModelSource, resources) : - contactModelFactory.buildContactModel(beanModelSource, resources); + + if (user.isAdmin() || user.isCoordinator()) { + contactModel = fullView ? + contactModelFactory.buildAdminContactModel(beanModelSource, resources) : + contactModelFactory.buildCoordinatorContactModel(beanModelSource, resources); + } else { + contactModel = + contactModelFactory.buildContactModel(beanModelSource, resources); + } } return contactModel; } @@ -433,7 +444,6 @@ contact.getDataInputDate() != null; return contact.getValidationCompany() == null && (state.isUnfinishedState() || boardingDone); - case OBSERVER: default: return false; } @@ -447,7 +457,6 @@ case COORDINATOR: return contact.getValidationCompany() != null && contact.getValidationProgram() == null; - case OBSERVER: default: return false; } @@ -666,7 +675,7 @@ @Log Object onSuccessFromContactsForm() { - if (!edited) { + if (!edited && contactEdited != null) { try { if (log.isDebugEnabled()) { log.debug("Contact save : " + contactEdited); @@ -706,4 +715,37 @@ layout.addError("Un contact en cours existe déjà pour ce navire"); } } + + /****************************** COMMENT POPUP *****************************/ + + @Property + private String contactId; + + @Property + private String extraComment; + + @Environmental + private RenderSupport renderSupport; + + @Log + void afterRender() { + renderSupport.addScript("extraComment = new ExtraComment();"); + } + + public String getValidationComment() { + String comment = null; + switch (user.getRole()) { + case ADMIN: + comment = contact.getCommentAdmin(); break; + case COORDINATOR: + comment = contact.getCommentCoordinator(); + } + return comment == null ? "" : comment.replace("'", "\'"); + } + + @Log + void onSuccessFromCommentForm() { + serviceContact.saveComment(contactId, user.getRole(), extraComment); + } + } Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/ContactModelFactory.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/ContactModelFactory.java 2010-06-16 13:22:34 UTC (rev 538) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/ContactModelFactory.java 2010-06-16 19:12:34 UTC (rev 539) @@ -89,8 +89,15 @@ return contactModel; } + public BeanModel<Contact> buildCoordinatorContactModel(BeanModelSource beanModelSource, ComponentResources resources) { + BeanModel<Contact> contactModel = buildContactModel(beanModelSource, resources); + contactModel.add(RelativePosition.AFTER, "validation", "commentCoordinator", getCommentCoordinatorPropertyConduit()); + contactModel.add(RelativePosition.AFTER, "commentCoordinator", "commentAdmin", getCommentAdminPropertyConduit()); + return contactModel; + } + public BeanModel<Contact> buildAdminContactModel(BeanModelSource beanModelSource, ComponentResources resources) { - BeanModel<Contact> contactModel = buildContactModel(beanModelSource, resources); + BeanModel<Contact> contactModel = buildCoordinatorContactModel(beanModelSource, resources); contactModel.exclude("createdBy"); contactModel.add(RelativePosition.AFTER, TopiaEntity.TOPIA_CREATE_DATE, "observer", getUserPropertyConduit()); contactModel.add(RelativePosition.AFTER, "observer", WaoUser.COMPANY, getCompanyPropertyConduit()); @@ -445,4 +452,52 @@ } }; } + + public PropertyConduit getCommentCoordinatorPropertyConduit() { + return new PropertyConduit() { + @Override + public Object get(Object arg0) { + Contact contact = (Contact)arg0; + return contact.getCommentCoordinator(); + } + + @Override + public void set(Object arg0, Object arg1) { + } + + @Override + public Class getPropertyType() { + return String.class; + } + + @Override + public <T extends Annotation> T getAnnotation(Class<T> arg0) { + return null; + } + }; + } + + public PropertyConduit getCommentAdminPropertyConduit() { + return new PropertyConduit() { + @Override + public Object get(Object arg0) { + Contact contact = (Contact)arg0; + return contact.getCommentAdmin(); + } + + @Override + public void set(Object arg0, Object arg1) { + } + + @Override + public Class getPropertyType() { + return String.class; + } + + @Override + public <T extends Annotation> T getAnnotation(Class<T> arg0) { + return null; + } + }; + } } Modified: trunk/wao-ui/src/main/webapp/Contacts.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Contacts.tml 2010-06-16 13:22:34 UTC (rev 538) +++ trunk/wao-ui/src/main/webapp/Contacts.tml 2010-06-16 19:12:34 UTC (rev 539) @@ -330,10 +330,32 @@ <input t:type="submitContext" t:id="unvalidateContact" class="ico22px unvalidate" value="Unvalidate" t:context="contact.topiaId" title="Enlever la validation du contact" /> </t:if> +  + <a onclick="extraComment.openWindow('${validationComment}','${contact.id}');"> +  + <img src="${asset:context:img/comment-22px.png}" alt="Add comment" /> + </a> +  </t:if> </p:actionsCell> </div> </form> </t:zone> +<div t:type="ck/Window" t:id="commentWindow" t:show="false" t:modal="true" + title="literal:Ajouter un commentaire" t:width="550" t:height="230"> + <form t:type="form" t:id="commentForm" action="tapestry"> + <p> + <textarea t:type="textarea" t:id="extraComment" t:value="extraComment" cols="50" rows="7" /> + <input t:type="hidden" t:id="hiddenContactId" t:value="contactId" /> + </p> + <p> </p> + <p class="aright"> + <a onclick="extraComment.saveComment()" class="save"> + <img src="${asset:context:img/save-22px.png}" alt="Save comment"/> + </a> +   + </p> + </form> +</div> </t:layout> Modified: trunk/wao-ui/src/main/webapp/js/wao.js =================================================================== --- trunk/wao-ui/src/main/webapp/js/wao.js 2010-06-16 13:22:34 UTC (rev 538) +++ trunk/wao-ui/src/main/webapp/js/wao.js 2010-06-16 19:12:34 UTC (rev 539) @@ -37,6 +37,7 @@ var hidden = $$('.' + commentHiddenClass)[0]; var oldValue = hidden.getValue(); var newValue = $F(commentPopupId); + // TODO-fdesbois-2010-06-16 : use hidden images directly in tml instead of using context + imgId in argument var img = $(imgId); if ((unfinishedState && !newValue) || (unfinishedState && oldValue == newValue)) { img.setAttribute('src', context + '/img/comment-invalid-22px.png'); @@ -60,48 +61,48 @@ * - loginValid : img to display in case of login Ok (select is defined) * - loginInvalid : img to display in case of login Ko (select is undefined) */ -function refreshUserRoles(response) { +//function refreshUserRoles(response) { +// +// //Tapestry.debug('reponse.select = ' + response.select); +// +// if (response.select) { +// var content = ''; +// +// for (i = 0; i < response.select.length; i++) { +// var option = response.select[i]; +// +// //Tapestry.debug('option.name = ' + option.name); +// //Tapestry.debug('option.label = ' + option.label); +// +// content += '<option value="' + option.name + '"'; +// // First option is selected +// if (i == 0) { +// content += ' selected="selected"'; +// } +// content += '>' + option.label + '</option>\n\t'; +// } +// // Update select userRole +// $('userRole').update(content); +// $('userRole').enable(); +// // Display valid picture +// $('loginValid').toggleClassName('hidden'); +// // Hide invalid picture if needed +// if (!$('loginInvalid').hasClassName('hidden')) { +// $('loginInvalid').toggleClassName('hidden'); +// } +// } else { +// // Update select userRole (empty options) +// $('userRole').update('<option value=""></option>'); +// $('userRole').disable(); +// // Display invalid picture +// $('loginInvalid').toggleClassName('hidden'); +// // Hide valid picture if needed +// if (!$('loginValid').hasClassName('hidden')) { +// $('loginValid').toggleClassName('hidden'); +// } +// } +//} - //Tapestry.debug('reponse.select = ' + response.select); - - if (response.select) { - var content = ''; - - for (i = 0; i < response.select.length; i++) { - var option = response.select[i]; - - //Tapestry.debug('option.name = ' + option.name); - //Tapestry.debug('option.label = ' + option.label); - - content += '<option value="' + option.name + '"'; - // First option is selected - if (i == 0) { - content += ' selected="selected"'; - } - content += '>' + option.label + '</option>\n\t'; - } - // Update select userRole - $('userRole').update(content); - $('userRole').enable(); - // Display valid picture - $('loginValid').toggleClassName('hidden'); - // Hide invalid picture if needed - if (!$('loginInvalid').hasClassName('hidden')) { - $('loginInvalid').toggleClassName('hidden'); - } - } else { - // Update select userRole (empty options) - $('userRole').update('<option value=""></option>'); - $('userRole').disable(); - // Display invalid picture - $('loginInvalid').toggleClassName('hidden'); - // Hide valid picture if needed - if (!$('loginValid').hasClassName('hidden')) { - $('loginValid').toggleClassName('hidden'); - } - } -} - function toggleNewsDetails(element) { $(element).toggleClassName('hidden'); } @@ -132,7 +133,7 @@ // Update params of the anchor to be clickable anchor.update('Lire la suite...'); anchor.addClassName('news-details-link'); - anchor.writeAttribute('onClick', 'toggleNewsDetails("' + detailsContent.id + '")'); + anchor.writeAttribute('onclick', 'toggleNewsDetails("' + detailsContent.id + '")'); // Retrieve siblings paragraphs to wrap them into the hidden detailsContent var otherParagraphs = paragraph.nextSiblings(); @@ -147,3 +148,19 @@ } } } + +ExtraComment = Class.create({ + initialize: function() { + this.commentForm = $('commentForm'); + this.window = commentWindow; + }, + openWindow: function(comment, contactId) { + this.commentForm.extraComment.setValue(comment); + this.commentForm.hiddenContactId.setValue(contactId); + this.window.showCenter(true); + }, + saveComment: function() { + this.commentForm.submit(); + this.window.close(); + } +});

1 0

[Suiviobsmer-commits] r538 - trunk/wao-business/src/main/java/fr/ifremer/wao/service
by fdesbois＠users.labs.libre-entreprise.org 16 Jun '10

16 Jun '10

Author: fdesbois Date: 2010-06-16 13:22:34 +0000 (Wed, 16 Jun 2010) New Revision: 538 Log: Refactor usage of Binder using WaoBinderHelper Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java 2010-06-16 13:19:44 UTC (rev 537) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java 2010-06-16 13:22:34 UTC (rev 538) @@ -27,6 +27,7 @@ import com.csvreader.CsvReader; import com.csvreader.CsvWriter; +import fr.ifremer.wao.WaoBinderHelper; import fr.ifremer.wao.WaoBusinessException; import fr.ifremer.wao.WaoBusinessException.Type; import fr.ifremer.wao.WaoContext; @@ -73,8 +74,6 @@ import org.nuiton.topia.framework.TopiaQuery.Op; import org.nuiton.util.DateUtils; import org.nuiton.util.PeriodDates; -import org.nuiton.util.beans.BinderBuilder; -import org.nuiton.util.beans.BinderProvider; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -130,9 +129,9 @@ context.closeTransaction(transaction); } - public ServiceSamplingImpl() { - prepareBinderForProfession(); - } +// public ServiceSamplingImpl() { +// prepareBinderForProfession(); +// } @Override public void executeCreateUpdateSampleRow(TopiaContext transaction, @@ -584,8 +583,10 @@ Profession newProfession = new ProfessionImpl(); // Use of Binder previously initialized to copy the existing // profession in a new one - BinderProvider.getBinder(Profession.class). - copy(profession, newProfession); +// BinderProvider.getBinder(Profession.class). +// copy(profession, newProfession); + WaoBinderHelper.getSimpleTopiaBinder(Profession.class). + copy(profession, newProfession); return newProfession; } @@ -646,25 +647,25 @@ } } - /** - * Prepare the Binder for Profession copy. This method is called in - * service constructor. The copy from two Profession will be available - * anywhere using BinderProvider.get(Profession.class).copy(source, dest); - * - * @see org.nuiton.util.beans.Binder - * @see org.nuiton.util.beans.BinderProvider - */ - protected void prepareBinderForProfession() { - BinderBuilder builder = new BinderBuilder(); - builder.createBinderModel(Profession.class).addSimpleProperties( - Profession.CODE_DCF5, - Profession.LIBELLE, - Profession.MESH_SIZE, - Profession.OTHER, - Profession.SIZE, - Profession.SPECIES); - BinderProvider.registerBinder(builder); - } +// /** +// * Prepare the Binder for Profession copy. This method is called in +// * service constructor. The copy from two Profession will be available +// * anywhere using BinderProvider.get(Profession.class).copy(source, dest); +// * +// * @see org.nuiton.util.beans.Binder +// * @see org.nuiton.util.beans.BinderProvider +// */ +// protected void prepareBinderForProfession() { +// BinderBuilder builder = new BinderBuilder(); +// builder.createBinderModel(Profession.class).addSimpleProperties( +// Profession.CODE_DCF5, +// Profession.LIBELLE, +// Profession.MESH_SIZE, +// Profession.OTHER, +// Profession.SIZE, +// Profession.SPECIES); +// BinderProvider.registerBinder(builder); +// } @Override public InputStream executeExportSamplingPlanCsv(TopiaContext transaction,

1 0

[Suiviobsmer-commits] r537 - in trunk/wao-business: . src/main/java/fr/ifremer/wao src/main/java/fr/ifremer/wao/service src/main/xmi
by fdesbois＠users.labs.libre-entreprise.org 16 Jun '10

16 Jun '10

Author: fdesbois Date: 2010-06-16 13:19:44 +0000 (Wed, 16 Jun 2010) New Revision: 537 Log: Evo #2332 : - Add fields for contact comments in model - Update migration for 1.4 - Use BinderHelperTransformer from ToPIA + use it in ServiceContact Modified: trunk/wao-business/pom.xml trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java trunk/wao-business/src/main/java/fr/ifremer/wao/WaoMigrationCallBack.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java trunk/wao-business/src/main/xmi/wao.zargo Modified: trunk/wao-business/pom.xml =================================================================== --- trunk/wao-business/pom.xml 2010-06-15 19:57:36 UTC (rev 536) +++ trunk/wao-business/pom.xml 2010-06-16 13:19:44 UTC (rev 537) @@ -137,7 +137,8 @@ org.nuiton.topia.generator.TopiaMetaTransformer, org.nuiton.eugene.java.JavaBeanTransformer, org.nuiton.topia.generator.ServiceTransformer, - org.nuiton.eugene.java.JavaInterfaceTransformer + org.nuiton.eugene.java.JavaInterfaceTransformer, + org.nuiton.topia.generator.BinderHelperTransformer </templates> </configuration> <goals> Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java 2010-06-15 19:57:36 UTC (rev 536) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java 2010-06-16 13:19:44 UTC (rev 537) @@ -141,7 +141,15 @@ @Override protected void createNewsCompanyColumn_1_4a(List<String> queries) { + // Evo #2248 : news for company queries.add("ALTER TABLE News ADD company CHARACTER VARYING(255)" + " REFERENCES Company (topiaId);"); } + + @Override + protected void createContactCommentColumns_1_4b(List<String> queries) { + // Evo #2332 : extra comments for contacts + queries.add("ALTER TABLE Contact ADD commentAdmin TEXT;"); + queries.add("ALTER TABLE Contact ADD commentCoordinator TEXT;"); + } } Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoMigrationCallBack.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/WaoMigrationCallBack.java 2010-06-15 19:57:36 UTC (rev 536) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/WaoMigrationCallBack.java 2010-06-16 13:19:44 UTC (rev 537) @@ -66,6 +66,8 @@ protected abstract void createNewsCompanyColumn_1_4a(List<String> queries); + protected abstract void createContactCommentColumns_1_4b(List<String> queries); + protected static final Version[] VERSIONS = new Version[] { VersionUtil.valueOf("1.0"), VersionUtil.valueOf("1.1"), @@ -162,6 +164,8 @@ createNewsCompanyColumn_1_4a(queries); + createContactCommentColumns_1_4b(queries); + String[] strings = queries.toArray(new String[queries.size()]); executeSQL(tx, showSql, showProgression, strings); } Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2010-06-15 19:57:36 UTC (rev 536) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2010-06-16 13:19:44 UTC (rev 537) @@ -56,8 +56,6 @@ import fr.ifremer.wao.io.*; import fr.ifremer.wao.io.WaoCsvHeader.*; import org.apache.commons.lang.BooleanUtils; -import org.nuiton.util.beans.BinderBuilder; -import org.nuiton.util.beans.BinderProvider; /** * ServiceContactImpl @@ -73,38 +71,6 @@ private WaoContext context; - - public ServiceContactImpl() { - prepareBinderForContact(); - } - - /** - * Prepare the Binder for Contact copy. This method is called in - * service constructor. The copy from two Contact will be available - * anywhere using BinderProvider.get(Contact.class).copy(source, dest); - * - * @see org.nuiton.util.beans.Binder - * @see org.nuiton.util.beans.BinderProvider - */ - protected void prepareBinderForContact() { - BinderBuilder builder = new BinderBuilder(); - // Properties SAMPLE_ROW, BOAT, TOPIA_CREATE_DATE are immuable - builder.createBinderModel(Contact.class).addSimpleProperties( - Contact.COMMENT, - Contact.DATA_INPUT_DATE, - Contact.MAMMALS_CAPTURE, - Contact.MAMMALS_OBSERVATION, - Contact.NB_OBSERVANTS, - Contact.OBSERVER, - Contact.STATE, - Contact.TIDE_BEGIN_DATE, - Contact.TIDE_END_DATE, - Contact.TIDE_NB_DAYS, - Contact.VALIDATION_COMPANY, - Contact.VALIDATION_PROGRAM); - BinderProvider.registerBinder(builder); - } - public void setContext(WaoContext context) { this.context = context; } @@ -124,6 +90,36 @@ protected void closeTransaction(TopiaContext transaction) { context.closeTransaction(transaction); } + +// public ServiceContactImpl() { +// prepareBinderForContact(); +// } +// /** +// * Prepare the Binder for Contact copy. This method is called in +// * service constructor. The copy from two Contact will be available +// * anywhere using BinderProvider.get(Contact.class).copy(source, dest); +// * +// * @see org.nuiton.util.beans.Binder +// * @see org.nuiton.util.beans.BinderProvider +// */ +// protected void prepareBinderForContact() { +// BinderBuilder builder = new BinderBuilder(); +// // Properties SAMPLE_ROW, BOAT, TOPIA_CREATE_DATE are immuable +// builder.createBinderModel(Contact.class).addSimpleProperties( +// Contact.COMMENT, +// Contact.DATA_INPUT_DATE, +// Contact.MAMMALS_CAPTURE, +// Contact.MAMMALS_OBSERVATION, +// Contact.NB_OBSERVANTS, +// Contact.OBSERVER, +// Contact.STATE, +// Contact.TIDE_BEGIN_DATE, +// Contact.TIDE_END_DATE, +// Contact.TIDE_NB_DAYS, +// Contact.VALIDATION_COMPANY, +// Contact.VALIDATION_PROGRAM); +// BinderProvider.registerBinder(builder); +// } @Override public Map<String, Contact> executeGetContacts(TopiaContext transaction, @@ -261,7 +257,12 @@ source.setTopiaId(destination.getTopiaId()); } // Bind the contact in argument with the contact in session - BinderProvider.getBinder(Contact.class).copy(source, destination); + //BinderProvider.getBinder(Contact.class).copy(source, destination); + WaoBinderHelper.getSimpleTopiaBinder(Contact.class). + copyExcluding(source, destination, + Contact.BOAT, + Contact.SAMPLE_ROW + ); // Update the change dao.update(destination); Modified: trunk/wao-business/src/main/xmi/wao.zargo =================================================================== (Binary files differ)

1 0

[Suiviobsmer-commits] r536 - in trunk/wao-ui/src/main/webapp: css js
by fdesbois＠users.labs.libre-entreprise.org 15 Jun '10

15 Jun '10

Author: fdesbois Date: 2010-06-15 19:57:36 +0000 (Tue, 15 Jun 2010) New Revision: 536 Log: Evo #2333 : use anchor from FCKEditor to detect where the text need to be crop Modified: trunk/wao-ui/src/main/webapp/css/news.css trunk/wao-ui/src/main/webapp/js/wao.js Modified: trunk/wao-ui/src/main/webapp/css/news.css =================================================================== --- trunk/wao-ui/src/main/webapp/css/news.css 2010-06-15 19:54:07 UTC (rev 535) +++ trunk/wao-ui/src/main/webapp/css/news.css 2010-06-15 19:57:36 UTC (rev 536) @@ -66,7 +66,7 @@ } div#so-news div.news-item div.news-content a.news-details-link { - color: blue; + color: #133852; text-decoration: underline; cursor: pointer; } Modified: trunk/wao-ui/src/main/webapp/js/wao.js =================================================================== --- trunk/wao-ui/src/main/webapp/js/wao.js 2010-06-15 19:54:07 UTC (rev 535) +++ trunk/wao-ui/src/main/webapp/js/wao.js 2010-06-15 19:57:36 UTC (rev 536) @@ -125,23 +125,23 @@ // Tapestry.debug('find anchor : ' + anchor); // Prepare the hidden block - var moreContent = document.createElement('div'); - moreContent.id = 'news-details-content-' + j; - moreContent.addClassName('hidden'); + var detailsContent = document.createElement('div'); + detailsContent.id = 'news-details-content-' + j; + detailsContent.addClassName('hidden'); // Update params of the anchor to be clickable anchor.update('Lire la suite...'); anchor.addClassName('news-details-link'); - anchor.writeAttribute('onClick', 'toggleNewsDetails("' + moreContent.id + '")'); + anchor.writeAttribute('onClick', 'toggleNewsDetails("' + detailsContent.id + '")'); - // Retrieve siblings paragraphs to wrap them into the hidden moreContent + // Retrieve siblings paragraphs to wrap them into the hidden detailsContent var otherParagraphs = paragraph.nextSiblings(); for (k = 0; k < otherParagraphs.length; k++) { - moreContent.appendChild(otherParagraphs[k]); + detailsContent.appendChild(otherParagraphs[k]); } // append the hidden block to the news - news.appendChild(moreContent); + news.appendChild(detailsContent); break; } }

1 0

[Suiviobsmer-commits] r535 - in trunk/wao-ui/src/main: java/fr/ifremer/wao/ui/pages webapp/css webapp/js
by fdesbois＠users.labs.libre-entreprise.org 15 Jun '10

15 Jun '10

Author: fdesbois Date: 2010-06-15 19:54:07 +0000 (Tue, 15 Jun 2010) New Revision: 535 Log: Evo #2333 : use anchor from FCKEditor to detect where the text need to be crop Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Index.java trunk/wao-ui/src/main/webapp/css/news.css trunk/wao-ui/src/main/webapp/js/wao.js Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Index.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Index.java 2010-06-15 17:59:24 UTC (rev 534) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Index.java 2010-06-15 19:54:07 UTC (rev 535) @@ -34,6 +34,7 @@ import fr.ifremer.wao.ui.data.RequiresAuthentication; import org.apache.tapestry5.Asset2; import org.apache.tapestry5.PersistenceConstants; +import org.apache.tapestry5.RenderSupport; import org.apache.tapestry5.annotations.IncludeStylesheet; import org.apache.tapestry5.annotations.Log; import org.apache.tapestry5.annotations.Path; @@ -88,7 +89,14 @@ @Path("context:js/FCKConf.js") private Asset2 fckconf; + @Inject + private RenderSupport renderSupport; + public void beginRender() { + // Hide news details depends on an anchor named 'details' in news.getContent() + renderSupport.addScript("hideNewsDetails();"); + } + @Log void setupRender() throws WaoException { if (editedId == null || !"NEW".equals(editedId)) { Modified: trunk/wao-ui/src/main/webapp/css/news.css =================================================================== --- trunk/wao-ui/src/main/webapp/css/news.css 2010-06-15 17:59:24 UTC (rev 534) +++ trunk/wao-ui/src/main/webapp/css/news.css 2010-06-15 19:54:07 UTC (rev 535) @@ -65,6 +65,16 @@ text-indent: 30px; } +div#so-news div.news-item div.news-content a.news-details-link { + color: blue; + text-decoration: underline; + cursor: pointer; +} + +div#so-news div.news-item div.news-content a.news-details-link:hover { + text-decoration: none; +} + div#so-news div.news-item p.date { font-style: italic; font-size: 0.8em; Modified: trunk/wao-ui/src/main/webapp/js/wao.js =================================================================== --- trunk/wao-ui/src/main/webapp/js/wao.js 2010-06-15 17:59:24 UTC (rev 534) +++ trunk/wao-ui/src/main/webapp/js/wao.js 2010-06-15 19:54:07 UTC (rev 535) @@ -102,15 +102,48 @@ } } -function toggleNewsMoreContent(element) { - // Get the 'div' parent of the 'a' element - var newsContent = element.ancestors()[0]; +function toggleNewsDetails(element) { + $(element).toggleClassName('hidden'); +} - if (newsContent.match('div.news-content')) { - // Retrieve elements with select 'span.news-more', so the hidden block - var array = newsContent.select('span.news-more'); - // toggle the block - array[0].toggleClassName('hidden'); +function hideNewsDetails() { + var allNews = $('so-news').select('div.news-content'); + // Tapestry.debug('nb news : ' + contentsArray.length); + + for (j = 0; j < allNews.length; j++) { + var news = allNews[j]; + // Select all paragraphs in the news + // Tapestry.debug('nb paragraphs in news : ' + paragraphs.length); + var paragraphs = news.select('p'); + + for (i = 0; i < paragraphs.length; i++) { + var paragraph = paragraphs[i]; + + // Check the firstDescendant in the paragraph, we take only anchor called 'details' + if (paragraph.firstDescendant() && paragraph.firstDescendant().match('a[name="details"]')) { + var anchor = paragraph.firstDescendant(); + // Tapestry.debug('find anchor : ' + anchor); + + // Prepare the hidden block + var moreContent = document.createElement('div'); + moreContent.id = 'news-details-content-' + j; + moreContent.addClassName('hidden'); + + // Update params of the anchor to be clickable + anchor.update('Lire la suite...'); + anchor.addClassName('news-details-link'); + anchor.writeAttribute('onClick', 'toggleNewsDetails("' + moreContent.id + '")'); + + // Retrieve siblings paragraphs to wrap them into the hidden moreContent + var otherParagraphs = paragraph.nextSiblings(); + for (k = 0; k < otherParagraphs.length; k++) { + moreContent.appendChild(otherParagraphs[k]); + } + + // append the hidden block to the news + news.appendChild(moreContent); + break; + } + } } - }

1 0