Commit graph

2525 commits

Author SHA1 Message Date
snipe
44569558e9 Remove admin label 2017-07-08 01:41:07 -07:00
snipe
814bf18a4b Updated phpinfo title 2017-07-08 00:23:28 -07:00
snipe
33557f3792 Nicer formatting for phpinfo output 2017-07-08 00:22:30 -07:00
snipe
c2927c4a2e Added phpinfo page if debugging is enabled 2017-07-08 00:09:39 -07:00
snipe
ab2b2f3043 Updated UI for Admin Settings 2017-07-07 23:44:48 -07:00
snipe
0e598702f8 Fixed error field name in settings > login note 2017-07-07 19:56:14 -07:00
snipe
9894edb008 Added login note to settings 2017-07-07 19:54:10 -07:00
snipe
c2e8803d1e Addec clone button back to models, assets, licenses, etc 2017-07-07 18:45:49 -07:00
snipe
7e1f7297b3 Settings tweaks 2017-07-07 18:06:31 -07:00
snipe
31cabaa4db Fixes #3724 - adds edit/delete button back to companies listing 2017-07-07 17:10:06 -07:00
Daniel Meltzer
61c6160b98 Importer mapping - v1 (#3677)
* Move importer to an inline-template, allows for translations and easier passing of data from laravel to vue.

* Pull the modal out into a dedicated partial, move importer to views/importer.

* Add document of CSV->importer mappings.  Reorganize some code.

Progress.

* Add header_row and first_row to imports table, and process upon uploading a file

* Use an expandable table row instead of a modal for import processing.  This should allow for field mapping interaction easier.

* Fix import processing after moving method.

* Frontend importer mapping improvements.

Invert display so we show found columns and allow users to select an
importer field to map to.  Also implement sample data based on first row
of csv.

* Update select2.  Maintain selected items properly.

* Backend support for importing.  Only works on the web importer currently.  Definitely needs testing and polish.

* We no longer use vue-modal plugin.

* Add a column to track field mappings to the imports table.

* Cleanup/rename methods+refactor

* Save field mappings and import type when attempting an import, and repopulate these values when returning to the page.

* Update debugbar to fix a bug in the debugbar code.

* Fix asset tag detection.

Also rename findMatch to be a bit clearer as to what it does.
  Remove logging to file of imports for http imports because
it eats an incredible amouint of memory.

This commit also moves imports out of the hardware namespace and into
their own webcontroller and route prefix, remove dead code from
AssetController as a result.

* Dynamically limit options for select2 based on import type selected, and group them by item type.

* Add user importer.

Still need to implement emailing of passwords to new users, and probably
test a bit more.

This also bumps the memory limit for web imports up as well, I need to
profile memory usage here before too long.

* Query the db to find user matches rather than search the array.  Performance is much much better.

* Speed/memory improvements in importers.

Move to querying the db rather than maintaining an array for all
importers.  Also only store the id of items when we import, rather than
the full model.  It saves a decent amount of memory.

* Remove grouping of items in select2

With the values being set dynamically, the grouping is redundant.  It
also caused a regression with automatically guessing/matching field
names.  This is starting to get close.

* Remove debug line on every create.

* Switch migration to be text field instead of json field for compatibility with older mysql/mariadb

* Fix asset import regression matching email address.

* Rearrange travis order in attempt to fix null settings.

* Use auth::id instead of fetching it off the user.  Fixes a null object reference during seeding.
2017-06-21 16:37:37 -07:00
snipe
5b9bcd8fa2 Add next auto-increment to settings form 2017-06-20 12:23:16 -07:00
Daniel Meltzer
5d4920c741 [WIP] Improvements to unit tests. (#3574)
* Improvemenets to unit tests.

* Break up modelfactory into multiple files, populate many states.
* Begin testing validation at the unit test level, test relationships.
* Add tests for Asset::availableForCheckout.
* Model factories now generate all needed relationships on demand,
  which allows us to unit test with a empty database.
* To faciliate the empty database, we move to using sqlite in memory as
  the unit testing database.

* Fix bug with logs of checkouts to non users.

* Fix location finding for assets.  Also Fix location show page to show users associated with location.  Still need some work to show assets.

* More test and generator improvements

* More unit test fixes. PermissionsTest is borked still.

* More Updates

* Rewrite permissionstest.  Check that we have access on the model level rather than via web requests.  Also test delete permissions.

* Fix seeders.

* Make the default asset model factory generate assets that are rtd for testing.

* Save progress.

* Rebase tests, fix department unit test, update database for functional tests.

* Update functional and api tests to use new modelfactory signatures.
2017-06-12 17:39:03 -07:00
Daniel Meltzer
dfea47a272 Fix location view display. Migrate to api controller methods and fix missing bits to make this happen. Show manager on the location view page. 2017-06-12 18:24:20 -05:00
Daniel Meltzer
f0d78091d2 Add a manager field to locations.
This is round one of the rethink of checkout-to-everything.  A location
now has a manager field, and the manager (by default) be responsible for
assets checked out to the location.
2017-06-12 18:23:50 -05:00
snipe
3046d7d33c Fixes #3644 - broken datepicker 2017-06-09 18:53:19 -07:00
snipe
0aa76bd946 PHPStorm lag strikes again 2017-06-09 16:49:55 -07:00
snipe
ad816264e9 WIP import mapper #3639
@dmeltzer, I’m not sure how much extra work this will be to integrate.
2017-06-09 16:29:42 -07:00
snipe
408bb6476f Removed some unneeded styles 2017-06-09 14:57:57 -07:00
snipe
e387673e74 Fixes #3651 - backups not working 2017-06-09 12:44:11 -07:00
snipe
0bc709206f Fixes #3652 - missing groups UI element in user edit view 2017-06-09 12:19:12 -07:00
snipe
269997a1fb Push v3.6.5 changes into v4 2017-06-09 00:35:23 -07:00
snipe
041b794e1f Fixes #3634 - use new routes for groups 2017-06-08 20:24:26 -07:00
snipe
da2d9b2374 Fixes presenter issue on user history 2017-06-08 19:09:42 -07:00
snipe
a59db7062d Fix license datatable on license view 2017-06-08 18:59:53 -07:00
snipe
2aaa635345 Fixes crash on asset detail view 2017-06-08 18:26:55 -07:00
snipe
8269aec71a Removed erroneous file 2017-06-08 17:51:30 -07:00
snipe
d62896f945 Fixes #3414 - bulk update for asset models 2017-06-08 17:48:48 -07:00
snipe
a717ca683c Fixes #3648 - missing endif in blade 2017-06-08 16:16:49 -07:00
snipe
d7827fedd9 Fixed dashboard size element 2017-06-06 15:19:19 -07:00
snipe
fbcc40a145 Commented out dashboard chart until proper data provided 2017-06-06 02:51:29 -07:00
snipe
12a7309ecd Note that the chart doesn’t work, to clear things up 2017-06-06 02:40:50 -07:00
snipe
1c056d1a59 Updated asset urls 2017-06-06 02:35:26 -07:00
snipe
240a07b108 Formatting for error pages 2017-06-06 02:32:04 -07:00
snipe
01cc00c832 Fixing webpack. Again 2017-06-06 01:39:53 -07:00
snipe
9338b37b74 Try to fix the datepicker :(
Webpack has fucked everything. I hate everything.
2017-06-06 00:51:41 -07:00
snipe
9cd2881ad0 Initiate datepicker 2017-06-06 00:29:52 -07:00
snipe
0238dd59a3 Fixes #3600 - wrong route for hardware 2017-06-01 20:34:01 -07:00
snipe
461ca53289 Fixes #3603 - Depreciation report crashes 2017-06-01 20:31:44 -07:00
snipe
ccc0063556 Fixes #3604 - company view not displaying assets on page load 2017-06-01 20:28:09 -07:00
snipe
cc5192c91e Updated asset url 2017-05-31 13:57:23 -07:00
snipe
66eaff739a More npm/css/js updates 2017-05-31 12:34:05 -07:00
snipe
1992906790 Use laravel mix asset call 2017-05-31 09:41:52 -07:00
snipe
b0fc2489f6 Almost fixes user history table
Something is still fucky here
2017-05-31 09:39:52 -07:00
snipe
b13726880e Fixes #3601 - HTML instead of username for manager in user view 2017-05-31 09:39:30 -07:00
snipe
748aba3c48 Add assets dashboard feature
- also a really broken sample graph
2017-05-31 05:23:54 -07:00
snipe
d950ddbda7 Changed go button to primary class 2017-05-31 05:23:09 -07:00
snipe
fd0da6ecf0 Ignore the icon column in exports 2017-05-31 02:03:09 -07:00
snipe
92052442e3 Include department in user info 2017-05-31 01:17:30 -07:00
snipe
3c167c9d33 Remove debugging frowny-face 2017-05-23 15:06:43 -07:00