From 19325761db0811dcfe093aef98166b4fa22a2496 Mon Sep 17 00:00:00 2001 From: Korina Cordero Date: Fri, 5 Jul 2019 12:03:34 +0000 Subject: [PATCH] Add list, view, and delete for review. Fix typographical errors in Partner forms. #228 --- config/acl.yaml | 14 +-- config/menu.yaml | 4 +- config/routes/review.yaml | 18 +++ src/Controller/PartnerController.php | 2 +- src/Controller/ReviewController.php | 168 +++++++++++++++++++++++++++ templates/partner/form.html.twig | 22 +++- templates/partner/list.html.twig | 2 +- templates/review/form.html.twig | 86 ++++++++++++++ templates/review/list.html.twig | 146 +++++++++++++++++++++++ 9 files changed, 448 insertions(+), 14 deletions(-) create mode 100644 config/routes/review.yaml create mode 100644 src/Controller/ReviewController.php create mode 100644 templates/review/form.html.twig create mode 100644 templates/review/list.html.twig diff --git a/config/acl.yaml b/config/acl.yaml index 45772e21..5695e217 100644 --- a/config/acl.yaml +++ b/config/acl.yaml @@ -318,14 +318,14 @@ access_keys: - id: partner.delete label: Delete - - id: partner_review - label: Partner Reviews + - id: review + label: Reviews acls: - - id: partner_review.menu + - id: review.menu label: Menu - - id: partner_review.list + - id: review.list label: List - - id: partner_review.hide - label: Hide - - id: partner_review.delete + - id: review.view + label: View + - id: review.delete label: Delete diff --git a/config/menu.yaml b/config/menu.yaml index 36beee3f..d470f680 100644 --- a/config/menu.yaml +++ b/config/menu.yaml @@ -161,7 +161,7 @@ main_menu: acl: partner.list label: Partners parent: partner - - id: partner_review - acl: partner_review.list + - id: review_list + acl: review.list label: Reviews parent: partner diff --git a/config/routes/review.yaml b/config/routes/review.yaml new file mode 100644 index 00000000..01024400 --- /dev/null +++ b/config/routes/review.yaml @@ -0,0 +1,18 @@ +review_list: + path: /reviews + controller: App\Controller\ReviewController::index + +review_rows: + path: /reviews/rows + controller: App\Controller\ReviewController::rows + methods: [POST] + +review_view_form: + path: /reviews/{id}/view + controller: App\Controller\ReviewController::openViewForm + methods: [GET] + +review_delete: + path: /reviews/{id} + controller: App\Controller\ReviewController::destroy + methods: [DELETE] diff --git a/src/Controller/PartnerController.php b/src/Controller/PartnerController.php index 2a26f32d..44439d98 100644 --- a/src/Controller/PartnerController.php +++ b/src/Controller/PartnerController.php @@ -104,7 +104,7 @@ class PartnerController extends Controller // add crud urls if ($this->isGranted('partner.update')) $row['meta']['update_url'] = $this->generateUrl('partner_update', ['id' => $row['id']]); - if ($this->isGranted('hub.delete')) + if ($this->isGranted('partner.delete')) $row['meta']['delete_url'] = $this->generateUrl('partner_delete', ['id' => $row['id']]); $rows[] = $row; diff --git a/src/Controller/ReviewController.php b/src/Controller/ReviewController.php new file mode 100644 index 00000000..b5acae33 --- /dev/null +++ b/src/Controller/ReviewController.php @@ -0,0 +1,168 @@ +denyAccessUnlessGranted('review.list', null, 'No access.'); + + return $this->render('review/list.html.twig'); + } + + public function rows(Request $req) + { + $this->denyAccessUnlessGranted('review.list', null, 'No access.'); + + // get query builder + $qb = $this->getDoctrine() + ->getRepository(Review::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']; + $offset = ($page - 1) * $perpage; + + // add metadata + $meta = [ + 'page' => $page, + 'perpage' => $perpage, + 'pages' => ceil($total / $perpage), + 'total' => $total, + 'sort' => 'asc', + 'field' => 'id' + ]; + + // 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(); + + // process rows + $rows = []; + foreach ($obj_rows as $orow) + { + // add row data + $row['id'] = $orow->getID(); + $row['partner'] = $orow->getPartner()->getName(); + $row['rating'] = $orow->getRating(); + $row['message'] = $orow->getMessage(); + $row['mobile_session'] = $orow->getMobileSession()->getID(); + + // add row metadata + $row['meta'] = [ + 'view_url' => '', + 'delete_url' => '' + ]; + + // add view and delete urls + if ($this->isGranted('review.view')) + $row['meta']['view_url'] = $this->generateUrl('review_view_form', ['id' => $row['id']]); + if ($this->isGranted('review.delete')) + $row['meta']['delete_url'] = $this->generateUrl('review_delete', ['id' => $row['id']]); + + $rows[] = $row; + } + + // response + return $this->json([ + 'meta' => $meta, + 'data' => $rows + ]); + } + + /** + * @Menu(selected="review_list") + */ + public function openViewForm($id) + { + $this->denyAccessUnlessGranted('review.view', null, 'No access.'); + + // get row data + $em = $this->getDoctrine()->getManager(); + $obj = $em->getRepository(Review::class)->find($id); + + // make sure this row exists + if (empty($obj)) + throw $this->createNotFoundException('The item does not exist'); + + $params = []; + $params['obj'] = $obj; + + // response + return $this->render('review/form.html.twig', $params); + } + + public function destroy($id) + { + $this->denyAccessUnlessGranted('review.delete', null, 'No access.'); + + // get object data + $em = $this->getDoctrine()->getManager(); + $obj = $em->getRepository(Review::class)->find($id); + + if (empty($obj)) + throw $this->createNotFoundException('The item does not exist'); + + // delete this object + $em->remove($obj); + $em->flush(); + + // response + $response = new Response(); + $response->setStatusCode(Response::HTTP_OK); + $response->send(); + } + + + protected function setQueryFilters($datatable, QueryBuilder $query) + { + // TODO: Improve search query + if (isset($datatable['query']['data-rows-search']) && !empty($datatable['query']['data-rows-search'])) { + $query->where('q.message LIKE :filter') + ->setParameter('filter', '%' . $datatable['query']['data-rows-search'] . '%'); + } + } + + +} diff --git a/templates/partner/form.html.twig b/templates/partner/form.html.twig index e0aa838d..4495cd3f 100644 --- a/templates/partner/form.html.twig +++ b/templates/partner/form.html.twig @@ -39,14 +39,14 @@ - +
- +
@@ -55,7 +55,7 @@ - +
@@ -110,6 +110,22 @@
+
+
+ + + +
+
+ + + +
+
diff --git a/templates/partner/list.html.twig b/templates/partner/list.html.twig index 5422731e..4ada99b0 100644 --- a/templates/partner/list.html.twig +++ b/templates/partner/list.html.twig @@ -82,7 +82,7 @@ }, { field: 'name', - title: 'Hub' + title: 'Name' }, { field: 'branch', diff --git a/templates/review/form.html.twig b/templates/review/form.html.twig new file mode 100644 index 00000000..5b173816 --- /dev/null +++ b/templates/review/form.html.twig @@ -0,0 +1,86 @@ +{% extends 'base.html.twig' %} + +{% block body %} + +
+
+
+

Reviews

+
+
+
+ +
+ +
+
+
+
+
+
+ + + View Review + +
+
+
+
+
+
+
+ + + +
+
+ + + +
+
+
+
+ + + +
+
+
+
+ + + +
+
+ + + +
+
+
+
+
+
+
+
+
+ Back +
+
+
+
+ +
+
+{% endblock %} diff --git a/templates/review/list.html.twig b/templates/review/list.html.twig new file mode 100644 index 00000000..a7fecacc --- /dev/null +++ b/templates/review/list.html.twig @@ -0,0 +1,146 @@ +{% extends 'base.html.twig' %} + +{% block body %} + +
+
+
+

+ Reviews +

+
+
+
+ +
+ +
+
+
+
+
+
+
+
+
+
+ + + + +
+
+
+
+
+
+ +
+ +
+
+
+
+
+{% endblock %} + +{% block scripts %} + +{% endblock %}