diff --git a/app/Http/Controllers/AssesmentFormController.php b/app/Http/Controllers/AssesmentFormController.php index 830a698..164996e 100644 --- a/app/Http/Controllers/AssesmentFormController.php +++ b/app/Http/Controllers/AssesmentFormController.php @@ -15,7 +15,7 @@ class AssesmentFormController extends Controller { public function index() { - $lands = Land::select('id', 'name')->whereNotIn('id', function ($query) { + $lands = Land::select('id', 'land_name')->whereNotIn('id', function ($query) { $query->select('land_id')->from('evaluation'); })->orderBy('created_at', 'desc')->get(); $indicators = Indicator::select('id', 'name')->whereIn('id', function ($query) { diff --git a/app/Http/Controllers/AssessmentHistoryController.php b/app/Http/Controllers/AssessmentHistoryController.php index 156c9bd..fe0b518 100644 --- a/app/Http/Controllers/AssessmentHistoryController.php +++ b/app/Http/Controllers/AssessmentHistoryController.php @@ -9,7 +9,6 @@ class AssessmentHistoryController extends Controller { public function index() { - // $evaluations = Evaluation::with('evaluationDetails.indicator')->where('user_id', auth()->user()->id)->get(); $evaluations = Evaluation::with('land', 'evaluationDetails.indicator')->orderBy('created_at', 'desc')->get(); return view('assessment.index', compact('evaluations')); } diff --git a/resources/views/assessment/form.blade.php b/resources/views/assessment/form.blade.php index 14f2814..659a754 100644 --- a/resources/views/assessment/form.blade.php +++ b/resources/views/assessment/form.blade.php @@ -38,7 +38,7 @@