Tuotteiden lisaaminen varastoon

code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/ProductBean.java

@@ -25,11 +25,13 @@ import fi.insomnia.bortal.facade.AccountEventFacade;
 import fi.insomnia.bortal.facade.BillLineFacade;
 import fi.insomnia.bortal.facade.BillLineFacade;
 import fi.insomnia.bortal.facade.DiscountFacade;
 import fi.insomnia.bortal.facade.DiscountFacade;
 import fi.insomnia.bortal.facade.EventUserFacade;
 import fi.insomnia.bortal.facade.EventUserFacade;
+import fi.insomnia.bortal.facade.InventoryEventFacade;
 import fi.insomnia.bortal.facade.ProductFacade;
 import fi.insomnia.bortal.facade.ProductFacade;
 import fi.insomnia.bortal.facade.UserFacade;
 import fi.insomnia.bortal.facade.UserFacade;
 import fi.insomnia.bortal.model.AccountEvent;
 import fi.insomnia.bortal.model.AccountEvent;
 import fi.insomnia.bortal.model.Discount;
 import fi.insomnia.bortal.model.Discount;
 import fi.insomnia.bortal.model.EventUser;
 import fi.insomnia.bortal.model.EventUser;
+import fi.insomnia.bortal.model.InventoryEvent;
 import fi.insomnia.bortal.model.LanEvent;
 import fi.insomnia.bortal.model.LanEvent;
 import fi.insomnia.bortal.model.Product;
 import fi.insomnia.bortal.model.Product;
 import fi.insomnia.bortal.model.ProductFlag;
 import fi.insomnia.bortal.model.ProductFlag;
@@ -56,6 +58,9 @@ public class ProductBean implements ProductBeanLocal {
 	private ProductFacade productFacade;
 	private ProductFacade productFacade;
 
 
 	@EJB
 	@EJB
+	private InventoryEventFacade ieFacade;
+
+	@EJB
 	private EventBeanLocal eventBean;
 	private EventBeanLocal eventBean;
 
 
 	@EJB
 	@EJB
@@ -343,4 +348,16 @@ public class ProductBean implements ProductBeanLocal {
 		return productFacade.findProductByBarcode(barcode);
 		return productFacade.findProductByBarcode(barcode);
 	}
 	}
 
 
+	@Override
+	@RolesAllowed(ShopPermission.S_MANAGE_PRODUCTS)
+	public void saveInventoryEvent(InventoryEvent ie) {
+		logger.debug("Creating new Inventoryevent {}", ie);
+		ieFacade.create(ie);
+	}
+
+	@Override
+	@RolesAllowed(ShopPermission.S_MANAGE_PRODUCTS)
+	public List<Product> findProductsForEvent() {
+		return productFacade.findAll();
+	}
 }
 }

code/LanBortalBeansClient/ejbModule/fi/insomnia/bortal/beans/ProductBeanLocal.java

@@ -11,6 +11,7 @@ import javax.ejb.Local;
 import fi.insomnia.bortal.model.AccountEvent;
 import fi.insomnia.bortal.model.AccountEvent;
 import fi.insomnia.bortal.model.Discount;
 import fi.insomnia.bortal.model.Discount;
 import fi.insomnia.bortal.model.EventUser;
 import fi.insomnia.bortal.model.EventUser;
+import fi.insomnia.bortal.model.InventoryEvent;
 import fi.insomnia.bortal.model.Product;
 import fi.insomnia.bortal.model.Product;
 import fi.insomnia.bortal.model.ProductFlag;
 import fi.insomnia.bortal.model.ProductFlag;
 
 
@@ -51,4 +52,8 @@ public interface ProductBeanLocal {
 
 
 	BigDecimal getProductLimit(Product product, EventUser user, Map<Integer, BigDecimal> prodCounts);
 	BigDecimal getProductLimit(Product product, EventUser user, Map<Integer, BigDecimal> prodCounts);
 
 
+	void saveInventoryEvent(InventoryEvent ie);
+
+	List<Product> findProductsForEvent();
+
 }
 }

code/LanBortalDatabase/src/fi/insomnia/bortal/model/InventoryEvent.java

@@ -25,7 +25,16 @@ public class InventoryEvent extends GenericEntity {
 
 
     @JoinColumn(name = "user_id")
     @JoinColumn(name = "user_id")
     private User user;
     private User user;
-    
+
+    @JoinColumn(name = "product_id")
+    private Product product;
+
+    @Column(name = "info", nullable = true)
+    private String info;
+
+    @Column(name = "quantity", nullable = false, precision = 24, scale = 4)
+    private BigDecimal quantity;
+
     public Product getProduct() {
     public Product getProduct() {
         return product;
         return product;
     }
     }
@@ -42,17 +51,6 @@ public class InventoryEvent extends GenericEntity {
         this.info = info;
         this.info = info;
     }
     }
 
 
