Merge branch 'develop' into fix_action_date

Merge pull request #17110 from Godmartinz/allow-users-to-dl-eula-from-account
Fixed #17084 - Adds Eula table to User account area with download option
2025-06-06 17:18:27 +01:00 · 2025-06-06 17:07:19 +01:00 · 2025-06-06 17:01:50 +01:00 · 2025-06-05 10:59:16 -07:00 · 2025-06-04 15:48:35 -07:00 · 2025-06-04 15:04:59 -07:00
16 changed files with 357 additions and 125 deletions
@@ -6,6 +6,7 @@ use App\Helpers\Helper;
 use App\Http\Controllers\Controller;
 use App\Http\Requests\SaveUserRequest;
 use App\Http\Transformers\AccessoriesTransformer;
+use App\Http\Transformers\ActionlogsTransformer;
 use App\Http\Transformers\AssetsTransformer;
 use App\Http\Transformers\ConsumablesTransformer;
 use App\Http\Transformers\LicensesTransformer;
@@ -80,7 +81,7 @@ class UsersController extends Controller
            'users.autoassign_licenses',
            'users.website',

-        ])->with('manager', 'groups', 'userloc', 'company', 'department', 'assets', 'licenses', 'accessories', 'consumables', 'createdBy', 'managesUsers', 'managedLocations')
+        ])->with('manager', 'groups', 'userloc', 'company', 'department', 'assets', 'licenses', 'accessories', 'consumables', 'createdBy', 'managesUsers', 'managedLocations', 'eulas')
            ->withCount([
                'assets as assets_count' => function(Builder $query) {
                    $query->withoutTrashed();
@@ -736,6 +737,25 @@ class UsersController extends Controller
        return (new UsersTransformer)->transformUser($request->user());
    }

+    /**
+     * Display the EULAs accepted by the user.
+     *
+     *  @param \App\Models\User $user
+     *  @param \App\Http\Transformers\ActionlogsTransformer $transformer
+     *  @return \Illuminate\Http\JsonResponse
+     *@since [v8.1.16]
+     * @author [Godfrey Martinez] [<gmartinez@grokability.com>]
+     */
+    public function eulas(User $user, ActionlogsTransformer $transformer)
+    {
+        $this->authorize('view', Asset::class);
+
+        $eulas = $user->eulas;
+        return response()->json(
+            $transformer->transformActionlogs($eulas, $eulas->count())
+        );
+    }
+
    /**
     * Restore a soft-deleted user.
     *
@@ -113,7 +113,13 @@ class Actionlog extends SnipeModel
            } elseif (auth()->user() && auth()->user()->company) {
                $actionlog->company_id = auth()->user()->company_id;
            }
+
+            if ($actionlog->action_date == '') {
+                $actionlog->action_date = Carbon::now();
+            }
+
        });
+
    }


@@ -89,9 +89,6 @@ trait Loggable
        $log->note = $note;
        $log->action_date = $action_date;

-        if (! $log->action_date) {
-            $log->action_date = date('Y-m-d H:i:s');
-        }

        $changed = [];
        $array_to_flip = array_keys($fields_array);
@@ -551,6 +551,25 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
            ->orderBy('created_at', 'desc');
    }

+    /**
+     * Establishes the user -> eula relationship
+     *
+     * @return \Illuminate\Database\Eloquent\Relations\Relation
+     * @since [v8.1.16]
+     * @author [Godfrey Martinez] [<gmartinez@grokability.com>]
+ */
+    public function eulas()
+    {
+        return $this->hasMany(Actionlog::class, 'target_id')
+            ->with('item')
+            ->select(['id', 'target_id', 'target_type', 'action_type', 'filename', 'accept_signature', 'created_at'])
+            ->where('target_type', self::class)
+            ->where('action_type', 'accepted')
+            ->whereNotNull('filename')
+            ->whereNotNull('accept_signature')
+            ->orderBy('created_at', 'desc');
+    }
+
    /**
     * Establishes the user -> requested assets relationship
     *
@@ -0,0 +1,172 @@
+<?php
+
+namespace App\Presenters;
+
+/**
+ * Class AccessoryPresenter
+ */
+class HistoryPresenter extends Presenter
+{
+    /**
+     * Json Column Layout for bootstrap table
+     * @return string
+     */
+    public static function dataTableLayout($serial = false)
+    {
+        $extra = [];
+        $layout_start = [
+            [
+                'id' => 'id',
+                'searchable' => false,
+                'sortable' => true,
+                'switchable' => true,
+                'title' => trans('general.id'),
+                'visible' => false,
+                'class' => 'hidden-xs',
+            ],
+            [
+                'field' => 'icon',
+                'searchable' => false,
+                'sortable' => true,
+                'switchable' => true,
+                'title' => trans('admin/hardware/table.icon'),
+                'visible' => true,
+                'class' => 'hidden-xs',
+                'formatter' => 'iconFormatter',
+            ],
+            [
+                'field' => 'created_at',
+                'searchable' => true,
+                'sortable' => true,
+                'switchable' => true,
+                'title' => trans('general.created_at'),
+                'visible' => false,
+                'formatter' => 'dateDisplayFormatter',
+            ],
+            [
+                'field' => 'created_by',
+                'searchable' => false,
+                'sortable' => true,
+                'title' => trans('general.created_by'),
+                'visible' => false,
+                'formatter' => 'usersLinkObjFormatter',
+            ],
+            [
+                'field' => 'action_date',
+                'searchable' => false,
+                'sortable' => true,
+                'title' => trans('general.action_date'),
+                'visible' => false,
+                'formatter' => 'dateDisplayFormatter',
+            ],
+            [
+                'field' => 'action_type',
+                'searchable' => true,
+                'sortable' => true,
+                'switchable' => true,
+                'title' => trans('general.action'),
+                'visible' => false,
+            ],
+            [
+                'field' => 'item',
+                'searchable' => true,
+                'sortable' => true,
+                'switchable' => true,
+                'title' => trans('general.item'),
+                'visible' => false,
+                'formatter' => 'polymorphicItemFormatter',
+            ],
+        ];
+
+
+        if ($serial) {
+            $extra =  [
+                [
+                'field' => 'item.serial',
+                'title' => trans('admin/hardware/table.serial'),
+                'visible' => false,
+            ]
+            ];
+        }
+
+        $layout_end = [
+            [
+                'field' => 'target',
+                'searchable' => true,
+                'sortable' => true,
+                'switchable' => true,
+                'title' => trans('general.target'),
+                'visible' => false,
+                'formatter' => 'polymorphicItemFormatter',
+            ],
+            [
+                'field' => 'file',
+                'searchable' => true,
+                'sortable' => true,
+                'switchable' => true,
+                'title' => trans('general.file_name'),
+                'visible' => false,
+                'formatter' => 'fileUploadNameFormatter',
+            ],
+            [
+                'field' => 'file_download',
+                'searchable' => true,
+                'sortable' => true,
+                'switchable' => true,
+                'title' => trans('general.download'),
+                'visible' => false,
+                'formatter' => 'fileUploadFormatter',
+            ],
+            [
+                'field' => 'note',
+                'searchable' => true,
+                'sortable' => true,
+                'visible' => false,
+                'title' => trans('general.notes'),
+                'formatter' => 'notesFormatter'
+            ],
+            [
+                'field' => 'signature_file',
+                'searchable' => true,
+                'sortable' => true,
+                'switchable' => true,
+                'title' => trans('general.signature'),
+                'visible' => false,
+                'formatter' => 'imageFormatter',
+            ],
+            [
+                'field' => 'log_meta',
+                'searchable' => false,
+                'sortable' => false,
+                'visible' => true,
+                'title' => trans('admin/hardware/table.changed'),
+                'formatter' => 'changeLogFormatter',
+            ],
+            [
+                'field' => 'remote_ip',
+                'searchable' => false,
+                'sortable' => false,
+                'visible' => true,
+                'title' => trans('admin/settings/general.login_ip'),
+            ],
+            [
+                'field' => 'user_agent',
+                'searchable' => false,
+                'sortable' => false,
+                'visible' => true,
+                'title' => trans('admin/settings/general.login_user_agent'),
+            ],
+            [
+                'field' => 'action_source',
+                'searchable' => false,
+                'sortable' => false,
+                'visible' => true,
+                'title' => trans('general.action_source'),
+            ],
+        ];
+
+        $merged = array_merge($layout_start, $extra, $layout_end);
+        return json_encode($merged);
+    }
+
+}
@@ -0,0 +1,31 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+
+        Schema::table('action_logs', function (Blueprint $table) {
+            $table->index(['action_date']);
+        });
+
+        DB::update('update '.DB::getTablePrefix().'action_logs set action_date = created_at where created_at IS NOT NULL and action_date IS NULL');
+
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+
+    }
+};
@@ -8,9 +8,11 @@ return [
    'accessory'				=> 'Accessory',
    'accessory_report'		=> 'Accessory Report',
    'action'                => 'Action',
+    'action_date'			=> 'Action Date',
    'activity_report'		=> 'Activity Report',
    'address'				=> 'Address',
    'admin'					=> 'Admin Settings',
+    'admin_user'			=> 'Admin User',
    'admin_tooltip'			=> 'This user has admin privileges',
    'superuser'				=> 'Superuser',
    'superuser_tooltip'		=> 'This user has superuser privileges',
@@ -287,6 +289,8 @@ return [
    'status_label'			=> 'Status Label',
    'status'    			=> 'Status',
    'accept_eula'           => 'Acceptance Agreement',
+    'eula'                  => 'EULAs',
+    'eula_long'             => 'End-User License Agreements',
    'show_or_hide_eulas' => 'Show/Hide EULAs',
    'supplier'              => 'Supplier',
    'suppliers'  			=> 'Suppliers',
@@ -108,6 +108,7 @@
                             <div class="row">
                                 <div class="col-md-12">
                                <table
+                                        data-columns="{{ \App\Presenters\HistoryPresenter::dataTableLayout() }}"
                                        class="table table-striped snipe-table"
                                        data-cookie-id-table="AccessoryHistoryTable"
                                        data-id-table="AccessoryHistoryTable"
@@ -125,23 +126,7 @@
                       "fileName": "export-{{ str_slug($accessory->name) }}-history-{{ date('Y-m-d') }}",
                       "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
                     }'
-                                                data-url="{{ route('api.activity.index', ['item_id' => $accessory->id, 'item_type' => 'accessory']) }}">
-
-                                            <thead>
-                                            <tr>
-                                                <th class="col-sm-2" data-visible="false" data-sortable="true" data-field="created_at" data-formatter="dateDisplayFormatter">{{ trans('general.record_created') }}</th>
-                                                <th class="col-sm-2"data-visible="true" data-sortable="true" data-field="admin" data-formatter="usersLinkObjFormatter">{{ trans('general.created_by') }}</th>
-                                                <th class="col-sm-2" data-sortable="true"  data-visible="true" data-field="action_type">{{ trans('general.action') }}</th>
-                                                <th class="col-sm-2" data-field="file" data-visible="false" data-formatter="fileUploadNameFormatter">{{ trans('general.file_name') }}</th>
-                                                <th class="col-sm-2" data-sortable="true"  data-visible="true" data-field="item" data-formatter="polymorphicItemFormatter">{{ trans('general.item') }}</th>
-                                                <th class="col-sm-2" data-visible="true" data-field="target" data-formatter="polymorphicItemFormatter">{{ trans('general.target') }}</th>
-                                                <th class="col-sm-2" data-sortable="true" data-visible="true" data-field="note">{{ trans('general.notes') }}</th>
-                                                <th class="col-sm-2" data-visible="true" data-field="action_date" data-formatter="dateDisplayFormatter">{{ trans('general.date') }}</th>
-                                                @if  ($snipeSettings->require_accept_signature=='1')
-                                                    <th class="col-md-3" data-field="signature_file" data-visible="false"  data-formatter="imageFormatter">{{ trans('general.signature') }}</th>
-                                                @endif
-                                            </tr>
-                                            </thead>
+                                        data-url="{{ route('api.activity.index', ['item_id' => $accessory->id, 'item_type' => 'accessory']) }}">
                                        </table>
                                    </div> <!-- /.col-md-12-->
                                </div> <!-- /.row-->
@@ -87,6 +87,17 @@
            </a>
          </li>

+          <li>
+            <a href="#eulas" data-toggle="tab">
+            <span class="hidden-lg hidden-md" aria-hidden="true">
+                <x-icon type="files" class="fa-2x" />
+              </span>
+              <span class="hidden-xs hidden-sm">{{ trans('general.eula') }}
+                {!! ($user->eulas->count() > 0 ) ? '<span class="badge badge-secondary">'.number_format($user->eulas->count()).'</span>' : '' !!}
+            </span>
+            </a>
+          </li>
+
        </ul>

        <div class="tab-content">
@@ -711,7 +722,45 @@
                </tbody>
              </table>
          </div><!-- /consumables-tab -->
+          <div class="tab-pane" id="eulas">
+            <table
+                    data-toolbar="#userEULAToolbar"
+                    data-cookie-id-table="userEULATable"
+                    data-id-table="userEULATable"
+                    id="userEULATable"
+                    data-search="true"
+                    data-pagination="true"
+                    data-side-pagination="client"
+                    data-show-columns="true"
+                    data-show-fullscreen="true"
+                    data-show-export="true"
+                    data-show-footer="true"
+                    data-show-refresh="false"
+                    data-sort-order="asc"
+                    data-sort-name="name"
+                    class="table table-striped snipe-table table-hover"
+                    data-url="{{route('api.user.eulas', $user->id)}}"
+                    data-export-options='{
+                    "fileName": "export-eula-{{ str_slug($user->username) }}-{{ date('Y-m-d') }}",
+                    "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","delete","purchasecost", "icon"]
+                    }'>

