Merge branch '677-dropdown-menu-for-specific-emergency-scenarios' into 'master'

Resolve "Dropdown Menu for specific Emergency Scenarios"

Closes #677

See merge request jankstudio/resq!791
This commit is contained in:
Kendrick Chan 2022-06-10 07:23:40 +00:00
commit 9150db3c20
11 changed files with 781 additions and 10 deletions

View file

@ -553,3 +553,16 @@ access_keys:
- id: subticket_type.delete - id: subticket_type.delete
label: Delete label: Delete
- id: emergency_type
label: Emergency Type Access
acls:
- id: emergency_type.menu
label: Menu
- id: emergency_type.list
label: List
- id: emergency_type.add
label: Add
- id: emergency_type.update
label: Update
- id: emergency_type.delete
label: Delete

View file

@ -236,4 +236,8 @@ main_menu:
- id: subticket_type_list - id: subticket_type_list
acl: subticket_type.menu acl: subticket_type.menu
label: Sub Ticket Types label: Sub Ticket Types
parent: database
- id: emergency_type_list
acl: emergency_type.menu
label: Emergency Types
parent: database parent: database

View file

@ -0,0 +1,34 @@
emergency_type_list:
path: /emergency-types
controller: App\Controller\EmergencyTypeController::index
methods: [GET]
emergency_type_rows:
path: /emergency-types/rowdata
controller: App\Controller\EmergencyTypeController::datatableRows
methods: [POST]
emergency_type_add_form:
path: /emergency-types/newform
controller: App\Controller\EmergencyTypeController::addForm
methods: [GET]
emergency_type_add_submit:
path: /emergency-types
controller: App\Controller\EmergencyTypeController::addSubmit
methods: [POST]
emergency_type_update_form:
path: /emergency-types/{id}
controller: App\Controller\EmergencyTypeController::updateForm
methods: [GET]
emergency_type_update_submit:
path: /emergency-types/{id}
controller: App\Controller\EmergencyTypeController::updateSubmit
methods: [POST]
emergency_type_delete:
path: /emergency-types/{id}
controller: App\Controller\EmergencyTypeController::deleteSubmit
methods: [DELETE]

View file

@ -0,0 +1,252 @@
<?php
namespace App\Controller;
use Doctrine\ORM\Query;
use Doctrine\ORM\QueryBuilder;
use Doctrine\ORM\EntityManagerInterface;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\Validator\Validator\ValidatorInterface;
use Symfony\Bundle\FrameworkBundle\Controller\Controller;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\IsGranted;
use Catalyst\MenuBundle\Annotation\Menu;
use App\Entity\EmergencyType;
class EmergencyTypeController extends Controller
{
/**
* @Menu(selected="emergency_type_list")
* @IsGranted("emergency_type.list")
*/
public function index()
{
return $this->render('emergency-type/list.html.twig');
}
/**
* @IsGranted("emergency_type.list")
*/
public function datatableRows(Request $req)
{
// get query builder
$qb = $this->getDoctrine()
->getRepository(EmergencyType::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();
// add row metadata
$row['meta'] = [
'update_url' => '',
'delete_url' => ''
];
// add crud urls
if ($this->isGranted('emergency_type.update'))
$row['meta']['update_url'] = $this->generateUrl('emergency_type_update_form', ['id' => $row['id']]);
if ($this->isGranted('emergency_type.delete'))
$row['meta']['delete_url'] = $this->generateUrl('emergency_type_delete', ['id' => $row['id']]);
$rows[] = $row;
}
// response
return $this->json([
'meta' => $meta,
'data' => $rows
]);
}
/**
* @Menu(selected="emergency_type.list")
* @IsGranted("emergency_type.add")
*/
public function addForm()
{
$emergency_type = new EmergencyType();
$params = [
'emergency_type' => $emergency_type,
'mode' => 'create',
];
// response
return $this->render('emergency-type/form.html.twig', $params);
}
/**
* @IsGranted("emergency_type.add")
*/
public function addSubmit(Request $req, EntityManagerInterface $em, ValidatorInterface $validator)
{
$emergency_type = new EmergencyType();
$this->setObject($emergency_type, $req);
// validate
$errors = $validator->validate($emergency_type);
// 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($emergency_type);
$em->flush();
// return successful response
return $this->json([
'success' => 'Changes have been saved!'
]);
}
/**
* @Menu(selected="emergency_type_list")
* @ParamConverter("emergency_type", class="App\Entity\EmergencyType")
* @IsGranted("emergency_type.update")
*/
public function updateForm($id, EntityManagerInterface $em, EmergencyType $emergency_type)
{
$params = [];
$params['emergency_type'] = $emergency_type;
$params['mode'] = 'update';
// response
return $this->render('emergency-type/form.html.twig', $params);
}
/**
* @ParamConverter("emergency_type", class="App\Entity\EmergencyType")
* @IsGranted("emergency_type.update")
*/
public function updateSubmit(Request $req, EntityManagerInterface $em, ValidatorInterface $validator, EmergencyType $emergency_type)
{
$this->setObject($emergency_type, $req);
// validate
$errors = $validator->validate($emergency_type);
// 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!'
]);
}
/**
* @ParamConverter("emergency_type", class="App\Entity\EmergencyType")
* @IsGranted("emergency_type.update")
*/
public function deleteSubmit(EntityManagerInterface $em, EmergencyType $emergency_type)
{
// delete this object
$em->remove($emergency_type);
$em->flush();
// response
$response = new Response();
$response->setStatusCode(Response::HTTP_OK);
$response->send();
}
protected function setObject(EmergencyType $obj, Request $req)
{
// set and save values
$obj->setName($req->request->get('name'));
}
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')
->setParameter('filter', '%' . $datatable['query']['data-rows-search'] . '%');
}
}
}

