From cc9209d2deaf7f75fdc9f2803c4c06ae2d6ac0fe Mon Sep 17 00:00:00 2001 From: snipe Date: Fri, 6 Jun 2025 11:32:13 +0100 Subject: [PATCH 1/5] Removed EOL date and purchase date partials Signed-off-by: snipe --- .../views/partials/forms/edit/eol_date.blade.php | 11 ----------- .../views/partials/forms/edit/purchase_date.blade.php | 11 ----------- 2 files changed, 22 deletions(-) delete mode 100644 resources/views/partials/forms/edit/eol_date.blade.php delete mode 100644 resources/views/partials/forms/edit/purchase_date.blade.php diff --git a/resources/views/partials/forms/edit/eol_date.blade.php b/resources/views/partials/forms/edit/eol_date.blade.php deleted file mode 100644 index 5efba06a85..0000000000 --- a/resources/views/partials/forms/edit/eol_date.blade.php +++ /dev/null @@ -1,11 +0,0 @@ - -
- -
-
- - -
- {!! $errors->first('asset_eol_date', '') !!} -
-
diff --git a/resources/views/partials/forms/edit/purchase_date.blade.php b/resources/views/partials/forms/edit/purchase_date.blade.php deleted file mode 100644 index f07387c309..0000000000 --- a/resources/views/partials/forms/edit/purchase_date.blade.php +++ /dev/null @@ -1,11 +0,0 @@ - -
- -
-
- - -
- {!! $errors->first('purchase_date', '') !!} -
-
From e18e9f699e199cda6af81f04c750750bbeb3fd35 Mon Sep 17 00:00:00 2001 From: snipe Date: Fri, 6 Jun 2025 11:32:37 +0100 Subject: [PATCH 2/5] Use blade component in datepicker partial Signed-off-by: snipe --- .../partials/forms/edit/datepicker.blade.php | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/resources/views/partials/forms/edit/datepicker.blade.php b/resources/views/partials/forms/edit/datepicker.blade.php index d91659134e..74ec021e4b 100644 --- a/resources/views/partials/forms/edit/datepicker.blade.php +++ b/resources/views/partials/forms/edit/datepicker.blade.php @@ -2,11 +2,21 @@
-
- - -
+ {!! $errors->first($fieldname, '') !!}
+ @if (isset($help_text)) +
+

+ {!! $help_text !!} +

+
+ @endif
+ \ No newline at end of file From 974627849bddeb065088e1dbca089589f9e55f85 Mon Sep 17 00:00:00 2001 From: snipe Date: Fri, 6 Jun 2025 11:32:47 +0100 Subject: [PATCH 3/5] Added datepicker partial Signed-off-by: snipe --- resources/views/blade/input/datepicker.blade.php | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 resources/views/blade/input/datepicker.blade.php diff --git a/resources/views/blade/input/datepicker.blade.php b/resources/views/blade/input/datepicker.blade.php new file mode 100644 index 0000000000..111aa8dbf7 --- /dev/null +++ b/resources/views/blade/input/datepicker.blade.php @@ -0,0 +1,13 @@ +@props([ + 'value' => '', + 'required' => '', + 'end_date' => null, + 'col_size_class' => null, +]) + + +
+ merge(['class' => 'form-control']) }} {{ $required=='1' ? 'required' : '' }}> + + +
\ No newline at end of file From b162aba445bd319fe1539aaa593b16a29b7430d5 Mon Sep 17 00:00:00 2001 From: snipe Date: Fri, 6 Jun 2025 11:33:02 +0100 Subject: [PATCH 4/5] Added localization for datepicker Signed-off-by: snipe --- resources/lang/en-US/datepicker.php | 78 +++++++++++++++++++++++++++++ 1 file changed, 78 insertions(+) create mode 100644 resources/lang/en-US/datepicker.php diff --git a/resources/lang/en-US/datepicker.php b/resources/lang/en-US/datepicker.php new file mode 100644 index 0000000000..1abad03a81 --- /dev/null +++ b/resources/lang/en-US/datepicker.php @@ -0,0 +1,78 @@ + 'Today', + 'clear' => 'Clear', + 'days' => [ + 'sunday' => 'Sunday', + 'monday' => 'Monday', + 'tuesday' => 'Tuesday', + 'wednesday' => 'Wednesday', + 'thursday' => 'Thursday', + 'friday' => 'Friday', + 'saturday' => 'Saturday', + ], + + 'short_days' => [ + 'sunday' => 'Sun', + 'monday' => 'Mon', + 'tuesday' => 'Tue', + 'wednesday' => 'Wed', + 'thursday' => 'Thu', + 'friday' => 'Fri', + 'saturday' => 'Sat', + ], + + 'min_days' => [ + 'sunday' => 'Su', + 'monday' => 'Mo', + 'tuesday' => 'Tu', + 'wednesday' => 'We', + 'thursday' => 'Th', + 'friday' => 'Fr', + 'saturday' => 'Sa', + ], + + 'months' => [ + 'january' => 'January', + 'february' => 'February', + 'march' => 'March', + 'april' => 'April', + 'may' => 'May', + 'june' => 'June', + 'july' => 'July', + 'august' => 'August', + 'september' => 'September', + 'october' => 'October', + 'november' => 'November', + 'december' => 'December', + ], + + 'months_short' => [ + 'january' => 'Jan', + 'february' => 'Feb', + 'march' => 'Mar', + 'april' => 'Apr', + 'may' => 'May', + 'june' => 'Jun', + 'july' => 'Jul', + 'august' => 'Aug', + 'september' => 'Sep', + 'october' => 'Oct', + 'november' => 'Nov', + 'december' => 'Dec', + ], + +); From 048d910d5b844e4cc485af924a4df33b4b6ab39e Mon Sep 17 00:00:00 2001 From: snipe Date: Fri, 6 Jun 2025 11:33:17 +0100 Subject: [PATCH 5/5] Use partial Signed-off-by: snipe --- resources/views/accessories/edit.blade.php | 2 +- .../views/asset_maintenances/edit.blade.php | 22 ++++--- resources/views/components/edit.blade.php | 2 +- resources/views/consumables/edit.blade.php | 2 +- resources/views/hardware/checkout.blade.php | 43 +++++-------- resources/views/hardware/edit.blade.php | 28 ++------- resources/views/layouts/default.blade.php | 62 +++++++++++++++++++ resources/views/licenses/edit.blade.php | 2 +- 8 files changed, 97 insertions(+), 66 deletions(-) diff --git a/resources/views/accessories/edit.blade.php b/resources/views/accessories/edit.blade.php index 8e0503400f..827e117b51 100644 --- a/resources/views/accessories/edit.blade.php +++ b/resources/views/accessories/edit.blade.php @@ -22,7 +22,7 @@ @include ('partials.forms.edit.location-select', ['translated_name' => trans('general.location'), 'fieldname' => 'location_id']) @include ('partials.forms.edit.model_number') @include ('partials.forms.edit.order_number') -@include ('partials.forms.edit.purchase_date') +@include ('partials.forms.edit.datepicker', ['translated_name' => trans('general.purchase_date'),'fieldname' => 'purchase_date']) @include ('partials.forms.edit.purchase_cost', ['currency_type' => $item->location->currency ?? null]) @include ('partials.forms.edit.quantity') @include ('partials.forms.edit.minimum_quantity') diff --git a/resources/views/asset_maintenances/edit.blade.php b/resources/views/asset_maintenances/edit.blade.php index 4dd390ddfa..8e41701c79 100644 --- a/resources/views/asset_maintenances/edit.blade.php +++ b/resources/views/asset_maintenances/edit.blade.php @@ -65,10 +65,12 @@
-
- - -
+ {!! $errors->first('start_date', '') !!}
@@ -80,12 +82,12 @@
-
- - - - -
+ {!! $errors->first('completion_date', '') !!}
diff --git a/resources/views/components/edit.blade.php b/resources/views/components/edit.blade.php index 206418f894..979d68248c 100644 --- a/resources/views/components/edit.blade.php +++ b/resources/views/components/edit.blade.php @@ -26,7 +26,7 @@ @include ('partials.forms.edit.location-select', ['translated_name' => trans('general.location'), 'fieldname' => 'location_id']) @include ('partials.forms.edit.supplier-select', ['translated_name' => trans('general.supplier'), 'fieldname' => 'supplier_id']) @include ('partials.forms.edit.order_number') -@include ('partials.forms.edit.purchase_date') +@include ('partials.forms.edit.datepicker', ['translated_name' => trans('general.purchase_date'),'fieldname' => 'purchase_date']) @include ('partials.forms.edit.purchase_cost') @include ('partials.forms.edit.notes') @include ('partials.forms.edit.image-upload', ['image_path' => app('components_upload_path')]) diff --git a/resources/views/consumables/edit.blade.php b/resources/views/consumables/edit.blade.php index 300a7114d9..e844338fa7 100644 --- a/resources/views/consumables/edit.blade.php +++ b/resources/views/consumables/edit.blade.php @@ -22,7 +22,7 @@ @include ('partials.forms.edit.model_number') @include ('partials.forms.edit.item_number') @include ('partials.forms.edit.order_number') -@include ('partials.forms.edit.purchase_date') +@include ('partials.forms.edit.datepicker', ['translated_name' => trans('general.purchase_date'),'fieldname' => 'purchase_date']) @include ('partials.forms.edit.purchase_cost') @include ('partials.forms.edit.quantity') @include ('partials.forms.edit.minimum_quantity') diff --git a/resources/views/hardware/checkout.blade.php b/resources/views/hardware/checkout.blade.php index ac5c8022ec..60d64221e2 100755 --- a/resources/views/hardware/checkout.blade.php +++ b/resources/views/hardware/checkout.blade.php @@ -110,14 +110,15 @@ {{ trans('admin/hardware/form.checkout_date') }}
-
- - - -
+ + {!! $errors->first('checkout_at', '') !!}
@@ -129,15 +130,12 @@
-
- - - - -
+ {!! $errors->first('expected_checkin', '') !!}
@@ -224,15 +222,4 @@ @section('moar_scripts') @include('partials/assets-assigned') - - @stop diff --git a/resources/views/hardware/edit.blade.php b/resources/views/hardware/edit.blade.php index 28b9a8438a..921a4542fd 100755 --- a/resources/views/hardware/edit.blade.php +++ b/resources/views/hardware/edit.blade.php @@ -114,28 +114,8 @@