From c07a244babff53edce0bb522bc23f34c3971d9cf Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Tue, 10 May 2022 11:20:42 -0700 Subject: [PATCH 1/5] fixes 1/2 visual issues, adds history tab to accessories --- resources/views/accessories/view.blade.php | 236 ++++++++++++++------- 1 file changed, 154 insertions(+), 82 deletions(-) diff --git a/resources/views/accessories/view.blade.php b/resources/views/accessories/view.blade.php index 20c6264b90..cd00501452 100644 --- a/resources/views/accessories/view.blade.php +++ b/resources/views/accessories/view.blade.php @@ -47,15 +47,34 @@ {{-- Page content --}} @section('content') + +
-
-
+ - +
+
+
+
- + - + -
{{ trans('general.user') }} {{ trans('general.notes') }} {{ trans('admin/hardware/table.checkout_date') }} {{ trans('table.actions') }}
-
-
+ +
+ + + + + +
+ + @if ($accessory->image!='') +
+
+ {{ $accessory->name }} +
+
+ @endif + + @if ($accessory->company) +
+
+ {{ trans('general.company')}} +
+
+ {{ $accessory->company->name }} +
+
+ @endif + + + @if ($accessory->category) +
+
+ {{ trans('general.category')}} +
+
+ {{ $accessory->category->name }} +
+
+ @endif + + + @if ($accessory->notes) + +
+ + {{ trans('general.notes') }} + +
+
+ {!! nl2br(e($accessory->notes)) !!} +
+ + @endif + + +
+
+ Number remaining +
+
+ {{ $accessory->numRemaining() }} +
+
+ + + + @can('checkout', \App\Models\Accessory::class) +
+
+ numRemaining() > 0 ) ? '' : ' disabled') }}>{{ trans('general.checkout') }} +
+
+ @endcan + + + + @stop +
+ + + +
+
+
+ + + + + + + + + + + + @if ($snipeSettings->require_accept_signature=='1') + + @endif + + +
{{ trans('general.record_created') }}{{ trans('general.admin') }}{{ trans('general.action') }}{{ trans('general.item') }}{{ trans('general.target') }}{{ trans('general.notes') }}{{ trans('general.date') }}{{ trans('general.signature') }}
+
+
+
+ + - - - - - -
- - @if ($accessory->image!='') -
-
- {{ $accessory->name }} -
-
- @endif - - @if ($accessory->company) -
-
- {{ trans('general.company')}} -
-
- {{ $accessory->company->name }} -
-
- @endif - - - @if ($accessory->category) -
-
- {{ trans('general.category')}} -
-
- {{ $accessory->category->name }} -
-
- @endif - - - @if ($accessory->notes) - -
- - {{ trans('general.notes') }} - -
-
- {!! nl2br(e($accessory->notes)) !!} -
-
- @endif - - -
-
- Number remaining -
-
- {{ $accessory->numRemaining() }} -
-
- @can('checkout', \App\Models\Accessory::class) -
-
- numRemaining() > 0 ) ? '' : ' disabled') }}>{{ trans('general.checkout') }} -
-
- @endcan - - -@stop + + + + + + @section('moar_scripts') @include ('partials.bootstrap-table') From 8ebe64e630cb37010d9a6f87aa925bddca22b5ed Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Wed, 11 May 2022 12:13:36 -0700 Subject: [PATCH 2/5] fixes final visual issue --- resources/views/accessories/view.blade.php | 110 ++++++++++----------- 1 file changed, 54 insertions(+), 56 deletions(-) diff --git a/resources/views/accessories/view.blade.php b/resources/views/accessories/view.blade.php index cd00501452..883bb97db9 100644 --- a/resources/views/accessories/view.blade.php +++ b/resources/views/accessories/view.blade.php @@ -105,64 +105,65 @@ + -
- - @if ($accessory->image!='') -
-
- {{ $accessory->name }} -
-
- @endif - - @if ($accessory->company) -
-
- {{ trans('general.company')}} -
-
- {{ $accessory->company->name }} -
-
- @endif - - - @if ($accessory->category) -
-
- {{ trans('general.category')}} -
-
- {{ $accessory->category->name }} -
-
- @endif - - - @if ($accessory->notes) - -
- - {{ trans('general.notes') }} - -
-
- {!! nl2br(e($accessory->notes)) !!} -
- - @endif - +
+ @if ($accessory->image!='')
-
- Number remaining -
-
- {{ $accessory->numRemaining() }} +
+ {{ $accessory->name }}
+ @endif + + @if ($accessory->company) +
+
+ {{ trans('general.company')}} +
+
+ {{ $accessory->company->name }} +
+
+ @endif + + + @if ($accessory->category) +
+
+ {{ trans('general.category')}} +
+
+ {{ $accessory->category->name }} +
+
+ @endif + + + @if ($accessory->notes) + +
+ + {{ trans('general.notes') }} + +
+
+ {!! nl2br(e($accessory->notes)) !!} +
+ + @endif + + +
+
+ Number remaining +
+
+ {{ $accessory->numRemaining() }} +
+
@@ -174,9 +175,6 @@
@endcan - - - @stop
@@ -220,8 +218,8 @@ + @stop - From 5316f41eba0702e263d2d535ea2529e1dff00380 Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Wed, 1 Jun 2022 16:56:01 -0700 Subject: [PATCH 3/5] fixed a div placement --- resources/views/accessories/view.blade.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/resources/views/accessories/view.blade.php b/resources/views/accessories/view.blade.php index 883bb97db9..cb13bf8c31 100644 --- a/resources/views/accessories/view.blade.php +++ b/resources/views/accessories/view.blade.php @@ -54,9 +54,9 @@
  • - +
    • @@ -106,7 +106,7 @@ - +
    @@ -153,7 +153,7 @@ {!! nl2br(e($accessory->notes)) !!}
    - @endif + @endif
    @@ -218,8 +218,8 @@
    - @stop + git From d302675056a998a814db4e7018f45c51e92393aa Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Wed, 1 Jun 2022 16:58:29 -0700 Subject: [PATCH 4/5] fixed a div placement --- resources/views/accessories/view.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/accessories/view.blade.php b/resources/views/accessories/view.blade.php index cb13bf8c31..d8cc0ccbd3 100644 --- a/resources/views/accessories/view.blade.php +++ b/resources/views/accessories/view.blade.php @@ -219,7 +219,7 @@ - git +@stop From 4e03ebe284ab80eb9902089bb837f0b3d85596f4 Mon Sep 17 00:00:00 2001 From: snipe Date: Thu, 2 Jun 2022 16:30:26 -0700 Subject: [PATCH 5/5] =?UTF-8?q?Don=E2=80=99t=20use=20the=20formatted=20dat?= =?UTF-8?q?e=20for=20diff=20days=20in=20audit=20report?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: snipe --- .../views/notifications/markdown/upcoming-audits.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/notifications/markdown/upcoming-audits.blade.php b/resources/views/notifications/markdown/upcoming-audits.blade.php index e1d95d6112..f7ccf556b1 100644 --- a/resources/views/notifications/markdown/upcoming-audits.blade.php +++ b/resources/views/notifications/markdown/upcoming-audits.blade.php @@ -9,7 +9,7 @@ @php $next_audit_date = Helper::getFormattedDateObject($asset->next_audit_date, 'date', false); $last_audit_date = Helper::getFormattedDateObject($asset->last_audit_date, 'date', false); -$diff = Carbon::parse(Carbon::now())->diffInDays($next_audit_date, false); +$diff = Carbon::parse(Carbon::now())->diffInDays($asset->next_audit_date, false); $icon = ($diff <= 7) ? '🚨' : (($diff <= 14) ? '⚠️' : ' '); @endphp |{{ $icon }}| [{{ $asset->present()->name }}]({{ route('hardware.show', $asset->id) }}) | {{ $last_audit_date }}| {{ $next_audit_date }} | {{ $diff }} | {{ ($asset->supplier ? e($asset->supplier->name) : '') }}|{{ ($asset->assignedTo ? $asset->assignedTo->present()->name() : '') }}