changed pie data structure
This commit is contained in:
parent
9ea0509030
commit
e7dee61433
1 changed files with 2 additions and 54 deletions
|
@ -6,8 +6,6 @@ sub index {
|
||||||
|
|
||||||
my $entity = $c->stash->{api_user}->entity;
|
my $entity = $c->stash->{api_user}->entity;
|
||||||
|
|
||||||
my $data = { local_all => {}, categories => {}, essentials => {} };
|
|
||||||
|
|
||||||
my $purchase_rs = $entity->purchases;
|
my $purchase_rs = $entity->purchases;
|
||||||
my $local_org_local_purchase = $purchase_rs->search({
|
my $local_org_local_purchase = $purchase_rs->search({
|
||||||
"me.distance" => { '<', 20000 },
|
"me.distance" => { '<', 20000 },
|
||||||
|
@ -45,67 +43,17 @@ sub index {
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
$data->{local_all} = {
|
my $data = {
|
||||||
'Local shop local purchaser' => $local_org_local_purchase->count,
|
'Local shop local purchaser' => $local_org_local_purchase->count,
|
||||||
'Local shop non-local purchaser' => $local_org_non_local_purchase->count,
|
'Local shop non-local purchaser' => $local_org_non_local_purchase->count,
|
||||||
'Non-local shop local purchaser' => $non_local_org_local_purchase->count,
|
'Non-local shop local purchaser' => $non_local_org_local_purchase->count,
|
||||||
'Non-local shop non-local purchaser' => $non_local_org_non_local_purchase->count,
|
'Non-local shop non-local purchaser' => $non_local_org_non_local_purchase->count,
|
||||||
};
|
};
|
||||||
|
|
||||||
my $duration = DateTime::Duration->new( days => 28 );
|
|
||||||
my $end = DateTime->today;
|
|
||||||
my $start = $end->clone->subtract_duration( $duration );
|
|
||||||
|
|
||||||
my $dtf = $c->schema->storage->datetime_parser;
|
|
||||||
my $driver = $c->schema->storage->dbh->{Driver}->{Name};
|
|
||||||
my $month_transaction_category_rs = $c->schema->resultset('ViewQuantisedTransactionCategory' . $driver)->search(
|
|
||||||
{
|
|
||||||
purchase_time => {
|
|
||||||
-between => [
|
|
||||||
$dtf->format_datetime($start),
|
|
||||||
$dtf->format_datetime($end),
|
|
||||||
],
|
|
||||||
},
|
|
||||||
buyer_id => $entity->id,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
columns => [
|
|
||||||
{
|
|
||||||
quantised => 'quantised_weeks',
|
|
||||||
value => { sum => 'value' },
|
|
||||||
category_id => 'category_id',
|
|
||||||
essential => 'essential',
|
|
||||||
},
|
|
||||||
],
|
|
||||||
group_by => [ qw/ category_id quantised_weeks essential / ],
|
|
||||||
}
|
|
||||||
);
|
|
||||||
|
|
||||||
my $category_list = $c->schema->resultset('Category')->as_hash;
|
|
||||||
|
|
||||||
for my $cat_trans ( $month_transaction_category_rs->all ) {
|
|
||||||
my $quantised = $c->db_datetime_parser->parse_datetime($cat_trans->get_column('quantised'));
|
|
||||||
my $days = $c->format_iso_date( $quantised ) || 0;
|
|
||||||
my $category = $cat_trans->get_column('category_id') || 0;
|
|
||||||
my $value = ($cat_trans->get_column('value') || 0) / 100000;
|
|
||||||
$data->{categories}->{$days}->{$category_list->{$category}} += $value;
|
|
||||||
next unless $cat_trans->get_column('essential');
|
|
||||||
$data->{essentials}->{$days}->{value} += $value;
|
|
||||||
}
|
|
||||||
|
|
||||||
for my $day ( keys %{ $data->{categories} } ) {
|
|
||||||
my @days = ( map{ {
|
|
||||||
days => $day,
|
|
||||||
value => $data->{categories}->{$day}->{$_},
|
|
||||||
category => $_,
|
|
||||||
} } keys %{ $data->{categories}->{$day} } );
|
|
||||||
$data->{categories}->{$day} = [ sort { $b->{value} <=> $a->{value} } @days ];
|
|
||||||
}
|
|
||||||
|
|
||||||
return $c->render(
|
return $c->render(
|
||||||
json => {
|
json => {
|
||||||
success => Mojo::JSON->true,
|
success => Mojo::JSON->true,
|
||||||
data => $data,
|
pie => $data,
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
Reference in a new issue