diff --git a/resources/views/form/rapport-team4/1788175239-76b9a95a-2dd2-42ce-8686-72dfe2cd37f7.blade.php b/resources/views/form/rapport-team4/1788175239-76b9a95a-2dd2-42ce-8686-72dfe2cd37f7.blade.php
index 7108d89d..bb7f21ca 100644
--- a/resources/views/form/rapport-team4/1788175239-76b9a95a-2dd2-42ce-8686-72dfe2cd37f7.blade.php
+++ b/resources/views/form/rapport-team4/1788175239-76b9a95a-2dd2-42ce-8686-72dfe2cd37f7.blade.php
@@ -1,100 +1,333 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-    @include('layouts.shared/title-meta', ['title' => "History"])
+    @include('layouts.shared/title-meta', ['title' => "Form"])
     @include('layouts.shared/head-css', ["mode" => $mode ?? '', "demo" => $demo ?? ''])
+    <link href="{{asset('assets/libs/sweetalert2/sweetalert2.min.css')}}" rel="stylesheet" type="text/css" />
+    <link href="{{ asset('assets/libs/select2/select2.min.css') }}" rel="stylesheet" type="text/css" />
 </head>
-
+<div id="pageloader">
+   <img src="http://cdnjs.cloudflare.com/ajax/libs/semantic-ui/0.16.1/images/loader-large.gif" alt="processing..." />
+</div>
 <body class="loading">
     <div class="account-pages">
         <div class="container">
+            <div class="row justify-content-center">
+                <div class="col-md-8 col-lg-6 col-xl-5 p-0">
+                    <div class="card bg-pattern">
+                        <div class="card-body p-3 row">
+
+                            @if(Session::has('error'))<div class="alert alert-danger">{{Session::get('error')}}</div>
+                            <br>@endif
+                            @if(session('success'))<div class=" alert alert-success">{{ session('success') }}
+                            </div>
+                            <br>@endif
+                            <div class="col-8">
+                                <h4 class="page-title">{{$form->title}}</h4>
+                            </div>
+                            @if(!isset($form->is_approval) || (isset($form->is_approval) && $form->is_approval != 'yes' ) )
+                            <div class="col-4">
+                                @if($form->link_type == 'form')
+                                <a href="/form/history" class="float-end pt-1">View History</a>
+                                @else
+                                <a href="{{url()->previous()}}" class="float-end pt-1">Back</a>
+                                @endif
+                            </div>
+                            @endif
+                            @if(isset($form->user_info))
+                            <div class="col-12">
+                                <h6>Submitted By: {{$form->user_info->name}}</h6>
+                            </div>
+                            @endif
+                            <form method="POST" action="/form/submit" id="report-form" enctype="multipart/form-data">
+                                <input type="hidden" name="form_id" value="{{$form_id}}">
+                                <input type="hidden" name="user_id" value="{{$form->user_id}}">
+                                
+                                @csrf
+                                @if($id)
+                                <input type="hidden" name="id" value="{{$id}}">
+                                @endif
+                                @if(isset($form->manager_can_submit) && $form->manager_can_submit == true)
+                                <div class="col-md-12 mb-2">
+                                    <label for="field-user_id" class="form-label"> Select User / Territory <span class="text-danger">*</span> </label>
+                                    <select class="form-control" id="field-user_id" name="user_id" required>
+                                        <option value=""> -- Select -- </option>
+                                        @foreach($form->users as $option)
+                                        <option value="{{$option->value}}" hierarchy="{{$option->hierarchy_id}}" {{isset($question->value) && $question->value == $option->value ? 'selected':''}}>{{$option->display}}</option>
+                                        @endforeach
+                                    </select>
+                                    <input type="hidden" id="field-hierarchy_id" name="hierarchy_id" value="">
+                                </div>
+                                @endif
+                                
+
+                                @foreach($questions as $question)
+                                    <div class="col-md-12 mb-2">
+                                    <label for="field-{{$question->code}}" class="form-label">{{$question->question}} {!!$question->required == 'yes' ? '<span class="text-danger">*</span>':''!!} </label>
+                                    @switch($question->type)
+                                        @case('hidden')
+                                            <input type="{{$question->type}}" id="field-{{$question->code}}" name="{{$question->code}}" value="{{isset($question->value)?$question->value:''}}">
+                                            @break
+                                        @case('text')
+                                        @case('email')
+                                        @case('tel')
+                                        @case('date')
+                                            <input type="{{$question->type}}" id="field-{{$question->code}}" name="{{$question->code}}" class="form-control" {{$question->required == 'yes'?'required':'' }} value="{{isset($question->value)?$question->value:''}}">
+                                            @break
+                                        @case('number')
+                                            <input type="{{$question->type}}" min="0" max="9999999999" step="1" id="field-{{$question->code}}" name="{{$question->code}}" class="form-control" {{$question->required == 'yes'?'required':'' }}  value="{{isset($question->value)?$question->value:0}}">
+                                            @break
+                                        @case('textarea')
+                                            <textarea id="field-{{$question->code}}" name="{{$question->code}}" class="form-control" {{$question->required == 'yes'?'required':'' }}>{{isset($question->value)?$question->value:''}}</textarea>
+                                            @break
+                                        @case('dropdown')
+                                        <select class="form-control" {!!($question->code
+                                        == 'contact_id')?'data-toggle="select2"':'' !!} id="field-{{ $question->code }}" name="{{ $question->code }}" {{ $question->required == 'yes' ? 'required' : '' }}>
+                                            <option value=""> -- Select -- </option>
+                                            @foreach ($question->options as $option)
+                                            @if($question->code == 'contact_id'  && isset($option->contact->type) && $option->contact->type == 'doctor' )
+                                                    @if( isset($option->contact->montair_lc_kid_5_chemist_and_dr_tagging) && $option->contact->montair_lc_kid_5_chemist_and_dr_tagging == 'Yes' )
+                                                    <option value="{{ $option->value }}"
+                                                        @if(isset($question->value) && $question->value == $option->value) selected @endif
+                                                            @if($question->code == 'contact_id')
+                                                                msl_code="{{ (isset($option->contact->legacy_code) ? $option->contact->legacy_code : '') }}"
+                                                                speciality="{{ (isset($option->contact->speciality) ? $option->contact->speciality : '') }}"
+                                                                chemist1="{{ (isset($option->contact->montair_lc_kid_5_chemist_and_dr_tagging_chemist_1) ? $option->contact->montair_lc_kid_5_chemist_and_dr_tagging_chemist_1 : '') }}"
+                                                                chemist2="{{ (isset($option->contact->montair_lc_kid_5_chemist_and_dr_tagging_chemist_2) ? $option->contact->montair_lc_kid_5_chemist_and_dr_tagging_chemist_2 : '') }}"
+                                                                chemist3="{{ (isset($option->contact->montair_lc_kid_5_chemist_and_dr_tagging_chemist_3) ? $option->contact->montair_lc_kid_5_chemist_and_dr_tagging_chemist_3 : '') }}"
 
