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-08 14:45:21 +07:00
parent c148b6ebb5 1afbcdfcb3
commit 834c6c9c0f
3 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
frontend/client-portal/src/sections/claim-submit/DialogClaimSubmitMember.tsx
View File

@@ -167,22 +167,23 @@ export default function DialogClaimSubmitMember({
</form>
</Grid>
<div
style={{
position: 'relative',
flex: 'none',
height: 'fit-content',
margin: '15px',
}}
// style={{
// position: 'relative',
// flex: 'none',
// height: 'fit-content',
// margin: '15px',
// // width: '52px',
// }}
>
<img
{/* <img
width={52}
height={52}
src="/images/user-profile.png"
alt="user-profile"
style={{ borderRadius: '50%' }}
/>
/> */}
</div>
<Grid item xs={11} lg={11} xl={11}>
<Grid item xs={11} lg={11} xl={11} py={2}>
<Typography variant="subtitle1">{row.fullName}</Typography>
<Typography color="#637381" variant="body2" sx={{ fontWeight: 500 }}>
{row.memberId}

2
frontend/hospital-portal/src/sections/dashboard/DialogFinalLog.tsx
View File

@@ -118,7 +118,7 @@ export default function DialogFinalLog({ member, getData, onClose, handleSubmitS
<Card sx={{ p: 1, background: '#f4f6f8'}}>
<Stack direction="row">
<Avatar
src="https://minimal-assets-api.vercel.app/assets/images/avatars/avatar_5.jpg"
src=""
alt={member?.full_name ?? ''}
sx={{ marginTop: 1, width: 48, height: 48 }}
/>

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

@@ -183,12 +183,12 @@
right: 10px;
text-align: left;
}
.logo_vale-<?php echo now()->timestamp; ?> {
.logo_company-<?php echo now()->timestamp; ?> {
position: absolute;
top: -35.12px;
left: -35.91px;
width: 10%;
max-width: 400px; /* batasan lebar maksimum gambar */
max-width: 40px; /* batasan lebar maksimum gambar */
margin-top: 1px; /* jarak antara segitiga dan gambar */
margin-bottom: 5px;
}
@@ -197,7 +197,12 @@
<body>
<div class="triangle2"></div>
<div class="triangle1"></div>
<img class="logo_vale-<?php echo now()->timestamp; ?>" src="data:image/png;base64,{{ base64_encode(file_get_contents(public_path('images/vale_logo.png'))) }}">
@php
if(!empty($logoPerusahaan->path)) {
$imgSrc = 'data:image/png;base64,' . base64_encode(file_get_contents(storage_path('app/public/' . $logoPerusahaan->path)));
echo '<img class="logo_company-' . now()->timestamp . '" src="' . $imgSrc . '">';
}
@endphp
<div class="content-<?php echo now()->timestamp; ?>">
<div class="corner-text-<?php echo now()->timestamp; ?> top-right-<?php echo now()->timestamp; ?>">
The Future Of Healthcare At Your Fingertips