From 67dd589b0ebf96f4e51324c232a589756f4fa987 Mon Sep 17 00:00:00 2001 From: Amir Date: Sun, 29 Oct 2023 13:22:19 +0800 Subject: [PATCH 1/2] Fix galeri marhun request vue to jquery --- app/Http/Controllers/MarhunController.php | 70 ++++- public/css/style.css | 16 ++ .../views/pengurusangambar/cawangan.blade.php | 265 ++++++++++++++++++ .../views/pengurusangambar/operasi.blade.php | 259 +++++++++++++++++ routes/web.php | 2 + 5 files changed, 609 insertions(+), 3 deletions(-) create mode 100644 resources/views/pengurusangambar/cawangan.blade.php create mode 100644 resources/views/pengurusangambar/operasi.blade.php diff --git a/app/Http/Controllers/MarhunController.php b/app/Http/Controllers/MarhunController.php index a7b05cbf..acc4fcfe 100644 --- a/app/Http/Controllers/MarhunController.php +++ b/app/Http/Controllers/MarhunController.php @@ -32,6 +32,7 @@ use Illuminate\Support\Facades\Request as FacadesRequest; use App\Models\TempPengesahan; use DateTime; use App\Models\LogUser; +use Illuminate\Support\Facades\Storage; class MarhunController extends Controller { @@ -2598,14 +2599,77 @@ class MarhunController extends Controller public function pengurusanGambarMarhun() { - return view('pengurusangambar.index'); + $lelong_all = Lelong::select('id', 'tarikh_lelong', 'fasa')->get(); + foreach($lelong_all as $index => $lelong) + { + $date_convert = strtotime($lelong->tarikh_lelong); + $lelong_all[$index]['tarikh_lelong'] = date("d-m-Y", $date_convert); + } + + return view('pengurusangambar.operasi', compact('lelong_all')); } public function galeriMarhun() { $user = Auth::user(); - $kodcaw = Cawangan::select('id')->where('caw_code', $user->kodcaw)->first(); - return view('pengurusangambar.galerimarhun', compact('kodcaw')); + $cawangan = Cawangan::with('lelong')->where('caw_code', $user->kodcaw)->first(); + + $caw_id = $cawangan->id; + $lelong_all = $cawangan->lelong; + foreach($lelong_all as $index => $lelong) + { + $date_convert = strtotime($lelong->tarikh_lelong); + $lelong_all[$index]['tarikh_lelong'] = date("d-m-Y", $date_convert); + $lelong_all[$index]['new_id'] = str_pad($lelong->id, 3, "0", STR_PAD_LEFT); + } + + return view('pengurusangambar.cawangan', compact('caw_id', 'lelong_all')); + } + + public function listCawangan(Request $request) + { + $cawangan_all = CawanganLelong::join('cawangan', 'cawangan_lelong.caw_id', '=', 'cawangan.id') + ->where('lelong_id', $request->lelong_id) + ->select('cawangan_lelong.caw_id', 'cawangan.caw_name')->get(); + return response()->json($cawangan_all); + } + + public function listLelongBid(Request $request) + { + $lelong_bid_all = LelongBid::with('fileMarhunMain') + ->where('caw_id', $request->caw_id) + ->where('lelong_id', $request->lelong_id) + ->select(['id','norujukan', 'marhun', 'nilaimarhun', 'status_semak', 'berat', 'hargaasas']) + ->get(); + + foreach ($lelong_bid_all as $index => $lelong_bid) { + $lelong_bid_all[$index]['nilaimarhun'] = number_format($lelong_bid->nilaimarhun, 2, '.', ','); + $lelong_bid_all[$index]['hargaasas'] = number_format($lelong_bid->hargaasas, 2, '.', ','); + + if ($lelong_bid->fileMarhunMain != null) { + + $directory = "/{$lelong_bid->norujukan}/overall_photo/"; + $imageExtension = $lelong_bid->fileMarhunMain->file_type; + + $marhunImageFileName = "overall.{$imageExtension}"; + + if (Storage::disk('marhun')->exists("{$directory}${marhunImageFileName}")) { + $marhun_photo = Storage::disk('marhun')->get("{$directory}${marhunImageFileName}"); + + $lelong_bid_all[$index]['fileMarhunMain']['gambar'] = base64_encode($marhun_photo); + } else { + $lelong_bid_all[$index]['fileMarhunMain']['gambar'] = 0; + } + } + } + + $belum_semak = $lelong_bid_all->where('status_semak', 0)->count(); + + return response()->json([ + "jumlah_surat" => $lelong_bid_all->count(), + "belum_semak" => $belum_semak, + "lelong_bid" => $lelong_bid_all, + ]); } } diff --git a/public/css/style.css b/public/css/style.css index de155424..3f12650e 100644 --- a/public/css/style.css +++ b/public/css/style.css @@ -368,4 +368,20 @@ a.article:hover { .user-info { /* display: flex; */ +} + +.blink { + animation: blinker 0.6s linear infinite; + } + + @keyframes blinker { + 50% { + opacity: 0; + } + } + + .unchecked { + border: 2px solid red !important; + border-start-start-radius: 7px; + border-start-end-radius: 7px; } \ No newline at end of file diff --git a/resources/views/pengurusangambar/cawangan.blade.php b/resources/views/pengurusangambar/cawangan.blade.php new file mode 100644 index 00000000..b612b5a5 --- /dev/null +++ b/resources/views/pengurusangambar/cawangan.blade.php @@ -0,0 +1,265 @@ +@extends('layouts.app') + +@section('content') + + +
+
+
+
+
+
+ Galeri Marhun +
+
+
+
+ + +
+ + +
+ + +
+ +
+
+
+
+
+ +@endsection diff --git a/resources/views/pengurusangambar/operasi.blade.php b/resources/views/pengurusangambar/operasi.blade.php new file mode 100644 index 00000000..3037ca4d --- /dev/null +++ b/resources/views/pengurusangambar/operasi.blade.php @@ -0,0 +1,259 @@ +@extends('layouts.app') + +@section('content') + + +
+
+
+
+
+
+ Galeri Marhun +
+
+
+
+ + +
+ + +
+ + +
+ +
+
+
+
+
+ +@endsection diff --git a/routes/web.php b/routes/web.php index b9bea651..e346b7b5 100644 --- a/routes/web.php +++ b/routes/web.php @@ -666,6 +666,8 @@ Route::group(['middleware' => ['permission:backdate'],'prefix'=>'backdate'], fun Route::group(['middleware' => ['permission:pengurusangambar'], 'prefix' => 'pengurusangambar'], function () { Route::get('/marhun', ['as' => 'pengurusangambar.marhun', 'uses' => 'MarhunController@pengurusanGambarMarhun']); Route::get('/galerimarhun', ['as' => 'pengurusangambar.galerimarhun', 'uses' => 'MarhunController@galeriMarhun']); + Route::get('/listCawangan', ['as' => 'pengurusangambar.listcawangan', 'uses' => 'MarhunController@listCawangan']); + Route::get('/listLelongBid', ['as' => 'pengurusangambar.listlelongbid', 'uses' => 'MarhunController@listLelongBid']); }); Route::group(['middleware' => ['permission:pengurusanuploaddownload'], 'prefix' => 'pengurusanuploaddownload'], function () { Route::get('/testupload', ['as' => 'pengurusanuploaddownload.testupload', 'uses' => 'DatabaseController@pengurusanMaxUploadSize']); From 26c76b1e665b58e1863f302191104c642109e52e Mon Sep 17 00:00:00 2001 From: Amir Date: Mon, 30 Oct 2023 09:31:09 +0800 Subject: [PATCH 2/2] Add role pemasaran --- app/Http/Controllers/HomeController.php | 2 ++ app/Http/Controllers/LelongController.php | 2 ++ database/seeders/RolesSeeder.php | 12 ++++++++++ resources/views/homepemasaran.blade.php | 16 ++++++++++++++ resources/views/includes/sidebar.blade.php | 22 +++++++++++++++++++ .../views/lelong/senarailelong.blade.php | 2 ++ .../views/lelong/senaraimarhun.blade.php | 10 +++++++++ .../views/lelong/senaraimarhundone.blade.php | 2 ++ resources/views/lelong/showlelong.blade.php | 2 ++ 9 files changed, 70 insertions(+) create mode 100644 resources/views/homepemasaran.blade.php diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index c807b01d..2f80ec25 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -432,6 +432,8 @@ class HomeController extends Controller return view('homeoperasikpi'); } else if ($user->hasRole('hr')) { return view('homehr'); + } else if ($user->hasRole('pemasaran')) { + return view('homepemasaran'); } else if ($user->hasRole('admin')) { return view('homeadmin'); } else if ($user->hasRole('account')) { diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index 9f312757..c159a026 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -1470,6 +1470,7 @@ class LelongController extends Controller } public function senaraimarhun($lelongid, $cawid){ + $user = Auth::user(); $total_berat = 0; $total_pinjaman = 0; $total_upah = 0; @@ -1545,6 +1546,7 @@ class LelongController extends Controller 'total_nilaimarhun', 'lelonglel', 'cawanganDetail', + 'user', 'total_cazlelong')); } diff --git a/database/seeders/RolesSeeder.php b/database/seeders/RolesSeeder.php index 61008b60..58056523 100644 --- a/database/seeders/RolesSeeder.php +++ b/database/seeders/RolesSeeder.php @@ -286,6 +286,10 @@ class RolesSeeder extends Seeder $role13 = Role::create(['name' => 'hr']); $role13->givePermissionTo('skoptugasan'); + $role14 = Role::create(['name' => 'pemasaran']); + $role14->givePermissionTo('pengurusangambar'); + $role14->givePermissionTo('pendaftaranbatch'); + // $role3 = Role::create(['name' => 'Super-Admin']); // gets all permissions via Gate::before rule; see AuthServiceProvider @@ -398,5 +402,13 @@ class RolesSeeder extends Seeder 'user_type' => 1 ]); $user->assignRole($role13); + + $user = \App\Models\User::factory()->create([ + 'name' => 'Pemasaran', + 'username' => 'pemasaran', + 'email' => 'pemasaran@example.com', + 'user_type' => 1 + ]); + $user->assignRole($role14); } } diff --git a/resources/views/homepemasaran.blade.php b/resources/views/homepemasaran.blade.php new file mode 100644 index 00000000..92c2e7ce --- /dev/null +++ b/resources/views/homepemasaran.blade.php @@ -0,0 +1,16 @@ +@extends('layouts.app') + +@section('content') +
+
+
+
+
{{ __('Dashboard') }}
+
+ Selamat Datang +
+
+
+
+
+@endsection \ No newline at end of file diff --git a/resources/views/includes/sidebar.blade.php b/resources/views/includes/sidebar.blade.php index 5217023f..2e700eb3 100644 --- a/resources/views/includes/sidebar.blade.php +++ b/resources/views/includes/sidebar.blade.php @@ -1021,6 +1021,28 @@ @endhasrole @hasrole('pembida') @endhasrole + @hasrole('pemasaran') +
  • + +
    + + published_with_changes + + Senarai Lelong +
    +     +
    • +
  • + +
    + + gallery_thumbnail + + Galeri Marhun +
    +     +
    • + @endhasrole
    Beta V1.0
    diff --git a/resources/views/lelong/senarailelong.blade.php b/resources/views/lelong/senarailelong.blade.php index 8ff53b23..74d83c1d 100644 --- a/resources/views/lelong/senarailelong.blade.php +++ b/resources/views/lelong/senarailelong.blade.php @@ -223,7 +223,9 @@ {{-- --}} + @hasrole('operasi') + @endhasrole @endforeach diff --git a/resources/views/lelong/senaraimarhun.blade.php b/resources/views/lelong/senaraimarhun.blade.php index 7397aa18..84362f5d 100644 --- a/resources/views/lelong/senaraimarhun.blade.php +++ b/resources/views/lelong/senaraimarhun.blade.php @@ -65,7 +65,9 @@ + @hasrole('operasi') + @endhasrole {{-- --}} @@ -87,9 +89,11 @@ @endphp @foreach ($marhuns as $index=> $marhun) + @hasrole('operasi') + @endhasrole {{-- --}} @@ -128,7 +132,11 @@ {{-- --}} + @if($user->hasRole('operasi')) + @else + + @endif @@ -145,10 +153,12 @@
    TindakanNo No RujukanNama Pelanggan
    {{$loop->iteration}} {{ $marhun['norujukan']}}{{ $marhun['nama']['nama']}}
    JUMLAH KESELURUHANJUMLAH KESELURUHAN{{ number_format($total_berat, 2, '.', ',') }} {{ number_format($total_nilaimarhun, 2, '.', ',') }} {{ number_format($total_pinjaman, 2, '.', ',') }}
    + @hasrole('operasi')
    {{-- Kembali --}}
    + @endhasrole {{-- Kembali --}} diff --git a/resources/views/lelong/senaraimarhundone.blade.php b/resources/views/lelong/senaraimarhundone.blade.php index 09231006..138109e5 100644 --- a/resources/views/lelong/senaraimarhundone.blade.php +++ b/resources/views/lelong/senaraimarhundone.blade.php @@ -56,7 +56,9 @@
    {{-- Muat Turun PDF --}} + @hasrole('operasi') Ubah Rugi Lelong + @endhasrole
    @csrf diff --git a/resources/views/lelong/showlelong.blade.php b/resources/views/lelong/showlelong.blade.php index b0903a80..4d297c4e 100644 --- a/resources/views/lelong/showlelong.blade.php +++ b/resources/views/lelong/showlelong.blade.php @@ -28,7 +28,9 @@