Author: bleny Date: 2013-04-17 12:27:04 +0200 (Wed, 17 Apr 2013) New Revision: 103 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revisions... Log: add delivered requested lists in report Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/MagalieReport.java trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReportService.java trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/RequestedArticleService.java trunk/magalie-web/src/main/webapp/WEB-INF/content/report.jsp 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-17 09:46:14 UTC (rev 102) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/MagalieReport.java 2013-04-17 10:27:04 UTC (rev 103) @@ -1,6 +1,7 @@ package com.franciaflex.magalie.services; import com.franciaflex.magalie.persistence.StorageMovements; +import com.franciaflex.magalie.persistence.entity.DeliveredRequestedList; import com.franciaflex.magalie.persistence.entity.LocationError; import com.franciaflex.magalie.persistence.entity.MagalieUser; import com.franciaflex.magalie.persistence.entity.StorageMovement; @@ -20,6 +21,8 @@ protected List<LocationError> allLocationErrors; + protected List<DeliveredRequestedList> allDeliveredRequestedLists; + public void setReportDate(Date reportDate) { this.reportDate = reportDate; } @@ -69,4 +72,12 @@ public void setAllLocationErrors(List<LocationError> allLocationErrors) { this.allLocationErrors = allLocationErrors; } + + public void setAllDeliveredRequestedLists(List<DeliveredRequestedList> allDeliveredRequestedLists) { + this.allDeliveredRequestedLists = allDeliveredRequestedLists; + } + + public List<DeliveredRequestedList> getAllDeliveredRequestedLists() { + return allDeliveredRequestedLists; + } } Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReportService.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReportService.java 2013-04-17 09:46:14 UTC (rev 102) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReportService.java 2013-04-17 10:27:04 UTC (rev 103) @@ -1,6 +1,7 @@ package com.franciaflex.magalie.services.service; import com.franciaflex.magalie.persistence.dao.StorageMovementDao; +import com.franciaflex.magalie.persistence.entity.DeliveredRequestedList; import com.franciaflex.magalie.persistence.entity.LocationError; import com.franciaflex.magalie.persistence.entity.MagalieUser; import com.franciaflex.magalie.persistence.entity.StorageMovement; @@ -46,6 +47,12 @@ magalieReport.setAllLocationErrors(allLocationsInError); + RequestedArticleService requestedArticleService = serviceContext.newService(RequestedArticleService.class); + + List<DeliveredRequestedList> allDeliveredRequestedLists = requestedArticleService.getAllDeliveredRequestedLists(); + + magalieReport.setAllDeliveredRequestedLists(allDeliveredRequestedLists); + return magalieReport; } Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/RequestedArticleService.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/RequestedArticleService.java 2013-04-17 09:46:14 UTC (rev 102) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/RequestedArticleService.java 2013-04-17 10:27:04 UTC (rev 103) @@ -305,4 +305,16 @@ return requestedArticles; } + + public List<DeliveredRequestedList> getAllDeliveredRequestedLists() { + + MagaliePersistenceContext persistenceContext = serviceContext.getPersistenceContext(); + + DeliveredRequestedListDao dao = persistenceContext.getDeliveredRequestedListDao(); + + List<DeliveredRequestedList> all = dao.findAll(); + + return all; + + } } 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-17 09:46:14 UTC (rev 102) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/report.jsp 2013-04-17 10:27:04 UTC (rev 103) @@ -205,6 +205,51 @@ </section> <section> + <h2>Traitement des listes</h2> + + <table class="table"> + <thead> + <tr> + <th> + Id + </th> + <th> + Liste + </th> + <th> + Statut + </th> + <th> + Affectation + </th> + </tr> + </thead> + + <tbody> + <s:iterator value="report.allDeliveredRequestedLists"> + <tr> + <td> + <s:property value="id" /> + </td> + <td> + <s:property value="requestedList.code" /> + </td> + <td> + <s:property value="status" /> + </td> + <td> + <s:if test="affectedTo"> + <a href="#<s:property value="affectedTo.id" />"><s:property value="affectedTo.login" /></a> + </s:if> + </td> + </tr> + </s:iterator> + </tbody> + + </table> +</section> + +<section> <h2>Utilisateurs connus</h2> <table class="table">