Index: lams_central/web/css/free.ui.jqgrid.custom.css =================================================================== diff -u -r9883884dd081926917115f0d7a105ddd4c89d2c1 -r432fd5e118d63c8dab4bce32210b55f752cf0776 --- lams_central/web/css/free.ui.jqgrid.custom.css (.../free.ui.jqgrid.custom.css) (revision 9883884dd081926917115f0d7a105ddd4c89d2c1) +++ lams_central/web/css/free.ui.jqgrid.custom.css (.../free.ui.jqgrid.custom.css) (revision 432fd5e118d63c8dab4bce32210b55f752cf0776) @@ -76,8 +76,7 @@ border: 3px !important; } -.ui-subgrid.ui-row-ltr .subgrid-cell, .ui-jqgrid.ui-jqgrid-bootstrap .ui-jqgrid-bootstrap-corner-bottom - { +.ui-subgrid.ui-row-ltr .subgrid-cell, .ui-jqgrid.ui-jqgrid-bootstrap .ui-jqgrid-bootstrap-corner-bottom { background-color: #F6F5FA; } @@ -93,18 +92,30 @@ right: .6rem; } -.ui-jqgrid .ui-jqgrid-titlebar>.ui-jqgrid-titlebar-close>span.fa { +.ui-jqgrid .ui-jqgrid-titlebar>.ui-jqgrid-titlebar-close { + top: 40%; +} +.ui-jqgrid .ui-jqgrid-titlebar>.ui-jqgrid-titlebar-close>span.fa-solid { font-size: 1.3rem; } .ui-jqgrid.ui-jqgrid-bootstrap .ui-pg-table .btn.ui-pg-button { + /* color: #fff; background-color: #6c757d; border-color: #6c757d; margin-right: .4rem; margin-left: .4rem; + */ + font-size: 14px; + border: none; } +.ui-jqgrid.ui-jqgrid-bootstrap .ui-pg-table .btn.ui-pg-button.active, +.ui-jqgrid.ui-jqgrid-bootstrap .ui-pg-table .btn.ui-pg-button:hover { + border: none; +} + .ui-jqgrid.ui-jqgrid-bootstrap .ui-pg-table .btn.ui-pg-button.disabled { opacity: 0.65; } @@ -121,4 +132,29 @@ font-size: 1rem; padding: 0; text-align: center; +} + +.ui-jqgrid.ui-jqgrid-bootstrap .popover-link { + text-decoration: none; +} + +.ui-jqgrid.ui-jqgrid-bootstrap .sgbutton > .fa-solid { + font-weight: 1000; + color: #3C42E0; +} + +.ui-jqgrid.ui-jqgrid-bootstrap .ui-pg-button span { + margin: 5px 5px 0 0; +} + +.ui-jqgrid.ui-jqgrid-bootstrap .ui-pg-table .ui-pg-selbox { + padding-left: 5px; +} + +.ui-jqgrid.ui-jqgrid-bootstrap .ui-search-toolbar .ui-search-table td { + border-bottom: none; +} + +.ui-jqgrid.ui-jqgrid-bootstrap .ui-search-toolbar .ui-search-table .ui-search-clear > a { + font-size: 30px; } \ No newline at end of file Index: lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/controller/GradebookMonitoringController.java =================================================================== diff -u -r53b1f5c6dcfb9e0d74e56c9647da69f07b889a55 -r432fd5e118d63c8dab4bce32210b55f752cf0776 --- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/controller/GradebookMonitoringController.java (.../GradebookMonitoringController.java) (revision 53b1f5c6dcfb9e0d74e56c9647da69f07b889a55) +++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/controller/GradebookMonitoringController.java (.../GradebookMonitoringController.java) (revision 432fd5e118d63c8dab4bce32210b55f752cf0776) @@ -35,7 +35,6 @@ import java.util.Set; import javax.servlet.ServletOutputStream; -import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; @@ -132,7 +131,8 @@ request.setAttribute("weights", weights); } - return "gradebookMonitor"; + boolean isTab = WebUtil.readBooleanParam(request, "isTab", false); + return "gradebookMonitor" + (isTab ? "Content" : ""); } @RequestMapping("/courseMonitor") Index: lams_gradebook/web/gradebookMonitor.jsp =================================================================== diff -u -re3d7ba5c8a601fbe64f734ce198dc2a963d2115d -r432fd5e118d63c8dab4bce32210b55f752cf0776 --- lams_gradebook/web/gradebookMonitor.jsp (.../gradebookMonitor.jsp) (revision e3d7ba5c8a601fbe64f734ce198dc2a963d2115d) +++ lams_gradebook/web/gradebookMonitor.jsp (.../gradebookMonitor.jsp) (revision 432fd5e118d63c8dab4bce32210b55f752cf0776) @@ -1,8 +1,6 @@ <%@ include file="/common/taglibs.jsp"%> -${not empty weights} - <fmt:message key="gradebook.title.window.lessonMonitor"/> @@ -13,13 +11,6 @@ - - @@ -29,801 +20,11 @@ - - - -
-
- - -
-
- - - -
-
-
-
-
- -
-
- - -
-
- - - - - - -
-
-
- -
-
- -
-
-
- - + \ No newline at end of file Index: lams_gradebook/web/gradebookMonitorContent.jsp =================================================================== diff -u --- lams_gradebook/web/gradebookMonitorContent.jsp (revision 0) +++ lams_gradebook/web/gradebookMonitorContent.jsp (revision 432fd5e118d63c8dab4bce32210b55f752cf0776) @@ -0,0 +1,804 @@ + +<%@ include file="/common/taglibs.jsp"%> + +${not empty weights} + + + + + + +
+
+ + +
+
+ + + +
+
+
+
+
+ +
+
+ + +
+
+ + + + + + +
+
+
+ +
+
+ +
+
+
\ No newline at end of file Index: lams_monitoring/web/css/components-monitoring.css =================================================================== diff -u -r1a86d65e1c3e0253797a97185a97a93be476340e -r432fd5e118d63c8dab4bce32210b55f752cf0776 --- lams_monitoring/web/css/components-monitoring.css (.../components-monitoring.css) (revision 1a86d65e1c3e0253797a97185a97a93be476340e) +++ lams_monitoring/web/css/components-monitoring.css (.../components-monitoring.css) (revision 432fd5e118d63c8dab4bce32210b55f752cf0776) @@ -42,7 +42,6 @@ padding: 2rem 4.8rem 2rem 4.8rem; transition: all .3s ease; vertical-align: top; - text-align: center; } .monitoring-page-content.active { @@ -116,8 +115,10 @@ } +.monitoring-page-wrapper #sequence-tab-content { + text-align: center; +} - .monitoring-page-content .graph-grades { background-color: #fff; box-shadow: 0px 20px 20px #2E384D1A; Index: lams_monitoring/web/includes/javascript/monitorLesson.js =================================================================== diff -u -rfaa25016ecf0fd068694f3add01fc6532791a534 -r432fd5e118d63c8dab4bce32210b55f752cf0776 --- lams_monitoring/web/includes/javascript/monitorLesson.js (.../monitorLesson.js) (revision faa25016ecf0fd068694f3add01fc6532791a534) +++ lams_monitoring/web/includes/javascript/monitorLesson.js (.../monitorLesson.js) (revision 432fd5e118d63c8dab4bce32210b55f752cf0776) @@ -2439,7 +2439,7 @@ * Refreshes Gradebook Tab. */ function updateGradebookTab() { - $("#gradebookLoading").show(); + // $("#gradebookLoading").show(); $("#gradebookDiv").load(LAMS_URL + 'gradebook/gradebookMonitoring.do?lessonID=' + lessonId, function() { $("#gradebookLoading").hide(); }); Index: lams_monitoring/web/includes/javascript/monitorLesson5.js =================================================================== diff -u -r7dd66b6ceff2f45df32f0cca72018901f6c92133 -r432fd5e118d63c8dab4bce32210b55f752cf0776 --- lams_monitoring/web/includes/javascript/monitorLesson5.js (.../monitorLesson5.js) (revision 7dd66b6ceff2f45df32f0cca72018901f6c92133) +++ lams_monitoring/web/includes/javascript/monitorLesson5.js (.../monitorLesson5.js) (revision 432fd5e118d63c8dab4bce32210b55f752cf0776) @@ -33,6 +33,7 @@ $(document).ready(function(){ initCommonElements(); initSequenceTab(); + initGradebookTab(); loadTab('sequence'); }); @@ -2321,6 +2322,80 @@ }); } +//********** GRADEBOOK TAB FUNCTIONS ********** + +/** + * Inits Gradebook Tab. + */ +function initGradebookTab() { + /* + $.extend(true, $.jgrid.icons, { + fontAwesome6: $.extend(true, {}, $.jgrid.icons.fontAwesome, { + nav: { del: "fa-times" }, + actions: { del: "fa-times" }, + form: { del: "fa-times" } + }) + }); + */ + + $.extend(true, $.jgrid.icons.fontAwesome, { + common : "fa-solid" + }); +} + +/** + * Refreshes Gradebook Tab. + */ +function updateGradebookTab() { + $("#gradebookLoading").show(); + $("#gradebookDiv").load(LAMS_URL + 'gradebook/gradebookMonitoring.do?isTab=true&lessonID=' + lessonId, function() { + $("#gradebookLoading").hide(); + }); +} + +function fixPagerInCenter(pagername, numcolshift) { + $('#'+pagername+'_right').css('display','inline'); + if ( numcolshift > 0 ) { + var marginshift = - numcolshift * 12; + $('#'+pagername+'_center table').css('margin-left', marginshift+'px'); + } +} + +/* gradebook dialog windows on the ipad do not update the grid width properly using setGridWidth. Calling this is +-- setting the grid to parentWidth-1 and the width of the parent to parentWidth+1, leading to growing width window +-- that overflows the dialog window. Keep the main grids slightly smaller than their containers and all is well. +*/ + +function resizeJqgrid(jqgrids) { + jqgrids.each(function(index) { + var gridId = $(this).attr('id'); + var parent = jQuery('#gbox_' + gridId).parent(); + var gridParentWidth = parent.width(); + if ( parent.hasClass('grid-holder') ) { + gridParentWidth = gridParentWidth - 2; + } + jQuery('#' + gridId).setGridWidth(gridParentWidth, true); + }); +} + + +/* Based on jqgrid internal functions */ +function displayCellErrorMessage(table, iRow, iCol, errorLabel, errorMessage, buttonText ) { + setTimeout(function () { + try { + var frozenRows = table.grid.fbRows, + tr = table.rows[iRow]; + tr = frozenRows != null && frozenRows[0].cells.length > iCol ? frozenRows[tr.rowIndex] : tr; + var td = tr != null && tr.cells != null ? $(tr.cells[iCol]) : $(), + rect = td[0].getBoundingClientRect(); + $.jgrid.info_dialog.call(table, errorLabel, errorMessage, buttonText, {left:rect.left-200, top:rect.top}); + } catch (e) { + alert(errorMessage); + } + }, 50); +} + + //********** COMMON FUNCTIONS ********** function isAutoRefreshBlocked(){ @@ -2357,7 +2432,7 @@ } else if (tabName == 'learners'){ updateLearnersTab(); } else if (tabName == 'gradebook'){ - // updateGradebookTab(); + updateGradebookTab(); } } Index: lams_monitoring/web/monitor-gradebook-tab.jsp =================================================================== diff -u -r7dd66b6ceff2f45df32f0cca72018901f6c92133 -r432fd5e118d63c8dab4bce32210b55f752cf0776 --- lams_monitoring/web/monitor-gradebook-tab.jsp (.../monitor-gradebook-tab.jsp) (revision 7dd66b6ceff2f45df32f0cca72018901f6c92133) +++ lams_monitoring/web/monitor-gradebook-tab.jsp (.../monitor-gradebook-tab.jsp) (revision 432fd5e118d63c8dab4bce32210b55f752cf0776) @@ -1,3 +1,5 @@ <%@ include file="/taglibs.jsp"%> +
+ \ No newline at end of file Index: lams_monitoring/web/monitor5.jsp =================================================================== diff -u -r7dd66b6ceff2f45df32f0cca72018901f6c92133 -r432fd5e118d63c8dab4bce32210b55f752cf0776 --- lams_monitoring/web/monitor5.jsp (.../monitor5.jsp) (revision 7dd66b6ceff2f45df32f0cca72018901f6c92133) +++ lams_monitoring/web/monitor5.jsp (.../monitor5.jsp) (revision 432fd5e118d63c8dab4bce32210b55f752cf0776) @@ -12,6 +12,9 @@ + + + @@ -21,14 +24,20 @@ + + + + + + +