From c9747b00a364710416d6323dcd304dd6d6bb9335 Mon Sep 17 00:00:00 2001
From: akemidx <kojotek.dx@gmail.com>
Date: Tue, 24 Jun 2025 19:21:17 -0400
Subject: [PATCH 01/15] pushing this up. added livewire note

---
 resources/views/users/print.blade.php | 69 +++++++++++++++++++++++++++
 1 file changed, 69 insertions(+)

diff --git a/resources/views/users/print.blade.php b/resources/views/users/print.blade.php
index 9ed76ae3f067..72cc3ef501ac 100644
--- a/resources/views/users/print.blade.php
+++ b/resources/views/users/print.blade.php
@@ -124,6 +124,7 @@ class="snipe-table table table-striped inventory"
                 <th data-field="asset_serial" data-sortable="true" data-visible="true">{{ trans('admin/hardware/form.serial') }}</th>
                 <th data-field="asset_checkout_date" data-sortable="true" data-visible="true">{{ trans('admin/hardware/table.checkout_date') }}</th>
                 <th data-field="signature" data-sortable="false" data-visible="true">{{ trans('general.signature') }}</th>
+                <th data-field="custom" data-sortable="true" data-visible="true">{{ trans('general.custom') }}</th>
             </thead>
             <tbody>
             @foreach ($show_user->assets as $asset)
@@ -151,6 +152,9 @@ class="snipe-table table table-striped inventory"
                             <img style="width:auto;height:100px;" src="{{ asset('/') }}display-sig/{{ $asset->getLatestSignedAcceptance($show_user)->accept_signature }}">
                         @endif
                     </td>
+                    <td>
+                        {{ $asset->fetchCustomFields() }}
+                    </td>
                 </tr>
                 @if ($settings->show_assigned_assets)
                     @php
@@ -524,5 +528,70 @@ classes: 'table table-responsive table-no-bordered',
     });
 </script>
 
+<script nonce="{{ csrf_token() }}">
+    @if(Request::has('model_id'))
+    //TODO: Refactor custom fields to use Livewire, populate from server on page load when requested with model_id
+    //TODO: This todo is coming off of the edit hardware blade. if we are moving to livewire, then this may have to wait on that.
+    $(document).ready(function() {
+        fetchCustomFields()
+    });
+    @endif
+
+    var transformed_oldvals={};
+
+    function fetchCustomFields() {
+
+        //save custom field choices
+        var oldvals = $('#custom_fields_content').find('input,select').serializeArray();
+        for(var i in oldvals) {
+            transformed_oldvals[oldvals[i].name]=oldvals[i].value;
+        }
+
+        var modelid = $('#model_select_id').val();
+        if (modelid == '') {
+            $('#custom_fields_content').html("");
+        } else {
+
+            $.ajax({
+                type: 'GET',
+                url: "{{ config('app.url') }}/models/" + modelid + "/custom_fields",
+                headers: {
+                    "X-Requested-With": 'XMLHttpRequest',
+                    "X-CSRF-TOKEN": $('meta[name="csrf-token"]').attr('content')
+                },
+                _token: "{{ csrf_token() }}",
+                dataType: 'html',
+                success: function (data) {
+                    $('#custom_fields_content').html(data);
+                    $('#custom_fields_content select').select2(); //enable select2 on any custom fields that are select-boxes
+                    //now re-populate the custom fields based on the previously saved values
+                    $('#custom_fields_content').find('input,select').each(function (index,elem) {
+                        if(transformed_oldvals[elem.name]) {
+                            if (elem.type === 'checkbox' || elem.type === 'radio'){
+                                let shouldBeChecked = oldvals.find(oldValElement => {
+                                    return oldValElement.name === elem.name && oldValElement.value === $(elem).val();
+                                });
+
+                                if (shouldBeChecked){
+                                    $(elem).prop('checked', true);
+                                }
+
+                                return;
+                            }
+                            {{-- If there already *is* is a previously-input 'transformed_oldvals' handy,
+                                 overwrite with that previously-input value *IF* this is an edit of an existing item *OR*
+                                 if there is no new default custom field value coming from the model --}}
+                            if({{ $asset->id ? 'true' : 'false' }} || $(elem).val() == '') {
+                                $(elem).val(transformed_oldvals[elem.name]).trigger('change'); //the trigger is for select2-based objects, if we have any
+                            }
+                        }
+
+                    });
+                }
+            });
+        }
+    }
+</script>
+
 </body>
 </html>

From d256dc627f212bbe50e8d3629304c224d4967336 Mon Sep 17 00:00:00 2001
From: akemidx <kojotek.dx@gmail.com>
Date: Mon, 7 Jul 2025 20:09:46 -0400
Subject: [PATCH 02/15] migration and checkbox

---
 ...dd_custom_fields_to_print_all_assigned.php | 30 +++++++++++++++++++
 .../views/custom_fields/fields/edit.blade.php |  7 +++++
 2 files changed, 37 insertions(+)
 create mode 100644 database/migrations/2025_07_07_235712_add_custom_fields_to_print_all_assigned.php

diff --git a/database/migrations/2025_07_07_235712_add_custom_fields_to_print_all_assigned.php b/database/migrations/2025_07_07_235712_add_custom_fields_to_print_all_assigned.php
new file mode 100644
index 000000000000..11e4685e8907
--- /dev/null
+++ b/database/migrations/2025_07_07_235712_add_custom_fields_to_print_all_assigned.php
@@ -0,0 +1,30 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('custom_fields', function (Blueprint $table) {
+            $table->boolean('display_on_print_assigned')->nullable()->default(0);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('custom_fields', function (Blueprint $table) {
+            if (Schema::hasColumn('custom_fields', 'display_on_print_assigned')) {
+                $table->dropColumn('display_on_print_assigned');
+            }
+        });
+    }
+};
diff --git a/resources/views/custom_fields/fields/edit.blade.php b/resources/views/custom_fields/fields/edit.blade.php
index 07a21b089f15..9880a38c8c98 100644
--- a/resources/views/custom_fields/fields/edit.blade.php
+++ b/resources/views/custom_fields/fields/edit.blade.php
@@ -244,6 +244,13 @@ class="format form-control"
                  </label>
              </div>
 
+             <!-- Show on Print Assigned Page  -->
+             <div class="col-md-9 col-md-offset-3" id="display_on_print_assigned" style="padding-bottom: 10px;">
+                 <label class="form-control">
+                     <input type="checkbox" name="display_on_print_assigned" aria-label="display_on_print_assigned" value="1" {{ (old('display_on_print_assigned') || $field->display_on_print_assigned) ? ' checked="checked"' : '' }}>
+                     {{ trans('admin/custom_fields/general.display_on_print_assigned') }}
+                 </label>
+             </div>
 
              <!-- Show in View All Assets profile view  -->
               <div class="col-md-9 col-md-offset-3" id="display_in_user_view">

From 9993bd6942bd4f5f6137b20fdc3bcad1e1fa8b37 Mon Sep 17 00:00:00 2001
From: akemidx <kojotek.dx@gmail.com>
Date: Mon, 7 Jul 2025 20:44:51 -0400
Subject: [PATCH 03/15] added to controller

---
 app/Http/Controllers/CustomFieldsController.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/Http/Controllers/CustomFieldsController.php b/app/Http/Controllers/CustomFieldsController.php
index 7862719276a3..5969931a5649 100644
--- a/app/Http/Controllers/CustomFieldsController.php
+++ b/app/Http/Controllers/CustomFieldsController.php
@@ -107,7 +107,9 @@ public function store(CustomFieldRequest $request) : RedirectResponse
             "display_checkin" => $request->input("display_checkin", 0),
             "display_checkout" => $request->input("display_checkout", 0),
             "display_audit" => $request->input("display_audit", 0),
-            "created_by" => auth()->id()
+            "display_on_print_assigned" => $request->input('display_on_print_assigned', 0),
+
+        "created_by" => auth()->id()
         ]);
 
 
@@ -252,6 +254,8 @@ public function update(CustomFieldRequest $request, CustomField $field) : Redire
         $field->display_checkin = $request->get("display_checkin", 0);
         $field->display_checkout = $request->get("display_checkout", 0);
         $field->display_audit = $request->get("display_audit", 0);
