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

[Suiviobsmer-commits] r873 - in trunk: wao-business/src/main/java/fr/ifremer/wao/bean wao-business/src/main/java/fr/ifremer/wao/io/csv wao-business/src/main/java/fr/ifremer/wao/service wao-business/src/test/java/fr/ifremer/wao/service wao-ui/src/main/java/fr/ifremer/wao/ui/components wao-ui/src/main/java/fr/ifremer/wao/ui/pages wao-ui/src/main/webapp/css
by bleny＠users.labs.libre-entreprise.org Dec. 31, 2010

Dec. 31, 2010

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;

1 0

[Suiviobsmer-commits] r872 - in trunk/wao-business/src: main/java/fr/ifremer/wao/io/csv main/java/fr/ifremer/wao/service test/java/fr/ifremer/wao/service test/resources/import
by bleny＠users.labs.libre-entreprise.org Dec. 30, 2010

Dec. 30, 2010

Author: bleny Date: 2010-12-30 16:38:52 +0000 (Thu, 30 Dec 2010) New Revision: 872 Log: enable import/export for obsvente sampling plan Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv/WaoCsvHeader.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSamplingImplTest.java trunk/wao-business/src/test/resources/import/echantillonnage.csv 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:06:30 UTC (rev 871) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv/WaoCsvHeader.java 2010-12-30 16:38:52 UTC (rev 872) @@ -66,7 +66,7 @@ * used will be the same returned by datePattern * * @param date the date to be formatted - * @return + * @return the formatted date */ String format(Date date); } @@ -197,7 +197,8 @@ /** SampleRow average tide time **/ PLAN_DUREE_MOY(15, "Durée moyenne d'une marée (jours)"), /** SampleRow comment **/ - PLAN_COMMENT(17, "Commentaire"); + PLAN_COMMENT(17, "Commentaire"), + PLAN_STRATEGIE(18, "Stratégie d'échantillonage"); private int contactHeader; @@ -396,7 +397,7 @@ } public static String formatValidation(Boolean validation) { - String valid = ""; + String valid; if (validation == null) { valid = "N"; } else if (BooleanUtils.isTrue(validation)) { @@ -448,7 +449,7 @@ /** ActivityZone zoneId **/ TSECT_COD, /** ActivityZone zoneLibelle **/ - SECT_LIB; + SECT_LIB } public static String getHeaderForContactCsv(int index) { 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-12-30 16:06:30 UTC (rev 871) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java 2010-12-30 16:38:52 UTC (rev 872) @@ -35,11 +35,7 @@ import fr.ifremer.wao.WaoProperty; import fr.ifremer.wao.WaoQueryBuilder; import fr.ifremer.wao.WaoQueryHelper; -import fr.ifremer.wao.bean.ConnectedUser; -import fr.ifremer.wao.bean.FacadeRow; -import fr.ifremer.wao.bean.FacadeRowImpl; -import fr.ifremer.wao.bean.SamplingFilter; -import fr.ifremer.wao.bean.UserRole; +import fr.ifremer.wao.bean.*; import fr.ifremer.wao.entity.Boat; import fr.ifremer.wao.entity.Company; import fr.ifremer.wao.entity.CompanyDAO; @@ -852,6 +848,7 @@ export.record(SAMPLING.PLAN_NB_OBSERV, numberFormat.format(row.getNbObservants())); export.record(SAMPLING.PLAN_DUREE_MOY, numberFormat.format(row.getAverageTideTime())); export.record(SAMPLING.PLAN_COMMENT, String.valueOf(row.getComment())); + export.record(SAMPLING.PLAN_STRATEGIE, row.getSamplingStrategy().name()); export.recordMonths(row); @@ -1072,9 +1069,14 @@ String comment = ImportHelper.read(reader, SAMPLING.PLAN_COMMENT); PeriodDates period = ImportHelper.readPeriod(reader, SAMPLING.PROGRAMME_DEBUT, SAMPLING.PROGRAMME_FIN); - String codeDCF5 = ImportHelper.read(reader, SAMPLING.METIER_CODE_DCF5); - codeDCF5 = codeDCF5.trim(); + + String samplingStrategyName = ImportHelper.read(reader, SAMPLING.PLAN_STRATEGIE); + if (StringUtils.isNotBlank(samplingStrategyName)) { + SamplingStrategy samplingStrategy = SamplingStrategy.valueOf(samplingStrategyName); + sampleRow.setSamplingStrategy(samplingStrategy); + } + sampleRow.setFishingZonesInfos(fishingZoneInfos); sampleRow.setNbObservants(nbObservants); sampleRow.setAverageTideTime(averageTideTime); @@ -1083,6 +1085,8 @@ sampleRow.setPeriodEnd(period.getThruDate()); sampleRow.setComment(comment); + String codeDCF5 = ImportHelper.read(reader, SAMPLING.METIER_CODE_DCF5); + codeDCF5 = codeDCF5.trim(); // a trick, nullSampleRow is just intantiated to user the parsing // of the codes in the CSV. This trick is needed cause if we use // sampleRow to do the parsing, parsed objects will be linked to @@ -1100,8 +1104,10 @@ sampleRow.addAllDCF5Code(parsed); // sampleRow.setDCF5Code(parsed); works fine too - // 16 fixed columns : 13 before months and 3 after - int nbFixedColumns = 16; + + + // 16 fixed columns : 13 before months and 4 after + int nbFixedColumns = 17; // Months begin at 14th column int firstMonthColumnId = 13; int nbTotalColumns = reader.getColumnCount(); Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSamplingImplTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSamplingImplTest.java 2010-12-30 16:06:30 UTC (rev 871) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSamplingImplTest.java 2010-12-30 16:38:52 UTC (rev 872) @@ -31,6 +31,7 @@ import fr.ifremer.wao.bean.FacadeRow; import fr.ifremer.wao.bean.SamplingFilter; import fr.ifremer.wao.bean.SamplingFilterImpl; +import fr.ifremer.wao.bean.SamplingStrategy; import fr.ifremer.wao.entity.Boat; import fr.ifremer.wao.entity.Company; import fr.ifremer.wao.entity.CompanyDAO; @@ -613,6 +614,8 @@ Collection<DCF5Code> dcf5codes = row1.getDCF5Code(); assertEquals(1, dcf5codes.size()); + assertEquals(row1.getSamplingStrategy(), SamplingStrategy.SIMULTANEOUS_ALL_SPECIES); + transaction.closeContext(); } Modified: trunk/wao-business/src/test/resources/import/echantillonnage.csv =================================================================== --- trunk/wao-business/src/test/resources/import/echantillonnage.csv 2010-12-30 16:06:30 UTC (rev 871) +++ trunk/wao-business/src/test/resources/import/echantillonnage.csv 2010-12-30 16:38:52 UTC (rev 872) @@ -1,14 +1,14 @@ -"PLAN_CODE","SOCIETE_NOM","PECHE_DIVISION","PECHE_AUTRE","METIER_CODE_DCF5","METIER_MAILLAGE","METIER_TAILLE","METIER_AUTRE","METIER_LIBELLE","METIER_ESPECES","PROGRAMME_CODE","PROGRAMME_DEBUT","PROGRAMME_FIN",12/2009,01/2010,02/2010,03/2010,04/2010,05/2010,06/2010,07/2010,08/2010,09/2010,10/2010,11/2010,12/2010,01/2011,02/2011,03/2011,"PLAN_DUREE_MOY","PLAN_NB_OBSERV","PLAN_COMMENT" -"2010_1",TARTANPION,"IId / I",,"DRB_ALG",,,,,,"MA-2009",03/2010,01/2011,,,,0,0,0,0,0,0,0,2,0,0,4,,,"1,5",1,"Un petit commentaire" -"2010_2",,"IId",,"DRH_CAT et DRH_CRU",,,,"Fileyage","poissons tubes","MANY",01/2008,12/2008,,20,0,0,21,0,0,21,0,0,21,0,0,,,,1,1, -"2010_03",,"IId / IV",,"FAR",,,,"balottage en plein air","divers choses visqueuses","MA-2009",03/2010,01/2011,,,,0,22,0,0,25,0,0,21,0,0,25,,,2,1, -"2009_1",,"IId / IV",,"GTR_DEF et GNS_DEF","110-119",,,"Fileyage à poissons tubes","poissons plats","PPP2010",12/2009,10/2010,0,1,1,1,2,1,1,1,1,1,2,,,,,,1,1, -"2009_2",,"IId",,"GTR_DEF et GNS_DEF","9888-99",,,"Fileyage à sirènes ","nymphes","PPP2010",12/2009,10/2010,1,1,1,2,3,4,4,4,4,3,3,,,,,,1,1, -"2009_3",TARTANPION,"IV",,"GTR_MOL et GNS_FIN",,,,"Fileyages à baleines à bosse","chameaux","PPP2010",12/2009,10/2010,2,2,2,2,2,2,2,2,2,2,4,,,,,,1,1, -"2009_4",,"IId",,"PTB_ALG",">=190",">18",,"Chalutage de fond machiavélique","gadidés, divers","PPP2010",12/2009,10/2010,1,1,1,1,1,1,1,1,1,1,2,,,,,,3,2, -"2009_5",,"IId",,"PTB_ALG","70-1100",">1140",,"Plongeur de fond sous-marin","gadidés, divers","PPP2010",12/2009,10/2010,1,1,1,1,1,1,1,1,1,1,2,,,,,,3,2, -"2009_6",BIS,"I / IV",,"OT_DEF","70-1100",">1140",,"Leon","poissons plats","PPP2010",12/2009,10/2010,0,1,0,1,0,1,2,2,2,2,1,,,,,,3,2, -"2010_4",TARTANPION,"IId / IV",,"OT_DEF et PTB_ALG et DRH",,,,"Chalutage de fond","gadidés, poissons plats, divers","BLOB",01/2010,12/2010,,3,0,0,3,0,0,3,0,0,3,0,0,,,,3,1, -"2010_5",,,,"DRB",,,,"Kamoulox","merlu, poissons cerises, divers","MA-2009",03/2010,01/2011,,,,0,5,0,0,5,0,0,6,0,0,3,,,3,1, -"2010_10",,"I / IV",,"DRB","70-1100",,,"Kamoulox","merlu, poissons pommes, divers","MA-2009",03/2010,01/2011,,,,0,5,0,0,5,0,0,6,0,0,3,,,3,1, -"2010_11",,"I / IV",,"DRB_CSJ","70-1100",,,"Troubidou","merlu, poissons cerises","MA-2009",03/2010,01/2011,,,,0,5,0,0,5,0,0,6,0,0,3,,,3,1, +"PLAN_CODE","SOCIETE_NOM","PECHE_DIVISION","PECHE_AUTRE","METIER_CODE_DCF5","METIER_MAILLAGE","METIER_TAILLE","METIER_AUTRE","METIER_LIBELLE","METIER_ESPECES","PROGRAMME_CODE","PROGRAMME_DEBUT","PROGRAMME_FIN",12/2009,01/2010,02/2010,03/2010,04/2010,05/2010,06/2010,07/2010,08/2010,09/2010,10/2010,11/2010,12/2010,01/2011,02/2011,03/2011,"PLAN_DUREE_MOY","PLAN_NB_OBSERV","PLAN_COMMENT","PLAN_STRATEGIE" +"2010_1",TARTANPION,"IId / I",,"DRB_ALG",,,,,,"MA-2009",03/2010,01/2011,,,,0,0,0,0,0,0,0,2,0,0,4,,,"1,5",1,"Un petit commentaire",SIMULTANEOUS_ALL_SPECIES +"2010_2",,"IId",,"DRH_CAT et DRH_CRU",,,,"Fileyage","poissons tubes","MANY",01/2008,12/2008,,20,0,0,21,0,0,21,0,0,21,0,0,,,,1,1,, +"2010_03",,"IId / IV",,"FAR",,,,"balottage en plein air","divers choses visqueuses","MA-2009",03/2010,01/2011,,,,0,22,0,0,25,0,0,21,0,0,25,,,2,1,, +"2009_1",,"IId / IV",,"GTR_DEF et GNS_DEF","110-119",,,"Fileyage à poissons tubes","poissons plats","PPP2010",12/2009,10/2010,0,1,1,1,2,1,1,1,1,1,2,,,,,,1,1,, +"2009_2",,"IId",,"GTR_DEF et GNS_DEF","9888-99",,,"Fileyage à sirènes ","nymphes","PPP2010",12/2009,10/2010,1,1,1,2,3,4,4,4,4,3,3,,,,,,1,1,, +"2009_3",TARTANPION,"IV",,"GTR_MOL et GNS_FIN",,,,"Fileyages à baleines à bosse","chameaux","PPP2010",12/2009,10/2010,2,2,2,2,2,2,2,2,2,2,4,,,,,,1,1,, +"2009_4",,"IId",,"PTB_ALG",">=190",">18",,"Chalutage de fond machiavélique","gadidés, divers","PPP2010",12/2009,10/2010,1,1,1,1,1,1,1,1,1,1,2,,,,,,3,2,, +"2009_5",,"IId",,"PTB_ALG","70-1100",">1140",,"Plongeur de fond sous-marin","gadidés, divers","PPP2010",12/2009,10/2010,1,1,1,1,1,1,1,1,1,1,2,,,,,,3,2,, +"2009_6",BIS,"I / IV",,"OT_DEF","70-1100",">1140",,"Leon","poissons plats","PPP2010",12/2009,10/2010,0,1,0,1,0,1,2,2,2,2,1,,,,,,3,2,, +"2010_4",TARTANPION,"IId / IV",,"OT_DEF et PTB_ALG et DRH",,,,"Chalutage de fond","gadidés, poissons plats, divers","BLOB",01/2010,12/2010,,3,0,0,3,0,0,3,0,0,3,0,0,,,,3,1,, +"2010_5",,,,"DRB",,,,"Kamoulox","merlu, poissons cerises, divers","MA-2009",03/2010,01/2011,,,,0,5,0,0,5,0,0,6,0,0,3,,,3,1,, +"2010_10",,"I / IV",,"DRB","70-1100",,,"Kamoulox","merlu, poissons pommes, divers","MA-2009",03/2010,01/2011,,,,0,5,0,0,5,0,0,6,0,0,3,,,3,1,, +"2010_11",,"I / IV",,"DRB_CSJ","70-1100",,,"Troubidou","merlu, poissons cerises","MA-2009",03/2010,01/2011,,,,0,5,0,0,5,0,0,6,0,0,3,,,3,1,,

1 0

[Suiviobsmer-commits] r871 - trunk
by bleny＠users.labs.libre-entreprise.org Dec. 30, 2010

Dec. 30, 2010

Author: bleny Date: 2010-12-30 16:06:30 +0000 (Thu, 30 Dec 2010) New Revision: 871 Log: update topia version to 2.5 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-12-30 09:26:25 UTC (rev 870) +++ trunk/pom.xml 2010-12-30 16:06:30 UTC (rev 871) @@ -331,7 +331,7 @@ <nuitonI18nVersion>1.2.2</nuitonI18nVersion> <nuitonUtilsVersion>1.5.3</nuitonUtilsVersion> <nuitonWebVersion>0.1</nuitonWebVersion> - <topiaVersion>2.5-SNAPSHOT</topiaVersion> + <topiaVersion>2.5</topiaVersion> <eugeneVersion>2.3</eugeneVersion> <tapestryVersion>5.2.4</tapestryVersion> <hibernateVersion>3.3.2.GA</hibernateVersion>

1 0

[Suiviobsmer-commits] r870 - trunk
by bleny＠users.labs.libre-entreprise.org Dec. 30, 2010

Dec. 30, 2010

Author: bleny Date: 2010-12-30 09:26:25 +0000 (Thu, 30 Dec 2010) New Revision: 870 Log: fix pom Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-12-30 09:24:17 UTC (rev 869) +++ trunk/pom.xml 2010-12-30 09:26:25 UTC (rev 870) @@ -349,7 +349,7 @@ scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk </connection> <developerConnection> - scm:svn:svn+ssh://${username}@labs.libre-entreprise.org/svnroot/suiviobsmer/trunk + scm:svn:svn+ssh://${user.name}@labs.libre-entreprise.org/svnroot/suiviobsmer/trunk </developerConnection> <url>http://labs.libre-entreprise.org/scm/viewvc.php/trunk/?root=suiviobsmer </url>

1 0

[Suiviobsmer-commits] r869 - trunk
by bleny＠users.labs.libre-entreprise.org Dec. 30, 2010

Dec. 30, 2010

Author: bleny Date: 2010-12-30 09:24:17 +0000 (Thu, 30 Dec 2010) New Revision: 869 Log: fix scm url in pom Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-12-30 09:19:46 UTC (rev 868) +++ trunk/pom.xml 2010-12-30 09:24:17 UTC (rev 869) @@ -349,7 +349,7 @@ scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk </connection> <developerConnection> - scm:svn:svn+ssh://bleny at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk + scm:svn:svn+ssh://${username}@labs.libre-entreprise.org/svnroot/suiviobsmer/trunk </developerConnection> <url>http://labs.libre-entreprise.org/scm/viewvc.php/trunk/?root=suiviobsmer </url>

1 0

[Suiviobsmer-commits] r868 - in trunk: wao-business/src/main/xmi wao-ui/src/main/java/fr/ifremer/wao/ui/pages wao-ui/src/main/webapp
by bleny＠users.labs.libre-entreprise.org Dec. 30, 2010

Dec. 30, 2010

Author: bleny Date: 2010-12-30 09:19:46 +0000 (Thu, 30 Dec 2010) New Revision: 868 Log: add ObsVente fields in contact form Modified: trunk/wao-business/src/main/xmi/wao.zargo trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/ContactForm.java trunk/wao-ui/src/main/webapp/ContactForm.tml Modified: trunk/wao-business/src/main/xmi/wao.zargo =================================================================== (Binary files differ) Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/ContactForm.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/ContactForm.java 2010-12-29 19:41:49 UTC (rev 867) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/ContactForm.java 2010-12-30 09:19:46 UTC (rev 868) @@ -294,7 +294,11 @@ return result; } + public boolean showObsVente() { + return connectedUser.getProfile().getObsProgram() == ObsProgram.OBSVENTE; + } + /************************ ADMIN FIELDS ************************************/ Modified: trunk/wao-ui/src/main/webapp/ContactForm.tml =================================================================== --- trunk/wao-ui/src/main/webapp/ContactForm.tml 2010-12-29 19:41:49 UTC (rev 867) +++ trunk/wao-ui/src/main/webapp/ContactForm.tml 2010-12-30 09:19:46 UTC (rev 868) @@ -135,6 +135,16 @@ <t:label t:for="inputDate" /> <t:output value="contact.dataInputDate" format="dateFormat" /> </div> + <t:if test="showObsVente()"> + <div class="t-beaneditor-row"> + <t:label t:for="actualSamplingStrategy" /> + ${contact.samplingStrategy} + </div> + <div class="t-beaneditor-row"> + <t:label t:for="completeSampling" /> + ${contact.completeSampling} + </div> + </t:if> <div class="t-beaneditor-row"> <t:label t:for="observerComment" /> @@ -194,8 +204,17 @@ <t:label t:for="inputDate" /> <input t:type="datefield" t:id="inputDate" class="date" value="contact.dataInputDate" /> </div> + <t:if test="showObsVente()"> + <div class="t-beaneditor-row"> + <t:label t:for="actualSamplingStrategy" /> + <input t:type="select" t:id="actualSamplingStrategy" t:value="contact.samplingStrategy" t:validate="required" /> + </div> + <div class="t-beaneditor-row"> + <t:label t:for="completeSampling" /> + <input t:type="checkbox" t:id="completeSampling" value="contact.completeSampling" /> + </div> + </t:if> - <t:unless test="connectedUser.observer"> <div class="t-beaneditor-row"> <t:label t:for="coordinatorComment" />

1 0

[Suiviobsmer-commits] r867 - trunk
by tchemit＠users.labs.libre-entreprise.org Dec. 29, 2010

Dec. 29, 2010

Author: tchemit Date: 2010-12-29 19:41:49 +0000 (Wed, 29 Dec 2010) New Revision: 867 Log: use last stable of nuiton-utils Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-12-29 17:54:17 UTC (rev 866) +++ trunk/pom.xml 2010-12-29 19:41:49 UTC (rev 867) @@ -329,7 +329,7 @@  <nuitonI18nVersion>1.2.2</nuitonI18nVersion> - <nuitonUtilsVersion>1.5.3-SNAPSHOT</nuitonUtilsVersion> + <nuitonUtilsVersion>1.5.3</nuitonUtilsVersion> <nuitonWebVersion>0.1</nuitonWebVersion> <topiaVersion>2.5-SNAPSHOT</topiaVersion> <eugeneVersion>2.3</eugeneVersion>

1 0

[Suiviobsmer-commits] r866 - in trunk: . wao-business
by tchemit＠users.labs.libre-entreprise.org Dec. 29, 2010

Dec. 29, 2010

Author: tchemit Date: 2010-12-29 17:54:17 +0000 (Wed, 29 Dec 2010) New Revision: 866 Log: use stable version of eugene + make build works with the new Binder Api Modified: trunk/pom.xml trunk/wao-business/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-12-29 16:27:19 UTC (rev 865) +++ trunk/pom.xml 2010-12-29 17:54:17 UTC (rev 866) @@ -332,7 +332,7 @@ <nuitonUtilsVersion>1.5.3-SNAPSHOT</nuitonUtilsVersion> <nuitonWebVersion>0.1</nuitonWebVersion> <topiaVersion>2.5-SNAPSHOT</topiaVersion> - <eugeneVersion>2.3-SNAPSHOT</eugeneVersion> + <eugeneVersion>2.3</eugeneVersion> <tapestryVersion>5.2.4</tapestryVersion> <hibernateVersion>3.3.2.GA</hibernateVersion> Modified: trunk/wao-business/pom.xml =================================================================== --- trunk/wao-business/pom.xml 2010-12-29 16:27:19 UTC (rev 865) +++ trunk/wao-business/pom.xml 2010-12-29 17:54:17 UTC (rev 866) @@ -195,6 +195,21 @@ </goals> </execution> </executions> + <dependencies> + <dependency> + <groupId>org.nuiton.topia</groupId> + <artifactId>topia-persistence</artifactId> + <version>${topiaVersion}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + <version>${nuitonUtilsVersion}</version> + <scope>compile</scope> + </dependency> + </dependencies> + </plugin> <plugin> <groupId>org.nuiton.i18n</groupId>

1 0

[Suiviobsmer-commits] r865 - in trunk: wao-business/src/main/java/fr/ifremer/wao 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/resources/fr/ifremer/wao/ui/pages wao-ui/src/main/webapp
by bleny＠users.labs.libre-entreprise.org Dec. 29, 2010

Dec. 29, 2010

Author: bleny Date: 2010-12-29 16:27:19 +0000 (Wed, 29 Dec 2010) New Revision: 865 Log: add ObsVente new columns in contacts page refactor ContactModelFactory Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java 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/resources/fr/ifremer/wao/ui/pages/Contacts.properties trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/SamplingPlan.properties trunk/wao-ui/src/main/webapp/SamplingPlan.tml Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java 2010-12-28 16:55:24 UTC (rev 864) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java 2010-12-29 16:27:19 UTC (rev 865) @@ -368,6 +368,10 @@ query.addEquals(sampleRowProperty.obsProgramOrdinal(), filter.getObsProgram().ordinal()); } + if (filter.getSamplingStrategy() != null) { + query.addEquals(sampleRowProperty.samplingStrategyOrdinal(), filter.getSamplingStrategy().ordinal()); + } + if(logger.isDebugEnabled()) { logger.debug("sampling filter query " + query); } 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-12-28 16:55:24 UTC (rev 864) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java 2010-12-29 16:27:19 UTC (rev 865) @@ -54,14 +54,7 @@ import org.apache.tapestry5.Field; 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; -import org.apache.tapestry5.annotations.Persist; -import org.apache.tapestry5.annotations.Property; -import org.apache.tapestry5.annotations.SessionState; +import org.apache.tapestry5.annotations.*; import org.apache.tapestry5.beaneditor.BeanModel; import org.apache.tapestry5.corelib.components.Form; import org.apache.tapestry5.corelib.components.Zone; @@ -93,8 +86,8 @@ */ @SuppressWarnings({"UnusedDeclaration"}) @RequiresAuthentication(allowedRoles = {UserRole.ADMIN, UserRole.COORDINATOR, UserRole.OBSERVER}) - at IncludeStylesheet("context:css/contacts.css") - at IncludeJavaScriptLibrary("context:js/contacts.js") + at Import(stylesheet = "context:css/contacts.css") +//@IncludeJavaScriptLibrary("context:js/contacts.js") public class Contacts extends AbstractFilteredPage { @Inject @@ -138,8 +131,8 @@ */ @Log void afterRender() { - addCommentScript(); - addSendEmailScript(); + //addCommentScript(); + //addSendEmailScript(); } /**************************** CONTACT FILTERS *****************************/ @@ -311,12 +304,8 @@ @Inject private ComponentResources resources; - @Inject - private ContactModelFactory contactModelFactory; - @Persist private ContactDataSource contacts; -// private Map<String, Contact> contacts; @Property private Contact contact; @@ -346,15 +335,10 @@ public BeanModel<Contact> getContactModel() { if (contactModel == null) { + ContactModelFactory contactModelFactory = new ContactModelFactory( + user.getProfile().getObsProgram(), user.getProfile().getUserRole(), fullView); - if (user.isAdmin() || user.isCoordinator()) { - contactModel = fullView ? - contactModelFactory.buildAdminContactModel(beanModelSource, resources) : - contactModelFactory.buildCoordinatorContactModel(beanModelSource, resources); - } else { - contactModel = - contactModelFactory.buildContactModel(beanModelSource, resources); - } + contactModel = contactModelFactory.newModel(beanModelSource, resources); } return contactModel; } 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-12-28 16:55:24 UTC (rev 864) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/ContactModelFactory.java 2010-12-29 16:27:19 UTC (rev 865) @@ -24,20 +24,23 @@ package fr.ifremer.wao.ui.services; +import fr.ifremer.wao.bean.ObsProgram; +import fr.ifremer.wao.bean.UserRole; import fr.ifremer.wao.entity.Contact; import fr.ifremer.wao.entity.FishingZone; import fr.ifremer.wao.entity.WaoUser; import org.apache.tapestry5.ComponentResources; import org.apache.tapestry5.PropertyConduit; import org.apache.tapestry5.beaneditor.BeanModel; -import org.apache.tapestry5.beaneditor.RelativePosition; import org.apache.tapestry5.services.BeanModelSource; import org.nuiton.topia.persistence.TopiaEntity; import java.lang.annotation.Annotation; /** - * ContactModelFactory + * This class is used in {@link fr.ifremer.wao.ui.pages.Contacts} page to fix + * what column can be see (depending on view option, role, program), and how + * to display the content in each column. * * Created: 18 nov. 2009 * @@ -45,487 +48,300 @@ */ public class ContactModelFactory { - /** - * @param beanModelSource used to construct BeanModel<Contact> - * @param resources used to construct BeanModel<Contact> - * @return BeanModel<Contact> with new params - */ - public BeanModel<Contact> buildContactModel(BeanModelSource beanModelSource, ComponentResources resources) { - BeanModel<Contact> contactModel = beanModelSource.createDisplayModel(Contact.class, resources.getMessages()); + protected UserRole userRole; + protected ObsProgram obsProgram; + protected boolean fullView; - // New properties for contactModel - contactModel.add("createdBy", null); -// contactModel.add(Contact.SAMPLE_ROW, getSampleRowPropertyConduit()); -// contactModel.add(Contact.BOAT, getBoatPropertyConduit()); - contactModel.add(Contact.PROPERTY_SAMPLE_ROW, null); - contactModel.add(Contact.PROPERTY_BOAT, null); - contactModel.add("mammals", null); - contactModel.add("validation", null); - contactModel.add("actions", null); + /** the model the factory will build */ + protected BeanModel<Contact> model; - contactModel.include( - "createdBy", - TopiaEntity.TOPIA_CREATE_DATE, - Contact.PROPERTY_SAMPLE_ROW, - Contact.PROPERTY_BOAT, - Contact.PROPERTY_STATE, - Contact.PROPERTY_OBSERVATION_BEGIN_DATE, - Contact.PROPERTY_OBSERVATION_END_DATE, - Contact.PROPERTY_NB_OBSERVANTS, - "mammals", - Contact.PROPERTY_COMMENT, - Contact.PROPERTY_DATA_INPUT_DATE, - "validation", - "actions"); - - contactModel.get(TopiaEntity.TOPIA_CREATE_DATE).sortable(false); - contactModel.get(Contact.PROPERTY_STATE).sortable(false); - contactModel.get(Contact.PROPERTY_OBSERVATION_BEGIN_DATE).sortable(false); - contactModel.get(Contact.PROPERTY_OBSERVATION_END_DATE).sortable(false); - contactModel.get(Contact.PROPERTY_NB_OBSERVANTS).sortable(false); - contactModel.get(Contact.PROPERTY_DATA_INPUT_DATE).sortable(false); - contactModel.get(Contact.PROPERTY_COMMENT).sortable(false); - - return contactModel; + public ContactModelFactory(ObsProgram obsProgram, UserRole userRole, boolean fullView) { + this.userRole = userRole; + this.obsProgram = obsProgram; + this.fullView = fullView; } - public BeanModel<Contact> buildCoordinatorContactModel(BeanModelSource beanModelSource, ComponentResources resources) { - BeanModel<Contact> contactModel = buildContactModel(beanModelSource, resources); - contactModel.add(RelativePosition.AFTER, "validation", Contact.PROPERTY_COMMENT_COORDINATOR, getCommentCoordinatorPropertyConduit()); - contactModel.add(RelativePosition.AFTER, Contact.PROPERTY_COMMENT_COORDINATOR, Contact.PROPERTY_COMMENT_ADMIN, getCommentAdminPropertyConduit()); - contactModel.get(Contact.PROPERTY_COMMENT_COORDINATOR).sortable(false); - contactModel.get(Contact.PROPERTY_COMMENT_ADMIN).sortable(false); - contactModel.add(RelativePosition.BEFORE, "actions", "dataReliability", getDataReliabilityPropertyConduit()); - contactModel.get("dataReliability").sortable(false); - return contactModel; + /** add a property in the model and make it not sortable + * @param property the name of the property to add + * @param conduit a PropertyConduit to get the String representation of the + * value of the property, may be null if toString can be used */ + protected void addNonSortableProperty(String property, PropertyConduit conduit) { + model.add(property, conduit); + model.get(property).sortable(false); } - public BeanModel<Contact> buildAdminContactModel(BeanModelSource beanModelSource, ComponentResources 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.PROPERTY_COMPANY, getCompanyPropertyConduit()); - contactModel.add(RelativePosition.AFTER, Contact.PROPERTY_SAMPLE_ROW, "program", getProgramPropertyConduit()); - contactModel.add(RelativePosition.AFTER, "program", "professionCode", getProfessionCodePropertyConduit()); - contactModel.add(RelativePosition.AFTER, "professionCode", "professionLibelle", getProfessionLibellePropertyConduit()); - contactModel.add(RelativePosition.AFTER, "professionLibelle", "professionSpecies", getProfessionSpeciesPropertyConduit()); - contactModel.add(RelativePosition.AFTER, "professionSpecies", "fishingZoneFacade", getFishingZoneFacadePropertyConduit()); - contactModel.add(RelativePosition.AFTER, "fishingZoneFacade", "fishingZoneSector", getFishingZoneSectorPropertyConduit()); - contactModel.add(RelativePosition.AFTER, "fishingZoneSector", "fishingZoneDivision", getFishingZoneDivisionPropertyConduit()); - contactModel.add(RelativePosition.AFTER, Contact.PROPERTY_BOAT, "boatImmatriculation", getBoatImmatriculationPropertyConduit()); - contactModel.add(RelativePosition.AFTER, "boatImmatriculation", "boatDistrictCode", getBoatDistrictCodePropertyConduit()); + /** add ALL properties to the bean model. */ + protected void initModel() { - contactModel.get("observer").sortable(false); - contactModel.get(WaoUser.PROPERTY_COMPANY).sortable(false); - contactModel.get("program").sortable(false); - contactModel.get("professionCode").sortable(false); - contactModel.get("professionLibelle").sortable(false); - contactModel.get("professionSpecies").sortable(false); - contactModel.get("fishingZoneFacade").sortable(false); - contactModel.get("fishingZoneSector").sortable(false); - contactModel.get("fishingZoneDivision").sortable(false); - contactModel.get("boatImmatriculation").sortable(false); - contactModel.get("boatDistrictCode").sortable(false); + // order is meaningful, properties will be displayed in columns from left to right -// contactModel.add(RelativePosition.AFTER, TopiaEntity.TOPIA_CREATE_DATE, "observer", null); -// contactModel.add(RelativePosition.AFTER, "observer", User.COMPANY, null); -// contactModel.add(RelativePosition.AFTER, Contact.SAMPLE_ROW, "program", null); -// contactModel.add(RelativePosition.AFTER, "program", "professionCode", null); -// contactModel.add(RelativePosition.AFTER, "professionCode", "professionLibelle", null); -// contactModel.add(RelativePosition.AFTER, "professionLibelle", "professionSpecies", null); -// contactModel.add(RelativePosition.AFTER, "professionSpecies", "fishingZoneFacade", null); -// contactModel.add(RelativePosition.AFTER, "fishingZoneFacade", "fishingZoneSector", null); -// contactModel.add(RelativePosition.AFTER, "fishingZoneSector", "fishingZoneDivision", null); -// contactModel.add(RelativePosition.AFTER, Contact.BOAT, "boatImmatriculation", null); -// contactModel.add(RelativePosition.AFTER, "boatImmatriculation", "boatDistrictCode", null); - return contactModel; + addNonSortableProperty(TopiaEntity.TOPIA_CREATE_DATE, null); + addNonSortableProperty(Contact.PROPERTY_MAIN_OBSERVER, getUserPropertyConduit()); + addNonSortableProperty(WaoUser.PROPERTY_COMPANY, getCompanyPropertyConduit()); + addNonSortableProperty(Contact.PROPERTY_SAMPLE_ROW, getSampleRowPropertyConduit()); + addNonSortableProperty("program", getProgramPropertyConduit()); + addNonSortableProperty("professionCode", getProfessionCodePropertyConduit()); + addNonSortableProperty("professionLibelle", getProfessionLibellePropertyConduit()); + addNonSortableProperty("professionSpecies", getProfessionSpeciesPropertyConduit()); + addNonSortableProperty("expectedSamplingStrategy", getExpectedSamplingStrategyPropertyConduit()); + addNonSortableProperty("fishingZoneFacade", getFishingZoneFacadePropertyConduit()); + addNonSortableProperty("fishingZoneSector", getFishingZoneSectorPropertyConduit()); + addNonSortableProperty("fishingZoneDivision", getFishingZoneDivisionPropertyConduit()); + addNonSortableProperty(Contact.PROPERTY_BOAT, getBoatPropertyConduit()); + addNonSortableProperty("boatImmatriculation", getBoatImmatriculationPropertyConduit()); + addNonSortableProperty("boatDistrictCode", getBoatDistrictCodePropertyConduit()); + addNonSortableProperty(Contact.PROPERTY_STATE, null); + addNonSortableProperty(Contact.PROPERTY_OBSERVATION_BEGIN_DATE, null); + addNonSortableProperty(Contact.PROPERTY_OBSERVATION_END_DATE, null); + addNonSortableProperty(Contact.PROPERTY_NB_OBSERVANTS, null); + addNonSortableProperty("mammals", null); + addNonSortableProperty("actualSamplingStrategy", getActualSamplingStrategyPropertyConduit()); + addNonSortableProperty(Contact.PROPERTY_COMPLETE_SAMPLING, null); + addNonSortableProperty(Contact.PROPERTY_COMMENT, null); + addNonSortableProperty(Contact.PROPERTY_DATA_INPUT_DATE, null); + addNonSortableProperty("validation", null); + addNonSortableProperty(Contact.PROPERTY_COMMENT_COORDINATOR, getCommentCoordinatorPropertyConduit()); + addNonSortableProperty(Contact.PROPERTY_COMMENT_ADMIN, getCommentAdminPropertyConduit()); + addNonSortableProperty("dataReliability", getDataReliabilityPropertyConduit()); + addNonSortableProperty("actions", null); } - public PropertyConduit getUserPropertyConduit() { - return new PropertyConduit() { - @Override - public Object get(Object arg0) { - Contact contact = (Contact)arg0; - return contact.getMainObserver().getFullName(); - } - - @Override - public void set(Object arg0, Object arg1) { - } + /** remove properties from model depending on role, program, and fullView */ + protected void filterModel() { - @Override - public Class getPropertyType() { - return String.class; - } + if (obsProgram == ObsProgram.OBSMER) { + model.exclude("expectedSamplingStrategy", + "actualSamplingStrategy", + Contact.PROPERTY_COMPLETE_SAMPLING); + } - @Override - public <T extends Annotation> T getAnnotation(Class<T> arg0) { - return null; - } - }; - } - - public PropertyConduit getCompanyPropertyConduit() { - return new PropertyConduit() { - @Override - public Object get(Object arg0) { - Contact contact = (Contact)arg0; - return contact.getMainObserver().getCompany().getName(); - } + if (obsProgram == ObsProgram.OBSVENTE) { + model.exclude("dataReliability"); + } - @Override - public void set(Object arg0, Object arg1) { - } + if (userRole != UserRole.ADMIN || ! fullView) { + model.exclude("observer", + WaoUser.PROPERTY_COMPANY,"program","professionCode", "professionLibelle", + "professionSpecies", "fishingZoneFacade", "fishingZoneSector", + "fishingZoneDivision", "boatImmatriculation", "boatDistrictCode"); + } - @Override - public Class getPropertyType() { - return String.class; - } + if (userRole != UserRole.ADMIN && userRole != UserRole.COORDINATOR) { + model.exclude(Contact.PROPERTY_COMMENT_COORDINATOR, + Contact.PROPERTY_COMMENT_ADMIN, "dataReliability"); + } - @Override - public <T extends Annotation> T getAnnotation(Class<T> arg0) { - return null; - } - }; - } - - public PropertyConduit getSampleRowPropertyConduit() { - return new PropertyConduit() { - @Override - public Object get(Object arg0) { - Contact contact = (Contact)arg0; - return contact.getSampleRow().getCode(); - } + } - @Override - public void set(Object arg0, Object arg1) { - } + public BeanModel<Contact> newModel(BeanModelSource beanModelSource, ComponentResources resources) { + model = beanModelSource.createDisplayModel(Contact.class, resources.getMessages()); - @Override - public Class getPropertyType() { - return String.class; - } + // reset, so next adds will not throw an exception about already existing property + model.include(); - @Override - public <T extends Annotation> T getAnnotation(Class<T> arg0) { - return null; - } - }; - } + initModel(); - public PropertyConduit getBoatPropertyConduit() { - return new PropertyConduit() { - @Override - public Object get(Object arg0) { - Contact contact = (Contact)arg0; - return contact.getBoat().getName(); - } + filterModel(); - @Override - public void set(Object arg0, Object arg1) { - } + return model; + } - @Override - public Class getPropertyType() { - return String.class; - } + /** put in common some implementation of PropertyConduit interface. */ + protected static abstract class ContactReaderPropertyConduit implements PropertyConduit { - @Override - public <T extends Annotation> T getAnnotation(Class<T> arg0) { - return null; - } - }; - } + public abstract String getValue(Contact contact); - public PropertyConduit getProgramPropertyConduit() { - return new PropertyConduit() { - @Override - public Object get(Object arg0) { - Contact contact = (Contact)arg0; - return contact.getSampleRow().getProgramName(); - } + @Override + public String get(Object instance) { + // cast and delegate + Contact contact = (Contact) instance; + return getValue(contact); + } - @Override - public void set(Object arg0, Object arg1) { - } + /** all value returned are string */ + @Override + public Class getPropertyType() { + return String.class; + } - @Override - public Class getPropertyType() { - return String.class; - } + /** should never be called */ + @Override + public void set(Object instance, Object value) { + throw new UnsupportedOperationException(); + } - @Override - public <T extends Annotation> T getAnnotation(Class<T> arg0) { - return null; - } - }; + /** should never be called */ + @Override + public <T extends Annotation> T getAnnotation(Class<T> annotationClass) { + throw new UnsupportedOperationException(); + } } - public PropertyConduit getProfessionCodePropertyConduit() { - return new PropertyConduit() { - @Override - public Object get(Object arg0) { - Contact contact = (Contact)arg0; - return contact.getSampleRow().getProfessionDescription(); - } + protected PropertyConduit getUserPropertyConduit() { + return new ContactReaderPropertyConduit() { + @Override + public String getValue(Contact contact) { + return contact.getMainObserver().getFullName(); + } + }; + } + + protected PropertyConduit getCompanyPropertyConduit() { + return new ContactReaderPropertyConduit() { + @Override + public String getValue(Contact contact) { + return contact.getMainObserver().getCompany().getName(); + } + }; + } + + protected PropertyConduit getSampleRowPropertyConduit() { + return new ContactReaderPropertyConduit() { + @Override + public String getValue(Contact contact) { + return contact.getSampleRow().getCode(); + } + }; + } - @Override - public void set(Object arg0, Object arg1) { - } + protected PropertyConduit getBoatPropertyConduit() { + return new ContactReaderPropertyConduit() { + @Override + public String getValue(Contact contact) { + return contact.getBoat().getName(); + } + }; + } - @Override - public Class getPropertyType() { - return String.class; - } + protected PropertyConduit getProgramPropertyConduit() { + return new ContactReaderPropertyConduit() { + @Override + public String getValue(Contact contact) { + return contact.getSampleRow().getProgramName(); + } + }; + } - @Override - public <T extends Annotation> T getAnnotation(Class<T> arg0) { - return null; - } - }; + protected PropertyConduit getProfessionCodePropertyConduit() { + return new ContactReaderPropertyConduit() { + @Override + public String getValue(Contact contact) { + return contact.getSampleRow().getProfessionDescription(); + } + }; } - public PropertyConduit getProfessionLibellePropertyConduit() { - return new PropertyConduit() { - @Override - public Object get(Object arg0) { - Contact contact = (Contact)arg0; - return contact.getSampleRow().getProfession().getLibelle(); - } + protected PropertyConduit getProfessionLibellePropertyConduit() { + return new ContactReaderPropertyConduit() { + @Override + public String getValue(Contact contact) { + return contact.getSampleRow().getProfession().getLibelle(); + } + }; + } - @Override - public void set(Object arg0, Object arg1) { - } + protected PropertyConduit getProfessionSpeciesPropertyConduit() { + return new ContactReaderPropertyConduit() { + @Override + public String getValue(Contact contact) { + return contact.getSampleRow().getProfession().getSpecies(); + } + }; + } - @Override - public Class getPropertyType() { - return String.class; - } + protected PropertyConduit getFishingZoneFacadePropertyConduit() { + return new ContactReaderPropertyConduit() { + @Override + public String getValue(Contact contact) { + return contact.getSampleRow().getFacade(); + } + }; + } - @Override - public <T extends Annotation> T getAnnotation(Class<T> arg0) { - return null; - } - }; + protected PropertyConduit getFishingZoneSectorPropertyConduit() { + return new ContactReaderPropertyConduit() { + @Override + public String getValue(Contact contact) { + return contact.getSampleRow().getSectors(); + } + }; } - public PropertyConduit getProfessionSpeciesPropertyConduit() { - return new PropertyConduit() { - @Override - public Object get(Object arg0) { - Contact contact = (Contact)arg0; - return contact.getSampleRow().getProfession().getSpecies(); + protected PropertyConduit getFishingZoneDivisionPropertyConduit() { + return new ContactReaderPropertyConduit() { + @Override + public String getValue(Contact contact) { + String result = ""; + for (FishingZone zone : contact.getSampleRow().getFishingZone()) { + result += zone.getDistrictCode() + " "; } - - @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; - } - }; + return result; + } + }; } - public PropertyConduit getFishingZoneFacadePropertyConduit() { - return new PropertyConduit() { - @Override - public Object get(Object arg0) { - Contact contact = (Contact)arg0; - return contact.getSampleRow().getFacade(); - } - - @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; - } - }; + protected PropertyConduit getBoatImmatriculationPropertyConduit() { + return new ContactReaderPropertyConduit() { + @Override + public String getValue(Contact contact) { + return String.valueOf(contact.getBoat().getImmatriculation()); + } + }; } - public PropertyConduit getFishingZoneSectorPropertyConduit() { - return new PropertyConduit() { - @Override - public Object get(Object arg0) { - Contact contact = (Contact)arg0; - return contact.getSampleRow().getSectors(); - } - - @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; - } - }; + protected PropertyConduit getBoatDistrictCodePropertyConduit() { + return new ContactReaderPropertyConduit() { + @Override + public String getValue(Contact contact) { + return contact.getBoat().getDistrictCode(); + } + }; } - public PropertyConduit getFishingZoneDivisionPropertyConduit() { - return new PropertyConduit() { - @Override - public Object get(Object arg0) { - Contact contact = (Contact)arg0; - String result = ""; - for (FishingZone zone : contact.getSampleRow().getFishingZone()) { - result += zone.getDistrictCode() + " "; - } - return result; - } - - @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; - } - }; + protected PropertyConduit getCommentCoordinatorPropertyConduit() { + return new ContactReaderPropertyConduit() { + @Override + public String getValue(Contact contact) { + return contact.getCommentCoordinator(); + } + }; } - public PropertyConduit getBoatImmatriculationPropertyConduit() { - return new PropertyConduit() { - @Override - public Object get(Object arg0) { - Contact contact = (Contact)arg0; - return contact.getBoat().getImmatriculation(); - } - - @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; - } - }; + protected PropertyConduit getCommentAdminPropertyConduit() { + return new ContactReaderPropertyConduit() { + @Override + public String getValue(Contact contact) { + return contact.getCommentAdmin(); + } + }; } - public PropertyConduit getBoatDistrictCodePropertyConduit() { - return new PropertyConduit() { - @Override - public Object get(Object arg0) { - Contact contact = (Contact)arg0; - return contact.getBoat().getDistrictCode(); - } - - @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; - } - }; + protected PropertyConduit getDataReliabilityPropertyConduit() { + return new ContactReaderPropertyConduit() { + @Override + public String getValue(Contact contact) { + return contact.getDataReliability().toString(); + } + }; } - 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; - } - }; + protected PropertyConduit getActualSamplingStrategyPropertyConduit() { + return new ContactReaderPropertyConduit() { + @Override + public String getValue(Contact contact) { + return contact.getSamplingStrategy().toString(); + } + }; } - 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; - } - }; + protected PropertyConduit getExpectedSamplingStrategyPropertyConduit() { + return new ContactReaderPropertyConduit() { + @Override + public String getValue(Contact contact) { + return contact.getSampleRow().getSamplingStrategy().toString(); + } + }; } - public PropertyConduit getDataReliabilityPropertyConduit() { - return new PropertyConduit() { - @Override - public Object get(Object arg0) { - Contact contact = (Contact) arg0; - return contact.getDataReliability(); - } - @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/resources/fr/ifremer/wao/ui/pages/Contacts.properties =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Contacts.properties 2010-12-28 16:55:24 UTC (rev 864) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Contacts.properties 2010-12-29 16:27:19 UTC (rev 865) @@ -61,6 +61,10 @@ commentCoordinator-label: Commentaire soci\u00e9t\u00e9 dataReliability-label: Qualit\u00e9 de la donn\u00e9e sortedByBoardingDate-label: Trier par date de d\u00e9but de mar\u00e9e (du plus r\u00e9cent au plus ancien) +expectedSamplingStrategy-label: Strat\u00e9gie d'\u00e9chantillonnage attendue +actualSamplingStrategy-label: Strat\u00e9gie d'\u00e9chantillonnage utilis\u00e9e +completeSampling-label: \u00c9chantillonnage complet + # 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/resources/fr/ifremer/wao/ui/pages/SamplingPlan.properties =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/SamplingPlan.properties 2010-12-28 16:55:24 UTC (rev 864) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/SamplingPlan.properties 2010-12-29 16:27:19 UTC (rev 865) @@ -33,5 +33,6 @@ selectedSampleRow-label: Code ligne fishingGearDCF-label: Engins code DCF targetSpeciesDCF-label: Ensembles d\'esp\u00e8ces-cible code DCF +samplingStrategy-label: Strat\u00e9gie d'\u00e9chantillonnage sampleRow-delete-confirmMessage: \u00cates-vous s\u00fbr de vouloir supprimer d\u00e9finitivement la ligne %1$s du plan d\'\u00e9chantillonnage ? Modified: trunk/wao-ui/src/main/webapp/SamplingPlan.tml =================================================================== --- trunk/wao-ui/src/main/webapp/SamplingPlan.tml 2010-12-28 16:55:24 UTC (rev 864) +++ trunk/wao-ui/src/main/webapp/SamplingPlan.tml 2010-12-29 16:27:19 UTC (rev 865) @@ -127,6 +127,10 @@ <input t:type="select" t:id="fishingGearDCF" t:model="dcfGearSelectModel" value="fishingGearDCFId"/>  <t:label t:for="targetSpeciesDCF" /> : <input t:type="select" t:id="targetSpeciesDCF" t:model="dcfSpeciesSelectModel" value="targetSpeciesDCFId"/>  + <t:if test="showObsVente()"> + <t:label t:for="samplingStrategy" /> + <input t:type="select" t:id="samplingStrategy" value="filter.samplingStrategy" /> + </t:if> </div> <div class="t-beaneditor-row aright"> <input t:type="submit" class="ico search-32px" t:id="search" value="Search" title="Rechercher les lignes du plan correspondants aux filtres saisies" /> 

1 0

[Suiviobsmer-commits] r864 - in trunk: wao-business/src/main/java/fr/ifremer/wao wao-business/src/main/java/fr/ifremer/wao/bean wao-business/src/main/java/fr/ifremer/wao/entity wao-business/src/main/resources/i18n wao-business/src/main/xmi wao-ui/src/main/java/fr/ifremer/wao/ui/components wao-ui/src/main/java/fr/ifremer/wao/ui/pages wao-ui/src/main/resources/fr/ifremer/wao/ui/components wao-ui/src/main/resources/fr/ifremer/wao/ui/pages wao-ui/src/main/webapp wao-ui/src/main/webapp/WEB-INF
by bleny＠users.labs.libre-entreprise.org Dec. 28, 2010

Dec. 28, 2010

Author: bleny Date: 2010-12-28 16:55:24 +0000 (Tue, 28 Dec 2010) New Revision: 864 Log: add sampling strategy in business + UI for sampleRows Added: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SamplingStrategy.java Modified: 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/entity/ContactImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowImpl.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/components/Layout.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SampleRowForm.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SamplingPlan.java trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/Layout.tml trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/SampleRowForm.properties trunk/wao-ui/src/main/webapp/SampleRowForm.tml trunk/wao-ui/src/main/webapp/SamplingPlan.tml trunk/wao-ui/src/main/webapp/WEB-INF/app.properties Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java 2010-12-28 09:56:05 UTC (rev 863) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java 2010-12-28 16:55:24 UTC (rev 864) @@ -690,4 +690,16 @@ queries.add("ALTER TABLE Contact RENAME tideBeginDate TO observationBeginDate"); queries.add("ALTER TABLE Contact RENAME tideEndDate TO observationEndDate"); } + + @Override + protected void addSampleRowAndContactsObsVenteColumns_2_0(List<String> queries) { + queries.add("ALTER TABLE SampleRow ADD samplingStrategyOrdinal SMALLINT;"); + queries.add("ALTER TABLE Contact ADD samplingStrategyOrdinal SMALLINT;"); + + // for all ObsMer sampleRows and contacts, set samplingStrategy to SIMULTANEOUS_ALL_SPECIES + queries.add("UPDATE SampleRow SET samplingStrategyOrdinal=2 WHERE ObsProgramOrdinal=0"); + queries.add("UPDATE Contact SET samplingStrategyOrdinal=2 WHERE ObsProgramOrdinal=0"); + + queries.add("ALTER TABLE Contact ADD completeSampling BOOLEAN;"); + } } Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoMigrationCallBack.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/WaoMigrationCallBack.java 2010-12-28 09:56:05 UTC (rev 863) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/WaoMigrationCallBack.java 2010-12-28 16:55:24 UTC (rev 864) @@ -119,6 +119,8 @@ protected abstract void renameContactsColumnsToCommonName_2_0(List<String> queries); + protected abstract void addSampleRowAndContactsObsVenteColumns_2_0(List<String> queries); + protected static final Version[] VERSIONS = new Version[] { VersionUtil.valueOf("1.0"), VersionUtil.valueOf("1.1"), @@ -423,6 +425,8 @@ renameContactsColumnsToCommonName_2_0(queries); + addSampleRowAndContactsObsVenteColumns_2_0(queries); + String[] strings = queries.toArray(new String[queries.size()]); executeSQL(tx, true, true, strings); } Added: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SamplingStrategy.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SamplingStrategy.java (rev 0) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SamplingStrategy.java 2010-12-28 16:55:24 UTC (rev 864) @@ -0,0 +1,31 @@ +package fr.ifremer.wao.bean; + +import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.n_; + +public enum SamplingStrategy { + + SIMULTANEOUS_G1_SPECIES(n_("fr.ifremer.wao.bean.SamplingStrategy.SIMULTANEOUS_G1_SPECIES")), + SIMULTANEOUS_G1_G2_SPECIES(n_("fr.ifremer.wao.bean.SamplingStrategy.SIMULTANEOUS_G1_G2_SPECIES")), + SIMULTANEOUS_ALL_SPECIES(n_("fr.ifremer.wao.bean.SamplingStrategy.SIMULTANEOUS_ALL_SPECIES")), + SPECIFIC_STOCK(n_("fr.ifremer.wao.bean.SamplingStrategy.SPECIFIC_STOCK")); + + protected String i18nkey; + + SamplingStrategy(String i18nkey) { + this.i18nkey = i18nkey; + } + + public String toString() { + return _(i18nkey); + } + + public static SamplingStrategy valueOf(int samplingStrategyOrdinal) { + for (SamplingStrategy samplingStrategy : values()) { + if (samplingStrategy.ordinal() == samplingStrategyOrdinal) { + return samplingStrategy; + } + } + return null; + } +} 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-12-28 09:56:05 UTC (rev 863) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ContactImpl.java 2010-12-28 16:55:24 UTC (rev 864) @@ -27,6 +27,7 @@ import fr.ifremer.wao.bean.ContactState; import fr.ifremer.wao.bean.DataReliability; import fr.ifremer.wao.bean.ObsProgram; +import fr.ifremer.wao.bean.SamplingStrategy; import org.nuiton.util.DateUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -113,4 +114,14 @@ public void setObsProgram(ObsProgram obsProgram) { setObsProgramOrdinal(obsProgram.ordinal()); } + + @Override + public SamplingStrategy getSamplingStrategy() { + return SamplingStrategy.valueOf(getSamplingStrategyOrdinal()); + } + + @Override + public void setSamplingStrategy(SamplingStrategy samplingStrategy) { + setSamplingStrategyOrdinal(samplingStrategy.ordinal()); + } } Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowImpl.java 2010-12-28 09:56:05 UTC (rev 863) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowImpl.java 2010-12-28 16:55:24 UTC (rev 864) @@ -26,6 +26,7 @@ import fr.ifremer.wao.WaoUtils; import fr.ifremer.wao.bean.ObsProgram; +import fr.ifremer.wao.bean.SamplingStrategy; import fr.ifremer.wao.service.ServiceSampling; import org.apache.commons.lang.BooleanUtils; import org.apache.commons.lang.StringUtils; @@ -431,4 +432,14 @@ public void setObsProgram(ObsProgram obsProgram) { setObsProgramOrdinal(obsProgram.ordinal()); } + + @Override + public SamplingStrategy getSamplingStrategy() { + return SamplingStrategy.valueOf(getSamplingStrategyOrdinal()); + } + + @Override + public void setSamplingStrategy(SamplingStrategy samplingStrategy) { + setSamplingStrategyOrdinal(samplingStrategy.ordinal()); + } } 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-12-28 09:56:05 UTC (rev 863) +++ trunk/wao-business/src/main/resources/i18n/wao-business-en_GB.properties 2010-12-28 16:55:24 UTC (rev 864) @@ -1,3 +1,7 @@ +fr.ifremer.wao.bean.SamplingStrategy.SIMULTANEOUS_ALL_SPECIES= +fr.ifremer.wao.bean.SamplingStrategy.SIMULTANEOUS_G1_G2_SPECIES= +fr.ifremer.wao.bean.SamplingStrategy.SIMULTANEOUS_G1_SPECIES= +fr.ifremer.wao.bean.SamplingStrategy.SPECIFIC_STOCK= fr.ifremer.wao.entity.FishingGearDCF.=Not specified fr.ifremer.wao.entity.FishingGearDCF.DRB=Boat dredges fr.ifremer.wao.entity.FishingGearDCF.DRH=Hand dredges 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-12-28 09:56:05 UTC (rev 863) +++ trunk/wao-business/src/main/resources/i18n/wao-business-fr_FR.properties 2010-12-28 16:55:24 UTC (rev 864) @@ -1,6 +1,10 @@ fr.ifremer.wao.bean.ObsProgram.OBSDEB=ObsDeb fr.ifremer.wao.bean.ObsProgram.OBSMER=ObsMer fr.ifremer.wao.bean.ObsProgram.OBSVENTE=ObsVente +fr.ifremer.wao.bean.SamplingStrategy.SIMULTANEOUS_ALL_SPECIES=Simultan\u00E9 \: Toutes esp\u00E8ces commerciales +fr.ifremer.wao.bean.SamplingStrategy.SIMULTANEOUS_G1_G2_SPECIES=Simultan\u00E9 \: esp\u00E8ces G1+G2 +fr.ifremer.wao.bean.SamplingStrategy.SIMULTANEOUS_G1_SPECIES=Simultan\u00E9 \: esp\u00E8ces G1 +fr.ifremer.wao.bean.SamplingStrategy.SPECIFIC_STOCK=Stock sp\u00E9cifique fr.ifremer.wao.bean.UserRole.ADMIN=Administrateur fr.ifremer.wao.bean.UserRole.COORDINATOR=Coordinateur fr.ifremer.wao.bean.UserRole.GUEST=Invit\u00E9 Modified: trunk/wao-business/src/main/xmi/wao.zargo =================================================================== (Binary files differ) 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-28 09:56:05 UTC (rev 863) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/Layout.java 2010-12-28 16:55:24 UTC (rev 864) @@ -46,6 +46,8 @@ import java.util.LinkedHashMap; import java.util.Map; +import static org.nuiton.i18n.I18n._; + /** * Layout * @@ -145,8 +147,7 @@ menuItems = new LinkedHashMap<String, String>(); for (Class page : pagesInMenu) { if (serviceAuthentication.isAllowed(page)) { - // menuItems.put(page.getSimpleName(), _(page.getName())); - menuItems.put(page.getSimpleName(), page.getSimpleName()); + menuItems.put(page.getSimpleName(), _(page.getName())); } } } Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SampleRowForm.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SampleRowForm.java 2010-12-28 09:56:05 UTC (rev 863) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SampleRowForm.java 2010-12-28 16:55:24 UTC (rev 864) @@ -26,10 +26,7 @@ import fr.ifremer.wao.WaoBusinessException; import fr.ifremer.wao.WaoException; -import fr.ifremer.wao.bean.ConnectedUser; -import fr.ifremer.wao.bean.SamplingFilter; -import fr.ifremer.wao.bean.SamplingFilterImpl; -import fr.ifremer.wao.bean.UserRole; +import fr.ifremer.wao.bean.*; import fr.ifremer.wao.entity.Boat; import fr.ifremer.wao.entity.Company; import fr.ifremer.wao.entity.DCF5Code; @@ -56,12 +53,7 @@ import org.apache.tapestry5.Field; import org.apache.tapestry5.OptionModel; import org.apache.tapestry5.SelectModel; -import org.apache.tapestry5.annotations.IncludeStylesheet; -import org.apache.tapestry5.annotations.InjectComponent; -import org.apache.tapestry5.annotations.Log; -import org.apache.tapestry5.annotations.Persist; -import org.apache.tapestry5.annotations.Property; -import org.apache.tapestry5.annotations.SessionState; +import org.apache.tapestry5.annotations.*; import org.apache.tapestry5.beaneditor.BeanModel; import org.apache.tapestry5.corelib.components.Form; import org.apache.tapestry5.internal.OptionModelImpl; @@ -89,7 +81,8 @@ * @author fdesbois <fdesbois at codelutin.com> */ @RequiresAuthentication(allowedRoles = UserRole.ADMIN, readOnlyAllowed = false) - at IncludeStylesheet("context:css/sampling.css") +//@IncludeStylesheet("context:css/sampling.css") + at Import(stylesheet = "context:css/sampling.css") public class SampleRowForm { @Inject @@ -535,6 +528,10 @@ } } else { sampleRow = serviceSampling.getNewSampleRow(); + sampleRow.setObsProgram(user.getProfile().getObsProgram()); + if (sampleRow.getObsProgram() == ObsProgram.OBSMER) { + sampleRow.setSamplingStrategy(SamplingStrategy.SIMULTANEOUS_ALL_SPECIES); + } } propertyChange = new WaoPropertyChangeListener(); } @@ -554,6 +551,9 @@ sampleRowModel.add("company", null); sampleRowModel.add("boats", null); sampleRowModel.include("code", "company", "nbObservants", "averageTideTime", "boats", "comment"); + if (user.getProfile().getObsProgram() == ObsProgram.OBSVENTE) { + sampleRowModel.add("samplingStrategy"); + } } return sampleRowModel; } @@ -692,6 +692,12 @@ String rowCode = serviceSampling.getNewSampleRowCode(periodBegin); getSampleRow().setCode(rowCode); } + + if (sampleRow.getSamplingStrategy() == SamplingStrategy.SPECIFIC_STOCK) { + if (StringUtils.isEmpty(getSampleRow().getProfession().getSpecies())) { + sampleRowForm.recordError("Pour ce choix de stratégie d'échantillonnage, il faut préciser les espèces cibles"); + } + } } } catch (WaoBusinessException eee) { sampleRowForm.recordError(eee.getMessage()); Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SamplingPlan.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SamplingPlan.java 2010-12-28 09:56:05 UTC (rev 863) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SamplingPlan.java 2010-12-28 16:55:24 UTC (rev 864) @@ -26,10 +26,7 @@ import fr.ifremer.wao.WaoBusinessException; import fr.ifremer.wao.WaoException; -import fr.ifremer.wao.bean.ConnectedUser; -import fr.ifremer.wao.bean.FacadeRow; -import fr.ifremer.wao.bean.SamplingFilter; -import fr.ifremer.wao.bean.SamplingFilterImpl; +import fr.ifremer.wao.bean.*; import fr.ifremer.wao.entity.DCF5Code; import fr.ifremer.wao.entity.FishingZone; import fr.ifremer.wao.entity.SampleMonth; @@ -564,7 +561,11 @@ } public int getNbColumnsForOther() { - return 4; + int nbColumnsForOther = 4; + if (showObsVente()) { + nbColumnsForOther += 1; // add sampling strategy + } + return nbColumnsForOther; } public int getNbColumnsTotal() { @@ -612,6 +613,10 @@ return new SimpleDateFormat("MM/yyyy"); } + public boolean showObsVente() { + return user.getProfile().getObsProgram() == ObsProgram.OBSVENTE; + } + /** ------------------------- ACTIONS ---------------------------------- **/ /** Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/Layout.tml =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/Layout.tml 2010-12-28 09:56:05 UTC (rev 863) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/Layout.tml 2010-12-28 16:55:24 UTC (rev 864) @@ -64,7 +64,7 @@ </div> <div id="user-infos" class="fleft"> Vous êtes <strong>${currentUser.fullName}</strong> de la société <strong>${currentUser.company.name}</strong> - (${accessText}) + (${currentUser.profile.description}) </div> <div id="user-actions" class="fright"> <a t:type="pagelink" t:page="index" title="Page d'accueil"> Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/SampleRowForm.properties =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/SampleRowForm.properties 2010-12-28 09:56:05 UTC (rev 863) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/SampleRowForm.properties 2010-12-28 16:55:24 UTC (rev 864) @@ -46,6 +46,7 @@ nbObservants-label: Nombre d'observateurs averageTideTime-label: Dur\u00e9e moyenne d'une mar\u00e9e comment-label: Commentaire sur la ligne +samplingStrategy-label: Stat\u00e9gie d'\u00e9chantillonnage # FORM errors-banner: La ligne n'a pas \u00e9t\u00e9 sauvegard\u00e9 \u00e0 cause des erreurs suivantes : Modified: trunk/wao-ui/src/main/webapp/SampleRowForm.tml =================================================================== --- trunk/wao-ui/src/main/webapp/SampleRowForm.tml 2010-12-28 09:56:05 UTC (rev 863) +++ trunk/wao-ui/src/main/webapp/SampleRowForm.tml 2010-12-28 16:55:24 UTC (rev 864) @@ -199,6 +199,10 @@ <t:label t:for="comment" /> <input t:type="textarea" t:id="comment" cols="40" rows="3" value="sampleRow.comment" /> </p:comment> + <p:samplingStrategy> + <t:label t:for="samplingStrategy" /> + <input t:type="select" t:id="samplingStrategy" value="sampleRow.samplingStrategy" t:validate="required" /> + </p:samplingStrategy> </t:beaneditor> </div> </fieldset> Modified: trunk/wao-ui/src/main/webapp/SamplingPlan.tml =================================================================== --- trunk/wao-ui/src/main/webapp/SamplingPlan.tml 2010-12-28 09:56:05 UTC (rev 863) +++ trunk/wao-ui/src/main/webapp/SamplingPlan.tml 2010-12-28 16:55:24 UTC (rev 864) @@ -38,7 +38,7 @@ <a t:type="actionlink" t:id="exportSamplingPlan"> <img src="${asset:context:}/img/file-export-22px.png" alt="Export CSV" title="Exporter le plan d'échantillonnage du ${dateFormat.format(period.fromDate)} au ${dateFormat.format(period.thruDate)}" /> - </a> + </a> </span> <t:unless t:test="user.guest"> <span> @@ -65,7 +65,7 @@ title="Agrandir le plan d'échantillonnage"/> </p:else> </t:if> - </a> + </a> </span> <t:if t:test="canEditSampleRow()"> <span> @@ -74,9 +74,9 @@ </a> </span> </t:if> - </t:if> + </t:if> </div> - </div> + </div> <div> Pour la pédiode du <t:output value="period.fromDate" format="dateFormat" /> au <t:output value="period.thruDate" format="dateFormat" />  <a t:type="actionlink" t:id="showFilters" t:zone="so-sampling-filters" class="display-form"><img src="${asset:context:img/search.png}" /> recherche avancée</a> @@ -177,6 +177,9 @@ <td class="width50 bright">total</td> <td class="width60">Durée moyenne d'une marée (J.)</td> <td class="width60">Nb. d'observateurs</td> + <t:if test="showObsVente()"> + <td class="width60 bright">Stratégie d'échantillonnage</td> + </t:if> <td class="width60 bright">Commentaire</td> <td class="bright">Actions</td> </tr> @@ -272,6 +275,11 @@ </td> <td class="width60 acenter"><t:output t:value="row.averageTideTime" t:format="numberFormat" /></td> <td class="width60 acenter">${row.nbObservants}</td> + <t:if test="showObsVente()"> + <td class="width60 acenter"> + ${row.samplingStrategy} + </td> + </t:if> <td class="width60 acenter bright"> <t:if t:test="row.comment"> <span t:type="ck/Tooltip" title="Commentaire" t:value="prop:rowComment" t:effect="appear"> Modified: trunk/wao-ui/src/main/webapp/WEB-INF/app.properties =================================================================== --- trunk/wao-ui/src/main/webapp/WEB-INF/app.properties 2010-12-28 09:56:05 UTC (rev 863) +++ trunk/wao-ui/src/main/webapp/WEB-INF/app.properties 2010-12-28 16:55:24 UTC (rev 864) @@ -38,3 +38,7 @@ DataReliability.RELIABLE: Exploitable DataReliability.NOT_PROVIDED: Non contr\u00f4l\u00e9e +SamplingStrategy.SIMULTANEOUS_G1_SPECIES: Simultan\u00e9 : esp\u00e8ces G1 +SamplingStrategy.SIMULTANEOUS_G1_G2_SPECIES: Simultan\u00e9 : esp\u00e8ces G1+G2 +SamplingStrategy.SIMULTANEOUS_ALL_SPECIES: Toutes esp\u00e8ces commerciales +SamplingStrategy.SPECIFIC_STOCK: Stock sp\u00e9cifique

1 0