Subversion Repositories wpShopGermany4

Rev

Rev 5261 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 5261 Rev 5866
Line 23... Line 23...
23
23
24 
			$chartJS['legend'][$i] .= "}";
 24 
			$chartJS['legend'][$i] .= "}";
25
25
26 
			$j = 0;
 26 
			$j = 0;
27
27
28 
			foreach ((array)$this->view['chart']['data'][$i]['records'] as $index => $record)
 28 
			if (wpsg_isSizedArray($this->view['chart']['data'][$i]))
29 
			{
 29 
			{
30 
				//immer das Datum vom Rootelement nutzen
 - 
 
31 
				$k = 0 ;
 - 
 
32
30
33 
				foreach ($this->view['chart']['data'][0]['records'] as $rindex => $rrecord)
 31 
				foreach ((array)$this->view['chart']['data'][$i]['records'] as $index => $record)
34 
				{
 32 
				{
- 
 
 33 
					//immer das Datum vom Rootelement nutzen
- 
 
 34 
					$k = 0 ;
- 
 
 35
- 
 
 36 
					foreach ($this->view['chart']['data'][0]['records'] as $rindex => $rrecord)
- 
 
 37 
					{
35 
					if ($j == $k)
 38 
						if ($j == $k)
36 
					{
39 
						{
37 
						//if (mktime($record['hour'], 0, 0, $record['month'], $record['day'], $record['year']) <= mktime(date('H'), 0, 0, date('m'), date('d'), date('Y')))
 40 
							//if (mktime($record['hour'], 0, 0, $record['month'], $record['day'], $record['year']) <= mktime(date('H'), 0, 0, date('m'), date('d'), date('Y')))
38 
						//{
 41 
							//{
39 
							$chartJS['area']['area'.$i][] = "['".$rrecord['year'].'/'.$rrecord['month'].'/'.$rrecord['day']." ".$rrecord['hour'].":00:00', ".wpsg_hspc($record['total'])."]";
42 
								$chartJS['area']['area'.$i][] = "['".$rrecord['year'].'/'.$rrecord['month'].'/'.$rrecord['day']." ".$rrecord['hour'].":00:00', ".wpsg_hspc($record['total'])."]";
40 
						//}
43 
							//}
41 
					}
44 
						}
42 
					$k++;
 45 
						$k++;
- 
 
 46 
					}
- 
 
 47
- 
 
 48 
					if ($j == count($this->view['chart']['data'][$i]['records']) - 1) {
- 
 
 49 
				  		$chartJS['area']['area'.$i] = '['.implode(',', (array)$chartJS['area']['area'.$i]).']';
- 
 
 50 
				  	}
- 
 
 51
- 
 
 52 
				  	$j++;
43 
				}
 53 
				}
44
54
45 
				if ($j == count($this->view['chart']['data'][$i]['records']) - 1) {
- 
 
46 
			  		$chartJS['area']['area'.$i] = '['.implode(',', (array)$chartJS['area']['area'.$i]).']';
- 
 
47 
			  	}
 - 
 
48
- 
 
49 
			  	$j++;
 - 
 
50 
			}
55 
			}
51
56
52 
		}
 57 
		}
53 
 
 58 
 
54 
	}
 59 
	}
55
60