From ebf760a477614d8e848db11e81810332bd07d76d Mon Sep 17 00:00:00 2001
From: akemidx <kojotek.dx@gmail.com>
Date: Tue, 19 Dec 2023 18:01:19 -0500
Subject: [PATCH] translations, UI fixes

---
 .../Controllers/ReportTemplatesController.php |  7 ++++
 app/Http/Controllers/ReportsController.php    |  2 +-
 resources/lang/en/admin/reports/message.php   | 10 ++++-
 resources/views/reports/custom.blade.php      | 41 ++++++++-----------
 4 files changed, 33 insertions(+), 27 deletions(-)

diff --git a/app/Http/Controllers/ReportTemplatesController.php b/app/Http/Controllers/ReportTemplatesController.php
index 5671cef244..718dd95f0e 100644
--- a/app/Http/Controllers/ReportTemplatesController.php
+++ b/app/Http/Controllers/ReportTemplatesController.php
@@ -18,6 +18,13 @@ class ReportTemplatesController extends Controller
             'name' => $request->get('name'),
             'options' => $request->except(['_token', 'name']),
         ]);
+//        This is for error handling in creation. This probably is the wrong spot, and syntax is off, but i don't wanna forget
+//        if(is_null($report->name)) {
+//            return redirect()->route('reports/custom')->with('error', trans('reports/message.create.needs_title'));
+//        }
+//        elseif(exists($report->name)) {
+//            return redirect()->route('reports/custom')->with('error', trans('reports/message.create.duplicate'));
+//        }
 
         return redirect()->route('reports/custom', ['report' => $report->id]);
     }
