diff --git a/app/Http/Controllers/FormController.php b/app/Http/Controllers/FormController.php
index fab9a407..b63e2133 100644
--- a/app/Http/Controllers/FormController.php
+++ b/app/Http/Controllers/FormController.php
@@ -5465,6 +5465,7 @@ class FormController extends Controller
         $request->session()->put('formdata', $formdata);
         Log::debug(print_r($formdata, true));
 
+        //return response()->json(['status' => 'error', 'data' => $formdata]);
         $files = $request->file();
         foreach($files as $fname => $file) {
             $post[$fname] = $this->_uploadMedia($request, $fname, 'form/'.$post['form_id'].'/'.$fname);
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 877c89ba..637f9e5e 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
@@ -64,9 +64,9 @@
                                     $hideFields = [
                                         'date',
                                         'contact_id',
-                                        'month_1_rx',
-                                        'month_2_rx',
-                                        'month_3_rx',
+                                        'month_1',
+                                        'month_2',
+                                        'month_3',
                                         'converted'
                                     ];
 
@@ -305,6 +305,7 @@
         $categoryDoctorSubmissions = [];
         $doctorRxCounts = [];
         $doctorMonthData = [];
+        
 
         $categoryAttributes = [
             'foracort-ciphaler' => 'foracort_ciphaler',
diff --git a/resources/views/form/rapport-arise/1781237897-1c44a1d5-844c-470f-bc6c-cef8945ad09f.blade.php b/resources/views/form/rapport-arise/1781237897-1c44a1d5-844c-470f-bc6c-cef8945ad09f.blade.php
index fca8c45d..fb461fdf 100644
--- a/resources/views/form/rapport-arise/1781237897-1c44a1d5-844c-470f-bc6c-cef8945ad09f.blade.php
+++ b/resources/views/form/rapport-arise/1781237897-1c44a1d5-844c-470f-bc6c-cef8945ad09f.blade.php
@@ -64,9 +64,9 @@
                                     $hideFields = [
                                         'record_date',
                                         'contact_id',
-                                        'month_1_rx',
-                                        'month_2_rx',
-                                        'month_3_rx',
+                                        'month_1',
+                                        'month_2',
+                                        'month_3',
                                         'converted'
                                     ];
 
diff --git a/resources/views/form/rapport-team4/1769684976-dc875a6c-519f-49fb-b8aa-54f4116f28d5.blade.php b/resources/views/form/rapport-team4/1769684976-dc875a6c-519f-49fb-b8aa-54f4116f28d5.blade.php
index 8908b3c2..8a48ce63 100644
--- a/resources/views/form/rapport-team4/1769684976-dc875a6c-519f-49fb-b8aa-54f4116f28d5.blade.php
+++ b/resources/views/form/rapport-team4/1769684976-dc875a6c-519f-49fb-b8aa-54f4116f28d5.blade.php
@@ -8,6 +8,43 @@
     <link href="https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/css/select2.min.css" rel="stylesheet" />
 <style>
 
+/* =========================
+   Below CSS is for the multiple option that are selecting in field-current_prescribing_molecule_combination
+========================= */
+
+/* Selected tags in multiple select */
+.select2-container--default .select2-selection--multiple .select2-selection__choice {
+    background-color: #6658dd !important;
+    border: 1px solid #6658dd !important;
+    color: #fff !important;
+    font-weight: 600;
+}
+
+/* Cross icon */
+.select2-container--default .select2-selection__choice__remove {
+    color: #ffffff !important;
+
+}
+.select2-container--default .select2-selection__choice__remove:hover {
+    color: rgb(255, 255, 255) !important;
+    background-color: transparent !important;
+}
+
+/* Selected option in dropdown list */
+.select2-results__option[aria-selected="true"] {
+    background-color: #6658dd !important;
+    color: #fff !important;
+    font-weight: 600;
+}
+
+
+
+
+
+
+
+
+
 /* =========================
    SELECT2 CUSTOM HIGHLIGHT
 ========================= */
@@ -219,9 +256,11 @@
                                                                 @endforeach
                                                             </select>
                                         @else
-                                                            <select class="form-control" id="execution-{{ $question->code }}"
-                                                                name="{{ $question->code }}[0]"
-                                                                {{ $question->required == 'yes' ? 'required' : '' }}>
+                                                            <select class="form-control"
+    id="execution-{{ $question->code }}"
+    name="{{ $question->code }}[0]{{ $question->code == 'current_prescribing_molecule_combination' ? '[]' : '' }}"
+    {{ $question->required == 'yes' ? 'required' : '' }}
+    {{ $question->code == 'current_prescribing_molecule_combination' ? 'multiple' : '' }}>
                                                                 <option value=""> -- Select -- </option>
                                                                 @foreach ($question->options as $option)
                                                                     <option value="{{ $option->value }}"
@@ -352,9 +391,10 @@
                 placeholder: '-- Select User / Territory --'
             });
 
