|
@@ -196,7 +196,10 @@ class ApiController extends Controller
|
|
if($item->begin_date_time >= $begin_date_time) {
|
|
if($item->begin_date_time >= $begin_date_time) {
|
|
$thisMonthLearnTime += $duration;
|
|
$thisMonthLearnTime += $duration;
|
|
$day = Carbon::createFromTimestamp(strtotime($item->end_date_time))->day;
|
|
$day = Carbon::createFromTimestamp(strtotime($item->end_date_time))->day;
|
|
- $checkCardList->push(collect(['month' => 'current', 'day' => $day, 'color' => '#77b9b9']));
|
|
|
|
|
|
+ $tmp = $checkCardList->where('day', $day);
|
|
|
|
+ if($tmp->count() == 0) {
|
|
|
|
+ $checkCardList->push(collect(['month' => 'current', 'day' => $day, 'color' => '#77b9b9']));
|
|
|
|
+ }
|
|
}
|
|
}
|
|
}
|
|
}
|
|
$today = $now->day;
|
|
$today = $now->day;
|