summaryrefslogtreecommitdiffstats
path: root/application/views
diff options
context:
space:
mode:
Diffstat (limited to 'application/views')
-rwxr-xr-xapplication/views/scripts/event/checkoverlapdrop.phtml56
-rwxr-xr-xapplication/views/scripts/statistics/success.phtml4
2 files changed, 29 insertions, 31 deletions
diff --git a/application/views/scripts/event/checkoverlapdrop.phtml b/application/views/scripts/event/checkoverlapdrop.phtml
index e1150d1..7e9ff28 100755
--- a/application/views/scripts/event/checkoverlapdrop.phtml
+++ b/application/views/scripts/event/checkoverlapdrop.phtml
@@ -1,43 +1,41 @@
<?php
if($this->past) {
$output['past'] = 1;
- $output['withoutrepeat'] = -1;
- $output['withrepeat'] = -1;
} else {
$output['past'] = 0;
- $output['cfevents'] = $this->cfeventswithrepeat;
+}
+$output['cfevents'] = $this->cfeventswithrepeat;
- // conflict free plot with repeat
- $output['cfplotwithrepeat'] = '<ul id="cfplot">';
- foreach($this->cfeventswithrepeat as $c){
- if(isset($c['end'])) {
- $output['cfplotwithrepeat'] .= '<li>' . 'EventID: ' . $c['eventID'] . ', Title: ' . $c['title'] . ', Start: ' . $c['start'] . ', End: ' . $c['end'] . '</li>';
- } else {
- $output['cfplotwithrepeat'] .= '<li>' . 'EventID: ' . $c['eventID'] . ', Title: ' . $c['title'] . ', Start: ' . $c['start'] . '</li>';
- }
+// conflict free plot with repeat
+$output['cfplotwithrepeat'] = '<ul id="cfplot">';
+foreach($this->cfeventswithrepeat as $c){
+ if(isset($c['end'])) {
+ $output['cfplotwithrepeat'] .= '<li>' . 'EventID: ' . $c['eventID'] . ', Title: ' . $c['title'] . ', Start: ' . $c['start'] . ', End: ' . $c['end'] . '</li>';
+ } else {
+ $output['cfplotwithrepeat'] .= '<li>' . 'EventID: ' . $c['eventID'] . ', Title: ' . $c['title'] . ', Start: ' . $c['start'] . '</li>';
}
- $output['cfplotwithrepeat'] .= '</ul>';
+}
+$output['cfplotwithrepeat'] .= '</ul>';
- // conflict plot with repeat
- if(count($this->overlapswithrepeat) == 0) {
- $output['withrepeat'] = -1;
- }
- else {
- $output['withrepeat'] = '<ul id="conflictEvents">';
- foreach($this->overlapswithrepeat as $o){
- if(isset($o['end'])) {
- $output['withrepeat'] .= '<li>' . 'EventID: ' . $o['eventID'] . ', Title: ' . $o['title'] . ', Start: ' . $o['start'] . ', End: ' . $o['end'] . '</li>';
- } else {
- $output['withrepeat'] .= '<li>' . 'EventID: ' . $o['eventID'] . ', Title: ' . $o['title'] . ', Start: ' . $o['start'] . '</li>';
- }
+// conflict plot with repeat
+if(count($this->overlapswithrepeat) == 0) {
+ $output['withrepeat'] = -1;
+}
+else {
+ $output['withrepeat'] = '<ul id="conflictEvents">';
+ foreach($this->overlapswithrepeat as $o){
+ if(isset($o['end'])) {
+ $output['withrepeat'] .= '<li>' . 'EventID: ' . $o['eventID'] . ', Title: ' . $o['title'] . ', Start: ' . $o['start'] . ', End: ' . $o['end'] . '</li>';
+ } else {
+ $output['withrepeat'] .= '<li>' . 'EventID: ' . $o['eventID'] . ', Title: ' . $o['title'] . ', Start: ' . $o['start'] . '</li>';
}
- $output['withrepeat'] .= '</ul>';
}
+ $output['withrepeat'] .= '</ul>';
+}
- // conflict plot without repeat
- if(count($this->overlapswithoutrepeat) == 0) {
- $output['withoutrepeat'] = -1;
- }
+// conflict plot without repeat
+if(count($this->overlapswithoutrepeat) == 0) {
+ $output['withoutrepeat'] = -1;
}
echo json_encode($output);
?> \ No newline at end of file
diff --git a/application/views/scripts/statistics/success.phtml b/application/views/scripts/statistics/success.phtml
index c12c636..8911033 100755
--- a/application/views/scripts/statistics/success.phtml
+++ b/application/views/scripts/statistics/success.phtml
@@ -76,7 +76,7 @@ function refreshPlot(dataBar, dataPieS, dataPieT, color) {
seriesColors: color
//legend: { show:true, location: 'e' }
});
- $('#plotPieT').empty();
+ /*$('#plotPieT').empty();
$.jqplot('plotPieT', dataPieT,
{
title: 'Chart with ErrorType Labels',
@@ -93,7 +93,7 @@ function refreshPlot(dataBar, dataPieS, dataPieT, color) {
},
seriesColors: color
//legend: { show:true, location: 'ne' }
- });
+ });*/
}
$(document).ready(function(){