+              <caption id="userEulaToolbar" class="tableCaption">
+                {{ trans('general.eula_long') }}
+              </caption>
+
+              <thead>
+              <tr>
+                <th data-visible="true" data-field="icon" style="width: 40px;" class="hidden-xs" data-formatter="iconFormatter">{{ trans('admin/hardware/table.icon') }}</th>
+                <th data-visible="true" data-field="item.name">{{ trans('general.item') }}</th>
+                <th data-visible="true" data-field="created_at" data-sortable="true" data-formatter="dateDisplayFormatter">{{ trans('general.accepted_date') }}</th>
+                <th data-field="note">{{ trans('general.notes') }}</th>
+                <th data-field="signature_file" data-visible="false"  data-formatter="imageFormatter">{{ trans('general.signature') }}</th>
+                <th data-field="file" data-formatter="fileUploadFormatter">{{ trans('general.download') }}</th>
+              </tr>
+              </thead>
+            </table>
+          </div><!-- /eulas-tab -->
        </div><!-- /.tab-content -->
      </div><!-- nav-tabs-custom -->
    </div>
@@ -122,7 +122,7 @@
                    @endif
                </td>
                <td>
-                    {{ $file->created_at }}
+                    {{ $file->created_at ? Helper::getFormattedDateObject($file->created_at, 'datetime', false) : '' }}
                </td>
                <td>
                    {{ ($file->adminuser) ? $file->adminuser->present()->getFullNameAttribute() : '' }}
