Skip to content

A free open source IT asset/license management system

move example asset to asset factory

Godfrey M3c01a8e58d1e
diff --git a/app/Http/Controllers/LabelsController.php b/app/Http/Controllers/LabelsController.php
index 9b7b154cc7..e30e85abaf 100755
--- a/app/Http/Controllers/LabelsController.php
+++ b/app/Http/Controllers/LabelsController.php
@@ -60,44 +60,7 @@ class LabelsController extends Controller
}
- $exampleAsset = new Asset;
-
- $exampleAsset->id = 999999;
- $exampleAsset->name = 'JEN-867-5309';
- $exampleAsset->asset_tag = '100001';
- $exampleAsset->serial = 'SN9876543210';
- $exampleAsset->asset_eol_date = '2025-01-01';
- $exampleAsset->order_number = '12345';
- $exampleAsset->purchase_date = '2023-01-01';
- $exampleAsset->status_id = 1;
- $exampleAsset->location_id = 1;
-
- $exampleAsset->company = new Company([
- 'name' => trans('admin/labels/table.example_company'),
- 'phone' => '1-555-555-5555',
- 'email' => '[email protected]',
- 'logo' => 'label-preview-logo.png',
- ]);
- $exampleAsset->is_label_preview = true;
-
- $exampleAsset->setRelation('assignedTo', new User(['first_name' => 'Luke', 'last_name' => 'Skywalker']));
- $exampleAsset->defaultLoc = new Location(['name' => trans('admin/labels/table.example_defaultloc'), 'phone' => '1-555-555-5555']);
- $exampleAsset->location = new Location(['name' => trans('admin/labels/table.example_location'), 'phone' => '1-555-555-5555']);
-
- $exampleAsset->model = new AssetModel;
- $exampleAsset->model->id = 999999;
- $exampleAsset->model->name = trans('admin/labels/table.example_model');
- $exampleAsset->model->model_number = 'MDL5678';
- $exampleAsset->model->manufacturer = new Manufacturer;
- $exampleAsset->model->manufacturer->id = 999999;
- $exampleAsset->model->manufacturer->name = trans('admin/labels/table.example_manufacturer');
- $exampleAsset->model->manufacturer->support_email = '[email protected]';
- $exampleAsset->model->manufacturer->support_phone = '1-555-555-5555';
- $exampleAsset->model->manufacturer->support_url = 'https://example.com';
- $exampleAsset->supplier = new Supplier(['name' => trans('admin/labels/table.example_company')]);
- $exampleAsset->model->category = new Category;
- $exampleAsset->model->category->id = 999999;
- $exampleAsset->model->category->name = trans('admin/labels/table.example_category');
+ $exampleAsset = Asset::factory()->labelPreview()->make();
$customFieldColumns = CustomField::where('field_encrypted', '=', 0)->pluck('db_column');
@@ -422,59 +385,7 @@ class LabelsController extends Controller
$template->applyEditorConfig($editorConfig);
}
- $exampleAsset = new Asset;
- $exampleAsset->id = 999999;
- $exampleAsset->name = 'JEN-867-5309';
- $exampleAsset->asset_tag = '100001';
- $exampleAsset->serial = 'SN9876543210';
- $exampleAsset->asset_eol_date = '2025-01-01';
- $exampleAsset->order_number = '12345';
- $exampleAsset->purchase_date = '2023-01-01';
- $exampleAsset->status_id = 1;
- $exampleAsset->location_id = 1;
-
- $exampleAsset->company = new Company([
- 'name' => trans('admin/labels/table.example_company'),
- 'phone' => '1-555-555-5555',
- 'email' => '[email protected]',
- ]);
-
- $exampleAsset->setRelation('assignedTo', new User([
- 'first_name' => 'Luke',
- 'last_name' => 'Skywalker',
- ]));
-
- $exampleAsset->defaultLoc = new Location([
- 'name' => trans('admin/labels/table.example_defaultloc'),
- 'phone' => '1-555-555-5555',
- ]);
-
- $exampleAsset->location = new Location([
- 'name' => trans('admin/labels/table.example_location'),
- 'phone' => '1-555-555-5555',
- ]);
-
- $exampleAsset->model = new AssetModel;
- $exampleAsset->model->id = 999999;
- $exampleAsset->model->name = trans('admin/labels/table.example_model');
- $exampleAsset->model->model_number = 'MDL5678';
-
- $exampleAsset->model->manufacturer = new Manufacturer;
- $exampleAsset->model->manufacturer->id = 999999;
- $exampleAsset->model->manufacturer->name = trans('admin/labels/table.example_manufacturer');
- $exampleAsset->model->manufacturer->support_email = '[email protected]';
- $exampleAsset->model->manufacturer->support_phone = '1-555-555-5555';
- $exampleAsset->model->manufacturer->support_url = 'https://example.com';
-
- $exampleAsset->supplier = new Supplier([
- 'name' => trans('admin/labels/table.example_company'),
- ]);
-
- $exampleAsset->model->category = new Category;
- $exampleAsset->model->category->id = 999999;
- $exampleAsset->model->category->name = trans('admin/labels/table.example_category');
-
- $exampleAsset->is_label_preview = true;
+ $exampleAsset = Asset::factory()->labelPreview()->make();
$customFieldColumns = CustomField::where('field_encrypted', 0)->pluck('db_column');
@@ -709,9 +620,16 @@ class LabelsController extends Controller
);
if ($configValidator->fails()) {
+
+ $messages = collect($configValidator->errors()->all())
+ ->map(function ($message) {
+ return '<i class="fa-solid fa-xmark text-danger"></i> ' . $message;
+ })
+ ->toArray();
+
return back()
->withErrors([
- 'config_snapshot' => $configValidator->errors()->all(),
+ 'config_snapshot' => $messages,
])
->withInput();
}
diff --git a/database/factories/AssetFactory.php b/database/factories/AssetFactory.php
index 6d8d8f56ac..ead0ba34f9 100644
--- a/database/factories/AssetFactory.php
+++ b/database/factories/AssetFactory.php
@@ -5,6 +5,9 @@ namespace Database\Factories;
use App\Models\Asset;
use App\Models\AssetModel;
use App\Models\CustomField;
+use App\Models\Company;
+use App\Models\Manufacturer;
+use App\Models\Category;
use App\Models\Location;
use App\Models\Statuslabel;
use App\Models\Supplier;
@@ -418,4 +421,62 @@ class AssetFactory extends Factory
$asset->setValidating(true);
});
}
+
+ public function labelPreview()
+ {
+ return $this->afterMaking(function (Asset $asset) {
+
+ $asset->id = 999999;
+ $asset->name = 'JEN-867-5309';
+ $asset->asset_tag = '100001';
+ $asset->serial = 'SN9876543210';
+ $asset->asset_eol_date = '2025-01-01';
+ $asset->order_number = '12345';
+ $asset->purchase_date = '2023-01-01';
+ $asset->status_id = 1;
+ $asset->location_id = 1;
+
+ $asset->company = new Company([
+ 'name' => trans('admin/labels/table.example_company'),
+ 'phone' => '1-555-555-5555',
+ 'email' => '[email protected]',
+ 'logo' => 'label-preview-logo.png',
+ ]);
+
+ $asset->setRelation('assignedTo', new User([
+ 'first_name' => 'Luke',
+ 'last_name' => 'Skywalker',
+ ]));
+
+ $asset->defaultLoc = new Location([
+ 'name' => trans('admin/labels/table.example_defaultloc'),
+ 'phone' => '1-555-555-5555',
+ ]);
+
+ $asset->location = new Location([
+ 'name' => trans('admin/labels/table.example_location'),
+ 'phone' => '1-555-555-5555',
+ ]);
+
+ $asset->model = new AssetModel;
+ $asset->model->id = 999999;
+ $asset->model->name = trans('admin/labels/table.example_model');
+ $asset->model->model_number = 'MDL5678';
+
+ $asset->model->manufacturer = new Manufacturer;
+ $asset->model->manufacturer->id = 999999;
+ $asset->model->manufacturer->name = trans('admin/labels/table.example_manufacturer');
+
+ $asset->supplier = new Supplier([
+ 'name' => trans('admin/labels/table.example_company'),
+ ]);
+
+ $asset->model->category = new Category;
+ $asset->model->category->id = 999999;
+ $asset->model->category->name = trans('admin/labels/table.example_category');
+ $asset->is_label_preview = true;
+ });
+
+
+ }
}
diff --git a/resources/views/settings/label-edit.blade.php b/resources/views/settings/label-edit.blade.php
index 73f262a59b..25ca7e8265 100644
--- a/resources/views/settings/label-edit.blade.php
+++ b/resources/views/settings/label-edit.blade.php
@@ -7,6 +7,13 @@
@stop
@section('header_right')
+ <button
+ type="submit"
+ form="label-customizer-form"
+ class="btn btn-success"
+ >
+ <i class="fa fa-check"></i> Save
+ </button>
<a href="{{ route('settings.labels.index') }}" class="btn btn-primary"> {{ trans('general.back') }}</a>
@stop
@@ -71,14 +78,6 @@
.label-form-footer {
grid-column: 1 / -1;
}
-
- .label-form-header {
- position: sticky;
- top: 0;
- z-index: 15;
- padding: 10px 0;
- grid-column: 1 / -1;
- }
</style>
<div class="col-sm-10 col-sm-offset-1 col-md-10 col-md-offset-1">
@@ -111,7 +110,7 @@
$defaultName = $selectedLabel ? 'Copy of '.$selectedLabel : 'Custom Label';
@endphp
- <div class="form-group">
+ <div class="form-group" style="margin-left: 0; margin-right: 0;">
<label for="name" style="display:block; margin-bottom:6px;">
Label Name
</label>
@@ -322,15 +321,7 @@
</div>
<div class="label-form-footer">
<div class="box-footer clearfix" style="padding-left: 0; padding-right: 0;">
- <div class="pull-right">
- <button
- type="submit"
- form="label-customizer-form"
- class="btn btn-success"
- >
- <i class="fa fa-check"></i> Save
- </button>
- </div>
+
</div>
</div>
@stop
diff --git a/resources/views/settings/labels.blade.php b/resources/views/settings/labels.blade.php
index f5a0b4179a..2c77c11270 100644
--- a/resources/views/settings/labels.blade.php
+++ b/resources/views/settings/labels.blade.php
@@ -82,7 +82,8 @@
@if ($setting->label2_enable)
- <div class="form-group{{ $errors->has('config_snapshot') ? ' has-error' : '' }}">
+ <!-- Import Label -->
+ <div class="form-group">
<div class="col-md-3 text-right">
<label for="config_snapshot" class="control-label">
Import Label Config
@@ -167,14 +168,14 @@
</div>
@if ($errors->has('config_snapshot'))
- <ul class="alert-msg">
+ <ul class="alert-msg list-unstyled" style="margin-top: 10px;">
@foreach ((array) $errors->get('config_snapshot') as $message)
@if (is_array($message))
@foreach ($message as $line)
- <li>{{ $line }}</li>
+ <li>{!! $line !!}</li>
@endforeach
@else
- <li>{{ $message }}</li>
+ <li>{!! $message !!}</li>
@endif
@endforeach
</ul>
@@ -200,6 +201,19 @@
</div>
</fieldset>
+ <fieldset name="label-preview">
+ <x-form.legend>
+ {{ trans('admin/settings/general.label2_label_preview') }}: <code
+ id="selected-template-display">{{ $setting->label2_template_display }}</code>
+ </x-form.legend>
+ <div class="col-md-12" style="margin-bottom: 10px;">
+ <input type="hidden" name="label2_template" id="label2_template"
+ value="{{ old('label2_template', $setting->label2_template) }}">
+ @include('partials.label2-preview')
+ </div>
+ </fieldset>
+
+
<fieldset name="label-settings">
<x-form.legend help_text="{{ trans('admin/settings/general.labels_title_help') }}">
{{ trans('admin/settings/general.labels_title') }}
@@ -477,17 +491,17 @@
</fieldset>
- <fieldset name="label-preview">
- <x-form.legend>
- {{ trans('admin/settings/general.label2_label_preview') }}: <code
- id="selected-template-display">{{ $setting->label2_template_display }}</code>
- </x-form.legend>
- <div class="col-md-12" style="margin-bottom: 10px;">
- <input type="hidden" name="label2_template" id="label2_template"
- value="{{ old('label2_template', $setting->label2_template) }}">
- @include('partials.label2-preview')
- </div>
- </fieldset>
+ {{-- <fieldset name="label-preview">--}}
+ {{-- <x-form.legend>--}}
+ {{-- {{ trans('admin/settings/general.label2_label_preview') }}: <code--}}
+ {{-- id="selected-template-display">{{ $setting->label2_template_display }}</code>--}}
+ {{-- </x-form.legend>--}}
+ {{-- <div class="col-md-12" style="margin-bottom: 10px;">--}}
+ {{-- <input type="hidden" name="label2_template" id="label2_template"--}}
+ {{-- value="{{ old('label2_template', $setting->label2_template) }}">--}}
+ {{-- @include('partials.label2-preview')--}}
+ {{-- </div>--}}
+ {{-- </fieldset>--}}
@include('partials.bootstrap-table')