Added pagination to organisation pages

This commit is contained in:
Tom Bloor 2017-07-25 15:44:16 +01:00
parent 1df31d79a0
commit 4644f9217e
6 changed files with 249 additions and 16 deletions

View file

@ -33,6 +33,7 @@ sub startup {
push @{ $self->commands->namespaces }, __PACKAGE__ . '::Command'; push @{ $self->commands->namespaces }, __PACKAGE__ . '::Command';
$self->plugin('Pear::LocalLoop::Plugin::BootstrapPagination', { bootstrap4 => 1 } );
$self->plugin('Pear::LocalLoop::Plugin::Validators'); $self->plugin('Pear::LocalLoop::Plugin::Validators');
$self->plugin('Authentication' => { $self->plugin('Authentication' => {

View file

@ -25,18 +25,6 @@ sub run {
my $schema = $self->app->schema; my $schema = $self->app->schema;
$schema->resultset('Leaderboard')->populate([
[ qw/ name type / ],
[ 'Daily Total', 'daily_total' ],
[ 'Daily Count', 'daily_count' ],
[ 'Weekly Total', 'weekly_total' ],
[ 'Weekly Count', 'weekly_count' ],
[ 'Monthly Total', 'monthly_total' ],
[ 'Monthly Count', 'monthly_count' ],
[ 'All Time Total', 'all_time_total' ],
[ 'All Time Count', 'all_time_count' ],
]);
$schema->resultset('User')->create({ $schema->resultset('User')->create({
email => 'test@example.com', email => 'test@example.com',
password => 'abc123', password => 'abc123',

View file

@ -18,13 +18,31 @@ sub list {
sub valid_read { sub valid_read {
my $c = shift; my $c = shift;
my $valid_org = $c->schema->resultset('Organisation')->find( $c->param('id') ); my $valid_org = $c->schema->resultset('Organisation')->find( $c->param('id') );
$c->stash( valid_org => $valid_org ); my $transactions = $valid_org->transactions->search(
undef, {
page => $c->param('page') || 1,
rows => 10,
},
);
$c->stash(
valid_org => $valid_org,
transactions => $transactions,
);
} }
sub pending_read { sub pending_read {
my $c = shift; my $c = shift;
my $pending_org = $c->schema->resultset('PendingOrganisation')->find( $c->param('id') ); my $pending_org = $c->schema->resultset('PendingOrganisation')->find( $c->param('id') );
$c->stash( pending_org => $pending_org ); my $transactions = $pending_org->transactions->search(
undef, {
page => $c->param('page') || 1,
rows => 10,
},
);
$c->stash(
pending_org => $pending_org,
transactions => $transactions,
);
} }
sub pending_approve { sub pending_approve {

View file

@ -0,0 +1,216 @@
package Pear::LocalLoop::Plugin::BootstrapPagination;
# nabbed from Mojolicious::Plugin::BootstrapPagination -
# https://github.com/csroli/Mojolicious-Plugin-BootstrapPagination
use Mojo::Base 'Mojolicious::Plugin';
use POSIX( qw/ceil/ );
use Mojo::ByteStream 'b';
use strict;
use warnings;
our $VERSION = "0.14";
# Homer: Well basically, I just copied the plant we have now.
# Then, I added some fins to lower wind resistance.
# And this racing stripe here I feel is pretty sharp.
# Burns: Agreed. First prize!
sub register{
my ( $self, $app, $args ) = @_;
$args ||= {};
$app->helper( bootstrap_pagination => sub{
my ( $self, $actual, $count, $opts ) = @_;
my %bs4classes = (list_class => "page-item", anchor_class => "page-link");
my $localize = ( $opts->{localize} || $args->{localize} ) ?
( $opts->{localize} || $args->{localize} ) : undef;
$count = ceil($count);
return "" unless $count > 1;
$opts = {} unless $opts;
my $round = $opts->{round} || $args->{round} || 4;
my $param = $opts->{param} || $args->{param} || "page";
my $class = $opts->{class} || $args->{class} || "";
my $bs4 = $opts->{bootstrap4} || $args->{bootstrap4} || undef;
if ($class ne ""){
$class = " " . $class;
}
my $outer = $opts->{outer} || $args->{outer} || 2;
my $query = exists $opts->{query} ? $opts->{query} : $args->{query} || "";
my $start = $opts->{start} // $args->{start} // 1;
my @current = ( $actual - $round .. $actual + $round );
my @first = ($start.. $start + $outer - 1);
my @tail = ( $count - $outer + 1 .. $count );
my @ret = ();
my $last = undef;
foreach my $number( sort { $a <=> $b } @current, @first, @tail ){
next if ( $last && $last == $number && $start > 0 ) || ( defined $last && $last == $number && $start == 0 );
next if ( $number <= 0 && $start > 0) || ( $number < 0 && $start == 0 );
last if ( $number > $count && $start > 0 ) || ( $number >= $count && $start == 0 );
push @ret, ".." if( $last && $last + 1 != $number );
push @ret, $number;
$last = $number;
}
my $html = "<ul class=\"pagination$class\">";
if( $actual == $start ){
$html .= "<li class=\"disabled".($bs4?" ".$bs4classes{list_class}:"")."\"><a".($bs4?" class=\"".$bs4classes{anchor_class}."\"":"")." href=\"#\" >&laquo;</a></li>";
} else {
$html .= "<li".($bs4?" class=\"".$bs4classes{list_class}."\"":"")."><a".($bs4?" class=\"".$bs4classes{anchor_class}."\"":"")." href=\"" . $self->url_with->query( [$param => $actual - 1] ) . $query . "\" >&laquo;</a></li>";
}
my $last_num = -1;
foreach my $number( @ret ){
my $show_number = $start > 0 ? $number : ( $number =~ /\d+/ ? $number + 1 : $number );
if ( $localize ) {
$show_number = $localize->($self, $show_number);
}
if( $number eq ".." && $last_num < $actual ){
my $offset = ceil( ( $actual - $round ) / 2 ) + 1 ;
$html .= "<li".($bs4?" class=\"".$bs4classes{list_class}."\"":"")."><a".($bs4?" class=\"".$bs4classes{anchor_class}."\"":"")." href=\"" . $self->url_with->query( [$param => $start == 0 ? $offset + 1 : $offset] ) . $query ."\" >&hellip;</a></li>";
}
elsif( $number eq ".." && $last_num > $actual ) {
my $back = $count - $outer + 1;
my $forw = $round + $actual;
my $offset = ceil( ( ( $back - $forw ) / 2 ) + $forw );
$html .= "<li".($bs4?" class=\"".$bs4classes{list_class}."\"":"")."><a".($bs4?" class=\"".$bs4classes{anchor_class}."\"":"")." href=\"" . $self->url_with->query( [$param => $start == 0 ? $offset + 1 : $offset] ) . $query ."\" >&hellip;</a></li>";
} elsif( $number == $actual ) {
$html .= "<li class=\"active".($bs4?" ".$bs4classes{list_class}:"")."\"><span".($bs4?" class=\"".$bs4classes{anchor_class}."\"":"").">$show_number</span></li>";
} else {
$html .= "<li".($bs4?" class=\"".$bs4classes{list_class}."\"":"")."><a".($bs4?" class=\"".$bs4classes{anchor_class}."\"":"")." href=\"" . $self->url_with->query( [$param => $number] ) . $query ."\">$show_number</a></li>";
}
$last_num = $number;
}
if( $actual == $count ){
$html .= "<li class=\"disabled".($bs4?" ".$bs4classes{list_class}:"")."\"><a".($bs4?" class=\"".$bs4classes{anchor_class}."\"":"")." href=\"" . $self->url_with->query( [$param => $actual + 1] ) . $query . "\" >&raquo;</a></li>";
} else {
$html .= "<li".($bs4?" class=\"".$bs4classes{list_class}."\"":"")."><a".($bs4?" class=\"".$bs4classes{anchor_class}."\"":"")." href=\"" . $self->url_with->query( [$param => $actual + 1] ) . $query . "\" >&raquo;</a></li>";
}
$html .= "</ul>";
return b( $html );
} );
}
1;
__END__
=encoding utf-8
=head1 NAME
Mojolicious::Plugin::BootstrapPagination - Page Navigator plugin for Mojolicious
This module has derived from L<Mojolicious::Plugin::PageNavigator>
=head1 SYNOPSIS
# Mojolicious::Lite
plugin 'bootstrap_pagination'
# Mojolicious
$self->plugin( 'bootstrap_pagination' );
=head1 DESCRIPTION
L<Mojolicious::Plugin::BootstrapPagination> generates standard page navigation bar, like
<< 1 2 ... 11 12 13 14 15 ... 85 86 >>
=head1 HELPERS
=head2 bootstrap_pagination
%= bootstrap_pagination( $current_page, $total_pages, $opts );
=head3 Options
Options is a optional ref hash.
%= bootstrap_pagination( $current_page, $total_pages, {
round => 4,
outer => 2,
query => "&id=$id",
start => 1,
class => 'pagination-lg',
param => 'page' } );
=over 1
=item round
Number of pages around the current page. Default: 4.
=item outer
Number of outer window pages (first and last pages). Default 2.
=item param
Name of param for query url. Default: 'page'
=item query
Additional query string to url. Optional.
=item start
Start number for query string. Default: 1. Optional.
=back
=head1 INTERNATIONALIZATION
If you want to use internationalization (I18N), you can pass a code reference via I<localize>.
plugin 'bootstrap_pagination' => {
localize => \&localize,
};
sub localize {
my ($number) = @_;
my %trans = (
1 => 'one',
2 => 'two',
6 => 'six',
7 => 'seven',
8 => 'eight',
9 => 'nine',
10 => 'ten',
11 => 'eleven',
12 => 'twelve',
13 => 'thirteen',
14 => 'fourteen',
15 => 'fifteen',
);
return $trans{$number};
}
This will print the words instead of the numbers.
=head1 SEE ALSO
L<Mojolicious>, L<Mojolicious::Guides>, L<http://mojolicio.us>,L<Mojolicious::Plugin::PageNavigator>.
=head1 Repository
https://github.com/dokechin/Mojolicious-Plugin-BootstrapPagination
=head1 LICENSE
Copyright (C) dokechin.
This library is free software; you can redistribute it and/or modify
it under the same terms as Perl itself.
=head1 AUTHOR
dokechin E<lt>E<gt>
=head1 CONTRIBUTORS
Andrey Chips Kuzmin <chipsoid@cpan.org>
=cut

View file

@ -27,7 +27,7 @@
Transactions Transactions
</h3> </h3>
<ul class="list-group list-group-flush"> <ul class="list-group list-group-flush">
% for my $transaction ( $pending_org->transactions->all ) { % for my $transaction ( $transactions->all ) {
<li class="list-group-item"> <li class="list-group-item">
<div class="container"> <div class="container">
<div class="row text-center"> <div class="row text-center">
@ -38,5 +38,10 @@
</div> </div>
</li> </li>
% } % }
<li class="list-group-item">
<div class="container">
%= bootstrap_pagination( $c->param('page') || 1, $transactions->pager->last_page, { class => 'justify-content-center' } );
</div>
</li>
</ul> </ul>
</div> </div>

View file

@ -26,7 +26,7 @@
Transactions Transactions
</h3> </h3>
<ul class="list-group list-group-flush"> <ul class="list-group list-group-flush">
% for my $transaction ( $valid_org->transactions->all ) { % for my $transaction ( $transactions->all ) {
<li class="list-group-item"> <li class="list-group-item">
<div class="container"> <div class="container">
<div class="row text-center"> <div class="row text-center">
@ -37,5 +37,10 @@
</div> </div>
</li> </li>
% } % }
<li class="list-group-item">
<div class="container">
%= bootstrap_pagination( $c->param('page') || 1, $transactions->pager->last_page, { class => 'justify-content-center' } );
</div>
</li>
</ul> </ul>
</div> </div>