diff --git a/sai/modules/saimod_sys_log/js/saimod_sys_log.js b/sai/modules/saimod_sys_log/js/saimod_sys_log.js index f71b785..2c47256 100644 --- a/sai/modules/saimod_sys_log/js/saimod_sys_log.js +++ b/sai/modules/saimod_sys_log/js/saimod_sys_log.js @@ -60,7 +60,7 @@ function load_visualisation(){ data.addColumn('number',key); } }); - $.each(json, function(key, value){first = true; data.addRow($.map(value, function(v) { if(first){first=false;return [new Date(v)];}else{return [(v == null || parseFloat(v) <= 0) ? parseFloat(0.00001) : parseFloat(v)];}}));}); + $.each(json, function(key, value){first = true; data.addRow($.map(value, function(v) { if(first){first=false;return [new Date(v)];}else{return [(v == null || parseFloat(v) <= 0) ? parseFloat(0) : parseFloat(v)];}}));}); var options = {title: name, aggregationTarget: 'category', selectionMode: 'multiple', curveType: 'function', /*focusTarget: 'category',*/ chartArea:{left:100,top:40}, vAxis:{logScale: true}, interpolateNulls: false, width: "1200", height: "500"}; new google.visualization.LineChart(document.getElementById('vis')).draw(data, options); diff --git a/sai/modules/saimod_sys_todo/js/saimod_sys_todo.js b/sai/modules/saimod_sys_todo/js/saimod_sys_todo.js index 70e06fd..783bd90 100644 --- a/sai/modules/saimod_sys_todo/js/saimod_sys_todo.js +++ b/sai/modules/saimod_sys_todo/js/saimod_sys_todo.js @@ -1,3 +1,4 @@ +google.load("visualization", "1", {packages:["corechart"]}); function init_saimod_sys_todo() { $('#tabs_todo a').click(function (e) { $('#tabs_todo li').each(function(){ @@ -44,6 +45,11 @@ function init_saimod_sys_todo_stats() { $('#tabs_todo li').each(function(){ $(this).removeClass('active');}); $('#menu_stats').parent().addClass('active'); + $('#vis_filter_time').change(function(){ + load_visualisation();}) + $('#vis_filter_type').change(function(){ + load_visualisation();}) + load_visualisation(); } function init_saimod_sys_todo_todoopen(){ @@ -269,5 +275,33 @@ function init_tinymce(){ forced_root_block : "", force_br_newlines : true, force_p_newlines : false -}); + }); +} + +function load_visualisation(){ + $('img#loader').show(); + var name = $('#vis_filter_type').val();; + var filter = $('#vis_filter_time').val(); + $.getJSON('./sai.php?sai_mod=.SYSTEM.SAI.saimod_sys_todo&action=stats&name='+name+'&filter='+filter,function(json){ + if(!json || json.status != true || !json.result){ + $('img#loader').hide(); + return; + } + json = json.result; + $('img#loader').hide(); + var data = new google.visualization.DataTable(); + first = true; + $.each(json[0], function(key, value){ + if(first){ + data.addColumn('datetime',key); + first = false; + } else { + data.addColumn('number',key); + } + }); + $.each(json, function(key, value){first = true; data.addRow($.map(value, function(v) { if(first){first=false;return [new Date(v)];}else{return [(v == null || parseFloat(v) <= 0) ? parseFloat(0) : parseFloat(v)];}}));}); + + var options = {title: name, aggregationTarget: 'category', selectionMode: 'multiple', curveType: 'function', /*focusTarget: 'category',*/ chartArea:{left:100,top:40}, vAxis:{logScale: true}, interpolateNulls: false, width: "1200", height: "500"}; + new google.visualization.LineChart(document.getElementById('vis')).draw(data, options); + }); } diff --git a/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_STATS_ASSIGNED.php b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_STATS_ASSIGNED.php new file mode 100644 index 0000000..8dd62f6 --- /dev/null +++ b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_STATS_ASSIGNED.php @@ -0,0 +1,16 @@ +id; diff --git a/sai/modules/saimod_sys_todo/tpl/todo_stats.tpl b/sai/modules/saimod_sys_todo/tpl/todo_stats.tpl index 177e4c8..ae81190 100644 --- a/sai/modules/saimod_sys_todo/tpl/todo_stats.tpl +++ b/sai/modules/saimod_sys_todo/tpl/todo_stats.tpl @@ -22,4 +22,31 @@