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

app/Http/Controllers/Api/CompoundResourceController.php

@@ -247,15 +247,16 @@ class CompoundResourceController extends BaseController
         // $kpd = '';
         // $modul = '03';
         // $status = 'All';
-        // $jenis = 'Pelbagai_KT';
+        // $jenis = 'Parkir';
         // if(!empty($request->department)){
-        //     $department = array (
-        //       0 => '5df355f891d6e66b9c5e626d',
-        //       1 => '5df721c5cde7fd741433c6b2',
-        //       2 => '5df722a24636f4594f4a3c3d',
-        //       3 => '5f17a31795dbfd3320761bfe',
-        //       4 => '5f3b872fea58cb3c1b0e7b8d',
-        //     );
+        //     $department = ["5df355f891d6e66b9c5e626d","5df721c5cde7fd741433c6b2","5df722a24636f4594f4a3c3d","5f17a31795dbfd3320761bfe","5f3b872fea58cb3c1b0e7b8d"];
+        //     // $department = array (
+        //     //   0 => '5df355f891d6e66b9c5e626d',
+        //     //   1 => '5df721c5cde7fd741433c6b2',
+        //     //   2 => '5df722a24636f4594f4a3c3d',
+        //     //   3 => '5f17a31795dbfd3320761bfe',
+        //     //   4 => '5f3b872fea58cb3c1b0e7b8d',
+        //     // );
         // }else {
         //     $department = [];
         // }
@@ -317,7 +318,7 @@ class CompoundResourceController extends BaseController
         $compound = $this->searchCompanyName($enforcer,$faulty,$jenis,$modul,$status,$start_date,$end_date,$department,$plate_no,$kpd,$company_no,$nric,$license,$namaP,$company_name, $day3, $day7)->orderBy('created_at','ASC')->get();
         // dd($compound);
 
-        info($compound);
+        // info($compound);
 
         return \DataTables::of(CompoundResource::collection($compound))->addIndexColumn()
         ->addColumn('index', function($row) {
@@ -473,7 +474,6 @@ class CompoundResourceController extends BaseController
             }
         }
 
-
         //return kpd with tag
         $num = $tag . $num;
 

app/Http/Controllers/Main/CompoundController.php

@@ -382,9 +382,7 @@ class CompoundController extends Controller
 
 		$compound = Compound::with('ConfidentialFile')->where('kpd',$kpd)->orWhere('non',$kpd)->first();
 		$file = ConfidentialFile::where('no_siri',$compound->ConfidentialFile->no_siri)->first();
-		$faulty = Faulty::with(['DeedLaw' => function($q){
-			$q->with('Department');
-		}])->where('_id',$compound->seksyen_kesalahan)->first();
+		$faulty = Faulty::with('DeedLaw','Department')->where('_id',$compound->seksyen_kesalahan)->first();
 
 		$role = Roles::where('kod',$compound->modul)->first();
 
@@ -876,9 +874,10 @@ class CompoundController extends Controller
 		$site = SiteSetting::first();
 		$faulty = Faulty::with('DeedLaw','Department')->get();
 		$staff = StaffDetail::where('roles_access','PenguatKuasa')->get();
-		$compound = Compound::with('Faulty','Department','Deedlaw')->find($_id);
+        $compound = Compound::with('Faulty','Department','Deedlaw')->find($_id);
+        $jalan = CodeMukim::all();
 
