From 47f1638be9ebd8f9e207aefc84d6f151b2e432c7 Mon Sep 17 00:00:00 2001 From: Korina Cordero Date: Thu, 4 Jul 2019 09:00:26 +0000 Subject: [PATCH 1/8] Add Partner, Service, and Review entities. Add association for Partner and User. Add association for MobileSession and Review. #228 --- src/Entity/MobileSession.php | 15 +++++ src/Entity/Partner.php | 118 +++++++++++++++++++++++++++++++++++ src/Entity/Review.php | 117 ++++++++++++++++++++++++++++++++++ src/Entity/Service.php | 76 ++++++++++++++++++++++ src/Entity/User.php | 12 ++++ 5 files changed, 338 insertions(+) create mode 100644 src/Entity/Partner.php create mode 100644 src/Entity/Review.php create mode 100644 src/Entity/Service.php diff --git a/src/Entity/MobileSession.php b/src/Entity/MobileSession.php index 831d14fd..c36092ed 100644 --- a/src/Entity/MobileSession.php +++ b/src/Entity/MobileSession.php @@ -3,6 +3,9 @@ namespace App\Entity; use Doctrine\ORM\Mapping as ORM; + +use Doctrine\Common\Collections\ArrayCollection; + use DateTime; /** @@ -91,6 +94,12 @@ class MobileSession */ protected $date_code_sent; + // reviews made by mobile session + /** + * @ORM\OneToMany(targetEntity="Review", mappedBy="mobile_session") + */ + protected $reviews; + public function __construct() { @@ -101,6 +110,7 @@ class MobileSession $this->confirm_flag = false; $this->date_confirmed = null; $this->date_code_sent = null; + $this->reviews = new ArrayCollection(); } public function generateKeyID() @@ -239,4 +249,9 @@ class MobileSession { return $this->date_code_sent; } + + public function getReviews() + { + return $this->reviews; + } } diff --git a/src/Entity/Partner.php b/src/Entity/Partner.php new file mode 100644 index 00000000..d1908980 --- /dev/null +++ b/src/Entity/Partner.php @@ -0,0 +1,118 @@ +services = new ArrayCollection(); + $this->date_create = new DateTime(); + } + + public function getID() + { + return $this->id; + } + + public function setName($name) + { + $this->name = $name; + return $this; + } + + public function getName() + { + return $this->name; + } + + public function getDateCreate() + { + return $this->date_create; + } + + public function setCreatedBy(User $created_by) + { + $this->created_by = $created_by; + return $this; + } + + public function getCreatedBy() + { + return $this->created_by; + } + + public function addService(Service $service) + { + if (!isset($this->services[$service->getID()])) + unset($this->services[$service->getID()]); + return $this; + } + + public function removeService(Service $service) + { + if (isset($this->services[$service->getID()])) + unset($this->services[$service->getID()]); + return $this; + } + + public function clearServices() + { + $this->services->clear(); + return $this; + } + + public function getServices() + { + return $this->services; + } + +} diff --git a/src/Entity/Review.php b/src/Entity/Review.php new file mode 100644 index 00000000..57ee2c6f --- /dev/null +++ b/src/Entity/Review.php @@ -0,0 +1,117 @@ +date_create = new DateTime(); + $this->rating = 0; + $this->comment = ""; + } + + public function getID() + { + return $this->id; + } + + public function setPartner(Partner $partner) + { + $this->partner = $partner; + return $this; + } + + public function getPartner() + { + return $this->partner; + } + + public function setRating($rating) + { + $this->rating = $rating; + return $this; + } + + public function getRating() + { + return $this->rating; + } + + + public function setMessage($message) + { + $this->message = $message; + return $this; + } + + public function getMessage() + { + return $this->message; + } + + public function getDateCreate() + { + return $this->date_create; + } + + public function setMobileSession(MobileSession $mobile_session) + { + $this->mobile_session = $mobile_session; + return $this; + } + + public function getMobileSession() + { + return $this->mobile_session; + } + +} diff --git a/src/Entity/Service.php b/src/Entity/Service.php new file mode 100644 index 00000000..cc420e01 --- /dev/null +++ b/src/Entity/Service.php @@ -0,0 +1,76 @@ +partners = new ArrayCollection(); + } + + public function getID() + { + return $this->id; + } + + public function setName($name) + { + $this->name = $name; + return $this; + } + + public function getName() + { + return $this->name; + } + + public function addPartner(Partner $partner) + { + $this->partners[$partner->getID()] = $partner; + + return $this; + } + + public function clearPartners() + { + $this->partners->clear(); + return $this; + } + + public function getPartners() + { + return $this->partners; + } + +} diff --git a/src/Entity/User.php b/src/Entity/User.php index c7304ef3..a57afb97 100644 --- a/src/Entity/User.php +++ b/src/Entity/User.php @@ -104,6 +104,12 @@ class User extends BaseUser implements Serializable */ protected $invoices; + // partners made by this user + /** + * @ORM\OneToMany(targetEntity="Partner", mappedBy="created_by") + */ + protected $partners_created; + public function __construct() { parent::__construct(); @@ -112,6 +118,7 @@ class User extends BaseUser implements Serializable $this->job_orders_created = new ArrayCollection(); $this->job_orders_assigned = new ArrayCollection(); $this->tickets = new ArrayCollection(); + $this->partners_created = new ArrayCollection(); } public function getID() @@ -297,4 +304,9 @@ class User extends BaseUser implements Serializable { return $this->invoices; } + + public function getPartnersCreated() + { + return $this->partners_created; + } } From 36098b06a47ac7f1dc04258858ae502e37389688 Mon Sep 17 00:00:00 2001 From: Korina Cordero Date: Thu, 4 Jul 2019 09:43:22 +0000 Subject: [PATCH 2/8] Add services, partners and partner reviews to the menu and acl yaml files. #228 --- config/acl.yaml | 40 ++++++++++++++++++++++++++++++++++++++++ config/menu.yaml | 22 ++++++++++++++++++++++ 2 files changed, 62 insertions(+) diff --git a/config/acl.yaml b/config/acl.yaml index 7bb0a9b2..45772e21 100644 --- a/config/acl.yaml +++ b/config/acl.yaml @@ -289,3 +289,43 @@ access_keys: label: Rejection Report - id: report.battery.conflict label: Battery Conflict Report + + - id: service + label: Other Services + acls: + - id: service.menu + label: Menu + - id: service.list + label: List + - id: service.add + label: Add + - id: service.update + label: Update + - id: service.delete + label: Delete + + - id: partner + label: Partners + acls: + - id: partner.menu + label: Menu + - id: partner.list + label: List + - id: partner.add + label: Add + - id: partner.update + label: Update + - id: partner.delete + label: Delete + + - id: partner_review + label: Partner Reviews + acls: + - id: partner_review.menu + label: Menu + - id: partner_review.list + label: List + - id: partner_review.hide + label: Hide + - id: partner_review.delete + label: Delete diff --git a/config/menu.yaml b/config/menu.yaml index 1d5b0bcd..36beee3f 100644 --- a/config/menu.yaml +++ b/config/menu.yaml @@ -143,3 +143,25 @@ main_menu: acl: warranty.search label: Customer Battery Search parent: support + + - id: service + acl: service.menu + label: Other Services + icon: flaticon-squares + - id: service_list + acl: service.list + label: Services + parent: service + + - id: partner + acl: partner.menu + label: Partners + icon: flaticon-network + - id: partner_list + acl: partner.list + label: Partners + parent: partner + - id: partner_review + acl: partner_review.list + label: Reviews + parent: partner From 56f152fa7045f329d0c97f99f241d173c490171e Mon Sep 17 00:00:00 2001 From: Korina Cordero Date: Fri, 5 Jul 2019 03:29:41 +0000 Subject: [PATCH 3/8] Add CRUD functionalities to Other Services. #228 --- config/routes/service.yaml | 33 ++++ src/Controller/ServiceController.php | 272 +++++++++++++++++++++++++++ templates/service/form.html.twig | 133 +++++++++++++ templates/service/list.html.twig | 142 ++++++++++++++ 4 files changed, 580 insertions(+) create mode 100644 config/routes/service.yaml create mode 100644 src/Controller/ServiceController.php create mode 100644 templates/service/form.html.twig create mode 100644 templates/service/list.html.twig diff --git a/config/routes/service.yaml b/config/routes/service.yaml new file mode 100644 index 00000000..5118552b --- /dev/null +++ b/config/routes/service.yaml @@ -0,0 +1,33 @@ +service_list: + path: /services + controller: App\Controller\ServiceController::index + +service_rows: + path: /services/rows + controller: App\Controller\ServiceController::rows + methods: [POST] + +service_create: + path: /services/create + controller: App\Controller\ServiceController::addForm + methods: [GET] + +service_create_submit: + path: /services/create + controller: App\Controller\ServiceController::addSubmit + methods: [POST] + +service_update: + path: /services/{id} + controller: App\Controller\ServiceController::updateForm + methods: [GET] + +service_update_submit: + path: /services/{id} + controller: App\Controller\ServiceController::updateSubmit + methods: [POST] + +service_delete: + path: /services/{id} + controller: App\Controller\ServiceController::destroy + methods: [DELETE] diff --git a/src/Controller/ServiceController.php b/src/Controller/ServiceController.php new file mode 100644 index 00000000..90c6fc84 --- /dev/null +++ b/src/Controller/ServiceController.php @@ -0,0 +1,272 @@ +denyAccessUnlessGranted('service.list', null, 'No access.'); + + return $this->render('service/list.html.twig'); + } + + public function rows(Request $req) + { + $this->denyAccessUnlessGranted('service.list', null, 'No access.'); + + // build query + $qb = $this->getDoctrine() + ->getRepository(Service::class) + ->createQueryBuilder('q'); + + // get datatable params + $datatable = $req->request->get('datatable'); + + // count total records + $tquery = $qb->select('COUNT(q)'); + + // add fitlers to count query + $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'); + + // add filters to query + $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['name'] = $orow->getName(); + $row['partners'] = $orow->getPartners(); + + // add row metadata + $row['meta'] = [ + 'update_url' => '', + 'delete_url' => '' + ]; + + // add crud urls + if ($this->isGranted('service.update')) + $row['meta']['update_url'] = $this->generateUrl('service_update', ['id' => $row['id']]); + if ($this->isGranted('service.delete')) + $row['meta']['delete_url'] = $this->generateUrl('service_delete', ['id' => $row['id']]); + + $rows[] = $row; + } + + // response + return $this->json([ + 'meta' => $meta, + 'data' => $rows + ]); + } + + /** + * @Menu(selected="service_list") + */ + public function addForm() + { + $this->denyAccessUnlessGranted('service.add', null, 'No access.'); + + $params = []; + $params['obj'] = new Service(); + $params['mode'] = 'create'; + + // response + return $this->render('service/form.html.twig', $params); + } + + public function addSubmit(Request $req, ValidatorInterface $validator) + { + $this->denyAccessUnlessGranted('service.add', null, 'No access.'); + + // create new object + $em = $this->getDoctrine()->getManager(); + $row = new Service(); + + // set and save values + $row->setName($req->request->get('name')); + + // validate + $errors = $validator->validate($row); + + // 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); + } else { + // validated! save the entity + $em->persist($row); + $em->flush(); + + // return successful response + return $this->json([ + 'success' => 'Changes have been saved!' + ]); + } + } + + /** + * @Menu(selected="service_list") + */ + public function updateForm($id) + { + $this->denyAccessUnlessGranted('service.update', null, 'No access.'); + + $params = []; + $params['mode'] = 'update'; + + // get row data + $em = $this->getDoctrine()->getManager(); + $row = $em->getRepository(Service::class)->find($id); + + // make sure this row exists + if (empty($row)) + throw $this->createNotFoundException('The item does not exist'); + + $params['obj'] = $row; + + // response + return $this->render('service/form.html.twig', $params); + } + + public function updateSubmit(Request $req, ValidatorInterface $validator, $id) + { + $this->denyAccessUnlessGranted('service.update', null, 'No access.'); + + // get row data + $em = $this->getDoctrine()->getManager(); + $row = $em->getRepository(Service::class)->find($id); + + // make sure this row exists + if (empty($row)) + throw $this->createNotFoundException('The item does not exist'); + + // set and save values + $row->setName($req->request->get('name')); + + // validate + $errors = $validator->validate($row); + + // 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); + } else { + // validated! save the entity + $em->flush(); + + // return successful response + return $this->json([ + 'success' => 'Changes have been saved!' + ]); + } + } + + /** + * @Menu(selected="service_list") + */ + public function destroy($id) + { + $this->denyAccessUnlessGranted('service.delete', null, 'No access.'); + + $params = []; + + // get row data + $em = $this->getDoctrine()->getManager(); + $row = $em->getRepository(Service::class)->find($id); + + if (empty($row)) + throw $this->createNotFoundException('The item does not exist'); + + // delete this row + $em->remove($row); + $em->flush(); + + // response + $response = new Response(); + $response->setStatusCode(Response::HTTP_OK); + $response->send(); + } + + protected function setQueryFilters($datatable, &$query) + { + if (isset($datatable['query']['data-rows-search']) && !empty($datatable['query']['data-rows-search'])) { + $query->where('q.name LIKE :filter') + ->setParameter('filter', '%' . $datatable['query']['data-rows-search'] . '%'); + } + } + +} diff --git a/templates/service/form.html.twig b/templates/service/form.html.twig new file mode 100644 index 00000000..49a10bdc --- /dev/null +++ b/templates/service/form.html.twig @@ -0,0 +1,133 @@ +{% extends 'base.html.twig' %} + +{% block body %} + +
+
+
+

