diff --git a/app/Services/Export/Formats/PdfExport.php b/app/Services/Export/Formats/PdfExport.php index c2d5d9a..66b44c7 100644 --- a/app/Services/Export/Formats/PdfExport.php +++ b/app/Services/Export/Formats/PdfExport.php @@ -21,6 +21,7 @@ protected function handle(): string Pdf::loadView('staff.reports.viewer.html-report', $data) ->setPaper('a4', 'landscape') ->setWarnings(false) + ->setOption('defaultFont', 'Courier') ->save(ReportStorage::abspath($filepath)); return $filepath; diff --git a/app/Services/Export/Formats/Word2007Export.php b/app/Services/Export/Formats/Word2007Export.php index e74e310..887492b 100644 --- a/app/Services/Export/Formats/Word2007Export.php +++ b/app/Services/Export/Formats/Word2007Export.php @@ -6,6 +6,7 @@ use App\Services\Export\ExportDocumentBase; use App\Services\ReportStorage; use CreateDocx; +use Illuminate\Support\Facades\Blade; final class Word2007Export extends ExportDocumentBase { @@ -17,7 +18,8 @@ protected function handle(): string return $filepath; } - $html = $this->report->getContent(); + $title = 'View Report'; + $html = Blade::render('staff.reports.viewer.html-report', ['report' => $this->report, 'title' => $title]); $docx = new CreateDocx; $docx->embedHTML($html); $docx->createDocx(ReportStorage::abspath($filepath)); diff --git a/resources/views/staff/reports/popup.blade.php b/resources/views/staff/reports/popup.blade.php index be0878a..d070b48 100644 --- a/resources/views/staff/reports/popup.blade.php +++ b/resources/views/staff/reports/popup.blade.php @@ -1,17 +1,33 @@ @foreach ($reports as $report) - - + + - - - - + @endforeach - - - Create -
{{ $report->created_at }}{{ $report->report_status->name }}{{ $report->created_at }} + + {{ $report->report_status->name }} + + + {{ $report->radiologist?->name }}VWdocpdfhtm + + DOCX downloaddoc + + + PDF downloadpdf + + + HTML downloadhtm + +
+ + + Create + +