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

Merge branch '31-change-timeline-date-format-to-12-hour' into 'master'

Browse source 
Resolve "Change timeline date format to 12-hour"

Closes #31

See merge request jankstudio/resq!30
This commit is contained in:
Ramon Gutierrez 2018-02-27 15:46:46 +00:00
commit d3f01a1303
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/Controller/JobOrderController.php
View file

@ -1267,25 +1267,25 @@ class JobOrderController extends BaseController
$params['timeline'] = [ $params['timeline'] = [
[ [
'date' => date("M j"), 'date' => date("M j"),
'time' => date("H:i A"), 'time' => date("g:i A"),
'event' => "Event 4", 'event' => "Event 4",
'color' => "#f4516c" 'color' => "#f4516c"
], ],
[ [
'date' => date("M j"), 'date' => date("M j"),
'time' => date("H:i A"), 'time' => date("g:i A"),
'event' => "Event 3", 'event' => "Event 3",
'color' => "#34bfa3" 'color' => "#34bfa3"
], ],
[ [
'date' => date("M j"), 'date' => date("M j"),
'time' => date("H:i A"), 'time' => date("g:i A"),
'event' => "Event 2", 'event' => "Event 2",
'color' => "#716aca" 'color' => "#716aca"
], ],
[ [
'date' => date("M j"), 'date' => date("M j"),
'time' => date("H:i A"), 'time' => date("g:i A"),
'event' => "Event 1", 'event' => "Event 1",
'color' => "#ffb822" 'color' => "#ffb822"
], ],