Updated more views

This commit is contained in:
snipe
2025-09-24 16:58:35 +01:00
parent f0561475cc
commit 235dcbc7d9
18 changed files with 79 additions and 121 deletions
+1 -9
View File
@@ -32,14 +32,12 @@
<x-form-row
:label="trans('general.model_no')"
:$item
:$errors
name="model_number"
/>
<!-- Order number -->
<x-form-row
:label="trans('general.order_number')"
:$item
:$errors
name="order_number"
input_div_class="col-md-5 col-sm-12"
/>
@@ -49,7 +47,6 @@
<x-form-row
:label="trans('general.purchase_date')"
:$item
:$errors
name="purchase_date"
type="date"
input_div_class="col-md-4 col-sm-12"
@@ -60,7 +57,6 @@
<x-form-row
:label="trans('general.unit_cost')"
:$item
:$errors
name="purchase_cost"
type="number"
maxlength="25"
@@ -74,7 +70,6 @@
<x-form-row
:label="trans('general.quantity')"
:$item
:$errors
input_div_class="col-md-2"
name="qty"
/>
@@ -83,7 +78,6 @@
<x-form-row
:label="trans('general.min_amt')"
:$item
:$errors
name="min_amt"
input_div_class="col-md-2"
minlength="1"
@@ -96,13 +90,11 @@
<x-form-row
:label="trans('general.notes')"
:$item
:$errors
name="notes"
type="textarea"
maxlength="65000"
placeholder="{{ trans('general.placeholders.notes') }}"
/>
@include ('partials.forms.edit.image-upload', ['image_path' => app('accessories_upload_path')])
@stop
+6 -1
View File
@@ -9,7 +9,12 @@
@section('inputFields')
@include ('partials.forms.edit.name', ['translated_name' => trans('admin/categories/general.name')])
<!-- Name -->
<x-form-row
:label="trans('general.name')"
:$item
name="name"
/>
<!-- Type -->
<div class="form-group {{ $errors->has('category_type') ? ' has-error' : '' }}">
-5
View File
@@ -12,7 +12,6 @@
<x-form-row
:label="trans('general.name')"
:$item
:$errors
name="name"
/>
@@ -20,7 +19,6 @@
<x-form-row
:label="trans('general.phone')"
:$item
:$errors
name="phone"
type="tel"
/>
@@ -29,7 +27,6 @@
<x-form-row
:label="trans('general.fax')"
:$item
:$errors
name="fax"
type="tel"
/>
@@ -38,7 +35,6 @@
<x-form-row
:label="trans('general.email')"
:$item
:$errors
name="fax"
type="email"
/>
@@ -50,7 +46,6 @@
<x-form-row
:label="trans('general.notes')"
:$item
:$errors
name="notes"
type="textarea"
maxlength="65000"
+1 -9
View File
@@ -20,7 +20,6 @@
<x-form-row
:label="trans('general.name')"
:$item
:$errors
name="name"
/>
@@ -29,7 +28,6 @@
<x-form-row
:label="trans('general.quantity')"
:$item
:$errors
name="qty"
input_div_class="col-md-2"
minlength="1"
@@ -42,7 +40,6 @@
<x-form-row
:label="trans('general.min_amt')"
:$item
:$errors
name="min_amt"
input_div_class="col-md-2"
minlength="1"
@@ -54,7 +51,6 @@
<x-form-row
:label="trans('admin/hardware/form.serial')"
:$item
:$errors
name="serial"
type="text"
/>
@@ -65,7 +61,6 @@
<x-form-row
:label="trans('general.model_no')"
:$item
:$errors
name="model_number"
input_div_class="col-md-5 col-sm-12"
/>
@@ -78,7 +73,6 @@
<x-form-row
:label="trans('general.order_number')"
:$item
:$errors
name="order_number"
input_div_class="col-md-5 col-sm-12"
/>
@@ -87,7 +81,6 @@
<x-form-row
:label="trans('general.purchase_date')"
:$item
:$errors
name="purchase_date"
type="date"
input_div_class="col-md-4 col-sm-12"
@@ -98,7 +91,6 @@
<x-form-row
:label="trans('general.unit_cost')"
:$item
:$errors
name="purchase_cost"
type="number"
maxlength="25"
@@ -112,12 +104,12 @@
<x-form-row
:label="trans('general.notes')"
:$item
:$errors
name="notes"
type="textarea"
maxlength="65000"
placeholder="{{ trans('general.placeholders.notes') }}"
/>
@include ('partials.forms.edit.image-upload', ['image_path' => app('components_upload_path')])
@@ -20,7 +20,6 @@
<x-form-row
:label="trans('general.name')"
:$item
:$errors
name="name"
/>
@@ -33,7 +32,6 @@
<x-form-row
:label="trans('general.model_no')"
:$item
:$errors
name="model_number"
input_div_class="col-md-5 col-sm-12"
/>
@@ -42,7 +40,6 @@
<x-form-row
:label="trans('admin/consumables/general.item_no')"
:$item
:$errors
name="item_no"
input_div_class="col-md-5 col-sm-12"
/>
@@ -51,7 +48,6 @@
<x-form-row
:label="trans('general.order_number')"
:$item
:$errors
name="order_number"
input_div_class="col-md-5 col-sm-12"
/>
@@ -60,7 +56,6 @@
<x-form-row
:label="trans('general.purchase_date')"
:$item
:$errors
name="purchase_date"
type="date"
input_div_class="col-md-4 col-sm-12"
@@ -71,7 +66,6 @@
<x-form-row
:label="trans('general.unit_cost')"
:$item
:$errors
name="purchase_cost"
type="number"
maxlength="25"
@@ -86,7 +80,6 @@
<x-form-row
:label="trans('general.quantity')"
:$item
:$errors
name="qty"
input_div_class="col-md-2"
/>
@@ -96,7 +89,6 @@
<x-form-row
:label="trans('general.min_amt')"
:$item
:$errors
name="min_amt"
input_div_class="col-md-2"
minlength="1"
@@ -109,7 +101,6 @@
<x-form-row
:label="trans('general.notes')"
:$item
:$errors
name="notes"
type="textarea"
maxlength="65000"
@@ -40,16 +40,12 @@
<div class="col-md-8">
<!-- Name -->
<div class="form-group {{ $errors->has('name') ? ' has-error' : '' }}">
<label for="name" class="col-md-3 control-label">
{{ trans('admin/custom_fields/general.field_name') }}
</label>
<div class="col-md-8 required">
<input class="form-control" aria-label="name" name="name" type="text" required value="{{ old('name', $field->name) }}">
{!! $errors->first('name', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
</div>
</div>
<!-- Name -->
<x-form-row
:label="trans('general.name')"
:$item
name="name"
/>
<!-- Element Type -->
<div class="form-group {{ $errors->has('element') ? ' has-error' : '' }}">
@@ -11,7 +11,12 @@
@stop
@section('inputFields')
@include ('partials.forms.edit.name', ['translated_name' => trans('general.name')])
<!-- Name -->
<x-form-row
:label="trans('general.name')"
:$item
name="name"
/>
@stop
+30 -17
View File
@@ -7,7 +7,12 @@
{{-- Page content --}}
@section('inputFields')
@include ('partials.forms.edit.name', ['translated_name' => trans('admin/departments/table.name')])
<!-- Name -->
<x-form-row
:label="trans('general.name')"
:$item
name="name"
/>
<!-- Company -->
@if (\App\Models\Company::canManageUsersCompanies())
@@ -16,8 +21,21 @@
<input id="hidden_company_id" type="hidden" name="company_id" value="{{ Auth::user()->company_id }}">
@endif
@include ('partials.forms.edit.phone')
@include ('partials.forms.edit.fax')
<!-- Phone -->
<x-form-row
:label="trans('general.phone')"
:$item
name="phone"
type="tel"
/>
<!-- Fax -->
<x-form-row
:label="trans('general.fax')"
:$item
name="fax"
type="tel"
/>
<!-- Manager -->
@include ('partials.forms.edit.user-select', ['translated_name' => trans('admin/users/table.manager'), 'fieldname' => 'manager_id'])
@@ -26,20 +44,15 @@
@include ('partials.forms.edit.location-select', ['translated_name' => trans('general.location'), 'fieldname' => 'location_id'])
@include ('partials.forms.edit.image-upload', ['image_path' => app('departments_upload_path')])
<div class="form-group{!! $errors->has('notes') ? ' has-error' : '' !!}">
<label for="notes" class="col-md-3 control-label">{{ trans('general.notes') }}</label>
<div class="col-md-8">
<x-input.textarea
name="notes"
id="notes"
:value="old('notes', $item->notes)"
placeholder="{{ trans('general.placeholders.notes') }}"
aria-label="notes"
rows="5"
/>
{!! $errors->first('notes', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
</div>
</div>
<!-- Notes -->
<x-form-row
:label="trans('general.notes')"
:$item
name="notes"
type="textarea"
maxlength="65000"
placeholder="{{ trans('general.placeholders.notes') }}"
/>
@stop
+17 -11
View File
@@ -9,17 +9,23 @@
{{-- Page content --}}
@section('inputFields')
@include ('partials.forms.edit.name', ['translated_name' => trans('admin/depreciations/general.depreciation_name')])
<!-- Months -->
<div class="form-group {{ $errors->has('months') ? ' has-error' : '' }}">
<label for="months" class="col-md-3 control-label">
{{ trans('admin/depreciations/general.number_of_months') }}
</label>
<div class="col-md-9 col-sm-12">
<input class="form-control" type="number" min="0" max="3600" name="months" id="months" value="{{ old('months', $item->months) }}" style="width: 90px;"{!! (\App\Helpers\Helper::checkIfRequired($item, 'months')) ? ' required' : '' !!} />
{!! $errors->first('months', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
</div>
</div>
<!-- Name -->
<x-form-row
:label="trans('general.name')"
:$item
name="name"
/>
<!-- Months -->
<x-form-row
:label="'admin/depreciations/general.number_of_months'"
:$item
name="months"
type="number"
min="0"
max="3600"
/>
<!-- Depreciation Minimum -->
<div class="form-group {{ $errors->has('depreciation_min') ? ' has-error' : '' }}">
+6 -1
View File
@@ -6,5 +6,10 @@
{{-- Page content --}}
@section('inputFields')
@include ('partials.forms.edit.name', ['translated_name' => trans('general.name')])
<!-- Name -->
<x-form-row
:label="trans('general.name')"
:$item
name="name"
/>
@stop
-5
View File
@@ -25,12 +25,7 @@
<table
data-cookie-id-table="kitModelsTable"
data-columns="{{ \App\Presenters\PredefinedKitPresenter::dataTableModels() }}"
data-side-pagination="server"
data-sort-order="asc"
data-sort-name="name"
id="kitModelsTable"
-15
View File
@@ -19,7 +19,6 @@
<x-form-row
:label="trans('general.name')"
:$item
:$errors
name="name"
/>
@@ -30,7 +29,6 @@
<x-form-row
:label="trans('admin/licenses/form.seats')"
:$item
:$errors
name="seats"
input_div_class="col-md-2"
minlength="1"
@@ -42,7 +40,6 @@
<x-form-row
:label="trans('general.min_amt')"
:$item
:$errors
name="seats"
input_div_class="col-md-2"
minlength="1"
@@ -56,7 +53,6 @@
<x-form-row
:label="trans('admin/licenses/form.license_key')"
:$item
:$errors
name="serial"
type="textarea"
maxlength="65000"
@@ -71,7 +67,6 @@
<x-form-row
:label="trans('admin/licenses/form.to_name')"
:$item
:$errors
name="license_name"
/>
@@ -79,7 +74,6 @@
<x-form-row
:label="trans('admin/licenses/form.to_email')"
:$item
:$errors
name="license_email"
type="email"
/>
@@ -88,7 +82,6 @@
<x-form-row-checkbox
:label="trans('admin/licenses/form.reassignable')"
:$item
:$errors
name="reassignable"
checkbox_value="1"
:value_text="trans('general.yes')"
@@ -100,7 +93,6 @@
<x-form-row
:label="trans('general.order_number')"
:$item
:$errors
name="order_number"
input_div_class="col-md-5 col-sm-12"
/>
@@ -109,7 +101,6 @@
<x-form-row
:label="trans('admin/licenses/form.purchase_order')"
:$item
:$errors
name="purchase_order"
input_div_class="col-md-5 col-sm-12"
/>
@@ -118,7 +109,6 @@
<x-form-row
:label="trans('general.purchase_cost')"
:$item
:$errors
name="purchase_cost"
type="number"
maxlength="25"
@@ -133,7 +123,6 @@
<x-form-row
:label="trans('general.purchase_date')"
:$item
:$errors
name="purchase_date"
type="date"
input_div_class="col-md-4 col-sm-12"
@@ -145,7 +134,6 @@
<x-form-row
:label="trans('admin/licenses/form.expiration')"
:$item
:$errors
name="expiration_date"
type="date"
input_div_class="col-md-4 col-sm-12"
@@ -157,7 +145,6 @@
<x-form-row
:label="trans('admin/licenses/form.termination_date')"
:$item
:$errors
name="termination_date"
type="date"
input_div_class="col-md-4 col-sm-12"
@@ -171,7 +158,6 @@
<x-form-row-checkbox
:label="trans('admin/licenses/form.maintained')"
:$item
:$errors
:value_text="trans('general.yes')"
name="maintained"
checkbox_value="1"
@@ -182,7 +168,6 @@
<x-form-row
:label="trans('general.notes')"
:$item
:$errors
name="notes"
type="textarea"
maxlength="65000"
-5
View File
@@ -14,7 +14,6 @@
<x-form-row
:label="trans('general.name')"
:$item
:$errors
name="name"
/>
@@ -31,7 +30,6 @@
<x-form-row
:label="trans('general.phone')"
:$item
:$errors
name="phone"
type="tel"
/>
@@ -40,7 +38,6 @@
<x-form-row
:label="trans('general.fax')"
:$item
:$errors
name="fax"
type="tel"
/>
@@ -49,7 +46,6 @@
<x-form-row
:label="trans('admin/locations/table.currency')"
:$item
:$errors
name="currency"
maxlength="3"
input_div_class="col-md-2 col-sm-6 col-xs-6"
@@ -82,7 +78,6 @@
<x-form-row
:label="trans('general.notes')"
:$item
:$errors
name="notes"
type="textarea"
maxlength="65000"
+6 -1
View File
@@ -43,7 +43,12 @@
<div class="box-body">
@include ('partials.forms.edit.name', ['translated_name' => trans('general.name'), 'required' => 'true'])
<!-- Name -->
<x-form-row
:label="trans('general.name')"
:$item
name="name"
/>
<!-- This is a new maintenance -->
@if (!$item->id)
@@ -14,7 +14,6 @@
<x-form-row
:label="trans('admin/manufacturers/table.name')"
:$item
:$errors
name="name"
/>
@@ -22,7 +21,6 @@
<x-form-row
:label="trans('general.url')"
:$item
:$errors
name="url"
type="url"
/>
@@ -31,7 +29,6 @@
<x-form-row
:label="trans('admin/manufacturers/table.support_url')"
:$item
:$errors
name="support_url"
type="url"
/>
@@ -40,7 +37,6 @@
<x-form-row
:label="trans('admin/manufacturers/table.warranty_lookup_url')"
:$item
:$errors
help_text="{!! trans('admin/manufacturers/message.support_url_help') !!}"
name="warranty_lookup_url"
type="url"
@@ -50,7 +46,6 @@
<x-form-row
:label="trans('admin/manufacturers/table.support_phone')"
:$item
:$errors
name="support_phone"
type="tel"
/>
@@ -59,7 +54,6 @@
<x-form-row
:label="trans('admin/manufacturers/table.support_email')"
:$item
:$errors
name="support_email"
type="email"
input_div_class="col-md-6 col-sm-12 col-xs-12"
@@ -72,7 +66,6 @@
<x-form-row
:label="trans('general.notes')"
:$item
:$errors
name="notes"
type="textarea"
maxlength="65000"
-4
View File
@@ -14,7 +14,6 @@
<x-form-row
:label="trans('general.name')"
:$item
:$errors
name="name"
/>
@@ -25,7 +24,6 @@
<x-form-row
:label="trans('general.model_no')"
:$item
:$errors
name="model_number"
/>
@@ -35,7 +33,6 @@
<x-form-row
:label="trans('general.min_amt')"
:$item
:$errors
name="min_amt"
input_div_class="col-md-2"
minlength="1"
@@ -90,7 +87,6 @@
<x-form-row
:label="trans('general.notes')"
:$item
:$errors
name="notes"
type="textarea"
maxlength="65000"
@@ -23,7 +23,6 @@
<x-form-row
:label="trans('general.name')"
:$item
:$errors
name="name"
/>
@@ -61,7 +60,6 @@
<x-form-row
:label="trans('general.notes')"
:$item
:$errors
name="notes"
type="textarea"
maxlength="65000"
@@ -72,7 +70,6 @@
<x-form-row-checkbox
:label="trans('admin/statuslabels/table.show_in_nav')"
:$item
:$errors
:value_text="trans('general.yes')"
name="show_in_nav"
checkbox_value="1"
@@ -81,7 +78,6 @@
<!-- Set as Default -->
<x-form-row-checkbox
:$item
:$errors
:value_text="trans('general.yes')"
name="default_label"
checkbox_value="1"
-7
View File
@@ -14,7 +14,6 @@
<x-form-row
:label="trans('general.name')"
:$item
:$errors
name="name"
/>
@@ -24,7 +23,6 @@
<x-form-row
:label="trans('admin/suppliers/table.contact')"
:$item
:$errors
name="contact"
/>
@@ -33,7 +31,6 @@
<x-form-row
:label="trans('general.phone')"
:$item
:$errors
name="phone"
type="tel"
/>
@@ -42,7 +39,6 @@
<x-form-row
:label="trans('general.fax')"
:$item
:$errors
name="fax"
type="tel"
/>
@@ -51,7 +47,6 @@
<x-form-row
:label="trans('general.email')"
:$item
:$errors
name="email"
type="email"
/>
@@ -60,7 +55,6 @@
<x-form-row
:label="trans('general.url')"
:$item
:$errors
name="url"
type="url"
/>
@@ -71,7 +65,6 @@
<x-form-row
:label="trans('general.notes')"
:$item
:$errors
name="notes"
type="textarea"
maxlength="65000"