X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=mainpage.pl;h=f5872e65bbb27103b384b62789f29e0157f7537c;hb=4bd0cb39abca3f2a2dbe80fd567e6b956bb9a52a;hp=c1df82b4420e829d3dc36e14911c16d8235a8029;hpb=da172a560f7c4c2ba3eab69144ddcac9043b2c3b;p=srvgit

diff --git a/mainpage.pl b/mainpage.pl
index c1df82b442..f5872e65bb 100755
--- a/mainpage.pl
+++ b/mainpage.pl
@@ -21,39 +21,50 @@
 
 use Modern::Perl;
 use CGI qw ( -utf8 );
-use C4::Output;
-use C4::Auth;
+use C4::Output qw( output_html_with_http_headers );
+use C4::Auth qw( get_template_and_user );
 use C4::Koha;
-use C4::NewsChannels; # GetNewsToDisplay
-use C4::Suggestions qw/CountSuggestion/;
-use C4::Tags qw/get_count_by_tag_status/;
+use C4::Tags qw( get_count_by_tag_status );
+use Koha::AdditionalContents;
 use Koha::Patron::Modifications;
 use Koha::Patron::Discharge;
 use Koha::Reviews;
 use Koha::ArticleRequests;
+use Koha::ProblemReports;
+use Koha::Quotes;
+use Koha::Suggestions;
+use Koha::BackgroundJobs;
+use Koha::CurbsidePickups;
 
-my $query = new CGI;
+my $query = CGI->new;
 
 my ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user(
     {
         template_name   => "intranet-main.tt",
         query           => $query,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { catalogue => 1, },
     }
 );
 
+my $logged_in_user = Koha::Patrons->find($loggedinuser);
+
 my $homebranch;
 if (C4::Context->userenv) {
     $homebranch = C4::Context->userenv->{'branch'};
 }
-my $all_koha_news   = &GetNewsToDisplay("koha",$homebranch);
-my $koha_news_count = scalar @$all_koha_news;
+my $koha_news = Koha::AdditionalContents->search_for_display(
+    {
+        category   => 'news',
+        location   => [ 'staff_only', 'staff_and_opac' ],
+        lang       => $template->lang,
+        library_id => $homebranch
+    }
+);
 
 $template->param(
-    koha_news       => $all_koha_news,
-    koha_news_count => $koha_news_count
+    koha_news   => $koha_news,
+    daily_quote => Koha::Quotes->get_daily_quote(),
 );
 
 my $branch =
@@ -63,32 +74,58 @@ my $branch =
   ? C4::Context->userenv()->{'branch'}
   : undef;
 
-my $pendingcomments    = Koha::Reviews->search({ approved => 0 })->count;
+my $pendingcomments    = Koha::Reviews->search_limited({ approved => 0 })->count;
 my $pendingtags        = get_count_by_tag_status(0);
-my $pendingsuggestions = CountSuggestion("ASKED");
+
+# Get current branch count and total viewable count, if they don't match then pass
+# both to template
+
+if( C4::Context->only_my_library ){
+    my $local_pendingsuggestions_count = Koha::Suggestions->search({ status => "ASKED", branchcode => C4::Context->userenv()->{'branch'} })->count();
+    $template->param( pendingsuggestions => $local_pendingsuggestions_count );
+} else {
+    my $pendingsuggestions = Koha::Suggestions->search({ status => "ASKED" });
+    my $local_pendingsuggestions_count = $pendingsuggestions->search({ 'me.branchcode' => C4::Context->userenv()->{'branch'} })->count();
+    my $pendingsuggestions_count = $pendingsuggestions->count();
+    $template->param(
+        all_pendingsuggestions => $pendingsuggestions_count != $local_pendingsuggestions_count ? $pendingsuggestions_count : 0,
+        pendingsuggestions => $local_pendingsuggestions_count
+    );
+}
+
 my $pending_borrower_modifications = Koha::Patron::Modifications->pending_count( $branch );
 my $pending_discharge_requests = Koha::Patron::Discharge::count({ pending => 1 });
-my $pending_article_requests = Koha::ArticleRequests->count(
+my $pending_article_requests = Koha::ArticleRequests->search_limited(
     {
-        status => Koha::ArticleRequest::Status::Pending,
-        $branch ? ( branchcode => $branch ) : (),
+        status => Koha::ArticleRequest::Status::Requested,
+        $branch ? ( 'me.branchcode' => $branch ) : (),
     }
-);
+)->count;
+my $pending_problem_reports = Koha::ProblemReports->search({ status => 'New' });
+
+unless ( $logged_in_user->has_permission( { parameters => 'manage_background_jobs' } ) ) {
+    my $already_ran_jobs = Koha::BackgroundJobs->search(
+        { borrowernumber => $logged_in_user->borrowernumber } )->count ? 1 : 0;
+    $template->param( already_ran_jobs => $already_ran_jobs );
+}
+
+if ( C4::Context->preference('CurbsidePickup') ) {
+    $template->param(
+        new_curbside_pickups => Koha::CurbsidePickups->search(
+            {
+                branchcode                => $homebranch,
+            }
+        )->filter_by_to_be_staged->filter_by_scheduled_today,
+    );
+}
 
 $template->param(
     pendingcomments                => $pendingcomments,
     pendingtags                    => $pendingtags,
-    pendingsuggestions             => $pendingsuggestions,
     pending_borrower_modifications => $pending_borrower_modifications,
     pending_discharge_requests     => $pending_discharge_requests,
     pending_article_requests       => $pending_article_requests,
+    pending_problem_reports        => $pending_problem_reports
 );
 
-#
-# warn user if they are using mysql/admin login
-#
-unless ($loggedinuser) {
-    $template->param(adminWarning => 1);
-}
-
 output_html_with_http_headers $query, $cookie, $template->output;