From 7a1c721eca13c8e270c55b41fa8249e6da40a918 Mon Sep 17 00:00:00 2001
From: Godfrey M <godmartinz@gmail.com>
Date: Mon, 9 Sep 2024 16:22:56 -0700
Subject: [PATCH 1/7] making modal partials for reuse

---
 resources/views/modals/model.blade.php        | 25 ++++---------------
 .../modals/partials/fieldset-select.blade.php |  6 +++++
 .../views/modals/partials/footer.blade.php    |  6 +++++
 .../partials/manufacturer-select.blade.php    |  9 +++++++
 .../modals/partials/model-number.blade.php    |  6 +++++
 resources/views/modals/user.blade.php         |  4 +--
 6 files changed, 34 insertions(+), 22 deletions(-)
 create mode 100644 resources/views/modals/partials/fieldset-select.blade.php
 create mode 100644 resources/views/modals/partials/footer.blade.php
 create mode 100644 resources/views/modals/partials/manufacturer-select.blade.php
 create mode 100644 resources/views/modals/partials/model-number.blade.php

diff --git a/resources/views/modals/model.blade.php b/resources/views/modals/model.blade.php
index abbd50ee97..92823c8b99 100644
--- a/resources/views/modals/model.blade.php
+++ b/resources/views/modals/model.blade.php
@@ -22,27 +22,12 @@
                     </div>
                 </div>
 
-                <div class="dynamic-form-row">
-                    <div class="col-md-4 col-xs-12"><label for="modal-manufacturer_id">{{ trans('general.manufacturer') }}:
-                        </label></div>
-                    <div class="col-md-8 col-xs-12">
-                        <select class="js-data-ajax" data-endpoint="manufacturers" name="manufacturer_id" style="width: 100%" id="modal-manufacturer_id"></select>
-                    </div>
-                </div>
 
-                <div class="dynamic-form-row">
-                    <div class="col-md-4 col-xs-12"><label for="modal-modelno">{{ trans('general.model_no') }}:</label></div>
-                    <div class="col-md-8 col-xs-12"><input type='text' name="model_number" id='modal-model_number' class="form-control"></div>
-                </div>
-
-                <div class="dynamic-form-row">
-                    <div class="col-md-4 col-xs-12"><label for="modal-fieldset_id">{{ trans('admin/models/general.fieldset') }}:</label></div>
-                    <div class="col-md-8 col-xs-12">{{ Form::select('fieldset_id', Helper::customFieldsetList(),old('fieldset_id'), array('class'=>'select2', 'id'=>'modal-fieldset_id', 'style'=>'width:350px')) }}</div>
-                </div>
-        </div>
-        <div class="modal-footer">
-            <button type="button" class="btn btn-default" data-dismiss="modal">{{ trans('button.cancel') }}</button>
-            <button type="button" class="btn btn-primary" id="modal-save">{{ trans('general.save') }}</button>
+                @include('modals.partials.manufacturer-select')
+                @include('modals.partials.model-number')
+                @include('modals.partials.fieldset-select')
+            </form>
         </div>
+       @include('modals.partials.footer')
     </div><!-- /.modal-content -->
 </div><!-- /.modal-dialog -->
diff --git a/resources/views/modals/partials/fieldset-select.blade.php b/resources/views/modals/partials/fieldset-select.blade.php
new file mode 100644
index 0000000000..dbebedef28
--- /dev/null
+++ b/resources/views/modals/partials/fieldset-select.blade.php
@@ -0,0 +1,6 @@
+<!-- partials/modals/partials/fieldset-select.blade.php -->
+<div class="dynamic-form-row">
+    <div class="col-md-4 col-xs-12"><label for="modal-fieldset_id">{{ trans('admin/models/general.fieldset') }}:</label></div>
+    <div class="col-md-8 col-xs-12">{{ Form::select('fieldset_id', Helper::customFieldsetList(),old('fieldset_id'), array('class'=>'select2', 'id'=>'modal-fieldset_id', 'style'=>'width:350px')) }}</div>
+</div>
+<!-- partials/modals/partials/fieldset-select.blade.php -->
\ No newline at end of file
diff --git a/resources/views/modals/partials/footer.blade.php b/resources/views/modals/partials/footer.blade.php
new file mode 100644
index 0000000000..354d189b9e
--- /dev/null
+++ b/resources/views/modals/partials/footer.blade.php
@@ -0,0 +1,6 @@
+<!-- partials/modals/partials/footer.blade.php -->
+<div class="modal-footer">
+    <button type="button" class="btn btn-default pull-left" data-dismiss="modal">{{ trans('button.cancel') }}</button>
+    <button type="button" class="btn btn-primary pull-right" id="modal-save">{{ trans('general.save') }}</button>
+</div>
+<!-- partials/modals/partials/footer.blade.php -->
\ No newline at end of file
diff --git a/resources/views/modals/partials/manufacturer-select.blade.php b/resources/views/modals/partials/manufacturer-select.blade.php
new file mode 100644
index 0000000000..3472e5984a
--- /dev/null
+++ b/resources/views/modals/partials/manufacturer-select.blade.php
@@ -0,0 +1,9 @@
+<!-- partials/modals/partials/model-number.blade.php -->
+<div class="dynamic-form-row">
+    <div class="col-md-4 col-xs-12"><label for="modal-manufacturer_id">{{ trans('general.manufacturer') }}:
+        </label></div>
+    <div class="col-md-8 col-xs-12">
+        <select class="js-data-ajax" data-endpoint="manufacturers" name="manufacturer_id" style="width: 100%" id="modal-manufacturer_id"></select>
+    </div>
+</div>
+<!-- partials/modals/partials/model-number.blade.php -->
\ No newline at end of file
diff --git a/resources/views/modals/partials/model-number.blade.php b/resources/views/modals/partials/model-number.blade.php
new file mode 100644
index 0000000000..2691f30d48
--- /dev/null
+++ b/resources/views/modals/partials/model-number.blade.php
@@ -0,0 +1,6 @@
+<!-- partials/modals/partials/model-number.blade.php -->
+<div class="dynamic-form-row">
+    <div class="col-md-4 col-xs-12"><label for="modal-modelno">{{ trans('general.model_no') }}:</label></div>
+    <div class="col-md-8 col-xs-12"><input type='text' name="model_number" id='modal-model_number' class="form-control"></div>
+</div>
+<!-- partials/modals/partials/model-number.blade.php -->
\ No newline at end of file
diff --git a/resources/views/modals/user.blade.php b/resources/views/modals/user.blade.php
index e65fcca5b0..01c6093331 100644
--- a/resources/views/modals/user.blade.php
+++ b/resources/views/modals/user.blade.php
@@ -96,8 +96,8 @@
                 </form>
             </div>
         <div class="modal-footer">
-            <button type="button" class="btn btn-default" data-dismiss="modal">{{ trans('button.cancel') }}</button>
-            <button type="button" class="btn btn-primary" id="modal-save">{{ trans('general.save') }}</button>
+            <button type="button" class="btn btn-default pull-left" data-dismiss="modal">{{ trans('button.cancel') }}</button>
+            <button type="button" class="btn btn-primary pull-right" id="modal-save">{{ trans('general.save') }}</button>
         </div>
     </div><!-- /.modal-content -->
 </div><!-- /.modal-dialog -->

