Author: bleny Date: 2013-03-25 18:06:46 +0100 (Mon, 25 Mar 2013) New Revision: 39 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revisions... Log: refs #2204: show sites in error Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/dao/SiteErrorDao.java trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/dao/jpa/JpaSiteErrorDao.java trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/MagalieReport.java trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/ReportService.java trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/SiteErrorsService.java trunk/magalie-web/src/main/webapp/WEB-INF/content/report.jsp Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/dao/SiteErrorDao.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/dao/SiteErrorDao.java 2013-03-25 15:47:59 UTC (rev 38) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/dao/SiteErrorDao.java 2013-03-25 17:06:46 UTC (rev 39) @@ -14,4 +14,6 @@ List<Site> getAllSitesInError(); + List<SiteError> findAll(); + } Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/dao/jpa/JpaSiteErrorDao.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/dao/jpa/JpaSiteErrorDao.java 2013-03-25 15:47:59 UTC (rev 38) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/dao/jpa/JpaSiteErrorDao.java 2013-03-25 17:06:46 UTC (rev 39) @@ -37,4 +37,11 @@ List<Site> allSitesInError = query.getResultList(); return allSitesInError; } + + @Override + public List<SiteError> findAll() { + Query query = entityManager.createQuery("from SiteError se order by se.reportDate"); + List<SiteError> all = query.getResultList(); + return all; + } } 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-03-25 15:47:59 UTC (rev 38) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/MagalieReport.java 2013-03-25 17:06:46 UTC (rev 39) @@ -2,6 +2,7 @@ import com.franciaflex.magalie.StorageMovements; import com.franciaflex.magalie.entity.MagalieUser; +import com.franciaflex.magalie.entity.SiteError; import com.franciaflex.magalie.entity.StorageMovement; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; @@ -17,6 +18,8 @@ protected List<StorageMovement> allStorageMovements; + protected List<SiteError> allSiteErrors; + public void setReportDate(Date reportDate) { this.reportDate = reportDate; } @@ -58,4 +61,12 @@ ); return confirmedStorageMovements; } + + public List<SiteError> getAllSiteErrors() { + return allSiteErrors; + } + + public void setAllSiteErrors(List<SiteError> allSiteErrors) { + this.allSiteErrors = allSiteErrors; + } } Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/ReportService.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/ReportService.java 2013-03-25 15:47:59 UTC (rev 38) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/ReportService.java 2013-03-25 17:06:46 UTC (rev 39) @@ -2,6 +2,7 @@ import com.franciaflex.magalie.dao.StorageMovementDao; import com.franciaflex.magalie.entity.MagalieUser; +import com.franciaflex.magalie.entity.SiteError; import com.franciaflex.magalie.entity.StorageMovement; import java.util.Date; @@ -36,6 +37,12 @@ magalieReport.setAllStorageMovements(allStorageMovements); + SiteErrorsService siteErrorsService = serviceContext.newService(SiteErrorsService.class); + + List<SiteError> allSitesInError = siteErrorsService.getAllSiteErrors(); + + magalieReport.setAllSiteErrors(allSitesInError); + return magalieReport; } Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/SiteErrorsService.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/SiteErrorsService.java 2013-03-25 15:47:59 UTC (rev 38) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/SiteErrorsService.java 2013-03-25 17:06:46 UTC (rev 39) @@ -60,4 +60,14 @@ return allSitesInError; } + + public List<SiteError> getAllSiteErrors() { + + SiteErrorDao siteErrorDao = serviceContext.getSiteErrorDao(); + + List<SiteError> allSiteErrors = siteErrorDao.findAll(); + + return allSiteErrors; + + } } Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/report.jsp =================================================================== --- trunk/magalie-web/src/main/webapp/WEB-INF/content/report.jsp 2013-03-25 15:47:59 UTC (rev 38) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/report.jsp 2013-03-25 17:06:46 UTC (rev 39) @@ -138,6 +138,55 @@ </section> <section> + <h2>Emplacements en erreur</h2> + + <table class="table"> + <thead> + <tr> + <th> + Id + </th> + <th> + Magasin + </th> + <th> + Emplacement + </th> + <th> + Rapporteur + </th> + <th> + Date + </th> + </tr> + </thead> + + <tbody> + <s:iterator value="report.allSiteErrors"> + <tr> + <td> + <s:property value="id" /> + </td> + <td> + <s:property value="site.storeCode" /> + </td> + <td> + <s:property value="site.locationCode" /> + </td> + <td> + <s:property value="magalieUser.name" /> + </td> + <td> + <s:property value="reportDate" /> + </td> + </tr> + </s:iterator> + </tbody> + + </table> +</section> + +<section> <h2>Utilisateurs connus</h2> <table class="table">