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

[Suiviobsmer-commits] r534 - in trunk/wao-ui/src/main: java/fr/ifremer/wao/ui/pages webapp webapp/css webapp/js
by fdesbois＠users.labs.libre-entreprise.org 15 Jun '10

15 Jun '10

Author: fdesbois Date: 2010-06-15 17:59:24 +0000 (Tue, 15 Jun 2010) New Revision: 534 Log: Evo #2333 : use max char to hide too large news, not working because of style inside news content... Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Index.java trunk/wao-ui/src/main/webapp/Index.tml trunk/wao-ui/src/main/webapp/css/news.css trunk/wao-ui/src/main/webapp/js/wao.js Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Index.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Index.java 2010-06-15 16:16:52 UTC (rev 533) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Index.java 2010-06-15 17:59:24 UTC (rev 534) @@ -147,6 +147,26 @@ return dateFormat; } + private static final int NEWS_CONTENT_MAX_CHARS = 500; + + public boolean isMoreContentNeeded() { + return news.getContent().length() > NEWS_CONTENT_MAX_CHARS; + } + + public String getNewsContent() { + String result = news.getContent(); + if (isMoreContentNeeded()) { + result = result.substring(0, NEWS_CONTENT_MAX_CHARS); + } + return result; + } + + public String getNewsMoreContent() { + String content = news.getContent(); + String result = content.substring(NEWS_CONTENT_MAX_CHARS, content.length()); + return result; + } + void onActionFromAddNews() throws WaoException { news = serviceNews.getNewNews(user); // Create a new list with the new news in first position Modified: trunk/wao-ui/src/main/webapp/Index.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Index.tml 2010-06-15 16:16:52 UTC (rev 533) +++ trunk/wao-ui/src/main/webapp/Index.tml 2010-06-15 17:59:24 UTC (rev 534) @@ -39,7 +39,7 @@ </p> </t:if> <t:loop t:source="newsList" value="news" t:index="rowIndex" t:volatile="true"> - <div class="item" > + <div class="news-item" > <p class="date"> <t:unless t:test="createMode"> Publiée par @@ -82,18 +82,27 @@ </t:if> </p> </t:if> - <div class="content"> + <div class="news-content"> <t:if t:test="editionMode"> <t:label t:for="content" /><br />  <textarea t:type="easyfck/fckeditor" t:id="content" width="800px" height="200px" value="news.content" t:configuration="fckconf" t:validate="required" /> <p:else> <t:outputraw t:value="news.content"/> +  +  +  +  +  +  +  +  +  </p:else> </t:if> </div> </div> - <div class="sep"><hr /></div> + <div class="news-sep"><hr /></div> </t:loop> </form> Modified: trunk/wao-ui/src/main/webapp/css/news.css =================================================================== --- trunk/wao-ui/src/main/webapp/css/news.css 2010-06-15 16:16:52 UTC (rev 533) +++ trunk/wao-ui/src/main/webapp/css/news.css 2010-06-15 17:59:24 UTC (rev 534) @@ -40,22 +40,22 @@ } -div#so-news div.item { +div#so-news div.news-item { padding: 15px; /*background-color: #DEE7EC;*/ } -div#so-news div.item h2 { +div#so-news div.news-item h2 { margin: 5px; padding: 5px; color: #007CC2; } -div#so-news div.item h2.company { +div#so-news div.news-item h2.company { color: #19A28D !important; } -div#so-news div.item div.content { +div#so-news div.news-item div.news-content { margin: 5px; text-align: justify; border-left: 3px solid #133852; @@ -65,7 +65,7 @@ text-indent: 30px; } -div#so-news div.item p.date { +div#so-news div.news-item p.date { font-style: italic; font-size: 0.8em; padding-right: 10px; @@ -73,7 +73,7 @@ font-weight: bold; } -div#so-news div.sep { +div#so-news div.news-sep { width: 60%; margin-left: auto; margin-right: auto; Modified: trunk/wao-ui/src/main/webapp/js/wao.js =================================================================== --- trunk/wao-ui/src/main/webapp/js/wao.js 2010-06-15 16:16:52 UTC (rev 533) +++ trunk/wao-ui/src/main/webapp/js/wao.js 2010-06-15 17:59:24 UTC (rev 534) @@ -101,3 +101,16 @@ } } } + +function toggleNewsMoreContent(element) { + // Get the 'div' parent of the 'a' element + var newsContent = element.ancestors()[0]; + + if (newsContent.match('div.news-content')) { + // Retrieve elements with select 'span.news-more', so the hidden block + var array = newsContent.select('span.news-more'); + // toggle the block + array[0].toggleClassName('hidden'); + } + +}

1 0

[Suiviobsmer-commits] r533 - in trunk/wao-business/src/main/java/fr/ifremer/wao: . bean entity service
by fdesbois＠users.labs.libre-entreprise.org 15 Jun '10

15 Jun '10

