._.

RolandoCM · Nov 27, 2017 · 7271dd1 · 7271dd1
1 parent 7070e9d
commit 7271dd1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/SIGECU/src/java/dao/Implements/Evento/EventosDashboardDAO.java b/SIGECU/src/java/dao/Implements/Evento/EventosDashboardDAO.java
@@ -28,10 +28,11 @@ public class EventosDashboardDAO implements IEventosDashboardDAO{
     @Override
     public List<Evento> dashEventoDAO() throws BusinessException {
         List<Evento> dashEvento= new ArrayList<>();
-        String sql = "select  e.idevento, c.nombre, e.fechaInicio, e.fechaTermino, count(*)  \n" +
-                    "from alumno a, alumno_has_eventos ae, cursos c, eventos e\n" +
-                    "where ae.e_idevento = e.idevento and a.idalumno=ae.a_idalumno and ae.activo=1\n" +
-                    "group by e.idevento, c.nombre, e.fechaInicio, e.fechaTermino;";
+        String sql = "SELECT e.idevento, c.cNombre, e.eFechaInicio, e.eFechaTermino, count(*)\n" +
+            "FROM eventos e, alumno_has_eventos ae, cursos c, alumno a\n" +
+            "WHERE ae.e_idevento=e.idevento AND a.idalumno=ae.a_idalumno AND c.idcursos=e.cursos_idcursos\n" +
+            "	AND ae.activo=1\n" +
+            "GROUP BY e.idevento, c.cNombre, e.eFechaInicio, e.eFechaTermino;";
 
         try
         {

diff --git a/SIGECU/src/java/extras/ObtenerProgreso.java b/SIGECU/src/java/extras/ObtenerProgreso.java
@@ -46,4 +46,4 @@ public static int progreso(String fechaInicio, String fechaTermino)
             return (int)progresoS;
     }
 
-}
+}
-Original file line number
+Diff line change
@@ Expand Up @@
                 return (int)progresoS;
         }
-    }
+    }