fix(assessment-form): fix routing view
This commit is contained in:
parent
bf853ba856
commit
fc04e15b6c
|
@ -21,7 +21,7 @@ public function index()
|
||||||
$indicators = Indicator::select('id', 'name')->whereIn('id', function ($query) {
|
$indicators = Indicator::select('id', 'name')->whereIn('id', function ($query) {
|
||||||
$query->select('indicator_id')->from('rule');
|
$query->select('indicator_id')->from('rule');
|
||||||
})->get();
|
})->get();
|
||||||
return view('assesment-form.index', compact('lands', 'indicators'));
|
return view('assessment.form', compact('lands', 'indicators'));
|
||||||
}
|
}
|
||||||
|
|
||||||
public function store(Request $request)
|
public function store(Request $request)
|
||||||
|
@ -70,6 +70,7 @@ public function store(Request $request)
|
||||||
$evaluation = new Evaluation;
|
$evaluation = new Evaluation;
|
||||||
$evaluation->land_id = $request->land;
|
$evaluation->land_id = $request->land;
|
||||||
$evaluation->cf_value = $cfCombine;
|
$evaluation->cf_value = $cfCombine;
|
||||||
|
$evaluation->user_id = auth()->user()->id;
|
||||||
$evaluation->save();
|
$evaluation->save();
|
||||||
|
|
||||||
foreach ($indicators as $id => $value) {
|
foreach ($indicators as $id => $value) {
|
||||||
|
|
|
@ -15,11 +15,13 @@ public function up(): void
|
||||||
$table->id();
|
$table->id();
|
||||||
$table->unsignedBigInteger('land_id');
|
$table->unsignedBigInteger('land_id');
|
||||||
$table->double('cf_value', 15, 10);
|
$table->double('cf_value', 15, 10);
|
||||||
|
$table->unsignedBigInteger('user_id');
|
||||||
$table->timestamps();
|
$table->timestamps();
|
||||||
});
|
});
|
||||||
|
|
||||||
Schema::table('evaluation', function (Blueprint $table) {
|
Schema::table('evaluation', function (Blueprint $table) {
|
||||||
$table->foreign('land_id')->references('id')->on('land')->onDelete('cascade');
|
$table->foreign('land_id')->references('id')->on('land')->onDelete('cascade');
|
||||||
|
$table->foreign('user_id')->references('id')->on('users')->onDelete('cascade');
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -105,6 +105,6 @@
|
||||||
<!-- listjs init -->
|
<!-- listjs init -->
|
||||||
<script src="assets/js/pages/form-validation.init.js"></script>
|
<script src="assets/js/pages/form-validation.init.js"></script>
|
||||||
|
|
||||||
<script src="assets/js/pages/customJs/assesment-form/index.js"></script>
|
<script src="assets/js/pages/customJs/assessment/form.js"></script>
|
||||||
@endpush
|
@endpush
|
||||||
@endsection
|
@endsection
|
||||||
|
|
|
@ -100,6 +100,13 @@ class="nav-link {{ request()->routeIs('master_data.aturan.*') ? 'active' : '' }}
|
||||||
Penilaian</span>
|
Penilaian</span>
|
||||||
</a>
|
</a>
|
||||||
</li>
|
</li>
|
||||||
|
<li class="nav-item">
|
||||||
|
<a class="nav-link menu-link {{ request()->routeIs('assessment_history_officer.officer') ? 'active' : '' }}"
|
||||||
|
href="{{ route('assessment_history_officer.officer') }}">
|
||||||
|
<i data-feather="book" class="icon-dual"></i> <span data-key="t-dashboards">Riwayat
|
||||||
|
Penilaian</span>
|
||||||
|
</a>
|
||||||
|
</li>
|
||||||
@endif <!-- end Dashboard Menu -->
|
@endif <!-- end Dashboard Menu -->
|
||||||
|
|
||||||
{{-- <li class="menu-title"><i class="ri-more-fill"></i> <span data-key="t-pages">Pages</span>
|
{{-- <li class="menu-title"><i class="ri-more-fill"></i> <span data-key="t-pages">Pages</span>
|
||||||
|
|
Loading…
Reference in New Issue