@@ -67,6 +67,16 @@
          </a>
        </li>

+        <li>
+          <a href="#history" data-toggle="tab">
+                <span class="hidden-lg hidden-md">
+                  <i class="fas fa-history fa-2x" aria-hidden="true"></i>
+                </span>
+            <span class="hidden-xs hidden-sm">
+                  {{ trans('general.history') }}
+                </span>
+          </a>
+        </li>

        @can('components.files', $component)
          <li>
@@ -139,6 +149,35 @@
          </div>
        </div> <!-- close tab-pane div -->

+        <div class="tab-pane" id="history">
+          <div class="table-responsive">
+
+            <table
+                    data-columns="{{ \App\Presenters\HistoryPresenter::dataTableLayout() }}"
+                    class="table table-striped snipe-table"
+                    id="componentHistory"
+                    data-pagination="true"
+                    data-id-table="componentHistory"
+                    data-search="true"
+                    data-side-pagination="server"
+                    data-show-columns="true"
+                    data-show-fullscreen="true"
+                    data-show-refresh="true"
+                    data-sort-order="desc"
+                    data-sort-name="created_at"
+                    data-show-export="true"
+                    data-export-options='{
+                         "fileName": "export-component-{{  $component->id }}-history",
+                         "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
+                       }'
+
+                    data-url="{{ route('api.activity.index', ['item_id' => $component->id, 'item_type' => 'component']) }}"
+                    data-cookie-id-table="componentHistory"
+                    data-cookie="true">
+            </table>
+          </div>
+        </div><!-- /.tab-pane -->
+

        @can('components.files', $component)
          <div class="tab-pane" id="files">
