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
cfa5d9f6
Commit
cfa5d9f6
authored
6 years ago
by
Billy Larru
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[EDIT programacion seminario]
parent
54e3598f
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
213 additions
and
20 deletions
+213
-20
programacion_seminario.js
src/main/webapp/js/pages/programacion_seminario.js
+114
-19
.LCKindex.jsp~
src/main/webapp/vistas/.LCKindex.jsp~
+2
-0
index.jsp
src/main/webapp/vistas/index.jsp
+1
-1
detalleSeminario.jspf
...entesporhoras/programacionSeminario/detalleSeminario.jspf
+48
-0
editarSeminario.jspf
...centesporhoras/programacionSeminario/editarSeminario.jspf
+48
-0
No files found.
src/main/webapp/js/pages/programacion_seminario.js
View file @
cfa5d9f6
...
@@ -56,6 +56,10 @@ function getColumns() {
...
@@ -56,6 +56,10 @@ function getColumns() {
let
text
=
""
;
let
text
=
""
;
switch
(
data
)
{
switch
(
data
)
{
case
-
1
:
label
=
"label label-danger"
;
text
=
"ELIMINADO"
;
break
;
case
0
:
case
0
:
label
=
"label bg-purple"
;
label
=
"label bg-purple"
;
text
=
"PENDIENTE"
;
text
=
"PENDIENTE"
;
...
@@ -93,7 +97,7 @@ function getColumns() {
...
@@ -93,7 +97,7 @@ function getColumns() {
aceptar
=
`<span style="cursor: pointer"><i class="aceptar icon-checkmark4 text-success-700"></i> </span>`
;
aceptar
=
`<span style="cursor: pointer"><i class="aceptar icon-checkmark4 text-success-700"></i> </span>`
;
rechazar
=
`<span style="cursor: pointer"><i class="rechazar icon-cross2 text-danger-700"></i> </span>`
;
rechazar
=
`<span style="cursor: pointer"><i class="rechazar icon-cross2 text-danger-700"></i> </span>`
;
verdetalle
=
`<span style="cursor: pointer"><i class="verdetalle icon-three-bars text-primary-700"></i> </span>`
;
//
verdetalle = `<span style="cursor: pointer"><i class="verdetalle icon-three-bars text-primary-700"></i> </span>`;
editar
=
`<span style="cursor: pointer"><i class="editar icon-pencil text-slate-800"></i> </span>`
;
editar
=
`<span style="cursor: pointer"><i class="editar icon-pencil text-slate-800"></i> </span>`
;
...
@@ -127,12 +131,12 @@ const mostrarModalAprobarSeminario = (data) => {
...
@@ -127,12 +131,12 @@ const mostrarModalAprobarSeminario = (data) => {
let
titulo
=
""
;
let
titulo
=
""
;
let
textoConfirmacion
=
""
let
textoConfirmacion
=
""
let
tituloOperacion
=
""
;
let
tituloOperacion
=
""
;
if
(
estado
==
0
)
{
//
if (estado == 0) {
titulo
=
'Está seguro de aprobar el seminario?'
;
titulo
=
'Está seguro de aprobar el seminario?'
;
textoConfirmacion
=
'Sí, aprobar!'
;
textoConfirmacion
=
'Sí, aprobar!'
;
tituloOperacion
=
'¡Aprobado exitosamente!'
;
tituloOperacion
=
'¡Aprobado exitosamente!'
;
estado
=
1
;
estado
=
1
;
}
//
}
swal
({
swal
({
title
:
titulo
,
title
:
titulo
,
...
@@ -165,12 +169,101 @@ const mostrarModalRechazarSeminario = (data) => {
...
@@ -165,12 +169,101 @@ const mostrarModalRechazarSeminario = (data) => {
let
titulo
=
""
;
let
titulo
=
""
;
let
textoConfirmacion
=
""
let
textoConfirmacion
=
""
let
tituloOperacion
=
""
;
let
tituloOperacion
=
""
;
if
(
estado
==
0
)
{
// if (estado == 0) {
titulo
=
'Está seguro de desaaprobar el seminario?'
;
titulo
=
'Está seguro de desaaprobar el seminario?'
;
textoConfirmacion
=
'Sí, desaprobar!'
;
textoConfirmacion
=
'Sí, desaprobar!'
;
tituloOperacion
=
'¡Desaprobado exitosamente!'
;
tituloOperacion
=
'¡Desaprobado exitosamente!'
;
estado
=
2
;
estado
=
2
;
}
// }
swal
({
title
:
titulo
,
text
:
""
,
type
:
'warning'
,
showCancelButton
:
true
,
confirmButtonColor
:
'#3085d6'
,
cancelButtonColor
:
'#d33'
,
confirmButtonText
:
textoConfirmacion
}).
then
((
result
)
=>
{
if
(
result
.
value
)
{
ajaxWebService
.
patch
(
`
${
URI_DOCENTES_PROGRAMACION_SEMINARIO
}
/
${
id
}
`
,
{
estado
}).
then
((
response
)
=>
{
if
(
response
.
status
)
{
swal
({
type
:
'success'
,
title
:
tituloOperacion
,
showConfirmButton
:
false
,
timer
:
1500
});
listarSeminariosProgramados
();
}
});
}
});
};
const
inicializarInputsModalEditarSeminario
=
(
data
)
=>
{
$
(
"#spanNombres"
).
text
(
`
${
data
.
trabajador_apellidos
}
${
data
.
trabajador_nombres
}
`
)
listarTipoSeminario
(
"#cboTipoSeminario"
,
data
.
tiposeminario_id
);
listarGrupoAcademico
(
"#cboGrupoAcademico"
,
data
.
grupoacademico_id
);
initDatePicker
(
"#dpFechaSeminario"
);
debugger
$
(
"#dpFechaSeminario"
).
val
(
data
.
fecha_seminario
);
$
(
"#txtHoraInicio"
).
val
(
data
.
hora_inicio
);
$
(
"#txtHoraFin"
).
val
(
data
.
hora_fin
);
$
(
"#txtObservacion"
).
val
(
data
.
observacion
);
};
const
editarSeminario
=
()
=>
{
swal
({
type
:
'success'
,
title
:
'¡Seminario editado exitosamente!'
,
showConfirmButton
:
false
,
timer
:
1500
});
};
const
mostrarModalEditarSeminario
=
(
data
)
=>
{
ajaxModal
.
get
(
"docentesporhoras/programacionSeminario/editarSeminario.jspf"
).
then
((
response
)
=>
{
swal
({
title
:
'<strong>Editar seminario</strong>'
,
html
:
response
.
data
,
showCloseButton
:
true
,
showCancelButton
:
true
,
focusConfirm
:
false
,
confirmButtonText
:
'<i class="icon-checkmark2"></i> Editar seminario'
,
confirmButtonAriaLabel
:
'Editar seminario'
,
cancelButtonText
:
'<i class="icon-cross3"></i>Cancelar'
,
cancelButtonAriaLabel
:
'Thumbs down'
,
width
:
'30%'
,
customClass
:
'swal2-overflow'
,
onOpen
:
()
=>
{
inicializarInputsModalEditarSeminario
(
data
);
}
}).
then
((
result
)
=>
{
if
(
result
.
value
)
{
editarSeminario
();
}
});
});
};
const
mostrarModalVerDetalleSeminario
=
(
data
)
=>
{
};
const
mostrarModalEliminarSeminario
=
(
data
)
=>
{
let
{
id
,
estado
}
=
data
;
let
titulo
=
""
;
let
textoConfirmacion
=
""
let
tituloOperacion
=
""
;
// if (estado == 0) {
titulo
=
'Está seguro de eliminar el seminario?'
;
textoConfirmacion
=
'Sí, eliminar!'
;
tituloOperacion
=
'¡Eliminado exitosamente!'
;
estado
=
-
1
;
// }
swal
({
swal
({
title
:
titulo
,
title
:
titulo
,
...
@@ -208,7 +301,7 @@ function listarSeminariosProgramados(objParams = {}){
...
@@ -208,7 +301,7 @@ function listarSeminariosProgramados(objParams = {}){
wrapsNameDatatable
,
wrapsNameDatatable
,
{
{
data
:
response
.
data
,
data
:
response
.
data
,
columns
,
columns
},
},
classNameForDatatable
,
classNameForDatatable
,
).
then
((
nodes
)
=>
{
).
then
((
nodes
)
=>
{
...
@@ -216,15 +309,15 @@ function listarSeminariosProgramados(objParams = {}){
...
@@ -216,15 +309,15 @@ function listarSeminariosProgramados(objParams = {}){
.
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
();
mostrarModalVerDetalle
Tolerancia
(
data
);
mostrarModalVerDetalle
Seminario
(
data
);
})
})
.
on
(
"click"
,
".editar"
,
function
()
{
.
on
(
"click"
,
".editar"
,
function
()
{
let
data
=
nodes
.
datatable
.
DataTable
().
row
(
$
(
this
).
parents
(
"tr"
)).
data
();
let
data
=
nodes
.
datatable
.
DataTable
().
row
(
$
(
this
).
parents
(
"tr"
)).
data
();
mostrarModalEditar
Tolerancia
(
data
);
mostrarModalEditar
Seminario
(
data
);
})
})
.
on
(
"click"
,
".eliminar"
,
function
()
{
.
on
(
"click"
,
".eliminar"
,
function
()
{
let
data
=
nodes
.
datatable
.
DataTable
().
row
(
$
(
this
).
parents
(
"tr"
)).
data
();
let
data
=
nodes
.
datatable
.
DataTable
().
row
(
$
(
this
).
parents
(
"tr"
)).
data
();
mostrarModalEliminar
Tolerancia
(
data
);
mostrarModalEliminar
Seminario
(
data
);
})
})
.
on
(
"click"
,
".aceptar"
,
function
()
{
.
on
(
"click"
,
".aceptar"
,
function
()
{
let
data
=
nodes
.
datatable
.
DataTable
().
row
(
$
(
this
).
parents
(
"tr"
)).
data
();
let
data
=
nodes
.
datatable
.
DataTable
().
row
(
$
(
this
).
parents
(
"tr"
)).
data
();
...
@@ -242,23 +335,25 @@ const aplicarFiltro = () => {
...
@@ -242,23 +335,25 @@ const aplicarFiltro = () => {
};
};
const
listarTipoSeminario
=
(
nodeIdentifier
)
=>
{
const
listarTipoSeminario
=
(
nodeIdentifier
,
selectedValue
=
""
)
=>
{
ajaxWebService
.
get
(
URI_DOCENTES_TIPO_SEMINARIO
).
then
((
response
)
=>
{
ajaxWebService
.
get
(
URI_DOCENTES_TIPO_SEMINARIO
).
then
((
response
)
=>
{
let
tiposSeminario
=
response
.
data
;
let
tiposSeminario
=
response
.
data
;
tiposSeminario
=
_
.
orderBy
(
tiposSeminario
,
s
=>
s
.
descripcion
);
tiposSeminario
=
_
.
orderBy
(
tiposSeminario
,
s
=>
s
.
descripcion
);
let
html
=
`<option value="">[SELECCIONE]</option>`
;
let
html
=
`<option value="">[SELECCIONE]</option>`
;
html
+=
tiposSeminario
.
map
(
tipoSeminario
=>
`<option value="
${
tipoSeminario
.
id
}
">
${
tipoSeminario
.
descripcion
}
</option>`
);
html
+=
tiposSeminario
.
map
(
tipoSeminario
=>
`<option value="
${
tipoSeminario
.
id
}
">
${
tipoSeminario
.
descripcion
}
</option>`
);
$
(
nodeIdentifier
).
html
(
html
);
$
(
nodeIdentifier
).
html
(
html
);
$
(
nodeIdentifier
).
val
(
selectedValue
);
});
});
};
};
const
listarGrupoAcademico
=
(
nodeIdentifier
)
=>
{
const
listarGrupoAcademico
=
(
nodeIdentifier
,
selectedValue
=
""
)
=>
{
ajaxWebService
.
get
(
URI_DOCENTES_GRUPO_ACADEMICO
).
then
((
response
)
=>
{
ajaxWebService
.
get
(
URI_DOCENTES_GRUPO_ACADEMICO
).
then
((
response
)
=>
{
let
gruposacademicos
=
response
.
data
;
let
gruposacademicos
=
response
.
data
;
gruposacademicos
=
_
.
orderBy
(
gruposacademicos
,
grupoAcademico
=>
grupoAcademico
.
descripcion
);
gruposacademicos
=
_
.
orderBy
(
gruposacademicos
,
grupoAcademico
=>
grupoAcademico
.
descripcion
);
let
html
=
`<option value="">[SELECCIONE]</option>`
;
let
html
=
`<option value="">[SELECCIONE]</option>`
;
html
+=
gruposacademicos
.
map
(
grupoAcademico
=>
`<option value="
${
grupoAcademico
.
id
}
">
${
grupoAcademico
.
descripcion
}
</option>`
);
html
+=
gruposacademicos
.
map
(
grupoAcademico
=>
`<option value="
${
grupoAcademico
.
id
}
">
${
grupoAcademico
.
descripcion
}
</option>`
);
$
(
nodeIdentifier
).
html
(
html
);
$
(
nodeIdentifier
).
html
(
html
);
$
(
nodeIdentifier
).
val
(
selectedValue
);
});
});
};
};
...
...
This diff is collapsed.
Click to expand it.
src/main/webapp/vistas/.LCKindex.jsp~
0 → 100644
View file @
cfa5d9f6
D:\billy\Proyectos\Asistencia\src\main\webapp\vistas\index.jsp
\ No newline at end of file
This diff is collapsed.
Click to expand it.
src/main/webapp/vistas/index.jsp
View file @
cfa5d9f6
...
@@ -47,7 +47,7 @@
...
@@ -47,7 +47,7 @@
<div
class=
"panel panel-body login-form"
>
<div
class=
"panel panel-body login-form"
>
<div
class=
"text-center"
>
<div
class=
"text-center"
>
<div
class=
"icon-object border-slate-300 text-slate-300"
><i
class=
"icon-reading"
></i></div>
<div
class=
"icon-object border-slate-300 text-slate-300"
><i
class=
"icon-reading"
></i></div>
<h5
class=
"content-group"
>
PROYECTO
<small
class=
"display-block"
>
Ingrese sus credenciales
</small></h5>
<h5
class=
"content-group"
>
Trismegisto Asistencia
<small
class=
"display-block"
>
Ingrese sus credenciales
</small></h5>
</div>
</div>
<div
class=
"form-group has-feedback has-feedback-left"
>
<div
class=
"form-group has-feedback has-feedback-left"
>
...
...
This diff is collapsed.
Click to expand it.
src/main/webapp/vistas/modals/docentesporhoras/programacionSeminario/detalleSeminario.jspf
0 → 100644
View file @
cfa5d9f6
<form id="frm" onsubmit="return false;" autocomplete="off">
<div class="row">
<div class="form-group col-md-8">
<label>Docente</label>
<select id="cboDocentes" class="select-search form-control"></select>
</div>
<div class="form-group col-md-4">
<label>Tipo de seminario</label>
<select id="cboTipoSeminario" class="select-search form-control"></select>
</div>
</div>
<div class="row">
<div class="form-group col-md-4">
<label>Fecha Seminario</label>
<div class="input-group">
<span class="input-group-addon"><i class="icon-calendar"></i></span>
<input type="text" class="form-control" id="dpFechaSeminario">
</div>
</div>
<div class="form-group col-md-4">
<label>Hora inicio</label>
<div class="input-group">
<span class="input-group-addon"><i class="fa fa-clock-o"></i></span>
<input type="time" class="form-control" id="txtHoraInicio">
</div>
</div>
<div class="form-group col-md-4">
<label>Hora fin</label>
<div class="input-group">
<span class="input-group-addon"><i class="fa fa-clock-o"></i></span>
<input type="time" class="form-control" id="txtHoraFin">
</div>
</div>
</div>
<div class="row">
<div class="form-group col-md-4">
<label>Grupo academico</label>
<select id="cboGrupoAcademico" class="select-search form-control"></select>
</div>
<div class="form-group col-md-8">
<label>Observacion</label>
<textarea name="txtObservacion" id="txtObservacion" cols="30" rows="4" class="form-control"></textarea>
</div>
</div>
</form>
\ No newline at end of file
This diff is collapsed.
Click to expand it.
src/main/webapp/vistas/modals/docentesporhoras/programacionSeminario/editarSeminario.jspf
0 → 100644
View file @
cfa5d9f6
<form id="frm" onsubmit="return false;" autocomplete="off">
<div class="row">
<div class="form-group col-md-8">
<label>Docente</label>
<span class="label label-left border-left-primary label-striped form-control" id="spanNombres"></span>
</div>
<div class="form-group col-md-4">
<label>Tipo de seminario</label>
<select id="cboTipoSeminario" class="select-search form-control"></select>
</div>
</div>
<div class="row">
<div class="form-group col-md-4">
<label>Fecha Seminario</label>
<div class="input-group">
<span class="input-group-addon"><i class="icon-calendar"></i></span>
<input type="text" class="form-control" id="dpFechaSeminario">
</div>
</div>
<div class="form-group col-md-4">
<label>Hora inicio</label>
<div class="input-group">
<span class="input-group-addon"><i class="fa fa-clock-o"></i></span>
<input type="time" class="form-control" id="txtHoraInicio">
</div>
</div>
<div class="form-group col-md-4">
<label>Hora fin</label>
<div class="input-group">
<span class="input-group-addon"><i class="fa fa-clock-o"></i></span>
<input type="time" class="form-control" id="txtHoraFin">
</div>
</div>
</div>
<div class="row">
<div class="form-group col-md-4">
<label>Grupo academico</label>
<select id="cboGrupoAcademico" class="select-search form-control"></select>
</div>
<div class="form-group col-md-8">
<label>Observacion</label>
<textarea name="txtObservacion" id="txtObservacion" cols="30" rows="4" class="form-control"></textarea>
</div>
</div>
</form>
\ No newline at end of file
This diff is collapsed.
Click to expand it.
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