April 2013 - Franciaflex-magalie-commits - mailman.cloud.codelutin.com

r144 - in trunk: magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity magalie-services/src/main/resources
by bleny＠users.forge.codelutin.com 26 Apr '13

26 Apr '13

Author: bleny Date: 2013-04-26 12:24:21 +0200 (Fri, 26 Apr 2013) New Revision: 144 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: add a withdrawAllowed column in Warehouse Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/StoredArticleJpaDao.java trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Warehouse.java trunk/magalie-services/src/main/resources/fixtures.yaml trunk/magalie-services/src/main/resources/fixtures2.yaml Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/StoredArticleJpaDao.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/StoredArticleJpaDao.java 2013-04-26 09:50:28 UTC (rev 143) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/StoredArticleJpaDao.java 2013-04-26 10:24:21 UTC (rev 144) @@ -46,7 +46,7 @@ @Override public List<StoredArticle> findAllForArticleInBuilding(Article article, Building building) { - TypedQuery<StoredArticle> query = createQuery("from StoredArticle sa where sa.article = :article and sa.location.warehouse.building = :building"); + TypedQuery<StoredArticle> query = createQuery("from StoredArticle sa where sa.article = :article and sa.location.warehouse.withdrawAllowed = true and sa.location.warehouse.building = :building"); query.setParameter("article", article); query.setParameter("building", building); List<StoredArticle> resultList = findAll(query); Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Warehouse.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Warehouse.java 2013-04-26 09:50:28 UTC (rev 143) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Warehouse.java 2013-04-26 10:24:21 UTC (rev 144) @@ -38,6 +38,8 @@ @ManyToOne protected Building building; + protected boolean withdrawAllowed; + @Override public String getId() { return id; @@ -62,4 +64,12 @@ public void setCode(String code) { this.code = code; } + + public boolean isWithdrawAllowed() { + return withdrawAllowed; + } + + public void setWithdrawAllowed(boolean withdrawAllowed) { + this.withdrawAllowed = withdrawAllowed; + } } Modified: trunk/magalie-services/src/main/resources/fixtures.yaml =================================================================== --- trunk/magalie-services/src/main/resources/fixtures.yaml 2013-04-26 09:50:28 UTC (rev 143) +++ trunk/magalie-services/src/main/resources/fixtures.yaml 2013-04-26 10:24:21 UTC (rev 144) @@ -51,36 +51,42 @@ id: warehouse_u01 code: U01 building: *B1 + withdrawAllowed: true U02: &U02 !warehouse id: warehouse_u02 code: U02 building: *B1 + withdrawAllowed: true U03: &U03 !warehouse id: warehouse_u03 code: U03 building: *B2 + withdrawAllowed: true U04: &U04 !warehouse id: warehouse_u04 code: U04 building: *B2 + withdrawAllowed: true SOM: &SOM !warehouse id: warehouse_som code: SOM building: *B1 + withdrawAllowed: true B01: &B01 !warehouse id: warehouse_b01 code: B01 building: *B1 + withdrawAllowed: true warehouses: - *U01 Modified: trunk/magalie-services/src/main/resources/fixtures2.yaml =================================================================== --- trunk/magalie-services/src/main/resources/fixtures2.yaml 2013-04-26 09:50:28 UTC (rev 143) +++ trunk/magalie-services/src/main/resources/fixtures2.yaml 2013-04-26 10:24:21 UTC (rev 144) @@ -45,36 +45,42 @@ id: warehouse_u01 code: U01 building: *B1 + withdrawAllowed: true U02: &U02 !warehouse id: warehouse_u02 code: U02 building: *B1 + withdrawAllowed: true U03: &U03 !warehouse id: warehouse_u03 code: U03 building: *B1 + withdrawAllowed: true U04: &U04 !warehouse id: warehouse_u04 code: U04 building: *B1 + withdrawAllowed: true SOM: &SOM !warehouse id: warehouse_som code: SOM building: *B1 + withdrawAllowed: true B01: &B01 !warehouse id: warehouse_b01 code: B01 building: *B1 + withdrawAllowed: true warehouses: - *U01

1 0

r143 - in trunk: magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity magalie-services/src/main/java/com/franciaflex/magalie/services magalie-services/src/main/java/com/franciaflex/magalie/services/service magalie-web/src/main/webapp/WEB-INF/content
by bleny＠users.forge.codelutin.com 26 Apr '13

26 Apr '13

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/revision… 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>

1 0

r142 - in trunk: magalie-persistence/src/main/java/com/franciaflex/magalie/persistence magalie-services/src/test/java/com/franciaflex/magalie/services/service
by bleny＠users.forge.codelutin.com 26 Apr '13

26 Apr '13

Author: bleny Date: 2013-04-26 11:11:47 +0200 (Fri, 26 Apr 2013) New Revision: 142 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: fix usage of fixedLocationFirsts comparator Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/StoredArticles.java trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/ArticleStorageServiceTest.java Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/StoredArticles.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/StoredArticles.java 2013-04-26 08:53:22 UTC (rev 141) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/StoredArticles.java 2013-04-26 09:11:47 UTC (rev 142) @@ -51,12 +51,7 @@ Preconditions.checkArgument(article.equals(y.getArticle())); boolean xIsInFixedLocation = article.isFixedLocation(x.getLocation()); boolean yIsInFixedLocation = article.isFixedLocation(y.getLocation()); - int compare; - if (article.isFixedLocationsFirst()) { - compare = BooleanComparator.getTrueFirstComparator().compare(xIsInFixedLocation, yIsInFixedLocation); - } else { - compare = 0; - } + int compare = BooleanComparator.getBooleanComparator(article.isFixedLocationsFirst()).compare(xIsInFixedLocation, yIsInFixedLocation); return compare; } Modified: trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/ArticleStorageServiceTest.java =================================================================== --- trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/ArticleStorageServiceTest.java 2013-04-26 08:53:22 UTC (rev 141) +++ trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/ArticleStorageServiceTest.java 2013-04-26 09:11:47 UTC (rev 142) @@ -6,6 +6,7 @@ import com.franciaflex.magalie.persistence.entity.MagalieUser; import com.franciaflex.magalie.persistence.entity.StorageMovement; import com.franciaflex.magalie.services.AbstractMagalieServiceTest; +import com.google.common.collect.Iterables; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.Assert; @@ -54,8 +55,11 @@ Article article = fixture("article2"); + Location fixedLocation = + Iterables.getOnlyElement(article.getFixedLocations()); + BookArticleRequest bookArticleRequest = - new BookArticleRequest(magalieUser, building, article, 11., destinationLocation, false); + new BookArticleRequest(magalieUser, building, article, 17., destinationLocation, false); BookArticleResult bookArticleResult = service.bookArticle(bookArticleRequest); @@ -63,8 +67,15 @@ List<StorageMovement> storageMovements = bookArticleResult.getStorageMovementOrder().getStorageMovements(); + // for this article, not-fixed locations first, from lowest quantities to highest quantities Assert.assertEquals(2., storageMovements.get(0).getExpectedQuantity(), DELTA); - Assert.assertEquals(9., storageMovements.get(1).getExpectedQuantity(), DELTA); + Assert.assertNotEquals(fixedLocation, storageMovements.get(0).getOriginLocation()); + Assert.assertEquals(10., storageMovements.get(1).getExpectedQuantity(), DELTA); + Assert.assertNotEquals(fixedLocation, storageMovements.get(1).getOriginLocation()); + // now there is only the fixed site is remaining + Assert.assertEquals(5., storageMovements.get(2).getExpectedQuantity(), DELTA); + Assert.assertEquals(fixedLocation, storageMovements.get(2).getOriginLocation()); + } }

