Resolve "Ticket changes" #830

Merged
arcticzero merged 5 commits from 21-ticket-changes into master 2018-02-26 09:53:57 +00:00
4 changed files with 32 additions and 1 deletions
Showing only changes of commit 7cc7c81d98 - Show all commits

View file

@ -99,6 +99,7 @@ class TicketController extends BaseController
$row['contact_num'] = $orow->getContactNumber();
$row['status'] = $ticket_statuses[$orow->getStatus()];
$row['ticket_type'] = $ticket_types[$orow->getTicketType()];
$row['plate_number'] = $orow->getPlateNumber();
// add row metadata
$row['meta'] = [
@ -216,6 +217,7 @@ class TicketController extends BaseController
->setOtherTicketType($other_ticket_type)
->setSubject($req->request->get('subject'))
->setDetails($req->request->get('details'))
->setPlateNumber($req->request->get('plate_number'))
->setDateCreate(new DateTime())
->setCreatedBy($this->getUser());
@ -348,7 +350,8 @@ class TicketController extends BaseController
->setTicketType($ticket_type)
->setOtherTicketType($other_ticket_type)
->setSubject($req->request->get('subject'))
->setDetails($req->request->get('details'));
->setDetails($req->request->get('details'))
->setPlateNumber($req->request->get('plate_number'));
// initialize error list
$error_array = [];

View file

@ -83,6 +83,12 @@ class Ticket
*/
protected $details;
// plate number
/**
* @ORM\Column(type="string", length=10, nullable=true)
*/
protected $plate_number;
// user that created the ticket
/**
* @ORM\ManyToOne(targetEntity="User", inversedBy="tickets")
@ -222,6 +228,17 @@ class Ticket
return $this->details;
}
public function setPlateNumber($plate_number)
{
$this->plate_number = $plate_number;
return $this;
}
public function getPlateNumber()
{
return $this->plate_number;
}
public function setCreatedBy(User $created_by)
{
$this->created_by = $created_by;

View file

@ -80,6 +80,13 @@
<div class="form-control-feedback hide" data-field="other_ticket_type"></div>
</div>
</div>
<div class="form-group m-form__group row no-border">
<div class="col-lg-4">
<label data-field="plate_number">Vehicle 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="subject">Subject</label>

View file

@ -105,6 +105,10 @@
field: 'contact_num',
title: 'Contact No.'
},
{
field: 'plate_number',
title: 'Plate Number'
},
{
field: 'ticket_type',
title: 'Type'