Author: fdesbois Date: 2010-01-24 21:06:28 +0000 (Sun, 24 Jan 2010) New Revision: 267 Modified: trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/data/BusinessUtils.java Log: Evol #2041 : Change colors for contact depends on state Modified: trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/data/BusinessUtils.java =================================================================== --- trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/data/BusinessUtils.java 2010-01-24 20:52:33 UTC (rev 266) +++ trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/data/BusinessUtils.java 2010-01-24 21:06:28 UTC (rev 267) @@ -122,16 +122,18 @@ public static String getContactStyle(Contact contact, boolean admin) { String result = ""; + boolean accepted = BooleanUtils.isTrue(contact.getValidationProgram()) || + (!admin && BooleanUtils.isTrue(contact.getValidationCompany())); + ContactState state = ContactState.createContactStateEnum(contact.getState()); if (BooleanUtils.isFalse(contact.getValidationProgram()) || (!admin && BooleanUtils.isFalse(contact.getValidationCompany()))) { result = "refused"; - } else if (BooleanUtils.isTrue(contact.getValidationProgram()) || - (!admin && BooleanUtils.isTrue(contact.getValidationCompany()))) { + } else if (accepted && state.equals(ContactState.BOARDING_DONE)) { result = "accepted"; - } else if (state.isUnfinishedState()) { + } else if (accepted && state.isUnfinishedState()) { result = "unfinished"; - } else if (state.equals(ContactState.BOARDING_DONE)) { + } else if (state.isFinalState()) { result = "even"; } else { result = "odd";