2016-03-25 15:50:08 -07:00
|
|
|
<?php
|
2016-04-07 13:21:09 -07:00
|
|
|
namespace App\Http\Controllers;
|
2016-03-25 01:18:05 -07:00
|
|
|
|
|
|
|
use App\Helpers\Helper;
|
|
|
|
use App\Models\Actionlog;
|
|
|
|
use App\Models\Company;
|
|
|
|
use App\Models\Component;
|
|
|
|
use App\Models\Setting;
|
|
|
|
use App\Models\User;
|
|
|
|
use App\Models\Asset;
|
|
|
|
use Auth;
|
|
|
|
use Config;
|
|
|
|
use DB;
|
|
|
|
use Input;
|
|
|
|
use Lang;
|
|
|
|
use Mail;
|
|
|
|
use Redirect;
|
|
|
|
use Slack;
|
|
|
|
use Str;
|
|
|
|
use View;
|
2016-06-22 15:59:00 -07:00
|
|
|
use Validator;
|
|
|
|
use Illuminate\Http\Request;
|
2016-08-02 00:54:38 -07:00
|
|
|
use Gate;
|
2016-03-25 01:18:05 -07:00
|
|
|
|
2016-04-07 13:21:09 -07:00
|
|
|
/**
|
|
|
|
* This class controls all actions related to Components for
|
|
|
|
* the Snipe-IT Asset Management application.
|
|
|
|
*
|
|
|
|
* @version v1.0
|
|
|
|
*/
|
2016-03-25 01:18:05 -07:00
|
|
|
class ComponentsController extends Controller
|
|
|
|
{
|
|
|
|
/**
|
2016-03-28 22:51:49 -07:00
|
|
|
* Returns a view that invokes the ajax tables which actually contains
|
|
|
|
* the content for the components listing, which is generated in getDatatable.
|
|
|
|
*
|
|
|
|
* @author [A. Gianotto] [<snipe@snipe.net>]
|
|
|
|
* @see ComponentsController::getDatatable() method that generates the JSON response
|
|
|
|
* @since [v3.0]
|
|
|
|
* @return View
|
|
|
|
*/
|
2016-12-15 19:59:42 -08:00
|
|
|
public function index()
|
2016-03-25 01:18:05 -07:00
|
|
|
{
|
2016-12-19 11:04:28 -08:00
|
|
|
$this->authorize('view', Component::class);
|
2016-03-25 01:18:05 -07:00
|
|
|
return View::make('components/index');
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
2016-03-28 22:51:49 -07:00
|
|
|
* Returns a form to create a new component.
|
|
|
|
*
|
|
|
|
* @author [A. Gianotto] [<snipe@snipe.net>]
|
|
|
|
* @see ComponentsController::postCreate() method that stores the data
|
|
|
|
* @since [v3.0]
|
|
|
|
* @return View
|
|
|
|
*/
|
2016-12-15 19:59:42 -08:00
|
|
|
public function create()
|
2016-03-25 01:18:05 -07:00
|
|
|
{
|
2016-12-19 11:04:28 -08:00
|
|
|
$this->authorize('create', Component::class);
|
2016-03-25 01:18:05 -07:00
|
|
|
// Show the page
|
2016-06-05 07:47:44 -07:00
|
|
|
$category_list = Helper::categoryList('component');
|
2016-03-25 01:18:05 -07:00
|
|
|
$company_list = Helper::companyList();
|
|
|
|
$location_list = Helper::locationsList();
|
|
|
|
|
|
|
|
return View::make('components/edit')
|
Partialize forms (#2884)
* Consolidate edit form elements into reusable partials.
This is a large code change that doesn't do much immediately. It
refactors all of the various edit.blade.php files to reference
standardized partials, so that they all reference the same base html
layout. This has the side effect of moving everything to the new fancy
"required" indicators, and making things look consistent.
In addition, I've gone ahead and renamed a few database fields. We had
Assetmodel::modelno and Consumable::model_no, I've renamed both to
model_number. We had items using ::note and ::notes, I've standardized
on ::notes. Component used total_qty where consumables and accessories
used qty, so I've moved everything to qty (And fixed a few bugs in the
helper file in the process.
TODO includes looking at how/where to place the modal javascripts to
allow for on the fly creation from all places, rather than just the
asset page.
Rename assetmodel::modelno to model_number for clarity and consistency
Rename consumable::model_no to model_number for clarity and consistency
Rename assetmodel::note to notes for clarity and consistency
Port asset and assetmodel to new partials layout. Adapt all code to the renamed model_number and notes database changes. Fix some stying.
* Share a settings variable with all views.
* Allow editing the per_page setting. We showed the value, but we never showed it on the edit page..
* use snipeSettings in all views instead of the long ugly path.
* War on partials. Centralize all bootstrap table javascript
* Use model_number instead of modelno in importer
* Codacy fix.
* More unification/deduplication. Create an edit form template layout that we use as the base for all edit forms. This gives the same interface for editing everything and makes the edit.blade.* files much easier to read.
* Use a ViewComposer instead of sharing the variable directly. Fixes artisan optimize trying to hit the db--which ruins new installs
* Fix DB seeder.
* Base sql dump and csv's to import data from for tests.
* Start some functional tests for creating items.
* Add functional tests for all create methods. Still need to do tests for edits, deletes, and lots of other things
* Improvements to functional tests.
Use the built in DB seeding mechanism instead of doing it ourselves.
Break the tests into multiple units, rather than testing everything in
each function.
* Some improvements to acceptance tests.
Make sure we're only looking at the "trs" within the bootstrap table.
Creation of assets is now tested at the functional level (and is faster)
so ignore it here.
I'm testing acceptance tests with the
IMPORT_{ASSETS,ACCESSORIES,CONSUMABLES}.csv in the tests/_data folder
imported.
* A few things to make acceptance tests work. Add a name to the companies table, and make the locations table have the correct name
* Use a .env.tests file for testing functional and unit to allow a separate database.
* Add functional tests for compoents, groups, and licenses.
* Now that the config is in the functional.yml, this just confuses things.
* Start some functional tests for creating items.
* Add functional tests for all create methods. Still need to do tests for edits, deletes, and lots of other things
* Improvements to functional tests.
Use the built in DB seeding mechanism instead of doing it ourselves.
Break the tests into multiple units, rather than testing everything in
each function.
* Some improvements to acceptance tests.
Make sure we're only looking at the "trs" within the bootstrap table.
Creation of assets is now tested at the functional level (and is faster)
so ignore it here.
I'm testing acceptance tests with the
IMPORT_{ASSETS,ACCESSORIES,CONSUMABLES}.csv in the tests/_data folder
imported.
* update db dump
* Update tests to new reality
* env for the test setup
* only load the database at beginning of tests, not between each Functional test.
* Fix a miss from renaming note to notes.
* Set Termination date when creating an asset. It was only set on edit.
* Rename serial_number to serial in components for consistency.
* Update validation rules to match limits in database. Currently we just accepted the values and they were truncated when adding to DB.
* Much more detailed functional testing of creating items. This checks to make sure all values on form have been successfully persisted to database.
2016-11-16 16:56:57 -08:00
|
|
|
->with('item', new Component)
|
2016-03-25 01:18:05 -07:00
|
|
|
->with('category_list', $category_list)
|
|
|
|
->with('company_list', $company_list)
|
|
|
|
->with('location_list', $location_list);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
2016-03-28 22:51:49 -07:00
|
|
|
* Validate and store data for new component.
|
|
|
|
*
|
|
|
|
* @author [A. Gianotto] [<snipe@snipe.net>]
|
|
|
|
* @see ComponentsController::getCreate() method that generates the view
|
|
|
|
* @since [v3.0]
|
|
|
|
* @return Redirect
|
|
|
|
*/
|
2016-12-15 19:59:42 -08:00
|
|
|
public function store()
|
2016-03-25 01:18:05 -07:00
|
|
|
{
|
2016-12-19 11:04:28 -08:00
|
|
|
$this->authorize('create', Component::class);
|
2016-03-25 01:18:05 -07:00
|
|
|
// create a new model instance
|
|
|
|
$component = new Component();
|
|
|
|
|
|
|
|
// Update the component data
|
|
|
|
$component->name = e(Input::get('name'));
|
|
|
|
$component->category_id = e(Input::get('category_id'));
|
|
|
|
$component->location_id = e(Input::get('location_id'));
|
|
|
|
$component->company_id = Company::getIdForCurrentUser(Input::get('company_id'));
|
|
|
|
$component->order_number = e(Input::get('order_number'));
|
2016-03-25 15:24:12 -07:00
|
|
|
$component->min_amt = e(Input::get('min_amt'));
|
Partialize forms (#2884)
* Consolidate edit form elements into reusable partials.
This is a large code change that doesn't do much immediately. It
refactors all of the various edit.blade.php files to reference
standardized partials, so that they all reference the same base html
layout. This has the side effect of moving everything to the new fancy
"required" indicators, and making things look consistent.
In addition, I've gone ahead and renamed a few database fields. We had
Assetmodel::modelno and Consumable::model_no, I've renamed both to
model_number. We had items using ::note and ::notes, I've standardized
on ::notes. Component used total_qty where consumables and accessories
used qty, so I've moved everything to qty (And fixed a few bugs in the
helper file in the process.
TODO includes looking at how/where to place the modal javascripts to
allow for on the fly creation from all places, rather than just the
asset page.
Rename assetmodel::modelno to model_number for clarity and consistency
Rename consumable::model_no to model_number for clarity and consistency
Rename assetmodel::note to notes for clarity and consistency
Port asset and assetmodel to new partials layout. Adapt all code to the renamed model_number and notes database changes. Fix some stying.
* Share a settings variable with all views.
* Allow editing the per_page setting. We showed the value, but we never showed it on the edit page..
* use snipeSettings in all views instead of the long ugly path.
* War on partials. Centralize all bootstrap table javascript
* Use model_number instead of modelno in importer
* Codacy fix.
* More unification/deduplication. Create an edit form template layout that we use as the base for all edit forms. This gives the same interface for editing everything and makes the edit.blade.* files much easier to read.
* Use a ViewComposer instead of sharing the variable directly. Fixes artisan optimize trying to hit the db--which ruins new installs
* Fix DB seeder.
* Base sql dump and csv's to import data from for tests.
* Start some functional tests for creating items.
* Add functional tests for all create methods. Still need to do tests for edits, deletes, and lots of other things
* Improvements to functional tests.
Use the built in DB seeding mechanism instead of doing it ourselves.
Break the tests into multiple units, rather than testing everything in
each function.
* Some improvements to acceptance tests.
Make sure we're only looking at the "trs" within the bootstrap table.
Creation of assets is now tested at the functional level (and is faster)
so ignore it here.
I'm testing acceptance tests with the
IMPORT_{ASSETS,ACCESSORIES,CONSUMABLES}.csv in the tests/_data folder
imported.
* A few things to make acceptance tests work. Add a name to the companies table, and make the locations table have the correct name
* Use a .env.tests file for testing functional and unit to allow a separate database.
* Add functional tests for compoents, groups, and licenses.
* Now that the config is in the functional.yml, this just confuses things.
* Start some functional tests for creating items.
* Add functional tests for all create methods. Still need to do tests for edits, deletes, and lots of other things
* Improvements to functional tests.
Use the built in DB seeding mechanism instead of doing it ourselves.
Break the tests into multiple units, rather than testing everything in
each function.
* Some improvements to acceptance tests.
Make sure we're only looking at the "trs" within the bootstrap table.
Creation of assets is now tested at the functional level (and is faster)
so ignore it here.
I'm testing acceptance tests with the
IMPORT_{ASSETS,ACCESSORIES,CONSUMABLES}.csv in the tests/_data folder
imported.
* update db dump
* Update tests to new reality
* env for the test setup
* only load the database at beginning of tests, not between each Functional test.
* Fix a miss from renaming note to notes.
* Set Termination date when creating an asset. It was only set on edit.
* Rename serial_number to serial in components for consistency.
* Update validation rules to match limits in database. Currently we just accepted the values and they were truncated when adding to DB.
* Much more detailed functional testing of creating items. This checks to make sure all values on form have been successfully persisted to database.
2016-11-16 16:56:57 -08:00
|
|
|
$component->serial = e(Input::get('serial'));
|
2016-03-25 01:18:05 -07:00
|
|
|
|
|
|
|
if (e(Input::get('purchase_date')) == '') {
|
|
|
|
$component->purchase_date = null;
|
|
|
|
} else {
|
|
|
|
$component->purchase_date = e(Input::get('purchase_date'));
|
|
|
|
}
|
|
|
|
|
|
|
|
if (e(Input::get('purchase_cost')) == '0.00') {
|
|
|
|
$component->purchase_cost = null;
|
|
|
|
} else {
|
2016-09-27 19:07:30 -07:00
|
|
|
$component->purchase_cost = Helper::ParseFloat(e(Input::get('purchase_cost')));
|
2016-03-25 01:18:05 -07:00
|
|
|
}
|
|
|
|
|
Partialize forms (#2884)
* Consolidate edit form elements into reusable partials.
This is a large code change that doesn't do much immediately. It
refactors all of the various edit.blade.php files to reference
standardized partials, so that they all reference the same base html
layout. This has the side effect of moving everything to the new fancy
"required" indicators, and making things look consistent.
In addition, I've gone ahead and renamed a few database fields. We had
Assetmodel::modelno and Consumable::model_no, I've renamed both to
model_number. We had items using ::note and ::notes, I've standardized
on ::notes. Component used total_qty where consumables and accessories
used qty, so I've moved everything to qty (And fixed a few bugs in the
helper file in the process.
TODO includes looking at how/where to place the modal javascripts to
allow for on the fly creation from all places, rather than just the
asset page.
Rename assetmodel::modelno to model_number for clarity and consistency
Rename consumable::model_no to model_number for clarity and consistency
Rename assetmodel::note to notes for clarity and consistency
Port asset and assetmodel to new partials layout. Adapt all code to the renamed model_number and notes database changes. Fix some stying.
* Share a settings variable with all views.
* Allow editing the per_page setting. We showed the value, but we never showed it on the edit page..
* use snipeSettings in all views instead of the long ugly path.
* War on partials. Centralize all bootstrap table javascript
* Use model_number instead of modelno in importer
* Codacy fix.
* More unification/deduplication. Create an edit form template layout that we use as the base for all edit forms. This gives the same interface for editing everything and makes the edit.blade.* files much easier to read.
* Use a ViewComposer instead of sharing the variable directly. Fixes artisan optimize trying to hit the db--which ruins new installs
* Fix DB seeder.
* Base sql dump and csv's to import data from for tests.
* Start some functional tests for creating items.
* Add functional tests for all create methods. Still need to do tests for edits, deletes, and lots of other things
* Improvements to functional tests.
Use the built in DB seeding mechanism instead of doing it ourselves.
Break the tests into multiple units, rather than testing everything in
each function.
* Some improvements to acceptance tests.
Make sure we're only looking at the "trs" within the bootstrap table.
Creation of assets is now tested at the functional level (and is faster)
so ignore it here.
I'm testing acceptance tests with the
IMPORT_{ASSETS,ACCESSORIES,CONSUMABLES}.csv in the tests/_data folder
imported.
* A few things to make acceptance tests work. Add a name to the companies table, and make the locations table have the correct name
* Use a .env.tests file for testing functional and unit to allow a separate database.
* Add functional tests for compoents, groups, and licenses.
* Now that the config is in the functional.yml, this just confuses things.
* Start some functional tests for creating items.
* Add functional tests for all create methods. Still need to do tests for edits, deletes, and lots of other things
* Improvements to functional tests.
Use the built in DB seeding mechanism instead of doing it ourselves.
Break the tests into multiple units, rather than testing everything in
each function.
* Some improvements to acceptance tests.
Make sure we're only looking at the "trs" within the bootstrap table.
Creation of assets is now tested at the functional level (and is faster)
so ignore it here.
I'm testing acceptance tests with the
IMPORT_{ASSETS,ACCESSORIES,CONSUMABLES}.csv in the tests/_data folder
imported.
* update db dump
* Update tests to new reality
* env for the test setup
* only load the database at beginning of tests, not between each Functional test.
* Fix a miss from renaming note to notes.
* Set Termination date when creating an asset. It was only set on edit.
* Rename serial_number to serial in components for consistency.
* Update validation rules to match limits in database. Currently we just accepted the values and they were truncated when adding to DB.
* Much more detailed functional testing of creating items. This checks to make sure all values on form have been successfully persisted to database.
2016-11-16 16:56:57 -08:00
|
|
|
$component->qty = e(Input::get('qty'));
|
2016-03-25 01:18:05 -07:00
|
|
|
$component->user_id = Auth::user()->id;
|
|
|
|
|
|
|
|
// Was the component created?
|
|
|
|
if ($component->save()) {
|
2016-10-12 18:45:32 -07:00
|
|
|
$component->logCreate();
|
2016-03-25 01:18:05 -07:00
|
|
|
// Redirect to the new component page
|
2016-12-15 19:59:42 -08:00
|
|
|
return redirect()->route('components.index')->with('success', trans('admin/components/message.create.success'));
|
2016-03-25 01:18:05 -07:00
|
|
|
}
|
|
|
|
|
2016-04-28 21:06:41 -07:00
|
|
|
return redirect()->back()->withInput()->withErrors($component->getErrors());
|
2016-03-25 01:18:05 -07:00
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
2016-03-28 22:51:49 -07:00
|
|
|
* Return a view to edit a component.
|
|
|
|
*
|
|
|
|
* @author [A. Gianotto] [<snipe@snipe.net>]
|
|
|
|
* @see ComponentsController::postEdit() method that stores the data.
|
|
|
|
* @since [v3.0]
|
|
|
|
* @param int $componentId
|
|
|
|
* @return View
|
|
|
|
*/
|
2016-12-15 19:59:42 -08:00
|
|
|
public function edit($componentId = null)
|
2016-03-25 01:18:05 -07:00
|
|
|
{
|
|
|
|
// Check if the component exists
|
Partialize forms (#2884)
* Consolidate edit form elements into reusable partials.
This is a large code change that doesn't do much immediately. It
refactors all of the various edit.blade.php files to reference
standardized partials, so that they all reference the same base html
layout. This has the side effect of moving everything to the new fancy
"required" indicators, and making things look consistent.
In addition, I've gone ahead and renamed a few database fields. We had
Assetmodel::modelno and Consumable::model_no, I've renamed both to
model_number. We had items using ::note and ::notes, I've standardized
on ::notes. Component used total_qty where consumables and accessories
used qty, so I've moved everything to qty (And fixed a few bugs in the
helper file in the process.
TODO includes looking at how/where to place the modal javascripts to
allow for on the fly creation from all places, rather than just the
asset page.
Rename assetmodel::modelno to model_number for clarity and consistency
Rename consumable::model_no to model_number for clarity and consistency
Rename assetmodel::note to notes for clarity and consistency
Port asset and assetmodel to new partials layout. Adapt all code to the renamed model_number and notes database changes. Fix some stying.
* Share a settings variable with all views.
* Allow editing the per_page setting. We showed the value, but we never showed it on the edit page..
* use snipeSettings in all views instead of the long ugly path.
* War on partials. Centralize all bootstrap table javascript
* Use model_number instead of modelno in importer
* Codacy fix.
* More unification/deduplication. Create an edit form template layout that we use as the base for all edit forms. This gives the same interface for editing everything and makes the edit.blade.* files much easier to read.
* Use a ViewComposer instead of sharing the variable directly. Fixes artisan optimize trying to hit the db--which ruins new installs
* Fix DB seeder.
* Base sql dump and csv's to import data from for tests.
* Start some functional tests for creating items.
* Add functional tests for all create methods. Still need to do tests for edits, deletes, and lots of other things
* Improvements to functional tests.
Use the built in DB seeding mechanism instead of doing it ourselves.
Break the tests into multiple units, rather than testing everything in
each function.
* Some improvements to acceptance tests.
Make sure we're only looking at the "trs" within the bootstrap table.
Creation of assets is now tested at the functional level (and is faster)
so ignore it here.
I'm testing acceptance tests with the
IMPORT_{ASSETS,ACCESSORIES,CONSUMABLES}.csv in the tests/_data folder
imported.
* A few things to make acceptance tests work. Add a name to the companies table, and make the locations table have the correct name
* Use a .env.tests file for testing functional and unit to allow a separate database.
* Add functional tests for compoents, groups, and licenses.
* Now that the config is in the functional.yml, this just confuses things.
* Start some functional tests for creating items.
* Add functional tests for all create methods. Still need to do tests for edits, deletes, and lots of other things
* Improvements to functional tests.
Use the built in DB seeding mechanism instead of doing it ourselves.
Break the tests into multiple units, rather than testing everything in
each function.
* Some improvements to acceptance tests.
Make sure we're only looking at the "trs" within the bootstrap table.
Creation of assets is now tested at the functional level (and is faster)
so ignore it here.
I'm testing acceptance tests with the
IMPORT_{ASSETS,ACCESSORIES,CONSUMABLES}.csv in the tests/_data folder
imported.
* update db dump
* Update tests to new reality
* env for the test setup
* only load the database at beginning of tests, not between each Functional test.
* Fix a miss from renaming note to notes.
* Set Termination date when creating an asset. It was only set on edit.
* Rename serial_number to serial in components for consistency.
* Update validation rules to match limits in database. Currently we just accepted the values and they were truncated when adding to DB.
* Much more detailed functional testing of creating items. This checks to make sure all values on form have been successfully persisted to database.
2016-11-16 16:56:57 -08:00
|
|
|
if (is_null($item = Component::find($componentId))) {
|
2016-03-25 01:18:05 -07:00
|
|
|
// Redirect to the blogs management page
|
2016-12-15 19:59:42 -08:00
|
|
|
return redirect()->route('components.index')->with('error', trans('admin/components/message.does_not_exist'));
|
2016-03-25 01:18:05 -07:00
|
|
|
}
|
|
|
|
|
2016-12-19 11:04:28 -08:00
|
|
|
$this->authorize('update', $item);
|
|
|
|
|
2016-06-05 07:47:44 -07:00
|
|
|
$category_list = Helper::categoryList('component');
|
2016-03-25 01:18:05 -07:00
|
|
|
$company_list = Helper::companyList();
|
|
|
|
$location_list = Helper::locationsList();
|
|
|
|
|
Partialize forms (#2884)
* Consolidate edit form elements into reusable partials.
This is a large code change that doesn't do much immediately. It
refactors all of the various edit.blade.php files to reference
standardized partials, so that they all reference the same base html
layout. This has the side effect of moving everything to the new fancy
"required" indicators, and making things look consistent.
In addition, I've gone ahead and renamed a few database fields. We had
Assetmodel::modelno and Consumable::model_no, I've renamed both to
model_number. We had items using ::note and ::notes, I've standardized
on ::notes. Component used total_qty where consumables and accessories
used qty, so I've moved everything to qty (And fixed a few bugs in the
helper file in the process.
TODO includes looking at how/where to place the modal javascripts to
allow for on the fly creation from all places, rather than just the
asset page.
Rename assetmodel::modelno to model_number for clarity and consistency
Rename consumable::model_no to model_number for clarity and consistency
Rename assetmodel::note to notes for clarity and consistency
Port asset and assetmodel to new partials layout. Adapt all code to the renamed model_number and notes database changes. Fix some stying.
* Share a settings variable with all views.
* Allow editing the per_page setting. We showed the value, but we never showed it on the edit page..
* use snipeSettings in all views instead of the long ugly path.
* War on partials. Centralize all bootstrap table javascript
* Use model_number instead of modelno in importer
* Codacy fix.
* More unification/deduplication. Create an edit form template layout that we use as the base for all edit forms. This gives the same interface for editing everything and makes the edit.blade.* files much easier to read.
* Use a ViewComposer instead of sharing the variable directly. Fixes artisan optimize trying to hit the db--which ruins new installs
* Fix DB seeder.
* Base sql dump and csv's to import data from for tests.
* Start some functional tests for creating items.
* Add functional tests for all create methods. Still need to do tests for edits, deletes, and lots of other things
* Improvements to functional tests.
Use the built in DB seeding mechanism instead of doing it ourselves.
Break the tests into multiple units, rather than testing everything in
each function.
* Some improvements to acceptance tests.
Make sure we're only looking at the "trs" within the bootstrap table.
Creation of assets is now tested at the functional level (and is faster)
so ignore it here.
I'm testing acceptance tests with the
IMPORT_{ASSETS,ACCESSORIES,CONSUMABLES}.csv in the tests/_data folder
imported.
* A few things to make acceptance tests work. Add a name to the companies table, and make the locations table have the correct name
* Use a .env.tests file for testing functional and unit to allow a separate database.
* Add functional tests for compoents, groups, and licenses.
* Now that the config is in the functional.yml, this just confuses things.
* Start some functional tests for creating items.
* Add functional tests for all create methods. Still need to do tests for edits, deletes, and lots of other things
* Improvements to functional tests.
Use the built in DB seeding mechanism instead of doing it ourselves.
Break the tests into multiple units, rather than testing everything in
each function.
* Some improvements to acceptance tests.
Make sure we're only looking at the "trs" within the bootstrap table.
Creation of assets is now tested at the functional level (and is faster)
so ignore it here.
I'm testing acceptance tests with the
IMPORT_{ASSETS,ACCESSORIES,CONSUMABLES}.csv in the tests/_data folder
imported.
* update db dump
* Update tests to new reality
* env for the test setup
* only load the database at beginning of tests, not between each Functional test.
* Fix a miss from renaming note to notes.
* Set Termination date when creating an asset. It was only set on edit.
* Rename serial_number to serial in components for consistency.
* Update validation rules to match limits in database. Currently we just accepted the values and they were truncated when adding to DB.
* Much more detailed functional testing of creating items. This checks to make sure all values on form have been successfully persisted to database.
2016-11-16 16:56:57 -08:00
|
|
|
return View::make('components/edit', compact('item'))
|
2016-03-25 01:18:05 -07:00
|
|
|
->with('category_list', $category_list)
|
|
|
|
->with('company_list', $company_list)
|
|
|
|
->with('location_list', $location_list);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
2016-03-28 22:51:49 -07:00
|
|
|
* Return a view to edit a component.
|
|
|
|
*
|
|
|
|
* @author [A. Gianotto] [<snipe@snipe.net>]
|
|
|
|
* @see ComponentsController::getEdit() method presents the form.
|
|
|
|
* @param int $componentId
|
|
|
|
* @since [v3.0]
|
|
|
|
* @return Redirect
|
|
|
|
*/
|
2016-12-15 19:59:42 -08:00
|
|
|
public function update($componentId = null)
|
2016-03-25 01:18:05 -07:00
|
|
|
{
|
|
|
|
// Check if the blog post exists
|
|
|
|
if (is_null($component = Component::find($componentId))) {
|
|
|
|
// Redirect to the blogs management page
|
2016-12-15 19:59:42 -08:00
|
|
|
return redirect()->route('components.index')->with('error', trans('admin/components/message.does_not_exist'));
|
2016-03-25 01:18:05 -07:00
|
|
|
}
|
|
|
|
|
2016-12-19 11:04:28 -08:00
|
|
|
$this->authorize('update', $component);
|
|
|
|
|
2016-03-25 01:18:05 -07:00
|
|
|
|
|
|
|
// Update the component data
|
|
|
|
$component->name = e(Input::get('name'));
|
|
|
|
$component->category_id = e(Input::get('category_id'));
|
|
|
|
$component->location_id = e(Input::get('location_id'));
|
|
|
|
$component->company_id = Company::getIdForCurrentUser(Input::get('company_id'));
|
|
|
|
$component->order_number = e(Input::get('order_number'));
|
Partialize forms (#2884)
* Consolidate edit form elements into reusable partials.
This is a large code change that doesn't do much immediately. It
refactors all of the various edit.blade.php files to reference
standardized partials, so that they all reference the same base html
layout. This has the side effect of moving everything to the new fancy
"required" indicators, and making things look consistent.
In addition, I've gone ahead and renamed a few database fields. We had
Assetmodel::modelno and Consumable::model_no, I've renamed both to
model_number. We had items using ::note and ::notes, I've standardized
on ::notes. Component used total_qty where consumables and accessories
used qty, so I've moved everything to qty (And fixed a few bugs in the
helper file in the process.
TODO includes looking at how/where to place the modal javascripts to
allow for on the fly creation from all places, rather than just the
asset page.
Rename assetmodel::modelno to model_number for clarity and consistency
Rename consumable::model_no to model_number for clarity and consistency
Rename assetmodel::note to notes for clarity and consistency
Port asset and assetmodel to new partials layout. Adapt all code to the renamed model_number and notes database changes. Fix some stying.
* Share a settings variable with all views.
* Allow editing the per_page setting. We showed the value, but we never showed it on the edit page..
* use snipeSettings in all views instead of the long ugly path.
* War on partials. Centralize all bootstrap table javascript
* Use model_number instead of modelno in importer
* Codacy fix.
* More unification/deduplication. Create an edit form template layout that we use as the base for all edit forms. This gives the same interface for editing everything and makes the edit.blade.* files much easier to read.
* Use a ViewComposer instead of sharing the variable directly. Fixes artisan optimize trying to hit the db--which ruins new installs
* Fix DB seeder.
* Base sql dump and csv's to import data from for tests.
* Start some functional tests for creating items.
* Add functional tests for all create methods. Still need to do tests for edits, deletes, and lots of other things
* Improvements to functional tests.
Use the built in DB seeding mechanism instead of doing it ourselves.
Break the tests into multiple units, rather than testing everything in
each function.
* Some improvements to acceptance tests.
Make sure we're only looking at the "trs" within the bootstrap table.
Creation of assets is now tested at the functional level (and is faster)
so ignore it here.
I'm testing acceptance tests with the
IMPORT_{ASSETS,ACCESSORIES,CONSUMABLES}.csv in the tests/_data folder
imported.
* A few things to make acceptance tests work. Add a name to the companies table, and make the locations table have the correct name
* Use a .env.tests file for testing functional and unit to allow a separate database.
* Add functional tests for compoents, groups, and licenses.
* Now that the config is in the functional.yml, this just confuses things.
* Start some functional tests for creating items.
* Add functional tests for all create methods. Still need to do tests for edits, deletes, and lots of other things
* Improvements to functional tests.
Use the built in DB seeding mechanism instead of doing it ourselves.
Break the tests into multiple units, rather than testing everything in
each function.
* Some improvements to acceptance tests.
Make sure we're only looking at the "trs" within the bootstrap table.
Creation of assets is now tested at the functional level (and is faster)
so ignore it here.
I'm testing acceptance tests with the
IMPORT_{ASSETS,ACCESSORIES,CONSUMABLES}.csv in the tests/_data folder
imported.
* update db dump
* Update tests to new reality
* env for the test setup
* only load the database at beginning of tests, not between each Functional test.
* Fix a miss from renaming note to notes.
* Set Termination date when creating an asset. It was only set on edit.
* Rename serial_number to serial in components for consistency.
* Update validation rules to match limits in database. Currently we just accepted the values and they were truncated when adding to DB.
* Much more detailed functional testing of creating items. This checks to make sure all values on form have been successfully persisted to database.
2016-11-16 16:56:57 -08:00
|
|
|
$component->min_amt = e(Input::get('min_amt'));
|
|
|
|
$component->serial = e(Input::get('serial'));
|
2016-03-25 01:18:05 -07:00
|
|
|
|
|
|
|
if (e(Input::get('purchase_date')) == '') {
|
|
|
|
$component->purchase_date = null;
|
|
|
|
} else {
|
|
|
|
$component->purchase_date = e(Input::get('purchase_date'));
|
|
|
|
}
|
|
|
|
|
|
|
|
if (e(Input::get('purchase_cost')) == '0.00') {
|
|
|
|
$component->purchase_cost = null;
|
|
|
|
} else {
|
2016-09-27 19:07:30 -07:00
|
|
|
$component->purchase_cost = Helper::ParseFloat(e(Input::get('purchase_cost')));
|
2016-03-25 01:18:05 -07:00
|
|
|
}
|
|
|
|
|
Partialize forms (#2884)
* Consolidate edit form elements into reusable partials.
This is a large code change that doesn't do much immediately. It
refactors all of the various edit.blade.php files to reference
standardized partials, so that they all reference the same base html
layout. This has the side effect of moving everything to the new fancy
"required" indicators, and making things look consistent.
In addition, I've gone ahead and renamed a few database fields. We had
Assetmodel::modelno and Consumable::model_no, I've renamed both to
model_number. We had items using ::note and ::notes, I've standardized
on ::notes. Component used total_qty where consumables and accessories
used qty, so I've moved everything to qty (And fixed a few bugs in the
helper file in the process.
TODO includes looking at how/where to place the modal javascripts to
allow for on the fly creation from all places, rather than just the
asset page.
Rename assetmodel::modelno to model_number for clarity and consistency
Rename consumable::model_no to model_number for clarity and consistency
Rename assetmodel::note to notes for clarity and consistency
Port asset and assetmodel to new partials layout. Adapt all code to the renamed model_number and notes database changes. Fix some stying.
* Share a settings variable with all views.
* Allow editing the per_page setting. We showed the value, but we never showed it on the edit page..
* use snipeSettings in all views instead of the long ugly path.
* War on partials. Centralize all bootstrap table javascript
* Use model_number instead of modelno in importer
* Codacy fix.
* More unification/deduplication. Create an edit form template layout that we use as the base for all edit forms. This gives the same interface for editing everything and makes the edit.blade.* files much easier to read.
* Use a ViewComposer instead of sharing the variable directly. Fixes artisan optimize trying to hit the db--which ruins new installs
* Fix DB seeder.
* Base sql dump and csv's to import data from for tests.
* Start some functional tests for creating items.
* Add functional tests for all create methods. Still need to do tests for edits, deletes, and lots of other things
* Improvements to functional tests.
Use the built in DB seeding mechanism instead of doing it ourselves.
Break the tests into multiple units, rather than testing everything in
each function.
* Some improvements to acceptance tests.
Make sure we're only looking at the "trs" within the bootstrap table.
Creation of assets is now tested at the functional level (and is faster)
so ignore it here.
I'm testing acceptance tests with the
IMPORT_{ASSETS,ACCESSORIES,CONSUMABLES}.csv in the tests/_data folder
imported.
* A few things to make acceptance tests work. Add a name to the companies table, and make the locations table have the correct name
* Use a .env.tests file for testing functional and unit to allow a separate database.
* Add functional tests for compoents, groups, and licenses.
* Now that the config is in the functional.yml, this just confuses things.
* Start some functional tests for creating items.
* Add functional tests for all create methods. Still need to do tests for edits, deletes, and lots of other things
* Improvements to functional tests.
Use the built in DB seeding mechanism instead of doing it ourselves.
Break the tests into multiple units, rather than testing everything in
each function.
* Some improvements to acceptance tests.
Make sure we're only looking at the "trs" within the bootstrap table.
Creation of assets is now tested at the functional level (and is faster)
so ignore it here.
I'm testing acceptance tests with the
IMPORT_{ASSETS,ACCESSORIES,CONSUMABLES}.csv in the tests/_data folder
imported.
* update db dump
* Update tests to new reality
* env for the test setup
* only load the database at beginning of tests, not between each Functional test.
* Fix a miss from renaming note to notes.
* Set Termination date when creating an asset. It was only set on edit.
* Rename serial_number to serial in components for consistency.
* Update validation rules to match limits in database. Currently we just accepted the values and they were truncated when adding to DB.
* Much more detailed functional testing of creating items. This checks to make sure all values on form have been successfully persisted to database.
2016-11-16 16:56:57 -08:00
|
|
|
$component->qty = e(Input::get('qty'));
|
2016-03-25 01:18:05 -07:00
|
|
|
|
|
|
|
if ($component->save()) {
|
2016-12-15 19:59:42 -08:00
|
|
|
return redirect()->route('components.index')->with('success', trans('admin/components/message.update.success'));
|
2016-03-25 01:18:05 -07:00
|
|
|
}
|
|
|
|
|
2016-04-28 21:06:41 -07:00
|
|
|
return redirect()->back()->withInput()->withErrors($component->getErrors());
|
2016-03-25 01:18:05 -07:00
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
2016-03-28 22:51:49 -07:00
|
|
|
* Delete a component.
|
|
|
|
*
|
|
|
|
* @author [A. Gianotto] [<snipe@snipe.net>]
|
|
|
|
* @since [v3.0]
|
|
|
|
* @param int $componentId
|
|
|
|
* @return Redirect
|
|
|
|
*/
|
2016-12-15 19:59:42 -08:00
|
|
|
public function destroy($componentId)
|
2016-03-25 01:18:05 -07:00
|
|
|
{
|
|
|
|
if (is_null($component = Component::find($componentId))) {
|
2016-12-15 19:59:42 -08:00
|
|
|
return redirect()->route('components.index')->with('error', trans('admin/components/message.not_found'));
|
2016-03-25 01:18:05 -07:00
|
|
|
}
|
|
|
|
|
2016-12-19 11:04:28 -08:00
|
|
|
$this->authorize('delete', $component);
|
|
|
|
|
2016-12-15 19:59:42 -08:00
|
|
|
$component->delete();
|
|
|
|
return redirect()->route('components.index')->with('success', trans('admin/components/message.delete.success'));
|
2016-03-25 01:18:05 -07:00
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
public function postBulk($componentId = null)
|
|
|
|
{
|
2016-12-19 11:04:28 -08:00
|
|
|
//$this->authorize('checkout', $component)
|
2016-03-25 01:18:05 -07:00
|
|
|
echo 'Stubbed - not yet complete';
|
|
|
|
}
|
|
|
|
|
|
|
|
public function postBulkSave($componentId = null)
|
|
|
|
{
|
2016-12-19 11:04:28 -08:00
|
|
|
//$this->authorize('edit', Component::class);
|
2016-03-25 01:18:05 -07:00
|
|
|
echo 'Stubbed - not yet complete';
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
2016-03-28 22:51:49 -07:00
|
|
|
* Return a view to display component information.
|
2016-03-25 01:18:05 -07:00
|
|
|
*
|
2016-03-28 22:51:49 -07:00
|
|
|
* @author [A. Gianotto] [<snipe@snipe.net>]
|
|
|
|
* @see ComponentsController::getDataView() method that generates the JSON response
|
|
|
|
* @since [v3.0]
|
|
|
|
* @param int $componentId
|
2016-03-25 01:18:05 -07:00
|
|
|
* @return View
|
2016-03-28 22:51:49 -07:00
|
|
|
*/
|
2016-12-15 19:59:42 -08:00
|
|
|
public function show($componentId = null)
|
2016-03-25 01:18:05 -07:00
|
|
|
{
|
2016-03-28 22:51:49 -07:00
|
|
|
$component = Component::find($componentId);
|
2016-03-25 01:18:05 -07:00
|
|
|
|
|
|
|
if (isset($component->id)) {
|
|
|
|
|
|
|
|
|
2016-12-19 11:04:28 -08:00
|
|
|
$this->authorize('view', $component);
|
2016-03-25 01:18:05 -07:00
|
|
|
|
2016-12-19 11:04:28 -08:00
|
|
|
return View::make('components/view', compact('component'));
|
2016-03-25 01:18:05 -07:00
|
|
|
}
|
2016-12-19 11:04:28 -08:00
|
|
|
// Prepare the error message
|
|
|
|
$error = trans('admin/components/message.does_not_exist', compact('id'));
|
2016-03-25 01:18:05 -07:00
|
|
|
|
2016-12-19 11:04:28 -08:00
|
|
|
// Redirect to the user management page
|
|
|
|
return redirect()->route('components')->with('error', $error);
|
2016-03-25 01:18:05 -07:00
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
2016-03-28 22:51:49 -07:00
|
|
|
* Returns a view that allows the checkout of a component to an asset.
|
|
|
|
*
|
|
|
|
* @author [A. Gianotto] [<snipe@snipe.net>]
|
|
|
|
* @see ComponentsController::postCheckout() method that stores the data.
|
|
|
|
* @since [v3.0]
|
|
|
|
* @param int $componentId
|
|
|
|
* @return View
|
|
|
|
*/
|
2016-03-25 01:18:05 -07:00
|
|
|
public function getCheckout($componentId)
|
|
|
|
{
|
|
|
|
// Check if the component exists
|
|
|
|
if (is_null($component = Component::find($componentId))) {
|
|
|
|
// Redirect to the component management page with error
|
2016-12-15 20:02:47 -08:00
|
|
|
return redirect()->route('components.index')->with('error', trans('admin/components/message.not_found'));
|
2016-03-25 01:18:05 -07:00
|
|
|
}
|
|
|
|
|
2016-12-19 11:04:28 -08:00
|
|
|
$this->authorize('checkout', $component);
|
|
|
|
|
2016-03-25 01:18:05 -07:00
|
|
|
// Get the dropdown of assets and then pass it to the checkout view
|
2016-06-07 05:58:08 -07:00
|
|
|
$assets_list = Helper::detailedAssetList();
|
2016-03-25 01:18:05 -07:00
|
|
|
|
|
|
|
return View::make('components/checkout', compact('component'))->with('assets_list', $assets_list);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
2016-03-28 22:51:49 -07:00
|
|
|
* Validate and store checkout data.
|
|
|
|
*
|
|
|
|
* @author [A. Gianotto] [<snipe@snipe.net>]
|
|
|
|
* @see ComponentsController::getCheckout() method that returns the form.
|
|
|
|
* @since [v3.0]
|
|
|
|
* @param int $componentId
|
|
|
|
* @return Redirect
|
|
|
|
*/
|
2016-06-22 15:59:00 -07:00
|
|
|
public function postCheckout(Request $request, $componentId)
|
2016-03-25 01:18:05 -07:00
|
|
|
{
|
2016-06-22 15:59:00 -07:00
|
|
|
// Check if the component exists
|
2016-03-25 01:18:05 -07:00
|
|
|
if (is_null($component = Component::find($componentId))) {
|
|
|
|
// Redirect to the component management page with error
|
2016-12-15 20:02:47 -08:00
|
|
|
return redirect()->route('components.index')->with('error', trans('admin/components/message.not_found'));
|
2016-03-25 01:18:05 -07:00
|
|
|
}
|
|
|
|
|
2016-12-19 11:04:28 -08:00
|
|
|
$this->authorize('checkout', $component);
|
2016-06-22 15:59:00 -07:00
|
|
|
|
|
|
|
$max_to_checkout = $component->numRemaining();
|
|
|
|
$validator = Validator::make($request->all(),[
|
|
|
|
"asset_id" => "required",
|
|
|
|
"assigned_qty" => "required|numeric|between:1,$max_to_checkout"
|
|
|
|
]);
|
|
|
|
|
|
|
|
if ($validator->fails()) {
|
|
|
|
return redirect()->back()
|
|
|
|
->withErrors($validator)
|
|
|
|
->withInput();
|
|
|
|
}
|
|
|
|
|
2016-03-25 01:18:05 -07:00
|
|
|
$admin_user = Auth::user();
|
|
|
|
$asset_id = e(Input::get('asset_id'));
|
|
|
|
|
|
|
|
// Check if the user exists
|
|
|
|
if (is_null($asset = Asset::find($asset_id))) {
|
|
|
|
// Redirect to the component management page with error
|
2016-12-15 19:59:42 -08:00
|
|
|
return redirect()->route('components.index')->with('error', trans('admin/components/message.asset_does_not_exist'));
|
2016-03-25 01:18:05 -07:00
|
|
|
}
|
2016-12-15 19:59:42 -08:00
|
|
|
|
2016-03-25 01:18:05 -07:00
|
|
|
// Update the component data
|
|
|
|
$component->asset_id = $asset_id;
|
|
|
|
|
|
|
|
$component->assets()->attach($component->id, array(
|
|
|
|
'component_id' => $component->id,
|
|
|
|
'user_id' => $admin_user->id,
|
2016-09-26 22:35:51 -07:00
|
|
|
'created_at' => date('Y-m-d H:i:s'),
|
2016-03-25 01:18:05 -07:00
|
|
|
'assigned_qty' => e(Input::get('assigned_qty')),
|
|
|
|
'asset_id' => $asset_id));
|
|
|
|
|
2016-09-06 19:39:42 -07:00
|
|
|
$logaction = $component->logCheckout(e(Input::get('note')), $asset_id);
|
2016-03-25 01:18:05 -07:00
|
|
|
|
|
|
|
$settings = Setting::getSettings();
|
|
|
|
|
|
|
|
if ($settings->slack_endpoint) {
|
|
|
|
|
|
|
|
$slack_settings = [
|
|
|
|
'username' => $settings->botname,
|
|
|
|
'channel' => $settings->slack_channel,
|
|
|
|
'link_names' => true
|
|
|
|
];
|
|
|
|
|
|
|
|
$client = new \Maknz\Slack\Client($settings->slack_endpoint, $slack_settings);
|
|
|
|
|
|
|
|
try {
|
|
|
|
$client->attach([
|
|
|
|
'color' => 'good',
|
|
|
|
'fields' => [
|
|
|
|
[
|
|
|
|
'title' => 'Checked Out:',
|
2016-12-19 11:04:28 -08:00
|
|
|
'value' => class_basename(strtoupper($logaction->item_type))
|
|
|
|
.' <'.route('components.show', ['component' => $component->id]).'|'.$component->name
|
|
|
|
.'> checked out to <'.route('hardware.show', $asset->id).'|'.$asset->showAssetName()
|
|
|
|
.'> by <'.route('users.show', $admin_user->id).'|'.$admin_user->fullName().'>.'
|
2016-03-25 01:18:05 -07:00
|
|
|
],
|
|
|
|
[
|
|
|
|
'title' => 'Note:',
|
|
|
|
'value' => e($logaction->note)
|
|
|
|
],
|
|
|
|
]
|
|
|
|
])->send('Component Checked Out');
|
|
|
|
|
|
|
|
} catch (Exception $e) {
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-12-15 19:59:42 -08:00
|
|
|
return redirect()->route('components.index')->with('success', trans('admin/components/message.checkout.success'));
|
2016-03-25 01:18:05 -07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2016-03-28 22:51:49 -07:00
|
|
|
/**
|
|
|
|
* Generates the JSON response for accessories listing view.
|
|
|
|
*
|
|
|
|
* For debugging, see at /api/accessories/list
|
|
|
|
*
|
|
|
|
* @author [A. Gianotto] [<snipe@snipe.net>]
|
|
|
|
* @since [v3.0]
|
|
|
|
* @return string JSON
|
|
|
|
**/
|
2016-03-25 01:18:05 -07:00
|
|
|
public function getDatatable()
|
|
|
|
{
|
2016-12-19 11:04:28 -08:00
|
|
|
$this->authorize('view', Component::class);
|
2016-07-25 19:46:29 -07:00
|
|
|
$components = Company::scopeCompanyables(Component::select('components.*')->whereNull('components.deleted_at')
|
|
|
|
->with('company', 'location', 'category'));
|
2016-03-25 01:18:05 -07:00
|
|
|
|
|
|
|
if (Input::has('search')) {
|
|
|
|
$components = $components->TextSearch(Input::get('search'));
|
|
|
|
}
|
|
|
|
|
|
|
|
if (Input::has('offset')) {
|
|
|
|
$offset = e(Input::get('offset'));
|
|
|
|
} else {
|
|
|
|
$offset = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (Input::has('limit')) {
|
|
|
|
$limit = e(Input::get('limit'));
|
|
|
|
} else {
|
|
|
|
$limit = 50;
|
|
|
|
}
|
|
|
|
|
Partialize forms (#2884)
* Consolidate edit form elements into reusable partials.
This is a large code change that doesn't do much immediately. It
refactors all of the various edit.blade.php files to reference
standardized partials, so that they all reference the same base html
layout. This has the side effect of moving everything to the new fancy
"required" indicators, and making things look consistent.
In addition, I've gone ahead and renamed a few database fields. We had
Assetmodel::modelno and Consumable::model_no, I've renamed both to
model_number. We had items using ::note and ::notes, I've standardized
on ::notes. Component used total_qty where consumables and accessories
used qty, so I've moved everything to qty (And fixed a few bugs in the
helper file in the process.
TODO includes looking at how/where to place the modal javascripts to
allow for on the fly creation from all places, rather than just the
asset page.
Rename assetmodel::modelno to model_number for clarity and consistency
Rename consumable::model_no to model_number for clarity and consistency
Rename assetmodel::note to notes for clarity and consistency
Port asset and assetmodel to new partials layout. Adapt all code to the renamed model_number and notes database changes. Fix some stying.
* Share a settings variable with all views.
* Allow editing the per_page setting. We showed the value, but we never showed it on the edit page..
* use snipeSettings in all views instead of the long ugly path.
* War on partials. Centralize all bootstrap table javascript
* Use model_number instead of modelno in importer
* Codacy fix.
* More unification/deduplication. Create an edit form template layout that we use as the base for all edit forms. This gives the same interface for editing everything and makes the edit.blade.* files much easier to read.
* Use a ViewComposer instead of sharing the variable directly. Fixes artisan optimize trying to hit the db--which ruins new installs
* Fix DB seeder.
* Base sql dump and csv's to import data from for tests.
* Start some functional tests for creating items.
* Add functional tests for all create methods. Still need to do tests for edits, deletes, and lots of other things
* Improvements to functional tests.
Use the built in DB seeding mechanism instead of doing it ourselves.
Break the tests into multiple units, rather than testing everything in
each function.
* Some improvements to acceptance tests.
Make sure we're only looking at the "trs" within the bootstrap table.
Creation of assets is now tested at the functional level (and is faster)
so ignore it here.
I'm testing acceptance tests with the
IMPORT_{ASSETS,ACCESSORIES,CONSUMABLES}.csv in the tests/_data folder
imported.
* A few things to make acceptance tests work. Add a name to the companies table, and make the locations table have the correct name
* Use a .env.tests file for testing functional and unit to allow a separate database.
* Add functional tests for compoents, groups, and licenses.
* Now that the config is in the functional.yml, this just confuses things.
* Start some functional tests for creating items.
* Add functional tests for all create methods. Still need to do tests for edits, deletes, and lots of other things
* Improvements to functional tests.
Use the built in DB seeding mechanism instead of doing it ourselves.
Break the tests into multiple units, rather than testing everything in
each function.
* Some improvements to acceptance tests.
Make sure we're only looking at the "trs" within the bootstrap table.
Creation of assets is now tested at the functional level (and is faster)
so ignore it here.
I'm testing acceptance tests with the
IMPORT_{ASSETS,ACCESSORIES,CONSUMABLES}.csv in the tests/_data folder
imported.
* update db dump
* Update tests to new reality
* env for the test setup
* only load the database at beginning of tests, not between each Functional test.
* Fix a miss from renaming note to notes.
* Set Termination date when creating an asset. It was only set on edit.
* Rename serial_number to serial in components for consistency.
* Update validation rules to match limits in database. Currently we just accepted the values and they were truncated when adding to DB.
* Much more detailed functional testing of creating items. This checks to make sure all values on form have been successfully persisted to database.
2016-11-16 16:56:57 -08:00
|
|
|
$allowed_columns = ['id','name','min_amt','order_number','serial','purchase_date','purchase_cost','companyName','category','total_qty'];
|
2016-03-25 01:18:05 -07:00
|
|
|
$order = Input::get('order') === 'asc' ? 'asc' : 'desc';
|
|
|
|
$sort = in_array(Input::get('sort'), $allowed_columns) ? Input::get('sort') : 'created_at';
|
|
|
|
|
|
|
|
switch ($sort) {
|
|
|
|
case 'category':
|
|
|
|
$components = $components->OrderCategory($order);
|
|
|
|
break;
|
|
|
|
case 'location':
|
|
|
|
$components = $components->OrderLocation($order);
|
|
|
|
break;
|
|
|
|
case 'companyName':
|
|
|
|
$components = $components->OrderCompany($order);
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
$components = $components->orderBy($sort, $order);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
$consumCount = $components->count();
|
|
|
|
$components = $components->skip($offset)->take($limit)->get();
|
|
|
|
|
|
|
|
$rows = array();
|
|
|
|
|
|
|
|
foreach ($components as $component) {
|
2016-08-02 00:54:38 -07:00
|
|
|
$actions = '<nobr>';
|
2016-12-19 11:04:28 -08:00
|
|
|
if (Gate::allows('checkout', $component)) {
|
2016-08-02 00:54:38 -07:00
|
|
|
$actions .= '<a href="' . route('checkout/component',
|
|
|
|
$component->id) . '" style="margin-right:5px;" class="btn btn-info btn-sm ' . (($component->numRemaining() > 0) ? '' : ' disabled') . '" ' . (($component->numRemaining() > 0) ? '' : ' disabled') . '>' . trans('general.checkout') . '</a>';
|
|
|
|
}
|
|
|
|
|
2016-12-19 11:04:28 -08:00
|
|
|
if (Gate::allows('edit', $component)) {
|
2016-12-15 19:59:42 -08:00
|
|
|
$actions .= '<a href="' . route('components.edit',
|
2016-08-02 00:54:38 -07:00
|
|
|
$component->id) . '" class="btn btn-warning btn-sm" style="margin-right:5px;"><i class="fa fa-pencil icon-white"></i></a>';
|
|
|
|
}
|
|
|
|
|
2016-12-19 11:04:28 -08:00
|
|
|
if (Gate::allows('delete', $component)) {
|
2016-12-15 19:59:42 -08:00
|
|
|
$actions .= '<a data-html="false" class="btn delete-asset btn-danger btn-sm" data-toggle="modal" href="' . route('components.destroy',
|
2016-08-02 00:54:38 -07:00
|
|
|
$component->id) . '" data-content="' . trans('admin/components/message.delete.confirm') . '" data-title="' . trans('general.delete') . ' ' . htmlspecialchars($component->name) . '?" onClick="return false;"><i class="fa fa-trash icon-white"></i></a>';
|
|
|
|
}
|
|
|
|
|
|
|
|
$actions .='</nobr>';
|
2016-03-25 01:18:05 -07:00
|
|
|
$company = $component->company;
|
|
|
|
|
|
|
|
$rows[] = array(
|
|
|
|
'checkbox' =>'<div class="text-center"><input type="checkbox" name="component['.$component->id.']" class="one_required"></div>',
|
|
|
|
'id' => $component->id,
|
2016-12-15 19:59:42 -08:00
|
|
|
'name' => (string)link_to_route('components.show', e($component->name), ['component' => $component->id]),
|
Partialize forms (#2884)
* Consolidate edit form elements into reusable partials.
This is a large code change that doesn't do much immediately. It
refactors all of the various edit.blade.php files to reference
standardized partials, so that they all reference the same base html
layout. This has the side effect of moving everything to the new fancy
"required" indicators, and making things look consistent.
In addition, I've gone ahead and renamed a few database fields. We had
Assetmodel::modelno and Consumable::model_no, I've renamed both to
model_number. We had items using ::note and ::notes, I've standardized
on ::notes. Component used total_qty where consumables and accessories
used qty, so I've moved everything to qty (And fixed a few bugs in the
helper file in the process.
TODO includes looking at how/where to place the modal javascripts to
allow for on the fly creation from all places, rather than just the
asset page.
Rename assetmodel::modelno to model_number for clarity and consistency
Rename consumable::model_no to model_number for clarity and consistency
Rename assetmodel::note to notes for clarity and consistency
Port asset and assetmodel to new partials layout. Adapt all code to the renamed model_number and notes database changes. Fix some stying.
* Share a settings variable with all views.
* Allow editing the per_page setting. We showed the value, but we never showed it on the edit page..
* use snipeSettings in all views instead of the long ugly path.
* War on partials. Centralize all bootstrap table javascript
* Use model_number instead of modelno in importer
* Codacy fix.
* More unification/deduplication. Create an edit form template layout that we use as the base for all edit forms. This gives the same interface for editing everything and makes the edit.blade.* files much easier to read.
* Use a ViewComposer instead of sharing the variable directly. Fixes artisan optimize trying to hit the db--which ruins new installs
* Fix DB seeder.
* Base sql dump and csv's to import data from for tests.
* Start some functional tests for creating items.
* Add functional tests for all create methods. Still need to do tests for edits, deletes, and lots of other things
* Improvements to functional tests.
Use the built in DB seeding mechanism instead of doing it ourselves.
Break the tests into multiple units, rather than testing everything in
each function.
* Some improvements to acceptance tests.
Make sure we're only looking at the "trs" within the bootstrap table.
Creation of assets is now tested at the functional level (and is faster)
so ignore it here.
I'm testing acceptance tests with the
IMPORT_{ASSETS,ACCESSORIES,CONSUMABLES}.csv in the tests/_data folder
imported.
* A few things to make acceptance tests work. Add a name to the companies table, and make the locations table have the correct name
* Use a .env.tests file for testing functional and unit to allow a separate database.
* Add functional tests for compoents, groups, and licenses.
* Now that the config is in the functional.yml, this just confuses things.
* Start some functional tests for creating items.
* Add functional tests for all create methods. Still need to do tests for edits, deletes, and lots of other things
* Improvements to functional tests.
Use the built in DB seeding mechanism instead of doing it ourselves.
Break the tests into multiple units, rather than testing everything in
each function.
* Some improvements to acceptance tests.
Make sure we're only looking at the "trs" within the bootstrap table.
Creation of assets is now tested at the functional level (and is faster)
so ignore it here.
I'm testing acceptance tests with the
IMPORT_{ASSETS,ACCESSORIES,CONSUMABLES}.csv in the tests/_data folder
imported.
* update db dump
* Update tests to new reality
* env for the test setup
* only load the database at beginning of tests, not between each Functional test.
* Fix a miss from renaming note to notes.
* Set Termination date when creating an asset. It was only set on edit.
* Rename serial_number to serial in components for consistency.
* Update validation rules to match limits in database. Currently we just accepted the values and they were truncated when adding to DB.
* Much more detailed functional testing of creating items. This checks to make sure all values on form have been successfully persisted to database.
2016-11-16 16:56:57 -08:00
|
|
|
'serial_number' => $component->serial,
|
2016-03-25 01:18:05 -07:00
|
|
|
'location' => ($component->location) ? e($component->location->name) : '',
|
2016-12-15 19:59:42 -08:00
|
|
|
'qty' => number_format($component->qty),
|
2016-03-25 15:24:12 -07:00
|
|
|
'min_amt' => e($component->min_amt),
|
|
|
|
'category' => ($component->category) ? e($component->category->name) : 'Missing category',
|
|
|
|
'order_number' => e($component->order_number),
|
|
|
|
'purchase_date' => e($component->purchase_date),
|
2016-08-16 18:47:53 -07:00
|
|
|
'purchase_cost' => Helper::formatCurrencyOutput($component->purchase_cost),
|
2016-03-25 01:18:05 -07:00
|
|
|
'numRemaining' => $component->numRemaining(),
|
|
|
|
'actions' => $actions,
|
|
|
|
'companyName' => is_null($company) ? '' : e($company->name),
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
|
|
|
$data = array('total' => $consumCount, 'rows' => $rows);
|
|
|
|
|
|
|
|
return $data;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
2016-03-28 22:51:49 -07:00
|
|
|
/**
|
|
|
|
* Return JSON data to populate the components view,
|
|
|
|
*
|
|
|
|
* @author [A. Gianotto] [<snipe@snipe.net>]
|
|
|
|
* @see ComponentsController::getView() method that returns the view.
|
|
|
|
* @since [v3.0]
|
|
|
|
* @param int $componentId
|
|
|
|
* @return string JSON
|
|
|
|
*/
|
|
|
|
public function getDataView($componentId)
|
2016-03-25 01:18:05 -07:00
|
|
|
{
|
2016-12-19 11:04:28 -08:00
|
|
|
if (is_null($component = Component::with('assets')->find($componentId))) {
|
|
|
|
// Redirect to the component management page with error
|
|
|
|
return redirect()->route('components.index')->with('error', trans('admin/components/message.not_found'));
|
|
|
|
}
|
2016-03-25 01:18:05 -07:00
|
|
|
|
|
|
|
if (!Company::isCurrentUserHasAccess($component)) {
|
|
|
|
return ['total' => 0, 'rows' => []];
|
|
|
|
}
|
2016-12-19 11:04:28 -08:00
|
|
|
$this->authorize('view', $component);
|
2016-03-25 01:18:05 -07:00
|
|
|
|
|
|
|
$rows = array();
|
|
|
|
|
|
|
|
foreach ($component->assets as $component_assignment) {
|
|
|
|
$rows[] = array(
|
2016-12-15 19:59:42 -08:00
|
|
|
'name' => (string)link_to_route('hardware.show', e($component_assignment->showAssetName()), ['hardware' => $component_assignment->id]),
|
2016-03-25 15:24:12 -07:00
|
|
|
'qty' => e($component_assignment->pivot->assigned_qty),
|
2016-03-25 01:18:05 -07:00
|
|
|
'created_at' => ($component_assignment->created_at->format('Y-m-d H:i:s')=='-0001-11-30 00:00:00') ? '' : $component_assignment->created_at->format('Y-m-d H:i:s'),
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
|
|
|
$componentCount = $component->assets->count();
|
|
|
|
$data = array('total' => $componentCount, 'rows' => $rows);
|
|
|
|
return $data;
|
|
|
|
}
|
|
|
|
}
|