@@ -449,6 +449,7 @@
            <div class="table-responsive">

              <table
+                      data-columns="{{ \App\Presenters\HistoryPresenter::dataTableLayout() }}"
                      class="table table-striped snipe-table"
                      id="consumableHistory"
                      data-pagination="true"
@@ -469,26 +470,8 @@
                       }'

                      data-url="{{ route('api.activity.index', ['item_id' => $consumable->id, 'item_type' => 'consumable']) }}"
-                      data-cookie-id-table="assetHistory"
+                      data-cookie-id-table="consumableHistory"
                      data-cookie="true">
-                <thead>
-                <tr>
-                  <th data-visible="true" data-field="icon" style="width: 40px;" class="hidden-xs" data-formatter="iconFormatter">{{ trans('admin/hardware/table.icon') }}</th>
-                  <th data-visible="true" data-field="action_date" data-sortable="true" data-formatter="dateDisplayFormatter">{{ trans('general.date') }}</th>
-                  <th data-visible="true" data-field="admin" data-formatter="usersLinkObjFormatter">{{ trans('general.created_by') }}</th>
-                  <th data-visible="true" data-field="action_type">{{ trans('general.action') }}</th>
-                  <th class="col-sm-2" data-field="file" data-visible="false" data-formatter="fileUploadNameFormatter">{{ trans('general.file_name') }}</th>
-                  <th data-visible="true" data-field="item" data-formatter="polymorphicItemFormatter">{{ trans('general.item') }}</th>
-                  <th data-visible="true" data-field="target" data-formatter="polymorphicItemFormatter">{{ trans('general.target') }}</th>
-                  <th data-field="note">{{ trans('general.notes') }}</th>
-                  <th data-field="signature_file" data-visible="false"  data-formatter="imageFormatter">{{ trans('general.signature') }}</th>
-                  <th data-visible="false" data-field="file" data-visible="false"  data-formatter="fileUploadFormatter">{{ trans('general.download') }}</th>
-                  <th data-field="log_meta" data-visible="true" data-formatter="changeLogFormatter">{{ trans('admin/hardware/table.changed')}}</th>
-                  <th data-field="remote_ip" data-visible="false" data-sortable="true">{{ trans('admin/settings/general.login_ip') }}</th>
-                  <th data-field="user_agent" data-visible="false" data-sortable="true">{{ trans('admin/settings/general.login_user_agent') }}</th>
-                  <th data-field="action_source" data-visible="false" data-sortable="true">{{ trans('general.action_source') }}</th>
-                </tr>
-                </thead>
              </table>
            </div>
          </div><!-- /.tab-pane -->
