diff --git a/app/Models/SavedReport.php b/app/Models/SavedReport.php index 417a6ccadf..e3c0009f28 100644 --- a/app/Models/SavedReport.php +++ b/app/Models/SavedReport.php @@ -24,6 +24,9 @@ class SavedReport extends Model 'options', ]; + //we will need a bit to catch and store the name of the report. + //for now the blip above is creating the name, but can be confusing if multiple are made at once + public function checkmarkValue($property): string { // Assuming we're using the null object pattern, @@ -41,9 +44,10 @@ class SavedReport extends Model { // @todo: this method feels more like "radioShouldBeChecked" or something... - if (array_has($this->options, $property) && $this->options[$property] === $value) { - return $return; - } +// if (array_has($this->options, $property) && $this->options[$property] === $value) { +// return $return; +// } + // this is currently throwing an error. $property is coming through as a string and it needs to be an array return null; } diff --git a/resources/lang/en/admin/reports/general.php b/resources/lang/en/admin/reports/general.php index 6d0b0e0055..cc87e1334d 100644 --- a/resources/lang/en/admin/reports/general.php +++ b/resources/lang/en/admin/reports/general.php @@ -7,8 +7,9 @@ return [ 'reminder_sent' => 'Reminder sent', 'acceptance_deleted' => 'Acceptance request deleted', 'acceptance_request' => 'Acceptance request', + 'saved_reports' => 'Saved Reports', 'save_template' => 'Save Template', 'apply_template' => 'Apply Template', - 'select_template' => 'Select Template', + 'generate_template' => 'Generate Template', 'apply_and_generate' => 'Apply and Generate', ]; \ No newline at end of file diff --git a/resources/views/reports/custom.blade.php b/resources/views/reports/custom.blade.php index 0dd623447c..84394981ef 100644 --- a/resources/views/reports/custom.blade.php +++ b/resources/views/reports/custom.blade.php @@ -366,20 +366,27 @@
- - {{ trans('admin/reports/general.apply_and_generate') }} + +
+
+ + {{ trans('admin/reports/general.apply_and_generate') }}
@csrf - -
- + {{ trans('admin/reports/general.select_template') }} @@ -391,22 +398,6 @@ @endforeach
- - - {{ $fieldname = $report->name }} -