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
c422a8ee
Commit
c422a8ee
authored
Aug 27, 2018
by
Billy Larru
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
arreglando bugs en control de asistencia
parent
865d1229
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
13 additions
and
15 deletions
+13
-15
control_asistencia_policias.js
src/main/webapp/js/pages/control_asistencia_policias.js
+7
-9
crearRolPolicia.js
src/main/webapp/js/pages/crearRolPolicia.js
+2
-2
proyectar_asistencia_policias.js
src/main/webapp/js/pages/proyectar_asistencia_policias.js
+3
-3
controlAsistenciaPolicias.jsp
src/main/webapp/vistas/controlAsistenciaPolicias.jsp
+1
-1
No files found.
src/main/webapp/js/pages/control_asistencia_policias.js
View file @
c422a8ee
...
@@ -213,7 +213,7 @@ function mostrarMensajeResultadoModal(result = {}) {
...
@@ -213,7 +213,7 @@ function mostrarMensajeResultadoModal(result = {}) {
}
}
function
mostrarModalRegistroAsistencia
(
data
=
{})
{
function
mostrarModalRegistroAsistencia
(
data
=
{})
{
a
xios
.
get
(
"modals/
policias/controlAsistencia/registrarAsistencia.jsp"
).
then
((
response
)
=>
{
a
jaxModal
.
get
(
"
policias/controlAsistencia/registrarAsistencia.jsp"
).
then
((
response
)
=>
{
swal
({
swal
({
title
:
'<strong>Registrar Asistencia</strong>'
,
title
:
'<strong>Registrar Asistencia</strong>'
,
html
:
response
.
data
,
html
:
response
.
data
,
...
@@ -234,18 +234,17 @@ function mostrarModalRegistroAsistencia(data = {}) {
...
@@ -234,18 +234,17 @@ function mostrarModalRegistroAsistencia(data = {}) {
});
});
}
}
function
listarAsistencias
(
objParams
=
{})
{
function
listarAsistencias
(
objParams
=
{})
{
axios
.
get
(
URI_POLICIAS_ASISTENCIA
,
objParams
).
then
((
response
)
=>
{
ajaxWebService
.
get
(
URI_POLICIAS_ASISTENCIA
,
objParams
).
then
((
response
)
=>
{
response
.
data
=
formatResponse
(
response
);
let
columns
=
getColumns
();
let
columns
=
getColumns
();
let
columnDefs
=
getColumnDefs
();
let
columnDefs
=
getColumnDefs
();
let
wrapsNameDatatable
=
`divAsistencias`
;
let
wrapsNameDatatable
=
`divAsistencias`
;
let
classNameForDatatable
=
`display table table-bordered`
;
let
classNameForDatatable
=
`display table table-bordered`
;
let
footer
=
false
;
let
footer
=
false
;
debugger
makeDatatable
(
makeDatatable
(
{
{
data
:
response
.
data
.
data
,
data
:
response
.
data
,
columns
,
columns
,
columnDefs
,
columnDefs
,
wrapsNameDatatable
,
wrapsNameDatatable
,
...
@@ -262,7 +261,7 @@ function listarAsistencias(objParams = {}) {
...
@@ -262,7 +261,7 @@ function listarAsistencias(objParams = {}) {
}
}
function
listarSedes
(
selectorName
)
{
function
listarSedes
(
selectorName
)
{
a
xios
.
get
(
URI_SEDES
).
then
((
result
)
=>
{
a
jaxWebService
.
get
(
URI_SEDES
).
then
((
result
)
=>
{
let
sedes
=
result
.
data
;
let
sedes
=
result
.
data
;
sedes
=
_
.
orderBy
(
sedes
,
s
=>
s
.
descripcion
);
sedes
=
_
.
orderBy
(
sedes
,
s
=>
s
.
descripcion
);
let
html
=
`<option value="">[TODOS]</option>`
;
let
html
=
`<option value="">[TODOS]</option>`
;
...
@@ -273,7 +272,7 @@ function listarSedes(selectorName) {
...
@@ -273,7 +272,7 @@ function listarSedes(selectorName) {
}
}
function
listarPolicias
(
selectorName
)
{
function
listarPolicias
(
selectorName
)
{
a
xios
.
get
(
URI_POLICIAS
).
then
((
result
)
=>
{
a
jaxWebService
.
get
(
URI_POLICIAS
).
then
((
result
)
=>
{
let
policias
=
result
.
data
;
let
policias
=
result
.
data
;
policias
=
_
.
orderBy
(
policias
,
p
=>
p
.
nombres
);
policias
=
_
.
orderBy
(
policias
,
p
=>
p
.
nombres
);
let
html
=
`<option value="">[TODOS]</option>`
;
let
html
=
`<option value="">[TODOS]</option>`
;
...
@@ -285,7 +284,7 @@ function listarPolicias(selectorName) {
...
@@ -285,7 +284,7 @@ function listarPolicias(selectorName) {
function
listarEstadoAsistencia
()
{
function
listarEstadoAsistencia
()
{
a
xios
.
get
(
URI_ESTADO_ASISTENCIA
).
then
((
response
)
=>
{
a
jaxWebService
.
get
(
URI_ESTADO_ASISTENCIA
).
then
((
response
)
=>
{
let
estados
=
response
.
data
;
let
estados
=
response
.
data
;
let
html
=
""
;
let
html
=
""
;
estados
.
forEach
(
e
=>
html
+=
`<option value="
${
e
.
codigo
}
">
${
e
.
nombre
}
</option>`
);
estados
.
forEach
(
e
=>
html
+=
`<option value="
${
e
.
codigo
}
">
${
e
.
nombre
}
</option>`
);
...
@@ -366,7 +365,6 @@ $().ready(function () {
...
@@ -366,7 +365,6 @@ $().ready(function () {
listarEstadoAsistencia
();
listarEstadoAsistencia
();
listarPolicias
(
"#cboPoliciasFiltro"
);
listarPolicias
(
"#cboPoliciasFiltro"
);
listarSedes
(
"#cboSedesFiltro"
);
listarSedes
(
"#cboSedesFiltro"
);
defaultConfigDataTable
();
$
(
'.selectpicker'
).
selectpicker
({
$
(
'.selectpicker'
).
selectpicker
({
style
:
'btn-info'
,
style
:
'btn-info'
,
size
:
4
size
:
4
...
...
src/main/webapp/js/pages/crearRolPolicia.js
View file @
c422a8ee
...
@@ -104,7 +104,7 @@ function listarRolesPolicias(objParams = {}) {
...
@@ -104,7 +104,7 @@ function listarRolesPolicias(objParams = {}) {
let
data
=
nodes
.
datatable
.
DataTable
().
row
(
$
(
this
).
parents
(
"tr"
)).
data
();
let
data
=
nodes
.
datatable
.
DataTable
().
row
(
$
(
this
).
parents
(
"tr"
)).
data
();
console
.
log
(
data
);
console
.
log
(
data
);
ajax
WebService
.
get
(
"modals/
policias/mantenimientoRol/detalleRol.jspf"
).
then
((
response
)
=>
{
ajax
Modal
.
get
(
"
policias/mantenimientoRol/detalleRol.jspf"
).
then
((
response
)
=>
{
debugger
debugger
swal
({
swal
({
title
:
'<strong>Detalle de rol</strong>'
,
title
:
'<strong>Detalle de rol</strong>'
,
...
@@ -295,7 +295,7 @@ function guardarCambios() {
...
@@ -295,7 +295,7 @@ function guardarCambios() {
function
mostrarModalNuevoRol
()
{
function
mostrarModalNuevoRol
()
{
ajaxModal
.
get
(
"
modals/
policias/mantenimientoRol/crearRol.jspf"
).
then
((
response
)
=>
{
ajaxModal
.
get
(
"policias/mantenimientoRol/crearRol.jspf"
).
then
((
response
)
=>
{
swal
({
swal
({
title
:
'<strong>Nuevo Rol</strong>'
,
title
:
'<strong>Nuevo Rol</strong>'
,
// type: 'info',
// type: 'info',
...
...
src/main/webapp/js/pages/proyectar_asistencia_policias.js
View file @
c422a8ee
...
@@ -14,7 +14,7 @@ function initializeData() {
...
@@ -14,7 +14,7 @@ function initializeData() {
function
listarSedes
(
selectorName
)
{
function
listarSedes
(
selectorName
)
{
a
xios
.
get
(
URI_SEDES
).
then
((
result
)
=>
{
a
jaxWebService
.
get
(
URI_SEDES
).
then
((
result
)
=>
{
let
sedes
=
result
.
data
;
let
sedes
=
result
.
data
;
sedes
=
_
.
orderBy
(
sedes
,
s
=>
s
.
descripcion
);
sedes
=
_
.
orderBy
(
sedes
,
s
=>
s
.
descripcion
);
listaSedes
=
_
.
map
(
sedes
,
s
=>
s
.
descripcion
);
listaSedes
=
_
.
map
(
sedes
,
s
=>
s
.
descripcion
);
...
@@ -26,7 +26,7 @@ function listarSedes(selectorName) {
...
@@ -26,7 +26,7 @@ function listarSedes(selectorName) {
}
}
function
listarPolicias
(
selectorName
)
{
function
listarPolicias
(
selectorName
)
{
a
xios
.
get
(
URI_POLICIAS
).
then
((
result
)
=>
{
a
jaxWebService
.
get
(
URI_POLICIAS
).
then
((
result
)
=>
{
let
policias
=
result
.
data
;
let
policias
=
result
.
data
;
policias
=
_
.
orderBy
(
policias
,
p
=>
p
.
nombres
);
policias
=
_
.
orderBy
(
policias
,
p
=>
p
.
nombres
);
let
html
=
`<option value="">[TODOS]</option>`
;
let
html
=
`<option value="">[TODOS]</option>`
;
...
@@ -51,7 +51,7 @@ function defaultConfigHandsonTable() {
...
@@ -51,7 +51,7 @@ function defaultConfigHandsonTable() {
function
mostrarVistaPrevia
()
{
function
mostrarVistaPrevia
()
{
a
xios
.
get
(
URI_ROL_POLICIA
).
then
((
response
)
=>
{
a
jaxWebService
.
get
(
URI_ROL_POLICIA
).
then
((
response
)
=>
{
debugger
debugger
if
(
response
.
data
.
status
)
{
if
(
response
.
data
.
status
)
{
handsonTable
.
destroy
();
handsonTable
.
destroy
();
...
...
src/main/webapp/vistas/controlAsistenciaPolicias.jsp
View file @
c422a8ee
...
@@ -358,9 +358,9 @@
...
@@ -358,9 +358,9 @@
<!--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=
"../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=
"../plantilla/assets/js/plugins/tables/datatables/datatables.min.js"
type=
"text/javascript"
></script>
<script
src=
"../js/lib/bootstrap-select/bootstrap-select.min.js"
type=
"text/javascript"
></script>
<script
src=
"../js/lib/bootstrap-select/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/pickers/datepicker.js" type="text/javascript"></script>-->
<script
src=
"../plantilla/assets/js/plugins/pickers/daterangepicker.js"
></script>
<script
src=
"../plantilla/assets/js/plugins/pickers/daterangepicker.js"
></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