Skip to content

H
horario
Commit 08dbc408 by Crhistian Yuri Anchivilca Amasifuen
Options

CAMBIOS 05-12

parent ef834bda
Showing with 539 additions and 250 deletions
src/java/pe/siso/horario/MySqlDAO/MySqlDAOFactory.java
...@@ -90,12 +90,12 @@ public class MySqlDAOFactory extends DAOFactory { ...@@ -90,12 +90,12 @@ public class MySqlDAOFactory extends DAOFactory {
try { try {
conexion = DriverManager.getConnection( conexion = DriverManager.getConnection(
"jdbc:mysql://localhost:3306/horarios_docente", // "jdbc:mysql://localhost:3306/horarios_docente",
"root", // "root",
"mysql"); // "mysql");
// "jdbc:mysql://172.16.0.6:3306/horarios_docente", "jdbc:mysql://172.16.0.6:3306/horarios_docente",
// "backup", "backup",
// "mysql2016"); "mysql2016");
} catch (Exception e) { } catch (Exception e) {
// TODO Auto-generated catch block // TODO Auto-generated catch block
...@@ -106,12 +106,12 @@ public class MySqlDAOFactory extends DAOFactory { ...@@ -106,12 +106,12 @@ public class MySqlDAOFactory extends DAOFactory {
try { try {
conexion = DriverManager.getConnection( conexion = DriverManager.getConnection(
"jdbc:mysql://localhost:3306/sacoolive3", // "jdbc:mysql://localhost:3306/sacoolive3",
"root", // "root",
"mysql"); // "mysql");
// "jdbc:mysql://172.16.0.6:3306/sacoolive3", "jdbc:mysql://172.16.0.6:3306/sacoolive3",
// "backup", "backup",
// "mysql2016"); "mysql2016");
} catch (Exception e) { } catch (Exception e) {
// TODO Auto-generated catch block // TODO Auto-generated catch block
e.printStackTrace(); e.printStackTrace();
......
src/java/pe/siso/horario/MySqlDAO/MySqlHorarioDAO.java
...@@ -2326,8 +2326,8 @@ public class MySqlHorarioDAO implements HorarioDAO { ...@@ -2326,8 +2326,8 @@ public class MySqlHorarioDAO implements HorarioDAO {
+ " estDis = 1 " + " estDis = 1 "
+ " AND cod_per = ? " + " AND cod_per = ? "
+ ") dd ON dd.codDoc = pd.cod_doc " + ") dd ON dd.codDoc = pd.cod_doc "
+ "INNER JOIN datos_docente dat ON dat.cod_doc = pr.codprofesor " + "LEFT JOIN datos_docente dat ON dat.cod_doc = pr.codprofesor " // aqui no hay relacion
+ "INNER JOIN ubigeo u ON u.cod_dep_ubi = dat.cod_dep " + "LEFT JOIN ubigeo u ON u.cod_dep_ubi = dat.cod_dep "
+ "AND u.cod_pro_ubi = dat.cod_prov " + "AND u.cod_pro_ubi = dat.cod_prov "
+ "AND u.cod_dis_ubi = dat.cod_dis " + "AND u.cod_dis_ubi = dat.cod_dis "
+ "LEFT JOIN ( " + "LEFT JOIN ( "
...@@ -2344,7 +2344,7 @@ public class MySqlHorarioDAO implements HorarioDAO { ...@@ -2344,7 +2344,7 @@ public class MySqlHorarioDAO implements HorarioDAO {
+ " ) te ON te.cod_doc = pr.codprofesor " + " ) te ON te.cod_doc = pr.codprofesor "
+ "WHERE " + "WHERE "
+ " pr.estadoprofe = 'Y' " + " pr.estadoprofe = 'Y' "
+ "AND pd.cod_pla = ? " + "AND pd.cod_pla = ? AND pd.cod_per=? "
+ "GROUP BY " + "GROUP BY "
+ " pr.codprofesor, " + " pr.codprofesor, "
+ " CONCAT(pr.apellido, ', ', pr.nombre), " + " CONCAT(pr.apellido, ', ', pr.nombre), "
...@@ -2366,6 +2366,7 @@ public class MySqlHorarioDAO implements HorarioDAO { ...@@ -2366,6 +2366,7 @@ public class MySqlHorarioDAO implements HorarioDAO {
pst.setString(2, json.getString("codigoPeriodo")); pst.setString(2, json.getString("codigoPeriodo"));
pst.setString(3, json.getString("codigoPlana")); pst.setString(3, json.getString("codigoPlana"));
pst.setString(4, json.getString("codigoPlana")); pst.setString(4, json.getString("codigoPlana"));
pst.setString(5, json.getString("codigoPeriodo"));
rs = pst.executeQuery(); rs = pst.executeQuery();
...@@ -2458,17 +2459,82 @@ public class MySqlHorarioDAO implements HorarioDAO { ...@@ -2458,17 +2459,82 @@ public class MySqlHorarioDAO implements HorarioDAO {
return jReturn; return jReturn;
} }
public static void main(String[] args) throws Exception { // public static void main(String[] args) throws Exception {
// List<String> prueba = new ArrayList<String>(); //// List<String> prueba = new ArrayList<String>();
// prueba.add("hola"); //// prueba.add("hola");
// prueba.add("chau"); //// prueba.add("chau");
//
JSONObject json = new JSONObject(); //
json.put("codigoPeriodo", "20"); // JSONObject json = new JSONObject();
json.put("codigoProfesor", "1663"); // json.put("codigoPeriodo", "20");
JSONObject resp = new MySqlHorarioDAO().listarVistaHorarioDisponibilidad(json); // json.put("codigoProfesor", "1663");
System.out.println("" + resp.toString()); // JSONObject resp = new MySqlHorarioDAO().listarVistaHorarioDisponibilidad(json);
// System.out.println("" + resp.toString());
//
// }
public static void main(String[] args) {
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, "
+ " te.pro_pla, "
+ " te.exa, "
+ " te.not_enc, "
+ " te.prom "
+ "FROM "
+ " plana_docente pd "
+ "INNER JOIN sacoolive3.profesor pr ON pr.codprofesor = pd.cod_doc "
+ "LEFT JOIN ( "
+ " SELECT "
+ " codDoc, "
+ " diaDis "
+ " FROM "
+ " disponibilidad_docente "
+ " WHERE "
+ " estDis = 1 "
+ " AND cod_per = ? "
+ ") dd ON dd.codDoc = pd.cod_doc "
+ "LEFT JOIN datos_docente dat ON dat.cod_doc = pr.codprofesor " // aqui no hay relacion
+ "INNER 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 "
+ "LEFT JOIN ( "
+ "SELECT "
+ "te.cod_doc , "
+ "te.pro_pla, "
+ " te.exa, "
+ " te.not_enc, "
+ " te.prom "
+ "FROM tabla_evaluacion te "
+ "INNER JOIN encuesta_docente.encuesta enc "
+ "ON enc.cod_enc = te.cod_enc "
+ "where enc.cod_per = ? and te.cod_pla = ? "
+ " ) te ON te.cod_doc = pr.codprofesor "
+ "WHERE "
+ " pr.estadoprofe = 'Y' "
+ "AND pd.cod_pla = ? "
+ "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, "
+ " te.pro_pla, "
+ " te.exa, "
+ " te.not_enc, "
+ " te.prom "
+ "ORDER BY "
+ " nombreDoc ASC ";
System.out.println(sql);
} }
@Override @Override
......
src/java/pe/siso/horario/Servlets/ServletHorario.java
...@@ -2911,7 +2911,7 @@ public class ServletHorario extends HttpServlet { ...@@ -2911,7 +2911,7 @@ public class ServletHorario extends HttpServlet {
+ " <label >" + " <label >"
+ " <div id='curso_" + contGenral + "_" + diaPos + "_" + diaGen + "'> " + " <div id='curso_" + contGenral + "_" + diaPos + "_" + diaGen + "'> "
+ "<div class=\"inline pull-center position-relative dropdown-hover\">\n" + "<div class=\"inline pull-center position-relative dropdown-hover\">\n"
+ " <p class=\"btn btn-minier bigger btn-primary \">\n" + " <p id=\"accionHorario\" class=\"btn btn-minier bigger btn-primary \">\n"
+ " <i class=\"ace-icon fa fa-cog icon-only bigger-120\"></i>\n" + " <i class=\"ace-icon fa fa-cog icon-only bigger-120\"></i>\n"
+ " <b>Acción</b>" + " <b>Acción</b>"
+ " </p>\n" + " </p>\n"
...@@ -2984,7 +2984,7 @@ public class ServletHorario extends HttpServlet { ...@@ -2984,7 +2984,7 @@ public class ServletHorario extends HttpServlet {
+ " <tr>" + " <tr>"
+ " <td></td>" + " <td></td>"
+ " <td align='right' valign='middle' height='40'>" + " <td align='right' valign='middle' height='40'>"
+ " <a title=\"Eliminar\" style=\"text-decoration:none\" href=\"javascript:EliminarTodoAula('" + aulas[i] + "','" + codPeriodo + "');\" >\n" + " <a id=\"tachoEliminar\" title=\"Eliminar\" style=\"text-decoration:none\" href=\"javascript:EliminarTodoAula('" + aulas[i] + "','" + codPeriodo + "');\" >\n"
+ " <span class=\"red\">\n" + " <span class=\"red\">\n"
+ " <i class=\"ace-icon fa fa-trash bigger-130\"></i>\n" + " <i class=\"ace-icon fa fa-trash bigger-130\"></i>\n"
+ " Eliminar el horario del aula" + " Eliminar el horario del aula"
......
web/vista/arm_hor_gen.jsp
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="es"> <html lang="es">
<head> <head>
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" /> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
<meta charset="utf-8" /> <meta charset="utf-8" />
<title>:::SISTEMA DE HORARIOS:::</title> <title>:::SISTEMA DE HORARIOS:::</title>
...@@ -28,6 +29,18 @@ ...@@ -28,6 +29,18 @@
jQuery("#registroEncuesta").validationEngine(); jQuery("#registroEncuesta").validationEngine();
});*/ });*/
</script> </script>
<style type="text/css">
@media print {
#vistaDoble {display:none}
#iconoImprimir{display:none}
#regresar{display:none}
#inicioPage{display: none}
#generarHorario{display: none}
#tachoEliminar{display: none}
#accionHorario{display: none}
}
</style>
</head> </head>
<body class="no-skin" onLoad="cargar();"> <body class="no-skin" onLoad="cargar();">
...@@ -93,7 +106,7 @@ ...@@ -93,7 +106,7 @@
<ul class="breadcrumb"> <ul class="breadcrumb">
<li> <li>
<i class="ace-icon fa fa-home home-icon"></i> <i class="ace-icon fa fa-home home-icon"></i>
<a href="principal.jsp">INICIO</a> <a href="principal.jsp" id="inicioPage">INICIO</a>
</li> </li>
<li class="active">HORARIOS</li> <li class="active">HORARIOS</li>
</ul><!-- /.breadcrumb --> </ul><!-- /.breadcrumb -->
...@@ -105,7 +118,7 @@ ...@@ -105,7 +118,7 @@
<div class="page-header"> <div class="page-header">
<h1> <h1>
Horarios Horarios
<small> <small id="generarHorario">
<i class="ace-icon fa fa-angle-double-right"></i> <i class="ace-icon fa fa-angle-double-right"></i>
Generar Horario Generar Horario
</small> </small>
...@@ -124,7 +137,11 @@ ...@@ -124,7 +137,11 @@
<!-- ----------------------------------------------------- --> <!-- ----------------------------------------------------- -->
<div class="col-sm-12" style="width:100%; height: 40px;"> <div class="col-sm-12" style="width:100%; height: 40px;">
<center><a class="btn btn-sm btn-primary" href="vistaDobleDisponibilidad.jsp" target="_blank">Vista doble</a></center> <center><a class="btn btn-sm btn-primary" href="vistaDobleDisponibilidad.jsp" target="_blank" id="vistaDoble">Vista doble</a>
<a class="btn btn-app btn-light btn-xs align-left" onclick="window.print();" target="_blank" id="iconoImprimir">
<i class="ace-icon fa fa-print bigger-160"></i>
</a></center>
</div> </div>
<!-- ----------------------------------------------------- --> <!-- ----------------------------------------------------- -->
...@@ -138,7 +155,7 @@ ...@@ -138,7 +155,7 @@
</div> </div>
<br><br> <br><br>
<center> <center>
<button class="btn btn-sm btn-primary" onclick="regresar();" type="button"> <button class="btn btn-sm btn-primary" onclick="regresar();" type="button" id="regresar">
<i class="ace-icon fa fa-reply icon-on-right bigger-110"></i> <i class="ace-icon fa fa-reply icon-on-right bigger-110"></i>
Regresar Regresar
</button> </button>
...@@ -362,7 +379,7 @@ window.jQuery || document.write("<script src='../assets/js/jquery1x.js'>"+"<"+"/ ...@@ -362,7 +379,7 @@ window.jQuery || document.write("<script src='../assets/js/jquery1x.js'>"+"<"+"/
<link rel="stylesheet" href="css/validationEngine.jquery.css" type="text/css"/> <link rel="stylesheet" href="css/validationEngine.jquery.css" type="text/css"/>
<!--<link rel="stylesheet" href="css/template.css" type="text/css"/>--> <!--<link rel="stylesheet" href="css/template.css" type="text/css"/>-->
<!-- <script src="https://cdnjs.cloudflare.com/ajax/libs/jspdf/1.4.1/jspdf.debug.js" integrity="sha384-THVO/sM0mFD9h7dfSndI6TS0PgAGavwKvB5hAxRRvc0o9cPLohB0wb/PTA7LdUHs" crossorigin="anonymous"></script>-->
<!-- inline scripts related to this page --> <!-- inline scripts related to this page -->
<script type="text/javascript"> <script type="text/javascript">
...@@ -1881,6 +1898,30 @@ window.jQuery || document.write("<script src='../assets/js/jquery1x.js'>"+"<"+"/ ...@@ -1881,6 +1898,30 @@ window.jQuery || document.write("<script src='../assets/js/jquery1x.js'>"+"<"+"/
} }
}); });
} }
// function imprimirHorario(elem)
// {
// var mywindow = window.open('', 'PRINT', 'height=400,width=800');
//
// mywindow.document.write('<html><head><title>' + document.title + '</title>');
// mywindow.document.write(`<style>
// h1{color:#307ECC;}
//
// </style>`);
// mywindow.document.write('</head><body >');
//
// mywindow.document.write(`<h1 style="text-align:center;">Sistema de Horarios</h1>`);
// mywindow.document.write(document.getElementById(elem).innerHTML);
// mywindow.document.write('</body></html>');
//
// mywindow.document.close(); // necessary for IE >= 10
// mywindow.focus(); // necessary for IE >= 10*/
//
// mywindow.print();
// mywindow.close();
//
// return true;
// }
</script> </script>
...@@ -1898,6 +1939,7 @@ window.jQuery || document.write("<script src='../assets/js/jquery1x.js'>"+"<"+"/ ...@@ -1898,6 +1939,7 @@ window.jQuery || document.write("<script src='../assets/js/jquery1x.js'>"+"<"+"/
<script src="../docs/assets/js/language/html.js"></script> <script src="../docs/assets/js/language/html.js"></script>
<script src="../docs/assets/js/language/css.js"></script> <script src="../docs/assets/js/language/css.js"></script>
<script src="../docs/assets/js/language/javascript.js"></script> <script src="../docs/assets/js/language/javascript.js"></script>
......
web/vista/exportarHorarioDocentePersonalizadoPlana.jsp
...@@ -26,6 +26,11 @@ ...@@ -26,6 +26,11 @@
<% <%
String plana = request.getParameter("plana"); String plana = request.getParameter("plana");
String periodo = request.getParameter("periodo"); String periodo = request.getParameter("periodo");
String correoDocente="";
String direccionDocente="";
String celularDocente="";
String distrito="";
HorarioServices servicios = new HorarioServices(); HorarioServices servicios = new HorarioServices();
...@@ -39,7 +44,7 @@ ...@@ -39,7 +44,7 @@
JSONArray arrayPersona = objeto.getJSONArray("data"); JSONArray arrayPersona = objeto.getJSONArray("data");
response.setContentType("application/vnd.ms-excel; "); response.setContentType("application/vnd.ms-excel; ");
response.setHeader("Content-Disposition","attachment; filename=UsuarioDocente.xls"); response.setHeader("Content-Disposition","attachment; filename=UsuarioDocente.xls");
for(Object objetoPersona : arrayPersona){ for(Object objetoPersona : arrayPersona){
...@@ -48,10 +53,26 @@ ...@@ -48,10 +53,26 @@
//cabecera //cabecera
String nombreDocente=dataPersona.getString("nombre"); String nombreDocente=dataPersona.getString("nombre");
String correoDocente=dataPersona.getString("correo");
String direccionDocente=dataPersona.getString("direccion");
String celularDocente=dataPersona.getString("celular"); if(dataPersona.has("correo")){
String distrito=dataPersona.getString("distrito"); correoDocente=dataPersona.getString("correo");
}
if(dataPersona.has("direccion")){
direccionDocente=dataPersona.getString("direccion");
}
if(dataPersona.has("celular")){
celularDocente=dataPersona.getString("celular");
}
if(dataPersona.has("distrito")){
distrito=dataPersona.getString("distrito");
}
String examen=dataPersona.isNull("examen")?"":dataPersona.getString("examen"); String examen=dataPersona.isNull("examen")?"":dataPersona.getString("examen");
...@@ -94,8 +115,8 @@ ...@@ -94,8 +115,8 @@
} }
String borderT="style='border:solid 0.5pt #000000;vertical-align:middle; background-color:#A9F5F2;' "; String borderT="style='border:solid 0.5pt #000000;vertical-align:middle; background-color:#307ECC;color:white;' ";
String borderTD="style='border:solid 0.5pt #000000;vertical-align:middle; background-color:#A9F5D0;' "; String borderTD="style='border:solid 0.5pt #000000;vertical-align:middle; background-color:#FFCC99;' ";
String border="style='border:solid 0.5pt #000000;vertical-align:middle;'"; String border="style='border:solid 0.5pt #000000;vertical-align:middle;'";
...@@ -150,7 +171,7 @@ ...@@ -150,7 +171,7 @@
<td <%=borderTD%>>M</td> <td <%=borderTD%>>M</td>
<% <%
for(int i=0;i<6;i++){ for(int i=0;i<6;i++){
String x="firebrick"; String x="#FFC7CE";
if(diaM.contains(String.valueOf(i+1))){ if(diaM.contains(String.valueOf(i+1))){
x=""; x="";
} }
...@@ -174,7 +195,7 @@ ...@@ -174,7 +195,7 @@
<% <%
for(int i=0;i<6;i++){ for(int i=0;i<6;i++){
String x="firebrick"; String x="#FFC7CE";
if(diaM.contains(String.valueOf(i+1))){ if(diaM.contains(String.valueOf(i+1))){
x=""; x="";
} }
......
web/vista/js/pages/vistaHorarioDocente.js
...@@ -4,9 +4,7 @@ let codPer = '' ...@@ -4,9 +4,7 @@ let codPer = ''
$(document).ready(function () { $(document).ready(function () {
const urlParams = new URLSearchParams(window.location.search); const urlParams = new URLSearchParams(window.location.search);
const myDni = urlParams.get('dni'); const myDni = urlParams.get('dni');
...@@ -14,12 +12,6 @@ $(document).ready(function () { ...@@ -14,12 +12,6 @@ $(document).ready(function () {
dniDocente: myDni dniDocente: myDni
} }
// let json2={
// codigoPeriodo:codPer,
// codigoProfesor:codigoDocente
//
// }
//
$.ajax({ $.ajax({
url: '../ServletHorario?Accion=verHorarioDocenteDni', url: '../ServletHorario?Accion=verHorarioDocenteDni',
type: 'POST', type: 'POST',
...@@ -31,19 +23,19 @@ $(document).ready(function () { ...@@ -31,19 +23,19 @@ $(document).ready(function () {
//console.log(response); //console.log(response);
codigoDocente = response.codigoDocente codigoDocente = response.codigoDocente
let array = response.data; let array = response.data;
let options = ""; let options = "<option selected>[SELECCIONE]</option>";
array.forEach(function (value, index) { array.forEach(function (value, index) {
options += `<option value="${value.codigoPeriodo}">${value.nombrePeriodo}</option>` options += `<option value="${value.codigoPeriodo}">${value.nombrePeriodo}</option>`
}); });
$("#cboPeriodo").html(options); $("#cboPeriodo").html(options);
} }
}), }),
// ahora vemos el detalle de horario del profesor de acuerdo al codigo docente // ahora vemos el detalle de horario del profesor de acuerdo al codigo docente
$(document).on('change', '#cboPeriodo', function (event) { $('#cboPeriodo').on('change', function (event) {
codPer = $("#cboPeriodo option:selected").val(); codPer = $("#cboPeriodo option:selected").val();
//console.log(codPer); //console.log(codPer);
//console.log(codigoDocente); //console.log(codigoDocente);
...@@ -56,7 +48,11 @@ $(document).ready(function () { ...@@ -56,7 +48,11 @@ $(document).ready(function () {
codigoProfesor: codigoDocente codigoProfesor: codigoDocente
}, },
success: function (response, textStatus, jqXHR) { success: function (response, textStatus, jqXHR) {
//console.log(response.data); $("#tabla").show();
$("#btnVerHorario").hide();
$('.alert').hide()
console.log(response.data);
let array = response.data; let array = response.data;
let diaM = []; let diaM = [];
let diaT = []; let diaT = [];
...@@ -141,7 +137,7 @@ $(document).ready(function () { ...@@ -141,7 +137,7 @@ $(document).ready(function () {
// //
}); });
HTMLDOM += `<td>${horaM}</td>`; HTMLDOM += `<td class='celdas'>${horaM}</td>`;
// //
...@@ -173,12 +169,11 @@ $(document).ready(function () { ...@@ -173,12 +169,11 @@ $(document).ready(function () {
} else { } else {
var esVisible = $("#tabla").is(":visible"); $("#tabla").hide();
if(esVisible){ $('.alert').show();
$("#tabla").toggle(1000);
}else{
alert("no hay disponibilidad");
}
// mostrarModal(); // mostrarModal();
...@@ -208,16 +203,5 @@ $(document).ready(function () { ...@@ -208,16 +203,5 @@ $(document).ready(function () {
$("#btnVerHorario").click(function () {
$("#tabla").toggle(1000);
});
}); });
web/vista/vistaDobleDisponibilidad.jsp
...@@ -122,111 +122,226 @@ ...@@ -122,111 +122,226 @@
}, },
success: function (data, textStatus, jqXHR) { success: function (data, textStatus, jqXHR) {
let html = '' let html = ''
let mensaje='No registrado'
data.data.forEach(function (docente) { data.data.forEach(function (docente) {
html += `
<div class="divider"></div> if(typeof(docente.celular && docente.distrito) == "undefined"){
<div class="section"> html += `
<h6>` + docente.nombre + `</h6>` <div class="divider"></div>
<div class="section">
html += '<p>Celular: '+ docente.celular +'</p>' <h6>` + docente.nombre + `</h6>`
html += '<p>Distrito: '+ docente.distrito +'</p>' html += '<p>Celular:No registrado</p>'
html += '<p>Direccion: '+ docente.direccion +'</p>' html += '<p>Distrito:No registrado</p>'
html += '<p>Correo: '+ docente.correo +'</p>' html += '<p>Direccion: No registrado</p>'
html += '<br>' html += '<p>Correo: No registrado</p>'
html += '<br>'
if (docente.disponibilidad) {
let disponibilidad = docente.disponibilidad.split('-') || [] if (docente.disponibilidad) {
let diasM = []
let diasT = [] let disponibilidad = docente.disponibilidad.split('-') || []
let aulasM = [] let diasM = []
let aulasT = [] let diasT = []
let aulasM = []
if (docente.arrayAulas) { let aulasT = []
docente.arrayAulas.forEach(v => {
if (v.turno == '1') { if (docente.arrayAulas) {
aulasM.push(v) docente.arrayAulas.forEach(v => {
} else if (v.turno == '2') { if (v.turno == '1') {
aulasT.push(v) aulasM.push(v)
} } else if (v.turno == '2') {
}) aulasT.push(v)
} }
})
disponibilidad.forEach(function (d) { }
let turno = d.split('#')[0]
let dia = d.split('#')[1] disponibilidad.forEach(function (d) {
let turno = d.split('#')[0]
if (turno == '1') { let dia = d.split('#')[1]
diasM.push(dia)
} else if (turno == '2') { if (turno == '1') {
diasT.push(dia) diasM.push(dia)
} } else if (turno == '2') {
}) diasT.push(dia)
}
html += '<p class="col s12">' })
html += '<table class="centered">'
html += '<thead>' html += '<p class="col s12">'
html += '<tr>' html += '<table class="centered">'
html += '<td>TURNO</td>' html += '<thead>'
html += '<td>LUNES</td>' html += '<tr>'
html += '<td>MARTES</td>' html += '<td>TURNO</td>'
html += '<td>MIERCOLES</td>' html += '<td>LUNES</td>'
html += '<td>JUEVES</td>' html += '<td>MARTES</td>'
html += '<td>VIERNES</td>' html += '<td>MIERCOLES</td>'
html += '<td>SABADO</td>' html += '<td>JUEVES</td>'
html += '</tr>' html += '<td>VIERNES</td>'
html += '</thead>' html += '<td>SABADO</td>'
html += '<tbody>' html += '</tr>'
html += '</thead>'
html += '<tbody>'
html += '<tr>'
html += '<td>M</td>'
html += '<tr>'
for (let i = 0; i < 6; i++) { html += '<td>M</td>'
let aulas = aulasM.map(a => {
if (a.dia == i + 1) { for (let i = 0; i < 6; i++) {
return a.sede + ' | ' + a.aulas let aulas = aulasM.map(a => {
} if (a.dia == i + 1) {
}) return a.sede + ' | ' + a.aulas
if (diasM.some(d => d == (i + 1))) { }
html += `<td class="green">` + aulas.join(' \n ') + `</td>` })
} else { if (diasM.some(d => d == (i + 1))) {
html += '<td class="red">' + aulas.join(' \n ') + '</td>' html += `<td class="green">` + aulas.join(' \n ') + `</td>`
} } else {
} html += '<td class="red">' + aulas.join(' \n ') + '</td>'
}
}
html += '</tr>'
html += '<tr>' html += '</tr>'
html += '<td>T</td>'
html += '<tr>'
for (let i = 0; i < 6; i++) { html += '<td>T</td>'
let aulas = aulasT.map(a => {
if (a.dia == i + 1) { for (let i = 0; i < 6; i++) {
return a.sede + ' | ' + a.aulas let aulas = aulasT.map(a => {
} if (a.dia == i + 1) {
}) return a.sede + ' | ' + a.aulas
if (diasT.some(d => d == (i + 1))) { }
html += `<td class="green">` + aulas.join(' \n ') + `</td>` })
} else { if (diasT.some(d => d == (i + 1))) {
html += '<td class="red">' + aulas.join(' \n ') + '</td>' html += `<td class="green">` + aulas.join(' \n ') + `</td>`
} } else {
} html += '<td class="red">' + aulas.join(' \n ') + '</td>'
}
html += '</tr>' }
html += '</tbody>' html += '</tr>'
html += '</table>'
html += '</p>' html += '</tbody>'
} else { html += '</table>'
html += '<p>EL DOCENTE NO TIENE DISPONIBILIDAD REGISTRADA</p>' html += '</p>'
} else {
html += '<p>EL DOCENTE NO TIENE DISPONIBILIDAD REGISTRADA</p>'
}
html += `
</div>
`
}else{
html += `
<div class="divider"></div>
<div class="section">
<h6>` + docente.nombre + `</h6>`
html += '<p>Celular: '+ docente.celular +'</p>'
html += '<p>Distrito: '+ docente.distrito +'</p>'
html += '<p>Direccion: '+ docente.direccion +'</p>'
html += '<p>Correo: '+ docente.correo +'</p>'
html += '<br>'
if (docente.disponibilidad) {
let disponibilidad = docente.disponibilidad.split('-') || []
let diasM = []
let diasT = []
let aulasM = []
let aulasT = []
if (docente.arrayAulas) {
docente.arrayAulas.forEach(v => {
if (v.turno == '1') {
aulasM.push(v)
} else if (v.turno == '2') {
aulasT.push(v)
}
})
}
disponibilidad.forEach(function (d) {
let turno = d.split('#')[0]
let dia = d.split('#')[1]
if (turno == '1') {
diasM.push(dia)
} else if (turno == '2') {
diasT.push(dia)
}
})
html += '<p class="col s12">'
html += '<table class="centered">'
html += '<thead>'
html += '<tr>'
html += '<td>TURNO</td>'
html += '<td>LUNES</td>'
html += '<td>MARTES</td>'
html += '<td>MIERCOLES</td>'
html += '<td>JUEVES</td>'
html += '<td>VIERNES</td>'
html += '<td>SABADO</td>'
html += '</tr>'
html += '</thead>'
html += '<tbody>'
html += '<tr>'
html += '<td>M</td>'
for (let i = 0; i < 6; i++) {
let aulas = aulasM.map(a => {
if (a.dia == i + 1) {
return a.sede + ' | ' + a.aulas
}
})
if (diasM.some(d => d == (i + 1))) {
html += `<td class="green">` + aulas.join(' \n ') + `</td>`
} else {
html += '<td class="red">' + aulas.join(' \n ') + '</td>'
}
}
html += '</tr>'
html += '<tr>'
html += '<td>T</td>'
for (let i = 0; i < 6; i++) {
let aulas = aulasT.map(a => {
if (a.dia == i + 1) {
return a.sede + ' | ' + a.aulas
}
})
if (diasT.some(d => d == (i + 1))) {
html += `<td class="green">` + aulas.join(' \n ') + `</td>`
} else {
html += '<td class="red">' + aulas.join(' \n ') + '</td>'
}
}
html += '</tr>'
html += '</tbody>'
html += '</table>'
html += '</p>'
} else {
html += '<p>EL DOCENTE NO TIENE DISPONIBILIDAD REGISTRADA</p>'
}
html += `
</div>
`
} }
html += `
</div>
`
}) })
document.querySelector('#divListaDisponibilidad').innerHTML = html document.querySelector('#divListaDisponibilidad').innerHTML = html
} }
......
web/vista/vistaHorarioDocente.jsp
...@@ -9,21 +9,23 @@ ...@@ -9,21 +9,23 @@
<html> <html>
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<!-- Compiled and minified CSS --> <link rel="stylesheet" href="../assets/css/bootstrap.css" />
<!-- <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/materialize/1.0.0/css/materialize.min.css"> <link rel="stylesheet" href="../assets/css/font-awesome.css" />
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
<link rel="stylesheet" href="../assets/css/chosen.css" />
Compiled and minified JavaScript <!-- page specific plugin styles -->
<script src="https://cdnjs.cloudflare.com/ajax/libs/materialize/1.0.0/js/materialize.min.js"></script> <link rel="stylesheet" href="../assets/css/jquery-ui.custom.css" />
<link rel="stylesheet" href="../assets/css/chosen.css" />
<link rel="stylesheet" href="../assets/css/datepicker.css" />
<link rel="stylesheet" href="../assets/css/bootstrap-timepicker.css" />
<link rel="stylesheet" href="../assets/css/daterangepicker.css" />
<link rel="stylesheet" href="../assets/css/bootstrap-datetimepicker.css" />
<link rel="stylesheet" href="../assets/css/colorpicker.css" />
jquery <!-- text fonts -->
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script> <link rel="stylesheet" href="../assets/css/ace-fonts.css" />
axios <!-- ace styles -->
<script src="https://unpkg.com/axios/dist/axios.min.js"></script>--> <link rel="stylesheet" href="../assets/css/ace.css" class="ace-main-stylesheet" id="main-ace-style" />
<!--<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/css/bootstrap.min.css" integrity="sha384-MCw98/SFnGE8fJT3GXwEOngsV7Zt27NXFoaoApmYm81iuXoPkFOJwJ8ERdknLPMO" crossorigin="anonymous">-->
<title>JSP Page</title> <title>JSP Page</title>
<style> <style>
...@@ -32,87 +34,146 @@ ...@@ -32,87 +34,146 @@
} }
.cabeceraDias th{ .cabeceraDias th{
background-color: skyblue; background-color: skyblue;
text-align: center;
}
.celdas{
text-align:center;
font-size:13px;
} }
</style> </style>
</head> </head>
<body> <body>
<% <% //
String borderT="style='border:solid 0.5pt #000000;vertical-align:middle; background-color:#A9F5F2;' "; String borderT="style='border:solid 0.5pt #000000;vertical-align:middle; background-color:#A9F5F2;' ";
String border="style='border:solid 0.5pt #000000;vertical-align:middle;'"; String border="style='border:solid 0.5pt #000000;vertical-align:middle;'";
%> %>
<div class="navbar navbar-default" id="navbar">
<div class="navbar-container" id="navbar-container">
</div>
<div class="navbar-header pull-left">
<span class="navbar-brand">
<small>
<i class="ace-icon fa fa-calendar green"></i>
<span class="orange">Sistema</span>
<span class="white">de Horarios</span>
</small>
</span>
<h1>HORARIOS DE ACUERDO AL PERIODO</h1>
<hr>
<form class="form">
</form>
<label>Periodo : </label>
<div>
<select id="cboPeriodo" class="chosen-select form-control">
</select>
</div> </div>
<div>
<button id="btnVerHorario" class="btn btn-success">ver horario</button>
</div> </div>
<hr>
<div id="tabla" style="display: none;">
<table border="2" class="tabla">
<tr>
<td colspan="7" height='10'> </td>
</tr>
<tr class="cabecera">
<td colspan="2" class="datacabecera"><b>DOCENTE:</b></td>
<td colspan="2" id="docente"></td>
<td colspan="1" class="datacabecera"><b>CORREO:</b></td>
<td colspan="2" id="correo"></td>
</tr>
<tr class="cabecera">
<td colspan="2" class="datacabecera"><b>CELULAR:</b></td>
<td colspan="2" align='left' id="celular"></td>
<td colspan="1"class="datacabecera" ><b>DISTRITO:</b></td>
<td colspan="2" id="distrito"></td>
</tr>
<tr class="cabecera">
<td colspan="2" height='70'class="datacabecera" ><b>DIRECCIÓN:</b></td>
<td colspan="5" id="direccion"></td>
</tr>
<tr>
<td height='10' colspan="7" ></td>
</tr>
<tr class="cabeceraDias">
<th>TURNO</th>
<th>LUNES</th>
<th>MARTES</th>
<th>MIERCOLES</th>
<th>JUEVES</th>
<th>VIERNES</th>
<th>SABADO</th>
</tr>
<tr>
<tr id="trM">
</tr>
<tr id="trT">
</tr>
</tr>
<div class="main-container">
<div class="main-content-inner">
<div class="breadcrumbs" id="breadcrumbs">
<ul class="breadcrumb">
<li>
<i class="ace-icon fa fa-home home-icon"></i>
<a href="principalDocente.jsp">INICIO</a>
</li>
<li class="active">
Horarios
</li>
</ul>
</div>
<div class="page-content">
<div class="page-header">
<h1>Datos
<small>
<i class="ace-icon fa fa-angle-double-right"></i>
Ver horarios de acuerdo al periodo
</small>
</h1>
</div>
<div class="row">
<select id="cboPeriodo" class="chosen-select form-control">
</select>
<div class="col-sm-12" style="width: 100%">
<div class="col-sm-12">
<hr>
<form class="formular">
<div id="divListaRegistro">
<div>
<div id="tabla" style="display: none;" class="table">
<table border="2" id="tabla" class="table">
<tbody>
<tr style="background-color: #307ecc;">
<td colspan="7" height='50' style="color: white;font-size:20px;">Datos del docente</td>
</tr>
<tr class="cabecera">
<td colspan="2" class="datacabecera"><b>DOCENTE:</b></td>
<td colspan="2" id="docente"></td>
<td colspan="1" class="datacabecera"><b>CORREO:</b></td>
<td colspan="2" id="correo"></td>
</tr>
<tr class="cabecera">
<td colspan="2" class="datacabecera"><b>CELULAR:</b></td>
<td colspan="2" align='left' id="celular"></td>
<td colspan="1"class="datacabecera" ><b>DISTRITO:</b></td>
<td colspan="2" id="distrito"></td>
</tr>
<tr class="cabecera">
<td colspan="2" height='70'class="datacabecera" ><b>DIRECCIÓN:</b></td>
<td colspan="5" id="direccion"></td>
</tr>
<tr>
<td height='1' colspan="7" ></td>
</tr>
<tr class="cabeceraDias">
<th style="background-color: #DFF0D8;color:black;">TURNO</th>
<th style="background-color: #DFF0D8;color:black;">LUNES</th>
<th style="background-color: #DFF0D8;color:black;">MARTES</th>
<th style="background-color:#DFF0D8;color:black;">MIERCOLES</th>
<th style="background-color:#DFF0D8;color:black;">JUEVES</th>
<th style="background-color: #DFF0D8;color:black;">VIERNES</th>
<th style="background-color: #DFF0D8;color:black;">SABADO</th>
</tr>
<tr>
<tr id="trM">
</tr>
<tr id="trT">
</tr>
</tr>
</tbody>
</table>
</div>
</div>
<div class="alert alert-info" data-placement="top" style="display: none;">
<strong>No hay disponibilidad.</strong>
</div>
</form>
</div>
</div>
</div>
</table> </div>
</div> </div>
<script src="../assets/js/jquery.js" type="text/javascript"></script> <script src="../assets/js/jquery.js" type="text/javascript"></script>
<!-- <script src="js/jquery-3.3.1.min.js" type="text/javascript"></script>--> <!-- <script src="js/jquery-3.3.1.min.js" type="text/javascript"></script>-->
<script src="js/pages/vistaHorarioDocente.js" type="text/javascript"></script> <script src="js/pages/vistaHorarioDocente.js" type="text/javascript"></script>
......
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