Author: fdesbois Date: 2010-06-15 16:16:52 +0000 (Tue, 15 Jun 2010) New Revision: 533 Log: Refactor deprecate methods from TopiaQuery Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactStatus.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/BoatInfosImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ContactDAOImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceNewsImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java 2010-06-15 15:15:57 UTC (rev 532) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java 2010-06-15 16:16:52 UTC (rev 533) @@ -81,14 +81,6 @@ return query; } -// public TopiaQuery getQuery() { -// return query; -// } -// -// public void setQuery(TopiaQuery query) { -// this.query = query; -// } -// public void setSampleRowProperty(String sampleRowProperty) { this.sampleRowProperty = sampleRowProperty; } @@ -96,38 +88,10 @@ public void setFishingZoneProperty(String fishingZoneProperty) { this.fishingZoneProperty = fishingZoneProperty; } -// -// public void setBoatProperty(String boatProperty) { -// this.boatProperty = boatProperty; -// } -// -// public void setContactProperty(String contactProperty) { -// this.contactProperty = contactProperty; -// } -// -// public void setElligibleBoatProperty(String elligibleBoatProperty) { -// this.elligibleBoatProperty = elligibleBoatProperty; -// } -// + public String getSampleRowProperty() { return sampleRowProperty; } -// -// public String getFishingZoneProperty() { -// return fishingZoneProperty; -// } -// -// public String getBoatProperty() { -// return boatProperty; -// } -// -// public String getContactProperty() { -// return contactProperty; -// } -// -// public String getElligibleBoatProperty() { -// return elligibleBoatProperty; -// } public String getSectorNameProperty() { String result = getProperty(fishingZoneProperty, @@ -280,18 +244,6 @@ return result; } -// public String getContactBeginTideProperty() { -// String result = getProperty(contactProperty, -// Contact.TIDE_BEGIN_DATE); -// return result; -// } -// -// public String getElligibleBoatProperty() { -// String result = getProperty(elligibleBoatProperty, -// ElligibleBoat.BOAT); -// return result; -// } - public String getElligibleSampleRowProperty() { String result = getProperty(elligibleBoatProperty, ElligibleBoat.SAMPLE_ROW); @@ -361,12 +313,7 @@ sampleRowProperty = ALIAS_SAMPLE_ROW; query.addFrom(SampleRow.class, sampleRowProperty). - addWhere(new StringBuilder(sampleRowProperty). - append(" IN elements("). - append(getFishingZoneSampleRowProperty()). - append(")"). - toString() - ); + addInElements(sampleRowProperty, getFishingZoneSampleRowProperty()); } if (company != null) { @@ -527,20 +474,19 @@ // Company if (company != null) { // Test only valid ElligibleBoat for that company - query.addWhere(new StringBuilder(getElligibleCompanyActiveProperty()). - append(" = :booleanTrue "). - append("OR ("). - append(getElligibleCompanyActiveProperty()). - append(" IS NULL AND "). - append(getElligibleGlobalActiveProperty()). - append(" = :booleanTrue)"). - toString() +// query.addWhere(new StringBuilder(getElligibleCompanyActiveProperty()). +// append(" = :booleanTrue "). +// append("OR ("). +// append(getElligibleCompanyActiveProperty()). +// append(" IS NULL AND "). +// append(getElligibleGlobalActiveProperty()). +// append(" = :booleanTrue)"). +// toString() +// ).addParam("booleanTrue", Boolean.TRUE); + query.addWhere(_parse("$1 = :booleanTrue OR ($1 IS NULL AND $2 = :booleanTrue)", + getElligibleCompanyActiveProperty(), + getElligibleGlobalActiveProperty()) ).addParam("booleanTrue", Boolean.TRUE); - // TopiaQuery.newOr(getElligibleCompanyActiveProperty()). - // or("? = :booleanTrue"). - // orEnclosed("? IS NULL AND $1 = :booleanTrue", - // getElligibleGlobalActiveProperty()). - // toString() } } @@ -597,16 +543,16 @@ // MAMMALS_OBSERVATION and MAMMALS_CAPTURE if (mammalsObservation && mammalsCapture) { - query.addWhere(new StringBuilder(getMammalsObservationProperty()). - append(" = :mammals OR "). - append(getMammalsCaptureProperty()). - append(" = :mammals"). - toString() - ).addParam("mammals", Boolean.TRUE); - // TopiaQuery.newOr(getMammalsObservationProperty()). - // or("? = :mammals"). - // or("$1 = :mammals", getMammalsCaptureProperty()). - // toString() +// query.addWhere(new StringBuilder(getMammalsObservationProperty()). +// append(" = :mammals OR "). +// append(getMammalsCaptureProperty()). +// append(" = :mammals"). +// toString() +// ).addParam("mammals", Boolean.TRUE); + query.addWhere(_parse("$1 = :mammals OR $2 = :mammals", + getMammalsObservationProperty(), + getMammalsCaptureProperty()) + ).addParam("mammals", Boolean.TRUE); } else if (mammalsObservation) { query.addEquals(getMammalsObservationProperty(), Boolean.TRUE); } else if (mammalsCapture) { @@ -646,12 +592,6 @@ // FROM_DATE if (fromDate != null) { -// query.add("(" + tideBeginDateProperty + " IS NOT NULL AND " -// + tideBeginDateProperty + " >= :fromDate)" + -// " OR (" + tideBeginDateProperty + " IS NULL AND " -// + createDateProperty + " >= :fromDate)"); -// query.addParam("fromDate", getFromDate()); - query.addWhere(getContactCreateDateProperty(), TopiaQuery.Op.GE, fromDate); } @@ -664,6 +604,10 @@ return this; } - - + public static String _parse(String statement, String... properties) { + for (int i = 1; i <= properties.length; i++) { + statement = statement.replace("$" + i, properties[i-1]); + } + return statement; + } } Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactStatus.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactStatus.java 2010-06-15 15:15:57 UTC (rev 532) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactStatus.java 2010-06-15 16:16:52 UTC (rev 533) @@ -256,10 +256,8 @@ period.initDayOfMonthExtremities(); // Bind sampleMonth.sampleRow with contact sampleRow - query.add(SampleMonth.SAMPLE_ROW, sampleRow). - add(SampleMonth.PERIOD_DATE + " BETWEEN :fromDate AND :thruDate"). - addParam("fromDate", period.getFromDate()). - addParam("thruDate", period.getThruDate()); + query.addEquals(SampleMonth.SAMPLE_ROW, sampleRow). + addBetween(SampleMonth.PERIOD_DATE, period.getFromDate(), period.getThruDate()); //add(SampleMonth.PERIOD_DATE, period); SampleMonth result = monthDAO.findByQuery(query); if (result == null) { Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/BoatInfosImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/BoatInfosImpl.java 2010-06-15 15:15:57 UTC (rev 532) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/BoatInfosImpl.java 2010-06-15 16:16:52 UTC (rev 533) @@ -67,11 +67,16 @@ ContactDAO dao = WaoDAOHelper.getContactDAO(transaction); + TopiaQuery query = dao.createQueryDoneContactsFromDate(getBoat(), fromDate); - query.add(Contact.OBSERVER + "." + WaoUser.COMPANY, getCompany()); - result = query.executeCount(); + String companyProperty = + TopiaQuery.getProperty(query.getMainAlias(), Contact.OBSERVER, WaoUser.COMPANY); + + query.addEquals(companyProperty, getCompany()); + + result = dao.countByQuery(query); } catch (Exception eee) { WaoUtils.treateError(transaction, eee, Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ContactDAOImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ContactDAOImpl.java 2010-06-15 15:15:57 UTC (rev 532) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ContactDAOImpl.java 2010-06-15 16:16:52 UTC (rev 533) @@ -25,13 +25,15 @@ package fr.ifremer.wao.entity; +import fr.ifremer.wao.WaoQueryBuilder; import fr.ifremer.wao.bean.ContactState; import java.util.Date; import org.nuiton.topia.framework.TopiaQuery; import org.nuiton.topia.framework.TopiaQuery.Op; -import org.nuiton.topia.persistence.TopiaEntity; +import static fr.ifremer.wao.WaoQueryBuilder._parse; + /** * ContactDAOImpl * @@ -51,17 +53,36 @@ */ @Override public TopiaQuery createQueryLastContactForBoat(Boat boat, Company company) { - TopiaQuery query = createQuery("C1"). - add("C1." + Contact.BOAT, boat). - add("C1." + Contact.OBSERVER + "." + WaoUser.COMPANY + " = :company"). - addParam("company", company); - TopiaQuery subquery = createQuery("C2"). - setSelect("MAX(C2." + TopiaEntity.TOPIA_CREATE_DATE + ")"). - add("C2." + Contact.BOAT + " = C1." + Contact.BOAT). - add("C2." + Contact.OBSERVER + "." + WaoUser.COMPANY + " = :company"); + // Prepare properties for queries + String mainContactAlias = WaoQueryBuilder.ALIAS_CONTACT + "1"; + String mainBoatProperty = + TopiaQuery.getProperty(mainContactAlias, Contact.BOAT); + String mainCompanyProperty = + TopiaQuery.getProperty(mainContactAlias, Contact.OBSERVER, WaoUser.COMPANY); + String mainCreateDateProperty = + TopiaQuery.getProperty(mainContactAlias, Contact.TOPIA_CREATE_DATE); - query.add("C1." + TopiaEntity.TOPIA_CREATE_DATE + " = (" + subquery.fullQuery() + ")"); + String subContactAlias = WaoQueryBuilder.ALIAS_CONTACT + "2"; + String subBoatProperty = + TopiaQuery.getProperty(subContactAlias, Contact.BOAT); + String subCompanyProperty = + TopiaQuery.getProperty(subContactAlias, Contact.OBSERVER, WaoUser.COMPANY); + String subCreateDateProperty = + TopiaQuery.getProperty(subContactAlias, Contact.TOPIA_CREATE_DATE); + + // Construct subquery + TopiaQuery subquery = createQuery(subContactAlias). + setSelect(_parse("MAX($1)", subCreateDateProperty)). + addWhere(_parse("$1 = $2", subBoatProperty ,mainBoatProperty)). + addEquals(subCompanyProperty, company); + + // Construct mainquery + TopiaQuery query = createQuery(mainContactAlias). + addEquals(mainBoatProperty, boat). + addEquals(mainCompanyProperty, company). + addSubQuery(_parse("$1 = (?)", mainCreateDateProperty), subquery); + return query; } @@ -77,19 +98,32 @@ */ @Override public TopiaQuery createQueryDoneContactsFromDate(Boat boat, Date fromDate) { - TopiaQuery query = createQuery("C"). - add("C." + Contact.STATE, ContactState.BOARDING_DONE.ordinal()). - add("C." + Contact.VALIDATION_COMPANY, Boolean.TRUE). - // TODO : use addNullOr method with Topia version 2.3.0-beta-9 - add("C." + Contact.VALIDATION_PROGRAM + " IS NULL OR " + "C." + Contact.VALIDATION_PROGRAM + " = :booleanTrue"). - addParam("booleanTrue", Boolean.TRUE); + // Prepare properties for query + String mainAlias = WaoQueryBuilder.ALIAS_CONTACT; + String stateProperty = + TopiaQuery.getProperty(mainAlias, Contact.STATE); + String validationCompanyProperty = + TopiaQuery.getProperty(mainAlias, Contact.VALIDATION_COMPANY); + String validationProgramProperty = + TopiaQuery.getProperty(mainAlias, Contact.VALIDATION_PROGRAM); + String boatProperty = + TopiaQuery.getProperty(mainAlias, Contact.BOAT); + String tideBeginProperty = + TopiaQuery.getProperty(mainAlias, Contact.TIDE_BEGIN_DATE); + + // Construct query + TopiaQuery query = createQuery(mainAlias). + addEquals(stateProperty, ContactState.BOARDING_DONE.ordinal()). + addEquals(validationCompanyProperty, Boolean.TRUE). + addNullOr(validationProgramProperty, Op.EQ, Boolean.TRUE); + if (boat != null) { - query.add("C." + Contact.BOAT, boat); + query.addEquals(boatProperty, boat); } if (fromDate != null) { - query.add("C." + Contact.TIDE_BEGIN_DATE, Op.GE, fromDate); + query.addWhere(tideBeginProperty, Op.GE, fromDate); } return query; } Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceNewsImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceNewsImpl.java 2010-06-15 15:15:57 UTC (rev 532) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceNewsImpl.java 2010-06-15 16:16:52 UTC (rev 533) @@ -92,20 +92,11 @@ TopiaQuery.getProperty(newsAlias, News.TOPIA_CREATE_DATE); TopiaQuery query = dao.createQuery(newsAlias). - // Add fetch to load company (will used a join) - addFetch(companyProperty). - addOrderDesc(createDateProperty); + // Add fetch to load company (will used a join) + addFetch(companyProperty). + addOrderDesc(createDateProperty). + addNullOr(companyProperty, TopiaQuery.Op.EQ, user.getCompany()); - query.addWhere(new StringBuilder(companyProperty). - append(" IS NULL OR "). - append(companyProperty). - append(" = :company"). - toString() - ).addParam("company", user.getCompany()); - - // query.addWhere("$1 IS NULL OR $1 = :company", companyAlias).addParam("company", user.getCompany()); - // query.addWhere(TopiaQuery.newOr(News.COMPANY).or("? IS NULL").or("? = :company").toString()).addParam("company", user.getCompany()); - List<News> results = dao.findAllByQuery(query); return results; Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java 2010-06-15 15:15:57 UTC (rev 532) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java 2010-06-15 16:16:52 UTC (rev 533) @@ -193,11 +193,11 @@ String sampleRow = contact + "." + Contact.SAMPLE_ROW; // Only for sampleRows with averageTideTime less or equals to 2 days - query.add(sampleRow + "." + SampleRow.AVERAGE_TIDE_TIME, Op.LE, 2.); + query.addWhere(sampleRow + "." + SampleRow.AVERAGE_TIDE_TIME, Op.LE, 2.); // Add filter on sampleRow company if needed if (company != null) { - query.add(sampleRow + "." + SampleRow.COMPANY, company); + query.addEquals(sampleRow + "." + SampleRow.COMPANY, company); } // Prepare aliases for mapping results in select part @@ -215,7 +215,7 @@ log.trace("Exec query : " + query); } - List<Map<String, Object>> nbBoardingsByBoat = query.execute(); + List<Map<String, Object>> nbBoardingsByBoat = transaction.findByQuery(query); if (!nbBoardingsByBoat.isEmpty()) { for (Map<String, Object> row : nbBoardingsByBoat) {

1 0

[Suiviobsmer-commits] r532 - in trunk: wao-business/src/main/java/fr/ifremer/wao/service wao-ui/src/main/webapp
by fdesbois＠users.labs.libre-entreprise.org 15 Jun '10

15 Jun '10