-    <!-- start page title -->
-    <div class="row">
-        <div class="col-8 p-2">
-            <h4 class="page-title">{{$formname}}</h4>
-        </div>
-        <div class="col-4 p-2">
-            <a href="/form/show" class="float-end pt-1">New Submission</a>
-        </div>
-    </div>
-    <!-- end page title -->
-    @if(session()->has('message'))
-        <div class="alert alert-success">
-            {{ session()->get('message') }}
-        </div>
-    @endif
-    @if(session()->has('error'))
-        <div class="alert alert-danger">
-            {{ session()->get('error') }}
-        </div>
-    @endif
-        <div class="row">
-            <div class="col-12 p-0">
-                <div class="card">
-                    <div class="card-body">
-                        <div class="responsive-table-plugin">
-                            <div class="table-rep-plugin">
-                                <div class="table-responsive" data-pattern="priority-columns">
-                                    <table id="tech-companies-1" class="table table-striped">
-                                        <thead>
-                                            <tr>
-                                                <th data-priority="1">Submission Date</th>
-                                                @foreach($questions as $code => $question)
-                                                @if($question->type == 'hidden')
-                                                    @continue;
-                                                @endif
-                                                <th data-priority="1">{{$question->label}}</th>
-                                                @endforeach
-                                                <th data-priority="1">Action</th>
-                                            </tr>
-                                        </thead>
-                                        <tbody>
-                                            @foreach($submissions as $submission)
-                                            <tr>
-                                                <th>{{date("d M Y", strtotime($submission->updatedAt))}}</th>
-                                                @foreach($questions as $code => $question)
-                                                    @if($question->type == 'hidden')
-                                                        @continue;
-                                                    @endif
-                                                    @if($question->type == 'file')
-                                                    <td><a target="_blank" href="{{ isset($submission->formdata->{$code}) ? is_array($submission->formdata->{$code})? implode(', ', $submission->formdata->{$code}) :(is_string($submission->formdata->{$code}) ? $submission->formdata->{$code} : '' ) : $code }}" download="{{ isset($submission->formdata->{$code}) ? is_array($submission->formdata->{$code})? implode(', ', $submission->formdata->{$code}) : (is_string($submission->formdata->{$code}) ? $submission->formdata->{$code} : '' ) : $code }}" class="btn btn-dark btn-xs"><i class="mdi mdi-cloud-download me-1"></i> Download</a></td>
-                                                    @elseif(count((array)$question->options) > 0 && 1==2 )
-                                                    <td>{{ $question->options->{ $submission->formdata->{$code} } }}</td>
-                                                    @else
-                                                    <td>{{ isset($submission->formdata->{$code}) ? is_array($submission->formdata->{$code})? implode(', ', $submission->formdata->{$code}) :$submission->formdata->{$code} : $code }}</td>
-                                                    @endif
-                                                @endforeach
-                                                <th>
-                                                    @if($question->can_edit == 'yes' || sizeof($submission->workflow_approvals) == 0 )
-                                                        @if($submission->workflow == 'yes' && $submission->workflow_status == 'approved' )
-                                                        <p>Approved</p>
-                                                        @else
-                                                        <a href="/form/show?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" class="btn btn-primary btn-xs">Edit</button>
-                                                            @if(isset($form->allow_delete_by_user) && $form->allow_delete_by_user == 'yes')
-                                                            <a href="/form/delete?form_id={{$submission->formdata->form_id}}&id={{$submission->id}}" onclick="return confirm('Are you sure you want to delete this submission? This is not recoverable!');" class="btn btn-danger btn-xs mt-1">Delete</button>
                                                             @endif
