diff options
Diffstat (limited to 'views/mods/mod_statistics/chartturnover')
6 files changed, 50 insertions, 35 deletions
diff --git a/views/mods/mod_statistics/chartturnover/all.phtml b/views/mods/mod_statistics/chartturnover/all.phtml index c9e7181..ead62fd 100644 --- a/views/mods/mod_statistics/chartturnover/all.phtml +++ b/views/mods/mod_statistics/chartturnover/all.phtml @@ -4,6 +4,7 @@ if (wpsg_isSizedArray($this->view['chart']['data']))
{
+ unset($this->view['chart']['data']['template']);
for ($i = 0; $i < count($this->view['chart']['data']); $i++)
{
@@ -42,7 +43,7 @@ }
$k++;
}
-
+
if ($j == count($this->view['chart']['data'][$i]['records']) - 1) {
$chartJS['area']['area'.$i] = '['.implode(',', $chartJS['area']['area'.$i]).']';
}
@@ -79,7 +80,7 @@ jQuery(document).ready(function(){ <?php foreach ($chartJS['area'] as $index => $area) { ?>
var <?php echo $index; ?> = <?php echo $area; ?>;
<?php } ?>
-
+
var chartannualturnoverLine = jQuery.jqplot('chartannualturnover-line', [<?php echo implode(',', array_keys($chartJS['area'])); ?>], {
animate: true,
axesDefaults: {
diff --git a/views/mods/mod_statistics/chartturnover/day.phtml b/views/mods/mod_statistics/chartturnover/day.phtml index 76e259a..a7b5751 100644 --- a/views/mods/mod_statistics/chartturnover/day.phtml +++ b/views/mods/mod_statistics/chartturnover/day.phtml @@ -1,12 +1,18 @@ <?php $this->render(WPSG_PATH_VIEW.'/mods/mod_statistics/simplefilter.phtml'); ?>
<?php
-
+
if (wpsg_isSizedArray($this->view['chart']['data']))
{
+ $cnt = count($this->view['chart']['data']);
+ unset($this->view['chart']['data']['template']);
+ $cnt = count($this->view['chart']['data']);
for ($i = 0; $i < count($this->view['chart']['data']); $i++)
{
+ //if (!key_exists('label', $this->view['chart']['data'][$i])) continue;
+ //$lbl = $this->view['chart']['data'][$i]['label'];
+ //if ($lbl == null) continue;
$chartJS['legend'][$i] = "{";
@@ -28,31 +34,31 @@ if (wpsg_isSizedArray($this->view['chart']['data'][$i]))
{
- foreach ((array)$this->view['chart']['data'][$i]['records'] as $index => $record)
- {
-
- //immer das Datum vom Rootelement nutzen
- $k = 0 ;
-
- foreach ($this->view['chart']['data'][0]['records'] as $rindex => $rrecord)
+ foreach ((array)$this->view['chart']['data'][$i]['records'] as $index => $record)
{
- if ($j == $k)
- {
- if (mktime($record['hour'], 0, 0, $record['month'], $record['day'], $record['year']) <= mktime(date_i18n('H'), 0, 0, date_i18n('m'), date_i18n('d'), date_i18n('Y')))
- {
- $chartJS['area']['area'.$i][] = "['".$rrecord['year'].'/'.$rrecord['month'].'/'.$rrecord['day']." ".$rrecord['hour'].":00:00', ".wpsg_hspc($record['total'])."]";
- }
- }
- $k++;
+
+ //immer das Datum vom Rootelement nutzen
+ $k = 0 ;
+
+ foreach ($this->view['chart']['data'][0]['records'] as $rindex => $rrecord)
+ {
+ if ($j == $k)
+ {
+ if (mktime($record['hour'], 0, 0, $record['month'], $record['day'], $record['year']) <= mktime(date_i18n('H'), 0, 0, date_i18n('m'), date_i18n('d'), date_i18n('Y')))
+ {
+ $chartJS['area']['area'.$i][] = "['".$rrecord['year'].'/'.$rrecord['month'].'/'.$rrecord['day']." ".$rrecord['hour'].":00:00', ".wpsg_hspc($record['total'])."]";
+ }
+ }
+ $k++;
+ }
+
+ if ($j == count($this->view['chart']['data'][$i]['records']) - 1) {
+ $chartJS['area']['area'.$i] = '['.implode(',', (array)$chartJS['area']['area'.$i]).']';
+ }
+
+ $j++;
}
- if ($j == count($this->view['chart']['data'][$i]['records']) - 1) {
- $chartJS['area']['area'.$i] = '['.implode(',', (array)$chartJS['area']['area'.$i]).']';
- }
-
- $j++;
- }
-
}
}
@@ -102,7 +108,7 @@ jQuery(document).ready(function(){ tickInterval: '1 hours'
},
yaxis:{
- label:'<?php echo wpsg_hspc($this->view['chart']['info']['yaxis']['label']); ?>',
+ label:'<?php echo wpsg_hspc(wpsg_getStr($this->view['chart']['info']['yaxis']['label'])); ?>',
tickOptions: {
formatter: wpsg_statistics_number_format
},
diff --git a/views/mods/mod_statistics/chartturnover/month.phtml b/views/mods/mod_statistics/chartturnover/month.phtml index 5ef077a..d6a9bda 100644 --- a/views/mods/mod_statistics/chartturnover/month.phtml +++ b/views/mods/mod_statistics/chartturnover/month.phtml @@ -4,6 +4,7 @@ if (wpsg_isSizedArray($this->view['chart']['data']))
{
+ unset($this->view['chart']['data']['template']);
for ($i = 0; $i < count($this->view['chart']['data']); $i++)
{
@@ -17,7 +18,7 @@ $chartJS['legend'][$i] .= " highlighter: {";
- $chartJS['legend'][$i] .= " formatString: '<table><tr><td>%s ".$this->view['chart']['data'][$i]['year'].", %s ".$this->get_option('wpsg_currency')."</td></tr></table>'";
+ $chartJS['legend'][$i] .= " formatString: '<table><tr><td>%s ".wpsg_getStr($this->view['chart']['data'][$i]['year']).", %s ".$this->get_option('wpsg_currency')."</td></tr></table>'";
$chartJS['legend'][$i] .= " }";
@@ -73,7 +74,7 @@ jQuery(document).ready(function(){ <?php foreach ($chartJS['area'] as $index => $area) { ?>
var <?php echo $index; ?> = <?php echo $area; ?>;
<?php } ?>
-
+
var chartannualturnoverLine = jQuery.jqplot('chartannualturnover-line', [<?php echo implode(',', array_keys($chartJS['area'])); ?>], {
animate: true,
axesDefaults: {
@@ -89,7 +90,8 @@ jQuery(document).ready(function(){ axes:{
xaxis:{
renderer:jQuery.jqplot.DateAxisRenderer,
- label:'<?php echo wpsg_hspc($this->view['chart']['info']['xaxis']['label']); ?>',
+ label:'<?php echo wpsg_hspc(wpsg_getStr($this->view['chart']['info']['xaxis']['label'])); ?>',
+ label:'<?php echo wpsg_hspc(wpsg_getStr($this->view['chart']['data'][0]['label'])); ?>',
tickOptions:{formatString:'%d'},
tickInterval: '1 day',
min:'<?php echo date('Y', $this->view['chart']['data'][0]['min']); ?>/<?php echo date('m', $this->view['chart']['data'][0]['min']); ?>/<?php echo date('d', $this->view['chart']['data'][0]['min']); ?>',
diff --git a/views/mods/mod_statistics/chartturnover/quarter.phtml b/views/mods/mod_statistics/chartturnover/quarter.phtml index 36fc4cf..7f18413 100644 --- a/views/mods/mod_statistics/chartturnover/quarter.phtml +++ b/views/mods/mod_statistics/chartturnover/quarter.phtml @@ -5,7 +5,8 @@ if (wpsg_isSizedArray($this->view['chart']['data']))
{
-
+ unset($this->view['chart']['data']['template']);
+
for ($i = 0; $i < count($this->view['chart']['data']); $i++)
{
@@ -93,7 +94,8 @@ jQuery(document).ready(function(){ },
axes:{
xaxis:{
- label:'<?php echo wpsg_hspc($this->view['chart']['info']['xaxis']['label']); ?>',
+ label:'<?php echo wpsg_hspc(wpsg_getStr($this->view['chart']['info']['xaxis']['label'])); ?>',
+ label:'<?php echo wpsg_hspc(wpsg_getStr($this->view['chart']['data'][0]['label'])); ?>',
syncTicks: false,
tickOptions:{formatString:'KW %d'},
ticks: [<?php echo implode(',', $chartJS['ticks']['ticks0']); ?>]
diff --git a/views/mods/mod_statistics/chartturnover/week.phtml b/views/mods/mod_statistics/chartturnover/week.phtml index 57dd4a5..9777326 100644 --- a/views/mods/mod_statistics/chartturnover/week.phtml +++ b/views/mods/mod_statistics/chartturnover/week.phtml @@ -6,6 +6,9 @@ {
$series = '';
+ $cnt = count($this->view['chart']['data']);
+ unset($this->view['chart']['data']['template']);
+ $cnt = count($this->view['chart']['data']);
for ($i = 0; $i < count($this->view['chart']['data']); $i++)
{
@@ -19,7 +22,7 @@ $chartJS['legend'][$i] .= " highlighter: {";
- $chartJS['legend'][$i] .= " formatString: '<table><tr><td>%s ".$this->view['chart']['data'][$i]['year'].", %s ".$this->get_option('wpsg_currency')."</td></tr></table>'";
+ $chartJS['legend'][$i] .= " formatString: '<table><tr><td>%s ".wpsg_getStr($this->view['chart']['data'][$i]['year']).", %s ".$this->get_option('wpsg_currency')."</td></tr></table>'";
$chartJS['legend'][$i] .= " }";
@@ -97,7 +100,7 @@ jQuery(document).ready(function(){ max:'<?php echo date('Y', $this->view['chart']['data'][0]['lastdayofweek']); ?>/<?php echo date('m', $this->view['chart']['data'][0]['lastdayofweek']); ?>/<?php echo date('d', $this->view['chart']['data'][0]['lastdayofweek']); ?>'
},
yaxis:{
- label:'<?php echo wpsg_hspc($this->view['chart']['info']['yaxis']['label']); ?>',
+ label:'<?php echo wpsg_hspc(wpsg_getStr($this->view['chart']['info']['yaxis']['label'])); ?>',
tickOptions: {
formatter: wpsg_statistics_number_format
},
diff --git a/views/mods/mod_statistics/chartturnover/year.phtml b/views/mods/mod_statistics/chartturnover/year.phtml index 2be39aa..319cc9d 100644 --- a/views/mods/mod_statistics/chartturnover/year.phtml +++ b/views/mods/mod_statistics/chartturnover/year.phtml @@ -4,6 +4,7 @@ if (wpsg_isSizedArray($this->view['chart']['data']))
{
+ unset($this->view['chart']['data']['template']);
for ($i = 0; $i < count($this->view['chart']['data']); $i++)
{
@@ -37,7 +38,7 @@ {
if (mktime(0, 0, 0, $record['month'], 1, $record['year']) <= mktime(0, 0, 0, date_i18n('m'), 1, date_i18n('Y')))
{
- $chartJS['area']['area'.$i][] .= "['".$j."', ".wpsg_hspc($record['total'])."]";
+ $chartJS['area']['area'.$i][] = "['".$j."', ".wpsg_hspc($record['total'])."]";
}
$chartJS['ticks']['ticks'.$i][] = '['.$j.', \''.$record['tick'].'\']';
}
@@ -97,7 +98,7 @@ jQuery(document).ready(function(){ xaxis:{
rendererOptions:{tickRenderer:
jQuery.jqplot.CanvasAxisTickRenderer},
- label:'<?php echo wpsg_hspc($this->view['chart']['info']['xaxis']['label']); ?>',
+ label:'<?php echo wpsg_hspc(wpsg_getStr($this->view['chart']['info']['xaxis']['label'])); ?>',
syncTicks: false,
tickOptions:{formatString:'%d'},
ticks: [<?php echo implode(',', $chartJS['ticks']['ticks0']); ?>]
|