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

Add schedule and adjust schedule date to display date and time always #67

Browse source
This commit is contained in:
Kendrick Chan 2018-04-03 21:38:45 +08:00
parent 684c6f62d8
commit 190ab8ceaf
10 changed files with 23 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/Controller/JobOrderController.php
View file

@ -530,7 +530,8 @@ class JobOrderController extends BaseController
// add row data
$row['id'] = $orow->getID();
$row['delivery_address'] = $orow->getDeliveryAddress();
$row['date_schedule'] = $orow->isAdvanceOrder() ? $orow->getDateSchedule()->format("d M Y g:i A") : 'Immediate';
$row['date_schedule'] = $orow->getDateSchedule()->format("d M Y g:i A");
$row['type'] = $orow->isAdvanceOrder() ? 'Advanced Order' : 'Immediate';
$row['service_type'] = $service_types[$orow->getServiceType()];
$row['status'] = $statuses[$orow->getStatus()];
$row['flag_advance'] = $orow->isAdvanceOrder();

6
src/Controller/TicketController.php
View file

@ -91,7 +91,6 @@ class TicketController extends BaseController
// add row data
$row['id'] = $orow->getID();
$row['date_create'] = $orow->getDateCreate()->format("d M Y g:i A");
$row['subject'] = $orow->getSubject();
$row['first_name'] = $orow->getFirstName();
$row['last_name'] = $orow->getLastName();
$row['contact_num'] = $orow->getContactNumber();
@ -243,7 +242,6 @@ class TicketController extends BaseController
->setStatus($req->request->get('status'))
->setTicketType($ticket_type)
->setOtherTicketType($other_ticket_type)
->setSubject($req->request->get('subject'))
->setDetails($req->request->get('details'))
->setPlateNumber($req->request->get('plate_number'))
->setDateCreate(new DateTime())
@ -401,7 +399,6 @@ class TicketController extends BaseController
->setStatus($req->request->get('status'))
->setTicketType($ticket_type)
->setOtherTicketType($other_ticket_type)
->setSubject($req->request->get('subject'))
->setDetails($req->request->get('details'))
->setPlateNumber($req->request->get('plate_number'));
@ -465,8 +462,7 @@ class TicketController extends BaseController
// check if datatable filter is present and append to query
protected function setQueryFilters($datatable, &$query, $qb) {
if (isset($datatable['query']['data-rows-search']) && !empty($datatable['query']['data-rows-search'])) {
$query->where('q.subject LIKE :filter')
->orWhere('q.status LIKE :filter')
$query->where('q.status LIKE :filter')
->orWhere('q.ticket_type LIKE :filter')
->orWhere('q.other_ticket_type LIKE :filter')
->orWhere('q.first_name LIKE :filter')

18
src/Entity/Ticket.php
View file

@ -50,13 +50,6 @@ class Ticket
*/
protected $other_ticket_type;
// subject of this ticket
/**
* @ORM\Column(type="string", length=80)
* @Assert\NotBlank()
*/
protected $subject;
// first name of ticket owner
/**
* @ORM\Column(type="string", length=80)
@ -180,17 +173,6 @@ class Ticket
}
}
public function setSubject($subject)
{
$this->subject = $subject;
return $this;
}
public function getSubject()
{
return $this->subject;
}
public function setFirstName($first_name)
{
$this->first_name = $first_name;

4
templates/job-order/list.all.html.twig
View file

@ -85,6 +85,10 @@
field: 'service_type',
title: 'Type of Transaction'
},
{
field: 'type',
title: 'Schedule'
},
{
field: 'date_schedule',
title: 'Scheduled Date'

4
templates/job-order/list.assigning.html.twig
View file

@ -85,6 +85,10 @@
field: 'service_type',
title: 'Type of Transaction'
},
{
field: 'type',
title: 'Schedule'
},
{
field: 'date_schedule',
title: 'Scheduled Date'

4
templates/job-order/list.fulfillment.html.twig
View file

@ -85,6 +85,10 @@
field: 'service_type',
title: 'Type of Transaction'
},
{
field: 'type',
title: 'Schedule'
},
{
field: 'date_schedule',
title: 'Scheduled Date'

4
templates/job-order/list.open.html.twig
View file

@ -85,6 +85,10 @@
field: 'service_type',
title: 'Type of Transaction'
},
{
field: 'type',
title: 'Schedule'
},
{
field: 'date_schedule',
title: 'Scheduled Date'

4
templates/job-order/list.processing.html.twig
View file

@ -81,6 +81,10 @@
field: 'delivery_address',
title: 'Customer Area'
},
{
field: 'type',
title: 'Schedule'
},
{
field: 'date_schedule',
title: 'Scheduled Date'

13
templates/ticket/form.html.twig
View file

@ -95,13 +95,6 @@
<div class="form-control-feedback hide" data-field="status"></div>
</div>
</div>
<div class="form-group m-form__group row no-border">
<div class="col-lg-12">
<label data-field="subject">Subject</label>
<input type="text" name="subject" class="form-control m-input" value="{{ obj.getSubject }}">
<div class="form-control-feedback hide" data-field="subject"></div>
</div>
</div>
<div class="form-group m-form__group row no-border">
<div class="col-lg-12">
<label for="details" data-field="details">
@ -248,7 +241,6 @@
trow = {
id: "{{ ticket.getID }}",
date_create: "{{ ticket.getDateCreate|date('d M Y - h:i A') }}",
subject: "{{ ticket.getSubject }}",
ticket_type: "{{ ticket.getTicketTypeText }}",
status: "{{ ticket.getStatusText }}",
edit_url: "{{ url('ticket_update', {'id': ticket.getID}) }}"
@ -281,11 +273,6 @@
title: 'Date Created',
width: 200
},
{
field: 'subject',
title: 'Subject',
width: 300
},
{
field: 'ticket_type',
title: 'Ticket Type'

5
templates/ticket/list.html.twig
View file

@ -88,11 +88,6 @@
title: 'Date Created',
width: 150
},
{
field: 'subject',
title: 'Subject',
width: 250
},
{
field: 'first_name',
title: 'First Name'