From 367f02af8642c23674afbfefedc456e7cedb6785 Mon Sep 17 00:00:00 2001
From: Godfrey M <godmartinz@gmail.com>
Date: Mon, 9 Sep 2024 16:34:04 -0700
Subject: [PATCH 2/7] more partials and includes

---
 resources/views/modals/category.blade.php        | 13 ++-----------
 resources/views/modals/location.blade.php        | 12 ++----------
 resources/views/modals/model.blade.php           | 16 ++--------------
 .../modals/partials/categories-select.blade.php  |  8 ++++++++
 resources/views/modals/partials/name.blade.php   |  7 +++++++
 resources/views/modals/user.blade.php            |  5 +----
 6 files changed, 22 insertions(+), 39 deletions(-)
 create mode 100644 resources/views/modals/partials/categories-select.blade.php
 create mode 100644 resources/views/modals/partials/name.blade.php

diff --git a/resources/views/modals/category.blade.php b/resources/views/modals/category.blade.php
index c07b092ace..4dfe26d026 100644
--- a/resources/views/modals/category.blade.php
+++ b/resources/views/modals/category.blade.php
@@ -11,19 +11,10 @@
                 {{ csrf_field() }}
                 <div class="alert alert-danger" id="modal_error_msg" style="display:none">
                 </div>
-                <div class="dynamic-form-row">
-                    <div class="col-md-4 col-xs-12"><label for="modal-name">{{ trans('general.name') }}:
-                        </label></div>
-                    <div class="col-md-8 col-xs-12 required">
-                        <input type='text' name='name' id='modal-name' class="form-control">
-                    </div>
-                </div>
+               @include('modals.partials.name')
                 <input type="hidden" name='category_type' id="modal-category_type" value="{{ request('category_type') }}" />
             </form>
         </div>
-        <div class="modal-footer">
-            <button type="button" class="btn btn-default" data-dismiss="modal">{{ trans('button.cancel') }}</button>
-            <button type="button" class="btn btn-primary" id="modal-save">{{ trans('general.save') }}</button>
-        </div>
+       @include('modals.partials.footer')
     </div><!-- /.modal-content -->
 </div><!-- /.modal-dialog -->
diff --git a/resources/views/modals/location.blade.php b/resources/views/modals/location.blade.php
index d705f5500e..9817e1ddd7 100644
--- a/resources/views/modals/location.blade.php
+++ b/resources/views/modals/location.blade.php
@@ -9,11 +9,7 @@
             <form action="{{ route('api.locations.store') }}" onsubmit="return false">
                     <div class="alert alert-danger" id="modal_error_msg" style="display:none">
                 </div>
-                <div class="dynamic-form-row">
-                    <div class="col-md-4 col-xs-12"><label for="modal-name">{{ trans('general.name') }}:
-                        </label></div>
-                    <div class="col-md-8 col-xs-12 required"><input type='text' name="name" id='modal-name' class="form-control"></div>
-                </div>
+                @include('modals.partials.name')
 
                 <div class="dynamic-form-row">
                     <div class="col-md-4 col-xs-12"><label for="modal-city">{{ trans('general.city') }}:</label></div>
@@ -26,10 +22,6 @@
                 </div>
             </form>
         </div>
-
-        <div class="modal-footer">
-            <button type="button" class="btn btn-default" data-dismiss="modal">{{ trans('button.cancel') }}</button>
-            <button type="button" class="btn btn-primary" id="modal-save">{{ trans('general.save') }}</button>
-        </div>
+        @include('modals.partials.footer')
     </div><!-- /.modal-content -->
 </div><!-- /.modal-dialog -->
diff --git a/resources/views/modals/model.blade.php b/resources/views/modals/model.blade.php
index 92823c8b99..3b6bd47e5f 100644
--- a/resources/views/modals/model.blade.php
+++ b/resources/views/modals/model.blade.php
@@ -9,20 +9,8 @@
             <form action="{{ route('api.models.store') }}" onsubmit="return false">
                 <div class="alert alert-danger" id="modal_error_msg" style="display:none">
                 </div>
-                <div class="dynamic-form-row">
-                    <div class="col-md-4 col-xs-12"><label for="modal-name">{{ trans('general.name') }}:
-                        </label></div>
-                    <div class="col-md-8 col-xs-12 required"><input type='text' name="name" id='modal-name' class="form-control"></div>
-                </div>
-
-                <div class="dynamic-form-row">
-                    <div class="col-md-4 col-xs-12"><label for="modal-category_id">{{ trans('general.category') }}:</label></div>
-                    <div class="col-md-8 col-xs-12 required">
-                        <select class="js-data-ajax" data-endpoint="categories/asset" name="category_id" style="width: 100%" id="modal-category_id"></select>
-                    </div>
-                </div>
-
-
+                @include('modals.partials.name')
+                @include('modals.partials.categories-select')
                 @include('modals.partials.manufacturer-select')
                 @include('modals.partials.model-number')
                 @include('modals.partials.fieldset-select')
diff --git a/resources/views/modals/partials/categories-select.blade.php b/resources/views/modals/partials/categories-select.blade.php
new file mode 100644
index 0000000000..9cbc721748
--- /dev/null
+++ b/resources/views/modals/partials/categories-select.blade.php
@@ -0,0 +1,8 @@
+<!-- modals/partials/categories-select.blade.php -->
+<div class="dynamic-form-row">
+    <div class="col-md-4 col-xs-12"><label for="modal-category_id">{{ trans('general.category') }}:</label></div>
+    <div class="col-md-8 col-xs-12 required">
+        <select class="js-data-ajax" data-endpoint="categories/asset" name="category_id" style="width: 100%" id="modal-category_id"></select>
+    </div>
+</div>
+<!-- modals/partials/categories-select.blade.php -->
\ No newline at end of file
diff --git a/resources/views/modals/partials/name.blade.php b/resources/views/modals/partials/name.blade.php
new file mode 100644
index 0000000000..92bd7a62b7
--- /dev/null
+++ b/resources/views/modals/partials/name.blade.php
@@ -0,0 +1,7 @@
+<!-- modals/partials/name.blade.php -->
+<div class="dynamic-form-row">
+    <div class="col-md-4 col-xs-12"><label for="modal-name">{{ trans('general.name') }}:
+        </label></div>
+    <div class="col-md-8 col-xs-12 required"><input type='text' name="name" id='modal-name' class="form-control"></div>
+</div>
+<!-- modals/partials/name.blade.php -->
\ No newline at end of file
diff --git a/resources/views/modals/user.blade.php b/resources/views/modals/user.blade.php
index 01c6093331..321b6b03ab 100644
--- a/resources/views/modals/user.blade.php
+++ b/resources/views/modals/user.blade.php
@@ -95,10 +95,7 @@
                     
                 </form>
             </div>
-        <div class="modal-footer">
-            <button type="button" class="btn btn-default pull-left" data-dismiss="modal">{{ trans('button.cancel') }}</button>
-            <button type="button" class="btn btn-primary pull-right" id="modal-save">{{ trans('general.save') }}</button>
-        </div>
+       @include('modals.partials.footer')
     </div><!-- /.modal-content -->
 </div><!-- /.modal-dialog -->
 

From 0bc98e971fd9c5e0c0eb596daed799dab54f6ec4 Mon Sep 17 00:00:00 2001
From: Godfrey M <godmartinz@gmail.com>
Date: Thu, 12 Sep 2024 12:26:19 -0700
Subject: [PATCH 3/7] refactoring modals with partials and fixing misalignments