@@ -1438,6 +1438,7 @@
                        <div class="row">
                            <div class="col-md-12">
                                <table
+                                        data-columns="{{ \App\Presenters\HistoryPresenter::dataTableLayout() }}"
                                        class="table table-striped snipe-table"
                                        id="assetHistory"
                                        data-pagination="true"
@@ -1460,24 +1461,6 @@
                                        data-url="{{ route('api.activity.index', ['item_id' => $asset->id, 'item_type' => 'asset']) }}"
                                        data-cookie-id-table="assetHistory"
                                        data-cookie="true">
-                                    <thead>
-                                    <tr>
-                                        <th data-visible="true" data-field="icon" style="width: 40px;" class="hidden-xs" data-formatter="iconFormatter">{{ trans('admin/hardware/table.icon') }}</th>
-                                        <th data-visible="true" data-field="action_date" data-sortable="true" data-formatter="dateDisplayFormatter">{{ trans('general.date') }}</th>
-                                        <th data-visible="true" data-field="admin" data-formatter="usersLinkObjFormatter">{{ trans('general.created_by') }}</th>
-                                        <th data-visible="true" data-field="action_type">{{ trans('general.action') }}</th>
-                                        <th class="col-sm-2" data-field="file" data-visible="false" data-formatter="fileUploadNameFormatter">{{ trans('general.file_name') }}</th>
-                                        <th data-visible="true" data-field="item" data-formatter="polymorphicItemFormatter">{{ trans('general.item') }}</th>
-                                        <th data-visible="true" data-field="target" data-formatter="polymorphicItemFormatter">{{ trans('general.target') }}</th>
-                                        <th data-field="note">{{ trans('general.notes') }}</th>
-                                        <th data-field="signature_file" data-visible="false"  data-formatter="imageFormatter">{{ trans('general.signature') }}</th>
-                                        <th data-visible="false" data-field="file" data-visible="false"  data-formatter="fileUploadFormatter">{{ trans('general.download') }}</th>
-                                        <th data-field="log_meta" data-visible="true" data-formatter="changeLogFormatter">{{ trans('admin/hardware/table.changed')}}</th>
-                                        <th data-field="remote_ip" data-visible="false" data-sortable="true">{{ trans('admin/settings/general.login_ip') }}</th>
-                                        <th data-field="user_agent" data-visible="false" data-sortable="true">{{ trans('admin/settings/general.login_user_agent') }}</th>
-                                        <th data-field="action_source" data-visible="false" data-sortable="true">{{ trans('general.action_source') }}</th>
-                                    </tr>
-                                    </thead>
                                </table>
                            </div>
                        </div> <!-- /.row -->
