|
@@ -5,8 +5,8 @@
|
|
<?php
|
|
<?php
|
|
$palette = [
|
|
$palette = [
|
|
["bc" => '#522e92', "fc" => "#fff"],
|
|
["bc" => '#522e92', "fc" => "#fff"],
|
|
- ["bc" => '#111e6c', "fc" => "#fff"],
|
|
|
|
["bc" => '#003152', "fc" => "#fff"],
|
|
["bc" => '#003152', "fc" => "#fff"],
|
|
|
|
+ ["bc" => '#111e6c', "fc" => "#fff"],
|
|
["bc" => '#1034a6', "fc" => "#fff"],
|
|
["bc" => '#1034a6', "fc" => "#fff"],
|
|
["bc" => '#0f52ba', "fc" => "#fff"],
|
|
["bc" => '#0f52ba', "fc" => "#fff"],
|
|
["bc" => '#447684', "fc" => "#fff"],
|
|
["bc" => '#447684', "fc" => "#fff"],
|
|
@@ -140,7 +140,7 @@
|
|
$proMeta = [];
|
|
$proMeta = [];
|
|
?>
|
|
?>
|
|
@foreach($pros as $iPro)
|
|
@foreach($pros as $iPro)
|
|
- <option value="{{$iPro->uid}}" {{ $iPro->uid === $pro->uid ? 'selected' : '' }}
|
|
|
|
|
|
+ <option value="{{$iPro->id}}" {{ $iPro->uid === $pro->uid ? 'selected' : '' }}
|
|
data-bc="{{$palette[$proIndex]["bc"]}}"
|
|
data-bc="{{$palette[$proIndex]["bc"]}}"
|
|
data-fc="{{$palette[$proIndex]["fc"]}}"
|
|
data-fc="{{$palette[$proIndex]["fc"]}}"
|
|
data-initials="{{$iPro->initials()}}">
|
|
data-initials="{{$iPro->initials()}}">
|
|
@@ -221,8 +221,8 @@
|
|
navLinks: true,
|
|
navLinks: true,
|
|
dayMaxEvents: false,
|
|
dayMaxEvents: false,
|
|
events: function(info, successCallback, failureCallback) {
|
|
events: function(info, successCallback, failureCallback) {
|
|
- let proUid = $('#eventPros').val();
|
|
|
|
- if(!proUid || !proUid.length) {
|
|
|
|
|
|
+ let proIds = $('#eventPros').val();
|
|
|
|
+ if(!proIds || !proIds.length) {
|
|
successCallback([]); // no events if no pro selected
|
|
successCallback([]); // no events if no pro selected
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
@@ -231,15 +231,15 @@
|
|
successCallback([]); // no events if no tz selected
|
|
successCallback([]); // no events if no tz selected
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
- console.log(proUid)
|
|
|
|
- $.get('/api/appointment/getAllAppointmentsForPro' +
|
|
|
|
- '?proUid=' + proUid +
|
|
|
|
|
|
+ console.log(proIds)
|
|
|
|
+ $.get('/appointment/getAllAppointmentsForPros' +
|
|
|
|
+ '?proIds=' + proIds +
|
|
'&start=' + info.startStr.substr(0, 10) +
|
|
'&start=' + info.startStr.substr(0, 10) +
|
|
'&end=' + info.endStr.substr(0, 10) +
|
|
'&end=' + info.endStr.substr(0, 10) +
|
|
'&timeZone=' + timeZone, function(_data) {
|
|
'&timeZone=' + timeZone, function(_data) {
|
|
// $.get('/api/appointment/getAllAppointmentsForPro?start=1990-01-01&end=2025-01-01&timeZone=CENTRAL', function(_data) {
|
|
// $.get('/api/appointment/getAllAppointmentsForPro?start=1990-01-01&end=2025-01-01&timeZone=CENTRAL', function(_data) {
|
|
- if(_data && _data.success) {
|
|
|
|
- let events = _data.data;
|
|
|
|
|
|
+ if(_data && Array.isArray(_data)) {
|
|
|
|
+ let events = _data;
|
|
for(let e in events) {
|
|
for(let e in events) {
|
|
if(events.hasOwnProperty(e) && proMeta[events[e].proUid]) {
|
|
if(events.hasOwnProperty(e) && proMeta[events[e].proUid]) {
|
|
let ev = events[e], meta = proMeta[ev.proUid];
|
|
let ev = events[e], meta = proMeta[ev.proUid];
|
|
@@ -253,7 +253,7 @@
|
|
successCallback(events);
|
|
successCallback(events);
|
|
}
|
|
}
|
|
else {
|
|
else {
|
|
- failureCallback('Unable to fetch appointments!');
|
|
|
|
|
|
+ failureCallback(_data);
|
|
}
|
|
}
|
|
}, 'json');
|
|
}, 'json');
|
|
},
|
|
},
|