diff --git a/resources/views/form/rapport-iva/1781611760-316ed831-b02a-49f1-8724-e60f9d966fb5.blade.php b/resources/views/form/rapport-iva/1781611760-316ed831-b02a-49f1-8724-e60f9d966fb5.blade.php
index 7e102b6c..93d034d8 100644
--- a/resources/views/form/rapport-iva/1781611760-316ed831-b02a-49f1-8724-e60f9d966fb5.blade.php
+++ b/resources/views/form/rapport-iva/1781611760-316ed831-b02a-49f1-8724-e60f9d966fb5.blade.php
@@ -339,13 +339,12 @@
         $('#report-form').on('submit', function(event){
             event.preventDefault();
             $("#pageloader").fadeIn();
-            @if($id)
-                    $('#report-form').append('<input type="hidden" name="'+ $('#field-brand_sku').val() +'_pob_units" value="'+ $('#field-unit_plan').val() +'">');
-                    $('#report-form').append('<input type="hidden" name="'+ $('#field-brand_sku').val() +'_pob_value" value="'+ $("#field-value_plan").val() +'">');
-                    let sku_brand_map = sku_brand_maps.find(sb => sb.sku_code == $('#field-brand_sku').val());
-                    $('#report-form').append('<input type="hidden" name="sku_name" value="'+ sku_brand_map.sku +'">');  
-                    
-            @endif
+            
+            $('#report-form').append('<input type="hidden" name="'+ $('#field-brand_sku').val() +'_pob_units" value="'+ $("#field-unit_plan").val() +'">');
+            $('#report-form').append('<input type="hidden" name="'+ $('#field-brand_sku').val() +'_pob_value" value="'+ $("#field-rate_plan").val() +'">');
+            let sku_brand_map = sku_brand_maps.find(sb => sb.sku_code == $('#field-brand_sku').val());
+            $('#report-form').append('<input type="hidden" name="sku_name" value="'+ sku_brand_map.sku +'">');    
+            
             $.ajax({
                 type: "POST",
                 url: '/form/ajaxsubmit',
diff --git a/resources/views/form/rapport-team3/1655458541-00d0e7c9-c60e-410e-ada7-8e0fef8e6ac1.blade.php b/resources/views/form/rapport-team3/1655458541-00d0e7c9-c60e-410e-ada7-8e0fef8e6ac1.blade.php
index 7f980830..5bf860ca 100644
--- a/resources/views/form/rapport-team3/1655458541-00d0e7c9-c60e-410e-ada7-8e0fef8e6ac1.blade.php
+++ b/resources/views/form/rapport-team3/1655458541-00d0e7c9-c60e-410e-ada7-8e0fef8e6ac1.blade.php
@@ -105,25 +105,49 @@
                                                         <tr>
                                                             <td>
 
-                                                            @if($sub->workflow_status=='approved' || isset($sub->formdata->execution_done) && $sub->formdata->execution_done == 'Yes' )
-                                                        <button type="button" class="btn btn-xs btn-info edit-btn"
-                                                        plan_details="{{ json_encode($sub->formdata) }}"><i
-                                                            class="mdi mdi-pencil"></i> Execute</button>
-                                                            <button type="button" class="btn btn-danger btn-xs  delete-btn" data-form-id="{{ $sub->formdata->form_id }}" data-id="{{ $sub->id }}">Delete</button>
+                                                         @if($sub->workflow_status == 'approved' &&
+                                                            (!isset($sub->formdata->record_date) || $sub->formdata->record_date == 0))
+
+                                                            <button type="button" class="btn btn-xs btn-info edit-btn"
+                                                                plan_details="{{ json_encode($sub->formdata) }}">
+                                                                <i class="mdi mdi-pencil"></i> Execute
+                                                            </button>
+
+                                                            <button type="button"
+                                                                class="btn btn-danger btn-xs delete-btn"
+                                                                data-form-id="{{ $sub->formdata->form_id }}"
+                                                                data-id="{{ $sub->id }}">
+                                                                Delete
+                                                            </button>
+
+                                                        @elseif($sub->workflow_status == 'rejected')
+
+                                                            <button type="button"
+                                                                class="btn btn-xs btn-info edit-plan-btn"
+                                                                plan_details="{{ json_encode($sub->formdata) }}">
+                                                                <i class="mdi mdi-pencil"></i> Edit Plan
+                                                            </button>
+
+                                                            <button type="button"
+                                                                class="btn btn-danger btn-xs delete-btn"
+                                                                data-form-id="{{ $sub->formdata->form_id }}"
+                                                                data-id="{{ $sub->id }}">
+                                                                Delete
+                                                            </button>
+
+                                                        @else
+
+                                                            <button type="button"
+                                                                class="btn btn-danger btn-xs delete-btn"
+                                                                data-form-id="{{ $sub->formdata->form_id }}"
+                                                                data-id="{{ $sub->id }}">
+                                                                Delete
+                                                            </button>
+
+                                                        @endif
+
 
-                                                        
                                                     
-                                                        @elseif($sub->workflow_status=='rejected')
-                                                        <button type="button" class="btn btn-xs btn-info edit-plan-btn"
-                                                            plan_details="{{ json_encode($sub->formdata) }}"><i
-                                                                class="mdi mdi-pencil"></i> Edit Plan</button>
-                                                            <button type="button" class="btn btn-danger btn-xs  delete-btn" data-form-id="{{ $sub->formdata->form_id }}" data-id="{{ $sub->id }}">Delete</button>
-                                                        
-                                                        @else 
-                                                                    <button type="button" class="btn btn-danger btn-xs  delete-btn" data-form-id="{{ $sub->formdata->form_id }}" data-id="{{ $sub->id }}">Delete</button>
-
-
-                                                    @endif
                                                                 <!-- <button type="button"
                                                                     class="btn btn-xs btn-info edit-btn"
                                                                     plan_details="{{ json_encode($sub->formdata) }}"><i
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 9b873578..7108d89d 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,574 +1,100 @@
 <!DOCTYPE html>
 <html lang="en">
-
 <head>
-    @include('layouts.shared/title-meta', ['title' => "Form"])
+    @include('layouts.shared/title-meta', ['title' => "History"])
     @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="https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/css/select2.min.css" rel="stylesheet" />
-<style>
-
-/* =========================
-   SELECT2 CUSTOM HIGHLIGHT
-========================= */
-
-.select2-container .select2-selection--single{
-    height: 38px !important;
-    border: 1px solid #ced4da !important;
-    border-radius: 6px !important;
-    padding-top: 4px !important;
-}
-
-.select2-container--default .select2-selection--single .select2-selection__rendered{
-    line-height: 28px !important;
-}
-
-.select2-container--default .select2-selection--single .select2-selection__arrow{
-    height: 36px !important;
-}
-
-/* Dropdown option hover */
-.select2-results__option--highlighted{
-    background-color: #0d6efd !important;
-    color: white !important;
-}
-
-/* Selected option */
-.select2-results__option[aria-selected=true]{
-    background-color: #dbe9ff !important;
-    color: black !important;
-    font-weight: 600;
-}
-
-/* Search box */
-.select2-search__field{
-    border-radius: 5px !important;
-    padding: 6px !important;
-}
-
-</style>
 </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
-
-                            @php
-                            $submissions = Formhelper::getMultiformData( $form->partition, $form_id, $form->user_id);
-                            $submissions = $submissions->data->submissions;
-                            
-                            /* echo "<pre>";
-                            print_r($submissions);
-                            echo "</pre>"; */
-
-                            $existingCount = count($submissions);
-
-                            $targetLimit = 20; // नवीन लिमिट २०
-
-                            $historyDoctorIds = [];
-
-                            foreach ($submissions as $sub) {
-                                if (isset($sub->formdata->cont_id) && $sub->formdata->cont_id != '') {
-                                    $historyDoctorIds[] = (string) $sub->formdata->cont_id;
-                                }
-                            }
-
-                            $historyDoctorIds = array_unique($historyDoctorIds);
-
-                            @endphp
-                            
-                            @if($existingCount<20 || $id)
-                            <form method="POST" action="/form/submit" id="report-form" enctype="multipart/form-data">
-                                <input type="hidden" name="form_id" value="{{$form_id}}">
-                                @csrf
-                                @if($id)
-                                <input type="hidden" name="id[0]" 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)
-                                {{-- @if( !in_array($question->code,
-                                ["record_date","select_rxber_type"] ) )
-                                @continue;
-                                @endif --}}
-                                <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" id="field-{{ $question->code }}" name="{{ $question->code }}" {{ $question->required == 'yes' ? 'required' : '' }}>
-                                            <option value=""> -- Select -- </option>
-                                            @if ($question->code == 'contact_id')
-                                                @foreach ($question->options as $option)
-                                                @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 }}" pcode="{{isset($option->contact->pcode)?$option->contact->pcode:''}}" legacy_code="{{isset($option->contact->legacy_code)?$option->contact->legacy_code:''}}"
-                                                chemist_1_name="{{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:''}}"
-                                                chemist_2_name="{{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:''}}"
-                                                chemist_3_name="{{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:''}}"
-
-                                                 {{ isset($question->value) && $question->value == $option->value ? 'selected' : '' }}>
-                                                    {{ $option->display }}
-                                                </option>
-                                                @endif
-                                                @endforeach
-                                            @else
-                                                @foreach ($question->options as $option)
-                                                <option value="{{ $option->value }}" {{ isset($question->value) && $question->value == $option->value ? 'selected' : '' }}>
-                                                    {{ $option->display }}
-                                                </option>
-                                                @endforeach
-                                            @endif
-                                        </select>
-                                    @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>
-                            @elseif(!$id) 
-                            <h4>You have already submitted the 20 Chemist & Dr Tagging.</h4>
-                            @endif
-                        </div> <!-- end card-body -->
-                    </div>
-                    <!-- end card -->
-
-                    <!-- end row -->
-
-                </div> <!-- end col -->
-            </div>
-            <!-- end row -->
+    <!-- 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>
-        <!-- end container -->
     </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
+                                                    @endif
+                                                </th>
+                                            </tr>
+                                            @endforeach
+                                        </tbody>
+                                    </table>
+                                </div> <!-- end .table-responsive -->
+
+                            </div> <!-- end .table-rep-plugin-->
+                        </div> <!-- end .responsive-table-plugin-->
+
+                    </div> <!-- end card body-->
+                </div> <!-- end card -->
+            </div><!-- end col-->
+        </div>
+        <!-- end row-->
+    </div> <!-- container -->
+
+</div>
     <!-- end page -->
-    <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%;
-    }
-
-    .doctor-wrapper {
-        border: 1px solid #ccc;
-        padding: 20px;
-        border-radius: 10px;
-        margin-bottom: 20px;
-    }
-    </style>
     @include('layouts.shared/footer-script')
