first-commit

app/Http/Controllers/FormController.php

@@ -1,7 +1,7 @@
 <?php
 
 namespace App\Http\Controllers;
-use Illuminate\Support\Facades\DB;
+
 use Illuminate\Http\Request;
 use App\Models\Form;
 use App\Models\User;
@@ -104,6 +104,7 @@ Contact us at (123) 456-7890 or no_reply@example.com
 
     public function store(Request $request)
     {
+        try {
             $validatedData = $request->validate([
                 'title' => 'required|string|max:255',
                 'description' => 'nullable|string',
@@ -111,35 +112,33 @@ Contact us at (123) 456-7890 or no_reply@example.com
                 'questions.*.type' => 'required|string|in:multiple_choice,checkbox,dropdown,text',
                 'questions.*.text' => 'required|string',
                 'questions.*.options' => 'nullable|array',
-            'questions.*.required' => 'boolean',
+                'questions.*.required' => 'nullable|boolean',
             ]);
 
-        DB::beginTransaction();
 
-        try {
-            $form = Form::create([
-                'title' => $validatedData['title'],
-                'description' => $validatedData['description'],
-                'user_id' => Auth::id(),
-            ]);
+            $form = new Form();
+            $form->title = $validatedData['title'];
+            $form->description = $validatedData['description'];
+            $form->is_published = $request->input('is_published', false);
+            $form->user_id = Auth::id();
+            $form->save();
 
             foreach ($validatedData['questions'] as $questionData) {
-                $question = new Question([
-                    'form_id' => $form->id,
-                    'type' => $questionData['type'],
-                    'question_text' => $questionData['text'],
-                    'options' => json_encode($questionData['options'] ?? []),
-                    'required' => $questionData['required'],
-                ]);
+                $question = new Question();
+                $question->form_id = $form->id;
+                $question->type = $questionData['type'];
+                $question->question_text = $questionData['text'];
+                $question->options = isset($questionData['options']) ? json_encode($questionData['options']) : null;
+                $question->required = isset($questionData['required']) ? $questionData['required'] : false;
                 $question->save();
             }
 
-            DB::commit();
-            return response()->json(['success' => true, 'message' => 'Form saved successfully.']);
+
+
+            return response()->json(['success' => true, 'form_id' => $form->id]);
         } catch (\Exception $e) {
-            DB::rollBack();
-            Log::error('Error saving form: ' . $e->getMessage());
-            return response()->json(['success' => false, 'message' => 'Failed to save form.']);
+            Log::error('Error saving form: ' . $e->getMessage(), ['exception' => $e]);
+            return response()->json(['success' => false, 'message' => 'Error saving form'], 500);
         }
     }
 
@@ -158,21 +157,14 @@ Contact us at (123) 456-7890 or no_reply@example.com
 
     public function update(Request $request, Form $form)
     {
-    try {
-        // Normalize the 'required' field to boolean
-        if ($request->has('questions')) {
-            $questions = $request->input('questions');
-            foreach ($questions as $index => $question) {
-                if (isset($question['required']) && $question['required'] === 'on') {
-                    $questions[$index]['required'] = true;
-                } else {
-                    $questions[$index]['required'] = false;
-                }
-            }
-            $request->merge(['questions' => $questions]);
-        }
+        if ($request->has('publish')) {
+            $form->is_published = !$form->is_published;
+            $form->save();
+
+            return redirect()->route('forms.show', $form);
+        }
+        Log::info('Incoming request data: ', $request->all());
 
-        // Validate the request
         $validatedData = $request->validate([
             'title' => 'required|string|max:255',
             'description' => 'nullable|string|max:255',
@@ -182,41 +174,53 @@ Contact us at (123) 456-7890 or no_reply@example.com
             'questions.*.text' => 'required|string|max:255',
             'questions.*.options' => 'nullable|array',
             'questions.*.options.*' => 'nullable|string|max:255',
-            'questions.*.required' => 'boolean',
         ]);
 
-        // Update form
+        Log::info('Validated data: ', $validatedData);
+
         $form->update([
             'title' => $validatedData['title'],
             'description' => $validatedData['description'],
         ]);
 
-        // Clear existing questions
-        $form->questions()->delete();
-
-        // Create or update questions
+        $existingQuestionIds = [];
         foreach ($validatedData['questions'] as $questionData) {
-            $question = new Question([
-                'form_id' => $form->id,
-                'type' => $questionData['type'],
-                'question_text' => $questionData['text'],
-                'options' => json_encode($questionData['options'] ?? []),
-                'required' => $questionData['required'],
-            ]);
-            $question->save();
+            if (isset($questionData['id'])) {
+                $question = Question::find($questionData['id']);
+            } else {
+                $question = new Question();
+                $question->form_id = $form->id;
             }
 
-        DB::commit();
+            $question->type = $questionData['type'];
+            $question->question_text = $questionData['text'];
+            $question->options = isset($questionData['options']) ? json_encode($questionData['options']) : json_encode([]);
+            $question->save();
+
+            Log::info('Saved question: ', $question->toArray());
+
+            $existingQuestionIds[] = $question->id;
+        }
+
+        $form->questions()->whereNotIn('id', $existingQuestionIds)->delete();
+
+        Log::info('Remaining questions: ', $form->questions()->get()->toArray());
+
         return redirect()->route('forms.show', $form)->with('success', 'Form updated successfully.');
-    } catch (\Exception $e) {
-        DB::rollBack();
-        Log::error('Error updating form: ' . $e->getMessage());
-        return back()->withErrors(['error' => 'An error occurred while updating the form. Please try again.'])->withInput();
-    }
     }
 
 
 
+
+
+
+
+
+
+
+
+
+
     public function destroy(Form $form)
     {
         // This will also delete all related questions and responses due to foreign key constraints

app/Http/Controllers/ResponseController.php

@@ -31,27 +31,33 @@ class ResponseController extends Controller
 
     public function viewResponse(Form $form, $responseId)
     {
+
         $responses = Response::where('response_id', $responseId)
             ->where('form_id', $form->id)
             ->get();
 
-        if ($responses->isEmpty()) {
-            abort(404, 'Response not found');
+
+        $questions = Question::where('form_id', $form->id)->get()->keyBy('id');
+
+
+        $statistics = [];
+        foreach ($questions as $question) {
+            $statistics[$question->id] = [
+                'question_text' => $question->question_text,
+                'type' => $question->type,
+                'options' => json_decode($question->options),
+                'responses' => []
+            ];
+
+            foreach ($responses as $response) {
+                $decodedAnswers = json_decode($response->answers, true);
+                if (isset($decodedAnswers[$question->id])) {
+                    $statistics[$question->id]['responses'][] = $decodedAnswers[$question->id];
+                }
+            }
         }
 
-        $formSnapshot = json_decode($responses->first()->form_snapshot, true);
-
-        if (is_null($formSnapshot) || !isset($formSnapshot['questions'])) {
-            Log::error('Form snapshot is null or does not contain questions', [
-                'response_id' => $responseId,
-                'form_snapshot' => $responses->first()->form_snapshot
-            ]);
-            abort(500, 'Form snapshot is invalid');
-        }
-
-        $questions = collect($formSnapshot['questions'])->keyBy('id');
-
-        return view('responses.viewResponse', compact('form', 'responses', 'questions'));
+        return view('responses.viewResponse', compact('form', 'responses', 'questions', 'statistics'));
     }
 
 
@@ -102,39 +108,34 @@ class ResponseController extends Controller
 
     public function submitForm(Request $request, Form $form)
     {
-        Log::info('Form submission started', $request->all());
+        Log::info($request->all());
+
 
         $questions = $form->questions;
 
+
         $requiredQuestionIds = $questions->where('required', true)->pluck('id')->toArray();
 
+
         $validatedData = $request->validate([
-            'answers' => 'array',
-            'answers.*' => '',
+            'answers' => 'required|array',
+            'answers.*' => 'required',
         ]);
 
+
         foreach ($requiredQuestionIds as $requiredQuestionId) {
             if (!isset($validatedData['answers'][$requiredQuestionId]) || empty($validatedData['answers'][$requiredQuestionId])) {
-                return response()->json(['success' => false, 'message' => 'Please answer all required questions.']);
+                return redirect()->back()
+                    ->withErrors(['errors' => 'Please answer all required questions.'])
+                    ->withInput();
             }
         }
 
-        Log::info('Validation passed', $validatedData);
+        Log::info($validatedData);
+
 
         $responseId = Uuid::uuid4()->toString();
 
-        $formSnapshot = [
-            'title' => $form->title,
-            'description' => $form->description,
-            'questions' => $questions->map(function ($question) {
-                return [
-                    'id' => $question->id,
-                    'question_text' => $question->question_text,
-                    'type' => $question->type,
-                    'options' => $question->options,
-                ];
-            })->toArray(),
-        ];
 
         foreach ($validatedData['answers'] as $questionId => $answer) {
             $response = new Response();
@@ -144,12 +145,10 @@ class ResponseController extends Controller
             $response->user_id = auth()->id();
             $response->answers = json_encode($answer);
             $response->submitted_at = now();
-            $response->form_snapshot = json_encode($formSnapshot);
             $response->save();
-
-            Log::info('Response saved', $response->toArray());
         }
 
-        return response()->json(['success' => true, 'message' => 'Response submitted successfully.']);
+        return redirect()->route('responses.showForm', $form)
+            ->with('success', 'Response submitted successfully.');
     }
 }

app/Models/Question.php

@@ -1,21 +1,25 @@
 <?php
 
 namespace App\Models;
-use Illuminate\Database\Eloquent\SoftDeletes;
+
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 
 class Question extends Model
 {
-    use SoftDeletes;
     use HasFactory;
-    protected $fillable = ['form_id', 'type', 'question_text', 'options', 'required'];
+    protected $fillable = ['form_id', 'user_id', 'submitted_at', 'answers'];
 
     protected $casts = [
+        'answers' => 'array',
         'options' => 'array',
-        'required' => 'boolean',
     ];
 
+    public function getOptionsAttribute($value)
+    {
+        return json_decode($value, true);
+    }
+
     public function form()
     {
         return $this->belongsTo(Form::class);

app/Models/Response.php

@@ -8,7 +8,7 @@ use Illuminate\Database\Eloquent\Model;
 class Response extends Model
 {
     use HasFactory;
-    protected $fillable = ['form_id', 'user_id', 'response_id', 'question_id', 'answers', 'submitted_at', 'form_snapshot'];
+    protected $fillable = ['form_id', 'user_id', 'answers'];
 
     // Define relationships
     public function form()

database/migrations/2024_07_24_174429_add_soft_deletes_to_questions_table.php

@@ -1,22 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-return new class extends Migration
-{
-    public function up()
-    {
-        Schema::table('questions', function (Blueprint $table) {
-            $table->softDeletes();
-        });
-    }
-
-    public function down()
-    {
-        Schema::table('questions', function (Blueprint $table) {
-            $table->dropSoftDeletes();
-        });
-    }
-};

database/migrations/2024_07_24_185521_add_form_snapshot_to_responses_table.php

@@ -1,30 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-return new class extends Migration
-{
-    /**
-     * Run the migrations.
-     */
-    public function up(): void
-    {
-        Schema::table('responses', function (Blueprint $table) {
-            $table->json('form_snapshot')->nullable();
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     */
-    public function down(): void
-    {
-        Schema::table('responses', function (Blueprint $table) {
-            if (Schema::hasColumn('responses', 'form_snapshot')) {
-                $table->dropColumn('form_snapshot');
-            }
-        });
-    }
-};

public/css/app.css

@@ -255,7 +255,3 @@ input:focus, textarea:focus, select:focus{
     color: black;
     height: 20px;
 }
-
-.active-question {
-    border-left: 4px solid blue;
-}

public/js/script.js

@@ -6,7 +6,7 @@ document.addEventListener("DOMContentLoaded", function () {
         const optionDiv = document.createElement("div");
         optionDiv.className = "option";
         optionDiv.innerHTML = `
-            <input type="text" class="form-control option-input mb-1" placeholder="New Option" />
+            <input type="text" class="form-control option-input" placeholder="New Option" />
             <span class="delete-option" onclick="deleteOption(this)">&#10005;</span>
         `;
         optionContainer.appendChild(optionDiv);