| xqd
@@ -78,7 +78,11 @@ class StudentCourse extends Model
|
|
|
return '';
|
|
|
} else {
|
|
|
$days = $this['duration'];
|
|
|
- $leave_days = (int)Leave::where('student_id', $this['student_id'])->get()->count('days');
|
|
|
+ $leaves = Leave::where('student_id', $this['student_id'])->get();
|
|
|
+ $leave_days = $days;
|
|
|
+ foreach($leaves as $leave) {
|
|
|
+ $leave_days += (int) $leave->days;
|
|
|
+ }
|
|
|
$days += $leave_days;
|
|
|
return Carbon::createFromTimestamp(strtotime($apply_date))->addDays($days)->toDateString();
|
|
|
}
|