Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/EjercitarWeb
diff options
context:
space:
mode:
authorcecigg <caggsld@gmail.com>2014-10-11 19:35:02 (GMT)
committer cecigg <caggsld@gmail.com>2014-10-11 19:35:02 (GMT)
commit3dd337d44256cdf02177ead56b31771b8893e071 (patch)
tree1881b1d066b8dc97b073f705f4f8fdeeb156604a /EjercitarWeb
parentbda837bc523b5f65641454533c679e73e8446eca (diff)
correcion simular
Diffstat (limited to 'EjercitarWeb')
-rw-r--r--EjercitarWeb/WebContent/login.jsp63
-rw-r--r--EjercitarWeb/src/src/MenuPrincipalServlet.java7
2 files changed, 67 insertions, 3 deletions
diff --git a/EjercitarWeb/WebContent/login.jsp b/EjercitarWeb/WebContent/login.jsp
index ea908a1..3e10f05 100644
--- a/EjercitarWeb/WebContent/login.jsp
+++ b/EjercitarWeb/WebContent/login.jsp
@@ -33,11 +33,55 @@
.input-group {
margin-bottom: 5px;
}
+
+
+ body {
+ background: url('/img/fondo.png') no-repeat center center fixed;
+ -webkit-background-size: cover;
+ -moz-background-size: cover;
+ -o-background-size: cover;
+ background-size: cover;
+ }
+
+ .panel-default {
+ opacity: 0.9;
+ margin-top:30px;
+ }
+ .form-group.last {
+ margin-bottom:0px;
+ }
+
+ .white, .white a {
+ color: #fff;
+ }
+
+ .navbar {
+ background-color: transparent;
+ background: transparent;
+ border-color: transparent;
+ }
+
+
+
</style>
</head>
<body>
+
+
+
+
<div class="container">
- <div class="center well">
+ <div class="row"> <br/><br/><br/><br/><br/></div>
+ <div class="row ">
+ <div class="col-md-6 white ">
+ <h1 > Bienvenidos a Ejercitar!</h1>
+
+ <p><h3> Ejercitar es un modelo de aprendizaje basado en el uso de computadoras. </h3></p>
+ </div>
+ <div class="col-md-4 col-md-offset-2">
+ <div class="panel panel-default">
+ <div class="panel-heading"> <strong class="">Login</strong> </div>
+ <div class="panel-body">
<div class="alert alert-danger" id="e-msg-error-cnt">
<a class="close" data-dismiss="alert" href="#">x</a><div id="e-msg-error"><%= request.getAttribute("error") %></div>
</div>
@@ -53,7 +97,24 @@
<button class="btn btn-lg btn-primary btn-block" type="submit" name="submit">Aceptar</button>
<button class="btn btn-lg btn-success btn-block" type="button" onclick="location.href='/EjercitarWeb/NuevoProfesorServlet';">Crear Cuenta</button>
</form>
+ </div>
+ </div>
</div>
</div>
+ </div>
+
+ <nav class="navbar navbar-default navbar-fixed-bottom" role="navigation">
+ <div class="container-fluid">
+
+ <ul class="nav navbar-nav navbar-right">
+ <a href="http://one.laptop.org/"><img src="/img/olpc-logo.png" class="img-rounded" alt="Rounded Image"></img></a>
+ <a href="http://www.paraguayeduca.org/"><img src="/img/educa-logo.png" class="img-rounded" alt="Rounded Image"></img></a>
+ <a href="http://www.pol.una.py/"><img src="/img/fpuna-logo.png" class="img-rounded" alt="Rounded Image"></img></a>
+
+ </ul>
+
+ </div>
+ </nav>
+
</body>
</html>
diff --git a/EjercitarWeb/src/src/MenuPrincipalServlet.java b/EjercitarWeb/src/src/MenuPrincipalServlet.java
index eb3d4f9..2bee6fd 100644
--- a/EjercitarWeb/src/src/MenuPrincipalServlet.java
+++ b/EjercitarWeb/src/src/MenuPrincipalServlet.java
@@ -3,6 +3,7 @@ package src;
import java.io.IOException;
import java.util.List;
+import javax.ejb.EJB;
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
import javax.servlet.RequestDispatcher;
@@ -14,6 +15,7 @@ import javax.servlet.http.HttpServletResponse;
import model.Asignatura;
import model.Profesor;
+import beans.SimulacionBeanRemote;
/**
* Servlet implementation class MenuPrincipalServlet
@@ -26,7 +28,8 @@ public class MenuPrincipalServlet extends HttpServlet {
/**
* @see HttpServlet#HttpServlet()
*/
-
+ @EJB
+ SimulacionBeanRemote simular;
public MenuPrincipalServlet() {
super();
@@ -42,7 +45,7 @@ public class MenuPrincipalServlet extends HttpServlet {
response.setContentType("text/html;charset=UTF-8");
Profesor profesor = (Profesor)request.getSession().getAttribute("profesor");
Profesor profTemp = em.find(Profesor.class, profesor.getIdProfesor());
-
+ simular.simular();
List<Asignatura> asignaturas = em.createQuery("select a from Asignatura a where a.profesor = :profesor ").setParameter("profesor", profTemp).getResultList();
request.setAttribute("lista_asignatura", asignaturas);