diff --git a/app/Controllers/PrintResult.php b/app/Controllers/PrintResult.php index 20d65e7..649b3ae 100644 --- a/app/Controllers/PrintResult.php +++ b/app/Controllers/PrintResult.php @@ -489,10 +489,10 @@ class PrintResult extends BaseController { if ($hostordernumber[0] == 'B' || $hostordernumber[0] == 'Z') { if ($uservalidator != null){ - $doctor = "dr. I Komang Parwata, SpPK Subip.B.D.K.T.(K)"; + $doctor = "dr. I Komang Parwata, SpPK Subsp.B.D.K.T.(K)"; $analyst = "Mrs. Gusti Ayu Riska Mastari"; $noreg = "Reg. No: 570/SIPDS/0001/I/DPMPTSP/2023"; - $signature = ""; + $signature = ""; $enteredby = "Entered By"; $labtech = "Lab Technician"; $verifiedby = "Verified By"; @@ -556,7 +556,7 @@ class PrintResult extends BaseController { $birth_date = $data[0]['BIRTHDATE']; $birth_date = \DateTime::createFromFormat('Y-m-d H:i:s.u', $birth_date); - if ($birth_date) { $birth_date = $birth_date->format('d-m-Y'); } + if ($birth_date) { $birth_date = $birth_date->format('d F Y'); } if ($hostordernumber[0] == 'B' || $hostordernumber[0] == 'Z') { $branch = "PMG Bali"; @@ -569,7 +569,7 @@ class PrintResult extends BaseController { $collection_date = $data[0]['COLLECTIONDATE']; $dateTimeCol = \DateTime::createFromFormat('Y-m-d H:i:s.u', $collection_date); if ($dateTimeCol) { - $collection_date = $dateTimeCol->format('d-m-Y H:i'); + $collection_date = $dateTimeCol->format('d F Y H:i'); } $result_date = end($resultData); @@ -584,7 +584,7 @@ class PrintResult extends BaseController { if ($year < 2020) { $result_date = ""; } else { - $result_date = $dateTimeRes->format('d-m-Y H:i'); + $result_date = $dateTimeRes->format('d F Y H:i'); } // $result_date = $dateTimeRes->format('d-m-Y H:i'); @@ -621,35 +621,28 @@ class PrintResult extends BaseController { -
RM Number: $rm_number
- - -
Visit Number: $hostordernumber
+
RM Number : $rm_number
+
Visit Number : $hostordernumber
-
Name: $first_name $last_name
- -
Company: $company
- +
Name : $first_name $last_name
+
Company : $company
-
DOB: $birth_date
- -
Visit Type: $visittype
- +
DOB : $birth_date
+
Visit Type : $visittype
-
Gender: $sex
-
Order Date / Time: $collection_date
+
Gender : $sex
+
Order Date / Time : $collection_date
-
Branch: $branch
-
Result Date / Time: $result_date
- +
Branch : $branch
+
Result Date / Time : $result_date
diff --git a/public/assets/css/pdf_new.css b/public/assets/css/pdf_new.css index a8639cf..4bf9267 100644 --- a/public/assets/css/pdf_new.css +++ b/public/assets/css/pdf_new.css @@ -41,7 +41,7 @@ body { margin: 0; padding: 0; /* height: 18.47cm; */ - height: 19.60cm; + height: 18.40cm; } .result { /* table-layout:fixed; */ @@ -179,6 +179,11 @@ tr.chapter td { text-align: right; /* background-color: aqua; */ } +.table_footer tr td.margin_right_img_bali { + padding-right: 55px; + text-align: right; + /* background-color: aqua; */ +} .table_footer tr td.margin_right_sby_img { padding-right: 5px; @@ -200,6 +205,10 @@ tr.chapter td { #ttd_p { width: 25%; } +#ttd_k { + width: 23%; +} + @media print { @page { margin:0; size:210mm 297mm; } diff --git a/public/assets/img/ttdnewdokpar.jpg b/public/assets/img/ttdnewdokpar.jpg new file mode 100644 index 0000000..cc4ff78 Binary files /dev/null and b/public/assets/img/ttdnewdokpar.jpg differ diff --git a/public/assets/img/ttdnewdokpar3.png b/public/assets/img/ttdnewdokpar3.png new file mode 100644 index 0000000..6f2bb87 Binary files /dev/null and b/public/assets/img/ttdnewdokpar3.png differ