Add: New Fields for the form

app/Http/Controllers/AdminController.php

@@ -23,18 +23,35 @@ class AdminController extends Controller
     }
 
     public function getResponses()
-    {
-        $responses = Response::with('user'); 
+{
+    $responses = Response::with('user', 'department');
 
-        return DataTables::of($responses)
-            ->addColumn('user_name', function ($response) {
-                return $response->user->name ?? 'Unknown'; 
-            })
-            ->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);
+}
 }

app/Http/Controllers/FacultyController.php

@@ -20,19 +20,32 @@ class FacultyController extends Controller
         return view('faculty.response-form');
     }
 
-    // Handle form submission from faculty
     public function submitResponse(Request $request)
     {
+        // dd($request->all());
         try {
             // Validate the request data
             $validated = $request->validate([
                 'title' => 'required|string',
-                'activity_type' => 'required|string',
+                'organising_institute' => 'required|string',
+                'address' => 'required|string',
+                // 'department' => 'required|string',
+                // 'faculty_name' => 'required|string',
                 'start_date' => 'required|date',
+                'start_time' => 'required|date_format:H:i',
                 'end_date' => 'required|date',
-                'proof' => 'nullable|mimes:jpg,jpeg,png,pdf,doc,docx', // Validate proof file
+                'end_time' => 'required|date_format:H:i',
+                'num_days' => 'required|integer',
+                'activity_type' => 'required|string',
+                'category' => 'required|string',
+                'level' => 'required|string',
+                'proof' => 'nullable|mimes:jpg,jpeg,png,pdf,doc,docx,zip',
             ]);
 
+            // Combine start date and time
+            $startDateTime = date('Y-m-d H:i:s', strtotime("{$validated['start_date']} {$validated['start_time']}"));
+            $endDateTime = date('Y-m-d H:i:s', strtotime("{$validated['end_date']} {$validated['end_time']}"));
+
             // Handle the file upload
             $proofPath = null;
             if ($request->hasFile('proof')) {
@@ -43,18 +56,27 @@ class FacultyController extends Controller
             }
 
             // Save the response to the database
+            // dd($validated['organising_institute']);
             Response::create([
                 'title' => $validated['title'],
+                'organising_institute' => $validated['organising_institute'],
+                'address' => $validated['address'],
+                'department_id' => auth()->user()->department->id,
+                'faculty_id' => auth()->user()->id,
+                // 'faculty_name' => $validated['faculty_name'],
+                'start_date' => $startDateTime,
+                'end_date' => $endDateTime,
+                'num_days' => $validated['num_days'],
                 'activity_type' => $validated['activity_type'],
-                'start_date' => $validated['start_date'],
-                'end_date' => $validated['end_date'],
-                'proof' => $proofPath, // Store the file path
-                'faculty_id' => auth()->user()->id, // Assuming the logged-in user is the faculty
+                'category' => $validated['category'],
+                'level' => $validated['level'],
+                'proof' => $proofPath,
             ]);
 
             return redirect()->route('faculty.dashboard')->with('status', 'Response submitted successfully');
         } catch (\Exception $e) {
             // Handle the exception and provide an error message
+            // dd($e);
             return back()->withErrors('An error occurred while submitting your response: ' . $e->getMessage());
         }
     }