Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
H
horario
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
Juan Guevara Mayta
horario
Commits
e81b8464
Commit
e81b8464
authored
Jan 16, 2020
by
sistem26user
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[add] grabar bloques como libre al 90%
parent
4e369a7b
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
40 additions
and
5 deletions
+40
-5
ServletHorario.java
src/java/pe/siso/horario/Servlets/ServletHorario.java
+15
-2
arm_hor_gen.jsp
web/vista/arm_hor_gen.jsp
+25
-3
No files found.
src/java/pe/siso/horario/Servlets/ServletHorario.java
View file @
e81b8464
...
...
@@ -3435,15 +3435,28 @@ public class ServletHorario extends HttpServlet {
// examen semanal
pw
.
println
(
"<div class='infobox infobox-blue' style=\"margin-right:75px\">"
);
pw
.
println
(
"<div class='infobox-data'>"
);
pw
.
println
(
"<span class='infobox-data-number' style='font-size: 18px'>Examen Semanal</span>"
);
pw
.
println
(
"<div class='infobox-content center'><input type='checkbox' id='chkExamenSemanal'/></div>"
);
pw
.
println
(
"<span class='infobox-data-number' style='font-size: 18px
;text-align:center;
'>Examen Semanal</span>"
);
pw
.
println
(
"<div class='infobox-content center'><input type='checkbox' id='chkExamenSemanal'
onchange='checkExamenSemanal()'
/></div>"
);
pw
.
println
(
"</div>"
);
pw
.
println
(
"</div>"
);
//fin examen semanal
// libre
pw
.
println
(
"<div class='infobox infobox-blue' style=\"margin-right:16px\">"
);
pw
.
println
(
"<div class='infobox-data'>"
);
pw
.
println
(
"<span class='infobox-data-number' style='font-size: 18px;text-align:center;'>Libre</span>"
);
pw
.
println
(
"<div class='infobox-content center'><input type='checkbox' id='chkBloqueLibre' onchange='checkLibre()'/></div>"
);
pw
.
println
(
"</div>"
);
pw
.
println
(
"</div>"
);
// fin libre
pw
.
println
(
"<div class='col-sm-2'></div>"
);
pw
.
println
(
"</div>"
);
pw
.
println
(
"<div class='col-sm-12' style='height:40px;'><hr></div>"
);
...
...
web/vista/arm_hor_gen.jsp
View file @
e81b8464
...
...
@@ -1978,6 +1978,18 @@ window.jQuery || document.write("<script src='../assets/js/jquery1x.js'>"+"<"+"/
]
});
}
function
checkLibre
(){
$
(
'#chkExamenSemanal'
).
prop
(
'checked'
,
false
)
}
function
checkExamenSemanal
(){
$
(
'#chkBloqueLibre'
).
prop
(
'checked'
,
false
)
}
function
validar_RegistroAsigCurDoc
(
codigaGrupoHorario
,
bloq
,
dia
,
Hini
,
Hfin
,
codaula
,
opcion
,
Turno
,
contGeneral
,
historial
)
{
...
...
@@ -2010,12 +2022,17 @@ window.jQuery || document.write("<script src='../assets/js/jquery1x.js'>"+"<"+"/
let
validaFechaAviso
=
$
(
"#recibeFechaFaltaAviso"
).
val
();
let
checkStatus
=
$
(
'#chkExamenSemanal'
).
prop
(
'checked'
)
let
checkLibreStatus
=
$
(
'#chkBloqueLibre'
).
prop
(
'checked'
)
if
(
checkStatus
){
var
json
=
{}
console
.
log
(
"Registro examen semanal"
)
popup_confimacion
(
codigaGrupoHorario
,
bloq
,
dia
,
Hini
,
Hfin
,
codaula
,
opcion
,
Turno
,
contGeneral
,
9999
,
historial
,
json
);
}
else
if
(
checkLibreStatus
){
var
json
=
{}
console
.
log
(
"Registro dia libre"
)
popup_confimacion
(
codigaGrupoHorario
,
bloq
,
dia
,
Hini
,
Hfin
,
codaula
,
opcion
,
Turno
,
contGeneral
,
8888
,
historial
,
json
);
}
else
{
var
estado
=
jQuery
(
'#RegistroAsigCurDoc'
).
validationEngine
(
'validate'
);
...
...
@@ -2175,8 +2192,12 @@ window.jQuery || document.write("<script src='../assets/js/jquery1x.js'>"+"<"+"/
var
dato
=
verificarTurno
(
hora_inicio
,
hora_termino
);
var
codTurno
=
dato
;
let
chkStatus
=
$
(
'#chkExamenSemanal'
).
prop
(
'checked'
);
let
chkLibreStatus
=
$
(
'#chkBloqueLibre'
).
prop
(
'checked'
);
var
codCurso
=
""
codCurso
=
chkStatus
?
"61"
:
$
(
"#cmbCurso"
).
val
();
codCurso
=
chkStatus
?
"61"
:
chkLibreStatus
?
"62"
:
$
(
"#cmbCurso"
).
val
();
// var codDocente = $("#cmbDocDisp").val();
var
codClase
=
$
(
"#idClase"
).
val
();
var
periodo
=
"<%=periodo!=null?periodo.getCodigoPeriodo():""%>"
;
...
...
@@ -2311,8 +2332,9 @@ window.jQuery || document.write("<script src='../assets/js/jquery1x.js'>"+"<"+"/
//alert("registrarAsigCurDoceHorario");
var
codTurno
=
Turno
;
let
codCurso
=
""
let
statusCheck
=
$
(
'#chkExamenSemanal'
).
prop
(
'checked'
)
codCurso
=
statusCheck
?
"61"
:
$
(
"#cmbCurso"
).
val
();
let
statusCheck
=
$
(
'#chkExamenSemanal'
).
prop
(
'checked'
)
let
statusLibreCheck
=
$
(
'#chkBloqueLibre'
).
prop
(
'checked'
)
codCurso
=
statusCheck
?
"61"
:
statusLibreCheck
?
"62"
:
$
(
"#cmbCurso"
).
val
();
var
codClase
=
$
(
"#idClase"
).
val
();
var
periodo
=
"<%=periodo!=null?periodo.getCodigoPeriodo():""%>"
;
...
...
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