diff --git a/resources/teacherTools/classManager.jsp b/resources/teacherTools/classManager.jsp index 8556ce8d..c91d95ad 100644 --- a/resources/teacherTools/classManager.jsp +++ b/resources/teacherTools/classManager.jsp @@ -59,7 +59,6 @@ - <%@ page contentType="text/html;charset=UTF-8" language="java" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> @@ -4113,7 +4112,7 @@ function registerAllEvents(){

- <%= rb.getString("clone_class") %> + <%= rb.getString("create_class_cluster") %>

@@ -4148,7 +4147,7 @@ function registerAllEvents(){
- +
diff --git a/resources/teacherTools/teacherToolsMain.jsp b/resources/teacherTools/teacherToolsMain.jsp index 23cd6786..2d856055 100644 --- a/resources/teacherTools/teacherToolsMain.jsp +++ b/resources/teacherTools/teacherToolsMain.jsp @@ -298,11 +298,19 @@ catch (Exception e) { var myHTML = ""; var nbrOfClasses = homePageClassArr[0][7]; var nbrOfClusters = 0; + + for (let index = 0; index < nbrOfClasses; index++) { + nbrOfClusters += homePageClassArr[index][2]; + } myHTML = ''; - myHTML += '

'; + myHTML += '

'; if (nbrOfClasses > 0) { myHTML += '<%= rb.getString("existing_classes") %>'; + if (nbrOfClusters > 0) { + myHTML += ' | '; + myHTML += '<%= rb.getString("clusters") %>'; + } } else { myHTML += '<%= rb.getString("no_pre-existing_classes") %>'; @@ -312,9 +320,6 @@ catch (Exception e) { var needsEndOfRowDiv = true; if (nbrOfClasses > 0) { - for (let index = 0; index < nbrOfClasses; index++) { - nbrOfClusters += homePageClassArr[index][2]; - } @@ -350,7 +355,7 @@ catch (Exception e) { myHTML += ''; } else { - myHTML += ''; + myHTML += ''; } myHTML += '

'; diff --git a/src/edu/umass/ckc/wo/db/DbClass.java b/src/edu/umass/ckc/wo/db/DbClass.java index 192a5c31..933572d1 100644 --- a/src/edu/umass/ckc/wo/db/DbClass.java +++ b/src/edu/umass/ckc/wo/db/DbClass.java @@ -723,7 +723,7 @@ public static ClassInfo getClassByName(Connection conn, String className) throws PreparedStatement s = null; try { String q = "select c.id,teacher,school,schoolYear,name,town,section,propgroupid,pretestPoolId, pool.description, " + - "logType,teacherId, c.flashClient, c.isActive, c.hasClusters, c.isCluster from class c, prepostpool pool where name='" + className + "' and pretestPoolId=pool.id"; + "logType,teacherId, c.flashClient, c.isActive from class c, prepostpool pool where name='" + className + "' and pretestPoolId=pool.id"; s = conn.prepareStatement(q); rs = s.executeQuery(); if (rs.next()) { @@ -742,7 +742,9 @@ public static ClassInfo getClassByName(Connection conn, String className) throws String cl = rs.getString(13); int isActive = rs.getInt(14); int gazeDetectionOn = 0; - ClassInfo c = null; + + ClassInfo c = new ClassInfo(sch, yr, name, town, sec, id, teacherId, teacherName, propgroupid, pretestPoolId, + pretestPoolDescr, logType, 0, 7, 0, 7, "5", isActive, gazeDetectionOn,0,0,"green"); return c; } } finally { diff --git a/web/WEB-INF/classes/MathSpring.properties b/web/WEB-INF/classes/MathSpring.properties index c2e76c17..0ca44c48 100644 --- a/web/WEB-INF/classes/MathSpring.properties +++ b/web/WEB-INF/classes/MathSpring.properties @@ -99,7 +99,7 @@ view_teacher_activities=View Teachers' Activities existing_classes=Existing Classes (New) existing_classes_archived=Existing Classes (Archived) no_pre-existing_classes=You do not have any pre-existing classes. -view_class=View +view_class=Edit/View delete_class=Delete archive_class=Archive restore_class=Restore @@ -878,9 +878,12 @@ red=red violet=violet yellow=yellow home_page_for_cluster=Home Page for Cluster +cluster_name=Cluster name cluster_code=Cluster Code +clusters=Clusters create_class_cluster=Create Class Cluster select_a_destination=Select a destination +move_the_student=Move the student setup_cluster_instructions=Setup Cluster Instructions part_three_class_clustering=Part three : Class clustering what_are_clusters=What are clusters? diff --git a/web/WEB-INF/classes/MathSpring_es.properties b/web/WEB-INF/classes/MathSpring_es.properties index fb7efece..a89288e6 100644 --- a/web/WEB-INF/classes/MathSpring_es.properties +++ b/web/WEB-INF/classes/MathSpring_es.properties @@ -99,7 +99,7 @@ view_teacher_activities=ver las actividades de los maestros existing_classes=Clases existentes existing_classes_archived=Clases existentes (Archivadas) no_pre-existing_classes=No tenés ninguna clase preexistente. -view_class=Ver +view_class=Editar/Ver delete_class=Eliminar archive_class=Archivar restore_class=Restaurar @@ -878,9 +878,12 @@ red=rojo violet=Violeta yellow=amarillo home_page_for_cluster=Página de inicio del clúster +cluster_name=El nombre de clúster cluster_code=código de clúster +clusters=Los clústeres create_class_cluster=Crear clúster de clase select_a_destination=Seleccione un destino +move_the_student=Mover al estudiante select class_map_clusters.clusterId as classId, c.name as className, cc.isCluster as isCluster, cc.hasClusters as hasClusters, cc.color as color from class as c, classconfig as cc, class_map_clusters where class_map_clusters.classId = 1825 and class_map_clusters.clusterId = cc.classId and c.isactive = 1 and class_map_clusters.clusterId = c.id order by class_map_clusters.classid asc, class_map_clusters.clusterId asc setup_cluster_instructions=Instrucciones de configuración del clúster part_three_class_clustering=Tercera parte: agrupamiento de clases diff --git a/webProduction/WEB-INF/classes/MathSpring.properties b/webProduction/WEB-INF/classes/MathSpring.properties index c2e76c17..0ca44c48 100644 --- a/webProduction/WEB-INF/classes/MathSpring.properties +++ b/webProduction/WEB-INF/classes/MathSpring.properties @@ -99,7 +99,7 @@ view_teacher_activities=View Teachers' Activities existing_classes=Existing Classes (New) existing_classes_archived=Existing Classes (Archived) no_pre-existing_classes=You do not have any pre-existing classes. -view_class=View +view_class=Edit/View delete_class=Delete archive_class=Archive restore_class=Restore @@ -878,9 +878,12 @@ red=red violet=violet yellow=yellow home_page_for_cluster=Home Page for Cluster +cluster_name=Cluster name cluster_code=Cluster Code +clusters=Clusters create_class_cluster=Create Class Cluster select_a_destination=Select a destination +move_the_student=Move the student setup_cluster_instructions=Setup Cluster Instructions part_three_class_clustering=Part three : Class clustering what_are_clusters=What are clusters? diff --git a/webProduction/WEB-INF/classes/MathSpring_es.properties b/webProduction/WEB-INF/classes/MathSpring_es.properties index fb7efece..a89288e6 100644 --- a/webProduction/WEB-INF/classes/MathSpring_es.properties +++ b/webProduction/WEB-INF/classes/MathSpring_es.properties @@ -99,7 +99,7 @@ view_teacher_activities=ver las actividades de los maestros existing_classes=Clases existentes existing_classes_archived=Clases existentes (Archivadas) no_pre-existing_classes=No tenés ninguna clase preexistente. -view_class=Ver +view_class=Editar/Ver delete_class=Eliminar archive_class=Archivar restore_class=Restaurar @@ -878,9 +878,12 @@ red=rojo violet=Violeta yellow=amarillo home_page_for_cluster=Página de inicio del clúster +cluster_name=El nombre de clúster cluster_code=código de clúster +clusters=Los clústeres create_class_cluster=Crear clúster de clase select_a_destination=Seleccione un destino +move_the_student=Mover al estudiante select class_map_clusters.clusterId as classId, c.name as className, cc.isCluster as isCluster, cc.hasClusters as hasClusters, cc.color as color from class as c, classconfig as cc, class_map_clusters where class_map_clusters.classId = 1825 and class_map_clusters.clusterId = cc.classId and c.isactive = 1 and class_map_clusters.clusterId = c.id order by class_map_clusters.classid asc, class_map_clusters.clusterId asc setup_cluster_instructions=Instrucciones de configuración del clúster part_three_class_clustering=Tercera parte: agrupamiento de clases diff --git a/webTest/WEB-INF/classes/MathSpring.properties b/webTest/WEB-INF/classes/MathSpring.properties index c2e76c17..0ca44c48 100644 --- a/webTest/WEB-INF/classes/MathSpring.properties +++ b/webTest/WEB-INF/classes/MathSpring.properties @@ -99,7 +99,7 @@ view_teacher_activities=View Teachers' Activities existing_classes=Existing Classes (New) existing_classes_archived=Existing Classes (Archived) no_pre-existing_classes=You do not have any pre-existing classes. -view_class=View +view_class=Edit/View delete_class=Delete archive_class=Archive restore_class=Restore @@ -878,9 +878,12 @@ red=red violet=violet yellow=yellow home_page_for_cluster=Home Page for Cluster +cluster_name=Cluster name cluster_code=Cluster Code +clusters=Clusters create_class_cluster=Create Class Cluster select_a_destination=Select a destination +move_the_student=Move the student setup_cluster_instructions=Setup Cluster Instructions part_three_class_clustering=Part three : Class clustering what_are_clusters=What are clusters? diff --git a/webTest/WEB-INF/classes/MathSpring_es.properties b/webTest/WEB-INF/classes/MathSpring_es.properties index fb7efece..a89288e6 100644 --- a/webTest/WEB-INF/classes/MathSpring_es.properties +++ b/webTest/WEB-INF/classes/MathSpring_es.properties @@ -99,7 +99,7 @@ view_teacher_activities=ver las actividades de los maestros existing_classes=Clases existentes existing_classes_archived=Clases existentes (Archivadas) no_pre-existing_classes=No tenés ninguna clase preexistente. -view_class=Ver +view_class=Editar/Ver delete_class=Eliminar archive_class=Archivar restore_class=Restaurar @@ -878,9 +878,12 @@ red=rojo violet=Violeta yellow=amarillo home_page_for_cluster=Página de inicio del clúster +cluster_name=El nombre de clúster cluster_code=código de clúster +clusters=Los clústeres create_class_cluster=Crear clúster de clase select_a_destination=Seleccione un destino +move_the_student=Mover al estudiante select class_map_clusters.clusterId as classId, c.name as className, cc.isCluster as isCluster, cc.hasClusters as hasClusters, cc.color as color from class as c, classconfig as cc, class_map_clusters where class_map_clusters.classId = 1825 and class_map_clusters.clusterId = cc.classId and c.isactive = 1 and class_map_clusters.clusterId = c.id order by class_map_clusters.classid asc, class_map_clusters.clusterId asc setup_cluster_instructions=Instrucciones de configuración del clúster part_three_class_clustering=Tercera parte: agrupamiento de clases