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
71da090b
Commit
71da090b
authored
Oct 15, 2018
by
Billy Larru
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[FIX modificando titulos de paneles]
parent
73e25c8c
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
21 additions
and
23 deletions
+21
-23
control_asistencia_docentes.js
src/main/webapp/js/pages/control_asistencia_docentes.js
+0
-1
crear_rol_policia.js
src/main/webapp/js/pages/crear_rol_policia.js
+1
-1
controlAsistenciaAdministrativa.jsp
src/main/webapp/vistas/controlAsistenciaAdministrativa.jsp
+1
-1
controlAsistenciaDocentes.jsp
src/main/webapp/vistas/controlAsistenciaDocentes.jsp
+3
-3
controlAsistenciaPolicias.jsp
src/main/webapp/vistas/controlAsistenciaPolicias.jsp
+3
-3
crearRolPolicia.jsp
src/main/webapp/vistas/crearRolPolicia.jsp
+3
-3
registroTolerancia.jspf
...administrativos/tolerancia/masiva/registroTolerancia.jspf
+3
-3
registrarAsistencia.jspf
...odals/policias/controlAsistencia/registrarAsistencia.jspf
+1
-2
crearRol.jspf
...app/vistas/modals/policias/mantenimientoRol/crearRol.jspf
+1
-1
montosAdministrativos.jsp
src/main/webapp/vistas/montosAdministrativos.jsp
+2
-2
proyectarAsistenciaPolicias.jsp
src/main/webapp/vistas/proyectarAsistenciaPolicias.jsp
+3
-3
No files found.
src/main/webapp/js/pages/control_asistencia_docentes.js
View file @
71da090b
...
...
@@ -8,7 +8,6 @@ function getColumns() {
{
title
:
`APELLIDOS Y NOMBRES`
,
data
:
null
,
className
:
`text-center`
,
render
:
(
data
)
=>
{
let
nombresCompletos
;
let
nombres
=
data
.
trabajador_nombres
;
...
...
src/main/webapp/js/pages/crear_rol_policia.js
View file @
71da090b
...
...
@@ -347,7 +347,7 @@ function guardarCambios() {
function
mostrarModalNuevoRol
()
{
ajaxModal
.
get
(
"policias/mantenimientoRol/crearRol.jspf"
).
then
((
response
)
=>
{
swal
({
title
:
'<strong>
Nuevo
Rol</strong>'
,
title
:
'<strong>
Registro de
Rol</strong>'
,
// type: 'info',
html
:
response
.
data
,
showCloseButton
:
true
,
...
...
src/main/webapp/vistas/controlAsistenciaAdministrativa.jsp
View file @
71da090b
...
...
@@ -15,7 +15,7 @@
<div
class=
"col-md-6 col-md-offset-3"
>
<div
class=
"panel panel-primary"
>
<div
class=
"panel-heading"
>
<h5
class=
"panel-title"
>
Búsqueda de asistencias
</h5>
<h5
class=
"panel-title"
>
Búsqueda de asistencias
administrativas
</h5>
</div>
<div
class=
"panel-body"
>
...
...
src/main/webapp/vistas/controlAsistenciaDocentes.jsp
View file @
71da090b
...
...
@@ -17,13 +17,13 @@
<div
class=
"col-md-6 col-md-offset-3"
>
<div
class=
"panel panel-primary"
>
<div
class=
"panel-heading"
>
<h5
class=
"panel-title"
>
Control de Asistencia de D
ocentes por horas
</h5>
<h5
class=
"panel-title"
>
Búsqueda de asistencias de d
ocentes por horas
</h5>
</div>
<div
class=
"panel-body"
>
<div
class=
"row"
>
<div
class=
"col-md-6 form-group"
>
<label>
Personal
</label>
<label>
Docente
</label>
<select
class=
"select-search form-control"
id=
"cboPersonalFiltro"
>
</select>
</div>
...
...
@@ -72,7 +72,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"
>
L
ISTADO DE ASISTENCIAS DE DOCENTES
</h6>
<h6
class=
"panel-title"
style=
"font-size: 15px; font-family: inherit"
>
L
istado de asistencias de docentes
</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>
...
...
src/main/webapp/vistas/controlAsistenciaPolicias.jsp
View file @
71da090b
...
...
@@ -15,14 +15,14 @@
<div
class=
"col-md-6 col-md-offset-3"
>
<div
class=
"panel panel-primary"
>
<div
class=
"panel-heading"
>
<h5
class=
"panel-title"
>
Control de Asistencia de Polici
as
</h5>
<h5
class=
"panel-title"
>
Búsqueda de asistencias de policí
as
</h5>
</div>
<form
id=
"frmAsistenciaPolicias"
onsubmit=
"return false;"
autocomplete=
"off"
>
<div
class=
"panel-body"
>
<div
class=
"row"
>
<div
class=
"col-md-6 form-group"
>
<label>
Polic
i
a
</label>
<label>
Polic
í
a
</label>
<select
class=
"select-search form-control"
id=
"cboPoliciasFiltro"
>
</select>
</div>
...
...
@@ -80,7 +80,7 @@
<div
class=
"col-md-12"
>
<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"
><i
class=
"icon icon-search4"
></i>
L
ISTADO DE ASISTENCIAS
</h6>
<h6
class=
"panel-title"
style=
"font-size: 15px; font-family: inherit"
><i
class=
"icon icon-search4"
></i>
L
istado de asistencias de policías
</h6>
</div>
<div
id=
"divAsistencias"
>
<!-- <table class="table dataTable table-striped table-hover table-sm table-bordered display" id="tblAsistenciaPolicias">
...
...
src/main/webapp/vistas/crearRolPolicia.jsp
View file @
71da090b
...
...
@@ -17,13 +17,13 @@
<div
class=
"col-md-6 col-md-offset-3"
>
<div
class=
"panel panel-primary"
>
<div
class=
"panel-heading"
>
<h5
class=
"panel-title"
>
Filtros de rol
</h5>
<h5
class=
"panel-title"
>
Búsqueda de rol de policías
</h5>
</div>
<div
class=
"panel-body"
>
<div
class=
"row"
>
<div
class=
"col-md-6 form-group"
>
<label>
Polic
i
a
</label>
<label>
Polic
í
a
</label>
<select
class=
"select-search form-control"
id=
"cboPoliciasFiltro"
>
</select>
</div>
...
...
@@ -65,7 +65,7 @@
<div
class=
"col-md-8 col-md-offset-2"
>
<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"
>
L
ISTADO DE ROLES
</h6>
<h6
class=
"panel-title"
style=
"font-size: 15px; font-family: inherit"
>
L
istado de roles de policías
</h6>
<div
class=
"heading-elements"
>
<button
type=
"button"
id=
"btnNuevoRol"
class=
"btn bg-slate border-slate-600 btn-xs"
><i
class=
"glyphicon glyphicon-plus"
></i>
Nuevo rol
</button>
</div>
...
...
src/main/webapp/vistas/modals/administrativos/tolerancia/masiva/registroTolerancia.jspf
View file @
71da090b
<form id="frm" onsubmit="return false;" autocomplete="off">
<div class="row">
<div class="form-group col-md-6">
<label>Fecha</label>
<label>Fecha
de asistencia
</label>
<div class="input-group">
<span class="input-group-addon"><i class="icon-calendar"></i></span>
<input type="text" id="dpFecha" class="form-control">
</div>
</div>
<div class="form-group col-md-6">
<label>Hora</label>
<label>Hora
lmite
</label>
<input type="time" id="txtHora" class="form-control">
</div>
</div>
<div class="row">
<div class="form-group col-md-12">
<label>Sede</label>
<label>Sede
de marcacin
</label>
<select type="text" id="cboSedes" class="select-search form-control"></select>
</div>
</div>
...
...
src/main/webapp/vistas/modals/policias/controlAsistencia/registrarAsistencia.jspf
View file @
71da090b
<%--<jsp:include page="/vistas/modals/helperHeader.jsp"/>--%>
<div class="panel-body">
<form id="frm" onsubmit="return false;" autocomplete="off">
...
...
@@ -14,7 +13,7 @@
<div class="row">
<div class="form-group col-md-12">
<label>Polic
i
a</label>
<label>Polica</label>
<span class="label label-left border-left-primary label-striped form-control" id="spanNombres"></span>
</div>
</div>
...
...
src/main/webapp/vistas/modals/policias/mantenimientoRol/crearRol.jspf
View file @
71da090b
...
...
@@ -2,7 +2,7 @@
<div class="panel-body">
<div class="row">
<div class="col-md-12 form-group">
<label>Polic
i
a</label>
<label>Polica</label>
<select class="select-search form-control" id="cboPolicias">
</select>
</div>
...
...
src/main/webapp/vistas/montosAdministrativos.jsp
View file @
71da090b
...
...
@@ -15,7 +15,7 @@
<div
class=
"col-md-6 col-md-offset-3"
>
<div
class=
"panel panel-primary"
>
<div
class=
"panel-heading"
>
<h5
class=
"panel-title"
>
Busqueda
</h5>
<h5
class=
"panel-title"
>
Reporte mensual de descuentos
</h5>
</div>
<div
class=
"panel-body"
>
...
...
@@ -61,7 +61,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"
>
Reporte mensual de descuentos
</h6>
<h6
class=
"panel-title"
style=
"font-size: 15px; font-family: inherit"
>
Listado del personal
</h6>
</div>
<div
id=
"divDatatable"
></div>
</div>
...
...
src/main/webapp/vistas/proyectarAsistenciaPolicias.jsp
View file @
71da090b
...
...
@@ -15,13 +15,13 @@
<div
class=
"col-md-6 col-md-offset-3"
>
<div
class=
"panel panel-primary"
>
<div
class=
"panel-heading"
>
<h5
class=
"panel-title"
>
Proyección de Asistencias
</h5>
<h5
class=
"panel-title"
>
Selección de fechas a proyectar
</h5>
</div>
<div
class=
"panel-body"
>
<div
class=
"row"
>
<div
class=
"col-md-6 form-group"
>
<label>
Polic
i
a
</label>
<label>
Polic
í
a
</label>
<select
class=
"select-search form-control"
id=
"cboPoliciasFiltro"
>
</select>
</div>
...
...
@@ -63,7 +63,7 @@
<div
class=
"col-md-12"
>
<div
class=
"panel panel-primary card-3"
>
<div
class=
"panel-heading"
>
<h6
class=
"panel-title"
style=
"font-size: 15px; font-family: inherit"
><i
class=
"icon icon-search4"
></i>
A
SISTENCIAS PROYECTADAS
</h6>
<h6
class=
"panel-title"
style=
"font-size: 15px; font-family: inherit"
><i
class=
"icon icon-search4"
></i>
A
sistencias de policías a proyectar
</h6>
<div
class=
"heading-elements"
>
<button
type=
"button"
id=
"btnGuardarCambios"
class=
"btn bg-slate border-slate-600 btn-xs"
><i
class=
"glyphicon glyphicon-plus"
></i>
Guardar cambios
</button>
</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