|
@@ -797,11 +797,13 @@ class Member extends Component
|
|
|
$dow = date('w', strtotime($calendar->from));
|
|
$dow = date('w', strtotime($calendar->from));
|
|
|
$d = $days[$dow];
|
|
$d = $days[$dow];
|
|
|
|
|
|
|
|
|
|
+ $h = date('H:i', strtotime($calendar->from));
|
|
|
|
|
+
|
|
|
// Elenco corsi per tipologia in base al calendario
|
|
// Elenco corsi per tipologia in base al calendario
|
|
|
$courses = \App\Models\Course::where('name', $calendar->name)->where('date_from', '<=', $calendar->from)->where('date_to', '>=', $calendar->to)->pluck('id')->toArray();
|
|
$courses = \App\Models\Course::where('name', $calendar->name)->where('date_from', '<=', $calendar->from)->where('date_to', '>=', $calendar->to)->pluck('id')->toArray();
|
|
|
|
|
|
|
|
// Elenco utenti iscritti al corso "padre"
|
|
// Elenco utenti iscritti al corso "padre"
|
|
|
- if (\App\Models\MemberCourse::where('when', 'like', "%" . $d . "%")->whereIn('course_id', $courses)->where('member_id', $this->dataId)->first())
|
|
|
|
|
|
|
+ if (\App\Models\MemberCourse::where('when', 'like', "%" . $d . "%")->where('when', 'like', '%"from":"' . $h . '"%')->whereIn('course_id', $courses)->where('member_id', $this->dataId)->first())
|
|
|
{
|
|
{
|
|
|
$status = '';
|
|
$status = '';
|
|
|
if (in_array($calendar->id, $presences))
|
|
if (in_array($calendar->id, $presences))
|