From 2d1a91842a22871a864173004ffd4fe171c5ba81 Mon Sep 17 00:00:00 2001 From: Korina Cordero Date: Fri, 26 Jul 2019 08:21:00 +0000 Subject: [PATCH 1/6] Rename the old Warranty controller to WarrantySearchController. Rename the old warranty.yaml to warranty_search.yaml. Add create, update, and view warranty to menu and acl yamls. Add WarrantyController and template file for Warranty. #236 --- config/acl.yaml | 12 + config/menu.yaml | 4 + config/routes/warranty.yaml | 30 ++- config/routes/warranty_search.yaml | 10 + src/Controller/WarrantyController.php | 243 ++++++++++++++++---- src/Controller/WarrantySearchController.php | 73 ++++++ templates/warranty/list.html.twig | 129 +++++++++++ 7 files changed, 456 insertions(+), 45 deletions(-) create mode 100644 config/routes/warranty_search.yaml create mode 100644 src/Controller/WarrantySearchController.php create mode 100644 templates/warranty/list.html.twig diff --git a/config/acl.yaml b/config/acl.yaml index e868c7ec..9de80027 100644 --- a/config/acl.yaml +++ b/config/acl.yaml @@ -344,3 +344,15 @@ access_keys: label: Update - id: privacy_policy.delete label: Delete + + - id: warranty + label: Warranty + acls: + - id: warranty.menu + label: Menu + - id: warranty.list + label: List + - id: warranty.add + label: Add + - id: warranty.update + label: Update diff --git a/config/menu.yaml b/config/menu.yaml index b0a00d92..92b29c2d 100644 --- a/config/menu.yaml +++ b/config/menu.yaml @@ -147,6 +147,10 @@ main_menu: acl: privacy_policy.list label: Privacy Policy parent: support + - id: warranty_list + acl: warranty.list + label: Warranty + parent: support - id: service acl: service.menu diff --git a/config/routes/warranty.yaml b/config/routes/warranty.yaml index 8e4156e2..86c3e9b9 100644 --- a/config/routes/warranty.yaml +++ b/config/routes/warranty.yaml @@ -1,10 +1,30 @@ # warranty -warranty_search: - path: /warranty_search +warranty_list: + path: /warranties controller: App\Controller\WarrantyController::index -search_warranty: - path: /warranty_search/warranty - controller: App\Controller\WarrantyController::search +warranty_rows: + path: /warranties/rows + controller: App\Controller\WarrantyController::rows + methods: [POST] + +warranty_create: + path: /warranties/create + controller: App\Controller\WarrantyController::addForm methods: [GET] + +warranty_create_submit: + path: /warranties/create + controller: App\Controller\WarrantyController::addSubmit + methods: [POST] + +warranty_update: + path: /warranties/{id} + controller: App\Controller\WarrantyController::updateForm + methods: [GET] + +warranty_update_submit: + path: /warranties/{id} + controller: App\Controller\WarrantyController::updateSubmit + methods: [POST] diff --git a/config/routes/warranty_search.yaml b/config/routes/warranty_search.yaml new file mode 100644 index 00000000..0dd525c8 --- /dev/null +++ b/config/routes/warranty_search.yaml @@ -0,0 +1,10 @@ +# warranty search + +warranty_search: + path: /warranty_search + controller: App\Controller\WarrantySearchController::index + +search_warranty: + path: /warranty_search/warranty + controller: App\Controller\WarrantySearchController::search + methods: [GET] diff --git a/src/Controller/WarrantyController.php b/src/Controller/WarrantyController.php index 5e572229..3f5be3cf 100644 --- a/src/Controller/WarrantyController.php +++ b/src/Controller/WarrantyController.php @@ -4,6 +4,8 @@ namespace App\Controller; use App\Entity\Warranty; +use App\Ramcar\WarrantyClass; + use Doctrine\ORM\Query; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; @@ -15,59 +17,220 @@ use Catalyst\MenuBundle\Annotation\Menu; class WarrantyController extends Controller { /** - * @Menu(selected="warranty_search") + * @Menu(selected="warranty_list") */ public function index() { - $this->denyaccessUnlessGranted('warranty.search', null, 'No access.'); - $params["mode"] = "form"; + $this->denyAccessUnlessGranted('warranty.list', null, 'No access.'); + + return $this->render('warranty/list.html.twig'); + } + + public function rows(Request $req) + { + $this->denyAccessUnlessGranted('warranty.list', null, 'No access.'); + + // get query builder + $qb = $this->getDoctrine() + ->getRepository(Warranty::class) + ->createQueryBuilder('q'); + + // get datatable params + $datatable = $req->request->get('datatable'); + + // count total records + $tquery = $qb->select('COUNT(q)'); + + // add filters 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['serial'] = $orow->getSerial(); + $row['plate_number'] = $orow->getPlateNumber(); + $row['warranty_class'] = $orow->getWarrantyClass(); + $row['status'] = $orow->getStatus(); + $row['is_activated'] = $orow->isActivated(); + + // add row metadata + $row['meta'] = [ + 'update_url' => '', + ]; + + // add crud urls + if ($this->isGranted('warranty.update')) + $row['meta']['update_url'] = $this->generateUrl('warranty_update', ['id' => $row['id']]); + + $rows[] = $row; + } // response - return $this->render('warranty-search/form.html.twig', $params); + return $this->json([ + 'meta' => $meta, + 'data' => $rows + ]); } /** - * @Menu(selected="warranty_search") + * @Menu(selected="warranty_list") */ - public function search(Request $req) + public function addForm() { - $this->denyAccessUnlessGranted('warranty.search', null, 'No access.'); + $this->denyAccessUnlessGranted('warranty.add', null, 'No access.'); - $serial = $req->query->get('battery_serial'); - $name = $req->query->get('owner_name'); - $plate_num = $req->query->get('plate_num'); + $params['obj'] = new Warranty(); + $params['mode'] = 'create'; - // find the warranty - $qb = $this->getDoctrine() - ->getRepository(Warranty::class) - ->createQueryBuilder('w'); - - $query = $qb; - if (!empty($serial)) - { - $qb->where('w.serial = :serial') - ->setParameter('serial', $serial); - } - - if (!empty($plate_num)) - { - $qb->andWhere('w.plate_number = :plate_num') - ->setParameter('plate_num', $plate_num); - } - - $results = $query->getQuery()->getResult(); - - $res = []; - foreach ($results as $result) { - $res[] = $result; - } - $params['data'] = $res; - $params['battery_serial'] = $serial; - $params['owner_name'] = $name; - $params['plate_num'] = $plate_num; - $params['mode'] = "results"; + // get batteries (models and sizes) + // get SAP batteries + // get warranty class // response - return $this->render('warranty-search/form.html.twig', $params); + return $this->render('warranty/form.html.twig', $params); } + + public function addSubmit(Request $req, ValidatorInterface $validator) + { + $this->denyAccessUnlessGranted('warranty.add', null, 'No access.'); + + // create new row + $em = $this->getDoctrine()->getManager(); + $obj = new Warranty(); + + // set and save values + $obj->setSerial($req->request->get('serial')) + ->setWarrantyClass($req->request->get('warranty_class')) + ->setFirstName($req->request->get('first_name')) + ->setLastName($req->request->get('last_name')) + ->setMobileNumber($req->request->get('mobile_number')) + ->setDatePurchase(DateTime::createFromFormat("d M Y h:i A", $req->request->get('date_purchase'))); + + // need to get the battery and SAP battery set + + // validate + $errors = $validator->validate($obj); + + $cleaned_plate_number = Warranty::cleanPlateNumber($req->request->get('plate_number')); + if (!$cleaned_plate_number) + { + $error_array['plate_number'] = 'Invalid plate number specified.'; + } + + // add errors to list + foreach ($errors as $error) { + $error_array[$error->getPropertyPath()] = $error->getMessage(); + } + } + + /** + * @Menu(selected="warranty_list") + */ + public function updateForm($id) + { + $this->denyAccessUnlessGranted('warranty.update', null, 'No access.'); + + $params['mode'] = 'update'; + + // get row data + $em = $this->getDoctrine()->getManager(); + $obj = $em->getRepository(Warranty::class)->find($id); + + // make sure this row exists + if (empty($obj)) + throw $this->createNotFoundException('The item does not exist'); + + // get batteries (models and sizes) + // get SAP batteries + // get warranty class + // get status + + $params['obj'] = $obj; + + // response + return $this->render('warranty/form.html.twig', $params); + } + + public function updateSubmit(Request $req, ValidatorInterface $validator, $id) + { + $this->denyAccessUnlessGranted('warranty.update', null, 'No access.'); + + // get row data + $em = $this->getDoctrine()->getManager(); + $obj = $em->getRepository(Warranty::class)->find($id); + + // make sure this row exists + if (empty($obj)) + throw $this->createNotFoundException('The item does not exist'); + } + + + protected function fillDropdownParameters(&$params) + { + $em = $this->getDoctrine()->getManager(); + + // db loaded + $params['bmfgs'] = $em->getRepository(BatteryManufacturer::class)->findAll(); + + // need to add battery model and sizes + + // need to add SAP battery + + // name values + $params['warranty_classes'] = WarrantyClass::getCollection(); + } + + // check if datatable filter is present and append to query + protected function setQueryFilters($datatable, &$query) { + if (isset($datatable['query']['data-rows-search']) && !empty($datatable['query']['data-rows-search'])) { + $query->where('q.serial LIKE :filter') + ->orWhere('q.plate_number LIKE :filter') + ->setParameter('filter', '%' . $datatable['query']['data-rows-search'] . '%'); + } + } + + + + } diff --git a/src/Controller/WarrantySearchController.php b/src/Controller/WarrantySearchController.php new file mode 100644 index 00000000..f73d6267 --- /dev/null +++ b/src/Controller/WarrantySearchController.php @@ -0,0 +1,73 @@ +denyaccessUnlessGranted('warranty.search', null, 'No access.'); + $params["mode"] = "form"; + + // response + return $this->render('warranty-search/form.html.twig', $params); + } + + /** + * @Menu(selected="warranty_search") + */ + public function search(Request $req) + { + $this->denyAccessUnlessGranted('warranty.search', null, 'No access.'); + + $serial = $req->query->get('battery_serial'); + $name = $req->query->get('owner_name'); + $plate_num = $req->query->get('plate_num'); + + // find the warranty + $qb = $this->getDoctrine() + ->getRepository(Warranty::class) + ->createQueryBuilder('w'); + + $query = $qb; + if (!empty($serial)) + { + $qb->where('w.serial = :serial') + ->setParameter('serial', $serial); + } + + if (!empty($plate_num)) + { + $qb->andWhere('w.plate_number = :plate_num') + ->setParameter('plate_num', $plate_num); + } + + $results = $query->getQuery()->getResult(); + + $res = []; + foreach ($results as $result) { + $res[] = $result; + } + $params['data'] = $res; + $params['battery_serial'] = $serial; + $params['owner_name'] = $name; + $params['plate_num'] = $plate_num; + $params['mode'] = "results"; + + // response + return $this->render('warranty-search/form.html.twig', $params); + } +} diff --git a/templates/warranty/list.html.twig b/templates/warranty/list.html.twig new file mode 100644 index 00000000..0a3efa47 --- /dev/null +++ b/templates/warranty/list.html.twig @@ -0,0 +1,129 @@ +{% extends 'base.html.twig' %} + +{% block body %} + +
+
+
+

