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

app/Http/Controllers/Api/CompoundController.php

@@ -930,7 +930,7 @@ class CompoundController extends BaseController
     		$data = array(); $timestamp = time();
 			$start = Carbon::createFromTimestamp($timestamp)->startOfDay();
 			$end = Carbon::createFromTimestamp($timestamp)->endOfDay();
-    		$compound = Compound::with('ConfidentialFile','Faulty','Department')->where('dikeluarkan',$staff->_id)->whereBetween('created_at', [$start, $end])->orderBy('created_at','DESC')->get();
+    		$compound = Compound::with('ConfidentialFile','Faulty','Department')->where('modul','03')->where('dikeluarkan',$staff->_id)->whereBetween('created_at', [$start, $end])->orderBy('created_at','DESC')->get();
 
     		foreach($compound as $c){
     			if(!empty($c->Faulty) && !empty($c->Department)){
@@ -1000,4 +1000,86 @@ class CompoundController extends BaseController
     		return $this->sendResponse($data, 'Senarai data kompaun');
     	}
     }
+
+    public function viewNoticeToday(Request $request)
+    {
+    	$staff = Staff::with('StaffDetail')->where('api_token',$request->api_token)->first();
+    	if(empty($staff)){
+    		return $this->sendError('Invalid', 'Staff not existed');
+    	}else {
+
+    		$data = array(); $timestamp = time();
+			$start = Carbon::createFromTimestamp($timestamp)->startOfDay();
+			$end = Carbon::createFromTimestamp($timestamp)->endOfDay();
+    		$compound = Compound::with('ConfidentialFile','Faulty','Department')->where('modul','02')->where('dikeluarkan',$staff->_id)->whereBetween('created_at', [$start, $end])->orderBy('created_at','DESC')->get();
+
+    		foreach($compound as $c){
+    			if(!empty($c->Faulty) && !empty($c->Department)){
+	    			$tawaran = '' ;
+	    			$akta = DeedLaw::where('_id',$c->akta)->first();
+	    			$faulty = Faulty::where('_id',$c->seksyen_kesalahan)->first();
+	    			
+	    			if($c->jumlah_kemaskini_kompaun == ''){
+	    				$tawaran = $c->jumlah_asal_kompaun;
+	    			}else{
+	    				$tawaran = $c->jumlah_kemaskini_kompaun;
+	    			}
+
+	    			if($c->jenis == 'Pelbagai'){
+	    				array_push($data, array(
+	    					"no_plate" => $c->no_plate,
+		    				'nama' => $c->nama,
+		    				'identity' => $c->identity,
+		    				'nama_syarikat' => $c->nama_syarikat,
+		    				'no_daftar_syarikat' => $c->no_daftar_syarikat,
+		    				'alamat' => $c->alamat,
+		    				'jumlah' => $tawaran,
+		    				'akta' => '['.$akta->akkod.'] '.$akta->nama,
+		    				'seksyen_kesalahan' => '['.$c->Faulty->sketr.'] '.$c->Faulty->nama,
+		    				'latlong' => $c->latlong,
+		    				'created_at' => $c->created_at->format('d/m/Y h:i:s A'),
+		    				'kpd' => $c->kpd,
+		    				'jabatan' => '['.$c->Department->jbkod.'] '.$c->Department->jnama,
+		    				'amount_before_14' => $c->Faulty->amount_before_14,
+		    				'amount_before_30' => $c->Faulty->amount_before_30,
+		    				'amount' => $c->Faulty->amount,
+		    				'jenis' => $c->jenis,
+		    				'keterangan'=> $c->catatan,
+		    				'no_telefon' => $c->no_telefon,
+		    				'no_lesen' => $c->no_akaun_lesen,
+		    				'lokasi_dikompaun' => $c->lokasi_kejadian,
+		    				'no_cukai_jalan' => $c->no_cukai_jalan,
+		    			));
+	    			}else if($c->jenis == 'Parkir'){
+	    				array_push($data, array(
+	    					"no_plate" => $c->no_plate,
+	    					"no_cukai_jalan" => $c->no_cukai_jalan,
+	    					"jenis_kenderaan" => $c->jenis_kenderaan,
+	    					"model_kenderaan" => $c->model_kenderaan,
+	    					"warna_kenderaan" => $c->warna_kenderaan,
+	    					"nama_taman" => $c->nama_taman,
+	    					"nama_jalan" => $c->nama_jalan,
+	    					"nama_kawasan" => $c->nama_kawasan,
+	    					"no_parking" => $c->no_parking,
+		    				'jumlah' => $tawaran,
+		    				'akta' => '['.$akta->akkod.'] '.$akta->nama,
+		    				'seksyen_kesalahan' => '['.$c->Faulty->sketr.'] '.$c->Faulty->nama,
+		    				'latlong' => $c->latlong,
+		    				'created_at' => $c->created_at->format('d/m/Y h:i:s A'),
+		    				'kpd' => $c->kpd,
+		    				'jabatan' => '['.$c->Department->jbkod.'] '.$c->Department->jnama,
+		    				'amount_before_14' => $c->Faulty->amount_before_14,
+		    				'amount_before_30' => $c->Faulty->amount_before_30,
+		    				'amount' => $c->Faulty->amount,
+		    				'jenis' => $c->jenis,
+		    				'keterangan'=> $c->catatan
+		    			));
+	    			}
+	    		}
+    		}
+
+    		return $this->sendResponse($data, 'Senarai data kompaun');
+    	}
+    }
+
 }

routes/api.php

@@ -24,6 +24,7 @@ Route::group(['middleware' => 'mobileapps'], function() {
     Route::post('/mobile/staff/faulty/list', 'Api\DepartmentController@requestStaffFaulty');
     Route::post('/mobile/staff/update/coordinates', 'Api\TrackMapController@save_updateLocation');
     Route::post('/mobile/staff/compound/today/list', 'Api\CompoundController@viewCompoundToday');
+    Route::post('/mobile/staff/notice/today/list', 'Api\CompoundController@viewNoticeToday');
     Route::post('/mobile/store/compound', 'Api\CompoundResourceController@store');
     Route::post('/mobile/store/notice', 'Api\CompoundResourceController@storeNotice');
     Route::post('/mobile/store/compound/picture', 'Api\CompoundController@storeCompoundAttachment');