@@ -480,6 +480,7 @@
            <div class="col-md-12">
              <div class="table-responsive">
              <table
+                      data-columns="{{ \App\Presenters\HistoryPresenter::dataTableLayout() }}"
                      class="table table-striped snipe-table"
                      data-cookie-id-table="licenseHistoryTable"
                      data-id-table="licenseHistoryTable"
@@ -498,22 +499,6 @@
                       "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
                     }'
                      data-url="{{ route('api.activity.index', ['item_id' => $license->id, 'item_type' => 'license']) }}">
-
-                <thead>
-                <tr>
-                  <th class="col-sm-2" data-visible="false" data-sortable="true" data-field="created_at" data-formatter="dateDisplayFormatter">{{ trans('general.record_created') }}</th>
-                  <th class="col-sm-2"data-visible="true" data-sortable="true" data-field="admin" data-formatter="usersLinkObjFormatter">{{ trans('general.created_by') }}</th>
-                  <th class="col-sm-2" data-sortable="true"  data-visible="true" data-field="action_type">{{ trans('general.action') }}</th>
-                  <th class="col-sm-2" data-field="file" data-visible="false" data-formatter="fileUploadNameFormatter">{{ trans('general.file_name') }}</th>
-                  <th class="col-sm-2" data-sortable="true"  data-visible="true" data-field="item" data-formatter="polymorphicItemFormatter">{{ trans('general.item') }}</th>
-                  <th class="col-sm-2" data-visible="true" data-field="target" data-formatter="polymorphicItemFormatter">{{ trans('general.target') }}</th>
-                  <th class="col-sm-2" data-sortable="true" data-visible="true" data-field="note">{{ trans('general.notes') }}</th>
-                  <th class="col-sm-2" data-visible="true" data-field="action_date" data-formatter="dateDisplayFormatter">{{ trans('general.date') }}</th>
-                  @if  ($snipeSettings->require_accept_signature=='1')
-                    <th class="col-md-3" data-field="signature_file" data-visible="false"  data-formatter="imageFormatter">{{ trans('general.signature') }}</th>
-                  @endif
-                </tr>
-                </thead>
              </table>
              </div>
            </div> <!-- /.col-md-12-->