Services

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

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

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

+ Services +

+
+
+
+ +
+ +
+
+
+
+
+
+
+
+
+
+ + + + +
+
+
+
+
+ + + + New Service + + +
+
+
+
+ +
+ +
+
+
+
+
+{% endblock %} + +{% block scripts %} + +{% endblock %} From d1209d24741f56ab01300ff10af1a39bc410d518 Mon Sep 17 00:00:00 2001 From: Korina Cordero Date: Fri, 5 Jul 2019 07:26:16 +0000 Subject: [PATCH 4/8] Add CRUD functionalities to Partners. #228 --- config/routes/partner.yaml | 33 +++ src/Controller/PartnerController.php | 314 +++++++++++++++++++++++++++ src/Entity/Partner.php | 23 +- src/Entity/Service.php | 2 +- templates/partner/form.html.twig | 312 ++++++++++++++++++++++++++ templates/partner/list.html.twig | 163 ++++++++++++++ 6 files changed, 836 insertions(+), 11 deletions(-) create mode 100644 config/routes/partner.yaml create mode 100644 src/Controller/PartnerController.php create mode 100644 templates/partner/form.html.twig create mode 100644 templates/partner/list.html.twig diff --git a/config/routes/partner.yaml b/config/routes/partner.yaml new file mode 100644 index 00000000..e1640b9b --- /dev/null +++ b/config/routes/partner.yaml @@ -0,0 +1,33 @@ +partner_list: + path: /partners + controller: App\Controller\PartnerController::index + +partner_rows: + path: /partners/rows + controller: App\Controller\PartnerController::rows + methods: [POST] + +partner_create: + path: /partners/create + controller: App\Controller\PartnerController::addForm + methods: [GET] + +partner_create_submit: + path: /partners/create + controller: App\Controller\PartnerController::addSubmit + methods: [POST] + +partner_update: + path: /partners/{id} + controller: App\Controller\PartnerController::updateForm + methods: [GET] + +partner_update_submit: + path: /partners/{id} + controller: App\Controller\PartnerController::updateSubmit + methods: [POST] + +partner_delete: + path: /partners/{id} + controller: App\Controller\PartnerController::destroy + methods: [DELETE] diff --git a/src/Controller/PartnerController.php b/src/Controller/PartnerController.php new file mode 100644 index 00000000..2a26f32d --- /dev/null +++ b/src/Controller/PartnerController.php @@ -0,0 +1,314 @@ +denyAccessUnlessGranted('partner.list', null, 'No access.'); + + return $this->render('partner/list.html.twig'); + } + + public function rows(Request $req) + { + $this->denyAccessUnlessGranted('partner.list', null, 'No access.'); + + // get query builder + $qb = $this->getDoctrine() + ->getRepository(Partner::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['name'] = $orow->getName(); + $row['branch'] = $orow->getBranch(); + $row['address'] = $orow->getAddress(); + $row['contact_nums'] = $orow->getContactNumbers(); + $row['time_open'] = $orow->getTimeOpen()->format('g:i A'); + $row['time_close'] = $orow->getTimeClose()->format('g:i A'); + + // add row metadata + $row['meta'] = [ + 'update_url' => '', + 'delete_url' => '' + ]; + + // add crud urls + if ($this->isGranted('partner.update')) + $row['meta']['update_url'] = $this->generateUrl('partner_update', ['id' => $row['id']]); + if ($this->isGranted('hub.delete')) + $row['meta']['delete_url'] = $this->generateUrl('partner_delete', ['id' => $row['id']]); + + $rows[] = $row; + } + + // response + return $this->json([ + 'meta' => $meta, + 'data' => $rows + ]); + } + + /** + * @Menu(selected="partner_list") + */ + public function addForm() + { + $this->denyAccessUnlessGranted('partner.add', null, 'No access.'); + + $params = []; + $params['obj'] = new Partner(); + $params['mode'] = 'create'; + + $em = $this->getDoctrine()->getManager(); + + // get services + $params['services'] = $em->getRepository(Service::class)->findAll(); + + // response + return $this->render('partner/form.html.twig', $params); + } + + public function addSubmit(Request $req, EncoderFactoryInterface $ef, ValidatorInterface $validator) + { + $this->denyAccessUnlessGranted('partner.add', null, 'No access.'); + + // create new object + $em = $this->getDoctrine()->getManager(); + $obj = new Partner(); + + $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!' + ]); + } + + /** + * @Menu(selected="partner_list") + */ + public function updateForm($id) + { + $this->denyAccessUnlessGranted('partner.update', null, 'No access.'); + + // get row data + $em = $this->getDoctrine()->getManager(); + $obj = $em->getRepository(Partner::class)->find($id); + + // make sure this row exists + if (empty($obj)) + throw $this->createNotFoundException('The item does not exist'); + + $params = []; + $params['obj'] = $obj; + $params['services'] = $em->getRepository(Service::class)->findAll(); + $params['mode'] = 'update'; + + // response + return $this->render('partner/form.html.twig', $params); + } + + public function updateSubmit(Request $req, EncoderFactoryInterface $ef, ValidatorInterface $validator, $id) + { + $this->denyAccessUnlessGranted('partner.update', null, 'No access.'); + + // get object data + $em = $this->getDoctrine()->getManager(); + $obj = $em->getRepository(Partner::class)->find($id); + + // make sure this object exists + if (empty($obj)) + throw $this->createNotFoundException('The item does not exist'); + + $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->flush(); + + // return successful response + return $this->json([ + 'success' => 'Changes have been saved!' + ]); + } + + public function destroy($id) + { + $this->denyAccessUnlessGranted('partner.delete', null, 'No access.'); + + // get object data + $em = $this->getDoctrine()->getManager(); + $obj = $em->getRepository(Partner::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) + { + 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(Partner $obj, EntityManager $em, Request $req) + { + // coordinates + $point = new Point($req->request->get('coord_lng'), $req->request->get('coord_lat')); + + // times + $format = 'g:i A'; + $time_open = DateTime::createFromFormat($format, $req->request->get('time_open')); + $time_close = DateTime::createFromFormat($format, $req->request->get('time_close')); + + // set and save values + $obj->setName($req->request->get('name')) + ->setCreatedBy($this->getUser()) + ->setBranch($req->request->get('branch')) + ->setAddress($req->request->get('address')) + ->setContactNumbers($req->request->get('contact_nums')) + ->setTimeOpen($time_open) + ->setTimeClose($time_close) + ->setCoordinates($point) + ->clearServices(); + + // set services + $services = $req->request->get('services'); + + if (!empty($services)) + { + foreach($services as $service_id) + { + // check if service exists + $service = $em->getRepository(Service::class)->find($service_id); + + if (!empty($service)) + $obj->addService($service); + } + } + } + +} diff --git a/src/Entity/Partner.php b/src/Entity/Partner.php index d1908980..bb8d9580 100644 --- a/src/Entity/Partner.php +++ b/src/Entity/Partner.php @@ -47,13 +47,15 @@ class Partner // services provided /** - * @ORM\ManyToMany(targetEntity="Service", inversedBy="partners", indexBy="id") + * @ORM\ManyToMany(targetEntity="Service", inversedBy="partners") * @ORM\JoinTable(name="partner_services") */ protected $services; public function __construct() { + $this->time_open = new DateTime(); + $this->time_close = new DateTime(); $this->services = new ArrayCollection(); $this->date_create = new DateTime(); } @@ -92,15 +94,7 @@ class Partner public function addService(Service $service) { - if (!isset($this->services[$service->getID()])) - unset($this->services[$service->getID()]); - return $this; - } - - public function removeService(Service $service) - { - if (isset($this->services[$service->getID()])) - unset($this->services[$service->getID()]); + $this->services->add($service); return $this; } @@ -111,6 +105,15 @@ class Partner } public function getServices() + { + $str_services = []; + foreach ($this->services as $service) + $str_services[] = $service->getID(); + + return $str_services; + } + + public function getServicesObjects() { return $this->services; } diff --git a/src/Entity/Service.php b/src/Entity/Service.php index cc420e01..e24cd672 100644 --- a/src/Entity/Service.php +++ b/src/Entity/Service.php @@ -30,7 +30,7 @@ class Service // link to partners with this service /** - * @ORM\ManyToMany(targetEntity="Partner", mappedBy="services", indexBy="id", fetch="EXTRA_LAZY") + * @ORM\ManyToMany(targetEntity="Partner", mappedBy="services", fetch="EXTRA_LAZY") */ protected $partners; diff --git a/templates/partner/form.html.twig b/templates/partner/form.html.twig new file mode 100644 index 00000000..e0aa838d --- /dev/null +++ b/templates/partner/form.html.twig @@ -0,0 +1,312 @@ +{% extends 'base.html.twig' %} + +{% block body %} + +
+
+
+

