Merge branch '391-resq-app-changes' into 'master'

Resolve "Resq - App Changes"

Closes #391

See merge request jankstudio/resq!435
This commit is contained in:
Kendrick Chan 2020-04-30 03:19:07 +00:00
commit 4d7455a058

View file

@ -3023,41 +3023,50 @@ class APIController extends Controller implements LoggedController
$data = [];
// set all slots to true
$data[] = [
'08_09' => [
'label' => '8-9 AM',
$data = [
[
'id' => '08_09',
'label' => '8:00 AM',
'available' => $status,
],
'09_10' => [
'label' => '9-10 AM',
[
'id' => '09_10',
'label' => '9:00 AM',
'available' => $status,
],
'10_11' => [
'label' => '10-11 AM',
[
'id' => '10_11',
'label' => '10:00 AM',
'available' => $status,
],
'11_12' => [
'label' => '11 AM-12 PM',
[
'id' =>'11_12',
'label' => '11:00 AM',
'available' => $status,
],
'13_14' => [
'label' => '12 PM-1 PM',
[
'id' => '12_13',
'label' => '12:00 PM',
'available' => $status,
],
'14_15' => [
'label' => '1-2 PM',
[
'id' => '13_14',
'label' => '1:00 PM',
'available' => $status,
],
'14_15' => [
'label' => '2-3 PM',
[
'id' => '14_15',
'label' => '2:00 PM',
'available' => $status,
],
'15_16' => [
'label' => '3-4 PM',
[
'id' => '15_16',
'label' => '3:00 PM',
'available' => $status,
],
'16_17' => [
'label' => '4-5 PM',
[
'id' => '16_17',
'label' => '4:00 PM',
'available' => $status,
],
];
@ -3077,74 +3086,65 @@ class APIController extends Controller implements LoggedController
switch($i) {
case '0':
$data[] = [
'08_09' => [
'label' => '8-9 AM',
'available' => true,
]
'id' => '08_09',
'label' => '8:00 AM',
'available' => true,
];
break;
case '1':
$data[] = [
'09_10' => [
'label' => '9-10 AM',
'available' => true,
]
'id' => '09_10',
'label' => '9:00 AM',
'available' => true,
];
break;
case '2':
$data[] = [
'10_11' => [
'label' => '10-11 AM',
'available' => true,
]
'id' => '10_11',
'label' => '10:00 AM',
'available' => true,
];
break;
case '3':
$data[] = [
'11_12' => [
'label' => '11 AM-12 PM',
'available' => true,
]
'id' => '11_12',
'label' => '11:00 AM',
'available' => true,
];
break;
case '4':
$data[] = [
'12_13' => [
'label' => '12 PM-1 PM',
'available' => true,
]
'id' => '12_13',
'label' => '12:00 PM',
'available' => true,
];
break;
case '5':
$data[] = [
'13_14' => [
'label' => '1-2 PM',
'available' => true,
]
'id' => '13_14',
'label' => '1:00 PM',
'available' => true,
];
break;
case '6':
$data[] = [
'14_15' => [
'label' => '2-3 PM',
'available' => true,
]
'id' => '14_15',
'label' => '2:00 PM',
'available' => true,
];
break;
case '7':
$data[] = [
'15_16' => [
'label' => '3-4 PM',
'available' => true,
]
'id' => '15_16',
'label' => '3:00 PM',
'available' => true,
];
break;
case '8':
$data[] = [
'16_17' => [
'label' => '4-5 PM',
'available' => true,
]
'id' => '16_17',
'label' => '4:00 PM',
'available' => true,
];
break;
default:
@ -3157,74 +3157,65 @@ class APIController extends Controller implements LoggedController
switch($i) {
case '0':
$data[] = [
'08_09' => [
'label' => '8-9 AM',
'available' => false,
]
'id' => '08_09',
'label' => '8:00 AM',
'available' => false,
];
break;
case '1':
$data[] = [
'09_10' => [
'label' => '9-10 AM',
'available' => false,
]
'id' => '09_10',
'label' => '9:00 AM',
'available' => false,
];
break;
case '2':
$data[] = [
'10_11' => [
'label' => '10-11 AM',
'available' => false,
]
'id' => '10_11',
'label' => '10:00 AM',
'available' => false,
];
break;
case '3':
$data[] = [
'11_12' => [
'label' => '11 AM-12 PM',
'available' => false,
]
'id' => '11_12',
'label' => '11:00 AM',
'available' => false,
];
break;
case '4':
$data[] = [
'12_13' => [
'label' => '12 PM-1 PM',
'available' => false,
]
'id' => '12_13',
'label' => '12:00 PM',
'available' => false,
];
break;
case '5':
$data[] = [
'13_14' => [
'label' => '1-2 PM',
'available' => false,
]
'id' => '13_14',
'label' => '1:00 PM',
'available' => false,
];
break;
case '6':
$data[] = [
'14_15' => [
'label' => '2-3 PM',
'available' => false,
]
'id' => '14_15',
'label' => '2:00 PM',
'available' => false,
];
break;
case '7':
$data[] = [
'15_16' => [
'label' => '3-4 PM',
'available' => false,
]
'id' => '15_16',
'label' => '3:00 PM',
'available' => false,
];
break;
case '8':
$data[] = [
'16_17' => [
'label' => '4-5 PM',
'available' => false,
]
'id' => '16_17',
'label' => '4:00 PM',
'available' => false,
];
break;
default: