commit dia 27/11

horario: 13:58
heavenstudio · Nov 27, 2015 · 118a162 · 118a162
1 parent 349adb0
commit 118a162
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 14 deletions.
diff --git a/plataformaAmorim/src/br/com/muranodesign/business/TutoriaService.java b/plataformaAmorim/src/br/com/muranodesign/business/TutoriaService.java
@@ -140,6 +140,12 @@ public Tutoria atualizarTutoria(Tutoria p) {
 		return p;
 	}
 
+	/**
+	 * Listar por professor e ano
+	 * @param tutor
+	 * @param ano
+	 * @return
+	 */
 	public List<Tutoria> listarProfessorId(int tutor, String ano){
 		PersistenceContext pc = DAOFactory.createPersistenceContext();
 		TutoriaDAO dao = DAOFactory.getTutoriaDAO(pc);
@@ -149,6 +155,11 @@ public List<Tutoria> listarProfessorId(int tutor, String ano){
 
 	}
 
+	/**
+	 * Listar por professor
+	 * @param tutor
+	 * @return
+	 */
 	public List<Tutoria> listarProfessorId(int tutor){
 		PersistenceContext pc = DAOFactory.createPersistenceContext();
 		TutoriaDAO dao = DAOFactory.getTutoriaDAO(pc);

diff --git a/plataformaAmorim/src/br/com/muranodesign/business/UsuarioService.java b/plataformaAmorim/src/br/com/muranodesign/business/UsuarioService.java
@@ -52,7 +52,11 @@ public List<Usuario> listarkey(int key) {
 		return result;
 	}
 
-
+	/**
+	 * Listar aluno
+	 * @param idAluno
+	 * @return
+	 */
 	public List<Usuario> listaAluno(int idAluno) {
 		PersistenceContext pc = DAOFactory.createPersistenceContext();
 		UsuarioDAO dao = DAOFactory.getUsuarioDAO(pc);
@@ -61,6 +65,11 @@ public List<Usuario> listaAluno(int idAluno) {
 		return result;
 	}
 
+	/**
+	 * Listar professor
+	 * @param idProfessor
+	 * @return
+	 */
 	public List<Usuario> listaProfessor(int idProfessor) {
 		PersistenceContext pc = DAOFactory.createPersistenceContext();
 		UsuarioDAO dao = DAOFactory.getUsuarioDAO(pc);
@@ -69,6 +78,11 @@ public List<Usuario> listaProfessor(int idProfessor) {
 		return result;
 	}
 
+	/**
+	 * Listar aluno email
+	 * @param email
+	 * @return
+	 */
 	public List<Usuario> listaAlunoEmail(String email) {
 		PersistenceContext pc = DAOFactory.createPersistenceContext();
 		UsuarioDAO dao = DAOFactory.getUsuarioDAO(pc);
@@ -137,6 +151,12 @@ public Usuario atualizarUsuario(Usuario p) {
 		return p;
 	}
 
+	/**
+	 * update user
+	 * @param senha
+	 * @param id
+	 * @return
+	 */
 	public int updateUser(String senha,int id){
 		PersistenceContext pc = DAOFactory.createPersistenceContext();
 		UsuarioDAO dao = DAOFactory.getUsuarioDAO(pc);

diff --git a/plataformaAmorim/src/br/com/muranodesign/resources/MuralResource.java b/plataformaAmorim/src/br/com/muranodesign/resources/MuralResource.java
@@ -66,7 +66,6 @@ public String eventoAction(
 			@FormParam("idOficina") int idOficina,
 			@FormParam("tutor") int tutor,
 			@FormParam("ano") String ano,
-			//@FormParam("data") String data,
 			@FormParam("idAluno") int idAluno) throws ParseException{
 
 
@@ -106,11 +105,9 @@ public String eventoAction(
 					mural.setMensagem(mensagem);
 					mural.setAluno(listAluno.get(k));
 					mural.setData(data);
-					//mural.setData(new Date());
 
 					mural.setProfessor(new ProfessorFuncionarioService().listarkey(idProfessor).get(0));
 
-					//new MuralService().criarMural(mural);
 					new MuralService().atualizarMural(mural);
 				  }
 
@@ -134,10 +131,9 @@ public String eventoAction(
 					mural.setMensagem(mensagem);
 					mural.setAluno(alunoVariavel);
 					mural.setData(data);
-					//mural.setData(new Date());
+
 					mural.setProfessor(new ProfessorFuncionarioService().listarkey(idProfessor).get(0));
-
-					//new MuralService().criarMural(mural);
+
 					new MuralService().atualizarMural(mural);
 				}
 
@@ -172,7 +168,7 @@ public String eventoAction(
 					mural.setMensagem(mensagem);
 					mural.setAluno(alunoVariavel);
 					mural.setData(data);
-					//mural.setData(new Date());
+
 					mural.setProfessor(new ProfessorFuncionarioService().listarkey(idProfessor).get(0));
 
 					new MuralService().criarMural(mural);
@@ -221,7 +217,7 @@ public String eventoAction(
 						mural.setMensagem(mensagem);
 						mural.setAluno(alunosComTutor.get(i));
 						mural.setData(data);
-						//mural.setData(new Date());
+
 						mural.setProfessor(new ProfessorFuncionarioService().listarkey(idProfessor).get(0));
 
 						new MuralService().criarMural(mural);
@@ -233,7 +229,7 @@ public String eventoAction(
 						mural.setMensagem(mensagem);
 						mural.setAluno(alunosComOficina.get(j));
 						mural.setData(data);
-						//mural.setData(new Date());
+
 						mural.setProfessor(new ProfessorFuncionarioService().listarkey(idProfessor).get(0));
 
 						new MuralService().criarMural(mural);
@@ -275,7 +271,6 @@ public List<Mural> getRange(@PathParam("idAluno") int idAluno){
 		Date dataHoje = new Date();
 		SimpleDateFormat formataData = new SimpleDateFormat("yy-MM-dd");
 		String data = formataData.format(dataHoje);
-		//StringUtil stringUtil = new StringUtil();
 
 		Calendar c = Calendar.getInstance();
 		int mes = c.get(Calendar.MONTH);
@@ -285,10 +280,8 @@ public List<Mural> getRange(@PathParam("idAluno") int idAluno){
 			String quebra[] = data.split("-");
 
 			if(mes > 10){
-				//data2 = quebra[0]+"-"+quebra[1]+"-"+Integer.toString(dia);
 				data2 = quebra[0]+"-"+Integer.toString(mes)+"-"+quebra[2];
 			}else{
-				//data2 = quebra[0]+"-"+quebra[1]+"-"+"0"+Integer.toString(dia);
 				data2 = quebra[0]+"-"+"0"+Integer.toString(mes)+"-"+quebra[2];
 			}
 
@@ -301,7 +294,6 @@ public List<Mural> getRange(@PathParam("idAluno") int idAluno){
 			int ano = Integer.parseInt(quebra[0]);
 			ano = ano - 1;
 
-			//data2 = Integer.toString(aux)+"/"+Integer.toString(mes)+"/"+quebra[2];
 			data2 = Integer.toString(ano)+"-"+Integer.toString(aux)+"-"+quebra[2];
 
 		}