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
f3697172
Commit
f3697172
authored
Jan 14, 2020
by
Tony Inuma Dahua
Browse files
Options
Browse Files
Download
Plain Diff
[MERGE] tonyid merge to canchivilca
parents
895dd91b
99acea16
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
229 additions
and
52 deletions
+229
-52
workspace.xml
.idea/workspace.xml
+126
-1
Aula.java
src/java/pe/siso/horario/Beans/Aula.java
+11
-0
AulaDAO.java
src/java/pe/siso/horario/DAO/AulaDAO.java
+8
-2
MySqlAulaDAO.java
src/java/pe/siso/horario/MySqlDAO/MySqlAulaDAO.java
+0
-0
MySqlDAOFactory.java
src/java/pe/siso/horario/MySqlDAO/MySqlDAOFactory.java
+24
-25
AulaServices.java
src/java/pe/siso/horario/Services/AulaServices.java
+12
-2
ServletAula.java
src/java/pe/siso/horario/Servlets/ServletAula.java
+16
-6
lista_aula_dirage.jsp
web/vista/lista_aula_dirage.jsp
+1
-15
man_aula_dirage_session.jsp
web/vista/man_aula_dirage_session.jsp
+31
-1
No files found.
.idea/workspace.xml
View file @
f3697172
<?xml version="1.0" encoding="UTF-8"?>
<project
version=
"4"
>
<component
name=
"ChangeListManager"
>
<list
default=
"true"
id=
"9dfe57b6-a802-4c85-b2ac-d001e04f864c"
name=
"Default Changelist"
comment=
""
>
<change
beforePath=
"$PROJECT_DIR$/.idea/workspace.xml"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/.idea/workspace.xml"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/src/java/pe/siso/horario/Beans/Aula.java"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/src/java/pe/siso/horario/Beans/Aula.java"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/src/java/pe/siso/horario/DAO/AulaDAO.java"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/src/java/pe/siso/horario/DAO/AulaDAO.java"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/src/java/pe/siso/horario/MySqlDAO/MySqlAulaDAO.java"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/src/java/pe/siso/horario/MySqlDAO/MySqlAulaDAO.java"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/src/java/pe/siso/horario/MySqlDAO/MySqlDAOFactory.java"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/src/java/pe/siso/horario/MySqlDAO/MySqlDAOFactory.java"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/src/java/pe/siso/horario/Services/AulaServices.java"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/src/java/pe/siso/horario/Services/AulaServices.java"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/src/java/pe/siso/horario/Servlets/ServletAula.java"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/src/java/pe/siso/horario/Servlets/ServletAula.java"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/web/vista/lista_aula_dirage.jsp"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/web/vista/lista_aula_dirage.jsp"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/web/vista/man_aula_dirage_session.jsp"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/web/vista/man_aula_dirage_session.jsp"
afterDir=
"false"
/>
</list>
<ignored
path=
"$PROJECT_DIR$/.tmp/"
/>
<ignored
path=
"$PROJECT_DIR$/temp/"
/>
<ignored
path=
"$PROJECT_DIR$/tmp/"
/>
<option
name=
"EXCLUDED_CONVERTED_TO_IGNORED"
value=
"true"
/>
<option
name=
"SHOW_DIALOG"
value=
"false"
/>
<option
name=
"HIGHLIGHT_CONFLICTS"
value=
"true"
/>
<option
name=
"HIGHLIGHT_NON_ACTIVE_CHANGELIST"
value=
"false"
/>
<option
name=
"LAST_RESOLUTION"
value=
"IGNORE"
/>
</component>
<component
name=
"FUSProjectUsageTrigger"
>
<session
id=
"-1323325538"
>
<usages-collector
id=
"statistics.lifecycle.project"
>
<counts>
<entry
key=
"project.closed"
value=
"1"
/>
<entry
key=
"project.open.time.2"
value=
"1"
/>
<entry
key=
"project.open.time.3"
value=
"1"
/>
<entry
key=
"project.opened"
value=
"2"
/>
</counts>
</usages-collector>
</session>
</component>
<component
name=
"Git.Settings"
>
<option
name=
"RECENT_GIT_ROOT_PATH"
value=
"$PROJECT_DIR$"
/>
</component>
<component
name=
"JsBuildToolGruntFileManager"
detection-done=
"true"
sorting=
"DEFINITION_ORDER"
/>
<component
name=
"JsBuildToolPackageJson"
detection-done=
"true"
sorting=
"DEFINITION_ORDER"
/>
<component
name=
"JsGulpfileManager"
>
<detection-done>
true
</detection-done>
<sorting>
DEFINITION_ORDER
</sorting>
</component>
<component
name=
"NodePackageJsonFileManager"
>
<packageJsonPaths
/>
<packageJsonPaths>
<path
value=
"$PROJECT_DIR$/build/web/mustache/js/package.json"
/>
<path
value=
"$PROJECT_DIR$/build/web/package.json"
/>
<path
value=
"$PROJECT_DIR$/web/mustache/js/package.json"
/>
<path
value=
"$PROJECT_DIR$/web/package.json"
/>
</packageJsonPaths>
</component>
<component
name=
"ProjectFrameBounds"
extendedState=
"6"
>
<option
name=
"x"
value=
"960"
/>
<option
name=
"width"
value=
"960"
/>
<option
name=
"height"
value=
"1040"
/>
</component>
<component
name=
"ProjectView"
>
<navigator
proportions=
""
version=
"1"
>
<foldersAlwaysOnTop
value=
"true"
/>
</navigator>
<panes>
<pane
id=
"Scope"
/>
<pane
id=
"ProjectPane"
>
<subPane>
<expand>
<path>
<item
name=
"horario"
type=
"b2602c69:ProjectViewProjectNode"
/>
<item
name=
"horario"
type=
"462c0819:PsiDirectoryNode"
/>
</path>
</expand>
<select
/>
</subPane>
</pane>
</panes>
</component>
<component
name=
"PropertiesComponent"
>
<property
name=
"WebServerToolWindowFactoryState"
value=
"false"
/>
<property
name=
"nodejs_interpreter_path.stuck_in_default_project"
value=
"undefined stuck path"
/>
<property
name=
"nodejs_npm_path_reset_for_default_project"
value=
"true"
/>
</component>
<component
name=
"RunDashboard"
>
<option
name=
"ruleStates"
>
<list>
<RuleState>
<option
name=
"name"
value=
"ConfigurationTypeDashboardGroupingRule"
/>
</RuleState>
<RuleState>
<option
name=
"name"
value=
"StatusDashboardGroupingRule"
/>
</RuleState>
</list>
</option>
</component>
<component
name=
"SvnConfiguration"
>
<configuration
/>
</component>
<component
name=
"TaskManager"
>
<task
active=
"true"
id=
"Default"
summary=
"Default task"
>
<changelist
id=
"9dfe57b6-a802-4c85-b2ac-d001e04f864c"
name=
"Default Changelist"
comment=
""
/>
<created>
1579033500045
</created>
<option
name=
"number"
value=
"Default"
/>
<option
name=
"presentableId"
value=
"Default"
/>
<updated>
1579033500045
</updated>
<workItem
from=
"1579033502305"
duration=
"528000"
/>
<workItem
from=
"1579034082196"
duration=
"617000"
/>
</task>
<servers
/>
</component>
<component
name=
"TimeTrackingManager"
>
<option
name=
"totallyTimeSpent"
value=
"1145000"
/>
</component>
<component
name=
"ToolWindowManager"
>
<frame
x=
"-8"
y=
"-8"
width=
"1936"
height=
"1056"
extended-state=
"6"
/>
<layout>
<window_info
content_ui=
"combo"
id=
"Project"
order=
"0"
visible=
"true"
weight=
"0.14963119"
/>
<window_info
id=
"Structure"
order=
"1"
side_tool=
"true"
weight=
"0.25"
/>
<window_info
id=
"Favorites"
order=
"2"
side_tool=
"true"
/>
<window_info
anchor=
"bottom"
id=
"Message"
order=
"0"
/>
<window_info
anchor=
"bottom"
id=
"Find"
order=
"1"
/>
<window_info
anchor=
"bottom"
id=
"Run"
order=
"2"
/>
<window_info
anchor=
"bottom"
id=
"Debug"
order=
"3"
weight=
"0.4"
/>
<window_info
anchor=
"bottom"
id=
"Cvs"
order=
"4"
weight=
"0.25"
/>
<window_info
anchor=
"bottom"
id=
"Inspection"
order=
"5"
weight=
"0.4"
/>
<window_info
anchor=
"bottom"
id=
"TODO"
order=
"6"
/>
<window_info
anchor=
"bottom"
id=
"Docker"
order=
"7"
show_stripe_button=
"false"
/>
<window_info
active=
"true"
anchor=
"bottom"
id=
"Version Control"
order=
"8"
visible=
"true"
weight=
"0.329718"
/>
<window_info
anchor=
"bottom"
id=
"Terminal"
order=
"9"
sideWeight=
"0.49947312"
weight=
"0.329718"
/>
<window_info
anchor=
"bottom"
id=
"Event Log"
order=
"10"
sideWeight=
"0.50052685"
side_tool=
"true"
weight=
"0.329718"
/>
<window_info
anchor=
"right"
id=
"Commander"
internal_type=
"SLIDING"
order=
"0"
type=
"SLIDING"
weight=
"0.4"
/>
<window_info
anchor=
"right"
id=
"Ant Build"
order=
"1"
weight=
"0.25"
/>
<window_info
anchor=
"right"
content_ui=
"combo"
id=
"Hierarchy"
order=
"2"
weight=
"0.25"
/>
</layout>
</component>
<component
name=
"TypeScriptGeneratedFilesManager"
>
<option
name=
"version"
value=
"1"
/>
</component>
<component
name=
"VcsContentAnnotationSettings"
>
<option
name=
"myLimit"
value=
"2678400000"
/>
</component>
</project>
\ No newline at end of file
src/java/pe/siso/horario/Beans/Aula.java
View file @
f3697172
...
...
@@ -31,6 +31,17 @@ public class Aula {
private
String
nombreTurno
;
private
String
usuario
;
private
String
clave
;
private
String
nombrePeriodo
;
public
String
getNombrePeriodo
()
{
return
nombrePeriodo
;
}
public
void
setNombrePeriodo
(
String
nombrePeriodo
)
{
this
.
nombrePeriodo
=
nombrePeriodo
;
}
private
String
nombre
;
public
String
getNombre
()
{
...
...
src/java/pe/siso/horario/DAO/AulaDAO.java
View file @
f3697172
...
...
@@ -19,7 +19,7 @@ public interface AulaDAO {
public
ArrayList
<
Aula
>
listaAulas
()
throws
Exception
;
public
ArrayList
<
Aula
>
listaAulasDirage
(
String
codigoLocal
)
throws
Exception
;
public
ArrayList
<
Aula
>
listaAulasDirage
()
throws
Exception
;
public
int
registrarAula
(
String
codSede
,
String
codTipoCentro
,
String
codCentro
,
String
codNivel
,
String
codTipoGrado
,
String
codGrado
,
String
codSeccion
,
String
codTurno
,
String
nombreAula
)
throws
Exception
;
public
int
registrarAula
(
String
codSede
,
String
codTipoCentro
,
String
codCentro
,
String
codNivel
,
String
codTipoGrado
,
String
codGrado
,
String
codSeccion
,
String
codTurno
,
String
nombreAula
,
int
codPeriodo
)
throws
Exception
;
public
int
consultarAula
(
String
codSede
,
String
codTipoCentro
,
String
codCentro
,
String
codNivel
,
String
codTipoGrado
,
String
codGrado
,
String
codSeccion
,
String
codTurno
)
throws
Exception
;
public
int
consultarAulaConNombre
(
String
codSede
,
String
codTipoCentro
,
String
codCentro
,
String
codNivel
,
String
codTipoGrado
,
String
codGrado
,
String
codSeccion
,
String
codTurno
,
String
nombre
)
throws
Exception
;
public
String
consultarAula
(
String
codigoAula
)
throws
Exception
;
...
...
@@ -32,8 +32,14 @@ public interface AulaDAO {
public
void
crearUsuarioEncuestador
(
String
codigoSede
,
String
codigoAula
,
String
nombreUsuario
,
String
usuario
,
String
clave
,
String
cantidad
)
throws
Exception
;
public
int
cantlistarAulasBloque
(
String
codSede
,
String
codTipoCentro
,
String
codCentro
,
String
codNivel
,
String
codTipoGrado
,
String
codGrado
,
String
codSeccion
,
String
codTurno
)
throws
Exception
;
public
ArrayList
<
Aula
>
listarAulasBloque
(
String
codSede
,
String
codTipoCentro
,
String
codCentro
,
String
codNivel
,
String
codTipoGrado
,
String
codGrado
,
String
codSeccion
,
String
codTurno
)
throws
Exception
;
public
ArrayList
<
Aula
>
listarAulasBloque
(
String
codSede
,
String
codTipoCentro
,
String
codCentro
,
String
codNivel
,
String
codTipoGrado
,
String
codGrado
,
String
codSeccion
,
String
codTurno
,
int
inicio
,
int
cantidad
)
throws
Exception
;
public
ArrayList
<
Aula
>
listarAulasHorario
(
String
codSede
,
String
codTipoCentro
,
String
codCentro
,
String
codNivel
,
String
codTipoGrado
,
String
codGrado
,
String
codSeccion
,
String
codTurno
,
int
inicio
,
int
cantidad
)
throws
Exception
;
//METODO RECIEN AGREGADOS EL 14-01-2020
public
ArrayList
<
Aula
>
listarAulasBloqueTotal
(
String
codSede
,
String
codTipoCentro
,
String
codCentro
,
String
codNivel
,
String
codTipoGrado
,
String
codGrado
,
String
codSeccion
,
String
codTurno
,
int
inicio
,
int
cantidad
,
int
periodo
)
throws
Exception
;
public
int
cantlistarAulasBloqueTotal
(
String
codSede
,
String
codTipoCentro
,
String
codCentro
,
String
codNivel
,
String
codTipoGrado
,
String
codGrado
,
String
codSeccion
,
String
codTurno
,
int
codperiodo
)
throws
Exception
;
public
ArrayList
<
Aula
>
listarAulasHorario
(
String
codSede
,
String
codTipoCentro
,
String
codCentro
,
String
codNivel
,
String
codTipoGrado
,
String
codGrado
,
String
codSeccion
,
String
codTurno
,
int
inicio
,
int
cantidad
)
throws
Exception
;
public
ArrayList
<
Aula
>
listarAulasHorario
(
String
codSede
,
String
codTipoCentro
,
String
codCentro
,
String
codNivel
,
String
codTipoGrado
,
String
codGrado
,
String
codSeccion
,
String
codTurno
)
throws
Exception
;
public
ArrayList
<
Aula
>
listarAulasHorario
(
String
codSede
,
String
codTipoCentro
,
String
codCentro
,
String
codNivel
,
String
codTipoGrado
,
String
codGrado
,
String
codSeccion
,
String
codTurno
,
String
periodo
)
throws
Exception
;
public
int
cantlistarAulasHorario
(
String
codSede
,
String
codTipoCentro
,
String
codCentro
,
String
codNivel
,
String
codTipoGrado
,
String
codGrado
,
String
codSeccion
,
String
codTurno
)
throws
Exception
;
...
...
src/java/pe/siso/horario/MySqlDAO/MySqlAulaDAO.java
View file @
f3697172
This diff is collapsed.
Click to expand it.
src/java/pe/siso/horario/MySqlDAO/MySqlDAOFactory.java
View file @
f3697172
...
...
@@ -59,12 +59,12 @@ public class MySqlDAOFactory extends DAOFactory {
try
{
conexion
=
DriverManager
.
getConnection
(
// "jdbc:mysql://SERVERPRUEBA
:3306/encuesta_docente",
//
"desarrollo",
//
"5VC02019");
"jdbc:mysql://localhost:3306/encuesta_docente"
,
"billy
"
,
"billy
"
);
"jdbc:mysql://serverprueba
:3306/encuesta_docente"
,
"desarrollo"
,
"5VC02019"
);
//
"jdbc:mysql://localhost:3306/encuesta_docente",
// "root
",
// "mysql
");
// //server_winpla
// "jdbc:mysql://172.16.2.68:3306/encuesta_docente",
// "sis_horarios",
...
...
@@ -80,12 +80,12 @@ public class MySqlDAOFactory extends DAOFactory {
try
{
conexion
=
DriverManager
.
getConnection
(
// "jdbc:mysql://SERVERPRUEBA
:3306/nuevo",
//
"desarrollo",
//
"5VC02019");
"jdbc:mysql://localhost:3306/nuevo"
,
"billy
"
,
"billy
"
);
"jdbc:mysql://serverprueba
:3306/nuevo"
,
"desarrollo"
,
"5VC02019"
);
//
"jdbc:mysql://localhost:3306/nuevo",
// "root
",
// "mysql
");
//server_winpla
// "jdbc:mysql://172.16.2.68:3306/nuevo",
// "sis_horarios",
...
...
@@ -101,12 +101,12 @@ public class MySqlDAOFactory extends DAOFactory {
try
{
conexion
=
DriverManager
.
getConnection
(
// "jdbc:mysql://SERVERPRUEBA
:3306/horarios_docente",
//
"desarrollo",
//
"5VC02019");
"jdbc:mysql://localhost:3306/horarios_docente"
,
"billy
"
,
"billy
"
);
"jdbc:mysql://serverprueba
:3306/horarios_docente"
,
"desarrollo"
,
"5VC02019"
);
//
"jdbc:mysql://localhost:3306/horarios_docente",
// "root
",
// "mysql
");
//server_winpla
// "jdbc:mysql://172.16.2.68:3306/horarios_docente",
// "sis_horarios",
...
...
@@ -121,12 +121,12 @@ public class MySqlDAOFactory extends DAOFactory {
try
{
conexion
=
DriverManager
.
getConnection
(
"jdbc:mysql://localhost
:3306/sacoolive3"
,
"
billy
"
,
"billy
"
);
// "jdbc:mysql://
SERVERPRUEBA
:3306/sacoolive3",
// "
desarrollo
",
// "
5VC02019
");
"jdbc:mysql://serverprueba
:3306/sacoolive3"
,
"
desarrollo
"
,
"5VC02019
"
);
// "jdbc:mysql://
localhost
:3306/sacoolive3",
// "
root
",
// "
mysql
");
//server_winpla
// "jdbc:mysql://172.16.2.68:3306/sacoolive3",
// "sis_horarios",
...
...
@@ -306,5 +306,4 @@ public class MySqlDAOFactory extends DAOFactory {
return
new
MySqlPlanAcademicoDAO
();
}
}
src/java/pe/siso/horario/Services/AulaServices.java
View file @
f3697172
...
...
@@ -52,10 +52,10 @@ public class AulaServices {
}
public
int
registrarAula
(
String
codSede
,
String
codTipoCentro
,
String
codCentro
,
String
codNivel
,
String
codTipoGrado
,
String
codGrado
,
String
codSeccion
,
String
codTurno
,
String
nombreAula
){
public
int
registrarAula
(
String
codSede
,
String
codTipoCentro
,
String
codCentro
,
String
codNivel
,
String
codTipoGrado
,
String
codGrado
,
String
codSeccion
,
String
codTurno
,
String
nombreAula
,
int
codPeriodo
){
int
dato
=
0
;
try
{
dato
=
objAulaDAO
.
registrarAula
(
codSede
,
codTipoCentro
,
codCentro
,
codNivel
,
codTipoGrado
,
codGrado
,
codSeccion
,
codTurno
,
nombreAula
);
dato
=
objAulaDAO
.
registrarAula
(
codSede
,
codTipoCentro
,
codCentro
,
codNivel
,
codTipoGrado
,
codGrado
,
codSeccion
,
codTurno
,
nombreAula
,
codPeriodo
);
}
catch
(
Exception
e
)
{
// TODO Auto-generated catch block
e
.
printStackTrace
();
...
...
@@ -287,6 +287,16 @@ public class AulaServices {
}
return
lista
;
}
public
ArrayList
<
Aula
>
listarAulasBloqueTotal
(
String
codSede
,
String
codTipoCentro
,
String
codCentro
,
String
codNivel
,
String
codTipoGrado
,
String
codGrado
,
String
codSeccion
,
String
codTurno
,
int
inicio
,
int
cantidad
,
int
codperiodo
)
{
ArrayList
<
Aula
>
lista
=
null
;
try
{
lista
=
objAulaDAO
.
listarAulasBloqueTotal
(
codSede
,
codTipoCentro
,
codCentro
,
codNivel
,
codTipoGrado
,
codGrado
,
codSeccion
,
codTurno
,
inicio
,
cantidad
,
codperiodo
);
}
catch
(
Exception
e
)
{
// TODO Auto-generated catch block
e
.
printStackTrace
();
}
return
lista
;
}
public
int
CantlistaAulasDirageSede
(){
int
cant
=
0
;
...
...
src/java/pe/siso/horario/Servlets/ServletAula.java
View file @
f3697172
...
...
@@ -146,10 +146,13 @@ public class ServletAula extends HttpServlet {
String
codSeccion
=
request
.
getParameter
(
"codSeccion"
);
String
codTurno
=
request
.
getParameter
(
"codTurno"
);
String
nombreAula
=
request
.
getParameter
(
"nombreAula"
);
int
codPeriodo
=
Integer
.
parseInt
(
request
.
getParameter
(
"codPeriodo"
));
response
.
setContentType
(
"text/html"
);
PrintWriter
pw
=
response
.
getWriter
();
int
aula
=
0
;
int
dato
=
servicios
.
registrarAula
(
codSede
,
codTipoCentro
,
codCentro
,
codNivel
,
codTipoGrado
,
codGrado
,
codSeccion
,
codTurno
,
nombreAula
);
int
dato
=
servicios
.
registrarAula
(
codSede
,
codTipoCentro
,
codCentro
,
codNivel
,
codTipoGrado
,
codGrado
,
codSeccion
,
codTurno
,
nombreAula
,
codPeriodo
);
if
(
dato
==
1
)
{
aula
=
servicios
.
consultarAulaConNombre
(
codSede
,
codTipoCentro
,
codCentro
,
codNivel
,
codTipoGrado
,
codGrado
,
codSeccion
,
codTurno
,
nombreAula
);
...
...
@@ -656,7 +659,7 @@ public class ServletAula extends HttpServlet {
+
" <th tabindex=\"0\" class=\"center\" rowspan=\"1\" colspan=\"1\">TIPO CENTRO</th>\n"
+
" <th tabindex=\"0\" class=\"center\" rowspan=\"1\" colspan=\"1\">CENTRO</th>\n"
+
" <th tabindex=\"0\" class=\"center\" rowspan=\"1\" colspan=\"1\">NIVEL</th>\n"
//
+ " <th tabindex=\"0\" class=\"center\" rowspan=\"1\" colspan=\"1\">TIPO GRADO</th>\n"
+
" <th tabindex=\"0\" class=\"center\" rowspan=\"1\" colspan=\"1\">TIPO GRADO</th>\n"
+
" <th tabindex=\"0\" class=\"center\" rowspan=\"1\" colspan=\"1\">GRADO</th>\n"
+
" <th tabindex=\"0\" class=\"center\" rowspan=\"1\" colspan=\"1\">SECCIÓN</th>\n"
+
" <th tabindex=\"0\" class=\"center\" rowspan=\"1\" colspan=\"1\">NOMBRE</th>\n"
...
...
@@ -682,7 +685,7 @@ public class ServletAula extends HttpServlet {
+
" <td>"
+
lista
.
get
(
i
).
getNombreTipoCentro
()
+
"</td>"
+
" <td>"
+
lista
.
get
(
i
).
getNombreCentro
()
+
"</td>"
+
" <td>"
+
lista
.
get
(
i
).
getNombreNivel
()
+
"</td>"
//
+ " <td>" + lista.get(i).getNombreTipoGrado() + "</td>"
+
" <td>"
+
lista
.
get
(
i
).
getNombreTipoGrado
()
+
"</td>"
+
" <td><a class='lblNombreGrado' href=\"javascript:editarNombreGrado('"
+
lista
.
get
(
i
).
getCodigoAula
()+
"');\" style='text-decoration: none;'>"
+
lista
.
get
(
i
).
getNombreGrado
()+
"</a></td>"
+
" <td align='center'><a class='lblNombreSeccion' href=\"javascript:editarNombreSeccion('"
+
lista
.
get
(
i
).
getCodigoAula
()+
"');\" style='text-decoration: none;'>"
+
lista
.
get
(
i
).
getNombreSeccion
()+
"</a></td>"
+
" <td><a class='lblNombreAula' href=\"javascript:editarNombreAula('"
+
lista
.
get
(
i
).
getCodigoAula
()+
"');\" style='text-decoration: none;'>"
+
lista
.
get
(
i
).
getNombre
()+
"</a></td>"
...
...
@@ -2137,6 +2140,8 @@ public class ServletAula extends HttpServlet {
String
codSeccion
=
request
.
getParameter
(
"codSeccion"
);
String
codTurno
=
request
.
getParameter
(
"codTurno"
);
String
periodo
=
request
.
getParameter
(
"periodo"
);
int
codPeriodo
=
Integer
.
parseInt
(
request
.
getParameter
(
"periodo"
));
//------------------datos de paginacion---------------------------
int
cantidad
=
Integer
.
parseInt
(
request
.
getParameter
(
"cantidad"
));
...
...
@@ -2146,8 +2151,9 @@ public class ServletAula extends HttpServlet {
int
inicio
=
(
pagina
-
1
)
*
cantidad
;
int
cantRegistro
=
0
;
lista
=
servicio
.
listarAulasBloque
(
codSede
,
codTipoCentro
,
codCentro
,
codNivel
,
codTipoGrado
,
codGrado
,
codSeccion
,
codTurno
,
inicio
,
cantidad
);
cantRegistro
=
servicio
.
cantlistarAulasBloque
(
codSede
,
codTipoCentro
,
codCentro
,
codNivel
,
codTipoGrado
,
codGrado
,
codSeccion
,
codTurno
);
lista
=
servicio
.
listarAulasBloqueTotal
(
codSede
,
codTipoCentro
,
codCentro
,
codNivel
,
codTipoGrado
,
codGrado
,
codSeccion
,
codTurno
,
inicio
,
cantidad
,
codPeriodo
);
cantRegistro
=
servicio
.
cantlistarAulasBloque
(
codSede
,
codTipoCentro
,
codCentro
,
codNivel
,
codTipoGrado
,
codGrado
,
codSeccion
,
codTurno
);
//=============CALCULO DE PAGINADO=============
int
numero
=
cantRegistro
/
cantidad
;
...
...
@@ -2192,6 +2198,7 @@ public class ServletAula extends HttpServlet {
+
" <tr role=\"row\">\n"
+
" <th tabindex=\"0\" class=\"center\" rowspan=\"2\" colspan=\"1\" >N°</th>\n"
+
" <th tabindex=\"0\" class=\"center\" rowspan=\"2\" colspan=\"1\">SEDE</th>\n"
+
"<th tabindex=\"0\" class=\"center\" rowspan=\"2\" colspan=\"1\">PERIODO</th>\n"
+
" <th tabindex=\"0\" class=\"center\" rowspan=\"2\" colspan=\"1\">TIPO CENTRO</th>\n"
+
" <th tabindex=\"0\" class=\"center\" rowspan=\"2\" colspan=\"1\">CENTRO</th>\n"
+
" <th tabindex=\"0\" class=\"center\" rowspan=\"2\" colspan=\"1\">NIVEL</th>\n"
...
...
@@ -2232,7 +2239,9 @@ public class ServletAula extends HttpServlet {
codAula
=
""
+
lista
.
get
(
i
).
getCodigoAula
();
//cantidadHCero = servicioH.cantidadHorarioCero(codAula, periodo);
nom
=
" <td>"
+
lista
.
get
(
i
).
getNombreLocal
()
+
"</td>"
nom
=
" <td>"
+
lista
.
get
(
i
).
getNombreLocal
()
+
"</td>"
+
"<td>"
+
lista
.
get
(
i
).
getNombrePeriodo
()+
"</td>"
+
"<td>"
+
lista
.
get
(
i
).
getNombreTipoCentro
()
+
"</td>"
+
"<td>"
+
lista
.
get
(
i
).
getNombreCentro
()
+
"</td>"
+
"<td>"
+
lista
.
get
(
i
).
getNombreNivel
()
+
"</td>"
...
...
@@ -2320,6 +2329,7 @@ public class ServletAula extends HttpServlet {
pw
.
println
(
"<tr>"
+
" <td align='center' height='30'>"
+
cont
+
"</td>"
+
" <td>"
+
lista
.
get
(
i
).
getNombreLocal
()
+
"</td>"
+
" <td style='color:#307ecc;'>"
+
lista
.
get
(
i
).
getNombrePeriodo
()
+
"</td>"
+
" <td>"
+
lista
.
get
(
i
).
getNombreTipoCentro
()
+
"</td>"
+
" <td>"
+
lista
.
get
(
i
).
getNombreCentro
()
+
"</td>"
+
" <td>"
+
lista
.
get
(
i
).
getNombreNivel
()
+
"</td>"
...
...
web/vista/lista_aula_dirage.jsp
View file @
f3697172
...
...
@@ -319,14 +319,6 @@ window.jQuery || document.write("<script src='../assets/js/jquery1x.js'>"+"<"+"/
}
}));
$
(
"#id-btn-dialog2"
).
on
(
'click'
,
function
(
e
)
{
//--
e
.
preventDefault
();
$
(
"#dialog-confirm"
).
removeClass
(
'hide'
).
dialog
({
...
...
@@ -687,12 +679,10 @@ window.jQuery || document.write("<script src='../assets/js/jquery1x.js'>"+"<"+"/
let
nombre
=
""
;
function
editarNombreAula
(
codAula
)
{
console
.
log
(
"inicio"
+
codAula
)
let
id
=
$
(
".lblNombreAula"
);
codigo
=
codAula
;
console
.
log
(
"xtttt"
+
codigo
)
setEditable
(
id
);
}
...
...
@@ -734,10 +724,6 @@ window.jQuery || document.write("<script src='../assets/js/jquery1x.js'>"+"<"+"/
}
});
},
error
:
function
(
data
)
{
$
(
'.lblNombreAula'
).
editable
(
'destroy'
);
}
...
...
web/vista/man_aula_dirage_session.jsp
View file @
f3697172
...
...
@@ -222,6 +222,14 @@
</div>
<br>
</div>
<div
class=
"col-sm-6"
>
<label
for=
"form-field-select-3"
>
Periodo
<span
style=
"color: red;"
>
*
</span></label>
<br>
<div
id=
"divPeriodo"
>
</div>
<br>
</div>
</fieldset>
...
...
@@ -673,6 +681,22 @@
title_html
:
true
});
}
function
cargarPeriodoHorario
()
{
var
accion
=
""
;
var
nombre
=
"cbPeriodo"
;
$
.
ajax
({
type
:
'POST'
,
url
:
'../ServletPeriodoAcademico?Accion=listarPeriodoAcademico'
,
data
:
'accion='
+
accion
+
'&nombre='
+
nombre
,
beforeSend
:
function
()
{
},
success
:
function
(
resultado
)
{
$
(
"#divPeriodo"
).
html
(
resultado
);
},
complete
:
function
()
{
}
});
}
function
close_carga
()
{
$
(
"#dialog-cargando"
).
dialog
(
"close"
);
...
...
@@ -827,6 +851,7 @@
$
(
"#divSeccion"
).
html
(
resultado
);
},
complete
:
function
()
{
cargarTurno
();
cargarPeriodoHorario
();
}
});
...
...
@@ -928,13 +953,18 @@
var
codSeccion
=
$
(
"#cmbSeccion"
).
val
();
let
nombre
=
$
(
"#txtAula"
).
val
();
var
codTurno
=
$
(
"#cmbturno"
).
val
();
// codigo de periodo
var
codperiodo
=
$
(
"#cbPeriodo"
).
val
()
$
(
"#codSede"
).
val
(
codSede
);
$
.
ajax
({
type
:
'POST'
,
url
:
'../ServletAula?Accion=registarAula'
,
data
:
'codCentro='
+
codCentro
+
'&codNivel='
+
codNivel
+
'&codTipoGrado='
+
codTipoGrado
+
'&codGrado='
+
codGrado
+
'&codSede='
+
codSede
+
'&codTipoCentro='
+
codTipoCentro
+
'&codSeccion='
+
codSeccion
+
'&codTurno='
+
codTurno
+
'&nombreAula='
+
nombre
,
data
:
'codCentro='
+
codCentro
+
'&codNivel='
+
codNivel
+
'&codTipoGrado='
+
codTipoGrado
+
'&codGrado='
+
codGrado
+
'&codSede='
+
codSede
+
'&codTipoCentro='
+
codTipoCentro
+
'&codSeccion='
+
codSeccion
+
'&codTurno='
+
codTurno
+
'&nombreAula='
+
nombre
+
'&codPeriodo='
+
codperiodo
,
beforeSend
:
function
()
{
cargando
();
},
success
:
function
(
resultado
)
{
...
...
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