Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/TblMonitoringController.java =================================================================== diff -u -rfd7c55b02c1430bad3c5e057f7a2a25db97db1f3 -rc9048d2a6d579af33cc6b3a36e716715be8e9b2b --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/TblMonitoringController.java (.../TblMonitoringController.java) (revision fd7c55b02c1430bad3c5e057f7a2a25db97db1f3) +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/TblMonitoringController.java (.../TblMonitoringController.java) (revision c9048d2a6d579af33cc6b3a36e716715be8e9b2b) @@ -282,7 +282,7 @@ request.setAttribute("chartNamesDataset", chartNamesDataset.toString()); } - return "tblmonitor/teams"; + return "tblmonitor/teams5"; } /** @@ -324,7 +324,7 @@ } request.setAttribute("permissionGates", permissionGates); - return "tblmonitor/gates"; + return "tblmonitor/gates5"; } /** Index: lams_monitoring/web/css/components-monitoring.css =================================================================== diff -u -rd0a966a0d817bebcc0ffbc9fa386e5ab5e8f3628 -rc9048d2a6d579af33cc6b3a36e716715be8e9b2b --- lams_monitoring/web/css/components-monitoring.css (.../components-monitoring.css) (revision d0a966a0d817bebcc0ffbc9fa386e5ab5e8f3628) +++ lams_monitoring/web/css/components-monitoring.css (.../components-monitoring.css) (revision c9048d2a6d579af33cc6b3a36e716715be8e9b2b) @@ -52,6 +52,10 @@ text-decoration: none; } +.monitoring-page-wrapper .card-header { + background-color: var(--bs-gray-200); +} + .monitoring-page-content { min-height: 100%; padding: 2rem 4.8rem 2rem 8rem; @@ -109,19 +113,21 @@ .component-sidebar .lesson-properties { padding-left: 2rem; text-align: left; + visibility: hidden; + height: 0; } +.component-sidebar .lesson-properties.active { + visibility: visible; + height: initial; +} + .component-sidebar .lesson-properties #lessonDetails { opacity: 0; - height: 0; - visibility: hidden; - transition: height 0s ease 0s; } .component-sidebar .lesson-properties.active #lessonDetails { opacity: 1; - height: initial; - visibility: visible; transition: opacity .3s ease .3s; } @@ -144,7 +150,6 @@ margin-left: 4rem; } - .monitoring-page-wrapper #sequence-tab-content { text-align: center; } @@ -1245,4 +1250,5 @@ .table-hover > tbody > tr:hover > * { --bs-table-accent-bg: var(--bs-gray-200); -} \ No newline at end of file +} + Index: lams_monitoring/web/tblmonitor/teams5.jsp =================================================================== diff -u --- lams_monitoring/web/tblmonitor/teams5.jsp (revision 0) +++ lams_monitoring/web/tblmonitor/teams5.jsp (revision c9048d2a6d579af33cc6b3a36e716715be8e9b2b) @@ -0,0 +1,710 @@ +<%@ include file="/taglibs.jsp"%> + + + + + +
+ + +
+
+
+

+ +

+
+
+ +
+ +
+
+
+
+
+
+
+
+ + + + +
+
+ + + +
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + +
+ + + + + - + + + + + +  "> + + +  "> + + +   + + + + + + + + - + + + ${groupDto.traCorrectAnswerCount} + + +  "> + + +  "> + + +   + + + + + + + + - + + + ${groupDto.correctAnswerCountPercentDelta}% + + + +  "> + + +  "> + + +   + + + + +
+ + + - + + + + + + + + + - + + + + + + + + + - + + + % + + +
+
+
+
+ + +
+
+ + + +
+ +
+ + + + - + + +
: ${groupDto.traCorrectAnswerCount}
+
+ + +
: + ${groupDto.traCorrectAnswerCount} +
+
+
+
+
+ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + +
+ + + + + + + fw-bold" + data-portrait="${userDto.portraitUuid}" data-fullname="${userDto.lastName}, ${userDto.firstName}"> + + + + + + + + + + + + - + + + + ${userDto.iraCorrectAnswerCount} + + + + + +  "> + + +  "> + + +   + + + + + + + + + - + + + ${userDto.correctAnswerCountPercentDelta}% + + + + +  "> + + +  "> + + +   + + + + + +
+ + + % +
+
+
+ + +
+
+ + + + + + + +
+
+ + + +
+
+
+ +
+
+
+
+ + + + + + + + + + + + + + +
+
\ No newline at end of file