View file

@ -0,0 +1,46 @@
<?php
namespace App\Entity;
use Doctrine\ORM\Mapping as ORM;
use Symfony\Component\Validator\Constraints as Assert;
/**
* @ORM\Entity
* @ORM\Table(name="emergency_type")
* })
*/
class EmergencyType
{
// unique id
/**
* @ORM\Id
* @ORM\Column(type="integer")
* @ORM\GeneratedValue(strategy="AUTO")
*/
protected $id;
/**
* @ORM\Column(type="string", length=80)
* @Assert\NotBlank()
*/
protected $name;
public function getID()
{
return $this->id;
}
public function setName($name)
{
$this->name = $name;
return $this;
}
public function getName()
{
return $this->name;
}
}

View file

@ -408,6 +408,13 @@ class JobOrder
*/ */
protected $caller_classification; protected $caller_classification;
// emergency type
/**
* @ORM\ManyToOne(targetEntity="EmergencyType", inversedBy="job_orders")
* @ORM\JoinColumn(name="emergency_type_id", referencedColumnName="id", nullable=true)
*/
protected $emergency_type;
public function __construct() public function __construct()
{ {
$this->date_create = new DateTime(); $this->date_create = new DateTime();
@ -1164,4 +1171,15 @@ class JobOrder
return $this->caller_classification; return $this->caller_classification;
} }
public function setEmergencyType(EmergencyType $emergency_type = null)
{
$this->emergency_type = $emergency_type;
return $this;
}
public function getEmergencyType()
{
return $this->emergency_type;
}
} }

View file