@@ -25,6 +25,7 @@
            <div class="box-body">

                <table
+                        data-columns="{{ \App\Presenters\HistoryPresenter::dataTableLayout($serial = true) }}"
                        data-cookie-id-table="activityReport"
                        data-pagination="true"
                        data-id-table="activityReport"
@@ -45,56 +46,6 @@
                        "fileName": "activity-report-{{ date('Y-m-d') }}",
                        "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
                        }'>
-
-                    <thead>
-                        <tr>
-                            <th data-field="id" class="hidden-xs "data-sortable="true" data-visible="false">
-                                {{ trans('general.id') }}
-                            </th>
-                            <th data-field="icon" style="width: 40px;" class="hidden-xs" data-formatter="iconFormatter">
-                                {{ trans('admin/hardware/table.icon') }}
-                            </th>
-                            <th class="col-sm-3" data-searchable="false" data-sortable="true" data-field="created_at" data-formatter="dateDisplayFormatter">
-                                {{ trans('general.date') }}
-                            </th>
-                            <th class="col-sm-2" data-searchable="true" data-sortable="true" data-field="created_by" data-formatter="usersLinkObjFormatter">
-                                {{ trans('general.created_by') }}
-                            </th>
-                            <th class="col-sm-2" data-field="action_type">
-                                {{ trans('general.action') }}
-                            </th>
-                            <th class="col-sm-2" data-field="file" data-visible="false" data-formatter="fileUploadNameFormatter">
-                                {{ trans('general.file_name') }}
-                            </th>
-                            <th class="col-sm-1" data-field="item_type" data-searchable="true" data-formatter="itemTypeFormatter">
-                                {{ trans('general.type') }}
-                            </th>
-                            <th class="col-sm-3" data-field="item.serial" data-visible="false">
-                                {{ trans('admin/hardware/table.serial') }}
-                            </th>
-                            <th class="col-sm-3" data-field="item" data-formatter="polymorphicItemFormatter">
-                                {{ trans('general.item') }}
-                            </th>
-                            <th class="col-sm-2" data-field="target" data-formatter="polymorphicItemFormatter">
-                                {{ trans('general.to') }}
-                            </th>
-                            <th class="col-sm-1" data-field="note" data-sortable="true">
-                                {{ trans('general.notes') }}
-                            </th>
-                            <th class="col-sm-2" data-field="log_meta" data-visible="false" data-formatter="changeLogFormatter">
-                                {{ trans('general.changed') }}
-                            </th>
-                            <th data-field="remote_ip" data-visible="false" data-sortable="true">
-                                {{ trans('admin/settings/general.login_ip') }}
-                            </th>
-                            <th data-field="user_agent" data-visible="false" data-sortable="true">
-                                {{ trans('admin/settings/general.login_user_agent') }}
-                            </th>
-                            <th data-field="action_source" data-visible="false" data-sortable="true">
-                                {{ trans('general.action_source') }}
-                            </th>
-                        </tr>
-                    </thead>
                </table>
            </div>
        </div>
