Skip to content

H
horario
Commit 16a6a227 by Roman Luque
Options

[EDIT] Areglo de errores generales en diversos módulos

parent 12cea38a
Showing with 71 additions and 80 deletions
nbproject/build-impl.xml
......@@ -998,17 +998,17 @@ exists or setup the property manually. For example like this:
<target depends="init,compile,compile-jsps,-pre-dist,-do-dist-with-manifest,-do-dist-without-manifest" name="do-dist"/>
<target depends="init" if="dist.ear.dir" name="library-inclusion-in-manifest">
<copyfiles files="${file.reference.activation.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
<copyfiles files="${file.reference.mysql-connector-java-3.1.14-bin.jar-1}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
<copyfiles files="${file.reference.json-20171018.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
<copyfiles files="${file.reference.dotenv-0.1.1.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
<copyfiles files="${file.reference.mysql-connector-java-5.1.23-bin.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
<mkdir dir="${build.web.dir}/META-INF"/>
<manifest file="${build.web.dir}/META-INF/MANIFEST.MF" mode="update"/>
</target>
<target depends="init" name="library-inclusion-in-archive" unless="dist.ear.dir">
<copyfiles files="${file.reference.activation.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
<copyfiles files="${file.reference.mysql-connector-java-3.1.14-bin.jar-1}" todir="${build.web.dir}/WEB-INF/lib"/>
<copyfiles files="${file.reference.json-20171018.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
<copyfiles files="${file.reference.dotenv-0.1.1.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
<copyfiles files="${file.reference.mysql-connector-java-5.1.23-bin.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
</target>
<target depends="init" if="dist.ear.dir" name="-clean-webinf-lib">
<delete dir="${build.web.dir}/WEB-INF/lib"/>
......
nbproject/genfiles.properties
build.xml.data.CRC32=22d59e15
build.xml.data.CRC32=0cf8cf75
build.xml.script.CRC32=5a966c0c
build.xml.stylesheet.CRC32=651128d4@1.77.1.1
# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
nbproject/build-impl.xml.data.CRC32=22d59e15
nbproject/build-impl.xml.script.CRC32=a9c734cb
nbproject/build-impl.xml.data.CRC32=0cf8cf75
nbproject/build-impl.xml.script.CRC32=050b490e
nbproject/build-impl.xml.stylesheet.CRC32=99ea4b56@1.77.1.1
nbproject/project.properties
......@@ -31,7 +31,7 @@ excludes=
file.reference.activation.jar=D:\\LIBRERIAS\\activation.jar
file.reference.dotenv-0.1.1.jar=C:\\Users\\sistem17user\\Desktop\\Juan Carlos Yupanqui Lozano\\Libreria\\LIBRERIAS 2\\DotEnv\\dotenv-0.1.1.jar
file.reference.json-20171018.jar=D:\\LIBRERIAS\\json-20171018.jar
file.reference.mysql-connector-java-3.1.14-bin.jar-1=D:\\LIBRERIAS\\mysql-connector-java-3.1.14-bin.jar
file.reference.mysql-connector-java-5.1.23-bin.jar=C:\\Users\\sistem17user\\Desktop\\Juan Carlos Yupanqui Lozano\\Libreria\\LIBRERIAS 2\\mysql-connector-java-5.1.23-bin.jar
includes=**
j2ee.compile.on.save=true
j2ee.copy.static.files.on.save=true
......@@ -47,9 +47,9 @@ j2ee.server.type=gfv3ee6
jar.compress=false
javac.classpath=\
${file.reference.activation.jar}:\
${file.reference.mysql-connector-java-3.1.14-bin.jar-1}:\
${file.reference.json-20171018.jar}:\
${file.reference.dotenv-0.1.1.jar}
${file.reference.dotenv-0.1.1.jar}:\
${file.reference.mysql-connector-java-5.1.23-bin.jar}
# Space-separated list of extra javac options
javac.compilerargs=
javac.debug=true
......
nbproject/project.xml
......@@ -11,15 +11,15 @@
<path-in-war>WEB-INF/lib</path-in-war>
</library>
<library dirs="200">
<file>${file.reference.mysql-connector-java-3.1.14-bin.jar-1}</file>
<file>${file.reference.json-20171018.jar}</file>
<path-in-war>WEB-INF/lib</path-in-war>
</library>
<library dirs="200">
<file>${file.reference.json-20171018.jar}</file>
<file>${file.reference.dotenv-0.1.1.jar}</file>
<path-in-war>WEB-INF/lib</path-in-war>
</library>
<library dirs="200">
<file>${file.reference.dotenv-0.1.1.jar}</file>
<file>${file.reference.mysql-connector-java-5.1.23-bin.jar}</file>
<path-in-war>WEB-INF/lib</path-in-war>
</library>
</web-module-libraries>
......
src/java/pe/siso/horario/MySqlDAO/MySqlAulaDAO.java
......@@ -1914,6 +1914,7 @@ public class MySqlAulaDAO implements AulaDAO {
+ " ORDER BY h.cod_gru_aul,s.des_loc,tg.destipogrado,g.desgrado,t.desturno,h.codGru,\n"
+ "tc.destipocentro,h.codGru,c.descentro,n.desnivel,h.codAula,sc.desseccion ";
System.out.println("QUERYYY ---> " + query);
ResultSet rs = st.executeQuery(query);
while (rs.next()) {
Aula aula = new Aula();
......
src/java/pe/siso/horario/MySqlDAO/MySqlDAOFactory.java
......@@ -68,7 +68,7 @@ public class MySqlDAOFactory extends DAOFactory {
System.out.println("ERROR AL OBTENER EL ARCHIVO DOTENV --->> " + e.getMessage());
}
System.out.println("PAATH =>> " + path);
// System.out.println("PAATH =>> " + path);
String host = dotenv.get("MYSQL_HOST_SERVIDOR_HORARIO");
String port = dotenv.get("MYSQL_PORT_SERVIDOR_HORARIO");
......
src/java/pe/siso/horario/MySqlDAO/MySqlHorarioDAO.java
......@@ -1801,7 +1801,7 @@ public class MySqlHorarioDAO implements HorarioDAO {
// + " INNER JOIN turno on turno.codturno=aula.codturno "
// + " WHERE horario_curso_docente.cod_doc='" + codDocente + "' and horario_curso_docente.cod_per='" + periodo + "' and horario_curso_docente.est_hcd='1' "
// + " ORDER BY horario_curso_docente.dia, horario_curso_docente.hor_ini";
String query = "SELECT\n"
String query = "SELECT DISTINCT\n"
+ "tb_curso.cod_pla,\n"
+ "tb_detalle.cod_tur,\n"
+ "tb_detalle.codAula,\n"
......@@ -2980,7 +2980,7 @@ public class MySqlHorarioDAO implements HorarioDAO {
pst.setString(1, json.getString("codigoPeriodo"));
pst.setInt(2, docente.getInt("codDocente"));
// pst.setString(3, String.join(",", arrayDias));
System.out.println(pst);
rs = pst.executeQuery();
JSONArray arrayAulas = new JSONArray();
......@@ -3042,40 +3042,28 @@ public class MySqlHorarioDAO implements HorarioDAO {
try {
cn = MySqlDAOFactory.obtenerConexion("horario");
String sql = ""
+ "select "
+ "pr.codprofesor, "
+ "CONCAT(pr.apellido,', ',pr.nombre) nombreDoc, "
+ "dat.cel_dat_per, "
+ "dat.nom_dir, "
+ "dat.cor_dat_per, "
+ "u.nom_dis_ubi, "
+ "dd.diaDis "
+ "from sacoolive3.profesor pr "
+ "left join ( "
+ " select codDoc,diaDis from disponibilidad_docente "
+ " where estDis = 1 "
+ " and cod_per = ? "
+ ") dd on dd.codDoc = pr.codprofesor "
+ "left join datos_docente dat on dat.cod_doc = pr.codprofesor "
+ "left join ubigeo u on u.cod_dep_ubi = dat.cod_dep and u.cod_pro_ubi = dat.cod_prov and u.cod_dis_ubi = dat.cod_dis "
+ "where pr.estadoprofe = 'Y' "
+ "and pr.codprofesor = ? "
+ "group by "
+ "pr.codprofesor, "
+ "CONCAT(pr.apellido,', ',pr.nombre), "
+ "dd.diaDis, "
+ "dat.cel_dat_per, "
+ "dat.nom_dir, "
+ "dat.cor_dat_per, "
+ "u.nom_dis_ubi "
+ "order by nombreDoc ASC ";
+ " SELECT pr.codprofesor,\n"
+ " CONCAT(pr.apellido,', ',pr.nombre) nombreDoc,\n"
+ " COALESCE(dat.cel_dat_per, 'No registrado') AS cel_dat_per,\n"
+ " COALESCE(dat.nom_dir, 'No registrado') AS nom_dir,\n"
+ " COALESCE(dat.cor_dat_per, 'No registrado') AS cor_dat_per,\n"
+ " COALESCE(u.nom_dis_ubi, 'No registrado') AS nom_dis_ubi,\n"
+ " dd.diaDis\n"
+ " from sacoolive3.profesor pr\n"
+ " INNER join (select codDoc,diaDis from disponibilidad_docente where estDis = 1 and cod_per = ? ) dd on dd.codDoc = pr.codprofesor\n"
+ " left join datos_docente dat on dat.cod_doc = pr.codprofesor\n"
+ " left join ubigeo u on u.cod_dep_ubi = dat.cod_dep and u.cod_pro_ubi = dat.cod_prov and u.cod_dis_ubi = dat.cod_dis\n"
+ " where pr.estadoprofe = 'Y'\n"
+ " and pr.codprofesor = ?\n"
+ " group by pr.codprofesor, CONCAT(pr.apellido,', ',pr.nombre), dd.diaDis, dat.cel_dat_per, dat.nom_dir, dat.cor_dat_per, u.nom_dis_ubi\n"
+ " order by nombreDoc ASC;";
pst = cn.prepareStatement(sql);
System.out.println("" + sql);
pst.setString(1, json.getString("codigoPeriodo"));
pst.setString(2, json.getString("codigoProfesor"));
System.out.println("QUERY DATOS DEL DOCENTE ---->> \n" + pst);
rs = pst.executeQuery();
JSONArray arrayDocente = new JSONArray();
......@@ -3162,7 +3150,7 @@ public class MySqlHorarioDAO implements HorarioDAO {
Logger.getLogger(MySqlHorarioDAO.class.getName()).log(Level.SEVERE, null, ex);
}
}
System.out.println("RESPUESTAAA -->> \n" + jReturn);
return jReturn;
}
......@@ -3319,9 +3307,9 @@ public class MySqlHorarioDAO implements HorarioDAO {
+ "INNER JOIN sacoolive3.profesor p ON hc.cod_doc=p.codprofesor "
+ "INNER JOIN periodo_academico pa ON hc.cod_per=pa.cod_per "
+ "WHERE p.codprofesor=? and hc.est_hcd=1 "
+ "AND pa.nom_per != 'REGULAR 2020 I' OR hc.cod_per != 24 "
// + "AND pa.nom_per != 'REGULAR 2020 I' OR hc.cod_per != 24 "
+ "GROUP BY hc.cod_per,pa.nom_per ORDER BY hc.cod_per DESC ";
System.out.println("QUERY DE LISTA DE PERIODOOO -->> \n" + sql);
pst = cn.prepareStatement(sql);
pst.setString(1, codigoDocente);
rs = pst.executeQuery();
......
src/java/pe/siso/horario/MySqlDAO/MySqlPeriodoAcademicoDAO.java
......@@ -22,11 +22,13 @@ class MySqlPeriodoAcademicoDAO implements PeriodoAcademicoDAO {
public ArrayList<PeriodoAcademico> listarPeriodoAcademico() throws Exception {
ArrayList<PeriodoAcademico> lista = new ArrayList<PeriodoAcademico>();
String base = "horario";
System.out.println("ANTES DE CONECTAR...");
try (Connection cnx = MySqlDAOFactory.obtenerConexion(base);) {
System.out.println("CONECTADO...");
Statement st = cnx.createStatement();
String query = "SELECT cod_per,nom_per,fec_ini_per,fec_fin_per,est_per FROM periodo_academico Order by cod_per desc";
System.out.println("ANTES DE EJECTUAR EL QUERY...");
ResultSet rs = st.executeQuery(query);
while (rs.next()) {
......
src/java/pe/siso/horario/Servlets/ServletPeriodoAcademico.java
......@@ -273,6 +273,7 @@ public class ServletPeriodoAcademico extends HttpServlet {
}
private void listarPeriodoAcademico(HttpServletRequest request, HttpServletResponse response) throws IOException {
System.out.println("LLEGA AL BACKEND...");
PeriodoAcademicoServices servicios = new PeriodoAcademicoServices();
ArrayList<PeriodoAcademico> lista = new ArrayList<PeriodoAcademico>();
......@@ -283,16 +284,17 @@ public class ServletPeriodoAcademico extends HttpServlet {
response.setContentType("text/html");
PrintWriter pw = response.getWriter();
pw.println("<select class='form-control validate[required]' id='" + id + "' onchange='"+accion+"'>");
pw.println("<select class='form-control validate[required]' id='" + id + "' onchange='" + accion + "'>");
pw.println("<option value=\"\">[SELECCIONE PERIODO]</option>");
for (int i = 0; i < lista.size(); i++) {
if(lista.get(i).getEstadoPeriodo() == 1){
pw.println("<option value='"+lista.get(i).getCodigoPeriodo()+"' selected>"+lista.get(i).getNombrePeriodo()+" - ACTIVO</option>");
}else{
pw.println("<option value='"+lista.get(i).getCodigoPeriodo()+"'>"+lista.get(i).getNombrePeriodo()+"</option>");
if (lista.get(i).getEstadoPeriodo() == 1) {
pw.println("<option value='" + lista.get(i).getCodigoPeriodo() + "' selected>" + lista.get(i).getNombrePeriodo() + " - ACTIVO</option>");
} else {
pw.println("<option value='" + lista.get(i).getCodigoPeriodo() + "'>" + lista.get(i).getNombrePeriodo() + "</option>");
}
}
System.out.println("REGRESA DEL BACKEND...");
pw.println("</select>");
}
......
web/vista/exportarHorarioDocenteCompletoDisponibilidad.jsp
......@@ -184,7 +184,7 @@
%>
<!-- HORARIO CONFIRMADO-->
<!-- HORARIO CONFIRMADO-->
<hr>
......@@ -194,17 +194,17 @@
<%
String codDocente2 = request.getParameter("codDocente");
String periodo2 = request.getParameter("periodo");
String codDocente2 = request.getParameter("codDocente");
String periodo2 = request.getParameter("periodo");
HorarioServices serviciosDos = new HorarioServices();
JSONObject jparam2=new JSONObject();
jparam2.put("codigoPeriodo",periodo2);
jparam2.put("codigoProfesor",codDocente2);
JSONObject objeto2=serviciosDos.listarVistaHorarioConformidad(jparam2);
JSONObject dataPersona2 = objeto2.getJSONArray("data").getJSONObject(0);
HorarioServices serviciosDos = new HorarioServices();
JSONObject jparam2=new JSONObject();
jparam2.put("codigoPeriodo",periodo2);
jparam2.put("codigoProfesor",codDocente2);
JSONObject objeto2=serviciosDos.listarVistaHorarioConformidad(jparam2);
JSONObject dataPersona2 = objeto2.getJSONArray("data").getJSONObject(0);
if(!dataPersona2.isNull("disponibilidad")){
if(!dataPersona2.isNull("disponibilidad")){
//cabecera
String nombreDocente2=dataPersona2.getString("nombre");
......@@ -219,7 +219,7 @@
ArrayList<Object> aulaM2 = new ArrayList<Object>();
ArrayList<Object> aulaT2 = new ArrayList<Object>();
for(int i= 0; i < disponibilidad2.length; i++){
for(int i= 0; i < disponibilidad2.length; i++){
String turno2 = disponibilidad2[i].split("#")[0];
String dia2= disponibilidad2[i].split("#")[1];
......@@ -228,9 +228,9 @@
} else if(turno2.equals("2")){
diaT2.add(dia2);
}
}
}
if(!dataPersona2.isNull("arrayAulas")){
if(!dataPersona2.isNull("arrayAulas")){
JSONArray array = dataPersona2.getJSONArray("arrayAulas");
for(Object obj : array){
......@@ -243,10 +243,10 @@
}
}
}
}
response.setContentType("application/vnd.ms-excel; ");
response.setHeader("Content-Disposition","attachment; filename=UsuarioDocente.xls");
response.setHeader("Content-Disposition","attachment; filename=UsuarioDocente.xls");
String borderT="style='border:solid 0.5pt #000000;vertical-align:middle; background-color:#A9F5F2;' ";
String borderTD="style='border:solid 0.5pt #000000;vertical-align:middle; background-color:#A9F5D0;' ";
......
web/vista/exportarHorarioTodoPeriodo2.jsp
<%@page import="pe.siso.horario.Beans.Aula"%>
<%@page import="pe.siso.horario.Beans.Aula"%>
<%@page import="pe.siso.horario.Beans.PeriodoAcademico"%>
<%--
Document : exportarHorario
......@@ -128,18 +128,12 @@
//cipreces
String nombreSede=listaDatos.get(0).getNombreLocal();
for(int z=0;z<listaDatos.size();z++){
String codAulas = ""+listaDatos.get(z).getCodigoAula();
String codigo = listaDatos.get(z).getCodigoGrupo();
int cantidad = 1;
System.out.println("nombre Sede "+nombreSede);
AulaServices servicios = new AulaServices();
BloqueServices serviciosBlo = new BloqueServices();
HorarioServices serviciosHor = new HorarioServices();
......@@ -350,12 +344,12 @@
}else{
%>
<!-- <td colspan='2' width='140' align='center' ></td>-->
<!-- <td colspan='2' width='140' align='center' ></td>-->
<td <%=border%> colspan='2' width='140' align='center' style='background-color: #FF7C80; color: white; vertical-align:middle; font-size: 10px; ' >SIN HORARIO</td>
<%
}
contenido=0;
}
}
%>
</tr>
<%
......@@ -364,7 +358,7 @@
contGenral++;
}
}
}
%>
......
web/vista/gen_hor_gen.jsp
......@@ -1100,9 +1100,10 @@
cargando();
}, success: function (resultado) {
close_carga();
// debugger
debugger
$('#aula').html(resultado);
let op = $("#cmbSede").val();
debugger
name = $("#lblUsuario").text();
if (name === "6" || name === "5") {
$("#aula #btnAgregar").hide();
......@@ -1118,7 +1119,9 @@
}, complete: function () {
$('#aula').fadeIn();
$("#cmbSede").val(codAulaSession)
console.log(`revisar...`)
debugger;
// $("#cmbSede").val(codAulaSession)
// $("body").animate({ scrollTop: $(document).height()}, 1000);
}
......
web/vista/vistaDobleDisponibilidad.jsp
......@@ -792,7 +792,8 @@
html += '<tr>'
html += '<td id="turno">M</td>'
console.log('Prueba.....................................................');
debugger;
for (let i = 0; i < 6; i++) {
let aulas = aulasM.map(a => {
if (a.dia == i + 1) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment