From e9e68171bbd31fb5f48ca2da50dca5ee946ea9ff Mon Sep 17 00:00:00 2001 From: akemidx Date: Tue, 12 Dec 2023 18:56:21 -0500 Subject: [PATCH] frontend stuff --- app/Models/SavedReport.php | 6 ++--- resources/views/reports/custom.blade.php | 28 +++++++++++++++--------- 2 files changed, 21 insertions(+), 13 deletions(-) diff --git a/app/Models/SavedReport.php b/app/Models/SavedReport.php index dab8486a6e..806c9dab99 100644 --- a/app/Models/SavedReport.php +++ b/app/Models/SavedReport.php @@ -53,9 +53,9 @@ class SavedReport extends Model // @todo: this method feels more like "radioShouldBeChecked" or something... // @todo: improve the variable names... -// 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/views/reports/custom.blade.php b/resources/views/reports/custom.blade.php index c7c92c99f2..f231b985c8 100644 --- a/resources/views/reports/custom.blade.php +++ b/resources/views/reports/custom.blade.php @@ -365,23 +365,17 @@
-
- -
@csrf - {{-- this will be a box to name the report? --}} -
+
{{-- --}} {{-- {{ trans('admin/reports/general.select_template') }}--}} @@ -391,7 +385,7 @@ + + @if($saved_reports->first()!="") + + + + @endif + @push('js')