-                                                        @endif
+                                                    >
+                                                        {{ $option->display }}
+                                                    </option>
                                                     @endif
-                                                </th>
-                                            </tr>
+                                            @elseif($question->code != 'contact_id')
+                                                        <option value="{{ $option->value }}" {{ isset($question->value) && $question->value == $option->value ? 'selected' : '' }} {{ $question->code == 'contact_id' ? 'pcode= ' . (isset($option->contact->pcode)?$option->contact->pcode:'') . ' ' : '' }} {{ isset($question->value) && $question->value == $option->value ? 'selected' : '' }} {{ $question->code == 'contact_id' ? 'speciality= ' . (isset($option->contact->speciality) ? $option->contact->speciality :'') . ' ' : '' }} >
+                                                            {{ $option->display }}
+                                                        </option>
+                                            @endif
+                                                        
+                                            
+                                            
                                             @endforeach
-                                        </tbody>
-                                    </table>
-                                </div> <!-- end .table-responsive -->
+                                           
+                                        </select>
+                                            @break
+                                        @case('checkbox')
+                                            @foreach($question->options as $option)
+                                            <div class="form-check mb-2 form-check-primary">
+                                                <input class="form-check-input" type="checkbox" id="field-{{$question->code}}-{{$option->value}}" name="{{$question->code}}[]" value="{{$option->value}}" {{isset($question->value) && $question->value != '' && in_array($option->value, $question->value) ? 'checked':''}}>
+                                                <label class="form-check-label" for="field-{{$question->code}}-{{$option->value}}">{{$option->display}}</label>
+                                            </div>
+                                            @endforeach
+                                            @break
+                                        @case('file')
+                                        @if(!isset($form->is_approval) || (isset($form->is_approval) && $form->is_approval != 'yes' ) )
+                                             <input type="file" id="field-{{$question->code}}" name="{{$question->code}}" class="form-control" value="" {{$question->required == 'yes'?'required':'' }}>
+                                        @elseif(isset($question->value))
+                                             <img src="{{$question->value}}" class="img-fluid">
+                                        @endif
+                                           
+                                            @break
+                                        @case('multitextbox')
+                                            <div class="row">
+                                                @foreach($question->options as $option)
+                                                <div class="col-6">{{$option->display}}</div>
+                                                <div class="col-6 mb-1">
+                                                    <input type="number" id="field-{{$option->value}}" name="{{$option->value}}" class="form-control" required value="{{isset($option->val)?$option->val:0}}">
+                                                </div>
+                                                @endforeach
+                                            </div>
+                                        @break
+                                        
+                                        @case('time')
+                                            <input type="time" 
+                                                id="field-{{$question->code}}" 
+                                                name="{{$question->code}}" 
+                                                class="form-control" 
+                                                {{$question->required == 'yes' ? 'required' : ''}} 
+                                                value="{{isset($question->value) ? $question->value : ''}}">
+                                        @break
+                                        
+                                    @endswitch
+                                    </div>
+                                @endforeach
+                                @if(!isset($form->is_approval) || (isset($form->is_approval) && $form->is_approval != 'yes' ) )
+                                <div class="text-center d-grid mt-3">
+                                    <button class="btn btn-primary" type="submit" id="submit-btn"> Submit </button>
+                                </div>
+                                @endif
+                            </form>
 
