diff --git a/public/js/pekerjaan/action.js b/public/js/pekerjaan/action.js index d2894de..54a2d69 100644 --- a/public/js/pekerjaan/action.js +++ b/public/js/pekerjaan/action.js @@ -42,6 +42,7 @@ function detailOrder(id){ ` : data?.order?.jenis_customer === "Karyawan RSAB Harapan Kita" ? `

Bagian /Instalasi: ${data?.order?.bagian_instalasi || '-'}

No Ekstensien: ${data?.order?.no_ekstensien || '-'}

+

NIP : ${data?.order?.nip || '-'}

` : data?.order?.jenis_customer === "Keluarga Pasien / Penunggu Pasien" ? `

Nama Pasien: ${data?.order?.nama_pasien || '-'}

Ruang Perawatan: ${data?.order?.ruang_perawatan || '-'}

diff --git a/public/js/pekerjaan/dt.js b/public/js/pekerjaan/dt.js index 89f8957..d9cc86a 100644 --- a/public/js/pekerjaan/dt.js +++ b/public/js/pekerjaan/dt.js @@ -118,12 +118,20 @@ title: "Pemesan", field:'order.nama_pemesan', formatter: function(value, row){ - return `` + }, sortable: true, }, diff --git a/public/js/pesanan_pending/of_dt.js b/public/js/pesanan_pending/of_dt.js index ff50894..cb3f37b 100644 --- a/public/js/pesanan_pending/of_dt.js +++ b/public/js/pesanan_pending/of_dt.js @@ -66,7 +66,6 @@ function initPekerjaanDt(selectDate = []) { queryParams: params => ({ ...params, tanggal: selectDate, - // status: $('#filterStatus').val() }), showColumns: true, showColumnsToggleAll: true, @@ -180,7 +179,6 @@ function getTableColumns() { title:"Total Kalori", formatter: function(value, row){ - return row?.total_kalori ? row?.total_kalori + ' kal' : '-' } }, @@ -192,6 +190,12 @@ function getTableColumns() { ${r?.order?.nama_institusi ? `
  • ${r?.order?.nama_institusi + '(' + r?.order?.jenis_customer +')'}
  • ` : `
  • ${r?.order?.jenis_customer ?? '-'}
  • `} + ${r?.order?.nip ? ` +
  • ${r?.order?.nip ?? '-'}
  • + ` : ``} + ${r?.order?.bagian_instalasi ? ` +
  • ${r?.order?.bagian_instalasi ?? '-'}
  • + ` : ''} ` }, { title: "Tgl Antar", field: 'tgl_antar' }, @@ -246,6 +250,7 @@ function detailOrder(id){ ` : data?.order?.jenis_customer === "Karyawan RSAB Harapan Kita" ? `

    Bagian /Instalasi: ${data?.order?.bagian_instalasi || '-'}

    No Ekstensien: ${data?.order?.no_ekstensien || '-'}

    +

    NIP : ${data?.order?.nip || '-'}

    ` : data?.order?.jenis_customer === "Keluarga Pasien / Penunggu Pasien" ? `

    Nama Pasien: ${data?.order?.nama_pasien || '-'}

    Ruang Perawatan: ${data?.order?.ruang_perawatan || '-'}

    diff --git a/resources/views/dashboard/label/index.blade.php b/resources/views/dashboard/label/index.blade.php index 78db8ac..1beb335 100644 --- a/resources/views/dashboard/label/index.blade.php +++ b/resources/views/dashboard/label/index.blade.php @@ -87,13 +87,33 @@ - - + + @if($label?->order?->jenis_customer === "Keluarga Pasien / Penunggu Pasien") - + + + + @elseif($label?->order?->jenis_customer === "Karyawan RSAB Harapan Kita") - + + + + @endif @if ($label?->order?->nama_institusi) diff --git a/resources/views/guest/mcu/index.blade.php b/resources/views/guest/mcu/index.blade.php index 3f42dd5..ecde32b 100644 --- a/resources/views/guest/mcu/index.blade.php +++ b/resources/views/guest/mcu/index.blade.php @@ -74,7 +74,7 @@
    - +
    {{ $label->order?->jenis_customer !== 'MCU' ? 'Nama Pemesan' : 'Nama Pasien'}} {{ $label?->order?->jenis_customer === "Keluarga Pasien / Penunggu Pasien" ? '/ Pasien' : ''}}: {{ $label?->order?->nama_pemesan }} {{ $label?->order?->jenis_customer === "Keluarga Pasien / Penunggu Pasien" ? '/ ' . $label?->order?->nama_pasien : ''}}{{ $label->order?->jenis_customer !== 'MCU' ? 'Nama Pemesan' : 'Nama Pasien'}} + {{ $label?->order?->jenis_customer === "Keluarga Pasien / Penunggu Pasien" ? '/ Pasien' : ''}} + : + + {{ $label?->order?->nama_pemesan }} {{ $label?->order?->jenis_customer === "Keluarga Pasien / Penunggu Pasien" ? '/ ' . $label?->order?->nama_pasien : ''}} + +
    Ruang Perawatan/No Kamar: {{ $label?->order?->kelas_perawatan ?? '-'}} / {{ $label?->order?->no_kamar_perawatan ?? '-'}}
    Ruang Perawatan/No Kamar: + + {{ $label?->order?->kelas_perawatan ?? '-'}} / {{ $label?->order?->no_kamar_perawatan ?? '-'}} + +
    Bagian/No Ekstensien : {{ $label?->order?->bagian_instalasi ?? '-'}} / {{ $label?->order?->no_ekstensien ?? '-'}}
    Bagian/No Ekstensien : + + {{ $label?->order?->bagian_instalasi ?? '-'}} / {{ $label?->order?->no_ekstensien ?? '-'}} + +