tbfajri/aso
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/staging' into origin/production

Browse Source
This commit is contained in:
Linksehat Staging Server
2024-01-15 14:14:49 +07:00
parent 17b1ac678c 0c5cab5904
commit ce9c6b198f
5 changed files with 75 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php
View File

@@ -448,6 +448,11 @@ class RequestLogController extends Controller
LEFT JOIN corporate_employees ON corporate_employees.corporate_id = corporates.id
WHERE corporate_employees.member_id = members.id LIMIT 1) AS id_perusahaan
'),
DB::raw('
(Select corporates.code FROM corporates
LEFT JOIN corporate_employees ON corporate_employees.corporate_id = corporates.id
WHERE corporate_employees.member_id = members.id LIMIT 1) AS code_perusahaan
'),
DB::raw('
(Select services.name FROM services
WHERE services.code = "'.$dataRequestLog->service_code.'" LIMIT 1) AS jenis_perwatan
@@ -528,7 +533,14 @@ class RequestLogController extends Controller
->where('files.fileable_type', '=', 'App\Models\Signature')
->where('signatures.type', '=', 2)
->where('signatures.user_id', '=', $dataRequestLog->approved_by)
->select('files.path')
->select(
'files.path',
DB::raw('
(Select persons.name FROM users
LEFT JOIN persons ON users.person_id = persons.id
WHERE users.id = "'.$dataRequestLog->approved_by.'" LIMIT 1) AS name_approve
')
)
->first();
$data['signatureAd'] = $signatureAd;
@@ -596,6 +608,11 @@ class RequestLogController extends Controller
LEFT JOIN corporate_employees ON corporate_employees.corporate_id = corporates.id
WHERE corporate_employees.member_id = members.id LIMIT 1) AS id_perusahaan
'),
DB::raw('
(Select corporates.code FROM corporates
LEFT JOIN corporate_employees ON corporate_employees.corporate_id = corporates.id
WHERE corporate_employees.member_id = members.id LIMIT 1) AS code_perusahaan
'),
DB::raw('
(Select services.name FROM services
WHERE services.code = "'.$dataRequestLog->service_code.'" LIMIT 1) AS jenis_perwatan
@@ -695,7 +712,14 @@ class RequestLogController extends Controller
->where('files.fileable_type', '=', 'App\Models\Signature')
->where('signatures.type', '=', 2)
->where('signatures.user_id', '=', $dataRequestLog->approved_by)
->select('files.path')
->select(
'files.path',
DB::raw('
(Select persons.name FROM users
LEFT JOIN persons ON users.person_id = persons.id
WHERE users.id = "'.$dataRequestLog->approved_by.'" LIMIT 1) AS name_approve
')
)
->first();
$data['signatureAd'] = $signatureAd;

BIN
public/images/ttd_dr_vale.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 51 KiB

10
resources/views/pdf/final_log_page_1.blade.php
View File

@@ -427,19 +427,19 @@
</table>
<div class="corner-text-<?php echo now()->timestamp; ?> bottom-left-<?php echo now()->timestamp; ?>">
@php
if (!empty($logoPerusahaan->code) == 'VALEIND') {
if (!empty($dataMember->code_perusahaan) == 'VALEIND') {
@endphp
<b>Alarm Center Vale MKS (LinkSehat) Office</b><br>
<b>{{ !empty($logoPerusahaan->name) ? $logoPerusahaan->name : '' }}</b><br>
<b>{{ !empty($dataMember->nama_perusahaan) ? $dataMember->nama_perusahaan : '' }}</b><br>
Lt. 1, Jalan Somba Opu 281, Ujung Pandang, Losari, <br> Kec. Makassar, Kota Makassar, Sulawesi Selatan 90113
@php
} else if(!empty($logoPerusahaan->code) == 'PETROLAB') {
} else if(!empty($dataMember->code_perusahaan) == 'PETROLAB') {
@endphp
<b>Alarm Center Vale MKS (LinkSehat) Office</b><br>
<b>{{ !empty($logoPerusahaan->name) ? $logoPerusahaan->name : '' }}</b><br>
<b>{{ !empty($dataMember->nama_perusahaan) ? $dataMember->nama_perusahaan : '' }}</b><br>
Jalan Pisangan Lama 3 Nomor 28 Jatinegara, RT.9/RW.3, <br>Pisangan Tim., Kec. Pulo Gadung, Kota Jakarta Timur, Daerah Khusus Ibukota Jakarta 13230
@php
@@ -447,7 +447,7 @@
@endphp
<b>Alarm Center Vale MKS (LinkSehat) Office</b><br>
<b>{{ !empty($logoPerusahaan->name) ? $logoPerusahaan->name : '' }}</b><br>
<b>{{ !empty($dataMember->nama_perusahaan) ? $dataMember->nama_perusahaan : '' }}</b><br>
@php

34
resources/views/pdf/final_log_page_2.blade.php
View File

@@ -264,14 +264,14 @@
{{ $dataMember->nama_perusahaan }}
</div>
<div class="corner-text-<?php echo now()->timestamp; ?> bottom-left-ttd-2-<?php echo now()->timestamp; ?> ">
<!-- @php
<!-- @php
if(!empty($signatureDr->path)) {
$imgSrc = 'data:image/png;base64,' . base64_encode(file_get_contents(storage_path('app/public/' . $signatureDr->path)));
echo '<img style="width: 65px; height: 48px;" src="' . $imgSrc . '">';
}
@endphp -->
@php
if(!empty($logoPerusahaan->code) == 'VALEIND') {
@php
if(!empty($dataMember->code_perusahaan) == 'VALEIND') {
$imgSrc = 'data:image/png;base64,' . base64_encode(file_get_contents(public_path('images/ttd_dr_vale.png')));
echo '<img style="width: 65px; height: 48px;" src="' . $imgSrc . '">';
}
@@ -279,7 +279,7 @@
</div>
<div class="corner-text-<?php echo now()->timestamp; ?> bottom-left-ttd-<?php echo now()->timestamp; ?> ">
@php
if (!empty($logoPerusahaan->code) == 'VALEIND') {
if (!empty($dataMember->code_perusahaan) == 'VALEIND') {
@endphp
<u><b>Dr. Hery Hermas, M.Kes</b></u>
@php
@@ -296,7 +296,7 @@
Petugas Alarm Center
</div>
<div class="corner-text-<?php echo now()->timestamp; ?> bottom-right-ttd-2-<?php echo now()->timestamp; ?> ">
@php
@php
if(!empty($signatureAd->path)) {
$imgSrc = 'data:image/png;base64,' . base64_encode(file_get_contents(storage_path('app/public/' . $signatureAd->path)));
echo '<img style="width: 65px; height: 48px;" src="' . $imgSrc . '">';
@@ -304,8 +304,18 @@
@endphp
</div>
<div class="corner-text-<?php echo now()->timestamp; ?> bottom-right-ttd-<?php echo now()->timestamp; ?> ">
(.......................................)<br>
<b>Customer Service Team</b>
@php
if (!empty($signatureAd->name_approve)) {
@endphp
<u><b>{{ $signatureAd->name_approve }}</b></u>
@php
} else {
@endphp
(.......................................)
@php
}
@endphp
<br><b>Customer Service Team</b>
</div>
<div class="corner-text-<?php echo now()->timestamp; ?> bottom-left1-ttd-<?php echo now()->timestamp; ?> ">
(.......................................)
@@ -315,19 +325,19 @@
</div>
<div class="corner-text-<?php echo now()->timestamp; ?> bottom-left-<?php echo now()->timestamp; ?>">
@php
if (!empty($logoPerusahaan->code) == 'VALEIND') {
if (!empty($dataMember->code_perusahaan) == 'VALEIND') {
@endphp
<b>Alarm Center Vale MKS (LinkSehat) Office</b><br>
<b>{{ !empty($logoPerusahaan->name) ? $logoPerusahaan->name : '' }}</b><br>
<b>{{ !empty($dataMember->name_perusahaan) ? $dataMember->name_perusahaan : '' }}</b><br>
Lt. 1, Jalan Somba Opu 281, Ujung Pandang, Losari, <br> Kec. Makassar, Kota Makassar, Sulawesi Selatan 90113
@php
} else if(!empty($logoPerusahaan->code) == 'PETROLAB') {
} else if(!empty($dataMember->code_perusahaan) == 'PETROLAB') {
@endphp
<b>Alarm Center Petrolab (LinkSehat) Office</b><br>
<b>{{ !empty($logoPerusahaan->name) ? $logoPerusahaan->name : '' }}</b><br>
<b>{{ !empty($dataMember->name_perusahaan) ? $dataMember->name_perusahaan : '' }}</b><br>
Jalan Pisangan Lama 3 Nomor 28 Jatinegara, RT.9/RW.3, <br>Pisangan Tim., Kec. Pulo Gadung, Kota Jakarta Timur, Daerah Khusus Ibukota Jakarta 13230
@php
@@ -335,7 +345,7 @@
@endphp
<b>Alarm Center (LinkSehat) Office</b><br>
<b>{{ !empty($logoPerusahaan->name) ? $logoPerusahaan->name : '' }}</b><br>
<b>{{ !empty($dataMember->name_perusahaan) ? $dataMember->name_perusahaan : '' }}</b><br>
@php

34
resources/views/pdf/req_log_page_1.blade.php
View File

@@ -437,14 +437,14 @@
{{ $dataMember->nama_perusahaan }}
</div>
<div class="corner-text-<?php echo now()->timestamp; ?> bottom-left-ttd-2-<?php echo now()->timestamp; ?> ">
<!-- @php
<!-- @php
if(!empty($signatureDr->path)) {
$imgSrc = 'data:image/png;base64,' . base64_encode(file_get_contents(storage_path('app/public/' . $signatureDr->path)));
echo '<img style="width: 65px; height: 48px;" src="' . $imgSrc . '">';
}
@endphp -->
@php
if(!empty($logoPerusahaan->code) == 'VALEIND') {
@php
if(!empty($dataMember->code_perusahaan) == 'VALEIND') {
$imgSrc = 'data:image/png;base64,' . base64_encode(file_get_contents(public_path('images/ttd_dr_vale.png')));
echo '<img style="width: 65px; height: 48px;" src="' . $imgSrc . '">';
}
@@ -452,7 +452,7 @@
</div>
<div class="corner-text-<?php echo now()->timestamp; ?> bottom-left-ttd-<?php echo now()->timestamp; ?> ">
@php
if (!empty($logoPerusahaan->code) == 'VALEIND') {
if (!empty($dataMember->code_perusahaan) == 'VALEIND') {
@endphp
<u><b>Dr. Hery Hermas, M.Kes</b></u>
@php
@@ -469,7 +469,7 @@
Petugas Alarm Center
</div>
<div class="corner-text-<?php echo now()->timestamp; ?> bottom-right-ttd-2-<?php echo now()->timestamp; ?> ">
@php
@php
if(!empty($signatureAd->path)) {
$imgSrc = 'data:image/png;base64,' . base64_encode(file_get_contents(storage_path('app/public/' . $signatureAd->path)));
echo '<img style="width: 65px; height: 48px;" src="' . $imgSrc . '">';
@@ -477,27 +477,37 @@
@endphp
</div>
<div class="corner-text-<?php echo now()->timestamp; ?> bottom-right-ttd-<?php echo now()->timestamp; ?> ">
(.......................................)<br>
<b>Customer Service Team</b>
@php
if (!empty($signatureAd->name_approve)) {
@endphp
<u><b>{{ $signatureAd->name_approve }}</b></u>
@php
} else {
@endphp
(.......................................)
@php
}
@endphp
<br><b>Customer Service Team</b>
</div>
<div class="corner-text-<?php echo now()->timestamp; ?> bottom-right1-ttd-<?php echo now()->timestamp; ?> ">
<b>{{ $dataMember->name }}</b>
</div>
<div class="corner-text-<?php echo now()->timestamp; ?> bottom-left-<?php echo now()->timestamp; ?>">
@php
if (!empty($logoPerusahaan->code) == 'VALEIND') {
if (!empty($dataMember->code_perusahaan) == 'VALEIND') {
@endphp
<b>Alarm Center Vale MKS (LinkSehat) Office</b><br>
<b>{{ !empty($logoPerusahaan->name) ? $logoPerusahaan->name : '' }}</b><br>
<b>{{ !empty($dataMember->nama_perusahaan) ? $dataMember->nama_perusahaan : '' }}</b><br>
Lt. 1, Jalan Somba Opu 281, Ujung Pandang, Losari, <br> Kec. Makassar, Kota Makassar, Sulawesi Selatan 90113
@php
} else if(!empty($logoPerusahaan->code) == 'PETROLAB') {
} else if(!empty($dataMember->code_perusahaan) == 'PETROLAB') {
@endphp
<b>Alarm Center Petrolab (LinkSehat) Office</b><br>
<b>{{ !empty($logoPerusahaan->name) ? $logoPerusahaan->name : ''}}</b><br>
<b>{{ !empty($dataMember->nama_perusahaan) ? $dataMember->nama_perusahaan : ''}}</b><br>
Jalan Pisangan Lama 3 Nomor 28 Jatinegara, RT.9/RW.3, <br>Pisangan Tim., Kec. Pulo Gadung, Kota Jakarta Timur, Daerah Khusus Ibukota Jakarta 13230
@php
@@ -505,7 +515,7 @@
@endphp
<b>Alarm Center (LinkSehat) Office</b><br>
<b>{{ !empty($logoPerusahaan->name) ? $logoPerusahaan->name : '' }}</b><br>
<b>{{ !empty($dataMember->nama_perusahaan) ? $dataMember->nama_perusahaan : '' }}</b><br>
@php