Subversion Repositories wpShopGermany4

Rev

Rev 5261 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 5261 Rev 5945
Line 4... Line 4...
4
 
4
 
5
	if (wpsg_isSizedArray($this->view['chart']['data'])) 
5
	if (wpsg_isSizedArray($this->view['chart']['data'])) 
6
	{ 
6
	{ 
7
 
7
 
8
		$series = ''; 
8
		$series = ''; 
-
 
9
		$cnt = count($this->view['chart']['data']);
-
 
10
		unset($this->view['chart']['data']['template']);
-
 
11
		$cnt = count($this->view['chart']['data']);
9
		
12
		
10
		for ($i = 0; $i < count($this->view['chart']['data']); $i++)
13
		for ($i = 0; $i < count($this->view['chart']['data']); $i++)
11
		{
14
		{
12
			
15
			
13
			$chartJS['legend'][$i] = "{";
16
			$chartJS['legend'][$i] = "{";
Line 17... Line 20...
17
				$chartJS['legend'][$i] .= "label:'".$this->view['chart']['data'][$i]['label']."',";
20
				$chartJS['legend'][$i] .= "label:'".$this->view['chart']['data'][$i]['label']."',";
18
			}
21
			}
19
			
22
			
20
			$chartJS['legend'][$i] .= "	highlighter: {";
23
			$chartJS['legend'][$i] .= "	highlighter: {";
21
			
24
			
22
			$chartJS['legend'][$i] .= "		formatString: '<table><tr><td>%s ".$this->view['chart']['data'][$i]['year'].", %s ".$this->get_option('wpsg_currency')."</td></tr></table>'";
25
			$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>'";
23
			
26
			
24
			$chartJS['legend'][$i] .= "	}";
27
			$chartJS['legend'][$i] .= "	}";
25
			
28
			
26
			$chartJS['legend'][$i] .= "}";
29
			$chartJS['legend'][$i] .= "}";
27
			
30
			
Line 95... Line 98...
95
	          	tickInterval: '1 day',
98
	          	tickInterval: '1 day',
96
	          	min:'<?php echo date('Y', $this->view['chart']['data'][0]['firstdayofweek']); ?>/<?php echo date('m', $this->view['chart']['data'][0]['firstdayofweek']); ?>/<?php echo date('d', $this->view['chart']['data'][0]['firstdayofweek']); ?>',
99
	          	min:'<?php echo date('Y', $this->view['chart']['data'][0]['firstdayofweek']); ?>/<?php echo date('m', $this->view['chart']['data'][0]['firstdayofweek']); ?>/<?php echo date('d', $this->view['chart']['data'][0]['firstdayofweek']); ?>',
97
	          	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']); ?>'
100
	          	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']); ?>'
98
	        },
101
	        },
99
	        yaxis:{
102
	        yaxis:{
100
                label:'<?php echo wpsg_hspc($this->view['chart']['info']['yaxis']['label']); ?>',
103
                label:'<?php echo wpsg_hspc(wpsg_getStr($this->view['chart']['info']['yaxis']['label'])); ?>',
101
                tickOptions: {
104
                tickOptions: {
102
                	formatter: wpsg_statistics_number_format
105
                	formatter: wpsg_statistics_number_format
103
            	},
106
            	},
104
        		min:0
107
        		min:0
105
            }
108
            }