Author: bleny Date: 2013-04-26 11:50:28 +0200 (Fri, 26 Apr 2013) New Revision: 143 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revisions... Log: make unavailable articles specific to building Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/UnavailableArticleDao.java trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/UnavailableArticleJpaDao.java trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/UnavailableArticle.java trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/MagalieReport.java trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ArticleStorageService.java trunk/magalie-web/src/main/webapp/WEB-INF/content/report.jsp Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/UnavailableArticleDao.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/UnavailableArticleDao.java 2013-04-26 09:11:47 UTC (rev 142) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/UnavailableArticleDao.java 2013-04-26 09:50:28 UTC (rev 143) @@ -1,6 +1,7 @@ package com.franciaflex.magalie.persistence.dao; import com.franciaflex.magalie.persistence.entity.Article; +import com.franciaflex.magalie.persistence.entity.Building; import com.franciaflex.magalie.persistence.entity.UnavailableArticle; /** @@ -8,6 +9,6 @@ */ public interface UnavailableArticleDao extends Dao<UnavailableArticle> { - UnavailableArticle findByArticle(Article article); + UnavailableArticle findByArticle(Building building, Article article); } Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/UnavailableArticleJpaDao.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/UnavailableArticleJpaDao.java 2013-04-26 09:11:47 UTC (rev 142) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/UnavailableArticleJpaDao.java 2013-04-26 09:50:28 UTC (rev 143) @@ -2,6 +2,7 @@ import com.franciaflex.magalie.persistence.dao.UnavailableArticleDao; import com.franciaflex.magalie.persistence.entity.Article; +import com.franciaflex.magalie.persistence.entity.Building; import com.franciaflex.magalie.persistence.entity.UnavailableArticle; import javax.persistence.EntityManager; @@ -19,9 +20,10 @@ } @Override - public UnavailableArticle findByArticle(Article article) { - TypedQuery<UnavailableArticle> query = createQuery("from UnavailableArticle ua where ua.article = :article"); + public UnavailableArticle findByArticle(Building building, Article article) { + TypedQuery<UnavailableArticle> query = createQuery("from UnavailableArticle ua where ua.article = :article and ua.building = :building"); query.setParameter("article", article); + query.setParameter("building", building); return findUniqueOrNull(query); } } Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/UnavailableArticle.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/UnavailableArticle.java 2013-04-26 09:11:47 UTC (rev 142) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/UnavailableArticle.java 2013-04-26 09:50:28 UTC (rev 143) @@ -16,6 +16,9 @@ @OneToOne protected Article article; + @OneToOne + protected Building building; + protected Date reportDate; @Override @@ -35,6 +38,14 @@ this.article = article; } + public Building getBuilding() { + return building; + } + + public void setBuilding(Building building) { + this.building = building; + } + public void setReportDate(Date reportDate) { this.reportDate = reportDate; } Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/MagalieReport.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/MagalieReport.java 2013-04-26 09:11:47 UTC (rev 142) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/MagalieReport.java 2013-04-26 09:50:28 UTC (rev 143) @@ -46,8 +46,9 @@ protected List<LocationError> allLocationErrors; protected List<DeliveredRequestedList> allDeliveredRequestedLists; - private List<UnavailableArticle> allUnavailableArticles; + protected List<UnavailableArticle> allUnavailableArticles; + public void setReportDate(Date reportDate) { this.reportDate = reportDate; } Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ArticleStorageService.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ArticleStorageService.java 2013-04-26 09:11:47 UTC (rev 142) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ArticleStorageService.java 2013-04-26 09:50:28 UTC (rev 143) @@ -126,8 +126,10 @@ Article article = bookArticleRequest.getArticle(); - UnavailableArticle unavailableArticle = dao.findByArticle(article); + Building building = bookArticleRequest.getBuilding(); + UnavailableArticle unavailableArticle = dao.findByArticle(building, article); + if (articleIsAvailable) { if (unavailableArticle != null) { @@ -152,6 +154,8 @@ newUnavailableArticle.setArticle(article); + newUnavailableArticle.setBuilding(building); + newUnavailableArticle.setReportDate(serviceContext.getNow()); dao.persist(newUnavailableArticle); Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/report.jsp =================================================================== --- trunk/magalie-web/src/main/webapp/WEB-INF/content/report.jsp 2013-04-26 09:11:47 UTC (rev 142) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/report.jsp 2013-04-26 09:50:28 UTC (rev 143) @@ -288,6 +288,9 @@ Id </th> <th> + Bâtiment + </th> + <th> Article </th> </tr> @@ -300,9 +303,12 @@ <s:property value="id" /> </td> <td> - <s:property value="description" /> - (<s:property value="code" />) + <s:property value="building.code" /> </td> + <td> + <s:property value="article.description" /> + (<s:property value="article.code" />) + </td> </tr> </s:iterator> </tbody>