Skip to content

A free open source IT asset/license management system

Added select to other reports

snipe14e0b18fefb5
diff --git a/resources/views/reports/custom/component.blade.php b/resources/views/reports/custom/component.blade.php
index df97bc5598..75c0d36c24 100644
--- a/resources/views/reports/custom/component.blade.php
+++ b/resources/views/reports/custom/component.blade.php
@@ -179,47 +179,41 @@
<br>
- @include ('partials.forms.edit.company-select', [
- 'translated_name' => trans('general.company'),
- 'fieldname' =>
- 'by_company_id[]',
- 'multiple' => 'true',
- 'hide_new' => 'true',
- 'selected' => $template->selectValues('by_company_id', \App\Models\Company::class),
- ])
-
- @include ('partials.forms.edit.category-select', [
- 'translated_name' => trans('general.category'),
- 'fieldname' => 'by_category_id[]',
- 'multiple' => 'true',
- 'hide_new' => 'true',
- 'category_type' => 'component',
- 'selected' => $template->selectValues('by_category_id', \App\Models\Category::class),
- ])
-
- @include ('partials.forms.edit.manufacturer-select', [
- 'translated_name' => trans('general.manufacturer'),
- 'fieldname' => 'by_manufacturer_id[]',
- 'multiple' => 'true',
- 'hide_new' => 'true',
- 'selected' => $template->selectValues('by_manufacturer_id', \App\Models\Manufacturer::class),
- ])
-
- @include ('partials.forms.edit.supplier-select', [
- 'translated_name' => trans('general.supplier'),
- 'fieldname' => 'by_supplier_id[]',
- 'multiple' => 'true',
- 'hide_new' => 'true',
- 'selected' => $template->selectValues('by_supplier_id', \App\Models\Supplier::class),
- ])
-
- @include ('partials.forms.edit.location-select', [
- 'translated_name' => trans('general.location'),
- 'fieldname' => 'by_location_id[]',
- 'multiple' => 'true',
- 'hide_new' => 'true',
- 'selected' => $template->selectValues('by_location_id', \App\Models\Location::class),
- ])
+ <x-input.select2-checkboxes
+ name="by_company_id"
+ :label="trans('general.company')"
+ endpoint="companies"
+ :selected="$template->selectValues('by_company_id', \App\Models\Company::class)"
+ :modelClass="\App\Models\Company::class"
+ />
+ <x-input.select2-checkboxes
+ name="by_category_id"
+ :label="trans('general.category')"
+ endpoint="categories/component"
+ :selected="$template->selectValues('by_category_id', \App\Models\Category::class)"
+ :modelClass="\App\Models\Category::class"
+ />
+ <x-input.select2-checkboxes
+ name="by_manufacturer_id"
+ :label="trans('general.manufacturer')"
+ endpoint="manufacturers"
+ :selected="$template->selectValues('by_manufacturer_id', \App\Models\Manufacturer::class)"
+ :modelClass="\App\Models\Manufacturer::class"
+ />
+ <x-input.select2-checkboxes
+ name="by_supplier_id"
+ :label="trans('general.supplier')"
+ endpoint="suppliers"
+ :selected="$template->selectValues('by_supplier_id', \App\Models\Supplier::class)"
+ :modelClass="\App\Models\Supplier::class"
+ />
+ <x-input.select2-checkboxes
+ name="by_location_id"
+ :label="trans('general.location')"
+ endpoint="locations"
+ :selected="$template->selectValues('by_location_id', \App\Models\Location::class)"
+ :modelClass="\App\Models\Location::class"
+ />
<!-- Name -->
<div class="form-group">
diff --git a/resources/views/reports/custom/consumable.blade.php b/resources/views/reports/custom/consumable.blade.php
index 850f9b5ecd..97bc4fb5f6 100644
--- a/resources/views/reports/custom/consumable.blade.php
+++ b/resources/views/reports/custom/consumable.blade.php
@@ -173,45 +173,40 @@
<br>
- <x-input.company-select
+ <x-input.select2-checkboxes
+ name="by_company_id"
:label="trans('general.company')"
- name="by_company_id[]"
- multiple
- hideNewButton
- :selected="collect($template->selectValues('by_company_id', \App\Models\Company::class))->all()"
+ endpoint="companies"
+ :selected="$template->selectValues('by_company_id', \App\Models\Company::class)"
+ :modelClass="\App\Models\Company::class"
/>
-
- <x-input.category-select
+ <x-input.select2-checkboxes
+ name="by_category_id"
:label="trans('general.category')"
- name="by_category_id[]"
- multiple
- hideNewButton
- categoryType="consumable"
- :selected="collect($template->selectValues('by_category_id', \App\Models\Category::class))->all()"
+ endpoint="categories/consumable"
+ :selected="$template->selectValues('by_category_id', \App\Models\Category::class)"
+ :modelClass="\App\Models\Category::class"
/>
-
- <x-input.manufacturer-select
+ <x-input.select2-checkboxes
+ name="by_manufacturer_id"
:label="trans('general.manufacturer')"
- name="by_manufacturer_id[]"
- multiple
- hideNewButton
- :selected="collect($template->selectValues('by_manufacturer_id', \App\Models\Manufacturer::class))->all()"
+ endpoint="manufacturers"
+ :selected="$template->selectValues('by_manufacturer_id', \App\Models\Manufacturer::class)"
+ :modelClass="\App\Models\Manufacturer::class"
/>
-
- <x-input.supplier-select
+ <x-input.select2-checkboxes
+ name="by_supplier_id"
:label="trans('general.supplier')"
- name="by_supplier_id[]"
- multiple
- hideNewButton
- :selected="collect($template->selectValues('by_supplier_id', \App\Models\Supplier::class))->all()"
+ endpoint="suppliers"
+ :selected="$template->selectValues('by_supplier_id', \App\Models\Supplier::class)"
+ :modelClass="\App\Models\Supplier::class"
/>
-
- <x-input.location-select
+ <x-input.select2-checkboxes
+ name="by_location_id"
:label="trans('general.location')"
- name="by_location_id[]"
- multiple
- hideNewButton
- :selected="collect($template->selectValues('by_location_id', \App\Models\Location::class))->all()"
+ endpoint="locations"
+ :selected="$template->selectValues('by_location_id', \App\Models\Location::class)"
+ :modelClass="\App\Models\Location::class"
/>
<!-- Name -->