Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
Asistencia
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Billy Larru
Asistencia
Commits
b92f1fe3
Commit
b92f1fe3
authored
Sep 08, 2018
by
Billy Larru
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[FIX proyecciones]
parent
6fd11f13
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
17 additions
and
10 deletions
+17
-10
comparativo_proyeccion_policias.js
src/main/webapp/js/pages/comparativo_proyeccion_policias.js
+5
-3
proyectar_asistencia_policias.js
src/main/webapp/js/pages/proyectar_asistencia_policias.js
+1
-1
comparativoProyeccionPolicias.jsp
src/main/webapp/vistas/comparativoProyeccionPolicias.jsp
+8
-2
controlAsistenciaPolicias.jsp
src/main/webapp/vistas/controlAsistenciaPolicias.jsp
+0
-1
proyectarAsistenciaPolicias.jsp
src/main/webapp/vistas/proyectarAsistenciaPolicias.jsp
+3
-3
No files found.
src/main/webapp/js/pages/comparativo_proyeccion_policias.js
View file @
b92f1fe3
...
@@ -121,6 +121,8 @@ function listarPolicias(selectorName) {
...
@@ -121,6 +121,8 @@ function listarPolicias(selectorName) {
function
verReporte
()
{
function
verReporte
()
{
// let policia_nombres = $("#cboPolicias option:selected").text();
// let policia_nombres = $("#cboPolicias option:selected").text();
let
fecha_inicio
=
$
(
"#dpFechaInicio"
).
val
();
let
fecha_inicio
=
$
(
"#dpFechaInicio"
).
val
();
let
fecha_fin
=
$
(
"#dpFechaFin"
).
val
();
let
rango_fechas
=
generarFechas
(
fecha_inicio
,
fecha_fin
);
let
jsonPolicia
=
$
(
'#cboPolicias'
).
select2
(
'data'
)[
0
];
let
jsonPolicia
=
$
(
'#cboPolicias'
).
select2
(
'data'
)[
0
];
...
@@ -128,7 +130,7 @@ function verReporte() {
...
@@ -128,7 +130,7 @@ function verReporte() {
let
params
=
cleanQueryParams
({
let
params
=
cleanQueryParams
({
policia_dni
:
dni
,
policia_dni
:
dni
,
fecha_entrada
:
fecha_inicio
fecha_entrada
:
rango_fechas
});
});
...
@@ -154,8 +156,7 @@ function verReporte() {
...
@@ -154,8 +156,7 @@ function verReporte() {
$
().
ready
(
function
()
{
$
().
ready
(
function
()
{
let
nameDatePickers
=
[
"#dpFechaInicio"
,
"#dpFechaFin"
];
initDatePicker
(
"#dpFechaInicio"
,
"#dpFechaFin"
);
initDatePicker
(...
nameDatePickers
);
listarPolicias
(
"#cboPolicias"
);
listarPolicias
(
"#cboPolicias"
);
$
(
"#btnVerReporte"
).
click
(
verReporte
);
$
(
"#btnVerReporte"
).
click
(
verReporte
);
});
});
\ No newline at end of file
src/main/webapp/js/pages/proyectar_asistencia_policias.js
View file @
b92f1fe3
...
@@ -238,9 +238,9 @@ function guardarCambios() {
...
@@ -238,9 +238,9 @@ function guardarCambios() {
$
().
ready
(
function
()
{
$
().
ready
(
function
()
{
initDatePicker
(
"#dpFechaInicio"
,
"#dpFechaFin"
);
listarPolicias
(
"#cboPoliciasFiltro"
);
listarPolicias
(
"#cboPoliciasFiltro"
);
listarSedes
(
"#cboSedesFiltro"
);
listarSedes
(
"#cboSedesFiltro"
);
initDatePicker
(
"#dpFechaInicio"
,
"#dpFechaFin"
);
defaultConfigHandsonTable
();
defaultConfigHandsonTable
();
$
(
"#btnVer"
).
click
(
ver
);
$
(
"#btnVer"
).
click
(
ver
);
$
(
"#btnGuardarCambios"
).
click
(
guardarCambios
);
$
(
"#btnGuardarCambios"
).
click
(
guardarCambios
);
...
...
src/main/webapp/vistas/comparativoProyeccionPolicias.jsp
View file @
b92f1fe3
...
@@ -23,13 +23,19 @@
...
@@ -23,13 +23,19 @@
<div
class=
"row"
>
<div
class=
"row"
>
<div
class=
"col-md-6 form-group"
>
<div
class=
"col-md-6 form-group"
>
<label>
Fecha Inicio:
</label>
<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=
"dpFechaInicio"
>
<input
type=
"text"
class=
"form-control"
id=
"dpFechaInicio"
>
</div>
</div>
</div>
<div
class=
"col-md-6 form-group"
>
<div
class=
"col-md-6 form-group"
>
<label>
Fecha Fin
</label>
<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=
"dpFechaFin"
>
<input
type=
"text"
class=
"form-control"
id=
"dpFechaFin"
>
</div>
</div>
</div>
</div>
</div>
<div
class=
"row"
>
<div
class=
"row"
>
<div
class=
"col-md-12 form-group"
>
<div
class=
"col-md-12 form-group"
>
...
@@ -65,9 +71,9 @@
...
@@ -65,9 +71,9 @@
<
%@
include
file=
"templates/footer-body.jsp"
%
>
<
%@
include
file=
"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=
"../plantilla/assets/js/plugins/pickers/daterangepicker.js"
></script>
<script
src=
"../plantilla/assets/js/core/libraries/jquery_ui/widgets.min.js"
></script>
<script
src=
"../plantilla/assets/js/core/libraries/jquery_ui/widgets.min.js"
></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"
></script>
<script
src=
"../js/lib/lodash.js"
type=
"text/javascript"
></script>
<script
src=
"../js/lib/lodash.js"
type=
"text/javascript"
></script>
<script
src=
"../js/lib/axios.min.js"
type=
"text/javascript"
></script>
<script
src=
"../js/lib/axios.min.js"
type=
"text/javascript"
></script>
<script
src=
"../js/lib/sweetalert2.min.js"
type=
"text/javascript"
></script>
<script
src=
"../js/lib/sweetalert2.min.js"
type=
"text/javascript"
></script>
...
...
src/main/webapp/vistas/controlAsistenciaPolicias.jsp
View file @
b92f1fe3
...
@@ -361,7 +361,6 @@
...
@@ -361,7 +361,6 @@
<script
src=
"../plantilla/assets/js/core/libraries/jquery_ui/interactions.min.js"
></script>
<script
src=
"../plantilla/assets/js/core/libraries/jquery_ui/interactions.min.js"
></script>
<script
src=
"../plantilla/assets/js/core/libraries/jquery_ui/widgets.min.js"
></script>
<script
src=
"../plantilla/assets/js/core/libraries/jquery_ui/widgets.min.js"
></script>
<script
src=
"../js/lib/bootstrap-select.min.js"
type=
"text/javascript"
></script>
<script
src=
"../js/lib/bootstrap-select.min.js"
type=
"text/javascript"
></script>
<!--<script src="../plantilla/assets/js/plugins/pickers/datepicker.js" type="text/javascript"></script>-->
<script
src=
"../plantilla/assets/js/plugins/ui/moment/moment.min.js"
></script>
<script
src=
"../plantilla/assets/js/plugins/ui/moment/moment.min.js"
></script>
<script
src=
"../plantilla/assets/js/plugins/pickers/daterangepicker.js"
></script>
<script
src=
"../plantilla/assets/js/plugins/pickers/daterangepicker.js"
></script>
<script
src=
"../plantilla/assets/js/plugins/forms/selects/select2.min.js"
></script>
<script
src=
"../plantilla/assets/js/plugins/forms/selects/select2.min.js"
></script>
...
...
src/main/webapp/vistas/proyectarAsistenciaPolicias.jsp
View file @
b92f1fe3
...
@@ -38,14 +38,14 @@
...
@@ -38,14 +38,14 @@
<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>
<input
type=
"text"
class=
"form-control"
name=
"dpFechaInicio"
id=
"dpFechaInicio"
>
<input
type=
"text"
class=
"form-control"
id=
"dpFechaInicio"
>
</div>
</div>
</div>
</div>
<div
class=
"col-md-6 form-group"
>
<div
class=
"col-md-6 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>
<input
type=
"text"
class=
"form-control"
name=
"dpFechaFin"
id=
"dpFechaFin"
>
<input
type=
"text"
class=
"form-control"
id=
"dpFechaFin"
>
</div>
</div>
</div>
</div>
</div>
</div>
...
@@ -82,7 +82,7 @@
...
@@ -82,7 +82,7 @@
<!--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=
"../plantilla/assets/js/plugins/ui/moment/moment.min.js"
type=
"text/javascript"
></script>
<script
src=
"../plantilla/assets/js/plugins/pickers/date
range
picker.js"
></script>
<script
src=
"../plantilla/assets/js/plugins/pickers/datepicker.js"
></script>
<script
src=
"../plantilla/assets/js/core/libraries/jquery_ui/widgets.min.js"
></script>
<script
src=
"../plantilla/assets/js/core/libraries/jquery_ui/widgets.min.js"
></script>
<script
src=
"../plantilla/assets/js/plugins/tables/datatables/datatables.min.js"
type=
"text/javascript"
></script>
<script
src=
"../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=
"../js/lib/dataTables.rowsGroup.js"
type=
"text/javascript"
></script>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment