rgutierrez/resq
1
0
Fork 0
Code Issues 126 Pull requests 49 Projects Releases 4 Packages Wiki Activity Actions

Add rider schedule entry to rider form #8

Browse source
This commit is contained in:
Ramon Gutierrez 2018-02-18 16:34:30 +08:00
parent 3c27cf53bf
commit a4ae8f4726
3 changed files with 293 additions and 78 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
public/assets/css/style.css
View file

@ -99,7 +99,8 @@ span.has-danger,
font-weight: 300 !important;
}
.table-compact th {
.table-compact th,
.table th {
font-size: 0.9rem !important;
background-color: #F4F3F8;
color: #575962;
@ -109,7 +110,8 @@ span.has-danger,
background-color: #F7F6FA;
}
.table-compact td {
.table-compact td,
.table td {
font-size: 0.9rem !important;
}

130
src/Controller/RiderController.php
View file

@ -3,7 +3,9 @@
namespace App\Controller;
use App\Ramcar\BaseController;
use App\Ramcar\DayOfWeek;
use App\Entity\Rider;
use App\Entity\RiderSchedule;
use App\Entity\Hub;
use App\Service\FileUploader;
@ -13,6 +15,8 @@ use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\Security\Core\Encoder\EncoderFactoryInterface;
use Symfony\Component\Validator\Validator\ValidatorInterface;
use DateTime;
class RiderController extends BaseController
{
public function index()
@ -134,6 +138,7 @@ class RiderController extends BaseController
// get parent associations
$params['hubs'] = $em->getRepository(Hub::class)->findAll();
$params['days_of_week'] = DayOfWeek::getCollection();
// response
return $this->render('rider/form.html.twig', $params);
@ -143,12 +148,17 @@ class RiderController extends BaseController
{
$this->denyAccessUnlessGranted('rider.add', null, 'No access.');
/*
error_log(print_r($req->request->all(), true));
throw $this->createNotFoundException('The item does not exist');
*/
// create new row
$em = $this->getDoctrine()->getManager();
$row = new Rider();
$obj = new Rider();
// set and save values
$row->setFirstName($req->request->get('first_name'))
$obj->setFirstName($req->request->get('first_name'))
->setLastName($req->request->get('last_name'))
->setContactNumber($req->request->get('contact_no'))
->setPlateNumber($req->request->get('plate_number'))
@ -167,17 +177,55 @@ class RiderController extends BaseController
if (empty($hub))
$error_array['hub'] = 'Invalid hub selected.';
else
$row->setHub($hub);
$obj->setHub($hub);
}
// validate
$errors = $validator->validate($row);
$errors = $validator->validate($obj);
// add errors to list
foreach ($errors as $error) {
$error_array[$error->getPropertyPath()] = $error->getMessage();
}
// save schedules
$days_of_week = DayOfWeek::getCollection();
$time_start_input = $req->request->get('time_start');
$time_end_input = $req->request->get('time_end');
$break_start_input = $req->request->get('break_start');
$break_end_input = $req->request->get('break_end');
$has_schedule = $req->request->get('has_schedule');
foreach ($days_of_week as $key => $day) {
if (in_array($key, $has_schedule)) {
$serror_array = [];
$sobj = new RiderSchedule();
$sobj->setDayOfWeek($key)
->setTimeStart($time_start_input[$key])
->setTimeEnd($time_end_input[$key])
->setBreakStart($break_start_input[$key])
->setBreakEnd($break_end_input[$key])
->setRider($obj);
// validate
$errors = $validator->validate($sobj);
// add errors to list
foreach ($errors as $error) {
$serror_array[$error->getPropertyPath() . "_" . $key] = $error->getMessage();
}
if (empty($serror_array)) {
$obj->addSchedule($sobj);
} else {
$error_array = array_merge($error_array, $serror_array);
}
}
}
// check if any errors were found
if (!empty($error_array)) {
// return validation failure response
@ -187,7 +235,7 @@ class RiderController extends BaseController
], 422);
} else {
// validated! save the entity
$em->persist($row);
$em->persist($obj);
$em->flush();
// return successful response
@ -216,6 +264,7 @@ class RiderController extends BaseController
// get parent associations
$params['hubs'] = $em->getRepository(Hub::class)->findAll();
$params['days_of_week'] = DayOfWeek::getCollection();
$params['obj'] = $row;
@ -229,14 +278,14 @@ class RiderController extends BaseController
// get row data
$em = $this->getDoctrine()->getManager();
$row = $em->getRepository(Rider::class)->find($id);
$obj = $em->getRepository(Rider::class)->find($id);
// make sure this row exists
if (empty($row))
if (empty($obj))
throw $this->createNotFoundException('The item does not exist');
// set and save values
$row->setFirstName($req->request->get('first_name'))
$obj->setFirstName($req->request->get('first_name'))
->setLastName($req->request->get('last_name'))
->setContactNumber($req->request->get('contact_no'))
->setPlateNumber($req->request->get('plate_number'))
@ -255,19 +304,78 @@ class RiderController extends BaseController
if (empty($hub))
$error_array['hub'] = 'Invalid hub selected.';
else
$row->setHub($hub);
$obj->setHub($hub);
} else {
$row->clearHub();
$obj->clearHub();
}
// validate
$errors = $validator->validate($row);
$errors = $validator->validate($obj);
// add errors to list
foreach ($errors as $error) {
$error_array[$error->getPropertyPath()] = $error->getMessage();
}
// save schedules
$days_of_week = DayOfWeek::getCollection();
$time_start_input = $req->request->get('time_start');
$time_end_input = $req->request->get('time_end');
$break_start_input = $req->request->get('break_start');
$break_end_input = $req->request->get('break_end');
$has_schedule = $req->request->get('has_schedule');
foreach ($days_of_week as $key => $day) {
if (in_array($key, $has_schedule)) {
$serror_array = [];
$sobj = $em->getRepository(RiderSchedule::class)->findOneBy([
'rider' => $obj,
'day_of_week' => $key
]);
// create new schedule row if not found
if (empty($sobj)) {
$sobj = new RiderSchedule();
$sobj->setDayOfWeek($key)
->setRider($obj);
}
$sobj->setTimeStart($time_start_input[$key])
->setTimeEnd($time_end_input[$key])
->setBreakStart($break_start_input[$key])
->setBreakEnd($break_end_input[$key]);
// validate
$errors = $validator->validate($sobj);
// add errors to list
foreach ($errors as $error) {
$serror_array[$error->getPropertyPath() . "_" . $key] = $error->getMessage();
}
if (empty($serror_array)) {
if (empty($sobj->getID()))
$obj->addSchedule($sobj);
} else {
$error_array = array_merge($error_array, $serror_array);
}
}
}
// cleanup
// delete all schedules not in list
$schedules = $obj->getSchedules();
foreach ($schedules as $schedule)
{
if (!in_array($schedule->getDayOfWeek(), $has_schedule))
{
$obj->removeSchedule($schedule);
$em->remove($schedule);
}
}
// check if any errors were found
if (!empty($error_array)) {
// return validation failure response

235
templates/rider/form.html.twig
View file

@ -32,74 +32,154 @@
</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('rider_update_submit', {'id': obj.getId()}) : url('rider_create_submit') }}">
<form id="row-form" class="m-form m-form--fit m-form--label-align-right" method="post" action="{{ mode == 'update' ? url('rider_update_submit', {'id': obj.getId()}) : url('rider_create_submit') }}">
<div class="m-portlet__body">
<div class="form-group m-form__group row no-border">
<div class="col-lg-6">
<label data-field="first_name">First Name</label>
<input type="text" name="first_name" class="form-control m-input" value="{{ obj.getFirstName() }}">
<div class="form-control-feedback hide" data-field="first_name"></div>
<div class="m-form__section m-form__section--first">
<div class="m-form__heading">
<h3 class="m-form__heading-title">
Rider Details
</h3>
</div>
<div class="col-lg-6">
<label data-field="last_name">Last Name</label>
<input type="text" name="last_name" class="form-control m-input" value="{{ obj.getLastName() }}">
<div class="form-control-feedback hide" data-field="last_name"></div>
</div>
</div>
<div class="form-group m-form__group row no-border">
<div class="col-lg-6">
<label data-field="contact_no">Contact Number</label>
<input type="text" name="contact_no" class="form-control m-input" value="{{ obj.getContactNumber() }}">
<div class="form-control-feedback hide" data-field="contact_no"></div>
</div>
<div class="col-lg-6">
<label data-field="plate_number">Plate Number</label>
<input type="text" name="plate_number" class="form-control m-input" value="{{ obj.getPlateNumber() }}">
<div class="form-control-feedback hide" data-field="plate_number"></div>
</div>
</div>
<div class="form-group m-form__group row no-border">
<div class="col-lg-12">
<label data-field="hub">Hub</label>
<select class="form-control m-input" id="hub" name="hub">
<option value=""></option>
{% for hub in hubs %}
<option value="{{ hub.getID }}"{{ obj.getHub and hub.getID == obj.getHub.getID ? ' selected' }}>{{ hub.getName ~ (hub.getBranch ? ' - ' ~ hub.getBranch) }}</option>
{% endfor %}
</select>
<div class="form-control-feedback hide" data-field="hub"></div>
</div>
</div>
<div class="form-group m-form__group row">
<div class="col-lg-6">
<label data-field="image_file">
{% if mode == 'update' and obj.getImageFile %}
Replace Picture
{% else %}
Picture
{% endif %}
</label>
<div class="m-dropzone dropzone m-dropzone--primary" action="{{ url('rider_upload_image') }}" id="image-file">
<div class="m-dropzone__msg dz-message needsclick">
<h3 class="m-dropzone__msg-title">
Drop files here or click to upload.
</h3>
<span class="m-dropzone__msg-desc">
Upload only valid PNG, GIF, or JPEG images
</span>
</div>
</div>
{% if mode == 'update' and obj.getImageFile %}
<span class="m-form__help">Leave blank for unchanged</span>
{% endif %}
<div class="form-control-feedback hide" data-field="image_file"></div>
</div>
{% if mode == 'update' %}
<div class="form-group m-form__group row">
<div class="col-lg-6">
<label>&nbsp;</label>
<div class="portrait-box" style="background-image: url('{{ obj.getImageFile() ? '/uploads/' ~ obj.getImageFile() : '/assets/images/user.gif' }}');"></div>
<label data-field="first_name">First Name</label>
<input type="text" name="first_name" class="form-control m-input" value="{{ obj.getFirstName() }}">
<div class="form-control-feedback hide" data-field="first_name"></div>
</div>
{% endif %}
<div class="col-lg-6">
<label data-field="last_name">Last Name</label>
<input type="text" name="last_name" class="form-control m-input" value="{{ obj.getLastName() }}">
<div class="form-control-feedback hide" data-field="last_name"></div>
</div>
</div>
<div class="form-group m-form__group row">
<div class="col-lg-6">
<label data-field="contact_no">Contact Number</label>
<input type="text" name="contact_no" class="form-control m-input" value="{{ obj.getContactNumber() }}">
<div class="form-control-feedback hide" data-field="contact_no"></div>
</div>
<div class="col-lg-6">
<label data-field="plate_number">Plate Number</label>
<input type="text" name="plate_number" class="form-control m-input" value="{{ obj.getPlateNumber() }}" maxlength="10">
<div class="form-control-feedback hide" data-field="plate_number"></div>
</div>
</div>
<div class="form-group m-form__group row">
<div class="col-lg-12">
<label data-field="hub">Hub</label>
<select class="form-control m-input" id="hub" name="hub">
<option value=""></option>
{% for hub in hubs %}
<option value="{{ hub.getID }}"{{ obj.getHub and hub.getID == obj.getHub.getID ? ' selected' }}>{{ hub.getName ~ (hub.getBranch ? ' - ' ~ hub.getBranch) }}</option>
{% endfor %}
</select>
<div class="form-control-feedback hide" data-field="hub"></div>
</div>
</div>
<div class="form-group m-form__group row">
<div class="col-lg-6">
<label data-field="image_file">
{% if mode == 'update' and obj.getImageFile %}
Replace Picture
{% else %}
Picture
{% endif %}
</label>
<div class="m-dropzone dropzone m-dropzone--primary" action="{{ url('rider_upload_image') }}" id="image-file">
<div class="m-dropzone__msg dz-message needsclick">
<h3 class="m-dropzone__msg-title">
Drop files here or click to upload.
</h3>
<span class="m-dropzone__msg-desc">
Upload only valid PNG, GIF, or JPEG images
</span>
</div>
</div>
{% if mode == 'update' and obj.getImageFile %}
<span class="m-form__help">Leave blank for unchanged</span>
{% endif %}
<div class="form-control-feedback hide" data-field="image_file"></div>
</div>
{% if mode == 'update' %}
<div class="col-lg-6">
<label>&nbsp;</label>
<div class="portrait-box" style="background-image: url('{{ obj.getImageFile() ? '/uploads/' ~ obj.getImageFile() : '/assets/images/user.gif' }}');"></div>
</div>
{% endif %}
</div>
</div>
<div class="m-form__seperator m-form__seperator--dashed"></div>
<div class="m-form__section m-form__section--last">
<div class="m-form__heading">
<h3 class="m-form__heading-title">
Schedule
</h3>
</div>
<div class="form-group m-form__group row">
<div class="col-lg-12">
<table id="schedules-table" class="table m-table">
<thead>
<tr>
<th></th>
<th>Day</th>
<th>Time Start</th>
<th>Time End</th>
<th>Break Start</th>
<th>Break End</th>
</tr>
</thead>
<tbody>
{% for key, day in days_of_week %}
<tr>
<td>
<div class="checkbox">
<label>
<input type="checkbox" name="has_schedule[]" value="{{ key }}" class="day-has-schedule"{{ obj.getScheduleForDay(key) ? ' checked="checked"' }}>
</label>
</div>
<td>{{ day }}</td>
<td>
<div class="input-group timepicker">
<input type="text" name="time_start[{{ key }}]" data-name="time_start_{{ key }}" class="form-control m-input" readonly placeholder="Select time" type="text" value="{{ obj.getScheduleForDay(key).getTimeStart.format('g:i A')|default('') }}" disabled />
<span class="input-group-addon">
<i class="la la-clock-o"></i>
</span>
</div>
<div class="form-control-feedback hide" data-field="time_start_{{ key }}"></div>
</td>
<td>
<div class="input-group timepicker">
<input type="text" name="time_end[{{ key }}]" data-name="time_end_{{ key }}" class="form-control m-input" readonly placeholder="Select time" type="text" value="{{ obj.getScheduleForDay(key).getTimeEnd.format('g:i A')|default('') }}" disabled />
<span class="input-group-addon">
<i class="la la-clock-o"></i>
</span>
</div>
<div class="form-control-feedback hide" data-field="time_end_{{ key }}"></div>
</td>
<td>
<div class="input-group timepicker">
<input type="text" name="break_start[{{ key }}]" data-name="break_start_{{ key }}" class="form-control m-input" readonly placeholder="Select time" type="text" value="{{ obj.getScheduleForDay(key).getBreakStart.format('g:i A')|default('') }}" disabled />
<span class="input-group-addon">
<i class="la la-clock-o"></i>
</span>
</div>
<div class="form-control-feedback hide" data-field="break_start_{{ key }}"></div>
</td>
<td>
<div class="input-group timepicker">
<input type="text" name="break_end[{{ key }}]" data-name="break_end_{{ key }}" class="form-control m-input" readonly placeholder="Select time" type="text" value="{{ obj.getScheduleForDay(key).getBreakEnd.format('g:i A')|default('') }}" disabled />
<span class="input-group-addon">
<i class="la la-clock-o"></i>
</span>
</div>
<div class="form-control-feedback hide" data-field="break_end_{{ key }}"></div>
</td>
</tr>
{% endfor %}
</tbody>
</table>
</div>
</div>
</div>
</div>
<div class="m-portlet__foot m-portlet__foot--fit">
@ -148,6 +228,31 @@
};
$(function() {
// schedule checkboxes
$(".day-has-schedule").change(function() {
var fields = $(this).closest('tr').find('input[type="text"]');
var checked = $(this).prop('checked');
if (checked) {
fields.prop('disabled', false);
} else {
fields.prop('disabled', true).val("");
}
}).change();
// timepickers
$('.timepicker .m-input').timepicker({
format: "HH:ii P",
minuteStep: 1,
showMeridian: true,
snapToStep: true,
bootcssVer: 3,
todayHighlight: true,
autoclose: true,
defaultTime: '',
showInputs: false
});
$("#row-form").submit(function(e) {
var form = $(this);
@ -178,7 +283,7 @@
// display errors contextually
$.each(errors, function(field, msg) {
var formfield = $("[name='" + field + "']");
var formfield = $("[name='" + field + "'], [data-name='" + field + "']");
var label = $("label[data-field='" + field + "']");
var msgbox = $(".form-control-feedback[data-field='" + field + "']");