Author: bleny Date: 2010-12-31 15:14:08 +0000 (Fri, 31 Dec 2010) New Revision: 873 Log: fix UI menu ; make synthesis ObsMer only ; add ObsProgram fields in contact import/export Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SamplingStrategy.java trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv/ImportHelper.java trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv/WaoCsvHeader.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactInternalTest.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/Layout.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java trunk/wao-ui/src/main/webapp/css/main.css Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SamplingStrategy.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SamplingStrategy.java 2010-12-30 16:38:52 UTC (rev 872) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SamplingStrategy.java 2010-12-31 15:14:08 UTC (rev 873) @@ -26,6 +26,6 @@ return samplingStrategy; } } - return null; + throw new IllegalArgumentException("ordinal " + samplingStrategyOrdinal); } } Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv/ImportHelper.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv/ImportHelper.java 2010-12-30 16:38:52 UTC (rev 872) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv/ImportHelper.java 2010-12-31 15:14:08 UTC (rev 873) @@ -168,6 +168,21 @@ return result; } + public static Boolean readBoolean(CsvReader reader, IOHeader header) throws IOException { + String str = read(reader, header); + Boolean result; + if (StringUtils.isBlank(str) || "?".equals(str)) { + result = null; + } else if ("Y".equals(str)) { + result = true; + } else if ("N".equals(str)) { + result = false; + } else { + result = Boolean.parseBoolean(str); + } + return result; + } + /** * Read an int value in CsvReader from {@code header} column. * Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv/WaoCsvHeader.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv/WaoCsvHeader.java 2010-12-30 16:38:52 UTC (rev 872) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv/WaoCsvHeader.java 2010-12-31 15:14:08 UTC (rev 873) @@ -352,7 +352,9 @@ /** Contact program validation **/ CONT_PROGRAM_VALID(32), /** Data reliability **/ - CONT_DATA_RELIABILITY(33); + CONT_DATA_RELIABILITY(33), + CONT_SAMPLING_STRATEGY(34), + CONT_COMPLETE_SAMPLING(35); private int contactHeader; @@ -411,6 +413,18 @@ public static String formatMammals(boolean mammals) { return mammals ? "X" : ""; } + + public static String formatBoolean(Boolean bool) { + String result; + if (bool == null) { + result = "?"; + } else if (bool) { + result = "Y"; + } else { + result = "N"; + } + return result; + } } public enum ACTIVITY_CALENDAR implements IOHeader { 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-12-30 16:38:52 UTC (rev 872) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2010-12-31 15:14:08 UTC (rev 873) @@ -40,6 +40,7 @@ import fr.ifremer.wao.bean.ContactStatus; import fr.ifremer.wao.bean.ContactStatus.NullSampleMonthException; import fr.ifremer.wao.bean.DataReliability; +import fr.ifremer.wao.bean.SamplingStrategy; import fr.ifremer.wao.bean.UserRole; import fr.ifremer.wao.entity.Boat; import fr.ifremer.wao.entity.Company; @@ -66,6 +67,7 @@ import fr.ifremer.wao.io.csv.WaoCsvHeader.FISHING_ZONE; import fr.ifremer.wao.io.csv.WaoCsvHeader.SAMPLING; import org.apache.commons.lang.BooleanUtils; +import org.apache.commons.lang.StringUtils; import org.apache.commons.mail.EmailException; import org.apache.commons.mail.SimpleEmail; import org.nuiton.topia.TopiaContext; @@ -469,6 +471,16 @@ export.record(CONTACT.CONT_DATA_RELIABILITY, String.valueOf(contact.getDataReliabilityOrdinal())); + if (contact.getSamplingStrategy() != null) { + export.record(CONTACT.CONT_SAMPLING_STRATEGY, + contact.getSamplingStrategy().name()); + } + + if (contact.getCompleteSampling() != null) { + export.record(CONTACT.CONT_COMPLETE_SAMPLING, + CONTACT.formatBoolean(contact.getCompleteSampling())); + } + // Observer part WaoUser mainObserver = contact.getMainObserver(); @@ -751,6 +763,14 @@ contact.setDataReliabilityOrdinal( ImportHelper.readInt(reader, CONTACT.CONT_DATA_RELIABILITY)); + + String samplingStrategyName = ImportHelper.read(reader, CONTACT.CONT_SAMPLING_STRATEGY); + if (StringUtils.isNotBlank(samplingStrategyName)) { + contact.setSamplingStrategy(SamplingStrategy.valueOf(samplingStrategyName)); + } + + contact.setCompleteSampling(ImportHelper.readBoolean(reader, CONTACT.CONT_COMPLETE_SAMPLING)); + } /** Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactInternalTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactInternalTest.java 2010-12-30 16:38:52 UTC (rev 872) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactInternalTest.java 2010-12-31 15:14:08 UTC (rev 873) @@ -28,6 +28,7 @@ import fr.ifremer.wao.bean.ConnectedUser; import fr.ifremer.wao.bean.ContactState; import fr.ifremer.wao.bean.ContactStatus.NullSampleMonthException; +import fr.ifremer.wao.bean.SamplingStrategy; import fr.ifremer.wao.entity.Boat; import fr.ifremer.wao.entity.BoatDAO; import fr.ifremer.wao.entity.Company; @@ -574,6 +575,10 @@ thenReturn(comment); when(reader.get(CONTACT.CONT_DATA_RELIABILITY.name())). thenReturn("0"); + when(reader.get(CONTACT.CONT_SAMPLING_STRATEGY.name())). + thenReturn(SamplingStrategy.SIMULTANEOUS_ALL_SPECIES.name()); + when(reader.get(CONTACT.CONT_COMPLETE_SAMPLING.name())). + thenReturn("Y"); when(creator.getCompany()).thenReturn(company); when(creator.isAdmin()).thenReturn(false); Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/Layout.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/Layout.java 2010-12-30 16:38:52 UTC (rev 872) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/Layout.java 2010-12-31 15:14:08 UTC (rev 873) @@ -43,6 +43,7 @@ import org.apache.tapestry5.services.Request; import org.slf4j.Logger; +import java.util.HashMap; import java.util.LinkedHashMap; import java.util.Map; @@ -142,12 +143,19 @@ public Map getMenuItems() { if (menuItems == null) { - Class[] pagesInMenu = new Class[] { SamplingPlan.class, Boats.class, - Contacts.class, Synthesis.class, Administration.class}; + Map<String, Class> pagesInMenu = new LinkedHashMap<String, Class>(); + pagesInMenu.put("Plan d'échantillonnage", SamplingPlan.class); + pagesInMenu.put("Navires", Boats.class); + pagesInMenu.put("Contacts", Contacts.class); + pagesInMenu.put("Synthèse", Synthesis.class); + pagesInMenu.put("Administration", Administration.class); menuItems = new LinkedHashMap<String, String>(); - for (Class page : pagesInMenu) { + for (Map.Entry<String, Class> menuEntry : pagesInMenu.entrySet()) { + String linkName = menuEntry.getKey(); + Class page = menuEntry.getValue(); + if (serviceAuthentication.isAllowed(page)) { - menuItems.put(page.getSimpleName(), _(page.getName())); + menuItems.put(page.getSimpleName(), linkName); } } } Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java 2010-12-30 16:38:52 UTC (rev 872) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java 2010-12-31 15:14:08 UTC (rev 873) @@ -256,6 +256,7 @@ if (!user.isAdmin()) { dataSamplingFilter.setCompany(user.getCompany()); } + dataSamplingFilter.setObsProgram(user.getProfile().getObsProgram()); } return dataSamplingFilter; } Modified: trunk/wao-ui/src/main/webapp/css/main.css =================================================================== --- trunk/wao-ui/src/main/webapp/css/main.css 2010-12-30 16:38:52 UTC (rev 872) +++ trunk/wao-ui/src/main/webapp/css/main.css 2010-12-31 15:14:08 UTC (rev 873) @@ -138,7 +138,6 @@ } #so-menu { - width: 800px; margin-top: 7px; margin-left: auto; margin-right: auto;