Skip to content

Commit

Permalink
so falta os relatorios agr
Browse files Browse the repository at this point in the history
  • Loading branch information
@gianluca-magnabosco
gianluca-magnabosco committed Feb 12, 2023
1 parent aba253f commit 23ed92c
Show file tree
Hide file tree
Showing 31 changed files with 422 additions and 105 deletions.
6 changes: 3 additions & 3 deletions insert_db.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5776,9 +5776,9 @@ INSERT INTO pedido_has_item (id_pedido, id_item, qtd_item) VALUES
(13, 4, 1);
--14
INSERT INTO tb_pedido (descricao_pedido, orcamento_pedido, tempo_pedido)
VALUES ('Duas meias e uma cueca', 8.99, 1);
VALUES ('Duas calças e uma cueca', 23.49, 3);
INSERT INTO pedido_has_item (id_pedido, id_item, qtd_item) VALUES
(14, 4, 2),
(14, 1, 2),
(14, 5, 1);
--15
INSERT INTO tb_pedido (descricao_pedido, orcamento_pedido, tempo_pedido)
Expand All @@ -5799,7 +5799,7 @@ VALUES (3, 12, 'RECOLHIDO', (SELECT CAST(now() as DATE)), (SELECT CAST(now() as
--2 Aguardando Pagamento
INSERT INTO user_has_pedido (id_user, id_pedido, status, data_inicio, data_fim) VALUES
(3, 13, 'AGUARDANDO PAGAMENTO', (SELECT CAST(now() as DATE)), (SELECT CAST(now() as DATE) + 3)),
(3, 14, 'AGUARDANDO PAGAMENTO', (SELECT CAST(now() as DATE)), (SELECT CAST(now() as DATE) + 3));
(3, 14, 'AGUARDANDO PAGAMENTO', (SELECT CAST(now() as DATE) + 25), (SELECT CAST(now() as DATE) + 4));
--Pago
INSERT INTO user_has_pedido (id_user, id_pedido, status, data_inicio, data_fim)
VALUES (3, 15, 'PAGO', (SELECT CAST(now() as DATE) - 5), (SELECT CAST(now() as DATE) - 2));
Expand Down
10 changes: 10 additions & 0 deletions src/java/com/ufpr/tads/web2/controller/FuncionarioServlet.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,11 +84,21 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re
String email = request.getParameter("email");
String senha = request.getParameter("senha");


String param = null;

if (id == null || id.equals("")) {
FuncionarioFacade.insert(nome, dataNascimento, email, senha);
param = "&cadastrado=true&funcionario=" + nome;
} else {
FuncionarioFacade.update(id, nome, dataNascimento, email, senha);
}


if (param != null) {
response.sendRedirect("funcionarioController?action=listar" + param);
return;
}

response.sendRedirect("funcionarioController?action=listar");
return;
Expand Down
8 changes: 8 additions & 0 deletions src/java/com/ufpr/tads/web2/controller/ItemServlet.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,12 +78,20 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re

String path = getServletContext().getRealPath("");

String param = null;

if (id == null || id.equals("")) {
ItemFacade.insert(nome, preco, tempo, imagem, path);
param = "&cadastrado=true&roupa=" + nome;
} else {
ItemFacade.update(id, nome, preco, tempo, imagem, path);
}

if (param != null) {
response.sendRedirect("roupa?action=listar" + param);
return;
}

response.sendRedirect("roupa?action=listar");
return;
}
Expand Down
13 changes: 12 additions & 1 deletion src/java/com/ufpr/tads/web2/controller/PedidoServlet.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,14 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re
request.setAttribute("message", message);
}

String realizado = request.getParameter("realizado");
String id = request.getParameter("id");

if (realizado != null && realizado.equals("true") && id != null && !id.equals("")) {
request.setAttribute("realizado", realizado);
request.setAttribute("id", id);
}

request.setAttribute("pedidos", pedidos);
request.getRequestDispatcher("cliente/listarPedidos.jsp").forward(request, response);
return;
Expand Down Expand Up @@ -104,11 +112,14 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re

case "realizar" -> {
if (login.getRole().equals("Cliente")) {

String status = request.getParameter("status");

String body = IOUtils.toString(request.getInputStream(), StandardCharsets.UTF_8);

int idUser = login.getId();

PedidoFacade.insert(body, idUser);
PedidoFacade.insert(body, idUser, status);

response.sendRedirect("pedido?action=listar");
return;
Expand Down
1 change: 0 additions & 1 deletion src/java/com/ufpr/tads/web2/model/dao/PedidoDAO.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,6 @@ public void insert(Pedido pedido) throws DAOException {
throw new DAOException("Erro ao inserir pedido: " + INSERT_UHP_QUERY , e);
}


try (PreparedStatement st = con.prepareStatement(INSERT_PHI_QUERY)) {
for (ItemPedido item : pedido.getItens()) {
st.setInt(1, pedido.getId());
Expand Down
11 changes: 9 additions & 2 deletions src/java/com/ufpr/tads/web2/model/facade/PedidoFacade.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,13 @@ public static Pedido listById(String id) throws DAOException, DadoInvalidoExcept
}


public static void insert(String body, int idUser) throws DAOException, DadoInvalidoException {
public static void insert(String body, int idUser, String status) throws DAOException, DadoInvalidoException {

Validacao.validarVazio(status, "O status deve ser inserido!");

if (!(status.equals("confirmado") || status.equals("rejeitado"))) {
throw new DadoInvalidoException("O status deve ser inserido!");
}

Pedido pedido = null;

Expand Down Expand Up @@ -119,7 +125,8 @@ public static void insert(String body, int idUser) throws DAOException, DadoInva
pedido.setUser(new User(idUser));
pedido.setDataInicio(new Date());
pedido.setItens(itens);
pedido.setStatus("EM ABERTO");

pedido.setStatus(status.equals("confirmado") ? "EM ABERTO" : "REJEITADO");
} catch (Exception e) {
throw new DadoInvalidoException("Algum dado do pedido ta incorreto!");
}
Expand Down
13 changes: 7 additions & 6 deletions web/cliente/inicio.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,8 @@
</c:if>
<c:import url="header.jsp"/>
<c:if test="${not empty param.pedido}">
<c:import url="/popup/pedidoConfirmado.jsp"/>
</c:if>
<c:import url="/popup/cancelar.jsp"/>
<div class="content">
<div class="jumbotron">
Expand Down Expand Up @@ -89,8 +87,11 @@
});
$(".cancelar${pedido.id}").on("click", () => {
// ajeitar isso aqui
// location.href = "<c:url value='/popup/cancelar.jsp?id=${pedido.id}'/>";
$("#overlay.cancelarOverlay").show();
$(".confirmarCancelamento").on("click", () => {
location.href="<c:url value='/pedido?action=cancelar&id=${pedido.id}'/>";
});
});
</script>
</c:if>
Expand Down
22 changes: 20 additions & 2 deletions web/cliente/listarPedidos.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,16 @@
<c:import url="header.jsp"/>
<c:import url="/popup/cancelar.jsp"/>
<c:import url="/popup/pagar.jsp"/>
<c:if test="${not empty param.realizado}">
<c:import url="/popup/pedidoConfirmado.jsp">
<c:param name="id" value="${param.id}"/>
</c:import>
</c:if>
<div class="content">
<div class="jumbotron">
Expand Down Expand Up @@ -164,15 +174,23 @@
<button class="btn btn-success btn-sm pagar pagar${pedido.id}">Pagar Pedido</button></a>
<script>
$(".pagar${pedido.id}").on("click", () => {
// fazer script pra mostrar popup e ai se confirmar manda pra servlet
$("#overlay.pagarOverlay").show();
$(".pagamento").on("click", () => {
location.href="<c:url value='/pedido?action=pagar&id=${pedido.id}'/>";
});
});
</script>
</c:when>
<c:when test="${pedido.status == \"EM ABERTO\"}">
<button class="btn btn-danger btn-sm cancelar cancelar${pedido.id}">Cancelar Pedido</button>
<script>
$(".cancelar${pedido.id}").on("click", () => {
// fazer script pra mostrar popup e ai se confirmar manda pra servlet
$("#overlay.cancelarOverlay").show();
$(".confirmarCancelamento").on("click", () => {
location.href="<c:url value='/pedido?action=cancelar&id=${pedido.id}'/>";
});
});
</script>
</c:when>
Expand Down
20 changes: 19 additions & 1 deletion web/cliente/realizarPedido.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@
<c:import url="header.jsp"/>
<c:import url="/popup/rejeitarPedido.jsp"/>
<div class="content">
<div class="jumbotron">
Expand Down Expand Up @@ -138,8 +140,24 @@
</div>
<div class="control">
<button class="btn btn-danger btn-lg" id="recusar">Rejeitar</button>
<button class="btn btn-danger btn-lg" id="rejeitar">Rejeitar</button>
</div>
<script>
$("#rejeitar").on("click", function() {
if (!validateData()) {
return;
}
$("#overlay.rejeitarOverlay").show();
$(".confirmarRejeicao").on("click", () => {
enviarRequest("rejeitado");
return;
});
});
</script>
</div>
</div>
</div>
Expand Down
62 changes: 62 additions & 0 deletions web/css/cancelarPopup.css
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
@font-face {
font-family: 'Muli';
font-weight: 100;
src: url('http://assets.vervewine.com/fonts/muli-regular.eot');
}

#overlay {
opacity: 1;
display: block;
position: fixed;
background-color: rgba(0, 0, 0, 0.5);
top: 0;
left: 0;
width: 100%;
height: 100%;
z-index: 1000;
}

#content {
position: fixed;
top: 30%;
left: 50%;
margin-left: -275px;
width: 550px;
height: 400px;
padding: 20px;
border-radius: 15px;
background-color: #fff;
color: #000;
}

#centertext {
padding-top: 20px;
}