diff --git a/app/Http/Controllers/ReportsController.php b/app/Http/Controllers/ReportsController.php
index 864e889653..443245a716 100644
--- a/app/Http/Controllers/ReportsController.php
+++ b/app/Http/Controllers/ReportsController.php
@@ -411,7 +411,7 @@ class ReportsController extends Controller
      */
     public function postCustom(Request $request)
     {
-        dd('postCustom', $request->all());
+       // dd('postCustom', $request->all());
         ini_set('max_execution_time', env('REPORT_TIME_LIMIT', 12000)); //12000 seconds = 200 minutes
         $this->authorize('reports.view');
 
diff --git a/resources/lang/en/admin/reports/message.php b/resources/lang/en/admin/reports/message.php
index d4c8f8198f..98e4ec195a 100644
--- a/resources/lang/en/admin/reports/message.php
+++ b/resources/lang/en/admin/reports/message.php
@@ -1,5 +1,13 @@
 <?php
 
 return array(
-    'error'   => 'You must select at least ONE option.'
+    'error'   => 'You must select at least ONE option.',
+
+    'create'  => [
+        'success' => 'Report saved successfully',
+        'needs_title' => 'Report title can not be blank.',
+        'duplicate' => 'Report title already exists. Please choose a different one.',
+        ],
+
+    'delete' => 'Are you sure you want to delete this report?',
 );
diff --git a/resources/views/reports/custom.blade.php b/resources/views/reports/custom.blade.php
index 016020a508..9b569f5baa 100644
--- a/resources/views/reports/custom.blade.php
+++ b/resources/views/reports/custom.blade.php
@@ -44,8 +44,8 @@
                         @method('PUT')
                         <input type="hidden" id="savetemplateform" name="options">
                         <input type="hidden" id="name" name="name" value="{{ $reportTemplate->name }},1git ">
-                        <button class="btn btn-primary" style="width: 32%">
-                            {{ "update" }}
+                        <button class="btn btn-primary" style="width: 100%">
+                            {{ trans('general.save') }}
                         </button>
                     </form>
                 </div>
@@ -58,19 +58,27 @@
                         title="Update"
                     >
                         <i class="fas fa-pencil-alt" aria-hidden="true"></i>
-                        <span class="sr-only">Update</span>
+                        <span class="sr-only">{{ trans('general.update') }}</span>
                     </a>
+
+{{--                     This is from the license.view page--
+                           See line 1077 in routes.api for example of routing
+{{--                    <a class="btn delete-asset btn-danger btn-sm" href="{{ route('delete/licensefile', [$license->id, $file->id]) }}" data-content="{{ trans('general.delete_confirm', ['item' => $file->filename]) }}" data-title="{{ trans('general.delete') }}">--}}
+{{--                    <i class="fas fa-trash icon-white" aria-hidden="true"></i>--}}
+{{--                    <span class="sr-only">{{ trans('general.delete') }}</span>--}}
+{{--                  </a>--}}
+
                     {{-- these were pulled from hardware.index and the one below doesn't work...--}}
                     <a
                         href="#"
-                        class="actions btn btn-danger btn-sm delete-asset"
+                        class="actions btn btn-danger btn-sm delete-report" {{--This was delete-asset as a class. We'd need to make a delete-report class--}}
                         data-tooltip="true"
                         data-toggle="modal"
                         data-content="Are you sure you wish to delete 1260505622?"
                         data-title="Delete"
                         onclick="return false;"
                     >
-                            <i class="fas fa-trash" aria-hidden="true"></i><span class="sr-only">Delete</span>
+                            <i class="fas fa-trash" aria-hidden="true"></i><span class="sr-only">{{ trans('general.delete') }}</span>
                     </a>
                 </div>
             @endif
@@ -407,7 +415,7 @@
           </button>
         </div>
       </div> <!--/.box.box-default-->
-    {{ Form::close() }}  {{--does this need to be at the bottom of all our new stuff?--}}
+    {{ Form::close() }}
   </div>
 
     <div class="col-md-2">
@@ -416,7 +424,7 @@
                 <form method="post" id="savetemplateform" action="{{ route("report-templates.store") }}">
                     @csrf
                         <input type="hidden" id="savetemplateform" name="options">
-                        <input type="text" id="name" name="name" value="{{ $reportTemplate->name }}"> {{--this means that the name of a loaded report is in the input box. could lead to confusion with update--}}
+                        <input type="text" id="name" name="name" value="{{ $reportTemplate->name }}" style="width: 100%; margin-bottom: 5px; height: 34px"> {{--this means that the name of a loaded report is in the input box. could lead to confusion with update--}}
                         <button class="btn btn-primary" style="width: 100%">
                             {{ trans('admin/reports/general.save_template') }}
                         </button>
@@ -427,7 +435,7 @@
                 <select
                     id="saved_report_select"
                     class="form-control select2"
-                    data-placeholder="Load Saved Report" {{-- needs translation --}}
+                    data-placeholder={{ trans('admin/reports/general.saved_reports') }}
                     data-allow-clear="true"
                 >
                     <option></option>
@@ -438,23 +446,6 @@
                     @endforeach
                 </select>
 
-{{--                @if($saved_reports->first()!="")--}}
-{{--                    <button type="submit" class="btn btn-success" style="width: 32%">--}}
-{{--                        <i class="fas fa-download icon-white" aria-hidden="true"></i>--}}
-{{--                    </button>--}}
-{{--                    <form method="post" id="savetemplateform" action="{{ route("report-templates.update") }}">--}}
-{{--                        @csrf--}}
-{{--                        <input type="hidden" id="savetemplateform" name="options">--}}
-{{--                        <input type="hidden" id="name" name="name" value="{{ $reportTemplate->name }},1git ">--}}
-{{--                        <button class="btn btn-primary" style="width: 32%">--}}
-{{--                            {{ "update" }}--}}
-{{--                        </button>--}}
-{{--                    </form>--}}
-{{--                    <button class="btn btn-warning" style="width: 32%">--}}
-{{--                        {{ "delete" }}--}}
-{{--                    </button>--}}
-{{--                @endif--}}
-
                 @push('js')
                     <script>
                         $('#saved_report_select')