@ -26,6 +26,7 @@ use App\Entity\JORejection;
use App\Entity\Warranty; use App\Entity\Warranty;
use App\Entity\Customer; use App\Entity\Customer;
use App\Entity\CustomerTag; use App\Entity\CustomerTag;
use App\Entity\EmergencyType;
use App\Ramcar\InvoiceCriteria; use App\Ramcar\InvoiceCriteria;
use App\Ramcar\ServiceType; use App\Ramcar\ServiceType;
@ -434,6 +435,10 @@ class ResqJobOrderHandler implements JobOrderHandlerInterface
// get caller classification if any // get caller classification if any
$caller_class = $req->request->get('caller_class',''); $caller_class = $req->request->get('caller_class','');
// get emergency type if any
$etype_id = $req->request->get('emergency_type', 0);
$etype = $em->getRepository(EmergencyType::class)->find($etype_id);
// TODO: check status before saving since JO might already // TODO: check status before saving since JO might already
// have a status that needs to be retained // have a status that needs to be retained
@ -471,7 +476,8 @@ class ResqJobOrderHandler implements JobOrderHandlerInterface
->setInitialConcern($initial_concern) ->setInitialConcern($initial_concern)
->setInitialConcernNotes($initial_concern_notes) ->setInitialConcernNotes($initial_concern_notes)
->setCallerClassification($caller_class) ->setCallerClassification($caller_class)
->setGender($gender); ->setGender($gender)
->setEmergencyType($etype);
// check if user is null, meaning call to create came from API // check if user is null, meaning call to create came from API
if ($user != null) if ($user != null)
@ -684,6 +690,10 @@ class ResqJobOrderHandler implements JobOrderHandlerInterface
// get caller classification if any // get caller classification if any
$caller_class = $req->request->get('caller_class', ''); $caller_class = $req->request->get('caller_class', '');
// get emergency type if any
$etype_id = $req->request->get('emergency_type', 0);
$etype = $em->getRepository(EmergencyType::class)->find($etype_id);
if (empty($error_array)) if (empty($error_array))
{ {
// get current user // get current user
@ -716,7 +726,8 @@ class ResqJobOrderHandler implements JobOrderHandlerInterface
->setInitialConcern($initial_concern) ->setInitialConcern($initial_concern)
->setInitialConcernNotes($initial_concern_notes) ->setInitialConcernNotes($initial_concern_notes)
->setCallerClassification($caller_class) ->setCallerClassification($caller_class)
->setGender($gender); ->setGender($gender)
->setEmergencyType($etype);
// did they change invoice? // did they change invoice?
$invoice_items = $req->request->get('invoice_items', []); $invoice_items = $req->request->get('invoice_items', []);
@ -880,6 +891,10 @@ class ResqJobOrderHandler implements JobOrderHandlerInterface
// get caller classification if any // get caller classification if any
$caller_class = $req->request->get('caller_class', ''); $caller_class = $req->request->get('caller_class', '');
// get emergency type if any
$etype_id = $req->request->get('emergency_type', 0);
$etype = $em->getRepository(EmergencyType::class)->find($etype_id);
if (empty($error_array)) if (empty($error_array))
{ {
// coordinates // coordinates
@ -909,7 +924,8 @@ class ResqJobOrderHandler implements JobOrderHandlerInterface
->setInitialConcern($initial_concern) ->setInitialConcern($initial_concern)
->setInitialConcernNotes($initial_concern_notes) ->setInitialConcernNotes($initial_concern_notes)
->setGender($gender) ->setGender($gender)
->setCallerClassification($caller_class); ->setCallerClassification($caller_class)
->setEmergencyType($etype);
// validate // validate
$errors = $this->validator->validate($obj); $errors = $this->validator->validate($obj);
@ -1019,6 +1035,10 @@ class ResqJobOrderHandler implements JobOrderHandlerInterface
// get caller classification if any // get caller classification if any
$caller_class = $req->request->get('caller_class', ''); $caller_class = $req->request->get('caller_class', '');
// get emergency type if any
$etype_id = $req->request->get('emergency_type', 0);
$etype = $em->getRepository(EmergencyType::class)->find($etype_id);
// get current user // get current user
$user = $this->security->getUser(); $user = $this->security->getUser();
@ -1050,7 +1070,8 @@ class ResqJobOrderHandler implements JobOrderHandlerInterface
->setInitialConcern($initial_concern) ->setInitialConcern($initial_concern)
->setInitialConcernNotes($initial_concern_notes) ->setInitialConcernNotes($initial_concern_notes)
->setCallerClassification($caller_class) ->setCallerClassification($caller_class)
->setGender($gender); ->setGender($gender)
->setEmergencyType($etype);
if ($user != null) if ($user != null)
{ {
@ -1149,6 +1170,10 @@ class ResqJobOrderHandler implements JobOrderHandlerInterface
// get caller classification if any // get caller classification if any
$caller_class = $req->request->get('caller_class', ''); $caller_class = $req->request->get('caller_class', '');
// get emergency type if any
$etype_id = $req->request->get('emergency_type', 0);
$etype = $em->getRepository(EmergencyType::class)->find($etype_id);
if (empty($error_array)) { if (empty($error_array)) {
// coordinates // coordinates
$point = new Point($req->request->get('coord_lng'), $req->request->get('coord_lat')); $point = new Point($req->request->get('coord_lng'), $req->request->get('coord_lat'));
@ -1174,7 +1199,8 @@ class ResqJobOrderHandler implements JobOrderHandlerInterface
->setInitialConcern($initial_concern) ->setInitialConcern($initial_concern)
->setInitialConcernNotes($initial_concern_notes) ->setInitialConcernNotes($initial_concern_notes)
->setGender($gender) ->setGender($gender)
->setCallerClassification($caller_class); ->setCallerClassification($caller_class)
->setEmergencyType($etype);
// validate // validate
$errors = $this->validator->validate($obj); $errors = $this->validator->validate($obj);
@ -1393,6 +1419,10 @@ class ResqJobOrderHandler implements JobOrderHandlerInterface
// get caller classification if any // get caller classification if any
$caller_class = $req->request->get('caller_class', ''); $caller_class = $req->request->get('caller_class', '');
// get emergency type if any
$etype_id = $req->request->get('emergency_type', 0);
$etype = $em->getRepository(EmergencyType::class)->find($etype_id);
// get previously assigned hub, if any // get previously assigned hub, if any
$old_hub = $obj->getHub(); $old_hub = $obj->getHub();
@ -1449,6 +1479,7 @@ class ResqJobOrderHandler implements JobOrderHandlerInterface
->setInitialConcernNotes($initial_concern_notes) ->setInitialConcernNotes($initial_concern_notes)
->setGender($gender) ->setGender($gender)
->setCallerClassification($caller_class) ->setCallerClassification($caller_class)
->setEmergencyType($etype)
->clearRider(); ->clearRider();
if ($user != null) if ($user != null)
@ -1663,6 +1694,10 @@ class ResqJobOrderHandler implements JobOrderHandlerInterface
// get caller classification if any // get caller classification if any
$caller_class = $req->request->get('caller_class', ''); $caller_class = $req->request->get('caller_class', '');
// get emergency type if any
$etype_id = $req->request->get('emergency_type', 0);
$etype = $em->getRepository(EmergencyType::class)->find($etype_id);
if (empty($error_array)) { if (empty($error_array)) {
// rider mqtt event // rider mqtt event
// NOTE: need to send this before saving because rider will be cleared // NOTE: need to send this before saving because rider will be cleared
@ -1713,7 +1748,8 @@ class ResqJobOrderHandler implements JobOrderHandlerInterface
->setInitialConcern($initial_concern) ->setInitialConcern($initial_concern)
->setInitialConcernNotes($initial_concern_notes) ->setInitialConcernNotes($initial_concern_notes)
->setGender($gender) ->setGender($gender)
->setCallerClassification($caller_class); ->setCallerClassification($caller_class)
->setEmergencyType($etype);
if ($user != null) if ($user != null)
{ {
@ -3195,6 +3231,15 @@ class ResqJobOrderHandler implements JobOrderHandlerInterface
$params['bmfgs'] = $em->getRepository(BatteryManufacturer::class)->findAll(); $params['bmfgs'] = $em->getRepository(BatteryManufacturer::class)->findAll();
$params['promos'] = $em->getRepository(Promo::class)->findAll(); $params['promos'] = $em->getRepository(Promo::class)->findAll();
// list of emergency types
$e_types = $em->getRepository(EmergencyType::class)->findBy([], ['name' => 'ASC']);
$emergency_types = [];
foreach ($e_types as $e_type)
{
$emergency_types[$e_type->getID()] = $e_type->getName();
}
$params['emergency_types'] = $emergency_types;
// list of hubs // list of hubs
$hubs = $em->getRepository(Hub::class)->findBy([], ['name' => 'ASC']); $hubs = $em->getRepository(Hub::class)->findBy([], ['name' => 'ASC']);
$fac_hubs = []; $fac_hubs = [];

View file

@ -0,0 +1,133 @@
{% 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">Emergency Types</h3>
</div>
</div>
</div>
<!-- END: Subheader -->
<div class="m-content">
<!--Begin::Section-->
<div class="row">
<div class="col-xl-6">
<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="la la-industry"></i>
</span>
<h3 class="m-portlet__head-text">
{% if mode == 'update' %}
Edit Emergency Type
<small>{{ emergency_type.getName() }}</small>
{% else %}
New Emergency Type
{% endif %}
</h3>
</div>
</div>
</div>
<form id="row-form" class="m-form m-form--fit m-form--label-align-right m-form--group-seperator-dashed" method="post" action="{{ mode == 'update' ? url('emergency_type_update_submit', {'id': emergency_type.getId()}) : url('emergency_type_add_submit') }}">
<div class="m-portlet__body">
<div class="form-group m-form__group row">
<label class="col-lg-3 col-form-label" data-field="name">
Name:
</label>
<div class="col-lg-9">
<input type="text" name="name" class="form-control m-input" value="{{ emergency_type.getName() }}">
<div class="form-control-feedback hide" data-field="name"></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">
<button type="submit" class="btn btn-success">Submit</button>
<a href="{{ url('emergency_type_list') }}" class="btn btn-secondary">Back</a>
</div>
</div>
</div>
</div>
</form>
</div>
</div>
</div>
</div>
{% endblock %}
{% block scripts %}
<script>
$(function() {
$("#row-form").submit(function(e) {
var form = $(this);
e.preventDefault();
$.ajax({
method: "POST",
url: form.prop('action'),
data: form.serialize()
}).done(function(response) {
// remove all error classes
removeErrors();
swal({
title: 'Done!',
text: 'Your changes have been saved!',
type: 'success',
onClose: function() {
window.location.href = "{{ url('emergency_type_list') }}";
}
});
}).fail(function(response) {
if (response.status == 422) {
var errors = response.responseJSON.errors;
var firstfield = false;
// remove all error classes first
removeErrors();
// display errors contextually
$.each(errors, function(field, msg) {
var formfield = $("[name='" + field + "']");
var label = $("label[data-field='" + field + "']");
var msgbox = $(".form-control-feedback[data-field='" + field + "']");
// add error classes to bad fields
formfield.addClass('form-control-danger');
label.addClass('has-danger');
msgbox.html(msg).addClass('has-danger').removeClass('hide');
// check if this field comes first in DOM
var domfield = formfield.get(0);
if (!firstfield || (firstfield && firstfield.compareDocumentPosition(domfield) === 2)) {
firstfield = domfield;
}
});
// focus on first bad field
firstfield.focus();
// scroll to above that field to make it visible
$('html, body').animate({
scrollTop: $(firstfield).offset().top - 200
}, 100);
}
});
});
// remove all error classes
function removeErrors() {
$(".form-control-danger").removeClass('form-control-danger');
$("[data-field]").removeClass('has-danger');
$(".form-control-feedback[data-field]").addClass('hide');
}
});
</script>
{% endblock %}

View file

@ -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">
Emergency Types
</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 class="col-xl-4 order-1 order-xl-2 m--align-right">
<a href="{{ url('emergency_type_add_form') }}" class="btn btn-focus m-btn m-btn--custom m-btn--icon m-btn--air m-btn--pill">
<span>
<i class="la la-industry"></i>
<span>New Emergency Type</span>
</span>
</a>
<div class="m-separator m-separator--dashed d-xl-none"></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("emergency_type_rows") }}',
method: 'POST'
}
},
saveState: {
cookie: false,
webstorage: false
},
pageSize: 10,
serverPaging: true,
serverFiltering: true,
serverSorting: true
},
layout: {
scroll: true
},
columns: [
{
field: 'id',
title: 'ID',
width: 30
},
{
field: 'name',
title: 'Name'
},
{
field: 'Actions',
width: 110,
title: 'Actions',
sortable: false,
overflow: 'visible',
template: function (row, index, datatable) {
var actions = '';
if (row.meta.update_url != '') {
actions += '<a href="' + row.meta.update_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.name + '" title="Edit"><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.name + '" 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 %}

View file

@ -375,7 +375,7 @@
</div> </div>
</div> </div>
<div class="form-group m-form__group row"> <div class="form-group m-form__group row">
<div class="col-lg-4"> <div class="col-lg-6">
<label data-field="flag_will_wait">Willing to Wait</label> <label data-field="flag_will_wait">Willing to Wait</label>
<select class="form-control m-input" id="flag-willing-to-wait" name="flag_willing_to_wait"> <select class="form-control m-input" id="flag-willing-to-wait" name="flag_willing_to_wait">
{% for key, class in willing_to_wait_content %} {% for key, class in willing_to_wait_content %}
@ -384,7 +384,7 @@
</select> </select>
<div class="form-control-feedback hide" data-field="flag_willing_to_wait"></div> <div class="form-control-feedback hide" data-field="flag_willing_to_wait"></div>
</div> </div>
<div class="col-lg-4"> <div class="col-lg-6">
<label data-field="no_wait_reason">Reason Why Not Willing to Wait</label> <label data-field="no_wait_reason">Reason Why Not Willing to Wait</label>
<select class="form-control m-input" id="no-wait-reason" name="no_wait_reason" disabled> <select class="form-control m-input" id="no-wait-reason" name="no_wait_reason" disabled>
<option value="">None</option> <option value="">None</option>
@ -394,10 +394,26 @@
</select> </select>
<div class="form-control-feedback hide" data-field="no_wait_reason"></div> <div class="form-control-feedback hide" data-field="no_wait_reason"></div>
</div> </div>
<div class="col-lg-4"> </div>
<div class="form-group m-form__group row">
<div class="col-lg-6">
<label data-field="emergency_type">Emergency Scenario</label>
<select class="form-control m-input" id="emergency-type" name="emergency_type" disabled>
<option value=""></option>
{% for id, label in emergency_types %}
{% if obj.getEmergencyType %}
<option value="{{ id }}"{{ obj.getEmergencyType.getID == id ? ' selected' }}>{{ label }}</option>
{% else %}
<option value="{{ id }}">{{ label }}</option>
{% endif %}
{% endfor %}
</select>
<div class="form-control-feedback hide" data-field="emergency_type"></div>
</div>
<div class="col-lg-6">
<label data-field="not_wait_notes">Notes on Not Willing to Wait</label> <label data-field="not_wait_notes">Notes on Not Willing to Wait</label>
<textarea name="not_wait_notes" id="not-wait-notes" class="form-control m-input" rows="2" disabled>{{ obj.getNotWaitingNotes }}</textarea> <textarea name="not_wait_notes" id="not-wait-notes" class="form-control m-input" rows="2" disabled>{{ obj.getNotWaitingNotes }}</textarea>
<div class="form-control-feedback hide" data-field="not_wait_notes"></div> <div class="form-control-feedback hide" data-field="not_wait_notes"></div>
</div> </div>
</div> </div>
<div class="form-group m-form__group row"> <div class="form-group m-form__group row">
@ -2053,6 +2069,19 @@ $(function() {
// empty the reason text field // empty the reason text field
$("#not-wait-notes").val(''); $("#not-wait-notes").val('');
// remove selected option that might have already been selected
$("#emergency-type option:selected").prop("selected", false);
}
});
$("#no-wait-reason").change(function() {
var field_value = $(this).val();
console.log(field_value);
if (field_value == 'emergency') {
$("#emergency-type").attr("disabled", false);
} else {
$("#emergency-type").attr("disabled", true);
} }
}); });
}); });

View file

@ -0,0 +1,51 @@
-- MySQL dump 10.19 Distrib 10.3.32-MariaDB, for Linux (x86_64)
--
-- Host: localhost Database: resq
-- ------------------------------------------------------
-- Server version 10.3.32-MariaDB
/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
/*!40101 SET NAMES utf8mb4 */;
/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
/*!40103 SET TIME_ZONE='+00:00' */;
/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
--
-- Table structure for table `emergency_type`
--
DROP TABLE IF EXISTS `emergency_type`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `emergency_type` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`name` varchar(80) COLLATE utf8_unicode_ci NOT NULL,
PRIMARY KEY (`id`)
) ENGINE=InnoDB AUTO_INCREMENT=10 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
/*!40101 SET character_set_client = @saved_cs_client */;
--
-- Dumping data for table `emergency_type`
--
LOCK TABLES `emergency_type` WRITE;
/*!40000 ALTER TABLE `emergency_type` DISABLE KEYS */;
INSERT INTO `emergency_type` VALUES (1,'Emergency Situation Related to Vehicle Problem'),(2,'Avoiding Towing'),(3,'Road Obstruction'),(4,'Along the Road'),(5,'With Babies or Kids Inside the Car'),(6,'Senior Citizen'),(7,'Buying Medicine'),(8,'Going to Hospital'),(9,'Uniformed Officials');
/*!40000 ALTER TABLE `emergency_type` ENABLE KEYS */;
UNLOCK TABLES;
/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-- Dump completed on 2022-06-06 8:52:11