function getAll() { $month_array = getTimeseries(); $data = array(); $categories = getCategories(); foreach ($categories as $cat) { $data[$cat['grouptype']][$cat['groupvalue']] = getChartProportionFullData(pg_escape_string($cat['grouptype']), pg_escape_string($cat['groupvalue']), $month_array); } $data['timeseries'] = $month_array; return $data; }
function getAll() { $current_year = date('Y'); $most_recent_three_years = array($current_year, $current_year - 1, $current_year - 2); $data = array(); $categories = getCategories(); foreach ($categories as $cat) { foreach ($most_recent_three_years as $year) { $data[] = array('grouptype' => $cat['grouptype'], 'groupvalue' => $cat['groupvalue'], 'year' => $year, 'capacity' => getChartTotalCapacityData(pg_escape_string($cat['grouptype']), pg_escape_string($cat['groupvalue']), $year), 'proportion' => getChartProportionFullData(pg_escape_string($cat['grouptype']), pg_escape_string($cat['groupvalue']), $year)); } } return $data; }