From 75844c594223064850dd026af40217f45b36b4d6 Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Mon, 11 Jul 2022 09:56:58 -0700 Subject: [PATCH 1/8] adds a checkbox to exclude archived assets from custom reports --- app/Http/Controllers/ReportsController.php | 3 +++ resources/lang/en/general.php | 1 + resources/views/reports/custom.blade.php | 5 ++++- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/ReportsController.php b/app/Http/Controllers/ReportsController.php index 500b57c96..1869b87b5 100644 --- a/app/Http/Controllers/ReportsController.php +++ b/app/Http/Controllers/ReportsController.php @@ -642,6 +642,9 @@ class ReportsController extends Controller if (($request->filled('next_audit_start')) && ($request->filled('next_audit_end'))) { $assets->whereBetween('assets.next_audit_date', [$request->input('next_audit_start'), $request->input('next_audit_end')]); } + if($request->filled('exclude_archived')){ + $assets->where('archived', '=', 0); + } $assets->orderBy('assets.id', 'ASC')->chunk(20, function ($assets) use ($handle, $customfields, $request) { $executionTime = microtime(true) - $_SERVER['REQUEST_TIME_FLOAT']; diff --git a/resources/lang/en/general.php b/resources/lang/en/general.php index 97a704a1d..9b1380f25 100644 --- a/resources/lang/en/general.php +++ b/resources/lang/en/general.php @@ -101,6 +101,7 @@ return [ 'employee_number' => 'Employee Number', 'email_domain_help' => 'This is used to generate email addresses when importing', 'error' => 'Error', + 'exclude_archived' => 'Exclude Archived Assets', 'example' => 'Example: ', 'filastname_format' => 'First Initial Last Name (jsmith@example.com)', 'firstname_lastname_format' => 'First Name Last Name (jane.smith@example.com)', diff --git a/resources/views/reports/custom.blade.php b/resources/views/reports/custom.blade.php index 9a6a7e432..96fbc114f 100644 --- a/resources/views/reports/custom.blade.php +++ b/resources/views/reports/custom.blade.php @@ -340,11 +340,14 @@
+ -
From 5efe45226d4aed386e5e72ba5d34824da58b1257 Mon Sep 17 00:00:00 2001 From: mikeroq Date: Mon, 11 Jul 2022 20:02:10 -0500 Subject: [PATCH 2/8] Fixes Email List of All Assigned being "successful" when the user has no email Added check in view to disable button if there is no email Added translation for title on disabled button and for email check in controller Fixed missing trans for user not found message --- app/Http/Controllers/Users/UsersController.php | 16 +++++++++------- resources/lang/en/admin/users/message.php | 3 ++- resources/views/users/view.blade.php | 16 ++++++++++------ 3 files changed, 21 insertions(+), 14 deletions(-) diff --git a/app/Http/Controllers/Users/UsersController.php b/app/Http/Controllers/Users/UsersController.php index 421e07b4e..7cbbbdb10 100755 --- a/app/Http/Controllers/Users/UsersController.php +++ b/app/Http/Controllers/Users/UsersController.php @@ -628,14 +628,16 @@ class UsersController extends Controller { $this->authorize('view', User::class); - if( User::where('id', $id)->first()->exists()) - { - $user= User::where('id', $id)->first(); - $user->notify((new CurrentInventory($user))); - return redirect()->back()->with('success', trans('admin/users/general.user_notified')); - } + if (!$user = User::find($id)) { + return redirect()->back() + ->with('error', trans('admin/users/message.user_not_found', ['id' => $id])); + } + if (empty($user->email)) { + return redirect()->back()->with('error', trans('admin/users/message.user_has_no_email')); + } - return redirect()->back()->with('error', 'admin/accessories/message.user_does_not_exist'); + $user->notify((new CurrentInventory($user))); + return redirect()->back()->with('success', trans('admin/users/general.user_notified')); } /** diff --git a/resources/lang/en/admin/users/message.php b/resources/lang/en/admin/users/message.php index 85d016f04..29f82db38 100644 --- a/resources/lang/en/admin/users/message.php +++ b/resources/lang/en/admin/users/message.php @@ -14,6 +14,7 @@ return array( 'ldap_not_configured' => 'LDAP integration has not been configured for this installation.', 'password_resets_sent' => 'The selected users who are activated and have a valid email addresses have been sent a password reset link.', 'password_reset_sent' => 'A password reset link has been sent to :email!', + 'user_has_no_email' => 'This user does not have an email address in their profile.', 'success' => array( @@ -58,4 +59,4 @@ return array( 'invalidfiles' => 'One or more of your files is too large or is a filetype that is not allowed. Allowed filetypes are png, gif, jpg, doc, docx, pdf, and txt.', ), -); +); \ No newline at end of file diff --git a/resources/views/users/view.blade.php b/resources/views/users/view.blade.php index 616ab7089..8763c5718 100755 --- a/resources/views/users/view.blade.php +++ b/resources/views/users/view.blade.php @@ -184,12 +184,16 @@ @endcan @can('view', $user) -
-
- {{ csrf_field() }} - -
-
+
+ @if(!empty($user->email)) +
+ {{ csrf_field() }} + +
+ @else + + @endif +
@endcan @can('update', $user) From 48349071ed36032b613bc22c6f184777fb2795e3 Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Tue, 12 Jul 2022 09:46:44 -0700 Subject: [PATCH 3/8] accounts for status_id as well --- app/Http/Controllers/ReportsController.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/ReportsController.php b/app/Http/Controllers/ReportsController.php index 1869b87b5..73cc4618e 100644 --- a/app/Http/Controllers/ReportsController.php +++ b/app/Http/Controllers/ReportsController.php @@ -643,8 +643,9 @@ class ReportsController extends Controller $assets->whereBetween('assets.next_audit_date', [$request->input('next_audit_start'), $request->input('next_audit_end')]); } if($request->filled('exclude_archived')){ - $assets->where('archived', '=', 0); + $assets->where('archived', '=', 0) && $assets->where('status_id', '!=', 3); } + $assets->orderBy('assets.id', 'ASC')->chunk(20, function ($assets) use ($handle, $customfields, $request) { $executionTime = microtime(true) - $_SERVER['REQUEST_TIME_FLOAT']; From 58c54cc3dceb02c86e76ecf969af42138609d948 Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Tue, 12 Jul 2022 12:20:11 -0700 Subject: [PATCH 4/8] uses notArchived scope instead now --- app/Http/Controllers/ReportsController.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/ReportsController.php b/app/Http/Controllers/ReportsController.php index 73cc4618e..d37e1e6b2 100644 --- a/app/Http/Controllers/ReportsController.php +++ b/app/Http/Controllers/ReportsController.php @@ -643,7 +643,8 @@ class ReportsController extends Controller $assets->whereBetween('assets.next_audit_date', [$request->input('next_audit_start'), $request->input('next_audit_end')]); } if($request->filled('exclude_archived')){ - $assets->where('archived', '=', 0) && $assets->where('status_id', '!=', 3); + $assets->notArchived(); +// where('archived', '=', 0) && $assets->where('status_id', '!=', 3); } $assets->orderBy('assets.id', 'ASC')->chunk(20, function ($assets) use ($handle, $customfields, $request) { From 27039325f3f624a17fc5b8da140e6bd2d094dd55 Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Tue, 12 Jul 2022 12:41:07 -0700 Subject: [PATCH 5/8] removed comments, because I forgot --- app/Http/Controllers/ReportsController.php | 1 - 1 file changed, 1 deletion(-) diff --git a/app/Http/Controllers/ReportsController.php b/app/Http/Controllers/ReportsController.php index d37e1e6b2..74d709adc 100644 --- a/app/Http/Controllers/ReportsController.php +++ b/app/Http/Controllers/ReportsController.php @@ -644,7 +644,6 @@ class ReportsController extends Controller } if($request->filled('exclude_archived')){ $assets->notArchived(); -// where('archived', '=', 0) && $assets->where('status_id', '!=', 3); } $assets->orderBy('assets.id', 'ASC')->chunk(20, function ($assets) use ($handle, $customfields, $request) { From f21824a8e2cd692ce91b6c0bf3f502aff7f0df80 Mon Sep 17 00:00:00 2001 From: mikeroq Date: Tue, 12 Jul 2022 17:59:03 -0500 Subject: [PATCH 6/8] Changed comparing the action type from translated in presenter to actual value --- app/Http/Transformers/ActionlogsTransformer.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Transformers/ActionlogsTransformer.php b/app/Http/Transformers/ActionlogsTransformer.php index 5a7c47200..5e0fc917e 100644 --- a/app/Http/Transformers/ActionlogsTransformer.php +++ b/app/Http/Transformers/ActionlogsTransformer.php @@ -57,7 +57,7 @@ class ActionlogsTransformer $file_url = ''; if($actionlog->filename!='') { - if ($actionlog->present()->actionType() == 'accepted') { + if ($actionlog->action_type == 'accepted') { $file_url = route('log.storedeula.download', ['filename' => $actionlog->filename]); } else { if ($actionlog->itemType() == 'asset') { From 6428dc5cd2ee84f91ff347505a2716f6730c3467 Mon Sep 17 00:00:00 2001 From: snipe Date: Wed, 13 Jul 2022 13:08:10 -0700 Subject: [PATCH 7/8] Removed duplicate supplier_id Signed-off-by: snipe --- app/Http/Controllers/Api/LicensesController.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/app/Http/Controllers/Api/LicensesController.php b/app/Http/Controllers/Api/LicensesController.php index ad0055c22..6e67f07ee 100644 --- a/app/Http/Controllers/Api/LicensesController.php +++ b/app/Http/Controllers/Api/LicensesController.php @@ -73,9 +73,6 @@ class LicensesController extends Controller $licenses->where('depreciation_id', '=', $request->input('depreciation_id')); } - if ($request->filled('supplier_id')) { - $licenses->where('supplier_id', '=', $request->input('supplier_id')); - } if (($request->filled('maintained')) && ($request->input('maintained')=='true')) { $licenses->where('maintained','=',1); From 58499c2322c3000e6c3bf51c2e328e8005c123a6 Mon Sep 17 00:00:00 2001 From: snipe Date: Fri, 15 Jul 2022 17:09:17 -0700 Subject: [PATCH 8/8] Fixed #11508 - font size in alert menu Signed-off-by: snipe --- public/css/build/app.css | 6 ++++++ public/css/build/overrides.css | 6 ++++++ public/css/dist/all.css | 12 ++++++++++++ public/mix-manifest.json | 6 +++--- resources/assets/less/overrides.less | 8 ++++++++ resources/views/layouts/default.blade.php | 2 +- 6 files changed, 36 insertions(+), 4 deletions(-) diff --git a/public/css/build/app.css b/public/css/build/app.css index 2e046ea43..b2dbca0a0 100644 --- a/public/css/build/app.css +++ b/public/css/build/app.css @@ -763,6 +763,12 @@ a.skip-main:active { h2 { font-size: 22px; } +h2.task_menu { + font-size: 14px; +} +h2 small { + font-size: 85%; +} h3 { font-size: 20px; } diff --git a/public/css/build/overrides.css b/public/css/build/overrides.css index ad673bb29..b3c9dc219 100644 --- a/public/css/build/overrides.css +++ b/public/css/build/overrides.css @@ -396,6 +396,12 @@ a.skip-main:active { h2 { font-size: 22px; } +h2.task_menu { + font-size: 14px; +} +h2 small { + font-size: 85%; +} h3 { font-size: 20px; } diff --git a/public/css/dist/all.css b/public/css/dist/all.css index e07a38636..2b7600d82 100644 --- a/public/css/dist/all.css +++ b/public/css/dist/all.css @@ -23519,6 +23519,12 @@ a.skip-main:active { h2 { font-size: 22px; } +h2.task_menu { + font-size: 14px; +} +h2 small { + font-size: 85%; +} h3 { font-size: 20px; } @@ -24582,6 +24588,12 @@ a.skip-main:active { h2 { font-size: 22px; } +h2.task_menu { + font-size: 14px; +} +h2 small { + font-size: 85%; +} h3 { font-size: 20px; } diff --git a/public/mix-manifest.json b/public/mix-manifest.json index b4fa587d9..a9da8fa13 100644 --- a/public/mix-manifest.json +++ b/public/mix-manifest.json @@ -1,8 +1,8 @@ { "/js/build/app.js": "/js/build/app.js?id=8b75d505c1bee38e15573e394b96f249", "/css/dist/skins/skin-blue.css": "/css/dist/skins/skin-blue.css?id=71977934351d63b126c6b3573baf3349", - "/css/build/overrides.css": "/css/build/overrides.css?id=a58e6183c486b28f306d4d227d196f6b", - "/css/build/app.css": "/css/build/app.css?id=0a7f55911780e98afda948089bbb3552", + "/css/build/overrides.css": "/css/build/overrides.css?id=933065998b88257a57bfb1650d82b76c", + "/css/build/app.css": "/css/build/app.css?id=4cbaeaaac109b0a70a3ad718b66f5b82", "/css/build/AdminLTE.css": "/css/build/AdminLTE.css?id=dc383f8560a8d4adb51d44fb4043e03b", "/css/dist/skins/skin-orange.css": "/css/dist/skins/skin-orange.css?id=0715caf11a30f0756768c093ee3a5a8f", "/css/dist/skins/skin-orange-dark.css": "/css/dist/skins/skin-orange-dark.css?id=0d8fd1ee0653f7255619590d4abf3c22", @@ -18,7 +18,7 @@ "/css/dist/skins/skin-green.css": "/css/dist/skins/skin-green.css?id=407f83d58689706f303a83e195f6c041", "/css/dist/skins/skin-contrast.css": "/css/dist/skins/skin-contrast.css?id=8e538625ebd4b8096e150d1aa483547b", "/css/dist/skins/skin-red.css": "/css/dist/skins/skin-red.css?id=c17879493dcd86dbb6c1701082bec9f7", - "/css/dist/all.css": "/css/dist/all.css?id=f9d3af05e25b4dc1ac2514b9a570c69a", + "/css/dist/all.css": "/css/dist/all.css?id=7aa07fa7dad1ea53568782ab1a822179", "/css/blue.png": "/css/blue.png?id=e83a6c29e04fe851f2122815b2e4b150", "/css/blue@2x.png": "/css/blue@2x.png?id=51135dd4d24f88f5de0b2414bd51dac5", "/css/dist/signature-pad.css": "/css/dist/signature-pad.css?id=6a89d3cd901305e66ced1cf5f13147f7", diff --git a/resources/assets/less/overrides.less b/resources/assets/less/overrides.less index 3763f5391..c6117021c 100644 --- a/resources/assets/less/overrides.less +++ b/resources/assets/less/overrides.less @@ -434,6 +434,14 @@ h2 { font-size: 22px; } +h2.task_menu { + font-size: 14px; +} + +h2 small { + font-size: 85%; +} + h3 { font-size: 20px; } diff --git a/resources/views/layouts/default.blade.php b/resources/views/layouts/default.blade.php index c45a4bcc9..2379b1f55 100644 --- a/resources/views/layouts/default.blade.php +++ b/resources/views/layouts/default.blade.php @@ -271,7 +271,7 @@
  • -

    {{ $alert_items[$i]['name'] }} +

    {{ $alert_items[$i]['name'] }} {{ $alert_items[$i]['remaining'] }} {{ trans('general.remaining') }}