1 0

r141 - trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service
by bleny＠users.forge.codelutin.com 26 Apr '13

26 Apr '13

Author: bleny Date: 2013-04-26 10:53:22 +0200 (Fri, 26 Apr 2013) New Revision: 141 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: remove todo, mark requested list as PENDING when necessary Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/RequestedArticleService.java 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-26 08:49:46 UTC (rev 140) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/RequestedArticleService.java 2013-04-26 08:53:22 UTC (rev 141) @@ -210,21 +210,12 @@ + " to " + requestedList.getCode()); } - boolean isFinished = false; // TODO brendan 16/04/13 really ? + boolean isFinished = oldAffectation.getStatus().equals(DeliveredRequestedListStatus.COMPLETE); - if (isFinished) { + if ( ! isFinished) { if (log.isInfoEnabled()) { log.info("request list " + oldAffectation.getRequestedList() - + " is complete, save status"); - } - - oldAffectation.setStatus(DeliveredRequestedListStatus.COMPLETE); - - } else { - - if (log.isInfoEnabled()) { - log.info("request list " + oldAffectation.getRequestedList() + " is not complete, putting it back to pending"); }

1 0

r140 - in trunk: magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa magalie-services/src/main/java/com/franciaflex/magalie/services/service
by bleny＠users.forge.codelutin.com 26 Apr '13

