Joko/order_gizi
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Compare commits

base: Joko:36ac961e03f8b6be3676e8850ec0e39ee0dcd3c8
Branches Tags
Joko:production
Joko:main
Joko:new_version
Joko:development
Joko:real_time
Joko:test
..
compare: Joko:b9d1d207f384be023a218fa9370a407cb61e0fd0
Branches Tags
Joko:production
Joko:main
Joko:new_version
Joko:development
Joko:real_time
Joko:test

No commits in common. "36ac961e03f8b6be3676e8850ec0e39ee0dcd3c8" and "b9d1d207f384be023a218fa9370a407cb61e0fd0" have entirely different histories.
36ac961e03 ... b9d1d207f3

5 changed files with 11 additions and 45 deletions
Show Stats Expand all files Collapse all files

1
public/js/pekerjaan/action.js
View File

@ -42,7 +42,6 @@ function detailOrder(id){
` : data?.order?.jenis_customer === "Karyawan RSAB Harapan Kita" ? `
<p class="mb-1">Bagian /Instalasi: <strong>${data?.order?.bagian_instalasi || '-'}</strong></p>
<p class="mb-1">No Ekstensien: <strong>${data?.order?.no_ekstensien || '-'}</strong></p>
<p class="mb-1">NIP : <strong>${data?.order?.nip || '-'}</strong></p>
` : data?.order?.jenis_customer === "Keluarga Pasien / Penunggu Pasien" ? `
<p class="mb-1">Nama Pasien: <strong>${data?.order?.nama_pasien || '-'}</strong></p>
<p class="mb-1">Ruang Perawatan: <strong>${data?.order?.ruang_perawatan || '-'}</strong></p>

16
public/js/pekerjaan/dt.js
View File

@ -118,20 +118,12 @@
title: "Pemesan",
field:'order.nama_pemesan',
formatter: function(value, row){
return `
<ul class="list-unstyled mb-0 text-nowrap">
<li><i class="fa fa-user me-1 text-muted"></i><strong>${row?.order?.nama_pemesan ?? '-'}</strong></li>
${row?.order?.nama_institusi ? `
return `<ul class="list-unstyled mb-0 text-nowrap;">
<li><i class="fa fa-user me-1 text-muted"></i> <strong> ${row?.order.nama_pemesan ?? '-'} </strong></li>
${row?.order?.nama_institusi ? `
<li><i class="fa fa-tag me-1 text-muted"></i> ${row?.order?.nama_institusi + '(' + row?.order?.jenis_customer +')'}</li>
` : `<li><i class="fa fa-tag me-1 text-muted"></i> ${row?.order?.jenis_customer ?? '-'}</li>`}
${row?.order?.nip ? `
<li><i class="fas fa-id-card me-1 text-muted"></i> ${row?.order?.nip ?? '-'}</li>
` : ``}
${row?.order?.bagian_instalasi ? `
<li><i class="fa fa-tag me-1 text-muted"></i> ${row?.order?.bagian_instalasi ?? '-'}</li>
` : ''}
</ul>`
</ul>`
},
sortable: true,
},

9
public/js/pesanan_pending/of_dt.js
View File

@ -66,6 +66,7 @@ function initPekerjaanDt(selectDate = []) {
queryParams: params => ({
...params,
tanggal: selectDate,
// status: $('#filterStatus').val()
}),
showColumns: true,
showColumnsToggleAll: true,
@ -179,6 +180,7 @@ function getTableColumns() {
title:"Total Kalori",
formatter: function(value, row){
return row?.total_kalori ? row?.total_kalori + ' kal' : '-'
}
},
@ -190,12 +192,6 @@ function getTableColumns() {
${r?.order?.nama_institusi ? `
<li><i class="fa fa-tag me-1 text-muted"></i> ${r?.order?.nama_institusi + '(' + r?.order?.jenis_customer +')'}</li>
` : `<li><i class="fa fa-tag me-1 text-muted"></i> ${r?.order?.jenis_customer ?? '-'}</li>`}
${r?.order?.nip ? `
<li><i class="fas fa-id-card me-1 text-muted"></i> ${r?.order?.nip ?? '-'}</li>
` : ``}
${r?.order?.bagian_instalasi ? `
<li><i class="fa fa-tag me-1 text-muted"></i> ${r?.order?.bagian_instalasi ?? '-'}</li>
` : ''}
</ul>`
},
{ title: "Tgl Antar", field: 'tgl_antar' },
@ -250,7 +246,6 @@ function detailOrder(id){
` : data?.order?.jenis_customer === "Karyawan RSAB Harapan Kita" ? `
<p class="mb-1">Bagian /Instalasi: <strong>${data?.order?.bagian_instalasi || '-'}</strong></p>
<p class="mb-1">No Ekstensien: <strong>${data?.order?.no_ekstensien || '-'}</strong></p>
<p class="mb-1">NIP : <strong>${data?.order?.nip || '-'}</strong></p>
` : data?.order?.jenis_customer === "Keluarga Pasien / Penunggu Pasien" ? `
<p class="mb-1">Nama Pasien: <strong>${data?.order?.nama_pasien || '-'}</strong></p>
<p class="mb-1">Ruang Perawatan: <strong>${data?.order?.ruang_perawatan || '-'}</strong></p>

28
resources/views/dashboard/label/index.blade.php
View File

@ -87,33 +87,13 @@
<table class="info">
<tr>
<td>{{ $label->order?->jenis_customer !== 'MCU' ? 'Nama Pemesan' : 'Nama Pasien'}}
{{ $label?->order?->jenis_customer === "Keluarga Pasien / Penunggu Pasien" ? '/ Pasien' : ''}}
</td>
<td><span style="vertical-align: top;">:</span>
<span style="max-width: 54mm; word-wrap: break-word; white-space: normal; display: inline-block; vertical-align: top;">
{{ $label?->order?->nama_pemesan }} {{ $label?->order?->jenis_customer === "Keluarga Pasien / Penunggu Pasien" ? '/ ' . $label?->order?->nama_pasien : ''}}
</span>
</td>
<td>{{ $label->order?->jenis_customer !== 'MCU' ? 'Nama Pemesan' : 'Nama Pasien'}} {{ $label?->order?->jenis_customer === "Keluarga Pasien / Penunggu Pasien" ? '/ Pasien' : ''}}</td>
<td>: {{ $label?->order?->nama_pemesan }} {{ $label?->order?->jenis_customer === "Keluarga Pasien / Penunggu Pasien" ? '/ ' . $label?->order?->nama_pasien : ''}}</td>
</tr>
@if($label?->order?->jenis_customer === "Keluarga Pasien / Penunggu Pasien")
<tr>
<td>Ruang Perawatan/No Kamar</td>
<td><span style="vertical-align: top;">:</span>
<span style="max-width: 54mm; word-wrap: break-word; white-space: normal; display: inline-block; vertical-align: top;">
{{ $label?->order?->kelas_perawatan ?? '-'}} / {{ $label?->order?->no_kamar_perawatan ?? '-'}}
</span>
</td>
</tr>
<tr><td>Ruang Perawatan/No Kamar</td><td>: {{ $label?->order?->kelas_perawatan ?? '-'}} / {{ $label?->order?->no_kamar_perawatan ?? '-'}} </td></tr>
@elseif($label?->order?->jenis_customer === "Karyawan RSAB Harapan Kita")
<tr>
<td>Bagian/No Ekstensien </td>
<td><span style="vertical-align: top;">:</span>
<span style="max-width: 54mm; word-wrap: break-word; white-space: normal; display: inline-block; vertical-align: top;">
{{ $label?->order?->bagian_instalasi ?? '-'}} / {{ $label?->order?->no_ekstensien ?? '-'}}
</span>
</td>
</tr>
<tr><td>Bagian/No Ekstensien </td><td>: {{ $label?->order?->bagian_instalasi ?? '-'}} / {{ $label?->order?->no_ekstensien ?? '-'}} </td></tr>
@endif
@if ($label?->order?->nama_institusi)

2
resources/views/guest/mcu/index.blade.php
View File

@ -74,7 +74,7 @@
</div>
<div class="mb-3">
<label class="form-label fw-semibold">Tinggi Badan</label>
<input type="number" class="form-control rounded-3" name="tinggi_badan" id="tinggi_badan" placeholder="cm" min="1" max="300">
<input type="number" class="form-control rounded-3" name="tinggi_badan" id="tinggi_badan" placeholder="kg" min="1" max="300">
</div>
<div class="mb-3">
<label class="form-label fw-semibold">Berat Badan</label>