summaryrefslogtreecommitdiffstats
path: root/application/views
diff options
context:
space:
mode:
authorSebastian Wagner2011-09-30 17:09:23 +0200
committerSebastian Wagner2011-09-30 17:09:23 +0200
commita19068db1ccc0982fa604edd32a7e5351e2e2388 (patch)
tree6c47536137b9d7104806ac7361310dc7d16e9107 /application/views
parentbugfix (diff)
downloadpoolctrl-a19068db1ccc0982fa604edd32a7e5351e2e2388.tar.gz
poolctrl-a19068db1ccc0982fa604edd32a7e5351e2e2388.tar.xz
poolctrl-a19068db1ccc0982fa604edd32a7e5351e2e2388.zip
some changes
Diffstat (limited to 'application/views')
-rwxr-xr-xapplication/views/scripts/event/index.phtml2
-rw-r--r--application/views/scripts/statistic/index.phtml34
2 files changed, 23 insertions, 13 deletions
diff --git a/application/views/scripts/event/index.phtml b/application/views/scripts/event/index.phtml
index aaf277c..f5beb9e 100755
--- a/application/views/scripts/event/index.phtml
+++ b/application/views/scripts/event/index.phtml
@@ -621,7 +621,7 @@ var dayClick = false;
autoOpen: false,
width: 600,
modal: true,
- title: 'Edit ' + event.title,
+ title: 'Edit ' + selectedEvent.title,
buttons: {
"Cancel": function() {
$(this).dialog("close");
diff --git a/application/views/scripts/statistic/index.phtml b/application/views/scripts/statistic/index.phtml
index 369a5a8..d6c9ca9 100644
--- a/application/views/scripts/statistic/index.phtml
+++ b/application/views/scripts/statistic/index.phtml
@@ -15,6 +15,7 @@ var lecture = 0;
var boot = 0;
var shutdown = 0;
var maintenance = 0;
+var foo;
//fetch all poolevents of the selected #poolselectbox value
function fetchPoolEvents() {
@@ -28,16 +29,29 @@ function setPoolIDtmp() {
function plot() {
poolID = $("#poolselectbox option:selected").val();
- $.get("/statistic/categorylist/poolID/" + poolID + "/category/" + 1, function(data) {lecture = data;});
- $.get("/statistic/categorylist/poolID/" + poolID + "/category/" + 3, function(data) {boot = data;});
- $.get("/statistic/categorylist/poolID/" + poolID + "/category/" + 4, function(data) {shutdown = data;});
- $.get("/statistic/categorylist/poolID/" + poolID + "/category/" + 2, function(data) {maintenance = data; refreshPlot();});
+
+ $.get("/statistic/categorylist/poolID/" + poolID + "/category/" + 2, function(data) {
+// lecture = data.lecture;
+// boot = data.boot;
+// shutdown = data.shutdown;
+// maintenance = data.maintenance;
+ refreshPlot(data);
+// $.ajax({
+// type: 'POST',
+// url: "/statistic/dump",
+// data: {data: [[[boot,'Boot'], [shutdown,'Shutdwon'], [maintenance,'Maintenance'], [lecture,'Lecture']]]},
+// success: function(){alert("done");},
+// dataType: "json"
+// });
+
+ }, "json");
}
-function refreshPlot() {
+function refreshPlot(data) {
$('#plot').empty();
- $.jqplot('plot', [
- [[boot,'Boot'], [shutdown,'Shutdwon'], [maintenance,'Maintenance'], [lecture,'Lecture']]], {
+// $.jqplot('plot', [
+// [[boot,'Boot'], [shutdown,'Shutdwon'], [maintenance,'Maintenance'], [lecture,'Lecture']]], {
+ $.jqplot('plot', data, {
seriesDefaults: {
renderer:$.jqplot.BarRenderer,
// Show point labels to the right ('e'ast) of each bar.
@@ -68,11 +82,7 @@ $(document).ready(function(){
poolIDtmp = $("#poolselectbox option:selected").val();
fetchPoolEvents();
});
-
- // For horizontal bar charts, x an y values must will be "flipped"
- // from their vertical bar counterpart.
});
</script>
-<div id="plot"
- style="height: 400px; width: 700px;"></div>
+<div id="plot" style="height: 400px; width: 700px;"></div>