From 4a3ce59b114b37a8ef05ef19095d135d917458b9 Mon Sep 17 00:00:00 2001
From: mikael-zakaria <mzi3721s@gmail.com>
Date: Sun, 8 Dec 2024 16:09:54 +0800
Subject: [PATCH] update2 NOTE pada Hasil Test -zaka edisi salah commit

---
 app/Controllers/PrinterController.php | 36 ++++++++++-----------------
 1 file changed, 13 insertions(+), 23 deletions(-)

diff --git a/app/Controllers/PrinterController.php b/app/Controllers/PrinterController.php
index 5c4d753..ae5e732 100644
--- a/app/Controllers/PrinterController.php
+++ b/app/Controllers/PrinterController.php
@@ -483,29 +483,19 @@ P1
 
     public function printResultTest($access) {
         $db = \Config\Database::connect();
-        $sql = "SELECT 
-                dc.CHAPID, 
-                dc.FULLTEXT AS chap_eng,
-                dc.FULLTEXT AS chap_ind, 
-                cr.*, 
-                cdt.TEXT1 AS test_eng, 
-                cdt.TEXT2 AS test_ind 
-            FROM 
-                cmod.dbo.CM_RESULTS cr 
-            LEFT JOIN REQUESTS r 
-                ON r.ACCESSNUMBER = cr.ACCESSNUMBER
-            LEFT JOIN cmod.dbo.CM_DICT_TESTS cdt 
-                ON cr.TESTCODE = cdt.TESTCODE
-            LEFT JOIN DICT_TESTS dt 
-                ON dt.TESTCODE = cr.TESTCODE AND dt.ENDVALIDDATE IS NULL
-            LEFT JOIN TESTS t 
-                ON t.REQUESTID = r.REQUESTID AND t.TESTID = dt.TESTID
-            LEFT JOIN DICT_CHAPTERS dc 
-                ON dc.CHAPID = dt.CHAPID AND dc.ENDVALIDDATE IS NULL
-            LEFT JOIN cmod.dbo.CM_DICT_CHAPTERS cdc 
-                ON cdc.CHAPCODE = dc.CHAPCODE
-            WHERE 
-                cr.ACCESSNUMBER = '$access' 
+        $sql = "
+            select dc.CHAPID, dc.FULLTEXT as chap_eng,dc.FULLTEXT as chap_ind, 
+            RESULT=case when cr.RESTYPE in('NM','TX') then cr.RESVALUE when cr.RESTYPE='CE' then tx.FULLTEXT end,
+            cr.*, cdt.TEXT1 as test_eng, cdt.TEXT2 as test_ind 
+            from cmod.dbo.CM_RESULTS cr 
+            left join REQUESTS r on r.ACCESSNUMBER=cr.ACCESSNUMBER
+            left join cmod.dbo.CM_DICT_TESTS cdt on cr.TESTCODE=cdt.TESTCODE
+            left join DICT_TESTS dt on dt.TESTCODE=cr.TESTCODE and dt.ENDVALIDDATE is null
+            left join TESTS t on t.REQUESTID = r.REQUESTID and t.TESTID=dt.TESTID
+            left join DICT_TEXTS tx on tx.TEXTID=t.CODEDRESULTID
+            left join DICT_CHAPTERS	dc on dc.CHAPID=dt.CHAPID and dc.ENDVALIDDATE is null
+            left join cmod.dbo.CM_DICT_CHAPTERS cdc on cdc.CHAPCODE=dc.CHAPCODE
+            where cr.ACCESSNUMBER='$access' 
             ORDER BY 
                 CASE 
                     WHEN cr.TESTCODE = 'NOTE' THEN 1