Merge pull request #15154 from snipe/fixes/15103_show_eol_to_users

Fixes #15103 - Added EOL and audit into to user profile assets
snipe · Jul 24, 2024 · 172da4d · 172da4d
2 parents 9457e5b + 6f8ccd4
commit 172da4d
Showing 1 changed file with 58 additions and 13 deletions.
diff --git a/resources/views/account/view-assets.blade.php b/resources/views/account/view-assets.blade.php
@@ -399,17 +399,43 @@ class="table table-striped snipe-table"
                   }'>
                     <thead>
                     <tr>
-                      <th class="col-md-1">#</th>
-                      <th class="col-md-1">{{ trans('general.image') }}</th>
-                      <th class="col-md-2" data-switchable="true" data-visible="true">{{ trans('general.category') }}</th>
-                      <th class="col-md-2" data-switchable="true" data-visible="true">{{ trans('admin/hardware/table.asset_tag') }}</th>
-                      <th class="col-md-2" data-switchable="true" data-visible="true">{{ trans('general.name') }}</th>
-                      <th class="col-md-2" data-switchable="true" data-visible="true">{{ trans('admin/hardware/table.asset_model') }}</th>
-                      <th class="col-md-3" data-switchable="true" data-visible="true">{{ trans('admin/hardware/table.serial') }}</th>
-                      <th class="col-md-2" data-switchable="true" data-visible="false">{{ trans('admin/hardware/form.default_location') }}</th>
+                      <th class="col-md-1">
+                        #
+                      </th>
+                      <th class="col-md-1">
+                        {{ trans('general.image') }}
+                      </th>
+                      <th class="col-md-2" data-switchable="true" data-visible="true">
+                        {{ trans('general.category') }}
+                      </th>
+                      <th class="col-md-2" data-switchable="true" data-visible="true">
+                        {{ trans('admin/hardware/table.asset_tag') }}
+                      </th>
+                      <th class="col-md-2" data-switchable="true" data-visible="false">{{ trans('general.name') }}</th>
+                      <th class="col-md-2" data-switchable="true" data-visible="true">
+                        {{ trans('admin/hardware/table.asset_model') }}
+                      </th>
+                      <th class="col-md-3" data-switchable="true" data-visible="true">
+                        {{ trans('admin/hardware/table.serial') }}
+                      </th>
+                      <th class="col-md-2" data-switchable="true" data-visible="false">
+                        {{ trans('admin/hardware/form.default_location') }}
+                      </th>
+
                       @can('self.view_purchase_cost')
-                        <th class="col-md-6" data-footer-formatter="sumFormatter" data-fieldname="purchase_cost">{{ trans('general.purchase_cost') }}</th>
+                        <th class="col-md-6" data-footer-formatter="sumFormatter" data-fieldname="purchase_cost">
+                          {{ trans('general.purchase_cost') }}
+                        </th>
                       @endcan
+                      <th class="col-md-2" data-switchable="true" data-visible="false">
+                        {{ trans('admin/hardware/form.eol_date') }}
+                      </th>
+                      <th class="col-md-2" data-switchable="true" data-visible="false">
+                        {{ trans('general.last_audit') }}
+                      </th>
+                      <th class="col-md-2" data-switchable="true" data-visible="false">
+                        {{ trans('general.next_audit_date') }}
+                      </th>
                       @foreach ($field_array as $db_column => $field_name)
                         <th class="col-md-1" data-switchable="true" data-visible="true">{{ $field_name }}</th>
                       @endforeach
@@ -436,21 +462,40 @@ class="table table-striped snipe-table"
                           {{ $asset->model->category->name }}
                           @endif
                         </td>
-                        <td>{{ $asset->asset_tag }}</td>
-                        <td>{{ $asset->name }}</td>
+                        <td>
+                          {{ $asset->asset_tag }}
+                        </td>
+                        <td>
+                          {{ $asset->name }}
+                        </td>
                         <td>
                           @if ($asset->physical=='1')
                             {{ $asset->model->name }}
                           @endif
                         </td>
-                        <td>{{ $asset->serial }}</td>
-                        <td>{{ ($asset->defaultLoc) ? $asset->defaultLoc->name : '' }}</td>
+                        <td>
+                          {{ $asset->serial }}
+                        </td>
+                        <td>
+                          {{ ($asset->defaultLoc) ? $asset->defaultLoc->name : '' }}
+                        </td>
                         @can('self.view_purchase_cost')
                         <td>
                           {!! Helper::formatCurrencyOutput($asset->purchase_cost) !!}
                         </td>
                         @endcan
 
+                        <td>
+                          {{ ($asset->asset_eol_date != '') ? Helper::getFormattedDateObject($asset->asset_eol_date, 'date', false) : null }}
+                        </td>
+
+                        <td>
+                          {{ Helper::getFormattedDateObject($asset->last_audit_date, 'datetime', false) }}
+                        </td>
+                        <td>
+                          {{ Helper::getFormattedDateObject($asset->next_audit_date, 'date', false) }}
+                        </td>
+
                         @foreach ($field_array as $db_column => $field_value)
                           <td>
                             {{ $asset->{$db_column} }}