Author: bleny Date: 2014-05-14 12:26:38 +0200 (Wed, 14 May 2014) New Revision: 1938 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1938 Log: remove some fixed todo tags Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerContactsService.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ContactsAction.java trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerContactsService.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerContactsService.java 2014-05-14 08:13:27 UTC (rev 1937) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerContactsService.java 2014-05-14 10:26:38 UTC (rev 1938) @@ -202,11 +202,9 @@ } else { - //TODO Contact contact = new ContactImpl(); - contact.setObsProgram(ObsProgram.OBSMER); - contact.setDataReliability(DataReliability.UNKNOWN); + contact.setObsProgram(authenticatedWaoUser.getObsProgram()); updateContactCommand.setContact(contact); Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ContactsAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ContactsAction.java 2014-05-14 08:13:27 UTC (rev 1937) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ContactsAction.java 2014-05-14 10:26:38 UTC (rev 1938) @@ -34,7 +34,6 @@ import fr.ifremer.wao.services.service.ObsMerContactsService; import fr.ifremer.wao.services.service.PaginationBean; import fr.ifremer.wao.web.WaoJspActionSupport; -import org.apache.commons.lang3.BooleanUtils; import org.apache.commons.lang3.time.DateUtils; import org.nuiton.topia.persistence.pager.TopiaPagerBean; @@ -144,14 +143,6 @@ return ContactState.OBSERVATION_DONE == contact.getContactState(); } - //FIXME Use ellipse - public String getCommentDisplayText(String comment) { - if (comment != null && comment.length() > 20) { - return comment.substring(0, 20) + "..."; - } - return comment; - } - public String getDivision(SampleRow sampleRow) { String result = ""; for (FishingZone zone : sampleRow.getFishingZone()) { @@ -160,14 +151,6 @@ return result; } - //FIXME - public String getTooltipText(String input) { - if (input != null) { - return input.replaceAll("\n", "<br />").replaceAll("\r", ""); - } - return ""; - } - /** * Devrait résoudre un problème que pose le composant ck/tooltip. * <p/> @@ -182,29 +165,6 @@ return result; } - public String getContactCssClass(Contact contact) { - // TODO brendan 23/04/14 revoir la logique - boolean admin = getAuthenticatedWaoUser().isAdmin(); - String result = ""; - boolean accepted = BooleanUtils.isTrue(contact.getValidationProgram()) || - (!admin && BooleanUtils.isTrue(contact.getValidationCompany())); - - ContactState state = contact.getContactState(); - if (BooleanUtils.isFalse(contact.getValidationProgram()) || - (!admin && BooleanUtils.isFalse(contact.getValidationCompany()))) { - result = "refused"; - } else if (accepted && state.equals(ContactState.OBSERVATION_DONE)) { - result = "accepted"; - } else if (accepted && state.isUnfinishedState()) { - result = "unfinished"; - } else if (state.isFinalState()) { - result = "even"; - } else { - result = "odd"; - } - return result; - } - public String getContactToHighlightId() { return session.getContactToHighlightId(); } Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp 2014-05-14 08:13:27 UTC (rev 1937) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp 2014-05-14 10:26:38 UTC (rev 1938) @@ -355,7 +355,7 @@ <tbody> <s:iterator value="contacts" var="contact"> - <tr class="contact-row <s:property value="getContactCssClass(#contact)"/><s:if test="topiaId.equals(contactToHighlightId)"> highlight</s:if>"> + <tr class="contact-row<s:if test="topiaId.equals(contactToHighlightId)"> highlight</s:if>"> <td> <s:property value="creationDate"/> </td>