---
 resources/views/modals/user.blade.php         | 31 ++++++-------------
 .../views/partials/forms/edit/email.blade.php |  8 ++---
 .../partials/forms/edit/name-first.blade.php  |  9 ++++++
 .../partials/forms/edit/name-last.blade.php   |  9 ++++++
 .../partials/forms/edit/username.blade.php    |  6 ++++
 resources/views/users/edit.blade.php          | 17 ++--------
 6 files changed, 40 insertions(+), 40 deletions(-)
 create mode 100644 resources/views/partials/forms/edit/name-first.blade.php
 create mode 100644 resources/views/partials/forms/edit/name-last.blade.php
 create mode 100644 resources/views/partials/forms/edit/username.blade.php

diff --git a/resources/views/modals/user.blade.php b/resources/views/modals/user.blade.php
index 321b6b03ab..af2863282b 100644
--- a/resources/views/modals/user.blade.php
+++ b/resources/views/modals/user.blade.php
@@ -25,7 +25,7 @@
             <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
             <h2 class="modal-title">{{ trans('admin/users/table.createuser') }}</h2>
         </div>
-            <div class="modal-body">
+            <div class="modal-body" style="width:100%; display:block;">
                 <form action="{{ route('api.users.store') }}" onsubmit="return false">
                     <div class="alert alert-danger" id="modal_error_msg" style="display:none">
                     </div>
@@ -42,29 +42,17 @@
                     <div class="dynamic-form-row">
                         @include ('partials.forms.edit.location-profile-select', ['translated_name' => trans('general.location'), 'fieldname' => 'location_id'])
                     </div>
-                    
                     <div class="dynamic-form-row">
-                        <div class="col-md-3 col-xs-12"><label for="modal-first_name">{{ trans('general.first_name') }}:</label></div>
-                        <div class="col-md-8 col-xs-12 required"><input type='text' name="first_name" id='modal-first_name' class="form-control"></div>
+                        @include('partials.forms.edit.name-first', ['class' => 'col-md-8 col-xs-12', 'style' => 'width:65.5%;'])
                     </div>
-
                     <div class="dynamic-form-row">
-                        <div class="col-md-3 col-xs-12"><label for="modal-last_name">{{ trans('general.last_name') }}:</label></div>
-                        <div class="col-md-8 col-xs-12"><input type='text' name="last_name" id='modal-last_name' class="form-control"> </div>
+                    @include('partials.forms.edit.name-last', ['class' => 'col-md-8 col-xs-12', 'style' => 'width:65.5%;'])
                     </div>
-
                     <div class="dynamic-form-row">
-                        <div class="col-md-3 col-xs-12"><label for="modal-username">{{ trans('admin/users/table.username') }}:</label></div>
-                        <div class="col-md-8 col-xs-12 required"><input type='text' name="username" id='modal-username' class="form-control"></div>
+                        @include('partials.forms.edit.email')
                     </div>
-
-					<!-- User email address -->		
-					<div class="dynamic-form-row">
-                        <div class="col-md-3 col-xs-12"><label for="modal-email">{{ trans('admin/users/table.email') }}:</label></div>
-                        <div class="col-md-8 col-xs-12">
-						<input class="form-control" type="text" name="email" id="modal-email" autocomplete="off">
-						{!! $errors->first('email', '<span class="alert-msg" aria-hidden="true">:message</span>') !!} 
-						</div>
+                    <div class="dynamic-form-row">
+                        @include('partials.forms.edit.username')
                     </div>
 
                     <div class="dynamic-form-row">
@@ -91,11 +79,12 @@
                                 {{ trans('general.login_enabled') }}
                             </label>
 						</div>
-                    </div>                    
-                    
+                    </div>
+                    <div class="dynamic-form-row">
+                        @include('modals.partials.footer')
+                    </div>
                 </form>
             </div>
-       @include('modals.partials.footer')
     </div><!-- /.modal-content -->
 </div><!-- /.modal-dialog -->
 
diff --git a/resources/views/partials/forms/edit/email.blade.php b/resources/views/partials/forms/edit/email.blade.php
index 0e10b7d766..652b7155c7 100644
--- a/resources/views/partials/forms/edit/email.blade.php
+++ b/resources/views/partials/forms/edit/email.blade.php
@@ -1,7 +1,7 @@
 <div class="form-group {{ $errors->has('email') ? ' has-error' : '' }}">
