From 703ecc1da556232c456b286d1a3fd071fdbd6128 Mon Sep 17 00:00:00 2001
From: daniel <daniel@localhost.localdomain>
Date: Fri, 21 Jan 2011 18:17:42 -0300
Subject: [PATCH] adicionar item orcamento

---
 .../controller/AdicionarItemOrcamento.java         | 15 ++++++-----
 .../java/facafesta/controller/VerOrcamento.java    | 21 +++++++++++++++
 src/main/java/facafesta/model/ItemOrcamento.java   | 30 ++++++++++++++++++++++
 src/main/java/facafesta/model/Orcamento.java       |  6 ++---
 src/main/webapp/WEB-INF/item-show.jsp              |  6 +++--
 src/main/webapp/WEB-INF/orcamento-show.jsp         | 22 ++++++++++++++++
 src/main/webapp/WEB-INF/orcamento.jsp              |  1 -
 7 files changed, 88 insertions(+), 13 deletions(-)
 create mode 100644 src/main/java/facafesta/controller/VerOrcamento.java
 create mode 100644 src/main/java/facafesta/model/ItemOrcamento.java
 create mode 100644 src/main/webapp/WEB-INF/orcamento-show.jsp
 delete mode 100644 src/main/webapp/WEB-INF/orcamento.jsp

diff --git a/src/main/java/facafesta/controller/AdicionarItemOrcamento.java b/src/main/java/facafesta/controller/AdicionarItemOrcamento.java
index 683a742..74531e9 100644
--- a/src/main/java/facafesta/controller/AdicionarItemOrcamento.java
+++ b/src/main/java/facafesta/controller/AdicionarItemOrcamento.java
@@ -12,6 +12,7 @@ import javax.servlet.http.HttpSession;
 
 import facafesta.Util;
 import facafesta.model.Item;
+import facafesta.model.ItemOrcamento;
 import facafesta.model.Orcamento;
 
 @WebServlet("/orcamento/adicionaritem")
