ouyang/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'refs/heads/develop'

Browse Source
This commit is contained in:
snipe
2013-11-26 16:37:09 -05:00
parent 7f82a6e9fa 1527b88fd6
commit 7722c50312
9 changed files with 222 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/database/migrations/2013_11_26_211820_drop_license_from_assets_table.php
+31
View File
@@ -0,0 +1,31 @@
<?php
use Illuminate\Database\Migrations\Migration;
class DropLicenseFromAssetsTable extends Migration {
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::table('assets', function($table)
{
$table->dropColumn('license_name');
$table->dropColumn('license_email');
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
//
}
}
app/database/seeds/AssetsSeeder.php
+57 -27
View File
@@ -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();
app/database/seeds/CategoriesSeeder.php
+5
View File
@@ -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,
);
app/database/seeds/LicenseSeatsSeeder.php
+28 -14
View File
@@ -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' =>'',
);
app/database/seeds/LicensesSeeder.php
+28 -21
View File
@@ -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();
app/database/seeds/LocationsSeeder.php
+44 -45
View File
@@ -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();
app/database/seeds/ManufacturersSeeder.php
+23 -24
View File
@@ -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,
);
app/database/seeds/SettingsSeeder.php
+2 -2
View File
@@ -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,
);
app/database/seeds/StatuslabelsSeeder.php
+4
View File
@@ -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,
);