-    @JoinColumn(name = "product_id")
-    private Product product;
-
-    @Column(name = "info", nullable = true)
-    private String info;
-    
-    @Column(name = "quantity", nullable = false, precision = 24, scale = 4)
-    private BigDecimal quantity;
-
-    
-
     public User getUser() {
     public User getUser() {
         return user;
         return user;
     }
     }
@@ -77,5 +75,4 @@ public class InventoryEvent extends GenericEntity {
         this.quantity = quantity;
         this.quantity = quantity;
     }
     }
 
 
-
 }
 }

code/LanBortalWeb/src/fi/insomnia/bortal/resources/i18n_en.properties

@@ -290,6 +290,13 @@ infoview.back          = Back
 infoview.computerplace = Computer places
 infoview.computerplace = Computer places
 infoview.shop          = Shop
 infoview.shop          = Shop
 
 
+inventory.product.info         = Info
+inventory.product.name         = Product
+inventory.product.pickProduct  = Pick product
+inventory.product.quantity     = Quantatity
+inventory.product.submitButton = Add
+inventory.product.title        = Add items to storage
+
 invite.emailexists           = User with that email address already exists in the system.
 invite.emailexists           = User with that email address already exists in the system.
 invite.notFound              = Invite invalid or already used
 invite.notFound              = Invite invalid or already used
 invite.successfull           = Invite sent successfully
 invite.successfull           = Invite sent successfully

code/LanBortalWeb/src/fi/insomnia/bortal/resources/i18n_fi.properties

@@ -297,6 +297,13 @@ infoview.back          = Takaisin
 infoview.computerplace = Tietokonepaikat
 infoview.computerplace = Tietokonepaikat
 infoview.shop          = Kauppa
 infoview.shop          = Kauppa
 
 
+inventory.product.info         = Info
+inventory.product.name         = Tuote
+inventory.product.pickProduct  = Valitse tuote
+inventory.product.quantity     = M\u00E4\u00E4r\u00E4
+inventory.product.submitButton = Lis\u00E4\u00E4
+inventory.product.title        = Lis\u00E4\u00E4 tuottetta varastoon
+
 invite.emailexists           = J\u00E4rjestelm\u00E4ss\u00E4 on jo k\u00E4ytt\u00E4j\u00E4tunnus samalla s\u00E4hk\u00F6postiosoitteella.
 invite.emailexists           = J\u00E4rjestelm\u00E4ss\u00E4 on jo k\u00E4ytt\u00E4j\u00E4tunnus samalla s\u00E4hk\u00F6postiosoitteella.
 invite.notFound              = Kutsu virheellinen tai jo k\u00E4ytetty.
 invite.notFound              = Kutsu virheellinen tai jo k\u00E4ytetty.
 invite.successfull           = Kutsu l\u00E4hetetty
 invite.successfull           = Kutsu l\u00E4hetetty

code/LanBortalWeb/src/fi/insomnia/bortal/web/cdiview/shop/ProductListView.java

@@ -26,5 +26,6 @@ public class ProductListView extends PaginationView<Product> {
 			super.setResults(pizzabean.getProducts());
 			super.setResults(pizzabean.getProducts());
 		}
 		}
 	}
 	}
+	
 
 
 }
 }

code/LanBortalWeb/src/fi/insomnia/bortal/web/converter/ProductConverter.java

@@ -4,6 +4,9 @@ import javax.ejb.EJB;
 import javax.enterprise.context.RequestScoped;
 import javax.enterprise.context.RequestScoped;
 import javax.inject.Named;
 import javax.inject.Named;
 
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import fi.insomnia.bortal.beans.ProductBeanLocal;
 import fi.insomnia.bortal.beans.ProductBeanLocal;
 import fi.insomnia.bortal.model.Product;
 import fi.insomnia.bortal.model.Product;
 import fi.insomnia.bortal.utilities.jsf.GenericIntegerEntityConverter;
 import fi.insomnia.bortal.utilities.jsf.GenericIntegerEntityConverter;
@@ -14,10 +17,13 @@ public class ProductConverter extends GenericIntegerEntityConverter<Product> {
 
 
 	@EJB
 	@EJB
 	private ProductBeanLocal productbean;
 	private ProductBeanLocal productbean;
+	private static final Logger logger = LoggerFactory.getLogger(ProductConverter.class);
 
 
 	@Override
 	@Override
 	protected Product find(Integer id) {
 	protected Product find(Integer id) {
-		return productbean.findById(id);
-	}
 
 
+		Product ret = productbean.findById(id);
+		logger.info("Converting product id {} to result {}", id, ret);
+		return ret;
+	}
 }
 }