h2 {
font-family: 'Muli', Arial, sans-serif;
}

#checkmark {
width: 200px;
height: 200px;
}

.botao {
font-family: 'Muli', Arial, sans-serif;
font-weight: 600;
width: 200px;
}




#numerotext {
font-family: 'Muli', Arial, sans-serif;
}

#close {
position: absolute;
top: 4px;
right: 6px;
}
4 changes: 2 additions & 2 deletions web/funcionario/cadastrarFuncionario.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
<form id="formulario" class="border rounded p-3" action="funcionarioController?action=update&id=${param.id}" method="post">
<div class="mb-2">
<label for="nome" class="form-label">Nome Completo</label>
<input type="text" class="form-control" placeholder="Insira o nome" name="nome" id="nome"
<input type="text" autofocus class="form-control" placeholder="Insira o nome" name="nome" id="nome"
<c:if test="${not empty funcionario}">
<c:out value="value=${funcionario.nome}"/>
</c:if>
Expand Down Expand Up @@ -110,7 +110,7 @@
<c:import url="/footer.jsp"/>
<script>
<c:import url="/js/cadastrarFuncionario.js"/>
<c:import url="/js/cadastrarFuncionario.js" charEncoding="UTF-8"/>
</script>
</body>
Expand Down
19 changes: 18 additions & 1 deletion web/funcionario/listarFuncionario.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,14 @@
</c:if>
<c:import url="header.jsp"/>
<c:import url="/popup/removerFuncionario.jsp"/>
<c:if test="${not empty param.cadastrado}">
<c:import url="/popup/funcionarioConfirmado.jsp">
<c:param name="funcionario" value="${param.funcionario}"/>
</c:import>
</c:if>
<div class="content">
<c:if test="${not empty param.message}">
Expand Down Expand Up @@ -64,7 +72,16 @@
<td><fmt:formatDate value="${funcionario.dataNascimento}" pattern="dd/MM/yyyy"/></td>
<td class="text-center">
<a href="<c:url value='/funcionarioController?action=formFuncionario&id=${funcionario.id}'/>"><button class="btn btn-warning btn-sm text-light alterar">Alterar</button></a>
<a href="<c:url value='/funcionarioController?action=delete&id=${funcionario.id}'/>"><button class="btn btn-danger btn-sm remover">Excluir</button></a>
<button class="btn btn-danger btn-sm remover${funcionario.id}">Excluir</button>
<script>
$(".remover${funcionario.id}").on("click", () => {
$("#overlay.removerOverlay").show();
$(".confirmarRemocao").on("click", () => {
location.href="<c:url value='/funcionarioController?action=delete&id=${funcionario.id}'/>";
});
});
</script>
<div class="inner-circle"></div>
</td>
</tr>
Expand Down
19 changes: 18 additions & 1 deletion web/funcionario/listarRoupa.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,14 @@
<c:import url="header.jsp"/>
<c:import url="/popup/removerRoupa.jsp"/>
<c:if test="${not empty param.cadastrado}">
<c:import url="/popup/roupaConfirmada.jsp">
<c:param name="roupa" value="${param.roupa}"/>
</c:import>
</c:if>
<div class="content">
<c:if test="${not empty param.message}">
Expand Down Expand Up @@ -67,7 +75,16 @@
<td><img src="<c:url value='${roupa.imagem}'/>" width="42" height="42"></td>
<td class="text-center">
<a href="<c:url value='/roupa?action=formRoupa&id=${roupa.id}'/>"><button class="btn btn-warning btn-sm text-light alterar">Alterar</button></a>
<a href="<c:url value='/roupa?action=delete&id=${roupa.id}'/>"><button class="btn btn-danger btn-sm remover">Remover</button></a>
<button class="btn btn-danger btn-sm remover${roupa.id}">Excluir</button>
<script>
$(".remover${roupa.id}").on("click", () => {
$("#overlay.removerOverlay").show();
$(".confirmarRemocao").on("click", () => {
location.href="<c:url value='/roupa?action=delete&id=${roupa.id}'/>";
});
});
</script>
<div class="inner-circle"></div>
</td>
</tr>
Expand Down
15 changes: 15 additions & 0 deletions web/js/cancelarPopup.js
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
$("#overlay.cancelarOverlay").on("click", () => {
if ($(event.target).is("#overlay.cancelarOverlay") || $(event.target).is(".cancelarOverlay #close")) {
$("#overlay.cancelarOverlay").hide();
}
});

$(document).keyup(e => {
if (e.key === "Escape") {
$("#overlay.cancelarOverlay").hide();
}
});

$(".cancelar").on("click", () => {
$("#overlay.cancelarOverlay").hide();
});
Loading

0 comments on commit 23ed92c

Please sign in to comment.