From 1527b88fd671a20c879c9b2061ae95f3b386ba27 Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 26 Nov 2013 16:36:42 -0500 Subject: [PATCH] Fixes #61 --- ..._211820_drop_license_from_assets_table.php | 31 +++++++ app/database/seeds/AssetsSeeder.php | 84 +++++++++++------ app/database/seeds/CategoriesSeeder.php | 5 ++ app/database/seeds/LicenseSeatsSeeder.php | 42 ++++++--- app/database/seeds/LicensesSeeder.php | 49 +++++----- app/database/seeds/LocationsSeeder.php | 89 +++++++++---------- app/database/seeds/ManufacturersSeeder.php | 47 +++++----- app/database/seeds/SettingsSeeder.php | 4 +- app/database/seeds/StatuslabelsSeeder.php | 4 + 9 files changed, 222 insertions(+), 133 deletions(-) create mode 100644 app/database/migrations/2013_11_26_211820_drop_license_from_assets_table.php diff --git a/app/database/migrations/2013_11_26_211820_drop_license_from_assets_table.php b/app/database/migrations/2013_11_26_211820_drop_license_from_assets_table.php new file mode 100644 index 0000000000..736432d746 --- /dev/null +++ b/app/database/migrations/2013_11_26_211820_drop_license_from_assets_table.php @@ -0,0 +1,31 @@ +dropColumn('license_name'); + $table->dropColumn('license_email'); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + // + } + +} \ No newline at end of file diff --git a/app/database/seeds/AssetsSeeder.php b/app/database/seeds/AssetsSeeder.php index 7bf498e38e..16b92335a2 100644 --- a/app/database/seeds/AssetsSeeder.php +++ b/app/database/seeds/AssetsSeeder.php @@ -26,12 +26,15 @@ class AssetsSeeder extends Seeder { 'assigned_to' => 0, 'physical' => 1, 'archived' => 0, - 'license_name' => NULL, - 'license_email' => NULL, - 'status_id' => NULL, + 'status_id' => NULL, + 'notes' => '', + 'deleted_at' => NULL, + 'archived' => '0', + 'warranty_months' => NULL, + 'depreciate' => '0', ); - // Pending (status_id is null, assigned_to = 0) + $asset[] = array( 'name' => 'Michael MBP', 'asset_tag' => 'NNY28633396', @@ -46,9 +49,12 @@ class AssetsSeeder extends Seeder { 'assigned_to' => 0, 'physical' => 1, 'archived' => 0, - 'license_name' => NULL, - 'license_email' => NULL, 'status_id' => NULL, + 'notes' => '', + 'deleted_at' => NULL, + 'archived' => '0', + 'warranty_months' => NULL, + 'depreciate' => '0', ); @@ -67,9 +73,12 @@ class AssetsSeeder extends Seeder { 'assigned_to' => 0, 'physical' => 1, 'archived' => 0, - 'license_name' => NULL, - 'license_email' => NULL, 'status_id' => 0, + 'notes' => '', + 'deleted_at' => NULL, + 'archived' => '0', + 'warranty_months' => NULL, + 'depreciate' => '0', ); // RTD (status_id =0, assigned_to = 0) @@ -87,9 +96,12 @@ class AssetsSeeder extends Seeder { 'assigned_to' => 0, 'physical' => 1, 'archived' => 0, - 'license_name' => NULL, - 'license_email' => NULL, 'status_id' => 0, + 'notes' => '', + 'deleted_at' => NULL, + 'archived' => '0', + 'warranty_months' => NULL, + 'depreciate' => '0', ); // RTD (status_id =0, assigned_to = 0) @@ -107,9 +119,12 @@ class AssetsSeeder extends Seeder { 'assigned_to' => 0, 'physical' => 1, 'archived' => 0, - 'license_name' => NULL, - 'license_email' => NULL, 'status_id' => 0, + 'notes' => '', + 'deleted_at' => NULL, + 'archived' => '0', + 'warranty_months' => NULL, + 'depreciate' => '0', ); @@ -128,9 +143,12 @@ class AssetsSeeder extends Seeder { 'assigned_to' => 2, 'physical' => 1, 'archived' => 0, - 'license_name' => NULL, - 'license_email' => NULL, 'status_id' => 0, + 'notes' => '', + 'deleted_at' => NULL, + 'archived' => '0', + 'warranty_months' => NULL, + 'depreciate' => '0', ); // Deployed (status_id =0, assigned_to > 0) @@ -148,9 +166,12 @@ class AssetsSeeder extends Seeder { 'assigned_to' => 2, 'physical' => 1, 'archived' => 0, - 'license_name' => NULL, - 'license_email' => NULL, 'status_id' => 0, + 'notes' => '', + 'deleted_at' => NULL, + 'archived' => '0', + 'warranty_months' => NULL, + 'depreciate' => '0', ); // Undeployable (status_id > 0, assigned_to = 0) @@ -168,9 +189,12 @@ class AssetsSeeder extends Seeder { 'assigned_to' => 0, 'physical' => 1, 'archived' => 0, - 'license_name' => NULL, - 'license_email' => NULL, 'status_id' => '3', + 'notes' => '', + 'deleted_at' => NULL, + 'archived' => '0', + 'warranty_months' => NULL, + 'depreciate' => '0', ); // Undeployable (status_id > 0, assigned_to = 0) @@ -188,9 +212,12 @@ class AssetsSeeder extends Seeder { 'assigned_to' => 0, 'physical' => 1, 'archived' => 0, - 'license_name' => NULL, - 'license_email' => NULL, 'status_id' => '2', + 'notes' => '', + 'deleted_at' => NULL, + 'archived' => '0', + 'warranty_months' => NULL, + 'depreciate' => '0', ); // Undeployable (status_id > 0, assigned_to = 0) @@ -208,9 +235,12 @@ class AssetsSeeder extends Seeder { 'assigned_to' => 0, 'physical' => 1, 'archived' => 1, - 'license_name' => NULL, - 'license_email' => NULL, 'status_id' => '4', + 'notes' => '', + 'deleted_at' => NULL, + 'archived' => '0', + 'warranty_months' => NULL, + 'depreciate' => '0', ); // Undeployable (status_id > 0, assigned_to = 0) @@ -228,14 +258,14 @@ class AssetsSeeder extends Seeder { 'assigned_to' => 0, 'physical' => 1, 'archived' => 1, - 'license_name' => NULL, - 'license_email' => NULL, 'status_id' => '3', + 'notes' => '', + 'deleted_at' => NULL, + 'archived' => '0', + 'warranty_months' => NULL, + 'depreciate' => '0', ); - - - // Delete all the old data DB::table('assets')->truncate(); diff --git a/app/database/seeds/CategoriesSeeder.php b/app/database/seeds/CategoriesSeeder.php index 88932105ba..b3c37a1134 100644 --- a/app/database/seeds/CategoriesSeeder.php +++ b/app/database/seeds/CategoriesSeeder.php @@ -12,6 +12,7 @@ class CategoriesSeeder extends Seeder { 'created_at' => $date->modify('-10 day'), 'updated_at' => $date->modify('-3 day'), 'user_id' => 1, + 'deleted_at' => NULL, ); $date = new DateTime; @@ -20,6 +21,7 @@ class CategoriesSeeder extends Seeder { 'created_at' => $date->modify('-10 day'), 'updated_at' => $date->modify('-3 day'), 'user_id' => 1, + 'deleted_at' => NULL, ); $date = new DateTime; @@ -28,6 +30,7 @@ class CategoriesSeeder extends Seeder { 'created_at' => $date->modify('-10 day'), 'updated_at' => $date->modify('-3 day'), 'user_id' => 1, + 'deleted_at' => NULL, ); $date = new DateTime; @@ -36,6 +39,7 @@ class CategoriesSeeder extends Seeder { 'created_at' => $date->modify('-10 day'), 'updated_at' => $date->modify('-3 day'), 'user_id' => 1, + 'deleted_at' => NULL, ); $date = new DateTime; @@ -44,6 +48,7 @@ class CategoriesSeeder extends Seeder { 'created_at' => $date->modify('-10 day'), 'updated_at' => $date->modify('-3 day'), 'user_id' => 1, + 'deleted_at' => NULL, ); diff --git a/app/database/seeds/LicenseSeatsSeeder.php b/app/database/seeds/LicenseSeatsSeeder.php index 99648b5897..4d7fac66c9 100644 --- a/app/database/seeds/LicenseSeatsSeeder.php +++ b/app/database/seeds/LicenseSeatsSeeder.php @@ -15,51 +15,65 @@ class LicenseSeatsSeeder extends Seeder { $license_seats[] = array( 'license_id' => '1', 'assigned_to' => '1', - 'created_at' => $date->modify('-10 day'), - 'updated_at' => $date->modify('-3 day'), + 'created_at' => $date->modify('-10 day'), + 'updated_at' => $date->modify('-3 day'), + 'deleted_at' => NULL, + 'notes' =>'', ); $license_seats[] = array( 'license_id' => '1', 'assigned_to' => NULL, - 'created_at' => $date->modify('-10 day'), - 'updated_at' => $date->modify('-3 day'), + 'created_at' => $date->modify('-10 day'), + 'updated_at' => $date->modify('-3 day'), + 'deleted_at' => NULL, + 'notes' =>'', ); $license_seats[] = array( 'license_id' => '1', 'assigned_to' => NULL, - 'created_at' => $date->modify('-10 day'), - 'updated_at' => $date->modify('-3 day'), + 'created_at' => $date->modify('-10 day'), + 'updated_at' => $date->modify('-3 day'), + 'deleted_at' => NULL, + 'notes' =>'', ); $license_seats[] = array( 'license_id' => '1', 'assigned_to' => NULL, - 'created_at' => $date->modify('-10 day'), - 'updated_at' => $date->modify('-3 day'), + 'created_at' => $date->modify('-10 day'), + 'updated_at' => $date->modify('-3 day'), + 'deleted_at' => NULL, + 'notes' =>'', ); $license_seats[] = array( 'license_id' => '1', 'assigned_to' => '2', - 'created_at' => $date->modify('-10 day'), - 'updated_at' => $date->modify('-3 day'), + 'created_at' => $date->modify('-10 day'), + 'updated_at' => $date->modify('-3 day'), + 'deleted_at' => NULL, + 'notes' =>'', ); $license_seats[] = array( 'license_id' => '2', 'assigned_to' => '1', - 'created_at' => $date->modify('-10 day'), - 'updated_at' => $date->modify('-3 day'), + 'created_at' => $date->modify('-10 day'), + 'updated_at' => $date->modify('-3 day'), + 'deleted_at' => NULL, + 'notes' =>'', ); // Pending (status_id is null, assigned_to = 0) $license_seats[] = array( 'license_id' => '2', 'assigned_to' => NULL, - 'created_at' => $date->modify('-10 day'), - 'updated_at' => $date->modify('-3 day'), + 'created_at' => $date->modify('-10 day'), + 'updated_at' => $date->modify('-3 day'), + 'deleted_at' => NULL, + 'notes' =>'', ); diff --git a/app/database/seeds/LicensesSeeder.php b/app/database/seeds/LicensesSeeder.php index 6e5b3ceb1a..692b80ae96 100644 --- a/app/database/seeds/LicensesSeeder.php +++ b/app/database/seeds/LicensesSeeder.php @@ -13,33 +13,40 @@ class LicensesSeeder extends Seeder { // Pending (status_id is null, assigned_to = 0) $license[] = array( - 'name' => 'Adobe Photoshop CS6', - 'serial' => 'ZOMG-WtF-BBQ-SRSLY', - 'purchase_date' => '2013-10-02', - 'purchase_cost' => '2435.99', - 'order_number' => '987698576946', - 'created_at' => $date->modify('-10 day'), - 'updated_at' => $date->modify('-3 day'), - 'seats' => 5, - 'license_name' => NULL, - 'license_email' => NULL, + 'name' => 'Adobe Photoshop CS6', + 'serial' => 'ZOMG-WtF-BBQ-SRSLY', + 'purchase_date' => '2013-10-02', + 'purchase_cost' => '2435.99', + 'order_number' => '987698576946', + 'created_at' => $date->modify('-10 day'), + 'updated_at' => $date->modify('-3 day'), + 'seats' => 5, + 'license_name' => NULL, + 'license_email' => NULL, + 'notes' =>'', + 'user_id' =>1, + 'depreciation_id' =>2, + 'deleted_at' => NULL, ); // Pending (status_id is null, assigned_to = 0) $license[] = array( - 'name' => 'Git Tower', - 'serial' => '98049890394-340485934', - 'purchase_date' => '2013-10-02', - 'purchase_cost' => '2435.99', - 'order_number' => '987698576946', - 'created_at' => $date->modify('-10 day'), - 'updated_at' => $date->modify('-3 day'), - 'seats' => 2, - 'license_name' => 'Alison Gianotto', - 'license_email' => 'snipe@snipe.net', + 'name' => 'Git Tower', + 'serial' => '98049890394-340485934', + 'purchase_date' => '2013-10-02', + 'purchase_cost' => '2435.99', + 'order_number' => '987698576946', + 'created_at' => $date->modify('-10 day'), + 'updated_at' => $date->modify('-3 day'), + 'seats' => 2, + 'license_name' => 'Alison Gianotto', + 'license_email' => 'snipe@snipe.net', + 'notes' =>'', + 'user_id' =>1, + 'depreciation_id' =>2, + 'deleted_at' => NULL, ); - // Delete all the old data DB::table('licenses')->truncate(); diff --git a/app/database/seeds/LocationsSeeder.php b/app/database/seeds/LocationsSeeder.php index 399e9bc322..59c758c101 100644 --- a/app/database/seeds/LocationsSeeder.php +++ b/app/database/seeds/LocationsSeeder.php @@ -11,63 +11,62 @@ class LocationsSeeder extends Seeder { $date = new DateTime; $location[] = array( - 'name' => 'NY - Broad St', - 'address' => '200 Broad Street', - 'address2' => 'Suite 142', - 'city' => 'New York', - 'state' => 'NY', - 'country' => 'US', - 'zip' => '10004', - 'created_at' => $date->modify('-10 day'), - 'updated_at' => $date->modify('-3 day'), - 'user_id' => 1, + 'name' => 'NY - Broad St', + 'address' => '200 Broad Street', + 'address2' => 'Suite 142', + 'city' => 'New York', + 'state' => 'NY', + 'country' => 'US', + 'zip' => '10004', + 'created_at' => $date->modify('-10 day'), + 'updated_at' => $date->modify('-3 day'), + 'user_id' => 1, + 'deleted_at' => NULL, ); $location[] = array( - 'name' => 'NY - Water St', - 'address' => '200 Broad Street', - 'address2' => 'Suite 142', - 'city' => 'New York', - 'state' => 'NY', - 'country' => '10038', - 'zip' => '10004', - 'created_at' => $date->modify('-10 day'), - 'updated_at' => $date->modify('-3 day'), - 'user_id' => 1, + 'name' => 'NY - Water St', + 'address' => '200 Broad Street', + 'address2' => 'Suite 142', + 'city' => 'New York', + 'state' => 'NY', + 'country' => '10038', + 'zip' => '10004', + 'created_at' => $date->modify('-10 day'), + 'updated_at' => $date->modify('-3 day'), + 'user_id' => 1, + 'deleted_at' => NULL, ); $location[] = array( - 'name' => 'SF - Broadway', - 'address' => '200 Broadway', - 'address2' => 'Suite 142', - 'city' => 'San Francisco', - 'state' => 'CA', - 'country' => 'US', - 'zip' => '94111', - 'created_at' => $date->modify('-10 day'), - 'updated_at' => $date->modify('-3 day'), - 'user_id' => 1, + 'name' => 'SF - Broadway', + 'address' => '200 Broadway', + 'address2' => 'Suite 142', + 'city' => 'San Francisco', + 'state' => 'CA', + 'country' => 'US', + 'zip' => '94111', + 'created_at' => $date->modify('-10 day'), + 'updated_at' => $date->modify('-3 day'), + 'user_id' => 1, + 'deleted_at' => NULL, ); $location[] = array( - 'name' => 'LA - Hollywood Blvd', - 'address' => '6253 Hollywood Blvd', - 'address2' => 'Suite 142', - 'city' => 'Los Angeles', - 'state' => 'CA', - 'country' => 'US', - 'zip' => '90028', - 'created_at' => $date->modify('-10 day'), - 'updated_at' => $date->modify('-3 day'), - 'user_id' => 1, + 'name' => 'LA - Hollywood Blvd', + 'address' => '6253 Hollywood Blvd', + 'address2' => 'Suite 142', + 'city' => 'Los Angeles', + 'state' => 'CA', + 'country' => 'US', + 'zip' => '90028', + 'created_at' => $date->modify('-10 day'), + 'updated_at' => $date->modify('-3 day'), + 'user_id' => 1, + 'deleted_at' => NULL, ); - - - - - // Delete all the old data DB::table('locations')->truncate(); diff --git a/app/database/seeds/ManufacturersSeeder.php b/app/database/seeds/ManufacturersSeeder.php index 0d4c724d5d..6cd8fc4f24 100644 --- a/app/database/seeds/ManufacturersSeeder.php +++ b/app/database/seeds/ManufacturersSeeder.php @@ -7,36 +7,35 @@ class ManufacturersSeeder extends Seeder { $date = date("Y-m-d"); $manufacturers[] = array( - 'name' => 'Apple', - 'created_at' => $date, - 'user_id' => 1, - ); - $manufacturers[] = array( - 'name' => 'Microsoft', - 'created_at' => $date, - 'user_id' => 1, - ); - $manufacturers[] = array( - 'name' => 'ASUS', - 'created_at' => $date, - 'user_id' => 1, - ); - $manufacturers[] = array( - 'name' => 'Dell', - 'created_at' => $date, - 'user_id' => 1, + 'name' => 'Apple', + 'created_at' => $date, + 'user_id' => 1, + 'updated_at' => $date, + 'deleted_at' => NULL, ); $manufacturers[] = array( - 'name' => 'Tower Software', - 'created_at' => $date, - 'user_id' => 1, + 'name' => 'Microsoft', + 'created_at' => $date, + 'user_id' => 1, + 'updated_at' => $date, + 'deleted_at' => NULL, ); $manufacturers[] = array( - 'name' => 'Adobe', - 'created_at' => $date, - 'user_id' => 1, + 'name' => 'ASUS', + 'created_at' => $date, + 'user_id' => 1, + 'updated_at' => $date, + 'deleted_at' => NULL, + ); + + $manufacturers[] = array( + 'name' => 'Dell', + 'created_at' => $date, + 'user_id' => 1, + 'updated_at' => $date, + 'deleted_at' => NULL, ); diff --git a/app/database/seeds/SettingsSeeder.php b/app/database/seeds/SettingsSeeder.php index 43838a1b70..6d0d6fee60 100644 --- a/app/database/seeds/SettingsSeeder.php +++ b/app/database/seeds/SettingsSeeder.php @@ -13,8 +13,8 @@ class SettingsSeeder extends Seeder { $setting[] = array( 'per_page' => '50', 'site_name' => 'Snipe IT Asset Management', - 'created_at' => $date->modify('-10 day'), - 'updated_at' => $date->modify('-3 day'), + 'created_at' => $date, + 'updated_at' => $date, 'user_id' => 1, ); diff --git a/app/database/seeds/StatuslabelsSeeder.php b/app/database/seeds/StatuslabelsSeeder.php index b967c3db8b..795a4f4191 100644 --- a/app/database/seeds/StatuslabelsSeeder.php +++ b/app/database/seeds/StatuslabelsSeeder.php @@ -16,6 +16,7 @@ class StatuslabelsSeeder extends Seeder { 'created_at' => $date->modify('-10 day'), 'updated_at' => $date->modify('-3 day'), 'user_id' => 1, + 'deleted_at' => NULL, ); @@ -24,6 +25,7 @@ class StatuslabelsSeeder extends Seeder { 'created_at' => $date->modify('-10 day'), 'updated_at' => $date->modify('-3 day'), 'user_id' => 1, + 'deleted_at' => NULL, ); @@ -32,6 +34,7 @@ class StatuslabelsSeeder extends Seeder { 'created_at' => $date->modify('-10 day'), 'updated_at' => $date->modify('-3 day'), 'user_id' => 1, + 'deleted_at' => NULL, ); $status[] = array( @@ -39,6 +42,7 @@ class StatuslabelsSeeder extends Seeder { 'created_at' => $date->modify('-10 day'), 'updated_at' => $date->modify('-3 day'), 'user_id' => 1, + 'deleted_at' => NULL, );