Refactor: responses as ActivitesAttended
This commit is contained in:
@@ -6,7 +6,7 @@ namespace App\Http\Controllers;
|
||||
|
||||
use Illuminate\Http\Request;
|
||||
use Yajra\DataTables\Facades\DataTables;
|
||||
use App\Models\Response;
|
||||
use App\Models\ActivitiesAttended;
|
||||
|
||||
class AdminController extends Controller
|
||||
{
|
||||
@@ -17,41 +17,41 @@ class AdminController extends Controller
|
||||
}
|
||||
|
||||
// View responses submitted by users
|
||||
public function viewResponses()
|
||||
public function viewActivitiesAttendedResponses()
|
||||
{
|
||||
return view('admin.responses');
|
||||
return view('admin.activities-attended-responses');
|
||||
}
|
||||
|
||||
public function getResponses()
|
||||
{
|
||||
$responses = Response::with('user', 'department');
|
||||
public function getActivitiesAttendedResponses()
|
||||
{
|
||||
$responses = ActivitiesAttended::with('user', 'department');
|
||||
|
||||
return DataTables::of($responses)
|
||||
->addColumn('user_name', function ($response) {
|
||||
return $response->user->name ?? 'Unknown';
|
||||
})
|
||||
->addColumn('department_name', function ($response) {
|
||||
return $response->department->name ?? 'Unknown';
|
||||
})
|
||||
->addColumn('start_date', function ($response) {
|
||||
return \Carbon\Carbon::parse($response->start_date)->format('d-m-Y');
|
||||
})
|
||||
->addColumn('start_time', function ($response) {
|
||||
return \Carbon\Carbon::parse($response->start_date)->format('h:i A');
|
||||
})
|
||||
->addColumn('end_date', function ($response) {
|
||||
return \Carbon\Carbon::parse($response->end_date)->format('d-m-Y');
|
||||
})
|
||||
->addColumn('end_time', function ($response) {
|
||||
return \Carbon\Carbon::parse($response->end_date)->format('h:i A');
|
||||
})
|
||||
->addColumn('action', function ($response) {
|
||||
$viewButton = $response->proof
|
||||
? '<a href="' . asset('storage/' . $response->proof) . '" target="_blank" class="btn btn-sm btn-primary">View</a>'
|
||||
: 'No Proof';
|
||||
return $viewButton;
|
||||
})
|
||||
->rawColumns(['action'])
|
||||
->make(true);
|
||||
}
|
||||
return DataTables::of($responses)
|
||||
->addColumn('user_name', function ($response) {
|
||||
return $response->user->name ?? 'Unknown';
|
||||
})
|
||||
->addColumn('department_name', function ($response) {
|
||||
return $response->department->name ?? 'Unknown';
|
||||
})
|
||||
->addColumn('start_date', function ($response) {
|
||||
return \Carbon\Carbon::parse($response->start_date)->format('d-m-Y');
|
||||
})
|
||||
->addColumn('start_time', function ($response) {
|
||||
return \Carbon\Carbon::parse($response->start_date)->format('h:i A');
|
||||
})
|
||||
->addColumn('end_date', function ($response) {
|
||||
return \Carbon\Carbon::parse($response->end_date)->format('d-m-Y');
|
||||
})
|
||||
->addColumn('end_time', function ($response) {
|
||||
return \Carbon\Carbon::parse($response->end_date)->format('h:i A');
|
||||
})
|
||||
->addColumn('action', function ($response) {
|
||||
$viewButton = $response->proof
|
||||
? '<a href="' . asset('storage/' . $response->proof) . '" target="_blank" class="btn btn-sm btn-primary">View</a>'
|
||||
: 'No Proof';
|
||||
return $viewButton;
|
||||
})
|
||||
->rawColumns(['action'])
|
||||
->make(true);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user