Fix upcoming notes

Author: Sobak

app/Http/Controllers/NoteController.php

@@ -189,17 +189,21 @@ public function getRemove($id)
      *
      * @return \Illuminate\Http\Response
      */
-    public function getUpcoming()
+    public function getUpcoming($mode = null)
     {
         $perPage = Auth::user()->options['notes_per_page'];
 
-        $notes = Note::logged()
+        $query = Note::logged()
             ->where('status', 0)
-            ->whereNotNull('expires_at')
-            ->orderBy('expires_at', 'asc')
-            ->simplePaginate($perPage);
+            ->whereNotNull('expires_at');
 
-        return View::make('index', [
+        if ($mode == 'no-expired') {
+            $query->whereRaw('expires_at > NOW()');
+        }
+
+        $notes = $query->orderBy('expires_at', 'asc')->simplePaginate($perPage);
+
+        return View::make('note.upcoming', [
             'notes' => $notes,
             'title' => trans('note.upcoming.title'),
         ]);

app/Http/routes.php

@@ -44,4 +44,4 @@
 
 Route::get('stats', ['as' => 'stats', 'uses' => 'StatisticsController@getIndex']);
 
-Route::get('upcoming', ['as' => 'upcoming', 'uses' => 'NoteController@getUpcoming']);
+Route::get('upcoming/{mode?}', ['as' => 'upcoming', 'uses' => 'NoteController@getUpcoming']);

resources/lang/pl/note.php

@@ -44,6 +44,7 @@
     ],
     'removed' => 'Notatka została usunięta.',
     'upcoming' => [
+        'no-expired' => 'Bez przekroczonych',
         'title' => 'Nadchodzące notatki',
     ],
 ];

resources/views/note/upcoming.blade.php

@@ -0,0 +1,31 @@
+@extends('app')
+
+@section('content')
+<h2>
+    @lang('note.upcoming.title')
+    <a href="{!! route('upcoming', ['mode' => 'no-expired']) !!}" class="btn btn-default btn-sm">
+        @lang('note.upcoming.no-expired')
+    </a>
+</h2>
+
+<div class="jscroll-container">
+    @each('note.single', $notes, 'note')
+
+    {!! $notes->render() !!}
+</div>
+@stop
+
+@section('footer')
+<script>
+$('.pager').hide();
+$('.jscroll-container').jscroll({
+    loadingHtml: '<i class="fa fa-spinner fa-spin"></i>',
+    padding: 10,
+    nextSelector: '.pager a[rel="next"]',
+    contentSelector: '.jscroll-container',
+    callback: function () {
+        $('.pager').hide();
+    }
+});
+</script>
+@stop