diff --git a/app/Http/Controllers/BarangKeluarController.php b/app/Http/Controllers/BarangKeluarController.php deleted file mode 100644 index 351c312..0000000 --- a/app/Http/Controllers/BarangKeluarController.php +++ /dev/null @@ -1,92 +0,0 @@ -validate([ - 'asset_id' => 'required', - 'jumlah' => 'required', - 'tanggal_keluar' => 'required', - 'penerima_barang' => 'required', - 'exit_warehouse' => 'required', - 'keterangan' => 'required', - ]); - // dd($request); - try { - $validatedData = $request->except('_token'); - // dd($validatedData); - BarangKeluar::create($validatedData); - return redirect()->back()->with('success', 'Data barang keluar berhasil ditambah.'); - } catch (\Throwable $th) { - return redirect()->back()->with('error', 'Data barang keluar gagal ditambah.'); - } - } - - /** - * Display the specified resource. - */ - public function show($barang_masuk) - { - // - } - - /** - * Show the form for editing the specified resource. - */ - public function edit($barang_masuk) - { - // - } - - /** - * Update the specified resource in storage. - */ - public function update(Request $request, $barang_masuk) - { - // - } - - /** - * Remove the specified resource from storage. - */ - public function destroy($id) - { - // dd("oke"); - try { - $asset = BarangKeluar::findOrFail($id); - $asset->delete(); - return redirect()->back()->with('success', 'Data Barang Keluar berhasil dihapus'); - } catch (\Throwable $th) { - return redirect()->back()->with('error', 'Data Barang Keluar gagal dihapus'); - } - } -} diff --git a/app/Http/Controllers/BarangMasukController.php b/app/Http/Controllers/BarangMasukController.php deleted file mode 100644 index 7212d4e..0000000 --- a/app/Http/Controllers/BarangMasukController.php +++ /dev/null @@ -1,66 +0,0 @@ -except('_token'); $validatedData['seri'] = $seri; - $validatedData['created_by'] = $currentUser->id; // Menambahkan ID pengguna sebagai created_by - $validatedData['updated_by'] = $currentUser->id; // Menambahkan ID pengguna sebagai updated_by + $validatedData['created_by'] = $currentUser->fullname; // Menambahkan ID pengguna sebagai created_by + $validatedData['updated_by'] = $currentUser->fullname; // Menambahkan ID pengguna sebagai updated_by // dd($validatedData); // Menyimpan data ke dalam database \App\Models\m_asset::create($validatedData); @@ -86,38 +86,36 @@ class M_assetController extends Controller // dd('oke'); $asset = m_asset::find($id); $warehouse = m_warehouse::all(); - return view('MasterData.asset.show', compact('asset', 'warehouse')); + return view('dashboard.Master_Data.Asset.show', compact('asset', 'warehouse')); } // Menampilkan data QR - public function QR($id) - { - $asset = m_asset::find($id); - return QrCode::generate( - 'Hello, World!', - ); - } + // public function QR($id) + // { + // $asset = m_asset::find($id); + // return QrCode::generate( + // 'Hello, World!', + // ); + // } /** * Show the form for editing the specified resource. */ - public function edit() - { - // dd('oke'); - } + // public function edit() + // { + // // + // } /** * Update the specified resource in storage. */ public function update(Request $request, $id) { - // dd('oke'); $request->validate([ 'name' => 'required', 'description' => 'required', 'warehouse_id' => 'required', 'date' => 'required', - 'qr_count' => 'required', ]); try { $asset = m_asset::findOrFail($id); @@ -154,7 +152,7 @@ class M_assetController extends Controller // Buat objek Dompdf $dompdf = new Dompdf(); // Render tampilan ke PDF - $html = view('MasterData.asset_pdf', compact('asset'))->render(); + $html = view('dashboard.Master_Data.Asset.asset_pdf', compact('asset'))->render(); // Muat HTML ke Dompdf $dompdf->loadHtml($html); diff --git a/app/Http/Controllers/M_userController.php b/app/Http/Controllers/M_userController.php index 473c7f7..b17d30c 100644 --- a/app/Http/Controllers/M_userController.php +++ b/app/Http/Controllers/M_userController.php @@ -19,7 +19,7 @@ class M_userController extends Controller $warehouse = m_warehouse::get(); $role = m_role::get(); $user = User::get(); - return view('MasterData.user', compact('user', 'role', 'warehouse')); + return view('dashboard.Master_Data.User.index', compact('user', 'role', 'warehouse')); } /** @@ -27,7 +27,9 @@ class M_userController extends Controller */ public function create() { - // + $role = m_role::get(); + $warehouse = m_warehouse::get(); + return view('dashboard.Master_Data.User.create', compact('role', 'warehouse')); } /** @@ -52,7 +54,7 @@ class M_userController extends Controller $validatedData['updated_by'] = $currentUser->fullname; // Menggunakan nama pengguna sebagai updated_by $validatedData['password'] = bcrypt($request->input('password')); // Enkripsi password user::create($validatedData); - return redirect()->back()->with('success', 'Data User Berhasil Ditambah.'); + return redirect()->route('dashboard.user.index')->with('success', 'Data User berhasil ditambahkan'); } catch (\Throwable $th) { return redirect()->back()->with('error', 'Data User Gagal Ditambah.'); } @@ -63,19 +65,22 @@ class M_userController extends Controller */ public function show($id) { - // dd('oke'); $user = User::find($id); $role = m_role::get(); $warehouse = m_warehouse::get(); - return view('MasterData.update_user', compact('user', 'role', 'warehouse')); + return view('dashboard.Master_Data.User.show', compact('user', 'role', 'warehouse')); } /** * Show the form for editing the specified resource. */ - public function edit() + public function edit($id) { // dd('oke'); + $user = User::find($id); + $role = m_role::get(); + $warehouse = m_warehouse::get(); + return view('dashboard.Master_Data.User.edit', compact('user', 'role', 'warehouse')); } /** @@ -84,14 +89,13 @@ class M_userController extends Controller public function update(Request $request, $id) { $request->validate([ + 'username' => 'required', 'fullname' => 'required', - 'nip' => 'required', - 'email' => 'required', - 'no_hp' => 'required', + 'email' => 'required|email', 'divisi' => 'required', - 'address' => 'required', 'role_id' => 'required', 'warehouse_id' => 'required', + 'password' => 'required', ]); // dd($request->all()); try { @@ -102,18 +106,10 @@ class M_userController extends Controller $userData['updated_by'] = Auth::user()->fullname; $user->update($userData); - return redirect()->route('user.index')->with('success', 'Data User berhasil diperbaharui'); + return redirect()->route('dashboard.user.index')->with('success', 'Data User berhasil diperbaharui'); } catch (\Throwable $th) { return redirect()->back()->with('error', 'Data User gagal diperbaharui'); } - // try { - // $user = User::findOrFail($id); - // $user->update($request->all()); - - // return redirect()->route('user.index')->with('success', 'Data User berhasil diperbaharui'); - // } catch (\Throwable $th) { - // return redirect()->back()->with('error', 'Data User gagal diperbaharui'); - // } } /** diff --git a/app/Http/Controllers/PeminjamanController.php b/app/Http/Controllers/PeminjamanController.php index 136584c..58a931d 100644 --- a/app/Http/Controllers/PeminjamanController.php +++ b/app/Http/Controllers/PeminjamanController.php @@ -18,7 +18,7 @@ class PeminjamanController extends Controller $asset = m_asset::all(); $peminjaman = asset_status::get(); $warehouse = m_warehouse::get(); - return view('dashboard.peminjaman', compact('asset', 'peminjaman', 'warehouse')); + return view('dashboard.Peminjaman.index', compact('asset', 'peminjaman', 'warehouse')); } /** @@ -26,7 +26,10 @@ class PeminjamanController extends Controller */ public function create() { - // + $asset = m_asset::all(); + $peminjaman = asset_status::get(); + $warehouse = m_warehouse::get(); + return view('dashboard.Peminjaman.create', compact('asset', 'peminjaman', 'warehouse')); } /** @@ -50,11 +53,10 @@ class PeminjamanController extends Controller $validatedData['updated_by'] = $currentUser->id; // Menambahkan ID pengguna sebagai updated_by // dd($validatedData); asset_status::create($validatedData); - return redirect()->back()->with('success', 'Data peminjaman berhasil ditambah.'); + return redirect()->route('dashboard.peminjaman.index')->with('success', 'Data peminjaman berhasil ditambah.'); } catch (\Throwable $th) { return redirect()->back()->with('error', 'Data peminjaman gagal ditambah.'); } - return redirect()->back()->with('success', 'Data peminjaman berhasil ditambah.'); } /** @@ -68,9 +70,12 @@ class PeminjamanController extends Controller /** * Show the form for editing the specified resource. */ - public function edit() + public function edit($id) { - // dd('oke'); + $peminjaman = asset_status::find($id); + $asset = m_asset::all(); + $warehouse = m_warehouse::get(); + return view('dashboard.Peminjaman.edit', compact('asset', 'peminjaman', 'warehouse')); } /** @@ -90,9 +95,8 @@ class PeminjamanController extends Controller $peminjaman = asset_status::findOrFail($id); $peminjaman['updated_by'] = Auth::user()->fullname; // Menambahkan ID pengguna sebagai updated_by $peminjaman->update($request->all()); - return redirect()->back()->with('success', 'Data peminjaman berhasil diperbaharui'); + return redirect()->route('dashboard.peminjaman.index')->with('success', 'Data peminjaman berhasil diperbaharui'); } catch (\Throwable $th) { - // dd($th->getMessage()); return redirect()->back()->with('error', 'Data peminjaman gagal diperbaharui'); } } @@ -102,7 +106,6 @@ class PeminjamanController extends Controller */ public function destroy($id) { - // dd("oke"); try { $peminjaman = asset_status::findOrFail($id); $peminjaman->delete(); diff --git a/app/Http/Controllers/PengadaanController.php b/app/Http/Controllers/PengadaanController.php deleted file mode 100644 index d63f254..0000000 --- a/app/Http/Controllers/PengadaanController.php +++ /dev/null @@ -1,61 +0,0 @@ -all()); $request->validate([ 'asset_id' => 'required', 'exit_at' => 'required', @@ -66,37 +63,35 @@ class PengembalianController extends Controller 'enter_pic' => 'required', 'enter_warehouse' => 'required', ]); + try { $peminjaman = asset_status::findOrFail($id); $peminjaman['updated_by'] = Auth::user()->fullname; // Menambahkan ID pengguna sebagai updated_by $peminjaman->update($request->all()); - return redirect()->route('pengembalian.index')->with('success', 'Data peminjaman berhasil diperbaharui'); + + return redirect()->route('dashboard.pengembalian.index')->with('success', 'Data peminjaman berhasil diperbaharui'); } catch (\Throwable $th) { - // dd($th->getMessage()); - return redirect()->back()->with('error', 'Data peminjaman gagal diperbaharui'); + // Tampilkan pesan kesalahan untuk debugging + return redirect()->back()->with('error', 'Data peminjaman gagal diperbaharui: ' . $th->getMessage()); } } + // public function update(Request $request, $id) // { - // // dd('oke'); // $request->validate([ // 'asset_id' => 'required', // 'exit_at' => 'required', // 'exit_pic' => 'required', - // 'exit_warehouse' => 'required', // 'enter_at' => 'required', // 'enter_pic' => 'required', // 'enter_warehouse' => 'required', // ]); - // // dd($request); // try { // $peminjaman = asset_status::findOrFail($id); - // // dd($peminjaman); - // // dd($request->all()); + // $peminjaman['updated_by'] = Auth::user()->fullname; // Menambahkan ID pengguna sebagai updated_by // $peminjaman->update($request->all()); // return redirect()->route('pengembalian.index')->with('success', 'Data peminjaman berhasil diperbaharui'); // } catch (\Throwable $th) { - // // dd($th->getMessage()); // return redirect()->back()->with('error', 'Data peminjaman gagal diperbaharui'); // } // } diff --git a/app/Http/Controllers/RoleController.php b/app/Http/Controllers/RoleController.php index c2bb05f..38376e0 100644 --- a/app/Http/Controllers/RoleController.php +++ b/app/Http/Controllers/RoleController.php @@ -4,6 +4,7 @@ namespace App\Http\Controllers; use App\Models\m_role; use Illuminate\Http\Request; +use Illuminate\Support\Facades\Auth; class RoleController extends Controller { @@ -13,7 +14,7 @@ class RoleController extends Controller public function index() { $role = m_role::all(); - return view('MasterData.role.index', compact('role')); + return view('dashboard.Master_Data.Role.index', compact('role')); } /** @@ -34,7 +35,10 @@ class RoleController extends Controller 'description' => 'required', ]); try { + $currentUser = Auth::user(); $validatedData = $request->except('_token'); + $validatedData['created_by'] = $currentUser->fullname; // Menggunakan nama pengguna sebagai created_by + $validatedData['updated_by'] = $currentUser->fullname; // Menggunakan nama pengguna sebagai updated_by m_role::create($validatedData); return redirect()->back()->with('success', 'Data role Berhasil Ditambah.'); } catch (\Throwable $th) { @@ -54,12 +58,12 @@ class RoleController extends Controller /** * Show the form for editing the specified resource. */ - public function edit($id) - { - // dd('oke'); - $role = m_role::find($id); - return view('MasterData.role.edit', compact('role')); - } + // public function edit($id) + // { + // // dd('oke'); + // $role = m_role::find($id); + // return view('dashboard.Master_Data.Role.edit', compact('role')); + // } /** * Update the specified resource in storage. diff --git a/app/Http/Controllers/SettingPlatformController.php b/app/Http/Controllers/SettingPlatformController.php deleted file mode 100644 index cd01056..0000000 --- a/app/Http/Controllers/SettingPlatformController.php +++ /dev/null @@ -1,64 +0,0 @@ - -
No | -Nama | -No. HP | -Alamat | -Ditugaskan | -Action | -|
---|---|---|---|---|---|---|
No | -Nama | -No. HP | -Alamat | -Ditugaskan | -Action | -|
{{ $noUser++ }} | -{{ $data->fullname }} | -{{ $data->email }} | -{{ isset($data->no_hp) ? $data->no_hp : '-' }} | -{{ isset($data->address) ? $data->address : '-' }} | -{{ $data->warehouse->name }} | -- - - - - - - | -
No | -Nama Akses | +No | +Nama Role | Deskripsi | Action | ||||
---|---|---|---|---|---|---|---|---|---|
{{ $norole++ }} | +{{ $norole++ }} | {{ $data_role->name }} | {{ $data_role->description }} |
@@ -41,10 +41,16 @@
data-target="#editDataModal{{ $data_role->id }}">
-
-
-
+ |
|||||
No | -Nama Asset | -Tgl Peinjaman | -PJ Peinjaman | -Asal Gudang | -Tgl Pengembalian | -PJ Pengembalian | -Tujuan Gudang | -Status | -Action | -- + | diff --git a/resources/views/dashboard/index.blade.php b/resources/views/dashboard/index.blade.php index 821c5c5..8732072 100644 --- a/resources/views/dashboard/index.blade.php +++ b/resources/views/dashboard/index.blade.php @@ -91,6 +91,7 @@ +
No | -Nama Asset | -Tgl Peminjaman | -PJ Keluar | -Asal Gudang | -Action | -
---|---|---|---|---|---|
No | -Nama Asset | -Tgl Peminjaman | -PJ Keluar | -Asal Gudang | -Action | -
{{ $no_peminjaman++ }} | -{{ $data->asset->name }} | -{{ \Carbon\Carbon::parse($data->exit_at)->format('d-m-Y') }} | -{{ $data->exit_pic }} | -{{ $data->warehouse->name }} | -- - - - - - - | -
Our Outgoing Item Tables are enhanced with the help of the DataTables plugin. This is a powerful tool that - allows you to explore outgoing data in a more interactive and efficient way.
- - + Tambah data - -Nama Barang | -Jumlah | -Tgl Keluar | -Penerima | -Asal Gudang | -Keterangan | -Action | -
---|---|---|---|---|---|---|
Nama Barang | -Jumlah | -Tgl Keluar | -Penerima | -Asal Gudang | -Keterangan | -Action | -
{{ $data->asset->name }} | -{{ $data->jumlah }} | -{{ \Carbon\Carbon::parse($data->tanggal_keluar)->format('d-m-Y') }} | -{{ $data->penerima_barang }} | -{{ $data->exit_warehouse }} | -{{ $data->keterangan }} | -- - - - - - - | -
Halaman Barang Masuk
-@endsection diff --git a/resources/views/landing_page/about.html b/resources/views/landing_page/about.html deleted file mode 100644 index edc15d7..0000000 --- a/resources/views/landing_page/about.html +++ /dev/null @@ -1,475 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - -Far far away, behind the word mountains, far from the countries Vokalia and Consonantia, there live the blind texts. Separated they live.
- -Far far away, behind the word mountains, far from the countries Vokalia and Consonantia, there live the blind texts.
-Far far away, behind the word mountains, far from the countries Vokalia and Consonantia, there live the blind texts.
- -Far far away, behind the word mountains, far from the countries Vokalia and Consonantia, there live the blind texts.
- -Far far away, behind the word mountains, far from the countries Vokalia and Consonantia, there live the blind texts.
- -Far far away, behind the word mountains, far from the countries Vokalia and Consonantia, there live the blind texts.
-Far far away, behind the word mountains, far from the countries Vokalia and Consonantia, there live the blind texts.
-Far far away, behind the word mountains, far from the countries Vokalia and Consonantia, there live the blind texts.
-Far far away, behind the word mountains, far from the countries Vokalia and Consonantia, there live the blind texts.
-Far far away, behind the word mountains, far from the countries Vokalia and Consonantia, there live the blind texts.
-Far far away, behind the word mountains, far from the countries Vokalia and Consonantia, there live the blind texts.
-Far far away, behind the word mountains, far from the countries Vokalia and Consonantia, there live the blind texts.
-Far far away, behind the word mountains, far from the countries Vokalia and Consonantia, there live the blind texts.
- -Far far away, behind the word mountains, far from the countries Vokalia and Consonantia, there live the blind texts.
-Separated they live in Bookmarksgrove right at the coast of the Semantics, a large language ocean.
-Far far away, behind the word mountains, far from the countries Vokalia and Consonantia, there live the blind texts.
-Separated they live in Bookmarksgrove right at the coast of the Semantics, a large language ocean.
-When she reached the first hills of the Italic Mountains, she had a last view back on the skyline of her hometown Bookmarksgrove, the headline of Alphabet Village and the subline of her own road, the Line Lane.
-Pityful a rethoric question ran over her cheek, then she continued her way.
-43 Raymouth Rd. Baltemoer, London 3910
-
- Sunday-Friday:
- 11:00 AM - 2300 PM
-
info@Untree.co
-+1 1234 55488 55
---“There live the blind texts. Separated they live in Bookmarksgrove right at the coast of the Semantics, a large language ocean.”
-
--“There live the blind texts. Separated they live in Bookmarksgrove right at the coast of the Semantics, a large language ocean.”
-
--“There live the blind texts. Separated they live in Bookmarksgrove right at the coast of the Semantics, a large language ocean.”
-
Copyright © - . All Rights Reserved. — Designed with love by Untree.co Distributed By ThemeWagon - -
We have more category here. Browse all
-Far far away, behind the word mountains, far from the - countries Vokalia and Consonantia, there live the blind texts. Separated they live.
- -Far far away, behind the word mountains, far from the countries Vokalia and Consonantia, there - live the blind texts.
-Far far away, behind the word mountains, far from the countries Vokalia and Consonantia, - there live the blind texts.
-Far far away, behind the word mountains, far from the countries Vokalia and Consonantia, - there live the blind texts.
-Far far away, behind the word mountains, far from the countries Vokalia and Consonantia, - there live the blind texts.
-Far far away, behind the word mountains, far from the countries Vokalia and Consonantia, - there live the blind texts.
-Far far away, behind the word mountains, far from the countries Vokalia and Consonantia, - there live the blind texts.
-Far far away, behind the word mountains, far from the countries Vokalia and Consonantia, - there live the blind texts.
-Far far away, behind the word mountains, far from the countries Vokalia and Consonantia, there - live the blind texts.
-Far far away, behind the word mountains, far from the - countries Vokalia and Consonantia, there live the blind texts. Separated they live in - Bookmarksgrove right at the coast of the Semantics, a large language ocean.
-- Admission - Learn More -
-Far far away, behind the word mountains, far from the countries Vokalia and Consonantia, there - live the blind texts.
-Far far away, behind the word mountains, far from the countries Vokalia and Consonantia, - there live the blind texts.
- -Far far away, behind the word mountains, far from the countries Vokalia and Consonantia, - there live the blind texts.
- -Far far away, behind the word mountains, far from the countries Vokalia and Consonantia, there - live the blind texts.
-Far far away, behind the word mountains, far from the countries Vokalia - and Consonantia, there live the blind texts.
- - -Far far away, behind the word mountains, far from the countries Vokalia - and Consonantia, there live the blind texts.
- - -Far far away, behind the word mountains, far from the countries Vokalia - and Consonantia, there live the blind texts.
- - -Far far away, behind the word mountains, far from the countries Vokalia and Consonantia, there - live the blind texts.
- -Far far away, behind the word mountains, far from the countries Vokalia - and Consonantia, there live the blind texts.
-Separated they live in Bookmarksgrove right at the coast of the - Semantics, a large language ocean.
-Far far away, behind the word mountains, far from the countries Vokalia - and Consonantia, there live the blind texts.
-Separated they live in Bookmarksgrove right at the coast of the - Semantics, a large language ocean.
-When she reached the first hills of the Italic Mountains, she had a last - view back on the skyline of her hometown Bookmarksgrove, the headline of - Alphabet Village and the subline of her own road, the Line Lane.
-Pityful a rethoric question ran over her cheek, then she continued her - way.
-Far far away, behind the word mountains, far from the countries Vokalia and Consonantia, there live the blind texts.
-Far far away, behind the word mountains, far from the countries Vokalia and Consonantia, there live the blind texts.
-Far far away, behind the word mountains, far from the countries Vokalia and Consonantia, there live the blind texts.
-Far far away, behind the word mountains, far from the countries Vokalia and Consonantia, there live the blind texts.
-Far far away, behind the word mountains, far from the countries Vokalia and Consonantia, there live the blind texts.
-Far far away, behind the word mountains, far from the countries Vokalia and Consonantia, there live the blind texts.
-Far far away, behind the word mountains, far from the countries Vokalia and Consonantia, there live the blind texts.
- -Far far away, behind the word mountains, far from the countries Vokalia and Consonantia, there live the blind texts.
- -Far far away, behind the word mountains, far from the countries Vokalia and Consonantia, there live the blind texts.
- -