Add list, view, and delete for review. Fix typographical errors in Partner forms. #228

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

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

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]

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;

src/Controller/ReviewController.php

@@ -0,0 +1,168 @@
+<?php
+
+namespace App\Controller;
+
+use App\Entity\Review;
+
+use Doctrine\ORM\Query;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+
+use DateTime;
+
+use Catalyst\MenuBundle\Annotation\Menu;
+
+class ReviewController extends Controller
+{
+    /**
+     * @Menu(selected="review_list")
+     */
+    public function index()
+    {
+        $this->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'] . '%');
+        }
+    }
+
+
+}

templates/partner/form.html.twig

@@ -39,14 +39,14 @@
                                 <label for="name" data-field="name">
                                     Name
                                 </label>
-                                <input type="text" name="name" class="form-control m-input" value="{{ obj.getName() }}">
+                                <input type="text" name="name" class="form-control m-input" value="{{ obj.getName()|default('') }}">
                                 <div class="form-control-feedback hide" data-field="name"></div>
                             </div>
                             <div class="col-lg-6">
                                 <label for="branch" data-field="branch">
                                     Branch
                                 </label>
-                                <input type="text" name="branch" class="form-control m-input" value="{{ obj.getBranch() }}">
+                                <input type="text" name="branch" class="form-control m-input" value="{{ obj.getBranch()|default('') }}">
                                 <div class="form-control-feedback hide" data-field="branch"></div>
                             </div>
                         </div>
@@ -55,7 +55,7 @@
                                 <label for="address" data-field="address">
                                     Address
                                 </label>
-                                <textarea class="form-control m-input" id="address" rows="4" name="address">{{ obj.getAddress }}</textarea>
+                                <textarea class="form-control m-input" id="address" rows="4" name="address">{{ obj.getAddress|default('') }}</textarea>
                                  <div class="form-control-feedback hide" data-field="address"></div>
                             </div>
                             <div class="col-lg-6">
@@ -110,6 +110,22 @@
                                 <div id="m_gmap" style="height:600px;"></div>
                             </div>
                         </div>
+                        <div class="form-group m-form__group row">
+                            <div class="col-lg-6">
+                                <label for="created_by" data-field="created_by">
+                                    Created By
+                                </label>
+                                <input type="text" name="created_by" class="form-control m-input" value="{{ obj.getCreatedBy.getFullName|default('') }}" disabled>
+                                <div class="form-control-feedback hide" data-field="created_by"></div>
+                            </div>
+                            <div class="col-lg-6">
+                                <label for="date_create" data-field="date_create">
+                                    Date Created
+                                </label>
+                                <input type="text" name="date_created" class="form-control m-input" value="{{ obj.getDateCreate|date('d M Y - h:i A') }}" disabled>
+                                <div class="form-control-feedback hide" data-field="branch"></div>
+                            </div>
+                        </div>
                         <div class="m-form__seperator m-form__seperator--dashed"></div>
                             <div class="m-form__section">
                                 <div class="m-form__heading">

templates/partner/list.html.twig

@@ -82,7 +82,7 @@
             },
             {
                 field: 'name',
-                title: 'Hub'
+                title: 'Name'
             },
             {
                 field: 'branch',

templates/review/form.html.twig

@@ -0,0 +1,86 @@
+{% extends 'base.html.twig' %}
+
+{% block body %}
+<!-- BEGIN: Subheader -->
+<div class="m-subheader">
+    <div class="d-flex align-items-center">
+        <div class="mr-auto">
+            <h3 class="m-subheader__title">Reviews</h3>
+        </div>
+    </div>
+</div>
+<!-- END: Subheader -->
+<div class="m-content">
+    <!--Begin::Section-->
+    <div class="row">
+        <div class="col-xl-12">
+            <div class="m-portlet m-portlet--mobile">
+                <div class="m-portlet__head">
+                    <div class="m-portlet__head-caption">
+                        <div class="m-portlet__head-title">
+                            <span class="m-portlet__head-icon">
+                                <i class="fa fa-building"></i>
+                                    View Review
+                            </span>
+                        </div>
+                    </div>
+                </div>
+                <form id="row-form" class="m-form m-form--label-align-right" }}">
+                    <div class="m-portlet__body">
+                        <div class="form-group m-form__group row no-border">
+                            <div class="col-lg-6">
+                                <label for="partner" data-field="partner">
+                                   Partner 
+                                </label>
+                                <input type="text" name="name" class="form-control m-input" value="{{ obj.getPartner.getName|default('') }}" disabled>
+                                <div class="form-control-feedback hide" data-field="partner"></div>
+                            </div>
+                            <div class="col-lg-6">
+                                <label for="rating" data-field="rating">
+                                    Rating
+                                </label>
+                                <input type="text" name="rating" class="form-control m-input" value="{{ obj.getRating }}" disabled>
+                                <div class="form-control-feedback hide" data-field="rating"></div>
+                            </div>
+                        </div>
+                        <div class="form-group m-form__group row no-border">
+                            <div class="col-lg-12">
+                                <label for="message" data-field="message">
+                                    Message
+                                </label>
+                                <textarea class="form-control m-input" id="message" rows="4" name="message" disabled>{{ obj.getMessage }} </textarea>
+                                 <div class="form-control-feedback hide" data-field="message"></div>
+                            </div>
+                        </div>
+                        <div class="form-group m-form__group row no-border">
+                            <div class="col-lg-6">
+                                <label for="mobile_session" data-field="mobile_session">
+                                   Mobile Session
+                                </label>
+                                <input type="text" name="mobile_session" class="form-control m-input" value="{{ obj.getMobileSession.getID|default('') }}" disabled>
+                                <div class="form-control-feedback hide" data-field="mobile_session"></div>
+                            </div>
+                            <div class="col-lg-6">
+                                <label for="date_create" data-field="date_create">
+                                   Date Created
+                                </label>
+                                <input type="text" name="date_create" class="form-control m-input" value="{{ obj.getDateCreate|date('d M Y - h:i A') }}" disabled>
+                                <div class="form-control-feedback hide" data-field="date_create"></div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="m-portlet__foot m-portlet__foot--fit">
+                <div class="m-form__actions m-form__actions--solid m-form__actions--right">
+                    <div class="row">
+                        <div class="col-lg-12">
+                                <a href="{{ url('review_list') }}" class="btn btn-secondary">Back</a>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </form>
+    </div>
+</div>
+{% endblock %}

