From 13287d3bc42befa0e817445acb920ac38671a552 Mon Sep 17 00:00:00 2001 From: Zakiaass <117088186+zakiaass@users.noreply.github.com> Date: Thu, 14 Mar 2024 14:54:28 +0700 Subject: [PATCH] Pagination and Searching --- app/Http/Controllers/CriteriaController.php | 9 +++-- app/Http/Controllers/DashboardController.php | 4 +-- app/Http/Controllers/DataUserController.php | 8 +++-- .../Controllers/ExtracurricularController.php | 12 +++++-- .../Controllers/SubCriteriaController.php | 11 ++++-- app/Providers/AppServiceProvider.php | 3 +- public/DataUser/data-user.xlsx | Bin 8502 -> 8591 bytes resources/views/dashboard/index.blade.php | 33 +++++++++++++----- .../ekstrakurikuler/ekstrakurikuler.blade.php | 16 ++++++--- resources/views/kriteria/kriteria.blade.php | 21 +++++------ resources/views/layout/main.blade.php | 8 ++--- .../views/subkriteria/subkriteria.blade.php | 14 ++++++-- resources/views/user/user.blade.php | 30 ++++++++++------ 13 files changed, 119 insertions(+), 50 deletions(-) diff --git a/app/Http/Controllers/CriteriaController.php b/app/Http/Controllers/CriteriaController.php index 6c7f3d1..b07bf06 100644 --- a/app/Http/Controllers/CriteriaController.php +++ b/app/Http/Controllers/CriteriaController.php @@ -39,9 +39,14 @@ class CriteriaController extends Controller // return redirect()->route('kriteria.index')->with('success', 'Bobot kriteria berhasil dihitung dan disimpan.'); // } - public function index() + public function index(Request $request) { - $criterias = Criteria::all(); + if ($request->has('search')) { + $criterias = Criteria::where('nama', 'LIKE', '%'.$request->search.'%')->paginate(5); + } else { + $criterias = Criteria::paginate(5); + } + return view('kriteria.kriteria', compact('criterias')); } diff --git a/app/Http/Controllers/DashboardController.php b/app/Http/Controllers/DashboardController.php index 7c8b725..d8f0718 100644 --- a/app/Http/Controllers/DashboardController.php +++ b/app/Http/Controllers/DashboardController.php @@ -18,8 +18,8 @@ public function index() $jumlahKriteria = Criteria::count(); $jumlahSubKriteria = SubCriteria::count(); $criterias = Criteria::all(); - $extracuricullars = Extracuricullar ::all(); - $subcriterias = Subcriteria::all(); + $extracuricullars = Extracuricullar ::paginate(5); + $subcriterias = Subcriteria::paginate(5); return view('dashboard.index', compact('jumlahEkstra','jumlahKriteria','jumlahSubKriteria', 'criterias', 'subcriterias', 'extracuricullars')); } diff --git a/app/Http/Controllers/DataUserController.php b/app/Http/Controllers/DataUserController.php index 96a7b15..de33af8 100644 --- a/app/Http/Controllers/DataUserController.php +++ b/app/Http/Controllers/DataUserController.php @@ -34,9 +34,13 @@ public function downloadUserTemplate() return Excel::download(new UserTemplateExport, 'data-user-template.xlsx'); } - public function index() + public function index(Request $request) { - $users = User::all(); + if ($request->has('search')) { + $users = User::where('name', 'LIKE', '%'.$request->search.'%')->paginate(10); + } else { + $users = User::paginate(10); + } return view('user.user', compact('users')); } diff --git a/app/Http/Controllers/ExtracurricularController.php b/app/Http/Controllers/ExtracurricularController.php index c19f8d5..5363cd7 100644 --- a/app/Http/Controllers/ExtracurricularController.php +++ b/app/Http/Controllers/ExtracurricularController.php @@ -11,9 +11,17 @@ class ExtracurricularController extends Controller /** * Display a listing of the resource. */ - public function index() + public function index(Request $request) { - $extracuricullars = Extracuricullar ::all(); + if ($request->has('search')) { + $extracuricullars = Extracuricullar::where('nama', 'LIKE', '%'.$request->search.'%') + ->orWhere('deskripsi', 'LIKE', '%'.$request->search.'%') + ->orWhere('kategori', 'LIKE', '%'.$request->search.'%') + ->paginate(5); + } else { + $extracuricullars = Extracuricullar::paginate(5); + } + return view('ekstrakurikuler.ekstrakurikuler', compact('extracuricullars')); } diff --git a/app/Http/Controllers/SubCriteriaController.php b/app/Http/Controllers/SubCriteriaController.php index ee41dff..d8c231d 100644 --- a/app/Http/Controllers/SubCriteriaController.php +++ b/app/Http/Controllers/SubCriteriaController.php @@ -47,9 +47,16 @@ class SubCriteriaController extends Controller // } - public function index() + public function index(Request $request) { - $subcriterias = Subcriteria::all(); + if ($request->has('search')) { + $subcriterias = SubCriteria::where('nama', 'LIKE', '%'.$request->search.'%') + ->orWhere('criteria_id', 'LIKE', '%'.$request->search.'%') + ->paginate(10); + } else { + $subcriterias = SubCriteria::paginate(10); + } + $criterias = Criteria::all(); return view('subkriteria.subkriteria', compact('subcriterias', 'criterias')); } diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index 452e6b6..b6e0fe6 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -2,6 +2,7 @@ namespace App\Providers; +use Illuminate\Pagination\Paginator; use Illuminate\Support\ServiceProvider; class AppServiceProvider extends ServiceProvider @@ -19,6 +20,6 @@ public function register(): void */ public function boot(): void { - // + Paginator::useBootstrap(); } } diff --git a/public/DataUser/data-user.xlsx b/public/DataUser/data-user.xlsx index 1988b7c9661c68bdd3ec49f84c1020893c6f086e..90063d8efd4b45fbd24f8d3d5b159b658b0a8cdb 100644 GIT binary patch delta 2202 zcmV;L2xa%SLXShR$_53|*h+~Wlg|bme{D~zFckiNllvb?zatdbWJEOEkX#crMyGx; zF&%W$SSYtGZpQfE?JkQtN~)mIMc5!D6+~dI(w>wBvTGPk6mcI)k$F5IjUrt6iUqW z0YEz)=^g*E>tMVUg2iqO_CpFBe@S1M$>Exn?0=C}e~s1OfMNIBXc(l`Y9)f;eG#p< z=H{W}qZ#A$u9L1s>iUwDCQ}?)oG5*oGfndt9l}t|>1HB8mTc-#!#G&IL*EOLbG(-G zm9#+pw8NSdOx-VaZWe(ihFnuw5lzRU(jdX5OW&1Si#;v`h}*iRzZ)hgf7BF63*3a3 zWD%LFE20alkvvA@=;2m@=MTfIAP+$e=O5%pkow3PIpWfWU;bfH)>eEq4DM}AKUbwnw9O{IBYJo zJ4WYfBM39J7Wb^m#XLqfHZp$Q9?o0iJ=`e|cQ(%m~kn!l7#y z4zTMDkOjANM$?A#F&KcY*+UolTV+fMA9!|<;?xfCz_mxCeqi^K)bAbQ zWPI97P14NwAX=C+W?wAx&}ny5q8q3KQv&TcGHtq?T~E%siDf*tG#*_i#+Bvne=WR$ z?;WRmE>7?ETsXeG9GG0}x%T{Y@_3)N+4`%u4kQGsaFrHk_5D5m1Cx;h6q9Ek4znZ* zB?1n8CL(Kz0ssIq1^@sU0F%of8h@OU$!@|h5QguS`VN-w#0g86h=97Py;a@r#+eWc zFR5)dRekr4LxDl%L~P$Q!x+H+#wkOj0xgQtNpFDM zUjP6A|Nj600RR7#(m@KtAP|M&tB41vF=_(A2no4}SfQ)5L`mD*_XWzd6c=@;&d)a+ zZMwvm7oWYe+x5=2kxS0f&94ckq2=r$wGYGjxx^IWnn&K8l;O^Xqn!}rDdE1m#){op z5#F=;dnRcnu!eTQ|1f*kjF@({Wlz<3h{;oBPuF;e$4#NowfR;Ib)&KwiTLF_k7#e?Mkikj?F$_ibg8xvm_jPn3B5fZi zxKI$`=?BD_I8$lUv1uLO-&;XJW|lWMIk}11f5o6aDT_~R;e6MDBJR`Rd9?8Ie0O#Q zN(%CTAu(AvlEB`bo*0p$+ANEOsg(IzYw0J7D7!QhH|H(oh^5IqYMC?PAQMrEL0@#; zrH)YO8C0Jt7Yl7kW&cs>_D?$_-kIValhMT){iA*>7*QR(EVy=VkdJji9{t)m_#t6_ z->~i}zEWOyKVa|?xm~^C)PM`ghW~_f{TD~K=eTc^0SXlb)U(RDoUh;sC77^G~b=6iT3A12A(Fk)DxCPDuCa zn*>mjK?5xq46Ilb?5`KWx8c79Nx5>i8haOKI=6exR&o?4_gm1DvFo};SEV*${{{Q` z@O_&`&9oVIC4ts!B{^zrpnf#zRb=Zt2o;V1xMq_)7{lw!FOXQL^b~(YLBamLQmM#nBek+>s1ZuFu&Rd?TZ_p~naa+&2-R#dxU$;%b5Zk~rBX7$6) z#zcE==RL&bE?@Cg!OIlSSHugTPTy1@9IWrh<;Zz7`@;2-3Kp~B8%YBN(b!6f9+NL0 zQUM2(f*&m#eI_Dni2?usG6nzu7ytkO00000000000026Z${$4m`I8VJKmnbTQ6L~2 zfR;Ib)&KwiTLAz76aWAK0000000000002>wj36f))U(RDoB;p;4+8)I5dZ)H00000 c00000003E&&LBPlEF6;#AtDC(9smFU0PwvP&;S4c delta 2139 zcmZ9NXHXM}62}t)Jcx8@3Z#H^sYa!E(vEIuMmi!$B!Pr}G=b293P=ltE*yry(M#Z= zlmkT22mwWD0V$yi1_TjKJr3X9`*J(8yI*#8cjo__-At2q<0d*cS4FYoG?X;TElptB zur!5YJ+a5|Pj~N^Qh$BObN|xMX`DR4AFSnlMDm?=f+xZ;!b|fJB{brjcQvQ%{f8i5 z4~K`(tSw;d!E1%eBWN+XmV4RHYObwzMW?^sMs5mZJ?5_uQSo{1z2A?})BASBx~2YZ zJSo>!0D#gnBWnG!9Hpn~Z29?7oeLL%T!@mtsENva)FAfwiMr&4%AJ^WlSWFHv5YY# zyf3Tu%&4<$E7d1&!%+0}TR^PGj%(u>9VgL|Q&U9^zu+VKT0h5;R(&$O~aqF{wm~ zJcNO!gfQMKax7OD>1)G+ZlXl3II1KT9-0S%OBkKDyXUUy6ti% zYvD~Ln_mAMA|W!c?cO}k@5D#&15>yHjICSmUtPEM16SG0nz1m^wS9XV!H#2C*|oeZ zJJ)f+A_|jh2Udo45)6xt#R`MDZ zpm;Aq(E8~U&vXOv-hu^4`zNO!wD@CwGs__*;!xWNw;UT(d9caphi9YeXX~#pwcN)K z?%-K`;LI(pO@tx=4{_4JprTzHv_3;LN&F5ESs*iz;Y3*dNZtQYMY zA>lvieo!FqPK`x|<{haT*bUA^xElG&(F)<9|s@Jra*A z$#Dxz)RatN=WiJxy7M_UwRth^h3HPV@TZL{CTH*7!vBPxCd~iG#$)MWwxKdU>OC7j zAJg(WwXQb`i!>rBQ909_DiM2$aa{%n0m{1x#W||}<>dsooiOd59{S{jS`5Dsk4U-( zM#h+=wQ9;=^!3H1TS3$oo4xq507eWeK7Y>EwHc8SSg`tLOa>mhrir^@3B0aKK6`D- zNLmTf6zBPBkd1XMNgAJ3BO`5{=V0Cnd3;O(s|VuKd$Z0%zTnuv9H4{`YsY4HgN=T= zds<$NNN9cU2shSdzKiiA449>-fi~VAyA=5JO4s?^jW9xvi`jgmH462(` z&sRgcjIj^dn~VC`;=`$}wYYU14f#hwA5wLy!O{6XUzE|Tu2-W~$!*7ziV36d4HJ0c z&+^LSulP==&k#p-MCD#boN|?wFltx;=Bg+;5FQ+FBEmVg$~768-@9jSORP(nTU8%A z5S=>XICL99bb$)^Sv)BxkEtA)AZ)r(Z7|SJ00IEV$0u4HAGatoERbr!mgg;Lt;%!_ zC#9Af+9(Glb&FwD?v}drTu~K1qzI|rLB+!%jdXp_3YW*XpN`Di!sQtG$t0vE7@vP` z7*|-D@bDx&jMGLjcwHDm>Q#a??f{9gn2PNX4wV!pI{D6{tNl;_ptVHc883kyU1-^K zGJWa9MgJxy6yp_w_PHJwf(`Hu{XvU+hEZz2p^)j9#0ZREpk4+{cCM7T5F%+OXm_p> zYw0wELf`4?7S2s@>G^WF3md%TF7?ZB}ws8C@uQRgJz`rVU5lG4giE??us=IPqac2~P z1e<4?Cwp6bOInHDqyRbXr3Osu42}JS@0T`L)nmQg4h&z+vvlwnp;L|%!`-0>!BO?! zH&bI0_vq`oBMQp$<-}~O#m?zygqYEKrB+k zVn(8$vBCXXJUyy8q3Ek+&^oLky;e7cFjil<;{9r}mx_%Z^fOe~4VeI*))(3kP<|dy zgEpiBlqFGiNoJ!hmVU4{DV}i0usXH`R=>5 zvKS|9j?DcSE+0?6pbSPi8y!(tsxSNX7TyE`f(E&tT=*mNzY#*tgZo09M#*3TLS3_c z22nJ-AH2Wa_EE$QBgLW!Cfkb&iF5_gy*mO&q4J5HOAu&(pA&fb7q^=mAE%b{0>u>5 z$bpXF($rZ`##q!WW?tSxBpkIbHK#gyG_w6EgFGG
-
+
@@ -76,7 +76,7 @@
-
+
  • @@ -89,10 +89,11 @@
