ariefajar
/
MIF_E31221322
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #31 from arieeefajar/fix/assessment-history-officer 

fix(assessmnet-history-officer): function show details
This commit is contained in:
Arie Fajar Bachtiar 2025-04-02 22:08:08 +07:00 committed by GitHub
parent 8eb4925b91 ba04f7d895
commit 9710c1305c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 20 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Http/Controllers/AssessmentHistoryController.php
View File

@ -15,7 +15,8 @@ public function index()
public function officer() public function officer()
{ {
$evaluations = Evaluation::with('land', 'evaluationDetails.indicator')->where('user_id', auth()->user()->id)->orderBy('created_at', 'desc')->get(); $evaluations = Evaluation::with('land', 'evaluationDetails.indicator.rules')->where('user_id', auth()->user()->id)->orderBy('created_at', 'desc')->get();
// dd($evaluations);
return view('assessment.officer', compact('evaluations')); return view('assessment.officer', compact('evaluations'));
} }
} }

43
public/assets/js/pages/customJs/assessment/officer.js
View File

@ -6,36 +6,25 @@ function detailData(data) {
if (Array.isArray(data)) { if (Array.isArray(data)) {
data.forEach((item) => { data.forEach((item) => {
let options = `<option value="" disabled ${
item.cf_e === null ? "selected" : ""
}>Pilih Jawaban</option>`;
item.indicator.rules.forEach((rule) => {
options += `<option value="${rule.cf}" ${
item.cf_e == rule.cf ? "selected" : ""
}>
${rule.parameter_type}
</option>`;
});
let row = `<div class="mb-3"> let row = `<div class="mb-3">
<label for="indicator-${ <label for="indicator-${item.indicator.id}" class="form-label">${item.indicator.name}</label>
item.indicator.id <select name="indicator" class="form-control" id="indicator-${item.indicator.id}" disabled>
}" class="form-label">${item.indicator.name}</label> ${options}
<select name="indicator" class="form-control" id="indicator-${
item.indicator.id
}" disabled>
<option value="" disabled ${
item.md_value === null ? "selected" : ""
}>Pilih Jawaban</option>
<option value="0" ${
item.md_value == 0 ? "selected" : ""
}>Tidak</option>
<option value="0.2" ${
item.md_value == 0.2 ? "selected" : ""
}>Tidak Tahu</option>
<option value="0.4" ${
item.md_value == 0.4 ? "selected" : ""
}>Mungkin</option>
<option value="0.6" ${
item.md_value == 0.6 ? "selected" : ""
}>Kemungkinan Besar</option>
<option value="0.8" ${
item.md_value == 0.8 ? "selected" : ""
}>Hampir Pasti</option>
<option value="1" ${
item.md_value == 1 ? "selected" : ""
}>Pasti</option>
</select> </select>
</div>`; </div>`;
detailModal.innerHTML += row; detailModal.innerHTML += row;
}); });
} else { } else {