-                            </div> <!-- end .table-rep-plugin-->
-                        </div> <!-- end .responsive-table-plugin-->
+                        </div> <!-- end card-body -->
+                    </div>
+                    <!-- end card -->
 
-                    </div> <!-- end card body-->
-                </div> <!-- end card -->
-            </div><!-- end col-->
+                    <!-- end row -->
+
+                </div> <!-- end col -->
+            </div>
+            <!-- end row -->
         </div>
-        <!-- end row-->
-    </div> <!-- container -->
-
-</div>
+        <!-- end container -->
+    </div>
     <!-- end page -->
-    @include('layouts.shared/footer-script')
+<style type="text/css">
+#pageloader {
+  background: rgba( 255, 255, 255, 0.8 );
+  display: none;
+  height: 100%;
+  position: fixed;
+  width: 100%;
+  z-index: 9999;
+}
+
+#pageloader img {
+  left: 50%;
+  margin-left: -32px;
+  margin-top: -32px;
+  position: absolute;
+  top: 50%;
+}
+</style>
+@include('layouts.shared/footer-script')
+<script src="{{asset('assets/libs/sweetalert2/sweetalert2.min.js')}}"></script>
+<script src="{{ asset('assets/libs/select2/select2.min.js') }}"></script>
+<script type="text/javascript">
+    jQuery(document).ready(function($){
+        $('[data-toggle="select2"]').select2();
+        $('#field-user_id').change(function(){
+            let hierarchy = $('option:selected', this).attr('hierarchy');
+            $('#field-hierarchy_id').val(hierarchy)
+            event.preventDefault();
+            $("#pageloader").fadeIn();
+            $.ajax({
+                type: "GET",
+                url: '/form/getdoctorlist?partition={{$form->partition}}&hierarchy='+hierarchy,
+                processData: false,
+                contentType: false,
+                success: function( data ) {
+                    $("#pageloader").fadeOut();
+                    $('#field-contact_id').html('')
+                    $('#field-contact_id').append($("<option></option>").attr("value",'').text('-- Select --'));
+                    for (let itm of data) {
+                        $('#field-contact_id').append($("<option></option>").attr("value",itm.value).text(itm.display).attr("msl_code", itm.contact.msl_code).attr('speciality',itm.contact.speciality));
+                    }
+
+                    $('#field-contact_id').change(function() {
+                        $('#field-msl_code').val($('option:selected', this).attr('msl_code'))
+                    })    
+                    
+                    $('#field-contact_id').change(function() {
+                        $('#field-speciality').val($('option:selected', this).attr('speciality'))
+                    })    
+                },
+            });
+
+            console.log(hierarchy)
+        })
+
+        $('#field-contact_id').change(function() {
+            $('#field-speciality').val($('option:selected', this).attr('speciality'))
+            $('#field-chemist_1_name').val($('option:selected', this).attr('chemist1'))
+            $('#field-chemist_2_name').val($('option:selected', this).attr('chemist2'))
+            $('#field-chemist_3_name').val($('option:selected', this).attr('chemist3'))
+
+        })
+        
+        $('#field-contact_id').change(function() {
+               		 $('#field-legacy_code').val($('option:selected', this).attr('msl_code'))
+        })
+
+        $('#field-msl_code,#field-speciality').attr('readonly',true);
+        
+        
+        $('#field-other_doctor_name,#field-other_speciality,#field-other_msl_code').prop({"required":false});
+        $('#field-other_doctor_name,#field-other_speciality,#field-other_msl_code').parent().hide();
+        
+
+        
+
+    
+        $('#field-file_upload').on('change', function () {
+            let file = this.files[0];
+
+            if (file) {
+                let allowedTypes = ['image/png', 'image/jpg', 'image/jpeg'];
+                let maxSize = 10 * 1024 * 1024; // 10 MB
+
+                // Type validation
+                if (!allowedTypes.includes(file.type)) {
+                    alert('Only PNG, JPG, and JPEG files are allowed.');
+                    $(this).val('');
+                    return;
+                }
+
+                // Size validation
+                if (file.size > maxSize) {
+                    alert('File size should not exceed 10 MB.');
+                    $(this).val('');
+                    return;
+                }
+            }
+        });
+
+        $(document).ready(function () {
+            $('#field-contact_id').trigger('change');
+        });
+
+        $('#field-city,#field-state,#field-departmental_head_name').on('input', function () {
+            this.value = this.value.replace(/[^a-zA-Z\s]/g, '');
+        });
+            
+
+        $('#report-form').on('submit', function(event){
+            event.preventDefault();
+            const formData = new FormData($('#report-form')[0]);
+            // Log form data to console
+            for (let [key, value] of formData.entries()) {
+                console.log(key, value);
+            }
+            $("#pageloader").fadeIn();
+            $.ajax({
+                type: "POST",
+                url: '/form/ajaxsubmit',
+                data: new FormData($('#report-form')[0]),
+                processData: false,
+                contentType: false,
+                success: function( data ) {
+                    $("#pageloader").fadeOut();
+                    if(data.status == 'success') {
+                        Swal.fire({
+                          title: 'Great!',
+                          text: 'Your data is successfully submitted!',
+                          icon: 'success'
+                        }).then(() => {
+                            location.reload(); // 🔥 page refresh here
+                                    });
+                        $('#report-form').trigger("reset");
+                    } else {
+                        Swal.fire({
+                            icon: 'error',
+                            title: 'Data not submitted',
+                            text: 'Something went wrong, please try again after some time!'
+                        })
+                    }
+                },
+            });
+        });
+
+            var today = new Date();
+            var dd = String(today.getDate()).padStart(2, '0');
+            var mm = String(today.getMonth() + 1).padStart(2, '0');
+            var yyyy = today.getFullYear();
+            today = yyyy + '-' + mm + '-' + dd;
+
+            var plandateField = document.getElementById('field-record_date');
+
+            plandateField.setAttribute('max', today);
+    });
+</script>
 </body>
