diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php index d261a6a..a3ba8d3 100644 --- a/app/Http/Controllers/Auth/LoginController.php +++ b/app/Http/Controllers/Auth/LoginController.php @@ -53,7 +53,7 @@ protected function authenticated(Request $request, $user) if ($user->role === 'admin') { return redirect()->intended('/dashboard'); } else { - return redirect()->intended('/'); + return redirect()->intended('/home'); } } } diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php index 2e7785a..79589d3 100644 --- a/app/Http/Controllers/Auth/RegisterController.php +++ b/app/Http/Controllers/Auth/RegisterController.php @@ -75,4 +75,7 @@ protected function create(array $data) 'role' => 'pengguna', ]); } -} + + + } + diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index a8438be..fa1771a 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -47,6 +47,22 @@ public function getProfile(){ return view('dashboard.user.profile',compact('hasil','riwayat')); } + public function getProfileAdmin(){ + $user = Auth::user(); + $hasil = User::where('id', $user->id)->get(); + // $riwayat = Hasil::where('nama', $user->nama) + // ->where('alamat', $user->alamat) + // ->get() + // ->map(function ($item) { + // $decoded = json_decode($item->hasil_diagnosa, true); + // $item->nama_penyakit = $decoded['Nama_Penyakit']['nama_penyakit'] ?? 'Tidak diketahui'; + // return $item; + // }); + + // Sesuaikan model dan kolomnya sesuai kebutuhan Anda + return view('dashboard.user.profile-admin',compact('hasil')); + } + public function dashboard() { $totalUsers = User::count(); @@ -56,4 +72,29 @@ public function dashboard() return view('dashboard.dashboard', compact('totalUsers', 'totalGejala', 'totalPenyakit', 'totalHasil')); } + + public function updateProfile(Request $request, $id) + { + // Validate the request data + $request->validate([ + 'nama' => 'required|string|max:255', + 'email' => 'required|string|email|max:255', + 'alamat' => 'nullable|string|max:255', + 'no_telpon' => 'nullable|string|max:15', + ]); + + // Get the authenticated user + $user = Auth::user(); + + // Update user data + $user->nama = $request->input('nama'); + $user->email = $request->input('email'); + $user->alamat = $request->input('alamat', 'Belum diisi'); + $user->no_telpon = $request->input('no_telpon', 'Belum diisi'); + $user->save(); + + // Return success response + return response()->json(['success' => 'Profile updated successfully.']); + } + } diff --git a/app/Http/Controllers/KonsultasiController.php b/app/Http/Controllers/KonsultasiController.php index 026cb53..c7b4bba 100644 --- a/app/Http/Controllers/KonsultasiController.php +++ b/app/Http/Controllers/KonsultasiController.php @@ -9,6 +9,7 @@ use App\Models\Diagnosa; use App\Models\Aturan; use Illuminate\Support\Facades\DB; +use Carbon\Carbon; class KonsultasiController extends Controller { @@ -78,6 +79,7 @@ public function hitungKonsultasi(Request $request) $arrHasilUser = $request->input('resultGejala'); +//pengecekan apakah user sudah memilih 2 gejala apa belum if ($arrHasilUser == null) { return back()->withInput()->with('error', 'Anda belum memilih gejala'); } else { @@ -119,9 +121,11 @@ public function hitungKonsultasi(Request $request) $hasil = new Hasil(); $hasil->nama = $validateReq['nama']; $hasil->alamat = $validateReq['alamat']; + $hasil->tanggal = Carbon::now()->toDateString(); // $hasil->jenis_sapi = $validateReq['jenis_sapi']; $hasil->hasil_diagnosa = json_encode($variabelTampilan); $hasil->solusi = $variabelTampilan['Solusi_Penyakit']['solusi']; + $hasil->save(); $idHasil = $hasil->id_hasil; diff --git a/app/Models/Hasil.php b/app/Models/Hasil.php index 00866e6..e0b1957 100644 --- a/app/Models/Hasil.php +++ b/app/Models/Hasil.php @@ -15,6 +15,7 @@ class Hasil extends Model 'alamat', 'jenis_sapi', 'hasil_diagnosa', - 'solusi' + 'solusi', + 'waktu' ]; } diff --git a/public/img/sapi tertular pmk.png b/public/img/sapi tertular pmk.png new file mode 100644 index 0000000..b87516e Binary files /dev/null and b/public/img/sapi tertular pmk.png differ diff --git a/resources/views/dashboard/navigasi/navbar.blade.php b/resources/views/dashboard/navigasi/navbar.blade.php index d5d2ea9..1e30da2 100644 --- a/resources/views/dashboard/navigasi/navbar.blade.php +++ b/resources/views/dashboard/navigasi/navbar.blade.php @@ -49,7 +49,7 @@
  • - Rules + Aturan
  • @@ -63,7 +63,7 @@ Akun
  • - + Profile diff --git a/resources/views/dashboard/riwayat/riwayat.blade.php b/resources/views/dashboard/riwayat/riwayat.blade.php index 34205b4..5428452 100644 --- a/resources/views/dashboard/riwayat/riwayat.blade.php +++ b/resources/views/dashboard/riwayat/riwayat.blade.php @@ -46,7 +46,8 @@ Alamat Penyakit Solusi - Action + Tanggal + @@ -60,19 +61,10 @@ {{ $data->alamat }} {{ $data->nama_penyakit }} {{ $data->solusi }} + {{ $data->tanggal }} - - {{-- - - - - - --}} - @endforeach diff --git a/resources/views/dashboard/user/profile-admin.blade.php b/resources/views/dashboard/user/profile-admin.blade.php new file mode 100644 index 0000000..2ee7cb0 --- /dev/null +++ b/resources/views/dashboard/user/profile-admin.blade.php @@ -0,0 +1,113 @@ +@extends('dashboard.navigasi.master') +@section('content') + +@auth + +
    + +
    + +
    +
    + +
    +
    +
    +
    Detail Profile
    +
    +
    +
    + @csrf + @method('put') +
    + + +
    +
    + + +
    +
    + + +
    +
    + + +
    + +
    + + + + + + Back to Dashboard +
    +
    +
    +
    +
    + +
    + +
    + + + + + + + + + +@endauth + +@guest +
    + +
    +@endguest + +@endsection diff --git a/resources/views/dashboard/user/profile.blade.php b/resources/views/dashboard/user/profile.blade.php index a5ee5ee..2bd5442 100644 --- a/resources/views/dashboard/user/profile.blade.php +++ b/resources/views/dashboard/user/profile.blade.php @@ -19,7 +19,9 @@
    Detail Profil
    -
    + + @csrf + @method('put')
    @@ -36,8 +38,13 @@
    - + +
    + + + + Back
    @@ -62,6 +69,7 @@ Alamat Penyakit Solusi + Tanggal {{-- Action --}} @@ -75,7 +83,17 @@ {{ $item->nama }} {{ $item->alamat }} {{ $item->nama_penyakit }} - {{ $item->solusi }} + + @php + $solusiArray = json_decode($item->solusi, true); + @endphp +
      + @foreach ($solusiArray as $solusi) +
    1. {{ $solusi }}
      2. + @endforeach +
    + + {{$item->tanggal}} @endforeach @@ -114,6 +132,29 @@ + @endauth diff --git a/resources/views/layouts/master.blade.php b/resources/views/layouts/master.blade.php index a6dd5b2..b129115 100644 --- a/resources/views/layouts/master.blade.php +++ b/resources/views/layouts/master.blade.php @@ -69,7 +69,7 @@