diff --git a/config/packages/catalyst_auth.yaml b/config/packages/catalyst_auth.yaml index b02b1fc9..636f5a8d 100644 --- a/config/packages/catalyst_auth.yaml +++ b/config/packages/catalyst_auth.yaml @@ -672,6 +672,20 @@ catalyst_auth: acls: - id: item_pricing.update label: Update + + - id: competitor + label: Competitors + acls: + - id: competitor.menu + label: Menu + - id: competitor.list + label: List + - id: competitor.add + label: Add + - id: competitor.update + label: Update + - id: competitor.delete + label: Delete api: user_entity: "App\\Entity\\ApiUser" diff --git a/config/packages/catalyst_menu.yaml b/config/packages/catalyst_menu.yaml index 7972a414..4dccc656 100644 --- a/config/packages/catalyst_menu.yaml +++ b/config/packages/catalyst_menu.yaml @@ -6,7 +6,6 @@ catalyst_menu: icon: flaticon-line-graph order: 1 - - id: user acl: user.menu label: '[menu.user]' @@ -306,3 +305,9 @@ catalyst_menu: acl: item_pricing.update label: Item Pricing parent: item + + - id: competitor + acl: competitor.menu + label: 'Competitors' + icon: fa fa-battery-0 #hehe + order: 17 \ No newline at end of file diff --git a/config/routes/competitor.yaml b/config/routes/competitor.yaml new file mode 100644 index 00000000..459c5665 --- /dev/null +++ b/config/routes/competitor.yaml @@ -0,0 +1,18 @@ +competitor_list: + path: /competitors + controller: App\Controller\CompetitorController::index + +competitor_rows: + path: /competitors/rows + controller: App\Controller\CompetitorController::rows + methods: [POST] + +competitor_create: + path: /competitors/create + controller: App\Controller\CompetitorController::addForm + methods: [GET] + +competitor_create_submit: + path: /competitors/create + controller: App\Controller\CompetitorController::addSubmit + methods: [POST] \ No newline at end of file diff --git a/src/Controller/CompetitorController.php b/src/Controller/CompetitorController.php new file mode 100644 index 00000000..fb4e3450 --- /dev/null +++ b/src/Controller/CompetitorController.php @@ -0,0 +1,198 @@ +denyAccessUnlessGranted('competitor.list', null, 'No access.'); + + return $this->render('competitor/list.html.twig'); + } + + public function rows(Request $req) + { + $this->denyAccessUnlessGranted('competitor.list', null, 'No access.'); + + // get query builder + $qb = $this->getDoctrine() + ->getRepository(Competitor::class) + ->createQueryBuilder('q'); + + // get datatable params + $datatable = $req->request->get('datatable'); + + // count total records + $tquery = $qb->select('COUNT(q)'); + $this->setQueryFilters($datatable, $tquery); + $total = $tquery->getQuery() + ->getSingleScalarResult(); + + // get current page number + $page = $datatable['pagination']['page'] ?? 1; + + $perpage = $datatable['pagination']['perpage']; + // ELMO TODO: FOR NOW: + // $perpage = 5; + $offset = ($page - 1) * $perpage; + + // add metadata + $meta = [ + 'page' => $page, + 'perpage' => $perpage, + 'pages' => ceil($total / $perpage), + 'total' => $total, + 'sort' => 'asc', + 'field' => 'id' + ]; + + // dd($meta); + + // 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'; + $query->orderBy('q.' . $datatable['sort']['field'], $order); + } else { + $query->orderBy('q.id', 'asc'); + } + + + // get rows for this page + $obj_rows = $query->setFirstResult($offset) + ->setMaxResults($perpage) + ->getQuery() + ->getResult(); + + // dd($obj_rows); + + // process rows + $rows = []; + foreach ($obj_rows as $orow) { + // add row data + $row['id'] = $orow->getID(); + $row['branch_name'] = $orow->getBranchName(); + $row['brand'] = $orow->getBrand(); + $row['address'] = $orow->getAddress(); + $row['is_near_partner'] = $orow->getIsNearPartner(); + + // add row metadata + $row['meta'] = [ + 'update_url' => '', + 'delete_url' => '' + ]; + + // add crud urls + if ($this->isGranted('competitor.update')) + $row['meta']['update_url'] = $this->generateUrl('home', ['id' => $row['id']]); + if ($this->isGranted('competitor.delete')) + $row['meta']['delete_url'] = $this->generateUrl('home', ['id' => $row['id']]); + + $rows[] = $row; + } + + // response + return $this->json([ + 'meta' => $meta, + 'data' => $rows + ]); + } + + public function addForm() + { + $this->denyAccessUnlessGranted('competitor.add', null, 'No access.'); + + $params = []; + $params['obj'] = new Competitor(); + $params['mode'] = 'create'; + + $em = $this->getDoctrine()->getManager(); + + // response + return $this->render('competitor/form.html.twig', $params); + } + + public function addSubmit(Request $req, EncoderFactoryInterface $ef, ValidatorInterface $validator) + { + $this->denyAccessUnlessGranted('competitor.add', null, 'No access.'); + + // create new object + $em = $this->getDoctrine()->getManager(); + $obj = new Competitor(); + + $this->setObject($obj, $em, $req); + + // validate + $errors = $validator->validate($obj); + + // initialize error list + $error_array = []; + + // add errors to list + foreach ($errors as $error) { + $error_array[$error->getPropertyPath()] = $error->getMessage(); + } + + // check if any errors were found + if (!empty($error_array)) { + // return validation failure response + return $this->json([ + 'success' => false, + 'errors' => $error_array + ], 422); + } + + // validated! save the entity + $em->persist($obj); + $em->flush(); + + // return successful response + return $this->json([ + 'success' => 'Changes have been saved!' + ]); + } + + 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') + ->orWhere('q.address LIKE :filter') + ->setParameter('filter', '%' . $datatable['query']['data-rows-search'] . '%'); + } + } + + protected function setObject(Competitor $obj, EntityManager $em, Request $req) + { + // dd($req); + + // set and save values + $obj->setBranchName($req->request->get('branch_name')) + ->setBrand($req->request->get('brand')) + ->setAddress($req->request->get('address')) + ->setIsNearPartner($req->request->get('isNearPartner') ? 1 : 0); + + } + +} + diff --git a/src/Entity/Competitor.php b/src/Entity/Competitor.php new file mode 100644 index 00000000..18dc6a94 --- /dev/null +++ b/src/Entity/Competitor.php @@ -0,0 +1,92 @@ +id; + } + + public function getBranchName(): ?string + { + return $this->branch_name; + } + + public function setBranchName(string $branch_name): self + { + $this->branch_name = $branch_name; + + return $this; + } + + public function getBrand(): ?string + { + return $this->brand; + } + + public function setBrand(string $brand): self + { + $this->brand = $brand; + + return $this; + } + + public function getIsNearPartner(): ?bool + { + return $this->isNearPartner; + } + + public function setIsNearPartner(bool $isNearPartner): self + { + $this->isNearPartner = $isNearPartner; + + return $this; + } + + public function getAddress(): ?string + { + return $this->address; + } + + public function setAddress(string $address): self + { + $this->address = $address; + + return $this; + } +} diff --git a/templates/competitor/form.html.twig b/templates/competitor/form.html.twig new file mode 100644 index 00000000..b6a4451f --- /dev/null +++ b/templates/competitor/form.html.twig @@ -0,0 +1,191 @@ +{% extends 'base.html.twig' %} + +{% block body %} + +
+
+
+

