diff options
author | ceci <caggsld@gmail.com> | 2013-09-14 13:14:40 (GMT) |
---|---|---|
committer | ceci <caggsld@gmail.com> | 2013-09-14 13:14:40 (GMT) |
commit | bbbcbf2624416a9e9c00b48904b2da117364eeea (patch) | |
tree | 311fcbf5ba411c82b411479e9fcf25bdc00b36bf /EjercitarWeb | |
parent | aa64bf84d7afdfa779c751711a8b21b9812bf152 (diff) |
se modifico iniciar_curso para que realice las validaciones para los pesos de los temas y conceptos.
Diffstat (limited to 'EjercitarWeb')
-rw-r--r-- | EjercitarWeb/WebContent/css/img/delete.png | bin | 0 -> 2812 bytes | |||
-rw-r--r-- | EjercitarWeb/WebContent/iniciar_curso.jsp | 66 | ||||
-rw-r--r-- | EjercitarWeb/WebContent/vista_asignatura.jsp | 9 |
3 files changed, 54 insertions, 21 deletions
diff --git a/EjercitarWeb/WebContent/css/img/delete.png b/EjercitarWeb/WebContent/css/img/delete.png Binary files differnew file mode 100644 index 0000000..6c10e11 --- /dev/null +++ b/EjercitarWeb/WebContent/css/img/delete.png diff --git a/EjercitarWeb/WebContent/iniciar_curso.jsp b/EjercitarWeb/WebContent/iniciar_curso.jsp index 29d3589..95e9c91 100644 --- a/EjercitarWeb/WebContent/iniciar_curso.jsp +++ b/EjercitarWeb/WebContent/iniciar_curso.jsp @@ -12,40 +12,70 @@ <script src="http://code.jquery.com/ui/1.10.3/jquery-ui.js"></script> <script> - $(function() { - $( "#accordion" ).accordion(); - }); + $(function() { + $( "#accordion" ).accordion({ + heightStyle: "fill" + }); + }); + $(function() { + $( "#accordion-resizer" ).resizable({ + minHeight: 140, + minWidth: 200, + resize: function() { + $( "#accordion" ).accordion( "refresh" ); + } + }); + }); </script> <script language='javascript'> function totalTemas(dato) { - total=0; + var total=0; for (var i=0; i<parseInt(dato); i++) { var id = "peso_"+i; num = document.getElementById(id).value; - + num = (!num)?0:num; total = parseFloat(total) + parseFloat(num); - - } - document.getElementById("total_temas").value = total; + } + + + + if(total != 1){ + document.getElementById("total_temas").style.background="#DC2D2D"; + }else if (total == 1){ + document.getElementById("total_temas").style.background="#71FC9A"; + document.getElementById('temas_img').src="css/img/guardar.png"; + // setTimeout( "document.getElementById('temas_img').src='css/img/guardar.png'", 1000 ); + + } + + document.getElementById("total_temas").value = total; } + + function totalConceptos(dato,id_tema) { total=0; + for (var i=0; i<parseInt(dato); i++) { - var id = "cpeso_"+i; + var id = "cpeso_"+i+"_t_"+id_tema; num = document.getElementById(id).value; - alert(id + num); + num = (!num)?0:num; total = parseFloat(total) + parseFloat(num); } var idt = "total_concepto_"+id_tema; - alert(idt + total); - + var imgTem = "tema_"+id_tema; + if(total != 1){ + document.getElementById(idt).style.background="#FE2E2E"; + }else if (total == 1){ + document.getElementById(idt).style.background="#71FC9A"; + document.getElementById(imgTem).src="css/img/guardar.png"; + } document.getElementById(idt).value = total; } @@ -56,9 +86,9 @@ <body> <%@page import="java.util.List" import="model.Tema" import="model.Concepto" import="model.Asignatura"%> <div id= "content"> -<form style="width: 1071px; height: 521px;" method="post" name="iniciar_form"> +<form style="width: 1071px; height: 521px;" method="post" name="form"> <div id="accordion"> - <h3>Temas</h3> + <h3>Temas <img src="css/img/agregar.png" id="temas_img"></h3> <div> <p> @@ -90,11 +120,11 @@ </p> </div> <% int cant_tema = 0;%> - <% int cant_concepto = 0;%> - <%for(Tema tema : temaList) {%> - <h3>Tema: <%= tema.getNombre() %></h3> + <%for(Tema tema : temaList) {%> + <% int cant_concepto = 0;%> + <h3>Tema: <%= tema.getNombre() %> <img src="css/img/agregar.png" id="tema_<%=cant_tema%>"> </h3> <table> <thead> <tr> @@ -106,7 +136,7 @@ <%for(Concepto concepto : tema.getConceptoList()) {%> <tr> <td><a > <%= concepto.getNombre()%></a> </td> - <td><input type="text" name="cpeso" id= "cpeso_<%=cant_concepto %>" onChange='totalConceptos(<%=tema.getConceptoList().size() %>,<%=cant_tema%>)'/></td> + <td><input type="text" name="cpeso" id= "cpeso_<%=cant_concepto %>_t_<%=cant_tema%>" onChange='totalConceptos(<%=tema.getConceptoList().size() %>,<%=cant_tema%>)'/></td> </tr> diff --git a/EjercitarWeb/WebContent/vista_asignatura.jsp b/EjercitarWeb/WebContent/vista_asignatura.jsp index 41ae5cf..70cb82f 100644 --- a/EjercitarWeb/WebContent/vista_asignatura.jsp +++ b/EjercitarWeb/WebContent/vista_asignatura.jsp @@ -98,11 +98,14 @@ <% if (asignatura.getIniciado()!=true){ %> <p><button type="button" style="width:150px" onclick="location.href='/EjercitarWeb/NuevoTemaServlet?asignatura=<%=asignatura.getIdAsignatura()%>';"><img src="css/img/agregar.png" align="middle"/> Tema</button></p> <p><button type="button" style="width:150px" onclick="location.href='/EjercitarWeb/NuevoConceptoServlet?asignatura=<%=asignatura.getIdAsignatura()%>';"><img src="css/img/agregar.png" align="middle"/> Concepto</button></p> + <p><button type="button" style="width:150px" onclick="location.href='/EjercitarWeb/IniciarCursoServlet?asignatura=<%=asignatura.getIdAsignatura()%>';"><img src="css/img/resultados.png"align="middle"/> Iniciar Curso</button></p> + + <%}else{%> + <p><button type="button" style="width:150px" onclick="location.href='/EjercitarWeb/NuevaTareaServlet?curso=<%=asignatura.getCurso().getIdCurso()%>&asignatura=<%=asignatura.getIdAsignatura()%>';"><img src="css/img/agregar.png" align="middle"/> Tarea</button></p> + <p><button type="button" style="width:150px" onclick="location.href='/EjercitarWeb/VerResultadosServlet?asignatura=<%=asignatura.getIdAsignatura()%>';"><img src="css/img/resultados.png"align="middle"/> Resultados</button></p> + <%}%> <p><button type="button" style="width:150px" onclick="location.href='/EjercitarWeb/NuevoEjercicioServlet?asignatura=<%=asignatura.getIdAsignatura()%>';"><img src="css/img/agregar.png"align="middle"/> Ejercicio</button></p> - <p><button type="button" style="width:150px" onclick="location.href='/EjercitarWeb/NuevaTareaServlet?curso=<%=asignatura.getCurso().getIdCurso()%>&asignatura=<%=asignatura.getIdAsignatura()%>';"><img src="css/img/agregar.png" align="middle"/> Tarea</button></p> - <p><button type="button" style="width:150px" onclick="location.href='/EjercitarWeb/VerResultadosServlet?asignatura=<%=asignatura.getIdAsignatura()%>';"><img src="css/img/resultados.png"align="middle"/> Resultados</button></p> - <p><button type="button" style="width:150px" onclick="location.href='/EjercitarWeb/IniciarCursoServlet?asignatura=<%=asignatura.getIdAsignatura()%>';"><img src="css/img/resultados.png"align="middle"/> Iniciar Curso</button></p> </form> |