@@ -21,24 +22,24 @@ public class AdicionarItemOrcamento extends HttpServlet {
 
 	@Override
 	protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
-		Long idItem = new Long(req.getParameter("id"));
+		Long idItem = new Long(req.getParameter("item"));
+		Integer quantidade = new Integer(req.getParameter("quantidade"));
 		HttpSession session = req.getSession(true);
 		
 		Orcamento orcamento = (Orcamento) session.getAttribute("orcamento");
 		if (orcamento == null) {
 			orcamento = new Orcamento();
-			session.setAttribute("orcamento", orcamento);
 		}
 		
-		
 		EntityManager manager = Util.getEntityManager();
-		manager.getTransaction().begin();
 		
 		Item item = (Item) manager.createQuery("from Item where id = :id").setParameter("id", idItem).getSingleResult();
-		orcamento.getItens().add(item);
-		
-		manager.getTransaction().commit();
+		ItemOrcamento e = new ItemOrcamento();
+		e.setItem(item);
+		e.setQuantidade(quantidade);
+		orcamento.getItens().add(e);
 		
+		session.setAttribute("orcamento", orcamento);
 		getServletContext().getRequestDispatcher("/WEB-INF/orcamento.jsp").forward(req, resp);
 		
 		manager.close();
diff --git a/src/main/java/facafesta/controller/VerOrcamento.java b/src/main/java/facafesta/controller/VerOrcamento.java
new file mode 100644
index 0000000..c3970b6
--- /dev/null
+++ b/src/main/java/facafesta/controller/VerOrcamento.java
@@ -0,0 +1,21 @@
+package facafesta.controller;
+
+import java.io.IOException;
+
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+@WebServlet("/orcamento")
+public class VerOrcamento extends HttpServlet {
+
+	private static final long serialVersionUID = 1L;
+	
+	@Override
+	protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+		getServletContext().getRequestDispatcher("/WEB-INF/orcamento-show.jsp").forward(req, resp);
+	}
+
+}
diff --git a/src/main/java/facafesta/model/ItemOrcamento.java b/src/main/java/facafesta/model/ItemOrcamento.java
new file mode 100644
index 0000000..3571c93
--- /dev/null
+++ b/src/main/java/facafesta/model/ItemOrcamento.java
@@ -0,0 +1,30 @@
+package facafesta.model;
+
+import java.math.BigDecimal;
+
+public class ItemOrcamento {
+
+	private Item item;
+	private Integer quantidade;
+
+	public Item getItem() {
+		return item;
+	}
+
+	public void setItem(Item item) {
+		this.item = item;
+	}
+
+	public Integer getQuantidade() {
+		return quantidade;
+	}
+
+	public void setQuantidade(Integer quantidade) {
+		this.quantidade = quantidade;
+	}
+
+	public BigDecimal getValorTotal() {
+		return item.getValor().multiply(new BigDecimal(quantidade));
+	}
+	
+}
diff --git a/src/main/java/facafesta/model/Orcamento.java b/src/main/java/facafesta/model/Orcamento.java
index aea33e3..dd94894 100644
--- a/src/main/java/facafesta/model/Orcamento.java
+++ b/src/main/java/facafesta/model/Orcamento.java
@@ -5,13 +5,13 @@ import java.util.List;
 
 public class Orcamento {
 
-	private List<Item> itens = new LinkedList<Item>();
+	private List<ItemOrcamento> itens = new LinkedList<ItemOrcamento>();
 
-	public List<Item> getItens() {
+	public List<ItemOrcamento> getItens() {
 		return itens;
 	}
 
-	public void setItens(List<Item> itens) {
+	public void setItens(List<ItemOrcamento> itens) {
 		this.itens = itens;
 	}
 	
diff --git a/src/main/webapp/WEB-INF/item-show.jsp b/src/main/webapp/WEB-INF/item-show.jsp
index ad36a66..7151dfe 100644
--- a/src/main/webapp/WEB-INF/item-show.jsp
+++ b/src/main/webapp/WEB-INF/item-show.jsp
@@ -10,7 +10,9 @@
 	<label>Quantidade: </label>
 	<span>${item.quantidade}</span>
 	<br>
-	<form action="/" method="get">
-		<input type="button" value="Adicionar ao Orçamento" />
+	<form action="/orcamento/adicionaritem" method="post">
+		<input type="hidden" name="item" value="${item.id}" />
+		<input type="text" name="quantidade" />
+		<input type="submit" value="Adicionar ao Orçamento" />
 	</form>
 </div>
diff --git a/src/main/webapp/WEB-INF/orcamento-show.jsp b/src/main/webapp/WEB-INF/orcamento-show.jsp
new file mode 100644
index 0000000..0b5c5b4
--- /dev/null
+++ b/src/main/webapp/WEB-INF/orcamento-show.jsp
@@ -0,0 +1,22 @@
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<h1>Orçamento</h1>
+<div>
+	<h2>Itens</h2>
+<c:forEach var="item" items="${orcamento.itens}">
+	<div>
+		<label>Descrição: </label>
+		<span>${item.item.descricao}</span>
+		<br>
+		<label>Valor Unitário: </label>
+		<span>${item.item.valor}</span>
+		<br>
+		<label>Quantidade: </label>
+		<span>${item.quantidade}</span>
+		<br>
+		<label>Valor Total: </label>
+		<span>${item.valorTotal}</span>
+		<br>
+	</div>
+</c:forEach>
+</div>
+<!-- links para reserva, enviar e-mail -->
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/orcamento.jsp b/src/main/webapp/WEB-INF/orcamento.jsp
deleted file mode 100644
index e16d16d..0000000
--- a/src/main/webapp/WEB-INF/orcamento.jsp
+++ /dev/null
@@ -1 +0,0 @@
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-- 
2.11.4.GIT