Author: fdesbois Date: 2010-06-15 15:15:57 +0000 (Tue, 15 Jun 2010) New Revision: 532 Log: Evo #2248 : - Reorganize news query using aliases for addFetch - Improve text to display in Index page Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceNewsImpl.java trunk/wao-ui/src/main/webapp/Index.tml Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceNewsImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceNewsImpl.java 2010-06-15 14:32:33 UTC (rev 531) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceNewsImpl.java 2010-06-15 15:15:57 UTC (rev 532) @@ -85,21 +85,25 @@ NewsDAO dao = WaoDAOHelper.getNewsDAO(transaction); - TopiaQuery query = dao.createQuery(). - addFetch(News.COMPANY). - addOrderDesc(News.TOPIA_CREATE_DATE); + String newsAlias = "N"; + String companyProperty = + TopiaQuery.getProperty(newsAlias, News.COMPANY); + String createDateProperty = + TopiaQuery.getProperty(newsAlias, News.TOPIA_CREATE_DATE); -// if (!user.isAdmin() && !user.isGuest()) { -// -// } - query.addWhere(new StringBuilder(News.COMPANY). + TopiaQuery query = dao.createQuery(newsAlias). + // Add fetch to load company (will used a join) + addFetch(companyProperty). + addOrderDesc(createDateProperty); + + query.addWhere(new StringBuilder(companyProperty). append(" IS NULL OR "). - append(News.COMPANY). + append(companyProperty). append(" = :company"). toString() ).addParam("company", user.getCompany()); - // query.addWhere("$1 IS NULL OR $1 = :company", News.COMPANY).addParam("company", user.getCompany()); + // query.addWhere("$1 IS NULL OR $1 = :company", companyAlias).addParam("company", user.getCompany()); // query.addWhere(TopiaQuery.newOr(News.COMPANY).or("? IS NULL").or("? = :company").toString()).addParam("company", user.getCompany()); List<News> results = dao.findAllByQuery(query); Modified: trunk/wao-ui/src/main/webapp/Index.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Index.tml 2010-06-15 14:32:33 UTC (rev 531) +++ trunk/wao-ui/src/main/webapp/Index.tml 2010-06-15 15:15:57 UTC (rev 532) @@ -45,7 +45,7 @@ Publiée par <t:if t:test="news.fromAdmin"> le programme - <p:else>par votre société</p:else> + <p:else>votre société</p:else> </t:if> le <t:output value="news.topiaCreateDate" format="dateFormat" />

1 0

[Suiviobsmer-commits] r531 - in trunk: wao-business 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/java/fr/ifremer/wao/service wao-business/src/main/xmi wao-ui/src/main/java/fr/ifremer/wao/ui/pages wao-ui/src/main/webapp wao-ui/src/main/webapp/css
by fdesbois＠users.labs.libre-entreprise.org 15 Jun '10

15 Jun '10

Author: fdesbois Date: 2010-06-15 14:32:33 +0000 (Tue, 15 Jun 2010) New Revision: 531 Log: Evo #2248 : - Add some methods in beans - Add check rights to edit news Added: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/NewsImpl.java Modified: trunk/wao-business/pom.xml trunk/wao-business/src/main/java/fr/ifremer/wao/WaoMigrationCallBack.java trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ConnectedUserImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceNewsImpl.java trunk/wao-business/src/main/xmi/wao.zargo trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Index.java trunk/wao-ui/src/main/webapp/Index.tml trunk/wao-ui/src/main/webapp/css/news.css Modified: trunk/wao-business/pom.xml =================================================================== --- trunk/wao-business/pom.xml 2010-06-15 13:56:23 UTC (rev 530) +++ trunk/wao-business/pom.xml 2010-06-15 14:32:33 UTC (rev 531) @@ -144,20 +144,20 @@ <goal>smart-generate</goal> </goals> </execution> - <execution> - <phase>generate-sources</phase> - <id>copy-version-files</id> - <configuration> - <includes>**/wao.objectmodel</includes> - <copyVersionDir>${basedir}/src/main/resources/oldmappings/%MODELNAME% - </copyVersionDir> - <copyVersionFiles>**/*.hbm.xml</copyVersionFiles> - <overwrite>true</overwrite> - </configuration> - <goals> - <goal>copyVersionFiles</goal> - </goals> - </execution> +  +  +  +  +  +  +  +  +  +  +  +  +  +  </executions> </plugin> <plugin> Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoMigrationCallBack.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/WaoMigrationCallBack.java 2010-06-15 13:56:23 UTC (rev 530) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/WaoMigrationCallBack.java 2010-06-15 14:32:33 UTC (rev 531) @@ -66,16 +66,17 @@ protected abstract void createNewsCompanyColumn_1_4a(List<String> queries); + protected static final Version[] VERSIONS = new Version[] { + VersionUtil.valueOf("1.0"), + VersionUtil.valueOf("1.1"), + VersionUtil.valueOf("1.2"), + VersionUtil.valueOf("1.3"), + VersionUtil.valueOf("1.4") + }; + @Override public Version[] getAvailableVersions() { - Version[] versions = new Version[] { - VersionUtil.valueOf("1.0"), - VersionUtil.valueOf("1.1"), - VersionUtil.valueOf("1.2"), - VersionUtil.valueOf("1.3"), - VersionUtil.valueOf("1.4") - }; - return versions; + return VERSIONS; } @Override Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ConnectedUserImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ConnectedUserImpl.java 2010-06-15 13:56:23 UTC (rev 530) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ConnectedUserImpl.java 2010-06-15 14:32:33 UTC (rev 531) @@ -21,6 +21,16 @@ } @Override + public boolean isCoordinator() { + return role.equals(UserRole.COORDINATOR); + } + + @Override + public boolean isObserver() { + return role.equals(UserRole.OBSERVER); + } + + @Override public boolean isReadOnly() { return user.isReadOnly(role); } Added: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/NewsImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/NewsImpl.java (rev 0) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/NewsImpl.java 2010-06-15 14:32:33 UTC (rev 531) @@ -0,0 +1,15 @@ +package fr.ifremer.wao.entity; + +/** + * Created: 15 juin 2010 + * + * @author fdesbois <fdesbois at codelutin.com> + * @version $Id$ + */ +public class NewsImpl extends NewsAbstract { + + @Override + public boolean isFromAdmin() { + return company == null; + } +} Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceNewsImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceNewsImpl.java 2010-06-15 13:56:23 UTC (rev 530) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceNewsImpl.java 2010-06-15 14:32:33 UTC (rev 531) @@ -85,7 +85,9 @@ NewsDAO dao = WaoDAOHelper.getNewsDAO(transaction); - TopiaQuery query = dao.createQuery().addOrderDesc(News.TOPIA_CREATE_DATE); + TopiaQuery query = dao.createQuery(). + addFetch(News.COMPANY). + addOrderDesc(News.TOPIA_CREATE_DATE); // if (!user.isAdmin() && !user.isGuest()) { // Modified: trunk/wao-business/src/main/xmi/wao.zargo =================================================================== (Binary files differ) Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Index.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Index.java 2010-06-15 13:56:23 UTC (rev 530) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Index.java 2010-06-15 14:32:33 UTC (rev 531) @@ -27,6 +27,7 @@ import fr.ifremer.wao.WaoException; import fr.ifremer.wao.bean.ConnectedUser; +import fr.ifremer.wao.bean.UserRole; import fr.ifremer.wao.entity.News; import fr.ifremer.wao.entity.NewsImpl; import fr.ifremer.wao.service.ServiceNews; @@ -96,16 +97,6 @@ } } -// void onActivate(EventContext ec) { -// if (ec.getCount() > 0) { -// this.editedId = ec.get(String.class, 0); -// } -// } -// -// String onPassivate() { -// return editedId; -// } - public List<News> getNewsList() throws WaoException { if (newsList == null) { newsList = serviceNews.getNews(user); @@ -114,9 +105,33 @@ } public boolean canEditNews() { - return user.isAdmin() && !user.isReadOnly(); + if (user.isReadOnly()) { + return false; + } + boolean result = false; + if (news != null) { + // ADMIN news + boolean adminEdit = news.isFromAdmin() && user.isAdmin(); + + // COMPANY news + boolean companyEdit = !news.isFromAdmin() && user.isCoordinator(); + + result = adminEdit || companyEdit; + } else { + // In case of a new news + result = user.isAdmin() || user.isCoordinator(); + } + return result; } + public String getHeaderStyle() { + String result = ""; + if (!news.isFromAdmin()) { + result = "company"; + } + return result; + } + public boolean isEditionMode() { return isCreateMode() || news.getTopiaId().equals(editedId); } Modified: trunk/wao-ui/src/main/webapp/Index.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Index.tml 2010-06-15 13:56:23 UTC (rev 530) +++ trunk/wao-ui/src/main/webapp/Index.tml 2010-06-15 14:32:33 UTC (rev 531) @@ -42,13 +42,19 @@ <div class="item" > <p class="date"> <t:unless t:test="createMode"> - Publiée le <t:output value="news.topiaCreateDate" format="dateFormat" /> + Publiée par + <t:if t:test="news.fromAdmin"> + le programme + <p:else>par votre société</p:else> + </t:if> + le + <t:output value="news.topiaCreateDate" format="dateFormat" /> <p:else> En cours de création... </p:else> </t:unless> </p> - <h2> + <h2 class="${headerStyle}"> <t:if t:test="editionMode"> <t:label t:for="title" /> : <input t:type="textfield" t:id="title" value="news.title" class="width200" t:validate="required"/> <p:else> Modified: trunk/wao-ui/src/main/webapp/css/news.css =================================================================== --- trunk/wao-ui/src/main/webapp/css/news.css 2010-06-15 13:56:23 UTC (rev 530) +++ trunk/wao-ui/src/main/webapp/css/news.css 2010-06-15 14:32:33 UTC (rev 531) @@ -51,6 +51,10 @@ color: #007CC2; } +div#so-news div.item h2.company { + color: #19A28D !important; +} + div#so-news div.item div.content { margin: 5px; text-align: justify;

1 0

15 Jun '10

