Index: lams_monitoring/web/css/components-monitoring.css =================================================================== diff -u -r7344842c444056d9b34ef71feb165946dd4f64ae -rdec809c7a193cb1e2ba92e718ba5daa48d4c2ad5 --- lams_monitoring/web/css/components-monitoring.css (.../components-monitoring.css) (revision 7344842c444056d9b34ef71feb165946dd4f64ae) +++ lams_monitoring/web/css/components-monitoring.css (.../components-monitoring.css) (revision dec809c7a193cb1e2ba92e718ba5daa48d4c2ad5) @@ -849,7 +849,13 @@ overflow: auto; } +#chartDiv { + width: 200px; + height: 200px; + padding: 0; +} + /********** CANVAS STYLES **********/ #canvas-container div#sequenceCanvas { width: 100%; Index: lams_monitoring/web/includes/javascript/monitorLesson5.js =================================================================== diff -u -r7344842c444056d9b34ef71feb165946dd4f64ae -rdec809c7a193cb1e2ba92e718ba5daa48d4c2ad5 --- lams_monitoring/web/includes/javascript/monitorLesson5.js (.../monitorLesson5.js) (revision 7344842c444056d9b34ef71feb165946dd4f64ae) +++ lams_monitoring/web/includes/javascript/monitorLesson5.js (.../monitorLesson5.js) (revision dec809c7a193cb1e2ba92e718ba5daa48d4c2ad5) @@ -62,11 +62,10 @@ } }); - /* - drawChart('pie', 'chartDiv', - LAMS_URL + 'monitoring/monitoring/getLessonChartData.do?lessonID=' + lessonId, - true); - */ + + drawChart('pie', 'chartDiv', + LAMS_URL + 'monitoring/monitoring/getLessonChartData.do?lessonID=' + lessonId, + true); } Index: lams_monitoring/web/monitor5.jsp =================================================================== diff -u -r7344842c444056d9b34ef71feb165946dd4f64ae -rdec809c7a193cb1e2ba92e718ba5daa48d4c2ad5 --- lams_monitoring/web/monitor5.jsp (.../monitor5.jsp) (revision 7344842c444056d9b34ef71feb165946dd4f64ae) +++ lams_monitoring/web/monitor5.jsp (.../monitor5.jsp) (revision dec809c7a193cb1e2ba92e718ba5daa48d4c2ad5) @@ -6,16 +6,19 @@ LAMS Monitor + - + + - + + @@ -205,38 +208,6 @@ $('.component-sidebar, .monitoring-page-content').toggleClass('active'); }); - var ctx = document.getElementById('myChart').getContext('2d'); - var myChart = new Chart(ctx, { - type : 'doughnut', - borderWidth : 0, - data : { - elements : { - arc : { - borderWidth : 0, - fontSize : 0, - } - }, - datasets : [ { - data : [ 10, 70, 20 ], - backgroundColor : [ 'rgba(5, 204, 214, 1)', - 'rgba(255, 195, 55, 1)', 'rgba(253, 60, 165, 1)', ], - label : 'Dataset 1', - borderWidth : 0, - } ], - labels : [ 'Not started', 'In process', 'Completed' ] - }, - options : { - responsive : true, - legend : { - display : false, - }, - animation : { - animateScale : true, - animateRotate : true - } - } - }); - initSequenceTab(); refreshMonitor(); }); @@ -290,7 +261,11 @@
-
+
+
+
+ +
+ +
#