-            $('select[id^="execution-"]').select2({
-                width: '100%'
-            });
+           $('#execution-current_prescribing_molecule_combination').select2({
+    width: '100%',
+    closeOnSelect: false
+});
         }
 
         initializeSelect2();
@@ -563,7 +603,11 @@
                                                 <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':'' }}>
+                                                <select class="form-control"
+    id="field-{{$question->code}}-${doctor_count}"
+    name="{{$question->code}}[${doctor_count}]{{ $question->code == 'current_prescribing_molecule_combination' ? '[]' : '' }}"
+    {{$question->required == 'yes'?'required':'' }}
+    {{ $question->code == 'current_prescribing_molecule_combination' ? 'multiple' : '' }}>
                                                     @if($question->code=='contact_id')
                                                     ${doctorName}
                                                     @else
@@ -588,12 +632,14 @@
                 width: '100%',
                 placeholder: '-- Select Doctor --'
             });
+            
+            $('#field-current_prescribing_molecule_combination-'+doctor_count).select2({
+    width: '100%',
+    closeOnSelect: false,
+});
              preventDuplicateDoctors();
 
 
-            $('select[id^="execution-"]').select2({
-                width: '100%'
-            });
 
                                      
             
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
index 5244c990..97325b73 100644
--- 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
@@ -1,57 +1,18 @@
 <!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>
+    <link href="https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/css/select2.min.css" rel="stylesheet" />       
 </head>
-<div id="pageloader">
-    <img src="http://cdnjs.cloudflare.com/ajax/libs/semantic-ui/0.16.1/images/loader-large.gif" alt="processing..." />
-</div>
 
+<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">
@@ -68,11 +29,10 @@
                             <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'
-                            ) )
+                            @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
@@ -83,38 +43,15 @@
                                 <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}}">
+                                <input type="hidden" name="id" value="{{$id}}">
                                 @endif
                                 @if(isset($form->manager_can_submit) && $form->manager_can_submit == true)
                                 <div class="col-md-12 mb-2">
-                                    <label for="field-user_id" class="form-label"> Select User / Territory <span class="text-danger">*</span> </label>
+                                <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)
@@ -124,187 +61,283 @@
                                     <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;
+                                @foreach($questions as $question)
+                                    @php
+
+                                    $hideFields = [
+                                        
+                                        'contact_id',
+                                        'month_1',
+                                        'month_2',
+                                        'month_3',
+                                        'converted',
+                                        'rx_support',
+                                        'other_molecule_use'
+                                    ];
+
+                                    @endphp
+
+                                    @if(in_array($question->code, $hideFields))
+                                        @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)
+                                    <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)
                                         @case('hidden')
-                                        <input type="{{$question->type}}" id="field-{{$question->code}}"
-                                            name="{{$question->code}}[0]"
-                                            value="{{isset($question->value)?$question->value:''}}">
-                                        @break
+                                            <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}}[0]" class="form-control"
-                                            {{$question->required == 'yes'?'required':'' }}
-                                            value="{{isset($question->value)?$question->value:''}}">
-                                        @break
+                                            <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}}[0]"
-                                            class="form-control" {{$question->required == 'yes'?'required':'' }}
-                                            value="{{isset($question->value)?$question->value:0}}">
-                                        @break
+                                            <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}}[0]"
-                                            class="form-control"
-                                            {{$question->required == 'yes'?'required':'' }}>{{isset($question->value)?$question->value:''}}</textarea>
-                                        @break
+                                            <textarea id="field-{{$question->code}}" name="{{$question->code}}" 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">
+                                            <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':''}}>{{$option->display}}</option>
+                                                @endforeach
+                                            </select>
+                                            @break
+                                        @case('radio')
                                             @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 class="form-check mb-2 form-check-success">
