|
|
@@ -30,7 +30,7 @@ class DrawController extends Controller
|
|
|
$users = CheckIn::where('activity_id', $request->activity_id)
|
|
|
->where('is_checked_in', 'true')
|
|
|
->where('is_awarded', 'false')
|
|
|
- ->whereTime('check_ins.updated_at', '<=', $activity->deadline)
|
|
|
+ // ->whereTime('check_ins.updated_at', '<=', $activity->deadline)
|
|
|
->whereIn('region', $request->region)
|
|
|
->join('departments', 'check_ins.department_id', '=', 'departments.department_id')
|
|
|
->inRandomOrder()
|
|
|
@@ -44,7 +44,7 @@ class DrawController extends Controller
|
|
|
array_push($output, [
|
|
|
'user_id' => $user->user_id,
|
|
|
'user_name' => $user->name,
|
|
|
- 'department_name' => $user->department_name,
|
|
|
+ 'department_name' => $user->alias,
|
|
|
]);
|
|
|
}
|
|
|
return $output;
|