diff --git a/resources/views/form/rapport-arise/1779187275-848fd8f3-6ea2-4521-9d85-85ec424fa8d5.blade.php b/resources/views/form/rapport-arise/1779187275-848fd8f3-6ea2-4521-9d85-85ec424fa8d5.blade.php
index 11656756..877c89ba 100644
--- a/resources/views/form/rapport-arise/1779187275-848fd8f3-6ea2-4521-9d85-85ec424fa8d5.blade.php
+++ b/resources/views/form/rapport-arise/1779187275-848fd8f3-6ea2-4521-9d85-85ec424fa8d5.blade.php
@@ -5,6 +5,7 @@
     @include('layouts.shared/head-css', ["mode" => $mode ?? '', "demo" => $demo ?? ''])
     <link href="{{asset('assets/libs/sweetalert2/sweetalert2.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>
@@ -27,7 +28,7 @@
                             @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>
+                                <!-- <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
@@ -63,15 +64,16 @@
                                     $hideFields = [
                                         'date',
                                         'contact_id',
+                                        'month_1_rx',
+                                        'month_2_rx',
+                                        'month_3_rx',
                                         'converted'
                                     ];
 
                                     @endphp
 
                                     @if(in_array($question->code, $hideFields))
-
                                         @continue
-
                                     @endif
                                     <div class="{{ in_array($question->code, ['upload-supporting-doc1', 'upload-supporting-doc2']) ? 'upload-doc-fields' : '' }} col-md-12 mb-2">
                                     <label for="field-{{$question->code}}" class="form-label">{{$question->question}} {!!$question->required == 'yes' ? '<span class="text-danger">*</span>':''!!} </label>
@@ -206,181 +208,45 @@
                                     </div>
                                 @endforeach
                                 @if(!isset($form->is_approval) || (isset($form->is_approval) && $form->is_approval != 'yes' ) )
-                                <div class="text-center d-grid mt-3">
+                                <div class="text-center d-gri mt-3">
                                     <div class="col-md-12 mt-3">
                                     <div class="card">
-
                                         <div class="card-header">
                                             <h5 class="mb-0">Tagged Doctors</h5>
                                         </div>
-
                                         <div class="card-body p-0">
-
                                             <div class="table-responsive">
-
-                                                <table class="table table-bordered mb-0">
-
+                                                <table class="table table-bordered  mb-0">
                                                     <thead>
-
                                                         <tr>
                                                             <th>Doctor Name</th>
                                                             <th>Speciality</th>
-                                                            <th>Number of Rx</th>
-                                                            <th>MSL Code</th>
-                                                            <th>Action</th>
+                                                            <th>Month1 Rx</th>
+                                                            <th>Month2 Rx</th>
+                                                            <th>Month3 Rx</th>
                                                         </tr>
-
                                                     </thead>
-
                                                     <tbody id="doctor-table-body">
-
                                                         <tr>
-                                                            <td colspan="5" class="text-center">
+                                                            <td colspan="8" class="text-center">
                                                                 No Doctors Found
                                                             </td>
                                                         </tr>
-
                                                     </tbody>
-
                                                 </table>
-
                                             </div>
-
                                         </div>
-
                                     </div>
-
-                                <!-- </div>
+                                 </div>
                                     <button class="btn btn-primary" type="submit" id="submit-btn"> Submit </button>
-                                </div> -->
+                                </div> 
                                 @endif
                             </form>
                             <!-- SAMPLE FORM MODAL -->
-
-<div class="modal fade"
-     id="sampleFormModal"
-     tabindex="-1"
-     aria-hidden="true">
-
-    <div class="modal-dialog modal-lg">
-
-        <div class="modal-content">
-
-            <div class="modal-header">
-
-                <h5 class="modal-title">
-                    Add RX
-                </h5>
-
-                <button type="button"
-                        class="btn-close"
-                        data-bs-dismiss="modal">
-                </button>
-
-            </div>
-
-            <div class="modal-body">
-
-                <form id="sample-form" enctype="multipart/form-data">
-
-                @csrf
-
-                <input type="hidden"
-                    name="form_id"
-                    value="1779187275-848fd8f3-6ea2-4521-9d85-85ec424fa8d5">
-
-                    <!-- hidden category -->
-                    <input type="hidden"
-                            id="sample-category"
-                            name="select-category">
-
-                    <!-- hidden doctor -->
-                    <input type="hidden"
-                           id="sample-doctor-id"
-                           name="contact_id">
-
-                    <input type="hidden"
-                            id="sample-converted"
-                            name="converted">
-
-                        <input type="hidden"
-                            id="sample-category-metric"
-                            name="">
-
-                    <div class="mb-3 d-none">
-
-                        <input type="text"
-                            id="sample-doctor-name"
-                            class="form-control"
-                            readonly>
-
-                    </div>
-
-                    <div class="mb-3 d-none">
-
-                        <input type="text"
-                            id="sample-category-display"
-                            class="form-control"
-                            readonly>
-
-                    </div>
-
-                    <!-- DATE FIELD -->
-
-                    <div class="mb-3">
-
-                        <label class="form-label">
-                            Date
-                        </label>
-
-                        <input type="date"
-                            id="sample-date"
-                            class="form-control"
-                            name="date"
-                            max="{{ date('Y-m-d') }}"
-                            required>
-
-                    </div>
-
-                    <div class="mb-3">
-
-                    <label class="form-label">
-                        Number of RX
-                    </label>
-
-                    <input type="text"
-                            class="form-control"
-                            id="sample-count"
-                            name="sample_count"
-                            inputmode="numeric"
-                            pattern="[0-9]*"
-                            autocomplete="off"
-                            required>
-
-                </div>
-
-                    <button type="submit"
-                            class="btn btn-primary">
-
-                        Submit
-                    </button>
-
-                </form>
-
-            </div>
-
-        </div>
-
-    </div>
-
-</div>
-
                         </div> <!-- end card-body -->
                     </div>
                     <!-- end card -->
-
                     <!-- end row -->
-
                 </div> <!-- end col -->
             </div>
             <!-- end row -->
@@ -413,104 +279,237 @@
 .upload-doc-fields {
     display: none;
 }
