From 4aa5f44f82a872a059df9027398dc4975442ebce Mon Sep 17 00:00:00 2001 From: Ramon Gutierrez Date: Mon, 8 Jan 2018 00:18:30 +0800 Subject: [PATCH 1/3] Remove counter beside My Profile link --- templates/base.html.twig | 5 ----- 1 file changed, 5 deletions(-) diff --git a/templates/base.html.twig b/templates/base.html.twig index f31af599..30e329d4 100644 --- a/templates/base.html.twig +++ b/templates/base.html.twig @@ -603,11 +603,6 @@ My Profile - - - 2 - - From e6ca66ccc91e40f535fa7d7b18acb8b032362623 Mon Sep 17 00:00:00 2001 From: Ramon Gutierrez Date: Mon, 8 Jan 2018 20:55:24 +0800 Subject: [PATCH 2/3] Move pagination/sorting/filtering to server side for user crud --- src/Controller/UserController.php | 64 ++++++++++++++++++++++++++++--- templates/user/list.html.twig | 13 ++++--- 2 files changed, 66 insertions(+), 11 deletions(-) diff --git a/src/Controller/UserController.php b/src/Controller/UserController.php index 127756dd..b6075879 100644 --- a/src/Controller/UserController.php +++ b/src/Controller/UserController.php @@ -29,16 +29,68 @@ class UserController extends BaseController return $this->render('user/list.html.twig', $params); } - public function rows() + public function rows(Request $req) { - // build query + // get query builder $qb = $this->getDoctrine() ->getRepository(User::class) - ->createQueryBuilder('q') - ->getQuery(); + ->createQueryBuilder('q'); + // count total records + $total = $qb->select('COUNT(q)') + ->getQuery() + ->getSingleScalarResult(); - // get all rows - $rows = $qb->getResult(Query::HYDRATE_ARRAY); + // get datatable params + $datatable = $req->request->get('datatable'); + + // 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'); + + // check if filter is present + if (isset($datatable['query']['data-rows-search']) && !empty($datatable['query']['data-rows-search'])) { + $query->where('q.username LIKE :filter') + ->orWhere('q.first_name LIKE :filter') + ->orWhere('q.last_name LIKE :filter') + ->orWhere('q.email LIKE :filter') + ->orWhere('q.contact_num LIKE :filter') + ->setParameter('filter', '%' . $datatable['query']['data-rows-search'] . '%'); + } + + // 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 + $rows = $query->setFirstResult($offset) + ->setMaxResults($perpage) + ->getQuery() + ->getResult(Query::HYDRATE_ARRAY); + + // response + return $this->json([ + 'meta' => $meta, + 'data' => $rows + ]); // add crud urls foreach ($rows as $index => $row) { diff --git a/templates/user/list.html.twig b/templates/user/list.html.twig index 79229e11..44064cdd 100644 --- a/templates/user/list.html.twig +++ b/templates/user/list.html.twig @@ -68,9 +68,13 @@ source: { read: { url: '{{ url("user_rows") }}', - method: 'POST' + method: 'POST', } - } + }, + pageSize: 10, + serverPaging: true, + serverFiltering: true, + serverSorting: true }, columns: [ { @@ -92,7 +96,7 @@ }, { field: 'email', - title: 'E- mail' + title: 'E-mail' }, { field: 'contact_num', @@ -135,11 +139,10 @@ input: $('#data-rows-search'), delay: 400 }, - /* + pageSize: 10, serverPaging: true, serverFiltering: true, serverSorting: true - */ }; var table = $("#data-rows").mDatatable(options); From 98df96a0ff91b36354b27c14b5b84dc86cc719d8 Mon Sep 17 00:00:00 2001 From: Ramon Gutierrez Date: Mon, 8 Jan 2018 22:39:15 +0800 Subject: [PATCH 3/3] Move pagination/sorting/filtering to server side for role crud and fix datatables webstorage issue --- src/Controller/RoleController.php | 65 ++++++++++++++++++++++++++++--- src/Controller/UserController.php | 1 + templates/role/list.html.twig | 17 ++++---- templates/user/list.html.twig | 10 ++--- 4 files changed, 75 insertions(+), 18 deletions(-) diff --git a/src/Controller/RoleController.php b/src/Controller/RoleController.php index cb1bf79a..a994d8c0 100644 --- a/src/Controller/RoleController.php +++ b/src/Controller/RoleController.php @@ -27,16 +27,66 @@ class RoleController extends BaseController return $this->render('role/list.html.twig', $params); } - public function rows() + public function rows(Request $req) { // build query $qb = $this->getDoctrine() ->getRepository(Role::class) - ->createQueryBuilder('q') - ->getQuery(); + ->createQueryBuilder('q'); - // get all rows - $rows = $qb->getResult(Query::HYDRATE_ARRAY); + // count total records + $total = $qb->select('COUNT(q)') + ->getQuery() + ->getSingleScalarResult(); + + // get datatable params + $datatable = $req->request->get('datatable'); + + // 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'); + + // check if filter is present + if (isset($datatable['query']['data-rows-search']) && !empty($datatable['query']['data-rows-search'])) { + $query->where('q.id LIKE :filter') + ->orWhere('q.name LIKE :filter') + ->setParameter('filter', '%' . $datatable['query']['data-rows-search'] . '%'); + } + + // 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 + $rows = $query->setFirstResult($offset) + ->setMaxResults($perpage) + ->getQuery() + ->getResult(Query::HYDRATE_ARRAY); + + // response + return $this->json([ + 'meta' => $meta, + 'data' => $rows + ]); // add crud urls foreach ($rows as $index => $row) { @@ -45,7 +95,10 @@ class RoleController extends BaseController } // response - return $this->json(['data' => $rows]); + return $this->json([ + 'meta' => $meta, + 'data' => $rows + ]); } public function create() diff --git a/src/Controller/UserController.php b/src/Controller/UserController.php index b6075879..fdb6f5bb 100644 --- a/src/Controller/UserController.php +++ b/src/Controller/UserController.php @@ -35,6 +35,7 @@ class UserController extends BaseController $qb = $this->getDoctrine() ->getRepository(User::class) ->createQueryBuilder('q'); + // count total records $total = $qb->select('COUNT(q)') ->getQuery() diff --git a/templates/role/list.html.twig b/templates/role/list.html.twig index 9a5cc19e..f176627e 100644 --- a/templates/role/list.html.twig +++ b/templates/role/list.html.twig @@ -70,7 +70,15 @@ url: '{{ url("role_rows") }}', method: 'POST' } - } + }, + saveState: { + cookie: false, + webstorage: false + }, + pageSize: 10, + serverPaging: true, + serverFiltering: true, + serverSorting: true }, columns: [ { @@ -102,12 +110,7 @@ onEnter: false, input: $('#data-rows-search'), delay: 400 - }, - /* - serverPaging: true, - serverFiltering: true, - serverSorting: true - */ + } }; var table = $("#data-rows").mDatatable(options); diff --git a/templates/user/list.html.twig b/templates/user/list.html.twig index 44064cdd..a16c3d80 100644 --- a/templates/user/list.html.twig +++ b/templates/user/list.html.twig @@ -71,6 +71,10 @@ method: 'POST', } }, + saveState: { + cookie: false, + webstorage: false + }, pageSize: 10, serverPaging: true, serverFiltering: true, @@ -138,11 +142,7 @@ onEnter: false, input: $('#data-rows-search'), delay: 400 - }, - pageSize: 10, - serverPaging: true, - serverFiltering: true, - serverSorting: true + } }; var table = $("#data-rows").mDatatable(options);