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
bdd7f2f9
Commit
bdd7f2f9
authored
Oct 10, 2018
by
Billy Larru
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[FIX cambiando titutlo de las cabeceras de los paneles]
parent
cb789ac1
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
20 additions
and
20 deletions
+20
-20
general.js
src/main/webapp/js/general.js
+1
-1
listado_justificacion.js
src/main/webapp/js/pages/listado_justificacion.js
+1
-1
programacion_seminario.js
src/main/webapp/js/pages/programacion_seminario.js
+4
-4
controlAsistenciaAdministrativa.jsp
src/main/webapp/vistas/controlAsistenciaAdministrativa.jsp
+1
-1
listadoJustificacion.jsp
src/main/webapp/vistas/listadoJustificacion.jsp
+2
-2
editarSeminario.jspf
...centesporhoras/programacionSeminario/editarSeminario.jspf
+2
-2
registroSeminario.jspf
...ntesporhoras/programacionSeminario/registroSeminario.jspf
+2
-2
programacionSeminario.jsp
src/main/webapp/vistas/programacionSeminario.jsp
+3
-3
toleranciaIndividual.jsp
src/main/webapp/vistas/toleranciaIndividual.jsp
+1
-1
toleranciaMasiva.jsp
src/main/webapp/vistas/toleranciaMasiva.jsp
+2
-2
vacacionesAdministrativasIndividual.jsp
...ain/webapp/vistas/vacacionesAdministrativasIndividual.jsp
+1
-1
No files found.
src/main/webapp/js/general.js
View file @
bdd7f2f9
...
@@ -9,7 +9,7 @@ const PATH_SERVICIO_REST = 'http://app9.sacooliveros.edu.pe:8080/security-rest/a
...
@@ -9,7 +9,7 @@ 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
baseURLModals
=
`http://
172.16.2.102
:7070/Asistencia/vistas/modals/`
;
const
baseURLImages
=
''
const
baseURLImages
=
''
...
...
src/main/webapp/js/pages/listado_justificacion.js
View file @
bdd7f2f9
...
@@ -80,7 +80,7 @@ const mostrarModalVerDetalleJustificacion = (data) => {
...
@@ -80,7 +80,7 @@ const mostrarModalVerDetalleJustificacion = (data) => {
debugger
debugger
localStorage
.
setItem
(
'data'
,
JSON
.
stringify
(
data
))
localStorage
.
setItem
(
'data'
,
JSON
.
stringify
(
data
))
// localStorage.setItem('filtros', JSON.stringify(filtros))
// localStorage.setItem('filtros', JSON.stringify(filtros))
location
.
href
=
`
${
baseURLModals
}
justificaciones/evaluarJustificacion.jsp
f
`
location
.
href
=
`
${
baseURLModals
}
justificaciones/evaluarJustificacion.jsp`
}
}
const
listarJustificaciones
=
(
objParams
=
{})
=>
{
const
listarJustificaciones
=
(
objParams
=
{})
=>
{
ajaxWebService
.
get
(
URI_JUSTIFICACION
,
objParams
).
then
((
response
)
=>
{
ajaxWebService
.
get
(
URI_JUSTIFICACION
,
objParams
).
then
((
response
)
=>
{
...
...
src/main/webapp/js/pages/programacion_seminario.js
View file @
bdd7f2f9
...
@@ -159,7 +159,7 @@ const mostrarModalRechazarSeminario = (data) => {
...
@@ -159,7 +159,7 @@ const mostrarModalRechazarSeminario = (data) => {
let
textoConfirmacion
=
""
let
textoConfirmacion
=
""
let
tituloOperacion
=
""
;
let
tituloOperacion
=
""
;
// if (estado == 0) {
// if (estado == 0) {
titulo
=
'Está seguro de desa
a
probar el seminario?'
;
titulo
=
'Está seguro de desaprobar el seminario?'
;
textoConfirmacion
=
'Sí, desaprobar!'
;
textoConfirmacion
=
'Sí, desaprobar!'
;
tituloOperacion
=
'¡Desaprobado exitosamente!'
;
tituloOperacion
=
'¡Desaprobado exitosamente!'
;
estado
=
2
;
estado
=
2
;
...
@@ -216,7 +216,7 @@ const editarSeminario = () => {
...
@@ -216,7 +216,7 @@ const editarSeminario = () => {
const
mostrarModalEditarSeminario
=
(
data
)
=>
{
const
mostrarModalEditarSeminario
=
(
data
)
=>
{
ajaxModal
.
get
(
"docentesporhoras/programacionSeminario/editarSeminario.jspf"
).
then
((
response
)
=>
{
ajaxModal
.
get
(
"docentesporhoras/programacionSeminario/editarSeminario.jspf"
).
then
((
response
)
=>
{
swal
({
swal
({
title
:
'<strong>Editar
seminario
</strong>'
,
title
:
'<strong>Editar
programación
</strong>'
,
html
:
response
.
data
,
html
:
response
.
data
,
showCloseButton
:
true
,
showCloseButton
:
true
,
showCancelButton
:
true
,
showCancelButton
:
true
,
...
@@ -413,12 +413,12 @@ const registrarSeminario = () => {
...
@@ -413,12 +413,12 @@ const registrarSeminario = () => {
const
mostrarModalNuevoSeminario
=
()
=>
{
const
mostrarModalNuevoSeminario
=
()
=>
{
ajaxModal
.
get
(
"docentesporhoras/programacionSeminario/registroSeminario.jspf"
).
then
((
response
)
=>
{
ajaxModal
.
get
(
"docentesporhoras/programacionSeminario/registroSeminario.jspf"
).
then
((
response
)
=>
{
swal
({
swal
({
title
:
'<strong>Registro de
seminario
</strong>'
,
title
:
'<strong>Registro de
Programación
</strong>'
,
html
:
response
.
data
,
html
:
response
.
data
,
showCloseButton
:
true
,
showCloseButton
:
true
,
showCancelButton
:
true
,
showCancelButton
:
true
,
focusConfirm
:
false
,
focusConfirm
:
false
,
confirmButtonText
:
'<i class="icon-checkmark2"></i> Registrar
seminario
'
,
confirmButtonText
:
'<i class="icon-checkmark2"></i> Registrar'
,
confirmButtonAriaLabel
:
'Registrar seminario'
,
confirmButtonAriaLabel
:
'Registrar seminario'
,
cancelButtonText
:
'<i class="icon-cross3"></i>Cancelar'
,
cancelButtonText
:
'<i class="icon-cross3"></i>Cancelar'
,
cancelButtonAriaLabel
:
'Thumbs down'
,
cancelButtonAriaLabel
:
'Thumbs down'
,
...
...
src/main/webapp/vistas/controlAsistenciaAdministrativa.jsp
View file @
bdd7f2f9
...
@@ -15,7 +15,7 @@
...
@@ -15,7 +15,7 @@
<div
class=
"col-md-6 col-md-offset-3"
>
<div
class=
"col-md-6 col-md-offset-3"
>
<div
class=
"panel panel-primary"
>
<div
class=
"panel panel-primary"
>
<div
class=
"panel-heading"
>
<div
class=
"panel-heading"
>
<h5
class=
"panel-title"
>
Búsqueda
</h5>
<h5
class=
"panel-title"
>
Búsqueda
de asistencias
</h5>
</div>
</div>
<div
class=
"panel-body"
>
<div
class=
"panel-body"
>
...
...
src/main/webapp/vistas/listadoJustificacion.jsp
View file @
bdd7f2f9
...
@@ -15,7 +15,7 @@
...
@@ -15,7 +15,7 @@
<div
class=
"col-md-6 col-md-offset-3"
>
<div
class=
"col-md-6 col-md-offset-3"
>
<div
class=
"panel panel-primary"
>
<div
class=
"panel panel-primary"
>
<div
class=
"panel-heading"
>
<div
class=
"panel-heading"
>
<h5
class=
"panel-title"
>
B
usqueda
</h5>
<h5
class=
"panel-title"
>
B
úsqueda de justificaciones por personal
</h5>
</div>
</div>
<div
class=
"panel-body"
>
<div
class=
"panel-body"
>
...
@@ -66,7 +66,7 @@
...
@@ -66,7 +66,7 @@
<div
class=
"col-md-10 col-md-offset-1"
>
<div
class=
"col-md-10 col-md-offset-1"
>
<div
class=
"panel panel-primary card-3"
style=
"margin-top: 30px"
>
<div
class=
"panel panel-primary card-3"
style=
"margin-top: 30px"
>
<div
class=
"panel-heading"
style=
"padding: 8px 15px"
>
<div
class=
"panel-heading"
style=
"padding: 8px 15px"
>
<h6
class=
"panel-title"
style=
"font-size: 15px; font-family: inherit"
>
L
ISTADO DE JUSTIFICACIONES
</h6>
<h6
class=
"panel-title"
style=
"font-size: 15px; font-family: inherit"
>
L
istado de justificaciones
</h6>
</div>
</div>
<div
id=
"divDatatable"
></div>
<div
id=
"divDatatable"
></div>
</div>
</div>
...
...
src/main/webapp/vistas/modals/docentesporhoras/programacionSeminario/editarSeminario.jspf
View file @
bdd7f2f9
...
@@ -6,13 +6,13 @@
...
@@ -6,13 +6,13 @@
<span class="label label-left border-left-primary label-striped form-control" id="spanNombres"></span>
<span class="label label-left border-left-primary label-striped form-control" id="spanNombres"></span>
</div>
</div>
<div class="form-group col-md-4">
<div class="form-group col-md-4">
<label>Tipo de
seminario
</label>
<label>Tipo de
programacin
</label>
<select id="cboTipoSeminario" class="select-search form-control"></select>
<select id="cboTipoSeminario" class="select-search form-control"></select>
</div>
</div>
</div>
</div>
<div class="row">
<div class="row">
<div class="form-group col-md-4">
<div class="form-group col-md-4">
<label>Fecha
Seminario
</label>
<label>Fecha
de programacin
</label>
<div class="input-group">
<div class="input-group">
<span class="input-group-addon"><i class="icon-calendar"></i></span>
<span class="input-group-addon"><i class="icon-calendar"></i></span>
<input type="text" class="form-control" id="dpFechaSeminario">
<input type="text" class="form-control" id="dpFechaSeminario">
...
...
src/main/webapp/vistas/modals/docentesporhoras/programacionSeminario/registroSeminario.jspf
View file @
bdd7f2f9
...
@@ -6,13 +6,13 @@
...
@@ -6,13 +6,13 @@
<select id="cboDocentes" class="select-search form-control"></select>
<select id="cboDocentes" class="select-search form-control"></select>
</div>
</div>
<div class="form-group col-md-4">
<div class="form-group col-md-4">
<label>Tipo de
seminario
</label>
<label>Tipo de
programacin
</label>
<select id="cboTipoSeminario" class="select-search form-control"></select>
<select id="cboTipoSeminario" class="select-search form-control"></select>
</div>
</div>
</div>
</div>
<div class="row">
<div class="row">
<div class="form-group col-md-4">
<div class="form-group col-md-4">
<label>Fecha
Seminario
</label>
<label>Fecha
de programacin
</label>
<div class="input-group">
<div class="input-group">
<span class="input-group-addon"><i class="icon-calendar"></i></span>
<span class="input-group-addon"><i class="icon-calendar"></i></span>
<input type="text" class="form-control" id="dpFechaSeminario">
<input type="text" class="form-control" id="dpFechaSeminario">
...
...
src/main/webapp/vistas/programacionSeminario.jsp
View file @
bdd7f2f9
...
@@ -15,7 +15,7 @@
...
@@ -15,7 +15,7 @@
<div
class=
"col-md-6 col-md-offset-3"
>
<div
class=
"col-md-6 col-md-offset-3"
>
<div
class=
"panel panel-primary"
>
<div
class=
"panel panel-primary"
>
<div
class=
"panel-heading"
>
<div
class=
"panel-heading"
>
<h5
class=
"panel-title"
>
B
usqueda
</h5>
<h5
class=
"panel-title"
>
B
úsqueda de programaciones
</h5>
</div>
</div>
<div
class=
"panel-body"
>
<div
class=
"panel-body"
>
...
@@ -62,9 +62,9 @@
...
@@ -62,9 +62,9 @@
<div
class=
"col-md-12"
>
<div
class=
"col-md-12"
>
<div
class=
"panel panel-primary card-3"
style=
"margin-top: 30px"
>
<div
class=
"panel panel-primary card-3"
style=
"margin-top: 30px"
>
<div
class=
"panel-heading"
style=
"padding: 8px 15px"
>
<div
class=
"panel-heading"
style=
"padding: 8px 15px"
>
<h6
class=
"panel-title"
style=
"font-size: 15px; font-family: inherit"
>
L
ISTADO DE SEMINARIOS PROGRAMADOS
</h6>
<h6
class=
"panel-title"
style=
"font-size: 15px; font-family: inherit"
>
L
istado de programaciones
</h6>
<div
class=
"heading-elements"
>
<div
class=
"heading-elements"
>
<button
type=
"button"
id=
"btnNuevoSeminario"
class=
"btn bg-slate border-slate-600 btn-xs"
><i
class=
"glyphicon glyphicon-plus"
></i>
Nuev
o seminario
</button>
<button
type=
"button"
id=
"btnNuevoSeminario"
class=
"btn bg-slate border-slate-600 btn-xs"
><i
class=
"glyphicon glyphicon-plus"
></i>
Nuev
a programación
</button>
</div>
</div>
</div>
</div>
<div
id=
"divDatatable"
>
<div
id=
"divDatatable"
>
...
...
src/main/webapp/vistas/toleranciaIndividual.jsp
View file @
bdd7f2f9
...
@@ -15,7 +15,7 @@
...
@@ -15,7 +15,7 @@
<div
class=
"col-md-6 col-md-offset-3"
>
<div
class=
"col-md-6 col-md-offset-3"
>
<div
class=
"panel panel-primary"
>
<div
class=
"panel panel-primary"
>
<div
class=
"panel-heading"
>
<div
class=
"panel-heading"
>
<h5
class=
"panel-title"
>
Búsqueda
</h5>
<h5
class=
"panel-title"
>
Búsqueda
de tolerancias
</h5>
</div>
</div>
<div
class=
"panel-body"
>
<div
class=
"panel-body"
>
...
...
src/main/webapp/vistas/toleranciaMasiva.jsp
View file @
bdd7f2f9
...
@@ -15,7 +15,7 @@
...
@@ -15,7 +15,7 @@
<div
class=
"col-md-6 col-md-offset-3"
>
<div
class=
"col-md-6 col-md-offset-3"
>
<div
class=
"panel panel-primary"
>
<div
class=
"panel panel-primary"
>
<div
class=
"panel-heading"
>
<div
class=
"panel-heading"
>
<h5
class=
"panel-title"
>
Búsqueda
</h5>
<h5
class=
"panel-title"
>
Búsqueda
del personal
</h5>
</div>
</div>
<div
class=
"panel-body"
>
<div
class=
"panel-body"
>
<div
class=
"row"
>
<div
class=
"row"
>
...
@@ -44,7 +44,7 @@
...
@@ -44,7 +44,7 @@
<div
class=
"col-md-8 col-md-offset-2"
>
<div
class=
"col-md-8 col-md-offset-2"
>
<div
class=
"panel panel-primary card-3"
style=
"margin-top: 30px"
>
<div
class=
"panel panel-primary card-3"
style=
"margin-top: 30px"
>
<div
class=
"panel-heading"
style=
"padding: 8px 15px"
>
<div
class=
"panel-heading"
style=
"padding: 8px 15px"
>
<h6
class=
"panel-title"
style=
"font-size: 15px; font-family: inherit"
>
Seleccionar personal
</h6>
<h6
class=
"panel-title"
style=
"font-size: 15px; font-family: inherit"
>
Seleccionar personal
para asignar tolerancia
</h6>
<div
class=
"heading-elements"
>
<div
class=
"heading-elements"
>
<button
type=
"button"
id=
"btnAsignarTolerancia"
class=
"btn bg-slate border-slate-600 btn-xs"
><i
class=
"glyphicon glyphicon-plus"
></i>
Asignar tolerancia
</button>
<button
type=
"button"
id=
"btnAsignarTolerancia"
class=
"btn bg-slate border-slate-600 btn-xs"
><i
class=
"glyphicon glyphicon-plus"
></i>
Asignar tolerancia
</button>
</div>
</div>
...
...
src/main/webapp/vistas/vacacionesAdministrativasIndividual.jsp
View file @
bdd7f2f9
...
@@ -15,7 +15,7 @@
...
@@ -15,7 +15,7 @@
<div
class=
"col-md-6 col-md-offset-3"
>
<div
class=
"col-md-6 col-md-offset-3"
>
<div
class=
"panel panel-primary"
>
<div
class=
"panel panel-primary"
>
<div
class=
"panel-heading"
>
<div
class=
"panel-heading"
>
<h5
class=
"panel-title"
>
Búsqueda
</h5>
<h5
class=
"panel-title"
>
Búsqueda
de vacaciones por personal
</h5>
</div>
</div>
<div
class=
"panel-body"
>
<div
class=
"panel-body"
>
...
...
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