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 a39d65ad..11656756 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
@@ -58,6 +58,21 @@
                                 @endif
 
                                 @foreach($questions as $question)
+                                    @php
+
+                                    $hideFields = [
+                                        'date',
+                                        'contact_id',
+                                        '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>
                                     @switch($question->type)
@@ -97,8 +112,12 @@
                                                 // Decode the first option's value to use as heading labels
                                                 $headings =
                                                     count($question->options) > 0
-                                                        ? json_decode($question->options[0]->value)
+                                                        ? json_decode($question->options[0]->value, true)
                                                         : [];
+
+                                                if(!is_array($headings)){
+                                                    $headings = [];
+                                                }
                                             @endphp
 
                                             {{-- Matrix Wrapper with Horizontal Scroll on Small Screens --}}
@@ -116,7 +135,14 @@
 
                                                     {{-- Table Rows --}}
                                                     @foreach ($question->options as $option)
-                                                        @php $nn = json_decode($option->value); @endphp
+                                                        @php
+                                                            $nn = json_decode($option->value, true);
+
+                                                            // fallback if invalid json
+                                                            if(!is_array($nn)){
+                                                                $nn = [];
+                                                            }
+                                                        @endphp
                                                         <div class="d-table-row align-middle">
                                                             <div class="d-table-cell font-weight-bold p-2"
                                                                 style="width: 150px;">
@@ -181,10 +207,173 @@
                                 @endforeach
                                 @if(!isset($form->is_approval) || (isset($form->is_approval) && $form->is_approval != 'yes' ) )
                                 <div class="text-center d-grid 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">
+
+                                                    <thead>
+
+                                                        <tr>
+                                                            <th>Doctor Name</th>
+                                                            <th>Speciality</th>
+                                                            <th>Number of Rx</th>
+                                                            <th>MSL Code</th>
+                                                            <th>Action</th>
+                                                        </tr>
+
+                                                    </thead>
+
+                                                    <tbody id="doctor-table-body">
+
+                                                        <tr>
+                                                            <td colspan="5" class="text-center">
+                                                                No Doctors Found
+                                                            </td>
+                                                        </tr>
+
+                                                    </tbody>
+
+                                                </table>
+
+                                            </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>
@@ -230,14 +419,98 @@
 <script type="text/javascript">
     jQuery(document).ready(function($){
     @php
+
+        // KEEP ORIGINAL DOCTOR LOGIC
+
         $doctors = [];
-        foreach($questions as $question) {
-            if($question->code == 'contact_id') {
+
+        foreach($questions as $question){
+
+            if($question->code == 'contact_id'){
+
                 $doctors = $question->options;
+
             }
+
         }
+
+        // RX HISTORY DATA ONLY
+
+        $history = Formhelper::getMultiformData(
+            $form->partition,
+            $form_id,
+            $form->user_id
+        );
+
+        $doctorRxCounts = [];
+
+if(isset($history->data->submissions)){
+
+    foreach($history->data->submissions as $sub){
+
+        // only RX entries
+        if(
+            !isset($sub->formdata->sample_count)
+        ){
+            continue;
+        }
+
+        $category =
+            strtolower(
+                trim(
+                    $sub->formdata->{'select-category'} ?? ''
+                )
+            );
+
+        $doctorName =
+            trim(
+                $sub->formdata->contact_id ?? ''
+            );
+
+        $rxValue =
+            intval(
+                $sub->formdata->sample_count ?? 0
+            );
+
+        if(!$doctorName){
+            continue;
+        }
+
+        // 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) !!};
+
+    console.log(
+        "DOCTOR RX COUNTS",
+        doctorRxCounts
+    );
     console.log("INITIAL DOCTORS FROM BACKEND", allDoctors);
 
 //         $.ajax({
@@ -303,19 +576,59 @@
         return false;
     }
 
-    // convert category slug
-    let categoryKey = selectedCategory
-        .replace(/-/g, '_');
+    const categoryMap = {
 
-    console.log("Checking:", categoryKey, doc.contact[categoryKey]);
+    "foracort-ciphaler": "foracort_ciphaler",
 
-    return doc.contact[categoryKey] === 'yes';
+    "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];
+
+    let categoryValue = doc.contact[categoryKey];
+
+    console.log(
+        "Doctor:",
+        doc.display,
+        "Category:",
+        categoryKey,
+        "Value:",
+        categoryValue
+    );
+
+    // normalize value
+    categoryValue = String(categoryValue)
+        .toLowerCase()
+        .trim();
+
+    return (
+        categoryValue === 'yes' ||
+        categoryValue === '1' ||
+        categoryValue === 'true'
+    );
 
 });
 
     console.log("Filtered Doctors:", filteredDoctors);
+
     console.log(filteredDoctors);
-    let requiredCount = mandatoryDoctorCount[selectedCategory] || 0;
+
+    let requiredCount =
+        mandatoryDoctorCount[selectedCategory] || 0;
     if(filteredDoctors.length < requiredCount){
 
     let categoryName = $('#field-select-category option:selected').text();
@@ -337,9 +650,27 @@
             .attr("value",'')
             .text('-- Select --')
     );
-
+    // reset doctor table
+    $('#doctor-table-body').html(`
+        <tr>
+            <td colspan="5" class="text-center">
+                No Doctors Found
+            </td>
+        </tr>
+    `);
     return;
 }
+// limit doctors to required count
+filteredDoctors =
+    filteredDoctors.slice(0, requiredCount);
+
+console.log(
+    "Final Allowed Doctors:",
+    filteredDoctors.length
+);
+
+// NOW render limited doctors
+renderDoctorTable(filteredDoctors);
     filteredDoctors.forEach(function(itm){
 
         $('#field-contact_id').append(
@@ -418,73 +749,133 @@
 
 
 
-function appendConvertedField() {
 
-    // remove old hidden fields
-    $('#report-form input.converted-hidden').remove();
 
-    let convertedValue = $('#field-converted').val();
+const categoryThresholds = {
 
-    let selectedCategory = $('#field-select-category').val();
+    "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
+
+};
+
+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"
+
+};
+function renderDoctorTable(filteredDoctors){
+
+    let tbody = $('#doctor-table-body');
+
+    tbody.html('');
+
+    if(filteredDoctors.length === 0){
+
+        tbody.html(`
+            <tr>
+                <td colspan="5" class="text-center">
+                    No Doctors Found
+                </td>
+            </tr>
+        `);
 
-    if(!convertedValue || !selectedCategory){
         return;
     }
 
-    // category mapping
-    let categoryMap = {
+    filteredDoctors.forEach(function(doc){
 
-        "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 doctorName = doc.display || '-';
 
-    };
+        let speciality = doc.contact?.speciality || '-';
 
-    let categoryKey = categoryMap[selectedCategory];
+        let selectedCategory =
+            $('#field-select-category').val();
 
-    if(!categoryKey){
-        return;
-    }
+        let doctorNameKey =
+            (doctorName || '').trim();
 
-    // category data
-    let categoryValue = (convertedValue === 'Yes') ? '1' : '0';
+        let rxCount = 0;
 
-    // append original category field
-    $('#report-form').append(
-        '<input type="hidden" class="converted-hidden" name="' + categoryKey + '" value="' + categoryValue + '">'
-    );
+        if(
+            doctorRxCounts[selectedCategory] &&
+            doctorRxCounts[selectedCategory][doctorNameKey]
+        ){
 
-    // extra metric fields
-    if(convertedValue === 'Yes'){
+            rxCount =
+                doctorRxCounts[selectedCategory][doctorNameKey];
 
-        $('#report-form').append(
-            '<input type="hidden" class="converted-hidden" name="conversion_yes" value="1">'
-        );
+        }
 
-    }
+        let mslCode = doc.contact?.msl_code || '-';
 
-    if(convertedValue === 'No'){
+        let doctorId = doc.value || '';
 
-        $('#report-form').append(
-            '<input type="hidden" class="converted-hidden" name="conversion_no" value="1">'
-        );
+        
 
-    }
+        tbody.append(`
 
-    console.log("Category:", categoryKey, categoryValue);
+            <tr>
+
+                <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>
+
+            </tr>
+
+        `);
+
+    });
 
 }
 
-$('#field-converted').on('change', appendConvertedField);
-
-$('#field-select-category').on('change', appendConvertedField);
-
-
-
 function toggleUploadFields() {
 
     let value = $('#field-converted').val();
@@ -585,41 +976,349 @@ $(document).on('change', '#field-converted', function () {
                 $('#field-select-category').trigger('change');
             }, 300);
             @endif
-        $('#report-form').on('submit', function(event){
+        // OPEN SAMPLE MODAL
+
+$(document).on(
+    'click',
+    '.open-sample-modal',
+    function(){
+
+    let doctorId =
+        $(this).data('doctor-id');
+
+    let doctorName =
+        $(this).data('doctor-name');
+
+    let category =
+        $(this).data('category');
+
+    let categoryDisplay =
+        $(this).data('category-display');
+
+    // set hidden values
+
+    $('#sample-doctor-id').val(doctorId);
+
+    $('#sample-category').val(category);
+
+    // display values
+
+    $('#sample-doctor-name').val(doctorName);
+
+    $('#sample-category-display')
+        .val(categoryDisplay);
+
+    // open modal
+
+    $('#sampleFormModal').modal('show');
+    // set today's date by default
+    $('#sample-date').val(
+        new Date().toISOString().split('T')[0]
+    );
+
+});
+        
+        function appendConvertedField(
+    selectedCategory,
+    convertedValue
+){
+
+    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"
+
+    };
+
+    let categoryKey =
+        categoryMap[selectedCategory];
+
+    // converted field
+    $('#sample-converted')
+        .val(convertedValue);
+
+    // category metric field
+    $('#sample-category-metric')
+        .attr('name', categoryKey)
+        .val(
+            convertedValue === 'Yes'
+            ? 1
+            : 0
+        );
+
+    console.log(
+        "CATEGORY KEY",
+        categoryKey
+    );
+
+    console.log(
+        "CONVERTED",
+        convertedValue
+    );
+}
+
+
+        $('#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($('#report-form')[0]),
+
+                data: new FormData($('#sample-form')[0]),
+
                 processData: false,
+
                 contentType: false,
-                success: function( data ) {
-                    console.log(allDoctors);
-                    console.log(data);
+
+                success: function(data){
+
                     $("#pageloader").fadeOut();
-                    if(data.status == 'success') {
-                        Swal.fire({
-                          title: 'Great!',
-                          text: 'Your data is successfully submitted!',
-                          icon: 'success'
-                        })
-                        $('#report-form').trigger("reset");
-                    } 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!'
-                        })
+
+                    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>