+
-
+
@@ -102,9 +103,9 @@ - @forelse ($extracuricullars as $extracuricullar) + @forelse ($extracuricullars as $index => $extracuricullar) - + @@ -115,6 +116,14 @@ @endforelse
{{ $loop->iteration }}{{ $index + $extracuricullars->firstItem() }} {{ $extracuricullar->nama }} {{ $extracuricullar->kategori }}
+
+
+
+ Showing data {{ $extracuricullars->firstItem() }} to {{ $extracuricullars->lastItem() }} of {{ $extracuricullars->total() }} entries +
+
{{ $extracuricullars->links() }}
+
+
@@ -122,7 +131,7 @@
-
+
@@ -133,9 +142,9 @@ - @forelse ($subcriterias as $subcriteria) + @forelse ($subcriterias as $index => $subcriteria) - + @@ -147,6 +156,14 @@ @endforelse
{{ $loop->iteration }}{{ $index + $subcriterias->firstItem() }} {{ $subcriteria->criteria->nama }} {{ $subcriteria->nama }} {{ $subcriteria->deskripsi }}
+
+
+
+ Showing data {{ $subcriterias->firstItem() }} to {{ $subcriterias->lastItem() }} of {{ $subcriterias->total() }} entries +
+
{{ $subcriterias->links() }}
+
+
diff --git a/resources/views/ekstrakurikuler/ekstrakurikuler.blade.php b/resources/views/ekstrakurikuler/ekstrakurikuler.blade.php index e2e3464..f58e5a5 100644 --- a/resources/views/ekstrakurikuler/ekstrakurikuler.blade.php +++ b/resources/views/ekstrakurikuler/ekstrakurikuler.blade.php @@ -39,9 +39,9 @@ -
+
- +
diff --git a/resources/views/kriteria/kriteria.blade.php b/resources/views/kriteria/kriteria.blade.php index 4376149..cbde597 100644 --- a/resources/views/kriteria/kriteria.blade.php +++ b/resources/views/kriteria/kriteria.blade.php @@ -45,7 +45,7 @@
- +
diff --git a/resources/views/layout/main.blade.php b/resources/views/layout/main.blade.php index 9d469ce..793f4bc 100644 --- a/resources/views/layout/main.blade.php +++ b/resources/views/layout/main.blade.php @@ -27,8 +27,8 @@ href="{{ asset('src/plugins/datatables/css/responsive.bootstrap4.min.css') }}" /> - {{-- - --}} + + {{-- --}} @@ -88,8 +88,8 @@ function gtag() { - {{-- - + + {{-- --}} diff --git a/resources/views/subkriteria/subkriteria.blade.php b/resources/views/subkriteria/subkriteria.blade.php index d713755..e558d1f 100644 --- a/resources/views/subkriteria/subkriteria.blade.php +++ b/resources/views/subkriteria/subkriteria.blade.php @@ -44,7 +44,7 @@
- +
diff --git a/resources/views/user/user.blade.php b/resources/views/user/user.blade.php index 5319c11..6c9f9ae 100644 --- a/resources/views/user/user.blade.php +++ b/resources/views/user/user.blade.php @@ -45,7 +45,7 @@ Export User
- +
-
- Sistem Pendukung Keputusan Pemilihan Ekstrakurikuler Metode SMARTER -
+
+
+ Sistem Pendukung Keputusan Pemilihan Ekstrakurikuler Metode SMARTER
@@ -288,11 +296,11 @@ class="badge btn-primary" data-toggle="modal"