-    {{ Form::label('email', trans('admin/suppliers/table.email'), array('class' => 'col-md-3 control-label')) }}
-    <div class="col-md-7">
-    {{Form::text('email', old('email', $item->email), array('class' => 'form-control')) }}
+    <label for="email" class="col-md-3 col-xs-12 control-label">{{ trans('admin/suppliers/table.email') }}</label>
+    <div class="col-md-8 col-xs-12">
+        <input type="text" name="email" id="email" value="{{ old('email', ($item->email ?? $user->email)) }}" class="form-control" style="width:98%; display:flex;">
         {!! $errors->first('email', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
     </div>
-</div>
+</div>
\ No newline at end of file
diff --git a/resources/views/partials/forms/edit/name-first.blade.php b/resources/views/partials/forms/edit/name-first.blade.php
new file mode 100644
index 0000000000..6911709c53
--- /dev/null
+++ b/resources/views/partials/forms/edit/name-first.blade.php
@@ -0,0 +1,9 @@
+<!-- partials/forms/edit/name-first.blade.php -->
+<div class="form-group {{ $errors->has('first_name') ? 'has-error' : '' }}">
+    <label class="col-md-3 control-label" for="first_name">{{ trans('general.first_name') }}</label>
+    <div class="{{$class ? $class : 'col-md-6'}}" style= "{{$style ? $style : ''}}""{{  (Helper::checkIfRequired($user, 'first_name')) ? ' required' : '' }}">
+        <input class="form-control" type="text" name="first_name" id="first_name" value="{{ old('first_name', $user->first_name) }}" maxlength="191" />
+        {!! $errors->first('first_name', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
+    </div>
+</div>
+<!-- partials/forms/edit/name-first.blade.php -->
\ No newline at end of file
diff --git a/resources/views/partials/forms/edit/name-last.blade.php b/resources/views/partials/forms/edit/name-last.blade.php
new file mode 100644
index 0000000000..f5e3d834fa
--- /dev/null
+++ b/resources/views/partials/forms/edit/name-last.blade.php
@@ -0,0 +1,9 @@
+<!-- partials/forms/edit/name-last.blade.php -->
+<div class="form-group {{ $errors->has('last_name') ? 'has-error' : '' }}">
+    <label class="col-md-3 control-label" for="last_name">{{ trans('general.last_name') }} </label>
+    <div class="{{$class ? $class : 'col-md-6'}}" style= "{{$style ? $style : ''}}""{{  (Helper::checkIfRequired($user, 'last_name')) ? ' required' : '' }}">
+        <input class="form-control" type="text" name="last_name" id="last_name"  value="{{ old('last_name', $user->last_name) }}" maxlength="191" />
+        {!! $errors->first('last_name', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
+    </div>
+</div>
+<!-- partials/forms/edit/name-last.blade.php -->
\ No newline at end of file
diff --git a/resources/views/partials/forms/edit/username.blade.php b/resources/views/partials/forms/edit/username.blade.php
new file mode 100644
index 0000000000..9db4b08e5d
--- /dev/null
+++ b/resources/views/partials/forms/edit/username.blade.php
@@ -0,0 +1,6 @@
+<!-- partials/forms/edit/username.blade.php -->
+
+    <div class="col-md-3 col-xs-12"><label for="modal-username">{{ trans('admin/users/table.username') }}:</label></div>
+    <div class="col-md-8 col-xs-12 required"><input type='text' name="username" id='modal-username' class="form-control"></div>
+
+<!-- partials/forms/edit/username.blade.php -->
\ No newline at end of file
diff --git a/resources/views/users/edit.blade.php b/resources/views/users/edit.blade.php
index fc342897a7..23421915a2 100755
--- a/resources/views/users/edit.blade.php
+++ b/resources/views/users/edit.blade.php
@@ -86,22 +86,10 @@
             <div class="row">
               <div class="col-md-12">
                 <!-- First Name -->
-                <div class="form-group {{ $errors->has('first_name') ? 'has-error' : '' }}">
-                  <label class="col-md-3 control-label" for="first_name">{{ trans('general.first_name') }}</label>
-                  <div class="col-md-6{{  (Helper::checkIfRequired($user, 'first_name')) ? ' required' : '' }}">
-                    <input class="form-control" type="text" name="first_name" id="first_name" value="{{ old('first_name', $user->first_name) }}" maxlength="191" />
-                    {!! $errors->first('first_name', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
-                  </div>
-                </div>
+                 @include('partials.forms.edit.name-first')
 
                 <!-- Last Name -->
-                <div class="form-group {{ $errors->has('last_name') ? 'has-error' : '' }}">
-                  <label class="col-md-3 control-label" for="last_name">{{ trans('general.last_name') }} </label>
-                  <div class="col-md-6{{  (Helper::checkIfRequired($user, 'last_name')) ? ' required' : '' }}">
-                    <input class="form-control" type="text" name="last_name" id="last_name" value="{{ old('last_name', $user->last_name) }}" maxlength="191" />
-                    {!! $errors->first('last_name', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
-                  </div>
-                </div>
+                @include('partials.forms.edit.name-last')
 
                 <!-- Username -->
                 <div class="form-group {{ $errors->has('username') ? 'has-error' : '' }}">
@@ -237,7 +225,6 @@
                           </div>
                   </div>
 
-
                   <!-- Email -->
                 <div class="form-group {{ $errors->has('email') ? 'has-error' : '' }}">
                   <label class="col-md-3 control-label" for="email">{{ trans('admin/users/table.email') }} </label>

From 18ddffe8f96deeecd84b1098f3f83d034c923e5d Mon Sep 17 00:00:00 2001
From: Godfrey M <godmartinz@gmail.com>
Date: Wed, 25 Sep 2024 11:42:16 -0700
Subject: [PATCH 4/7] fix partial variable intialization, fix width of input
 fields

---
 resources/views/modals/user.blade.php         | 24 ++++++++++++-------
 .../views/partials/forms/edit/email.blade.php |  2 +-
 .../partials/forms/edit/name-first.blade.php  |  6 ++++-
 .../partials/forms/edit/name-last.blade.php   |  6 ++++-
 4 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/resources/views/modals/user.blade.php b/resources/views/modals/user.blade.php
index af2863282b..fe73ae0d8a 100644
--- a/resources/views/modals/user.blade.php
+++ b/resources/views/modals/user.blade.php
@@ -29,7 +29,6 @@
                 <form action="{{ route('api.users.store') }}" onsubmit="return false">
                     <div class="alert alert-danger" id="modal_error_msg" style="display:none">
                     </div>
-                    
                     <!-- Setup of default company, taken from asset creator -->
 					@if ($user->company)
 						<input type="hidden" name="company_id" id='modal-company' value='{{ $user->company->id }}' class="form-control">
@@ -43,10 +42,10 @@
                         @include ('partials.forms.edit.location-profile-select', ['translated_name' => trans('general.location'), 'fieldname' => 'location_id'])
                     </div>
                     <div class="dynamic-form-row">
-                        @include('partials.forms.edit.name-first', ['class' => 'col-md-8 col-xs-12', 'style' => 'width:65.5%;'])
+                        @include('partials.forms.edit.name-first', ['class' => 'col-md-8 col-xs-12-pull', 'style' => 'width:67%;'])
                     </div>
                     <div class="dynamic-form-row">
-                    @include('partials.forms.edit.name-last', ['class' => 'col-md-8 col-xs-12', 'style' => 'width:65.5%;'])
+                    @include('partials.forms.edit.name-last', ['class' => 'col-md-8 col-xs-12-pull', 'style' => 'width:67%;'])
                     </div>
                     <div class="dynamic-form-row">
                         @include('partials.forms.edit.email')
@@ -56,18 +55,27 @@
                     </div>
 
                     <div class="dynamic-form-row">
-                        <div class="col-md-3 col-xs-12"><label for="modal-password">{{ trans('admin/users/table.password') }}:</label></div>
-                        <div class="col-md-8 col-xs-12 required"><input type='password' name="password" id='modal-password' class="form-control">
-                            <a href="#" class="left" id="modal-genPassword">Generate</a>
+                        <div class="form-group">
+                            <div class="col-md-3 col-xs-12">
+                                <label class="control-label" for="modal-password">{{ trans('admin/users/table.password') }}:</label>
+                            </div>
+                            <div class="col-md-8 col-xs-12 required"><input class="form-control"  type='password' name="password" id='modal-password' class="form-control">
+                                <a href="#" class="left" id="modal-genPassword">Generate</a>
+                            </div>
                         </div>
                     </div>
 
                     <div class="dynamic-form-row">
-                        <div class="col-md-3 col-xs-12"><label for="modal-password_confirmation">{{ trans('admin/users/table.password_confirm') }}:</label></div>
-                        <div class="col-md-8 col-xs-12 required"><input type='password' name="password_confirmation" id='modal-password_confirmation' class="form-control">
+                        <div class="form-group">
+                            <div class="col-md-3 col-xs-12">
+                                <label class="control-label" for="modal-password_confirmation">{{ trans('admin/users/table.password_confirm') }}:</label>
+                            </div>
+                        <div class="col-md-8 col-xs-12 required">
+                            <input class="form-control" type='password' name="password_confirmation" id='modal-password_confirmation' class="form-control">
                             <div id="modal-generated-password"></div>
                         </div>
                     </div>
+                    </div>
                     
 
                     
diff --git a/resources/views/partials/forms/edit/email.blade.php b/resources/views/partials/forms/edit/email.blade.php
index 652b7155c7..dc8a4d8d2c 100644
--- a/resources/views/partials/forms/edit/email.blade.php
+++ b/resources/views/partials/forms/edit/email.blade.php
@@ -1,7 +1,7 @@
 <div class="form-group {{ $errors->has('email') ? ' has-error' : '' }}">
     <label for="email" class="col-md-3 col-xs-12 control-label">{{ trans('admin/suppliers/table.email') }}</label>
     <div class="col-md-8 col-xs-12">
-        <input type="text" name="email" id="email" value="{{ old('email', ($item->email ?? $user->email)) }}" class="form-control" style="width:98%; display:flex;">
+        <input type="text" name="email" id="email" value="{{ old('email', ($item->email ?? $user->email)) }}" class="form-control" style="width:100%; display:flex;">
         {!! $errors->first('email', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
     </div>
 </div>
\ No newline at end of file
diff --git a/resources/views/partials/forms/edit/name-first.blade.php b/resources/views/partials/forms/edit/name-first.blade.php
index 6911709c53..d7c07947ae 100644
--- a/resources/views/partials/forms/edit/name-first.blade.php
+++ b/resources/views/partials/forms/edit/name-first.blade.php
@@ -1,7 +1,11 @@
 <!-- partials/forms/edit/name-first.blade.php -->
+@php
+    $class = $class ?? 'col-md-6';
+    $style = $style ?? '';
+@endphp
 <div class="form-group {{ $errors->has('first_name') ? 'has-error' : '' }}">
     <label class="col-md-3 control-label" for="first_name">{{ trans('general.first_name') }}</label>
-    <div class="{{$class ? $class : 'col-md-6'}}" style= "{{$style ? $style : ''}}""{{  (Helper::checkIfRequired($user, 'first_name')) ? ' required' : '' }}">
+    <div class="{{$class ? $class : 'col-md-6'}}" style= "{{$style}}""{{  (Helper::checkIfRequired($user, 'first_name')) ? ' required' : '' }}">
         <input class="form-control" type="text" name="first_name" id="first_name" value="{{ old('first_name', $user->first_name) }}" maxlength="191" />
         {!! $errors->first('first_name', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
     </div>
diff --git a/resources/views/partials/forms/edit/name-last.blade.php b/resources/views/partials/forms/edit/name-last.blade.php
index f5e3d834fa..61ef221dc0 100644
--- a/resources/views/partials/forms/edit/name-last.blade.php
+++ b/resources/views/partials/forms/edit/name-last.blade.php
@@ -1,7 +1,11 @@
 <!-- partials/forms/edit/name-last.blade.php -->
+@php
+    $class = $class ?? 'col-md-6';
+    $style = $style ?? '';
+@endphp
 <div class="form-group {{ $errors->has('last_name') ? 'has-error' : '' }}">
     <label class="col-md-3 control-label" for="last_name">{{ trans('general.last_name') }} </label>
-    <div class="{{$class ? $class : 'col-md-6'}}" style= "{{$style ? $style : ''}}""{{  (Helper::checkIfRequired($user, 'last_name')) ? ' required' : '' }}">
+    <div class="{{$class}}" style= "{{$style ? $style : ''}}" "{{  (Helper::checkIfRequired($user, 'last_name')) ? ' required' : '' }}">
         <input class="form-control" type="text" name="last_name" id="last_name"  value="{{ old('last_name', $user->last_name) }}" maxlength="191" />
         {!! $errors->first('last_name', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
     </div>

From 12522a3791a0705340f999b7a665d0ea45aa5918 Mon Sep 17 00:00:00 2001
From: Godfrey M <godmartinz@gmail.com>
Date: Wed, 25 Sep 2024 12:07:15 -0700
Subject: [PATCH 5/7] fix spacing issues

---
 resources/views/modals/user.blade.php         | 34 ++++++++++---------
 .../partials/forms/edit/username.blade.php    |  4 +--
 2 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/resources/views/modals/user.blade.php b/resources/views/modals/user.blade.php
index fe73ae0d8a..f04689569b 100644
--- a/resources/views/modals/user.blade.php
+++ b/resources/views/modals/user.blade.php
@@ -59,34 +59,36 @@
                             <div class="col-md-3 col-xs-12">
                                 <label class="control-label" for="modal-password">{{ trans('admin/users/table.password') }}:</label>
                             </div>
-                            <div class="col-md-8 col-xs-12 required"><input class="form-control"  type='password' name="password" id='modal-password' class="form-control">
+                            <div class="col-md-8 col-xs-12 required" style="margin-bottom:5px;">
+                                <input type='password' name="password" id='modal-password' class="form-control">
                                 <a href="#" class="left" id="modal-genPassword">Generate</a>
+                                <div id="modal-generated-password"></div>
                             </div>
                         </div>
                     </div>
 
                     <div class="dynamic-form-row">
                         <div class="form-group">
-                            <div class="col-md-3 col-xs-12">
+                            <div class="col-md-3 col-xs-12 ">
                                 <label class="control-label" for="modal-password_confirmation">{{ trans('admin/users/table.password_confirm') }}:</label>
                             </div>
-                        <div class="col-md-8 col-xs-12 required">
-                            <input class="form-control" type='password' name="password_confirmation" id='modal-password_confirmation' class="form-control">
-                            <div id="modal-generated-password"></div>
-                        </div>
-                    </div>
-                    </div>
-                    
+                            <div class="col-md-8 col-xs-12  required">
+                                <input class="form-control" type='password' name="password_confirmation" id='modal-password_confirmation'>
+
+                            </div>
+                         </div>
+                    </div>
 
-                    
 					<!-- Checkbox for activation new user, by default set for activated -->
 					<div class="dynamic-form-row">
-						<div class="col-md-offset-3 col-md-8 col-xs-12">
-                            <label class="form-control">
-						        <input type="checkbox" value="1" name="activated" id="modal-activated" {{ (old('activated', $user->activated)) == '1' ? ' checked="checked"' : '' }} aria-label="activated">
-                                {{ trans('general.login_enabled') }}
-                            </label>
-						</div>
+                        <div class="form-group">
+                            <div class="col-md-offset-3 col-md-8 col-xs-12">
+                                <label class="form-control">
+                                    <input type="checkbox" value="1" name="activated" id="modal-activated" {{ (old('activated', $user->activated)) == '1' ? ' checked="checked"' : '' }} aria-label="activated">
+                                    {{ trans('general.login_enabled') }}
+                                </label>
+                            </div>
+                        </div>
                     </div>
                     <div class="dynamic-form-row">
                         @include('modals.partials.footer')
diff --git a/resources/views/partials/forms/edit/username.blade.php b/resources/views/partials/forms/edit/username.blade.php
index 9db4b08e5d..fe8b21dd1b 100644
--- a/resources/views/partials/forms/edit/username.blade.php
+++ b/resources/views/partials/forms/edit/username.blade.php
@@ -1,6 +1,6 @@
 <!-- partials/forms/edit/username.blade.php -->
-
+<div class="form-group">
     <div class="col-md-3 col-xs-12"><label for="modal-username">{{ trans('admin/users/table.username') }}:</label></div>
     <div class="col-md-8 col-xs-12 required"><input type='text' name="username" id='modal-username' class="form-control"></div>
-
+</div>
 <!-- partials/forms/edit/username.blade.php -->
\ No newline at end of file

From b797c37acba1801e52945202620fdb12e20e0796 Mon Sep 17 00:00:00 2001
From: Godfrey M <godmartinz@gmail.com>
Date: Wed, 25 Sep 2024 12:48:05 -0700
Subject: [PATCH 6/7] replace duplicate code with partials

---
 resources/views/modals/manufacturer.blade.php       | 13 +++----------
 .../views/modals/partials/fieldset-select.blade.php |  2 +-
 .../modals/partials/manufacturer-select.blade.php   |  3 +--
 resources/views/modals/statuslabel.blade.php        | 13 +++++--------
 resources/views/modals/supplier.blade.php           |  9 +++------
 resources/views/partials/forms/edit/name.blade.php  |  4 ++--
 6 files changed, 15 insertions(+), 29 deletions(-)

diff --git a/resources/views/modals/manufacturer.blade.php b/resources/views/modals/manufacturer.blade.php
index 60cf8363e4..38c6e32af8 100644
--- a/resources/views/modals/manufacturer.blade.php
+++ b/resources/views/modals/manufacturer.blade.php
@@ -8,20 +8,13 @@
         </div>
         <div class="modal-body">
             <form action="{{ route('api.manufacturers.store') }}" onsubmit="return false">
-                <div class="alert alert-danger" id="modal_error_msg" style="display:none">
-                </div>
                 <div class="dynamic-form-row">
-                    <div class="col-md-4 col-xs-12"><label for="modal-name">{{ trans('general.name') }}:
-                        </label></div>
-                    <div class="col-md-8 col-xs-12 required">
-                        <input type='text' name="name" id='modal-name' class="form-control">
-                    </div>
+                    @include('partials.forms.edit.name', ['item' => new \App\Models\Manufacturer(), 'translated_name' => trans('admin/manufacturers/table.name')])
                 </div>
             </form>
         </div>
-        <div class="modal-footer">
-            <button type="button" class="btn btn-default" data-dismiss="modal">{{ trans('button.cancel') }}</button>
-            <button type="button" class="btn btn-primary" id="modal-save">{{ trans('general.save') }}</button>
+        <div class="dynamic-form-row">
+            @include('modals.partials.footer')
         </div>
     </div><!-- /.modal-content -->
 </div><!-- /.modal-dialog -->
diff --git a/resources/views/modals/partials/fieldset-select.blade.php b/resources/views/modals/partials/fieldset-select.blade.php
index dbebedef28..3f4efc24b6 100644
--- a/resources/views/modals/partials/fieldset-select.blade.php
+++ b/resources/views/modals/partials/fieldset-select.blade.php
@@ -1,6 +1,6 @@
 <!-- partials/modals/partials/fieldset-select.blade.php -->
 <div class="dynamic-form-row">
     <div class="col-md-4 col-xs-12"><label for="modal-fieldset_id">{{ trans('admin/models/general.fieldset') }}:</label></div>
-    <div class="col-md-8 col-xs-12">{{ Form::select('fieldset_id', Helper::customFieldsetList(),old('fieldset_id'), array('class'=>'select2', 'id'=>'modal-fieldset_id', 'style'=>'width:350px')) }}</div>
+    <div class="col-md-8 col-xs-12">{{ Form::select('fieldset_id', Helper::customFieldsetList(),old('fieldset_id'), array('class'=>'select2', 'id'=>'modal-fieldset_id', 'style'=>'width:100%;')) }}</div>
 </div>
 <!-- partials/modals/partials/fieldset-select.blade.php -->
\ No newline at end of file
diff --git a/resources/views/modals/partials/manufacturer-select.blade.php b/resources/views/modals/partials/manufacturer-select.blade.php
index 3472e5984a..810292067e 100644
--- a/resources/views/modals/partials/manufacturer-select.blade.php
+++ b/resources/views/modals/partials/manufacturer-select.blade.php
@@ -1,7 +1,6 @@
 <!-- partials/modals/partials/model-number.blade.php -->
 <div class="dynamic-form-row">
-    <div class="col-md-4 col-xs-12"><label for="modal-manufacturer_id">{{ trans('general.manufacturer') }}:
-        </label></div>
+    <div class="col-md-4 col-xs-12"><label for="modal-manufacturer_id">{{ trans('general.manufacturer') }}:</label></div>
     <div class="col-md-8 col-xs-12">
         <select class="js-data-ajax" data-endpoint="manufacturers" name="manufacturer_id" style="width: 100%" id="modal-manufacturer_id"></select>
     </div>
diff --git a/resources/views/modals/statuslabel.blade.php b/resources/views/modals/statuslabel.blade.php
index 7e07854197..fba829ae50 100644
--- a/resources/views/modals/statuslabel.blade.php
+++ b/resources/views/modals/statuslabel.blade.php
@@ -10,21 +10,18 @@
                 <div class="alert alert-danger" id="modal_error_msg" style="display:none">
                 </div>
                 <div class="dynamic-form-row">
-                    <div class="col-md-4 col-xs-12"><label for="modal-name">{{ trans('general.name') }}:
-                        </label></div>
-                    <div class="col-md-8 col-xs-12 required"><input type='text' name="name" id='modal-name' class="form-control"></div>
+                    @include('partials.forms.edit.name', ['item' => new \App\Models\Statuslabel(),'translated_name' => trans('admin/statuslabels/table.name')  ])
                 </div>
 
                 <div class="dynamic-form-row">
-                    <div class="col-md-4 col-xs-12"><label for="modal-type">{{ trans('admin/statuslabels/table.status_type') }}:
+                    <div class="col-md-3 col-xs-12"><label for="modal-type">{{ trans('admin/statuslabels/table.status_type') }}:
                         </label></div>
-                    <div class="col-md-8 col-xs-12 required">{{ Form::select('type', $statuslabel_types, '', array('class'=>'select2', 'style'=>'width:90%','id' =>'modal-type')) }}</div>
+                    <div class="col-md-8 col-xs-12 required">{{ Form::select('type', $statuslabel_types, '', array('class'=>'select2', 'style'=>'width:100%','id' =>'modal-type')) }}</div>
                 </div>
             </form>
         </div>
-        <div class="modal-footer">
-            <button type="button" class="btn btn-default" data-dismiss="modal">{{ trans('button.cancel') }}</button>
-            <button type="button" class="btn btn-primary" id="modal-save">{{ trans('general.save') }}</button>
+        <div class="dynamic-form-row">
+            @include('modals.partials.footer')
         </div>
     </div><!-- /.modal-content -->
 </div><!-- /.modal-dialog -->
diff --git a/resources/views/modals/supplier.blade.php b/resources/views/modals/supplier.blade.php
index 0dd10595bf..806b57c1de 100644
--- a/resources/views/modals/supplier.blade.php
+++ b/resources/views/modals/supplier.blade.php
@@ -10,15 +10,12 @@
                 <div class="alert alert-danger" id="modal_error_msg" style="display:none">
                 </div>
                 <div class="dynamic-form-row">
-                    <div class="col-md-4 col-xs-12"><label for="modal-name">{{ trans('general.name') }}:
-                        </label></div>
-                    <div class="col-md-8 col-xs-12 required"><input type='text' name="name" id='modal-name' class="form-control"></div>
+                   @include('partials.forms.edit.name', [ 'item' => new \App\Models\Supplier(), 'translated_name' => trans('admin/suppliers/table.name')])
                 </div>
             </form>
         </div>
-        <div class="modal-footer">
-            <button type="button" class="btn btn-default" data-dismiss="modal">{{ trans('button.cancel') }}</button>
-            <button type="button" class="btn btn-primary" id="modal-save">{{ trans('general.save') }}</button>
+        <div class="dynamic-form-row">
+            @include('modals.partials.footer')
         </div>
     </div><!-- /.modal-content -->
 </div><!-- /.modal-dialog -->
diff --git a/resources/views/partials/forms/edit/name.blade.php b/resources/views/partials/forms/edit/name.blade.php
index f4d29e606c..5a083bf928 100644
--- a/resources/views/partials/forms/edit/name.blade.php
+++ b/resources/views/partials/forms/edit/name.blade.php
@@ -1,8 +1,8 @@
 <!-- Name -->
 <div class="form-group {{ $errors->has('name') ? ' has-error' : '' }}">
     <label for="name" class="col-md-3 control-label">{{ $translated_name }}</label>
-    <div class="col-md-7 col-sm-12{{  (Helper::checkIfRequired($item, 'name')) ? ' required' : '' }}">
-        <input class="form-control" type="text" name="name" aria-label="name" id="name" value="{{ old('name', $item->name) }}"{!!  (Helper::checkIfRequired($item, 'name')) ? ' required' : '' !!} />
+    <div class="col-md-8 col-sm-12{{  (Helper::checkIfRequired($item, 'name')) ? ' required' : '' }}">
+        <input class="form-control" style="width:100%;" type="text" name="name" aria-label="name" id="name" value="{{ old('name', $item->name) }}"{!!  (Helper::checkIfRequired($item, 'name')) ? ' required' : '' !!} />
         {!! $errors->first('name', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
     </div>
 </div>

From ef82f954e538d8afb6e765aadcffe79b914c276a Mon Sep 17 00:00:00 2001
From: Godfrey M <godmartinz@gmail.com>
Date: Wed, 25 Sep 2024 15:47:57 -0700
Subject: [PATCH 7/7] fixed required css, and user input lengths

---
 resources/views/modals/location.blade.php          |  2 +-
 resources/views/modals/model.blade.php             |  4 ++--
 .../modals/partials/categories-select.blade.php    |  5 ++++-
 resources/views/modals/partials/name.blade.php     |  5 ++++-
 resources/views/modals/statuslabel.blade.php       |  4 ++--
 resources/views/modals/user.blade.php              | 14 +++++++-------
 .../partials/forms/edit/company-select.blade.php   |  2 +-
 .../forms/edit/location-profile-select.blade.php   |  2 +-
 .../views/partials/forms/edit/name-first.blade.php |  3 ++-
 .../views/partials/forms/edit/name-last.blade.php  |  1 +
 .../views/partials/forms/edit/username.blade.php   |  5 ++++-
 11 files changed, 29 insertions(+), 18 deletions(-)

diff --git a/resources/views/modals/location.blade.php b/resources/views/modals/location.blade.php
index 9817e1ddd7..9580f4bbf9 100644
--- a/resources/views/modals/location.blade.php
+++ b/resources/views/modals/location.blade.php
@@ -9,7 +9,7 @@
             <form action="{{ route('api.locations.store') }}" onsubmit="return false">
                     <div class="alert alert-danger" id="modal_error_msg" style="display:none">
                 </div>
-                @include('modals.partials.name')
+                @include('modals.partials.name', ['item' => new \App\Models\Location(), 'required' => 'true'])
 
                 <div class="dynamic-form-row">
                     <div class="col-md-4 col-xs-12"><label for="modal-city">{{ trans('general.city') }}:</label></div>
diff --git a/resources/views/modals/model.blade.php b/resources/views/modals/model.blade.php
index 3b6bd47e5f..fb1650eee7 100644
--- a/resources/views/modals/model.blade.php
+++ b/resources/views/modals/model.blade.php
@@ -9,8 +9,8 @@
             <form action="{{ route('api.models.store') }}" onsubmit="return false">
                 <div class="alert alert-danger" id="modal_error_msg" style="display:none">
                 </div>
-                @include('modals.partials.name')
-                @include('modals.partials.categories-select')
+                @include('modals.partials.name', ['required' => 'true'])
+                @include('modals.partials.categories-select', ['required' => 'true'])
                 @include('modals.partials.manufacturer-select')
                 @include('modals.partials.model-number')
                 @include('modals.partials.fieldset-select')
diff --git a/resources/views/modals/partials/categories-select.blade.php b/resources/views/modals/partials/categories-select.blade.php
index 9cbc721748..116a0808e9 100644
--- a/resources/views/modals/partials/categories-select.blade.php
+++ b/resources/views/modals/partials/categories-select.blade.php
@@ -1,8 +1,11 @@
 <!-- modals/partials/categories-select.blade.php -->
+@php
+    $required = $required ?? '';
+@endphp
 <div class="dynamic-form-row">
     <div class="col-md-4 col-xs-12"><label for="modal-category_id">{{ trans('general.category') }}:</label></div>
     <div class="col-md-8 col-xs-12 required">
-        <select class="js-data-ajax" data-endpoint="categories/asset" name="category_id" style="width: 100%" id="modal-category_id"></select>
+        <select class="js-data-ajax" data-endpoint="categories/asset" name="category_id" style="width: 100%" id="modal-category_id" {{$required ? 'required' : ''}}></select>
     </div>
 </div>
 <!-- modals/partials/categories-select.blade.php -->
\ No newline at end of file
diff --git a/resources/views/modals/partials/name.blade.php b/resources/views/modals/partials/name.blade.php
index 92bd7a62b7..6a64ed525f 100644
--- a/resources/views/modals/partials/name.blade.php
+++ b/resources/views/modals/partials/name.blade.php
@@ -1,7 +1,10 @@
 <!-- modals/partials/name.blade.php -->
+@php
+    $required = $required ?? '';
+@endphp
 <div class="dynamic-form-row">
     <div class="col-md-4 col-xs-12"><label for="modal-name">{{ trans('general.name') }}:
         </label></div>
-    <div class="col-md-8 col-xs-12 required"><input type='text' name="name" id='modal-name' class="form-control"></div>
+    <div class="col-md-8 col-xs-12"><input type='text' name="name" id='modal-name' class="form-control" {{$required ? 'required' : ''}}></div>
 </div>
 <!-- modals/partials/name.blade.php -->
\ No newline at end of file
diff --git a/resources/views/modals/statuslabel.blade.php b/resources/views/modals/statuslabel.blade.php
index fba829ae50..e7076f1bbb 100644
--- a/resources/views/modals/statuslabel.blade.php
+++ b/resources/views/modals/statuslabel.blade.php
@@ -10,13 +10,13 @@
                 <div class="alert alert-danger" id="modal_error_msg" style="display:none">
                 </div>
                 <div class="dynamic-form-row">
-                    @include('partials.forms.edit.name', ['item' => new \App\Models\Statuslabel(),'translated_name' => trans('admin/statuslabels/table.name')  ])
+                    @include('partials.forms.edit.name', ['required' => 'true', 'item' => new \App\Models\Statuslabel(),'translated_name' => trans('admin/statuslabels/table.name')  ])
                 </div>
 
                 <div class="dynamic-form-row">
                     <div class="col-md-3 col-xs-12"><label for="modal-type">{{ trans('admin/statuslabels/table.status_type') }}:
                         </label></div>
-                    <div class="col-md-8 col-xs-12 required">{{ Form::select('type', $statuslabel_types, '', array('class'=>'select2', 'style'=>'width:100%','id' =>'modal-type')) }}</div>
+                    <div class="col-md-8 col-xs-12">{{ Form::select('type', $statuslabel_types, '', array('class'=>'select2', 'style'=>'width:100%','id' =>'modal-type', 'required',)) }}</div>
                 </div>
             </form>
         </div>
diff --git a/resources/views/modals/user.blade.php b/resources/views/modals/user.blade.php
index f04689569b..5672119fa1 100644
--- a/resources/views/modals/user.blade.php
+++ b/resources/views/modals/user.blade.php
@@ -42,16 +42,16 @@
                         @include ('partials.forms.edit.location-profile-select', ['translated_name' => trans('general.location'), 'fieldname' => 'location_id'])
                     </div>
                     <div class="dynamic-form-row">
-                        @include('partials.forms.edit.name-first', ['class' => 'col-md-8 col-xs-12-pull', 'style' => 'width:67%;'])
+                        @include('partials.forms.edit.name-first', [ 'required' => 'true', 'class' => 'col-md-8 col-xs-12-pull', 'style' => 'width:67%;'])
                     </div>
                     <div class="dynamic-form-row">
-                    @include('partials.forms.edit.name-last', ['class' => 'col-md-8 col-xs-12-pull', 'style' => 'width:67%;'])
+                    @include('partials.forms.edit.name-last', ['required' => 'true', 'class' => 'col-md-8 col-xs-12-pull', 'style' => 'width:67%;'])
                     </div>
                     <div class="dynamic-form-row">
                         @include('partials.forms.edit.email')
                     </div>
                     <div class="dynamic-form-row">
-                        @include('partials.forms.edit.username')
+                        @include('partials.forms.edit.username', [ 'required' => 'true'])
                     </div>
 
                     <div class="dynamic-form-row">
@@ -59,8 +59,8 @@
                             <div class="col-md-3 col-xs-12">
                                 <label class="control-label" for="modal-password">{{ trans('admin/users/table.password') }}:</label>
                             </div>
-                            <div class="col-md-8 col-xs-12 required" style="margin-bottom:5px;">
-                                <input type='password' name="password" id='modal-password' class="form-control">
+                            <div class="col-md-8 col-xs-12 " style="margin-bottom:5px;">
+                                <input type='password' name="password" id='modal-password' class="form-control" required>
                                 <a href="#" class="left" id="modal-genPassword">Generate</a>
                                 <div id="modal-generated-password"></div>
                             </div>
@@ -72,8 +72,8 @@
                             <div class="col-md-3 col-xs-12 ">
                                 <label class="control-label" for="modal-password_confirmation">{{ trans('admin/users/table.password_confirm') }}:</label>
                             </div>
-                            <div class="col-md-8 col-xs-12  required">
-                                <input class="form-control" type='password' name="password_confirmation" id='modal-password_confirmation'>
+                            <div class="col-md-8 col-xs-12">
+                                <input class="form-control" type='password' name="password_confirmation" id='modal-password_confirmation' required>
 
                             </div>
                          </div>
diff --git a/resources/views/partials/forms/edit/company-select.blade.php b/resources/views/partials/forms/edit/company-select.blade.php
index 012e032866..59de71a6ab 100644
--- a/resources/views/partials/forms/edit/company-select.blade.php
+++ b/resources/views/partials/forms/edit/company-select.blade.php
@@ -20,7 +20,7 @@
     <!-- full company support is enabled or this user is a superadmin -->
     <div id="{{ $fieldname }}" class="form-group{{ $errors->has($fieldname) ? ' has-error' : '' }}">
         {{ Form::label($fieldname, $translated_name, array('class' => 'col-md-3 control-label')) }}
-        <div class="col-md-7">
+        <div class="col-md-8">
             <select class="js-data-ajax" data-endpoint="companies" data-placeholder="{{ trans('general.select_company') }}" name="{{ $fieldname }}" style="width: 100%" id="company_select"{{ (isset($multiple) && ($multiple=='true')) ? " multiple='multiple'" : '' }}>
                 @if ($company_id = old($fieldname, (isset($item)) ? $item->{$fieldname} : ''))
                     <option value="{{ $company_id }}" selected="selected">
diff --git a/resources/views/partials/forms/edit/location-profile-select.blade.php b/resources/views/partials/forms/edit/location-profile-select.blade.php
index e0e222aa99..14dc4793a5 100644
--- a/resources/views/partials/forms/edit/location-profile-select.blade.php
+++ b/resources/views/partials/forms/edit/location-profile-select.blade.php
@@ -2,7 +2,7 @@
 <div id="location_id" class="form-group{{ $errors->has('location_id') ? ' has-error' : '' }}"{!!  (isset($style)) ? ' style="'.e($style).'"' : ''  !!}>
 
     {{ Form::label('location_id', $translated_name, array('class' => 'col-md-3 control-label')) }}
-    <div class="col-md-7">
+    <div class="col-md-8">
         <select class="js-data-ajax" data-endpoint="locations" data-placeholder="{{ trans('general.select_location') }}" name="location_id" style="width: 100%" id="location_id_location_select" aria-label="location_id">
             @if ($location_id = old('location_id', (isset($user)) ? $user->location_id : ''))
                 <option value="{{ $location_id }}" selected="selected" role="option" aria-selected="true"  role="option">
diff --git a/resources/views/partials/forms/edit/name-first.blade.php b/resources/views/partials/forms/edit/name-first.blade.php
index d7c07947ae..5175313824 100644
--- a/resources/views/partials/forms/edit/name-first.blade.php
+++ b/resources/views/partials/forms/edit/name-first.blade.php
@@ -2,11 +2,12 @@
 @php
     $class = $class ?? 'col-md-6';
     $style = $style ?? '';
+    $required = $required ?? '';
 @endphp
 <div class="form-group {{ $errors->has('first_name') ? 'has-error' : '' }}">
     <label class="col-md-3 control-label" for="first_name">{{ trans('general.first_name') }}</label>
     <div class="{{$class ? $class : 'col-md-6'}}" style= "{{$style}}""{{  (Helper::checkIfRequired($user, 'first_name')) ? ' required' : '' }}">
-        <input class="form-control" type="text" name="first_name" id="first_name" value="{{ old('first_name', $user->first_name) }}" maxlength="191" />
+        <input class="form-control" type="text" name="first_name" id="first_name" value="{{ old('first_name', $user->first_name) }}" {{$required ? 'required' : ''}} maxlength="191"  />
         {!! $errors->first('first_name', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
     </div>
 </div>
diff --git a/resources/views/partials/forms/edit/name-last.blade.php b/resources/views/partials/forms/edit/name-last.blade.php
index 61ef221dc0..6d01a477d8 100644
--- a/resources/views/partials/forms/edit/name-last.blade.php
+++ b/resources/views/partials/forms/edit/name-last.blade.php
@@ -2,6 +2,7 @@
 @php
     $class = $class ?? 'col-md-6';
     $style = $style ?? '';
+        $required = $required ?? '';
 @endphp
 <div class="form-group {{ $errors->has('last_name') ? 'has-error' : '' }}">
     <label class="col-md-3 control-label" for="last_name">{{ trans('general.last_name') }} </label>
diff --git a/resources/views/partials/forms/edit/username.blade.php b/resources/views/partials/forms/edit/username.blade.php
index fe8b21dd1b..030becf722 100644
--- a/resources/views/partials/forms/edit/username.blade.php
+++ b/resources/views/partials/forms/edit/username.blade.php
@@ -1,6 +1,9 @@
 <!-- partials/forms/edit/username.blade.php -->
+@php
+    $required = $required ?? '';
+@endphp
 <div class="form-group">
     <div class="col-md-3 col-xs-12"><label for="modal-username">{{ trans('admin/users/table.username') }}:</label></div>
-    <div class="col-md-8 col-xs-12 required"><input type='text' name="username" id='modal-username' class="form-control"></div>
+    <div class="col-md-8 col-xs-12 required"><input type='text' name="username" id='modal-username' class="form-control"  {{$required ? 'required' : ''}}></div>
 </div>
 <!-- partials/forms/edit/username.blade.php -->
\ No newline at end of file