Merge pull request #18056 from grokability/add-expected-checkin-to-view-assets

Added expected_checkin to user’s View Assigned page

Author: snipe

app/Models/Asset.php

@@ -399,6 +399,12 @@ protected function eolDiffForHumans(): Attribute
 
     }
 
+    protected function expectedCheckinFormattedDate(): Attribute
+    {
+        return Attribute:: make(
+            get: fn(mixed $value, array $attributes) => array_key_exists('expected_checkin', $attributes) ? Helper::getFormattedDateObject($attributes['expected_checkin'], 'date', false) : null,
+        );
+    }
 
     /**
      * Establishes the asset -> company relationship

resources/views/account/view-assets.blade.php

@@ -464,6 +464,9 @@ class="table table-striped snipe-table"
                       <th class="col-md-2" data-switchable="true" data-visible="false">
                         {{ trans('general.location') }}
                       </th>
+                      <th class="col-md-2" data-switchable="true" data-visible="true">
+                        {{ trans('admin/hardware/form.expected_checkin') }}
+                      </th>
                       @can('self.view_purchase_cost')
                         <th class="col-md-6" data-footer-formatter="sumFormatter" data-fieldname="purchase_cost">
                           {{ trans('general.purchase_cost') }}
@@ -530,6 +533,9 @@ class="table table-striped snipe-table"
                         <td>
                           {{ ($asset->location) ? $asset->location->name : '' }}
                         </td>
+                        <td>
+                          {{ ($asset->expected_checkin) ? $asset->expected_checkin_formatted_date : '' }}
+                        </td>
                         @can('self.view_purchase_cost')
                         <td>
                           {!! Helper::formatCurrencyOutput($asset->purchase_cost) !!}