Tambah tombol filter berdasarkan tanggal (#449)

* Tambah tombol filter berdasarkan tanggal * Fix styling * Sesuaikan value * Perbaiki tidak ada kepala keluarga di kk * [ci skip] memutakhirkan catatan rilis * u * Fix styling Co-authored-by: yogiperdana <[email protected]> Co-authored-by: vickyrolanda <[email protected]> Co-authored-by: Vicky Rolanda <[email protected]> Co-authored-by: firlianif <[email protected]> Co-authored-by: FirlianiF <[email protected]>
OpenSID · Aug 1, 2022 · efe84e4 · efe84e4
1 parent 9865d43
commit efe84e4
Show file tree

Hide file tree

Showing 10 changed files with 43 additions and 19 deletions.
diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php
@@ -32,6 +32,7 @@
 namespace App\Console;
 
 use function base_path;
+
 use Illuminate\Console\Scheduling\Schedule;
 
 use Illuminate\Foundation\Console\Kernel as ConsoleKernel;

diff --git a/app/Helpers/Counter.php b/app/Helpers/Counter.php
@@ -34,13 +34,15 @@
 use App\Models\CounterPage;
 use App\Models\CounterVisitor;
 use Carbon\Carbon;
+
 use function config;
 use function env;
 use function hash;
 
 use Illuminate\Support\Facades\Cookie;
 use Illuminate\Support\Facades\DB;
 use Jaybizzle\CrawlerDetect\CrawlerDetect;
+
 use function number_format;
 
 class Counter

diff --git a/app/Http/Controllers/Page/PageController.php b/app/Http/Controllers/Page/PageController.php
@@ -122,6 +122,13 @@ public function filterFeeds(Request $request)
         }
 
         $feeds = $feeds->sortByDesc('date')->take(config('setting.jumlah_artikel_desa') ?? 30)->paginate(config('setting.artikel_desa_perhalaman') ?? 10);
+
+        // Tanggal
+        $tanggal = $request->tanggal;
+        if ($tanggal != 'Terlama') {
+            $feeds = $feeds->sortBy('date')->take(config('setting.jumlah_artikel_desa') ?? 30)->paginate(config('setting.artikel_desa_perhalaman') ?? 10);
+        }
+
         $feeds->all();
 
         $html =  view('pages.berita.feeds', [

diff --git a/app/Http/Middleware/CustomForms.php b/app/Http/Middleware/CustomForms.php
@@ -32,10 +32,12 @@
 namespace App\Http\Middleware;
 
 use function array_diff_key;
+
 use Closure;
 use Form;
 
 use Illuminate\Http\Request;
+
 use function session;
 use function sprintf;
 

diff --git a/app/Http/Middleware/KDInstalled.php b/app/Http/Middleware/KDInstalled.php
@@ -32,9 +32,11 @@
 namespace App\Http\Middleware;
 
 use Closure;
+
 use function file_exists;
 
 use Illuminate\Http\Request;
+
 use function redirect;
 use function storage_path;
 

diff --git a/app/Providers/BroadcastServiceProvider.php b/app/Providers/BroadcastServiceProvider.php
@@ -32,6 +32,7 @@
 namespace App\Providers;
 
 use function base_path;
+
 use Illuminate\Support\Facades\Broadcast;
 
 use Illuminate\Support\ServiceProvider;

diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php
@@ -32,6 +32,7 @@
 namespace App\Providers;
 
 use function base_path;
+
 use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider;
 
 use Illuminate\Support\Facades\Route;

diff --git a/catatan_rilis.md b/catatan_rilis.md
@@ -1,13 +1,14 @@
-#### [v22.07.01]
+#### [v22.08.01]
 
-Di rilis v22.07.01, menyediakan Widget Sidebar Foto Camat Rilis ini juga berisi perbaikan lain yang diminta Komunitas OpenDK.
+Di rilis v22.08.01, menyediakan Widget Sidebar Foto Camat Rilis ini juga berisi perbaikan lain yang diminta Komunitas OpenDK.
 
 Terima kasih pada totoprayogo1916 yang terus berkontribusi. Terima kasih pula pada vickyrolanda yang baru mulai berkontribusi.
 
 
 #### Penambahan Fitur
 
 1. [#142](https://github.com/OpenSID/OpenDK/issues/142) Sediakan Widget Sidebar Foto Camat.
+2. [#360](https://github.com/OpenSID/OpenDK/issues/360) Tampilkan berita desa yang berurutan berdasarkan tanggal penerbitan artikel.
 
 #### Perbaikan BUG
 

diff --git a/resources/views/pages/berita/desa.blade.php b/resources/views/pages/berita/desa.blade.php
@@ -113,24 +113,28 @@
 	</div>
 	<form class="form-horizontal" id="form_filter" method="get" action="{{ route('filter-berita-desa') }}">
 		<input type="hidden" value="1" name="page">
-	<div class="page-header" style="margin:0px 0px;">
-		<span style="display: inline-flex; vertical-align: middle;"><strong class="">Berita Desa</strong></span>
-	</div>
-	<div class="page-header" style="margin:0px 0px; padding: 0px;">
-		<select class="form-control" id="list_desa" name="desa" style="width: auto;">
-			<option value="Semua">Semua Desa</option>
-			@foreach($list_desa as $desa)
-				<option value="{{ $desa->desa_id }}" <?php $cari_desa == $desa->desa_id && print('selected') ?>>{{$desa->nama}} </option>
-			@endforeach
-		</select>
-		<div class="input-group input-group-sm" style="display: inline-flex; float: right; padding: 5px;">
-			<input class="form-control" style="height: auto;" type="text" name="cari" placeholder="Cari berita" value="{{$cari}}"/>
-			<button type="submit" class="btn btn-info btn-block" style="width: auto;">
-				<i class="fa fa-search"></i>
-			</button>
+		<div class="page-header" style="margin:0px 0px;">
+			<span style="display: inline-flex; vertical-align: middle;"><strong class="">Berita Desa</strong></span>
 		</div>
-	</div>
-</form>
+		<div class="page-header" style="margin:0px 0px; padding: 0px;">
+			<select class="form-control" id="list_desa" name="desa" style="width: auto;">
+				<option value="Semua">Semua Desa</option>
+				@foreach($list_desa as $desa)
+					<option value="{{ $desa->desa_id }}" <?php $cari_desa == $desa->desa_id && print('selected') ?>>{{$desa->nama}} </option>
+				@endforeach
+			</select>
+			<select class="form-control" id="tanggal" name="tanggal" style="display: inline-flex; width: auto;">
+				<option value="Terlama">Terbaru</option>
+				<option value="Terbaru">Terlama</option>
+			</select>
+			<div class="input-group input-group-sm" style="display: inline-flex; float: right; padding: 5px;">
+				<input class="form-control" style="height: auto;" type="text" name="cari" placeholder="Cari berita" value="{{$cari}}"/>
+				<button type="submit" class="btn btn-info btn-block" style="width: auto;">
+					<i class="fa fa-search"></i>
+				</button>
+			</div>
+		</div>
+	</form>
 	@include('pages.berita.feeds')
 
 </div>

diff --git a/resources/views/pages/berita/feeds.blade.php b/resources/views/pages/berita/feeds.blade.php
@@ -54,6 +54,9 @@
 		$( "#list_desa" ).change(function() {
 			$( "#form_filter" ).submit();
 		});
+    $( "#tanggal" ).change(function() {
+			$( "#form_filter" ).submit();
+		});
 
 		$(document).on('click', '.pagination a', function(event){
       event.preventDefault();