+
 </html>
\ No newline at end of file
diff --git a/resources/views/form/rapport-team4/1788495344-e823f5ac-f7a7-477b-926f-62a066a6c718.blade.php b/resources/views/form/rapport-team4/1788495344-e823f5ac-f7a7-477b-926f-62a066a6c718.blade.php
index 56375302..a0166d65 100644
--- a/resources/views/form/rapport-team4/1788495344-e823f5ac-f7a7-477b-926f-62a066a6c718.blade.php
+++ b/resources/views/form/rapport-team4/1788495344-e823f5ac-f7a7-477b-926f-62a066a6c718.blade.php
@@ -62,7 +62,7 @@
 
                             @endphp
 
-                            {{-- @if(count($submissions)<20)   --}}  
+                            @if(count($submissions)<20)    
                             <form method="POST" action="/form/submit" id="report-form" enctype="multipart/form-data">
                                 <input type="hidden" name="form_id" value="{{$form_id}}">
                                 @csrf
@@ -118,44 +118,45 @@
                                             <textarea id="field-{{$question->code}}" name="{{$question->code}}" class="form-control" {{$question->required == 'yes'?'required':'' }}>{{isset($question->value)?$question->value:''}}</textarea>
                                             @break
                                         @case('dropdown')
-                                <select class="form-control"
-                                    id="field-{{$question->code}}"
-                                    name="{{$question->code}}"
-                                    {{$question->required == 'yes'?'required':'' }}>
+                                            <select class="form-control"
+                                                id="field-{{$question->code}}"
+                                                name="{{$question->code}}"
+                                                {{$question->required == 'yes'?'required':'' }}>
 
-                                    <option value=""> -- Select -- </option>
+                                                <option value=""> -- Select -- </option>
 
-                                    @foreach($question->options as $option)
+                                                @foreach($question->options as $option)
 
-                                        {{-- 🔥 NEW: Check whether this doctor was already submitted --}}
-                                        @php
-                                            $alreadySubmitted = in_array(
-                                                (string) $option->value,
-                                                $historyDoctorIds
-                                            );
-                                        @endphp
+                                                    {{-- 🔥 NEW: Check whether this doctor was already submitted --}}
+                                                    {{-- @php
+                                                        $alreadySubmitted = in_array(
+                                                            (string) $option->value,
+                                                            $historyDoctorIds
+                                                        );
+                                                    @endphp --}}
 
