Commit 219df09c by Billy Larru

configurando para tener jsp dentro de directorios

parent 39731dbb
...@@ -5,22 +5,39 @@ ...@@ -5,22 +5,39 @@
*/ */
package asistencia.utilities; package asistencia.utilities;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
/** /**
* *
* @author sistem08user * @author sistem08user
*/ */
public class GeneralUtils { public class GeneralUtils {
public static int obtenerIndex(String ruta){
public static int obtenerIndex(String ruta) {
char[] c = ruta.toCharArray(); char[] c = ruta.toCharArray();
int salida = 0; int salida = 0;
for (int i = c.length-1; i >= 0; i--) { for (int i = c.length - 1; i >= 0; i--) {
String help = c[i]+""; String help = c[i] + "";
if(!help.equals("/")){ if (!help.equals("/")) {
salida = i; salida = i;
}else{ } else {
break; break;
} }
} }
return salida; return salida;
} }
public static String obtenerURIvista(String ruta) {
String rutaVista = "";
String patron = ".*/vistas/(.*)";
Pattern pattern = Pattern.compile(patron);
Matcher matcher = pattern.matcher(ruta);
if (matcher.find()) {
rutaVista = matcher.group(1);
}
System.out.println(rutaVista);
return rutaVista;
}
} }
...@@ -148,7 +148,7 @@ let block = () => { ...@@ -148,7 +148,7 @@ let block = () => {
let logOut = () => { let logOut = () => {
document.querySelector('#logOut').addEventListener('click', (e) => { document.querySelector('#logOut').addEventListener('click', (e) => {
window.location.href = '../vistas/logout'; window.location.href = `${contextPath}/vistas/logout`;
}); });
}; };
......
...@@ -37,7 +37,7 @@ let DOMNav = { ...@@ -37,7 +37,7 @@ let DOMNav = {
continue; continue;
} }
html += '<li><a target="_blank" href="../vistas/interceptar?p=' + url + 'vistas/redireccionarServlet&cp=' + cp + '" class="redirect" > '//<img src="assets/images/flags/de.png" alt=""> html += `<li><a target="_blank" href="${contextPath}vistas/interceptar?p=' + url + 'vistas/redireccionarServlet&cp=' + cp + '" class="redirect" > `//<img src="assets/images/flags/de.png" alt="">
+ /*'<i class="glyphicon glyphicon-arrow-right"></i>'+*/proyectos[i].nombre + '</a></li>'; + /*'<i class="glyphicon glyphicon-arrow-right"></i>'+*/proyectos[i].nombre + '</a></li>';
} }
document.getElementById("proyectos").innerHTML = html; document.getElementById("proyectos").innerHTML = html;
......
...@@ -8,6 +8,20 @@ function initializeData() { ...@@ -8,6 +8,20 @@ function initializeData() {
"fecha_entrada": "16/06/2018", "marcacion_entrada": "06:59", "marcacion_salida": "00:00", "fecha_salida": "16/06/2018"}); "fecha_entrada": "16/06/2018", "marcacion_entrada": "06:59", "marcacion_salida": "00:00", "fecha_salida": "16/06/2018"});
data.push({"dni": "12345678", "nombres": "DELGADO CHOZO JUAN FRANCISCO", "sede": "CANTA CALLAO 2", "horario": "07:00 - 07:00", "tipo_horario": "AMANECIDA 24h", data.push({"dni": "12345678", "nombres": "DELGADO CHOZO JUAN FRANCISCO", "sede": "CANTA CALLAO 2", "horario": "07:00 - 07:00", "tipo_horario": "AMANECIDA 24h",
"fecha_entrada": "17/06/2018", "marcacion_entrada": "06:59", "marcacion_salida": "00:00", "fecha_salida": "18/06/2018"}); "fecha_entrada": "17/06/2018", "marcacion_entrada": "06:59", "marcacion_salida": "00:00", "fecha_salida": "18/06/2018"});
data.push({"dni": "12345678", "nombres": "DELGADO CHOZO JUAN FRANCISCO", "sede": "CANTA CALLAO 2", "horario": "07:00 - 07:00", "tipo_horario": "AMANECIDA 24h",
"fecha_entrada": "17/06/2018", "marcacion_entrada": "06:59", "marcacion_salida": "00:00", "fecha_salida": "18/06/2018"});
data.push({"dni": "12345678", "nombres": "DELGADO CHOZO JUAN FRANCISCO", "sede": "CANTA CALLAO 2", "horario": "07:00 - 07:00", "tipo_horario": "AMANECIDA 24h",
"fecha_entrada": "17/06/2018", "marcacion_entrada": "06:59", "marcacion_salida": "00:00", "fecha_salida": "18/06/2018"});
data.push({"dni": "12345678", "nombres": "DELGADO CHOZO JUAN FRANCISCO", "sede": "CANTA CALLAO 2", "horario": "07:00 - 07:00", "tipo_horario": "AMANECIDA 24h",
"fecha_entrada": "17/06/2018", "marcacion_entrada": "06:59", "marcacion_salida": "00:00", "fecha_salida": "18/06/2018"});
data.push({"dni": "12345678", "nombres": "DELGADO CHOZO JUAN FRANCISCO", "sede": "CANTA CALLAO 2", "horario": "07:00 - 07:00", "tipo_horario": "AMANECIDA 24h",
"fecha_entrada": "17/06/2018", "marcacion_entrada": "06:59", "marcacion_salida": "00:00", "fecha_salida": "18/06/2018"});
data.push({"dni": "12345678", "nombres": "DELGADO CHOZO JUAN FRANCISCO", "sede": "CANTA CALLAO 2", "horario": "07:00 - 07:00", "tipo_horario": "AMANECIDA 24h",
"fecha_entrada": "17/06/2018", "marcacion_entrada": "06:59", "marcacion_salida": "00:00", "fecha_salida": "18/06/2018"});
data.push({"dni": "12345678", "nombres": "DELGADO CHOZO JUAN FRANCISCO", "sede": "CANTA CALLAO 2", "horario": "07:00 - 07:00", "tipo_horario": "AMANECIDA 24h",
"fecha_entrada": "17/06/2018", "marcacion_entrada": "06:59", "marcacion_salida": "00:00", "fecha_salida": "18/06/2018"});
data.push({"dni": "12345678", "nombres": "DELGADO CHOZO JUAN FRANCISCO", "sede": "CANTA CALLAO 2", "horario": "07:00 - 07:00", "tipo_horario": "AMANECIDA 24h",
"fecha_entrada": "17/06/2018", "marcacion_entrada": "06:59", "marcacion_salida": "00:00", "fecha_salida": "18/06/2018"});
sedes = ["LINCE", "MONTESORI", "AREQUIPA", "ARENALES", "CUBA", "COCALENOS", "BELISARIO", "BERTONELLI", "VILLA EL SALVADOR"]; sedes = ["LINCE", "MONTESORI", "AREQUIPA", "ARENALES", "CUBA", "COCALENOS", "BELISARIO", "BERTONELLI", "VILLA EL SALVADOR"];
......
...@@ -47,12 +47,12 @@ const DOMSideBar = { ...@@ -47,12 +47,12 @@ const DOMSideBar = {
} }
html += `</li></ul>`; html += `</li></ul>`;
} else { } else {
html += `<li class="${active}"><a href="${categoria[k].url}"><span>${primeraLetraMayuscula(categoria[k].nombre)}</span></a></li>`; html += `<li class="${active}"><a href="${contextPath}vistas/${categoria[k].url}"><span>${primeraLetraMayuscula(categoria[k].nombre)}</span></a></li>`;
} }
} }
html += `</li></ul>`; html += `</li></ul>`;
} else { } else {
html += `<li class="${active}"><a href="${modulo[j].url}"><i class="fa ${modulo[j].ico} fa-lg"></i><span>${primeraLetraMayuscula(modulo[j].nombre)}</span></a></li>`; html += `<li class="${active}"><a href="${contextPath}vistas/${modulo[j].url}"><i class="fa ${modulo[j].ico} fa-lg"></i><span>${primeraLetraMayuscula(modulo[j].nombre)}</span></a></li>`;
} }
} }
} }
......
<%@include file="templates/validar.jsp" %> <jsp:include page="/vistas/templates/validar.jsp" />
<%@page contentType="text/html" pageEncoding="UTF-8"%> <%@page contentType="text/html" pageEncoding="UTF-8"%>
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<%@include file="templates/header.jsp" %> <jsp:include page="/vistas/templates/header.jsp" />
<!--template-core--> <!--template-core-->
<!--css de la pagina--> <!--css de la pagina-->
<!--css--> <!--css-->
</head> </head>
<body> <body>
<%@include file="templates/header-body.jsp" %> <jsp:include page="/vistas/templates/header-body.jsp" />
<!-- content --> <!-- content -->
<!-- / content --> <!-- / content -->
<%@include file="templates/footer-body.jsp"%> <jsp:include page="/vistas/templates/footer-body.jsp" />
<!--js de la pagina--> <!--js de la pagina-->
<!--<script src="${pageContext.request.contextPath}/plantilla/assets/js/plugins/tables/datatables/datatables.min.js" type="text/javascript"></script>-->
<!--js--> <!--js-->
</body> </body>
......
<%@include file="templates/validar.jsp" %> <jsp:include page="/vistas/templates/validar.jsp" />
<%@page contentType="text/html" pageEncoding="UTF-8"%> <%@page contentType="text/html" pageEncoding="UTF-8"%>
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<%@include file="templates/header.jsp" %> <jsp:include page="/vistas/templates/header.jsp" />
<!--template-core--> <!--template-core-->
<!--css de la pagina--> <!--css de la pagina-->
<!--<link href="../css/lib/bootstrap-select/bootstrap-select.min.css" rel="stylesheet" type="text/css"/>--> <!--<link href="../css/lib/bootstrap-select/bootstrap-select.min.css" rel="stylesheet" type="text/css"/>-->
<!--css--> <!--css-->
</head> </head>
<body> <body>
<%@include file="templates/header-body.jsp" %> <jsp:include page="/vistas/templates/header-body.jsp" />
<!-- content --> <!-- content -->
<div class="col-md-6 col-md-offset-3"> <div class="col-md-6 col-md-offset-3">
...@@ -253,14 +253,14 @@ ...@@ -253,14 +253,14 @@
<!-- / content --> <!-- / content -->
<%@include file="templates/footer-body.jsp"%> <jsp:include page="/vistas/templates/footer-body.jsp" />
<!--js de la pagina--> <!--js de la pagina-->
<script type="text/javascript" src="https://cdn.datatables.net/1.10.16/js/jquery.dataTables.min.js"></script> <script src="https://cdn.datatables.net/1.10.16/js/jquery.dataTables.min.js" type="text/javascript"></script>
<script type="text/javascript" src="https://cdn.datatables.net/1.10.16/js/dataTables.bootstrap.min.js"></script> <script src="https://cdn.datatables.net/1.10.16/js/dataTables.bootstrap.min.js" type="text/javascript"></script>
<script src="../js/lib/bootstrap-select/bootstrap-select.min.js" type="text/javascript"></script> <script src="${pageContext.request.contextPath}/js/lib/bootstrap-select/bootstrap-select.min.js" type="text/javascript"></script>
<script type="text/javascript" src="../plantilla/assets/js/plugins/pickers/daterangepicker.js"></script> <script src="${pageContext.request.contextPath}/plantilla/assets/js/plugins/pickers/daterangepicker.js" type="text/javascript"></script>
<script type="text/javascript" src="../plantilla/assets/js/core/libraries/jquery_ui/widgets.min.js"></script> <script src="${pageContext.request.contextPath}/plantilla/assets/js/core/libraries/jquery_ui/widgets.min.js" type="text/javascript"></script>
<script src="../js/pages/controlAsistenciaDocentes.js" type="text/javascript"></script> <script src="${pageContext.request.contextPath}/js/pages/controlAsistenciaDocentes.js" type="text/javascript"></script>
<!--js--> <!--js-->
</body> </body>
</html> </html>
\ No newline at end of file
...@@ -6,8 +6,8 @@ ...@@ -6,8 +6,8 @@
<meta charset="utf-8"> <meta charset="utf-8">
<title>Trismegisto Asistencia</title> <title>Trismegisto Asistencia</title>
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/normalize/5.0.0/normalize.min.css"> <link href="https://cdnjs.cloudflare.com/ajax/libs/normalize/5.0.0/normalize.min.css" rel="stylesheet"/>
<link href="../css/pages/error.css" rel="stylesheet" type="text/css"/> <link href="${pageContext.request.contextPath}/css/pages/error.css" rel="stylesheet" type="text/css"/>
<style> <style>
@import "https://fonts.googleapis.com/css?family=Inconsolata"; @import "https://fonts.googleapis.com/css?family=Inconsolata";
html { html {
...@@ -132,7 +132,7 @@ ...@@ -132,7 +132,7 @@
%> %>
</p> </p>
<p class="output">Haga click aquí para <a href="../vistas/index.jsp">volver a la página principal</a></p> <p class="output">Haga click aquí para <a href="${pageContext.request.contextPath}/vistas/index.jsp">volver a la página principal</a></p>
</div> </div>
</body> </body>
......
<%@include file="templates/validar.jsp" %> <jsp:include page="/vistas/templates/validar.jsp" />
<%@page contentType="text/html" pageEncoding="UTF-8"%> <%@page contentType="text/html" pageEncoding="UTF-8"%>
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
<head> <head>
<%@include file="templates/header.jsp" %> <jsp:include page="/vistas/templates/header.jsp" />
<!--template-core--> <!--template-core-->
<!--css--> <!--css-->
...@@ -11,24 +11,22 @@ ...@@ -11,24 +11,22 @@
</head> </head>
<body> <body>
<%@include file="templates/header-body.jsp" %> <jsp:include page="/vistas/templates/header-body.jsp" />
<!-- content --> <!-- content -->
<!-- / content --> <!-- / content -->
<jsp:include page="/vistas/templates/footer-body.jsp" />
<%@include file="templates/footer-body.jsp" %>
<!--js--> <!--js-->
<script type="text/javascript" src="../plantilla/assets/js/plugins/forms/selects/bootstrap_select.min.js"></script> <script src="${pageContext.request.contextPath}/plantilla/assets/js/plugins/forms/selects/bootstrap_select.min.js" type="text/javascript"></script>
<script src="${pageContext.request.contextPath}/plantilla/assets/js/pages/form_bootstrap_select.js" type="text/javascript"></script>
<script type="text/javascript" src="../plantilla/assets/js/pages/form_bootstrap_select.js"></script>
<script> <script>
((window) => { ((window) => {
window.history.replaceState({}, '', 'main.jsp'); window.history.replaceState({}, '', contextPath + 'vistas/main.jsp');
})(window); })(window);
</script> </script>
</body> </body>
......
<%@include file="templates/validar.jsp" %> <jsp:include page="/vistas/templates/validar.jsp" />
<%@page contentType="text/html" pageEncoding="UTF-8"%> <%@page contentType="text/html" pageEncoding="UTF-8"%>
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<%@include file="templates/header.jsp" %> <jsp:include page="/vistas/templates/header.jsp" />
<!--template-core--> <!--template-core-->
<!--css de la pagina--> <!--css de la pagina-->
<!--css--> <!--css-->
</head> </head>
<body> <body>
<%@include file="templates/header-body.jsp" %> <jsp:include page="/vistas/templates/header-body.jsp" />
<!-- content --> <!-- content -->
<!-- / content --> <!-- / content -->
<%@include file="templates/footer-body.jsp"%> <jsp:include page="/vistas/templates/footer-body.jsp" />
<!--js de la pagina--> <!--js de la pagina-->
<!--js--> <!--js-->
......
<%@include file="templates/validar.jsp" %> <jsp:include page="/vistas/templates/validar.jsp" />
<%@page contentType="text/html" pageEncoding="UTF-8"%> <%@page contentType="text/html" pageEncoding="UTF-8"%>
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<%@include file="templates/header.jsp" %> <jsp:include page="/vistas/templates/header.jsp" />
<!--template-core--> <!--template-core-->
<!--css de la pagina--> <!--css de la pagina-->
<!--css--> <!--css-->
</head> </head>
<body> <body>
<%@include file="templates/header-body.jsp" %> <jsp:include page="/vistas/templates/header-body.jsp" />
<!-- content --> <!-- content -->
<div class="col-md-4 col-md-offset-4"> <div class="col-md-4 col-md-offset-4">
<div class="panel panel-primary"> <div class="panel panel-primary">
...@@ -100,14 +100,14 @@ ...@@ -100,14 +100,14 @@
<!-- / content --> <!-- / content -->
<%@include file="templates/footer-body.jsp"%> <jsp:include page="/vistas/templates/footer-body.jsp" />
<!--js de la pagina--> <!--js de la pagina-->
<script src="../plantilla/assets/js/plugins/tables/datatables/datatables.min.js" type="text/javascript"></script> <script src="${pageContext.request.contextPath}/plantilla/assets/js/plugins/tables/datatables/datatables.min.js" type="text/javascript"></script>
<script src="../plantilla/assets/js/plugins/ui/moment/moment.min.js" type="text/javascript"></script> <script src="${pageContext.request.contextPath}/plantilla/assets/js/plugins/ui/moment/moment.min.js" type="text/javascript"></script>
<script type="text/javascript" src="../plantilla/assets/js/plugins/pickers/daterangepicker.js"></script> <script src="${pageContext.request.contextPath}/plantilla/assets/js/plugins/pickers/daterangepicker.js" type="text/javascript"></script>
<script type="text/javascript" src="../plantilla/assets/js/core/libraries/jquery_ui/widgets.min.js"></script> <script src="${pageContext.request.contextPath}/plantilla/assets/js/core/libraries/jquery_ui/widgets.min.js" type="text/javascript"></script>
<script src="../js/lib/lodash.js" type="text/javascript"></script> <script src="${pageContext.request.contextPath}/js/lib/lodash.js" type="text/javascript"></script>
<script src="../js/pages/comparativo_proyeccion_policias.js" type="text/javascript"></script> <script src="${pageContext.request.contextPath}/js/pages/comparativo_proyeccion_policias.js" type="text/javascript"></script>
<!--js--> <!--js-->
</body> </body>
......
<%@include file="templates/validar.jsp" %> <jsp:include page="/vistas/templates/validar.jsp" />
<%@page contentType="text/html" pageEncoding="UTF-8"%> <%@page contentType="text/html" pageEncoding="UTF-8"%>
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<%@include file="templates/header.jsp" %> <jsp:include page="/vistas/templates/header.jsp" />
<!--template-core--> <!--template-core-->
<!--css de la pagina--> <!--css de la pagina-->
<!--css--> <!--css-->
</head> </head>
<body> <body>
<%@include file="templates/header-body.jsp" %> <jsp:include page="/vistas/templates/header-body.jsp" />
<!-- content --> <!-- content -->
<div class="col-md-6 col-md-offset-3"> <div class="col-md-6 col-md-offset-3">
<div class="panel panel-primary"> <div class="panel panel-primary">
...@@ -372,16 +372,16 @@ ...@@ -372,16 +372,16 @@
<!-- / content --> <!-- / content -->
<%@include file="templates/footer-body.jsp"%> <jsp:include page="/vistas/templates/footer-body.jsp" />
<!--js de la pagina--> <!--js de la pagina-->
<script type="text/javascript" src="https://cdn.datatables.net/1.10.16/js/jquery.dataTables.min.js"></script> <script src="https://cdn.datatables.net/1.10.16/js/jquery.dataTables.min.js" type="text/javascript"></script>
<script type="text/javascript" src="https://cdn.datatables.net/1.10.16/js/dataTables.bootstrap.min.js"></script> <script src="https://cdn.datatables.net/1.10.16/js/dataTables.bootstrap.min.js" type="text/javascript"></script>
<script src="../js/lib/bootstrap-select/bootstrap-select.min.js" type="text/javascript"></script> <script src="${pageContext.request.contextPath}/js/lib/bootstrap-select/bootstrap-select.min.js" type="text/javascript"></script>
<script type="text/javascript" src="../plantilla/assets/js/plugins/pickers/daterangepicker.js"></script> <script src="${pageContext.request.contextPath}/plantilla/assets/js/plugins/pickers/daterangepicker.js" type="text/javascript"></script>
<script type="text/javascript" src="../plantilla/assets/js/core/libraries/jquery_ui/widgets.min.js"></script> <script src="${pageContext.request.contextPath}/plantilla/assets/js/core/libraries/jquery_ui/widgets.min.js" type="text/javascript"></script>
<script src="../js/pages/control_asistencia_policias.js" type="text/javascript"></script> <script src="${pageContext.request.contextPath}/js/pages/control_asistencia_policias.js" type="text/javascript"></script>
<!--js--> <!--js-->
</body> </body>
</html> </html>
\ No newline at end of file
<%@include file="templates/validar.jsp" %> <jsp:include page="/vistas/templates/validar.jsp" />
<%@page contentType="text/html" pageEncoding="UTF-8"%> <%@page contentType="text/html" pageEncoding="UTF-8"%>
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<%@include file="templates/header.jsp" %> <jsp:include page="/vistas/templates/header.jsp" />
<!--template-core--> <!--template-core-->
<!--css de la pagina--> <!--css de la pagina-->
<link href="../plantilla/assets/css/extras/animate.min.css" rel="stylesheet" type="text/css"> <link href="${pageContext.request.contextPath}/plantilla/assets/css/extras/animate.min.css" rel="stylesheet" type="text/css">
<!--css--> <!--css-->
</head> </head>
<body> <body>
<%@include file="templates/header-body.jsp" %> <jsp:include page="/vistas/templates/header-body.jsp" />
<!-- content --> <!-- content -->
<div class="col-md-5 col-md-offset-3"> <div class="col-md-5 col-md-offset-3">
<div class="panel panel-primary"> <div class="panel panel-primary">
...@@ -899,22 +899,22 @@ ...@@ -899,22 +899,22 @@
</div> </div>
<!-- / content --> <!-- / content -->
<%@include file="templates/footer-body.jsp"%> <jsp:include page="/vistas/templates/footer-body.jsp" />
<!--js de la pagina--> <!--js de la pagina-->
<script type="text/javascript" src="../plantilla/assets/js/core/libraries/jquery_ui/interactions.min.js"></script> <script src="${pageContext.request.contextPath}/plantilla/assets/js/core/libraries/jquery_ui/interactions.min.js" type="text/javascript"></script>
<script type="text/javascript" src="../plantilla/assets/js/core/libraries/jquery_ui/widgets.min.js"></script> <script src="${pageContext.request.contextPath}/plantilla/assets/js/core/libraries/jquery_ui/widgets.min.js" type="text/javascript"></script>
<script src="../js/lib/bootstrap-select/bootstrap-select.min.js" type="text/javascript"></script> <script src="${pageContext.request.contextPath}/js/lib/bootstrap-select/bootstrap-select.min.js" type="text/javascript"></script>
<script type="text/javascript" src="../plantilla/assets/js/plugins/forms/selects/select2.min.js"></script> <script src="${pageContext.request.contextPath}/plantilla/assets/js/plugins/forms/selects/select2.min.js" type="text/javascript"></script>
<script type="text/javascript" src="../plantilla/assets/js/plugins/ui/moment/moment.min.js"></script> <script src="${pageContext.request.contextPath}/plantilla/assets/js/plugins/ui/moment/moment.min.js" type="text/javascript"></script>
<script type="text/javascript" src="../plantilla/assets/js/plugins/pickers/daterangepicker.js"></script> <script src="${pageContext.request.contextPath}/plantilla/assets/js/plugins/pickers/daterangepicker.js" type="text/javascript"></script>
<script src="../js/lib/jquery-ui.multidatespicker.js" type="text/javascript"></script> <script src="${pageContext.request.contextPath}/js/lib/jquery-ui.multidatespicker.js" type="text/javascript"></script>
<script type="text/javascript" src="../plantilla/assets/js/plugins/extensions/contextmenu.js"></script> <script src="${pageContext.request.contextPath}/plantilla/assets/js/plugins/extensions/contextmenu.js" type="text/javascript"></script>
<script src="../js/pages/crearRolPolicia.js" type="text/javascript"></script> <script src="${pageContext.request.contextPath}/js/pages/crearRolPolicia.js" type="text/javascript"></script>
<!--js--> <!--js-->
......
<%@include file="templates/validar.jsp" %> <jsp:include page="/vistas/templates/validar.jsp" />
<%@page contentType="text/html" pageEncoding="UTF-8"%> <%@page contentType="text/html" pageEncoding="UTF-8"%>
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<%@include file="templates/header.jsp" %> <jsp:include page="/vistas/templates/header.jsp" />
<!--template-core--> <!--template-core-->
<!--css de la pagina--> <!--css de la pagina-->
<!--css--> <!--css-->
</head> </head>
<body> <body>
<%@include file="templates/header-body.jsp" %> <jsp:include page="/vistas/templates/header-body.jsp" />
<!-- content --> <!-- content -->
<!-- / content --> <!-- / content -->
<%@include file="templates/footer-body.jsp"%> <jsp:include page="/vistas/templates/footer-body.jsp" />
<!--js de la pagina--> <!--js de la pagina-->
<!--js--> <!--js-->
......
<%@include file="templates/validar.jsp" %> <jsp:include page="/vistas/templates/validar.jsp" />
<%@page contentType="text/html" pageEncoding="UTF-8"%> <%@page contentType="text/html" pageEncoding="UTF-8"%>
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<%@include file="templates/header.jsp" %> <jsp:include page="/vistas/templates/header.jsp" />
<!--template-core--> <!--template-core-->
<!--css de la pagina--> <!--css de la pagina-->
<!--css--> <!--css-->
</head> </head>
<body> <body>
<%@include file="templates/header-body.jsp" %> <jsp:include page="/vistas/templates/header-body.jsp" />
<!-- content --> <!-- content -->
<div class="col-md-4 col-md-offset-4"> <div class="col-md-4 col-md-offset-4">
...@@ -172,7 +172,7 @@ ...@@ -172,7 +172,7 @@
<!-- / content --> <!-- / content -->
<%@include file="templates/footer-body.jsp"%> <jsp:include page="/vistas/templates/footer-body.jsp" />
<!--js de la pagina--> <!--js de la pagina-->
<!--js--> <!--js-->
......
<%@include file="templates/validar.jsp" %> <jsp:include page="/vistas/templates/validar.jsp" />
<%@page contentType="text/html" pageEncoding="UTF-8"%> <%@page contentType="text/html" pageEncoding="UTF-8"%>
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<%@include file="templates/header.jsp" %> <jsp:include page="/vistas/templates/header.jsp" />
<!--template-core--> <!--template-core-->
<!--css de la pagina--> <!--css de la pagina-->
<!--css--> <!--css-->
</head> </head>
<body> <body>
<%@include file="templates/header-body.jsp" %> <jsp:include page="/vistas/templates/header-body.jsp" />
<!-- content --> <!-- content -->
<div class="col-md-4 col-md-offset-4"> <div class="col-md-4 col-md-offset-4">
<div class="panel panel-primary"> <div class="panel panel-primary">
...@@ -307,10 +307,10 @@ ...@@ -307,10 +307,10 @@
<!-- / content --> <!-- / content -->
<%@include file="templates/footer-body.jsp"%> <jsp:include page="/vistas/templates/footer-body.jsp" />
<!--js de la pagina--> <!--js de la pagina-->
<script src="../plantilla/assets/js/plugins/tables/datatables/datatables.min.js" type="text/javascript"></script> <script src="${pageContext.request.contextPath}/plantilla/assets/js/plugins/tables/datatables/datatables.min.js" type="text/javascript"></script>
<script type="text/javascript" src="../plantilla/assets/js/plugins/forms/styling/switch.min.js"></script> <script src="${pageContext.request.contextPath}/plantilla/assets/js/plugins/forms/styling/switch.min.js" type="text/javascript"></script>
<script> <script>
$(".styled, .multiselect-container input").uniform({ $(".styled, .multiselect-container input").uniform({
radioClass: 'choice' radioClass: 'choice'
......
<%@include file="templates/validar.jsp" %> <jsp:include page="/vistas/templates/validar.jsp" />
<%@page contentType="text/html" pageEncoding="UTF-8"%> <%@page contentType="text/html" pageEncoding="UTF-8"%>
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<%@include file="templates/header.jsp" %> <jsp:include page="/vistas/templates/header.jsp" />
<!--template-core--> <!--template-core-->
<!--css de la pagina--> <!--css de la pagina-->
<!--css--> <!--css-->
</head> </head>
<body> <body>
<%@include file="templates/header-body.jsp" %> <jsp:include page="/vistas/templates/header-body.jsp" />
<!-- content --> <!-- content -->
<div class="col-md-6 col-md-offset-3"> <div class="col-md-6 col-md-offset-3">
<div class="panel panel-primary"> <div class="panel panel-primary">
...@@ -95,17 +95,17 @@ ...@@ -95,17 +95,17 @@
<!-- / content --> <!-- / content -->
<%@include file="templates/footer-body.jsp"%> <jsp:include page="/vistas/templates/footer-body.jsp" />
<!--js de la pagina--> <!--js de la pagina-->
<script src="../plantilla/assets/js/plugins/ui/moment/moment.min.js" type="text/javascript"></script> <script src="${pageContext.request.contextPath}/plantilla/assets/js/plugins/ui/moment/moment.min.js" type="text/javascript"></script>
<script type="text/javascript" src="../plantilla/assets/js/plugins/pickers/daterangepicker.js"></script> <script src="${pageContext.request.contextPath}/plantilla/assets/js/plugins/pickers/daterangepicker.js" type="text/javascript"></script>
<script type="text/javascript" src="../plantilla/assets/js/core/libraries/jquery_ui/widgets.min.js"></script> <script src="${pageContext.request.contextPath}/plantilla/assets/js/core/libraries/jquery_ui/widgets.min.js" type="text/javascript" ></script>
<script src="../plantilla/assets/js/plugins/tables/datatables/datatables.min.js" type="text/javascript"></script> <script src="${pageContext.request.contextPath}/plantilla/assets/js/plugins/tables/datatables/datatables.min.js" type="text/javascript"></script>
<script src="../js/lib/dataTables.rowsGroup.js" type="text/javascript"></script> <script src="${pageContext.request.contextPath}/js/lib/dataTables.rowsGroup.js" type="text/javascript"></script>
<script type="text/javascript" src="../plantilla/assets/js/plugins/tables/handsontable/handsontable.min.js"></script> <script src="${pageContext.request.contextPath}/plantilla/assets/js/plugins/tables/handsontable/handsontable.min.js" type="text/javascript" ></script>
<script src="../js/lib/jquery.inputmask.bundle.min.js" type="text/javascript"></script> <script src="${pageContext.request.contextPath}/js/lib/jquery.inputmask.bundle.min.js" type="text/javascript"></script>
<script src="../js/pages/proyectar_asistencia_policias.js" type="text/javascript"></script> <script src="${pageContext.request.contextPath}/js/pages/proyectar_asistencia_policias.js" type="text/javascript"></script>
<!--js--> <!--js-->
</body> </body>
......
...@@ -15,21 +15,22 @@ ...@@ -15,21 +15,22 @@
<!-- /page content --> <!-- /page content -->
</div> </div>
<!-- /page container --> <!-- /page container -->
<!-- Core JS files --> <!-- Core JS files -->
<script type="text/javascript" src="../plantilla/assets/js/plugins/loaders/pace.min.js"></script> <script src="${pageContext.request.contextPath}/plantilla/assets/js/plugins/loaders/pace.min.js" type="text/javascript"></script>
<script type="text/javascript" src="../plantilla/assets/js/core/libraries/jquery.min.js"></script> <script src="${pageContext.request.contextPath}/plantilla/assets/js/core/libraries/jquery.min.js" type="text/javascript" ></script>
<script src="../js/lib/jquery.cookie.js" type="text/javascript"></script> <script src="${pageContext.request.contextPath}/js/lib/jquery.cookie.js" type="text/javascript"></script>
<script type="text/javascript" src="../plantilla/assets/js/core/libraries/bootstrap.min.js"></script> <script src="${pageContext.request.contextPath}/plantilla/assets/js/core/libraries/bootstrap.min.js" type="text/javascript" ></script>
<script type="text/javascript" src="../plantilla/assets/js/plugins/loaders/blockui.min.js"></script> <script src="${pageContext.request.contextPath}/plantilla/assets/js/plugins/loaders/blockui.min.js" type="text/javascript" ></script>
<script type="text/javascript" src="../plantilla/assets/js/plugins/forms/styling/switchery.min.js"></script> <script src="${pageContext.request.contextPath}/plantilla/assets/js/plugins/forms/styling/switchery.min.js" type="text/javascript"></script>
<script type="text/javascript" src="../plantilla/assets/js/plugins/forms/styling/uniform.min.js"></script> <script src="${pageContext.request.contextPath}/plantilla/assets/js/plugins/forms/styling/uniform.min.js" type="text/javascript"></script>
<!--<script type="text/javascript" src="../plantilla/assets/js/plugins/forms/selects/bootstrap_multiselect.js"></script>--> <!--<script type="text/javascript" src="../plantilla/assets/js/plugins/forms/selects/bootstrap_multiselect.js"></script>-->
<script type="text/javascript" src="../plantilla/assets/js/core/app.js"></script> <script src="${pageContext.request.contextPath}/plantilla/assets/js/core/app.js" type="text/javascript"></script>
<!-- /core JS files --> <!-- /core JS files -->
<!-- /Generales --> <!-- /Generales -->
<script src="../js/general.js" type="text/javascript"></script> <script src="${pageContext.request.contextPath}/js/general.js" type="text/javascript"></script>
<script src="../js/pages/navbar.js" type="text/javascript"></script> <script src="${pageContext.request.contextPath}/js/pages/navbar.js" type="text/javascript"></script>
<script src="../js/pages/sidebar.js" type="text/javascript"></script> <script src="${pageContext.request.contextPath}/js/pages/sidebar.js" type="text/javascript"></script>
\ No newline at end of file \ No newline at end of file
<%@include file="navbar.jsp" %> <jsp:include page="navbar.jsp" />
<!-- Page container --> <!-- Page container -->
<div class="page-container"> <div class="page-container">
...@@ -7,8 +6,7 @@ ...@@ -7,8 +6,7 @@
<!-- Page content --> <!-- Page content -->
<div class="page-content"> <div class="page-content">
<%@include file="sidebar.jsp" %> <jsp:include page="sidebar.jsp" />
<!-- Main content --> <!-- Main content -->
<div class="content-wrapper"> <div class="content-wrapper">
......
...@@ -4,20 +4,23 @@ ...@@ -4,20 +4,23 @@
<title>Trismegisto Asistencia</title> <title>Trismegisto Asistencia</title>
<!-- Global stylesheets --> <!-- Global stylesheets -->
<link href="https://fonts.googleapis.com/css?family=Roboto:400,300,100,500,700,900" rel="stylesheet" type="text/css"> <link href="https://fonts.googleapis.com/css?family=Roboto:400,300,100,500,700,900" rel="stylesheet" type="text/css">
<link href="../plantilla/assets/css/icons/icomoon/styles.css" rel="stylesheet" type="text/css"> <link href="${pageContext.request.contextPath}/plantilla/assets/css/icons/icomoon/styles.css" rel="stylesheet" type="text/css">
<link href="../plantilla/assets/css/icons/fontawesome/styles.min.css" rel="stylesheet" type="text/css"> <link href="${pageContext.request.contextPath}/plantilla/assets/css/icons/fontawesome/styles.min.css" rel="stylesheet" type="text/css">
<link href="../plantilla/assets/css/bootstrap.css" rel="stylesheet" type="text/css"> <link href="${pageContext.request.contextPath}/plantilla/assets/css/bootstrap.css" rel="stylesheet" type="text/css">
<link href="../plantilla/assets/css/core.css" rel="stylesheet" type="text/css"> <link href="${pageContext.request.contextPath}/plantilla/assets/css/core.css" rel="stylesheet" type="text/css">
<link href="../plantilla/assets/css/components.css" rel="stylesheet" type="text/css"> <link href="${pageContext.request.contextPath}/plantilla/assets/css/components.css" rel="stylesheet" type="text/css">
<link href="../plantilla/assets/css/colors.css" rel="stylesheet" type="text/css"> <link href="${pageContext.request.contextPath}/plantilla/assets/css/colors.css" rel="stylesheet" type="text/css">
<link href="../css/general.css" rel="stylesheet" type="text/css"/> <link href="${pageContext.request.contextPath}/css/general.css" rel="stylesheet" type="text/css"/>
<!--<link href="${pageContext.request.contextPath}/num/num.css" rel="stylesheet" type="text/css"/>-->
<!-- /global stylesheets --> <!-- /global stylesheets -->
<script src="../js/lib/cookies.js" type="text/javascript"></script> <script src="${pageContext.request.contextPath}/js/lib/cookies.js" type="text/javascript"></script>
<!--<script src="../js/pages/validate.js" type="text/javascript"></script>--> <!--<script src="../js/pages/validate.js" type="text/javascript"></script>-->
<script> <script>
var sidebar = <%=(String)request.getSession().getAttribute("menu")%>; var sidebar = <%=(String) request.getSession().getAttribute("menu")%>;
var nombreUsuario = "<%=(String)request.getSession().getAttribute("nombre")%>"; var nombreUsuario = "<%=(String) request.getSession().getAttribute("nombre")%>";
var rolesUsuario = "<%=(String)request.getSession().getAttribute("roles")%>"; var rolesUsuario = "<%=(String) request.getSession().getAttribute("roles")%>";
var contextPath = "${pageContext.request.contextPath}/";
</script> </script>
\ No newline at end of file
<!-- Main navbar --> <!-- Main navbar -->
<div class="navbar navbar-default header-highlight"> <div class="navbar navbar-default header-highlight">
<div class="navbar-header"> <div class="navbar-header">
<a class="navbar-brand" href="../vistas/main.jsp"><img src="../plantilla/assets/images/logo_light.png" alt=""></a> <a class="navbar-brand" href="${pageContext.request.contextPath}/vistas/main.jsp"><img src="${pageContext.request.contextPath}/plantilla/assets/images/logo_light.png" alt=""></a>
<ul class="nav navbar-nav visible-xs-block"> <ul class="nav navbar-nav visible-xs-block">
<li><a data-toggle="collapse" data-target="#navbar-mobile"><i class="icon-tree5"></i></a></li> <li><a data-toggle="collapse" data-target="#navbar-mobile"><i class="icon-tree5"></i></a></li>
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
<ul class="nav navbar-nav navbar-right"> <ul class="nav navbar-nav navbar-right">
<li class="dropdown language-switch"> <li class="dropdown language-switch">
<a class="dropdown-toggle" data-toggle="dropdown" aria-expanded="false"> <a class="dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
<img src="assets/images/flags/gb.png" class="position-left " alt=""> <img src="${pageContext.request.contextPath}/plantilla/assets/images/flags/gb.png" class="position-left " alt="">
Sistemas Sistemas
<span class="caret"></span> <span class="caret"></span>
</a> </a>
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<!-- User menu --> <!-- User menu -->
<div class="sidebar-user"> <div class="sidebar-user">
<div class="category-content tp-sidebar-category-content"> <div class="category-content tp-sidebar-category-content">
<a href="main.jsp" class="media-left" style="padding-right: 0px;"> <a href="${pageContext.request.contextPath}/main.jsp" class="media-left" style="padding-right: 0px;">
<!--box-shadow: 0px 0px 13px 0px rgba(0,0,0,0.75);--> <!--box-shadow: 0px 0px 13px 0px rgba(0,0,0,0.75);-->
<img alt="Avatar usuario" class="avatar" style=" border-radius: 50%; border:2px solid white;"> <img alt="Avatar usuario" class="avatar" style=" border-radius: 50%; border:2px solid white;">
</a> </a>
......
...@@ -6,6 +6,6 @@ ...@@ -6,6 +6,6 @@
System.out.println("Validando..."); System.out.println("Validando...");
if (session.getAttribute("usuario") == null) { if (session.getAttribute("usuario") == null) {
response.sendRedirect("main.jsp"); response.sendRedirect(request.getContextPath() + "/vistas/main.jsp");
} }
%> %>
\ 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