Skip to content

A
Asistencia
Commit bc3a9899 by Billy Larru
Options

centrando columnas y cambiando rango de fechas al datepicker

parent d698ce78
Showing with 62 additions and 35 deletions
src/main/webapp/js/pages/control_asistencia_policias.js
...@@ -175,12 +175,12 @@ $().ready(function () { ...@@ -175,12 +175,12 @@ $().ready(function () {
}); });
$("#dpFechaInicio").datepicker({ $("#dpFechaInicio").datepicker({
minDate: new Date(2000, 1 - 1, 1), maxDate: new Date(), minDate: new Date(2000, 1 - 1, 1), maxDate: new Date(2018, 6, 31),
dateFormat: 'dd/mm/yy', dateFormat: 'dd/mm/yy',
defaultDate: new Date(), // defaultDate: new Date(),
changeMonth: true, changeMonth: true,
changeYear: true, changeYear: true,
yearRange: '-18:+0', yearRange: '-18:0',
onSelect: function () { onSelect: function () {
// $(this).valid(); // $(this).valid();
} }
...@@ -188,7 +188,7 @@ $().ready(function () { ...@@ -188,7 +188,7 @@ $().ready(function () {
$("#dpFechaInicio").datepicker('setDate', 'now'); $("#dpFechaInicio").datepicker('setDate', 'now');
$("#dpFechaFin").datepicker({ $("#dpFechaFin").datepicker({
minDate: new Date(2000, 1 - 1, 1), maxDate: new Date(), minDate: new Date(2000, 1 - 1, 1), maxDate: new Date(2018, 6, 31),
dateFormat: 'dd/mm/yy', dateFormat: 'dd/mm/yy',
defaultDate: new Date(), defaultDate: new Date(),
changeMonth: true, changeMonth: true,
......
src/main/webapp/vistas/controlAsistenciaPolicias.jsp
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
<form id="frmAsistenciaPolicias" onsubmit="return false;" autocomplete="off"> <form id="frmAsistenciaPolicias" onsubmit="return false;" autocomplete="off">
<div class="panel-body"> <div class="panel-body">
<div class="row"> <div class="row">
<div class="col-md-3 form-group"> <div class="col-md-4 form-group">
<label>Busqueda por</label> <label>Busqueda por</label>
<select class="form-control" id="cboCriterio"> <select class="form-control" id="cboCriterio">
<option>SEDE</option> <option>SEDE</option>
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
<option>DNI</option> <option>DNI</option>
</select> </select>
</div> </div>
<div class="col-md-9 form-group"> <div class="col-md-8 form-group">
<!-- <label>Busqueda</label> <!-- <label>Busqueda</label>
<input type="text" class="form-control"/>--> <input type="text" class="form-control"/>-->
<div id="divCriterio"><label>Sede</label> <div id="divCriterio"><label>Sede</label>
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
</div> </div>
<div class="row"> <div class="row">
<div class="col-md-6 form-group"> <div class="col-md-4 form-group">
<label>Fecha Inicio</label> <label>Fecha Inicio</label>
<div class="input-group"> <div class="input-group">
<span class="input-group-addon"><i class="icon-calendar"></i></span> <span class="input-group-addon"><i class="icon-calendar"></i></span>
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
</div> </div>
</div> </div>
<div class="col-md-6 form-group"> <div class="col-md-4 form-group">
<label>Fecha Fin</label> <label>Fecha Fin</label>
<div class="input-group"> <div class="input-group">
<span class="input-group-addon"><i class="icon-calendar"></i></span> <span class="input-group-addon"><i class="icon-calendar"></i></span>
...@@ -60,11 +60,8 @@ ...@@ -60,11 +60,8 @@
</div> </div>
</div> </div>
</div>
<div class="col-md-4 form-group">
<div class="row">
<div class="col-md-10 form-group">
<label>Estado</label> <label>Estado</label>
<select class="selectpicker form-control" name="cboSedes" id="cboSedes" multiple> <select class="selectpicker form-control" name="cboSedes" id="cboSedes" multiple>
<option>PENDIENTE</option> <option>PENDIENTE</option>
...@@ -77,6 +74,11 @@ ...@@ -77,6 +74,11 @@
</div> </div>
</div> </div>
<div class="row">
</div>
</div> </div>
<div class="panel-footer"> <div class="panel-footer">
<div class="text-center"> <div class="text-center">
...@@ -119,8 +121,8 @@ ...@@ -119,8 +121,8 @@
<td>HUAMANI TAIPE, FRANCISCO</td> <td>HUAMANI TAIPE, FRANCISCO</td>
<td>26/06/2018</td> <td>26/06/2018</td>
<td>07:00 - 17:00</td> <td>07:00 - 17:00</td>
<td>REGULAR</td> <td class="text-center">REGULAR</td>
<td>IMPAR</td> <td class="text-center">IMPAR</td>
<td class="text-center"> <td class="text-center">
<span class="text-success font-weight-bold">06:32</span> <span class="text-success font-weight-bold">06:32</span>
</td> </td>
...@@ -133,8 +135,8 @@ ...@@ -133,8 +135,8 @@
<td>LEON GOMEZ, MARIO JOSIMAR</td> <td>LEON GOMEZ, MARIO JOSIMAR</td>
<td>26/06/2018</td> <td>26/06/2018</td>
<td>19:00 - 07:00</td> <td>19:00 - 07:00</td>
<td>AMANECIDA 12H</td> <td class="text-center">AMANECIDA 12H</td>
<td>IMPAR</td> <td class="text-center">IMPAR</td>
<td class="text-center">19:07</td> <td class="text-center">19:07</td>
<td class="text-center">07:02</td> <td class="text-center">07:02</td>
<td><span class="label label-warning">TARDANZA</span></td> <td><span class="label label-warning">TARDANZA</span></td>
...@@ -145,8 +147,8 @@ ...@@ -145,8 +147,8 @@
<td>ALVITES MARIN, VICTOR MANUEL</td> <td>ALVITES MARIN, VICTOR MANUEL</td>
<td>26/06/2018</td> <td>26/06/2018</td>
<td>07:00- 17:00</td> <td>07:00- 17:00</td>
<td>REGULAR</td> <td class="text-center">REGULAR</td>
<td>DIARIO</td> <td class="text-center">DIARIO</td>
<td class="text-center">-</td> <td class="text-center">-</td>
<td class="text-center">-</td> <td class="text-center">-</td>
<td><span class="label label-danger">FCA</span></td> <td><span class="label label-danger">FCA</span></td>
...@@ -158,8 +160,8 @@ ...@@ -158,8 +160,8 @@
<td>ALVITES MARIN, VICTOR MANUEL</td> <td>ALVITES MARIN, VICTOR MANUEL</td>
<td>26/06/2018</td> <td>26/06/2018</td>
<td>07:00- 17:00</td> <td>07:00- 17:00</td>
<td>REGULAR</td> <td class="text-center">REGULAR</td>
<td>PAR</td> <td class="text-center">PAR</td>
<td class="text-center">-</td> <td class="text-center">-</td>
<td class="text-center">-</td> <td class="text-center">-</td>
<td><span class="label label-danger">FSA</span></td> <td><span class="label label-danger">FSA</span></td>
...@@ -170,8 +172,8 @@ ...@@ -170,8 +172,8 @@
<td>ALVITES MARIN, VICTOR MANUEL</td> <td>ALVITES MARIN, VICTOR MANUEL</td>
<td>26/06/2018</td> <td>26/06/2018</td>
<td>07:00 - 07:00</td> <td>07:00 - 07:00</td>
<td>AMANECIDA 24H</td> <td class="text-center">AMANECIDA 24H</td>
<td>IMPAR</td> <td class="text-center">IMPAR</td>
<td class="text-center">07:24</td> <td class="text-center">07:24</td>
<td class="text-center">06:58</td> <td class="text-center">06:58</td>
<td><span class="label label-default">NO MARCÓ</span></td> <td><span class="label label-default">NO MARCÓ</span></td>
...@@ -182,8 +184,8 @@ ...@@ -182,8 +184,8 @@
<td>ALVITES MARIN, VICTOR MANUEL</td> <td>ALVITES MARIN, VICTOR MANUEL</td>
<td>26/06/2018</td> <td>26/06/2018</td>
<td>07:00 - 07:00</td> <td>07:00 - 07:00</td>
<td>AMANECIDA 24H</td> <td class="text-center">AMANECIDA 24H</td>
<td>PAR</td> <td class="text-center">PAR</td>
<td class="text-center">-</td> <td class="text-center">-</td>
<td class="text-center">-</td> <td class="text-center">-</td>
<td><span class="label label-info">VAC</span></td> <td><span class="label label-info">VAC</span></td>
...@@ -194,8 +196,8 @@ ...@@ -194,8 +196,8 @@
<td>ALVITES MARIN, VICTOR MANUEL</td> <td>ALVITES MARIN, VICTOR MANUEL</td>
<td>26/06/2018</td> <td>26/06/2018</td>
<td>07:00 - 17:00</td> <td>07:00 - 17:00</td>
<td>AMANECIDA 24H</td> <td class="text-center">AMANECIDA 24H</td>
<td>DIARIO</td> <td class="text-center">DIARIO</td>
<td class="text-center">-</td> <td class="text-center">-</td>
<td class="text-center">-</td> <td class="text-center">-</td>
<td><span class="label label-info">FER</span></td> <td><span class="label label-info">FER</span></td>
...@@ -206,8 +208,8 @@ ...@@ -206,8 +208,8 @@
<td>ALVITES MARIN, VICTOR MANUEL</td> <td>ALVITES MARIN, VICTOR MANUEL</td>
<td>26/06/2018</td> <td>26/06/2018</td>
<td>07:50 - 17:00</td> <td>07:50 - 17:00</td>
<td>REGULAR</td> <td class="text-center">REGULAR</td>
<td>UN SOLO DÍA</td> <td class="text-center">UN SOLO DÍA</td>
<td class="text-center">-</td> <td class="text-center">-</td>
<td class="text-center">-</td> <td class="text-center">-</td>
<td><span class="label label-info">LCGH</span></td> <td><span class="label label-info">LCGH</span></td>
...@@ -218,8 +220,8 @@ ...@@ -218,8 +220,8 @@
<td>ALVITES MARIN, VICTOR MANUEL</td> <td>ALVITES MARIN, VICTOR MANUEL</td>
<td>26/06/2018</td> <td>26/06/2018</td>
<td>07:00 - 17:00</td> <td>07:00 - 17:00</td>
<td>REGULAR</td> <td class="text-center">REGULAR</td>
<td>IMPAR</td> <td class="text-center">IMPAR</td>
<td class="text-center"></td> <td class="text-center"></td>
<td class="text-center">17:13</td> <td class="text-center">17:13</td>
<td><span class="label bg-purple">ENTRADA PENDIENTE</span></td> <td><span class="label bg-purple">ENTRADA PENDIENTE</span></td>
...@@ -237,8 +239,8 @@ ...@@ -237,8 +239,8 @@
<td>ALVITES MARIN, VICTOR MANUEL</td> <td>ALVITES MARIN, VICTOR MANUEL</td>
<td>26/06/2018</td> <td>26/06/2018</td>
<td>07:00 - 17:00</td> <td>07:00 - 17:00</td>
<td>REGULAR</td> <td class="text-center">REGULAR</td>
<td>IMPAR</td> <td class="text-center">IMPAR</td>
<td class="text-center">07:28</td> <td class="text-center">07:28</td>
<td></td> <td></td>
<td><span class="label bg-purple">SALIDA PENDIENTE</span></td> <td><span class="label bg-purple">SALIDA PENDIENTE</span></td>
...@@ -256,8 +258,8 @@ ...@@ -256,8 +258,8 @@
<td>ALVITES MARIN, VICTOR MANUEL</td> <td>ALVITES MARIN, VICTOR MANUEL</td>
<td>26/06/2018</td> <td>26/06/2018</td>
<td>07:50 - 14:30</td> <td>07:50 - 14:30</td>
<td>REGULAR</td> <td class="text-center">REGULAR</td>
<td>DIARIO</td> <td class="text-center">DIARIO</td>
<td class="text-center"></td> <td class="text-center"></td>
<td></td> <td></td>
<td><span class="label bg-purple">PENDIENTE</span></td> <td><span class="label bg-purple">PENDIENTE</span></td>
......
src/main/webapp/vistas/horarioPolicias.jsp 0 → 100644
<%@include file="templates/validar.jsp" %>
<%@page contentType="text/html" pageEncoding="UTF-8"%>
<!DOCTYPE html>
<html>
<head>
<%@include file="templates/header.jsp" %>
<!--template-core-->
<!--css de la pagina-->
<!--css-->
</head>
<body>
<%@include file="templates/header-body.jsp" %>
<!-- content -->
<!-- / content -->
<%@include file="templates/footer-body.jsp"%>
<!--js de la pagina-->
<!--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