26 Apr '13

Author: bleny Date: 2013-04-26 10:49:46 +0200 (Fri, 26 Apr 2013) New Revision: 140 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: review usage of 'SANS' and 'REC' locations Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/StoredArticleJpaDao.java trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ArticleStorageService.java Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/StoredArticleJpaDao.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/StoredArticleJpaDao.java 2013-04-25 15:45:53 UTC (rev 139) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/StoredArticleJpaDao.java 2013-04-26 08:49:46 UTC (rev 140) @@ -30,7 +30,6 @@ import com.franciaflex.magalie.persistence.entity.StoredArticle; import javax.persistence.EntityManager; -import javax.persistence.Query; import javax.persistence.TypedQuery; import java.util.List; @@ -47,11 +46,10 @@ @Override public List<StoredArticle> findAllForArticleInBuilding(Article article, Building building) { - Query query = entityManager.createQuery("from StoredArticle sa where sa.article = :article and sa.location.warehouse.building = :building and sa.location.code != :receptionLocationCode"); + TypedQuery<StoredArticle> query = createQuery("from StoredArticle sa where sa.article = :article and sa.location.warehouse.building = :building"); query.setParameter("article", article); query.setParameter("building", building); - query.setParameter("receptionLocationCode", Locations.codeForReceptionLocations()); - List<StoredArticle> resultList = query.getResultList(); + List<StoredArticle> resultList = findAll(query); for (StoredArticle storedArticle : resultList) { entityManager.detach(storedArticle); } 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-25 15:45:53 UTC (rev 139) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ArticleStorageService.java 2013-04-26 08:49:46 UTC (rev 140) @@ -257,8 +257,8 @@ Ordering.compound( Lists.newArrayList( StoredArticles.fixedLocationForArticleComparator(), - StoredArticles.locationWithLowestQuantityFirstComparator() - //StoredArticles.articleStoredInLocationsRequiringDriverLicenseFirstComparator() + StoredArticles.locationWithLowestQuantityFirstComparator(), + StoredArticles.articleStoredInLocationsRequiringDriverLicenseFirstComparator() ) );

1 0

r139 - trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity
by bleny＠users.forge.codelutin.com 25 Apr '13

25 Apr '13

Author: bleny Date: 2013-04-25 17:45:53 +0200 (Thu, 25 Apr 2013) New Revision: 139 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: rename Location#full to fullLocation (hibernate fail to escape the column name) Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Location.java Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Location.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Location.java 2013-04-25 15:21:02 UTC (rev 138) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Location.java 2013-04-25 15:45:53 UTC (rev 139) @@ -40,7 +40,7 @@ protected int requiredAccreditationLevel; - protected boolean full; + protected boolean fullLocation; @Override public String getId() { @@ -84,11 +84,11 @@ return requiredAccreditationLevel == 9; } - public boolean isFull() { - return full; + public boolean isFullLocation() { + return fullLocation; } - public void setFull(boolean full) { - this.full = full; + public void setFullLocation(boolean fullLocation) { + this.fullLocation = fullLocation; } }

1 0

r138 - trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity
by bleny＠users.forge.codelutin.com 25 Apr '13

25 Apr '13

Author: bleny Date: 2013-04-25 17:21:02 +0200 (Thu, 25 Apr 2013) New Revision: 138 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: rename Location#fullLocation to full Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Location.java Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Location.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Location.java 2013-04-25 15:16:39 UTC (rev 137) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Location.java 2013-04-25 15:21:02 UTC (rev 138) @@ -40,7 +40,7 @@ protected int requiredAccreditationLevel; - protected boolean fullLocation; + protected boolean full; @Override public String getId() { @@ -84,11 +84,11 @@ return requiredAccreditationLevel == 9; } - public boolean isFullLocation() { - return fullLocation; + public boolean isFull() { + return full; } - public void setFullLocation(boolean fullLocation) { - this.fullLocation = fullLocation; + public void setFull(boolean full) { + this.full = full; } }

1 0

r137 - trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity
by bleny＠users.forge.codelutin.com 25 Apr '13

25 Apr '13

Author: bleny Date: 2013-04-25 17:16:39 +0200 (Thu, 25 Apr 2013) New Revision: 137 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: rename Location#full to fullLocation (hibernate fail to escape the column name) Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Location.java Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Location.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Location.java 2013-04-25 14:53:50 UTC (rev 136) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Location.java 2013-04-25 15:16:39 UTC (rev 137) @@ -40,7 +40,7 @@ protected int requiredAccreditationLevel; - protected boolean full; + protected boolean fullLocation; @Override public String getId() { @@ -84,11 +84,11 @@ return requiredAccreditationLevel == 9; } - public boolean isFull() { - return full; + public boolean isFullLocation() { + return fullLocation; } - public void setFull(boolean full) { - this.full = full; + public void setFullLocation(boolean fullLocation) { + this.fullLocation = fullLocation; } }

1 0

r136 - trunk/magalie-web/src/main/webapp/WEB-INF/content
by bleny＠users.forge.codelutin.com 25 Apr '13

25 Apr '13

Author: bleny Date: 2013-04-25 16:53:50 +0200 (Thu, 25 Apr 2013) New Revision: 136 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: show article in report: location error Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/report.jsp 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-25 14:47:55 UTC (rev 135) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/report.jsp 2013-04-25 14:53:50 UTC (rev 136) @@ -193,6 +193,9 @@ Emplacement </th> <th> + Article + </th> + <th> Rapporteur </th> <th> @@ -214,6 +217,10 @@ <s:property value="location.code" /> </td> <td> + <s:property value="article.description" /> + (<s:property value="article.code" />) + </td> + <td> <s:property value="magalieUser.name" /> </td> <td>

1 0

r135 - trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity
by bleny＠users.forge.codelutin.com 25 Apr '13

25 Apr '13

Author: bleny Date: 2013-04-25 16:47:55 +0200 (Thu, 25 Apr 2013) New Revision: 135 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: rename Location#occupied to full Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Location.java Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Location.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Location.java 2013-04-25 14:38:56 UTC (rev 134) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Location.java 2013-04-25 14:47:55 UTC (rev 135) @@ -40,7 +40,7 @@ protected int requiredAccreditationLevel; - protected boolean occupied; + protected boolean full; @Override public String getId() { @@ -84,11 +84,11 @@ return requiredAccreditationLevel == 9; } - public boolean isOccupied() { - return occupied; + public boolean isFull() { + return full; } - public void setOccupied(boolean occupied) { - this.occupied = occupied; + public void setFull(boolean full) { + this.full = full; } }

1 0