gitea/Abiyasa_Putra_Prasetya
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update: change controller for literacy questions

Browse Source
This commit is contained in:
abiyasa05 2025-06-21 11:21:12 +07:00
parent de05919e72
commit 5de96db598
2 changed files with 29 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Penilaian Literasi/iClOP-V2/app/Http/Controllers/Literacy/LiteracyMaterialController.php
View File

@ -162,4 +162,15 @@ public function show_materials($id)
return response()->file($path); return response()->file($path);
} }
public function getStoryTexts($id)
{
$material = LiteracyMaterial::with('storyTexts')->find($id);
if (!$material) {
return response()->json([], 404); // tanggapi dengan error jika tidak ditemukan
}
return response()->json($material->storyTexts);
}
} }

29
Penilaian Literasi/iClOP-V2/app/Http/Controllers/Literacy/LiteracyQuestionController.php
View File

@ -4,7 +4,7 @@
use App\Http\Controllers\Controller; use App\Http\Controllers\Controller;
use App\Models\Literacy\LiteracyQuestion; use App\Models\Literacy\LiteracyQuestion;
use App\Models\Literacy\LiteracyAnswer; use App\Models\Literacy\LiteracyStoryText;
use App\Models\Literacy\LiteracyMaterial; use App\Models\Literacy\LiteracyMaterial;
use App\Models\Literacy\LiteracyOption; use App\Models\Literacy\LiteracyOption;
use App\Models\Literacy\LiteracyAssessment; use App\Models\Literacy\LiteracyAssessment;
@ -17,7 +17,10 @@ class LiteracyQuestionController extends Controller
{ {
public function questions() public function questions()
{ {
$questions = LiteracyQuestion::orderBy('created_at', 'desc')->get(); $questions = LiteracyQuestion::with(['material', 'storyTexts', 'options'])->orderBy('created_at', 'desc')->get();
foreach ($questions as $question) {
$question->first_story_text = $question->storyTexts->first();
}
$materials = LiteracyMaterial::all(); $materials = LiteracyMaterial::all();
$users = User::all(); $users = User::all();
return view('literacy.teacher.questions.index', [ return view('literacy.teacher.questions.index', [
@ -41,24 +44,28 @@ public function create()
public function store(Request $request) public function store(Request $request)
{ {
$validated = $request->validate([ $validated = $request->validate([
'material_id' => 'required|exists:literacy_materials,id',
'story_text_id' => 'nullable|exists:literacy_story_texts,id',
'question_text' => 'required|string', 'question_text' => 'required|string',
'type' => 'required|in:multiple_choice,essay', 'type' => 'required|in:multiple_choice,essay',
]); ]);
$question = LiteracyQuestion::create($validated); $question = LiteracyQuestion::create([
'material_id' => $validated['material_id'],
'story_text_id' => $validated['story_text_id'] ?? null,
'question_text' => $validated['question_text'],
'type' => $validated['type'],
]);
// Jika tipe soal adalah pilihan ganda, simpan opsi jawaban
if ($request->type === 'multiple_choice' && $request->has('options')) { if ($request->type === 'multiple_choice' && $request->has('options')) {
foreach ($request->options as $option) { foreach ($request->options as $option) {
$question->options()->create([ $question->options()->create([
'option_text' => $option['text'] ?? null, // Gunakan null jika tidak ada teks 'option_text' => $option['text'] ?? null,
'score' => $option['score'] ?? 0, // Pastikan skor selalu ada 'score' => $option['score'] ?? 0,
'is_correct' => isset($option['is_correct']) ? 1 : 0, 'is_correct' => isset($option['is_correct']) ? 1 : 0,
]); ]);
} }
} } elseif ($request->type === 'essay') {
// Jika tipe soal adalah isian (essay), simpan skor & jawaban yang benar
elseif ($request->type === 'essay') {
$question->update([ $question->update([
'essay_score' => $request->essay_score ?? 0, 'essay_score' => $request->essay_score ?? 0,
'essay_answer' => $request->essay_answer ?? null, 'essay_answer' => $request->essay_answer ?? null,
@ -148,7 +155,7 @@ public function update(Request $request, $id)
foreach ($request->input('options', []) as $option) { foreach ($request->input('options', []) as $option) {
$isCorrect = isset($option['is_correct']) && $option['is_correct'] ? 1 : 0; $isCorrect = isset($option['is_correct']) && $option['is_correct'] ? 1 : 0;
$score = isset($option['score']) ? intval($option['score']) : 0; $score = isset($option['score']) ? intval($option['score']) : 0;
if (!empty($option['id'])) { if (!empty($option['id'])) {
// Update existing option // Update existing option
$existingOption = LiteracyOption::find($option['id']); $existingOption = LiteracyOption::find($option['id']);
@ -168,7 +175,7 @@ public function update(Request $request, $id)
'is_correct' => $isCorrect, 'is_correct' => $isCorrect,
]); ]);
} }
} }
} }
DB::commit(); DB::commit();