-                                        <option value="{{$option->value}}"
-                                            msl_code="{{ isset($option->contact->legacy_code) ? $option->contact->legacy_code : '' }}"
-                                            speciality="{{ isset($option->contact->speciality) ? $option->contact->speciality : '' }}"
+                                                    <option value="{{$option->value}}"
+                                                        msl_code="{{ isset($option->contact->legacy_code) ? $option->contact->legacy_code : '' }}"
+                                                        speciality="{{ isset($option->contact->speciality) ? $option->contact->speciality : '' }}"
+                                                       
 
-                                            {{-- 🔥 NEW --}}
-                                            {{ $alreadySubmitted ? 'disabled' : '' }}
+                                                        {{-- 🔥 NEW --}}
+                                                    {{--  {{ $alreadySubmitted ? 'disabled' : '' }} --}}
 
-                                            {{isset($question->value) && $question->value == $option->value ? 'selected':''}}>
+                                                        {{isset($question->value) && $question->value == $option->value ? 'selected':''}}>
 
-                                            {{$option->display}}
+                                                        {{$option->display}}
 
-                                            {{-- 🔥 NEW --}}
-                                            @if($alreadySubmitted)
-                                                (Already Submitted)
-                                            @endif
+                                                        {{-- 🔥 NEW --}}
+                                                    {{--  @if($alreadySubmitted)
+                                                            (Already Submitted)
+                                                        @endif --}}
 
-                                        </option>
+                                                    </option>
 
-                                    @endforeach
-                                </select>
-                                @break
+                                                @endforeach
+                                            </select>
+                                            @break
                                         @case('radio')
                                             @foreach($question->options as $option)
                                             <div class="form-check mb-2 form-check-success">
@@ -250,9 +251,9 @@
                                 </div>
                                 @endif
                             </form>
-                            {{-- @else 
+                            @else 
                             <h4>You have submitted 20  Doctors</h4>
-                            @endif --}}
+                            @endif
                         </div> <!-- end card-body -->
                     </div>
                     <!-- end card -->
@@ -298,43 +299,43 @@
         // 🔥 NEW - Disable doctors that were already submitted
 // NEW - DEBUG duplicate doctor check
 // 🔥 NEW - Disable previously submitted doctors
-        /* function preventDuplicateDoctors() {
+function preventDuplicateDoctors() {
 
-            $('#field-contact_id option').each(function () {
+    $('#field-contact_id option').each(function () {
 
-                let option = $(this);
-                let doctorId = String(option.val());
+        let option = $(this);
+        let doctorId = String(option.val());
 
-                if (!doctorId) {
-                    return;
-                }
+        if (!doctorId) {
+            return;
+        }
 
-                // Remove old label first
-                let cleanText = option.text()
-                    .replace(' (Already Submitted)', '');
+        // Remove old label first
+        let cleanText = option.text()
+            .replace(' (Already Submitted)', '');
 
-                console.log(
-                    "Doctor ID:",
-                    doctorId,
-                    "History IDs:",
-                    historyDoctorIds
-                );
+        console.log(
+            "Doctor ID:",
+            doctorId,
+            "History IDs:",
+            historyDoctorIds
+        );
 
-                if (historyDoctorIds.includes(doctorId)) {
+        if (historyDoctorIds.includes(doctorId)) {
 
-                    // 🔥 Disable doctor
-                    option.prop('disabled', true);
+            // 🔥 Disable doctor
+            option.prop('disabled', true);
 
-                    // 🔥 Show label
-                    option.text(cleanText + ' (Already Submitted)');
+            // 🔥 Show label
+            option.text(cleanText + ' (Already Submitted)');
 
-                } else {
+        } else {
 
-                    option.prop('disabled', false);
-                    option.text(cleanText);
-                }
-            });
-        } */
+            option.prop('disabled', false);
+            option.text(cleanText);
+        }
+    });
+}
         $('#field-user_id').change(function(){
 
     let hierarchy = $('option:selected', this).attr('hierarchy');
@@ -373,7 +374,7 @@
             }
 
             // 🔥 NEW - Disable doctors already submitted by this user
-            /* preventDuplicateDoctors(); */
+            preventDuplicateDoctors();
         },
     });
 
@@ -440,7 +441,6 @@
             var yyyy = today.getFullYear();
 
             today = yyyy + '-' + mm + '-' + dd;
-            //date field min and max
 
             var conversionDateField = document.getElementById('field-record_date');