summaryrefslogtreecommitdiffstats
path: root/application
diff options
context:
space:
mode:
authorBjörn Geiger2011-11-14 17:51:43 +0100
committerBjörn Geiger2011-11-14 17:51:43 +0100
commitf8939cfaa12a2a1ad3f207ceb67f850ea61f7f02 (patch)
tree15e94445d4b698c1c72a5199b602ffea2e0960c7 /application
parentEventController Cleaning: API in eigene Klasse ausgelagert (diff)
parentminor (diff)
downloadpoolctrl-f8939cfaa12a2a1ad3f207ceb67f850ea61f7f02.tar.gz
poolctrl-f8939cfaa12a2a1ad3f207ceb67f850ea61f7f02.tar.xz
poolctrl-f8939cfaa12a2a1ad3f207ceb67f850ea61f7f02.zip
Merge branch 'master' of git.openslx.org:lsfks/projekte/poolctrl
Diffstat (limited to 'application')
-rwxr-xr-xapplication/controllers/StatisticsController.php1
-rwxr-xr-xapplication/forms/EventEdit.php4
-rwxr-xr-xapplication/layouts/default.phtml4
-rwxr-xr-xapplication/models/EventreportMapper.php39
-rwxr-xr-xapplication/views/scripts/event/index.phtml165
-rwxr-xr-xapplication/views/scripts/statistics/category.phtml3
-rwxr-xr-xapplication/views/scripts/statistics/running.phtml14
-rwxr-xr-xapplication/views/scripts/statistics/success.phtml38
-rwxr-xr-xapplication/views/scripts/statistics/type.phtml14
9 files changed, 32 insertions, 250 deletions
diff --git a/application/controllers/StatisticsController.php b/application/controllers/StatisticsController.php
index 5bf798e..d840023 100755
--- a/application/controllers/StatisticsController.php
+++ b/application/controllers/StatisticsController.php
@@ -106,7 +106,6 @@ class StatisticsController extends Zend_Controller_Action
$ret['dataBar'] = $this->eventreportMapper->getSuccessBarCount($poolID);
$ret['dataPieS'] = $this->eventreportMapper->getSuccessPieCount($poolID);
- $ret['dataPieT'] = $this->eventreportMapper->getSuccessTypePieCount($poolID);
echo json_encode($ret);
diff --git a/application/forms/EventEdit.php b/application/forms/EventEdit.php
index c5809e0..d3cd830 100755
--- a/application/forms/EventEdit.php
+++ b/application/forms/EventEdit.php
@@ -132,18 +132,20 @@ class Application_Form_EventEdit extends Zend_Form
));
$this->getElement('title')->addPrefixPath('Poolctrl_Validate', 'Poolctrl/Validate/', 'validate');
- if(isset($this->params['force'])) {
+ if($this->params['force'] == 1) {
$this->addElement('checkbox', 'force', array(
'required' => false,
'label' => 'Force event:',
'value' => array(0,1),
'checked' => 'checked',
+ 'disable' => true,
));
} else {
$this->addElement('checkbox', 'force', array(
'required' => false,
'label' => 'Force event:',
'value' => array(0,1),
+ 'disable' => true,
));
}
diff --git a/application/layouts/default.phtml b/application/layouts/default.phtml
index 3921210..f0b2e20 100755
--- a/application/layouts/default.phtml
+++ b/application/layouts/default.phtml
@@ -31,10 +31,6 @@ echo $this->headScript()."\n";
src='/media/js/jqplot.categoryAxisRenderer.min.js'></script>
<script type='text/javascript' src='/media/js/jqplot.barRenderer.min.js'></script>
<script type="text/javascript" src='/media/js/jqplot.pieRenderer.min.js'></script>
-<script type="text/javascript"
- src='/media/js/jqplot.donutRenderer.min.js'></script>
-<script type="text/javascript" src='/media/js/jqplot.highlighter.min.js'></script>
-<script type="text/javascript" src='/media/js/jqplot.cursor.min.js'></script>
</head>
<body>
diff --git a/application/models/EventreportMapper.php b/application/models/EventreportMapper.php
index 11dacbc..da37e66 100755
--- a/application/models/EventreportMapper.php
+++ b/application/models/EventreportMapper.php
@@ -235,43 +235,6 @@ class Application_Model_EventreportMapper
return $return;
}
-
- public function getSuccessTypePieCount($poolID) {
-
- $db = Zend_Db_Table::getDefaultAdapter();
- if($poolID != 'all'){
- $select = $this->getDbTable()->select()
- ->setIntegrityCheck(false)
- ->from(array('pcr' => 'poolctrl_eventreport'),
- array('errortype' => 'pcr.errors', 'count' => 'COUNT(*)'))
- ->join(array('pce' => 'poolctrl_event'),
- 'pce.eventID = pcr.eventID',
- array())
- ->where('pce.pbs_poolID = ?', $poolID)
- ->group('pcr.errors')
- ->order('pce.category ASC');}
- else {
- $select = $this->getDbTable()->select()
- ->setIntegrityCheck(false)
- ->from(array('pcr' => 'poolctrl_eventreport'),
- array('errortype' => 'pcr.errors', 'count' => 'COUNT(*)'))
- ->join(array('pce' => 'poolctrl_event'),
- 'pce.eventID = pcr.eventID',
- array())
- ->group('pcr.errors')
- ->order('pce.category ASC');
- }
-
- $stmt = $db->query($select);
- $result = $stmt->fetchAll(PDO::FETCH_NUM);
- $ret = null;
-
- foreach ($result as $r) {
- $ret[] = array($r[0], (int)$r[1]);
- }
-
- return array($ret);
- }
-
+
}
diff --git a/application/views/scripts/event/index.phtml b/application/views/scripts/event/index.phtml
index 4061092..f79dd6c 100755
--- a/application/views/scripts/event/index.phtml
+++ b/application/views/scripts/event/index.phtml
@@ -1,4 +1,4 @@
-<h1>Events</h1>
+<h1>Pool Control</h1>
<div id='calendar'
style='margin: 3em 0; font-size: 13px'></div>
@@ -7,7 +7,6 @@
$(document).ready(function() {iniCalendar();});
-
/*
* calendar variables
*/
@@ -17,24 +16,13 @@ var eventColor = {ev:null, color:null};
// keydown
var selectedEvent = null;
-var cpEvent = null;
-var selectedDate = null;
// dblclick
var clickTmp = true;
-var evClick = false;
-
-// overlapping
-var isDroppable;
-var overlappStart;
-var overlappEnd;
// poolSelectVal
var poolIDtmp;
-// dayClick
-var dayClick = false;
-
//change border color of an event
function eventSelected(event) {
if (eventColor.ev != null){
@@ -48,13 +36,13 @@ function eventSelected(event) {
eventColor.color = event.borderColor;
event.borderColor = 'black';
$('#calendar').fullCalendar("rerenderEvents");
+ // show report button
if($.get("/event/checkright/rightShortcut/er")){
$('#eventReportButton').show();
-
} else {
$('#eventReportButton').hide();
-
}
+ // show edit button
if($.get("/event/checkright/rightShortcut/ee")) {
$('#editEvent').show();
} else {
@@ -69,14 +57,6 @@ function eventSelected(event) {
} else {
self.location="/event/add/";}
}
-
- function showCalendar() {
- $("#calendar").show();
- }
-
- function hideCalendar() {
- $("#calendar").hide();
- }
function setOpacity(type, value) {
var events = $('#calendar').fullCalendar( 'clientEvents' , function(event) {
@@ -109,9 +89,6 @@ function eventSelected(event) {
/*
* KEYDOWN FUNCTION
* delete selected event by key del(8) OR entf(46)
- * copy selected event by key ctrl(17) AND c(67)
- * cut selected event by key ctrl(17) AND x(88)
- * paste selected event by key ctrl(17) AND v(86)
*/
$(document).keydown(function (e) {
@@ -139,7 +116,6 @@ function eventSelected(event) {
},
open: function () {
$(".ui-dialog-titlebar-close").hide();
- //$(this).parents(".ui-dialog:first").find(".ui-dialog-titlebar").addClass("ui-state-error");
}
});
});
@@ -170,7 +146,6 @@ function eventSelected(event) {
},
open: function () {
$(".ui-dialog-titlebar-close").hide();
- //$(this).parents(".ui-dialog:first").find(".ui-dialog-titlebar").addClass("ui-state-error");
}
});
});
@@ -206,15 +181,6 @@ function eventSelected(event) {
defaultEventMinutes: 10,
loading: function(bool) { if (bool) $('#progress').show(); else $('#progress').hide(); },
-
-
- eventMouseover: function( event, jsEvent, view ) {
- evClick = true;
- },
-
- eventMouseout: function( event, jsEvent, view ) {
- evClick = false;
- },
eventClick: function( event, jsEvent, view ) {
@@ -223,8 +189,7 @@ function eventSelected(event) {
setTimeout(function() {clickTmp = true;} , 300);
$(this).qtip("destroy");
eventSelected(event);
- // non immediate event case
- } else if (event.immediate == 0 && $.get("/event/checkright/rightShortcut/ed")) {
+ } else if ($.get("/event/checkright/rightShortcut/ed")) {
// this is the dblclick
$(this).qtip("destroy");
if(event.repeat == 1) {
@@ -249,7 +214,6 @@ function eventSelected(event) {
},
open: function () {
$(".ui-dialog-titlebar-close").hide();
- //$(this).parents(".ui-dialog:first").find(".ui-dialog-titlebar").addClass("ui-state-error");
}
});
});
@@ -257,7 +221,7 @@ function eventSelected(event) {
} else self.location = "/event/edit/eventID/" + event.id + "/wdh/" + 0 + "/poolID/" + $("#poolselectbox option:selected").val();
} else if (!$.get("/event/checkright/rightShortcut/ee")) {
$( "#errorRightsDialog" ).dialog('open');
- } else $( "#errorEditImmediate" ).dialog('open');
+ }
},
select: function( startDate, endDate, allDay, jsEvent, view ) {
@@ -295,7 +259,7 @@ function eventSelected(event) {
if($("#poolselectbox option:selected").val() == 'defaultPool' || $("#poolselectbox option:selected").val() == 'noPool') {
$( "#noPoolSelectedDialog" ).dialog('open');
- } else if (right && evClick == false) {
+ } else if (right) {
$(function() {
$( "#eventAddDialog" ).dialog({
autoOpen: false,
@@ -327,16 +291,14 @@ function eventSelected(event) {
},
open: function () {
$(".ui-dialog-titlebar-close").hide();
- //$(this).parents(".ui-dialog:first").find(".ui-dialog-titlebar").addClass("ui-state-error");
}
});
});
$( "#eventAddDialog" ).dialog('open');
- } else if (!right && evClick == false) {
+ } else if (!right) {
$('#calendar').fullCalendar( 'unselect' );
$( "#errorRightsDialog" ).dialog('open');
} else
- evClick = true;
$('#calendar').fullCalendar( 'unselect' );
});
});
@@ -426,7 +388,6 @@ function eventSelected(event) {
},
open: function () {
$(".ui-dialog-titlebar-close").hide();
- //$(this).parents(".ui-dialog:first").find(".ui-dialog-titlebar").addClass("ui-state-error");
}
});
});
@@ -469,7 +430,6 @@ function eventSelected(event) {
},
open: function () {
$(".ui-dialog-titlebar-close").hide();
- //$(this).parents(".ui-dialog:first").find(".ui-dialog-titlebar").addClass("ui-state-error");
}
});
});
@@ -495,10 +455,8 @@ function eventSelected(event) {
var cfcell = document.getElementById("cfevents");
// get conflicts
var returndata = jQuery.parseJSON(data);
-
// get past
var past = returndata.past;
-
// get conflict free events with repeat
var cfevents = returndata.cfevents;
var cfeventsString = $.toJSON(cfevents);
@@ -548,7 +506,7 @@ function eventSelected(event) {
});
});
- if((event.repeat == 0 || event.repeat == 2) && event.immediate == 0 && $.get("/event/checkright/rightShortcut/ee")) {
+ if((event.repeat == 0 || event.repeat == 2) && $.get("/event/checkright/rightShortcut/ee")) {
$(function() {
$( "#defaultDialog" ).dialog({
autoOpen: false,
@@ -578,12 +536,11 @@ function eventSelected(event) {
},
open: function () {
$(".ui-dialog-titlebar-close").hide();
- //$(this).parents(".ui-dialog:first").find(".ui-dialog-titlebar").addClass("ui-state-error");
}
});
});
$( "#defaultDialog" ).dialog('open');
- } else if (event.repeat == 1 && event.immediate == 0 && $.get("/event/checkright/rightShortcut/ee")) {
+ } else if (event.repeat == 1 && $.get("/event/checkright/rightShortcut/ee")) {
$(function() {
$( "#eventMoveWdhDialog" ).dialog({
autoOpen: false,
@@ -633,31 +590,10 @@ function eventSelected(event) {
},
open: function () {
$(".ui-dialog-titlebar-close").hide();
- //$(this).parents(".ui-dialog:first").find(".ui-dialog-titlebar").addClass("ui-state-error");
}
});
});
$( "#eventMoveWdhDialog" ).dialog('open');
- } else if (event.immediate == 1 && $.get("/event/checkright/rightShortcut/ee")){
- $(function() {
- $( "#eventImmediateButtonDialog" ).dialog({
- autoOpen: false,
- width: 600,
- modal: true,
- title: 'Move ' + event.title,
- buttons: {
- "OK": function() {
- $(this).dialog("close");
- revertFunc();
- }
- },
- open: function () {
- $(".ui-dialog-titlebar-close").hide();
- $(this).parents(".ui-dialog:first").find(".ui-dialog-titlebar").addClass("ui-state-error");
- }
- });
- });
- $("#eventImmediateButtonDialog").dialog('open');
} else {
revertFunc();
$(this).qtip("destroy");
@@ -699,18 +635,13 @@ function eventSelected(event) {
element.removeClass('fc-event-vert'); // css class
}
- // disable resizing if the event is a boot- or shutdown-event
+ // disable resizing if the event is a boot- or shutdown-event
if(event.category == 'Boot' || event.category == 'Shutdown') {
element.resizable(false); // calendar resizing
element.resizable("destroy"); // jqeury resizing
element.removeClass('fc-event-vert'); // css class
}
- // disable editing of immediate events
- if(event.immediate == 1) {
- element.ediable = false;
- }
-
element.qtip({
content:
'Title: ' + event.title + '<br/>' +
@@ -720,10 +651,7 @@ function eventSelected(event) {
show: 'mouseover',
hide: 'mouseout'
});
-
- if (view.name == 'agendaWeek') {
-
- }
+
if (view.name == 'agendaDay') {
if(event.participants) {
element.find('.fc-event-title').append(
@@ -813,7 +741,7 @@ function eventSelected(event) {
$("#editEvent").click(function(){
if(selectedEvent != null) {
- if(selectedEvent.repeat == 1 && selectedEvent.immediate == 0) {
+ if(selectedEvent.repeat == 1) {
$(function() {
$( "#eventEditWdhDialog" ).dialog({
autoOpen: false,
@@ -835,40 +763,20 @@ function eventSelected(event) {
},
open: function () {
$(".ui-dialog-titlebar-close").hide();
- //$(this).parents(".ui-dialog:first").find(".ui-dialog-titlebar").addClass("ui-state-error");
}
});
});
$( "#eventEditWdhDialog" ).dialog('open');
- } else if ( ( selectedEvent.repeat == 0 || selectedEvent.repeat == 2 ) && selectedEvent.immediate == 0) self.location = "/event/edit/eventID/" + selectedEvent.id + "/wdh/" + 0 + "/poolID/" + $("#poolselectbox option:selected").val();
+ } else if ( selectedEvent.repeat == 0 || selectedEvent.repeat == 2 ) self.location = "/event/edit/eventID/" + selectedEvent.id + "/wdh/" + 0 + "/poolID/" + $("#poolselectbox option:selected").val();
else if (!$.get("/event/checkright/rightShortcut/ee")) {
$( "#errorRightsDialog" ).dialog('open');
- } else $( "#errorEditImmediate" ).dialog('open');
+ }
}
});
$("#eventReportButton").click(function(){
if(selectedEvent != null) {
self.location="/event/showreports/eventID/" + selectedEvent.id;
- } else {
- $(function() {
- $( "#eventReportButtonDialog" ).dialog({
- autoOpen: false,
- width: 600,
- modal: true,
- title: "ERROR",
- buttons: {
- "OK": function() {
- $(this).dialog("close");
- }
- },
- open: function () {
- $(".ui-dialog-titlebar-close").hide();
- $(this).parents(".ui-dialog:first").find(".ui-dialog-titlebar").addClass("ui-state-error");
- }
- });
- });
- $( "#eventReportButtonDialog" ).dialog('open');
}
});
@@ -922,25 +830,6 @@ function eventSelected(event) {
}
});
});
-
-// errorEditImmediate Dialog
- $(function() {
- $( "#errorEditImmediate" ).dialog({
- autoOpen: false,
- width: 600,
- modal: true,
- title: "ERROR",
- buttons: {
- "OK": function() {
- $(this).dialog("close");
- }
- },
- open: function () {
- $(".ui-dialog-titlebar-close").hide();
- $(this).parents(".ui-dialog:first").find(".ui-dialog-titlebar").addClass("ui-state-error");
- }
- });
- });
// errorTime Dialog
$(function() {
@@ -1022,27 +911,6 @@ selected one?</p>
<p>Are you sure to add this Event?</p>
</div>
-<!-- eventReportButton -->
-<div id="eventReportButtonDialog" style="display: none">
-<p>Please choose an Event first!</p>
-</div>
-
-<!-- eventImmediateButton -->
-<div id="eventImmediateButtonDialog" style="display: none">
-<p>You can´t change time of an Immediate-Event!</p>
-<p>Please generate a new Event</p>
-</div>
-
-<!-- eventResize boot -->
-<div id="eventResizeBootDialog" style="display: none">
-<p>You can´t change the EndTime of a Boot Event!</p>
-</div>
-
-<!-- eventResize shutdown -->
-<div id="eventResizeShutdownDialog" style="display: none">
-<p>You can´t change the EndTime of a Shutdown Event!</p>
-</div>
-
<!-- eventNotDroppableDialog -->
<div id="eventNotDroppableDialog" style="display: none">
<p>You can´t drop this Event here! There exists at least one collision
@@ -1071,11 +939,6 @@ between two events.</p>
<p>Please choose another position and try again.</p>
</div>
-<!-- errorEditImmediate -->
-<div id="errorEditImmediate" style="display: none">
-<p>You can´t edit an Immediate-Event!</p>
-</div>
-
<!-- errorRights -->
<div id="errorRightsDialog" style="display: none">
<p>Permission denied!</p>
diff --git a/application/views/scripts/statistics/category.phtml b/application/views/scripts/statistics/category.phtml
index 5d62170..8319d20 100755
--- a/application/views/scripts/statistics/category.phtml
+++ b/application/views/scripts/statistics/category.phtml
@@ -41,12 +41,10 @@ function refreshPlot(dataBar, dataPie, color) {
$('#plotBar').empty();
$.jqplot('plotBar', dataBar, {
seriesDefaults: {
- //renderer: $.jqplot.PieRenderer,
renderer:$.jqplot.BarRenderer,
pointLabels: { show: true, location: 'e', edgeTolerance: -15 },
shadowAngle: 135,
rendererOptions: {
- //showDataLabels: true,
barDirection: 'horizontal',
varyBarColor : true
}
@@ -73,7 +71,6 @@ function refreshPlot(dataBar, dataPie, color) {
}
},
seriesColors: color
- //legend: { show:true, location: 'e' }
});
}
diff --git a/application/views/scripts/statistics/running.phtml b/application/views/scripts/statistics/running.phtml
index 44a07aa..7bf27b8 100755
--- a/application/views/scripts/statistics/running.phtml
+++ b/application/views/scripts/statistics/running.phtml
@@ -33,20 +33,18 @@ function plot() {
} else if (poolID == 'default') {
$('#plotBar').empty();
$('#plotPie').empty();
- } else refreshPlot(data.dataBar, data.dataPie, data.color);
+ } else refreshPlot(data.dataBar, data.dataPie);
}, "json");
}
-function refreshPlot(dataBar, dataPie, color) {
+function refreshPlot(dataBar, dataPie) {
$('#plotBar').empty();
$.jqplot('plotBar', dataBar, {
seriesDefaults: {
- //renderer: $.jqplot.PieRenderer,
renderer:$.jqplot.BarRenderer,
pointLabels: { show: true, location: 'e', edgeTolerance: -15 },
shadowAngle: 135,
rendererOptions: {
- //showDataLabels: true,
barDirection: 'horizontal',
varyBarColor : true
}
@@ -55,9 +53,7 @@ function refreshPlot(dataBar, dataPie, color) {
yaxis: {
renderer: $.jqplot.CategoryAxisRenderer
}
- },
- seriesColors: color,
- highlighter: { show: false }
+ }
});
$('#plotPie').empty();
$.jqplot('plotPie', dataPie,
@@ -72,9 +68,7 @@ function refreshPlot(dataBar, dataPie, color) {
lineLabels: true,
varyBarColor : true
}
- },
- seriesColors: color
- //legend: { show:true, location: 'e' }
+ }
});
}
diff --git a/application/views/scripts/statistics/success.phtml b/application/views/scripts/statistics/success.phtml
index 8911033..e00a01d 100755
--- a/application/views/scripts/statistics/success.phtml
+++ b/application/views/scripts/statistics/success.phtml
@@ -29,16 +29,14 @@ function plot() {
$( "#noEventsDialog" ).dialog('open');
$('#plotBar').empty();
$('#plotPieS').empty();
- $('#plotPieT').empty();
} else if (poolID == 'default') {
$('#plotBar').empty();
$('#plotPieS').empty();
- $('#plotPieT').empty();
- } else refreshPlot(data.dataBar, data.dataPieS, data.dataPieT, data.color);
+ } else refreshPlot(data.dataBar, data.dataPieS, data.dataPieT);
}, "json");
}
-function refreshPlot(dataBar, dataPieS, dataPieT, color) {
+function refreshPlot(dataBar, dataPieS, dataPieT) {
$('#plotBar').empty();
$.jqplot('plotBar', dataBar, {
seriesDefaults: {
@@ -47,7 +45,6 @@ function refreshPlot(dataBar, dataPieS, dataPieT, color) {
pointLabels: { show: true, location: 'e', edgeTolerance: -15 },
shadowAngle: 135,
rendererOptions: {
- //showDataLabels: true,
barDirection: 'horizontal',
varyBarColor : true
}
@@ -56,9 +53,7 @@ function refreshPlot(dataBar, dataPieS, dataPieT, color) {
yaxis: {
renderer: $.jqplot.CategoryAxisRenderer
}
- },
- seriesColors: color,
- highlighter: { show: false }
+ }
});
$('#plotPieS').empty();
$.jqplot('plotPieS', dataPieS,
@@ -72,28 +67,8 @@ function refreshPlot(dataBar, dataPieS, dataPieT, color) {
showDataLabels: true,
varyBarColor : true
}
- },
- seriesColors: color
- //legend: { show:true, location: 'e' }
+ }
});
- /*$('#plotPieT').empty();
- $.jqplot('plotPieT', dataPieT,
- {
- title: 'Chart with ErrorType Labels',
- seriesDefaults: {
- // Make this a pie chart.
- renderer: jQuery.jqplot.PieRenderer,
- rendererOptions: {
- // Put data labels on the pie slices.
- // By default, labels show the percentage of the slice.
- showDataLabels: true,
- varyBarColor: true,
- dataLabels: 'percent'
- }
- },
- seriesColors: color
- //legend: { show:true, location: 'ne' }
- });*/
}
$(document).ready(function(){
@@ -127,9 +102,8 @@ $(function() {
</script>
<div>
-<div id="plotBar" class="spalte" style="height: 300px; width: 250px;"></div>
-<div id="plotPieS" class="spalte" style="height: 300px; width: 250px;"></div>
-<div id="plotPieT" class="spalte" style="height: 300px; width: 250px;"></div>
+<div id="plotBar" class="spalte" style="height: 300px; width: 350px;"></div>
+<div id="plotPieS" class="spalte" style="height: 300px; width: 350px;"></div>
</div>
<!-- no events -->
diff --git a/application/views/scripts/statistics/type.phtml b/application/views/scripts/statistics/type.phtml
index 2677f4e..a34eb2b 100755
--- a/application/views/scripts/statistics/type.phtml
+++ b/application/views/scripts/statistics/type.phtml
@@ -33,20 +33,18 @@ function plot() {
} else if (poolID == 'default') {
$('#plotBar').empty();
$('#plotPie').empty();
- } else refreshPlot(data.dataBar, data.dataPie, data.color);
+ } else refreshPlot(data.dataBar, data.dataPie);
}, "json");
}
-function refreshPlot(dataBar, dataPie, color) {
+function refreshPlot(dataBar, dataPie) {
$('#plotBar').empty();
$.jqplot('plotBar', dataBar, {
seriesDefaults: {
- //renderer: $.jqplot.PieRenderer,
renderer:$.jqplot.BarRenderer,
pointLabels: { show: true, location: 'e', edgeTolerance: -15 },
shadowAngle: 135,
rendererOptions: {
- //showDataLabels: true,
barDirection: 'horizontal',
varyBarColor : true
}
@@ -55,9 +53,7 @@ function refreshPlot(dataBar, dataPie, color) {
yaxis: {
renderer: $.jqplot.CategoryAxisRenderer
}
- },
- seriesColors: color,
- highlighter: { show: false }
+ }
});
$('#plotPie').empty();
$.jqplot('plotPie', dataPie,
@@ -72,9 +68,7 @@ function refreshPlot(dataBar, dataPie, color) {
lineLabels: true,
varyBarColor : true
}
- },
- seriesColors: color
- //legend: { show:true, location: 'e' }
+ }
});
}