Competitors

+
+
+
+ +
+ +
+
+
+
+
+
+ + + +

+ {% if mode == 'update' %} + Edit Competitor + {{ obj.getName() }} + {% else %} + New Competitor + {% endif %} +

+
+
+
+
+
+ + + + + + + +
+
+ + + +
+
+ + + +
+
+ + + + +
+
+ + + +
+
+ + + + + + +
+
+ + + + +
+
+ + + + + + +
+
+
+
+
+
+
+ + Back +
+
+
+
+ +
+
+{% endblock %} + + +{% block scripts %} + + +{% endblock %} diff --git a/templates/competitor/list.html.twig b/templates/competitor/list.html.twig new file mode 100644 index 00000000..fa100341 --- /dev/null +++ b/templates/competitor/list.html.twig @@ -0,0 +1,157 @@ +{% extends 'base.html.twig' %} + +{% block body %} + +
+
+
+

+ Competitors +

+
+
+
+ +
+ +
+
+
+
+
+
+
+
+
+
+ + + + +
+
+
+
+
+ + + + New Competitor + + +
+
+
+
+ +
+ +
+
+
+
+
+{% endblock %} + +{% block scripts %} + +{% endblock %} diff --git a/templates/vehicle/list.html.twig b/templates/vehicle/list.html.twig index 35538fe2..00bab333 100644 --- a/templates/vehicle/list.html.twig +++ b/templates/vehicle/list.html.twig @@ -129,6 +129,8 @@ } }; + console.log(options); + var table = $("#data-rows").mDatatable(options); $(document).on('click', '.btn-delete', function(e) {