Merge branch 'master' of http://git.swisslink.com.my/SwissLink/sipadu_mbip

app/Http/Controllers/Api/CompoundResourceController.php

@@ -328,9 +328,16 @@ class CompoundResourceController extends BaseController
             $data = '';
             if($row['status'] == 'Berbayar'){
 
-                $data = '<b>'.$row['status'].'</b><div style="margin-top: 8px"><span>Bayaran: </span><br/>';
-                $data .= 'RM '.$row['amount_payment'].'</div>';
-                $data .= '<div style="margin-top: 8px"><span>Catatan: </span><br/>'.$row['catatan_dari_admin'].'</div>';
+                if ($row['modul'] == '02') {
+
+                    $data = '<b>Selesai</b><div style="margin-top: 8px"><span></span><br/></div>';
+                    $data .= '<div style="margin-top: 8px"><span>Catatan: </span><br/>'.$row['catatan_dari_admin'].'</div>';  
+                }
+                else{
+                    $data = '<b>'.$row['status'].'</b><div style="margin-top: 8px"><span>Bayaran: </span><br/>';
+                    $data .= 'RM '.$row['amount_payment'].'</div>';
+                    $data .= '<div style="margin-top: 8px"><span>Catatan: </span><br/>'.$row['catatan_dari_admin'].'</div>';   
+                }                                                 
 
                 if($row['updated_by'] !== null ){
                     $data .=  '<div style="margin-top: 8px"><span>Kemaskini: </span><br/>';
@@ -343,8 +350,8 @@ class CompoundResourceController extends BaseController
                         $data .= '<div style="margin-top: 8px"><span>Kemaskini: </span><br/>';
                         $data .= $row['updated_at'].' <br/>'.$row['updates_by'].'</div>';
                     }
-                }                                          
-
+                }  
+                
             }else if($row['status'] == 'Belum Bayar' && $row['updated_by'] !== null){
                 $data = '<b>'.$row['status'].'</b>';
                 $data .= '<div style="margin-top: 8px"><span>Catatan: </span><br/>'.$row['catatan_dari_admin'].'</div>';
@@ -373,107 +380,6 @@ class CompoundResourceController extends BaseController
         })->rawColumns(['index','status_kemaskini','kesalahan'])->make(true);
     }
 
