Apply Indian date-time format across report tables
This commit is contained in:
parent
50e2a4f145
commit
cb2dad8aab
|
|
@ -4,9 +4,26 @@ $invoiceSummary = $invoice_summary ?? [];
|
|||
$invoiceRows = $invoice_rows ?? [];
|
||||
$ipdSummary = $ipd_summary ?? [];
|
||||
$ipdPaymentRows = $ipd_payment_rows ?? [];
|
||||
|
||||
$formatIndianDateTime = static function ($value): string {
|
||||
$value = trim((string) $value);
|
||||
if ($value === '') {
|
||||
return '';
|
||||
}
|
||||
|
||||
$timestamp = strtotime($value);
|
||||
if ($timestamp === false) {
|
||||
return $value;
|
||||
}
|
||||
|
||||
return date('d-m-Y H:i:s', $timestamp);
|
||||
};
|
||||
|
||||
$minRangeDisplay = $formatIndianDateTime($min_range ?? '');
|
||||
$maxRangeDisplay = $formatIndianDateTime($max_range ?? '');
|
||||
?>
|
||||
<div class="mb-3 small text-muted">
|
||||
Date: <strong><?= esc((string) ($min_range ?? '')) ?></strong> to <strong><?= esc((string) ($max_range ?? '')) ?></strong>
|
||||
Date: <strong><?= esc($minRangeDisplay) ?></strong> to <strong><?= esc($maxRangeDisplay) ?></strong>
|
||||
<?php if (! empty($doctor_filter)): ?>
|
||||
| Doctor: <strong><?= esc((string) $doctor_filter) ?></strong>
|
||||
<?php endif; ?>
|
||||
|
|
@ -110,7 +127,7 @@ $ipdPaymentRows = $ipd_payment_rows ?? [];
|
|||
<tr>
|
||||
<td><?= $sr++ ?></td>
|
||||
<td><?= esc((string) ($row->inv_name ?? ('INV#' . ($row->id ?? '')))) ?></td>
|
||||
<td><?= esc((string) ($row->inv_date ?? '')) ?></td>
|
||||
<td><?= esc($formatIndianDateTime((string) ($row->inv_date ?? ''))) ?></td>
|
||||
<td><?= (int) ($row->test_count ?? 0) ?></td>
|
||||
<td><?= number_format((float) ($row->test_amount ?? 0), 2) ?></td>
|
||||
<td><?= number_format((float) ($row->invoice_amount ?? 0), 2) ?></td>
|
||||
|
|
|
|||
|
|
@ -5,9 +5,26 @@ $maxRange = $max_range ?? '';
|
|||
$totalCr = (float) ($total_cr ?? 0);
|
||||
$totalDr = (float) ($total_dr ?? 0);
|
||||
$netTotal = (float) ($net_total ?? 0);
|
||||
|
||||
$formatIndianDateTime = static function ($value): string {
|
||||
$value = trim((string) $value);
|
||||
if ($value === '') {
|
||||
return '';
|
||||
}
|
||||
|
||||
$timestamp = strtotime($value);
|
||||
if ($timestamp === false) {
|
||||
return $value;
|
||||
}
|
||||
|
||||
return date('d-m-Y H:i:s', $timestamp);
|
||||
};
|
||||
|
||||
$minRangeDisplay = $formatIndianDateTime($minRange);
|
||||
$maxRangeDisplay = $formatIndianDateTime($maxRange);
|
||||
?>
|
||||
|
||||
<p class="mb-2">Date(YYYY-MM-DD h:m) between <?= esc($minRange) ?> and <?= esc($maxRange) ?></p>
|
||||
<p class="mb-2"><strong>Date Range:</strong> <?= esc($minRangeDisplay) ?> to <?= esc($maxRangeDisplay) ?></p>
|
||||
|
||||
<?php if (empty($rows)) : ?>
|
||||
<div class="text-muted">No records found for the selected filters.</div>
|
||||
|
|
|
|||
|
|
@ -10,9 +10,26 @@ $totals = $totals ?? [
|
|||
];
|
||||
$minRange = $min_range ?? '';
|
||||
$maxRange = $max_range ?? '';
|
||||
|
||||
$formatIndianDateTime = static function ($value): string {
|
||||
$value = trim((string) $value);
|
||||
if ($value === '') {
|
||||
return '';
|
||||
}
|
||||
|
||||
$timestamp = strtotime($value);
|
||||
if ($timestamp === false) {
|
||||
return $value;
|
||||
}
|
||||
|
||||
return date('d-m-Y H:i:s', $timestamp);
|
||||
};
|
||||
|
||||
$minRangeDisplay = $formatIndianDateTime($minRange);
|
||||
$maxRangeDisplay = $formatIndianDateTime($maxRange);
|
||||
?>
|
||||
|
||||
<p class="mb-2"><strong>Date Range:</strong> <?= esc($minRange) ?> to <?= esc($maxRange) ?></p>
|
||||
<p class="mb-2"><strong>Date Range:</strong> <?= esc($minRangeDisplay) ?> to <?= esc($maxRangeDisplay) ?></p>
|
||||
|
||||
<?php if (empty($rows)) : ?>
|
||||
<div class="text-muted">No records found for the selected filters.</div>
|
||||
|
|
|
|||
|
|
@ -3,10 +3,27 @@ $rows = $rows ?? [];
|
|||
$minRange = $min_range ?? '';
|
||||
$maxRange = $max_range ?? '';
|
||||
$uhidFilter = trim((string) ($uhid_filter ?? ''));
|
||||
|
||||
$formatIndianDateTime = static function ($value): string {
|
||||
$value = trim((string) $value);
|
||||
if ($value === '') {
|
||||
return '';
|
||||
}
|
||||
|
||||
$timestamp = strtotime($value);
|
||||
if ($timestamp === false) {
|
||||
return $value;
|
||||
}
|
||||
|
||||
return date('d-m-Y H:i:s', $timestamp);
|
||||
};
|
||||
|
||||
$minRangeDisplay = $formatIndianDateTime($minRange);
|
||||
$maxRangeDisplay = $formatIndianDateTime($maxRange);
|
||||
?>
|
||||
|
||||
<div class="mb-3">
|
||||
<p><strong>Date Range:</strong> <?= esc($minRange) ?> to <?= esc($maxRange) ?></p>
|
||||
<p><strong>Date Range:</strong> <?= esc($minRangeDisplay) ?> to <?= esc($maxRangeDisplay) ?></p>
|
||||
<?php if ($uhidFilter !== '') : ?>
|
||||
<p><strong>UHID Filter:</strong> <?= esc($uhidFilter) ?></p>
|
||||
<?php endif; ?>
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user