+
+.rx_count{
+    width: 70px;
+}
+
+
+
 </style>
 @include('layouts.shared/footer-script')
 <script src="{{asset('assets/libs/sweetalert2/sweetalert2.min.js')}}"></script>
 <script type="text/javascript">
     jQuery(document).ready(function($){
     @php
-
         // KEEP ORIGINAL DOCTOR LOGIC
-
         $doctors = [];
-
         foreach($questions as $question){
-
             if($question->code == 'contact_id'){
-
-                $doctors = $question->options;
-
+                $doctors = is_iterable($question->options ?? null) ? $question->options : [];
             }
-
         }
-
         // RX HISTORY DATA ONLY
-
-        $history = Formhelper::getMultiformData(
-            $form->partition,
-            $form_id,
-            $form->user_id
-        );
-
+        $history = Formhelper::getMultiformData( $form->partition, $form_id, $form->user_id );
+        $categorySubmissions = [];
+        $categoryDoctorSubmissions = [];
         $doctorRxCounts = [];
+        $doctorMonthData = [];
 
-if(isset($history->data->submissions)){
+        $categoryAttributes = [
+            'foracort-ciphaler' => 'foracort_ciphaler',
+            'duolin-synchrobreathe' => 'duolin_synchrobreathe',
+            'foracort-g' => 'foracort_g',
+            'pedia' => 'pedia',
+            'triple-combination-voltido-trio-indaflo-g' => 'triple_combination_voltido_trio_indaflo_g',
+            'ics-laba-seroflo-maxiflo-voltido' => 'ics_laba_seroflo_maxiflo_voltido',
+            'competition-dr' => 'competition_dr',
+        ];
 
-    foreach($history->data->submissions as $sub){
-
-        // only RX entries
-        if(
-            !isset($sub->formdata->sample_count)
-        ){
-            continue;
+        $doctorNameById = [];
+        $doctorIdByName = [];
+        foreach ($doctors as $doc) {
+            $doctorNameById[$doc->value] = $doc->display;
+            $doctorIdByName[trim($doc->display)] = $doc->value;
         }
 
-        $category =
-            strtolower(
-                trim(
-                    $sub->formdata->{'select-category'} ?? ''
-                )
-            );
+        if (isset($history->data->submissions) && is_iterable($history->data->submissions)) {
+            foreach ($history->data->submissions as $sub) {
+                $formdata = $sub->formdata ?? null;
+                if (!$formdata) {
+                    continue;
+                }
+                $category = strtolower(trim($formdata->{'select-category'} ?? ''));
+                if (!$category) {
+                    continue;
+                }
+                if (!isset($categorySubmissions[$category])) {
+                    $categorySubmissions[$category] = [];
+                }
+                if (isset($formdata->sample_count)) {
+                    $doctorId = trim($formdata->contact_id ?? '');
+                    $doctorName = $doctorNameById[$doctorId] ?? trim($formdata->contact_id ?? '');
+                    $rxValue = intval($formdata->sample_count ?? 0);
+                    if (!$doctorId) {
+                        continue;
+                    }
+                    $categorySubmissions[$category][] = [
+                        'type' => 'rx',
+                        'doctor_id' => $doctorId,
+                        'doctor_name' => $doctorName,
+                        'sample_count' => $rxValue,
+                        'date' => $formdata->date ?? '',
+                    ];
+                    if (!isset($doctorRxCounts[$category])) {
+                        $doctorRxCounts[$category] = [];
+                    }
+                    if (!isset($doctorRxCounts[$category][$doctorName])) {
+                        $doctorRxCounts[$category][$doctorName] = 0;
+                    }
+                    $doctorRxCounts[$category][$doctorName] += $rxValue;
+                    continue;
+                }
 
-        $doctorName =
-            trim(
-                $sub->formdata->contact_id ?? ''
-            );
+                $rawDoctorId = '';
+                if (!empty($formdata->contact_id)) {
+                    $contactId = $formdata->contact_id;
+                    if (is_array($contactId) || $contactId instanceof \Traversable) {
+                        $contactValues = array_values((array) $contactId);
+                        $rawDoctorId = trim((string) ($contactValues[0] ?? ''));
+                    } else {
+                        $rawDoctorId = trim((string) $contactId);
+                    }
+                }
 
-        $rxValue =
-            intval(
-                $sub->formdata->sample_count ?? 0
-            );
+                $doctorId = $rawDoctorId;
+                if (
+                    $doctorId !== '' &&
+                    !isset($doctorNameById[$doctorId]) &&
+                    isset($doctorIdByName[$doctorId])
+                ) {
+                    $doctorId = $doctorIdByName[$doctorId];
+                }
 
-        if(!$doctorName){
-            continue;
+                $categoryPrefix = $categoryAttributes[$category] ?? null;
+                $month1Val = $formdata->month_1 ?? '';
+                $month2Val = $formdata->month_2 ?? '';
+                $month3Val = $formdata->month_3 ?? '';
+
+                if ($categoryPrefix) {
+                    if (isset($formdata->{$categoryPrefix . '_month_1'}) && $formdata->{$categoryPrefix . '_month_1'} !== '') {
+                        $month1Val = $formdata->{$categoryPrefix . '_month_1'};
+                    }
+                    if (isset($formdata->{$categoryPrefix . '_month_2'}) && $formdata->{$categoryPrefix . '_month_2'} !== '') {
+                        $month2Val = $formdata->{$categoryPrefix . '_month_2'};
+                    }
+                    if (isset($formdata->{$categoryPrefix . '_month_3'}) && $formdata->{$categoryPrefix . '_month_3'} !== '') {
+                        $month3Val = $formdata->{$categoryPrefix . '_month_3'};
+                    }
+                }
+
+                $convertedVal = $formdata->converted ?? '';
+                if ($categoryPrefix && isset($formdata->{$categoryPrefix . '_converted'}) && $formdata->{$categoryPrefix . '_converted'} !== '') {
+                    $convertedVal = $formdata->{$categoryPrefix . '_converted'};
+                }
+
+                $submissionRow = [
+                    'submission_id' => $sub->id,
+                    'converted' => $convertedVal,
+                    'doctor_id' => $doctorId,
+                    'doctor_name' => $doctorNameById[$doctorId] ?? $rawDoctorId,
+                    'month_1' => $month1Val,
+                    'month_2' => $month2Val,
+                    'month_3' => $month3Val,
+                ];
+
+                if ($categoryPrefix) {
+                    $submissionRow[$categoryPrefix . '_month_1'] = $month1Val;
+                    $submissionRow[$categoryPrefix . '_month_2'] = $month2Val;
+                    $submissionRow[$categoryPrefix . '_month_3'] = $month3Val;
+                    $submissionRow[$categoryPrefix . '_converted'] = $convertedVal;
+                }
+
+                $categorySubmissions[$category][] = $submissionRow;
+
+                if (!isset($doctorMonthData[$category])) {
+                    $doctorMonthData[$category] = [];
+                }
+
+                if (!isset($categoryDoctorSubmissions[$category])) {
+                    $categoryDoctorSubmissions[$category] = [];
+                }
+
+                if ($doctorId !== '') {
+                    $categoryDoctorSubmissions[$category][$doctorId] = $submissionRow;
+                    $doctorMonthData[$category][$doctorId] = [
+                        'month_1' => $submissionRow['month_1'],
+                        'month_2' => $submissionRow['month_2'],
+                        'month_3' => $submissionRow['month_3'],
+                    ];
+                }
+
+                foreach (['month_1', 'month_2', 'month_3'] as $monthKey) {
+                    $formMonthKey = $monthKey;
+                    if ($categoryPrefix && isset($formdata->{$categoryPrefix . '_' . $monthKey}) && $formdata->{$categoryPrefix . '_' . $monthKey} !== '' && $formdata->{$categoryPrefix . '_' . $monthKey} !== null) {
+                        $formMonthKey = $categoryPrefix . '_' . $monthKey;
+                    }
+
+                    if (!isset($formdata->$formMonthKey) || $formdata->$formMonthKey === '' || $formdata->$formMonthKey === null) {
+                        continue;
+                    }
+
+                    $monthValue = $formdata->$formMonthKey;
+                    $monthEntries = [];
+
+                    if (is_array($monthValue) || $monthValue instanceof \stdClass) {
+                        foreach ((array) $monthValue as $entryKey => $val) {
+                            $normalizedKey = trim((string) $entryKey);
+                            if (
+                                $normalizedKey !== '' &&
+                                !isset($doctorNameById[$normalizedKey]) &&
+                                isset($doctorIdByName[$normalizedKey])
+                            ) {
+                                $normalizedKey = $doctorIdByName[$normalizedKey];
+                            }
+                            $monthEntries[$normalizedKey] = $val;
+                        }
+                    } elseif ($doctorId !== '') {
+                        $monthEntries = [$doctorId => $monthValue];
+                    }
+
+                    foreach ($monthEntries as $entryDoctorId => $val) {
+                        if ($entryDoctorId === '') {
+                            continue;
+                        }
+
+                        if (!isset($doctorMonthData[$category][$entryDoctorId])) {
+                            $doctorMonthData[$category][$entryDoctorId] = [
+                                'month_1' => '',
+                                'month_2' => '',
+                                'month_3' => '',
+                            ];
+                        }
+
+                        $doctorMonthData[$category][$entryDoctorId][$monthKey] = $val;
+
+                        if (!isset($categoryDoctorSubmissions[$category][$entryDoctorId])) {
+                            $categoryDoctorSubmissions[$category][$entryDoctorId] = [
+                                'submission_id' => $sub->id,
+                                'converted' => $formdata->converted ?? '',
+                                'doctor_id' => $entryDoctorId,
+                                'doctor_name' => $doctorNameById[$entryDoctorId] ?? $entryDoctorId,
+                                'month_1' => '',
+                                'month_2' => '',
+                                'month_3' => '',
+                            ];
+                        }
+
+                        $categoryDoctorSubmissions[$category][$entryDoctorId][$monthKey] = $val;
+                    }
+                }
+            }
         }
 
-        // category wise grouping
-        if(!isset($doctorRxCounts[$category])){
-
-            $doctorRxCounts[$category] = [];
-
-        }
-
-        // doctor initialize
-        if(
-            !isset(
-                $doctorRxCounts[$category][$doctorName]
-            )
-        ){
-
-            $doctorRxCounts[$category][$doctorName] = 0;
-
-        }
-
-        // add RX
-        $doctorRxCounts[$category][$doctorName]
-            += $rxValue;
-
-    }
-
-}
-
     @endphp
     var allDoctors = {!! json_encode($doctors) !!};
-    var doctorRxCounts =
-        {!! json_encode($doctorRxCounts) !!};
+    var categorySubmissions = {!! json_encode($categorySubmissions) !!};
+    var categoryDoctorSubmissions = {!! json_encode($categoryDoctorSubmissions) !!};
+    var doctorRxCounts = {!! json_encode($doctorRxCounts) !!};
+    var doctorMonthData = {!! json_encode($doctorMonthData) !!};
 
-    console.log(
-        "DOCTOR RX COUNTS",
-        doctorRxCounts
-    );
+    console.log("CATEGORY SUBMISSIONS", categorySubmissions);
+    console.log("DOCTOR RX COUNTS", doctorRxCounts);
+    console.log("DOCTOR MONTH DATA", doctorMonthData);
     console.log("INITIAL DOCTORS FROM BACKEND", allDoctors);
 
 //         $.ajax({
@@ -555,8 +554,18 @@ if(isset($history->data->submissions)){
 
     let selectedCategory = $(this).val();
 
-    $('#field-contact_id').html('');
+    if (!selectedCategory) {
+        $('#doctor-table-body').html(`
+            <tr>
+                <td colspan="5" class="text-center">
+                    No Doctors Found
+                </td>
+            </tr>
+        `);
+        return;
+    }
 
+    $('#field-contact_id').html('');
     $('#field-contact_id').append(
         $("<option></option>")
             .attr("value",'')
@@ -564,9 +573,7 @@ if(isset($history->data->submissions)){
     );
 
     if(allDoctors.length === 0) {
-
         console.log("Doctors array empty");
-
         return;
     }
 
@@ -577,25 +584,14 @@ if(isset($history->data->submissions)){
     }
 
     const categoryMap = {
-
-    "foracort-ciphaler": "foracort_ciphaler",
-
-    "duolin-synchrobreathe": "duolin_synchrobreathe",
-
-    "foracort-g": "foracort_g",
-
-    "pedia": "pedia",
-
-    "triple-combination-voltido-trio-indaflo-g":
-        "triple_combination_voltido_trio_indaflo_g",
-
-    "ics-laba-seroflo-maxiflo-voltido":
-        "ics_laba_seroflo_maxiflo_voltido",
-
-    "competition-dr":
-        "competition_dr"
-
-};
+        "foracort-ciphaler": "foracort_ciphaler",
+        "duolin-synchrobreathe": "duolin_synchrobreathe",
+        "foracort-g": "foracort_g",
+        "pedia": "pedia",
+        "triple-combination-voltido-trio-indaflo-g":"triple_combination_voltido_trio_indaflo_g",
+        "ics-laba-seroflo-maxiflo-voltido":"ics_laba_seroflo_maxiflo_voltido",
+        "competition-dr":"competition_dr"
+    };
 
 let categoryKey = categoryMap[selectedCategory];
 
@@ -653,7 +649,7 @@ let categoryKey = categoryMap[selectedCategory];
     // reset doctor table
     $('#doctor-table-body').html(`
         <tr>
-            <td colspan="5" class="text-center">
+            <td colspan="8" class="text-center">
                 No Doctors Found
             </td>
         </tr>
@@ -764,37 +760,121 @@ const categoryThresholds = {
 };
 
 const conversionMetricFields = {
-
-    "foracort-ciphaler":
-        "foracort_ciphaler",
-
-    "duolin-synchrobreathe":
-        "duolin_synchrobreathe",
-
-    "foracort-g":
-        "foracort_g",
-
-    "pedia":
-        "pedia",
-
-    "triple-combination-voltido-trio-indaflo-g":
-        "triple_combination_voltido_trio_indaflo_g",
-
-    "ics-laba-seroflo-maxiflo-voltido":
-        "ics_laba_seroflo_maxiflo_voltido",
-
-    "competition-dr":
-        "competition_dr"
+    "foracort-ciphaler":"foracort_ciphaler",
+    "duolin-synchrobreathe":"duolin_synchrobreathe",
+    "foracort-g":"foracort_g",
+    "pedia":"pedia",
+    "triple-combination-voltido-trio-indaflo-g": "triple_combination_voltido_trio_indaflo_g",
+    "ics-laba-seroflo-maxiflo-voltido": "ics_laba_seroflo_maxiflo_voltido",
+    "competition-dr": "competition_dr"
 
 };
-function renderDoctorTable(filteredDoctors){
 
+function getCategoryMonthFieldNames(selectedCategory) {
+    let prefix = conversionMetricFields[selectedCategory] || '';
+
+    return {
+        month1: prefix ? `${prefix}_month_1` : 'month_1',
+        month2: prefix ? `${prefix}_month_2` : 'month_2',
+        month3: prefix ? `${prefix}_month_3` : 'month_3',
+    };
+}
+
+function getCategoryConvertedFieldName(selectedCategory) {
+    let prefix = conversionMetricFields[selectedCategory] || '';
+
+    return prefix ? `${prefix}_converted` : 'converted';
+}
+
+function getSubmissionMonthValues(submission, monthFields) {
+    return {
+        month1: submission[monthFields.month1] ?? submission.month_1 ?? '',
+        month2: submission[monthFields.month2] ?? submission.month_2 ?? '',
+        month3: submission[monthFields.month3] ?? submission.month_3 ?? '',
+    };
+}
+
+function getMonthRxTotal(month1, month2, month3) {
+    return (parseInt(month1, 10) || 0)
+        + (parseInt(month2, 10) || 0)
+        + (parseInt(month3, 10) || 0);
+}
+
+function calculateDoctorConverted(month1, month2, month3, selectedCategory) {
+    let threshold = categoryThresholds[selectedCategory] || 0;
+    let totalRx = getMonthRxTotal(month1, month2, month3);
+
+    return totalRx >= threshold ? 1 : 0;
+}
+
+function syncCategoryMonthFields($row) {
+    let selectedCategory = $('#field-select-category').val() || '';
+    let monthFields = getCategoryMonthFieldNames(selectedCategory);
+    let doctorId = $row.data('doctor-id') || '';
+    let month1 = $row.find('.rx-month-1').val();
+    let month2 = $row.find('.rx-month-2').val();
+    let month3 = $row.find('.rx-month-3').val();
+
+    $row.find('.doctor-category-month-1').val(month1).attr('name', `${monthFields.month1}[${doctorId}]`);
+    $row.find('.doctor-category-month-2').val(month2).attr('name', `${monthFields.month2}[${doctorId}]`);
+    $row.find('.doctor-category-month-3').val(month3).attr('name', `${monthFields.month3}[${doctorId}]`);
+}
+
+function updateDoctorRowConverted($row) {
+    let selectedCategory = $('#field-select-category').val() || '';
+    let month1 = $row.find('.rx-month-1').val();
+    let month2 = $row.find('.rx-month-2').val();
+    let month3 = $row.find('.rx-month-3').val();
+    let converted = calculateDoctorConverted(
+        month1,
+        month2,
+        month3,
+        selectedCategory
+    );
+
+    $row.find('.doctor-converted').val(converted);
+
+    let convertedField = getCategoryConvertedFieldName(selectedCategory);
+    let doctorId = $row.data('doctor-id') || '';
+    $row.find('.doctor-category-converted')
+        .val(converted)
+        .attr('name', `${convertedField}[${doctorId}]`);
+
+    syncCategoryMonthFields($row);
+}
+
+function recalculateAllDoctorConverted() {
+    $('#doctor-table-body tr').each(function() {
+        if ($(this).find('.rx_count').length) {
+            updateDoctorRowConverted($(this));
+        }
+    });
+}
+
+function findDoctorSubmission(selectedCategory, doctorId, doctorName) {
+    let categoryDoctors = categoryDoctorSubmissions[selectedCategory] || {};
+    let monthData = doctorMonthData[selectedCategory] || {};
+    let categoryRows = categorySubmissions[selectedCategory] || [];
+
+    return categoryDoctors[doctorId]
+        || categoryDoctors[doctorName]
+        || monthData[doctorId]
+        || monthData[doctorName]
+        || categoryRows.find(function(row) {
+            return row.doctor_id === doctorId
+                || row.doctor_id === doctorName
+                || row.doctor_name === doctorName;
+        })
+        || {};
+}
+
+function renderDoctorTable(filteredDoctors){
     let tbody = $('#doctor-table-body');
+    let selectedCategory = $('#field-select-category').val() || '';
 
     tbody.html('');
 
     if(filteredDoctors.length === 0){
-
         tbody.html(`
             <tr>
                 <td colspan="5" class="text-center">
@@ -802,130 +882,79 @@ function renderDoctorTable(filteredDoctors){
                 </td>
             </tr>
         `);
-
         return;
     }
 
     filteredDoctors.forEach(function(doc){
-
         let doctorName = doc.display || '-';
-
         let speciality = doc.contact?.speciality || '-';
-
-        let selectedCategory =
-            $('#field-select-category').val();
-
-        let doctorNameKey =
-            (doctorName || '').trim();
-
-        let rxCount = 0;
-
-        if(
-            doctorRxCounts[selectedCategory] &&
-            doctorRxCounts[selectedCategory][doctorNameKey]
-        ){
-
-            rxCount =
-                doctorRxCounts[selectedCategory][doctorNameKey];
-
-        }
-
-        let mslCode = doc.contact?.msl_code || '-';
-
-        let doctorId = doc.value || '';
-
-        
+        let doctorId = doc.value || doc.contact?.id || '';
+        let submission = findDoctorSubmission(selectedCategory, doctorId, doctorName);
+        let monthFields = getCategoryMonthFieldNames(selectedCategory);
+        let convertedField = getCategoryConvertedFieldName(selectedCategory);
+        let months = getSubmissionMonthValues(submission, monthFields);
+        let converted = calculateDoctorConverted(
+            months.month1,
+            months.month2,
+            months.month3,
+            selectedCategory
+        );
 
         tbody.append(`
-
-            <tr>
-
+            <tr data-doctor-id="${doctorId}">
+                <input type="hidden" name='submission_id[${doctorId}]' value="${submission.submission_id || ''}" />
+                <input type="hidden" class="doctor-converted" name='converted[${doctorId}]' value="${converted}" />
+                <input type="hidden" class="doctor-category-converted" name='${convertedField}[${doctorId}]' value="${converted}" />
+                <input type="hidden" class="doctor-category-month-1" name='${monthFields.month1}[${doctorId}]' value="${months.month1 || ''}" />
+                <input type="hidden" class="doctor-category-month-2" name='${monthFields.month2}[${doctorId}]' value="${months.month2 || ''}" />
+                <input type="hidden" class="doctor-category-month-3" name='${monthFields.month3}[${doctorId}]' value="${months.month3 || ''}" />
                 <td>${doctorName}</td>
-
                 <td>${speciality}</td>
-
-                <td>${rxCount}</td>
-
-                <td>${mslCode}</td>
-
-                <td>
-
-                    <button
-                        type="button"
-                        class="btn btn-sm btn-primary open-sample-modal"
-
-                        data-doctor-id="${doctorId}"
-
-                        data-doctor-name="${doctorName}"
-
-                        data-category="${$('#field-select-category').val()}"
-
-                        data-category-display="${$('#field-select-category option:selected').text()}">
-
-                        Add
-
-                    </button>
-
-                </td>
-
+                <td><input type="number" name='month_1[${doctorId}]' class="rx_count rx-month-1" min="0" max="9999999999" step="1" value="${months.month1 || ''}" /></td>
+                <td><input type="number" name='month_2[${doctorId}]' class="rx_count rx-month-2" min="0" max="9999999999" step="1" value="${months.month2 || ''}" /></td>
+                <td><input type="number" name='month_3[${doctorId}]' class="rx_count rx-month-3" min="0" max="9999999999" step="1" value="${months.month3 || ''}" /></td>
             </tr>
-
         `);
-
     });
 
+    recalculateAllDoctorConverted();
 }
 
+$(document).on('input change', '#doctor-table-body .rx_count', function() {
+    updateDoctorRowConverted($(this).closest('tr'));
+});
+
 function toggleUploadFields() {
-
     let value = $('#field-converted').val();
-
     console.log(value);
-
     if (value === 'Yes') {
-
         $('.upload-doc-fields').show();
-
         // make upload mandatory
         $('#field-upload-supporting-doc1').prop('required', true);
-
     } else {
-
         $('.upload-doc-fields').hide();
-
         // remove mandatory validation
         $('#field-upload-supporting-doc1').prop('required', false);
-
         // optional cleanup
         $('#field-upload-supporting-doc1').val('');
         $('#field-upload-supporting-doc2').val('');
     }
 }
 
-
 // hide initially always
 $('.upload-doc-fields').css('display', 'none');
-
-
 // run after small delay so dropdown is fully rendered
 setTimeout(function () {
-
     toggleUploadFields();
-
 }, 200);
 
-
 // initial hide/show
 toggleUploadFields();
 
-
 // dropdown change
 $(document).on('change', '#field-converted', function () {
-
     toggleUploadFields();
-
     if ($(this).val() === 'No') {
-
         $('html, body').animate({
             scrollTop: $('#submit-btn').offset().top
         }, 500);
@@ -933,27 +962,6 @@ $(document).on('change', '#field-converted', function () {
 });
 
 
-
-        // $(document).on('change', '#field-converted', function () {
-        //     let converted = $(this).val();
-        //     if (converted == 'No') {
-        //         $('.metric-field-wrapper').hide();
-        //     } else {
-        //         $('.metric-field-wrapper').show();
-        //         incrementMetric();
-        //     }
-        // });
-
-        // function incrementMetric() {
-        //     let category = $('#field-select-category').val();
-        //     let metricField = categoryMetricMap[category];
-        //     if (!metricField) {
-        //         return;
-        //     }
-        //     let selector = '#field-' + metricField;
-        //     let currentVal = parseInt($(selector).val()) || 0;
-        //     $(selector).val(currentVal + 1);
-        // }
         
         $('input[type="file"]').on('change', function () {
             let file = this.files[0];
@@ -965,11 +973,52 @@ $(document).on('change', '#field-converted', function () {
 
             ];
             if (!allowedTypes.includes(file.type)) {
-                alert('Only JPG and PDF files are allowed.');
+                Swal.fire({
+                    icon: 'error',
+                    title: 'Invalid file',
+                    text: 'Only JPG and PDF files are allowed.'
+                });
                 $(this).val('');
             }
            
         });
+
+        $('#report-form').on('submit', function(event){
+            event.preventDefault();
+            $("#pageloader").fadeIn();
+            $.ajax({
+                type: "POST",
+                url: '/form/ajaxsubmitmultiple',
+                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'
+                        });
+                    } else {
+                        Swal.fire({
+                            icon: 'error',
+                            title: data.hasOwnProperty('message') ? 'You are not mapped to any position code' : 'Data not submitted',
+                            text: data.hasOwnProperty('message') ? 'for resolution please email Position code, L1 Manager and L2 Manager details to support1@stratawiz.com' : 'Something went wrong, please try again after some time!'
+                        });
+                    }
+                },
+                error: function() {
+                    $("#pageloader").fadeOut();
+                    Swal.fire({
+                        icon: 'error',
+                        title: 'Error',
+                        text: 'Something went wrong'
+                    });
+                }
+            });
+        });
+
          @if($id)
             setTimeout(function () {
                 console.log("EDIT MODE TRIGGERED");
@@ -1024,28 +1073,13 @@ $(document).on(
 ){
 
     const categoryMap = {
-
-        "foracort-ciphaler":
-            "foracort_ciphaler",
-
-        "duolin-synchrobreathe":
-            "duolin_synchrobreathe",
-
-        "foracort-g":
-            "foracort_g",
-
-        "pedia":
-            "pedia",
-
-        "triple-combination-voltido-trio-indaflo-g":
-            "triple_combination_voltido_trio_indaflo_g",
-
-        "ics-laba-seroflo-maxiflo-voltido":
-            "ics_laba_seroflo_maxiflo_voltido",
-
-        "competition-dr":
-            "competition_dr"
-
+        "foracort-ciphaler":"foracort_ciphaler",
+        "duolin-synchrobreathe":"duolin_synchrobreathe",
+        "foracort-g":"foracort_g",
+        "pedia":"pedia",
+        "triple-combination-voltido-trio-indaflo-g":"triple_combination_voltido_trio_indaflo_g",
+        "ics-laba-seroflo-maxiflo-voltido":"ics_laba_seroflo_maxiflo_voltido",
+        "competition-dr":"competition_dr"
     };
 
     let categoryKey =
@@ -1075,250 +1109,35 @@ $(document).on(
     );
 }
 
-
-        $('#sample-form').on('submit', function(event){
-
-            event.preventDefault();
-
-            $("#pageloader").fadeIn();
-            // CATEGORY
-            let selectedCategory =
-                $('#sample-category').val().trim();
-
-            // CURRENT RX
-            let rxValue =
-                parseInt(
-                    $('#sample-count').val()
-                ) || 0;
-
-            // DOCTOR NAME
-            let doctorName =
-                $('#sample-doctor-name').val().trim();
-
-            // thresholds
-            const rxThresholds = {
-
-                "foracort-ciphaler": 10,
-                "duolin-synchrobreathe": 10,
-                "foracort-g": 10,
-                "pedia": 5,
-                "triple-combination-voltido-trio-indaflo-g": 10,
-                "ics-laba-seroflo-maxiflo-voltido": 10,
-                "competition-dr": 20
-
-            };
-
-            // initialize category
-            if(!doctorRxCounts[selectedCategory]){
-
-                doctorRxCounts[selectedCategory] = {};
-
-            }
-
-            // initialize doctor
-            if(
-                !doctorRxCounts[selectedCategory][doctorName]
-            ){
-
-                doctorRxCounts[selectedCategory][doctorName] = 0;
-
-            }
-
-            // add rx
-            doctorRxCounts[selectedCategory][doctorName]
-                += rxValue;
-
-            // total rx
-            let totalRx =
-                doctorRxCounts[selectedCategory][doctorName];
-
-            // threshold
-            let requiredRx =
-                rxThresholds[selectedCategory] || 0;
-
-            // converted
-            let convertedValue = 'No';
-
-            if(totalRx >= requiredRx){
-
-                convertedValue = 'Yes';
-
-            }
-
-            // append hidden fields
-            appendConvertedField(
-                selectedCategory,
-                convertedValue
-            );
-
-            console.log(
-                $('#sample-form').serialize()
-            );
-            
-            $.ajax({
-
-                type: "POST",
-
-                url: '/form/ajaxsubmit',
-
-                data: new FormData($('#sample-form')[0]),
-
-                processData: false,
-
-                contentType: false,
-
-                success: function(data){
-
-                    $("#pageloader").fadeOut();
-
-                    console.log("SAMPLE FORM RESPONSE", data);
-
-                    if(data.status == 'success'){
-
-                //     let selectedCategory =
-                //         $('#sample-category').val();
-
-                //     let rxValue =
-                //         parseInt($('#sample-count').val()) || 0;
-
-                //     // initialize category
-                //     if(!doctorRxCounts[selectedCategory]){
-
-                //         doctorRxCounts[selectedCategory] = {};
-
-                //     }
-
-
-                //    let doctorName =
-                //         $('#sample-doctor-name').val().trim();
-
-                //     // initialize doctor
-                //     if(
-                //         !doctorRxCounts[selectedCategory][doctorName]
-                //     ){
-
-                //         doctorRxCounts[selectedCategory][doctorName] = 0;
-
-                //     }
-
-                //     // add rx
-                //     doctorRxCounts[selectedCategory][doctorName]
-                //         += rxValue;
-
-                //     let totalRx =
-                //         doctorRxCounts[selectedCategory][doctorName];
-
-                    // CATEGORY TARGET
-
-                    let requiredRx =
-                        categoryThresholds[selectedCategory] || 0;
-
-                    // AUTO CONVERSION
-                    let convertedValue = 'No';
-
-                    if(totalRx >= requiredRx){
-
-                        convertedValue = 'Yes';
-
-                    }
-                    appendConvertedField(
-                        selectedCategory,
-                        convertedValue
-                    );
-                                        
-                    console.log(
-                        "TOTAL RX",
-                        totalRx
-                    );
-
-                    console.log(
-                        "REQUIRED RX",
-                        requiredRx
-                    );
-
-                    console.log(
-                        "CONVERTED",
-                        convertedValue
-                    );
-
-                    console.log(
-                        "UPDATED RX COUNTS",
-                        doctorRxCounts
-                    );
-
-                    $('#sampleFormModal').modal('hide');
-
-                    $('#sample-form')[0].reset();
-
-                    $('#field-select-category').trigger('change');
-
-                    
-                    
-
-                }
-
-                },
-
-                error: function(){
-
-                    $("#pageloader").fadeOut();
-
-                    Swal.fire({
-
-                        icon: 'error',
-
-                        title: 'Error',
-
-                        text: 'Something went wrong'
-
-                    });
-
-                }
-
-            });
-
-        });
-
-       
             // allow only whole numbers in sample count
-
             $(document).on('keypress', '#sample-count', function(e){
-
                 // allow only 0-9
-
                 if(
                     e.which < 48 ||
                     e.which > 57
                 ){
                     e.preventDefault();
                 }
-
             });
 
             $(document).on('paste', '#sample-count', function(e){
-
                 let pastedData =
                     (e.originalEvent || e)
                     .clipboardData
                     .getData('text');
-
                 if(!/^\d+$/.test(pastedData)){
                     e.preventDefault();
                 }
-
             });
 
             $(document).on('input', '#sample-count', function(){
-
                 this.value =
                     this.value.replace(/[^0-9]/g, '');
-
             });
             $('input[type="date"]').attr(
                 'max',
                 new Date().toISOString().split("T")[0]
             );
-            
     });
 </script>
 </body>
diff --git a/resources/views/form/rapport-gennovadc/1750326824-c1c033e6-9d6e-4647-b0dd-d3d28e6953e5.blade.php b/resources/views/form/rapport-gennovadc/1750326824-c1c033e6-9d6e-4647-b0dd-d3d28e6953e5.blade.php
index 91ee74ff..115b6010 100644
--- a/resources/views/form/rapport-gennovadc/1750326824-c1c033e6-9d6e-4647-b0dd-d3d28e6953e5.blade.php
+++ b/resources/views/form/rapport-gennovadc/1750326824-c1c033e6-9d6e-4647-b0dd-d3d28e6953e5.blade.php
@@ -959,48 +959,48 @@ $brandData2 = [
         
         
 
-        $('.edit-btn').click(function() {
+        $('.edit-btn').click(function() { 
             // First make all readonly
             // $('#execution-form input').prop('readonly', true);
 
              // Keep only PLAN fields editable (plan with value that user filled while making plan and week selection fields)
-            $('#execution-vintor_4k_units').prop('readonly', true);
-            $('#execution-vintor_6k_units').prop('readonly', true);
-            $('#execution-vintor_10k_units').prop('readonly', true);
-            $('#execution-encicarb_500_units').prop('readonly', true);
-            $('#execution-encicarb_100_units').prop('readonly', true);
-            $('#execution-dynulta_units').prop('readonly', true);
+            $('#execution-vintor_4k_units').prop('readonly', false);
+            $('#execution-vintor_6k_units').prop('readonly', false);
+            $('#execution-vintor_10k_units').prop('readonly', false);
+            $('#execution-encicarb_500_units').prop('readonly', false);
+            $('#execution-encicarb_100_units').prop('readonly', false);
+            $('#execution-dynulta_units').prop('readonly', false);
 
-            $('#execution-vintor_4k_week1').prop('readonly', true);
-            $('#execution-vintor_4k_week2').prop('readonly', true);
-            $('#execution-vintor_4k_week3').prop('readonly', true);
-            $('#execution-vintor_4k_week4').prop('readonly', true);
+            $('#execution-vintor_4k_week1').prop('readonly', false);
+            $('#execution-vintor_4k_week2').prop('readonly', false);
+            $('#execution-vintor_4k_week3').prop('readonly', false);
+            $('#execution-vintor_4k_week4').prop('readonly', false);
           
-            $('#execution-vintor_6k_week1').prop('readonly', true);
-            $('#execution-vintor_6k_week2').prop('readonly', true);
-            $('#execution-vintor_6k_week3').prop('readonly', true);
-            $('#execution-vintor_6k_week4').prop('readonly', true);
+            $('#execution-vintor_6k_week1').prop('readonly', false);
+            $('#execution-vintor_6k_week2').prop('readonly', false);
+            $('#execution-vintor_6k_week3').prop('readonly', false);
+            $('#execution-vintor_6k_week4').prop('readonly', false);
 
-            $('#execution-vintor_10k_week1').prop('readonly', true);
-            $('#execution-vintor_10k_week2').prop('readonly', true);
-            $('#execution-vintor_10k_week3').prop('readonly', true);
-            $('#execution-vintor_10k_week4').prop('readonly', true);
+            $('#execution-vintor_10k_week1').prop('readonly', false);
+            $('#execution-vintor_10k_week2').prop('readonly', false);
+            $('#execution-vintor_10k_week3').prop('readonly', false);
+            $('#execution-vintor_10k_week4').prop('readonly', false);
             
 
-            $('#execution-encicarb_500_week1').prop('readonly', true);
-            $('#execution-encicarb_500_week2').prop('readonly', true);
-            $('#execution-encicarb_500_week3').prop('readonly', true);
-            $('#execution-encicarb_500_week4').prop('readonly', true);
+            $('#execution-encicarb_500_week1').prop('readonly', false);
+            $('#execution-encicarb_500_week2').prop('readonly', false);
+            $('#execution-encicarb_500_week3').prop('readonly', false);
+            $('#execution-encicarb_500_week4').prop('readonly', false);
 
-            $('#execution-encicarb_100_week1').prop('readonly', true);
-            $('#execution-encicarb_100_week2').prop('readonly', true);
-            $('#execution-encicarb_100_week3').prop('readonly', true);
-            $('#execution-encicarb_100_week4').prop('readonly', true);
+            $('#execution-encicarb_100_week1').prop('readonly', false);
+            $('#execution-encicarb_100_week2').prop('readonly', false);
+            $('#execution-encicarb_100_week3').prop('readonly', false);
+            $('#execution-encicarb_100_week4').prop('readonly', false);
 
-            $('#execution-dynulta_week1').prop('readonly', true);
-            $('#execution-dynulta_week2').prop('readonly', true);
-            $('#execution-dynulta_week3').prop('readonly', true);
-            $('#execution-dynulta_week4').prop('readonly', true);
+            $('#execution-dynulta_week1').prop('readonly', false);
+            $('#execution-dynulta_week2').prop('readonly', false);
+            $('#execution-dynulta_week3').prop('readonly', false);
+            $('#execution-dynulta_week4').prop('readonly', false);
 
             // execution fields still editable
             // $('[id*="_exe"]').prop('readonly', false);
@@ -1179,7 +1179,107 @@ $brandData2 = [
             $('label[for="execution-execution_week"]').html('<p class="form-label">Select Execution Week <span class="text-danger">*</span></p><p class="text-danger">*below total exe units & achv % will be calculated basis the week selected here</p>');   
             $('label[for="execution-execution_product"]').html('<p class="form-label">Execution Product <span class="text-danger">*</span></p><p class="text-danger">*Pl enter exec/achv units for the week selected above;<br/> eg if week 3 is selected, enter achv/exec units for week 3 only; accordingly total units and percentage will get calculated</p>');   
             
+/*
             function calculateExecution() {
+console.log("func 1...");
+    let numOfWeek = $('#execution-execution_week').val();
+
+    if (!numOfWeek) return;
+
+    // Vintor 4K
+    let v4kTotal =
+        (parseInt($('#execution-vintor_4k_week1_exe').val()) || 0) +
+        (parseInt($('#execution-vintor_4k_week2_exe').val()) || 0) +
+        (parseInt($('#execution-vintor_4k_week3_exe').val()) || 0) +
+        (parseInt($('#execution-vintor_4k_week4_exe').val()) || 0);
+
+    let v4kSelected = parseInt($('#execution-vintor_4k_week' + numOfWeek + '_exe').val()) || 0;
+    let v4kPlan = parseInt($('#execution-vintor_4k_units').val()) || 0;
+
+    $('#execution-vintor_4k_units_execution').val(v4kTotal);
+    $('#execution-vintor_4k_percent').val(
+        v4kPlan ? ((v4kSelected / v4kPlan) * 100).toFixed(2) : 0
+    );
+
+    // Vintor 10K
+    let v10kTotal =
+        (parseInt($('#execution-vintor_10k_week1_exe').val()) || 0) +
+        (parseInt($('#execution-vintor_10k_week2_exe').val()) || 0) +
+        (parseInt($('#execution-vintor_10k_week3_exe').val()) || 0) +
+        (parseInt($('#execution-vintor_10k_week4_exe').val()) || 0);
+
+    let v10kSelected = parseInt($('#execution-vintor_10k_week' + numOfWeek + '_exe').val()) || 0;
+    let v10kPlan = parseInt($('#execution-vintor_10k_units').val()) || 0;
+
+    $('#execution-vintor_10k_units_execution').val(v10kTotal);
+    $('#execution-vintor_10k_percent').val(
+        v10kPlan ? ((v10kSelected / v10kPlan) * 100).toFixed(2) : 0
+    );
+
+    // Vintor 6K
+    let v6kTotal =
+        (parseInt($('#execution-vintor_6k_week1_exe').val()) || 0) +
+        (parseInt($('#execution-vintor_6k_week2_exe').val()) || 0) +
+        (parseInt($('#execution-vintor_6k_week3_exe').val()) || 0) +
+        (parseInt($('#execution-vintor_6k_week4_exe').val()) || 0);
+
+    let v6kSelected = parseInt($('#execution-vintor_6k_week' + numOfWeek + '_exe').val()) || 0;
+    let v6kPlan = parseInt($('#execution-vintor_6k_units').val()) || 0;
+
+    $('#execution-vintor_6k_units_execution').val(v6kTotal);
+    $('#execution-vintor_6k_percent').val(
+        v6kPlan ? ((v6kSelected / v6kPlan) * 100).toFixed(2) : 0
+    );
+
+    // Encicarb 500
+    let e500Total =
+        (parseInt($('#execution-encicarb_500_week1_exe').val()) || 0) +
+        (parseInt($('#execution-encicarb_500_week2_exe').val()) || 0) +
+        (parseInt($('#execution-encicarb_500_week3_exe').val()) || 0) +
+        (parseInt($('#execution-encicarb_500_week4_exe').val()) || 0);
+
+    let e500Selected = parseInt($('#execution-encicarb_500_week' + numOfWeek + '_exe').val()) || 0;
+    let e500Plan = parseInt($('#execution-encicarb_500_units').val()) || 0;
+
+    $('#execution-encicarb_500_units_execution').val(e500Total);
+    $('#execution-encicarb_500_percent').val(
+        e500Plan ? ((e500Selected / e500Plan) * 100).toFixed(2) : 0
+    );
+
+    // Encicarb 100
+    let e100Total =
+        (parseInt($('#execution-encicarb_100_week1_exe').val()) || 0) +
+        (parseInt($('#execution-encicarb_100_week2_exe').val()) || 0) +
+        (parseInt($('#execution-encicarb_100_week3_exe').val()) || 0) +
+        (parseInt($('#execution-encicarb_100_week4_exe').val()) || 0);
+
+    let e100Selected = parseInt($('#execution-encicarb_100_week' + numOfWeek + '_exe').val()) || 0;
+    let e100Plan = parseInt($('#execution-encicarb_100_units').val()) || 0;
+
+    $('#execution-encicarb_100_units_execution').val(e100Total);
+    $('#execution-encicarb_100_percent').val(
+        e100Plan ? ((e100Selected / e100Plan) * 100).toFixed(2) : 0
+    );
+
+    // Dynulta
+    let dynTotal =
+        (parseInt($('#execution-dynulta_week1_exe').val()) || 0) +
+        (parseInt($('#execution-dynulta_week2_exe').val()) || 0) +
+        (parseInt($('#execution-dynulta_week3_exe').val()) || 0) +
+        (parseInt($('#execution-dynulta_week4_exe').val()) || 0);
+
+    let dynSelected = parseInt($('#execution-dynulta_week' + numOfWeek + '_exe').val()) || 0;
+    let dynPlan = parseInt($('#execution-dynulta_units').val()) || 0;
+
+    $('#execution-dynulta_units_execution').val(dynTotal);
+    $('#execution-dynulta_percent').val(
+        dynPlan ? ((dynSelected / dynPlan) * 100).toFixed(2) : 0
+    );
+}
+    */      
+      /*function calculateExecution() {
+      console.log("func 2...");
+
 
                 let numOfWeek = $('#execution-execution_week').val();
 
@@ -1239,28 +1339,149 @@ $brandData2 = [
                 $('#execution-dynulta_percent').val(
                     dynPlan ? ((dyn / dynPlan) * 100).toFixed(2) : 0
                 );
-            }
+            }*/
 
 
-            // Auto calculate while typing
-            $('[id*="_exe"]').on('keyup change', function () {
-                calculateExecution();
-            });
+
+           function calculateExecution() {
+
+    let numOfWeek = $('#execution-execution_week').val();
+
+    if (!numOfWeek) {
+        return;
+    }
+
+     
+    // Vintor 4K
+     
+    let v4kTotal =
+        parseInt($('#execution-vintor_4k_week' + numOfWeek + '_exe').val()) || 0;
+
+    let v4kPlan =
+        parseInt($('#execution-vintor_4k_units').val()) || 0;
+
+    $('#execution-vintor_4k_units_execution').val(v4kTotal);
+    $('#execution-vintor_4k_percent').val(
+        v4kPlan ? ((v4kTotal / v4kPlan) * 100).toFixed(2) : 0
+    );
 
 
-            // Week change readonly logic
-            $('#execution-execution_week').on('change', function () {
+     
+    // Vintor 10K
+     
+    let v10kTotal =
+        parseInt($('#execution-vintor_10k_week' + numOfWeek + '_exe').val()) || 0;
 
-                let selectedWeek = $(this).val();
+    let v10kPlan =
+        parseInt($('#execution-vintor_10k_units').val()) || 0;
 
-                $('[id*="_week"][id*="_exe"]').prop('readonly', true);
+    $('#execution-vintor_10k_units_execution').val(v10kTotal);
+    $('#execution-vintor_10k_percent').val(
+        v10kPlan ? ((v10kTotal / v10kPlan) * 100).toFixed(2) : 0
+    );
 
-                if (selectedWeek) {
-                    $(`[id*="_week${selectedWeek}_exe"]`).prop('readonly', false);
-                }
 
-                calculateExecution();
-            });
+     
+    // Vintor 6K
+     
+    let v6kTotal =
+        parseInt($('#execution-vintor_6k_week' + numOfWeek + '_exe').val()) || 0;
+
+    let v6kPlan =
+        parseInt($('#execution-vintor_6k_units').val()) || 0;
+
+    $('#execution-vintor_6k_units_execution').val(v6kTotal);
+    $('#execution-vintor_6k_percent').val(
+        v6kPlan ? ((v6kTotal / v6kPlan) * 100).toFixed(2) : 0
+    );
+
+
+     
+    // Encicarb 500
+     
+    let e500Total =
+        parseInt($('#execution-encicarb_500_week' + numOfWeek + '_exe').val()) || 0;
+
+    let e500Plan =
+        parseInt($('#execution-encicarb_500_units').val()) || 0;
+
+    $('#execution-encicarb_500_units_execution').val(e500Total);
+    $('#execution-encicarb_500_percent').val(
+        e500Plan ? ((e500Total / e500Plan) * 100).toFixed(2) : 0
+    );
+
+
+     
+    // Encicarb 100
+     
+    let e100Total =
+        parseInt($('#execution-encicarb_100_week' + numOfWeek + '_exe').val()) || 0;
+
+    let e100Plan =
+        parseInt($('#execution-encicarb_100_units').val()) || 0;
+
+    $('#execution-encicarb_100_units_execution').val(e100Total);
+    $('#execution-encicarb_100_percent').val(
+        e100Plan ? ((e100Total / e100Plan) * 100).toFixed(2) : 0
+    );
+
+
+     
+    // Dynulta
+     
+    let dynTotal =
+        parseInt($('#execution-dynulta_week' + numOfWeek + '_exe').val()) || 0;
+
+    let dynPlan =
+        parseInt($('#execution-dynulta_units').val()) || 0;
+
+    $('#execution-dynulta_units_execution').val(dynTotal);
+    $('#execution-dynulta_percent').val(
+        dynPlan ? ((dynTotal / dynPlan) * 100).toFixed(2) : 0
+    );
+}
+
+
+// Auto calculate while typing
+$('[id*="_week"][id*="_exe"]').on('keyup change', function () {
+
+    let currentField = $(this);
+    let value = parseInt(currentField.val()) || 0;
+
+    // Example:
+    // execution-vintor_4k_week2_exe
+    let fieldId = currentField.attr('id');
+
+    let product = fieldId.replace(/^execution-/, '');
+    product = product.replace(/_week[1-4]_exe$/, '');
+
+    let planValue =
+        parseInt($('#execution-' + product + '_units').val()) || 0;
+
+    $('#execution-' + product + '_units_execution').val(value);
+
+    $('#execution-' + product + '_percent').val(
+        planValue ? ((value / planValue) * 100).toFixed(2) : 0
+    );
+
+});
+
+
+// Week change readonly logic
+$('#execution-execution_week').on('change', function () {
+
+    let selectedWeek = $(this).val();
+
+    // Lock all week fields
+    $('[id*="_week"][id*="_exe"]').prop('readonly', true);
+
+    // Enable only selected week
+    if (selectedWeek) {
+        $(`[id*="_week${selectedWeek}_exe"]`).prop('readonly', false);
+    }
+
+    
+});
             // $('#execution-execution_week').on('change',function(){
             //     let numOfWeek=$('#execution-execution_week').val();
             //     console.log("Number of Week : ",numOfWeek);
@@ -1666,8 +1887,6 @@ $brandData2 = [
 
             
 
-            
-
         })
 
 
diff --git a/resources/views/form/rapport-team3/1718178830-d871301e-312b-4a60-nebmitra-15afa4ce6163.blade.php b/resources/views/form/rapport-team3/1718178830-d871301e-312b-4a60-nebmitra-15afa4ce6163.blade.php
index 3c8c8f85..1b9d5d58 100644
--- a/resources/views/form/rapport-team3/1718178830-d871301e-312b-4a60-nebmitra-15afa4ce6163.blade.php
+++ b/resources/views/form/rapport-team3/1718178830-d871301e-312b-4a60-nebmitra-15afa4ce6163.blade.php
@@ -562,6 +562,25 @@
 <script src="{{asset('assets/libs/datatables/datatables.min.js')}}"></script>
 <script type="text/javascript">
     jQuery(document).ready(function($){
+        function toInputDate(value) {
+            if (value === null || value === undefined || value === '') {
+                return '';
+            }
+            const str = String(value).trim();
+            const datePart = str.split(' ')[0];
+            if (/^\d{4}-\d{2}-\d{2}$/.test(datePart)) {
+                return datePart;
+            }
+            const parsed = new Date(str.includes(' ') ? str.replace(' ', 'T') : str);
+            if (isNaN(parsed.getTime())) {
+                return '';
+            }
+            const yyyy = parsed.getFullYear();
+            const mm = String(parsed.getMonth() + 1).padStart(2, '0');
+            const dd = String(parsed.getDate()).padStart(2, '0');
+            return yyyy + '-' + mm + '-' + dd;
+        }
+
         var submissions = []
         var table = $('#list-page-datatable').DataTable({
             stateSave: true,
@@ -935,9 +954,7 @@
                 //$('#field-nebulizer_doctor_image').parent().hide()
             }
 
-            let ex_date = new Date(selected.date_added)
-            console.log(ex_date)
-            $('#field-execution_date').val(ex_date.toISOString().split('T')[0]);
+            $('#field-execution_date').val(toInputDate(selected.date_added));
             if(selected.type == 'doctor') {
                 $('#field-legacy_code').parent().show()
                 $('#field-gst_number').parent().hide()
@@ -1311,12 +1328,15 @@
         }).then((result) => {
             if (result.isConfirmed) {
                 $.ajax({
-                    url: '/neb_mitra/doctor/delete', // Change this URL to your actual delete route
+                    url: '/neb_mitra/doctor/delete',
                     type: 'POST',
+                    headers: {
+                        'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content')
+                    },
                     data: {
                         id: id,
                         type: type,
-                        _token: '{{ csrf_token() }}'
+                        _token: $('meta[name="csrf-token"]').attr('content')
                     },
                     success: function(response) {
                         if (response.status === 'success') {
diff --git a/resources/views/form/rapport-team4/1781090899-2cedf382-9fbb-45ac-896b-94de9104a11b.blade.php b/resources/views/form/rapport-team4/1781090899-2cedf382-9fbb-45ac-896b-94de9104a11b.blade.php
new file mode 100644
index 00000000..5244c990
--- /dev/null
+++ b/resources/views/form/rapport-team4/1781090899-2cedf382-9fbb-45ac-896b-94de9104a11b.blade.php
@@ -0,0 +1,890 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    @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="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;
+                             $submissions = Formhelper::getMultiformData(
+                                $form->partition,
+                                $form_id,
+                                $form->user_id
+                            );
+
+                            $submissions = $submissions->data->submissions;
+
+                            $submittedDoctors = collect($submissions)->map(function ($item) {
+
+                                    return $item->formdata->cont_id ?? null;
+
+                                })->filter()->unique()->values()->toArray();
+
+
+                            
+
+                            @endphp
+                            {{-- @if(count($submissions)===0 || $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>
+                                            @foreach ($question->options as $option)
+                                            <option value="{{ $option->value }}" {{ isset($question->value) && $question->value == $option->value ? 'selected' : '' }} {{ $question->code == 'contact_id' ? 'legacy_code= ' . $option->contact->legacy_code . ' ' : '' }}  {{ $question->code == 'doctor_name' ? 'speciality= ' . (isset($option->contact->speciality) ? $option->contact->speciality :'') . ' ' : '' }} >
+                                                {{ $option->display }}
+                                            </option>
+
+                                            @endforeach
+                                            </select>
+                                    @break
+                                    @endswitch
+                                </div>
+                                @endforeach
+                                <div class="doctor-wrapper">
+                                    
+                                    @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}}[0]"
+                                            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}}[0]" 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}}[0]"
+                                            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}}[0]"
+                                            class="form-control"
+                                            {{$question->required == 'yes'?'required':'' }}>{{isset($question->value)?$question->value:''}}</textarea>
+                                        @break
+                                        @case('dropdown')
+                                        @if ($question->code == 'contact_id')
+                                                            <select class="form-control" id="field-{{ $question->code }}"
+                                                                name="{{ $question->code }}[0]"
+                                                                {{ $question->required == 'yes' ? 'required' : '' }}>
+                                                                <option value=""> -- Select -- </option>
+                                                                @foreach ($question->options as $option)
+                                                                    
+                                                                    
+                                                                        <option value="{{ $option->value }}"
+                                                                            {{ isset($question->value) && $question->value == $option->value ? 'selected' : '' }}
+                                                                            @if($question->code == 'contact_id')
+                                                                                legacy_code="{{ (isset($option->contact->legacy_code) ? $option->contact->legacy_code : '') }}"
+                                                                                speciality="{{ (isset($option->contact->speciality) ? $option->contact->speciality : '') }}"
+                                                                            @endif
+                                                                            >
+                                                                            {{ $option->display }}
+                                                                        </option>
+                                                                    
+                                                                @endforeach
+                                                            </select>
+                                        @else
+                                                            <select class="form-control" id="execution-{{ $question->code }}"
+                                                                name="{{ $question->code }}[0]"
+                                                                {{ $question->required == 'yes' ? 'required' : '' }}>
+                                                                <option value=""> -- Select -- </option>
+                                                                @foreach ($question->options as $option)
+                                                                    <option value="{{ $option->value }}"
+                                                                        {{ isset($question->value) && $question->value == $option->value ? 'selected' : '' }}>
+                                                                        {{ $option->display }}</option>
+                                                                @endforeach
+                                                            </select>
+                                            @endif
+                                        @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}}[0]" 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
+                                        @endswitch
+                                    </div>
+                                    @endforeach
+                                </div>
+                                <div id="doctor-group-wrapper">
+
+                                </div>
+                                @if(!isset($form->is_approval) || (isset($form->is_approval) && $form->is_approval !=
+                                'yes' ) )
+                                <div class="text-center button-list">
+                                    @if(!$id)
+                                    <button class="btn btn-primary" type="button" id="adddoctor-btn"> Add Doctor </button>
+                                    @endif
+                                    <button class="btn btn-primary" type="submit" id="submit-btn"> Submit </button>
+                                </div>
+                                @endif
+                            </form>
+                            {{-- @elseif(!$id) 
+                            <h4>You have submitted 10 doctors</h4>
+                            @endif --}}
+                        </div> <!-- end card-body -->
+                    </div>
+                    <!-- end card -->
+
+                    <!-- end row -->
+
+                </div> <!-- end col -->
+            </div>
+            <!-- end row -->
+        </div>
+        <!-- end 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('click', '.btn-remove', function () {
+
+    let wrapper = $(this).closest('.doctor-wrapper');
+
+    wrapper.find('select').each(function () {
+        if ($(this).hasClass('select2-hidden-accessible')) {
+            $(this).select2('destroy');
+        }
+    });
+
+    wrapper.remove();
+
+    numberOfSubmission--;
+    doctor_count--;
+
+    preventDuplicateDoctors(window.submittedDoctors);
+
+    console.log("New Number of Submission : ", numberOfSubmission);
+    console.log("Number of doctors : ", doctor_count);
+
+    $('#adddoctor-btn').show();
+});
+        
+        $('#field-contact_id').on('change',function(){
+            $('#field-legacy_code').val($(this).find(":selected").attr("legacy_code"));
+        })
+
+        $('#field-contact_id').on('change',function(){
+            $('#field-speciality').val($(this).find(":selected").attr("speciality"));
+        })
+      
+        $('#field-legacy_code,#field-speciality').attr('readonly',true);
+        
+         window.submittedDoctors = @json($submittedDoctors);
+
+         @if($id)
+
+            let currentDoctors = [];
+
+            $('select[id^="field-contact_id"]').each(function () {
+
+                let value = $(this).val();
+
+                if(value){
+                    currentDoctors.push(value);
+                }
+
+            });
+
+            window.submittedDoctors =
+                window.submittedDoctors.filter(
+                    doctor => !currentDoctors.includes(doctor)
+                );
+
+            @endif
+
+        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%'
+            });*/
+            $('select[id^="execution-"]').select2({
+            width: '100%',
+            minimumResultsForSearch: Infinity
+        });
+        }
+
+        initializeSelect2();
+        preventDuplicateDoctors(window.submittedDoctors);
+
+
+       
+        /* 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 --'
+                });
+
+            });
+
+        } */
+
+
+
+/* this is its default Function
+        function preventDuplicateDoctors() {
+
+            let selectedValues = [];
+
+            // 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)', '');
+
+                    // IMPORTANT:
+                    // keep currently selected option enabled
+                    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');
+
+            });
+
+        } */
+         function preventDuplicateDoctors(submittedDoctors = []) {
+
+            let selectedDoctors = [];
+
+            // Get currently selected doctors from form
+            $('select[id^="field-contact_id"]').each(function () {
+
+                let value = $(this).val();
+
+                if (value) {
+                    selectedDoctors.push(value);
+                }
+
+            });
+
+            // Merge current + submitted doctors
+            let blockedDoctors = [
+                ...new Set([
+                    ...selectedDoctors,
+                    ...submittedDoctors
+                ])
+            ];
+
+            $('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 labels
+                    let cleanText = option.text()
+                        .replace(' (Already Added)', '')
+                        .replace(' (Already Submitted)', '');
+
+                    // Keep currently selected option enabled
+                    if (
+                        blockedDoctors.includes(optionValue) &&
+                        optionValue !== currentValue
+                    ) {
+
+                        option.prop('disabled', true);
+
+                        /*if (submittedDoctors.includes(optionValue)) {
+
+                            option.text(cleanText + ' (Already Submitted)');
+
+                        } else {
+
+                            option.text(cleanText + ' (Already Added)');
+
+                        }*/
+                        if (submittedDoctors.includes(optionValue)) {
+
+                        option.text(cleanText + ' (Already Submitted)');
+
+                    } else {
+
+                        option.text(cleanText + ' (Already Added)');
+
+                    }
+
+                    } else {
+
+                        option.prop('disabled', false);
+                        option.text(cleanText);
+
+                    }
+
+                });
+
+                // Refresh Select2
+                if (currentSelect.hasClass('select2-hidden-accessible')) {
+                    currentSelect.select2('destroy');
+                }
+
+                currentSelect.select2({
+                    width: '100%',
+                    placeholder: '-- Select Doctor --'
+                });
+
+                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();
+
+    $('#field-legacy_code-' + id)
+        .val(selectedOption.attr('legacy_code'));
+
+    $('#field-speciality-' + id)
+        .val(selectedOption.attr('speciality'));
+
+    preventDuplicateDoctors(window.submittedDoctors);
+
+});
+   
+        
+
+        
+        var doctor_count = 0
+        let numberOfSubmission=0;
+        console.log("Number of Submission : ",numberOfSubmission);
+        $('#adddoctor-btn').click(function() {
+            let doctorName=$('#field-contact_id').html();
+
+            console.log("Doctor Name : ",doctorName);
+            doctor_count++;
+            numberOfSubmission=numberOfSubmission+1;
+            console.log("Number of Submission : ",numberOfSubmission);
+            
+            let empty_doctor = `
+            
+            <div class="doctor-wrapper"><button type="button" class="btn btn-danger btn-remove float-end" style="margin-top:-25px; margin-right:-25px"><i class="mdi mdi-close"></i></button>
+                                        
+                                        @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}}-${doctor_count}" name="{{$question->code}}[${doctor_count}]" value="{{isset($question->value)?$question->value:''}}">
+                                                @break
+                                            @case('text')
+                                            @case('file')
+                                            @case('email')
+                                            @case('tel')
+                                            @case('date')
+                                                <input type="{{$question->type}}" id="field-{{$question->code}}-${doctor_count}" name="{{$question->code}}[${doctor_count}]" 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}}-${doctor_count}" name="{{$question->code}}[${doctor_count}]" class="form-control" {{$question->required == 'yes'?'required':'' }}  value="{{isset($question->value)?$question->value:0}}">
+                                                @break
+                                            @case('dropdown')
+                                                <select class="form-control" id="field-{{$question->code}}-${doctor_count}" name="{{$question->code}}[${doctor_count}]" {{$question->required == 'yes'?'required':'' }}>
+                                                    @if($question->code=='contact_id')
+                                                    ${doctorName}
+                                                    @else
+                                                    <option value=""> -- Select -- </option>
+                                            @foreach($question->options as $option)
+                                            <option value="{{ $option->value }}" {{ isset($question->value) && $question->value == $option->value ? 'selected' : '' }} {{ $question->code == 'contact_id' ? 'legacy_code= ' . $option->contact->legacy_code . ' ' : '' }}  {{ $question->code == 'contact_id' ? 'speciality= ' . (isset($option->contact->speciality) ? $option->contact->speciality :'') . ' ' : '' }} >
+                                                {{ $option->display }}
+                                            </option>
+                                            @endforeach
+                                                    @endif
+                                                </select>
+                                                @break
+                                        @endswitch
+                                        </div>
+                                    @endforeach </div>`;
+            
+
+            $('#doctor-group-wrapper').append(empty_doctor)
+
+
+
+          /*  New code added for applying Search bar to dropdown in newly added doctor wrapper code and below commented code is old code */            
+          /*  $('#field-contact_id-'+doctor_count).select2({
+               
+                width: '100%',
+                placeholder: '-- Select Doctor --'
+            });
+            $('.doctor-wrapper:last select').each(function () {
+
+            if ($(this).hasClass('select2-hidden-accessible')) {
+                $(this).select2('destroy');
+            }
+
+            $(this).select2({
+                width: '100%',
+                minimumResultsForSearch: 0
+            });
+
+        });*/
+             preventDuplicateDoctors(window.submittedDoctors);
+
+
+          /* $('select[id^="execution-"]').select2({
+                width: '100%'
+            });*/
+            $('select[id^="execution-"]').select2({
+            width: '100%',
+            minimumResultsForSearch: Infinity
+        });
+
+                                     
+            
+           
+            setTimeout(() => {
+                    $('#field-legacy_code-'+doctor_count).attr('readonly',true);
+                    $('#field-speciality-'+doctor_count).attr('readonly',true);
+                    
+                       
+                
+            }, 500);
+
+            
+            
+
+            if ($('.doctor-wrapper').length >= 15) {
+                $('#adddoctor-btn').hide();
+            } else {
+                $('#adddoctor-btn').show();
+            }
+            
+
+            /*$('.btn-remove').unbind();
+            $('.btn-remove').click(function() {
+                $(this).closest('.doctor-wrapper').find('select').select2('destroy');
+                $(this).closest('.doctor-wrapper').remove();
+                numberOfSubmission--;
+                doctor_count--
+                preventDuplicateDoctors();
+                console.log("New Number of Submission : ",numberOfSubmission);
+                console.log("Number of doctors : ",doctor_count);
+                $('#adddoctor-btn').show();
+            })*/
+
+
+
+            
+
+
+
+
+        })
+
+
+        
+
+        $('#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();
+            if (numberOfSubmission >=14) {
+                    alert(`You can submit upto 15  Doctors, Current Doctors : ${numberOfSubmission+1}`);
+                    return; 
+            }
+
+            
+
+            $("#pageloader").fadeIn();
+            $.ajax({
+                type: "POST",
+                url: '/form/ajaxsubmitmultiple',
+                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');
+
+            if (plandateField) {
+                plandateField.setAttribute('min', '2026-06-01'); // 1st June 2026
+                plandateField.setAttribute('max', today);        // Current Date
+            }
+    </script>
+</body>
+
+</html>