+                                                <input class="form-check-input" type="radio" name="{{$question->code}}" id="field-{{$question->code}}_{{$option->value}}" value="{{$option->value}}">
+                                                <label class="form-check-label" for="field-{{$question->code}}_{{$option->value}}">{{$option->display}}</label>
                                             </div>
                                             @endforeach
-                                        </div>
-                                        @break
-                                        @endswitch
-                                    </div>
-                                    @endforeach
-                                </div>
-                                <div id="doctor-group-wrapper">
+                                            @break
+                                        @case('radiometrix')
+                                            @php
+                                                // Decode the first option's value to use as heading labels
+                                                $headings =
+                                                    count($question->options) > 0
+                                                        ? json_decode($question->options[0]->value, true)
+                                                        : [];
 
-                                </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
+                                                if(!is_array($headings)){
+                                                    $headings = [];
+                                                }
+                                            @endphp
+
+                                            {{-- Matrix Wrapper with Horizontal Scroll on Small Screens --}}
+                                            <div class="table-responsive">
+                                                <div class="d-table w-100">
+                                                    {{-- Table Headers --}}
+                                                    <div class="d-table-row font-weight-bold">
+                                                        <div class="d-table-cell p-2" style="width: 150px;"></div>
+                                                        {{-- Placeholder for row labels --}}
+                                                        @foreach ($headings as $head)
+                                                            <div class="d-table-cell text-center p-2">{{ $head }}
+                                                            </div>
+                                                        @endforeach
+                                                    </div>
+
+                                                    {{-- Table Rows --}}
+                                                    @foreach ($question->options as $option)
+                                                        @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;">
+                                                                {{ $option->display }}
+                                                            </div>
+
+                                                            @foreach ($nn as $value)
+                                                                <div class="d-table-cell text-center p-2">
+                                                                    <input type="radio"
+                                                                id="field-{{ $option->display }}-{{ $value }}"
+                                                                name="{{ $question->code }}[{{$option->display}}]" value="{{$value}}" class="form-check-input"
+                                                                {{ isset($question->display) && $option->display != $option->display ? 'checked' : '' }}>
+
+                                                                </div>
+                                                            @endforeach
+                                                        </div>
+                                                    @endforeach
+                                                </div>
+                                            </div>
+                                        @break    
+                                        @case('checkbox')
+                                            @foreach($question->options as $option)
+                                            <div class="form-check mb-2 form-check-primary ms-2">
+                                                <input class="form-check-input" type="checkbox" id="field-{{$question->code}}-{{$option->value}}" name="{{$question->code}}[]" value="{{$option->value}}" {{isset($question->value) && $question->value != '' && in_array($option->value, $question->value) ? 'checked':''}}>
+                                                <label class="form-check-label" for="field-{{$question->code}}-{{$option->value}}">{{$option->display}}</label>
+                                            </div>
+                                            @endforeach
+                                            @break
+
+                                            @case('file')
+
+                                            @if(!isset($form->is_approval) || (isset($form->is_approval) && $form->is_approval != 'yes' ) )
+
+                                            <input
+                                                type="file"
+                                                id="field-{{$question->code}}"
+                                                name="{{$question->code}}"
+                                                class="form-control"
+                                                accept=".jpg,.jpeg,.pdf,image/*"
+                                                capture="environment"
+                                                {{$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
+                                @if(!isset($form->is_approval) || (isset($form->is_approval) && $form->is_approval != 'yes' ) )
+                                <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">
+                                            @php
+$doctors = [];
+
+foreach($questions as $question){
+    if($question->code == 'contact_id'){
+        $doctors = $question->options ?? [];
+        break;
+    }
+}
+@endphp
+                                       <table class="table table-bordered  mb-0">
+                                                    <thead>
+                                                        <tr>
+                                                            <th>Doctor Name</th>
+                                                            
+                                                            <th>Rxn/Week Support</th>
+                                                            
+                                                            <th>Other Molecule Use</th>
+                                                        </tr>
+                                                    </thead>
+                                                    <tbody id="doctor-table-body">
+
+@for($i=1; $i<=5; $i++)
+
+<tr>
+
+    <td>
+     <input
+    type="hidden"
+    name="id[temp]"
+    class="submission-id"
+/>
+        <select
+            name="contact_id[]"
+            class="form-control doctor-select"
+            required
+        >
+            <option value="">-- Select Doctor --</option>
+
+            @foreach($questions as $question)
+
+                @if($question->code == 'contact_id')
+
+                    @foreach($question->options as $doctor)
+
+                        <option value="{{$doctor->value}}">
+                            {{$doctor->display}}
+                        </option>
+
+                    @endforeach
+
+                @endif
+
+            @endforeach
+
+        </select>
+    </td>
+
+    <td>
+    
+        <select
+            name="rx_support[]"
+            class="form-control"
+            required
+        >
+            <option value="">-- Select --</option>
+            <option value="1-3 Rxn/Week">1-3 Rxn/Week</option>
+            <option value="4-7 Rxn/Week">4-7 Rxn/Week</option>
+            <option value="8-11 Rxn/Week">8-11 Rxn/Week</option>
+            <option value=">11 Rxn/Week">&gt;11 Rxn/Week</option>
+        </select>
+    </td>
+
+    <td>
+    
+        <select
+            name="other_molecule_use[]"
+            class="form-control"
+            required
+        >
+            <option value="">-- Select --</option>
+            <option value="Erdosteine Prescriber">
+                Erdosteine Prescriber
+            </option>
+            <option value="Erdosteine + Acebrophylline">
+                Erdosteine + Acebrophylline
+            </option>
+            <option value="NAC + Acebrophylline">
+                NAC + Acebrophylline
+            </option>
+            <option value="No">
+                No
+            </option>
+        </select>
+    </td>
+
+</tr>
+
+@endfor
+
+</tbody>
+                                                </table>
+                                            </div>
+                                        </div>
+                                    </div>
+                                 </div>
+                                 
                                     <button class="btn btn-primary" type="submit" id="submit-btn"> Submit </button>
-                                </div>
+                                </div> 
                                 @endif
                             </form>
-                            {{-- @elseif(!$id) 
-                            <h4>You have submitted 10 doctors</h4>
-                            @endif --}}
+                            <!-- SAMPLE FORM MODAL -->
                         </div> <!-- end card-body -->
                     </div>
                     <!-- end card -->
-
                     <!-- end row -->
-
                 </div> <!-- end col -->
             </div>
             <!-- end row -->
@@ -312,535 +345,1033 @@
         <!-- 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;
-    }
+    
+<style type="text/css">
+select option:disabled {
+    color: #999;
+    font-style: italic;
+}
+select option:disabled {
+    color: #999;
+    font-style: italic;
+}
+#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%;
-    }
+#pageloader img {
+  left: 50%;
+  margin-left: -32px;
+  margin-top: -32px;
+  position: absolute;
+  top: 50%;
+}
+.form-label {
+    font-weight:bold;
+    font-size:16px;
+}
+.upload-doc-fields {
+    display: none;
+}
 
