DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-02-20 19:05:55 -08:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

WIP: add dedicated edit report page

Browse source
This commit is contained in:
Marcus Moore 2023-12-13 18:09:42 -08:00
parent 75bd056bbe
commit 27bb938d9e
No known key found for this signature in database
3 changed files with 114 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/Http/Controllers/SavedReportsController.php
View file

@ -2,6 +2,7 @@
namespace App\Http\Controllers; namespace App\Http\Controllers;
use App\Models\CustomField;
use App\Models\SavedReport; use App\Models\SavedReport;
use Illuminate\Http\Request; use Illuminate\Http\Request;
@ -21,6 +22,16 @@ class SavedReportsController extends Controller
return redirect()->route('reports/custom', ['report' => $report->id]); return redirect()->route('reports/custom', ['report' => $report->id]);
} }
public function edit(Request $request, $reportId)
{
$report = SavedReport::findOrFail($reportId);
return view('reports/custom', [
'customfields' => CustomField::get(),
'savedReport' => $report,
]);
}
public function update(Request $request) public function update(Request $request)
{ {
$this->authorize('update',SavedReport::class); $this->authorize('update',SavedReport::class);

76
resources/views/reports/custom.blade.php
View file

@ -28,12 +28,52 @@
<div class="box box-default"> <div class="box box-default">
<div class="box-header with-border"> <div class="box-header with-border">
<h2 class="box-title"> <h2 class="box-title">
@if ($savedReport->name) @if ($savedReport->exists && request()->routeIs('saved-templates.edit'))
Updating: {{ $savedReport->name }}
@elseif($savedReport->exists)
Saved Template: {{ $savedReport->name }} Saved Template: {{ $savedReport->name }}
@else @else
{{ trans('general.customize_report') }} {{ trans('general.customize_report') }}
@endif @endif
</h2> </h2>
@if ($savedReport->exists && request()->routeIs('saved-templates.edit'))
<div class="box-tools pull-right">
{{-- todo --}}
<form id="savetemplateform" action="{{ route("savedreports/update") }}">
@csrf
@method('PUT')
<input type="hidden" id="savetemplateform" name="options">
<input type="hidden" id="name" name="name" value="{{ $savedReport->name }},1git ">
<button class="btn btn-primary" style="width: 32%">
{{ "update" }}
</button>
</form>
</div>
@elseif ($savedReport->exists)
<div class="box-tools pull-right">
<a
href="{{ route('saved-templates.edit', $savedReport) }}"
class="btn btn-sm btn-warning"
data-tooltip="true"
title="Update"
>
<i class="fas fa-pencil-alt" aria-hidden="true"></i>
<span class="sr-only">Update</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"
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>
</a>
</div>
@endif
</div><!-- /.box-header --> </div><!-- /.box-header -->
<div class="box-body"> <div class="box-body">
@ -371,6 +411,7 @@
</div> </div>
<div class="col-md-2"> <div class="col-md-2">
@if (! request()->routeIs('saved-templates.edit'))
<div style=padding-bottom:5px> <div style=padding-bottom:5px>
<form method="post" id="savetemplateform" action="{{ route("savedreports/store") }}"> <form method="post" id="savetemplateform" action="{{ route("savedreports/store") }}">
@csrf @csrf
@ -402,22 +443,22 @@
@endforeach @endforeach
</select> </select>
@if($saved_reports->first()!="") {{-- @if($saved_reports->first()!="")--}}
<button type="submit" class="btn btn-success" style="width: 32%"> {{-- <button type="submit" class="btn btn-success" style="width: 32%">--}}
<i class="fas fa-download icon-white" aria-hidden="true"></i> {{-- <i class="fas fa-download icon-white" aria-hidden="true"></i>--}}
</button> {{-- </button>--}}
<form method="post" id="savetemplateform" action="{{ route("savedreports/update") }}"> {{-- <form method="post" id="savetemplateform" action="{{ route("savedreports/update") }}">--}}
@csrf {{-- @csrf--}}
<input type="hidden" id="savetemplateform" name="options"> {{-- <input type="hidden" id="savetemplateform" name="options">--}}
<input type="hidden" id="name" name="name" value="{{ $savedReport->name }},1git "> {{-- <input type="hidden" id="name" name="name" value="{{ $savedReport->name }},1git ">--}}
<button class="btn btn-primary" style="width: 32%"> {{-- <button class="btn btn-primary" style="width: 32%">--}}
{{ "update" }} {{-- {{ "update" }}--}}
</button> {{-- </button>--}}
</form> {{-- </form>--}}
<button class="btn btn-warning" style="width: 32%"> {{-- <button class="btn btn-warning" style="width: 32%">--}}
{{ "delete" }} {{-- {{ "delete" }}--}}
</button> {{-- </button>--}}
@endif {{-- @endif--}}
@push('js') @push('js')
<script> <script>
@ -431,6 +472,7 @@
</script> </script>
@endpush @endpush
</div> </div>
@endif
</div> </div>
</div> </div>

4
routes/web.php
View file

@ -359,7 +359,9 @@ Route::group(['middleware' => ['auth']], function () {
Route::post('reports/custom', [ReportsController::class, 'postCustom']); Route::post('reports/custom', [ReportsController::class, 'postCustom']);
// @todo: change to saved-template? // @todo: change to saved-template?
Route::post('reports/savedtemplate', [SavedReportsController::class, 'store'])->name('savedreports/store'); Route::post('reports/savedtemplate', [SavedReportsController::class, 'store'])->name('savedreports/store');
Route::post('report/savedtemplate', [SavedReportsController::class, 'update'])->name('savedreports/update'); // @todo: starting the process of adding "-" to saved-template...
Route::get('reports/saved-templates/{reportId}/edit', [SavedReportsController::class, 'edit'])->name('saved-templates.edit');
Route::put('report/savedtemplate', [SavedReportsController::class, 'update'])->name('savedreports/update');
Route::get( Route::get(
'reports/activity', 'reports/activity',