Author: fdesbois Date: 2010-06-15 13:56:23 +0000 (Tue, 15 Jun 2010) New Revision: 530 Log: Evo #2248 : - Add connectedUser for getNews and getNewNews to filter by company - Use last migration service TopiaMigrationEngine + TopiaMigrationCallback Added: trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/ trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/ trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/ trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/ trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/ActivityCalendarImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/ActivityMonthImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/ActivityProfessionImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/ActivityZoneImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/BoatImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/BoatInfosImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/CompanyImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/ContactImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/ElligibleBoatImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/FishingZoneImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/NewsImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/ProfessionImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/SampleMonthImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/SampleRowImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/SampleRowLogImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/ShipOwnerImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/WaoUserImpl.hbm.xml Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java trunk/wao-business/src/main/java/fr/ifremer/wao/WaoContextImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/WaoMigrationCallBack.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceNewsImpl.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/pages/Index.java trunk/wao-ui/src/test/java/test/fr/ifremer/wao/ui/pages/ConnectionTest.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java 2010-06-15 09:48:19 UTC (rev 529) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java 2010-06-15 13:56:23 UTC (rev 530) @@ -26,6 +26,8 @@ package fr.ifremer.wao; import fr.ifremer.wao.bean.ContactState; +import org.nuiton.util.Version; + import java.util.List; /** @@ -137,4 +139,9 @@ ); } + @Override + protected void createNewsCompanyColumn_1_4a(List<String> queries) { + queries.add("ALTER TABLE News ADD company CHARACTER VARYING(255)" + + " REFERENCES Company (topiaId);"); + } } Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoContextImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/WaoContextImpl.java 2010-06-15 09:48:19 UTC (rev 529) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/WaoContextImpl.java 2010-06-15 13:56:23 UTC (rev 530) @@ -28,10 +28,6 @@ import fr.ifremer.wao.entity.ActivityCalendar; import fr.ifremer.wao.io.ImportHelper; import fr.ifremer.wao.service.ServiceUser; -import java.nio.charset.Charset; -import java.security.NoSuchAlgorithmException; -import java.util.Date; -import java.util.Locale; import org.apache.commons.lang.RandomStringUtils; import org.apache.commons.lang.StringUtils; import org.apache.commons.mail.EmailException; @@ -46,7 +42,8 @@ import org.nuiton.topia.TopiaContextFactory; import org.nuiton.topia.TopiaException; import org.nuiton.topia.TopiaNotFoundException; -import org.nuiton.topia.migration.ManualMigrationEngine; +import org.nuiton.topia.migration.TopiaMigrationEngine; +import org.nuiton.topia.migration.TopiaMigrationService; import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.topia.persistence.TopiaId; import org.nuiton.util.ApplicationConfig; @@ -54,8 +51,14 @@ import org.nuiton.util.StringUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; + +import java.nio.charset.Charset; +import java.security.NoSuchAlgorithmException; +import java.util.Date; +import java.util.Locale; + +import static org.nuiton.i18n.I18n._; import static org.nuiton.i18n.I18n.n_; -import static org.nuiton.i18n.I18n._; /** * WaoContext.java @@ -154,25 +157,32 @@ } if (callBackName != null) { - conf.setOption( - ManualMigrationEngine.MIGRATION_APPLICATION_VERSION, - WaoDAOHelper.getModelVersion()); - conf.setOption( - ManualMigrationEngine.MIGRATION_MAPPING_DIRECTORY, - "oldmappings"); - conf.setOption( - ManualMigrationEngine.MIGRATION_MODEL_NAME, - WaoDAOHelper.getModelName()); - conf.setOption( - "topia.service.migration", - ManualMigrationEngine.class.getName()); - conf.setOption( - ManualMigrationEngine.MIGRATION_CALLBACK, - callBackName); +// conf.setOption( +// ManualMigrationEngine.MIGRATION_APPLICATION_VERSION, +// WaoDAOHelper.getModelVersion()); +// conf.setOption( +// ManualMigrationEngine.MIGRATION_MAPPING_DIRECTORY, +// "oldmappings"); +// conf.setOption( +// TopiaMigrationService.MIGRATION_MODEL_NAME, +// WaoDAOHelper.getModelName()); + conf.setOption(TopiaMigrationService.TOPIA_SERVICE_NAME, + TopiaMigrationEngine.class.getName()); + conf.setOption(TopiaMigrationService.MIGRATION_CALLBACK, + callBackName); + + // Options for debug, display progression and sql queries + if (log.isDebugEnabled()) { + conf.setOption(TopiaMigrationService.MIGRATION_SHOW_PROGRESSION, + "true"); + conf.setOption(TopiaMigrationService.MIGRATION_SHOW_SQL, + "true"); + } + } else { if (log.isWarnEnabled()) { log.warn("Database with dialect " + dialect + " is not " + - "supported for migration from 1.0 version"); + "supported for migration since 1.0 version"); } } } Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoMigrationCallBack.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/WaoMigrationCallBack.java 2010-06-15 09:48:19 UTC (rev 529) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/WaoMigrationCallBack.java 2010-06-15 13:56:23 UTC (rev 530) @@ -25,21 +25,22 @@ package fr.ifremer.wao; -import java.util.ArrayList; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.TopiaException; import org.nuiton.topia.framework.TopiaContextImplementor; -import org.nuiton.topia.migration.ManualMigrationCallback; +import org.nuiton.topia.migration.TopiaMigrationCallback; import org.nuiton.util.Version; +import org.nuiton.util.VersionUtil; +import java.util.ArrayList; import java.util.List; /** * * @author fdesbois <fdesbois at codelutin.com> */ -public abstract class WaoMigrationCallBack extends ManualMigrationCallback { +public abstract class WaoMigrationCallBack extends TopiaMigrationCallback { /** * Logger @@ -63,11 +64,28 @@ protected abstract void createSampleRowLogFromAdminColumn_1_3b(List<String> queries); + protected abstract void createNewsCompanyColumn_1_4a(List<String> queries); + @Override - public boolean askUser(Version dbVersion, - Version applicationVersion, - List<Version> versions) { - // Always migrate the database + public Version[] getAvailableVersions() { + Version[] versions = new Version[] { + VersionUtil.valueOf("1.0"), + VersionUtil.valueOf("1.1"), + VersionUtil.valueOf("1.2"), + VersionUtil.valueOf("1.3"), + VersionUtil.valueOf("1.4") + }; + return versions; + } + + @Override + public Version getApplicationVersion() { + Version version = VersionUtil.valueOf(WaoDAOHelper.getModelVersion()); + return version; + } + + @Override + public boolean askUser(Version dbVersion, List<Version> versions) { return true; } @@ -131,4 +149,19 @@ String[] strings = queries.toArray(new String[queries.size()]); executeSQL(tx, showSql, showProgression, strings); } + + public void migrateTo_1_4(TopiaContextImplementor tx, + boolean showSql, + boolean showProgression) throws TopiaException { + if (log.isInfoEnabled()) { + log.info("Migrate to version 1.4"); + } + + List<String> queries = new ArrayList <String>(); + + createNewsCompanyColumn_1_4a(queries); + + String[] strings = queries.toArray(new String[queries.size()]); + executeSQL(tx, showSql, showProgression, strings); + } } Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceNewsImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceNewsImpl.java 2010-06-15 09:48:19 UTC (rev 529) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceNewsImpl.java 2010-06-15 13:56:23 UTC (rev 530) @@ -28,11 +28,15 @@ import fr.ifremer.wao.WaoContext; import fr.ifremer.wao.WaoDAOHelper; import fr.ifremer.wao.WaoException; +import fr.ifremer.wao.bean.ConnectedUser; import fr.ifremer.wao.entity.News; import fr.ifremer.wao.entity.NewsDAO; import java.util.List; + +import fr.ifremer.wao.entity.NewsImpl; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; +import org.nuiton.topia.framework.TopiaQuery; import org.nuiton.topia.persistence.TopiaEntity; /** @@ -67,11 +71,38 @@ } @Override - public List<News> executeGetNews(TopiaContext transaction) throws TopiaException { + public News executeGetNewNews(ConnectedUser user) { + News newNews = new NewsImpl(); + if (!user.isAdmin()) { + newNews.setCompany(user.getCompany()); + } + return newNews; + } + @Override + public List<News> executeGetNews(TopiaContext transaction, ConnectedUser user) + throws TopiaException { + NewsDAO dao = WaoDAOHelper.getNewsDAO(transaction); - return dao.findAllWithOrder(TopiaEntity.TOPIA_CREATE_DATE + " DESC"); + TopiaQuery query = dao.createQuery().addOrderDesc(News.TOPIA_CREATE_DATE); + +// if (!user.isAdmin() && !user.isGuest()) { +// +// } + query.addWhere(new StringBuilder(News.COMPANY). + append(" IS NULL OR "). + append(News.COMPANY). + append(" = :company"). + toString() + ).addParam("company", user.getCompany()); + + // query.addWhere("$1 IS NULL OR $1 = :company", News.COMPANY).addParam("company", user.getCompany()); + // query.addWhere(TopiaQuery.newOr(News.COMPANY).or("? IS NULL").or("? = :company").toString()).addParam("company", user.getCompany()); + + List<News> results = dao.findAllByQuery(query); + + return results; } @Override 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-06-15 09:48:19 UTC (rev 529) +++ trunk/wao-business/src/main/resources/i18n/wao-business-en_GB.properties 2010-06-15 13:56:23 UTC (rev 530) @@ -31,6 +31,7 @@ wao.error.serviceContact.importContactCsv= wao.error.serviceContact.saveContact= wao.error.serviceContact.updateSampleMonthTidesValue= +wao.error.serviceNews.getNewNews= wao.error.serviceNews.getNews= wao.error.serviceNews.saveNews= wao.error.serviceReferential.getCodesDCF5Contains= 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-06-15 09:48:19 UTC (rev 529) +++ trunk/wao-business/src/main/resources/i18n/wao-business-fr_FR.properties 2010-06-15 13:56:23 UTC (rev 530) @@ -30,6 +30,7 @@ wao.error.serviceContact.importContactCsv=Impossible d'importer les contacts wao.error.serviceContact.saveContact=Impossible de sauvegarder le contact wao.error.serviceContact.updateSampleMonthTidesValue= +wao.error.serviceNews.getNewNews= wao.error.serviceNews.getNews=Impossible de r\u00E9cup\u00E9rer l'ensemble des news wao.error.serviceNews.saveNews=Impossible d'enregistrer la news ayant pour titre '%1$s' wao.error.serviceReferential.getCodesDCF5Contains= Added: trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/ActivityCalendarImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/ActivityCalendarImpl.hbm.xml (rev 0) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/ActivityCalendarImpl.hbm.xml 2010-06-15 13:56:23 UTC (rev 530) @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> + <class name="fr.ifremer.wao.entity.ActivityCalendarImpl" table="activityCalendar" node="fr.ifremer.wao.entity.ActivityCalendarImpl" abstract="false" proxy="fr.ifremer.wao.entity.ActivityCalendar" > + <id name="topiaId" type="string" length="255" node="@topiaId"/> + <version name="topiaVersion" type="long" node="@topiaVersion"/> + <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> + <property name="year" type="int" access="field" column="year" node="year"/> + <property name="fiability" type="int" access="field" column="fiability" node="fiability"/> + <bag name="activityMonth" inverse="true" order-by="month" lazy="true" cascade="all,delete-orphan" node="activityMonth" embed-xml="false"> + <key column="activityCalendar"/> + <one-to-many class="fr.ifremer.wao.entity.ActivityMonthImpl" node="topiaId" embed-xml="false"/> + </bag> + <many-to-one name="boat" class="fr.ifremer.wao.entity.BoatImpl" column="boat" node="boat/@topiaId" embed-xml="false"/> + </class> +</hibernate-mapping> Added: trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/ActivityMonthImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/ActivityMonthImpl.hbm.xml (rev 0) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/ActivityMonthImpl.hbm.xml 2010-06-15 13:56:23 UTC (rev 530) @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> + <class name="fr.ifremer.wao.entity.ActivityMonthImpl" table="activityMonth" node="fr.ifremer.wao.entity.ActivityMonthImpl" abstract="false" proxy="fr.ifremer.wao.entity.ActivityMonth" > + <id name="topiaId" type="string" length="255" node="@topiaId"/> + <version name="topiaVersion" type="long" node="@topiaVersion"/> + <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> + <property name="harbourLibelle" type="text" access="field" column="harbourLibelle" node="harbourLibelle"/> + <property name="active" type="boolean" access="field" column="active" node="active"/> + <property name="nbBoardingPersons" type="java.lang.Integer" access="field" column="nbBoardingPersons" node="nbBoardingPersons"/> + <property name="nbSeaDays" type="java.lang.Integer" access="field" column="nbSeaDays" node="nbSeaDays"/> + <property name="nbFishingDays" type="java.lang.Integer" access="field" column="nbFishingDays" node="nbFishingDays"/> + <property name="month" type="int" access="field" column="month" node="month"/> + <property name="harbourCode" type="text" access="field" column="harbourCode" node="harbourCode"/> + <property name="harbourId" type="int" access="field" column="harbourId" node="harbourId"/> + <bag name="activityProfession" inverse="true" order-by="professionOrder" lazy="true" cascade="all,delete-orphan" node="activityProfession" embed-xml="false"> + <key column="activityMonth"/> + <one-to-many class="fr.ifremer.wao.entity.ActivityProfessionImpl" node="topiaId" embed-xml="false"/> + </bag> + <many-to-one name="activityCalendar" class="fr.ifremer.wao.entity.ActivityCalendarImpl" column="activityCalendar" node="activityCalendar/@topiaId" embed-xml="false"/> + </class> +</hibernate-mapping> Added: trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/ActivityProfessionImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/ActivityProfessionImpl.hbm.xml (rev 0) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/ActivityProfessionImpl.hbm.xml 2010-06-15 13:56:23 UTC (rev 530) @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> + <class name="fr.ifremer.wao.entity.ActivityProfessionImpl" table="activityProfession" node="fr.ifremer.wao.entity.ActivityProfessionImpl" abstract="false" proxy="fr.ifremer.wao.entity.ActivityProfession" > + <id name="topiaId" type="string" length="255" node="@topiaId"/> + <version name="topiaVersion" type="long" node="@topiaVersion"/> + <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> + <property name="code" type="text" access="field" column="code" node="code"/> + <property name="libelle" type="text" access="field" column="libelle" node="libelle"/> + <property name="id" type="int" access="field" column="id" node="id"/> + <property name="professionOrder" type="int" access="field" column="professionOrder" node="professionOrder"/> + <many-to-one name="activityMonth" class="fr.ifremer.wao.entity.ActivityMonthImpl" column="activityMonth" node="activityMonth/@topiaId" embed-xml="false"/> + <bag name="activityZone" inverse="true" order-by="zoneId" lazy="true" cascade="all,delete-orphan" node="activityZone" embed-xml="false"> + <key column="activityProfession"/> + <one-to-many class="fr.ifremer.wao.entity.ActivityZoneImpl" node="topiaId" embed-xml="false"/> + </bag> + </class> +</hibernate-mapping> Added: trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/ActivityZoneImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/ActivityZoneImpl.hbm.xml (rev 0) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/ActivityZoneImpl.hbm.xml 2010-06-15 13:56:23 UTC (rev 530) @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> + <class name="fr.ifremer.wao.entity.ActivityZoneImpl" table="activityZone" node="fr.ifremer.wao.entity.ActivityZoneImpl" abstract="false" proxy="fr.ifremer.wao.entity.ActivityZone" > + <id name="topiaId" type="string" length="255" node="@topiaId"/> + <version name="topiaVersion" type="long" node="@topiaVersion"/> + <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> + <property name="zoneCode" type="text" access="field" column="zoneCode" node="zoneCode"/> + <property name="zoneLibelle" type="text" access="field" column="zoneLibelle" node="zoneLibelle"/> + <property name="zoneId" type="int" access="field" column="zoneId" node="zoneId"/> + <property name="gradiantCode" type="int" access="field" column="gradiantCode" node="gradiantCode"/> + <property name="gradiantLibelle" type="text" access="field" column="gradiantLibelle" node="gradiantLibelle"/> + <many-to-one name="activityProfession" class="fr.ifremer.wao.entity.ActivityProfessionImpl" column="activityProfession" node="activityProfession/@topiaId" embed-xml="false"/> + </class> +</hibernate-mapping> Added: trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/BoatImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/BoatImpl.hbm.xml (rev 0) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/BoatImpl.hbm.xml 2010-06-15 13:56:23 UTC (rev 530) @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> + <class name="fr.ifremer.wao.entity.BoatImpl" table="boat" node="fr.ifremer.wao.entity.BoatImpl" abstract="false" proxy="fr.ifremer.wao.entity.Boat" > + <id name="topiaId" type="string" length="255" node="@topiaId"/> + <version name="topiaVersion" type="long" node="@topiaVersion"/> + <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> + <property name="immatriculation" type="int" access="field" column="immatriculation" node="immatriculation" index="boat_immatriculation_idx" unique="true"/> + <property name="name" type="text" access="field" column="name" node="name"/> + <property name="districtCode" type="text" access="field" column="districtCode" node="districtCode"/> + <property name="boatLength" type="int" access="field" column="boatLength" node="boatLength"/> + <property name="buildYear" type="int" access="field" column="buildYear" node="buildYear"/> + <property name="active" type="boolean" access="field" column="active" node="active"/> + <many-to-one name="shipOwner" class="fr.ifremer.wao.entity.ShipOwnerImpl" column="shipOwner" lazy="false" node="shipOwner/@topiaId" embed-xml="false"/> + <bag name="companyBoatInfos" inverse="true" lazy="true" cascade="all,delete-orphan" node="companyBoatInfos" embed-xml="false"> + <key column="boat"/> + <one-to-many class="fr.ifremer.wao.entity.BoatInfosImpl" node="topiaId" embed-xml="false"/> + </bag> + <bag name="activityCalendar" inverse="true" lazy="true" cascade="all,delete-orphan" node="activityCalendar" embed-xml="false"> + <key column="boat"/> + <one-to-many class="fr.ifremer.wao.entity.ActivityCalendarImpl" node="topiaId" embed-xml="false"/> + </bag> + <bag name="elligibleBoat" inverse="true" order-by="companyActive" lazy="true" node="elligibleBoat" embed-xml="false"> + <key column="boat"/> + <one-to-many class="fr.ifremer.wao.entity.ElligibleBoatImpl" node="topiaId" embed-xml="false"/> + </bag> + </class> +</hibernate-mapping> Added: trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/BoatInfosImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/BoatInfosImpl.hbm.xml (rev 0) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/BoatInfosImpl.hbm.xml 2010-06-15 13:56:23 UTC (rev 530) @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> + <class name="fr.ifremer.wao.entity.BoatInfosImpl" table="boatInfos" node="fr.ifremer.wao.entity.BoatInfosImpl" abstract="false" proxy="fr.ifremer.wao.entity.BoatInfos" > + <id name="topiaId" type="string" length="255" node="@topiaId"/> + <version name="topiaVersion" type="long" node="@topiaVersion"/> + <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> + <property name="contactFirstName" type="text" access="field" column="contactFirstName" node="contactFirstName"/> + <property name="contactLastName" type="text" access="field" column="contactLastName" node="contactLastName"/> + <property name="contactEmail" type="text" access="field" column="contactEmail" node="contactEmail"/> + <property name="contactPhoneNumber" type="text" access="field" column="contactPhoneNumber" node="contactPhoneNumber"/> + <property name="dup" type="java.lang.Integer" access="field" column="dup" node="dup"/> + <property name="comment" type="text" access="field" column="comment" node="comment"/> + <property name="contactAddress1" type="text" access="field" column="contactAddress1" node="contactAddress1"/> + <property name="contactAddress2" type="text" access="field" column="contactAddress2" node="contactAddress2"/> + <property name="contactCity" type="text" access="field" column="contactCity" node="contactCity"/> + <property name="contactPostalCode" type="java.lang.Integer" access="field" column="contactPostalCode" node="contactPostalCode"/> + <property name="contactSiret" type="text" access="field" column="contactSiret" node="contactSiret"/> + <many-to-one name="company" class="fr.ifremer.wao.entity.CompanyImpl" column="company" node="company/@topiaId" embed-xml="false" /> + <many-to-one name="boat" class="fr.ifremer.wao.entity.BoatImpl" column="boat" node="boat/@topiaId" embed-xml="false" /> + </class> +</hibernate-mapping> Added: trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/CompanyImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/CompanyImpl.hbm.xml (rev 0) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/CompanyImpl.hbm.xml 2010-06-15 13:56:23 UTC (rev 530) @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> + <class name="fr.ifremer.wao.entity.CompanyImpl" table="company" node="fr.ifremer.wao.entity.CompanyImpl" abstract="false" proxy="fr.ifremer.wao.entity.Company" > + <id name="topiaId" type="string" length="255" node="@topiaId"/> + <version name="topiaVersion" type="long" node="@topiaVersion"/> + <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> + <property name="name" type="text" access="field" column="name" node="name"/> + <property name="phoneNumber" type="text" access="field" column="phoneNumber" node="phoneNumber"/> + <property name="address1" type="text" access="field" column="address1" node="address1"/> + <property name="address2" type="text" access="field" column="address2" node="address2"/> + <property name="active" type="boolean" access="field" column="active" node="active"/> + <property name="email" type="text" access="field" column="email" node="email"/> + <property name="city" type="text" access="field" column="city" node="city"/> + <property name="postalCode" type="int" access="field" column="postalCode" node="postalCode"/> + <bag name="waoUser" inverse="true" lazy="true" cascade="all,delete-orphan" node="waoUser" embed-xml="false"> + <key column="company"/> + <one-to-many class="fr.ifremer.wao.entity.WaoUserImpl" node="topiaId" embed-xml="false"/> + </bag> + <bag name="boatBoatInfos" inverse="true" lazy="true" cascade="all,delete-orphan" node="boatBoatInfos" embed-xml="false"> + <key column="company"/> + <one-to-many class="fr.ifremer.wao.entity.BoatInfosImpl" node="topiaId" embed-xml="false"/> + </bag> + </class> +</hibernate-mapping> Added: trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/ContactImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/ContactImpl.hbm.xml (rev 0) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/ContactImpl.hbm.xml 2010-06-15 13:56:23 UTC (rev 530) @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> + <class name="fr.ifremer.wao.entity.ContactImpl" table="contact" node="fr.ifremer.wao.entity.ContactImpl" abstract="false" proxy="fr.ifremer.wao.entity.Contact" > + <id name="topiaId" type="string" length="255" node="@topiaId"/> + <version name="topiaVersion" type="long" node="@topiaVersion"/> + <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> + <property name="tideBeginDate" type="java.util.Date" access="field" column="tideBeginDate" node="tideBeginDate"/> + <property name="tideEndDate" type="java.util.Date" access="field" column="tideEndDate" node="tideEndDate"/> + <property name="nbObservants" type="int" access="field" column="nbObservants" node="nbObservants"/> + <property name="mammalsObservation" type="boolean" access="field" column="mammalsObservation" node="mammalsObservation"/> + <property name="mammalsCapture" type="boolean" access="field" column="mammalsCapture" node="mammalsCapture"/> + <property name="validationProgram" type="java.lang.Boolean" access="field" column="validationProgram" node="validationProgram"/> + <property name="validationCompany" type="java.lang.Boolean" access="field" column="validationCompany" node="validationCompany"/> + <property name="dataInputDate" type="java.util.Date" access="field" column="dataInputDate" node="dataInputDate"/> + <property name="comment" type="text" access="field" column="comment" node="comment"/> + <property name="state" type="int" access="field" column="state" node="state"/> + <property name="tideNbDays" type="int" access="field" column="tideNbDays" node="tideNbDays"/> + <many-to-one name="observer" class="fr.ifremer.wao.entity.WaoUserImpl" column="observer" node="observer/@topiaId" embed-xml="false"/> + <many-to-one name="sampleRow" class="fr.ifremer.wao.entity.SampleRowImpl" column="sampleRow" lazy="false" node="sampleRow/@topiaId" embed-xml="false"/> + <many-to-one name="boat" class="fr.ifremer.wao.entity.BoatImpl" column="boat" lazy="false" node="boat/@topiaId" embed-xml="false"/> + </class> +</hibernate-mapping> Added: trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/ElligibleBoatImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/ElligibleBoatImpl.hbm.xml (rev 0) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/ElligibleBoatImpl.hbm.xml 2010-06-15 13:56:23 UTC (rev 530) @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> + <class name="fr.ifremer.wao.entity.ElligibleBoatImpl" table="elligibleBoat" node="fr.ifremer.wao.entity.ElligibleBoatImpl" abstract="false" proxy="fr.ifremer.wao.entity.ElligibleBoat" > + <id name="topiaId" type="string" length="255" node="@topiaId"/> + <version name="topiaVersion" type="long" node="@topiaVersion"/> + <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> + <property name="globalActive" type="boolean" access="field" column="globalActive" node="globalActive"/> + <property name="companyActive" type="java.lang.Boolean" access="field" column="companyActive" node="companyActive"/> + <many-to-one name="boat" class="fr.ifremer.wao.entity.BoatImpl" column="boat" lazy="false" node="boat/@topiaId" embed-xml="false"/> + <many-to-one name="sampleRow" class="fr.ifremer.wao.entity.SampleRowImpl" column="sampleRow" node="sampleRow/@topiaId" embed-xml="false"/> + </class> +</hibernate-mapping> Added: trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/FishingZoneImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/FishingZoneImpl.hbm.xml (rev 0) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/FishingZoneImpl.hbm.xml 2010-06-15 13:56:23 UTC (rev 530) @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> + <class name="fr.ifremer.wao.entity.FishingZoneImpl" table="fishingZone" node="fr.ifremer.wao.entity.FishingZoneImpl" abstract="false" proxy="fr.ifremer.wao.entity.FishingZone" > + <id name="topiaId" type="string" length="255" node="@topiaId"/> + <version name="topiaVersion" type="long" node="@topiaVersion"/> + <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> + <property name="sectorName" type="text" access="field" column="sectorName" node="sectorName"/> + <property name="facadeName" type="text" access="field" column="facadeName" node="facadeName"/> + <property name="districtCode" type="text" access="field" column="districtCode" node="districtCode"/> + <bag name="sampleRow" table="fishingzone_samplerow" inverse="true" lazy="true" node="sampleRow" embed-xml="true"> + <key column="fishingZone"/> + <many-to-many class="fr.ifremer.wao.entity.SampleRowImpl" column="sampleRow" order-by="code" node="topiaId"/> + </bag> + </class> +</hibernate-mapping> Added: trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/NewsImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/NewsImpl.hbm.xml (rev 0) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/NewsImpl.hbm.xml 2010-06-15 13:56:23 UTC (rev 530) @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> + <class name="fr.ifremer.wao.entity.NewsImpl" table="news" node="fr.ifremer.wao.entity.NewsImpl" abstract="false" proxy="fr.ifremer.wao.entity.News" > + <id name="topiaId" type="string" length="255" node="@topiaId"/> + <version name="topiaVersion" type="long" node="@topiaVersion"/> + <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> + <property name="title" type="text" access="field" column="title" node="title"/> + <property name="content" type="text" access="field" column="content" node="content"/> + <many-to-one name="company" class="fr.ifremer.wao.entity.CompanyImpl" column="company" node="company/@topiaId" embed-xml="false"/> + </class> +</hibernate-mapping> Added: trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/ProfessionImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/ProfessionImpl.hbm.xml (rev 0) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/ProfessionImpl.hbm.xml 2010-06-15 13:56:23 UTC (rev 530) @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> + <class name="fr.ifremer.wao.entity.ProfessionImpl" table="profession" node="fr.ifremer.wao.entity.ProfessionImpl" abstract="false" proxy="fr.ifremer.wao.entity.Profession" > + <id name="topiaId" type="string" length="255" node="@topiaId"/> + <version name="topiaVersion" type="long" node="@topiaVersion"/> + <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> + <property name="codeDCF5" type="text" access="field" column="codeDCF5" node="codeDCF5"/> + <property name="meshSize" type="text" access="field" column="meshSize" node="meshSize"/> + <property name="size" type="text" access="field" column="size" node="size"/> + <property name="other" type="text" access="field" column="other" node="other"/> + <property name="libelle" type="text" access="field" column="libelle" node="libelle"/> + <property name="species" type="text" access="field" column="species" node="species"/> + </class> +</hibernate-mapping> Added: trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/SampleMonthImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/SampleMonthImpl.hbm.xml (rev 0) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/SampleMonthImpl.hbm.xml 2010-06-15 13:56:23 UTC (rev 530) @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> + <class name="fr.ifremer.wao.entity.SampleMonthImpl" table="sampleMonth" node="fr.ifremer.wao.entity.SampleMonthImpl" abstract="false" proxy="fr.ifremer.wao.entity.SampleMonth" > + <id name="topiaId" type="string" length="255" node="@topiaId"/> + <version name="topiaVersion" type="long" node="@topiaVersion"/> + <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> + <property name="realTidesValue" type="int" access="field" column="realTidesValue" node="realTidesValue"/> + <property name="expectedTidesValue" type="int" access="field" column="expectedTidesValue" node="expectedTidesValue"/> + <property name="periodDate" type="java.util.Date" access="field" column="periodDate" node="periodDate"/> + <property name="estimatedTidesValue" type="int" access="field" column="estimatedTidesValue" node="estimatedTidesValue"/> + <many-to-one name="sampleRow" class="fr.ifremer.wao.entity.SampleRowImpl" column="sampleRow" node="sampleRow/@topiaId" embed-xml="false"/> + </class> +</hibernate-mapping> Added: trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/SampleRowImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/SampleRowImpl.hbm.xml (rev 0) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/SampleRowImpl.hbm.xml 2010-06-15 13:56:23 UTC (rev 530) @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> + <class name="fr.ifremer.wao.entity.SampleRowImpl" table="sampleRow" node="fr.ifremer.wao.entity.SampleRowImpl" abstract="false" proxy="fr.ifremer.wao.entity.SampleRow" > + <id name="topiaId" type="string" length="255" node="@topiaId"/> + <version name="topiaVersion" type="long" node="@topiaVersion"/> + <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> + <property name="nbObservants" type="int" access="field" column="nbObservants" node="nbObservants"/> + <property name="averageTideTime" type="double" access="field" column="averageTideTime" node="averageTideTime"/> + <property name="code" type="text" access="field" column="code" node="code" index="sampleRow_code_idx" unique="true"/> + <property name="fishingZonesInfos" type="text" access="field" column="fishingZonesInfos" node="fishingZonesInfos"/> + <property name="comment" type="text" access="field" column="comment" node="comment"/> + <property name="programName" type="text" access="field" column="programName" node="programName"/> + <property name="periodBegin" type="java.util.Date" access="field" column="periodBegin" node="periodBegin"/> + <property name="periodEnd" type="java.util.Date" access="field" column="periodEnd" node="periodEnd"/> + <many-to-one name="profession" class="fr.ifremer.wao.entity.ProfessionImpl" column="profession" lazy="false" node="profession/@topiaId" embed-xml="false"/> + <bag name="sampleMonth" inverse="true" order-by="periodDate" lazy="true" cascade="all,delete-orphan" node="sampleMonth" embed-xml="false"> + <key column="sampleRow"/> + <one-to-many class="fr.ifremer.wao.entity.SampleMonthImpl" node="topiaId" embed-xml="false"/> + </bag> + <many-to-one name="company" class="fr.ifremer.wao.entity.CompanyImpl" column="company" lazy="false" node="company/@topiaId" embed-xml="false"/> + <bag name="sampleRowLog" inverse="true" order-by="topiaCreateDate desc" lazy="true" cascade="all,delete-orphan" node="sampleRowLog" embed-xml="false"> + <key column="sampleRow"/> + <one-to-many class="fr.ifremer.wao.entity.SampleRowLogImpl" node="topiaId" embed-xml="false"/> + </bag> + <bag name="elligibleBoat" inverse="true" order-by="companyActive" lazy="true" cascade="all,delete-orphan" node="elligibleBoat" embed-xml="false"> + <key column="sampleRow"/> + <one-to-many class="fr.ifremer.wao.entity.ElligibleBoatImpl" node="topiaId" embed-xml="false"/> + </bag> + <bag name="fishingZone" table="fishingzone_samplerow" lazy="false" node="fishingZone" embed-xml="true"> + <key column="sampleRow"/> + <many-to-many class="fr.ifremer.wao.entity.FishingZoneImpl" column="fishingZone" order-by="facadeName,sectorName,districtCode" node="topiaId"/> + </bag> + <bag name="contact" inverse="true" lazy="true" node="contact" embed-xml="false"> + <key column="sampleRow"/> + <one-to-many class="fr.ifremer.wao.entity.ContactImpl" node="topiaId" embed-xml="false"/> + </bag> + </class> +</hibernate-mapping> Added: trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/SampleRowLogImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/SampleRowLogImpl.hbm.xml (rev 0) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/SampleRowLogImpl.hbm.xml 2010-06-15 13:56:23 UTC (rev 530) @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> + <class name="fr.ifremer.wao.entity.SampleRowLogImpl" table="sampleRowLog" node="fr.ifremer.wao.entity.SampleRowLogImpl" abstract="false" proxy="fr.ifremer.wao.entity.SampleRowLog" > + <id name="topiaId" type="string" length="255" node="@topiaId"/> + <version name="topiaVersion" type="long" node="@topiaVersion"/> + <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> + <property name="logText" type="text" access="field" column="logText" node="logText"/> + <property name="comment" type="text" access="field" column="comment" node="comment"/> + <property name="fromAdmin" type="boolean" access="field" column="fromAdmin" node="fromAdmin"/> + <many-to-one name="sampleRow" class="fr.ifremer.wao.entity.SampleRowImpl" column="sampleRow" node="sampleRow/@topiaId" embed-xml="false"/> + <many-to-one name="author" class="fr.ifremer.wao.entity.WaoUserImpl" column="author" lazy="false" node="author/@topiaId" embed-xml="false"/> + </class> +</hibernate-mapping> Added: trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/ShipOwnerImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/ShipOwnerImpl.hbm.xml (rev 0) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/ShipOwnerImpl.hbm.xml 2010-06-15 13:56:23 UTC (rev 530) @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> + <class name="fr.ifremer.wao.entity.ShipOwnerImpl" table="shipOwner" node="fr.ifremer.wao.entity.ShipOwnerImpl" abstract="false" proxy="fr.ifremer.wao.entity.ShipOwner" > + <id name="topiaId" type="string" length="255" node="@topiaId"/> + <version name="topiaVersion" type="long" node="@topiaVersion"/> + <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> + <property name="code" type="text" access="field" column="code" node="code" index="shipOwner_code_idx" unique="true"/> + <property name="firstName" type="text" access="field" column="firstName" node="firstName"/> + <property name="lastName" type="text" access="field" column="lastName" node="lastName"/> + </class> +</hibernate-mapping> Added: trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/WaoUserImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/WaoUserImpl.hbm.xml (rev 0) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.4/fr/ifremer/wao/entity/WaoUserImpl.hbm.xml 2010-06-15 13:56:23 UTC (rev 530) @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> + <class name="fr.ifremer.wao.entity.WaoUserImpl" table="waoUser" node="fr.ifremer.wao.entity.WaoUserImpl" abstract="false" proxy="fr.ifremer.wao.entity.WaoUser" > + <id name="topiaId" type="string" length="255" node="@topiaId"/> + <version name="topiaVersion" type="long" node="@topiaVersion"/> + <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> + <property name="firstName" type="text" access="field" column="firstName" node="firstName"/> + <property name="lastName" type="text" access="field" column="lastName" node="lastName"/> + <property name="phoneNumber" type="text" access="field" column="phoneNumber" node="phoneNumber"/> + <property name="login" type="text" access="field" column="login" node="login"/> + <property name="password" type="text" access="field" column="password" node="password"/> + <property name="active" type="boolean" access="field" column="active" node="active"/> + <property name="role" type="int" access="field" column="role" node="role"/> + <property name="roleReadOnly" type="int" access="field" column="roleReadOnly" node="roleReadOnly"/> + <many-to-one name="company" class="fr.ifremer.wao.entity.CompanyImpl" column="company" node="company/@topiaId" embed-xml="false"/> + <bag name="contact" inverse="true" lazy="true" node="contact" embed-xml="false"> + <key column="observer"/> + <one-to-many class="fr.ifremer.wao.entity.ContactImpl" node="topiaId" embed-xml="false"/> + </bag> + </class> +</hibernate-mapping> Modified: trunk/wao-business/src/main/xmi/wao.zargo =================================================================== (Binary files differ) Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Index.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Index.java 2010-06-15 09:48:19 UTC (rev 529) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Index.java 2010-06-15 13:56:23 UTC (rev 530) @@ -108,7 +108,7 @@ public List<News> getNewsList() throws WaoException { if (newsList == null) { - newsList = serviceNews.getNews(); + newsList = serviceNews.getNews(user); } return newsList; } @@ -133,7 +133,7 @@ } void onActionFromAddNews() throws WaoException { - news = new NewsImpl(); + news = serviceNews.getNewNews(user); // Create a new list with the new news in first position List<News> list = new ArrayList<News>(); list.add(news); Modified: trunk/wao-ui/src/test/java/test/fr/ifremer/wao/ui/pages/ConnectionTest.java =================================================================== --- trunk/wao-ui/src/test/java/test/fr/ifremer/wao/ui/pages/ConnectionTest.java 2010-06-15 09:48:19 UTC (rev 529) +++ trunk/wao-ui/src/test/java/test/fr/ifremer/wao/ui/pages/ConnectionTest.java 2010-06-15 13:56:23 UTC (rev 530) @@ -124,7 +124,7 @@ private Document connect(Document connectionPage, ConnectedUser user) throws WaoBusinessException { when(serviceUser.connect("login", "password")).thenReturn(user); - when(serviceNews.getNews()).thenReturn(new ArrayList<News>()); + when(serviceNews.getNews(user)).thenReturn(new ArrayList<News>()); Map<String, String> fieldValues = new HashMap<String, String>(); fieldValues.put("login", "login"); @@ -169,7 +169,7 @@ /** PREPARE LOADING **/ logger.info("-- Load 'Index' page : redirection to 'Connexion' page"); - when(serviceNews.getNews()).thenReturn(new ArrayList<News>()); + when(serviceNews.getNews(user)).thenReturn(new ArrayList<News>()); Document connectionPage1 = tester.renderPage("index"); // Prepare user for connection

