att

gustavopedro20 · May 22, 2019 · 20b500b · 20b500b
1 parent f8ed00a
commit 20b500b
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 44 deletions.
diff --git a/ProjetoPI/WebContent/ListarGrupos.jsp b/ProjetoPI/WebContent/ListarGrupos.jsp
@@ -22,7 +22,7 @@
         <c:import url="common/menu.jsp" />
     </header>
 
-    <div id="main" class="container" role="main">
+    <div id="main" class="container">
         <form action="controller.do" method="post" autocomplete="off">
 
             <div id="top" class="row">

diff --git a/ProjetoPI/build/classes/.gitignore b/ProjetoPI/build/classes/.gitignore
@@ -1,6 +1,6 @@
+/dao/
 /command/
 /controller/
-/dao/
+/filter/
 /model/
 /service/
-/filter/
diff --git a/ProjetoPI/build/classes/controller/ServletController.class b/ProjetoPI/build/classes/controller/ServletController.class
diff --git a/ProjetoPI/src/command/EditarGrupo.java b/ProjetoPI/src/command/EditarGrupo.java
@@ -43,32 +43,15 @@ public void executar(HttpServletRequest request,
 		gs.atualizar(grupo);
 
 		RequestDispatcher view = null;
-		HttpSession session = request.getSession();
-
-		@SuppressWarnings("unchecked")
-		ArrayList<Aluno> listaAluno = (ArrayList<Aluno>) session.getAttribute("lista_alunos");
-		//int pos = busca(grupo, listaGrupo);
-
-//		listaAluno.remove(pos);
-//		listaAluno.add(pos, grupo);
-
-		session.setAttribute("lista_alunos", listaAluno);
-		request.setAttribute("grupo", grupo);
+		HttpSession sessao = request.getSession();
 
+//		@SuppressWarnings("unchecked")
+//		ArrayList<Aluno> listaAluno = (ArrayList<Aluno>) sessao.getAttribute("lista_alunos");
+//		sessao.setAttribute("lista_alunos", listaAluno);
+		sessao.setAttribute("grupo", grupo);		
 		view = request.getRequestDispatcher("VisualizarGrupo.jsp");
 		view.forward(request, response);
 
 	}
 
-//	public int busca(Grupo grupo, ArrayList<Grupo> lista) {
-//		Grupo to;
-//		for(int i = 0; i < lista.size(); i++){
-//			to = lista.get(i);
-//			if(to.getId() == grupo.getId()){
-//				return i;
-//			}
-//		}
-//		return -1;
-//	}
-
 }
diff --git a/ProjetoPI/src/command/EnviarAtividade.java b/ProjetoPI/src/command/EnviarAtividade.java
@@ -26,8 +26,6 @@ public void executar(HttpServletRequest request, HttpServletResponse response)
 
 		String idAtividade = request.getParameter("id");
 		String linkEntrega = request.getParameter("entrega");
-
-		System.out.println("idAtividade: "+idAtividade+" *********** linkEntrega: "+linkEntrega);
 
 		TurmaAluno turmaAluno = new TurmaAluno();	
 		turmaAluno = (TurmaAluno) sessao.getAttribute("turmaAluno");

diff --git a/ProjetoPI/src/command/Login.java b/ProjetoPI/src/command/Login.java
@@ -26,6 +26,7 @@ public void executar(HttpServletRequest request, HttpServletResponse response)
 		login = request.getParameter("email");
 		senha = request.getParameter("senha");
 		acesso = request.getParameter("acesso");
+
 
 		if (acesso.equals("Aluno")) {
 			loginAluno(request, response, login, senha);
@@ -38,7 +39,7 @@ public void executar(HttpServletRequest request, HttpServletResponse response)
 
 		} else {
 			RequestDispatcher disp = request.getRequestDispatcher("index.jsp");
-			disp.forward(request, response);
+			disp.include(request, response);
 		}
 
 	}
@@ -58,7 +59,7 @@ public static void loginAluno(HttpServletRequest request, HttpServletResponse re
 		TurmaAluno turmaAluno = new TurmaAluno();
 		turmaAluno = tas.carregarAlunoTurmaGrupo(alunoSession.getId());
 
-		if (alunoSession.getEmail() != null) {
+		if (alunoSession.getEmail() != null && turmaAluno.getId() != -1) {
 
 			HttpSession sessao = request.getSession();
 			sessao.setAttribute("alunoLogado", true);

diff --git a/ProjetoPI/src/controller/ServletController.java b/ProjetoPI/src/controller/ServletController.java
@@ -14,24 +14,25 @@
 public class ServletController extends HttpServlet {
 	private static final long serialVersionUID = 1L;
 
-	protected void doExecute(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+	protected void doExecute(HttpServletRequest request, HttpServletResponse response)
+			throws ServletException, IOException {
 		try {
 			request.setCharacterEncoding("UTF-8");
-			Command comando = (Command)Class.forName("command."+request.getParameter("command")).newInstance();
+			Command comando = (Command) Class.forName("command." + request.getParameter("command")).newInstance();
 			comando.executar(request, response);
-		} catch (InstantiationException | IllegalAccessException
-				| ClassNotFoundException e) {
-			e.printStackTrace();
-			throw new ServletException(e);
+		} catch (InstantiationException | IllegalAccessException | ClassNotFoundException e) {
+			e.getMessage();
 		}
-	}	
-
-	protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-		doExecute(request,response);
 	}
 
-	protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-		doExecute(request,response);
+	protected void doGet(HttpServletRequest request, HttpServletResponse response)
+			throws ServletException, IOException {
+		doExecute(request, response);
+	}
+
+	protected void doPost(HttpServletRequest request, HttpServletResponse response)
+			throws ServletException, IOException {
+		doExecute(request, response);
 	}
 
 }
diff --git a/ProjetoPI/src/dao/TurmaAlunoDAO.java b/ProjetoPI/src/dao/TurmaAlunoDAO.java
@@ -70,9 +70,9 @@ public TurmaAluno carregarAlunoTurmaGrupo(int id) {
 //					turmaAluno.getTurma().setId(rs.getInt("turma_id"));
 				} else {
 					turmaAluno.setId(-1);
-					turmaAluno.getAluno().setId(-1);
-					turmaAluno.getGrupo().setId(-1);
-					turmaAluno.getTurma().setId(-1);
+					turmaAluno.setAluno(null);
+					turmaAluno.setGrupo(null);
+					turmaAluno.setGrupo(null);
 				}
 			} catch (SQLException e) {
 				e.printStackTrace();