@@ -1094,6 +1094,14 @@ Route::group(['prefix' => 'v1', 'middleware' => ['api', 'api-throttle:api']], fu
                ]
            )->name('api.users.me');

+            Route::get('{user}/eulas',
+                [
+                    Api\UsersController::class,
+                    'eulas'
+                ]
+            )->name('api.user.eulas');
+
+
            Route::get('list/{status?}',
            [
                Api\UsersController::class,
Author	SHA1	Message	Date
snipe	ec8ddc197f	Merge branch 'develop' into fix_action_date	2025-06-06 17:18:27 +01:00
snipe	b48e56bd46	Merge pull request #17110 from Godmartinz/allow-users-to-dl-eula-from-account Fixed #17084 - Adds Eula table to User account area with download option	2025-06-06 17:07:19 +01:00
snipe	753ca93371	Merge pull request #17126 from grokability/fixes-#17023-multi-maintenances Fixes #17023 - added ability to bulk add maintenances	2025-06-06 17:01:50 +01:00
Godfrey M	e2e54677ee	add auth to api call, gave more specificity to the relationship	2025-06-05 10:59:16 -07:00
Godfrey M	68c082e0dc	fix doc blocks	2025-06-04 15:48:35 -07:00
Godfrey M	ee3deb9c63	made eula api route, formatted table, cleaned up code	2025-06-04 15:04:59 -07:00
Godfrey M	6f4cee6334	adds Eula tab and count to user account	2025-06-04 11:38:50 -07:00
snipe	0b48fd1465	Removed extra headers Signed-off-by: snipe <snipe@snipe.net>	2025-03-10 13:05:31 +00:00
snipe	220537fbfb	Updated presenter name Signed-off-by: snipe <snipe@snipe.net>	2025-03-10 12:59:57 +00:00
snipe	df5437647b	Add optional serial value in presenter Signed-off-by: snipe <snipe@snipe.net>	2025-03-10 12:43:38 +00:00
snipe	92b2da9b1b	Added history tab to components Signed-off-by: snipe <snipe@snipe.net>	2025-03-10 11:48:38 +00:00
snipe	ef56177372	Use presenter Signed-off-by: snipe <snipe@snipe.net>	2025-03-10 11:48:31 +00:00
snipe	cb7822576f	Use new presenters Signed-off-by: snipe <snipe@snipe.net>	2025-03-10 11:48:19 +00:00
snipe	7ba361b10d	Use date formatter for filestable Signed-off-by: snipe <snipe@snipe.net>	2025-03-10 10:57:54 +00:00
snipe	55694fa2fc	Added strings Signed-off-by: snipe <snipe@snipe.net>	2025-03-10 10:57:40 +00:00
snipe	c825878c46	Added history presenter Signed-off-by: snipe <snipe@snipe.net>	2025-03-10 10:57:33 +00:00
snipe	80a69bfe90	Revert datetime to date Signed-off-by: snipe <snipe@snipe.net>	2025-03-06 18:09:27 +00:00
snipe	d4dc8d2b79	Remove action_date from loggable as a changed field Signed-off-by: snipe <snipe@snipe.net>	2025-03-06 17:43:07 +00:00
snipe	4e3df93349	Change action_date display to date from datetime Signed-off-by: snipe <snipe@snipe.net>	2025-03-06 16:16:17 +00:00
snipe	38efc62900	Add index on action_date, copy from created_at Signed-off-by: snipe <snipe@snipe.net>	2025-03-06 16:01:46 +00:00