templates/review/list.html.twig

@@ -0,0 +1,146 @@
+{% extends 'base.html.twig' %}
+
+{% block body %}
+    <!-- BEGIN: Subheader -->
+    <div class="m-subheader">
+        <div class="d-flex align-items-center">
+            <div class="mr-auto">
+                <h3 class="m-subheader__title">
+                   Reviews 
+                </h3>
+            </div>
+        </div>
+    </div>
+    <!-- END: Subheader -->
+    <div class="m-content">
+        <!--Begin::Section-->
+        <div class="row">
+            <div class="col-xl-12">
+            	<div class="m-portlet m-portlet--mobile">
+                    <div class="m-portlet__body">
+                    	<div class="m-form m-form--label-align-right m--margin-top-20 m--margin-bottom-30">
+                            <div class="row align-items-center">
+                                <div class="col-xl-8 order-2 order-xl-1">
+                                    <div class="form-group m-form__group row align-items-center">
+                                        <div class="col-md-4">
+                                            <div class="m-input-icon m-input-icon--left">
+                                                <input type="text" class="form-control m-input m-input--solid" placeholder="Search..." id="data-rows-search">
+                                                    <span class="m-input-icon__icon m-input-icon__icon--left">
+                                                        <span><i class="la la-search"></i></span>
+                                                    </span>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <!--begin: Datatable -->
+                        <div id="data-rows"></div>
+                        <!--end: Datatable -->
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+{% endblock %}
+
+{% block scripts %}
+<script>
+    $(function() {
+        var options = {
+            data: {
+                type: 'remote',
+                source: {
+                    read: {
+                        url: '{{ url("review_rows") }}',
+                        method: 'POST',
+                    }
+                },
+                saveState: {
+                    cookie: false,
+                    webstorage: false
+                },
+                    pageSize: 10,
+                    serverPaging: true,
+                    serverFiltering: true,
+                    serverSorting: true
+            },
+            columns: [
+            {
+                field: 'id',
+                title: 'ID',
+                width: 30
+            },
+            {
+                field: 'partner',
+                title: 'Partner'
+            },
+            {
+                field: 'rating',
+                title: 'Rating'
+            },
+            {
+                field: 'message',
+                title: 'Message'
+            },
+            {
+                field: 'mobile_session',
+                title: 'Mobile'
+            },
+            {
+                field: 'Actions',
+                width: 110,
+                title: 'Actions',
+                sortable: false,
+                overflow: 'visible',
+                template: function (row, index, datatable) {
+                    var actions = '';
+                            
+                    if (row.meta.view_url != '') {
+                        actions += '<a href="' + row.meta.view_url + '" class="m-portlet__nav-link btn m-btn m-btn--hover-accent m-btn--icon m-btn--icon-only m-btn--pill btn-edit" data-id="' + row.id + '" title="View"><i class="la la-edit"></i></a>';
+                    }
+
+                    if (row.meta.delete_url != '') {
+                        actions += '<a href="' + row.meta.delete_url + '" class="m-portlet__nav-link btn m-btn m-btn--hover-danger m-btn--icon m-btn--icon-only m-btn--pill btn-delete" data-id="' + row.id + '" title="Delete"><i class="la la-trash"></i></a>';
+                    }
+							
+                    return actions;
+                },
+            }
+            ],
+            search: {
+                onEnter: false,
+                input: $('#data-rows-search'),
+                delay: 400
+            }
+        };
+
+        var table = $("#data-rows").mDatatable(options);
+
+        $(document).on('click', '.btn-delete', function(e) {
+            var url = $(this).prop('href');
+                var id = $(this).data('id');
+                var btn = $(this);
+
+            e.preventDefault();
+
+            swal({
+                title: 'Confirmation',
+                html: 'Are you sure you want to delete <strong>' + id + '</strong>?',
+                type: 'warning',
+                showCancelButton: true
+            }).then((result) => {
+                if (result.value) {
+                    $.ajax({
+                        method: "DELETE",
+                        url: url
+                    }).done(function(response) {
+                        table.row(btn.parents('tr')).remove();
+                        table.reload();
+                    });
+                }
+            });
+        });
+    });
+</script>
+{% endblock %}