1 0

[Suiviobsmer-commits] r529 - in trunk: . wao-business wao-ui
by fdesbois＠users.labs.libre-entreprise.org 15 Jun '10

15 Jun '10

Author: fdesbois Date: 2010-06-15 09:48:19 +0000 (Tue, 15 Jun 2010) New Revision: 529 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml trunk/wao-business/pom.xml trunk/wao-ui/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-06-15 09:48:16 UTC (rev 528) +++ trunk/pom.xml 2010-06-15 09:48:19 UTC (rev 529) @@ -15,7 +15,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>1.3</version> + <version>1.4-SNAPSHOT</version> <modules> <module>wao-ui</module> @@ -252,9 +252,9 @@  <scm> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.3</connection> - <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.3</developerConnection> - <url>http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-1.3?root=suiviobsm…</url> + <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk</connection> + <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk</developerConnection> + <url>http://labs.libre-entreprise.org/scm/viewvc.php/trunk/?root=suiviobsmer</url> </scm> <build> Modified: trunk/wao-business/pom.xml =================================================================== --- trunk/wao-business/pom.xml 2010-06-15 09:48:16 UTC (rev 528) +++ trunk/wao-business/pom.xml 2010-06-15 09:48:19 UTC (rev 529) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>1.3</version> + <version>1.4-SNAPSHOT</version> </parent> <groupId>fr.ifremer.wao</groupId> @@ -192,9 +192,9 @@ </build> <scm> - <url>http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-1.3/?root=suiviobs…</url> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.3/wao-business</connection> - <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.3/wao-business</developerConnection> + <url>http://labs.libre-entreprise.org/scm/viewvc.php/trunk/wao-business/?root=su…</url> + <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-business</connection> + <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-business</developerConnection> </scm> </project> Modified: trunk/wao-ui/pom.xml =================================================================== --- trunk/wao-ui/pom.xml 2010-06-15 09:48:16 UTC (rev 528) +++ trunk/wao-ui/pom.xml 2010-06-15 09:48:19 UTC (rev 529) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>1.3</version> + <version>1.4-SNAPSHOT</version> </parent> <groupId>fr.ifremer.wao</groupId> @@ -227,9 +227,9 @@ </repositories> <scm> - <url>http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-1.3/?root=suiviobs…</url> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.3/wao-ui</connection> - <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.3/wao-ui</developerConnection> + <url>http://labs.libre-entreprise.org/scm/viewvc.php/trunk/wao-ui/?root=suiviobs…</url> + <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-ui</connection> + <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-ui</developerConnection> </scm> </project>

