DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-03-05 20:52:15 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
12510 commits 59 branches 275 tags 321 MiB
Commit graph

206 commits

Author SHA1 Message Date
Marcus Moore 530ea474d1
Merge branch 'develop' into saving_custom_report_template 
# Conflicts:
#	resources/lang/en/admin/reports/general.php
#	resources/views/reports/custom.blade.php
 2024-01-23 13:55:07 -08:00
Marcus Moore 82f4cc799b
Improve variable name 2024-01-17 11:54:37 -08:00
Marcus Moore 740d46a50e
Repopulate report after validation error 2024-01-02 17:59:30 -08:00
Marcus Moore 71761a48ad
A few more small clean ups 2023-12-20 17:50:55 -08:00
Marcus Moore 26cc4497eb
Use dedicated show route for report templates 2023-12-20 14:01:46 -08:00
akemidx ebf760a477 translations, UI fixes 2023-12-19 18:01:19 -05:00
Marcus Moore 9fcb1a2d0e
Rename SavedReport to ReportTemplate 2023-12-18 12:55:48 -08:00
snipe 421802893e Added new fields to action report 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-15 10:45:22 +00:00
Marcus Moore b9cda88363
Alphabetize saved reports list 2023-12-11 16:20:17 -08:00
Marcus Moore c9157dc55d
Update docblock 2023-12-11 14:20:33 -08:00
Marcus Moore c3b53b28e3
Allow saving custom reports 2023-12-11 14:19:03 -08:00
akemidx e636d7b9d5 multiple saved reports, beginning of dynamic dropdown listing/queried url 2023-12-11 15:28:34 -05:00
Marcus Moore b7011d853a WIP: add methods to restore settings from saved report 2023-11-02 17:10:50 -07:00
spencerrlongg 8f75bb8706 fix translation strings 2023-10-31 21:38:52 -05:00
snipe 96211cf73c Add additional fields to Download All in Activity Report 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-31 09:43:47 +00:00
Marcus Moore 06186c9b12 WIP: Simply post the form to a different controller 2023-10-30 16:30:53 -07:00
spencerrlongg 90eb3b86cf added user phone & address fields 2023-10-26 19:10:53 -05:00
spencerrlongg f12d44509e asset_eol_date should always be filled now 2023-10-26 14:39:02 -05:00
spencerrlongg 91b53bffa1 resolved 2023-10-26 14:23:31 -05:00
snipe 4d841dbc79 Use custom report validator 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-18 14:13:25 +01:00
snipe 866bbe5e11 Removed extra debugging 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-09 16:15:14 +01:00
snipe 6d55d78280 Set resend acceptance to POST 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-09 16:13:41 +01:00
Ivan Nieto Vivanco 9cbd2d032c Add a boolean variable and condition to handle the call to checkedOutToUser() method 2023-09-11 17:40:59 -06:00
Ivan Nieto Vivanco abd2ed3b81 Filter unaccepted assets that are not assigned to users 2023-09-07 13:39:16 -06:00
akemidx 734af87f2f template structuring 2023-08-28 19:26:31 -04:00
Marcus Moore 4e2ef4f056 Default to using the current date if last check in end date is not provided 2023-08-21 14:35:15 -07:00
Marcus Moore c332b98456 Add last checkin options to report front end 2023-08-21 13:44:49 -07:00
Marcus Moore c32f099053
Remove unneeded call to Company::scopeCompanyables 2023-08-08 17:22:15 -07:00
snipe ffb605a37c
Merge pull request #13309 from inietov/fixes/checkout_range_doesnt_include_today 
Fixed #13300 Custom Asset Report, Checkout date range never includes current day
 2023-07-31 15:04:22 +01:00
Ivan Nieto Vivanco cb4ed92639 Use Carbon date objects instead of casting using DB::raw() 2023-07-20 16:17:06 -06:00
snipe a19a508a80
Merge pull request #13197 from akemidx/current_value_for_assets 
Current value added to asset index page
 2023-07-19 19:06:15 +01:00
Ivan Nieto Vivanco ecac4718fe Add date casting to the SQL query, so the BETWEEN range doesn't care about time of day in custom report datetimes 2023-07-13 16:02:47 -06:00
akemidx 8df9db76bc column ordering fix 2023-06-22 17:12:40 -04:00
akemidx 8725d40f8d current value added to asset index page. translations for this in reports 2023-06-22 17:00:42 -04:00
snipe 02cacf76c6 Additional multi-select options for custom report 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-16 13:58:21 -07:00
snipe 0f3b77ee2d Added multi-select option to custom report 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-10 14:45:31 -07:00
snipe 9f39d71f16
Merge pull request #12831 from Godmartinz/adds_multi_select_to_custom_report 
Added Multiselect of companies for custom reports
 2023-05-10 11:36:21 -07:00
snipe fe710efb40
Merge pull request #12874 from Godmartinz/feature/sc-23130 
Adds a checkout range for custom asset reports
 2023-05-03 11:43:44 -07:00
Marcus Moore 429c4cb99f
Remove the loading of asset maintenances that are not used by view 2023-04-27 17:12:53 -07:00
Godfrey M bdd1045272 adds a checkout range for custom asset reports 2023-04-19 09:11:44 -07:00
Godfrey M ab67d903b5 adds multi select to custom report for companies 2023-04-13 12:02:11 -07:00
Ivan Nieto Vivanco 67471a3a77 Evaluate if the collection is empty before access the array index 2023-03-13 21:44:06 -06:00
Brady Wetherington ca849db316 The 'download activity report' displayed the wrong value for 'admin' 2023-03-01 12:23:13 -08:00
snipe 5e6ebb9a65
Merge pull request #12410 from uberbrady/paginate_accessories_report 
Paginate accessories report
 2023-02-23 12:26:17 -08:00
snipe c8c5dddcc1 Removed unused else condition 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-06 12:43:19 -08:00
Brady Wetherington c9f0f5fe8b Change Accessories report to use server-side pagination from URL 2023-01-24 17:35:44 -08:00
snipe 399c7590cd
Merge pull request #12209 from snipe/fixes/error_downloading_unaccepted_assets 
Fixed 500 when downloading the Unaccepted Assets report  [sc-19555]
 2022-12-15 14:19:41 -08:00
Ivan Nieto Vivanco eb67d1b064 Filter items from the report if null returned 2022-12-06 18:00:16 -06:00
Godfrey M a02a04d601 fixes a regression with the csv assigned to fields 2022-11-16 16:34:57 -08:00
snipe 7cb4740359
Merge pull request #11766 from snipe/fixes/wtf_method_names_derp 
Fixed (?) method name?
 2022-10-26 17:39:11 -07:00