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
01801e82
Commit
01801e82
authored
Sep 14, 2018
by
Billy Larru
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[EDIT detalleMontos dentro de la carpeta modals, con errores]
parent
3530877d
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
108 additions
and
102 deletions
+108
-102
general.js
src/main/webapp/js/general.js
+2
-1
montos_administrativos.js
src/main/webapp/js/pages/montos_administrativos.js
+105
-100
detalleMontosAdministrativos.jsp
...os/montosAdministrativos/detalleMontosAdministrativos.jsp
+1
-1
No files found.
src/main/webapp/js/general.js
View file @
01801e82
...
@@ -9,12 +9,13 @@ const PATH_SERVICIO_REST = 'http://app9.sacooliveros.edu.pe:8080/security-rest/a
...
@@ -9,12 +9,13 @@ const PATH_SERVICIO_REST = 'http://app9.sacooliveros.edu.pe:8080/security-rest/a
//<editor-fold> SERVICIOS REST
//<editor-fold> SERVICIOS REST
const
baseURLRest
=
'http://sistem16:666/'
;
const
baseURLRest
=
'http://sistem16:666/'
;
const
baseURLModals
=
`http://localhost:7070/Asistencia/vistas/modals/`
;
const
ajaxWebService
=
axios
.
create
({
const
ajaxWebService
=
axios
.
create
({
baseURL
:
baseURLRest
baseURL
:
baseURLRest
});
});
const
ajaxModal
=
axios
.
create
({
const
ajaxModal
=
axios
.
create
({
baseURL
:
`http://localhost:7070/Asistencia/vistas/modals/`
baseURL
:
baseURLModals
});
});
//<editor-fold>
//<editor-fold>
...
...
src/main/webapp/js/pages/montos_administrativos.js
View file @
01801e82
function
getColumns
()
{
function
getColumns
()
{
let
columns
=
[
let
columns
=
[
{
{
title
:
`N°`
,
title
:
`N°`
,
data
:
`id`
,
data
:
`id`
,
className
:
'text-center'
className
:
'text-center'
},
},
{
{
title
:
`APELLIDOS Y NOMBRES`
,
title
:
`APELLIDOS Y NOMBRES`
,
data
:
null
,
data
:
null
,
className
:
`text-center`
,
className
:
`text-center`
,
render
:
(
data
)
=>
{
render
:
(
data
)
=>
{
let
nombresCompletos
;
let
nombresCompletos
;
let
nombres
=
data
.
trabajador_nombres
;
let
nombres
=
data
.
trabajador_nombres
;
let
apellidos
=
data
.
trabajador_apellidos
;
let
apellidos
=
data
.
trabajador_apellidos
;
nombresCompletos
=
`
${
apellidos
}
${
nombres
}
`
;
nombresCompletos
=
`
${
apellidos
}
${
nombres
}
`
;
return
nombresCompletos
;
return
nombresCompletos
;
}
}
},
},
{
{
title
:
"SEDE"
,
title
:
"SEDE"
,
data
:
"sede_descripcion"
,
data
:
"sede_descripcion"
,
className
:
"text-center"
className
:
"text-center"
},
},
{
{
title
:
`CARGO`
,
title
:
`CARGO`
,
data
:
`puestolaboral_nombre`
,
data
:
`puestolaboral_nombre`
,
className
:
'text-center'
className
:
'text-center'
},
},
{
{
title
:
`DESCUENTO<br>(S/.)`
,
title
:
`DESCUENTO<br>(S/.)`
,
data
:
`descuento_total`
,
data
:
`descuento_total`
,
className
:
'text-center'
,
className
:
'text-center'
,
render
:
(
data
)
=>
{
render
:
(
data
)
=>
{
return
`<span class="text-danger">
${
data
}
.00</span>`
;
return
`<span class="text-danger">
${
data
}
.00</span>`
;
}
}
},
},
{
{
title
:
`ACCIONES`
,
title
:
`ACCIONES`
,
data
:
null
,
data
:
null
,
className
:
'text-center'
,
className
:
'text-center'
,
render
:
(
data
)
=>
{
render
:
(
data
)
=>
{
let
acciones
=
""
;
let
acciones
=
""
;
let
registrar
=
""
;
let
registrar
=
""
;
let
verdetalle
=
""
;
let
verdetalle
=
""
;
verdetalle
=
`<span data-toggle="tooltip" data-placement="left" title="Ver detalle" style="cursor: pointer"> <i class='verdetalle icon-list text-primary-700'></i> </span>`
;
verdetalle
=
`<span data-toggle="tooltip" data-placement="left" title="Ver detalle" style="cursor: pointer"> <i class='verdetalle icon-list text-primary-700'></i> </span>`
;
acciones
=
verdetalle
;
acciones
=
verdetalle
;
return
acciones
;
return
acciones
;
}
}
}
}
];
];
return
columns
;
return
columns
;
}
}
const
listarPeriodosCierreAsistencia
=
(
nodeIdentifier
)
=>
{
const
listarPeriodosCierreAsistencia
=
(
nodeIdentifier
)
=>
{
ajaxWebService
.
get
(
URI_ADMINISTRATIVOS_PERIODO_CIERRE_ASISTENCIA
).
then
((
result
)
=>
{
ajaxWebService
.
get
(
URI_ADMINISTRATIVOS_PERIODO_CIERRE_ASISTENCIA
).
then
((
result
)
=>
{
let
data
=
result
.
data
;
let
data
=
result
.
data
;
let
html
=
`<option value="">[SELECCIONE]</option>`
;
let
html
=
`<option value="">[SELECCIONE]</option>`
;
html
+=
data
.
map
(
periodo
=>
`<option value="
${
periodo
.
id
}
">
${
periodo
.
descripcion
}
</option>`
);
html
+=
data
.
map
(
periodo
=>
`<option value="
${
periodo
.
id
}
">
${
periodo
.
descripcion
}
</option>`
);
$
(
nodeIdentifier
).
html
(
html
);
$
(
nodeIdentifier
).
html
(
html
);
$
(
nodeIdentifier
).
change
((
e
)
=>
{
$
(
nodeIdentifier
).
change
((
e
)
=>
{
let
id
=
$
(
e
.
currentTarget
).
val
();
let
id
=
$
(
e
.
currentTarget
).
val
();
console
.
log
(
id
)
console
.
log
(
id
)
});
});
});
});
// initSelect2(nodeIdentifier, "descripcion");
// initSelect2(nodeIdentifier, "descripcion");
}
}
...
@@ -134,42 +134,46 @@ const listarPeriodosCierreAsistencia = (nodeIdentifier) => {
...
@@ -134,42 +134,46 @@ const listarPeriodosCierreAsistencia = (nodeIdentifier) => {
const
listarSedes
=
(
selectorName
)
=>
{
const
listarSedes
=
(
selectorName
)
=>
{
ajaxWebService
.
get
(
URI_SEDES
).
then
((
result
)
=>
{
ajaxWebService
.
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>`
;
sedes
.
forEach
(
sede
=>
html
+=
`<option value="
${
sede
.
codigo
}
">
${
sede
.
descripcion
}
</option>`
);
sedes
.
forEach
(
sede
=>
html
+=
`<option value="
${
sede
.
codigo
}
">
${
sede
.
descripcion
}
</option>`
);
$
(
`
${
selectorName
}
`
).
html
(
html
);
$
(
`
${
selectorName
}
`
).
html
(
html
);
$
(
selectorName
).
select2
();
$
(
selectorName
).
select2
();
});
});
};
};
const
mostrarModalVerDetalleDescuentoAsistencia
=
(
data
)
=>
{
location
.
href
=
`
${
baseURLModals
}
administrativos/montosAdministrativos/detalleMontosAdministrativos.jsp`
}
const
listarDescuentoMensualAdministrativos
=
(
objParams
=
{})
=>
{
const
listarDescuentoMensualAdministrativos
=
(
objParams
=
{})
=>
{
ajaxWebService
.
get
(
URI_ADMINISTRATIVOS_DESCUENTO_MENSUAL
,
objParams
).
then
((
response
)
=>
{
ajaxWebService
.
get
(
URI_ADMINISTRATIVOS_DESCUENTO_MENSUAL
,
objParams
).
then
((
response
)
=>
{
let
columns
=
getColumns
();
let
columns
=
getColumns
();
let
wrapsNameDatatable
=
`divDatatable`
;
let
wrapsNameDatatable
=
`divDatatable`
;
let
classNameForDatatable
=
`display table table-bordered`
;
let
classNameForDatatable
=
`display table table-bordered`
;
makeDatatable
(
makeDatatable
(
wrapsNameDatatable
,
wrapsNameDatatable
,
{
{
data
:
response
.
data
,
data
:
response
.
data
,
columns
,
columns
,
},
},
classNameForDatatable
,
classNameForDatatable
,
).
then
((
nodes
)
=>
{
).
then
((
nodes
)
=>
{
$
(
".chkFirma, #chkFirmaTodo"
).
uniform
();
$
(
".chkFirma, #chkFirmaTodo"
).
uniform
();
nodes
.
container
nodes
.
container
.
off
()
.
off
()
.
on
(
"click"
,
".verdetalle"
,
function
()
{
.
on
(
"click"
,
".verdetalle"
,
function
()
{
let
data
=
nodes
.
datatable
.
DataTable
().
row
(
$
(
this
).
parents
(
"tr"
)).
data
();
let
data
=
nodes
.
datatable
.
DataTable
().
row
(
$
(
this
).
parents
(
"tr"
)).
data
();
mostrarModalVerDetalleDescuentoAsistencia
(
data
);
mostrarModalVerDetalleDescuentoAsistencia
(
data
);
})
})
});
});
});
});
};
};
...
@@ -178,9 +182,9 @@ const aplicarFiltro = () => {
...
@@ -178,9 +182,9 @@ const aplicarFiltro = () => {
}
}
$
(
document
).
ready
(
function
()
{
$
(
document
).
ready
(
function
()
{
initDatePicker
(
"#dpFechaInicioFiltro"
,
"#dpFechaFinFiltro"
);
initDatePicker
(
"#dpFechaInicioFiltro"
,
"#dpFechaFinFiltro"
);
listarSedes
(
"#cboSedesFiltro"
);
listarSedes
(
"#cboSedesFiltro"
);
listarPeriodosCierreAsistencia
(
"#cboPeriodoCierreFiltro"
);
listarPeriodosCierreAsistencia
(
"#cboPeriodoCierreFiltro"
);
$
(
"#btnAplicarFiltro"
).
click
(
aplicarFiltro
);
$
(
"#btnAplicarFiltro"
).
click
(
aplicarFiltro
);
$
(
"#btnMostrarTodo"
).
click
(
listarDescuentoMensualAdministrativos
);
$
(
"#btnMostrarTodo"
).
click
(
listarDescuentoMensualAdministrativos
);
});
});
\ No newline at end of file
src/main/webapp/vistas/detalleMontosAdministrativos.jsp
→
src/main/webapp/vistas/
modals/administrativos/montosAdministrativos/
detalleMontosAdministrativos.jsp
View file @
01801e82
...
@@ -10,7 +10,7 @@
...
@@ -10,7 +10,7 @@
<!--css-->
<!--css-->
</head>
</head>
<body>
<body>
<
%@
include
file=
"templates/header-body.jsp"
%
>
<
%@
include
file=
"
../../
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"
>
...
...
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