1 0

[Suiviobsmer-commits] r528 - tags
by fdesbois＠users.labs.libre-entreprise.org 15 Jun '10

15 Jun '10

Author: fdesbois Date: 2010-06-15 09:48:16 +0000 (Tue, 15 Jun 2010) New Revision: 528 Log: [maven-release-plugin] copy for tag wao-1.3 Added: tags/wao-1.3/

1 0

[Suiviobsmer-commits] r527 - in trunk: . wao-business wao-ui
by fdesbois＠users.labs.libre-entreprise.org 15 Jun '10

15 Jun '10

Author: fdesbois Date: 2010-06-15 09:48:12 +0000 (Tue, 15 Jun 2010) New Revision: 527 Log: [maven-release-plugin] prepare release wao-1.3 Modified: trunk/pom.xml trunk/wao-business/pom.xml trunk/wao-ui/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-06-15 09:36:12 UTC (rev 526) +++ trunk/pom.xml 2010-06-15 09:48:12 UTC (rev 527) @@ -15,7 +15,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>1.3-SNAPSHOT</version> + <version>1.3</version> <modules> <module>wao-ui</module> @@ -252,9 +252,9 @@  <scm> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk</connection> - <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk</developerConnection> - <url>http://labs.libre-entreprise.org/scm/viewvc.php/trunk/?root=suiviobsmer</url> + <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.3</connection> + <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.3</developerConnection> + <url>http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-1.3?root=suiviobsm…</url> </scm> <build> Modified: trunk/wao-business/pom.xml =================================================================== --- trunk/wao-business/pom.xml 2010-06-15 09:36:12 UTC (rev 526) +++ trunk/wao-business/pom.xml 2010-06-15 09:48:12 UTC (rev 527) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>1.3-SNAPSHOT</version> + <version>1.3</version> </parent> <groupId>fr.ifremer.wao</groupId> @@ -192,9 +192,9 @@ </build> <scm> - <url>http://labs.libre-entreprise.org/scm/viewvc.php/trunk/wao-business/?root=su…</url> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-business</connection> - <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-business</developerConnection> + <url>http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-1.3/?root=suiviobs…</url> + <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.3/wao-business</connection> + <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.3/wao-business</developerConnection> </scm> </project> Modified: trunk/wao-ui/pom.xml =================================================================== --- trunk/wao-ui/pom.xml 2010-06-15 09:36:12 UTC (rev 526) +++ trunk/wao-ui/pom.xml 2010-06-15 09:48:12 UTC (rev 527) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>1.3-SNAPSHOT</version> + <version>1.3</version> </parent> <groupId>fr.ifremer.wao</groupId> @@ -227,9 +227,9 @@ </repositories> <scm> - <url>http://labs.libre-entreprise.org/scm/viewvc.php/trunk/wao-ui/?root=suiviobs…</url> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-ui</connection> - <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-ui</developerConnection> + <url>http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-1.3/?root=suiviobs…</url> + <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.3/wao-ui</connection> + <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.3/wao-ui</developerConnection> </scm> </project>

1 0

[Suiviobsmer-commits] r526 - trunk/src/site/rst/coordinator
by jcouteau＠users.labs.libre-entreprise.org 15 Jun '10

15 Jun '10

Author: jcouteau Date: 2010-06-15 09:36:12 +0000 (Tue, 15 Jun 2010) New Revision: 526 Log: Fix images path Modified: trunk/src/site/rst/coordinator/contacts.rst Modified: trunk/src/site/rst/coordinator/contacts.rst =================================================================== --- trunk/src/site/rst/coordinator/contacts.rst 2010-06-15 09:35:36 UTC (rev 525) +++ trunk/src/site/rst/coordinator/contacts.rst 2010-06-15 09:36:12 UTC (rev 526) @@ -36,14 +36,14 @@ Pour modifier un contact, il faut cliquer sur l'icone 'modification'. Cela ouvre la ligne du tableau en édition. Vous pouvez modifier le contact et enregistrer. -.. image:: contacts_modification.png +.. image:: ../user/contacts_modification.png :width: 800px Suivant le statut du contact, certaines informations sont nécessaires. Ces informations sont vérifiées à l'enregistrement et un message vous indique les informations manquantes si besoin. -.. image:: contacts_verification.png +.. image:: ../user/contacts_verification.png :width: 800px Supprimer un contact @@ -60,7 +60,7 @@ faire, il faut valider en cliquant sur l'icone de validation. Il est aussi possible de refuser un embarquement réaliser en cliquant sur l'icone de refus. -.. image:: contacts_validation.png +.. image:: ../user/contacts_validation.png :width: 800px Il y a 2 validations : une validation venant de la société et une validation

