From 4beb26a0a413bca0f1ee54e1d8388fc8383d16c3 Mon Sep 17 00:00:00 2001 From: Tom Bloor Date: Thu, 28 Sep 2017 15:51:56 +0100 Subject: [PATCH 01/12] Added mobile view meta tag for admin view --- templates/layouts/admin.html.ep | 1 + 1 file changed, 1 insertion(+) diff --git a/templates/layouts/admin.html.ep b/templates/layouts/admin.html.ep index 417937d..f937faf 100644 --- a/templates/layouts/admin.html.ep +++ b/templates/layouts/admin.html.ep @@ -2,6 +2,7 @@ + LocalLoop Admin - <%= title %> From c3519fa4df63b513e55bb8a2f1c09a05cc6a2eee Mon Sep 17 00:00:00 2001 From: Tom Bloor Date: Thu, 28 Sep 2017 16:39:03 +0100 Subject: [PATCH 02/12] Improved Feedback list page --- lib/Pear/LocalLoop.pm | 1 + .../LocalLoop/Controller/Admin/Feedback.pm | 11 ++++++-- lib/Pear/LocalLoop/Plugin/Datetime.pm | 11 ++++++++ lib/Pear/LocalLoop/Plugin/TemplateHelpers.pm | 18 ++++++++++++ templates/admin/feedback/index.html.ep | 28 +++++++++++++++---- 5 files changed, 61 insertions(+), 8 deletions(-) create mode 100644 lib/Pear/LocalLoop/Plugin/TemplateHelpers.pm diff --git a/lib/Pear/LocalLoop.pm b/lib/Pear/LocalLoop.pm index 8bdb811..a2f3ce1 100644 --- a/lib/Pear/LocalLoop.pm +++ b/lib/Pear/LocalLoop.pm @@ -36,6 +36,7 @@ sub startup { $self->plugin('Pear::LocalLoop::Plugin::BootstrapPagination', { bootstrap4 => 1 } ); $self->plugin('Pear::LocalLoop::Plugin::Validators'); $self->plugin('Pear::LocalLoop::Plugin::Datetime'); + $self->plugin('Pear::LocalLoop::Plugin::TemplateHelpers'); $self->plugin('Authentication' => { 'load_user' => sub { diff --git a/lib/Pear/LocalLoop/Controller/Admin/Feedback.pm b/lib/Pear/LocalLoop/Controller/Admin/Feedback.pm index f9063a4..753539c 100644 --- a/lib/Pear/LocalLoop/Controller/Admin/Feedback.pm +++ b/lib/Pear/LocalLoop/Controller/Admin/Feedback.pm @@ -9,8 +9,15 @@ has result_set => sub { sub index { my $c = shift; - my $feedback_rs = $c->result_set; - $c->stash( feedbacks => [ $feedback_rs->all ] ); + my $feedback_rs = $c->result_set->search( + undef, + { + page => $c->param('page') || 1, + rows => 12, + order_by => { -desc => 'submitted_at' }, + }, + ); + $c->stash( feedback_rs => $feedback_rs ); } sub read { diff --git a/lib/Pear/LocalLoop/Plugin/Datetime.pm b/lib/Pear/LocalLoop/Plugin/Datetime.pm index c598709..1f79e45 100644 --- a/lib/Pear/LocalLoop/Plugin/Datetime.pm +++ b/lib/Pear/LocalLoop/Plugin/Datetime.pm @@ -6,6 +6,17 @@ use DateTime::Format::Strptime; sub register { my ( $plugin, $app, $conf ) = @_; + $app->helper( human_datetime_parser => sub { + return DateTime::Format::Strptime->new( pattern => '%x %X' ); + }); + + $app->helper( format_human_datetime => sub { + my ( $c, $datetime_obj ) = @_; + return $c->human_datetime_parser->format_datetime( + $datetime_obj, + ); + }); + $app->helper( iso_datetime_parser => sub { return DateTime::Format::Strptime->new( pattern => '%Y-%m-%dT%H:%M:%S.%3N%z' ); }); diff --git a/lib/Pear/LocalLoop/Plugin/TemplateHelpers.pm b/lib/Pear/LocalLoop/Plugin/TemplateHelpers.pm new file mode 100644 index 0000000..87c04d4 --- /dev/null +++ b/lib/Pear/LocalLoop/Plugin/TemplateHelpers.pm @@ -0,0 +1,18 @@ +package Pear::LocalLoop::Plugin::TemplateHelpers; +use Mojo::Base 'Mojolicious::Plugin'; + +sub register { + my ( $plugin, $app, $conf ) = @_; + + $app->helper( truncate_text => sub { + my ( $c, $string, $length ) = @_; + if ( length $string < $length ) { + return $string; + } else { + return substr( $string, 0, $length - 3 ) . '...'; + } + }); + +} + +1; diff --git a/templates/admin/feedback/index.html.ep b/templates/admin/feedback/index.html.ep index c25a176..81cf9f9 100644 --- a/templates/admin/feedback/index.html.ep +++ b/templates/admin/feedback/index.html.ep @@ -11,12 +11,28 @@ Success! <%= $success %> % } -
- % for my $feedback (@$feedbacks) { - -
- <%= $feedback->user->email %> <%= $feedback->submitted_at %> +
+ % for my $feedback ( $feedback_rs->all ) { +
+
+
+
+ %= format_human_datetime $feedback->submitted_at; +
+
+ %= $feedback->user->email; +
+ 
<%= truncate_text $feedback->feedbacktext => 50; %>
+ + More info + +
- +
% }
+
+
+ %= bootstrap_pagination( $c->param('page') || 1, $feedback_rs->pager->last_page, { class => 'justify-content-center' } ); +
+
From 9cc1358283b506df2914ff8e4ad3f0a77da7d0da Mon Sep 17 00:00:00 2001 From: Tom Bloor Date: Thu, 28 Sep 2017 17:03:26 +0100 Subject: [PATCH 03/12] improve layout of feedback reading --- templates/admin/feedback/read.html.ep | 78 +++++++++++++++++---------- 1 file changed, 51 insertions(+), 27 deletions(-) diff --git a/templates/admin/feedback/read.html.ep b/templates/admin/feedback/read.html.ep index 6a5372b..36ec73b 100644 --- a/templates/admin/feedback/read.html.ep +++ b/templates/admin/feedback/read.html.ep @@ -11,33 +11,57 @@ Success! <%= $success %>
% } -
-
- - +
+
+
+

+ User Info +

+
    +
  • + Email Address: + <%= $feedback->user->email %> +
    • +
  • + Submitted At: + <%= format_human_datetime$feedback->submitted_at %> +
    • +
+
-
- - +
+
+

+ Feedback Message +

+
+ 
<%= $feedback->feedbacktext %>
+
+
-
- - +
+
+

+ Debug Info +

+
    +
  • + App Name: + <%= $feedback->app_name %> +
    • +
  • + Package Name: + <%= $feedback->package_name %> +
    • +
  • + Version Code: + <%= $feedback->version_code %> +
    • +
  • + Version Number: + <%= $feedback->version_number %> +
    • +
+
-
- - -
-
- - -
-
- - -
-
- - -
- +
From 2486c701a51a2c3c5d34e65aeb5a5e4766cf2200 Mon Sep 17 00:00:00 2001 From: Tom Bloor Date: Thu, 28 Sep 2017 17:10:13 +0100 Subject: [PATCH 04/12] Improve feedback list some more --- templates/admin/feedback/index.html.ep | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/templates/admin/feedback/index.html.ep b/templates/admin/feedback/index.html.ep index 81cf9f9..9c1e6c7 100644 --- a/templates/admin/feedback/index.html.ep +++ b/templates/admin/feedback/index.html.ep @@ -15,14 +15,16 @@ % for my $feedback ( $feedback_rs->all ) {
+
+ %= $feedback->user->email; +
%= format_human_datetime $feedback->submitted_at;
-
- %= $feedback->user->email; - 
<%= truncate_text $feedback->feedbacktext => 50; %>
+
+
More info From cf2c7dcc4bd33d58d05425201c7b9f4410cf350f Mon Sep 17 00:00:00 2001 From: Tom Bloor Date: Fri, 29 Sep 2017 14:45:44 +0100 Subject: [PATCH 05/12] Initial pass of Transaction reports --- lib/Pear/LocalLoop.pm | 2 + lib/Pear/LocalLoop/Controller/Admin.pm | 2 +- .../LocalLoop/Controller/Admin/Reports.pm | 62 ++++++++++ .../Result/ViewQuantisedTransactionPg.pm | 12 ++ .../Result/ViewQuantisedTransactionSQLite.pm | 21 ++++ .../admin/reports/transaction_data.html.ep | 116 ++++++++++++++++++ 6 files changed, 214 insertions(+), 1 deletion(-) create mode 100644 lib/Pear/LocalLoop/Controller/Admin/Reports.pm create mode 100644 lib/Pear/LocalLoop/Schema/Result/ViewQuantisedTransactionPg.pm create mode 100644 lib/Pear/LocalLoop/Schema/Result/ViewQuantisedTransactionSQLite.pm create mode 100644 templates/admin/reports/transaction_data.html.ep diff --git a/lib/Pear/LocalLoop.pm b/lib/Pear/LocalLoop.pm index a2f3ce1..b9eed08 100644 --- a/lib/Pear/LocalLoop.pm +++ b/lib/Pear/LocalLoop.pm @@ -193,6 +193,8 @@ sub startup { $admin_routes->get('/transactions/:id/image')->to('admin-transactions#image'); $admin_routes->post('/transactions/:id/delete')->to('admin-transactions#delete'); + $admin_routes->get('/reports/transactions')->to('admin-reports#transaction_data'); + # my $user_routes = $r->under('/')->to('root#under'); # $user_routes->get('/home')->to('root#home'); diff --git a/lib/Pear/LocalLoop/Controller/Admin.pm b/lib/Pear/LocalLoop/Controller/Admin.pm index 8030d59..7a9cf8d 100644 --- a/lib/Pear/LocalLoop/Controller/Admin.pm +++ b/lib/Pear/LocalLoop/Controller/Admin.pm @@ -7,7 +7,7 @@ sub under { if ( $c->is_user_authenticated ) { return 1 if $c->current_user->is_admin; } - $c->redirect_to('/'); + $c->redirect_to('/admin'); return 0; } diff --git a/lib/Pear/LocalLoop/Controller/Admin/Reports.pm b/lib/Pear/LocalLoop/Controller/Admin/Reports.pm new file mode 100644 index 0000000..658d4e5 --- /dev/null +++ b/lib/Pear/LocalLoop/Controller/Admin/Reports.pm @@ -0,0 +1,62 @@ +package Pear::LocalLoop::Controller::Admin::Reports; +use Mojo::Base 'Mojolicious::Controller'; + +use Mojo::JSON qw/ encode_json /; + +sub transaction_data { + my $c = shift; + + my $driver = $c->schema->storage->dbh->{Driver}->{Name}; + my $transaction_rs = $c->schema->resultset('ViewQuantisedTransaction' . $driver)->search( + {}, + { + columns => [ + 'quantised_hours', + { + count => \"COUNT(*)", + sum_distance => $c->pg_or_sqlite( + '', + 'SUM("me"."distance")', + ), + average_distance => $c->pg_or_sqlite( + '', + 'AVG("me"."distance")', + ), + sum_value => $c->pg_or_sqlite( + '', + 'SUM("me"."value")', + ), + average_value => $c->pg_or_sqlite( + '', + 'AVG("me"."value")', + ), + } + ], + group_by => 'quantised_hours', + order_by => { '-asc' => 'quantised_hours' }, + } + ); + + $transaction_rs->result_class('DBIx::Class::ResultClass::HashRefInflator'); + + $c->stash( + transaction_rs => encode_json( [$transaction_rs->all] ), + ); +} + +sub pg_or_sqlite { + my ( $c, $pg_sql, $sqlite_sql ) = @_; + + my $driver = $c->schema->storage->dbh->{Driver}->{Name}; + + if ( $driver eq 'Pg' ) { + return \$pg_sql; + } elsif ( $driver eq 'SQLite' ) { + return \$sqlite_sql; + } else { + $c->app->log->warn('Unknown Driver Used'); + return undef; + } +} + +1; diff --git a/lib/Pear/LocalLoop/Schema/Result/ViewQuantisedTransactionPg.pm b/lib/Pear/LocalLoop/Schema/Result/ViewQuantisedTransactionPg.pm new file mode 100644 index 0000000..adfcd7a --- /dev/null +++ b/lib/Pear/LocalLoop/Schema/Result/ViewQuantisedTransactionPg.pm @@ -0,0 +1,12 @@ +package Pear::LocalLoop::Schema::Result::ViewQuantisedTransactionPg; + +use strict; +use warnings; + +use base 'DBIx::Class::Core'; + +__PACKAGE__->table_class('DBIx::Class::ResultSource::View'); +__PACKAGE__->table('view_quantised_transactions'); +__PACKAGE__->result_source_instance->is_virtual(1); + +1; diff --git a/lib/Pear/LocalLoop/Schema/Result/ViewQuantisedTransactionSQLite.pm b/lib/Pear/LocalLoop/Schema/Result/ViewQuantisedTransactionSQLite.pm new file mode 100644 index 0000000..2ce3aac --- /dev/null +++ b/lib/Pear/LocalLoop/Schema/Result/ViewQuantisedTransactionSQLite.pm @@ -0,0 +1,21 @@ +package Pear::LocalLoop::Schema::Result::ViewQuantisedTransactionSQLite; + +use strict; +use warnings; + +use base 'DBIx::Class::Core'; + +__PACKAGE__->table_class('DBIx::Class::ResultSource::View'); +__PACKAGE__->table('view_quantised_transactions'); +__PACKAGE__->result_source_instance->is_virtual(1); + +__PACKAGE__->result_source_instance->view_definition( qq/ +SELECT "value", + "distance", + "purchase_time", + DATETIME(STRFTIME('%Y-%m-%d %H:00:00',"purchase_time")) AS "quantised_hours", + DATETIME(STRFTIME('%Y-%m-%d 00:00:00',"purchase_time")) AS "quantised_days" + FROM "transactions" +/); + +1; diff --git a/templates/admin/reports/transaction_data.html.ep b/templates/admin/reports/transaction_data.html.ep new file mode 100644 index 0000000..a3457b9 --- /dev/null +++ b/templates/admin/reports/transaction_data.html.ep @@ -0,0 +1,116 @@ +% layout 'admin'; +% title 'Tokens'; +% content_for javascript => begin + + +% end +% if ( my $error = flash 'error' ) { + +% } elsif ( my $success = flash 'success' ) { + +% } +
+
+
+
+%= $transaction_rs;
+
From bf74fcc44f1c0b90d69ce046413546845d9c2735 Mon Sep 17 00:00:00 2001 From: Tom Bloor Date: Fri, 29 Sep 2017 15:52:34 +0100 Subject: [PATCH 06/12] Redo all admin pages for bootstrap 4 beta --- templates/admin/feedback/index.html.ep | 2 +- templates/admin/feedback/read.html.ep | 8 +- templates/admin/home.html.ep | 24 +-- .../admin/organisations/valid_read.html.ep | 42 ++--- .../admin/reports/transaction_data.html.ep | 72 +++++--- templates/admin/tokens/index.html.ep | 10 +- templates/admin/transactions/index.html.ep | 12 +- templates/admin/transactions/read.html.ep | 12 +- templates/admin/users/read.html.ep | 158 +++++++++--------- templates/layouts/admin.html.ep | 47 ++++-- 10 files changed, 210 insertions(+), 177 deletions(-) diff --git a/templates/admin/feedback/index.html.ep b/templates/admin/feedback/index.html.ep index 9c1e6c7..049449c 100644 --- a/templates/admin/feedback/index.html.ep +++ b/templates/admin/feedback/index.html.ep @@ -18,7 +18,7 @@
%= $feedback->user->email;
-
+
%= format_human_datetime $feedback->submitted_at;
diff --git a/templates/admin/feedback/read.html.ep b/templates/admin/feedback/read.html.ep index 36ec73b..840a35b 100644 --- a/templates/admin/feedback/read.html.ep +++ b/templates/admin/feedback/read.html.ep @@ -24,7 +24,7 @@
  • Submitted At: - <%= format_human_datetime$feedback->submitted_at %> + <%= format_human_datetime $feedback->submitted_at %>
    • @@ -34,8 +34,10 @@

    Feedback Message

    -
    - 
    <%= $feedback->feedbacktext %>
    +
    +
    + 
    <%= $feedback->feedbacktext %>
    +
    diff --git a/templates/admin/home.html.ep b/templates/admin/home.html.ep index ebc749b..3f1aa45 100644 --- a/templates/admin/home.html.ep +++ b/templates/admin/home.html.ep @@ -3,41 +3,41 @@ % content_for javascript => begin % end
    -
    -
    +
    +
    User Count
    -
    +

    %= $user_count

    -
    -
    +
    +
    Unused Tokens
    -
    +

    <%= $tokens->{unused} %> / <%= $tokens->{total} %>

    -
    -
    +
    +
    Pending Organisations
    -
    +

    %= $pending_orgs

    -
    -
    +
    +
    Pending Transactions
    -
    +

    %= $pending_trans

    diff --git a/templates/admin/organisations/valid_read.html.ep b/templates/admin/organisations/valid_read.html.ep index 8a0f0e2..ce24858 100644 --- a/templates/admin/organisations/valid_read.html.ep +++ b/templates/admin/organisations/valid_read.html.ep @@ -36,7 +36,7 @@ function initMap() {

    %= $valid_org->name

    -
    +
    @@ -93,11 +93,7 @@ function initMap() {
    -
    - - -
    -
    +
    @@ -106,28 +102,22 @@ function initMap() {

    Transactions

    - +
    + %= bootstrap_pagination( $c->param('page') || 1, $transactions->pager->last_page, { class => 'justify-content-center' } ); +
    +
    diff --git a/templates/admin/reports/transaction_data.html.ep b/templates/admin/reports/transaction_data.html.ep index a3457b9..04fee8d 100644 --- a/templates/admin/reports/transaction_data.html.ep +++ b/templates/admin/reports/transaction_data.html.ep @@ -1,27 +1,27 @@ % layout 'admin'; -% title 'Tokens'; +% title 'Transaction Report'; % content_for javascript => begin - - %= stylesheet '/static/admin/css/main.css'; -