-		return view('main-dashboard.compound.compound_form_edit',compact('user','site','faulty','staff','compound'));
+		return view('main-dashboard.compound.compound_form_edit',compact('user','site','faulty','staff','compound', 'jalan'));
 	}
 
 	public function editmanualCompound(Request $request){
@@ -911,7 +910,29 @@ class CompoundController extends Controller
 
 					return redirect()->back()->with('success_msg', 'Berjaya kemasikini!');
 
-				}else if($compound->jenis == 'Pelbagai'){
+				}else if($compound->jenis == 'Pelbagai_KT'){
+					$compound->kpd = $request->kpd;
+					$compound->jbkod = $faulty->Department[0]->_id;
+		            $compound->akta = $faulty->DeedLaw->_id;
+		            $compound->seksyen_kesalahan = $faulty->_id;
+					$compound->nama = $request->namaP;
+					$compound->identity = $request->noIc;
+					$compound->nama_syarikat = $request->namaS;
+					$compound->no_daftar_syarikat = strtolower($request->daftarNo);
+					$compound->alamat = $request->alamat;
+					$compound->no_telefon = $request->tel;
+					$compound->no_akaun_lesen = $request->lesen;
+					$compound->no_plate = strtolower($request->no_plate);
+					$compound->no_cukai_jalan = $request->noCukaijalan;
+					$compound->no_plate = strtolower($request->no_plate);
+					$compound->maklumat_tambahan = $request->catatan;
+					$compound->catatan = $request->butiran_kesalahan;
+					$compound->lokasi_kejadian = $request->lokasi_kejadian;
+					$compound->created_at = new Carbon($request->tarikh_dikeluarkan);
+					$compound->save();
+
+					return redirect()->back()->with('success_msg', 'Berjaya kemasikini!');
+				}else if($compound->jenis == 'Pelbagai_JPB'){
 					$compound->kpd = $request->kpd;
 					$compound->jbkod = $faulty->Department[0]->_id;
 		            $compound->akta = $faulty->DeedLaw->_id;

app/Model/Module/Attachment.php

@@ -11,7 +11,7 @@ class Attachment extends Eloquent
     use SoftDeletes;
 
     protected $connection = 'mongodb';
-    protected $collection = 'attachment_test';
+    protected $collection = 'attachment';
 
     protected $guarded = ['_id'];
 

app/Model/Module/Compound.php

@@ -11,7 +11,7 @@ class Compound extends Eloquent
     use SoftDeletes;
 
 	protected $connection = 'mongodb';
-    protected $collection = 'compound_test';
+    protected $collection = 'compound';
 
     protected $guarded = ['_id'];
 

app/Model/Module/ConfidentialFile.php

@@ -8,7 +8,7 @@ class ConfidentialFile extends Eloquent
 {
     //
 	protected $connection = 'mongodb';
-    protected $collection = 'confidential_file_test';
+    protected $collection = 'confidential_file';
 
 	protected $guarded = ['_id'];
 

app/Model/Module/History.php

@@ -8,7 +8,7 @@ class History extends Eloquent
 {
     //
 	protected $connection = 'mongodb';
-    protected $collection = 'history_test';
+    protected $collection = 'history';
 
 	protected $guarded = ['_id'];
 

app/Model/Module/SubHistory.php

@@ -8,7 +8,7 @@ class SubHistory extends Eloquent
 {
     //
 	protected $connection = 'mongodb';
-    protected $collection = 'sub_history_test';
+    protected $collection = 'sub_history';
 
 	protected $guarded = ['_id'];
 

public/js/dataNotis.js

@@ -39,7 +39,8 @@ $(document).ready( function () {
 		{
 			"render": function ( data, type, row ) {
 				return '<div style="text-align:center"><a target="_blank" href="'+SITEURL+'/main/compound/'+row.kpd+'/index" class="btn btn-info btn-sm waves-effect waves-light">TERUSKAN</a>'
-						+'<button onclick="getDetail(\''+data+'\')" class="btn btn-primary btn-sm waves-effect waves-light">KEMASKINI STATUS</button></div>';
+						+'<button onclick="getDetail(\''+data+'\')" class="btn btn-primary btn-sm waves-effect waves-light">KEMASKINI STATUS</button>'
+						+'<a target="_blank" href="'+SITEURL+'/main/edit/notice/'+data+'" class="btn btn-danger btn-sm waves-effect waves-light">KEMASKINI</a></div>';
 			},
 			"targets": 9,
 		},

public/js/dataParkir.js

@@ -40,7 +40,8 @@ $(document).ready( function () {
 		{
 			"render": function ( data, type, row ) {
 				return '<div style="text-align:center"><a target="_blank" href="'+SITEURL+'/main/compound/'+row.kpd+'/index" class="btn btn-info btn-sm waves-effect waves-light">TERUSKAN</a>'
-						+'<button onclick="getDetail(\''+data+'\')" class="btn btn-primary btn-sm waves-effect waves-light">KEMASKINI STATUS</button></div>';
+						+'<button onclick="getDetail(\''+data+'\')" class="btn btn-primary btn-sm waves-effect waves-light">KEMASKINI STATUS</button>'
+						+'<a target="_blank" href="'+SITEURL+'/main/edit/compound/'+data+'" class="btn btn-danger btn-sm waves-effect waves-light">KEMASKINI</a></div>';
 			},
 			"targets": 10,
 		},

public/js/dataPelbagai.js

@@ -42,7 +42,8 @@ $(document).ready( function () {
 		{
 			"render": function ( data, type, row ) {
 				return '<div style="text-align:center"><a target="_blank" href="'+SITEURL+'/main/compound/'+row.kpd+'/index" class="btn btn-info btn-sm waves-effect waves-light">TERUSKAN</a>'
-						+'<button onclick="getDetail(\''+data+'\')" class="btn btn-primary btn-sm waves-effect waves-light">KEMASKINI STATUS</button></div>';
+						+'<button onclick="getDetail(\''+data+'\')" class="btn btn-primary btn-sm waves-effect waves-light">KEMASKINI STATUS</button>'
+						+'<a target="_blank" href="'+SITEURL+'/main/edit/compound/'+data+'" class="btn btn-danger btn-sm waves-effect waves-light">KEMASKINI</a></div>';
 			},
 			"targets": 12,
         },

public/uploads/cache/1603364836.json

@@ -0,0 +1 @@
+[{"_id":"5f891456b349cb2d286ebc68","modul":"03","jenis":"Pelbagai_JPB","kpd":"JPB0005","no_plate":null,"nric":"no kp","no_daftar_syarikat":"nos yarikat","nama_syarikat":"syarikat","nama":"nama","lesen":"lesen","tarikh_masa":"16/10/2020 11:32:38 AM","faulty_skter":"SEKSYEN 39 (2)","faulty_name":"MEROSAKKAN ATAU MENYEBABKAN KEROSAKKAN KEPADA MANA-MANA JALAN","enforcer":"000000, Test Enforcer","status":"Belum Bayar","kadar_kompaun":"2000","catatan_dari_admin":null,"updated_by":null,"updates_by":null,"tarikh_bayar":null,"amount_payment":null,"created_at":"2020-10-16 11:32:38","updated_at":"2020-10-21 12:16","index":"","status_kemaskini":"-","kesalahan":"-","DT_RowIndex":1},{"_id":"5f89485ad6efb4639c2980f3","modul":"03","jenis":"Pelbagai_JPB","kpd":"JPB0004","no_plate":null,"nric":"-","no_daftar_syarikat":"-","nama_syarikat":"-","nama":"kt","lesen":"-","tarikh_masa":"16/10/2020 15:14:34 PM","faulty_skter":"SEKSYEN 39 (2)","faulty_name":"MEROSAKKAN ATAU MENYEBABKAN KEROSAKKAN KEPADA MANA-MANA JALAN","enforcer":"000000, Test Enforcer","status":"Belum Bayar","kadar_kompaun":"2000","catatan_dari_admin":null,"updated_by":null,"updates_by":null,"tarikh_bayar":null,"amount_payment":null,"created_at":"2020-10-16 15:14:34","updated_at":"2020-10-21 12:15","index":"","status_kemaskini":"-","kesalahan":"-","DT_RowIndex":2},{"_id":"5f8956bdc79577137f662cbe","modul":"03","jenis":"Pelbagai_JPB","kpd":"JPB0001","no_plate":null,"nric":"no kp","no_daftar_syarikat":"no syarikat","nama_syarikat":"syarikat","nama":"nama","lesen":"lesen","tarikh_masa":"16/10/2020 16:15:57 PM","faulty_skter":"SEKSYEN 39(1)","faulty_name":"MENJALANKAN KERJA ATAU MENYEBABKAN PERUBAHAN TURAP TANPA KEBENARAN","enforcer":"111111, Testing 1","status":"Belum Bayar","kadar_kompaun":"2000","catatan_dari_admin":null,"updated_by":null,"updates_by":null,"tarikh_bayar":null,"amount_payment":"-","created_at":"2020-10-16 16:15:57","updated_at":"2020-10-17 16:37","index":"","status_kemaskini":"-","kesalahan":"-","DT_RowIndex":3},{"_id":"5f8faefe04367e70fc1872fd","modul":"03","jenis":"Pelbagai_JPB","kpd":"JPB0002","no_plate":null,"nric":"no kp","no_daftar_syarikat":"no syarikat","nama_syarikat":"syarikat","nama":"nama","lesen":"no lesen","tarikh_masa":"21/10/2020 11:46:06 AM","faulty_skter":"SEKSYEN 39 (2)","faulty_name":"MEROSAKKAN ATAU MENYEBABKAN KEROSAKKAN KEPADA MANA-MANA JALAN","enforcer":"000000, Test Enforcer","status":"Belum Bayar","kadar_kompaun":"2000","catatan_dari_admin":null,"updated_by":null,"updates_by":null,"tarikh_bayar":null,"amount_payment":"-","created_at":"2020-10-21 11:46:06","updated_at":"2020-10-21 11:46","index":"New","status_kemaskini":"-","kesalahan":"-","DT_RowIndex":4}]

public/uploads/cache/1603423091.json

@@ -0,0 +1 @@
+[{"_id":"5f891456b349cb2d286ebc68","modul":"03","jenis":"Pelbagai_JPB","kpd":"JPB0005","no_plate":null,"nric":"no kp","no_daftar_syarikat":"nos yarikat","nama_syarikat":"syarikat","nama":"nama","lesen":"lesen","tarikh_masa":"16/10/2020 11:32:38 AM","faulty_skter":"SEKSYEN 39 (2)","faulty_name":"MEROSAKKAN ATAU MENYEBABKAN KEROSAKKAN KEPADA MANA-MANA JALAN","enforcer":"000000, Test Enforcer","status":"Belum Bayar","kadar_kompaun":"2000","catatan_dari_admin":null,"updated_by":null,"updates_by":null,"tarikh_bayar":null,"amount_payment":null,"created_at":"2020-10-16 11:32:38","updated_at":"2020-10-21 12:16","index":"","status_kemaskini":"-","kesalahan":"-","DT_RowIndex":1},{"_id":"5f89485ad6efb4639c2980f3","modul":"03","jenis":"Pelbagai_JPB","kpd":"JPB0004","no_plate":null,"nric":"-","no_daftar_syarikat":"-","nama_syarikat":"-","nama":"kt","lesen":"-","tarikh_masa":"16/10/2020 15:14:34 PM","faulty_skter":"SEKSYEN 39 (2)","faulty_name":"MEROSAKKAN ATAU MENYEBABKAN KEROSAKKAN KEPADA MANA-MANA JALAN","enforcer":"000000, Test Enforcer","status":"Belum Bayar","kadar_kompaun":"2000","catatan_dari_admin":null,"updated_by":null,"updates_by":null,"tarikh_bayar":null,"amount_payment":null,"created_at":"2020-10-16 15:14:34","updated_at":"2020-10-21 12:15","index":"","status_kemaskini":"-","kesalahan":"-","DT_RowIndex":2},{"_id":"5f8956bdc79577137f662cbe","modul":"03","jenis":"Pelbagai_JPB","kpd":"JPB0001","no_plate":null,"nric":"no kp","no_daftar_syarikat":"no syarikat","nama_syarikat":"syarikat","nama":"nama","lesen":"lesen","tarikh_masa":"16/10/2020 16:15:57 PM","faulty_skter":"SEKSYEN 39(1)","faulty_name":"MENJALANKAN KERJA ATAU MENYEBABKAN PERUBAHAN TURAP TANPA KEBENARAN","enforcer":"111111, Testing 1","status":"Belum Bayar","kadar_kompaun":"2000","catatan_dari_admin":null,"updated_by":null,"updates_by":null,"tarikh_bayar":null,"amount_payment":"-","created_at":"2020-10-16 16:15:57","updated_at":"2020-10-17 16:37","index":"","status_kemaskini":"-","kesalahan":"-","DT_RowIndex":3},{"_id":"5f8faefe04367e70fc1872fd","modul":"03","jenis":"Pelbagai_JPB","kpd":"JPB0002","no_plate":null,"nric":"no kp","no_daftar_syarikat":"no syarikat","nama_syarikat":"syarikat","nama":"nama","lesen":"no lesen","tarikh_masa":"21/10/2020 11:46:06 AM","faulty_skter":"SEKSYEN 39 (2)","faulty_name":"MEROSAKKAN ATAU MENYEBABKAN KEROSAKKAN KEPADA MANA-MANA JALAN","enforcer":"000000, Test Enforcer","status":"Belum Bayar","kadar_kompaun":"2000","catatan_dari_admin":null,"updated_by":null,"updates_by":null,"tarikh_bayar":null,"amount_payment":"-","created_at":"2020-10-21 11:46:06","updated_at":"2020-10-21 11:46","index":"New","status_kemaskini":"-","kesalahan":"-","DT_RowIndex":4}]

public/uploads/cache/1603433833.json

@@ -0,0 +1 @@
+[{"_id":"5f88fed440d2c63980543bdd","modul":"02","jenis":"Notis_NMH","kpd":"NMH0001","no_plate":"","nric":"kp","no_daftar_syarikat":"nosya","nama_syarikat":"sya","nama":"nmhnama","lesen":"lesej","tarikh_masa":"16/10/2020 10:00:52 AM","faulty_skter":"SEKSYEN 46","faulty_name":"NOTIS MENGALIH HALANGAN","enforcer":"000000, Test Enforcer","status":"Belum Bayar","kadar_kompaun":"","catatan_dari_admin":null,"updated_by":null,"updates_by":null,"tarikh_bayar":"","amount_payment":"","created_at":"2020-10-16 10:00:52","updated_at":"2020-10-22 12:07","index":"","status_kemaskini":"-","kesalahan":"-","DT_RowIndex":1},{"_id":"5f8900a0d622ab634e7037df","modul":"02","jenis":"Notis_NMH","kpd":"NMH0002","no_plate":"","nric":"kp","no_daftar_syarikat":"nosay","nama_syarikat":"sya","nama":"nmh","lesen":"lesen","tarikh_masa":"16/10/2020 10:08:32 AM","faulty_skter":"SEKSYEN 46","faulty_name":"NOTIS MENGALIH HALANGAN","enforcer":"000000, Test Enforcer","status":"Belum Bayar","kadar_kompaun":"","catatan_dari_admin":null,"updated_by":null,"updates_by":null,"tarikh_bayar":"","amount_payment":"","created_at":"2020-10-16 10:08:32","updated_at":"2020-10-16 13:28","index":"","status_kemaskini":"-","kesalahan":"-","DT_RowIndex":2},{"_id":"5f8901eafa318c285e58bfaa","modul":"02","jenis":"Notis_NMH","kpd":"NMH0003","no_plate":"","nric":"kp","no_daftar_syarikat":"nosya","nama_syarikat":"sya","nama":"nmhnama","lesen":"lesne","tarikh_masa":"16/10/2020 10:14:02 AM","faulty_skter":"SEKSYEN 46","faulty_name":"NOTIS MENGALIH HALANGAN","enforcer":"000000, Test Enforcer","status":"Belum Bayar","kadar_kompaun":"","catatan_dari_admin":null,"updated_by":null,"updates_by":null,"tarikh_bayar":"","amount_payment":"","created_at":"2020-10-16 10:14:02","updated_at":"2020-10-16 16:52","index":"","status_kemaskini":"-","kesalahan":"-","DT_RowIndex":3}]

public/uploads/cache/1603433880.json

@@ -0,0 +1 @@
+[{"_id":"5f89022a539a5c155d7638a9","modul":"02","jenis":"Notis_NHN","kpd":"NHN0001","no_plate":"","nric":"kp","no_daftar_syarikat":"nosya","nama_syarikat":"sya","nama":"nhn","lesen":"lesen","tarikh_masa":"16/10/2020 10:15:06 AM","faulty_skter":"UUK3","faulty_name":"MENJALANKAN PERNIAGAAN TANPA LESEN MPJBT","enforcer":"000000, Test Enforcer","status":"Belum Bayar","kadar_kompaun":"","catatan_dari_admin":null,"updated_by":null,"updates_by":null,"tarikh_bayar":"","amount_payment":"","created_at":"2020-10-16 10:15:06","updated_at":"2020-10-22 15:22","index":"","status_kemaskini":"-","kesalahan":"-","DT_RowIndex":1},{"_id":"5f892fd269060627d946af4f","modul":"02","jenis":"Notis_NHN","kpd":"NHN0002","no_plate":"","nric":"test","no_daftar_syarikat":"test","nama_syarikat":"test","nama":"nhn test","lesen":"test","tarikh_masa":"16/10/2020 13:29:54 PM","faulty_skter":"UUK3","faulty_name":"MENJALANKAN PERNIAGAAN TANPA LESEN MPJBT","enforcer":"111111, Testing 1","status":"Belum Bayar","kadar_kompaun":"","catatan_dari_admin":null,"updated_by":null,"updates_by":null,"tarikh_bayar":"","amount_payment":"","created_at":"2020-10-16 13:29:54","updated_at":"2020-10-16 13:29","index":"","status_kemaskini":"-","kesalahan":"-","DT_RowIndex":2},{"_id":"5f894666a9f8e91277171c34","modul":"02","jenis":"Notis_NHN","kpd":"NHN0003","no_plate":"","nric":"-","no_daftar_syarikat":"test","nama_syarikat":"test","nama":"test lesen","lesen":"-","tarikh_masa":"16/10/2020 15:06:14 PM","faulty_skter":"UUK3","faulty_name":"MENJAJA TANPA LESEN MPJBT","enforcer":"111111, Testing 1","status":"Belum Bayar","kadar_kompaun":"","catatan_dari_admin":null,"updated_by":null,"updates_by":null,"tarikh_bayar":"","amount_payment":"","created_at":"2020-10-16 15:06:14","updated_at":"2020-10-16 17:11","index":"","status_kemaskini":"-","kesalahan":"-","DT_RowIndex":3},{"_id":"5f910504382bd41fa749897b","modul":"02","jenis":"Notis_NHN","kpd":"NHN0004","no_plate":"","nric":"kp","no_daftar_syarikat":"no syarikat","nama_syarikat":"syarikat","nama":"nhn nama","lesen":"lesen","tarikh_masa":"22/10/2020 12:05:24 PM","faulty_skter":"UUK3","faulty_name":"MENJAJA TANPA LESEN MPJBT","enforcer":"000000, Test Enforcer","status":"Belum Bayar","kadar_kompaun":"","catatan_dari_admin":null,"updated_by":null,"updates_by":null,"tarikh_bayar":"","amount_payment":"","created_at":"2020-10-22 12:05:24","updated_at":"2020-10-22 12:05","index":"New","status_kemaskini":"-","kesalahan":"-","DT_RowIndex":4},{"_id":"5f9105c68625920e26607a0a","modul":"02","jenis":"Notis_NHN","kpd":"NHN0005","no_plate":"","nric":"3","no_daftar_syarikat":"no syarikat","nama_syarikat":"syarikat","nama":"nama","lesen":"lesen","tarikh_masa":"22/10/2020 12:08:38 PM","faulty_skter":"UUK3","faulty_name":"MENJAJA TANPA LESEN MPJBT","enforcer":"000000, Test Enforcer","status":"Belum Bayar","kadar_kompaun":"","catatan_dari_admin":null,"updated_by":null,"updates_by":null,"tarikh_bayar":"","amount_payment":"","created_at":"2020-10-22 12:08:38","updated_at":"2020-10-22 12:08","index":"New","status_kemaskini":"-","kesalahan":"-","DT_RowIndex":5}]

public/uploads/cache/1603433888.json

@@ -0,0 +1 @@
+[{"_id":"5f8914ed6484113a113cee0a","modul":"02","jenis":"Notis_NKG","kpd":"NKG0004","no_plate":"","nric":"no kp","no_daftar_syarikat":"no syarikat","nama_syarikat":"syarikat","nama":"nama","lesen":"no lesen","tarikh_masa":"16/10/2020 11:35:09 AM","faulty_skter":"SEK.82","faulty_name":"NOTIS KACAU GANGGU","enforcer":"000000, Test Enforcer","status":"Belum Bayar","kadar_kompaun":"","catatan_dari_admin":null,"updated_by":null,"updates_by":null,"tarikh_bayar":"","amount_payment":"","created_at":"2020-10-16 11:35:09","updated_at":"2020-10-16 11:35","index":"","status_kemaskini":"-","kesalahan":"-","DT_RowIndex":1},{"_id":"5f8946a9b4cc5f307e26bdeb","modul":"02","jenis":"Notis_NKG","kpd":"NKG0005","no_plate":"","nric":"-","no_daftar_syarikat":"-","nama_syarikat":"test","nama":"nkg test","lesen":"test","tarikh_masa":"16/10/2020 15:07:21 PM","faulty_skter":"SEK.82","faulty_name":"NOTIS KACAU GANGGU","enforcer":"111111, Testing 1","status":"Belum Bayar","kadar_kompaun":"","catatan_dari_admin":null,"updated_by":null,"updates_by":null,"tarikh_bayar":"","amount_payment":"","created_at":"2020-10-16 15:07:21","updated_at":"2020-10-16 15:07","index":"","status_kemaskini":"-","kesalahan":"-","DT_RowIndex":2}]

public/uploads/cache/1603433896.json

@@ -0,0 +1 @@
+[{"_id":"5f88fe3a3ca6d61b5a46f9ab","modul":"02","jenis":"Notis_PA","kpd":"PA0001","no_plate":"","nric":"kp","no_daftar_syarikat":"nosya","nama_syarikat":"sya","nama":"panamq","lesen":"lesen","tarikh_masa":"16/10/2020 09:58:18 AM","faulty_skter":"UUK3(1)","faulty_name":"MEMILIKI ANJING TANPA LESEN MDJBT","enforcer":"000000, Test Enforcer","status":"Belum Bayar","kadar_kompaun":"","catatan_dari_admin":null,"updated_by":null,"updates_by":null,"tarikh_bayar":"","amount_payment":"","created_at":"2020-10-16 09:58:18","updated_at":"2020-10-16 11:47","index":"","status_kemaskini":"-","kesalahan":"-","DT_RowIndex":1},{"_id":"5f89153e965cfa5596614afd","modul":"02","jenis":"Notis_PA","kpd":"PA0002","no_plate":"","nric":"no kp","no_daftar_syarikat":"no syarikay","nama_syarikat":"syarikat","nama":"nama","lesen":"no lesen","tarikh_masa":"16/10/2020 11:36:30 AM","faulty_skter":"UUK3(1)","faulty_name":"MEMILIKI ANJING TANPA LESEN MDJBT","enforcer":"000000, Test Enforcer","status":"Belum Bayar","kadar_kompaun":"","catatan_dari_admin":null,"updated_by":null,"updates_by":null,"tarikh_bayar":"","amount_payment":"","created_at":"2020-10-16 11:36:30","updated_at":"2020-10-16 11:36","index":"","status_kemaskini":"-","kesalahan":"-","DT_RowIndex":2},{"_id":"5f8915a8c692920cdd41618f","modul":"02","jenis":"Notis_PA","kpd":"PA0003","no_plate":"","nric":"no kp","no_daftar_syarikat":"no syarikat","nama_syarikat":"syarikat","nama":"nama","lesen":"lesen","tarikh_masa":"16/10/2020 11:38:16 AM","faulty_skter":"UUK3(1)","faulty_name":"MEMILIKI ANJING TANPA LESEN MDJBT","enforcer":"000000, Test Enforcer","status":"Belum Bayar","kadar_kompaun":"","catatan_dari_admin":null,"updated_by":null,"updates_by":null,"tarikh_bayar":"","amount_payment":"","created_at":"2020-10-16 11:38:16","updated_at":"2020-10-16 16:35","index":"","status_kemaskini":"-","kesalahan":"-","DT_RowIndex":3},{"_id":"5f8942b16fbe4944b325ce9a","modul":"02","jenis":"Notis_PA","kpd":"PA0004","no_plate":"","nric":"-","no_daftar_syarikat":"test","nama_syarikat":"test","nama":"test","lesen":"-","tarikh_masa":"16/10/2020 14:50:25 PM","faulty_skter":"UUK3(1)","faulty_name":"MEMILIKI ANJING TANPA LESEN MDJBT","enforcer":"111111, Testing 1","status":"Belum Bayar","kadar_kompaun":"","catatan_dari_admin":null,"updated_by":null,"updates_by":null,"tarikh_bayar":"","amount_payment":"","created_at":"2020-10-16 14:50:25","updated_at":"2020-10-16 14:50","index":"","status_kemaskini":"-","kesalahan":"-","DT_RowIndex":4}]

public/uploads/cache/1603433902.json

@@ -0,0 +1 @@
+[{"_id":"5f8901b39b08984d1a51170b","modul":"02","jenis":"Notis_NPPM","kpd":"NPPM0001","no_plate":"","nric":"kp","no_daftar_syarikat":"nosya","nama_syarikat":"sya","nama":"nppm nama","lesen":"lesen","tarikh_masa":"16/10/2020 10:13:07 AM","faulty_skter":"SEK.107(2)","faulty_name":"TIDAK MEMATUHI SYARAT LESEN/ PERMIT MPJBT","enforcer":"000000, Test Enforcer","status":"Belum Bayar","kadar_kompaun":"","catatan_dari_admin":null,"updated_by":null,"updates_by":null,"tarikh_bayar":"","amount_payment":"","created_at":"2020-10-16 10:13:07","updated_at":"2020-10-16 10:13","index":"","status_kemaskini":"-","kesalahan":"-","DT_RowIndex":1}]

public/uploads/cache/1603437697.json

@@ -0,0 +1 @@
+[{"_id":"5f9284237309f6748350c8ad","modul":"03","jenis":"Parkir","kpd":"KPD4","no_plate":"noplat","nric":"-","no_daftar_syarikat":null,"nama_syarikat":null,"nama":"-","lesen":null,"tarikh_masa":"23/10/2020 15:20:03 PM","faulty_skter":"Perintah 17","faulty_name":"Mempamerkan kupon atau letak kereta yang telah tamat tempoh yang dibenarkan.","enforcer":"000000, Test Enforcer","status":"Belum Bayar","kadar_kompaun":"30","catatan_dari_admin":null,"updated_by":null,"updates_by":null,"tarikh_bayar":null,"amount_payment":"-","created_at":"2020-10-23 15:20:03","updated_at":"2020-10-23 15:20","index":"New","status_kemaskini":"-","kesalahan":"-","DT_RowIndex":1}]

public/uploads/cache/1603439537.json

@@ -0,0 +1 @@
+[{"_id":"5f891456b349cb2d286ebc68","modul":"03","jenis":"Pelbagai_JPB","kpd":"JPB0005","no_plate":null,"nric":"no kp","no_daftar_syarikat":"nos yarikat","nama_syarikat":"syarikat","nama":"nama","lesen":"lesen","tarikh_masa":"16/10/2020 11:32:38 AM","faulty_skter":"SEKSYEN 39 (2)","faulty_name":"MEROSAKKAN ATAU MENYEBABKAN KEROSAKKAN KEPADA MANA-MANA JALAN","enforcer":"000000, Test Enforcer","status":"Belum Bayar","kadar_kompaun":"2000","catatan_dari_admin":null,"updated_by":null,"updates_by":null,"tarikh_bayar":null,"amount_payment":null,"created_at":"2020-10-16 11:32:38","updated_at":"2020-10-21 12:16","index":"","status_kemaskini":"-","kesalahan":"-","DT_RowIndex":1},{"_id":"5f89485ad6efb4639c2980f3","modul":"03","jenis":"Pelbagai_JPB","kpd":"JPB0004","no_plate":null,"nric":"-","no_daftar_syarikat":"-","nama_syarikat":"-","nama":"kt","lesen":"-","tarikh_masa":"16/10/2020 15:14:34 PM","faulty_skter":"SEKSYEN 39 (2)","faulty_name":"MEROSAKKAN ATAU MENYEBABKAN KEROSAKKAN KEPADA MANA-MANA JALAN","enforcer":"000000, Test Enforcer","status":"Belum Bayar","kadar_kompaun":"2000","catatan_dari_admin":null,"updated_by":null,"updates_by":null,"tarikh_bayar":null,"amount_payment":null,"created_at":"2020-10-16 15:14:34","updated_at":"2020-10-21 12:15","index":"","status_kemaskini":"-","kesalahan":"-","DT_RowIndex":2},{"_id":"5f8956bdc79577137f662cbe","modul":"03","jenis":"Pelbagai_JPB","kpd":"JPB0001","no_plate":null,"nric":"no kp","no_daftar_syarikat":"no syarikat","nama_syarikat":"syarikat","nama":"nama","lesen":"lesen","tarikh_masa":"16/10/2020 16:15:57 PM","faulty_skter":"SEKSYEN 39(1)","faulty_name":"MENJALANKAN KERJA ATAU MENYEBABKAN PERUBAHAN TURAP TANPA KEBENARAN","enforcer":"111111, Testing 1","status":"Belum Bayar","kadar_kompaun":"2000","catatan_dari_admin":null,"updated_by":null,"updates_by":null,"tarikh_bayar":null,"amount_payment":"-","created_at":"2020-10-16 16:15:57","updated_at":"2020-10-17 16:37","index":"","status_kemaskini":"-","kesalahan":"-","DT_RowIndex":3},{"_id":"5f8faefe04367e70fc1872fd","modul":"03","jenis":"Pelbagai_JPB","kpd":"JPB0002","no_plate":"","nric":"no kp","no_daftar_syarikat":"no syarikat","nama_syarikat":"syarikat","nama":"nama pesalah","lesen":"no lesen","tarikh_masa":"21/10/2020 11:46:00 AM","faulty_skter":"SEKSYEN 39 (2)","faulty_name":"MEROSAKKAN ATAU MENYEBABKAN KEROSAKKAN KEPADA MANA-MANA JALAN","enforcer":"000000, Test Enforcer","status":"Belum Bayar","kadar_kompaun":"2000","catatan_dari_admin":null,"updated_by":null,"updates_by":null,"tarikh_bayar":null,"amount_payment":"-","created_at":"2020-10-21 11:46:00","updated_at":"2020-10-23 13:18","index":"New","status_kemaskini":"-","kesalahan":"-","DT_RowIndex":4}]

public/uploads/cache/1603439867.json

@@ -0,0 +1 @@
+[{"_id":"5f9284237309f6748350c8ad","modul":"03","jenis":"Parkir","kpd":"KPD4","no_plate":"noplat","nric":"-","no_daftar_syarikat":null,"nama_syarikat":null,"nama":"-","lesen":null,"tarikh_masa":"23/10/2020 15:20:03 PM","faulty_skter":"Perintah 17","faulty_name":"Mempamerkan kupon atau letak kereta yang telah tamat tempoh yang dibenarkan.","enforcer":"000000, Test Enforcer","status":"Belum Bayar","kadar_kompaun":"30","catatan_dari_admin":null,"updated_by":null,"updates_by":null,"tarikh_bayar":null,"amount_payment":"-","created_at":"2020-10-23 15:20:03","updated_at":"2020-10-23 15:20","index":"New","status_kemaskini":"-","kesalahan":"-","DT_RowIndex":1}]

public/uploads/cache/1603439880.json

@@ -0,0 +1 @@
+[{"_id":"5f9284237309f6748350c8ad","modul":"03","jenis":"Parkir","kpd":"KPD4","no_plate":"noplat","nric":"-","no_daftar_syarikat":null,"nama_syarikat":null,"nama":"-","lesen":null,"tarikh_masa":"23/10/2020 15:20:03 PM","faulty_skter":"Perintah 17","faulty_name":"Mempamerkan kupon atau letak kereta yang telah tamat tempoh yang dibenarkan.","enforcer":"000000, Test Enforcer","status":"Belum Bayar","kadar_kompaun":"30","catatan_dari_admin":null,"updated_by":null,"updates_by":null,"tarikh_bayar":null,"amount_payment":"-","created_at":"2020-10-23 15:20:03","updated_at":"2020-10-23 15:20","index":"New","status_kemaskini":"-","kesalahan":"-","DT_RowIndex":1}]

public/uploads/cache/1603439915.json

@@ -0,0 +1 @@
+[{"_id":"5f9284237309f6748350c8ad","modul":"03","jenis":"Parkir","kpd":"KPD4","no_plate":"noplat","nric":"-","no_daftar_syarikat":null,"nama_syarikat":null,"nama":"-","lesen":null,"tarikh_masa":"23/10/2020 15:20:03 PM","faulty_skter":"Perintah 17","faulty_name":"Mempamerkan kupon atau letak kereta yang telah tamat tempoh yang dibenarkan.","enforcer":"000000, Test Enforcer","status":"Belum Bayar","kadar_kompaun":"30","catatan_dari_admin":null,"updated_by":null,"updates_by":null,"tarikh_bayar":null,"amount_payment":"-","created_at":"2020-10-23 15:20:03","updated_at":"2020-10-23 15:20","index":"New","status_kemaskini":"-","kesalahan":"-","DT_RowIndex":1}]

public/uploads/cache/1603439926.json

@@ -0,0 +1 @@
+[{"_id":"5f9284237309f6748350c8ad","modul":"03","jenis":"Parkir","kpd":"KPD4","no_plate":"noplat","nric":"-","no_daftar_syarikat":null,"nama_syarikat":null,"nama":"-","lesen":null,"tarikh_masa":"23/10/2020 15:20:03 PM","faulty_skter":"Perintah 17","faulty_name":"Mempamerkan kupon atau letak kereta yang telah tamat tempoh yang dibenarkan.","enforcer":"000000, Test Enforcer","status":"Belum Bayar","kadar_kompaun":"30","catatan_dari_admin":null,"updated_by":null,"updates_by":null,"tarikh_bayar":null,"amount_payment":"-","created_at":"2020-10-23 15:20:03","updated_at":"2020-10-23 15:20","index":"New","status_kemaskini":"-","kesalahan":"-","DT_RowIndex":1}]

resources/js/components/DatatableJPB.js

@@ -0,0 +1,279 @@
+import React, { Component } from 'react';
+import { Modal } from 'react-bootstrap';
+import ClipLoader from 'react-spinners/ClipLoader';
+import axios from 'axios';
+
+export default class DatatableJPB extends Component {
+
+    constructor(props) {
+		super(props);
+		this.state = {
+			data: props.data,
+			currentUrl: props.url,
+			showModal: false,
+			processing: false,
+			responseMessage: '',
+			form : {
+				current_id: props.current_id,
+                id: '',
+                status: 'Belum Bayar',
+                remark: '',
+                amount: '',
+            },
+		};
+
+		this.onSubmit = this.onSubmit.bind(this);
+		this.onChangeStatus = this.onChangeStatus.bind(this);
+        this.onChangeRemark = this.onChangeRemark.bind(this);
+		this.onChangeAmount = this.onChangeAmount.bind(this);
+		this.closeModal = this.closeModal.bind(this);
+	}
+
+	onChangeStatus(e){
+		let value = e.target.value;
+		this.setState(prevState => ({
+            form: {
+                ...prevState.form,
+                status: value,
+            }
+        }));
+	}
+	onChangeRemark(e){
+		let value = e.target.value;
+		this.setState(prevState => ({
+            form: {
+                ...prevState.form,
+                remark: value,
+            }
+        }));
+	}
+	onChangeAmount(e){
+		let value = e.target.value;
+		this.setState(prevState => ({
+            form: {
+                ...prevState.form,
+                amount: value,
+            }
+        }));
+	}
+
+	onUpdateStatus(e){
+		this.setState(prevState => ({
+            form: {
+                ...prevState.form,
+                id: e,
+            }
+        }));
+		this.setState({ showModal: true });
+	}
+
+	closeModal() {
+		this.setState({ showModal: false });
+	}
+
+	onSubmit(e){
+		e.preventDefault();
+
+		let input = prompt("Adakah anda pasti kemaskini status kompaun ini? \nTaip 'yes' untuk teruskan", "");
+		if (input == "yes") {
+			this.setState({ processing: true });
+			let formData = this.state.form;
+			axios.post("/api/update/compound/via-dashboard", formData).then(response => {
+                if (response.data.success) {
+					fetch(this.state.currentUrl).then(response => {
+						response.json().then(res => {
+							this.setState({ processing: false });
+							this.setState({ data: res.data, showModal: false });
+						})
+					})
+					this.setState({ responseMessage: response.data.message });
+					alert(response.data.message);
+                }else{
+                    alert(response.data.message);
+                    this.setState({ showModal: false, processing: false, responseMessage: response.data.message });
+				}
+            }).catch(error =>{
+               console.log(error);
+            });
+		}else{
+			alert('Kemaskini status dibatalkan');
+			this.setState({ showModal: false });
+		}
+    }
+
+    render() {
+        return(
+            <div>
+                <div className="data_table_main dt-responsive table-responsive">
+                    <table id="compoundJPB" className="table table-sm table-striped table-bordered nowrap" width="100%">
+                        <thead>
+                            <tr>
+                                <th>#</th>
+                                <th>Kpd</th>
+                                <th>Jenis</th>
+                                <th>Tarikh Masa</th>
+                                <th>Kesalahan</th>
+                                <th width="110">Kadar Kompaun</th>
+                                <th>Nric</th>
+                                <th>Nama</th>
+                                <th>PenguatKuasa</th>
+                                <th>Status</th>
+                                <th>Tindakan</th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                            {   this.state.data.length > 0 ?
+                                    this.state.data.map((item,i) =>
+                                        <tr key={i}>
+                                            <td>
+                                                {item.DT_RowIndex}
+                                            </td>
+                                            <td>
+                                                {item.index !== "" ?<div><small className='label label-success'>{item.index}</small>&nbsp;{item.kpd}</div> : <div>{item.kpd}</div>}
+                                            </td>
+                                            <td>{item.jenis}</td>
+                                            <td>{item.tarikh_masa}</td>
+                                            <td>Seksyen {item.kesalahan.sketr} <br/> {item.kesalahan.nama}</td>
+                                            <td>{item.jumlah_kemaskini_kompaun !== "" ? <div>{item.jumlah_kemaskini_kompaun}</div> : <div>{item.jumlah_asal_kompaun}</div>}</td>
+                                            <td>{item.nric}</td>
+                                            <td>{item.nama}</td>
+                                            <td>{item.enforcer.no_badan}, {item.enforcer.full_name}</td>
+                                            <td>
+                                                {
+													item.catatan_dari_admin !== null ?
+														item.status !== "Belum Bayar" ?
+														<div>
+															<div><b>{item.status}</b></div>
+															<div style={{ "marginTop": "8px"}}>
+																<span>Bayaran: </span><br/>
+																RM {item.amount_payment}
+															</div>
+															<div style={{ "marginTop": "8px"}}>
+																<span>Catatan: </span><br/>
+																{item.catatan_dari_admin}
+															</div>
+															<div style={{ "marginTop": "8px"}}>
+																<span>Kemaskini: </span><br/>
+																{item.updated_at} <br/>
+																{item.updated_by !== null ?
+																	<div>{item.updated_by.no_badan}</div>
+																	: ""
+																}
+															</div>
+														</div>
+														:
+														<div>
+															<div><b>{item.status}</b></div>
+															<div style={{ "marginTop": "8px"}}>
+																<span>Catatan: </span><br/>
+																{item.catatan_dari_admin}
+															</div>
+															<div style={{ "marginTop": "8px"}}>
+																<span>Kemasikini: </span><br/>
+																{item.updated_at} <br/>
+																{item.updated_by !== null ?
+																	<div>{item.updated_by.no_badan}</div>
+																	: ""
+																}
+															</div>
+														</div>
+													:
+													<div><b>{item.status}</b></div>
+												}
+                                            </td>
+                                            <td style={{ "textAlign": "center" }}>
+                                                <a href={"/main/compound/"+item.kpd+"/index"} className="btn btn-info btn-sm waves-effect waves-light">
+                                                    TERUSKAN
+                                                </a>
+                                                <button data-toggle="modal" data-target="#ajaxModel" onClick={this.onUpdateStatus.bind(this, item._id)} className="btn btn-primary btn-sm waves-effect waves-light">
+													KEMASKINI STATUS
+												</button>
+												<a href={"/main/edit/compound/"+item._id} className="btn btn-danger btn-sm waves-effect waves-light">
+													KEMASKINI
+												</a>
+                                            </td>
+                                        </tr>
+                                    )
+                                :
+                                <tr>
+                                    <td colSpan="11" style={{ "textAlign": "center" }}>Tiada Data Ditemui</td>
+                                </tr>
+                            }
+                        </tbody>
+                        <tfoot>
+                            <tr>
+                                <th>#</th>
+                                <th>Kpd</th>
+                                <th>Jenis</th>
+                                <th>Tarikh Masa</th>
+                                <th>Kesalahan</th>
+                                <th width="110">Kadar Kompaun</th>
+                                <th>Nric</th>
+                                <th>Nama</th>
+                                <th>PenguatKuasa</th>
+                                <th>Status</th>
+                                <th>Tindakan</th>
+                            </tr>
+                        </tfoot>
+                    </table>
+                </div>
+
+                <Modal size="lg" show={this.state.showModal} onHide={this.closeModal}>
+					<form className="form-horizontal" onSubmit={this.onSubmit}>
+						<Modal.Header closeButton>
+							<Modal.Title>Kemaskini Status Kompaun</Modal.Title>
+						</Modal.Header>
+						<Modal.Body>
+							<div className="modal-body">
+
+							{!this.state.processing ?
+                            	''
+                            :
+                               <div className='sweet-loading' style={{'textAlign':'center'}}>
+                                    <ClipLoader
+                                        style={{'border-color': 'red'}}
+                                        sizeUnit={"px"}
+                                        size={50}
+                                        color={'#123abc'}
+                                        loading={this.state.processing}
+                                    />
+                                </div>
+							}
+
+								<input type="hidden" name="compound_id" id="compound_id" value={this.state.form.id} />
+								<div className="form-group">
+									<label className="col-sm-6 control-label"><b>Status</b></label>
+									<div className="col-sm-12">
+										<select className="form-control" required value={this.state.form.status} onChange={this.onChangeStatus}>
+											<option key="Belum Bayar" value="Belum Bayar">Belum Bayar</option>
+											<option key="Berbayar" value="Berbayar">Berbayar</option>
+											<option key="Batal" value="Batal">Batal</option>
+										</select>
+									</div>
+								</div>
+
+								<div className="form-group">
+									<label className="col-sm-6 control-label"><b>Catatan <code>*</code></b></label>
+									<div className="col-sm-12">
+										<textarea className="form-control"  value={this.state.form.remark} onChange={this.onChangeRemark}/>
+									</div>
+								</div>
+
+								<div className="form-group">
+									<label className="col-sm-6 control-label"><b>Jumlah Dibayar <code>*</code></b></label>
+									<div className="col-sm-12">
+										<input type="number" steps="0.00" className="form-control" placeholder="0.0" value={this.state.form.amount} onChange={this.onChangeAmount} required/>
+									</div>
+								</div>
+							</div>
+						</Modal.Body>
+						<Modal.Footer>
+							<button type="button" className="btn btn-sm btn-default waves-effect" onClick={this.closeModal}>Close</button>
+							<button type="submit" className="btn btn-sm btn-primary waves-effect waves-light">KEMASKINI</button>
+						</Modal.Footer>
+					</form>
+				</Modal>
+			</div>
+        )
+    }
+}

resources/js/components/DatatableKT.js

@@ -0,0 +1,279 @@
+import React, { Component } from 'react';
+import { Modal } from 'react-bootstrap';
+import ClipLoader from 'react-spinners/ClipLoader';
+import axios from 'axios';
+
+export default class DatatableKT extends Component {
+
+    constructor(props) {
+		super(props);
+		this.state = {
+			data: props.data,
+			currentUrl: props.url,
+			showModal: false,
+			processing: false,
+			responseMessage: '',
+			form : {
+				current_id: props.current_id,
+                id: '',
+                status: 'Belum Bayar',
+                remark: '',
+                amount: '',
+            },
+		};
+
+		this.onSubmit = this.onSubmit.bind(this);
+		this.onChangeStatus = this.onChangeStatus.bind(this);
+        this.onChangeRemark = this.onChangeRemark.bind(this);
+		this.onChangeAmount = this.onChangeAmount.bind(this);
+		this.closeModal = this.closeModal.bind(this);
+	}
+
+	onChangeStatus(e){
+		let value = e.target.value;
+		this.setState(prevState => ({
+            form: {
+                ...prevState.form,
+                status: value,
+            }
+        }));
+	}
+	onChangeRemark(e){
+		let value = e.target.value;
+		this.setState(prevState => ({
+            form: {
+                ...prevState.form,
+                remark: value,
+            }
+        }));
+	}
+	onChangeAmount(e){
+		let value = e.target.value;
+		this.setState(prevState => ({
+            form: {
+                ...prevState.form,
+                amount: value,
+            }
+        }));
+	}
+
+	onUpdateStatus(e){
+		this.setState(prevState => ({
+            form: {
+                ...prevState.form,
+                id: e,
+            }
+        }));
+		this.setState({ showModal: true });
+	}
+
+	closeModal() {
+		this.setState({ showModal: false });
+	}
+
+	onSubmit(e){
+		e.preventDefault();
+
+		let input = prompt("Adakah anda pasti kemaskini status kompaun ini? \nTaip 'yes' untuk teruskan", "");
+		if (input == "yes") {
+			this.setState({ processing: true });
+			let formData = this.state.form;
+			axios.post("/api/update/compound/via-dashboard", formData).then(response => {
+                if (response.data.success) {
+					fetch(this.state.currentUrl).then(response => {
+						response.json().then(res => {
+							this.setState({ processing: false });
+							this.setState({ data: res.data, showModal: false });
+						})
+					})
+					this.setState({ responseMessage: response.data.message });
+					alert(response.data.message);
+                }else{
+                    alert(response.data.message);
+                    this.setState({ showModal: false, processing: false, responseMessage: response.data.message });
+				}
+            }).catch(error =>{
+               console.log(error);
+            });
+		}else{
+			alert('Kemaskini status dibatalkan');
+			this.setState({ showModal: false });
+		}
+    }
+
+    render() {
+        return(
+            <div>
+                <div className="data_table_main dt-responsive table-responsive">
+                    <table id="compoundKT" className="table table-sm table-striped table-bordered nowrap" width="100%">
+                        <thead>
+                            <tr>
+                                <th>#</th>
+                                <th>Kpd</th>
+                                <th>Jenis</th>
+                                <th>Tarikh Masa</th>
+                                <th>Kesalahan</th>
+                                <th width="110">Kadar Kompaun</th>
+                                <th>Nric</th>
+                                <th>Nama</th>
+                                <th>PenguatKuasa</th>
+                                <th>Status</th>
+                                <th>Tindakan</th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                            {   this.state.data.length > 0 ?
+                                    this.state.data.map((item,i) =>
+                                        <tr key={i}>
+                                            <td>
+                                                {item.DT_RowIndex}
+                                            </td>
+                                            <td>
+                                                {item.index !== "" ?<div><small className='label label-success'>{item.index}</small>&nbsp;{item.kpd}</div> : <div>{item.kpd}</div>}
+                                            </td>
+                                            <td>{item.jenis}</td>
+                                            <td>{item.tarikh_masa}</td>
+                                            <td>Seksyen {item.kesalahan.sketr} <br/> {item.kesalahan.nama}</td>
+                                            <td>{item.jumlah_kemaskini_kompaun !== "" ? <div>{item.jumlah_kemaskini_kompaun}</div> : <div>{item.jumlah_asal_kompaun}</div>}</td>
+                                            <td>{item.nric}</td>
+                                            <td>{item.nama}</td>
+                                            <td>{item.enforcer.no_badan}, {item.enforcer.full_name}</td>
+                                            <td>
+                                                {
+													item.catatan_dari_admin !== null ?
+														item.status !== "Belum Bayar" ?
+														<div>
+															<div><b>{item.status}</b></div>
+															<div style={{ "marginTop": "8px"}}>
+																<span>Bayaran: </span><br/>
+																RM {item.amount_payment}
+															</div>
+															<div style={{ "marginTop": "8px"}}>
+																<span>Catatan: </span><br/>
+																{item.catatan_dari_admin}
+															</div>
+															<div style={{ "marginTop": "8px"}}>
+																<span>Kemaskini: </span><br/>
+																{item.updated_at} <br/>
+																{item.updated_by !== null ?
+																	<div>{item.updated_by.no_badan}</div>
+																	: ""
+																}
+															</div>
+														</div>
+														:
+														<div>
+															<div><b>{item.status}</b></div>
+															<div style={{ "marginTop": "8px"}}>
+																<span>Catatan: </span><br/>
+																{item.catatan_dari_admin}
+															</div>
+															<div style={{ "marginTop": "8px"}}>
+																<span>Kemasikini: </span><br/>
+																{item.updated_at} <br/>
+																{item.updated_by !== null ?
+																	<div>{item.updated_by.no_badan}</div>
+																	: ""
+																}
+															</div>
+														</div>
+													:
+													<div><b>{item.status}</b></div>
+												}
+                                            </td>
+                                            <td style={{ "textAlign": "center" }}>
+                                                <a href={"/main/compound/"+item.kpd+"/index"} className="btn btn-info btn-sm waves-effect waves-light">
+                                                    TERUSKAN
+                                                </a>
+                                                <button data-toggle="modal" data-target="#ajaxModel" onClick={this.onUpdateStatus.bind(this, item._id)} className="btn btn-primary btn-sm waves-effect waves-light">
+													KEMASKINI STATUS
+												</button>
+												<a href={"/main/edit/compound/"+item._id} className="btn btn-danger btn-sm waves-effect waves-light">
+													KEMASKINI
+												</a>
+                                            </td>
+                                        </tr>
+                                    )
+                                :
+                                <tr>
+                                    <td colSpan="11" style={{ "textAlign": "center" }}>Tiada Data Ditemui</td>
+                                </tr>
+                            }
+                        </tbody>
+                        <tfoot>
+                            <tr>
+                                <th>#</th>
+                                <th>Kpd</th>
+                                <th>Jenis</th>
+                                <th>Tarikh Masa</th>
+                                <th>Kesalahan</th>
+                                <th width="110">Kadar Kompaun</th>
+                                <th>Nric</th>
+                                <th>Nama</th>
+                                <th>PenguatKuasa</th>
+                                <th>Status</th>
+                                <th>Tindakan</th>
+                            </tr>
+                        </tfoot>
+                    </table>
+                </div>
+
+                <Modal size="lg" show={this.state.showModal} onHide={this.closeModal}>
+					<form className="form-horizontal" onSubmit={this.onSubmit}>
+						<Modal.Header closeButton>
+							<Modal.Title>Kemaskini Status Kompaun</Modal.Title>
+						</Modal.Header>
+						<Modal.Body>
+							<div className="modal-body">
+
+							{!this.state.processing ?
+                            	''
+                            :
+                               <div className='sweet-loading' style={{'textAlign':'center'}}>
+                                    <ClipLoader
+                                        style={{'border-color': 'red'}}
+                                        sizeUnit={"px"}
+                                        size={50}
+                                        color={'#123abc'}
+                                        loading={this.state.processing}
+                                    />
+                                </div>
+							}
+
+								<input type="hidden" name="compound_id" id="compound_id" value={this.state.form.id} />
+								<div className="form-group">
+									<label className="col-sm-6 control-label"><b>Status</b></label>
+									<div className="col-sm-12">
+										<select className="form-control" required value={this.state.form.status} onChange={this.onChangeStatus}>
+											<option key="Belum Bayar" value="Belum Bayar">Belum Bayar</option>
+											<option key="Berbayar" value="Berbayar">Berbayar</option>
+											<option key="Batal" value="Batal">Batal</option>
+										</select>
+									</div>
+								</div>
+
+								<div className="form-group">
+									<label className="col-sm-6 control-label"><b>Catatan <code>*</code></b></label>
+									<div className="col-sm-12">
+										<textarea className="form-control"  value={this.state.form.remark} onChange={this.onChangeRemark}/>
+									</div>
+								</div>
+
+								<div className="form-group">
+									<label className="col-sm-6 control-label"><b>Jumlah Dibayar <code>*</code></b></label>
+									<div className="col-sm-12">
+										<input type="number" steps="0.00" className="form-control" placeholder="0.0" value={this.state.form.amount} onChange={this.onChangeAmount} required/>
+									</div>
+								</div>
+							</div>
+						</Modal.Body>
+						<Modal.Footer>
+							<button type="button" className="btn btn-sm btn-default waves-effect" onClick={this.closeModal}>Close</button>
+							<button type="submit" className="btn btn-sm btn-primary waves-effect waves-light">KEMASKINI</button>
+						</Modal.Footer>
+					</form>
+				</Modal>
+			</div>
+        )
+    }
+}

resources/views/main-dashboard/compound/_edit_type/pelbagai.blade.php

@@ -0,0 +1,219 @@
+<form action="{{ url('/main/manual/edit/compound') }}" class="main cussPayment" method="POST" enctype="multipart/form-data">
+    <input type="hidden" name="_token" id="csrf-token" value="{{ Session::token() }}" />
+    <input type="hidden" name="_id" id="_id-token" value="{{ $compound->_id }}" />
+
+    <div class="row clearfix">
+        <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
+            <label for="subject"><b>No.KPD <code>*</code></b></label>
+            <div class="form-group">
+                <div class="form-line">
+                    <input type="text" id="kpd" name="kpd" class="form-control" value="{{ $compound->kpd }}"/>
+                </div>
+            </div>
+        </div>
+        <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
+            <label for="subject"><b>Butiran Kesalahan<code>*</code></b></label>
+            <div class="form-group">
+                <div class="form-line">
+                    <input type="text" name="butiran_kesalahan" class="form-control" value="{{$compound->butiran_kesalahan }}"/>
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="row clearfix">
+        <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
+            <label for="subject"><b>Seksyen Kesalahan <code>*</code></b></label>
+            <div class="form-group">
+                <div class="form-line">
+                    <select id="seksyen2" name="seksyen" class="js-section form-control" multiple="multiple" required>
+                        @foreach($faulty as $f)
+                            @if($f->_id == $compound->Faulty->_id)
+                                <option value="{{ $f->_id }}" selected>[{{ $f->sketr }}] {{$f->nama}}</option>
+                            @else
+                                <option value="{{ $f->_id }}">[{{ $f->sketr }}] {{$f->nama}}</option>
+                            @endif
+                        @endforeach
+                    </select>
+                    {{-- <textarea id="seksyen" name="seksyen" class="form-control" value="{{$compound->seksyen_kesalahan}}" >[{{ $compound->Faulty->sketr }}] {{ $compound->Faulty->nama}}</textarea> --}}
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="row clearfix">
+        <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
+            <label for="subject"><b>Akta Kesalahan <code>*</code></b></label>
+            <div class="form-group">
+                <div class="form-line">
+                    <input type="text" id="akta1" name="akta" class="form-control" value="{{ $compound->Deedlaw->nama }}" readonly>
+                </div>
+            </div>
+        </div>
+        <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
+            <label for="subject"><b>Jabatan <code>*</code></b></label>
+            <div class="form-group">
+                <div class="form-line">
+                    <input type="text" id="jabatan1" name="jabatan" class="form-control" value="{{ $compound->Department->jnama }}" readonly>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <hr style="border-top: 2px dotted #8c8b8b;">
+
+    <div class="row clearfix">
+        <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
+            <label for="subject"><b>Nama</b></label>
+            <div class="form-group">
+                <div class="form-line">
+                    <input type="text" id="namaP" name="namaP" class="form-control" value="{{ $compound->nama }}" required="">
+                    <code>Sila gunakan '-' jika tidak berkaitan</code>
+                </div>
+            </div>
+        </div>
+        <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
+            <label for="subject"><b>Identity</b></label>
+            <div class="form-group">
+                <div class="form-line">
+                    <input type="text" id="noIc" name="noIc" class="form-control" value="{{ $compound->identity }}" required="">
+                    <code>Sila gunakan '-' jika tidak berkaitan</code>
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="row clearfix">
+        <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
+            <label for="subject"><b>Alamat Pesalah</b></label>
+            <div class="form-group">
+                <div class="form-line">
+                    <textarea type="text" id="alamat" name="alamat" class="form-control" placeholder="Alamat" required>{{ $compound->alamat }}</textarea>
+                    <code>Sila gunakan '-' jika tidak berkaitan</code>
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="row clearfix">
+        <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
+            <label for="subject"><b>Nama Syarikat</b></label>
+            <div class="form-group">
+                <div class="form-line">
+                    <input type="text" id="namaS" name="namaS" class="form-control" placeholder="Syarikat Sdn Bhd" value="{{ $compound->nama_syarikat }}" required="">
+                    <code>Sila gunakan '-' jika tidak berkaitan</code>
+                </div>
+            </div>
+        </div>
+        <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
+            <label for="subject"><b>Daftar No.Syarikat</b></label>
+            <div class="form-group">
+                <div class="form-line">
+                    <input type="text" id="daftarNo" name="daftarNo" class="form-control" value="{{ $compound->no_daftar_syarikat }}" required="">
+                    <code>Sila gunakan '-' jika tidak berkaitan</code>
+                </div>
+            </div>
+        </div>
+    </div>
+
+
+    <div class="row clearfix">
+        {{-- <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
+            <label for="subject"><b>No.Tel </b></label>
+            <div class="form-group">
+                <div class="form-line">
+                    <input type="text" id="tel" name="tel" class="form-control" value="{{ $compound->no_telefon }}" />
+                </div>
+                <code>Sila gunakan '-' jika tidak berkaitan</code>
+            </div>
+        </div> --}}
+        <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
+            <label for="subject"><b>No. Akaun Lesen</b></label>
+            <div class="form-group">
+                <div class="form-line">
+                    <input type="text" id="lesen" name="lesen" class="form-control" value="{{ $compound->no_akaun_lesen }}" />
+                </div>
+                <code>Sila gunakan '-' jika tidak berkaitan</code>
+            </div>
+        </div>
+    </div>
+    <div class="row clearfix">
+        <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
+            <label for="subject"><b>Alamat Tempat Kesalahan</b></label>
+            <div class="form-group">
+                <textarea type="text" id="lokasi_kejadian" name="lokasi_kejadian" class="form-control" placeholder="Alamat" required>{{ $compound->lokasi_kejadian }}</textarea>
+                <code>Sila gunakan '-' jika tidak berkaitan</code>
+            </div>
+        </div>
+        <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
+			<label for="subject"><b>Nama Jalan<code>*</code></b></label>
+			<div class="form-group">
+				<div class="form-line">
+					<select id="namaJalan2" name="namaJalan" class="js-section form-control" multiple="multiple" required>
+                        @foreach($jalan as $j)
+                            @if($j->JLN_JNAMA == $compound->nama_jalan)
+                                <option value="{{ $j->_id}}" selected>{{ $j->JLN_JNAMA }}</option>
+                            @else
+                                <option value="{{ $j->_id}}">{{ $j->JLN_JNAMA }}</option>
+                            @endif
+                        @endforeach
+                    </select>
+				</div>
+			</div>
+        </div>
+        {{-- <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
+            <label for="subject"><b>Butiran Kesalahan</b></label>
+            <div class="form-group">
+                <input type="text" name="butiran_kesalahan" class="form-control" value="{{$compound->butiran_kesalahan }}" required/>
+                <code>Sila gunakan '-' jika tidak berkaitan</code>
+            </div>
+        </div> --}}
+    </div>
+    <div class="row clearfix">
+		<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
+			<label for="subject"><b>Nama Taman <code>*</code></b></label>
+			<div class="form-group">
+				<div class="form-line">
+					<input type="text" id="namaTaman2" name="namaTaman" class="form-control" value="-" required readonly>
+				</div>
+			</div>
+		</div>
+        <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
+			<label for="subject"><b>Nama Kawasan <code>*</code></b></label>
+			<div class="form-group">
+				<div class="form-line">
+                    <div class="form-line">
+                        <input type="text" id="namaKawasan2" name="namaKawasan" class="form-control" value="-" required readonly>
+                    </div>
+				</div>
+			</div>
+		</div>
+    </div>
+    <div class="row clearfix">
+        <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
+			<label for="subject"><b>Dikeluarkan Oleh <code>*</code></b></label>
+			<div class="form-group">
+				<select id="staff" name="staff" class="js-section form-control" multiple="multiple" required>
+					<option value="">Sila pilih penguatkuasa</option>
+                    @foreach($staff as $s)
+                        @if($s->_id == $compound->dikeluarkan)
+                            <option value="{{ $s->_id}}" selected>[{{ $s->no_badan }}] {{ $s->full_name }}</option>
+                        @else
+                            <option value="{{ $s->_id}}">[{{ $s->no_badan }}] {{ $s->full_name }}</option>
+                        @endif
+					@endforeach
+				</select>
+			</div>
+		</div>
+        <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
+            <label for="subject"><b>Tarikh & Masa Dikeluarkan <code>*</code></b></label>
+            <div class="form-group">
+                <div class="form-group">
+                    <input type="datetime-local" name="tarikh_dikeluarkan"  value="{{ date('Y-m-d\TH:i', strtotime($compound->created_c)) }}" class="form-control">
+                </div>
+            </div>
+        </div>
+    </div>
+    <hr>
+    <div class="row clearfix">
+        <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
+            <button type="submit" name="hantar" id="hantar" class="btn btn-md btn-outline-danger waves-effect f-right"> Kemaskini Kompaun</button>
+        </div>
+    </div>
+</form>

resources/views/main-dashboard/compound/_edit_type/petak.blade.php

@@ -0,0 +1,164 @@
+<form action="{{ url('/main/manual/edit/compound') }}" class="main cussPayment" method="POST" enctype="multipart/form-data">
+    <input type="hidden" name="_token" id="csrf-token" value="{{ Session::token() }}" />
+    <input type="hidden" name="_id" id="_id-token" value="{{ $compound->_id }}" />
+
+    <div class="row clearfix">
+        <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
+            <label for="subject"><b>No.KPD <code>*</code></b></label>
+            <div class="form-group">
+                <div class="form-line">
+                    <input type="text" id="kpd" name="kpd" class="form-control" value="{{ $compound->kpd }}" readonly>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <div class="row clearfix">
+        <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
+            <label for="subject"><b>Seksyen Kesalahan <code>*</code></b></label>
+            <div class="form-group">
+                <div class="form-line">
+                    <select id="seksyen" name="seksyen" class="js-section form-control" multiple="multiple" required>
+                        @foreach($faulty as $f)
+                            @if($f->_id == $compound->Faulty->_id)
+                                <option value="{{ $f->_id }}" selected>[{{ $f->sketr }}] {{$f->nama}}</option>
+                            @else
+                                <option value="{{ $f->_id }}">[{{ $f->sketr }}] {{$f->nama}}</option>
+                            @endif
+                        @endforeach
+                    </select>
+                    {{-- <textarea id="seksyen" name="seksyen" class="form-control" value="" readonly>[{{ $compound->Faulty->sketr }}] {{ $compound->Faulty->nama}}</textarea> --}}
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="row clearfix">
+        <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
+            <label for="subject"><b>Akta Kesalahan <code>*</code></b></label>
+            <div class="form-group">
+                <div class="form-line">
+                    <input type="text" id="akta" name="akta" class="form-control" value="{{ $compound->Deedlaw->nama }}" readonly>
+                </div>
+            </div>
+        </div>
+        <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
+            <label for="subject"><b>Jabatan <code>*</code></b></label>
+            <div class="form-group">
+                <div class="form-line">
+                    <input type="text" id="jabatan" name="jabatan" class="form-control" value="{{ $compound->Department->jnama }}" readonly>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <hr style="border-top: 2px dotted #8c8b8b;">
+
+    <div class="row clearfix">
+        <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
+            <label for="subject"><b>No.Plat <code>*</code></b></label>
+            <div class="form-group">
+                <div class="form-line">
+                    <input type="text" id="no_plate" name="no_plate" class="form-control" value="{{$compound->no_plate }}" required="">
+                </div>
+            </div>
+        </div>
+
+        <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
+            <label for="subject"><b>No. Cukai Jalan <code>*</code></b></label>
+            <div class="form-group">
+                <div class="form-line">
+                    <input type="text" id="noCukaijalan" name="noCukaijalan" class="form-control" value="{{$compound->no_cukai_jalan }}" required="">
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="row clearfix">
+        <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
+            <label for="subject"><b>Model Kenderaan <code>*</code></b></label>
+            <div class="form-group">
+                <div class="form-line">
+                    <input type="text" id="modelKenderaan" name="modelKenderaan" class="form-control" value="{{$compound->model_kenderaan }}" required="">
+                </div>
+            </div>
+        </div>
+        <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
+            <label for="subject"><b>Jenis Kenderaan <code>*</code></b></label>
+            <div class="form-group">
+                <div class="form-line">
+                    <input type="text" id="jenisKenderaan" name="jenisKenderaan" class="form-control" value="{{ $compound->jenis_kenderaan }}" required="">
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="row clearfix">
+        <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
+            <label for="subject"><b>Warna Kenderaan <code>*</code></b></label>
+            <div class="form-group">
+                <div class="form-line">
+                    <input type="text" id="warnakenderaan" name="warnakenderaan" class="form-control" value="{{$compound->warna_kenderaan }}" required="">
+                </div>
+            </div>
+        </div>
+        <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
+            <label for="subject"><b>No.Parkir<code>*</code></b></label>
+            <div class="form-group">
+                <div class="form-line">
+                    <input type="text" id="noParking" name="noParking" class="form-control" value="{{$compound->no_parking }}" required="">
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="row clearfix">
+        <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
+            <label for="subject"><b>Nama Jalan<code>*</code></b></label>
+            <div class="form-group">
+                <div class="form-line">
+                    <input type="text" id="namaJalan" name="namaJalan" class="form-control" value="{{$compound->nama_jalan }}" required="">
+                </div>
+            </div>
+        </div>
+        <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
+            <label for="subject"><b>Nama Taman <code>*</code></b></label>
+            <div class="form-group">
+                <div class="form-line">
+                    <input type="text" id="namaTaman" name="namaTaman" class="form-control" value="{{$compound->nama_taman }}" required="" readonly>
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="row clearfix">
+        <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
+			<label for="subject"><b>Nama Kawasan <code>*</code></b></label>
+			<div class="form-group">
+				<div class="form-line">
+                    <div class="form-line">
+                        <input type="text" id="namaKawasan2" name="namaKawasan" class="form-control" value="{{$compound->nama_kawasan }}" required readonly>
+                    </div>
+				</div>
+			</div>
+		</div>
+        <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
+            <label for="subject"><b>Tarikh & Masa Dikeluarkan <code>*</code></b></label>
+            <div class="form-group">
+                <div class="form-group">
+                    <input type="datetime-local" name="tarikh_dikeluarkan"  value="{{ date('Y-m-d\TH:i', strtotime($compound->created_at)) }}" class="form-control">
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="row clearfix">
+        <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
+            <label for="subject"><b>Nota</b></label>
+            <div class="form-group">
+                <input type="text" name="catatan" class="form-control" value="{{$compound->catatan}} " required/>
+                <code>Sila gunakan '-' jika tidak berkaitan</code>
+            </div>
+        </div>
+    </div>
+    <hr>
+    <div class="row clearfix">
+        <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
+            <button type="submit" name="hantar" id="hantar" class="btn btn-md btn-outline-danger waves-effect f-right"> Kemaskini Kompaun</button>
+        </div>
+    </div>
+</form>

resources/views/main-dashboard/compound/_type/pelbagai_JPB.blade.php

@@ -136,7 +136,7 @@
 		<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
 			<label for="subject"><b>Alamat Tempat Kesalahan</b></label>
 			<div class="form-group">
-				<input type="text" name="lokasi_kejadian" class="form-control" value="-" />
+				<textarea type="text" name="lokasi_kejadian" class="form-control" value="-" ></textarea>
 				<code>Sila gunakan '-' jika tidak berkaitan</code>
 			</div>
         </div>
@@ -175,7 +175,6 @@
 				</div>
 			</div>
 		</div>
-
     </div>
 	<div class="row clearfix">
 		<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">

resources/views/main-dashboard/compound/_type/pelbagai_KT.blade.php

@@ -122,7 +122,7 @@
 		<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
 			<label for="subject"><b>Alamat Tempat Kesalahan</b></label>
 			<div class="form-group">
-				<input type="text" name="lokasi_kejadian" class="form-control" value="-" />
+				<textarea type="text" name="lokasi_kejadian" class="form-control" value="-" ></textarea>
 				<code>Sila gunakan '-' jika tidak berkaitan</code>
 			</div>
         </div>

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

@@ -1,620 +1,286 @@
-@extends('layout.master', ['uid' => $user->_id, 'token' => $user->token_firebase])
-@section('page_title', 'Kompaun')
-@section('sub_page_title', '')
-@section('name', $user->StaffDetail->full_name)
-@section('img_profile', $user->StaffDetail->profile_img)
-
-@section('content')
-<style type="text/css">
-	select.form-control, select.form-control:focus, select.form-control:hover { 
-		border: 1px solid #ccc !important;
-		height: auto !important;
-	}
-
-	.panel-group .panel {
-	    margin-bottom: 0;
-	    overflow: hidden;
-	    border-radius: 4px;
-	}
-	.panel-default {
-    	border-color: #ddd;
-	}
-	.panel-default>.panel-heading {
-	    color: #333;
-	    background-color: #f5f5f5;
-	    border-color: #ddd;
-	}
-	.panel-title {
-	    margin-top: 0;
-	    margin-bottom: 0;
-	    font-size: 16px;
-	    color: inherit;
-	}
-
-	.panel-body .table>thead>tr>th, .panel-body .table>tbody>tr>th, .panel-body .table>tfoot>tr>th, .panel-body .table>thead>tr>td, .panel-body .table>tbody>tr>td, .panel-body .table>tfoot>tr>td , .panel-body div{
-	    padding: 8px 15px;
-	    line-height: 1.428571429;
-	    vertical-align: top;
-	    border-top: 1px solid #ddd;
-	}
-	.glyphicon { margin-right:10px; }
-	.panel-body { padding:0px; }
-	.panel-body table tr td { padding-left: 15px }
-	.panel-body table tr td a:hover , .panel-body div a:hover{ color: #d84315 !important; }
-	.panel-body .table, .panel-body div {margin-bottom: 0px; }
-
-	.active { color: #d84315; }
-	.active:hover { color: #d84315; }
-</style>
-
-<div class="inner-page">
-	<div class="row">
-		<div class="col-md-10 offset-1">
-			<div class="fluid">
-				@if(count($errors) > 0)
-				<div class="alert alert-danger icons-alert">
-					@foreach($errors->all() as $error)
-					<p>{{$error}}</p>
-					@endforeach
-				</div>
-				@endif
-
-				@if(Session::get('error_msg'))
-				<div class="alert alert-danger icons-alert">
-					{!! Session::get('error_msg') !!}
-				</div>
-				@elseif(Session::get('success_msg'))
-				<div class="alert alert-success icons-alert">
-					{!! Session::get('success_msg') !!}
-				</div>
-				@endif
-			</div>
-		</div>
-	</div>
-
-	<div class="row">
-
-		<div class="col-xl-10 col-md-12 offset-1">
-
-			<div class="row">
-				<div class="col-sm-12">
-					<div class="card">
-						<div class="card-header">
-							<h5>Kemaskini Maklumat Kompaun</h5>
-						</div>
-						<div class="card-block">
-							<div id="pelbagai">
-								<form action="{{ url('/main/manual/edit/compound') }}" class="main cussPayment" method="POST" enctype="multipart/form-data">
-									<input type="hidden" name="_token" id="csrf-token" value="{{ Session::token() }}" />
-									<input type="hidden" name="_id" id="_id-token" value="{{ $compound->_id }}" />
-								
-									<div class="row clearfix">
-										<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
-											<label for="subject"><b>No.KPD <code>*</code></b></label>
-											<div class="form-group">
-												<div class="form-line">
-													<input type="text" id="kpd" name="kpd" class="form-control" value="{{ $compound->kpd }}" readonly>
-												</div>
-											</div>
-										</div>
-									</div>
-
-									<div class="row clearfix">
-										<div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
-											<label for="subject"><b>Seksyen Kesalahan <code>*</code></b></label>
-											<div class="form-group">
-												<div class="form-line">
-													<textarea id="seksyen" name="seksyen" class="form-control" value="" readonly>[{{ $compound->Faulty->sketr }}] {{ $compound->Faulty->nama}}</textarea>
-												</div>
-											</div>
-										</div>
-									</div>
-
-									<div class="row clearfix">
-										<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
-											<label for="subject"><b>Jabatan <code>*</code></b></label>
-											<div class="form-group">
-												<div class="form-line">
-													<input type="text" id="jabatan1" name="jabatan" class="form-control" value="{{ $compound->Department->jnama }}" readonly>
-												</div>
-											</div>
-										</div>
-										<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
-											<label for="subject"><b>Akta Kesalahan <code>*</code></b></label>
-											<div class="form-group">
-												<div class="form-line">
-													<input type="text" id="akta1" name="akta" class="form-control" value="{{ $compound->Deedlaw->nama }}" readonly>
-												</div>
-											</div>
-										</div>
-									</div>
-		
-									<hr style="border-top: 2px dotted #8c8b8b;">
-									<div class="row clearfix">
-										<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
-											<label for="subject"><b>Nama</b></label>
-											<div class="form-group">
-												<div class="form-line">
-													<input type="text" id="namaP" name="namaP" class="form-control" value="{{ $compound->nama }}" required="">
-													<code>Sila gunakan '-' jika tidak berkaitan</code>
-												</div>
-											</div>
-										</div>								
-										<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
-											<label for="subject"><b>Identity</b></label>
-											<div class="form-group">
-												<div class="form-line">
-													<input type="text" id="noIc" name="noIc" class="form-control" value="{{ $compound->identity }}" required="">
-													<code>Sila gunakan '-' jika tidak berkaitan</code>
-												</div>
-											</div>
-										</div>							
-									</div>			
-									<div class="row clearfix">
-										<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
-											<label for="subject"><b>Nama Syarikat</b></label>
-											<div class="form-group">
-												<div class="form-line">
-													<input type="text" id="namaS" name="namaS" class="form-control" placeholder="Syarikat Sdn Bhd" value="{{ $compound->nama_syarikat }}" required="">
-													<code>Sila gunakan '-' jika tidak berkaitan</code>
-												</div>
-											</div>
-										</div>								
-										<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
-											<label for="subject"><b>Daftar No.Syarikat</b></label>
-											<div class="form-group">
-												<div class="form-line">
-													<input type="text" id="daftarNo" name="daftarNo" class="form-control" value="{{ $compound->no_daftar_syarikat }}" required="">
-													<code>Sila gunakan '-' jika tidak berkaitan</code>
-												</div>
-											</div>
-										</div>							
-									</div>
-									<div class="row clearfix">
-										<div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
-											<label for="subject"><b>Alamat</b></label>
-											<div class="form-group">
-												<div class="form-line">
-													<textarea type="text" id="alamat" name="alamat" class="form-control" placeholder="Alamat" required>{{ $compound->alamat }}</textarea>
-													<code>Sila gunakan '-' jika tidak berkaitan</code>
-												</div>
-											</div>
-										</div>
-									</div>	
-
-									<div class="row clearfix">
-										<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
-											<label for="subject"><b>No.Tel </b></label>
-											<div class="form-group">
-												<div class="form-line">
-													<input type="text" id="tel" name="tel" class="form-control" value="{{ $compound->no_telefon }}" />
-												</div>
-												<code>Sila gunakan '-' jika tidak berkaitan</code>
-											</div>
-										</div>
-										<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
-											<label for="subject"><b>No. Akaun Lesen</b></label>
-											<div class="form-group">
-												<div class="form-line">
-													<input type="text" id="lesen" name="lesen" class="form-control" value="{{ $compound->no_akaun_lesen }}" />
-												</div>
-												<code>Sila gunakan '-' jika tidak berkaitan</code>
-											</div>
-										</div>
-									</div>
-
-									<div class="row clearfix">
-										<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
-											<label for="subject"><b>No.Plat <code>*</code></b></label>
-											<div class="form-group">
-												<div class="form-line">
-													<input type="text" id="no_plate" name="no_plate" class="form-control" value="{{ $compound->no_plate }}" />
-												</div>
-												<code>Sila gunakan '-' jika tidak berkaitan</code>
-											</div>
-										</div>
-										
-										<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
-											<label for="subject"><b>No. Cukai Jalan <code>*</code></b></label>
-											<div class="form-group">
-												<div class="form-line">
-													<input type="text" id="noCukaijalan" name="noCukaijalan" class="form-control" value="{{ $compound->no_cukai_jalan }}" />
-												</div>
-												<code>Sila gunakan '-' jika tidak berkaitan</code>
-											</div>
-										</div>
-									</div>
-
-									<!-- <div class="row clearfix">
-										<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
-											<label for="subject"><b>Dikeluarkan Oleh <code>*</code></b></label>
-											<div class="form-group">
-												<select id="staff" name="staff" class="js-section form-control" multiple="multiple" required>
-													<option value="">Sila pilih penguatkuasa</option>
-													@foreach($staff as $s)
-													<option value="{{ $s->_id}}">[{{ $s->no_badan }}] {{ $s->full_name }}</option>
-													@endforeach
-												</select>
-											</div>
-										</div>
-
-										<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
-											<label for="subject"><b>Tarikh & Masa Dikeluarkan <code>*</code></b></label>
-											<div class="form-group">
-												<div class="form-group">
-													<input type="datetime-local" name="tarikh_dikeluarkan"  value="{{ old('tarikh_mula')}}" class="form-control" required="">
-												</div>
-											</div>
-										</div>
-									</div> -->
-
-									<div class="row clearfix">
-										<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
-											<label for="subject"><b>Lokasi kejadian</b></label>
-											<div class="form-group">
-												<input type="text" name="lokasi_kejadian" class="form-control" value="{{ $compound->lokasi_kejadian }}" />
-												<code>Sila gunakan '-' jika tidak berkaitan</code>
-											</div>
-										</div>
-										<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
-											<label for="subject"><b>Butiran Kesalahan</b></label>
-											<div class="form-group">
-												<input type="text" name="butiran_kesalahan" class="form-control" value="{{$compound->catatan }}" required/>
-												<code>Sila gunakan '-' jika tidak berkaitan</code>
-											</div>
-										</div>
-									</div>	
-
-									<div class="row clearfix">
-										<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
-											<label for="subject"><b>Tarikh & Masa Dikeluarkan <code>*</code></b></label>
-											<div class="form-group">
-												<div class="form-group">
-													<input type="datetime-local" name="tarikh_dikeluarkan"  value="{{ date('Y-m-d\TH:i', strtotime($compound->created_at)) }}" class="form-control">
-												</div>
-											</div>
-										</div>
-										<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
-											<label for="subject"><b>Catatan</b></label>
-											<div class="form-group">
-												<input type="text" name="catatan" class="form-control" value="{{$compound->maklumat_tambahan }}" required/>
-												<code>Sila gunakan '-' jika tidak berkaitan</code>
-											</div>
-										</div>
-									</div>		
-									<hr>
-									<div class="row clearfix">
-										<div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
-											<button type="submit" name="hantar" id="hantar" class="btn btn-md btn-outline-danger waves-effect f-right"> Kemaskini Kompaun</button>
-										</div>
-									</div>	
-								</form>
-							</div>	
-
-							<div id="petak">
-								<form action="{{ url('/main/manual/edit/compound') }}" class="main cussPayment" method="POST" enctype="multipart/form-data">
-									<input type="hidden" name="_token" id="csrf-token" value="{{ Session::token() }}" />
-									<input type="hidden" name="_id" id="_id-token" value="{{ $compound->_id }}" />
-											
-									<div class="row clearfix">
-										<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
-											<label for="subject"><b>No.KPD <code>*</code></b></label>
-											<div class="form-group">
-												<div class="form-line">
-													<input type="text" id="kpd" name="kpd" class="form-control" value="{{ $compound->kpd }}" readonly>
-												</div>
-											</div>
-										</div>
-									</div>
-
-									<div class="row clearfix">
-										<div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
-											<label for="subject"><b>Seksyen Kesalahan <code>*</code></b></label>
-											<div class="form-group">
-												<div class="form-line">
-													<textarea id="seksyen" name="seksyen" class="form-control" value="" readonly>[{{ $compound->Faulty->sketr }}] {{ $compound->Faulty->nama}}</textarea>
-												</div>
-											</div>
-										</div>
-									</div>
-
-									<div class="row clearfix">
-										<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
-											<label for="subject"><b>Jabatan <code>*</code></b></label>
-											<div class="form-group">
-												<div class="form-line">
-													<input type="text" id="jabatan1" name="jabatan" class="form-control" value="{{ $compound->Department->jnama }}" readonly>
-												</div>
-											</div>
-										</div>
-										<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
-											<label for="subject"><b>Akta Kesalahan <code>*</code></b></label>
-											<div class="form-group">
-												<div class="form-line">
-													<input type="text" id="akta1" name="akta" class="form-control" value="{{ $compound->Deedlaw->nama }}" readonly>
-												</div>
-											</div>
-										</div>
-									</div>
-
-									<hr style="border-top: 2px dotted #8c8b8b;">
-
-									<div class="row clearfix">
-										<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
-											<label for="subject"><b>No.Plat <code>*</code></b></label>
-											<div class="form-group">
-												<div class="form-line">
-													<input type="text" id="no_plate" name="no_plate" class="form-control" value="{{$compound->no_plate }}" required="">
-												</div>
-											</div>
-										</div>
-
-										<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
-											<label for="subject"><b>No. Cukai Jalan <code>*</code></b></label>
-											<div class="form-group">
-												<div class="form-line">
-													<input type="text" id="noCukaijalan" name="noCukaijalan" class="form-control" value="{{$compound->no_cukai_jalan }}" required="">
-												</div>
-											</div>
-										</div>
-									</div>	
-
-									<div class="row clearfix">
-										<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
-											<label for="subject"><b>Model Kenderaan <code>*</code></b></label>
-											<div class="form-group">
-												<div class="form-line">
-													<input type="text" id="modelKenderaan" name="modelKenderaan" class="form-control" value="{{$compound->model_kenderaan }}" required="">
-												</div>
-											</div>
-										</div>
-
-										<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
-											<label for="subject"><b>Jenis Kenderaan <code>*</code></b></label>
-											<div class="form-group">
-												<div class="form-line">
-													<input type="text" id="jenisKenderaan" name="jenisKenderaan" class="form-control" value="{{ $compound->jenis_kenderaan }}" required="">
-												</div>
-											</div>
-										</div>
-									</div>	
-
-									<div class="row clearfix">
-										<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
-											<label for="subject"><b>Warna Kenderaan <code>*</code></b></label>
-											<div class="form-group">
-												<div class="form-line">
-													<input type="text" id="warnakenderaan" name="warnakenderaan" class="form-control" value="{{$compound->warna_kenderaan }}" required="">
-												</div>
-											</div>
-										</div>
-
-										<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
-											<label for="subject"><b>No.Parkir<code>*</code></b></label>
-											<div class="form-group">
-												<div class="form-line">
-													<input type="text" id="noParking" name="noParking" class="form-control" value="{{$compound->no_parking }}" required="">
-												</div>
-											</div>
-										</div>
-									</div>
-
-									<div class="row clearfix">
-										<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
-											<label for="subject"><b>Nama Taman <code>*</code></b></label>
-											<div class="form-group">
-												<div class="form-line">
-													<input type="text" id="namaTaman" name="namaTaman" class="form-control" value="{{$compound->nama_taman }}" required="">
-												</div>
-											</div>
-										</div>
-
-										<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
-											<label for="subject"><b>Nama Jalan<code>*</code></b></label>
-											<div class="form-group">
-												<div class="form-line">
-													<input type="text" id="namaJalan" name="namaJalan" class="form-control" value="{{$compound->nama_jalan }}" required="">
-												</div>
-											</div>
-										</div>
-									</div>	
-
-									<!-- <div class="row clearfix">
-										<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
-											<label for="subject"><b>Dikeluarkan Oleh <code>*</code></b></label>
-											<div class="form-group">
-												<select id="staff1" name="staff" class="js-section form-control" multiple="multiple" required>
-													<option value="">Sila pilih penguatkuasa</option>
-													@foreach($staff as $s)
-													<option value="{{ $s->_id}}">[{{ $s->no_badan }}] {{ $s->full_name }}</option>
-													@endforeach
-												</select>
-											</div>
-										</div>
-
-										<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
-											<label for="subject"><b>Tarikh & Masa Dikeluarkan <code>*</code></b></label>
-											<div class="form-group">
-												<div class="form-group">
-													<input type="datetime-local" name="tarikh_dikeluarkan"  value="{{ old('tarikh_mula')}}" class="form-control">
-												</div>
-											</div>
-										</div>
-									</div> -->
-
-									<div class="row clearfix">
-										<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
-											<label for="subject"><b>Lokasi kejadian</b></label>
-											<div class="form-group">
-												<input type="text" name="lokasi_kejadian" class="form-control" value="{{$compound->lokasi_kejadian }}" />
-												<code>Sila gunakan '-' jika tidak berkaitan</code>
-											</div>
-										</div>
-										<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
-											<label for="subject"><b>Butiran Kesalahan</b></label>
-											<div class="form-group">
-												<input type="text" name="butiran_kesalahan" class="form-control" value="{{$compound->catatan }}" required />
-												<code>Sila gunakan '-' jika tidak berkaitan</code>
-											</div>
-										</div>
-									</div>	
-
-									<div class="row clearfix">
-										<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
-											<label for="subject"><b>Tarikh & Masa Dikeluarkan <code>*</code></b></label>
-											<div class="form-group">
-												<div class="form-group">
-													<input type="datetime-local" name="tarikh_dikeluarkan"  value="{{ date('Y-m-d\TH:i', strtotime($compound->created_at)) }}" class="form-control">
-												</div>
-											</div>
-										</div>
-										<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
-											<label for="subject"><b>Catatan</b></label>
-											<div class="form-group">
-												<input type="text" name="catatan" class="form-control" value="{{$compound->maklumat_tambahan }}" required/>
-												<code>Sila gunakan '-' jika tidak berkaitan</code>
-											</div>
-										</div>
-									</div>
-
-									<hr>
-									<div class="row clearfix">
-										<div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
-											<button type="submit" name="hantar" id="hantar" class="btn btn-md btn-outline-danger waves-effect f-right"> Kemaskini Kompaun</button>
-										</div>
-									</div>	
-								</form>	
-							</div>
-						</div>
-					</div>
-				</div>
-			</div>
-		</div>
-	</div>
-</div>
-@endsection
-
-@section('external_js')
-
-<script type="text/javascript">
-
-	var ellipsis = "...";
-	function TrimLength(text, maxLength)
-	{
-	    text = $.trim(text);
-
-	    if (text.length > maxLength)
-	    {
-	        text = text.substring(0, maxLength - ellipsis.length)
-	        return text.substring(0, text.lastIndexOf(" ")) + ellipsis;
-	    }
-	    else
-	        return text;
-	}
-
-	$.ajaxSetup({
-		headers: {
-			'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content')
-		}
-	});
-
-	$(document).ready(function() {
-
-		$('#pelbagai').hide();
-		$('#petak').hide();
-
-		var origin   = window.location.origin; 
-
-		$(".theme-loader").animate({
-			opacity: "0"
-		},1000);
-
-		setTimeout(function() {
-			$(".theme-loader").remove();
-		}, 800);
-
-		$('[data-toggle="tooltip"]').tooltip();
-
-		// $('#seksyen').change(function(){
-		// 	if( $(this).val()==""){
-		// 		$("#jabatan").prop("checked", false);
-		// 		$('#jabatan').empty();
-		// 		$('#jabatan').append('<option value="">Sila pilih jabatan</option>');
-
-		// 		$("#akta").val('-');
-		// 	}
-		// 	else {
-		// 		$('#jabatan').empty();
-		// 		$('#jabatan').append('<option value="">Sila pilih jabatan</option>');
-
-		// 		$.ajax({
-		//             type: "GET",
-		//             url: "{{ url('api/filter-department-based-faulty') }}"+"/"+$(this).val(),
-		//             success: function(result){
-		//                 $.each(result.data, function(i, d) {
-		//                     $('#jabatan').append('<option value="' + d._id + '">' + d.nama + '</option>');
-		//                     $('#jabatan').prop('required',true);
-		//                 });
-		//             }
-		//         });
-
-		//         $.ajax({
-		//             type: "GET",
-		//             url: "{{ url('api/get-deedlaw-based-faulty') }}"+"/"+$(this).val(),
-		//             success: function(result){
-		//             	$("#akta").val(result.data);
-		//             }
-		//         });
-		// 	}
-		// });
-
-
-		// $('#seksyen1').change(function(){
-		// 	if( $(this).val()==""){
-		// 		$("#jabatan1").prop("checked", false);
-		// 		$('#jabatan1').empty();
-		// 		$('#jabatan1').append('<option value="">Sila pilih jabatan</option>');
-
-		// 		$("#akta1").val('-');
-		// 	}
-		// 	else {
-		// 		$('#jabatan1').empty();
-		// 		$('#jabatan1').append('<option value="">Sila pilih jabatan</option>');
-
-		// 		$.ajax({
-		//             type: "GET",
-		//             url: "{{ url('api/filter-department-based-faulty') }}"+"/"+$(this).val(),
-		//             success: function(result){
-		//                 $.each(result.data, function(i, d) {
-		//                     $('#jabatan1').append('<option value="' + d._id + '">' + d.nama + '</option>');
-		//                     $('#jabatan1').prop('required',true);
-		//                 });
-		//             }
-		//         });
-
-		//         $.ajax({
-		//             type: "GET",
-		//             url: "{{ url('api/get-deedlaw-based-faulty') }}"+"/"+$(this).val(),
-		//             success: function(result){
-		//             	$("#akta1").val(result.data);
-		//             }
-		//         });
-		// 	}
-		// });
-
-		var jenis = '{{ $compound->jenis }}';
-		if(jenis == "Pelbagai"){
-			$('#petak').hide();
-			$('#pelbagai').show();
-		}else if(jenis == "Parkir"){
-			$('#pelbagai').hide();
-			$('#petak').show();
-		}
-
-		//Limited Numbers
-	    $(".js-section").select2({
-	        maximumSelectionLength: 1
-	    });
-	});
-</script>
-@endsection
+@extends('layout.master', ['uid' => $user->_id, 'token' => $user->token_firebase])
+@section('page_title', 'Kompaun')
+@section('sub_page_title', '')
+@section('name', $user->StaffDetail->full_name)
+@section('img_profile', $user->StaffDetail->profile_img)
+
+@section('content')
+<style type="text/css">
+	select.form-control, select.form-control:focus, select.form-control:hover {
+		border: 1px solid #ccc !important;
+		height: auto !important;
+	}
+
+	.panel-group .panel {
+	    margin-bottom: 0;
+	    overflow: hidden;
+	    border-radius: 4px;
+	}
+	.panel-default {
+    	border-color: #ddd;
+	}
+	.panel-default>.panel-heading {
+	    color: #333;
+	    background-color: #f5f5f5;
+	    border-color: #ddd;
+	}
+	.panel-title {
+	    margin-top: 0;
+	    margin-bottom: 0;
+	    font-size: 16px;
+	    color: inherit;
+	}
+
+	.panel-body .table>thead>tr>th, .panel-body .table>tbody>tr>th, .panel-body .table>tfoot>tr>th, .panel-body .table>thead>tr>td, .panel-body .table>tbody>tr>td, .panel-body .table>tfoot>tr>td , .panel-body div{
+	    padding: 8px 15px;
+	    line-height: 1.428571429;
+	    vertical-align: top;
+	    border-top: 1px solid #ddd;
+	}
+	.glyphicon { margin-right:10px; }
+	.panel-body { padding:0px; }
+	.panel-body table tr td { padding-left: 15px }
+	.panel-body table tr td a:hover , .panel-body div a:hover{ color: #d84315 !important; }
+	.panel-body .table, .panel-body div {margin-bottom: 0px; }
+
+	.active { color: #d84315; }
+	.active:hover { color: #d84315; }
+</style>
+
+<div class="inner-page">
+	<div class="row">
+		<div class="col-md-10 offset-1">
+			<div class="fluid">
+				@if(count($errors) > 0)
+				<div class="alert alert-danger icons-alert">
+					@foreach($errors->all() as $error)
+					<p>{{$error}}</p>
+					@endforeach
+				</div>
+				@endif
+
+				@if(Session::get('error_msg'))
+				<div class="alert alert-danger icons-alert">
+					{!! Session::get('error_msg') !!}
+				</div>
+				@elseif(Session::get('success_msg'))
+				<div class="alert alert-success icons-alert">
+					{!! Session::get('success_msg') !!}
+				</div>
+				@endif
+			</div>
+		</div>
+	</div>
+
+	<div class="row">
+
+		<div class="col-xl-10 col-md-12 offset-1">
+
+			<div class="row">
+				<div class="col-sm-12">
+					<div class="card">
+						<div class="card-header">
+							<h5>Kemaskini Maklumat Kompaun</h5>
+						</div>
+						<div class="card-block">
+                            <div id="pelbagai">
+								@include('main-dashboard.compound._edit_type.pelbagai')
+							</div>
+							<div id="petak">
+								@include('main-dashboard.compound._edit_type.petak')
+							</div>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
+@endsection
+
+@section('external_js')
+
+<script type="text/javascript">
+
+	var ellipsis = "...";
+	function TrimLength(text, maxLength)
+	{
+	    text = $.trim(text);
+
+	    if (text.length > maxLength)
+	    {
+	        text = text.substring(0, maxLength - ellipsis.length)
+	        return text.substring(0, text.lastIndexOf(" ")) + ellipsis;
+	    }
+	    else
+	        return text;
+	}
+
+	$.ajaxSetup({
+		headers: {
+			'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content')
+		}
+	});
+
+	$(document).ready(function() {
+
+		$('#pelbagai').hide();
+		$('#petak').hide();
+
+		var origin   = window.location.origin;
+
+		$(".theme-loader").animate({
+			opacity: "0"
+		},1000);
+
+		setTimeout(function() {
+			$(".theme-loader").remove();
+		}, 800);
+
+		$('[data-toggle="tooltip"]').tooltip();
+
+        var jenis = '{{ $compound->jenis }}';
+        if(jenis != "Parkir")
+        {
+            $('#petak').hide();
+			$('#pelbagai').show();
+        }
+        else if(jenis == "Parkir")
+        {
+            $('#pelbagai').hide();
+			$('#petak').show();
+        }
+
+		// if(jenis == "Pelbagai"){
+		// 	$('#petak').hide();
+		// 	$('#pelbagai').show();
+		// }else if(jenis == "Parkir"){
+		// 	$('#pelbagai').hide();
+		// 	$('#petak').show();
+        // }
+
+        //Kompaun Parking
+		$('#seksyen').change(function(){
+			if( $(this).val()==""){
+				$("#jabatan").prop("checked", false);
+				$('#jabatan').empty();
+				$('#jabatan').append('<option value="">Sila pilih jabatan</option>');
+
+				$("#akta").val('-');
+			}
+			else {
+				$('#jabatan').empty();
+				$('#jabatan').append('<option value="">Sila pilih jabatan</option>');
+
+				$.ajax({
+		            type: "GET",
+                    url: "{{ url('api/filter-department-based-faulty') }}"+"/"+$(this).val(),
+		            success: function(result){
+                        $("#jabatan").val(result.data);
+		            }
+		        });
+
+		        $.ajax({
+		            type: "GET",
+		            url: "{{ url('api/get-deedlaw-based-faulty') }}"+"/"+$(this).val(),
+		            success: function(result){
+		            	$("#akta").val(result.data);
+		            }
+		        });
+			}
+		});
+
+        $('#namaJalan').change(function(){
+			if( $(this).val()==""){
+				$("#namaKawasan").prop("checked", false);
+				$('#namaKawasan').empty();
+				$('#namaKawasan').val('-');
+
+				$("#namaTaman").val('-');
+			}
+			else {
+
+				$.ajax({
+		            type: "GET",
+		            url: "{{ url('api/filter-taman') }}"+"/"+$(this).val(),
+		            success: function(result){
+		                $("#namaTaman").val(result.data);
+		            }
+		        });
+
+		        $.ajax({
+		            type: "GET",
+		            url: "{{ url('api/filter-kawasan') }}"+"/"+$(this).val(),
+		            success: function(result){
+		            	$("#namaKawasan").val(result.data);
+		            }
+		        });
+			}
+		});
+
+        //Kompaun Pelbagai
+		$('#seksyen2').change(function(){
+			if( $(this).val()==""){
+				$("#jabatan2").prop("checked", false);
+				$('#jabatan2').empty();
+				$('#jabatan2').append('<option value="">Sila pilih jabatan</option>');
+
+				$("#akta2").val('-');
+			}
+			else {
+				$('#jabatan2').empty();
+				$('#jabatan2').append('<option value="">Sila pilih jabatan</option>');
+
+				$.ajax({
+		            type: "GET",
+		            url: "{{ url('api/filter-department-based-faulty') }}"+"/"+$(this).val(),
+		            success: function(result){
+                        $("#jabatan2").val(result.data);
+		            }
+		        });
+
+		        $.ajax({
+		            type: "GET",
+		            url: "{{ url('api/get-deedlaw-based-faulty') }}"+"/"+$(this).val(),
+		            success: function(result){
+		            	$("#akta2").val(result.data);
+		            }
+		        });
+			}
+		});
+
+        $('#namaJalan2').change(function(){
+			if( $(this).val()==""){
+				$("#namaKawasan2").prop("checked", false);
+				$('#namaKawasan2').empty();
+				$('#namaKawasan2').val('-');
+
+				$("#namaTaman2").val('-');
+			}
+			else {
+
+				$.ajax({
+		            type: "GET",
+		            url: "{{ url('api/filter-taman') }}"+"/"+$(this).val(),
+		            success: function(result){
+		                $("#namaTaman2").val(result.data);
+		            }
+		        });
+
+		        $.ajax({
+		            type: "GET",
+		            url: "{{ url('api/filter-kawasan') }}"+"/"+$(this).val(),
+		            success: function(result){
+		            	$("#namaKawasan2").val(result.data);
+		            }
+		        });
+			}
+		});
+
+		//Limited Numbers
+	    $(".js-section").select2({
+	        maximumSelectionLength: 1
+	    });
+	});
+</script>
+@endsection

resources/views/main-dashboard/compound_detail/part/compound_parkir.blade.php

@@ -10,32 +10,44 @@
                 <span class="form-bar"></span>
             </div>
         </div>
-
         <div class="col-lg-6 col-md-6">
             <div class="form-group form-primary">
-                <label class="float-label"><b>Akta/UUK:</b></label>
-                <input name="akta_uuk" class="form-control" readonly="" value="{{ $faulty->Deedlaw->nama }}"/>
+                <label class="float-label"><b>Jabatan:</b></label>
+                <input name="akta_uuk" class="form-control" readonly="" value="{{ $faulty->Department['0']->jnama }}"/>
                 <span class="form-bar"></span>
             </div>
         </div>
     </div>
 
     <div class="row">
-        <div class="col-lg-12 col-md-12">
+        <div class="col-lg-6 col-md-6">
+            <div class="form-group form-primary">
+                <label class="float-label"><b>Akta/UUK:</b></label>
+                <input name="akta_uuk" class="form-control" readonly="" value="{{ $faulty->Deedlaw->nama }}"/>
+                <span class="form-bar"></span>
+            </div>
+        </div>
+        <div class="col-lg-6 col-md-6">
             <div class="form-group form-primary">
                 <label class="float-label"><b>Seksyen Kesalahan:</b></label>
-                <textarea name="seksyen" class="form-control" readonly="">[{{ $faulty->sketr }}] {{ $faulty->nama }}
-                </textarea>
+                <textarea name="seksyen" class="form-control" readonly="">[{{ $faulty->sketr }}] {{ $faulty->nama }}</textarea>
                 <span class="form-bar"></span>
             </div>
         </div>
     </div>
 
     <div class="row">
-        <div class="col-lg-12 col-md-12">
+        <div class="col-lg-6 col-md-6">
             <div class="form-group form-primary">
                 <label class="float-label"><b>Jumlah Kompaun:</b></label>
-                <input name="total" class="form-control" readonly="" value="RM {{ $total }}">
+                <input name="total" class="form-control" readonly="" value="RM {{ $compound->jumlah_asal_kompaun }}">
+                <span class="form-bar"></span>
+            </div>
+        </div>
+        <div class="col-lg-6 col-md-6">
+            <div class="form-group form-primary">
+                <label class="float-label"><b>Nota:</b></label>
+                <input name="catatan" class="form-control" readonly="" value="{{ $compound->catatan }}"/>
                 <span class="form-bar"></span>
             </div>
         </div>
@@ -83,7 +95,7 @@
     </div> -->
 
     <div class="row">
-        <div class="col-lg-4 col-md-12">
+        <div class="col-lg-6 col-md-12">
             <div class="form-group form-primary">
                 <label class="float-label"><b>No.Plat:</b></label>
                 <input type="text" name="no_plate" class="form-control" readonly=""value="{{ $compound->no_plate }}">
@@ -91,7 +103,7 @@
             </div>
         </div>
 
-        <div class="col-lg-4 col-md-12">
+        <div class="col-lg-6 col-md-12">
             <div class="form-group form-primary">
                 <label class="float-label"><b>No.Parking:</b></label>
                 <input type="text" name="no_parking" class="form-control" readonly="" value="{{ $compound->no_parking }}">
@@ -99,19 +111,13 @@
             </div>
         </div>
 
-        <div class="col-lg-4 col-md-12">
-            <div class="form-group form-primary">
-                <label class="float-label"><b>No.Cukai Jalan:</b></label>
-                <input type="text" name="no_cukai_jalan" class="form-control" readonly="" value="{{ $compound->no_cukai_jalan }}">
-                <span class="form-bar"></span>
-            </div>
-        </div>
+
     </div>
 
     <div class="row">
         <div class="col-lg-6 col-md-12">
             <div class="form-group form-primary">
-                <label class="float-label"><b>Jenis Kenderaan:</b></label>
+                <label class="float-label"><b>Model Kenderaan:</b></label>
                 <input type="text" name="model_kenderaan" class="form-control" readonly="" value="{{ $compound->model_kenderaan }}">
                 <span class="form-bar"></span>
             </div>
@@ -129,12 +135,11 @@
     <div class="row">
         <div class="col-lg-6 col-md-6">
             <div class="form-group form-primary">
-                <label class="float-label"><b>Nama Taman:</b></label>
-                <input name="nama_taman" class="form-control" readonly="" value="{{ $compound->nama_taman }}"/>
+                <label class="float-label"><b>No.Cukai Jalan:</b></label>
+                <input type="text" name="no_cukai_jalan" class="form-control" readonly="" value="{{ $compound->no_cukai_jalan }}">
                 <span class="form-bar"></span>
             </div>
         </div>
-
         <div class="col-lg-6 col-md-6">
             <div class="form-group form-primary">
                 <label class="float-label"><b>Nama Jalan:</b></label>
@@ -142,42 +147,25 @@
                 <span class="form-bar"></span>
             </div>
         </div>
-    </div>
 
-    <div class="row">
-        <div class="col-lg-6 col-md-6">
-            <div class="form-group form-primary">
-                <label class="float-label"><b>Nama Kawasan:</b></label>
-                <input name="nama_kawasan" class="form-control" readonly="" value="{{ $compound->nama_kawasan }}"/>
-                <span class="form-bar"></span>
-            </div>
-        </div>
-        <div class="col-lg-6 col-md-6">
-            <div class="form-group form-primary">
-                <label class="float-label"><b>Butiran Kesalahan:</b></label>
-                <input name="catatan" class="form-control" readonly="" value="{{ $compound->catatan }}"/>
-                <span class="form-bar"></span>
-            </div>
-        </div>
     </div>
 
     <div class="row">
         <div class="col-lg-6 col-md-6">
             <div class="form-group form-primary">
-                <label class="float-label"><b>Lokasi Kejadian:</b></label>
-                <input name="lokasi_kejadian" class="form-control" readonly="" value="{{ $compound->lokasi_kejadian }}">
+                <label class="float-label"><b>Nama Taman:</b></label>
+                <input name="nama_taman" class="form-control" readonly="" value="{{ $compound->nama_taman }}"/>
                 <span class="form-bar"></span>
             </div>
         </div>
         <div class="col-lg-6 col-md-6">
             <div class="form-group form-primary">
-                <label class="float-label"><b>Catatan:</b></label>
-                <input name="catatan" class="form-control" readonly="" value="{{ $compound->maklumat_tambahan }}"/>
+                <label class="float-label"><b>Nama Kawasan:</b></label>
+                <input name="nama_kawasan" class="form-control" readonly="" value="{{ $compound->nama_kawasan }}"/>
                 <span class="form-bar"></span>
             </div>
         </div>
     </div>
-
     <hr>
     @if($compound->latlong != '' && $compound->latlong != '-')
     <div class="row">