Skip to content

H
horario
Commit 676e4c3d by Crhistian Yuri Anchivilca Amasifuen
Options

change of fixed report

parent 43d6871f
Showing with 251 additions and 68 deletions
src/java/pe/siso/horario/DAO/DocenteDAO.java
......@@ -142,5 +142,7 @@ public interface DocenteDAO {
// public int validarSiExisteCoordinador(String codigoDocente,String codigoPeriodoAcademico,String codigoPlana) throws Exception;
public ArrayList<Docente> filtroDocentesPrimSec(String periodo, String filtro,String codigoAula) throws Exception;
//
// public Docente obtenerNombreDocente(String codigoDocente)throws Exception;
}
src/java/pe/siso/horario/MySqlDAO/MySqlBloqueDAO.java
......@@ -568,7 +568,7 @@ public class MySqlBloqueDAO implements BloqueDAO {
try {
cnx = MySqlDAOFactory.obtenerConexion(base);
Statement st = cnx.createStatement();
String query = "SELECT cod_gru,nom_gru,max_gru,cadena,est_gru,anio FROM grupo_horario WHERE max_gru='" + bloque + "' and est_gru='1' and anio=YEAR(CURDATE()) ORDER BY anio DESC ";
String query = "SELECT cod_gru,nom_gru,max_gru,cadena,est_gru,anio FROM grupo_horario WHERE max_gru='" + bloque + "' and est_gru='1' and anio ORDER BY anio DESC ";
ResultSet rs = st.executeQuery(query);
while (rs.next()) {
Grupo grupo = new Grupo();
......
src/java/pe/siso/horario/MySqlDAO/MySqlDAOFactory.java
......@@ -56,13 +56,13 @@ public class MySqlDAOFactory extends DAOFactory {
try {
conexion = DriverManager.getConnection(
// "jdbc:mysql://172.16.2.69:3306/encuesta_docente",
// "root",
// "mysql");
"jdbc:mysql://localhost:3306/encuesta_docente",
"root",
"mysql");
//serverdes5
"jdbc:mysql://172.16.0.6:3306/encuesta_docente",
"christian",
"Saco1357$");
// "jdbc:mysql://172.16.0.15:3306/encuesta_docente",
// "sistemaHorarios",
// "Sac0Olive1357$");
} catch (Exception e) {
// TODO Auto-generated catch block
......@@ -74,13 +74,13 @@ public class MySqlDAOFactory extends DAOFactory {
try {
conexion = DriverManager.getConnection(
// "jdbc:mysql://172.16.2.69:3306/nuevo",
// "root",
// "mysql");
// serverweb
"jdbc:mysql://172.16.0.15:3306/nuevo",
"eduardo",
"jdbc:mysql://localhost:3306/nuevo",
"root",
"mysql");
// serverweb
// "jdbc:mysql://172.16.0.15:3306/nuevo",
// "sistemaHorarios",
// "Sac0Olive1357$");
} catch (Exception e) {
// TODO Auto-generated catch block
......@@ -92,12 +92,12 @@ public class MySqlDAOFactory extends DAOFactory {
try {
conexion = DriverManager.getConnection(
// "jdbc:mysql://localhost:3306/horarios_docente",
// "root",
// "mysql");
"jdbc:mysql://172.16.0.6:3306/horarios_docente",
"backup",
"mysql2016");
"jdbc:mysql://localhost:3306/horarios_docente",
"root",
"mysql");
// "jdbc:mysql://172.16.0.15:3306/horarios_docente",
// "sistemaHorarios",
// "Sac0Olive1357$");
} catch (Exception e) {
// TODO Auto-generated catch block
......@@ -108,13 +108,13 @@ public class MySqlDAOFactory extends DAOFactory {
try {
conexion = DriverManager.getConnection(
// "jdbc:mysql://localhost:3306/sacoolive3",
// "root",
// "mysql");
"jdbc:mysql://localhost:3306/sacoolive3",
"root",
"mysql");
//serverdes5
"jdbc:mysql://172.16.0.6:3306/sacoolive3",
"backup",
"mysql2016");
// "jdbc:mysql://172.16.0.15:3306/sacoolive3",
// "sistemaHorarios",
// "Sac0Olive1357$");
} catch (Exception e) {
// TODO Auto-generated catch block
e.printStackTrace();
......
src/java/pe/siso/horario/MySqlDAO/MySqlDocenteDAO.java
......@@ -57,6 +57,8 @@ public class MySqlDocenteDAO implements DocenteDAO {
return lista;
}
@Override
public ArrayList<Docente> listaDocentes(String apellido) throws Exception {
ArrayList<Docente> lista = new ArrayList<Docente>();
......@@ -2538,4 +2540,6 @@ public class MySqlDocenteDAO implements DocenteDAO {
// System.out.println(query);
//
// }
}
src/java/pe/siso/horario/Servlets/ServletAula.java
......@@ -2180,7 +2180,7 @@ public class ServletAula extends HttpServlet {
+ " <th tabindex=\"0\" class=\"center\" rowspan=\"2\" colspan=\"1\">NIVEL</th>\n"
+ " <th tabindex=\"0\" class=\"center\" rowspan=\"2\" colspan=\"1\">TIPO GRADO</th>\n"
+ " <th tabindex=\"0\" class=\"center\" rowspan=\"2\" colspan=\"1\">GRADO</th>\n"
+ " <th tabindex=\"0\" class=\"center\" rowspan=\"2\" colspan=\"1\">SECCIÓN</th>\n"
+ " <th tabindex=\"0\" class=\"center\" rowspan=\"2\" colspan=\"1\">NOMBRE</th>\n"
// + " <th tabindex=\"0\" class=\"center\" rowspan=\"2\" colspan=\"1\">NOMBRE</th>\n"
+ " <th tabindex=\"0\" class=\"center\" rowspan=\"2\" colspan=\"1\">TURNO</th>\n"
+ " <th tabindex=\"0\" class=\"center\" rowspan=\"2\" colspan=\"1\">HISTORIAL</th>\n"
......
src/java/pe/siso/horario/Servlets/ServletDocente.java
......@@ -5046,7 +5046,7 @@ public class ServletDocente extends HttpServlet {
pw.println("<table width='100%' height='30' id='datos'>");
pw.println("<tbody>");
pw.println("<tr>");
pw.println("<td>Lista de docentes</td>");
pw.println("<td>Lista de docentes disponibles</td>");
pw.println("<td align='right'>");
pw.println("</td>");
pw.println("<td width='10'></td>");
......@@ -5821,7 +5821,7 @@ public class ServletDocente extends HttpServlet {
pw.println("<table width='100%' height='30' id='datos'>");
pw.println("<tbody>");
pw.println("<tr>");
pw.println("<td>Lista de docentes</td>");
pw.println("<td>Lista de docentes disponibles</td>");
pw.println("<td align='right'>");
pw.println("</td>");
pw.println("<td width='10'></td>");
......@@ -5830,7 +5830,7 @@ public class ServletDocente extends HttpServlet {
pw.println("</table>");
pw.println("</div>");
// pw.println("<div style='height:300px;'>");
pw.println("<div style='height: 500px;overflow: auto; position: relative;'>");
pw.println("<div style='height: 200px;overflow: auto; position: relative;'>");
// pw.println("<div style=''>");
pw.println("<div class='fixed-table-container-inner extrawrap dataTables_wrapper form-inline no-footer'>");
pw.println("<table class='table table-striped table-bordered table-hover dataTable no-footer' id='tablaDocentes' role='grid' aria-describedby='sample-table-2_info' style='font-size:11px;' >");
......@@ -5844,7 +5844,7 @@ public class ServletDocente extends HttpServlet {
pw.println("<th width='200' class='center'>NOTA EXAMEN</th>");
pw.println("<th width='200' class='center'>NOTA ENCUESTA</th>");
pw.println("<th width='200' class='center'>NOTA PROMEDIO</th>");
pw.println("<th width='200' class='center'>ACCIÓN</th>");
pw.println("<th width='200' class='center'>ELEGIR</th>");
pw.println("</tr>");
pw.println("</thead>");
pw.println("<tbody>");
......@@ -5916,7 +5916,7 @@ public class ServletDocente extends HttpServlet {
// pw.println("<td align='center' style='vertical-align:middle'><i class=\"" + icono + "\"></i>&nbsp;" + promedio + "</td>");
pw.println("<td align='center' style='vertical-align:middle'>");
pw.println("<label>");
pw.println("<input name='checkbox" + cont + "' id='checkbox" + cont + "' class='ace' type='checkbox' value='" + cont + "' onclick='verificar_uno(this);'>");
pw.println("<input name='checkbox" + cont + "' id='checkbox" + cont + "' class='ace' type='checkbox' value='" + cont + "' onclick='verificar_uno(this);abrirModal(this);guardarDocente(this);'>");
pw.println("<span class='lbl'></span>");
pw.println("</label>");
pw.println("<input type='hidden' id='datos_" + cont + "' value='" + codigoDocente + "'>");
......
web/vista/asig_docente_area.jsp
......@@ -625,7 +625,7 @@ window.jQuery || document.write("<script src='../assets/js/jquery1x.js'>"+"<"+"/
close_carga();
$("#divDocente").html(resultado);
name=$("#lblUsuario").text();
if(name === "mgalvan" || name === "jramirez" || name === "fsalinas" || name === "wchancaf" || name === "rpinas"){
if(name === "mgalvan" || name === "jramirez" || name === "fsalinas" || name === "wchancaf" || name === "rpinas" || name === "mpadilla"){
$("#divDocente #btnAsignar").hide();
}
......
web/vista/asig_docente_plana.jsp
......@@ -410,7 +410,7 @@ window.jQuery || document.write("<script src='../assets/js/jquery1x.js'>"+"<"+"/
cerrar_cargando();
$("#divDocente").html(resultado);
name=$("#lblUsuario").text();
if(name === "mgalvan" || name === "jramirez" || name === "fsalinas" || name === "wchancaf" || name === "rpinas"){
if(name === "mgalvan" || name === "jramirez" || name === "fsalinas" || name === "wchancaf" || name === "rpinas" || name === "mpadilla"){
$("#divDocente #btnAsigPlana").hide();
}
......
web/vista/asig_zon_dis.jsp
......@@ -689,7 +689,7 @@
$('#divLista').html(resultado);
obj=$("#lblUsuario").text();
if(obj === "mgalvan" || obj === "jramirez" || obj === "fsalinas" || obj === "wchancaf" || obj === "rpinas"){
if(obj === "mgalvan" || obj === "jramirez" || obj === "fsalinas" || obj === "wchancaf" || obj === "rpinas" || obj === "mpadilla"){
$("#divLista").find("#btnZona").css('display','none');
}
},complete:function(){
......
web/vista/asig_zon_sed.jsp
......@@ -587,7 +587,7 @@
$("#divListaSede" ).html(resultado);
obj=$("#lblUsuario").text();
if(obj === "mgalvan" || obj === "jramirez" || obj === "fsalinas" || obj === "wchancaf" || obj === "rpinas"){
if(obj === "mgalvan" || obj === "jramirez" || obj === "fsalinas" || obj === "wchancaf" || obj === "rpinas" || obj === "mpadilla"){
$("#divListaSede #btnAsigZona").hide();
$("#divListaSede #btnEditar").hide();
$("#divListaSede #btnEliminar").hide();
......
web/vista/bus_plana.jsp
......@@ -642,7 +642,7 @@
close_carga();
$('#divListadoPlana').html(resultado);
name=$("#lblUsuario").text();
if(name === "mgalvan" || name === "jramirez" || name === "fsalinas" || name === "wchancaf" || name === "rpinas"){
if(name === "mgalvan" || name === "jramirez" || name === "fsalinas" || name === "wchancaf" || name === "rpinas" || name === "mpadilla"){
$("#divListadoPlana #btnAdPlana").hide();
$("#divListadoPlana #btnEdit").hide();
}
......
web/vista/buscar_curso.jsp
......@@ -733,7 +733,7 @@
name=$("#lblUsuario").text();
if(name === "mgalvan" || name === "jramirez" || name === "fsalinas" || name === "wchancaf" || name === "rpinas"){
if(name === "mgalvan" || name === "jramirez" || name === "fsalinas" || name === "wchancaf" || name === "rpinas" || name === "mpadilla"){
$("#divCurso #btnAdCurso").hide();
$("#divCurso #btnEdit").hide();
}
......
web/vista/css/alert.css 0 → 100644
.dgcAlert {
top: 0;position: absolute;
width: 100%;
display: block;height: 1000px;
background: url(http://www.dgcmedia.es/recursosExternos/fondoAlert.png)
repeat; text-align:center;
opacity:0;
display:none;
z-index:999999999999999;}
.dgcAlert .dgcVentana{width: 500px; background: white;min-height: 150px;position: relative;margin: 0 auto;color: black;padding: 10px;border-radius: 10px;}
.dgcAlert .dgcVentana .dgcCerrar {height: 25px;width: 25px;float: right; cursor:pointer; background: url(http://www.dgcmedia.es/recursosExternos/cerrarAlert.jpg) no-repeat center center;}
.dgcAlert .dgcVentana .dgcMensaje { margin: 0 auto; padding-top: 45px; text-align: center; width: 400px;font-size: 20px;}
.dgcAlert .dgcVentana .dgcAceptar{background:#09C; bottom:20px; display: inline-block; font-size: 12px; font-weight: bold; height: 24px; line-height: 24px; padding-left: 5px; padding-right: 5px;text-align: center; text-transform: uppercase; width: 75px;cursor: pointer; color:#FFF; margin-top:50px;}
\ No newline at end of file
web/vista/css/display.css
#lblUsuario{
display: none;
}
/* The Modal (background) */
.modal {
display: none; /* Hidden by default */
position: fixed; /* Stay in place */
z-index: 1; /* Sit on top */
left: 0;
top: 0;
width: 100%; /* Full width */
height: 100%; /* Full height */
overflow: auto; /* Enable scroll if needed */
background-color: rgb(0,0,0); /* Fallback color */
background-color: rgba(0,0,0,0.4); /* Black w/ opacity */
}
/* Modal Content/Box */
.modal-content {
background-color: #fefefe;
margin: 15% auto; /* 15% from the top and centered */
padding: 20px;
border: 1px solid #888;
width: 80%; /* Could be more or less, depending on screen size */
}
/* The Close Button */
.close {
color: #aaa;
float: right;
font-size: 28px;
font-weight: bold;
}
.close:hover,
.close:focus {
color: black;
text-decoration: none;
cursor: pointer;
}
\ No newline at end of file
web/vista/datos_docente.jsp
......@@ -608,7 +608,7 @@
name=$("#lblUsuario").text();
if(name === "mgalvan" || name === "jramirez" || name === "fsalinas" || name === "wchancaf" || name === "rpinas"){
if(name === "mgalvan" || name === "jramirez" || name === "fsalinas" || name === "wchancaf" || name === "rpinas" || name === "mpadilla"){
$("#divListadoDoc #btnRegEdit").hide();
$("#divListadoDoc #btnReg").hide();
$("#divListadoDoc #thDatos").hide();
......
web/vista/gen_hor_gen.jsp
......@@ -41,6 +41,7 @@
<%@ include file="banner.jsp" %>
</div><!-- /.navbar-container -->
<p id="lblUsuario"><%=usuario!=null?usuario.getUsuarioUsuario():""%></p>
<p id="tipoUsuario"><%=usuario!=null?usuario.getCodigoTipoUsuario():""%></p>
</div>
......@@ -961,10 +962,10 @@
// debugger
$('#aula').html(resultado);
name=$("#lblUsuario").text();
if(name === "mgalvan" || name === "jramirez" || name === "fsalinas" || name === "wchancaf" || name === "rpinas"){
name=$("#tipoUsuario").text();
if(name === "6"){
$("#aula #btnAgregar").hide();
$("#aula #btnEditar").hide();
//$("#aula #btnEditar").hide();
$("#aula #btnArmado").hide();
}
......
web/vista/lista_aula_dirage.jsp
......@@ -576,7 +576,7 @@
$('#divAula').html(resultado);
name=$("#lblUsuario").text();
if(name === "mgalvan" || name === "jramirez" || name === "fsalinas" || name === "wchancaf" || name === "rpinas"){
if(name === "mgalvan" || name === "jramirez" || name === "fsalinas" || name === "wchancaf" || name === "rpinas" || name === "mpadilla"){
$("#divAula #btnAdAula").hide();
}
......
web/vista/lista_docente.jsp
......@@ -683,7 +683,7 @@
function alerta1(codDoc, pagina) {
let hide = ''
let usu = $("#lblUsuario").text();
if (usu === "mgalvan" || usu === "jramirez" || usu === "fsalinas" || usu === "wchancaf" || usu === "rpinas") {
if (usu === "mgalvan" || usu === "jramirez" || usu === "fsalinas" || usu === "wchancaf" || usu === "rpinas" || usu === "mpadilla") {
hide = 'hide'
}
......
web/vista/listar_bloques2.jsp
......@@ -846,7 +846,7 @@
close_carga();
$('#divListadoBloquesCreado').html(resultado);
name=$("#lblUsuario").text();
if(name === "mgalvan" || name === "jramirez" || name === "fsalinas" || name === "wchancaf" || name === "rpinas"){
if(name === "mgalvan" || name === "jramirez" || name === "fsalinas" || name === "wchancaf" || name === "rpinas" || name === "mpadilla"){
$("#divListadoBloquesCreado #btnAdBloque").hide();
}
......@@ -917,7 +917,7 @@
let off = ''
let user = $("#lblUsuario").text();
if (user === "mgalvan" || user === "jramirez" || user === "fsalinas" || user === "wchancaf" || user === "rpinas") {
if (user === "mgalvan" || user === "jramirez" || user === "fsalinas" || user === "wchancaf" || user === "rpinas" || user === "mpadilla") {
off = 'hide'
}
......
web/vista/man_area.jsp
......@@ -320,7 +320,7 @@
jQuery(function($) {
let reg= $("#lblUsuario").text();
if(reg === "mgalvan" || reg === "jramirez" || reg === "fsalinas" || reg === "wchancaf" || reg === "rpinas"){
if(reg === "mgalvan" || reg === "jramirez" || reg === "fsalinas" || reg === "wchancaf" || reg === "rpinas" || reg === "mpadilla"){
$("#btnRegistrar").hide();
$("#txt_nom_area").prop('disabled', true);
}
......@@ -993,7 +993,7 @@
$('#divListadoArea').html(resultado);
// AQUI SE BLOQUEA LA VISTA DE EDICION
name=$("#lblUsuario").text();
if(name === "mgalvan" || name === "jramirez" || name === "fsalinas" || name === "wchancaf" || name === "rpinas"){
if(name === "mgalvan" || name === "jramirez" || name === "fsalinas" || name === "wchancaf" || name === "rpinas" || name === "mpadilla"){
$("#divListadoArea #btnEditar").hide();
}
......
web/vista/man_zona.jsp
......@@ -324,7 +324,7 @@
jQuery(function($) {
let reg= $("#lblUsuario").text();
if(reg === "mgalvan" || reg === "jramirez" || reg === "fsalinas" || reg === "wchancaf" || reg === "rpinas"){
if(reg === "mgalvan" || reg === "jramirez" || reg === "fsalinas" || reg === "wchancaf" || reg === "rpinas" || reg === "mpadilla"){
$("#btnRegistrar").hide();
$("#txtZona").prop('disabled','true');
}
......@@ -613,7 +613,7 @@
close_carga();
$('#divListadoZona').html(resultado);
name=$("#lblUsuario").text();
if(name === "mgalvan" || name === "jramirez" || name === "fsalinas" || name === "wchancaf" || name === "rpinas"){
if(name === "mgalvan" || name === "jramirez" || name === "fsalinas" || name === "wchancaf" || name === "rpinas" || name === "mpadilla"){
$("#divListadoZona #btnEdicion").hide();
}
......
web/vista/mig_pun.jsp
......@@ -289,7 +289,7 @@
jQuery(function($) {
let name= $("#lblUsuario").text();
if(name === "mgalvan" || name === "jramirez" || name === "fsalinas" || name === "wchancaf" || name === "rpinas"){
if(name === "mgalvan" || name === "jramirez" || name === "fsalinas" || name === "wchancaf" || name === "rpinas" || name === "mpadilla"){
$("#btnMigPuntajes").hide();
}
......
web/vista/registroTablaEvaluacionDocente.jsp
......@@ -426,7 +426,7 @@ window.jQuery || document.write("<script src='../assets/js/jquery1x.js'>"+"<"+"/
cerrar_cargando();
$("#divListado").html(resultado);
name=$("#lblUsuario").text();
if(name === "mgalvan" || name === "jramirez" || name === "fsalinas" || name === "wchancaf" || name === "rpinas"){
if(name === "mgalvan" || name === "jramirez" || name === "fsalinas" || name === "wchancaf" || name === "rpinas" || name === "mpadilla"){
$("#divListado #btnRegistrar").hide();
}
......
web/vista/vistaReporteCambioFijo.jsp 0 → 100644
<%--
Document : vistaReporteCambioFijo
Created on : 08-ene-2019, 14:49:39
Author : sistem20user
--%>
<%@page contentType="text/html" pageEncoding="UTF-8"%>
<%@ page import="java.text.SimpleDateFormat"%>
<%@ page import="java.util.*" %>
<%
String Motivo=request.getParameter("codigoMotivo");
String CondicionTr=request.getParameter("codCondicionTr");
String txtObservacion=request.getParameter("txtObservacion");
String txtDocente=request.getParameter("txtDocente");
String curso=request.getParameter("nombreCurso");
String sede=request.getParameter("sedefinal");
String dia=request.getParameter("diaRecibe");
String fechaRetiro=request.getParameter("fechafinals");
String fechaInicio=request.getParameter("fechainitial");
String horarioCF=request.getParameter("horarioCf");
String docenteEntrante=request.getParameter("docenteE");
String cursoSaliente=request.getParameter("cursoSal");
Date dNow = new Date();
SimpleDateFormat ft =
new SimpleDateFormat ("dd/MM/yyyy");
String currentDate = ft.format(dNow);
%>
<!DOCTYPE html>
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>JSP Page</title>
<style>
#dg{
background-color: #D9D2E9;
font-weight: bold;
}
#ds{
background-color: #FFF2CC;
font-weight: bold;
}
#di{
background-color: #C9DAF8;
font-weight: bold;
}
</style>
</head>
<body>
<label>REPORTE CAMBIO FIJO !</label>
<%
response.setContentType("application/vnd.ms-excel; ");
response.setHeader("Content-Disposition","attachment; filename=reporteCambioFijo.xls");
%>
<table border="1">
<tr>
<tr>
<td colspan="7" style="text-align: center;background-color: #D9D2E9;font-weight: bold;">DATOS GENERALES</td>
<td colspan="5" style="text-align: center;background-color: #FFF2CC;font-weight: bold;">DOCENTE QUE SALE</td>
<td colspan="5" style="text-align: center;background-color: #C9DAF8;font-weight: bold;">DOCENTE QUE INGRESA</td>
</tr>
<td id="dg">FECHA REGISTRO</td>
<td id="dg">SEDE</td>
<td id="dg">DIA</td>
<td id="dg">HORARIO</td>
<td id="dg">CANTIDAD DE HORAS</td>
<td id="dg">AULAS</td>
<td id="dg">CODIGO</td>
<td id="ds">APELLIDOS Y NOMBRES</td>
<td id="ds">CURSO</td>
<td id="ds">FECHA FIN</td>
<td id="ds">MOTIVO DE CAMBIO</td>
<td id="ds">SE DA BAJA EN EL SISTEMA</td>
<td id="di">APELLIDOS Y NOMBRES</td>
<td id="di">CURSO</td>
<td id="di">FECHA INICIO</td>
<td id="di">CONDICION DE TRABAJADOR</td>
<td id="di">OBSERVACION</td>
</tr>
<tr>
<td><%=currentDate%></td>
<td><%=sede%></td>
<td><%=dia%></td>
<td><%=horarioCF%></td>
<td>-</td>
<td>-</td>
<td>-</td>
<td><%=txtDocente%></td>
<td><%=cursoSaliente%></td>
<td><%=fechaRetiro%></td>
<td><%=Motivo%></td>
<td>NO</td>
<td><%=docenteEntrante%></td>
<td><%=curso%></td>
<td><%=fechaInicio%></td>
<td><%=CondicionTr%></td>
<td><%=txtObservacion%></td>
</tr>
</table>
</body>
</html>
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