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
0d39c60c
Commit
0d39c60c
authored
Sep 24, 2018
by
Billy Larru
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[FIX montos administrativos]
parent
18839fa4
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
86 deletions
+3
-86
detalle_montos_administrativos.js
src/main/webapp/js/pages/detalle_montos_administrativos.js
+1
-1
montos_administrativos.js
src/main/webapp/js/pages/montos_administrativos.js
+0
-83
detalleMontosAdministrativos.jsp
...os/montosAdministrativos/detalleMontosAdministrativos.jsp
+2
-2
No files found.
src/main/webapp/js/pages/detalle_montos_administrativos.js
View file @
0d39c60c
...
...
@@ -12,7 +12,7 @@ function getColumns() {
}
},
{
title
:
"FECHA"
,
title
:
"FECHA
<br>ASISTENCIA
"
,
data
:
"fecha_asistencia"
,
className
:
"text-center"
},
...
...
src/main/webapp/js/pages/montos_administrativos.js
View file @
0d39c60c
...
...
@@ -53,9 +53,6 @@ function getColumns() {
return
columns
;
}
const
listarPeriodosCierreAsistencia
=
(
nodeIdentifier
)
=>
{
ajaxWebService
.
get
(
URI_ADMINISTRATIVOS_PERIODO_CIERRE_ASISTENCIA
).
then
((
result
)
=>
{
let
data
=
result
.
data
;
...
...
@@ -69,81 +66,6 @@ const listarPeriodosCierreAsistencia = (nodeIdentifier) => {
});
// initSelect2(nodeIdentifier, "descripcion");
}
//const initSelect2 = (nodeIdentifier, title = "") => {
// $(`${nodeIdentifier}`).select2({
// containerCssClass: 'select-xs',
// ajax: {
// url: baseURLRest + URI_ADMINISTRATIVOS_PERIODO_CIERRE_ASISTENCIA,
// dataType: `json`,
// delay: 1000,
// data: function (params) {
// return {
// q: params.term, // search term
// page: params.page
// };
// },
// processResults: function (data, params) {
// // parse the results into the format expected by Select2
// // since we are using custom formatting functions we do not need to
// // alter the remote JSON data, except to indicate that infinite
// // scrolling can be used
// params.page = params.page || 1;
//
// return {
// results: data,
// pagination: {
// more: (params.page * 30) < data.length
// }
// };
// },
// cache: true
// },
// placeholder: `Buscar`,
// allowClear: true,
// escapeMarkup: function (markup) {
// return markup;
// }, // let our custom formatter work
// minimumInputLength: 1,
// templateResult: formatRepo,
// templateSelection: formatRepoSelection
// });
//
// function formatRepo(repo) {
// if (repo.loading) {
// return repo.text;
// }
//
// var markup = `
// <div class='select2-result-repository clearfix'>
// <div class='select2-result-repository__title'>${repo[title]}</div>
// </div>`;
//
// return markup;
// }
//
// function formatRepoSelection(repo) {
// if (repo.id) {
// return repo[title];
// } else {
// return repo.text;
// }
//}
//}
const
listarSedes
=
(
selectorName
)
=>
{
ajaxWebService
.
get
(
URI_SEDES
).
then
((
result
)
=>
{
let
sedes
=
result
.
data
;
sedes
=
_
.
orderBy
(
sedes
,
s
=>
s
.
descripcion
);
let
html
=
`<option value="">[TODOS]</option>`
;
sedes
.
forEach
(
sede
=>
html
+=
`<option value="
${
sede
.
codigo
}
">
${
sede
.
descripcion
}
</option>`
);
$
(
`
${
selectorName
}
`
).
html
(
html
);
$
(
selectorName
).
select2
();
});
};
const
mostrarModalVerDetalleDescuentoAsistencia
=
(
data
)
=>
{
let
filtros
=
{
fecha_inicio
:
$
(
"#dpFechaInicioFiltro"
).
val
(),
...
...
@@ -154,8 +76,6 @@ const mostrarModalVerDetalleDescuentoAsistencia = (data) => {
localStorage
.
setItem
(
'filtros'
,
JSON
.
stringify
(
filtros
))
location
.
href
=
`
${
baseURLModals
}
administrativos/montosAdministrativos/detalleMontosAdministrativos.jsp`
}
const
listarDescuentoMensualAdministrativos
=
(
objParams
=
{})
=>
{
ajaxWebService
.
get
(
URI_ADMINISTRATIVOS_DESCUENTO_MENSUAL
,
objParams
).
then
((
response
)
=>
{
let
columns
=
getColumns
();
...
...
@@ -181,12 +101,9 @@ const listarDescuentoMensualAdministrativos = (objParams = {}) => {
});
});
};
const
aplicarFiltro
=
()
=>
{
}
$
(
document
).
ready
(
function
()
{
initDatePicker
(
"#dpFechaInicioFiltro"
,
"#dpFechaFinFiltro"
);
listarSedes
(
"#cboSedesFiltro"
);
...
...
src/main/webapp/vistas/modals/administrativos/montosAdministrativos/detalleMontosAdministrativos.jsp
View file @
0d39c60c
...
...
@@ -15,7 +15,7 @@
<div
class=
"col-md-4 col-md-offset-4"
>
<div
class=
"panel panel-primary"
>
<div
class=
"panel-heading"
>
<h5
class=
"panel-title"
>
Detalle de descuento mensu
al
</h5>
<h5
class=
"panel-title"
>
Información del person
al
</h5>
</div>
<div
class=
"panel-body"
>
...
...
@@ -48,7 +48,7 @@
<div
class=
"col-md-10 col-md-offset-1"
>
<div
class=
"panel panel-primary card-3"
style=
"margin-top: 30px"
>
<div
class=
"panel-heading"
style=
"padding: 8px 15px"
>
<h6
class=
"panel-title"
style=
"font-size: 15px; font-family: inherit"
>
Asistencias
</h6>
<h6
class=
"panel-title"
style=
"font-size: 15px; font-family: inherit"
>
Descuentos de Asistencia
</h6>
<div
class=
"heading-elements"
>
<div
class=
"btn-group heading-btn"
>
<button
type=
"button"
class=
"btn bg-slate border-slate-600 btn-icon dropdown-toggle"
data-toggle=
"dropdown"
><i
class=
"icon-menu6"
></i>
<span
class=
"caret"
></span></button>
...
...
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