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>2013-11-20 22:26:16 (GMT)
committer cecigg <caggsld@gmail.com>2013-11-20 22:26:16 (GMT)
commitae09e23086c92870490d809cd8f1a6e1bc0f02b4 (patch)
treee3e25936dac21c6ec91012b29c7b2d6b089c7216 /EjercitarWeb
parent8c7ee8f64054a37bc45595cd4a115d38bed56b78 (diff)
se agrego metodos de getCriterioParada y se modifico el metodo getDatosAlumno. se modifico la entidad tarea y sesion.
se modifico te concepto y ejercicios jsp para incluir los campos numericos.
Diffstat (limited to 'EjercitarWeb')
-rw-r--r--EjercitarWeb/WebContent/Asignatura.jsp14
-rw-r--r--EjercitarWeb/WebContent/Concepto.jsp46
-rw-r--r--EjercitarWeb/WebContent/Tema.jsp8
-rw-r--r--EjercitarWeb/WebContent/concepto_ed.jsp36
-rw-r--r--EjercitarWeb/WebContent/tema_ed.jsp7
5 files changed, 98 insertions, 13 deletions
diff --git a/EjercitarWeb/WebContent/Asignatura.jsp b/EjercitarWeb/WebContent/Asignatura.jsp
index f7323eb..8f96cd0 100644
--- a/EjercitarWeb/WebContent/Asignatura.jsp
+++ b/EjercitarWeb/WebContent/Asignatura.jsp
@@ -7,7 +7,17 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<title>Asignatura</title>
+
+ <!-- validaciones -->
+ <script src="js/jquery-1.7.1.min.js"></script>
+ <script src="js/jquery.validate.min.js"></script>
+ <script src="js/validaciones.js"></script>
+
+
+
</head>
+
+
<body>
<%@page import="model.Curso" import="java.util.List" %>
<div id="content">
@@ -16,11 +26,11 @@
<fieldset>
<p>
<label>Nombre</label>
- <input type="text" name="nombre" />
+ <input type="text" name="nombre" id="nombre"/>
</p>
<p>
<label>Descripcion</label>
- <input type="text" name="descripcion"/>
+ <input type="text" name="descripcion" />
</p>
<p>
<label>Curso:</label>
diff --git a/EjercitarWeb/WebContent/Concepto.jsp b/EjercitarWeb/WebContent/Concepto.jsp
index 3f6c211..952eada 100644
--- a/EjercitarWeb/WebContent/Concepto.jsp
+++ b/EjercitarWeb/WebContent/Concepto.jsp
@@ -1,18 +1,26 @@
<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
pageEncoding="ISO-8859-1"%>
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<%@ include file="templateCSS.jsp" %>
+<!-- >%@ include file="templateCSS.jsp" %-->
+
+
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<title>Concepto</title>
-<script src="http://code.jquery.com/jquery-latest.js"></script>
+ <link rel="stylesheet" href="http://code.jquery.com/ui/1.10.3/themes/smoothness/jquery-ui.css" />
+<script src="http://code.jquery.com/jquery-1.9.1.js"></script>
+<script src="http://code.jquery.com/ui/1.10.3/jquery-ui.js"></script>
+<script src="js/jquery.validate.min.js"></script>
+ <script src="js/validaciones.js"></script>
+
+
</head>
<body>
<%@page import="java.util.List" import="model.Tema" import = "model.Profesor" import="model.Concepto"%>
<div id="content">
-<form style="width: 1071px; height: 521px;" method="post" name="ejercicio_form">
+<form id="form1" name="form1" method="post" action="">
<br>
<% Profesor profesor = (Profesor) request.getSession().getAttribute("profesor");%>
@@ -42,15 +50,15 @@
<legend> Probabilidades </legend>
<p>
<label>A priori:</label>
- <input type="text" name="a_priori" id= "a_priori" >
+ <input type="text" name="a_priori" id= "a_priori" value="0.5" disabled/>
</p>
<p>
<label>Adivinanza:</label>
- <input type="text" name="adivinanza" id="adivinanza" >
+ <input type="text" name="adivinanza" id="adivinanza" value="0.2" disabled />
</p>
<p>
<label>Descuido:</label>
- <input type="text" name="descuido" id="descuido" >
+ <input type="text" name="descuido" id="descuido" value="0.2" disabled />
</p>
</fieldset>
<p class="nolabel">
@@ -61,6 +69,32 @@
</form>
</div>
+
+ <script>
+
+ $( "#a_priori" ).spinner({
+ step: 0.01,
+ numberFormat: "n",
+ max:1,
+ min:0
+ });
+
+ $( "#adivinanza" ).spinner({
+ step: 0.1,
+ numberFormat: "n",
+ max:1,
+ min:0
+ });
+
+ $( "#descuido" ).spinner({
+ step: 0.1,
+ numberFormat: "n",
+ max:1,
+ min:0
+ });
+
+ </script>
+
</body>
diff --git a/EjercitarWeb/WebContent/Tema.jsp b/EjercitarWeb/WebContent/Tema.jsp
index 6ea9814..32ebe36 100644
--- a/EjercitarWeb/WebContent/Tema.jsp
+++ b/EjercitarWeb/WebContent/Tema.jsp
@@ -6,12 +6,18 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<title>Tema</title>
+
+<!-- validaciones -->
+ <script src="js/jquery-1.7.1.min.js"></script>
+ <script src="js/jquery.validate.min.js"></script>
+ <script src="js/validaciones.js"></script>
+
</head>
<body>
<%@page import="java.util.List" import="model.Asignatura" import="model.Profesor" import="model.Tema"%>
<div id="content">
-<form style="width: 1071px; height: 521px;" method="post" name="ejercicio_form">
+<form id="form1" name="form1" method="post" action="">
<br>
<% Profesor profesor = (Profesor) request.getSession().getAttribute("profesor");%>
diff --git a/EjercitarWeb/WebContent/concepto_ed.jsp b/EjercitarWeb/WebContent/concepto_ed.jsp
index a388356..6b1bbae 100644
--- a/EjercitarWeb/WebContent/concepto_ed.jsp
+++ b/EjercitarWeb/WebContent/concepto_ed.jsp
@@ -1,18 +1,22 @@
<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
pageEncoding="ISO-8859-1"%>
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<%@ include file="templateCSS.jsp" %>
+<!-- >%@ include file="templateCSS.jsp" %-->
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<title>Concepto</title>
-<script src="http://code.jquery.com/jquery-latest.js"></script>
+ <link rel="stylesheet" href="http://code.jquery.com/ui/1.10.3/themes/smoothness/jquery-ui.css" />
+<script src="http://code.jquery.com/jquery-1.9.1.js"></script>
+<script src="http://code.jquery.com/ui/1.10.3/jquery-ui.js"></script>
+<script src="js/jquery.validate.min.js"></script>
+ <script src="js/validaciones.js"></script>
</head>
<body>
<%@page import="java.util.List" import="model.Tema" import = "model.Profesor" import="model.Concepto" import = "model.Asignatura"%>
<div id="content">
-<form style="width: 1071px; height: 521px;" method="post" name="ejercicio_form">
+<form id="form1" name="form1" method="post" action="">
<br>
<% Profesor profesor = (Profesor) request.getSession().getAttribute("profesor");%>
<% Concepto concepto = (Concepto) request.getAttribute("concepto");%>
@@ -65,6 +69,32 @@
</form>
</div>
+
+ <script>
+
+ $( "#a_priori" ).spinner({
+ step: 0.01,
+ numberFormat: "n",
+ max:1,
+ min:0
+ });
+
+ $( "#adivinanza" ).spinner({
+ step: 0.1,
+ numberFormat: "n",
+ max:1,
+ min:0
+ });
+
+ $( "#descuido" ).spinner({
+ step: 0.1,
+ numberFormat: "n",
+ max:1,
+ min:0
+ });
+
+ </script>
+
</body>
diff --git a/EjercitarWeb/WebContent/tema_ed.jsp b/EjercitarWeb/WebContent/tema_ed.jsp
index f0a60c9..5765e0a 100644
--- a/EjercitarWeb/WebContent/tema_ed.jsp
+++ b/EjercitarWeb/WebContent/tema_ed.jsp
@@ -6,12 +6,17 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<title>Tema</title>
+<!-- validaciones -->
+ <script src="js/jquery-1.7.1.min.js"></script>
+ <script src="js/jquery.validate.min.js"></script>
+ <script src="js/validaciones.js"></script>
+
</head>
<body>
<%@page import="java.util.List" import="model.Asignatura" import="model.Profesor" import="model.Tema"%>
<div id="content">
-<form style="width: 1071px; height: 521px;" method="post" name="ejercicio_form">
+<form id="form1" name="form1" method="post" action="">
<br>
<% Profesor profesor = (Profesor) request.getSession().getAttribute("profesor");%>
<% Tema tema = (Tema) request.getAttribute("tema");%>
generated by cgit v0.9.1 at 2024-05-27 02:47:36 (GMT)