diff --git a/app/Http/Controllers/MarhunController.php b/app/Http/Controllers/MarhunController.php index c85ca4da..9a7942e7 100644 --- a/app/Http/Controllers/MarhunController.php +++ b/app/Http/Controllers/MarhunController.php @@ -2556,5 +2556,11 @@ class MarhunController extends Controller return view('pengurusangambar.index'); } - + public function galeriMarhun() + { + $user = Auth::user(); + + $kodcaw = Cawangan::select('id')->where('caw_code', $user->kodcaw)->first(); + return view('pengurusangambar.galerimarhun', compact('kodcaw')); + } } diff --git a/app/Http/Controllers/Mobile/LelongMobileController.php b/app/Http/Controllers/Mobile/LelongMobileController.php index add91d32..95c2863f 100644 --- a/app/Http/Controllers/Mobile/LelongMobileController.php +++ b/app/Http/Controllers/Mobile/LelongMobileController.php @@ -1442,6 +1442,19 @@ class LelongMobileController extends Controller return response()->json($lelong_all); } + public function listLelongByCawangan(Request $request) + { + $cawangan = Cawangan::with('lelong')->find($request->caw_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 response()->json($lelong_all); + } + public function listCawangan(Request $request) { $cawangan_all = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') diff --git a/resources/js/components/pengurusangambar/marhun/SelectBatchLelongCawangan.vue b/resources/js/components/pengurusangambar/marhun/SelectBatchLelongCawangan.vue new file mode 100644 index 00000000..04976a5e --- /dev/null +++ b/resources/js/components/pengurusangambar/marhun/SelectBatchLelongCawangan.vue @@ -0,0 +1,52 @@ + + + diff --git a/resources/js/vue-app.js b/resources/js/vue-app.js index ed621403..7a082b54 100644 --- a/resources/js/vue-app.js +++ b/resources/js/vue-app.js @@ -4,8 +4,13 @@ import 'viewerjs/dist/viewer.css' import VueViewer from 'v-viewer' import SelectBatchLelong from "./components/pengurusangambar/marhun/SelectBatchLelong.vue" +import SelectBatchLelongCawangan from "./components/pengurusangambar/marhun/SelectBatchLelongCawangan.vue" const appSelectBatchLelong = createApp(SelectBatchLelong); appSelectBatchLelong.use(VueViewer); -appSelectBatchLelong.mount("#appSelectBatchLelong"); \ No newline at end of file +const appSelectBatchLelongCawangan = createApp(SelectBatchLelongCawangan); +appSelectBatchLelongCawangan.use(VueViewer); + +appSelectBatchLelong.mount("#appSelectBatchLelong"); +appSelectBatchLelongCawangan.mount("#appSelectBatchLelongCawangan"); \ No newline at end of file diff --git a/resources/views/includes/sidebar.blade.php b/resources/views/includes/sidebar.blade.php index 11d58680..f98d6c38 100644 --- a/resources/views/includes/sidebar.blade.php +++ b/resources/views/includes/sidebar.blade.php @@ -46,9 +46,9 @@
- settings + gallery_thumbnail - Pengurusan Gambar Marhun + Galeri Marhun
@@ -147,9 +147,9 @@
- settings + gallery_thumbnail - Pengurusan Gambar Marhun + Galeri Marhun
@@ -272,6 +272,16 @@ +
  • + +
    + + gallery_thumbnail + + Galeri Marhun +
    +     +
    • +
  • + +
    + + gallery_thumbnail + + Galeri Marhun +
    +     +
    • @endhasrole @hasrole('penilai')
  • @@ -474,6 +494,16 @@
    • +
  • + +
    + + gallery_thumbnail + + Galeri Marhun +
    +     +
    • @endhasrole @hasrole('operasi')
  • @@ -622,9 +652,9 @@
    - settings + gallery_thumbnail - Pengurusan Gambar Marhun + Galeri Marhun
    • diff --git a/resources/views/pengurusangambar/galerimarhun.blade.php b/resources/views/pengurusangambar/galerimarhun.blade.php new file mode 100644 index 00000000..ce1770fd --- /dev/null +++ b/resources/views/pengurusangambar/galerimarhun.blade.php @@ -0,0 +1,26 @@ +@extends('layouts.app') + +@section('content') +
    +
    +
    +
    +
    +
    + Galeri Marhun +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    + + + +@endsection \ No newline at end of file diff --git a/resources/views/pengurusangambar/index.blade.php b/resources/views/pengurusangambar/index.blade.php index c10acd82..72d1b451 100644 --- a/resources/views/pengurusangambar/index.blade.php +++ b/resources/views/pengurusangambar/index.blade.php @@ -7,7 +7,7 @@
    - Pengurusan Gambar Marhun + Galeri Marhun
    diff --git a/routes/api.php b/routes/api.php index c2cea1c1..21cf1572 100644 --- a/routes/api.php +++ b/routes/api.php @@ -145,6 +145,7 @@ Route::get('/item','ApiController@biditem'); Route::get('/jeniskarat','ApiController@karat'); Route::get('/listLelong', [LelongMobileController::class, 'listLelong']); +Route::get('/listLelongByCawangan', [LelongMobileController::class, 'listLelongByCawangan']); Route::get('/listCawangan', [LelongMobileController::class, 'listCawangan']); Route::get('/listLelongBid', [LelongMobileController::class, 'listLelongBid']); Route::get('/showPhotoMarhun', [LelongMobileController::class, 'showPhotoMarhun']); diff --git a/routes/web.php b/routes/web.php index 37357c41..0fccfd38 100644 --- a/routes/web.php +++ b/routes/web.php @@ -621,6 +621,7 @@ 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::group(['middleware' => ['permission:pengurusanuploaddownload'], 'prefix' => 'pengurusanuploaddownload'], function () { Route::get('/testupload', ['as' => 'pengurusanuploaddownload.testupload', 'uses' => 'DatabaseController@pengurusanMaxUploadSize']);