From a958c158e4fb892a268d3ab36283211dccc1a1bc Mon Sep 17 00:00:00 2001
From: franknstayn <begorniafrankjohn@gmail.com>
Date: Sat, 7 Mar 2020 19:04:22 +0800
Subject: [PATCH] added category filter on clipart

---
 .../Controllers/admin/AdminController.php     | 12 +++++--
 app/Models/admin/AdminModel.php               | 24 +++++++++----
 .../views/admin_pages/cliparts.blade.php      | 34 ++++++++++++++++++-
 3 files changed, 60 insertions(+), 10 deletions(-)

diff --git a/app/Http/Controllers/admin/AdminController.php b/app/Http/Controllers/admin/AdminController.php
index 22e800a..1192206 100644
--- a/app/Http/Controllers/admin/AdminController.php
+++ b/app/Http/Controllers/admin/AdminController.php
@@ -648,11 +648,17 @@ class AdminController extends Controller
     }
 
     public function viewClipart(){
+
+        $clipart_category = request()->get('clipart_category');
+
         $AdminModel 	            = new AdminModel;
-        $clipart_array 	= $AdminModel->selectCliparts();
-        
+        $clipart_array 	= $AdminModel->selectCliparts($clipart_category);
+        $clipart_categories_array 	= $AdminModel->selectClipartCategory();
+
         return view('admin_pages.cliparts')
-                                    ->with('clipart_array', $clipart_array);
+                                    ->with('clipart_array', $clipart_array)
+                                    ->with('clipart_categories_array', $clipart_categories_array)
+                                    ->with('selected_clipart_category', $clipart_category);
     }
 
     public function visualizerAdd(){
diff --git a/app/Models/admin/AdminModel.php b/app/Models/admin/AdminModel.php
index 62f3d54..dd4e059 100644
--- a/app/Models/admin/AdminModel.php
+++ b/app/Models/admin/AdminModel.php
@@ -232,13 +232,25 @@ class AdminModel extends Model
 						return $i;
 	}
 
-	function selectCliparts(){
+	function selectCliparts($cat_id){
 
-		$i = DB::table('cliparts')->select('cliparts.*', 'clipart_categories.CategoryName')
-						->leftjoin('clipart_categories', 'clipart_categories.Id','=','cliparts.CategoryId')
-						->orderby("Id", "DESC")
-						->paginate(16);
-						return $i;
+		if($cat_id != 0 || $cat_id != ""){
+			$i = DB::table('cliparts')->select('cliparts.*', 'clipart_categories.CategoryName')
+					->leftjoin('clipart_categories', 'clipart_categories.Id','=','cliparts.CategoryId')
+					->where('cliparts.CategoryId', $cat_id)
+					->orderby("Id", "DESC")
+					->paginate(16);
+					return $i;
+		}else{
+			$i = DB::table('cliparts')->select('cliparts.*', 'clipart_categories.CategoryName')
+			->leftjoin('clipart_categories', 'clipart_categories.Id','=','cliparts.CategoryId')
+			// ->where('cliparts.CategoryId', $cat_id)
+			->orderby("Id", "DESC")
+			->paginate(16);
+			return $i;
+		}
+
+		
 
 						
 	}
diff --git a/resources/views/admin_pages/cliparts.blade.php b/resources/views/admin_pages/cliparts.blade.php
index ab40bad..629d0d2 100644
--- a/resources/views/admin_pages/cliparts.blade.php
+++ b/resources/views/admin_pages/cliparts.blade.php
@@ -29,7 +29,39 @@
                     </div>
                     <div class="box-body">
                         <div class="row">
-                            {{-- <div class="col-md-12"> --}}
+                            <div class="col-sm-12">
+                                <div class="well">
+                                    <form class="form-horizontal" role="search" id="frm_search_store">
+                                        <div class="col-lg-3">
+                                            <div class="form-group">
+                                                <div class="col-sm-12">
+                                                    <label  class="control-label">Clipart Category</label>
+                                                    <select class="form-control" id="sportName" name="clipart_category">
+                                                        <option value="0">Select Clipart Category</option>
+                                                            @foreach ($clipart_categories_array as $clipart_category)
+                                                                <option value="{{ $clipart_category->Id }}" @if ($selected_clipart_category == $clipart_category->Id) selected @endif>{{ $clipart_category->CategoryName }}</option>
+                                                            @endforeach
+                                                    </select>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="col-lg-6">
+                                            <div class="form-group">
+                                                <div class="col-sm-12">
+                                                    <label  class="control-label">&nbsp;</label>
+                                                </div>
+                                                <div class="col-sm-12">
+                                                    
+                                                    <button class="btn btn-primary">Filter</button>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </form>
+                                    <div class="clearfix"></div>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="row">
                                 {{-- <ul class="hide-bullets"> --}}
                                     @foreach($clipart_array as $clipart)
                                         <div class="item  col-sm-4 col-lg-3">