From d494400e7eae16626016c6165acf89c18333ff1b Mon Sep 17 00:00:00 2001
From: Deon George <deon@leenooks.net>
Date: Sat, 6 Aug 2022 00:19:20 +1000
Subject: [PATCH] Updated form helpers, to ensure right hand corners were
 rounded. Added success_button helper

---
 .../adminlte/views/widget/form_date.blade.php | 11 ++++---
 .../views/widget/form_select.blade.php        | 30 ++++++++++++++-----
 .../adminlte/views/widget/form_text.blade.php | 13 ++++----
 .../views/widget/success_button.blade.php     |  1 +
 4 files changed, 38 insertions(+), 17 deletions(-)
 create mode 100644 resources/themes/adminlte/views/widget/success_button.blade.php

diff --git a/resources/themes/adminlte/views/widget/form_date.blade.php b/resources/themes/adminlte/views/widget/form_date.blade.php
index 06dc1d2..35aeea2 100644
--- a/resources/themes/adminlte/views/widget/form_date.blade.php
+++ b/resources/themes/adminlte/views/widget/form_date.blade.php
@@ -1,9 +1,12 @@
 <div class="form-group">
 	<label for="{{ $id }}">{{ $label }}</label>
-	<div class="input-group">
-		<div class="input-group-prepend">
-			<span class="input-group-text"><i class="fa-fw {{ $icon ?? 'fas fa-calendar' }}"></i></span>
-		</div>
+	<div class="input-group has-validation">
+		@empty($icon)
+		@else
+			<div class="input-group-prepend">
+				<span class="input-group-text"><i class="fa-fw {{ $icon }}"></i></span>
+			</div>
+		@endempty()
 		<input type="date" class="form-control @error($id) is-invalid @enderror" id="{{ $id }}" name="{{ $name ?? $id}}" value="{{ old($old,$value) }}">
 		<span class="invalid-feedback" role="alert">
 			@error($id)
diff --git a/resources/themes/adminlte/views/widget/form_select.blade.php b/resources/themes/adminlte/views/widget/form_select.blade.php
index 1a51abf..0305030 100644
--- a/resources/themes/adminlte/views/widget/form_select.blade.php
+++ b/resources/themes/adminlte/views/widget/form_select.blade.php
@@ -1,18 +1,32 @@
 <div class="form-group">
 	<label for="{{ $id }}">{{ $label }}</label>
-	<div class="input-group">
-		<div class="input-group-prepend">
-			<span class="input-group-text"><i class="fa-fw {{ $icon ?? 'fas fa-list' }}"></i></span>
-		</div>
+	<div class="input-group has-validation">
+		@empty($icon)
+		@else
+			<div class="input-group-prepend">
+				<span class="input-group-text"><i class="fa-fw {{ $icon }}"></i></span>
+			</div>
+		@endempty()
 
 		<select class="form-control @error($id) is-invalid @enderror" id="{{ $id }}" name="{{ $name ?? $id}}">
 			@if(! isset($addvalues) || ! $addvalues)
 				<option id="new"></option>
 			@endif
-			@foreach($options as $option)
-				@empty(Arr::get($option,'value')) @continue @endempty
-				<option value="{{ Arr::get($option,'id') }}" @if(Arr::get($option,'id') == old($old,$value))selected @endif>{{ Arr::get($option,'value') }}</option>
-			@endforeach
+			@empty($groupby))
+				@foreach($options as $option)
+					@empty(Arr::get($option,'value')) @continue @endempty
+					<option value="{{ Arr::get($option,'id') }}" @if(Arr::get($option,'id') == old($old,$value))selected @endif>{{ Arr::get($option,'value') }}</option>
+				@endforeach
+			@else
+				@foreach($options->groupBy($groupby) as $group)
+					<optgroup label="{{ $groupby == 'active' ? (Arr::get($group->first(),$groupby) ? 'Active' : 'Not Active') : Arr::get($group->first(),$groupby) }}">
+						@foreach($group as $option)
+							@empty(Arr::get($option,'value')) @continue @endempty
+							<option value="{{ Arr::get($option,'id') }}" @if(Arr::get($option,'id') == old($old,$value))selected @endif>{{ Arr::get($option,'value') }}</option>
+						@endforeach
+					</optgroup>
+				@endforeach
+			@endempty
 		</select>
 
 		<span class="invalid-feedback" role="alert">
diff --git a/resources/themes/adminlte/views/widget/form_text.blade.php b/resources/themes/adminlte/views/widget/form_text.blade.php
index 42f5c5f..20aaded 100644
--- a/resources/themes/adminlte/views/widget/form_text.blade.php
+++ b/resources/themes/adminlte/views/widget/form_text.blade.php
@@ -1,10 +1,13 @@
 <div class="form-group">
 	<label for="{{ $id }}">{{ $label }}</label>
-	<div class="input-group">
-		<div class="input-group-prepend">
-			<span class="input-group-text"><i class="fa-fw {{ $icon }}"></i></span>
-		</div>
-		<input type="text" class="form-control @error($id) is-invalid @enderror" id="{{ $id }}" name="{{ $name ?: $id}}" value="{{ old($old ?? $name,$value) }}">
+	<div class="input-group has-validation">
+		@empty($icon)
+		@else
+			<div class="input-group-prepend">
+				<span class="input-group-text"><i class="fa-fw {{ $icon }}"></i></span>
+			</div>
+		@endempty()
+		<input type="text" class="form-control @error($id) is-invalid @enderror" id="{{ $id }}" name="{{ $name ?: $id }}" value="{{ old($old ?? $name,$value) }}">
 		<span class="invalid-feedback" role="alert">
 			@error($id)
 				{{ $message }}
diff --git a/resources/themes/adminlte/views/widget/success_button.blade.php b/resources/themes/adminlte/views/widget/success_button.blade.php
new file mode 100644
index 0000000..ef80179
--- /dev/null
+++ b/resources/themes/adminlte/views/widget/success_button.blade.php
@@ -0,0 +1 @@
+@if(session()->has('success'))<span class="ml-3 pt-0 pb-0 pr-1 pl-1 btn btn-outline-success float-right"><small>{{ session()->get('success') }}</small></span>@endif
\ No newline at end of file