From c08bd8f88bad332874923c47bf4a4cc6058cc7a8 Mon Sep 17 00:00:00 2001 From: snipe Date: Sat, 20 Jul 2024 16:11:45 +0100 Subject: [PATCH 1/5] Nicer consumables layout Signed-off-by: snipe --- .../lang/en-US/admin/consumables/general.php | 1 + resources/lang/en-US/general.php | 1 + resources/views/consumables/view.blade.php | 798 +++++++++++------- 3 files changed, 491 insertions(+), 309 deletions(-) diff --git a/resources/lang/en-US/admin/consumables/general.php b/resources/lang/en-US/admin/consumables/general.php index 7c6bb32968..29acfedc1b 100644 --- a/resources/lang/en-US/admin/consumables/general.php +++ b/resources/lang/en-US/admin/consumables/general.php @@ -8,4 +8,5 @@ return array( 'remaining' => 'Remaining', 'total' => 'Total', 'update' => 'Update Consumable', + 'inventory_warning' => 'The inventory of this consumable is below the minimum amount of :min_count', ); diff --git a/resources/lang/en-US/general.php b/resources/lang/en-US/general.php index 71bbb05a4f..b3a6b34320 100644 --- a/resources/lang/en-US/general.php +++ b/resources/lang/en-US/general.php @@ -557,5 +557,6 @@ return [ 'close' => 'Close', 'expires' => 'Expires', 'map_fields'=> 'Map :item_type Field', + 'remaining_var' => ':count Remaining', ]; diff --git a/resources/views/consumables/view.blade.php b/resources/views/consumables/view.blade.php index 5a25659fbe..512d387031 100644 --- a/resources/views/consumables/view.blade.php +++ b/resources/views/consumables/view.blade.php @@ -2,114 +2,500 @@ {{-- Page title --}} @section('title') - {{ $consumable->name }} - {{ trans('general.consumable') }} -@parent -@stop + {{ $consumable->name }} + {{ trans('general.consumable') }} + ({{ trans('general.remaining_var', ['count' => $consumable->numRemaining()]) }}) + @parent +@endsection @section('header_right') - - {{ trans('general.back') }} -@stop - + + {{ trans('general.back') }} +@endsection {{-- Page content --}} @section('content') -
-
- -
- +
+
+
-
+ +
-
-
+ @if ($consumable->image!='') +
+ + {{ $consumable->name }} +
+ @endif - + {{ trans('button.edit') }} + + @endcan + + @can('checkout', $consumable) + @if ($consumable->numRemaining() > 0) +
+ + {{ trans('general.checkout') }} + +
+ @else +
+ +
+ @endif + @endif + + + @can('delete', $consumable) +
+ @if ($consumable->deleted_at=='') + + {{ trans('general.delete') }} + @endif +
+ @endcan + + + + +
+ +
+ +
+ +
+ {{ trans('admin/users/table.name') }} +
+
+ {{ $consumable->name }} +
+
+ + + @if ($consumable->company) +
+
+ {{ trans('general.company') }} +
+
+ {{ $consumable->company->name }} +
+
+ @endif + + + @if ($consumable->category) +
+
+ {{ trans('general.category') }} +
+
+ {{ $consumable->category->name }} +
+
+ @endif + + + + @if ($consumable->numRemaining()) +
+
+ {{ trans('general.remaining') }} +
+
+ @if ($consumable->numRemaining() < (int) $consumable->min_amt) + + @endif + {{ $consumable->numRemaining() }} +
+
+ @endif + + + @if ($consumable->location) +
+
+ {{ trans('general.location') }} +
+
+ {{ $consumable->location->name }} +
+
+ @endif + + + @if ($consumable->supplier) +
+
+ {{ trans('general.supplier') }} +
+
+ {{ $consumable->supplier->name }} +
+
+ @endif + + + @if ($consumable->manufacturer) +
+
+ {{ trans('general.manufacturer') }} +
+
+ {{ $consumable->manufacturer->name }} +
+
+ @endif + + @if ($consumable->purchase_cost) +
+
+ {{ trans('general.purchase_cost') }} +
+
+ {{ $snipeSettings->default_currency }} + {{ Helper::formatCurrencyOutput($consumable->purchase_cost) }} +
+
+ @endif + + @if ($consumable->order_number) +
+
+ {{ trans('general.order_number') }} +
+
+ {{ $consumable->order_number }} + + +
+
+ @endif + + @if ($consumable->item_no) +
+
+ {{ trans('admin/consumables/general.item_no') }} +
+
+ + {{ $consumable->item_no }} + + +
+
+ @endif + + @if ($consumable->model_number) +
+
+ {{ trans('general.model_no') }} +
+
+ + {{ $consumable->model_number }} + + +
+
+ @endif + + + @if ($consumable->purchase_date) +
+
+ {{ trans('general.purchase_date') }} +
+
+ {{ \App\Helpers\Helper::getFormattedDateObject($consumable->purchase_date, 'datetime', false) }} +
+
+ @endif + + @if ($consumable->created_at) + +
+
+ {{ trans('general.created_at') }} +
+
+ {{ \App\Helpers\Helper::getFormattedDateObject($consumable->created_at, 'datetime')['formatted']}} +
+
+ @endif + + @if ($consumable->updated_at) + +
+
+ {{ trans('general.updated_at') }} +
+
+ {{ \App\Helpers\Helper::getFormattedDateObject($consumable->updated_at, 'datetime')['formatted']}} +
+
+ @endif + + @if ($consumable->admin) + +
+
+ {{ trans('general.created_by') }} +
+
+ + @if ($consumable->admin->deleted_at == '') + {{ $consumable->admin->present()->fullName }} + @else + {{ $consumable->admin->present()->fullName }} + @endif + +
+
+ @endif + + @if ($consumable->notes) + +
+ +
+ {{ trans('admin/users/table.notes') }} +
+
+ {!! nl2br(Helper::parseEscapedMarkedownInline($consumable->notes)) !!} +
+ +
+ @endif +
+
+ + + +
+ +
- - - - - - - - - -
{{ trans('general.image') }}{{ trans('general.user') }} - {{ trans('general.date') }} - {{ trans('general.notes') }}{{ trans('general.admin') }}
-
-
+ + + {{ trans('general.image') }} + {{ trans('general.user') }} + + {{ trans('general.date') }} + + {{ trans('general.notes') }} + {{ trans('general.admin') }} + + + + +
-
- -
-
+
+
+ +
+
+ + + + + + + + + + + + + + + + @if ($consumable->uploads->count() > 0) + @foreach ($consumable->uploads as $file) + + + + + + + + + + + + @endforeach + @else + + + + @endif + +
{{trans('general.file_type')}}{{ trans('general.image') }}{{ trans('general.file_name') }}{{ trans('general.filesize') }}{{ trans('general.notes') }}{{ trans('general.download') }}{{ trans('general.created_at') }}{{ trans('table.actions') }}
+ + {{ Helper::filetype_icon($file->filename) }} + + + @if ($file->filename) + @if ( Helper::checkUploadIsImage($file->get_src('consumables'))) + + @endif + @endif + + {{ $file->filename }} + + {{ @Helper::formatFilesizeUnits(Storage::exists('private_uploads/consumables/'.$file->filename) ? Storage::size('private_uploads/consumables/'.$file->filename) : '') }} + + @if ($file->note) + {!! nl2br(Helper::parseEscapedMarkedownInline($file->note)) !!} + @endif + + @if ($file->filename) + + + {{ trans('general.download') }} + + + + + + @endif + {{ $file->created_at }} + + + {{ trans('general.delete') }} + + +
{{ trans('general.no_results') }}
+
+
+
+
+ +
+
+
-
-
- - - @can('consumables.files', $consumable) -
- -
- - - - - - - - - - - - - - - @if ($consumable->uploads->count() > 0) - @foreach ($consumable->uploads as $file) - - - - - - - - - - - - @endforeach - @else - - - - @endif - -
{{trans('general.file_type')}}{{ trans('general.image') }}{{ trans('general.file_name') }}{{ trans('general.filesize') }}{{ trans('general.notes') }}{{ trans('general.download') }}{{ trans('general.created_at') }}{{ trans('table.actions') }}
- - {{ Helper::filetype_icon($file->filename) }} - - - @if ($file->filename) - @if ( Helper::checkUploadIsImage($file->get_src('consumables'))) - - @endif - @endif - - {{ $file->filename }} - - {{ @Helper::formatFilesizeUnits(Storage::exists('private_uploads/consumables/'.$file->filename) ? Storage::size('private_uploads/consumables/'.$file->filename) : '') }} - - @if ($file->note) - {!! nl2br(Helper::parseEscapedMarkedownInline($file->note)) !!} - @endif - - @if ($file->filename) - - - {{ trans('general.download') }} - - - - - - @endif - {{ $file->created_at }} - - - {{ trans('general.delete') }} - - -
{{ trans('general.no_results') }}
-
-
- @endcan - -
-
- +
+
+
- -
- -
-
-
-
- - - @if ($consumable->image!='') -
- - {{ $consumable->name }} -
- @endif - - @if ($consumable->purchase_date) -
- {{ trans('general.purchase_date') }}: - {{ Helper::getFormattedDateObject($consumable->purchase_date, 'date', false) }} -
- @endif - - @if ($consumable->purchase_cost) -
- {{ trans('general.purchase_cost') }}: - {{ $snipeSettings->default_currency }} - {{ Helper::formatCurrencyOutput($consumable->purchase_cost) }} -
- @endif - - @if ($consumable->item_no) -
- {{ trans('admin/consumables/general.item_no') }}: - {{ $consumable->item_no }} -
- @endif - - @if ($consumable->model_number) -
- {{ trans('general.model_no') }}: - {{ $consumable->model_number }} -
- @endif - - @if ($consumable->manufacturer) -
- {{ trans('general.manufacturer') }}: - {{ $consumable->manufacturer->name }} -
- @endif - - @if ($consumable->order_number) -
- {{ trans('general.order_number') }}: - {{ $consumable->order_number }} -
- @endif - - @if ($consumable->notes) - -
- - {{ trans('general.notes') }}: - -
-
- {!! nl2br(Helper::parseEscapedMarkedownInline($consumable->notes)) !!} -
- - @endif - - @can('checkout', \App\Models\Consumable::class) - -
-

