Remove annotations from destroy methods of battery, battery manufacturer, battery model, and api user since not needed. Add annotations for battery size, customer, geofence, and job order. #222

src/Controller/APIUserController.php

@@ -289,9 +289,6 @@ class APIUserController extends Controller
         }
     }
 
-    /**
-     * @Menu(selected="api_user_list")
-     */
     public function destroy($id)
     {
         $this->denyAccessUnlessGranted('apiuser.delete', null, 'No access.');

src/Controller/BatteryController.php

@@ -379,9 +379,6 @@ class BatteryController extends Controller
         }  
     }
 
-    /**
-     * @Menu(selected="battery_list")
-     */
     public function destroy($id)
     {
         $this->denyAccessUnlessGranted('battery.delete', null, 'No access.');

src/Controller/BatteryManufacturerController.php

@@ -240,9 +240,6 @@ class BatteryManufacturerController extends Controller
         }  
     }
 
-    /**
-     * @Menu(selected="bmfg_list")
-     */
     public function destroy($id)
     {
         $this->denyAccessUnlessGranted('bmfg.delete', null, 'No access.');

src/Controller/BatteryModelController.php

@@ -2,7 +2,6 @@
 
 namespace App\Controller;
 
-use App\Ramcar\BaseController;
 use App\Entity\BatteryModel;
 
 use Doctrine\ORM\Query;
@@ -13,9 +12,7 @@ use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 
 use Catalyst\MenuBundle\Annotation\Menu;
 
-use App\Menu\Generator as MenuGenerator;
+class BatteryModelController extends Controller
-
-class BatteryModelController extends BaseController
 {
     /**
      * @Menu(selected="bmodel_list")
@@ -236,9 +233,6 @@ class BatteryModelController extends BaseController
         }  
     }
 
-    /**
-     * @Menu(selected="bmodel_list")
-     */
     public function destroy($id)
     {
         $this->denyAccessUnlessGranted('bmodel.delete', null, 'No access.');

src/Controller/BatterySizeController.php

@@ -2,31 +2,26 @@
 
 namespace App\Controller;
 
-use App\Ramcar\BaseController;
 use App\Entity\BatterySize;
 
 use Doctrine\ORM\Query;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Validator\Validator\ValidatorInterface;
+use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 
-use App\Menu\Generator as MenuGenerator;
+use Catalyst\MenuBundle\Annotation\Menu;
 
-class BatterySizeController extends BaseController
+class BatterySizeController extends Controller
 {
-    public function __construct(MenuGenerator $menu_gen)
+    /**
-    {
+     * @Menu(selected="bsize_list")
-        parent::__construct($menu_gen);
+     */
-    }
-
     public function index()
     {
         $this->denyAccessUnlessGranted('bsize.list', null, 'No access.');
 
-        $params = $this->initParameters('bsize_list');
+        return $this->render('battery-size/list.html.twig');
-
-        // response
-        return $this->render('battery-size/list.html.twig', $params);
     }
 
     public function rows(Request $req)
@@ -115,11 +110,13 @@ class BatterySizeController extends BaseController
         ]);
     }
 
+    /**
+     * @Menu(selected="bsize_list")
+     */
     public function addForm()
     {
         $this->denyAccessUnlessGranted('bsize.add', null, 'No access.');
 
-        $params = $this->initParameters('bsize_list');
         $params['obj'] = new BatterySize();
         $params['mode'] = 'create';
 
@@ -176,11 +173,13 @@ class BatterySizeController extends BaseController
         }  
     }
 
