@@ -640,6 +639,7 @@ public class MySqlHorarioDAO implements HorarioDAO {
aula.setNombreCurso(rs.getString("nom_cur"));
lista.add(aula);
}
}catch(Exceptione){
e.printStackTrace();
}finally{
...
...
@@ -759,7 +759,6 @@ public class MySqlHorarioDAO implements HorarioDAO {
try{
cnx=MySqlDAOFactory.obtenerConexion(base);
Statementst=cnx.createStatement();
/* VERIFICAR SI ES UN AULA --> "LIBRE" */
StringqueryLibre="SELECT count(*) as cant FROM aula WHERE codtipogrado in ('38','40','41') AND codaula='"+codigoAula+"'";
System.out.println("-( LIBRE )-> "+queryLibre);
...
...
@@ -813,7 +812,7 @@ public class MySqlHorarioDAO implements HorarioDAO {
+" WHERE cod_doc='"+codigoDocente+"' and dia='"+dia+"' and (((hor_ini<='"+Hini+"' and hor_fin>='"+Hfin+"') or (hor_ini>'"+Hini+"' and hor_fin<'"+Hfin+"')) "
+" OR (hor_ini > '"+Hini+"' and hor_ini < '"+Hfin+"' and hor_fin > '"+Hfin+"') "
+" OR (hor_ini < '"+Hini+"' and hor_fin > '"+Hini+"' and hor_fin < '"+Hfin+"'))"
+" and cod_per='"+periodo+"'";
+" and cod_per='"+periodo+"' AND est_hcd=1";
System.out.println(">>-(2)cruce-> "+query);
ResultSetrset=st.executeQuery(query);
...
...
@@ -823,28 +822,23 @@ public class MySqlHorarioDAO implements HorarioDAO {
if(codHcd!=""){
//update
StringestadoHcd=codigoCurso=="61"?"4":"1";
queryInsertUpdate=" UPDATE horario_curso_docente SET est_hcd='"+estadoHcd+"' where cod_hcd = "+codHcd+"";
StringqueryHH1="INSERT INTO historial_horario (codAula,dia,pos_blo,hor_ini,hor_fin,cod_tur,cod_cur,cod_doc,est_hcd,cod_per,codGru,fecha,hora,accion,cod_usu) "
@@ -868,10 +862,7 @@ public class MySqlHorarioDAO implements HorarioDAO {
}else{
StringqueryUpdate="";
if(libre==0){
queryUpdate="UPDATE horario_curso_docente SET cod_cur='"+codigoCurso+"', cod_doc='"+codigoDocente+"', codSec='"+clase+"',est_hcd='1' WHERE cod_hcd='"+codHorario+"' and cod_per='"+periodo+"' ";
}else{
queryUpdate="UPDATE horario_curso_docente SET cod_cur='"+codigoCurso+"', cod_doc='"+codigoDocente+"', codSec='"+clase+"', est_hcd='0' WHERE cod_hcd='"+codHorario+"' and cod_per='"+periodo+"' ";
}
...
...
@@ -901,7 +892,6 @@ public class MySqlHorarioDAO implements HorarioDAO {
}
dato=st.executeUpdate(queryHH1);
}
}
}catch(Exceptione){
e.printStackTrace();
...
...
@@ -1193,8 +1183,8 @@ public class MySqlHorarioDAO implements HorarioDAO {
Statementst=cnx.createStatement();
Stringquery="SELECT hcd.hor_ini,hcd.hor_fin FROM horario_curso_docente hcd WHERE codAula='"+codAula+"' and hcd.dia='"+dia+"' and hcd.cod_per='"+periodo+"' and pos_blo='"+posicionbloque+"' and est_hcd='1'";
System.out.println("--cruce-->> "+query);
ResultSetrs=st.executeQuery(query);
if(rs.next()){
obj=newJSONObject()
...
...
@@ -2827,29 +2817,31 @@ public class MySqlHorarioDAO implements HorarioDAO {