-    <script src="https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/js/select2.min.js"></script>
-    <script src="{{asset('assets/libs/sweetalert2/sweetalert2.min.js')}}"></script>
-    <script type="text/javascript">
-    jQuery(document).ready(function($) {
-        $(document).on(
-    'input',
-    '#field-chemist_1_pob_units, #field-chemist_2_pob_units,#field-doctor_pob_units, #field-chemist_3_pob_units',
-    function () {
-        this.value = this.value
-            .replace(/[^0-9]/g, '')   // only digits
-            .replace(/^0+(?=\d)/, ''); // optional: remove leading zeros
-    }
-);
-        const historyDoctors = @json($historyDoctorIds);
-        console.log("History IDs:", historyDoctors);
-        // Allow only today's date
-        const today = new Date().toISOString().split('T')[0];
-
-            $('#field-record_date').attr({
-                min: "2026-07-01",
-                max: today
-            });
-        // ==========================================
-        // CHEMIST NAME - ALPHABETIC ONLY
-        // Works for initial + dynamically added wrappers
-        // ==========================================
-        $(document).on(
-            'input',
-            'input[id^="field-chemist_"][id*="_name"]',
-            function () {
-                this.value = this.value.replace(/[^a-zA-Z\s]/g, '');
-            }
-        );
-
-
-
-
-
-
-        // If an old/future date is already populated, clear it
-       /* if ($('#field-record_date').val() !== today) {
-            $('#field-record_date').val(today);
-        }*/
-        
-        $('#field-contact_id').on('change',function(){
-            $('#field-legacy_code').val($(this).find(":selected").attr("legacy_code"));
-        })
-        $('#field-contact_id').on('change', function () {
-    $('#field-chemist_1_name').val(
-        $(this).find(':selected').attr('chemist_1_name')
-    );
-});
-  $('#field-contact_id').on('change', function () {
-    $('#field-chemist_2_name').val(
-        $(this).find(':selected').attr('chemist_2_name')
-    );
-});
-  $('#field-contact_id').on('change', function () {
-    $('#field-chemist_3_name').val(
-        $(this).find(':selected').attr('chemist_3_name')
-    );
-});
-
-        $('#field-contact_id').on('change',function(){
-            $('#field-speciality').val($(this).find(":selected").attr("speciality"));
-        })
-      
-        $('#field-legacy_code,#field-chemist_1_name,#field-chemist_2_name,#field-chemist_3_name').attr('readonly',true);
-
-        function initializeSelect2() {
-
-            $('select[id^="field-contact_id"]').select2({
-                width: '100%',
-                placeholder: '-- Select Doctor --'
-            });
-
-            $('#field-user_id').select2({
-                width: '100%',
-                placeholder: '-- Select User / Territory --'
-            });
-
-            $('select[id^="execution-"]').select2({
-                width: '100%'
-            });
-        }
-
-        initializeSelect2();
-        preventDuplicateDoctors();
-
-
-       
-        /* function preventDuplicateDoctors() {
-
-            let selectedValues = [];
-
-            // Get all selected doctor values
-            $('select[id^="field-contact_id"]').each(function () {
-
-                let value = $(this).val();
-
-                if (value) {
-                    selectedValues.push(value);
-                }
-
-            });
-
-            // Apply duplicate prevention
-            $('select[id^="field-contact_id"]').each(function () {
-
-                let currentSelect = $(this);
-                let currentValue = currentSelect.val();
-
-                currentSelect.find('option').each(function () {
-
-                    let option = $(this);
-                    let optionValue = option.val();
-
-                    if (!optionValue) return;
-
-                    // Remove old text
-                    let cleanText = option.text().replace(' (Already Added)', '');
-
-                    if (
-                        selectedValues.includes(optionValue) &&
-                        optionValue !== currentValue
-                    ) {
-
-                        option.prop('disabled', true);
-                        option.text(cleanText + ' (Already Added)');
-
-                    } else {
-
-                        option.prop('disabled', false);
-                        option.text(cleanText);
-
-                    }
-
-                });
-
-                // 🔥 IMPORTANT
-                currentSelect.select2('destroy');
-
-                currentSelect.select2({
-                    width: '100%',
-                    placeholder: '-- Select Doctor --'
-                });
-
-            });
-
-        } */
-
-        function preventDuplicateDoctors() {
-
-            let selectedValues = [...historyDoctors];
-
-            // Collect selected values
-            $('select[id^="field-contact_id"]').each(function () {
-
-                let value = $(this).val();
-
-                if (value) {
-                    selectedValues.push(value);
-                }
-
-            });
-
-            $('select[id^="field-contact_id"]').each(function () {
-
-                let currentSelect = $(this);
-                let currentValue = currentSelect.val();
-
-                currentSelect.find('option').each(function () {
-
-                    let option = $(this);
-                    let optionValue = option.val();
-
-                    if (!optionValue) return;
-
-                    // remove previous label
-                    let cleanText = option.text()
-    .replace(' (Already Added)', '')
-    .replace(' (Already Submitted)', '');
-
-if (
-    historyDoctors.includes(optionValue) &&
-    optionValue !== currentValue
-) {
-    option.prop('disabled', true);
-    option.text(cleanText + ' (Already Submitted)');
-}
-else if (
-    selectedValues.includes(optionValue) &&
-    optionValue !== currentValue
-) {
-    option.prop('disabled', true);
-    option.text(cleanText + ' (Already Added)');
-}
-else {
-    option.prop('disabled', false);
-    option.text(cleanText);
-}
-
-                });
-
-                // refresh select2 safely
-                if (currentSelect.hasClass("select2-hidden-accessible")) {
-                    currentSelect.select2('destroy');
-                }
-
-                currentSelect.select2({
-                    width: '100%',
-                    placeholder: '-- Select Doctor --'
-                });
-
-                // VERY IMPORTANT FOR EDIT MODE
-                currentSelect.val(currentValue).trigger('change.select2');
-
-            });
-
-        }
-
-
-
-        $(document).on('change', 'select[id^="field-contact_id"]', function () {
-
-            let selectedOption = $(this).find(':selected');
-
-            let id = $(this).attr('id').split('-').pop(); // get doctor_count dynamically
-
-            $('#field-legacy_code-' + id).val(selectedOption.attr('legacy_code'));
-            $('#field-speciality-' + id).val(selectedOption.attr('speciality'));
-
-            preventDuplicateDoctors();
-        });
-   
-        var existingCount = {{ $existingCount ?? 0 }};
-        var targetLimit = 20;
-
-        var maxAllowedToAdd = targetLimit - existingCount;  
-
-        if(maxAllowedToAdd===1){
-            $('#adddoctor-btn').hide();
-        }
-        
-
-       
-        var currentFormsOnScreen = 1; 
-        var doctor_count = 0;
-
-        console.log("Existing Count:", existingCount);
-        console.log("Max Allowed to Add:", maxAllowedToAdd);
-
-        
-        
-        
-      
-
-
-        
-
-        $('#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("legacy_code", itm.contact.legacy_code).attr("speciality", itm.contact.speciality));
-                    }
-
-                    $('#field-contact_id').change(function() {
-                        $('#field-legacy_code').val($('option:selected', this).attr('legacy_code'))
-                    })  
-                    
-                    $('#field-contact_id').change(function() {
-                        $('#field-speciality').val($('option:selected', this).attr('speciality'))
-                    }) 
-                     
-                },
-            });
-
-            console.log(hierarchy)
-        })
-
-
-        $('#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!'
-                        })
-                    }
-                },
-            });
-        });
-
-    });
-    </script>
 </body>
-
-</html>
+</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 19492ffe..56375302 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
@@ -440,6 +440,7 @@
             var yyyy = today.getFullYear();
 
             today = yyyy + '-' + mm + '-' + dd;
+            //date field min and max
 
             var conversionDateField = document.getElementById('field-record_date');