Partners

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

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

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

+ Services +

+
+
+
+ {% if services is empty %} + No services available. + {% else %} +
+ {% for service in services %} + + {% endfor %} +
+ + Check all services that apply + {% endif %} +
+
+
+
+
+
+
+
+
+
+
+ + Back +
+
+
+
+ +
+ +{% endblock %} + + +{% block scripts %} + + + + +{% endblock %} diff --git a/templates/partner/list.html.twig b/templates/partner/list.html.twig new file mode 100644 index 00000000..5422731e --- /dev/null +++ b/templates/partner/list.html.twig @@ -0,0 +1,163 @@ +{% extends 'base.html.twig' %} + +{% block body %} + +
+
+
+

+ Partners +

+
+
+
+ +
+ +
+
+
+
+
+
+
+
+
+
+ + + + +
+
+
+
+
+ + + + New Partner + + +
+
+
+
+ +
+ +
+
+
+
+
+{% endblock %} + +{% block scripts %} + +{% endblock %} From 19325761db0811dcfe093aef98166b4fa22a2496 Mon Sep 17 00:00:00 2001 From: Korina Cordero Date: Fri, 5 Jul 2019 12:03:34 +0000 Subject: [PATCH 5/8] 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 %} From 4782bd7fe849e4d134e0d7150f2ad790d1fbde0d Mon Sep 17 00:00:00 2001 From: Korina Cordero Date: Sun, 7 Jul 2019 08:29:22 +0000 Subject: [PATCH 6/8] Add API call to list other services. #228 --- config/routes/api.yaml | 5 ++++ src/Controller/APIController.php | 51 ++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+) diff --git a/config/routes/api.yaml b/config/routes/api.yaml index 50e50957..50d6f3a5 100644 --- a/config/routes/api.yaml +++ b/config/routes/api.yaml @@ -124,3 +124,8 @@ api_location_support: path: /api/location_support controller: App\Controller\APIController:locationSupport methods: [GET] + +api_service_list: + path: /api/services + controller: App\Controller\APIController:listServices + methods: [GET] diff --git a/src/Controller/APIController.php b/src/Controller/APIController.php index 7a39d50b..ace7e540 100644 --- a/src/Controller/APIController.php +++ b/src/Controller/APIController.php @@ -38,6 +38,7 @@ use App\Entity\Promo; use App\Entity\Battery; use App\Entity\RiderRating; use App\Entity\JOEvent; +use App\Entity\Service; use DateTime; use Exception; @@ -1802,4 +1803,54 @@ class APIController extends Controller return $res->getReturnResponse(); } + + public function listServices(Request $req) + { + $required_params = []; + $em = $this->getDoctrine()->getManager(); + $res = $this->checkParamsAndKey($req, $em, $required_params); + if ($res->isError()) + return $res->getReturnResponse(); + + // services + $results = $em->getRepository(Service::class)->findAll(); + if (empty($results)) + { + $res->setError(true) + ->setErrorMessage('No services available.'); + return $res->getReturnResponse(); + } + + $services = []; + foreach ($results as $result) + { + // get partners + $partners = []; + $service_partners = $result->getPartners(); + foreach($service_partners as $sp) + { + $partners[] = [ + 'id' => $sp->getID(), + 'name' => $sp->getName(), + 'branch' => $sp->getBranch(), + 'address' => $sp->getAddress(), + 'contact_nums' => $sp->getContactNumbers(), + 'time_open' => $sp->getTimeOpen()->format("d M Y g:i A"), + 'time_close' => $sp->getTimeClose()->format("d M Y g:i A"), + ]; + } + + $services[] = [ + 'id' => $result->getID(), + 'name' => $result->getName(), + 'partners' => $partners, + ]; + } + + $data['services'] = $services; + + $res->setData($data); + + return $res->getReturnResponse(); + } } From 5c70cad3621701bcab963461ac7af337c1994d55 Mon Sep 17 00:00:00 2001 From: Korina Cordero Date: Sun, 7 Jul 2019 09:28:18 +0000 Subject: [PATCH 7/8] Add API call to get details and reviews for a given partner. #228 --- config/routes/api.yaml | 5 +++ src/Controller/APIController.php | 52 ++++++++++++++++++++++++++++++++ 2 files changed, 57 insertions(+) diff --git a/config/routes/api.yaml b/config/routes/api.yaml index 50d6f3a5..e11e0c20 100644 --- a/config/routes/api.yaml +++ b/config/routes/api.yaml @@ -129,3 +129,8 @@ api_service_list: path: /api/services controller: App\Controller\APIController:listServices methods: [GET] + +api_partner_info: + path: /api/partner/{pid} + controller: App\Controller\APIController:getPartnerInformation + methods: [GET] diff --git a/src/Controller/APIController.php b/src/Controller/APIController.php index ace7e540..72016ddc 100644 --- a/src/Controller/APIController.php +++ b/src/Controller/APIController.php @@ -39,6 +39,8 @@ use App\Entity\Battery; use App\Entity\RiderRating; use App\Entity\JOEvent; use App\Entity\Service; +use App\Entity\Partner; +use App\Entity\Review; use DateTime; use Exception; @@ -1853,4 +1855,54 @@ class APIController extends Controller return $res->getReturnResponse(); } + + public function getPartnerInformation(Request $req, $pid) + { + $required_params = []; + $em = $this->getDoctrine()->getManager(); + $res = $this->checkParamsAndKey($req, $em, $required_params); + if ($res->isError()) + return $res->getReturnResponse(); + + // get partner + $partner = $em->getRepository(Partner::class)->findOneBy(['id' => $pid]); + if ($partner == null) + { + $res->setError(true) + ->setErrorMessage('No partner found.'); + return $res->getReturnResponse(); + } + + // get reviews for partner + $reviews = $em->getRepository(Review::class)->findBy(['partner' => $partner]); + $rev = []; + if (!empty($reviews)) + { + foreach($reviews as $review) + { + $rev[] = [ + 'id' => $review->getID(), + 'rating' => $review->getRating(), + 'message' => $review->getMessage(), + 'date_create' => $review->getDateCreate()->format("d M Y g:i A"), + 'mobile_session' => $review->getMobileSession()->getID(), + ]; + } + } + + $data['partner'] = [ + 'id' => $partner->getID(), + 'name' => $partner->getName(), + 'branch' => $partner->getBranch(), + 'address' => $partner->getAddress(), + 'contact_nums' => $partner->getContactNumbers(), + 'time_open' => $partner->getTimeOpen()->format("d M Y g:i A"), + 'time_close' => $partner->getTimeClose()->format("d M Y g:i A"), + 'reviews' => $rev, + ]; + + $res->setData($data); + + return $res->getReturnResponse(); + } } From e8b76e8810aad8346486f892ea5e88d5f2a51f6d Mon Sep 17 00:00:00 2001 From: Korina Cordero Date: Mon, 8 Jul 2019 06:57:24 +0000 Subject: [PATCH 8/8] Add getClosestPartners method to the APIController that takes in a longitude, latitude, results limit, and service id to find the closes partners. #228 --- config/routes/api.yaml | 6 ++++ src/Controller/APIController.php | 62 +++++++++++++++++++++++++++++--- 2 files changed, 64 insertions(+), 4 deletions(-) diff --git a/config/routes/api.yaml b/config/routes/api.yaml index e11e0c20..6c66429d 100644 --- a/config/routes/api.yaml +++ b/config/routes/api.yaml @@ -134,3 +134,9 @@ api_partner_info: path: /api/partner/{pid} controller: App\Controller\APIController:getPartnerInformation methods: [GET] + +api_partner: + path: /api/partners + controller: App\Controller\APIController:getClosestPartners + methods: [GET] + diff --git a/src/Controller/APIController.php b/src/Controller/APIController.php index 72016ddc..d1bad313 100644 --- a/src/Controller/APIController.php +++ b/src/Controller/APIController.php @@ -1837,8 +1837,8 @@ class APIController extends Controller 'branch' => $sp->getBranch(), 'address' => $sp->getAddress(), 'contact_nums' => $sp->getContactNumbers(), - 'time_open' => $sp->getTimeOpen()->format("d M Y g:i A"), - 'time_close' => $sp->getTimeClose()->format("d M Y g:i A"), + 'time_open' => $sp->getTimeOpen()->format("g:i A"), + 'time_close' => $sp->getTimeClose()->format("g:i A"), ]; } @@ -1896,8 +1896,8 @@ class APIController extends Controller 'branch' => $partner->getBranch(), 'address' => $partner->getAddress(), 'contact_nums' => $partner->getContactNumbers(), - 'time_open' => $partner->getTimeOpen()->format("d M Y g:i A"), - 'time_close' => $partner->getTimeClose()->format("d M Y g:i A"), + 'time_open' => $partner->getTimeOpen()->format("g:i A"), + 'time_close' => $partner->getTimeClose()->format("g:i A"), 'reviews' => $rev, ]; @@ -1905,4 +1905,58 @@ class APIController extends Controller return $res->getReturnResponse(); } + + public function getClosestPartners(Request $req) + { + $required_params = [ + 'longitude', + 'latitude', + 'service_id', + 'limit', + ]; + $em = $this->getDoctrine()->getManager(); + $res = $this->checkParamsAndKey($req, $em, $required_params); + if ($res->isError()) + return $res->getReturnResponse(); + + $long = $req->query->get('longitude'); + $lat = $req->query->get('latitude'); + $service_id = $req->query->get('service_id'); + $limit = $req->query->get('limit'); + + // get partners within range + $query = $em->createQuery('SELECT p, st_distance(p.coordinates, point(:lng, :lat)) as dist FROM App\Entity\Partner p + JOIN App\Entity\Service s where s.id = :service_id ORDER BY dist') + ->setParameter('lat', $lat) + ->setParameter('lng', $long) + ->setParameter('service_id', $service_id); + + $query->setMaxResults($limit); + $result = $query->getResult(); + + $data = []; + foreach($result as $row) + { + $partner = []; + $partner[] = [ + 'id' => $row[0]->getID(), + 'name' => $row[0]->getName(), + 'branch' => $row[0]->getBranch(), + 'address' => $row[0]->getAddress(), + 'contact_nums' => $row[0]->getContactNumbers(), + 'time_open' => $row[0]->getTimeOpen()->format("g:i A"), + 'time_close' => $row[0]->getTimeClose()->format("g:i A"), + ]; + + $data[] = [ + 'partner' => $partner, + 'db_distance' => $row['dist'], + ]; + } + + $res->setData($data); + + return $res->getReturnResponse(); + + } }