+ Warranties +

+
+
+
+ +
+ +
+
+
+
+
+
+
+
+
+
+ + + + +
+
+
+
+
+ + + + New Warranty + + +
+
+
+
+ +
+ +
+
+
+
+
+{% endblock %} + +{% block scripts %} + +{% endblock %} + From 2deea2ea8ee9ad3ee6a6c9287892360522180906 Mon Sep 17 00:00:00 2001 From: Korina Cordero Date: Mon, 29 Jul 2019 04:38:00 +0000 Subject: [PATCH 2/6] Add form to add/update warranty. #236 --- src/Controller/WarrantyController.php | 23 ++---- templates/warranty/form.html.twig | 102 ++++++++++++++++++++++++++ 2 files changed, 110 insertions(+), 15 deletions(-) create mode 100644 templates/warranty/form.html.twig diff --git a/src/Controller/WarrantyController.php b/src/Controller/WarrantyController.php index 3f5be3cf..dab8e7c0 100644 --- a/src/Controller/WarrantyController.php +++ b/src/Controller/WarrantyController.php @@ -3,6 +3,8 @@ namespace App\Controller; use App\Entity\Warranty; +use App\Entity\SAPBattery; +use App\Entity\BatteryManufacturer; use App\Ramcar\WarrantyClass; @@ -123,9 +125,8 @@ class WarrantyController extends Controller $params['obj'] = new Warranty(); $params['mode'] = 'create'; - // get batteries (models and sizes) - // get SAP batteries - // get warranty class + // get dropdown parameters + $this->fillDropdownParameters($params); // response return $this->render('warranty/form.html.twig', $params); @@ -181,13 +182,11 @@ class WarrantyController extends Controller if (empty($obj)) throw $this->createNotFoundException('The item does not exist'); - // get batteries (models and sizes) - // get SAP batteries - // get warranty class - // get status - $params['obj'] = $obj; + // get dropdown parameters + $this->fillDropdownParameters($params); + // response return $this->render('warranty/form.html.twig', $params); } @@ -210,14 +209,8 @@ class WarrantyController extends Controller { $em = $this->getDoctrine()->getManager(); - // db loaded $params['bmfgs'] = $em->getRepository(BatteryManufacturer::class)->findAll(); - - // need to add battery model and sizes - - // need to add SAP battery - - // name values + $params['sap_batts'] = $em->getRepository(SAPBattery::class)->findAll(); $params['warranty_classes'] = WarrantyClass::getCollection(); } diff --git a/templates/warranty/form.html.twig b/templates/warranty/form.html.twig new file mode 100644 index 00000000..3e9da5dd --- /dev/null +++ b/templates/warranty/form.html.twig @@ -0,0 +1,102 @@ +{% extends 'base.html.twig' %} + +{% block body %} + +
+
+
+