-    .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 () {
+.rx_count{
+    width: 70px;
+}
 
-    let wrapper = $(this).closest('.doctor-wrapper');
 
-    wrapper.find('select').each(function () {
-        if ($(this).hasClass('select2-hidden-accessible')) {
-            $(this).select2('destroy');
+
+</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($){
+        function updateDoctorDropdowns() {
+
+    let selectedDoctors = [];
+
+    $('.doctor-select').each(function(){
+
+        let value = $(this).val();
+
+        if(value){
+            selectedDoctors.push(value);
         }
+
     });
 
-    wrapper.remove();
+    $('.doctor-select').each(function(){
 
-    numberOfSubmission--;
-    doctor_count--;
+        let currentDropdown = $(this);
+        let currentValue = currentDropdown.val();
 
-    preventDuplicateDoctors(window.submittedDoctors);
+        currentDropdown.find('option').each(function(){
 
-    console.log("New Number of Submission : ", numberOfSubmission);
-    console.log("Number of doctors : ", doctor_count);
+            let option = $(this);
 
-    $('#adddoctor-btn').show();
+            let originalText =
+                option.data('original-text') || option.text();
+
+            option.data('original-text', originalText);
+
+            option.text(originalText);
+
+            option.prop('disabled', false);
+
+            let optionValue = option.val();
+
+            if(
+                optionValue &&
+                optionValue !== currentValue &&
+                selectedDoctors.includes(optionValue)
+            ){
+                option.prop('disabled', true);
+
+                option.text(
+                    originalText +
+                    ' (Already Added)'
+                );
+            }
+
+        });
+
+    });
+
+}
+$(document).on(
+    'change',
+    '.doctor-select',
+    updateDoctorDropdowns
+);
+
+updateDoctorDropdowns();
+    
+function updateOtherMoleculeDropdowns() {
+
+    let selectedMolecule = $('#field-molecule_use').val();
+
+    $('select[name="other_molecule_use[]"]').each(function(){
+
+        let ddl = $(this);
+
+        ddl.find('option').each(function(){
+
+            let option = $(this);
+
+            // restore original text
+            let originalText =
+                option.data('original-text') || option.text();
+
+            option.data('original-text', originalText);
+
+            option.text(originalText);
+
+            option.prop('disabled', false);
+
+            if(
+                selectedMolecule &&
+                option.val() === selectedMolecule
+            ){
+                option.prop('disabled', true);
+                option.text(
+                    originalText + ' (Already Added)'
+                );
+            }
+
+        });
+
+    });
+
+}
+
+$('#field-molecule_use').on(
+    'change',
+    updateOtherMoleculeDropdowns
+);
+
+updateOtherMoleculeDropdowns();
+
+$('#field-molecule_use').on(
+    'change',
+    updateOtherMoleculeDropdowns
+);
+
+updateOtherMoleculeDropdowns();
+$('#field-molecule_use').on(
+    'change',
+    updateOtherMoleculeDropdowns
+);
+
+updateOtherMoleculeDropdowns();
+        $('.doctor-select').select2({
+    width: '100%',
+    placeholder: 'Search Doctor',
+    allowClear: true
 });
-        
-        $('#field-contact_id').on('change',function(){
-            $('#field-legacy_code').val($(this).find(":selected").attr("legacy_code"));
-        })
+setTimeout(function(){
 
-        $('#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);
+    $('.doctor-select').each(function(index){
+        $(this)
+    .closest('tr')
+    .find('.submission-id')
+    .val(historySubmissionIds[index] || '');
 
-         @if($id)
+        let doctorName =
+            historyDoctors[index];
 
-            let currentDoctors = [];
+        if(!doctorName){
+            return;
+        }
 
-            $('select[id^="field-contact_id"]').each(function () {
 
-                let value = $(this).val();
+        let ddl = $(this);
 
-                if(value){
-                    currentDoctors.push(value);
-                }
+        ddl.find('option').each(function(){
 
-            });
+            if(
+                $(this).text().trim()
+                === doctorName
+            )
+            {
+                if(historyMoleculeUse.length > 0){
 
-            window.submittedDoctors =
-                window.submittedDoctors.filter(
-                    doctor => !currentDoctors.includes(doctor)
+    $('#field-molecule_use')
+        .val(historyMoleculeUse[0])
+        .trigger('change');
+
+}
+
+if(historyRecordDate.length > 0){
+
+    $('#field-record_date')
+        .val(historyRecordDate[0]);
+
+}
+
+                let rxValue =
+    historyRxSupport[index];
+
+if(rxValue){
+
+    ddl.closest('tr')
+       .find('select[name="rx_support[]"]')
+       .val(rxValue);
+
+}
+
+let moleculeValue =
+    historyOtherMolecule[index];
+
+if(moleculeValue){
+
+    ddl.closest('tr')
+       .find('select[name="other_molecule_use[]"]')
+       .val(moleculeValue);
+
+}
+                ddl.val($(this).val());
+
+                ddl.trigger('change');
+let doctorId = $(this).val();
+
+ddl.closest('tr')
+   .find('.submission-id')
+   .attr(
+       'name',
+       'id[]'
+   )
+   .val(
+       historySubmissionIds[index] || ''
+   );
+                console.log(
+                    'SELECTED',
+                    doctorName
                 );
 
-            @endif
+                return false;
+            }
 
-        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
         });
+
+    });
+
+},1000);
+
+
+    @php
+        // KEEP ORIGINAL DOCTOR LOGIC
+        $doctors = [];
+        foreach($questions as $question){
+            if($question->code == 'contact_id'){
+                $doctors = is_iterable($question->options ?? null) ? $question->options : [];
+            }
+        }
+        // RX HISTORY DATA ONLY
+        $history = Formhelper::getMultiformData( $form->partition, $form_id, $form->user_id );
+        $categorySubmissions = [];
+        $categoryDoctorSubmissions = [];
+        $doctorRxCounts = [];
+        $doctorMonthData = [];
+
+        $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',
+        ];
+
+        $doctorNameById = [];
+        $doctorIdByName = [];
+        foreach ($doctors as $doc) {
+            $doctorNameById[$doc->value] = $doc->display;
+            $doctorIdByName[trim($doc->display)] = $doc->value;
         }
 
-        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);
+        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;
                 }
 
-            });
-
-            // 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)');
-
+                $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);
+                    }
+                }
 