-    public function notice_index(Request $request)
-    {
-        $per_page = '';
-        $kpd = '';
-
-        $modul = '02';
-        $status = 'All';
-        $jenis = 'Pelbagai_JPB';
-        
-        $department = array (
-          0 => '5df355f891d6e66b9c5e626d',
-          1 => '5df721c5cde7fd741433c6b2',
-          2 => '5df722a24636f4594f4a3c3d',
-          3 => '5f17a31795dbfd3320761bfe',
-          4 => '5f3b872fea58cb3c1b0e7b8d',
-        );
-        
-        $start_date = '2020-08-18';
-        $end_date = '2020-09-20';
-
-        $enforcer = 'All';
-        $faulty = 'All';
-
-        $plate_no = strtolower('');
-        $company_no = strtolower('');
-        $nric = '';
-        $license = '';
-        $namaP = '';
-        $company_name = '';
-
-        
-
-        ###############################################################################################################
-
-        // $per_page = $request->per_page;
-        // $kpd = $request->kpd;
-
-        // $modul = $request->modul;
-        // $status = $request->status;
-        // $jenis = $request->type;
-        // if(!empty($request->department)){
-        //     $department = json_decode($request->department);
-        // }else {
-        //     $department = [];
-        // }
-        // $start_date = $request->start_date;
-        // $end_date = $request->end_date;
-
-        // $enforcer = $request->enforcer;
-        // $faulty = $request->faulty;
-
-        // $plate_no = strtolower($request->plate_no);
-        // $company_no = strtolower($request->company_no);
-        // $nric = $request->nric;
-        // $license = $request->license;
-        // $namaP = $request->nameP;
-        // $company_name = $request->company_name;
-
-        $nested_data = array();
-
-        $compound = $this->searchCompanyName($enforcer,$faulty,$jenis,$modul,$status,$start_date,$end_date,$department,$plate_no,$kpd,$company_no,$nric,$license,$namaP,$company_name)->orderBy('created_at','ASC')->get();
-
-        // return \DataTables::of(CompoundResource::collection($compound))->addIndexColumn()
-        // ->addColumn('index', function($row) {
-        //     $curr = Carbon::now();
-        //     $dtC = Carbon::parse($row['created_at'])->setTimezone('Asia/Kuala_Lumpur');
-
-        //     if($curr->diffInDays($dtC) <= 3){ 
-        //         $html = 'New';
-        //     }else{ $html = ''; }
-        //     return $html;
-        // });
-
-        if (!empty($compound)) {
-
-            foreach ($compound as $key => $c) {
-
-                $faulty = Faulty::where('_id', $c->seksyen_kesalahan)->first();
-                $enforcer = StaffDetail::where('_id', $c->dikeluarkan)->first();
-                
-                array_push($nested_data, array(
-                    'index' => '',
-                    'modul' => $c->modul,
-                    'kpd' => $c->kpd,
-                    'jenis' => $c->jenis,
-                    'masa' => $c->created_at,
-                    'kesalahan' => $faulty->nama,
-                    'nric' => $c->identity,
-                    'nama' => $c->nama,
-                    'penguatkuasa' => $enforcer->full_name,
-                    // 'tindakan' => 
-
-                ));
-            }
-        }
-
-        
-
-        return \DataTables::of($nested_data)->addIndexcolumn()->make(true);
-
-    }
 
     /**
      * Show the form for creating a new resource.
@@ -1203,6 +1109,201 @@ class CompoundResourceController extends BaseController
         //
     }
 
+    public function updateStatusNoticeViaDashboard(Request $request)
+    {
+        $compound = $this->compound::with('ConfidentialFile')->find($request->id);
+        $staff = StaffDetail::find($request->current_id);
+        if(!empty($compound) && !empty($staff)){
+            if($staff->roles_access == "sysadmin" || $staff->roles_access == "Ketua Jabatan"){
+
+                if($compound->status != $request->status){
+                    $compound->status = $request->status;
+                    $compound->catatan_dari_admin = $request->remark;
+                    $compound->update_by = $request->current_id;
+                    $saved = $compound->save();
+                        
+                    if($saved){
+
+                        $gDate = $compound->created_at->format('F Y');
+                        $historyData = [
+                            'tarikh_kumpulan' => $gDate,
+                        ];
+                        $subHistory = [
+                            'no_siri' => $compound->ConfidentialFile->no_siri,
+                            'tajuk' => "Status notis ".$compound->kpd. " telah dikemaskini",
+                            'huraian' => "Status penyelesaian notis telah dikemaskini melalui 'dashboard' oleh <a href='https://mdch.sipadu.my/main/staff/".$staff->_id."/profile'>".$staff->full_name."</a>",
+                        ];
+
+                        $groupByDate = History::where('tarikh_kumpulan', $gDate)->first();
+                        if(!empty($groupByDate)){
+                            $groupByDate->subhistory()->create($subHistory);
+                            $historySaved = $compound->ConfidentialFile->history()->attach($groupByDate);
+                        }else{
+                            $history = History::create($historyData);
+                            $history->subhistory()->create($subHistory);
+                            $historySaved = $compound->ConfidentialFile->history()->attach($history);
+                        }
+
+                        if($request->status == "Berbayar"){
+                            return $this->sendResponse('', 'Berjaya kemaskini status. Sila rujuk kompaun ini di modul kategori "Kompaun/Notis Dijelaskan" ');
+                        }else{
+                            return $this->sendResponse('', 'Berjaya kemaskini status. Sila rujuk kompaun ini di modul kategori "Kompaun/Notis DiBatalkan" ');
+                        }
+                 
+                    }else{
+                        $response = [
+                            'success' => false, 'message' => 'Notis ini tidak berjaya dikemaskini',
+                        ];
+                        return response()->json($response, 200);
+                    }
+                }else{
+
+                    if($request->remark != ''){
+                        $compound->catatan_dari_admin = $request->remark;
+                        $compound->update_by = $request->current_id;
+                        $compound->save();
+
+                        $saved = $compound->save();
+                        if($saved){
+
+                            $gDate = $compound->created_at->format('F Y');
+                            $historyData = [
+                                'tarikh_kumpulan' => $gDate,
+                            ];
+                            $subHistory = [
+                                'no_siri' => $compound->ConfidentialFile->no_siri,
+                                'tajuk' => "Catatan ".$compound->kpd. " telah ditambah/dikemaskini",
+                                'huraian' => "Catatan notis ini telah dikemaskini melalui 'dashboard' oleh <a href='https://mdch.sipadu.my/main/staff/".$staff->_id."/profile'>".$staff->full_name."</a>",
+                            ];
+
+                            $groupByDate = History::where('tarikh_kumpulan', $gDate)->first();
+                            if(!empty($groupByDate)){
+                                $groupByDate->subhistory()->create($subHistory);
+                                $historySaved = $compound->ConfidentialFile->history()->attach($groupByDate);
+                            }else{
+                                $history = History::create($historyData);
+                                $history->subhistory()->create($subHistory);
+                                $historySaved = $compound->ConfidentialFile->history()->attach($history);
+                            }
+
+                            return $this->sendResponse('', 'Berjaya tambah catatan untuk notis ini');
+
+                        }else{
+                            $response = [
+                                'success' => false, 'message' => 'Notis ini tidak berjaya dikemaskini',
+                            ];
+                            return response()->json($response, 200);
+                        }
+
+                    }else{
+                        $response = [
+                            'success' => false, 'message' => 'Tiada kemaskini!',
+                        ];
+                        return response()->json($response, 200);
+                    }
+
+                }
+                
+            }else{
+
+                if($compound->status != 'Berbayar' && $compound->status != $request->status){
+                    $compound->status = $request->status;
+                    $compound->catatan_dari_admin = $request->remark;
+                    // $compound->amount_payment = $request->amount;
+                    $compound->update_by = $request->current_id;
+                    $saved = $compound->save();
+                        
+                    if($saved){
+
+                        $gDate = $compound->created_at->format('F Y');
+                        $historyData = [
+                            'tarikh_kumpulan' => $gDate,
+                        ];
+                        $subHistory = [
+                            'no_siri' => $compound->ConfidentialFile->no_siri,
+                            'tajuk' => "Status notis telah dikemaskini",
+                            'huraian' => "Status penyelesaian notis telah dikemaskini melalui 'dashboard' oleh <a href='https://mdch.sipadu.my/main/staff/".$staff->_id."/profile'>".$staff->full_name."</a>",
+                        ];
+
+                        $groupByDate = History::where('tarikh_kumpulan', $gDate)->first();
+                        if(!empty($groupByDate)){
+                            $groupByDate->subhistory()->create($subHistory);
+                            $historySaved = $compound->ConfidentialFile->history()->attach($groupByDate);
+                        }else{
+                            $history = History::create($historyData);
+                            $history->subhistory()->create($subHistory);
+                            $historySaved = $compound->ConfidentialFile->history()->attach($history);
+                        }
+
+                        if($request->status == "Berbayar"){
+                            return $this->sendResponse('', 'Berjaya kemaskini status. Sila rujuk notis ini di modul kategori "Kompaun/Notis Dijelaskan" ');
+                        }else{
+                            return $this->sendResponse('', 'Berjaya kemaskini status. Sila rujuk notis ini di modul kategori "Kompaun/Notis DiBatalkan" ');
+                        }
+                 
+                    }else{
+                        $response = [
+                            'success' => false, 'message' => 'Notis ini tidak berjaya dikemaskini',
+                        ];
+                        return response()->json($response, 200);
+                    }
+                }else{
+
+                    if($request->remark != ''){
+                        $compound->catatan_dari_admin = $request->remark;
+                        $compound->update_by = $request->current_id;
+                        $compound->save();
+
+                        $saved = $compound->save();
+                        if($saved){
+
+                            $gDate = $compound->created_at->format('F Y');
+                            $historyData = [
+                                'tarikh_kumpulan' => $gDate,
+                            ];
+                            $subHistory = [
+                                'no_siri' => $compound->ConfidentialFile->no_siri,
+                                'tajuk' => "Catatan ".$compound->kpd. " telah ditambah/dikemaskini",
+                                'huraian' => "Catatan notis ini telah dikemaskini melalui 'dashboard' oleh <a href='https://mdch.sipadu.my/main/staff/".$staff->_id."/profile'>".$staff->full_name."</a>",
+                            ];
+
+                            $groupByDate = History::where('tarikh_kumpulan', $gDate)->first();
+                            if(!empty($groupByDate)){
+                                $groupByDate->subhistory()->create($subHistory);
+                                $historySaved = $compound->ConfidentialFile->history()->attach($groupByDate);
+                            }else{
+                                $history = History::create($historyData);
+                                $history->subhistory()->create($subHistory);
+                                $historySaved = $compound->ConfidentialFile->history()->attach($history);
+                            }
+
+                            return $this->sendResponse('', 'Berjaya tambah catatan untuk notis ini');
+
+                        }else{
+                            $response = [
+                                'success' => false, 'message' => 'Notis ini tidak berjaya dikemaskini',
+                            ];
+                            return response()->json($response, 200);
+                        }
+
+                    }else{
+                        $response = [
+                            'success' => false, 'message' => 'Tiada kemaskini!',
+                        ];
+                        return response()->json($response, 200);
+                    }
+
+                }
+            }
+        }else{
+            $response = [
+                'success' => false,
+                'message' => 'Notis ini tidak dijumpai / staff tidak ditemui',
+            ];
+            return response()->json($response, 200);
+        }
+    }
+
     public function updateStatusPaymentViaDashboard(Request $request)
     {
         $compound = $this->compound::with('ConfidentialFile')->find($request->id);

app/Http/Controllers/Main/CompoundController.php

@@ -78,7 +78,7 @@ class CompoundController extends Controller
 		return view('main-dashboard.compound.compound_index', compact('user','site','staff','deedlaw','now','modul','semua','pre_notice','baru','invest','notice','inven','collap','comp'));
 	}
 
-	public function pre_notice_index(){
+	public function preNoticeIndex(){
 		$id = Auth::guard('sadmin')->id();
 		$user = Staff::with('StaffDetail')->find($id);
 

resources/views/main-dashboard/compound/prenotice_index.blade.php

@@ -228,8 +228,7 @@
 							<label class="col-sm-6 control-label"><b>Status</b></label>
 							<div class="col-sm-12">
 								<select class="form-control" name="status" required>
-									<option value="Belum Bayar">Belum Bayar</option>
-									<option value="Berbayar">Berbayar</option>
+									<option value="Berbayar">Selesai</option>
 									<option value="Batal">Batal</option>
 								</select>
 							</div>
@@ -238,11 +237,11 @@
 						<div class="form-group">
 							<label class="col-sm-6 control-label"><b>Catatan <code>*</code></b></label>
 							<div class="col-sm-12">
-								<textarea class="form-control" name="remark"></textarea>
+								<textarea class="form-control" name="remark" placeholder="-"></textarea>
 							</div>
 						</div>
 
-						<div class="form-group">
+						<!-- <div class="form-group">
 							<label class="col-sm-6 control-label"><b>Jumlah Dibayar <code>*</code></b></label>
 							<div class="col-sm-12">
 								<input type="text" class="form-control autonumber" name="amount" data-v-min="0.00" data-v-max="99999.00"placeholder="0.00" required/>
@@ -255,7 +254,7 @@
 								<input type="text" class="form-control autonumber" name="tunggakan" data-v-min="0.00" data-v-max="99999.00" placeholder="0.00" required/>
 								<code>Sekiranya tiada amaun tunggakan, sila letak 0. Amaun tunggakan ini akan diguna untuk laporan</code>
 							</div>
-						</div>
+						</div> -->
 					</div>
 					<div class="modal-footer">
 						<button type="button" class="btn btn-sm btn-secondary mobtn" data-dismiss="modal">Close</button>
@@ -348,13 +347,8 @@
 	    		$('#viewPelbagai').show();
 	    		$('#viewParkir').hide();
 
-	    		console.log('day 0' + queryString2);
 	    		tableP1.ajax.url(SITEURL +'/api/list/compound'+ queryString2).load();
-
-	    		console.log('day 3' + queryString2);
 	    		tableP3.ajax.url(SITEURL +'/api/list/compound'+ queryString2).load();
-
-	    		console.log('day 7' + queryString2);
 	    		tableP7.ajax.url(SITEURL +'/api/list/compound'+ queryString2).load();
 	    	}
 	    	else if($('#type_C').val() == "Pelbagai_KT"){
@@ -363,13 +357,8 @@
 	    		$('#viewPelbagai').show();
 	    		$('#viewParkir').hide();
 
-	    		console.log('day 0' + queryString2);
 	    		tableP1.ajax.url(SITEURL +'/api/list/compound'+ queryString2).load();
-
-	    		console.log('day 3' + queryString2);
 	    		tableP3.ajax.url(SITEURL +'/api/list/compound'+ queryString2).load();
-
-	    		console.log('day 7' + queryString2);
 	    		tableP7.ajax.url(SITEURL +'/api/list/compound'+ queryString2).load();
 	    	}
 	    	else if($('#type_C').val() == "Pelbagai_PA"){
@@ -378,13 +367,8 @@
 	    		$('#viewPelbagai').show();
 	    		$('#viewParkir').hide();
 
-	    		console.log('day 0' + queryString2);
 	    		tableP1.ajax.url(SITEURL +'/api/list/compound'+ queryString2).load();
-
-	    		console.log('day 3' + queryString2);
 	    		tableP3.ajax.url(SITEURL +'/api/list/compound'+ queryString2).load();
-
-	    		console.log('day 7' + queryString2);
 	    		tableP7.ajax.url(SITEURL +'/api/list/compound'+ queryString2).load();
 	    	}
 	    	else if($('#type_C').val() == "Pelbagai_LESEN"){
@@ -424,7 +408,7 @@
 
 				$.ajax({
 					type: "POST",
-					url: "{{ url('/api/update/compound/via-dashboard') }}",
+					url: "{{ url('/api/update/notice/via-dashboard') }}",
 					data: form_data,
 					success:function(data){
 
@@ -435,7 +419,23 @@
 	    						$('#viewParkir').show();
 	    						tableP.ajax.url(SITEURL +'/api/list/compound'+ queryString1).load();
 	    						$('#kemaskiniC').modal('hide');
-					    	}else if($('#type_C').val() == "Pelbagai"){
+					    	}else if($('#type_C').val() == "Pelbagai_KT"){
+					    		$('#viewPelbagai').show();
+	    						$('#viewParkir').hide();
+					    		tablePl.ajax.url(SITEURL +'/api/list/compound'+ queryString2).load();
+					    		$('#kemaskiniC').modal('hide');
+					    	}else if($('#type_C').val() == "Pelbagai_PA"){
+					    		$('#viewPelbagai').show();
+	    						$('#viewParkir').hide();
+					    		tablePl.ajax.url(SITEURL +'/api/list/compound'+ queryString2).load();
+					    		$('#kemaskiniC').modal('hide');
+					    	}
+					    	else if($('#type_C').val() == "Pelbagai_JPB"){
+					    		$('#viewPelbagai').show();
+	    						$('#viewParkir').hide();
+					    		tablePl.ajax.url(SITEURL +'/api/list/compound'+ queryString2).load();
+					    		$('#kemaskiniC').modal('hide');
+					    	}else if($('#type_C').val() == "Pelbagai_LESEN"){
 					    		$('#viewPelbagai').show();
 	    						$('#viewParkir').hide();
 					    		tablePl.ajax.url(SITEURL +'/api/list/compound'+ queryString2).load();

resources/views/main-dashboard/compound_detail/compound_job.blade.php

@@ -149,7 +149,7 @@
 					<div class="col-lg-12 col-md-12">
 						<div class="card">
 							<div class="card-header">
-								<h5>Serahan Kompaun kepada Pegawai</h5>
+								<h5>Serahan Kompaun Kepada Pegawai</h5>
 							</div>
 							<div class="card-block">
 								<input type="hidden" name="_token" value="<?php echo csrf_token(); ?>">
@@ -162,7 +162,7 @@
 											<select id="kategori_modul" name="kategori_modul" class="form-control" required>
 												<option value="">Pilih Kategori Modul</option>
 												@foreach($roles as $r)
-													@if($r->kod != '03')
+													@if($r->kod != $compound->modul)
 														<option value="{{ $r->kod }}">{{ $r->name }}</option>
 													@endif
 												@endforeach

routes/api.php

@@ -70,8 +70,8 @@ Route::group(['middleware' => 'mobileapps'], function() {
 	| Compound
 	|-------------------------------------------------------------------------*/
 	Route::get('/list/compound', 'Api\CompoundResourceController@index');