Warranties

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

+ {% if mode == 'update' %} + Edit Warranty + {% else %} + New Warranty + {% endif %} +

+
+
+
+
+
+
+
+

+ Warranty Info +

+
+
+
+ + + +
+
+ + + +
+
+ + + +
+
+
+
+ + + +
+
+ + + +
+
+ +
+ +63 + + +
+
+
+
+
+
+
+
+
+
+{% endblock %} From 2e022c893cff9331655528232504f35ec90b87ff Mon Sep 17 00:00:00 2001 From: Korina Cordero Date: Mon, 29 Jul 2019 08:32:48 +0000 Subject: [PATCH 3/6] Add form for warranty submission. #236 --- src/Controller/WarrantyController.php | 60 ++++++++- templates/warranty/form.html.twig | 175 ++++++++++++++++++++++++++ 2 files changed, 231 insertions(+), 4 deletions(-) diff --git a/src/Controller/WarrantyController.php b/src/Controller/WarrantyController.php index dab8e7c0..832cfd53 100644 --- a/src/Controller/WarrantyController.php +++ b/src/Controller/WarrantyController.php @@ -4,9 +4,11 @@ namespace App\Controller; use App\Entity\Warranty; use App\Entity\SAPBattery; -use App\Entity\BatteryManufacturer; +use App\Entity\BatteryModel; +use App\Entity\BatterySize; use App\Ramcar\WarrantyClass; +use App\Ramcar\WarrantyStatus; use Doctrine\ORM\Query; use Symfony\Component\HttpFoundation\Request; @@ -146,9 +148,38 @@ class WarrantyController extends Controller ->setFirstName($req->request->get('first_name')) ->setLastName($req->request->get('last_name')) ->setMobileNumber($req->request->get('mobile_number')) - ->setDatePurchase(DateTime::createFromFormat("d M Y h:i A", $req->request->get('date_purchase'))); + ->setDatePurchase(DateTime::createFromFormat("d M Y h:i A", $req->request->get('date_purchase'))) + ->setDateExpire(DateTime::createFromFormat("d M Y h:i A", $req->request->get('date_expire'))) + ->setDateClaim(DateTime::createFromFormat("d M Y h:i A", $req->request->get('date_claim'))) + ->setClaimFrom($req->request->get('claim_from')) + ->setStatus($req->request->get('status')); - // need to get the battery and SAP battery set + // custom validation for battery model + $model = $em->getRepository(BatteryModel::class) + ->find($req->request->get('battery_model')); + + if (empty($model)) + $error_array['battery_model'] = 'Invalid model selected.'; + else + $obj->setBatteryModel($model); + + // custom validation for battery size + $size = $em->getRepository(BatterySize::class) + ->find($req->request->get('battery_size')); + + if (empty($size)) + $error_array['battery_size'] = 'Invalid size selected.'; + else + $obj->setBatterySize($size); + + // custom validation for SAP battery + $sap = $em->getRepository(SAPBattery::class) + ->find($req->request->get('sap_battery')); + + if (empty($sap)) + $error_array['sap_battery'] = 'Invalid SAP battery selected.'; + else + $obj->setSAPBattery($sap); // validate $errors = $validator->validate($obj); @@ -163,6 +194,25 @@ class WarrantyController extends Controller 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($obj); + $em->flush(); + + // return successful response + return $this->json([ + 'success' => 'Changes have been saved!' + ]); + } + } /** @@ -209,9 +259,11 @@ class WarrantyController extends Controller { $em = $this->getDoctrine()->getManager(); - $params['bmfgs'] = $em->getRepository(BatteryManufacturer::class)->findAll(); + $params['batt_models'] = $em->getRepository(BatteryModel::class)->findAll(); + $params['batt_sizes'] = $em->getRepository(BatterySize::class)->findAll(); $params['sap_batts'] = $em->getRepository(SAPBattery::class)->findAll(); $params['warranty_classes'] = WarrantyClass::getCollection(); + $params['warranty_statuses'] = WarrantyStatus::getCollection(); } // check if datatable filter is present and append to query diff --git a/templates/warranty/form.html.twig b/templates/warranty/form.html.twig index 3e9da5dd..d5c629f4 100644 --- a/templates/warranty/form.html.twig +++ b/templates/warranty/form.html.twig @@ -92,6 +92,99 @@ +
+
+ + + +
+
+ + + +
+
+ + + +
+
+
+
+ +
+ + + + +
+ +
+
+ + + +
+
+
+
+ +
+ + + + +
+ +
+
+ + + +
+
+ + + +
+
+ + +
+
+
+
+ + Back +
+
@@ -100,3 +193,85 @@ {% endblock %} + +{% block scripts %} + +{% endblock %} From 978735adbd90f35d167eef8bd16c7c5ee411cb7e Mon Sep 17 00:00:00 2001 From: Korina Cordero Date: Tue, 30 Jul 2019 03:39:32 +0000 Subject: [PATCH 4/6] Fix error for add warranty. #236 --- src/Controller/WarrantyController.php | 17 +++++++++++++---- templates/warranty/form.html.twig | 4 ++-- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/src/Controller/WarrantyController.php b/src/Controller/WarrantyController.php index 832cfd53..145ffe85 100644 --- a/src/Controller/WarrantyController.php +++ b/src/Controller/WarrantyController.php @@ -16,6 +16,8 @@ use Symfony\Component\HttpFoundation\Response; use Symfony\Component\Validator\Validator\ValidatorInterface; use Symfony\Bundle\FrameworkBundle\Controller\Controller; +use DateTime; + use Catalyst\MenuBundle\Annotation\Menu; class WarrantyController extends Controller @@ -142,18 +144,24 @@ class WarrantyController extends Controller $em = $this->getDoctrine()->getManager(); $obj = new Warranty(); + $date_purchase = DateTime::createFromFormat('d M Y', $req->request->get('date_purchase')); + $date_claim = DateTime::createFromFormat('d M Y', $req->request->get('date_claim')); + // set and save values $obj->setSerial($req->request->get('serial')) ->setWarrantyClass($req->request->get('warranty_class')) ->setFirstName($req->request->get('first_name')) ->setLastName($req->request->get('last_name')) ->setMobileNumber($req->request->get('mobile_number')) - ->setDatePurchase(DateTime::createFromFormat("d M Y h:i A", $req->request->get('date_purchase'))) - ->setDateExpire(DateTime::createFromFormat("d M Y h:i A", $req->request->get('date_expire'))) - ->setDateClaim(DateTime::createFromFormat("d M Y h:i A", $req->request->get('date_claim'))) - ->setClaimFrom($req->request->get('claim_from')) + ->setDatePurchase($date_purchase) + ->setClaimedFrom($req->request->get('claim_from')) ->setStatus($req->request->get('status')); + if ($date_claim) + { + $obj->setDateClaim($date_claim); + } + // custom validation for battery model $model = $em->getRepository(BatteryModel::class) ->find($req->request->get('battery_model')); @@ -189,6 +197,7 @@ class WarrantyController extends Controller { $error_array['plate_number'] = 'Invalid plate number specified.'; } + $obj->setPlateNumber($cleaned_plate_number); // add errors to list foreach ($errors as $error) { diff --git a/templates/warranty/form.html.twig b/templates/warranty/form.html.twig index d5c629f4..be1fab1e 100644 --- a/templates/warranty/form.html.twig +++ b/templates/warranty/form.html.twig @@ -132,7 +132,7 @@
- + @@ -214,7 +214,7 @@ text: 'Your changes have been saved!', type: 'success', onClose: function() { - window.location.href = "{{ url('service_list') }}"; + window.location.href = "{{ url('warranty_list') }}"; } }); }).fail(function(response) { From ad27ec3cf2d915c57468799237cc7830ca712bad Mon Sep 17 00:00:00 2001 From: Korina Cordero Date: Tue, 30 Jul 2019 06:20:16 +0000 Subject: [PATCH 5/6] Add update warranty. #236 --- src/Controller/WarrantyController.php | 90 ++++++++++++++++++++++++++- templates/warranty/form.html.twig | 11 +++- 2 files changed, 97 insertions(+), 4 deletions(-) diff --git a/src/Controller/WarrantyController.php b/src/Controller/WarrantyController.php index 145ffe85..2f61d572 100644 --- a/src/Controller/WarrantyController.php +++ b/src/Controller/WarrantyController.php @@ -146,6 +146,7 @@ class WarrantyController extends Controller $date_purchase = DateTime::createFromFormat('d M Y', $req->request->get('date_purchase')); $date_claim = DateTime::createFromFormat('d M Y', $req->request->get('date_claim')); + $date_expire = DateTime::createFromFormat('d M Y', $req->request->get('date_expire')); // set and save values $obj->setSerial($req->request->get('serial')) @@ -161,6 +162,10 @@ class WarrantyController extends Controller { $obj->setDateClaim($date_claim); } + if ($date_expire) + { + $obj->setDateExpire($date_expire); + } // custom validation for battery model $model = $em->getRepository(BatteryModel::class) @@ -221,7 +226,6 @@ class WarrantyController extends Controller 'success' => 'Changes have been saved!' ]); } - } /** @@ -261,6 +265,90 @@ class WarrantyController extends Controller // make sure this row exists if (empty($obj)) throw $this->createNotFoundException('The item does not exist'); + + $date_purchase = DateTime::createFromFormat('d M Y', $req->request->get('date_purchase')); + $date_claim = DateTime::createFromFormat('d M Y', $req->request->get('date_claim')); + $date_expire = DateTime::createFromFormat('d M Y', $req->request->get('date_expire')); + + // set and save values + $obj->setSerial($req->request->get('serial')) + ->setWarrantyClass($req->request->get('warranty_class')) + ->setFirstName($req->request->get('first_name')) + ->setLastName($req->request->get('last_name')) + ->setMobileNumber($req->request->get('mobile_number')) + ->setDatePurchase($date_purchase) + ->setClaimedFrom($req->request->get('claim_from')) + ->setStatus($req->request->get('status')); + + if ($date_claim) + { + $obj->setDateClaim($date_claim); + } + if ($date_expire) + { + $obj->setDateExpire($date_expire); + } + + // custom validation for battery model + $model = $em->getRepository(BatteryModel::class) + ->find($req->request->get('battery_model')); + + if (empty($model)) + $error_array['battery_model'] = 'Invalid model selected.'; + else + $obj->setBatteryModel($model); + + // custom validation for battery size + $size = $em->getRepository(BatterySize::class) + ->find($req->request->get('battery_size')); + + if (empty($size)) + $error_array['battery_size'] = 'Invalid size selected.'; + else + $obj->setBatterySize($size); + + // custom validation for SAP battery + $sap = $em->getRepository(SAPBattery::class) + ->find($req->request->get('sap_battery')); + + if (empty($sap)) + $error_array['sap_battery'] = 'Invalid SAP battery selected.'; + else + $obj->setSAPBattery($sap); + + // validate + $errors = $validator->validate($obj); + + $cleaned_plate_number = Warranty::cleanPlateNumber($req->request->get('plate_number')); + if (!$cleaned_plate_number) + { + $error_array['plate_number'] = 'Invalid plate number specified.'; + } + $obj->setPlateNumber($cleaned_plate_number); + + // 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($obj); + $em->flush(); + + // return successful response + return $this->json([ + 'success' => 'Changes have been saved!' + ]); + } + } diff --git a/templates/warranty/form.html.twig b/templates/warranty/form.html.twig index be1fab1e..d1d4592f 100644 --- a/templates/warranty/form.html.twig +++ b/templates/warranty/form.html.twig @@ -110,7 +110,7 @@ @@ -122,7 +122,7 @@ @@ -141,7 +141,12 @@
- +
+ + + + +
From 9c2fd4ed3a555dd5a0f32dfdc05d03bb05535c1c Mon Sep 17 00:00:00 2001 From: Korina Cordero Date: Tue, 30 Jul 2019 06:33:40 +0000 Subject: [PATCH 6/6] Add default value for purchase date. Default for date expiry and date claim is empty. #236 --- src/Controller/WarrantyController.php | 4 ---- templates/warranty/form.html.twig | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/src/Controller/WarrantyController.php b/src/Controller/WarrantyController.php index 2f61d572..0dc5a43e 100644 --- a/src/Controller/WarrantyController.php +++ b/src/Controller/WarrantyController.php @@ -371,8 +371,4 @@ class WarrantyController extends Controller ->setParameter('filter', '%' . $datatable['query']['data-rows-search'] . '%'); } } - - - - } diff --git a/templates/warranty/form.html.twig b/templates/warranty/form.html.twig index d1d4592f..d99470cb 100644 --- a/templates/warranty/form.html.twig +++ b/templates/warranty/form.html.twig @@ -142,7 +142,7 @@
- +