Backend, Statistic und Korrektur E_NOTICE

git-svn-id: https://[internal]/wordpress/plugins/wpsg4@5945 0d5edaf7-2b12-4e95-93f4-047927463d4b

9 files changed, 54 insertions, 40 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']); ?>]

diff --git a/views/mods/mod_statistics/chartturnoverperhour/all.phtml b/views/mods/mod_statistics/chartturnoverperhour/all.phtml
index a7d96c2..30e1499 100644
--- a/views/mods/mod_statistics/chartturnoverperhour/all.phtml
+++ b/views/mods/mod_statistics/chartturnoverperhour/all.phtml
@@ -4,7 +4,8 @@
 

 	if (wpsg_isSizedArray($this->view['chart']['data'])) 

 	{

-

+		unset($this->view['chart']['data']['template']);

+		

 		for ($i = 0; $i < count($this->view['chart']['data']); $i++)

 		{

 			

diff --git a/views/mods/mod_statistics/simplefilter.phtml b/views/mods/mod_statistics/simplefilter.phtml
index c6edd92..c3906de 100644
--- a/views/mods/mod_statistics/simplefilter.phtml
+++ b/views/mods/mod_statistics/simplefilter.phtml
@@ -44,7 +44,7 @@
 	<div style="float:left;" id="filter-standard-wrapper">	

 		<select name="filter[standard]" id="filter-standard" size="1" onchange="<?php if ($_REQUEST['id'] == 0 || $_REQUEST['id'] == 1) { ?>checkForRelated(this);<?php } ?>">

 		<?php foreach ($this->view['standardFilter'] as $index => $filter) { ?>

-			<option value="<?php echo wpsg_hspc($index)?>" <?php if ($index == $this->view['filter']['standard']) { ?>selected="selected"<?php } ?>><?php echo wpsg_hspc($filter['name']); ?></option>

+			<option value="<?php echo wpsg_hspc($index)?>" <?php if ($index == $this->view['filter']['standard']) { ?>selected="selected"<?php } ?>><?php echo wpsg_hspc(wpsg_getStr($filter['name'])); ?></option>

 		<?php } ?>

 		</select>

 	</div>

diff --git a/views/mods/mod_statistics/statistics.phtml b/views/mods/mod_statistics/statistics.phtml
index fc27f1f..a5b7580 100644
--- a/views/mods/mod_statistics/statistics.phtml
+++ b/views/mods/mod_statistics/statistics.phtml
@@ -46,8 +46,6 @@
 		                    var div = jQuery(this).nextAll('div.jqplot-image-container' + btnId).first();

 		                    div.children('div.jqplot-image-container-content').empty();

 		                    div.children('div.jqplot-image-container-content').append(imgelem);

-

-		                    

 		                    

 		                    jQuery('div.jqplot-image-container' + btnId).dialog( { 

 		                    	'modal': true,

@@ -83,7 +81,7 @@
 					<ul class="nav navbar-nav">

 						<li role="presentation" class="<?php echo ((!isset($_REQUEST['action']))?'active':''); ?>"><a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Produkt"><?php echo __("Statistik", "wpsg"); ?></a></li>

 <!-- 

-						<li role="presentation" class="wpsg_showhide_filter <?php echo (($this->view['hasFilter'] === true)?'active':''); ?>"><a href="#" onclick="return false;"><span class="glyphicon glyphicon-search"></span><?php echo __("Suche", "wpsg"); ?></a></li>

+						<li role="presentation" class="wpsg_showhide_filter <?php echo ((wpsg_getInt($this->view['hasFilter']) === true)?'active':''); ?>"><a href="#" onclick="return false;"><span class="glyphicon glyphicon-search"></span><?php echo __("Suche", "wpsg"); ?></a></li>

 				 		<li role="presentation" class="<?php echo ((wpsg_isSizedString($_REQUEST['action'], 'add'))?'active':''); ?>"><a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Produkt&action=add"><span class="glyphicon glyphicon-plus"></span><?php echo __("Hinzufügen", "wpsg"); ?></a></li>

 -->				 		

 					</ul>