Merge pull request #732 from center-for-knowledge-communication/ms-is…

…sue-723 Issue #723 - home page appearance changes
center-for-knowledge-communication · Feb 9, 2023 · 7864a1e · 7864a1e
2 parents 631e6c0 + cc781fb
commit 7864a1e
Show file tree

Hide file tree

Showing 9 changed files with 40 additions and 16 deletions.
diff --git a/resources/teacherTools/classManager.jsp b/resources/teacherTools/classManager.jsp
@@ -59,7 +59,6 @@
 <!-- Frank 09-23-22     Issue #632R3 - added select all/deselect all for standards list popup and made dropdown gable -->
 <!-- Frank 10-06-22     Issue #632R4 - group feedback changes and fix drag element init -->
 <!-- Frank 11-27-22     Issue #714 - finish multi-lingual algorithms -->
-
 
 <%@ 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(){
                 <div class="row">
 	                <div class="col-md-10">
 	                    <h3 class="tt-page-header">
-	                        <small><%= rb.getString("clone_class") %></small>
+	                        <small><%= rb.getString("create_class_cluster") %></small>
 	                    </h3>
 	                </div>
                 </div>
@@ -4148,7 +4147,7 @@ function registerAllEvents(){
 				                            </div>
 				                             <div class="panel-body">
 				                                <div class="form-group">
-				                                    <label for="className"><%= rb.getString("class_name") %></label>
+				                                    <label for="className"><%= rb.getString("cluster_name") %></label>
 				                                    <div class="input-group">
 				                                    <span class="input-group-addon"><i
 				                                            class="glyphicon glyphicon-blackboard"></i></span>

diff --git 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  = '<div class="loader" style="display: none" ></div>';               
-			myHTML += '<div class="row"><div class="col-lg-12"><h1 class="page-header">';
+			myHTML += '<div class="row"><div class="col-lg-6"><h1 class="page-header">';
 			if (nbrOfClasses > 0) {
 				myHTML += '<small><%= rb.getString("existing_classes") %></small>';
+				if (nbrOfClusters > 0) {
+					myHTML += '   |   ';
+					myHTML += '<small><%= rb.getString("clusters") %></small>';
+				}
 			}
 			else {
 				myHTML += '<small><%= rb.getString("no_pre-existing_classes") %></small>';
@@ -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 += '<img src="../../images/classroom.png" height="64" width="64">';
 				    }
 				    else {
-					    myHTML += '<img src="../../images/cluster.png" height="48" width="48">';
+					    myHTML += '<img src="../../images/cluster.png" height="36" width="48">';
 				    }
 				    
 				    myHTML += '</div>';

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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