Author: bleny Date: 2010-11-18 10:45:27 +0000 (Thu, 18 Nov 2010) New Revision: 785 Log: coordinator can see data reliability Modified: 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/css/contacts.css 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-11-18 10:17:08 UTC (rev 784) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java 2010-11-18 10:45:27 UTC (rev 785) @@ -423,7 +423,8 @@ /**************************** CONTACT ROW ACTION **************************/ public boolean isDataReliabilityAsked() { - boolean result = contact.getValidationProgram() == null; + boolean result = user.isAdmin() && ! user.isReadOnly() && + contact.getValidationProgram() == null; return result; } 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-11-18 10:17:08 UTC (rev 784) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/ContactModelFactory.java 2010-11-18 10:45:27 UTC (rev 785) @@ -95,6 +95,8 @@ 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); + contactModel.add(RelativePosition.BEFORE, "actions", "dataReliability", getDataReliabilityPropertyConduit()); + contactModel.get("dataReliability").sortable(false); return contactModel; } @@ -112,7 +114,6 @@ contactModel.add(RelativePosition.AFTER, "fishingZoneSector", "fishingZoneDivision", getFishingZoneDivisionPropertyConduit()); contactModel.add(RelativePosition.AFTER, Contact.BOAT, "boatImmatriculation", getBoatImmatriculationPropertyConduit()); contactModel.add(RelativePosition.AFTER, "boatImmatriculation", "boatDistrictCode", getBoatDistrictCodePropertyConduit()); - contactModel.add(RelativePosition.AFTER, "validation", "dataReliability", getDataReliabilityPropertyConduit()); contactModel.get("observer").sortable(false); contactModel.get(WaoUser.COMPANY).sortable(false); @@ -125,7 +126,6 @@ contactModel.get("fishingZoneDivision").sortable(false); contactModel.get("boatImmatriculation").sortable(false); contactModel.get("boatDistrictCode").sortable(false); - contactModel.get("dataReliability").sortable(false); // contactModel.add(RelativePosition.AFTER, TopiaEntity.TOPIA_CREATE_DATE, "observer", null); // contactModel.add(RelativePosition.AFTER, "observer", User.COMPANY, null); Modified: trunk/wao-ui/src/main/webapp/css/contacts.css =================================================================== --- trunk/wao-ui/src/main/webapp/css/contacts.css 2010-11-18 10:17:08 UTC (rev 784) +++ trunk/wao-ui/src/main/webapp/css/contacts.css 2010-11-18 10:45:27 UTC (rev 785) @@ -146,7 +146,8 @@ div#so-contacts table.t-data-grid tbody tr td.comment, div#so-contacts table.t-data-grid thead tr th.comment, div#so-contacts table.t-data-grid thead tr th.commentCoordinator, -div#so-contacts table.t-data-grid thead tr th.commentAdmin { +div#so-contacts table.t-data-grid thead tr th.commentAdmin +div#so-contacts table.t-data-grid thead tr th.dataReliability { white-space: normal; width: 100px; text-align: center;