diff --git a/assets/coffee/slepe.coffee b/assets/coffee/slepe.coffee index 5f794f1..24346a5 100644 --- a/assets/coffee/slepe.coffee +++ b/assets/coffee/slepe.coffee @@ -19,9 +19,11 @@ handleSeverityClick = (e, msg = 'Set ticket severity:') -> url: editLink, data: severity: newSeverity, - success: (data) -> + dataType: 'json', + success: (result) -> newSeverity = newSeverity.charAt(0).toUpperCase() + newSeverity.slice(1) $('.ticket-severity > span').text(newSeverity) + updateTicketModified(result.updated_at) console.log('Ticket updated successfully.') }) else @@ -39,16 +41,22 @@ handleStatusClick = (e, msg = 'Set ticket status:') -> console.log('Setting status to ' + newStatus) editLink = $('#ticketEditLink').attr('href') + '/status' console.log('Sending data to ' + editLink) - $.ajax({ + $.ajax( type: "POST", url: editLink, data: status: newStatus, - success: (data) -> + dataType: 'json', + success: (result) -> newStatus = newStatus.charAt(0).toUpperCase() + newStatus.slice(1) $('.ticket-status > span').text(newStatus) + updateTicketModified(result.updated_at) console.log('Ticket updated successfully.') - }) + ) else console.log('Invalid status entered') handleStatusClick(e, 'Invalid status; valid values are open, closed, and parked.') + +updateTicketModified = (date) -> + $('.ticket-updated > span').text(date) + console.log('Ticket update time is ' + date) diff --git a/src/Controllers/TicketController.php b/src/Controllers/TicketController.php index 8c3fec6..df32ed5 100644 --- a/src/Controllers/TicketController.php +++ b/src/Controllers/TicketController.php @@ -82,7 +82,10 @@ class TicketController extends Controller { $ticket->save(); // return a response - $response->getBody()->write(json_encode(['status' => 'success'])); + $response->getBody()->write(json_encode([ + 'result' => 'success', + 'updated_at' => $ticket->formatUpdatedAt(), + ])); return $response; } diff --git a/src/Models/Ticket.php b/src/Models/Ticket.php index 43199ee..94a71cb 100644 --- a/src/Models/Ticket.php +++ b/src/Models/Ticket.php @@ -27,4 +27,12 @@ class Ticket extends Model { return $this->hasMany(Comment::class); } + public function formatCreatedAt(): string { + return date_format(date_create($this->created_at), "F jS\\, Y \\a\\t g:i:s a"); + } + + public function formatUpdatedAt(): string { + return date_format(date_create($this->updated_at), "F jS\\, Y \\a\\t g:i:s a"); + } + } diff --git a/views/ticket/view.twig b/views/ticket/view.twig index bce3c63..9f6fd92 100644 --- a/views/ticket/view.twig +++ b/views/ticket/view.twig @@ -9,8 +9,8 @@

{{ ticket.title }}

-

Created at {{ ticket.created_at }}

-

Last updated at {{ ticket.updated_at }}

+

Created at: {{ ticket.formatCreatedAt() }}

+

Last updated at: {{ ticket.formatUpdatedAt() }}