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
49572ee0
Commit
49572ee0
authored
Sep 14, 2018
by
Billy Larru
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[EDIT detalleMontosAdministrativos, seteando datos personales]
parent
e8a64c42
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
136 additions
and
95 deletions
+136
-95
general.css
src/main/webapp/css/general.css
+1
-2
detalle_montos_administrativos.js
src/main/webapp/js/pages/detalle_montos_administrativos.js
+120
-84
montos_administrativos.js
src/main/webapp/js/pages/montos_administrativos.js
+10
-4
detalleMontosAdministrativos.jsp
...os/montosAdministrativos/detalleMontosAdministrativos.jsp
+5
-5
No files found.
src/main/webapp/css/general.css
View file @
49572ee0
...
...
@@ -294,4 +294,4 @@ table.display tbody tr:hover td {
height
:
16px
;
background
:
url(../img/icons/reemplazo.png)
;
background-size
:
16px
16px
;
}
\ No newline at end of file
}
src/main/webapp/js/pages/detalle_montos_administrativos.js
View file @
49572ee0
let
personal
;
let
filtros
;
function
getColumns
()
{
let
columns
=
[
{
title
:
`N°`
,
data
:
`id`
,
className
:
'text-center'
},
{
title
:
"FECHA"
,
data
:
"fecha_asistencia"
,
className
:
"text-center"
},
{
title
:
`HORA`
,
data
:
`marcacion_entrada`
,
className
:
'text-center'
},
{
title
:
`DESCUENTO<br>(S/.)`
,
data
:
`descuento`
,
className
:
'text-center'
,
render
:
(
data
)
=>
{
return
`<span class="text-danger">
${
data
}
.00
</span>`
;
}
},
{
title
:
`DESCRIPICON`
,
data
:
`descripcion`
,
className
:
'text-center'
},
{
title
:
`SEDE<br>MARCACIÓN`
,
data
:
`sede_marcacion`
,
className
:
'text-center'
},
{
title
:
`TIPO REGISTRO`
,
data
:
`tipo_registro`
,
className
:
'text-center'
,
render
:
(
data
)
=>
{
let
label
=
""
;
let
contenido
=
""
;
if
(
data
==
1
)
{
label
=
"label label-info"
contenido
=
"HUELLA"
}
else
{
label
=
"label label-warning"
contenido
=
"MANUAL"
}
return
`<span class="
${
label
}
">
${
contenido
}
</span>`
}
},
{
title
:
`ACCIONES`
,
data
:
null
,
className
:
'text-center'
,
render
:
(
data
)
=>
{
let
acciones
=
""
;
let
registrar
=
""
;
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>`
;
acciones
=
verdetalle
;
return
acciones
;
}
}
];
let
columns
=
[
{
title
:
`N°`
,
data
:
`id`
,
className
:
'text-center'
},
{
title
:
"FECHA"
,
data
:
"fecha_asistencia"
,
className
:
"text-center"
},
{
title
:
`HORA`
,
data
:
`marcacion_entrada`
,
className
:
'text-center'
},
{
title
:
`DESCUENTO<br>(S/.)`
,
data
:
`descuento`
,
className
:
'text-center'
,
render
:
(
data
)
=>
{
return
`<span class="text-danger">
${
parseFloat
(
data
).
toFixed
(
2
)}
</span>`
;
}
},
{
title
:
`DESCRIPICON`
,
data
:
`descripcion`
,
className
:
'text-center'
},
{
title
:
`SEDE<br>MARCACIÓN`
,
data
:
`sede_marcacion`
,
className
:
'text-center'
},
{
title
:
`TIPO REGISTRO`
,
data
:
`tipo_registro`
,
className
:
'text-center'
,
render
:
(
data
)
=>
{
let
label
=
""
;
let
contenido
=
""
;
if
(
data
==
1
)
{
label
=
"label label-info"
contenido
=
"HUELLA"
}
else
{
label
=
"label label-warning"
contenido
=
"MANUAL"
}
return
`<span class="
${
label
}
">
${
contenido
}
</span>`
}
},
{
title
:
`ACCIONES`
,
data
:
null
,
className
:
'text-center'
,
render
:
(
data
)
=>
{
let
acciones
=
""
;
let
registrar
=
""
;
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>`
;
acciones
=
verdetalle
;
return
acciones
;
}
}
];
return
columns
;
return
columns
;
}
const
listarAsistenciaMensual
=
(
objParams
=
{})
=>
{
ajaxWebService
.
get
(
URI_ADMINISTRATIVOS_DESCUENTO_MENSUAL_DETALLADO
,
objParams
).
then
((
response
)
=>
{
let
columns
=
getColumns
();
ajaxWebService
.
get
(
URI_ADMINISTRATIVOS_DESCUENTO_MENSUAL_DETALLADO
,
objParams
).
then
((
response
)
=>
{
let
columns
=
getColumns
();
let
wrapsNameDatatable
=
`divDatatable`
;
let
classNameForDatatable
=
`display table table-bordered`
;
let
wrapsNameDatatable
=
`divDatatable`
;
let
classNameForDatatable
=
`display table table-bordered`
;
makeDatatable
(
wrapsNameDatatable
,
{
data
:
response
.
data
,
columns
,
},
classNameForDatatable
,
).
then
((
nodes
)
=>
{
$
(
".chkFirma, #chkFirmaTodo"
).
uniform
();
nodes
.
container
.
off
()
makeDatatable
(
wrapsNameDatatable
,
{
data
:
response
.
data
,
columns
,
},
classNameForDatatable
,
).
then
((
nodes
)
=>
{
$
(
".chkFirma, #chkFirmaTodo"
).
uniform
();
nodes
.
container
.
off
()
// .on("click", ".verdetalle", function () {
// let data = nodes.datatable.DataTable().row($(this).parents("tr")).data();
// mostrarModalVerDetalleDescuentoAsistencia(data);
// })
});
});
});
});
};
const
recibirData
=
()
=>
{
let
data
=
localStorage
.
getItem
(
'data'
)
let
filter
=
localStorage
.
getItem
(
'filtros'
)
personal
=
data
?
JSON
.
parse
(
data
)
:
null
;
filtros
=
filter
?
JSON
.
parse
(
filter
)
:
null
;
// localStorage.removeItem('data')
// localStorage.removeItem('filtros')
}
const
inicializarInputs
=
()
=>
{
// $("#spanNombres").text(`${personal}`)
}
const
mostrarDatosTrabajador
=
()
=>
{
let
id
=
personal
.
trabajador_id
ajaxWebService
.
get
(
`
${
URI_TRABAJADORES
}
/
${
id
}
`
)
.
then
((
response
)
=>
{
if
(
response
.
status
)
{
let
trabajador
=
response
.
data
;
$
(
"#spanNombres"
).
text
(
`
${
trabajador
.
apellidos
}
${
trabajador
.
nombres
}
`
)
$
(
"#spanCargo"
).
text
(
`
${
trabajador
.
cargoLaboral_nombre
}
`
)
$
(
"#spanHorario"
).
text
(
`
${
trabajador
.
horarioLV
}
`
)
let
costodia
=
trabajador
.
sueldo_planilla
/
30
$
(
"#spanCostoDia"
).
text
(
parseFloat
(
costodia
).
toFixed
(
2
))
}
})
}
$
(
document
).
ready
(
function
()
{
listarAsistenciaMensual
()
recibirData
();
mostrarDatosTrabajador
()
listarAsistenciaMensual
()
})
\ No newline at end of file
src/main/webapp/js/pages/montos_administrativos.js
View file @
49572ee0
...
...
@@ -2,7 +2,7 @@ function getColumns() {
let
columns
=
[
{
title
:
`N°`
,
data
:
`
id
`
,
data
:
`
numero_orden
`
,
className
:
'text-center'
},
{
...
...
@@ -20,12 +20,12 @@ function getColumns() {
},
{
title
:
"SEDE"
,
data
:
"sede_
descripcion
"
,
data
:
"sede_
nombre
"
,
className
:
"text-center"
},
{
title
:
`CARGO`
,
data
:
`
puest
olaboral_nombre`
,
data
:
`
carg
olaboral_nombre`
,
className
:
'text-center'
},
{
...
...
@@ -145,6 +145,13 @@ const listarSedes = (selectorName) => {
};
const
mostrarModalVerDetalleDescuentoAsistencia
=
(
data
)
=>
{
let
filtros
=
{
fecha_inicio
:
$
(
"#dpFechaInicioFiltro"
).
val
(),
fecha_fin
:
$
(
"#dpFechaFinFiltro"
).
val
(),
sede_id
:
$
(
"#cboSedesFiltro"
).
val
()
}
localStorage
.
setItem
(
'data'
,
JSON
.
stringify
(
data
))
localStorage
.
setItem
(
'filtros'
,
JSON
.
stringify
(
filtros
))
location
.
href
=
`
${
baseURLModals
}
administrativos/montosAdministrativos/detalleMontosAdministrativos.jsp`
}
...
...
@@ -164,7 +171,6 @@ const listarDescuentoMensualAdministrativos = (objParams = {}) => {
},
classNameForDatatable
,
).
then
((
nodes
)
=>
{
$
(
".chkFirma, #chkFirmaTodo"
).
uniform
();
nodes
.
container
.
off
()
.
on
(
"click"
,
".verdetalle"
,
function
()
{
...
...
src/main/webapp/vistas/modals/administrativos/montosAdministrativos/detalleMontosAdministrativos.jsp
View file @
49572ee0
...
...
@@ -6,7 +6,7 @@
<jsp:include
page=
"/vistas/templates/header.jsp"
/>
<!--template-core-->
<!--css de la pagina-->
<link
href=
"
..
/css/lib/sweetalert2.min.css"
rel=
"stylesheet"
type=
"text/css"
/>
<link
href=
"
${pageContext.request.contextPath}
/css/lib/sweetalert2.min.css"
rel=
"stylesheet"
type=
"text/css"
/>
<!--css-->
</head>
<body>
...
...
@@ -22,22 +22,22 @@
<div
class=
"row"
>
<div
class=
"col-md-6 form-group"
>
<label>
Personal
</label>
<span
class=
"label label-left border-left border-left-primary label-striped form-control"
>
GANGAS VASQUEZ LUIS ALBERTO
</span>
<span
class=
"label label-left border-left border-left-primary label-striped form-control"
id=
"spanNombres"
>
</span>
</div>
<div
class=
"col-md-6 form-group"
>
<label>
Cargo
</label>
<span
class=
"label label-left border-left border-left-primary label-striped form-control"
>
ANALISTA PROGRAMADOR
</span>
<span
class=
"label label-left border-left border-left-primary label-striped form-control"
id=
"spanCargo"
>
</span>
</div>
</div>
<div
class=
"row"
>
<div
class=
"col-md-6 form-group"
>
<label>
Horario
</label>
<span
class=
"label label-left border-left border-left-primary label-striped form-control"
>
07:30 - 17:30
</span>
<span
class=
"label label-left border-left border-left-primary label-striped form-control"
id=
"spanHorario"
>
</span>
</div>
<div
class=
"col-md-6 form-group"
>
<label>
Costo día
</label>
<span
class=
"label label-left border-left border-left-primary label-striped form-control"
>
600.00
</span>
<span
class=
"label label-left border-left border-left-primary label-striped form-control"
id=
"spanCostoDia"
>
</span>
</div>
</div>
</div>
...
...
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