Author: bleny Date: 2013-03-25 16:13:20 +0100 (Mon, 25 Mar 2013) New Revision: 37 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revisions... Log: refs #2204: Page de rapport Magalie, start Added: 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-web/src/main/java/com/franciaflex/magalie/web/action/ReportAction.java trunk/magalie-web/src/main/webapp/WEB-INF/content/report.jsp Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/dao/MagalieUserDao.java trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/dao/jpa/JpaMagalieUserDao.java trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/ArticleStorageService.java trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/DefaultMagalieServiceContext.java trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/MagalieServiceContext.java trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/MagalieUsersService.java trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/SiteErrorsService.java trunk/magalie-services/src/test/java/com/franciaflex/magalie/FakeMagalieServiceContext.java Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/dao/MagalieUserDao.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/dao/MagalieUserDao.java 2013-03-25 14:46:07 UTC (rev 36) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/dao/MagalieUserDao.java 2013-03-25 15:13:20 UTC (rev 37) @@ -2,6 +2,8 @@ import com.franciaflex.magalie.entity.MagalieUser; +import java.util.List; + /** * @author bleny */ @@ -9,4 +11,6 @@ MagalieUser findByLogin(String login); + List<MagalieUser> findAll(); + } Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/dao/jpa/JpaMagalieUserDao.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/dao/jpa/JpaMagalieUserDao.java 2013-03-25 14:46:07 UTC (rev 36) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/dao/jpa/JpaMagalieUserDao.java 2013-03-25 15:13:20 UTC (rev 37) @@ -27,4 +27,11 @@ MagalieUser onlyElement = Iterables.getOnlyElement(resultList, null); return onlyElement; } + + @Override + public List<MagalieUser> findAll() { + Query query = entityManager.createQuery("from MagalieUser mu order by mu.login"); + List<MagalieUser> resultList = query.getResultList(); + return resultList; + } } Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/ArticleStorageService.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/ArticleStorageService.java 2013-03-25 14:46:07 UTC (rev 36) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/ArticleStorageService.java 2013-03-25 15:13:20 UTC (rev 37) @@ -85,7 +85,7 @@ double quantity = 0; - Date orderDate = serviceContext.getDate(); + Date orderDate = serviceContext.getNow(); for (StoredArticle storedArticle : sortedStoredArticles) { Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/DefaultMagalieServiceContext.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/DefaultMagalieServiceContext.java 2013-03-25 14:46:07 UTC (rev 36) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/DefaultMagalieServiceContext.java 2013-03-25 15:13:20 UTC (rev 37) @@ -77,7 +77,7 @@ } @Override - public Date getDate() { + public Date getNow() { Date now = new Date(); return now; } Added: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/MagalieReport.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/MagalieReport.java (rev 0) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/MagalieReport.java 2013-03-25 15:13:20 UTC (rev 37) @@ -0,0 +1,24 @@ +package com.franciaflex.magalie.services; + +import com.franciaflex.magalie.entity.MagalieUser; + +import java.util.Date; +import java.util.List; + +public class MagalieReport { + + protected Date reportDate; + private List<MagalieUser> allMagalieUsers; + + public void setReportDate(Date reportDate) { + this.reportDate = reportDate; + } + + public void setAllMagalieUsers(List<MagalieUser> allMagalieUsers) { + this.allMagalieUsers = allMagalieUsers; + } + + public List<MagalieUser> getAllMagalieUsers() { + return allMagalieUsers; + } +} Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/MagalieServiceContext.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/MagalieServiceContext.java 2013-03-25 14:46:07 UTC (rev 36) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/MagalieServiceContext.java 2013-03-25 15:13:20 UTC (rev 37) @@ -39,7 +39,7 @@ */ public interface MagalieServiceContext { - Date getDate(); + Date getNow(); <E extends MagalieService> E newService(Class<E> serviceClass); Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/MagalieUsersService.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/MagalieUsersService.java 2013-03-25 14:46:07 UTC (rev 36) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/MagalieUsersService.java 2013-03-25 15:13:20 UTC (rev 37) @@ -4,6 +4,8 @@ import com.franciaflex.magalie.entity.MagalieUser; import com.google.common.base.Preconditions; +import java.util.List; + public class MagalieUsersService implements MagalieService { protected MagalieServiceContext serviceContext; @@ -25,4 +27,13 @@ } + public List<MagalieUser> getAllMagalieUsers() { + + MagalieUserDao dao = serviceContext.getMagalieUserDao(); + + List<MagalieUser> allMagalieUsers = dao.findAll(); + + return allMagalieUsers; + + } } Added: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/ReportService.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/ReportService.java (rev 0) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/ReportService.java 2013-03-25 15:13:20 UTC (rev 37) @@ -0,0 +1,35 @@ +package com.franciaflex.magalie.services; + +import com.franciaflex.magalie.entity.MagalieUser; + +import java.util.Date; +import java.util.List; + +public class ReportService implements MagalieService { + + protected MagalieServiceContext serviceContext; + + @Override + public void setServiceContext(MagalieServiceContext serviceContext) { + this.serviceContext = serviceContext; + } + + public MagalieReport getReport() { + + MagalieReport magalieReport = new MagalieReport(); + + Date now = serviceContext.getNow(); + + magalieReport.setReportDate(now); + + MagalieUsersService magalieUsersService = serviceContext.newService(MagalieUsersService.class); + + List<MagalieUser> allMagalieUsers = magalieUsersService.getAllMagalieUsers(); + + magalieReport.setAllMagalieUsers(allMagalieUsers); + + 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 14:46:07 UTC (rev 36) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/SiteErrorsService.java 2013-03-25 15:13:20 UTC (rev 37) @@ -35,7 +35,7 @@ newSiteError.setSite(site); - Date reportDate = serviceContext.getDate(); + Date reportDate = serviceContext.getNow(); newSiteError.setReportDate(reportDate); Modified: trunk/magalie-services/src/test/java/com/franciaflex/magalie/FakeMagalieServiceContext.java =================================================================== --- trunk/magalie-services/src/test/java/com/franciaflex/magalie/FakeMagalieServiceContext.java 2013-03-25 14:46:07 UTC (rev 36) +++ trunk/magalie-services/src/test/java/com/franciaflex/magalie/FakeMagalieServiceContext.java 2013-03-25 15:13:20 UTC (rev 37) @@ -14,7 +14,7 @@ protected Date date; @Override - public Date getDate() { + public Date getNow() { Preconditions.checkState(date != null, "you must provide a date before running service test"); if (log.isTraceEnabled()) { log.trace("injecting fake date in service: " + date); Added: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/ReportAction.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/ReportAction.java (rev 0) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/ReportAction.java 2013-03-25 15:13:20 UTC (rev 37) @@ -0,0 +1,29 @@ +package com.franciaflex.magalie.web.action; + +import com.franciaflex.magalie.services.MagalieReport; +import com.franciaflex.magalie.services.ReportService; +import com.franciaflex.magalie.web.MagalieActionSupport; + +public class ReportAction extends MagalieActionSupport { + + protected ReportService service; + + protected MagalieReport report; + + public void setService(ReportService service) { + this.service = service; + } + + @Override + public String execute() { + + report = service.getReport(); + + return SUCCESS; + + } + + public MagalieReport getReport() { + return report; + } +} Added: trunk/magalie-web/src/main/webapp/WEB-INF/content/report.jsp =================================================================== --- trunk/magalie-web/src/main/webapp/WEB-INF/content/report.jsp (rev 0) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/report.jsp 2013-03-25 15:13:20 UTC (rev 37) @@ -0,0 +1,51 @@ +<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8" %> +<%@ taglib prefix="s" uri="/struts-tags" %> + +<head> + <title>Rapport MagaLiE</title> +</head> + +<h1>Rapport MagaLiE</h1> + +<section> + <h2>Utilisateurs connus</h2> + + <table class="table"> + <thead> + <tr> + <th> + Id + </th> + <th> + login + </th> + <th> + nom + </th> + <th> + permis ? + </th> + </tr> + </thead> + + <tbody> + <s:iterator value="report.allMagalieUsers" var="magalieUser"> + <tr> + <td> + <s:property value="id" /> + </td> + <td> + <s:property value="login" /> + </td> + <td> + <s:property value="name" /> + </td> + <td> + <s:property value="driverLicenseOwner" /> + </td> + </tr> + </s:iterator> + </tbody> + + </table> +</section> \ No newline at end of file