From 82858d7451ac2aec86f552e0a1e5114e65cf190f Mon Sep 17 00:00:00 2001
From: Ravi Gulhane <>
Date: Wed, 10 Jun 2026 13:11:21 +0530
Subject: [PATCH] =Arise Form Fix

---
 ...d8f3-6ea2-4521-9d85-85ec424fa8d5.blade.php | 1021 +++++++----------
 1 file changed, 420 insertions(+), 601 deletions(-)

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>