Pear-Trading/Foodloop-Server
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Added extra data showing

Browse source
This commit is contained in:
Finn 2019-09-06 17:31:09 +01:00
parent d20fca6732
commit c65745f6a2
5 changed files with 104 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

14
lib/Pear/LocalLoop/Controller/Admin/ImportFrom.pm
View file

@ -9,7 +9,7 @@ sub index {
$c->stash->{org_entities} = [
map {
{ id => $_->entity_id, name => $_->name }
} $c->schema->resultset('Organisation')->all
} $c->schema->resultset('Organisation')->search({ name => { like => '%lancashire%' }}, { columns => [qw/ entity_id name / ]})
];
$c->app->max_request_size(104857600);
@ -37,9 +37,7 @@ sub post_suppliers {
my $job_id = $c->minion->enqueue('csv_supplier_import' => [ $filename ]);
my $job_url = $c->url_for("/admin/minion/jobs?id=$job_id")->to_abs;
$c->flash(success => "CSV import started, see status of minion job at: $job_url");
$c->flash(success => "CSV import started, see status of minion job at: " . $c->link_to( 'Minion Job', "/admin/minion/jobs?id=$job_id"));
return $c->redirect_to('/admin/import_from');
}
@ -65,9 +63,7 @@ sub post_postcodes {
my $job_id = $c->minion->enqueue('csv_postcode_import' => [ $filename ]);
my $job_url = $c->url_for("/admin/minion/jobs?id=$job_id")->to_abs;
$c->flash(success => "CSV import started, see status of minion job at: $job_url");
$c->flash(success => "CSV import started, see status of minion job at: " . $c->link_to( 'Minion Job', "/admin/minion/jobs?id=$job_id"));
return $c->redirect_to('/admin/import_from');
}
@ -98,9 +94,7 @@ sub post_transactions {
my $job_id = $c->minion->enqueue('csv_transaction_import' => [ $filename, $c->param('entity_id') ]);
my $job_url = $c->url_for("/admin/minion/jobs?id=$job_id")->to_abs;
$c->flash(success => "CSV import started, see status of minion job at: $job_url");
$c->flash(success => "CSV import started, see status of minion job at: " . $c->link_to( 'Minion Job', "/admin/minion/jobs?id=$job_id"));
return $c->redirect_to('/admin/import_from');
}

71
lib/Pear/LocalLoop/Controller/Api/External.pm
View file

@ -379,4 +379,75 @@ sub post_supplier_history {
});
}
sub post_lcc_table_summary {
my $c = shift;
my $validation = $c->validation;
$validation->input($c->stash->{api_json});
my $transaction_rs = $c->schema->resultset('Transaction');
my $ward_transactions_rs = $transaction_rs->search({},
{
join => { seller => { postcode => { gb_postcode => 'ward' } } },
group_by => 'ward.id',
select => [
{ count => 'me.id', '-as' => 'count' },
{ sum => 'me.value', '-as' => 'sum' },
'ward.ward'
],
as => [ qw/ count sum ward_name /],
}
);
my $transaction_type_data = {};
for my $meta ( qw/
local_service
regional_service
national_service
private_household_rebate
business_tax_and_rebate
stat_loc_gov
central_loc_gov
/ ) {
my $transaction_type_rs = $transaction_rs->search(
{
'meta.'.$meta => 1,
},
{
join => 'meta',
group_by => 'meta.' . $meta,
select => [
{ count => 'me.id', '-as' => 'count' },
{ sum => 'me.value', '-as' => 'sum' },
],
as => [ qw/ count sum /],
}
)->first;
$transaction_type_data->{$meta} = {
( $transaction_type_rs ? (
count => $transaction_type_rs->get_column('count'),
sum => $transaction_type_rs->get_column('sum'),
) : () ),
}
}
my @ward_transaction_list = (
map {{
ward => $_->get_column('ward_name') || "N/A",
sum => $_->get_column('sum') / 100000,
count => $_->get_column('count'),
}} $ward_transactions_rs->all
);
return $c->render( json => {
success => Mojo::JSON->true,
wards => \@ward_transaction_list,
types => $transaction_type_data,
});
}
1;