From 3173ead2e714e584d91620666915321028fcc149 Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Tue, 26 Mar 2024 09:11:54 -0700 Subject: [PATCH 1/4] adds accessory signature to user print report --- resources/views/users/print.blade.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/resources/views/users/print.blade.php b/resources/views/users/print.blade.php index 2c9b4719f2..cfc5bd4949 100644 --- a/resources/views/users/print.blade.php +++ b/resources/views/users/print.blade.php @@ -256,6 +256,7 @@ {{ trans('general.name') }} {{ trans('general.category') }} {{ trans('admin/hardware/table.checkout_date') }} + {{ trans('general.signature') }} @php @@ -274,6 +275,9 @@ {{ ($accessory->manufacturer) ? $accessory->manufacturer->name : '' }} {{ $accessory->name }} {{ $accessory->model_number }} {{ $accessory->category->name }} {{ $accessory->pivot->created_at }} + + + @php $acounter++ From 3222d4c8dfce98f7aae230a21fd8d2fb68abee51 Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Tue, 26 Mar 2024 09:18:34 -0700 Subject: [PATCH 2/4] adds signature check --- resources/views/users/print.blade.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/views/users/print.blade.php b/resources/views/users/print.blade.php index cfc5bd4949..023d091c05 100644 --- a/resources/views/users/print.blade.php +++ b/resources/views/users/print.blade.php @@ -275,9 +275,9 @@ {{ ($accessory->manufacturer) ? $accessory->manufacturer->name : '' }} {{ $accessory->name }} {{ $accessory->model_number }} {{ $accessory->category->name }} {{ $accessory->pivot->created_at }} + @if (($accessory->assetlog->first()) && ($accessory->assetlog->first()->accept_signature!='')) - - + @endif @php $acounter++ From f4f9b165a7cca12449da72661ada0cbe4a51f574 Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Tue, 26 Mar 2024 11:24:34 -0700 Subject: [PATCH 3/4] moves signature check inside of td --- resources/views/users/print.blade.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/resources/views/users/print.blade.php b/resources/views/users/print.blade.php index 023d091c05..8526a6863a 100644 --- a/resources/views/users/print.blade.php +++ b/resources/views/users/print.blade.php @@ -275,9 +275,12 @@ {{ ($accessory->manufacturer) ? $accessory->manufacturer->name : '' }} {{ $accessory->name }} {{ $accessory->model_number }} {{ $accessory->category->name }} {{ $accessory->pivot->created_at }} - @if (($accessory->assetlog->first()) && ($accessory->assetlog->first()->accept_signature!='')) - - @endif + + + @if (($accessory->assetlog->first()) && ($accessory->assetlog->first()->accept_signature!='')) + + @endif + @php $acounter++ From 84cc88831d5e768cb3fb83a5afa7539f6b50335a Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Tue, 26 Mar 2024 12:18:10 -0700 Subject: [PATCH 4/4] adds signature for components --- resources/views/users/print.blade.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/resources/views/users/print.blade.php b/resources/views/users/print.blade.php index 8526a6863a..4bbec7980b 100644 --- a/resources/views/users/print.blade.php +++ b/resources/views/users/print.blade.php @@ -315,6 +315,8 @@ {{ trans('general.name') }} {{ trans('general.category') }} {{ trans('admin/hardware/table.checkout_date') }} + {{ trans('general.signature') }} + @php @@ -336,6 +338,11 @@ {{ ($consumable->category) ? $consumable->category->name : ' invalid/deleted category' }} {{ $consumable->pivot->created_at }} + + @if (($consumable->assetlog->first()) && ($consumable->assetlog->first()->accept_signature!='')) + + @endif + @php $ccounter++