From 4db1a61e0479c0cd1be843b5aa519ff5f5b67804 Mon Sep 17 00:00:00 2001
From: mahdahar <89adham@gmail.com>
Date: Mon, 22 Sep 2025 15:37:25 +0700
Subject: [PATCH] fix location show

---
 app/Controllers/Location.php       |  4 ++--
 app/Database/Seeds/DummySeeder.php | 16 ++++++++++++----
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/app/Controllers/Location.php b/app/Controllers/Location.php
index ce81c0c..0a97a48 100644
--- a/app/Controllers/Location.php
+++ b/app/Controllers/Location.php
@@ -41,8 +41,8 @@ class Location extends Controller {
     public function show($LocationID = null) {
         $rows = $this->db->table('location l')
             ->select("l.*, la.*, v.*")
-            ->join("locationaddress la", "l.LocationID=la.LocationID")
-            ->join("valueset v", "v.VSetID=12 and v.VValue=l.loctype")
+            ->join("locationaddress la", "l.LocationID=la.LocationID", "left")
+            ->join("valueset v", "v.VSetID=12 and v.VValue=l.loctype", "left")
             ->where('l.LocationID', (int) $LocationID)
             ->get()->getResultArray();
         
diff --git a/app/Database/Seeds/DummySeeder.php b/app/Database/Seeds/DummySeeder.php
index c464ef3..d32da3b 100644
--- a/app/Database/Seeds/DummySeeder.php
+++ b/app/Database/Seeds/DummySeeder.php
@@ -11,13 +11,23 @@ class DummySeeder extends Seeder {
       ['LocationID'=>1, 'LocCode'=>'QLOC', 'LocFull'=>'Dummy Location', 'LocType'=>'ROOM', 'Description'=>'Location made for dummy testing' ]
     ];
     $this->db->table('location')->insertBatch($data);
-
-    // locationAddress
     $data = [
       ['LocationID'=>1, 'Street1'=>'Jalan Nginden', 'Street2'=>'Intan Raya', 'City'=>'Surabaya', 'Province'=>'East Java', 'PostCode'=>'60222']
     ];
     $this->db->table('locationaddress')->insertBatch($data);
 
+    // contact
+    $data = [
+      ['ContactID'=>1, 'NameFirst'=>'Default', 'NameLast'=>'Doctor', 'Title'=>'', 'Initial'=>'DEFDOC', 'Birthdate'=>'', 'EmailAddress1'=>'', 'EmailAddress2'=>'',
+        'Phone'=>'', 'MobilePhone1'=>'', 'MobilePhone2'=>'', 'Specialty'=>'', 'SubSpecialty'=>'' ]
+    ];
+    $this->db->table('contact')->insertBatch($data);
+    $data = [
+      ['ContactID'=>1, 'ContactCode'=>'QDOC', 'ContactEmail'=>'qdoc@email.com', 'OccupationID'=>'', 
+        'JobTitle'=>'', 'Department'=>'', 'ContactStartDate'=>'', 'ContactEndDate'=>'' ]
+    ];
+    $this->db->table('contactdetail')->insertBatch($data);
+    
     // patient
     $data = [
       [ 'InternalPID'=>1, 'PatientID'=>'SMAJ1', 'NameFirst'=>'Dummy', 'NameLast' => 'Patient M', 'Gender'=>'1', 'BirthDate'=>'1991-09-09', 'Street_1'=>'Makati', 'IntCountryID'=>'105', 'EmailAddress1'=>'smaj1@5panda.id',
@@ -26,8 +36,6 @@ class DummySeeder extends Seeder {
         'RaceID'=>'1', 'ReligionID'=>'1', 'EthnicID'=>'1', 'DeathIndicator' => '0']
     ];
     $this->db->table('patient')->insertBatch($data);
-    
-    // patidt
     $data = [
       [ 'InternalPID'=>1, 'IdentifierType'=>'KTP', 'Identifier'=>'9901' ],
       [ 'InternalPID'=>2, 'IdentifierType'=>'KTP', 'Identifier'=>'9902' ]