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

app/Http/Controllers/Main/TaskController.php

@@ -153,13 +153,17 @@ class TaskController extends Controller
 						'nama_kawasan' =>$compound->nama_kawasan,
 						'nama_taman' => $compound->nama_taman,
 						'nama_jalan' =>$compound->nama_jalan,
-						'catatan' => $compound->catatan,
-						'latlong' => $compound->latlong,
-						'jabatan' => $department->jnama,
+                        'catatan' => $compound->butiran_kesalahan_n,
+                        'lokasi_kejadian' => $compound->lokasi_kejadian,
+                        'no_daftar_syarikat' =>$compound->no_daftar_syarikat,
+                        'nama_syarikat' => $compound->nama_syarikat,
+                        'lesen' => $compound->no_akaun_lesen,
+						// 'latlong' => $compound->latlong,
+						// 'jabatan' => $department->jnama,
                         'akta' => $deedlaw->nama,
                         'seksyen' => $faulty->nama,
-						'tempoh' => $compound->tempoh,
-						'tindakan' => $compound->tindakan ?? "",
+						// 'tempoh' => $compound->tempoh,
+						// 'tindakan' => $compound->tindakan ?? "",
 						'created_n' => $compound->created_n,
 					));