Index: lams_central/.gitignore =================================================================== diff -u -ra0ba65df31b33eec6f8aa2de0fcebdec6f54da2b -r10afbb9a2d6f910c0f9131e82ebf2d3cb6ee359f --- lams_central/.gitignore (.../.gitignore) (revision a0ba65df31b33eec6f8aa2de0fcebdec6f54da2b) +++ lams_central/.gitignore (.../.gitignore) (revision 10afbb9a2d6f910c0f9131e82ebf2d3cb6ee359f) @@ -3,6 +3,7 @@ /.sass-cache/ /web/css/addLesson.css /web/css/defaultHTML*.css +/web/css/jquery.jqGrid.confidence-level-formattter.css /web/css/orgGroup.css /web/css/orgGrouping.css /web/css/purple*.css Index: lams_central/web/css/jqGrid.confidenceLevelFormattter.css =================================================================== diff -u --- lams_central/web/css/jqGrid.confidenceLevelFormattter.css (revision 0) +++ lams_central/web/css/jqGrid.confidenceLevelFormattter.css (revision 10afbb9a2d6f910c0f9131e82ebf2d3cb6ee359f) @@ -0,0 +1 @@ +.vertical-align{vertical-align:middle !important}.filled-bar{left:0;top:0;height:22px;position:relative;padding:0;margin-right:-2px;margin-left:-2px;border:0}.gradient{position:absolute;left:0;top:0;right:0;height:22px;float:left}.gradient-green{background:LimeGreen;background:linear-gradient(to right,LimeGreen,LightGreen)}.gradient-orange{background:orange;background:linear-gradient(to right,orange,#ffe1b4)}.gradient-red{background:OrangeRed;background:linear-gradient(to right,OrangeRed,#f18f8f)}.filled-bar-text{position:relative;margin-top:4px;margin-right:4px;text-align:right;float:right} \ No newline at end of file Index: lams_central/web/css/jquery.jqGrid.confidence-level-formattter.scss =================================================================== diff -u --- lams_central/web/css/jquery.jqGrid.confidence-level-formattter.scss (revision 0) +++ lams_central/web/css/jquery.jqGrid.confidence-level-formattter.scss (revision 10afbb9a2d6f910c0f9131e82ebf2d3cb6ee359f) @@ -0,0 +1,41 @@ +.vertical-align { + vertical-align: middle !important; +} + +.filled-bar { + left: 0px; + top:0px; + height:22px; + position:relative; + padding:0px 0px 0px 0px; + margin-right:-2px; + margin-left:-2px; + border:0; +} +.gradient { + position: absolute; + left: 0px; + top: 0px; + right: 0px; + height: 22px; + float: left; +} +.gradient-green { + background: LimeGreen; + background: linear-gradient(to right, LimeGreen, LightGreen); +} +.gradient-orange { + background: orange; + background: linear-gradient(to right, orange, #ffe1b4); +} +.gradient-red { + background: OrangeRed; + background: linear-gradient(to right, OrangeRed, #f18f8f); +} +.filled-bar-text { + position: relative; + margin-top: 4px; + margin-right: 4px; + text-align: right; + float: right; +} \ No newline at end of file Fisheye: Tag 10afbb9a2d6f910c0f9131e82ebf2d3cb6ee359f refers to a dead (removed) revision in file `lams_central/web/includes/javascript/jqGrid.confidenceLevelFormattter.js'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_central/web/includes/javascript/jquery.jqGrid.confidence-level-formattter.js =================================================================== diff -u --- lams_central/web/includes/javascript/jquery.jqGrid.confidence-level-formattter.js (revision 0) +++ lams_central/web/includes/javascript/jquery.jqGrid.confidence-level-formattter.js (revision 10afbb9a2d6f910c0f9131e82ebf2d3cb6ee359f) @@ -0,0 +1,34 @@ +//confidence level column formatter function for jqGrid +function gradientNumberFormatter (cellvalue) { + var MIN_DATA_VALUE = 0, + MAX_DATA_VALUE = 10; + + var dataAsNumber = parseInt(cellvalue, 10); + if (dataAsNumber == -1) { + return ""; + } + if (dataAsNumber > MAX_DATA_VALUE) { + dataAsNumber = MAX_DATA_VALUE; + } + if (dataAsNumber < MIN_DATA_VALUE) { + dataAsNumber = MIN_DATA_VALUE; + } + var procents = (dataAsNumber - MIN_DATA_VALUE) * 100 / (MAX_DATA_VALUE - MIN_DATA_VALUE); + var gradientClass; + switch (true) { + case (procents < 40): + gradientClass = "gradient-red"; + break; + case (procents >= 40 && procents <= 60): + gradientClass = "gradient-orange"; + break; + default: + gradientClass = "gradient-green"; + break; + } + + return '
' + + '
' + + '
' + (dataAsNumber * 10) + '%
' + + '
'; +}; \ No newline at end of file Index: lams_tool_assessment/web/includes/css/monitoring.scss =================================================================== diff -u --- lams_tool_assessment/web/includes/css/monitoring.scss (revision 0) +++ lams_tool_assessment/web/includes/css/monitoring.scss (revision 10afbb9a2d6f910c0f9131e82ebf2d3cb6ee359f) @@ -0,0 +1,5 @@ +.ui-jqgrid tr.jqgrow td { + white-space: normal !important; + height:auto; + vertical-align:text-top; +} \ No newline at end of file Index: lams_tool_assessment/web/pages/monitoring/monitoring.jsp =================================================================== diff -u -rfeb6062a5128a445b1fa0095b8c9d6cf232af90f -r10afbb9a2d6f910c0f9131e82ebf2d3cb6ee359f --- lams_tool_assessment/web/pages/monitoring/monitoring.jsp (.../monitoring.jsp) (revision feb6062a5128a445b1fa0095b8c9d6cf232af90f) +++ lams_tool_assessment/web/pages/monitoring/monitoring.jsp (.../monitoring.jsp) (revision 10afbb9a2d6f910c0f9131e82ebf2d3cb6ee359f) @@ -7,11 +7,12 @@ <%@ include file="/common/tabbedheader.jsp" %> - - + + - + + @@ -40,7 +41,7 @@ - + - + - + - +