Author: bleny Date: 2013-04-12 15:54:08 +0200 (Fri, 12 Apr 2013) New Revision: 95 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revisions... Log: introduce supplier Added: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Supplier.java Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Article.java trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ArticleStorageService.java trunk/magalie-services/src/main/resources/fixtures.yaml trunk/magalie-web/src/main/webapp/WEB-INF/content/withdraw-item-input.jsp Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Article.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Article.java 2013-04-12 12:40:47 UTC (rev 94) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Article.java 2013-04-12 13:54:08 UTC (rev 95) @@ -3,6 +3,7 @@ import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.ManyToMany; +import javax.persistence.ManyToOne; import java.util.Set; @Entity @@ -14,6 +15,9 @@ @ManyToMany protected Set<Location> fixedLocations; + @ManyToOne + protected Supplier supplier; + protected String description; protected String code; @@ -89,4 +93,12 @@ public void setFixedLocationsFirst(boolean fixedLocationsFirst) { this.fixedLocationsFirst = fixedLocationsFirst; } + + public Supplier getSupplier() { + return supplier; + } + + public void setSupplier(Supplier supplier) { + this.supplier = supplier; + } } Added: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Supplier.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Supplier.java (rev 0) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Supplier.java 2013-04-12 13:54:08 UTC (rev 95) @@ -0,0 +1,30 @@ +package com.franciaflex.magalie.persistence.entity; + +import javax.persistence.Entity; +import javax.persistence.Id; + +@Entity +public class Supplier extends AbstractEntity { + + @Id + protected String id; + + protected String name; + + @Override + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } +} 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-12 12:40:47 UTC (rev 94) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ArticleStorageService.java 2013-04-12 13:54:08 UTC (rev 95) @@ -54,6 +54,8 @@ Preconditions.checkNotNull(bookArticleRequest.getArticle()); + Preconditions.checkNotNull(bookArticleRequest.getDestinationLocation()); + Preconditions.checkArgument(bookArticleRequest.getRequestedQuantity() > 0.); if (log.isInfoEnabled()) { Modified: trunk/magalie-services/src/main/resources/fixtures.yaml =================================================================== --- trunk/magalie-services/src/main/resources/fixtures.yaml 2013-04-12 12:40:47 UTC (rev 94) +++ trunk/magalie-services/src/main/resources/fixtures.yaml 2013-04-12 13:54:08 UTC (rev 95) @@ -426,6 +426,7 @@ article: *article1 quantity: 80 requestedList: *requestedList1 + destinationLocation: *location14 requestedArticle2: &requestedArticle2 !requested-article @@ -433,6 +434,7 @@ article: *article2 quantity: 11 requestedList: *requestedList1 + destinationLocation: *location14 requestedArticle3: &requestedArticle3 !requested-article @@ -440,6 +442,7 @@ article: *article3 quantity: 111 requestedList: *requestedList1 + destinationLocation: *location14 requestedArticle4: &requestedArticle4 !requested-article @@ -447,6 +450,7 @@ article: *article4 quantity: 2 requestedList: *requestedList1 + destinationLocation: *location14 requestedArticle5: &requestedArticle5 !requested-article @@ -454,6 +458,7 @@ article: *article5 quantity: 5 requestedList: *requestedList2 + destinationLocation: *location14 requestedArticle6: &requestedArticle6 !requested-article @@ -461,6 +466,7 @@ article: *article6 quantity: 27 requestedList: *requestedList2 + destinationLocation: *location14 requestedArticles: - *requestedArticle1 Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/withdraw-item-input.jsp =================================================================== --- trunk/magalie-web/src/main/webapp/WEB-INF/content/withdraw-item-input.jsp 2013-04-12 12:40:47 UTC (rev 94) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/withdraw-item-input.jsp 2013-04-12 13:54:08 UTC (rev 95) @@ -90,8 +90,6 @@ <dd><s:property value="storageMovementTask.article.code" /></dd> <dt>Desc.</dt> <dd><s:property value="storageMovementTask.article.description" /></dd> - <dt>LàS</dt> - <dd>123456789</dd> <dt>Prélev.</dt> <dd><span id="withdrawn">0</span> / <s:property value="storageMovementTask.quantity" /> <s:property value="storageMovementTask.article.unit" /></dd> </dl>