-                        option.prop('disabled', false);
-                        option.text(cleanText);
+                $doctorId = $rawDoctorId;
+                if (
+                    $doctorId !== '' &&
+                    !isset($doctorNameById[$doctorId]) &&
+                    isset($doctorIdByName[$doctorId])
+                ) {
+                    $doctorId = $doctorIdByName[$doctorId];
+                }
 
+                $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;
                     }
 
-                });
-
-                // 🔥 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);
-
+                    if (!isset($formdata->$formMonthKey) || $formdata->$formMonthKey === '' || $formdata->$formMonthKey === null) {
+                        continue;
                     }
 
-                });
-
-                // 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)');
+                    $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];
                     }
 
-                    } else {
+                    foreach ($monthEntries as $entryDoctorId => $val) {
+                        if ($entryDoctorId === '') {
+                            continue;
+                        }
 
-                        option.prop('disabled', false);
-                        option.text(cleanText);
+                        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;
                     }
-
-                });
-
-                // Refresh Select2
-                if (currentSelect.hasClass('select2-hidden-accessible')) {
-                    currentSelect.select2('destroy');
                 }
-
-                currentSelect.select2({
-                    width: '100%',
-                    placeholder: '-- Select Doctor --'
-                });
-
-                currentSelect.val(currentValue).trigger('change.select2');
-            
-            });
-
+            }
         }
 
