Author: bleny Date: 2013-07-04 11:06:18 +0200 (Thu, 04 Jul 2013) New Revision: 285 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revisions... Log: sort companies by name on choose-campany, sort building by code, users by name Added: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/CompanyJpaDao.java Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/BuildingJpaDao.java trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/MagalieUserJpaDao.java trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/BuildingsService.java trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/CompanyService.java Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/BuildingJpaDao.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/BuildingJpaDao.java 2013-07-04 08:45:15 UTC (rev 284) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/BuildingJpaDao.java 2013-07-04 09:06:18 UTC (rev 285) @@ -34,15 +34,16 @@ * @author Bavencoff */ public class BuildingJpaDao extends AbstractBuildingJpaDao { + public BuildingJpaDao(EntityManager entityManager) { super(entityManager); } @Override public List<Building> findAllByCompany(Company company) { - - TypedQuery<Building> query = createQuery(Building.PROPERTY_COMPANY, company); - + TypedQuery<Building> query = createQuery("from Building b where b.company = :company order by b.code"); + query.setParameter("company", company); return findAll(query); } + } Added: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/CompanyJpaDao.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/CompanyJpaDao.java (rev 0) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/CompanyJpaDao.java 2013-07-04 09:06:18 UTC (rev 285) @@ -0,0 +1,20 @@ +package com.franciaflex.magalie.persistence.dao; + +import com.franciaflex.magalie.persistence.entity.Company; + +import javax.persistence.EntityManager; +import javax.persistence.TypedQuery; +import java.util.List; + +public class CompanyJpaDao extends AbstractCompanyJpaDao { + + public CompanyJpaDao(EntityManager entityManager) { + super(entityManager); + } + + public List<Company> findAllOrderByName() { + TypedQuery<Company> query = createQuery("from Company c order by c.name"); + return findAll(query); + } + +} //CompanyJpaDao Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/MagalieUserJpaDao.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/MagalieUserJpaDao.java 2013-07-04 08:45:15 UTC (rev 284) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/MagalieUserJpaDao.java 2013-07-04 09:06:18 UTC (rev 285) @@ -51,7 +51,8 @@ @Override public List<MagalieUser> findAllByCompany(Company company) { - TypedQuery<MagalieUser> query = createQuery(MagalieUser.PROPERTY_COMPANY, company); + TypedQuery<MagalieUser> query = createQuery("from MagalieUser mu where mu.company = :company order by mu.name"); + query.setParameter("company", company); return findAll(query); } } Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/BuildingsService.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/BuildingsService.java 2013-07-04 08:45:15 UTC (rev 284) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/BuildingsService.java 2013-07-04 09:06:18 UTC (rev 285) @@ -40,14 +40,6 @@ this.serviceContext = serviceContext; } - public List<Building> getAllBuildings() { - - BuildingJpaDao dao = serviceContext.getPersistenceContext().getBuildingDao(); - - return dao.findAll(); - - } - public Building getBuilding(String buildingId) { BuildingJpaDao dao = serviceContext.getPersistenceContext().getBuildingDao(); Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/CompanyService.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/CompanyService.java 2013-07-04 08:45:15 UTC (rev 284) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/CompanyService.java 2013-07-04 09:06:18 UTC (rev 285) @@ -46,7 +46,7 @@ CompanyJpaDao dao = serviceContext.getPersistenceContext().getCompanyDao(); - return dao.findAll(); + return dao.findAllOrderByName(); }