- @if ($consumable->numRemaining() > 0) - - {{ trans('general.checkout') }} - - @else - - @endif -
- @can('update', \App\Models\Consumable::class) -
- {{ trans('button.edit') }} -
- @endcan - - @can('delete', $consumable) -
- @if ($consumable->deleted_at=='') - - {{ trans('general.delete') }} - @endif -
- @endcan - - @endcan - -
- -
-
+ @can('update', \App\Models\User::class) + @include ('modals.upload-file', ['item_type' => 'consumable', 'item_id' => $consumable->id]) + @endcan -@can('consumables.files', \App\Models\Consumable::class) - @include ('modals.upload-file', ['item_type' => 'consumable', 'item_id' => $consumable->id]) -@endcan @stop @section('moar_scripts') - + $('#dataConfirmModal').on('show.bs.modal', function (event) { + var content = $(event.relatedTarget).data('content'); + var title = $(event.relatedTarget).data('title'); + $(this).find(".modal-body").text(content); + $(this).find(".modal-header").text(title); + }); -@include ('partials.bootstrap-table', ['exportFile' => 'consumable' . $consumable->name . '-export', 'search' => false]) -@stop + + + + @include ('partials.bootstrap-table', ['simple_view' => true]) +@endsection \ No newline at end of file From 2bfee0c29a285f0fc137959d26903eefba18c878 Mon Sep 17 00:00:00 2001 From: snipe Date: Sat, 20 Jul 2024 16:21:11 +0100 Subject: [PATCH 2/5] Few more tweaks Signed-off-by: snipe --- .../Consumables/ConsumablesController.php | 2 +- resources/views/consumables/view.blade.php | 22 ++++++++++++++----- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/app/Http/Controllers/Consumables/ConsumablesController.php b/app/Http/Controllers/Consumables/ConsumablesController.php index 5685944a5c..9dd17fe6bc 100644 --- a/app/Http/Controllers/Consumables/ConsumablesController.php +++ b/app/Http/Controllers/Consumables/ConsumablesController.php @@ -200,7 +200,7 @@ class ConsumablesController extends Controller */ public function show($consumableId = null) { - $consumable = Consumable::find($consumableId); + $consumable = Consumable::withCount('users as users_consumables')->find($consumableId); $this->authorize($consumable); if (isset($consumable->id)) { return view('consumables/view', compact('consumable')); diff --git a/resources/views/consumables/view.blade.php b/resources/views/consumables/view.blade.php index 512d387031..402edd707b 100644 --- a/resources/views/consumables/view.blade.php +++ b/resources/views/consumables/view.blade.php @@ -3,7 +3,7 @@ {{-- Page title --}} @section('title') {{ $consumable->name }} - {{ trans('general.consumable') }} + {{ trans('general.consumable') }} - ({{ trans('general.remaining_var', ['count' => $consumable->numRemaining()]) }}) @parent @endsection @@ -38,10 +38,10 @@
  • -
    • @@ -190,6 +190,18 @@
    @endif + + @if ($consumable->min_amt) +
    +
    + {{ trans('general.min_amt') }} +
    +
    + {{ $consumable->min_amt }} +
    +
    + @endif + @if ($consumable->location)
    @@ -248,7 +260,7 @@ - +
    @endif From 254e2f120b428bcb8e6823df891fa00ac9052355 Mon Sep 17 00:00:00 2001 From: snipe Date: Sat, 20 Jul 2024 16:40:32 +0100 Subject: [PATCH 3/5] Added clone to consumables Signed-off-by: snipe --- .../Controllers/Consumables/ConsumablesController.php | 10 ++++++++++ app/Http/Transformers/ConsumablesTransformer.php | 1 + routes/web/consumables.php | 4 ++++ 3 files changed, 15 insertions(+) diff --git a/app/Http/Controllers/Consumables/ConsumablesController.php b/app/Http/Controllers/Consumables/ConsumablesController.php index 9dd17fe6bc..f746b9f904 100644 --- a/app/Http/Controllers/Consumables/ConsumablesController.php +++ b/app/Http/Controllers/Consumables/ConsumablesController.php @@ -209,4 +209,14 @@ class ConsumablesController extends Controller return redirect()->route('consumables.index') ->with('error', trans('admin/consumables/message.does_not_exist')); } + + public function clone(Consumable $consumable) : View + { + $this->authorize('create', $consumable); + $consumable_to_close = $consumable; + $consumable = clone $consumable_to_close; + $consumable->id = null; + + return view('consumables/edit')->with('item', $consumable); + } } diff --git a/app/Http/Transformers/ConsumablesTransformer.php b/app/Http/Transformers/ConsumablesTransformer.php index f23ebc0382..d0ae57eef0 100644 --- a/app/Http/Transformers/ConsumablesTransformer.php +++ b/app/Http/Transformers/ConsumablesTransformer.php @@ -55,6 +55,7 @@ class ConsumablesTransformer 'checkin' => Gate::allows('checkin', Consumable::class), 'update' => Gate::allows('update', Consumable::class), 'delete' => Gate::allows('delete', Consumable::class), + 'clone' => (Gate::allows('create', Consumable::class) && ($consumable->deleted_at == '')), ]; $array += $permissions_array; diff --git a/routes/web/consumables.php b/routes/web/consumables.php index 4e2472d30c..8e6c94d863 100644 --- a/routes/web/consumables.php +++ b/routes/web/consumables.php @@ -31,6 +31,10 @@ Route::group(['prefix' => 'consumables', 'middleware' => ['auth']], function () [Consumables\ConsumablesFilesController::class, 'show'] )->name('show.consumablefile'); + Route::get('{consumable}/clone', + [Consumables\ConsumablesController::class, 'clone'] + )->name('consumables.clone.create'); + }); From cea31c5b11567e428e8000cf819a4b32230d970c Mon Sep 17 00:00:00 2001 From: snipe Date: Sat, 20 Jul 2024 16:53:01 +0100 Subject: [PATCH 4/5] Added more generic buttons with variables Signed-off-by: snipe --- resources/lang/en-US/button.php | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/resources/lang/en-US/button.php b/resources/lang/en-US/button.php index 22821b8157..51c54bb9b5 100644 --- a/resources/lang/en-US/button.php +++ b/resources/lang/en-US/button.php @@ -7,6 +7,7 @@ return [ 'checkin_and_delete' => 'Checkin All / Delete User', 'delete' => 'Delete', 'edit' => 'Edit', + 'clone' => 'Clone', 'restore' => 'Restore', 'remove' => 'Remove', 'request' => 'Request', @@ -21,4 +22,13 @@ return [ 'add_maintenance' => 'Add Maintenance', 'append' => 'Append', 'new' => 'New', + 'var' => [ + 'clone' => 'Clone :item_type', + 'edit' => 'Edit :item_type', + 'delete' => 'Delete :item_type', + 'restore' => 'Delete :item_type', + 'create' => 'Create New :item_type', + 'checkout' => 'Checkout :item_type', + 'checkin' => 'Checkin :item_type', + ] ]; From 38affea3f3a83994dd2c7109d59878e9dda2e793 Mon Sep 17 00:00:00 2001 From: snipe Date: Sat, 20 Jul 2024 16:57:10 +0100 Subject: [PATCH 5/5] More updates Signed-off-by: snipe --- .../Controllers/Consumables/ConsumablesController.php | 2 ++ resources/views/accessories/view.blade.php | 2 +- resources/views/consumables/view.blade.php | 8 ++++++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/Consumables/ConsumablesController.php b/app/Http/Controllers/Consumables/ConsumablesController.php index f746b9f904..883d5849ee 100644 --- a/app/Http/Controllers/Consumables/ConsumablesController.php +++ b/app/Http/Controllers/Consumables/ConsumablesController.php @@ -216,6 +216,8 @@ class ConsumablesController extends Controller $consumable_to_close = $consumable; $consumable = clone $consumable_to_close; $consumable->id = null; + $consumable->image = null; + $consumable->user_id = null; return view('consumables/edit')->with('item', $consumable); } diff --git a/resources/views/accessories/view.blade.php b/resources/views/accessories/view.blade.php index 9a37059b41..e42439bd86 100644 --- a/resources/views/accessories/view.blade.php +++ b/resources/views/accessories/view.blade.php @@ -330,7 +330,7 @@ {{ trans('admin/accessories/general.edit') }}
    @endcan - @can('update', \App\Models\Accessory::class) + @can('create', \App\Models\Accessory::class)
    {{ trans('admin/accessories/general.clone') }}
    diff --git a/resources/views/consumables/view.blade.php b/resources/views/consumables/view.blade.php index 402edd707b..f6ea14042e 100644 --- a/resources/views/consumables/view.blade.php +++ b/resources/views/consumables/view.blade.php @@ -101,6 +101,14 @@
    @endcan + @can('create', Consumable::class) + +
    + {{ trans('button.var.clone', ['item_type' => trans('general.consumable')]) }} +
    + + @endcan + @can('checkout', $consumable) @if ($consumable->numRemaining() > 0)