+    @endphp
+    @php
+$historyMoleculeUse = [];
+$historyRecordDate = [];
+$historyDoctors = [];
+$historyRxSupport = [];
+$historyOtherMolecule = [];
+$historySubmissionIds = [];
+if(isset($history->data->submissions)){
+
+    foreach($history->data->submissions as $sub){
+        if(isset($sub->formdata->molecule_use)){
+    $historyMoleculeUse[] =
+        $sub->formdata->molecule_use;
+}
+
+if(isset($sub->formdata->record_date)){
+    $historyRecordDate[] =
+        $sub->formdata->record_date;
+}
+        $historySubmissionIds[] = $sub->id;
+
+        if(isset($sub->formdata->contact_id)){
+            $historyDoctors[] =
+                $sub->formdata->contact_id;
+        }
+
+        if(isset($sub->formdata->rx_support)){
+            $historyRxSupport[] =
+                $sub->formdata->rx_support;
+        }
+
+        if(isset($sub->formdata->other_molecule_use)){
+            $historyOtherMolecule[] =
+                $sub->formdata->other_molecule_use;
+        }
+
+    }
+
+}
+
+@endphp
+    var allDoctors = {!! json_encode($doctors) !!};
+    var categorySubmissions = {!! json_encode($categorySubmissions) !!};
+    var categoryDoctorSubmissions = {!! json_encode($categoryDoctorSubmissions) !!};
+    var doctorRxCounts = {!! json_encode($doctorRxCounts) !!};
+    var doctorMonthData = {!! json_encode($doctorMonthData) !!};
+    var historyMoleculeUse =
+{!! json_encode($historyMoleculeUse) !!};
+
+var historyRecordDate =
+{!! json_encode($historyRecordDate) !!};
+    var historySubmissionIds =
+{!! json_encode($historySubmissionIds) !!};
+    var historyDoctors =
+{!! json_encode($historyDoctors) !!};
+
+var historyRxSupport =
+{!! json_encode($historyRxSupport) !!};
+
+var historyOtherMolecule =
+{!! json_encode($historyOtherMolecule) !!};
+
+console.log(historyRxSupport);
+console.log(historyOtherMolecule);
+
+console.log(
+    "HISTORY DOCTORS",
+    historyDoctors
+);
+    console.log("FORM HISTORY", {!! json_encode($history) !!});
+    console.log(
+    "SUBMISSIONS",
+    {!! json_encode($history->data->submissions ?? []) !!}
+);
+    console.log("CATEGORY SUBMISSIONS", categorySubmissions);
+    console.log("DOCTOR RX COUNTS", doctorRxCounts);
+    console.log("DOCTOR MONTH DATA", doctorMonthData);
+    console.log("INITIAL DOCTORS FROM BACKEND", allDoctors);
+    window.allDoctors = allDoctors;
+
+//         $.ajax({
+//     type: "GET",
+//     url: '/form/getdoctorlist?partition={{$form->partition}}&hierarchy=all',
+//     success: function(data) {
+
+//     console.log("FULL DATA", data);
+
+//     if(data.length > 0){
+//         console.log("FIRST DOCTOR", data[0]);
+//     }
+
+//     window.allDoctors = data;
+//     allDoctors = data;
+
+// }
+// });
 
 
-        $(document).on('change', 'select[id^="field-contact_id"]', function () {
 
-    let selectedOption = $(this).find(':selected');
 
-    let id = $(this).attr('id').split('-').pop();
+     $('#field-select-category').on('change', function () {
 
-    $('#field-legacy_code-' + id)
-        .val(selectedOption.attr('legacy_code'));
+    console.log("CATEGORY CHANGED");
 
-    $('#field-speciality-' + id)
-        .val(selectedOption.attr('speciality'));
+    console.log("Selected Category:", $(this).val());
 
-    preventDuplicateDoctors(window.submittedDoctors);
+    console.log("All Doctors:", allDoctors);
+
+    const mandatoryDoctorCount = {
+
+    "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
+
+};
+
+    let selectedCategory = $(this).val();
+
+    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",'')
+            .text('-- Select --')
+    );
+
+    if(allDoctors.length === 0) {
+        console.log("Doctors array empty");
+        return;
+    }
+
+    let filteredDoctors = allDoctors.filter(function(doc){
+
+    if(!doc.contact){
+        return false;
+    }
+
+    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];
+
+    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;
+    if(filteredDoctors.length < requiredCount){
+
+    let categoryName = $('#field-select-category option:selected').text();
+
+    Swal.fire({
+        icon: 'warning',
+        title: 'Incomplete Tagging',
+        text: `Tagging for ${categoryName} is incomplete. Please complete tagging through My Doctors.`
+    });
+
+    // reset category dropdown
+    $('#field-select-category').val('');
+
+    // reset doctor dropdown
+    $('#field-contact_id').html('');
+
+    $('#field-contact_id').append(
+        $("<option></option>")
+            .attr("value",'')
+            .text('-- Select --')
+    );
+    // reset doctor table
+    $('#doctor-table-body').html(`
+        <tr>
+            <td colspan="8" 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(
+            $("<option></option>")
+                .attr("value", itm.value)
+                .attr("doctor_category", itm.doctor_category)
+                .attr("msl_code", itm.msl_code)
+                .attr("speciality", itm.speciality)
+                .text(itm.display)
+        );
+
+    });
+
+});
+
+
+        // const categoryMetricMap = {
+
+        //     "Foracort Ciphaler":
+        //         "doctor_converion_Foracort_Ciphaler",
+
+        //     "Duolin Synchrobreathe":
+        //         "doctor_converion_Duolin_Synchrobreathe",
+
+        //     "Foracort G":
+        //         "doctor_converion_Foracort_G",
+
+        //     "Pedia":
+        //         "doctor_converion_Pedia",
+
+        //     "Triple combination (Voltido Trio/ Indaflo G)":
+        //         "doctor_converion_Triple_combination_(Voltido_Trio/_Indaflo_G)",
+
+        //     "ICS LABA (Seroflo Maxiflo Voltido)":
+        //         "doctor_converion_ICS_LABA_(Seroflo_Maxiflo_Voltido)"
+        // };
+
+
+        // $('#field-select-category').on('change', function () {
+
+        //     $('#report-form input.dynamic-hidden').remove();
+
+        //     // Convert value to slug
+        //     let slug = $(this).val()
+        //         .toLowerCase()
+        //         .trim()
+        //         .replace(/[^a-z0-9\s-]/g, '') // remove special chars
+        //         .replace(/\s+/g, '_')         // spaces to underscore
+        //         .replace(/-+/g, '_');         // hyphen to underscore
+
+        //     $('#report-form').append(
+        //         '<input type="hidden" class="dynamic-hidden" name="' + slug + '" value="1">'
+        //     );
+        // });
+
+        // $('#field-converted').on('change', function () {
+        //     let value = $(this).val();
+        //     console.log(value);
+        //     $('#report-form input.dynamic-hidden').remove();
+
+        //     // Convert value to slug
+        //     let slug = $(this).val()
+        //         .toLowerCase()
+        //         .trim()
+        //         .replace(/[^a-z0-9\s-]/g, '') // remove special chars
+        //         .replace(/\s+/g, '_')         // spaces to underscore
+        //         .replace(/-+/g, '_');         // hyphen to underscore
+
+        //     if(value === 'Yes') {
+        //         $('#report-form').append(
+        //             '<input type="hidden" class="dynamic-hidden" name="' + slug + '" value="1">'
+        //         );
+        //     }
+        // });
+
+
+
+
+
+
+const categoryThresholds = {
+
+    "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 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">
+                    No Doctors Found
+                </td>
+            </tr>
+        `);
+        return;
+    }
+
+    filteredDoctors.forEach(function(doc){
+        let doctorName = doc.display || '-';
+        let speciality = doc.contact?.speciality || '-';
+        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 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><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);
+    }
+});
+
 
         
-        var doctor_count = 0
-        let numberOfSubmission=0;
-        console.log("Number of Submission : ",numberOfSubmission);
-        $('#adddoctor-btn').click(function() {
-            let doctorName=$('#field-contact_id').html();
+        $('input[type="file"]').on('change', function () {
+            let file = this.files[0];
+            if (!file) return;
+            let allowedTypes = [
+                'image/jpeg',
+                'image/jpg',
+                'application/pdf'
 
-            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');
+            ];
+            if (!allowedTypes.includes(file.type)) {
+                Swal.fire({
+                    icon: 'error',
+                    title: 'Invalid file',
+                    text: 'Only JPG and PDF files are allowed.'
+                });
+                $(this).val('');
             }
-
-            $(this).select2({
-                width: '100%',
-                minimumResultsForSearch: 0
-            });
-
-        });*/
-             preventDuplicateDoctors(window.submittedDoctors);
-
-
-          /* $('select[id^="execution-"]').select2({
-                width: '100%'
-            });*/
-            $('select[id^="execution-"]').select2({
-            width: '100%',
-            minimumResultsForSearch: Infinity
+           
         });
 
-                                     
+        $('#report-form').on('submit', function(event){
             
-           
-            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; 
-            }
-
-            
+            let fd = new FormData($('#report-form')[0]);
 
+for (let pair of fd.entries()) {
+    console.log(pair[0], pair[1]);
+}
             $("#pageloader").fadeIn();
             $.ajax({
                 type: "POST",
@@ -850,41 +1381,152 @@
                 contentType: false,
                 success: function(data) {
                     $("#pageloader").fadeOut();
-                    if (data.status == 'success') {
+                    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!'
-                        })
+                            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");
+                $('#field-select-category').trigger('change');
+            }, 300);
+            @endif
+        // 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
+    );
+}
+
+            // 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]
+            );
     });
-            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>
+</script>
 </body>
 
-</html>
+</html>
\ No newline at end of file