1 0

[Suiviobsmer-commits] r525 - in trunk/src/site/rst: admin coordinator guest user
by fdesbois＠users.labs.libre-entreprise.org 15 Jun '10

15 Jun '10

Author: fdesbois Date: 2010-06-15 09:35:36 +0000 (Tue, 15 Jun 2010) New Revision: 525 Log: Correction Code DCF5 documentation Modified: trunk/src/site/rst/admin/echantillonage.rst trunk/src/site/rst/coordinator/echantillonage.rst trunk/src/site/rst/guest/echantillonage.rst trunk/src/site/rst/user/echantillonage.rst Modified: trunk/src/site/rst/admin/echantillonage.rst =================================================================== --- trunk/src/site/rst/admin/echantillonage.rst 2010-06-15 09:22:54 UTC (rev 524) +++ trunk/src/site/rst/admin/echantillonage.rst 2010-06-15 09:35:36 UTC (rev 525) @@ -50,8 +50,10 @@ Vous pouvez afficher le plan d'échantillonage sur une période de temps donnée grace aux filtres situés au dessus du plan. Vous pouvez accéder aux filtres -avancés en cliquant sur le lien 'Recherche avancée'. Pour le code métier DCFS, -il y a un système d'auto-complétion pour vous aider à la saisie. +avancés en cliquant sur le lien 'Recherche avancée'. Pour le code métier DCF5, +il y a un système d'auto-complétion pour vous aider à la saisie. Il est cependant +possible de n'indiquer qu'une partie du code recherché (ex : OTB) ce qui aura +pour effet de rechercher l'intégralité des lignes ayant un code contenant 'OTB'. .. image::../guest/autoComplete.png :width: 600px Modified: trunk/src/site/rst/coordinator/echantillonage.rst =================================================================== --- trunk/src/site/rst/coordinator/echantillonage.rst 2010-06-15 09:22:54 UTC (rev 524) +++ trunk/src/site/rst/coordinator/echantillonage.rst 2010-06-15 09:35:36 UTC (rev 525) @@ -50,8 +50,10 @@ A noter que vous pouvez accéder à la recherche avancée qui filtre le plan d'échantillonage afin de vous permettre d'accéder plus facilement à -l'information qui vous intéresse. Pour le code métier DCFS, il y a un système -d'auto-complétion pour vous aider à la saisie. +l'information qui vous intéresse. Pour le code métier DCF5, il y a un système +d'auto-complétion pour vous aider à la saisie. Il est cependant +possible de n'indiquer qu'une partie du code recherché (ex : OTB) ce qui aura +pour effet de rechercher l'intégralité des lignes ayant un code contenant 'OTB'. .. image::../guest/autoComplete.png :width: 600px Modified: trunk/src/site/rst/guest/echantillonage.rst =================================================================== --- trunk/src/site/rst/guest/echantillonage.rst 2010-06-15 09:22:54 UTC (rev 524) +++ trunk/src/site/rst/guest/echantillonage.rst 2010-06-15 09:35:36 UTC (rev 525) @@ -26,8 +26,10 @@ A noter que vous pouvez accéder à la recherche avancée qui filtre le plan d'échantillonage afin de vous permettre d'accéder plus facilement à -l'information qui vous intéresse. Pour le code métier DCFS, il y a un système -d'auto-complétion pour vous aider à la saisie. +l'information qui vous intéresse. Pour le code métier DCF5, il y a un système +d'auto-complétion pour vous aider à la saisie. Il est cependant +possible de n'indiquer qu'une partie du code recherché (ex : OTB) ce qui aura +pour effet de rechercher l'intégralité des lignes ayant un code contenant 'OTB'. .. image::autoComplete.png :width: 600px Modified: trunk/src/site/rst/user/echantillonage.rst =================================================================== --- trunk/src/site/rst/user/echantillonage.rst 2010-06-15 09:22:54 UTC (rev 524) +++ trunk/src/site/rst/user/echantillonage.rst 2010-06-15 09:35:36 UTC (rev 525) @@ -62,8 +62,10 @@ A noter que vous pouvez accéder à la recherche avancée qui filtre le plan d'échantillonage afin de vous permettre d'accéder plus facilement à -l'information qui vous intéresse. Pour le code métier DCFS, il y a un système -d'auto-complétion pour vous aider à la saisie. +l'information qui vous intéresse. Pour le code métier DCF5, il y a un système +d'auto-complétion pour vous aider à la saisie. Il est cependant +possible de n'indiquer qu'une partie du code recherché (ex : OTB) ce qui aura +pour effet de rechercher l'intégralité des lignes ayant un code contenant 'OTB'. .. image::../guest/autoComplete.png :width: 600px

1 0