Skip to content

A
Asistencia
Commit ab999bc0 by Billy Larru
Options

[ADD montos administrativos, panel de busqueda]

parent ecc8ea4d
Showing with 180 additions and 257 deletions
src/main/java/asistencia/config/RequestPath.java
......@@ -7,17 +7,17 @@ package asistencia.config;
/**
*
* @author Percy Oliver Quispe Huarcaya
* Clase encargada de almacenar las Url para
* enviar las solicitudes al servicio rest
* @author Percy Oliver Quispe Huarcaya Clase encargada de almacenar las Url
* para enviar las solicitudes al servicio rest
*/
public final class RequestPath {
/*Rest seguridad (security-rest)*/
/*Rest seguridad (security-rest)*/
// private static final String BASE="http://172.16.2.53:8080/security-rest/api/"; //base path;
private static final String BASE="http://app9.sacooliveros.edu.pe:8080/security-rest/api/"; //base path;
public static final String LOG_OUT = BASE+"user/logout";
public static final String LOGIN = BASE+"user/login";
public static final String ENVIAR_NUEVO_TOKEN = BASE+"proyecto/enviarNuevoToken";
public static final String VERIFICAR_LOGIN = BASE+"user/verificarLogin";
private static final String BASE = "http://app9.sacooliveros.edu.pe:8080/security-rest/api/"; //base path;
public static final String LOG_OUT = BASE + "user/logout";
public static final String LOGIN = BASE + "user/login";
public static final String ENVIAR_NUEVO_TOKEN = BASE + "proyecto/enviarNuevoToken";
public static final String VERIFICAR_LOGIN = BASE + "user/verificarLogin";
}
src/main/java/asistencia/filters/RequestFilter.java deleted 100644 → 0
///*
// * To change this license header, choose License Headers in Project Properties.
// * To change this template file, choose Tools | Templates
// * and open the template in the editor.
// */
//package asistencia.filters;
//
//import java.io.IOException;
//import java.io.PrintStream;
//import java.io.PrintWriter;
//import java.io.StringWriter;
//import java.util.ArrayList;
//import java.util.List;
//import javax.servlet.Filter;
//import javax.servlet.FilterChain;
//import javax.servlet.FilterConfig;
//import javax.servlet.ServletException;
//import javax.servlet.ServletRequest;
//import javax.servlet.ServletResponse;
//import javax.servlet.annotation.WebFilter;
//import javax.servlet.http.Cookie;
//import javax.servlet.http.HttpServletRequest;
//import javax.servlet.http.HttpServletResponse;
//import javax.servlet.http.HttpSession;
//import javax.ws.rs.WebApplicationException;
//import javax.ws.rs.core.Response;
//import org.json.JSONArray;
//import org.json.JSONObject;
//import asistencia.config.RequestPath;
//import asistencia.utilities.GeneralUtils;
//import asistencia.utilities.HttpRequest;
//
///**
// *
// * @author sistem08user
// */
//@WebFilter(filterName = "RequestFilter", urlPatterns = {"/*"})
//public class RequestFilter implements Filter {
//
// // The filter configuration object we are associated with. If
// // this value is null, this filter instance is not currently
// // configured.
// private FilterConfig filterConfig = null;
//
// public RequestFilter() {
// }
//
// private void doBeforeProcessing(ServletRequest req, ServletResponse resp, FilterChain chain)
// throws IOException, ServletException {
// HttpServletRequest request = (HttpServletRequest) req;
// HttpServletResponse response = (HttpServletResponse) resp;
// String uri = request.getRequestURI();
//
// if (uri.endsWith("Asistencia") || uri.endsWith("Asistencia/")
// || uri.contains("vistas/index.jsp")
// || uri.contains("plantilla/assets") || uri.endsWith(".js") || uri.endsWith(".css")
// || uri.endsWith(".png") || uri.endsWith(".jpg") || uri.endsWith(".gif")
// || uri.contains("/login") || uri.contains("vistas/redireccionarServlet")
// || uri.contains("vistas/interceptar")) {
// chain.doFilter(request, response);
// } else {
// if (request.getSession().getAttribute("codigo") != null) {
// if (uri.endsWith(".jsp")) {
// HttpSession session = request.getSession();
// HttpRequest httpRequest = new HttpRequest();
// JSONObject valid = null;
// String respuesta = "";
// String auth = "";
// try {
// if (session.getAttribute("Authorization") != null) {
// auth = (String) session.getAttribute("Authorization");
// } else {
// setError(response);
// }
// respuesta = httpRequest.getRespuesta(RequestPath.VERIFICAR_LOGIN, HttpRequest.POST, new JSONObject("{}"), auth);
// valid = new JSONObject(respuesta);
// if (valid.getBoolean("status")) {
// JSONObject menu = new JSONObject(valid.getString("menu"));//Obtiene el menu
// List<Object> vistas = new ArrayList<>();
// JSONObject rolvista = valid.getJSONObject("rolvista");
// JSONArray urls = rolvista.getJSONArray("vistas");
// for (int i = 0; i < urls.length(); i++) {
// vistas.add(urls.get(i));
// }
// vistas.add("main.jsp");
// String ruta = request.getRequestURI();
// int indice = GeneralUtils.obtenerIndex(ruta);
// String rutaJsp = ruta.substring(indice, ruta.length());
// boolean acceso = vistas.contains(rutaJsp);
// if (!acceso) {
// request.getSession().setAttribute("error", "no tiene acceso a la vista solicitada");//Esta session se elimina en el jsp (para que no ocupe memoria)
//// request.getRequestDispatcher("/vistas/error.jsp").forward(request, response);
// response.sendRedirect("error/error.jsp");
// return;
// }
// session.setAttribute("menu", menu.toString());
// } else {
// deleteCredenciales(response, request);
// request.getSession().setAttribute("error", "no tiene credenciales validas");
//// request.getRequestDispatcher("/vistas/error.jsp").forward(request, response);
// response.sendRedirect("error/error.jsp");
// return;
//// setError(response);
// }
// } catch (Exception ex) {
// request.getSession().setAttribute("error", ex.getMessage());
//// request.getRequestDispatcher("/vistas/error.jsp").forward(request, response);
// response.sendRedirect("error/error.jsp");
// return;
//// setError(response);
// }
// }
// chain.doFilter(request, response);
// } else {
// deleteCredenciales(response, request);
// response.sendRedirect("index.jsp");
// }
// }
// }
//
// private void deleteCredenciales(HttpServletResponse response, HttpServletRequest request) {
// Cookie cookieAuth = new Cookie("Authorization", "");
// cookieAuth.setMaxAge(0);
// request.getSession().invalidate();
// response.addCookie(cookieAuth);
// }
//
// private void sendError(HttpServletResponse response) throws IOException {
// response.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
// response.sendError(401);
// }
//
// public void setError(HttpServletResponse response) throws IOException {
// Response.ResponseBuilder builder = null;
// sendError(response);
// builder = Response.status(Response.Status.UNAUTHORIZED).entity(response);
// throw new WebApplicationException(builder.build());
// }
//
// private void doAfterProcessing(ServletRequest request, ServletResponse response)
// throws IOException, ServletException {
//
// }
//
// public void doFilter(ServletRequest req, ServletResponse resp,
// FilterChain chain)
// throws IOException, ServletException {
// System.out.println("Entrando al filtro");
// doBeforeProcessing(req, resp, chain);
//
//// chain.doFilter(req, resp);
// doAfterProcessing(req, resp);
//
// }
//
// /**
// * Return the filter configuration object for this filter.
// */
// public FilterConfig getFilterConfig() {
// return (this.filterConfig);
// }
//
// /**
// * Set the filter configuration object for this filter.
// *
// * @param filterConfig The filter configuration object
// */
// public void setFilterConfig(FilterConfig filterConfig) {
// this.filterConfig = filterConfig;
// }
//
// /**
// * Destroy method for this filter
// */
// public void destroy() {
// }
//
// /**
// * Init method for this filter
// */
// public void init(FilterConfig filterConfig) {
//
// }
//
// private void sendProcessingError(Throwable t, ServletResponse response) {
// String stackTrace = getStackTrace(t);
//
// if (stackTrace != null && !stackTrace.equals("")) {
// try {
// response.setContentType("text/html");
// PrintStream ps = new PrintStream(response.getOutputStream());
// PrintWriter pw = new PrintWriter(ps);
// pw.print("<html>\n<head>\n<title>Error</title>\n</head>\n<body>\n"); //NOI18N
//
// // PENDING! Localize this for next official release
// pw.print("<h1>The resource did not process correctly</h1>\n<pre>\n");
// pw.print(stackTrace);
// pw.print("</pre></body>\n</html>"); //NOI18N
// pw.close();
// ps.close();
// response.getOutputStream().close();
// } catch (Exception ex) {
// }
// } else {
// try {
// PrintStream ps = new PrintStream(response.getOutputStream());
// t.printStackTrace(ps);
// ps.close();
// response.getOutputStream().close();
// } catch (Exception ex) {
// }
// }
// }
//
// public static String getStackTrace(Throwable t) {
// String stackTrace = null;
// try {
// StringWriter sw = new StringWriter();
// PrintWriter pw = new PrintWriter(sw);
// t.printStackTrace(pw);
// pw.close();
// sw.close();
// stackTrace = sw.getBuffer().toString();
// } catch (Exception ex) {
// }
// return stackTrace;
// }
//
// public void log(String msg) {
// filterConfig.getServletContext().log(msg);
// }
//
//}
src/main/webapp/js/general.js
......@@ -41,6 +41,7 @@ const URI_DOCENTES_PROGRAMACION_SEMINARIO = "programacionSeminario";
const URI_DOCENTES_TIPO_SEMINARIO = "tipoSeminario";
const URI_DOCENTES_GRUPO_ACADEMICO = "grupoAcademico";
const URI_DOCENTES_ASISTENCIAS = "asistenciaDocentes";
const URI_ADMINISTRATIVOS_PERIODO_CIERRE_ASISTENCIA = "periodoCierreAsistenciaAdministrativa";
//</editor-fold>
......@@ -459,7 +460,6 @@ let initDatePicker = (...selectorName) => {
}
const initSelect2 = (nodeIdentifier, URI, {title, subtitle} = {}) => {
console.log(2)
$(`${nodeIdentifier}`).select2({
containerCssClass: 'select-xs',
ajax: {
......
src/main/webapp/js/pages/montos_administrativos.js 0 → 100644
const listarPeriodosCierreAsistencia = (nodeIdentifier) => {
ajaxWebService.get(URI_ADMINISTRATIVOS_PERIODO_CIERRE_ASISTENCIA).then((result) => {
let data = result.data;
let html = `<option value="">[SELECCIONE]</option>`;
html += data.map(periodo => `<option value="${periodo.id}">${periodo.descripcion}</option>`);
$(nodeIdentifier).html(html);
$(nodeIdentifier).change((e) => {
let id = $(e.currentTarget).val();
console.log(id)
});
});
// initSelect2(nodeIdentifier, "descripcion");
}
//const initSelect2 = (nodeIdentifier, title = "") => {
// $(`${nodeIdentifier}`).select2({
// containerCssClass: 'select-xs',
// ajax: {
// url: baseURLRest + URI_ADMINISTRATIVOS_PERIODO_CIERRE_ASISTENCIA,
// dataType: `json`,
// delay: 1000,
// data: function (params) {
// return {
// q: params.term, // search term
// page: params.page
// };
// },
// processResults: function (data, params) {
// // parse the results into the format expected by Select2
// // since we are using custom formatting functions we do not need to
// // alter the remote JSON data, except to indicate that infinite
// // scrolling can be used
// params.page = params.page || 1;
//
// return {
// results: data,
// pagination: {
// more: (params.page * 30) < data.length
// }
// };
// },
// cache: true
// },
// placeholder: `Buscar`,
// allowClear: true,
// escapeMarkup: function (markup) {
// return markup;
// }, // let our custom formatter work
// minimumInputLength: 1,
// templateResult: formatRepo,
// templateSelection: formatRepoSelection
// });
//
// function formatRepo(repo) {
// if (repo.loading) {
// return repo.text;
// }
//
// var markup = `
// <div class='select2-result-repository clearfix'>
// <div class='select2-result-repository__title'>${repo[title]}</div>
// </div>`;
//
// return markup;
// }
//
// function formatRepoSelection(repo) {
// if (repo.id) {
// return repo[title];
// } else {
// return repo.text;
// }
//}
//}
const listarSedes = (selectorName) => {
ajaxWebService.get(URI_SEDES).then((result) => {
let sedes = result.data;
sedes = _.orderBy(sedes, s => s.descripcion);
let html = `<option value="">[TODOS]</option>`;
sedes.forEach(sede => html += `<option value="${sede.codigo}">${sede.descripcion}</option>`);
$(`${selectorName}`).html(html);
$(selectorName).select2();
});
};
$(document).ready(function () {
initDatePicker("#dpFechaInicioFiltro", "#dpFechaFinFiltro");
listarSedes("#cboSedesFiltro");
listarPeriodosCierreAsistencia("#cboPeriodoCierreFiltro");
});
\ No newline at end of file
src/main/webapp/vistas/montosAdministrativos.jsp
......@@ -2,23 +2,83 @@
<%@page contentType="text/html" pageEncoding="UTF-8"%>
<!DOCTYPE html>
<html>
<head>
<%@include file="templates/header.jsp" %>
<!--template-core-->
<!--css de la pagina-->
<head>
<%@include file="templates/header.jsp" %>
<!--template-core-->
<!--css de la pagina-->
<link href="../css/lib/sweetalert2.min.css" rel="stylesheet" type="text/css"/>
<!--css-->
</head>
<body>
<%@include file="templates/header-body.jsp" %>
<!-- content -->
<div class="col-md-6 col-md-offset-3">
<div class="panel panel-primary">
<div class="panel-heading">
<h5 class="panel-title">Busqueda</h5>
</div>
<!--css-->
</head>
<body>
<%@include file="templates/header-body.jsp" %>
<!-- content -->
<div class="panel-body">
<div class="row">
<div class="col-md-4 form-group">
<label>Periodo cierre</label>
<select class="select-search form-control" id="cboPeriodoCierreFiltro">
</select>
</div>
<div class="col-md-4 form-group">
<label>Fecha Inicio</label>
<div class="input-group">
<span class="input-group-addon"><i class="icon-calendar"></i></span>
<input type="text" class="form-control" id="dpFechaInicioFiltro">
</div>
</div>
<div class="col-md-4 form-group">
<label>Fecha Fin</label>
<div class="input-group">
<span class="input-group-addon"><i class="icon-calendar"></i></span>
<input type="text" class="form-control" id="dpFechaFinFiltro">
</div>
</div>
</div>
<div class="row">
<div class="col-md-12 form-group">
<label>Sede</label>
<select class="form-control" id="cboSedesFiltro">
</select>
</div>
</div>
</div>
<div class="panel-footer">
<div class="text-center">
<button class="btn btn-primary" id="btnAplicarFiltro"><i class="icon-eye4"></i> Aplicar filtro</button>&nbsp;
<button class="btn btn-primary" id="btnMostrarTodo"><i class="icon-eye4"></i> Mostrar Todo</button>&nbsp;
</div>
</div>
</div>
</div>
<!-- / content -->
<%@include file="templates/footer-body.jsp"%>
<!--js de la pagina-->
<div class="col-md-10 col-md-offset-1">
<div class="panel panel-primary card-3" style="margin-top: 30px">
<div class="panel-heading" style="padding: 8px 15px">
<h6 class="panel-title" style="font-size: 15px; font-family: inherit">Reporte mensual de descuentos</h6>
</div>
<div id="divDatatable"></div>
</div>
</div>
<!-- / content -->
<!--js-->
<%@include file="templates/footer-body.jsp"%>
<!--js de la pagina-->
<script src="../plantilla/assets/js/core/libraries/jquery_ui/widgets.min.js" type="text/javascript"></script>
<script src="../plantilla/assets/js/plugins/ui/moment/moment.min.js" type="text/javascript"></script>
<script src="../plantilla/assets/js/plugins/pickers/datepicker.js" type="text/javascript"></script>
<script src="../js/lib/bootstrap-select.min.js" type="text/javascript"></script>
<script src="../plantilla/assets/js/plugins/forms/selects/select2.min.js"></script>
<script src="../js/lib/lodash.js" type="text/javascript"></script>
<script src="../js/pages/montos_administrativos.js" type="text/javascript"></script>
</body>
<!--js-->
</body>
</html>
\ No newline at end of file
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