-	Route::get('/list/notice', 'Api\CompoundResourceController@notice_index');
 	Route::post('/update/compound/via-dashboard', 'Api\CompoundResourceController@updateStatusPaymentViaDashboard');
+	Route::post('/update/notice/via-dashboard', 'Api\CompoundResourceController@updateStatusNoticeViaDashboard');
 	Route::get('/compound/list/{modul}', 'Api\CompoundController@compoundList');
 	Route::get('/compound/{jbkod}/{akta}/{sec}/list/{modul}', 'Api\CompoundController@compoundFilterList');
 	Route::get('/compound/completed/list', 'Api\CompoundController@compoundCompleteLists');

routes/web.php

@@ -73,7 +73,7 @@ Route::group(['middleware' => 'sysadminauth'], function () {
 	| Compound
 	|-------------------------------------------------------------------------*/
 	Route::get('/main/compound', ['uses' => 'Main\CompoundController@index', 'as' => 'compound']);
-	Route::get('/main/pre-notice/new', ['uses' => 'Main\CompoundController@pre_notice_index', 'as' => 'noticeN']);
+	Route::get('/main/pre-notice/new', ['uses' => 'Main\CompoundController@preNoticeIndex', 'as' => 'noticeN']);
 	Route::get('/main/compound/new', ['uses' => 'Main\CompoundController@new_index', 'as' => 'compoundN']);
 	Route::get('/main/compound/investigation', ['uses' => 'Main\CompoundController@investigation_index', 'as' => 'investL']);
 	Route::get('/main/compound/notice', ['uses' => 'Main\CompoundController@notice_index', 'as' => 'noticeL']);
@@ -161,9 +161,6 @@ Route::group(['middleware' => 'sysadminauth'], function () {
 	Route::post('/main/add-api-key', ['uses' => 'Main\SettingController@addApiKey']);
 	Route::post('/main/add-api-integration', ['uses' => 'Main\SettingController@addIntegrasi']);
 
-
-
-
 });
 
 /*