+    /**
+     * @Menu(selected="bsize_list")
+     */
     public function updateForm($id)
     {
         $this->denyAccessUnlessGranted('bsize.update', null, 'No access.');
 
-        $params = $this->initParameters('bsize_list');
         $params['mode'] = 'update';
 
         // get row data
@@ -245,8 +244,6 @@ class BatterySizeController extends BaseController
     {
         $this->denyAccessUnlessGranted('bsize.delete', null, 'No access.');
 
-    	$params = $this->initParameters('bsize_list');
-
         // get row data
         $em = $this->getDoctrine()->getManager();
         $row = $em->getRepository(BatterySize::class)->find($id);

src/Controller/CustomerController.php

@@ -2,7 +2,6 @@
 
 namespace App\Controller;
 
-use App\Ramcar\BaseController;
 use App\Ramcar\CustomerClassification;
 use App\Ramcar\FuelType;
 use App\Ramcar\VehicleStatusCondition;
@@ -20,26 +19,22 @@ use Doctrine\ORM\Query;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Validator\Validator\ValidatorInterface;
+use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 
-use App\Menu\Generator as MenuGenerator;
+use Catalyst\MenuBundle\Annotation\Menu;
 
 use DateTime;
 
-class CustomerController extends BaseController
+class CustomerController extends Controller
 {
-    public function __construct(MenuGenerator $menu_gen)
+    /**
-    {
+     * @Menu(selected="customer_list")
-        parent::__construct($menu_gen);
+     */
-    }
-
     public function index()
     {
         $this->denyAccessUnlessGranted('customer.list', null, 'No access.');
 
-        $params = $this->initParameters('customer_list');
+        return $this->render('customer/list.html.twig');
-
-        // response
-        return $this->render('customer/list.html.twig', $params);
     }
 
     public function rows(Request $req)
@@ -159,11 +154,13 @@ class CustomerController extends BaseController
         $params['batteries'] = $em->getRepository(Battery::class)->findAll();
     }
 
+    /**
+     * @Menu(selected="customer_list")
+     */
     public function addForm()
     {
         $this->denyAccessUnlessGranted('customer.add', null, 'No access.');
 
-        $params = $this->initParameters('customer_list');
         $params['obj'] = new Customer();
         $params['mode'] = 'create';
 
@@ -303,11 +300,13 @@ class CustomerController extends BaseController
         }  
     }
 
