Fix search filter, some sort columns, and menu reference

config/packages/catalyst_menu.yaml

@@ -6,6 +6,14 @@ catalyst_menu:
           icon: flaticon-line-graph
           order: 1
 
+
+        - id: competitors
+          acl: competitor.menu
+          label: Competitors
+          icon: fa fa-battery-0 #hehe
+          order: 1
+
+
         - id: user
           acl: user.menu
           label: '[menu.user]'
@@ -304,10 +312,4 @@ catalyst_menu:
         - id: item_pricing
           acl: item_pricing.update
           label: Item Pricing
-          parent: item
-
-        - id: competitor
-          acl: competitor.menu
-          label: Competitors
-          icon: fa fa-battery-0 #hehe
-          order: 1
+          parent: item

config/routes/home.yaml

@@ -2,6 +2,10 @@ home:
     path: /
     controller: App\Controller\HomeController::index
 
+home2:
+    path: /home
+    controller: App\Controller\HomeController::index
+
 rider_locations:
     path: /rider_locations
     controller: App\Controller\HomeController::getRiderLocations

src/Controller/CompetitorController.php

@@ -20,7 +20,7 @@ class CompetitorController extends Controller
 {
 
     /**
-     * @Menu(selected="competitor")
+     * @Menu(selected="competitors")
      */
     public function index()
     {
@@ -65,12 +65,11 @@ class CompetitorController extends Controller
             'field' => 'id'
         ];
 
-        // dd($meta);
-
-         // build query
+        
+        // build query
         $query = $qb->select('q');
         $this->setQueryFilters($datatable, $query);
-
+        
         // check if sorting is present, otherwise use default
         if (isset($datatable['sort']['field']) && !empty($datatable['sort']['field'])) {
             $order = $datatable['sort']['sort'] ?? 'asc';
@@ -126,7 +125,7 @@ class CompetitorController extends Controller
     }
 
     /**
-     * @Menu(selected="competitor")
+     * @Menu(selected="competitors")
      */
     public function addForm()
     {
@@ -183,7 +182,7 @@ class CompetitorController extends Controller
     }
 
     /**
-     * @Menu(selected="competitor")
+     * @Menu(selected="competitors")
      */
     public function updateForm($id)
 
@@ -274,8 +273,10 @@ class CompetitorController extends Controller
     protected function setQueryFilters($datatable, QueryBuilder $query)
     {
         if (isset($datatable['query']['data-rows-search']) && !empty($datatable['query']['data-rows-search'])) {
-            $query->where('q.name LIKE :filter')
+            $query->where('q.branch_name LIKE :filter')
                 ->orWhere('q.address LIKE :filter')
+                ->orWhere('q.brand LIKE :filter')
+                ->orWhere('q.is_near_partner LIKE :filter')
                 ->setParameter('filter', '%' . $datatable['query']['data-rows-search'] . '%');
         }
     }
@@ -288,7 +289,7 @@ class CompetitorController extends Controller
         $obj->setBranchName($req->request->get('branch_name'))
             ->setBrand($req->request->get('brand'))
             ->setAddress($req->request->get('address'))
-            ->setIsNearPartner($req->request->get('isNearPartner') ? 1 : 0);
+            ->setIsNearPartner($req->request->get('is_near_partner') ? 1 : 0);
 
     }
 

src/Entity/Competitor.php

@@ -30,7 +30,7 @@ class Competitor
     /**
      * @ORM\Column(type="boolean")
      */
-    private $isNearPartner;
+    private $is_near_partner;
 
     /**
      * @ORM\Column(type="string", length=255)
@@ -68,12 +68,12 @@ class Competitor
 
     public function getIsNearPartner(): ?bool
     {
-        return $this->isNearPartner;
+        return $this->is_near_partner;
     }
 
-    public function setIsNearPartner(bool $isNearPartner): self
+    public function setIsNearPartner(bool $is_near_partner): self
     {
-        $this->isNearPartner = $isNearPartner;
+        $this->is_near_partner = $is_near_partner;
 
         return $this;
     }

templates/competitor/form.html.twig

@@ -80,7 +80,7 @@
                             <div class="col-lg-12">
                                 <span class="m-switch m-switch--icon block-switch">
                                     <label>
-                                        <input type="checkbox" name="isNearPartner" id="flag_near_partner" value="1"{{ obj.isNearPartner() ? ' checked'}}>
+                                        <input type="checkbox" name="is_near_partner" id="flag_near_partner" value="1"{{ obj.getIsNearPartner() ? ' checked'}}>
                                         <label class="switch-label">Near A Partner</label>
                                         <span></span>
                                     </label>

templates/competitor/list.html.twig

@@ -95,7 +95,6 @@
             {
                 field: 'is_near_partner',
                 title: 'Near a Partner?',
-                sortable: false
             },
             {
                 field: 'Actions',

templates/menu.html.twig

@@ -14,7 +14,7 @@
                     <li class="m-menu__item " aria-haspopup="true" >
                 {% endif %}
 
-                    <a href="{{ menu_link(mi) }}" class="m-menu__link{% if mi.hasChildren %} m-menu__toggle{% endif %}">
+                    <a " href="{{ mi.getRoute }}" class="m-menu__link{% if mi.hasChildren %} m-menu__toggle{% endif %}">
                         <i class="m-menu__link-icon {{ mi.getIcon }}"></i>
                         <span class="m-menu__link-title">
                             <span class="m-menu__link-wrap">
@@ -49,7 +49,7 @@
                 {% else %}
                 <li class="m-menu__item " aria-haspopup="true" >
                 {% endif %}
-                    <a  href="{{ menu_link(mi) }}" class="m-menu__link ">
+                    <a " href="{{ menu_link(mi) }}" class="m-menu__link ">
                         <i class="m-menu__link-bullet m-menu__link-bullet--dot">
                             <span></span>
                         </i>