+        $field->display_on_print_assigned = $request->input('display_on_print_assigned', 0);
+
 
         if ($request->get('format') == 'CUSTOM REGEX') {
             $field->format = $request->get('custom_format');

From e2a1e2af0e8ecfd4e8288150a1bcc09680a24dc1 Mon Sep 17 00:00:00 2001
From: akemidx <kojotek.dx@gmail.com>
Date: Tue, 8 Jul 2025 14:56:06 -0400
Subject: [PATCH 04/15] checkbox works

---
 .../views/custom_fields/fields/edit.blade.php |  4 +++-
 resources/views/custom_fields/index.blade.php | 20 ++++++++++++-------
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/resources/views/custom_fields/fields/edit.blade.php b/resources/views/custom_fields/fields/edit.blade.php
index 9880a38c8c98..03cb2acf2b9f 100644
--- a/resources/views/custom_fields/fields/edit.blade.php
+++ b/resources/views/custom_fields/fields/edit.blade.php
@@ -245,6 +245,7 @@ class="format form-control"
              </div>
 
              <!-- Show on Print Assigned Page  -->
+             <!-- TODO: create if statement to show ONLY on assets -->
              <div class="col-md-9 col-md-offset-3" id="display_on_print_assigned" style="padding-bottom: 10px;">
                  <label class="form-control">
                      <input type="checkbox" name="display_on_print_assigned" aria-label="display_on_print_assigned" value="1" {{ (old('display_on_print_assigned') || $field->display_on_print_assigned) ? ' checked="checked"' : '' }}>
@@ -252,7 +253,8 @@ class="format form-control"
                  </label>
              </div>
 
-             <!-- Show in View All Assets profile view  -->
+
+                 <!-- Show in View All Assets profile view  -->
               <div class="col-md-9 col-md-offset-3" id="display_in_user_view">
                   <label class="form-control">
                       <input type="checkbox" name="display_in_user_view" aria-label="display_in_user_view" value="1" {{ (old('display_in_user_view') || $field->display_in_user_view) ? ' checked="checked"' : '' }}>
diff --git a/resources/views/custom_fields/index.blade.php b/resources/views/custom_fields/index.blade.php
index 108fe25000a1..4ad878a6fe65 100644
--- a/resources/views/custom_fields/index.blade.php
+++ b/resources/views/custom_fields/index.blade.php
@@ -153,14 +153,13 @@ class="table table-striped snipe-table"
               <th data-sortable="true" data-searchable="true">{{ trans('admin/custom_fields/general.help_text')}}</th>
               <th data-sortable="true" data-visible="false">{{ trans('admin/custom_fields/general.db_field') }}</th>
               <th data-sortable="true" data-searchable="true">{{ trans('admin/custom_fields/general.field_format') }}</th>
-              <th data-sortable="true" data-tooltip="{{ trans('admin/custom_fields/general.encrypted') }}"><i
-                        class="fa fa-lock" aria-hidden="true"></i>
-                <span class="hidden-xs hidden-sm hidden-md hidden-lg">{{ trans('admin/custom_fields/general.encrypted') }}</span>
+              <th data-sortable="true" data-tooltip="{{ trans('admin/custom_fields/general.encrypted') }}">
+                  <i class="fa fa-lock" aria-hidden="true"></i>
+                    <span class="hidden-xs hidden-sm hidden-md hidden-lg">{{ trans('admin/custom_fields/general.encrypted') }}</span>
               </th>
-              <th data-sortable="true" class="text-center"
-                  data-tooltip="{{ trans('admin/custom_fields/general.show_in_listview_short') }}"><i class="fa fa-list"
-                                                                                                      aria-hidden="true"></i>
-                <span class="hidden-xs hidden-sm hidden-md hidden-lg">{{ trans('admin/custom_fields/general.show_in_listview_short') }}</span>
+              <th data-sortable="true" class="text-center" data-tooltip="{{ trans('admin/custom_fields/general.show_in_listview_short') }}">
+                  <i class="fa fa-list" aria-hidden="true"></i>
+                    <span class="hidden-xs hidden-sm hidden-md hidden-lg">{{ trans('admin/custom_fields/general.show_in_listview_short') }}</span>
               </th>
               <th data-visible="false" data-sortable="true" class="text-center"
                   data-tooltip="{{ trans('admin/custom_fields/general.display_in_user_view_table') }}"><i
@@ -179,6 +178,12 @@ class="fa fa-laptop fa-fw" aria-hidden="true"><span
                           class="sr-only">{{ trans('admin/custom_fields/general.show_in_requestable_list_short') }}</span></i>
               </th>
 
+              <th data-sortable="true" data-searchable="false" class="text-center"
+                  data-tooltip="{{ trans('admin/custom_fields/general.display_on_print_assigned') }}"><i
+                        class="fa fa-print fa-fw" aria-hidden="true"><span
+                          class="sr-only">{{ trans('admin/custom_fields/general.display_on_print_assigned') }}</span></i>
+              </th>
+
               <th data-sortable="true" data-searchable="false" class="text-center"
                   data-tooltip="{{ trans('admin/custom_fields/general.unique') }}"><i
                         class="fa-solid fa-fingerprint"><span
@@ -235,6 +240,7 @@ class="sr-only">{{ trans('admin/custom_fields/general.unique') }}</span></i></th
               <td class="text-center">{!!  ($field->display_in_user_view=='1' ? '<i class="fa fa-check text-success"></i>' : '<i class="fa fa-times text-danger"></i>') !!}</td>
               <td class="text-center">{!! ($field->show_in_email=='1') ? '<i class="fas fa-check text-success" aria-hidden="true"><span class="sr-only">'.trans('general.yes').'</span></i>' : '<i class="fas fa-times text-danger" aria-hidden="true"><span class="sr-only">'.trans('general.no').'</span></i>'  !!}</td>
               <td class="text-center">{!! ($field->show_in_requestable_list=='1') ? '<i class="fas fa-check text-success" aria-hidden="true"><span class="sr-only">'.trans('general.yes').'</span></i>' : '<i class="fas fa-times text-danger" aria-hidden="true"><span class="sr-only">'.trans('general.no').'</span></i>'  !!}</td>
+              <td class="text-center">{!! ($field->display_on_print_assigned=='1') ? '<i class="fas fa-check text-success" aria-hidden="true"><span class="sr-only">'.trans('general.yes').'</span></i>' : '<i class="fas fa-times text-danger" aria-hidden="true"><span class="sr-only">'.trans('general.no').'</span></i>'  !!}</td>
               <td class="text-center">{!! ($field->is_unique=='1') ? '<i class="fas fa-check text-success" aria-hidden="true"><span class="sr-only">'.trans('general.yes').'</span></i>' : '<i class="fas fa-times text-danger" aria-hidden="true"><span class="sr-only">'.trans('general.no').'</span></i>'  !!}</td>
               <td class="text-center">{!! ($field->display_checkin=='1') ? '<i class="fas fa-check text-success" aria-hidden="true"><span class="sr-only">'.trans('general.yes').'</span></i>' : '<i class="fas fa-times text-danger" aria-hidden="true"><span class="sr-only">'.trans('general.no').'</span></i>'  !!}</td>
               <td class="text-center">{!! ($field->display_checkout=='1') ? '<i class="fas fa-check text-success" aria-hidden="true"><span class="sr-only">'.trans('general.yes').'</span></i>' : '<i class="fas fa-times text-danger" aria-hidden="true"><span class="sr-only">'.trans('general.no').'</span></i>'  !!}</td>

From 7fe5dc07122efb6262a259a3435c01a317b66b0f Mon Sep 17 00:00:00 2001
From: akemidx <kojotek.dx@gmail.com>
Date: Tue, 8 Jul 2025 15:02:34 -0400
Subject: [PATCH 05/15] translation

---
 resources/lang/en-US/admin/custom_fields/general.php | 1 +
 resources/views/custom_fields/fields/edit.blade.php  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/resources/lang/en-US/admin/custom_fields/general.php b/resources/lang/en-US/admin/custom_fields/general.php
index 1214fb9c7429..c705e7537fb6 100644
--- a/resources/lang/en-US/admin/custom_fields/general.php
+++ b/resources/lang/en-US/admin/custom_fields/general.php
@@ -60,6 +60,7 @@
     'display_checkin' => 'Display in checkin forms',
     'display_checkout' => 'Display in checkout forms',
     'display_audit' => 'Display in audit forms',
+    'display_on_print_assigned' => 'Display in the assigned assets print out',
     'types' => [
         'text' => 'Text Box',
         'listbox' => 'List Box',
diff --git a/resources/views/custom_fields/fields/edit.blade.php b/resources/views/custom_fields/fields/edit.blade.php
index 03cb2acf2b9f..65cff9c4e787 100644
--- a/resources/views/custom_fields/fields/edit.blade.php
+++ b/resources/views/custom_fields/fields/edit.blade.php
@@ -245,7 +245,7 @@ class="format form-control"
              </div>
 
              <!-- Show on Print Assigned Page  -->
-             <!-- TODO: create if statement to show ONLY on assets -->
+             <!-- TODO: create if statement to show ONLY on assets? -->
              <div class="col-md-9 col-md-offset-3" id="display_on_print_assigned" style="padding-bottom: 10px;">
                  <label class="form-control">
                      <input type="checkbox" name="display_on_print_assigned" aria-label="display_on_print_assigned" value="1" {{ (old('display_on_print_assigned') || $field->display_on_print_assigned) ? ' checked="checked"' : '' }}>

From 95e5b5c106d0ebc9514c27392fde9a6c4e25e7ba Mon Sep 17 00:00:00 2001
From: akemidx <kojotek.dx@gmail.com>
Date: Tue, 8 Jul 2025 19:13:35 -0400
Subject: [PATCH 06/15] notes

---
 resources/views/users/print.blade.php | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/resources/views/users/print.blade.php b/resources/views/users/print.blade.php
index 72cc3ef501ac..515922638aab 100644
--- a/resources/views/users/print.blade.php
+++ b/resources/views/users/print.blade.php
@@ -112,7 +112,7 @@ class="snipe-table table table-striped inventory"
             data-sort-name="created_at"
             data-show-columns-toggle-all="true"
             data-cookie-id-table="AssetsAssigned">
-            <thead>
+            <th>
                 <th data-field="asset_id" data-sortable="false" data-visible="true" data-switchable="false">#</th>
                 <th data-field="asset_image" data-sortable="true" data-visible="false" data-switchable="true">{{ trans('general.image') }}</th>
                 <th data-field="asset_tag" data-sortable="true" data-visible="true" data-switchable="false">{{ trans('admin/hardware/table.asset_tag') }}</th>
@@ -124,7 +124,7 @@ class="snipe-table table table-striped inventory"
                 <th data-field="asset_serial" data-sortable="true" data-visible="true">{{ trans('admin/hardware/form.serial') }}</th>
                 <th data-field="asset_checkout_date" data-sortable="true" data-visible="true">{{ trans('admin/hardware/table.checkout_date') }}</th>
                 <th data-field="signature" data-sortable="false" data-visible="true">{{ trans('general.signature') }}</th>
-                <th data-field="custom" data-sortable="true" data-visible="true">{{ trans('general.custom') }}</th>
+                <th data-field="custom" data-sortable="true" data-visible="true">{{ trans('general.custom') }} header loop go here</th>
             </thead>
             <tbody>
             @foreach ($show_user->assets as $asset)
@@ -153,8 +153,12 @@ class="snipe-table table table-striped inventory"
                         @endif
                     </td>
                     <td>
-                        {{ $asset->fetchCustomFields() }}
+data loop go here
                     </td>
+{{--                    wouldn't this actually search for the checked custom fields, build an array of those, and then add on columns as needed?--}}
+{{--                    probably a mess under the hood, but that seems the most streamlined way?--}}
+{{--                        wait, what if the custom field is encrypted--}}
+{{----}}
                 </tr>
                 @if ($settings->show_assigned_assets)
                     @php

From 68970f655455d1deca100e5e93069a7da23ef030 Mon Sep 17 00:00:00 2001
From: akemidx <kojotek.dx@gmail.com>
Date: Wed, 9 Jul 2025 19:42:23 -0400
Subject: [PATCH 07/15] fixing thead/th

---
 resources/views/users/print.blade.php | 78 +++------------------------
 1 file changed, 6 insertions(+), 72 deletions(-)

diff --git a/resources/views/users/print.blade.php b/resources/views/users/print.blade.php
index 515922638aab..4bdf977f4b2f 100644
--- a/resources/views/users/print.blade.php
+++ b/resources/views/users/print.blade.php
@@ -112,7 +112,7 @@ class="snipe-table table table-striped inventory"
             data-sort-name="created_at"
             data-show-columns-toggle-all="true"
             data-cookie-id-table="AssetsAssigned">
-            <th>
+            <thead>
                 <th data-field="asset_id" data-sortable="false" data-visible="true" data-switchable="false">#</th>
                 <th data-field="asset_image" data-sortable="true" data-visible="false" data-switchable="true">{{ trans('general.image') }}</th>
                 <th data-field="asset_tag" data-sortable="true" data-visible="true" data-switchable="false">{{ trans('admin/hardware/table.asset_tag') }}</th>
@@ -153,12 +153,12 @@ class="snipe-table table table-striped inventory"
                         @endif
                     </td>
                     <td>
-data loop go here
+                        data loop go here
                     </td>
-{{--                    wouldn't this actually search for the checked custom fields, build an array of those, and then add on columns as needed?--}}
-{{--                    probably a mess under the hood, but that seems the most streamlined way?--}}
-{{--                        wait, what if the custom field is encrypted--}}
-{{----}}
+                    {{--                    wouldn't this actually search for the checked custom fields, build an array of those, and then add on columns as needed?--}}
+                    {{--                    probably a mess under the hood, but that seems the most streamlined way?--}}
+                    {{--                        wait, what if the custom field is encrypted--}}
+                    {{----}}
                 </tr>
                 @if ($settings->show_assigned_assets)
                     @php
@@ -531,71 +531,5 @@ classes: 'table table-responsive table-no-bordered',
         });
     });
 </script>
-
-<script nonce="{{ csrf_token() }}">
-    @if(Request::has('model_id'))
-    //TODO: Refactor custom fields to use Livewire, populate from server on page load when requested with model_id
-    //TODO: This todo is coming off of the edit hardware blade. if we are moving to livewire, then this may have to wait on that.
-    $(document).ready(function() {
-        fetchCustomFields()
-    });
-    @endif
-
-    var transformed_oldvals={};
-
-    function fetchCustomFields() {
-
-        //save custom field choices
-        var oldvals = $('#custom_fields_content').find('input,select').serializeArray();
-        for(var i in oldvals) {
-            transformed_oldvals[oldvals[i].name]=oldvals[i].value;
-        }
-
-        var modelid = $('#model_select_id').val();
-        if (modelid == '') {
-            $('#custom_fields_content').html("");
-        } else {
-
-            $.ajax({
-                type: 'GET',
-                url: "{{ config('app.url') }}/models/" + modelid + "/custom_fields",
-                headers: {
-                    "X-Requested-With": 'XMLHttpRequest',
-                    "X-CSRF-TOKEN": $('meta[name="csrf-token"]').attr('content')
-                },
-                _token: "{{ csrf_token() }}",
-                dataType: 'html',
-                success: function (data) {
-                    $('#custom_fields_content').html(data);
-                    $('#custom_fields_content select').select2(); //enable select2 on any custom fields that are select-boxes
-                    //now re-populate the custom fields based on the previously saved values
-                    $('#custom_fields_content').find('input,select').each(function (index,elem) {
-                        if(transformed_oldvals[elem.name]) {
-                            if (elem.type === 'checkbox' || elem.type === 'radio'){
-                                let shouldBeChecked = oldvals.find(oldValElement => {
-                                    return oldValElement.name === elem.name && oldValElement.value === $(elem).val();
-                                });
-
-                                if (shouldBeChecked){
-                                    $(elem).prop('checked', true);
-                                }
-
-                                return;
-                            }
-                            {{-- If there already *is* is a previously-input 'transformed_oldvals' handy,
-                                 overwrite with that previously-input value *IF* this is an edit of an existing item *OR*
-                                 if there is no new default custom field value coming from the model --}}
-                            if({{ $asset->id ? 'true' : 'false' }} || $(elem).val() == '') {
-                                $(elem).val(transformed_oldvals[elem.name]).trigger('change'); //the trigger is for select2-based objects, if we have any
-                            }
-                        }
-
-                    });
-                }
-            });
-        }
-    }
-</script>
-
 </body>
 </html>

From 9b19a866e07aea24fff4ff54b90c96f0309882b7 Mon Sep 17 00:00:00 2001
From: akemidx <kojotek.dx@gmail.com>
Date: Thu, 10 Jul 2025 14:43:50 -0400
Subject: [PATCH 08/15] update to table. assets presenter, but now no data. 401
 error on js tweaks

---
 resources/views/users/print.blade.php | 196 ++++++++++++++------------
 1 file changed, 104 insertions(+), 92 deletions(-)

diff --git a/resources/views/users/print.blade.php b/resources/views/users/print.blade.php
index 4bdf977f4b2f..4b7e44048d11 100644
--- a/resources/views/users/print.blade.php
+++ b/resources/views/users/print.blade.php
@@ -98,12 +98,18 @@
             </h4>
         </div>
 
+{{--        @php--}}
+{{--            dd($show_user->id);--}}
+{{--        @endphp--}}
+
+
         <table
             class="snipe-table table table-striped inventory"
             id="AssetsAssigned"
+            data-columns="{{ \App\Presenters\AssetPresenter::dataTableLayout() }}" {{--using this presenter removes the signature from the table--}}
             data-pagination="false"
             data-id-table="AssetsAssigned"
-            data-search="false"
+            data-search="true"
             data-side-pagination="client"
             data-sortable="true"
             data-toolbar="#assets-toolbar"
@@ -111,93 +117,97 @@ class="snipe-table table table-striped inventory"
             data-sort-order="desc"
             data-sort-name="created_at"
             data-show-columns-toggle-all="true"
-            data-cookie-id-table="AssetsAssigned">
-            <thead>
-                <th data-field="asset_id" data-sortable="false" data-visible="true" data-switchable="false">#</th>
-                <th data-field="asset_image" data-sortable="true" data-visible="false" data-switchable="true">{{ trans('general.image') }}</th>
-                <th data-field="asset_tag" data-sortable="true" data-visible="true" data-switchable="false">{{ trans('admin/hardware/table.asset_tag') }}</th>
-                <th data-field="asset_name" data-sortable="true" data-visible="true">{{ trans('general.name') }}</th>
-                <th data-field="asset_category" data-sortable="true" data-visible="true">{{ trans('general.category') }}</th>
-                <th data-field="asset_model" data-sortable="true" data-visible="true">{{ trans('admin/hardware/form.model') }}</th>
-                <th data-field="rtd_location" data-sortable="true" data-visible="true">{{ trans('admin/hardware/form.default_location') }}</th>
-                <th data-field="asset_location" data-sortable="true" data-visible="false">{{ trans('general.location') }}</th>
-                <th data-field="asset_serial" data-sortable="true" data-visible="true">{{ trans('admin/hardware/form.serial') }}</th>
-                <th data-field="asset_checkout_date" data-sortable="true" data-visible="true">{{ trans('admin/hardware/table.checkout_date') }}</th>
-                <th data-field="signature" data-sortable="false" data-visible="true">{{ trans('general.signature') }}</th>
-                <th data-field="custom" data-sortable="true" data-visible="true">{{ trans('general.custom') }} header loop go here</th>
-            </thead>
-            <tbody>
-            @foreach ($show_user->assets as $asset)
-                @php
-                    if (($asset->model->category) && ($asset->model->category->getEula())) $eulas[] = $asset->model->category->getEula()
-                @endphp
-                <tr>
-                    <td>{{ $counter }}</td>
-                    <td>
-                        @if ($asset->getImageUrl())
-                            <img src="{{ $asset->getImageUrl() }}" class="thumbnail" style="max-height: 50px;">
-                        @endif
-                    </td>
-                    <td>{{ $asset->asset_tag }}</td>
-                    <td>{{ $asset->name }}</td>
-                    <td>{{ (($asset->model) && ($asset->model->category)) ? $asset->model->category->name : trans('general.invalid_category') }}</td>
-                    <td>{{ ($asset->model) ? $asset->model->name : trans('general.invalid_model') }}</td>
-                    <td>{{ ($asset->defaultLoc) ? $asset->defaultLoc->name : '' }}</td>
-                    <td>{{ ($asset->location) ? $asset->location->name : '' }}</td>
-                    <td>{{ $asset->serial }}</td>
-                    <td>
-                        {{ Helper::getFormattedDateObject($asset->last_checkout, 'datetime', false) }}</td>
-                    <td>
-                        @if ($asset->getLatestSignedAcceptance($show_user))
-                            <img style="width:auto;height:100px;" src="{{ asset('/') }}display-sig/{{ $asset->getLatestSignedAcceptance($show_user)->accept_signature }}">
-                        @endif
-                    </td>
-                    <td>
-                        data loop go here
-                    </td>
-                    {{--                    wouldn't this actually search for the checked custom fields, build an array of those, and then add on columns as needed?--}}
-                    {{--                    probably a mess under the hood, but that seems the most streamlined way?--}}
-                    {{--                        wait, what if the custom field is encrypted--}}
-                    {{----}}
-                </tr>
-                @if ($settings->show_assigned_assets)
-                    @php
-                        $assignedCounter = 1;
-                    @endphp
-                    @foreach ($asset->assignedAssets as $asset)
-                        <tr>
-                            <td>{{ $counter }}.{{ $assignedCounter }}</td>
-                            <td>
-                                @if ($asset->getImageUrl())
-                                    <img src="{{ $asset->getImageUrl() }}" class="thumbnail" style="max-height: 50px;">
-                                @endif
-                            </td>
-                            <td>{{ $asset->asset_tag }}</td>
-                            <td>{{ $asset->name }}</td>
-                            <td>{{ (($asset->model) && ($asset->model->category)) ? $asset->model->category->name : trans('general.invalid_category') }}</td>
-                            <td>{{ ($asset->model) ? $asset->model->name : trans('general.invalid_model') }}</td>
-                            <td>{{ ($asset->defaultLoc) ? $asset->defaultLoc->name : '' }}</td>
-                            <td>{{ ($asset->location) ? $asset->location->name : '' }}</td>
-                            <td>{{ $asset->serial }}</td>
-                            <td>
-                                {{ Helper::getFormattedDateObject($asset->last_checkout, 'datetime', false) }}
-                            </td>
-                            <td>
-                                @if ($asset->getLatestSignedAcceptance($show_user))
-                                    <img style="width:auto;height:100px;" src="{{ asset('/') }}display-sig/{{ $asset->getLatestSignedAcceptance($show_user)->accept_signature }}">
-                                @endif
-                            </td>
-                        </tr>
-                        @php
-                            $assignedCounter++
-                        @endphp
-                    @endforeach
-                @endif
-                @php
-                    $counter++
-                @endphp
-            @endforeach
-            </tbody>
+            data-cookie-id-table="AssetsAssigned"
+            data-url="{{ route('api.assets.index',['assigned_to' => $show_user->id, 'assigned_type' => 'App\Models\User']) }}">
+
+
+{{--        <thead>--}}
+{{--                <th data-field="asset_id" data-sortable="false" data-visible="true" data-switchable="false">#</th>--}}
+{{--                <th data-field="asset_image" data-sortable="true" data-visible="false" data-switchable="true">{{ trans('general.image') }}</th>--}}
+{{--                <th data-field="asset_tag" data-sortable="true" data-visible="true" data-switchable="false">{{ trans('admin/hardware/table.asset_tag') }}</th>--}}
+{{--                <th data-field="asset_name" data-sortable="true" data-visible="true">{{ trans('general.name') }}</th>--}}
+{{--                <th data-field="asset_category" data-sortable="true" data-visible="true">{{ trans('general.category') }}</th>--}}
+{{--                <th data-field="asset_model" data-sortable="true" data-visible="true">{{ trans('admin/hardware/form.model') }}</th>--}}
+{{--                <th data-field="rtd_location" data-sortable="true" data-visible="true">{{ trans('admin/hardware/form.default_location') }}</th>--}}
+{{--                <th data-field="asset_location" data-sortable="true" data-visible="false">{{ trans('general.location') }}</th>--}}
+{{--                <th data-field="asset_serial" data-sortable="true" data-visible="true">{{ trans('admin/hardware/form.serial') }}</th>--}}
+{{--                <th data-field="asset_checkout_date" data-sortable="true" data-visible="true">{{ trans('admin/hardware/table.checkout_date') }}</th>--}}
+{{--                <th data-field="signature" data-sortable="false" data-visible="true">{{ trans('general.signature') }}</th>--}}
+
+{{--                <th data-field="custom" data-sortable="true" data-visible="true">{{ trans('general.custom') }} header loop go here</th>--}}
+{{--            </thead>--}}
+{{--            <tbody>--}}
+{{--            @foreach ($show_user->assets as $asset)--}}
+{{--                @php--}}
+{{--                    if (($asset->model->category) && ($asset->model->category->getEula())) $eulas[] = $asset->model->category->getEula()--}}
+{{--                @endphp--}}
+{{--                <tr>--}}
+{{--                    <td>{{ $counter }}</td>--}}
+{{--                    <td>--}}
+{{--                        @if ($asset->getImageUrl())--}}
+{{--                            <img src="{{ $asset->getImageUrl() }}" class="thumbnail" style="max-height: 50px;">--}}
+{{--                        @endif--}}
+{{--                    </td>--}}
+{{--                    <td>{{ $asset->asset_tag }}</td>--}}
+{{--                    <td>{{ $asset->name }}</td>--}}
+{{--                    <td>{{ (($asset->model) && ($asset->model->category)) ? $asset->model->category->name : trans('general.invalid_category') }}</td>--}}
+{{--                    <td>{{ ($asset->model) ? $asset->model->name : trans('general.invalid_model') }}</td>--}}
+{{--                    <td>{{ ($asset->defaultLoc) ? $asset->defaultLoc->name : '' }}</td>--}}
+{{--                    <td>{{ ($asset->location) ? $asset->location->name : '' }}</td>--}}
+{{--                    <td>{{ $asset->serial }}</td>--}}
+{{--                    <td>--}}
+{{--                        {{ Helper::getFormattedDateObject($asset->last_checkout, 'datetime', false) }}</td>--}}
+{{--                    <td>--}}
+{{--                        @if ($asset->getLatestSignedAcceptance($show_user))--}}
+{{--                            <img style="width:auto;height:100px;" src="{{ asset('/') }}display-sig/{{ $asset->getLatestSignedAcceptance($show_user)->accept_signature }}">--}}
+{{--                        @endif--}}
+{{--                    </td>--}}
+{{--                    <td>--}}
+{{--                        data loop go here--}}
+{{--                    </td>--}}
+{{--                    --}}{{--                    wouldn't this actually search for the checked custom fields, build an array of those, and then add on columns as needed?--}}
+{{--                    --}}{{--                    probably a mess under the hood, but that seems the most streamlined way?--}}
+{{--                    --}}{{--                        wait, what if the custom field is encrypted--}}
+{{--                    --}}{{----}}
+{{--                </tr>--}}
+{{--                @if ($settings->show_assigned_assets)--}}
+{{--                    @php--}}
+{{--                        $assignedCounter = 1;--}}
+{{--                    @endphp--}}
+{{--                    @foreach ($asset->assignedAssets as $asset)--}}
+{{--                        <tr>--}}
+{{--                            <td>{{ $counter }}.{{ $assignedCounter }}</td>--}}
+{{--                            <td>--}}
+{{--                                @if ($asset->getImageUrl())--}}
+{{--                                    <img src="{{ $asset->getImageUrl() }}" class="thumbnail" style="max-height: 50px;">--}}
+{{--                                @endif--}}
+{{--                            </td>--}}
+{{--                            <td>{{ $asset->asset_tag }}</td>--}}
+{{--                            <td>{{ $asset->name }}</td>--}}
+{{--                            <td>{{ (($asset->model) && ($asset->model->category)) ? $asset->model->category->name : trans('general.invalid_category') }}</td>--}}
+{{--                            <td>{{ ($asset->model) ? $asset->model->name : trans('general.invalid_model') }}</td>--}}
+{{--                            <td>{{ ($asset->defaultLoc) ? $asset->defaultLoc->name : '' }}</td>--}}
+{{--                            <td>{{ ($asset->location) ? $asset->location->name : '' }}</td>--}}
+{{--                            <td>{{ $asset->serial }}</td>--}}
+{{--                            <td>--}}
+{{--                                {{ Helper::getFormattedDateObject($asset->last_checkout, 'datetime', false) }}--}}
+{{--                            </td>--}}
+{{--                            <td>--}}
+{{--                                @if ($asset->getLatestSignedAcceptance($show_user))--}}
+{{--                                    <img style="width:auto;height:100px;" src="{{ asset('/') }}display-sig/{{ $asset->getLatestSignedAcceptance($show_user)->accept_signature }}">--}}
+{{--                                @endif--}}
+{{--                            </td>--}}
+{{--                        </tr>--}}
+{{--                        @php--}}
+{{--                            $assignedCounter++--}}
+{{--                        @endphp--}}
+{{--                    @endforeach--}}
+{{--                @endif--}}
+{{--                @php--}}
+{{--                    $counter++--}}
+{{--                @endphp--}}
+{{--            @endforeach--}}
+{{--            </tbody>--}}
         </table>
     @endif
 
@@ -501,12 +511,14 @@ classes: 'table table-responsive table-no-bordered',
             paginationVAlign: 'both',
             queryParams: function (params) {
                 var newParams = {};
-                for(var i in params) {
-                    if(!keyBlocked(i)) { // only send the field if it's not in blockedFields
-                        newParams[i] = params[i];
+                var keyBlocked = function () {
+                    for (var i in params) {
+                        if (!keyBlocked(i)) { // only send the field if it's not in blockedFields
+                            newParams[i] = params[i];
+                        }
                     }
+                    return newParams;
                 }
-                return newParams;
             },
             formatLoadingMessage: function () {
                 return '<h2><i class="fas fa-spinner fa-spin" aria-hidden="true"></i> {{ trans('general.loading') }} </h4>';

From 608e61f70ef2188296e349d24af8104c3fbfc5fe Mon Sep 17 00:00:00 2001
From: akemidx <kojotek.dx@gmail.com>
Date: Tue, 15 Jul 2025 19:33:21 -0400
Subject: [PATCH 09/15] adding in for encryption. not saved on new field
 creation yet tho

---
 app/Http/Controllers/CustomFieldsController.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/Http/Controllers/CustomFieldsController.php b/app/Http/Controllers/CustomFieldsController.php
index 5969931a5649..a246e09c104b 100644
--- a/app/Http/Controllers/CustomFieldsController.php
+++ b/app/Http/Controllers/CustomFieldsController.php
@@ -85,11 +85,13 @@ public function store(CustomFieldRequest $request) : RedirectResponse
 
         $show_in_email = $request->input("show_in_email", 0);
         $display_in_user_view = $request->input("display_in_user_view", 0);
+        $display_on_print_assigned = $request->input('display_on_print_assigned', 0);
 
         // Override the display settings if the field is encrypted
         if ($request->input("field_encrypted") == '1') {
             $show_in_email = '0';
             $display_in_user_view = '0';
+            $display_on_print_assigned = '0';
         }
         
         $field = new CustomField([
@@ -107,7 +109,7 @@ public function store(CustomFieldRequest $request) : RedirectResponse
             "display_checkin" => $request->input("display_checkin", 0),
             "display_checkout" => $request->input("display_checkout", 0),
             "display_audit" => $request->input("display_audit", 0),
-            "display_on_print_assigned" => $request->input('display_on_print_assigned', 0),
+            "display_on_print_assigned" => $display_on_print_assigned,
 
         "created_by" => auth()->id()
         ]);
@@ -233,11 +235,14 @@ public function update(CustomFieldRequest $request, CustomField $field) : Redire
         $this->authorize('update', $field);
         $show_in_email = $request->get("show_in_email", 0);
         $display_in_user_view = $request->get("display_in_user_view", 0);
+        $display_on_print_assigned = $request->input('display_on_print_assigned', 0);
+
 
         // Override the display settings if the field is encrypted
         if ($request->get("field_encrypted") == '1') {
             $show_in_email = '0';
             $display_in_user_view = '0';
+            $display_on_print_assigned = '0';
         }
         
         $field->name          = trim($request->get("name"));
@@ -254,7 +259,8 @@ public function update(CustomFieldRequest $request, CustomField $field) : Redire
         $field->display_checkin = $request->get("display_checkin", 0);
         $field->display_checkout = $request->get("display_checkout", 0);
         $field->display_audit = $request->get("display_audit", 0);
-        $field->display_on_print_assigned = $request->input('display_on_print_assigned', 0);
+        $field->display_on_print_assigned = $display_on_print_assigned;
+
 
 
         if ($request->get('format') == 'CUSTOM REGEX') {

From 49899932448f6de22ab613760ac702b533639cf1 Mon Sep 17 00:00:00 2001
From: akemidx <kojotek.dx@gmail.com>
Date: Tue, 15 Jul 2025 19:53:41 -0400
Subject: [PATCH 10/15] saved on new custom field

---
 app/Models/CustomField.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/Models/CustomField.php b/app/Models/CustomField.php
index b3742882a2a3..318ca38feef0 100644
--- a/app/Models/CustomField.php
+++ b/app/Models/CustomField.php
@@ -83,6 +83,7 @@ class CustomField extends Model
         'display_checkin',
         'display_audit',
         'show_in_requestable_list',
+        'display_on_print_assigned',
     ];
 
     /**

From cabf786ebe765b582061fc87d475ef37bd63e5cb Mon Sep 17 00:00:00 2001
From: akemidx <kojotek.dx@gmail.com>
Date: Wed, 16 Jul 2025 20:15:40 -0400
Subject: [PATCH 11/15] stuck

---
 resources/views/users/print.blade.php | 191 +++++++++++++-------------
 1 file changed, 98 insertions(+), 93 deletions(-)

diff --git a/resources/views/users/print.blade.php b/resources/views/users/print.blade.php
index 4b7e44048d11..9d6208566377 100644
--- a/resources/views/users/print.blade.php
+++ b/resources/views/users/print.blade.php
@@ -106,108 +106,113 @@
         <table
             class="snipe-table table table-striped inventory"
             id="AssetsAssigned"
-            data-columns="{{ \App\Presenters\AssetPresenter::dataTableLayout() }}" {{--using this presenter removes the signature from the table--}}
+{{--            data-columns="{{ \App\Presenters\AssetPresenter::dataTableLayout() }}" --}}{{--using this presenter removes the signature from the table--}}
             data-pagination="false"
+            data-toolbar="#assets-toolbar"
+            data-search="false"
             data-id-table="AssetsAssigned"
-            data-search="true"
             data-side-pagination="client"
             data-sortable="true"
-            data-toolbar="#assets-toolbar"
             data-show-columns="true"
             data-sort-order="desc"
             data-sort-name="created_at"
             data-show-columns-toggle-all="true"
             data-cookie-id-table="AssetsAssigned"
-            data-url="{{ route('api.assets.index',['assigned_to' => $show_user->id, 'assigned_type' => 'App\Models\User']) }}">
-
-
-{{--        <thead>--}}
-{{--                <th data-field="asset_id" data-sortable="false" data-visible="true" data-switchable="false">#</th>--}}
-{{--                <th data-field="asset_image" data-sortable="true" data-visible="false" data-switchable="true">{{ trans('general.image') }}</th>--}}
-{{--                <th data-field="asset_tag" data-sortable="true" data-visible="true" data-switchable="false">{{ trans('admin/hardware/table.asset_tag') }}</th>--}}
-{{--                <th data-field="asset_name" data-sortable="true" data-visible="true">{{ trans('general.name') }}</th>--}}
-{{--                <th data-field="asset_category" data-sortable="true" data-visible="true">{{ trans('general.category') }}</th>--}}
-{{--                <th data-field="asset_model" data-sortable="true" data-visible="true">{{ trans('admin/hardware/form.model') }}</th>--}}
-{{--                <th data-field="rtd_location" data-sortable="true" data-visible="true">{{ trans('admin/hardware/form.default_location') }}</th>--}}
-{{--                <th data-field="asset_location" data-sortable="true" data-visible="false">{{ trans('general.location') }}</th>--}}
-{{--                <th data-field="asset_serial" data-sortable="true" data-visible="true">{{ trans('admin/hardware/form.serial') }}</th>--}}
-{{--                <th data-field="asset_checkout_date" data-sortable="true" data-visible="true">{{ trans('admin/hardware/table.checkout_date') }}</th>--}}
-{{--                <th data-field="signature" data-sortable="false" data-visible="true">{{ trans('general.signature') }}</th>--}}
-
-{{--                <th data-field="custom" data-sortable="true" data-visible="true">{{ trans('general.custom') }} header loop go here</th>--}}
-{{--            </thead>--}}
-{{--            <tbody>--}}
-{{--            @foreach ($show_user->assets as $asset)--}}
-{{--                @php--}}
-{{--                    if (($asset->model->category) && ($asset->model->category->getEula())) $eulas[] = $asset->model->category->getEula()--}}
-{{--                @endphp--}}
-{{--                <tr>--}}
-{{--                    <td>{{ $counter }}</td>--}}
-{{--                    <td>--}}
-{{--                        @if ($asset->getImageUrl())--}}
-{{--                            <img src="{{ $asset->getImageUrl() }}" class="thumbnail" style="max-height: 50px;">--}}
-{{--                        @endif--}}
-{{--                    </td>--}}
-{{--                    <td>{{ $asset->asset_tag }}</td>--}}
-{{--                    <td>{{ $asset->name }}</td>--}}
-{{--                    <td>{{ (($asset->model) && ($asset->model->category)) ? $asset->model->category->name : trans('general.invalid_category') }}</td>--}}
-{{--                    <td>{{ ($asset->model) ? $asset->model->name : trans('general.invalid_model') }}</td>--}}
-{{--                    <td>{{ ($asset->defaultLoc) ? $asset->defaultLoc->name : '' }}</td>--}}
-{{--                    <td>{{ ($asset->location) ? $asset->location->name : '' }}</td>--}}
-{{--                    <td>{{ $asset->serial }}</td>--}}
-{{--                    <td>--}}
-{{--                        {{ Helper::getFormattedDateObject($asset->last_checkout, 'datetime', false) }}</td>--}}
-{{--                    <td>--}}
-{{--                        @if ($asset->getLatestSignedAcceptance($show_user))--}}
-{{--                            <img style="width:auto;height:100px;" src="{{ asset('/') }}display-sig/{{ $asset->getLatestSignedAcceptance($show_user)->accept_signature }}">--}}
-{{--                        @endif--}}
-{{--                    </td>--}}
-{{--                    <td>--}}
-{{--                        data loop go here--}}
-{{--                    </td>--}}
-{{--                    --}}{{--                    wouldn't this actually search for the checked custom fields, build an array of those, and then add on columns as needed?--}}
-{{--                    --}}{{--                    probably a mess under the hood, but that seems the most streamlined way?--}}
-{{--                    --}}{{--                        wait, what if the custom field is encrypted--}}
-{{--                    --}}{{----}}
-{{--                </tr>--}}
-{{--                @if ($settings->show_assigned_assets)--}}
-{{--                    @php--}}
-{{--                        $assignedCounter = 1;--}}
-{{--                    @endphp--}}
-{{--                    @foreach ($asset->assignedAssets as $asset)--}}
-{{--                        <tr>--}}
-{{--                            <td>{{ $counter }}.{{ $assignedCounter }}</td>--}}
-{{--                            <td>--}}
-{{--                                @if ($asset->getImageUrl())--}}
-{{--                                    <img src="{{ $asset->getImageUrl() }}" class="thumbnail" style="max-height: 50px;">--}}
-{{--                                @endif--}}
-{{--                            </td>--}}
-{{--                            <td>{{ $asset->asset_tag }}</td>--}}
-{{--                            <td>{{ $asset->name }}</td>--}}
-{{--                            <td>{{ (($asset->model) && ($asset->model->category)) ? $asset->model->category->name : trans('general.invalid_category') }}</td>--}}
-{{--                            <td>{{ ($asset->model) ? $asset->model->name : trans('general.invalid_model') }}</td>--}}
-{{--                            <td>{{ ($asset->defaultLoc) ? $asset->defaultLoc->name : '' }}</td>--}}
-{{--                            <td>{{ ($asset->location) ? $asset->location->name : '' }}</td>--}}
-{{--                            <td>{{ $asset->serial }}</td>--}}
-{{--                            <td>--}}
-{{--                                {{ Helper::getFormattedDateObject($asset->last_checkout, 'datetime', false) }}--}}
-{{--                            </td>--}}
-{{--                            <td>--}}
-{{--                                @if ($asset->getLatestSignedAcceptance($show_user))--}}
-{{--                                    <img style="width:auto;height:100px;" src="{{ asset('/') }}display-sig/{{ $asset->getLatestSignedAcceptance($show_user)->accept_signature }}">--}}
-{{--                                @endif--}}
-{{--                            </td>--}}
-{{--                        </tr>--}}
-{{--                        @php--}}
-{{--                            $assignedCounter++--}}
-{{--                        @endphp--}}
-{{--                    @endforeach--}}
-{{--                @endif--}}
-{{--                @php--}}
-{{--                    $counter++--}}
-{{--                @endphp--}}
-{{--            @endforeach--}}
-{{--            </tbody>--}}
+{{--            data-url="{{ route('api.assets.index',['assigned_to' => $show_user->id, 'assigned_type' => 'App\Models\User']) }}">--}}
+
+
+        <thead>
+                <th data-field="asset_id" data-sortable="false" data-visible="true" data-switchable="false">#</th>
+                <th data-field="asset_image" data-sortable="true" data-visible="false" data-switchable="true">{{ trans('general.image') }}</th>
+                <th data-field="asset_tag" data-sortable="true" data-visible="true" data-switchable="false">{{ trans('admin/hardware/table.asset_tag') }}</th>
+                <th data-field="asset_name" data-sortable="true" data-visible="true">{{ trans('general.name') }}</th>
+                <th data-field="asset_category" data-sortable="true" data-visible="true">{{ trans('general.category') }}</th>
+                <th data-field="asset_model" data-sortable="true" data-visible="true">{{ trans('admin/hardware/form.model') }}</th>
+                <th data-field="rtd_location" data-sortable="true" data-visible="true">{{ trans('admin/hardware/form.default_location') }}</th>
+                <th data-field="asset_location" data-sortable="true" data-visible="false">{{ trans('general.location') }}</th>
+                <th data-field="asset_serial" data-sortable="true" data-visible="true">{{ trans('admin/hardware/form.serial') }}</th>
+                <th data-field="asset_checkout_date" data-sortable="true" data-visible="true">{{ trans('admin/hardware/table.checkout_date') }}</th>
+                <th data-field="signature" data-sortable="false" data-visible="true">{{ trans('general.signature') }}</th>
+
+
+                <th data-field="custom" data-sortable="true" data-visible="true">{{ trans('general.custom') }} header loop go here</th>
+            </thead>
+            <tbody>
+            @foreach ($show_user->assets as $asset)
+                @php
+                    if (($asset->model->category) && ($asset->model->category->getEula())) $eulas[] = $asset->model->category->getEula()
+                @endphp
+                <tr>
+                    <td>{{ $counter }}</td>
+                    <td>
+                        @if ($asset->getImageUrl())
+                            <img src="{{ $asset->getImageUrl() }}" class="thumbnail" style="max-height: 50px;">
+                        @endif
+                    </td>
+                    <td>{{ $asset->asset_tag }}</td>
+                    <td>{{ $asset->name }}</td>
+                    <td>{{ (($asset->model) && ($asset->model->category)) ? $asset->model->category->name : trans('general.invalid_category') }}</td>
+                    <td>{{ ($asset->model) ? $asset->model->name : trans('general.invalid_model') }}</td>
+                    <td>{{ ($asset->defaultLoc) ? $asset->defaultLoc->name : '' }}</td>
+                    <td>{{ ($asset->location) ? $asset->location->name : '' }}</td>
+                    <td>{{ $asset->serial }}</td>
+                    <td>
+                        {{ Helper::getFormattedDateObject($asset->last_checkout, 'datetime', false) }}</td>
+                    <td>
+                        @if ($asset->getLatestSignedAcceptance($show_user))
+                            <img style="width:auto;height:100px;" src="{{ asset('/') }}display-sig/{{ $asset->getLatestSignedAcceptance($show_user)->accept_signature }}">
+                        @endif
+                    </td>
+
+                    @foreach($asset->model->fieldset->fields as $fields)
+                        @dd($asset->model->fieldset->fields);
+                        {{-- weird that line 167 will pop a cant read property on null, but only when the dd is not there. --}}
+                    <td>
+                        {{ $fields }}
+                    </td>
+                    @endforeach
+{{--                                        wouldn't this actually search for the checked custom fields, build an array of those, and then add on columns as needed?--}}
+{{--                                        probably a mess under the hood, but that seems the most streamlined way?--}}
+
+                </tr>
+                @if ($settings->show_assigned_assets)
+                    @php
+                        $assignedCounter = 1;
+                    @endphp
+                    @foreach ($asset->assignedAssets as $asset)
+                        <tr>
+                            <td>{{ $counter }}.{{ $assignedCounter }}</td>
+                            <td>
+                                @if ($asset->getImageUrl())
+                                    <img src="{{ $asset->getImageUrl() }}" class="thumbnail" style="max-height: 50px;">
+                                @endif
+                            </td>
+                            <td>{{ $asset->asset_tag }}</td>
+                            <td>{{ $asset->name }}</td>
+                            <td>{{ (($asset->model) && ($asset->model->category)) ? $asset->model->category->name : trans('general.invalid_category') }}</td>
+                            <td>{{ ($asset->model) ? $asset->model->name : trans('general.invalid_model') }}</td>
+                            <td>{{ ($asset->defaultLoc) ? $asset->defaultLoc->name : '' }}</td>
+                            <td>{{ ($asset->location) ? $asset->location->name : '' }}</td>
+                            <td>{{ $asset->serial }}</td>
+                            <td>
+                                {{ Helper::getFormattedDateObject($asset->last_checkout, 'datetime', false) }}
+                            </td>
+                            <td>
+                                @if ($asset->getLatestSignedAcceptance($show_user))
+                                    <img style="width:auto;height:100px;" src="{{ asset('/') }}display-sig/{{ $asset->getLatestSignedAcceptance($show_user)->accept_signature }}">
+                                @endif
+                            </td>
+                        </tr>
+                        @php
+                            $assignedCounter++
+                        @endphp
+                    @endforeach
+                @endif
+                @php
+                    $counter++
+                @endphp
+            @endforeach
+            </tbody>
         </table>
     @endif
 

From f06e30bc546f259a54c50b4b48a707801ac02fa0 Mon Sep 17 00:00:00 2001
From: akemidx <kojotek.dx@gmail.com>
Date: Thu, 17 Jul 2025 13:54:37 -0400
Subject: [PATCH 12/15] com

---
 resources/views/users/print.blade.php | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/resources/views/users/print.blade.php b/resources/views/users/print.blade.php
index 9d6208566377..f2a74a5aece4 100644
--- a/resources/views/users/print.blade.php
+++ b/resources/views/users/print.blade.php
@@ -98,9 +98,6 @@
             </h4>
         </div>
 
-{{--        @php--}}
-{{--            dd($show_user->id);--}}
-{{--        @endphp--}}
 
 
         <table
@@ -135,7 +132,7 @@ class="snipe-table table table-striped inventory"
                 <th data-field="signature" data-sortable="false" data-visible="true">{{ trans('general.signature') }}</th>
 
 
-                <th data-field="custom" data-sortable="true" data-visible="true">{{ trans('general.custom') }} header loop go here</th>
+                <th data-field="custom" data-sortable="true" data-visible="true">{{ trans('general.custom') }}</th>
             </thead>
             <tbody>
             @foreach ($show_user->assets as $asset)
@@ -164,13 +161,19 @@ class="snipe-table table table-striped inventory"
                         @endif
                     </td>
 
-                    @foreach($asset->model->fieldset->fields as $fields)
-                        @dd($asset->model->fieldset->fields);
-                        {{-- weird that line 167 will pop a cant read property on null, but only when the dd is not there. --}}
-                    <td>
-                        {{ $fields }}
-                    </td>
-                    @endforeach
+
+
+
+
+{{--                    @foreach($asset->model->fieldset->fields as $fields)--}}
+{{--                        @dd($asset->model->fieldset->fields);--}}
+{{--                        --}}{{-- weird that line 167 will pop a cant read property on null, but only when the dd is not there. --}}
+{{--                    <td>--}}
+{{--                        @if($fields->display_on_print_assigned=='1')--}}
+{{--                            $fields;--}}
+{{--                        @endif--}}
+{{--                    </td>--}}
+{{--                    @endforeach--}}
 {{--                                        wouldn't this actually search for the checked custom fields, build an array of those, and then add on columns as needed?--}}
 {{--                                        probably a mess under the hood, but that seems the most streamlined way?--}}
 

From 5dd532033f3da8ff48823dbd2fae06270b0f49c4 Mon Sep 17 00:00:00 2001
From: akemidx <kojotek.dx@gmail.com>
Date: Thu, 17 Jul 2025 14:27:56 -0400
Subject: [PATCH 13/15] iterations

---
 .../Controllers/Users/UsersController.php     |  4 +-
 resources/views/users/print.blade.php         | 38 ++++++++-----------
 2 files changed, 19 insertions(+), 23 deletions(-)

diff --git a/app/Http/Controllers/Users/UsersController.php b/app/Http/Controllers/Users/UsersController.php
index b18a7b6fff8d..04832a06e014 100755
--- a/app/Http/Controllers/Users/UsersController.php
+++ b/app/Http/Controllers/Users/UsersController.php
@@ -10,6 +10,7 @@
 use App\Models\Actionlog;
 use App\Models\Asset;
 use App\Models\Company;
+use App\Models\CustomField;
 use App\Models\Group;
 use App\Models\Setting;
 use App\Models\User;
@@ -622,7 +623,8 @@ public function printInventory($id)
 
             return view('users.print')
                 ->with('users', [$user])
-                ->with('settings', Setting::getSettings());
+                ->with('settings', Setting::getSettings())
+                ->with('printable_customfields', CustomField::all()->filter(fn($customfield) => $customfield->display_on_print_assigned));
         }
 
         return redirect()->route('users.index')->with('error', trans('admin/users/message.user_not_found', compact('id')));
diff --git a/resources/views/users/print.blade.php b/resources/views/users/print.blade.php
index f2a74a5aece4..43d64ba57ce6 100644
--- a/resources/views/users/print.blade.php
+++ b/resources/views/users/print.blade.php
@@ -103,7 +103,6 @@
         <table
             class="snipe-table table table-striped inventory"
             id="AssetsAssigned"
-{{--            data-columns="{{ \App\Presenters\AssetPresenter::dataTableLayout() }}" --}}{{--using this presenter removes the signature from the table--}}
             data-pagination="false"
             data-toolbar="#assets-toolbar"
             data-search="false"
@@ -114,8 +113,7 @@ class="snipe-table table table-striped inventory"
             data-sort-order="desc"
             data-sort-name="created_at"
             data-show-columns-toggle-all="true"
-            data-cookie-id-table="AssetsAssigned"
-{{--            data-url="{{ route('api.assets.index',['assigned_to' => $show_user->id, 'assigned_type' => 'App\Models\User']) }}">--}}
+            data-cookie-id-table="AssetsAssigned">
 
 
         <thead>
@@ -129,11 +127,16 @@ class="snipe-table table table-striped inventory"
                 <th data-field="asset_location" data-sortable="true" data-visible="false">{{ trans('general.location') }}</th>
                 <th data-field="asset_serial" data-sortable="true" data-visible="true">{{ trans('admin/hardware/form.serial') }}</th>
                 <th data-field="asset_checkout_date" data-sortable="true" data-visible="true">{{ trans('admin/hardware/table.checkout_date') }}</th>
-                <th data-field="signature" data-sortable="false" data-visible="true">{{ trans('general.signature') }}</th>
 
+                @foreach($printable_customfields as $customfield)
+                    <th data-field="custom" data-sortable="true" data-visible="true">
+                        {{$customfield->name}}
+                    </th>
+                @endforeach
 
-                <th data-field="custom" data-sortable="true" data-visible="true">{{ trans('general.custom') }}</th>
-            </thead>
+                <th data-field="signature" data-sortable="false" data-visible="true">{{ trans('general.signature') }}</th>
+
+        </thead>
             <tbody>
             @foreach ($show_user->assets as $asset)
                 @php
@@ -155,28 +158,19 @@ class="snipe-table table table-striped inventory"
                     <td>{{ $asset->serial }}</td>
                     <td>
                         {{ Helper::getFormattedDateObject($asset->last_checkout, 'datetime', false) }}</td>
+
+                    @foreach($printable_customfields as $customfield)
+                        <td data-field="custom" data-sortable="true" data-visible="true">
+                            {{ $asset->{$customfield->db_column} }}
+                        </td>
+                    @endforeach
+
                     <td>
                         @if ($asset->getLatestSignedAcceptance($show_user))
                             <img style="width:auto;height:100px;" src="{{ asset('/') }}display-sig/{{ $asset->getLatestSignedAcceptance($show_user)->accept_signature }}">
                         @endif
                     </td>
 
-
-
-
-
-{{--                    @foreach($asset->model->fieldset->fields as $fields)--}}
-{{--                        @dd($asset->model->fieldset->fields);--}}
-{{--                        --}}{{-- weird that line 167 will pop a cant read property on null, but only when the dd is not there. --}}
-{{--                    <td>--}}
-{{--                        @if($fields->display_on_print_assigned=='1')--}}
-{{--                            $fields;--}}
-{{--                        @endif--}}
-{{--                    </td>--}}
-{{--                    @endforeach--}}
-{{--                                        wouldn't this actually search for the checked custom fields, build an array of those, and then add on columns as needed?--}}
-{{--                                        probably a mess under the hood, but that seems the most streamlined way?--}}
-
                 </tr>
                 @if ($settings->show_assigned_assets)
                     @php

From 346b1b95706b4715ac8419364428bea9f4e3efad Mon Sep 17 00:00:00 2001
From: akemidx <kojotek.dx@gmail.com>
Date: Thu, 17 Jul 2025 17:01:58 -0400
Subject: [PATCH 14/15] fixing iteration and adding hiding encrypted feels

---
 app/Http/Controllers/Users/UsersController.php | 4 +++-
 resources/views/users/print.blade.php          | 6 +++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/Http/Controllers/Users/UsersController.php b/app/Http/Controllers/Users/UsersController.php
index 04832a06e014..1acda4692fe7 100755
--- a/app/Http/Controllers/Users/UsersController.php
+++ b/app/Http/Controllers/Users/UsersController.php
@@ -624,7 +624,9 @@ public function printInventory($id)
             return view('users.print')
                 ->with('users', [$user])
                 ->with('settings', Setting::getSettings())
-                ->with('printable_customfields', CustomField::all()->filter(fn($customfield) => $customfield->display_on_print_assigned));
+                ->with('printable_customfields', CustomField::all()->filter(function ($customfield) {
+                    return $customfield->display_on_print_assigned && $customfield->field_encrypted == 0;
+                }));
         }
 
         return redirect()->route('users.index')->with('error', trans('admin/users/message.user_not_found', compact('id')));
diff --git a/resources/views/users/print.blade.php b/resources/views/users/print.blade.php
index 43d64ba57ce6..ba76ff885d91 100644
--- a/resources/views/users/print.blade.php
+++ b/resources/views/users/print.blade.php
@@ -117,7 +117,7 @@ class="snipe-table table table-striped inventory"
 
 
         <thead>
-                <th data-field="asset_id" data-sortable="false" data-visible="true" data-switchable="false">#</th>
+                <th data-field="asset_id" data-sortable="true" data-visible="true" data-switchable="false">#</th>
                 <th data-field="asset_image" data-sortable="true" data-visible="false" data-switchable="true">{{ trans('general.image') }}</th>
                 <th data-field="asset_tag" data-sortable="true" data-visible="true" data-switchable="false">{{ trans('admin/hardware/table.asset_tag') }}</th>
                 <th data-field="asset_name" data-sortable="true" data-visible="true">{{ trans('general.name') }}</th>
@@ -129,7 +129,7 @@ class="snipe-table table table-striped inventory"
                 <th data-field="asset_checkout_date" data-sortable="true" data-visible="true">{{ trans('admin/hardware/table.checkout_date') }}</th>
 
                 @foreach($printable_customfields as $customfield)
-                    <th data-field="custom" data-sortable="true" data-visible="true">
+                    <th data-sortable="true" data-visible="true">
                         {{$customfield->name}}
                     </th>
                 @endforeach
@@ -160,7 +160,7 @@ class="snipe-table table table-striped inventory"
                         {{ Helper::getFormattedDateObject($asset->last_checkout, 'datetime', false) }}</td>
 
                     @foreach($printable_customfields as $customfield)
-                        <td data-field="custom" data-sortable="true" data-visible="true">
+                        <td>
                             {{ $asset->{$customfield->db_column} }}
                         </td>
                     @endforeach

From 158b7642d7829b6db3e215de192dcfcc80ed224c Mon Sep 17 00:00:00 2001
From: akemidx <kojotek.dx@gmail.com>
Date: Thu, 28 Aug 2025 18:40:15 -0400
Subject: [PATCH 15/15] note for NOT displaying custom fields

---
 app/Http/Controllers/Users/UsersController.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/Http/Controllers/Users/UsersController.php b/app/Http/Controllers/Users/UsersController.php
index 595a84262d0c..dae8d356ede7 100755
--- a/app/Http/Controllers/Users/UsersController.php
+++ b/app/Http/Controllers/Users/UsersController.php
@@ -619,6 +619,7 @@ public function printInventory($id)
                 ->with('settings', Setting::getSettings())
                 ->with('printable_customfields', CustomField::all()->filter(function ($customfield) {
                     return $customfield->display_on_print_assigned && $customfield->field_encrypted == 0;
+                    //This should make it to NOT show encrypted custom fields on the printout
                 }));
         }