+    /**
+     * @Menu(selected="customer_list")
+     */
     public function updateForm($id)
     {
         $this->denyAccessUnlessGranted('customer.update', null, 'No access.');
 
-        $params = $this->initParameters('customer_list');
         $params['mode'] = 'update';
 
         // get row data
@@ -471,8 +470,6 @@ class CustomerController extends BaseController
     {
         $this->denyAccessUnlessGranted('customer.delete', null, 'No access.');
 
-    	$params = $this->initParameters('customer_list');
-
         // get row data
         $em = $this->getDoctrine()->getManager();
         $row = $em->getRepository(Customer::class)->find($id);

src/Controller/GeofenceController.php

@@ -2,7 +2,6 @@
 
 namespace App\Controller;
 
-use App\Ramcar\BaseController;
 use App\Entity\SupportedArea;
 
 use App\Service\KMLFileImporter;
@@ -14,18 +13,22 @@ use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Security\Core\Encoder\EncoderFactoryInterface;
 use Symfony\Component\Validator\Validator\ValidatorInterface;
+use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+
+use Catalyst\MenuBundle\Annotation\Menu;
 
 use CrEOF\Spatial\PHP\Types\Geometry\Point;
 use DateTime;
 
-class GeofenceController extends BaseController
+class GeofenceController extends Controller
 {
+    /**
+     * @Menu(selected="geofence_list")
+     */
     public function index()
     {
         $this->denyAccessUnlessGranted('geofence.list', null, 'No access.');
 
-        $params = $this->initParameters('geofence_list');
-
         $params['areas'] = $this->getDoctrine()
                 ->getRepository(SupportedArea::class)
                 ->findAll();;
@@ -33,11 +36,13 @@ class GeofenceController extends BaseController
         return $this->render('geofence/list.html.twig', $params);
     }
 
+    /**
+     * @Menu(selected="geofence_list")
+     */
     public function addForm()
     {
         $this->denyAccessUnlessGranted('geofence.add', null, 'No access.');
 
-        $params = $this->initParameters('geofence_list');
         $params['obj'] = new SupportedArea();
 
         // response
@@ -67,8 +72,6 @@ class GeofenceController extends BaseController
     {
         $this->denyAccessUnlessGranted('geofence.delete', null, 'No access.');
 
-        $params = $this->initParameters('geofence_list');
-
         // get object data
         $em = $this->getDoctrine()->getManager();
         $obj = $em->getRepository(SupportedArea::class)->find($id);

src/Controller/JobOrderController.php

@@ -2,7 +2,6 @@
 
 namespace App\Controller;
 
-use App\Ramcar\BaseController;
 use App\Ramcar\ServiceType;
 use App\Ramcar\JOStatus;
 use App\Ramcar\WarrantyClass;
@@ -42,6 +41,9 @@ use Doctrine\ORM\PessimisticLockException;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Validator\Validator\ValidatorInterface;
+use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+
+use Catalyst\MenuBundle\Annotation\Menu;
 
 use CrEOF\Spatial\PHP\Types\Geometry\Point;
 
@@ -51,7 +53,7 @@ use DateInterval;
 
 use FPDF;
 
-class JobOrderController extends BaseController
+class JobOrderController extends Controller
 {
     public function getJobOrders(Request $req)
     {
@@ -201,11 +203,13 @@ class JobOrderController extends BaseController
         }
     }
 
+    /**
+     * @Menu(selected="jo_in")
+     */
     public function incomingForm()
     {
         $this->denyAccessUnlessGranted('jo_in.list', null, 'No access.');
 
-        $params = $this->initParameters('jo_in');
         $params['obj'] = new JobOrder();
         $params['mode'] = 'create';
         $params['submit_url'] = $this->generateUrl('jo_in_submit');
@@ -220,6 +224,9 @@ class JobOrderController extends BaseController
         return $this->render('job-order/form.html.twig', $params);
     }
 
+    /**
+     * @Menu(selected="jo_in")
+     */
     public function openEditForm($id)
     {
         $this->denyAccessUnlessGranted('jo_open.edit', null, 'No access.');
@@ -227,8 +234,6 @@ class JobOrderController extends BaseController
         $em = $this->getDoctrine()->getManager();
         $jo = $em->getRepository(JobOrder::class)->find($id);
 
-
-        $params = $this->initParameters('jo_in');
         $params['obj'] = $jo;
         $params['mode'] = 'open_edit';
         $params['submit_url'] = $this->generateUrl('jo_open_edit_submit', ['id' => $id]);
@@ -382,11 +387,13 @@ class JobOrderController extends BaseController
         ]);
     }
 
+    /**
+     * @Menu(selected="jo_in")
+     */
     public function incomingVehicleForm($cvid)
     {
         $this->denyAccessUnlessGranted('jo_in.list', null, 'No access.');
 
-        $params = $this->initParameters('jo_in');
         $params['mode'] = 'create_vehicle';
         $params['submit_url'] = $this->generateUrl('jo_in_submit');
         $params['return_url'] = $this->generateUrl('jo_in');
@@ -642,62 +649,68 @@ class JobOrderController extends BaseController
         ];
     }
 
+    /**
+     * @Menu(selected="jo_proc")
+     */
     public function listProcessing()
     {
         $this->denyAccessUnlessGranted('jo_proc.list', null, 'No access.');
 
-        $params = $this->initParameters('jo_proc');
-
         $params['table_refresh_rate'] = $this->container->getParameter('job_order_refresh_interval');
 
         return $this->render('job-order/list.processing.html.twig', $params);
     }
    
+    /**
+     * @Menu(selected="jo_assign")
+     */ 
     public function listAssigning()
     {
         $this->denyAccessUnlessGranted('jo_assign.list', null, 'No access.');
 
-        $params = $this->initParameters('jo_assign');
-
         $params['table_refresh_rate'] = $this->container->getParameter('job_order_refresh_interval');
 
         return $this->render('job-order/list.assigning.html.twig', $params);
     }
 
+    /**
+     * @Menu(selected="jo_fulfill")
+     */
     public function listFulfillment()
     {
         $this->denyAccessUnlessGranted('jo_fulfill.list', null, 'No access.');
 
-        $params = $this->initParameters('jo_fulfill');
-
         $params['table_refresh_rate'] = $this->container->getParameter('job_order_refresh_interval');
 
         return $this->render('job-order/list.fulfillment.html.twig', $params);
     }
 
+    /**
+     * @Menu(selected="jo_open")
+     */
     public function listOpen()
     {
         $this->denyAccessUnlessGranted('jo_open.list', null, 'No access.');
 
-        $params = $this->initParameters('jo_open');
-
         $params['table_refresh_rate'] = $this->container->getParameter('job_order_refresh_interval');
         $params['statuses'] = JOStatus::getCollection();
 
         return $this->render('job-order/list.open.html.twig', $params);
     }
 
+    /**
+     * @Menu(selected="jo_all")
+     */
     public function listAll()
     {
         $this->denyAccessUnlessGranted('jo_all.list', null, 'No access.');
 
-        $params = $this->initParameters('jo_all');
-
         $params['table_refresh_rate'] = $this->container->getParameter('job_order_refresh_interval');
 
         return $this->render('job-order/list.all.html.twig', $params);
     }
 
+    /*
     public function listRows($tier)
     {
         // check which job order tier is being called for and confirm access
@@ -712,6 +725,7 @@ class JobOrderController extends BaseController
         // response
         return $this->render('job-order/list.html.twig', $params);
     }
+    */
 
     public function getRows(Request $req, $tier)
     {
@@ -841,6 +855,9 @@ class JobOrderController extends BaseController
         ]);
     }
 
+    /**
+     * @Menu(selected="jo_proc")
+     */
     public function processingForm(MapTools $map_tools, $id)
     {
         $this->denyAccessUnlessGranted('jo_proc.list', null, 'No access.');
@@ -894,7 +911,6 @@ class JobOrderController extends BaseController
 
         // NOTE: we are able to lock, everything should be fine now
 
-        $params = $this->initParameters('jo_proc');
         $params['mode'] = 'update-processing';
         $params['status_cancelled'] = JOStatus::CANCELLED;
 
@@ -1102,6 +1118,9 @@ class JobOrderController extends BaseController
         ]);
     }
 
+    /**
+     * @Menu(selected="jo_assign")
+     */
     public function assigningForm(MapTools $map_tools, $id)
     {
         $this->denyAccessUnlessGranted('jo_assign.list', null, 'No access.');
@@ -1111,7 +1130,6 @@ class JobOrderController extends BaseController
         // manual transaction since we're locking
         $em->getConnection()->beginTransaction();
 
-        $params = $this->initParameters('jo_assign');
         $params['mode'] = 'update-assigning';
 
         try
@@ -1288,13 +1306,15 @@ class JobOrderController extends BaseController
         ]);
     }
 
+    /**
+     * @Menu(selected="jo_fulfill")
+     */
     public function fulfillmentForm(MapTools $map_tools, $id)
     {
         $this->denyAccessUnlessGranted('jo_fulfill.list', null, 'No access.');
 
         $em = $this->getDoctrine()->getManager();
 
-        $params = $this->initParameters('jo_fulfill');
         $params['mode'] = 'update-fulfillment';
 
         // get row data
@@ -1505,13 +1525,15 @@ class JobOrderController extends BaseController
         $client->disconnect();
     }
 
+    /**
+     * @Menu(selected="jo_open")
+     */
     public function openHubForm(MapTools $map_tools, $id)
     {
         $this->denyAccessUnlessGranted('jo_open.list', null, 'No access.');
 
         $em = $this->getDoctrine()->getManager();
 
-        $params = $this->initParameters('jo_open');
         $params['mode'] = 'update-reassign-hub';
 
         // get row data
@@ -1693,13 +1715,15 @@ class JobOrderController extends BaseController
         ]);
     }
 
+    /**
+     * @Menu(selected="jo_open")
+     */
     public function openRiderForm($id)
     {
         $this->denyAccessUnlessGranted('jo_open.list', null, 'No access.');
 
         $em = $this->getDoctrine()->getManager();
 
-        $params = $this->initParameters('jo_open');
         $params['mode'] = 'update-reassign-rider';
 
         // get row data
@@ -1835,13 +1859,15 @@ class JobOrderController extends BaseController
         ]);
     }
 
+    /**
+     * @Menu(selected="jo_all")
+     */
     public function allForm($id)
     {
         $this->denyAccessUnlessGranted('jo_all.list', null, 'No access.');
 
         $em = $this->getDoctrine()->getManager();
 
-        $params = $this->initParameters('jo_all');
         $params['mode'] = 'update-all';
 
         // get row data