diff --git a/resources/views/form/rapport-gennovadc/1750326824-c1c033e6-9d6e-4647-b0dd-d3d28e6953e5.blade.php b/resources/views/form/rapport-gennovadc/1750326824-c1c033e6-9d6e-4647-b0dd-d3d28e6953e5.blade.php
index 7e219305..dd24f39c 100644
--- a/resources/views/form/rapport-gennovadc/1750326824-c1c033e6-9d6e-4647-b0dd-d3d28e6953e5.blade.php
+++ b/resources/views/form/rapport-gennovadc/1750326824-c1c033e6-9d6e-4647-b0dd-d3d28e6953e5.blade.php
@@ -21,6 +21,8 @@ $brandData = [
 
 ['brand'=>'Vintor 4K', 'slug'=>'vintor_4k_units','pseudoId'=>'vintor_4k_week1','pseudoId2'=>'vintor_4k_week2','pseudoId3'=>'vintor_4k_week3','pseudoId4'=>'vintor_4k_week4'],
 ['brand'=>'Vintor 10K', 'slug'=>'vintor_10k_units','pseudoId'=>'vintor_10k_week1','pseudoId2'=>'vintor_10k_week2','pseudoId3'=>'vintor_10k_week3','pseudoId4'=>'vintor_10k_week4'],
+['brand'=>'Vintor 6K', 'slug'=>'vintor_6k_units','pseudoId'=>'vintor_6k_week1','pseudoId2'=>'vintor_6k_week2','pseudoId3'=>'vintor_6k_week3','pseudoId4'=>'vintor_6k_week4'],
+
 ['brand'=>'Encicarb 500', 'slug'=>'encicarb_500_units','pseudoId'=>'encicarb_500_week1','pseudoId2'=>'encicarb_500_week2','pseudoId3'=>'encicarb_500_week3','pseudoId4'=>'encicarb_500_week4'],
 ['brand'=>'Encicarb 100', 'slug'=>'encicarb_100_units','pseudoId'=>'encicarb_100_week1','pseudoId2'=>'encicarb_100_week2','pseudoId3'=>'encicarb_100_week3','pseudoId4'=>'encicarb_100_week4'],
 // ['brand'=>'Epofer 4K', 'slug'=>'epofer_4k_units','pseudoId'=>'epofer_4k_week1','pseudoId2'=>'epofer_4k_week2','pseudoId3'=>'epofer_4k_week3','pseudoId4'=>'epofer_4k_week4'],
@@ -32,6 +34,8 @@ $brandData2 = [
 
 ['brand'=>'Vintor 4K', 'slug'=>'vintor_4k_units_execution','pseudoId'=>'vintor_4k_week1_exe','pseudoId2'=>'vintor_4k_week2_exe','pseudoId3'=>'vintor_4k_week3_exe','pseudoId4'=>'vintor_4k_week4_exe','pseudoId5'=>'vintor_4k_percent'],
 ['brand'=>'Vintor 10K', 'slug'=>'vintor_10k_units_execution','pseudoId'=>'vintor_10k_week1_exe','pseudoId2'=>'vintor_10k_week2_exe','pseudoId3'=>'vintor_10k_week3_exe','pseudoId4'=>'vintor_10k_week4_exe','pseudoId5'=>'vintor_10k_percent'],
+['brand'=>'Vintor 6K', 'slug'=>'vintor_6k_units_execution','pseudoId'=>'vintor_6k_week1_exe','pseudoId2'=>'vintor_6k_week2_exe','pseudoId3'=>'vintor_6k_week3_exe','pseudoId4'=>'vintor_6k_week4_exe','pseudoId5'=>'vintor_6k_percent'],
+
 ['brand'=>'Encicarb 500', 'slug'=>'encicarb_500_units_execution','pseudoId'=>'encicarb_500_week1_exe','pseudoId2'=>'encicarb_500_week2_exe','pseudoId3'=>'encicarb_500_week3_exe','pseudoId4'=>'encicarb_500_week4_exe','pseudoId5'=>'encicarb_500_percent'],
 ['brand'=>'Encicarb 100', 'slug'=>'encicarb_100_units_execution','pseudoId'=>'encicarb_100_week1_exe','pseudoId2'=>'encicarb_100_week2_exe','pseudoId3'=>'encicarb_100_week3_exe','pseudoId4'=>'encicarb_100_week4_exe','pseudoId5'=>'encicarb_100_percent'],
 // ['brand'=>'Epofer 4K', 'slug'=>'epofer_4k_units_execution','pseudoId'=>'epofer_4k_week1_exe','pseudoId2'=>'epofer_4k_week2_exe','pseudoId3'=>'epofer_4k_week3_exe','pseudoId4'=>'epofer_4k_week4_exe','pseudoId5'=>'epofer_4k_percent'],
@@ -102,6 +106,7 @@ $brandData2 = [
                                                 <th>Plan Week</th>
                                                 <th>Vintor 4K Month Plan Units</th>
                                                 <th>Vintor 10K Month Plan Units</th>
+                                                <th>Vintor 6K Month Plan Units</th>
                                                 <th>Encicarb 500 Month Plan Units</th>
                                                 <th>Encicarb 100 Month Plan Units</th>
                                                 <th>Dynulta Month Plan Units</th>
@@ -109,30 +114,35 @@ $brandData2 = [
                                                 
                                                 <th>Vintor 4K Week 1 planned units</th>
                                                 <th>Vintor 10K Week 1 planned units</th>
+                                                <th>Vintor 6K Week 1 planned units</th>
                                                 <th>Encicarb 500 Week 1 planned units</th>
                                                 <th>Encicarb 100 Week 1 planned units</th>
                                                 <th>Dynulta Week 1 planned units</th>
 
                                                 <th>Vintor 4K Week 2 planned units</th>
                                                 <th>Vintor 10K Week 2 planned units</th>
+                                                <th>Vintor 6K Week 2 planned units</th> 
                                                 <th>Encicarb 500 Week 2 planned units</th>
                                                 <th>Encicarb 100 Week 2 planned units</th>
                                                 <th>Dynulta Week 2 planned units</th>
 
                                                 <th>Vintor 4K Week 3 planned units</th>
                                                 <th>Vintor 10K Week 3 planned units</th>
+                                                <th>Vintor 6K Week 3 planned units</th>
                                                 <th>Encicarb 500 Week 3 planned units</th>
                                                 <th>Encicarb 100 Week 3 planned units</th>
                                                 <th>Dynulta Week 3 planned units</th>
 
                                                 <th>Vintor 4K Week 4 planned units</th>
                                                 <th>Vintor 10K Week 4 planned units</th>
+                                                <th>Vintor 6K Week 4 planned units</th>
                                                 <th>Encicarb 500 Week 4 planned units</th>
                                                 <th>Encicarb 100 Week 4 planned units</th>
                                                 <th>Dynulta Week 4 planned units</th>
 
                                                 <th>Vintor 4K Total Executed units</th>
                                                 <th>Vintor 10K Total Executed units</th>
+                                                <th>Vintor 6K Total Executed units</th>
                                                 <th>Encicarb 500 Total Executed units</th>
                                                 <th>Encicarb 100 Total Executed units</th>
                                                 <th>Dynulta Total Executed units</th>
@@ -140,30 +150,35 @@ $brandData2 = [
 
                                                 <th>Vintor 4K Percentage Achievement</th>
                                                 <th>Vintor 10K Percentage Achievement</th>
+                                                <th>Vintor 6K Percentage Achievement</th>
                                                 <th>Encicarb 500 Percentage Achievement</th>
                                                 <th>Encicarb 100 Percentage Achievement</th>
                                                 <th>Dynulta Percentage Achievement</th>
 
                                                 <th>Vintor 4K Week 1 Execution units</th>
                                                 <th>Vintor 10K Week 1 Execution units</th>
+                                                <th>Vintor 6K Week 1 Execution units</th>
                                                 <th>Encicarb 500 Week 1 Execution units</th>
                                                 <th>Encicarb 100 Week 1 Execution units</th>
                                                 <th>Dynulta Week 1 Execution units</th>
 
                                                 <th>Vintor 4K Week 2 Execution units</th>
                                                 <th>Vintor 10K Week 2 Execution units</th>
+                                                <th>Vintor 6K Week 2 Execution units</th>
                                                 <th>Encicarb 500 Week 2 Execution units</th>
                                                 <th>Encicarb 100 Week 2 Execution units</th>
                                                 <th>Dynulta Week 2 Execution units</th>
 
                                                 <th>Vintor 4K Week 3 Execution units</th>
                                                 <th>Vintor 10K Week 3 Execution units</th>
+                                                <th>Vintor 6K Week 3 Execution units</th>                                             
                                                 <th>Encicarb 500 Week 3 Execution units</th>
                                                 <th>Encicarb 100 Week 3 Execution units</th>
                                                 <th>Dynulta Week 3 Execution units</th>
 
                                                 <th>Vintor 4K Week 4 Execution units</th>
                                                 <th>Vintor 10K Week 4 Execution units</th>
+                                                <th>Vintor 6K Week 4 Execution units</th>
                                                 <th>Encicarb 500 Week 4 Execution units</th>
                                                 <th>Encicarb 100 Week 4 Execution units</th>
                                                 <th>Dynulta Week 4 Execution units</th>
@@ -220,6 +235,8 @@ $brandData2 = [
                                                 </td>
                                                 <td>{{isset($sub->formdata->vintor_10k_units) ? $sub->formdata->vintor_10k_units: ''}}
                                                 </td>
+                                                <td>{{isset($sub->formdata->vintor_6k_units) ? $sub->formdata->vintor_6k_units: ''}}
+                                                </td>
                                                 <td>{{isset($sub->formdata->encicarb_500_units) ? $sub->formdata->encicarb_500_units: ''}}
                                                 </td>
                                                 <td>{{isset($sub->formdata->encicarb_100_units) ? $sub->formdata->encicarb_100_units: ''}}
@@ -232,6 +249,8 @@ $brandData2 = [
                                                 </td>
                                                 <td>{{isset($sub->formdata->vintor_10k_week1) ? (int)$sub->formdata->vintor_10k_week1: ''}}
                                                 </td>
+                                                <td>{{isset($sub->formdata->vintor_6k_week1) ? (int)$sub->formdata->vintor_6k_week1: ''}}
+                                                </td>
                                                 <td>{{isset($sub->formdata->encicarb_500_week1) ? (int)$sub->formdata->encicarb_500_week1: ''}}
                                                 </td>
                                                 <td>{{isset($sub->formdata->encicarb_100_week1) ? (int)$sub->formdata->encicarb_100_week1: ''}}
@@ -244,6 +263,8 @@ $brandData2 = [
                                                 </td>
                                                 <td>{{isset($sub->formdata->vintor_10k_week2) ? (int)$sub->formdata->vintor_10k_week2: ''}}
                                                 </td>
+                                                <td>{{isset($sub->formdata->vintor_6k_week2) ? (int)$sub->formdata->vintor_6k_week2: ''}}
+                                                </td>
                                                 <td>{{isset($sub->formdata->encicarb_500_week2) ? (int)$sub->formdata->encicarb_500_week2: ''}}
                                                 </td>
                                                 <td>{{isset($sub->formdata->encicarb_100_week2) ? (int)$sub->formdata->encicarb_100_week1: ''}}
@@ -257,6 +278,8 @@ $brandData2 = [
                                                 </td>
                                                 <td>{{isset($sub->formdata->vintor_10k_week3) ? (int)$sub->formdata->vintor_10k_week3: ''}}
                                                 </td>
+                                                <td>{{isset($sub->formdata->vintor_6k_week3) ? (int)$sub->formdata->vintor_6k_week3: ''}}
+                                                </td>
                                                 <td>{{isset($sub->formdata->encicarb_500_week3) ? (int)$sub->formdata->encicarb_500_week3: ''}}
                                                 </td>
                                                 <td>{{isset($sub->formdata->encicarb_100_week3) ? (int)$sub->formdata->encicarb_100_week3: ''}}
@@ -269,6 +292,8 @@ $brandData2 = [
                                                 </td>
                                                 <td>{{isset($sub->formdata->vintor_10k_week4) ? (int)$sub->formdata->vintor_10k_week4: ''}}
                                                 </td>
+                                                <td>{{isset($sub->formdata->vintor_6k_week4) ? (int)$sub->formdata->vintor_6k_week4: ''}}
+                                                </td>
                                                 <td>{{isset($sub->formdata->encicarb_500_week4) ? (int)$sub->formdata->encicarb_500_week4: ''}}
                                                 </td>
                                                 <td>{{isset($sub->formdata->encicarb_100_week4) ? (int)$sub->formdata->encicarb_100_week4: ''}}
@@ -282,6 +307,8 @@ $brandData2 = [
                                                 </td>
                                                 <td>{{isset($sub->formdata->vintor_10k_units_execution) ? $sub->formdata->vintor_10k_units_execution: ''}}
                                                 </td>
+                                                <td>{{isset($sub->formdata->vintor_6k_units_execution) ? $sub->formdata->vintor_6k_units_execution: ''}}
+                                                </td>
                                                 <td>{{isset($sub->formdata->encicarb_500_units_execution) ? $sub->formdata->encicarb_500_units_execution: ''}}
                                                 </td>
                                                 <td>{{isset($sub->formdata->encicarb_100_units_execution) ? $sub->formdata->encicarb_100_units_execution: ''}}
@@ -294,6 +321,8 @@ $brandData2 = [
                                                 </td>
                                                 <td>{{isset($sub->formdata->vintor_10k_percent) ? $sub->formdata->vintor_10k_percent: ''}}
                                                 </td>
+                                                <td>{{isset($sub->formdata->vintor_6k_percent) ? $sub->formdata->vintor_6k_percent: ''}}
+                                                </td>
                                                 <td>{{isset($sub->formdata->encicarb_500_percent) ? $sub->formdata->encicarb_500_percent: ''}}
                                                 </td>
                                                 <td>{{isset($sub->formdata->encicarb_100_percent) ? $sub->formdata->encicarb_100_percent: ''}}
@@ -307,6 +336,8 @@ $brandData2 = [
                                                 </td>
                                                 <td>{{isset($sub->formdata->vintor_10k_week1_exe) ? $sub->formdata->vintor_10k_week1_exe: ''}}
                                                 </td>
+                                                <td>{{isset($sub->formdata->vintor_6k_week1_exe) ? $sub->formdata->vintor_6k_week1_exe: ''}}
+                                                </td>
                                                 <td>{{isset($sub->formdata->encicarb_500_week1_exe) ? $sub->formdata->encicarb_500_week1_exe: ''}}
                                                 </td>
                                                 <td>{{isset($sub->formdata->encicarb_100_week1_exe) ? $sub->formdata->encicarb_100_week1_exe: ''}}
@@ -319,6 +350,8 @@ $brandData2 = [
                                                 </td>
                                                 <td>{{isset($sub->formdata->vintor_10k_week2_exe) ? $sub->formdata->vintor_10k_week2_exe: ''}}
                                                 </td>
+                                                <td>{{isset($sub->formdata->vintor_6k_week2_exe) ? $sub->formdata->vintor_6k_week2_exe: ''}}
+                                                </td>
                                                 <td>{{isset($sub->formdata->encicarb_500_week2_exe) ? $sub->formdata->encicarb_500_week2_exe: ''}}
                                                 </td>
                                                 <td>{{isset($sub->formdata->encicarb_100_week2_exe) ? $sub->formdata->encicarb_100_week2_exe: ''}}
@@ -331,6 +364,8 @@ $brandData2 = [
                                                 </td>
                                                 <td>{{isset($sub->formdata->vintor_10k_week3_exe) ? $sub->formdata->vintor_10k_week3_exe: ''}}
                                                 </td>
+                                                <td>{{isset($sub->formdata->vintor_6k_week3_exe) ? $sub->formdata->vintor_6k_week3_exe: ''}}
+                                                </td>
                                                 <td>{{isset($sub->formdata->encicarb_500_week3_exe) ? $sub->formdata->encicarb_500_week3_exe: ''}}
                                                 </td>
                                                 <td>{{isset($sub->formdata->encicarb_100_week3_exe) ? $sub->formdata->encicarb_100_week3_exe: ''}}
@@ -343,6 +378,8 @@ $brandData2 = [
                                                 </td>
                                                 <td>{{isset($sub->formdata->vintor_10k_week4_exe) ? $sub->formdata->vintor_10k_week4_exe: ''}}
                                                 </td>
+                                                <td>{{isset($sub->formdata->vintor_6k_week4_exe) ? $sub->formdata->vintor_6k_week4_exe: ''}}
+                                                </td>
                                                 <td>{{isset($sub->formdata->encicarb_500_week4_exe) ? $sub->formdata->encicarb_500_week4_exe: ''}}
                                                 </td>
                                                 <td>{{isset($sub->formdata->encicarb_100_week4_exe) ? $sub->formdata->encicarb_100_week4_exe: ''}}
@@ -498,22 +535,22 @@ $brandData2 = [
                                                             <td>
                                                                 <input type="number" step="1" min="0" id="field-{{ $brand['pseudoId'] }}"
                                                                     name="{{ $brand['pseudoId'] }}"
-                                                                    class="form-control form-control-large" readonly="true" value="{{ $id && isset($formdata) && isset($formdata->{$brand['pseudoId']}) ? $formdata->{$brand['pseudoId']} : 0 }}">
+                                                                    class="form-control form-control-large" value="{{ $id && isset($formdata) && isset($formdata->{$brand['pseudoId']}) ? $formdata->{$brand['pseudoId']} : 0 }}">
                                                             </td>
                                                             <td>
                                                                 <input type="number" step="1" min="0" id="field-{{ $brand['pseudoId2'] }}"
                                                                     name="{{ $brand['pseudoId2'] }}"
-                                                                    class="form-control form-control-large" readonly="true" value="{{ $id && isset($formdata) && isset($formdata->{$brand['pseudoId']}) ? $formdata->{$brand['pseudoId']} : 0 }}">
+                                                                    class="form-control form-control-large" value="{{ $id && isset($formdata) && isset($formdata->{$brand['pseudoId']}) ? $formdata->{$brand['pseudoId']} : 0 }}">
                                                             </td>
                                                             <td>
                                                                 <input type="number" step="1" min="0" id="field-{{ $brand['pseudoId3'] }}"
                                                                     name="{{ $brand['pseudoId3'] }}"
-                                                                    class="form-control form-control-large" readonly="true" value="{{ $id && isset($formdata) && isset($formdata->{$brand['pseudoId']}) ? $formdata->{$brand['pseudoId']} : 0 }}">
+                                                                    class="form-control form-control-large" value="{{ $id && isset($formdata) && isset($formdata->{$brand['pseudoId']}) ? $formdata->{$brand['pseudoId']} : 0 }}">
                                                             </td>
                                                             <td>
                                                                 <input type="number" step="1" min="0" id="field-{{ $brand['pseudoId4'] }}"
                                                                     name="{{ $brand['pseudoId4'] }}"
-                                                                    class="form-control form-control-large" readonly="true" value="{{ $id && isset($formdata) && isset($formdata->{$brand['pseudoId']}) ? $formdata->{$brand['pseudoId']} : 0 }}">
+                                                                    class="form-control form-control-large" value="{{ $id && isset($formdata) && isset($formdata->{$brand['pseudoId']}) ? $formdata->{$brand['pseudoId']} : 0 }}">
                                                             </td>
 
                                                         </tr>
@@ -811,6 +848,25 @@ $brandData2 = [
     <script src="{{ asset('assets/libs/sweetalert2/sweetalert2.min.js') }}"></script>
     <script type="text/javascript">
     jQuery(document).ready(function($) {
+        
+        
+        
+
+    // Allow only positive integers
+        $('input[type="number"]').on('input', function () {
+
+            // remove anything except digits
+            this.value = this.value.replace(/[^0-9]/g, '');
+
+            // prevent negative
+            if (parseInt(this.value) < 0 || this.value.includes('-')) {
+                this.value = '';
+            }
+
+        });
+
+        
+        
         $('#form-wrapper').hide()
         $('#execution-form-wrapper').hide()
 
@@ -848,62 +904,105 @@ $brandData2 = [
 
 
 
-        $('#field-vintor_4k_units,#field-vintor_10k_units,#field-encicarb_500_units,#field-encicarb_100_units,#field-encicarb_100_units,#field-epofer_4k_units,#field-epofer_10k_units,#field-dynulta_units').on('keyup',function(){
-            let week=$('#field-select_plan_week').val();
-            console.log("week :",week);
-            let month_plan_units_Victor_4k=(parseInt($('#field-vintor_4k_units').val()))||0;
-            let month_plan_units_Victor_10k=parseInt($('#field-vintor_10k_units').val())||0;
-            let month_plan_units_Encicarb_500=parseInt($('#field-encicarb_500_units').val())||0;
-            let month_plan_units_Encicarb_100=parseInt($('#field-encicarb_100_units').val())||0;
-            // let month_plan_units_Epofer_4K=parseInt($('#field-epofer_4k_units').val())||0;
-            // let month_plan_units_Epofer_10K=parseInt($('#field-epofer_10k_units').val())||0;
-            let month_plan_units_Dynulta=parseInt($('#field-dynulta_units').val())||0;
+        // $('#field-vintor_4k_units,#field-vintor_10k_units,#field-encicarb_500_units,#field-encicarb_100_units,#field-encicarb_100_units,#field-epofer_4k_units,#field-epofer_10k_units,#field-dynulta_units').on('keyup',function(){
+        //     let week=$('#field-select_plan_week').val();
+        //     console.log("week :",week);
+        //     let month_plan_units_Victor_4k=(parseInt($('#field-vintor_4k_units').val()))||0;
+        //     let month_plan_units_Victor_10k=parseInt($('#field-vintor_10k_units').val())||0;
+        //     let month_plan_units_Encicarb_500=parseInt($('#field-encicarb_500_units').val())||0;
+        //     let month_plan_units_Encicarb_100=parseInt($('#field-encicarb_100_units').val())||0;
+        //     // let month_plan_units_Epofer_4K=parseInt($('#field-epofer_4k_units').val())||0;
+        //     // let month_plan_units_Epofer_10K=parseInt($('#field-epofer_10k_units').val())||0;
+        //     let month_plan_units_Dynulta=parseInt($('#field-dynulta_units').val())||0;
 
 
             
-                $('#field-vintor_4k_week1').val(Math.round(month_plan_units_Victor_4k*0.2));
-                $('#field-vintor_10k_week1').val(Math.round(month_plan_units_Victor_10k*0.2));
-                $('#field-encicarb_500_week1').val(Math.round(month_plan_units_Encicarb_500*0.2));
-                $('#field-encicarb_100_week1').val(Math.round(month_plan_units_Encicarb_100*0.2));
-                // $('#field-epofer_4k_week1').val(Math.round(month_plan_units_Epofer_4K*0.2));
-                // $('#field-epofer_10k_week1').val(Math.round(month_plan_units_Epofer_10K*0.2));
-                $('#field-dynulta_week1').val(Math.round(month_plan_units_Dynulta*0.2));
+        //         $('#field-vintor_4k_week1').val(Math.round(month_plan_units_Victor_4k*0.2));
+        //         $('#field-vintor_10k_week1').val(Math.round(month_plan_units_Victor_10k*0.2));
+        //         $('#field-encicarb_500_week1').val(Math.round(month_plan_units_Encicarb_500*0.2));
+        //         $('#field-encicarb_100_week1').val(Math.round(month_plan_units_Encicarb_100*0.2));
+        //         // $('#field-epofer_4k_week1').val(Math.round(month_plan_units_Epofer_4K*0.2));
+        //         // $('#field-epofer_10k_week1').val(Math.round(month_plan_units_Epofer_10K*0.2));
+        //         $('#field-dynulta_week1').val(Math.round(month_plan_units_Dynulta*0.2));
                 
            
-                $('#field-vintor_4k_week2').val(Math.round(month_plan_units_Victor_4k*0.4));
-                $('#field-vintor_10k_week2').val(Math.round(month_plan_units_Victor_10k*0.4));
-                $('#field-encicarb_500_week2').val(Math.round(month_plan_units_Encicarb_500*0.4));
-                $('#field-encicarb_100_week2').val(Math.round(month_plan_units_Encicarb_100*0.4));
-                // $('#field-epofer_4k_week2').val(Math.round(month_plan_units_Epofer_4K*0.4));
-                // $('#field-epofer_10k_week2').val(Math.round(month_plan_units_Epofer_10K*0.4));
-                $('#field-dynulta_week2').val(Math.round(month_plan_units_Dynulta*0.4));
+        //         $('#field-vintor_4k_week2').val(Math.round(month_plan_units_Victor_4k*0.4));
+        //         $('#field-vintor_10k_week2').val(Math.round(month_plan_units_Victor_10k*0.4));
+        //         $('#field-encicarb_500_week2').val(Math.round(month_plan_units_Encicarb_500*0.4));
+        //         $('#field-encicarb_100_week2').val(Math.round(month_plan_units_Encicarb_100*0.4));
+        //         // $('#field-epofer_4k_week2').val(Math.round(month_plan_units_Epofer_4K*0.4));
+        //         // $('#field-epofer_10k_week2').val(Math.round(month_plan_units_Epofer_10K*0.4));
+        //         $('#field-dynulta_week2').val(Math.round(month_plan_units_Dynulta*0.4));
                 
             
             
-                $('#field-vintor_4k_week3').val(Math.round(month_plan_units_Victor_4k*0.7));
-                $('#field-vintor_10k_week3').val(Math.round(month_plan_units_Victor_10k*0.7));
-                $('#field-encicarb_500_week3').val(Math.round(month_plan_units_Encicarb_500*0.7));
-                $('#field-encicarb_100_week3').val(Math.round(month_plan_units_Encicarb_100*0.7));
-                // $('#field-epofer_4k_week3').val(Math.round(month_plan_units_Epofer_4K*0.7));
-                // $('#field-epofer_10k_week3').val(Math.round(month_plan_units_Epofer_10K*0.7));
-                $('#field-dynulta_week3').val(Math.round(month_plan_units_Dynulta*0.7));
+        //         $('#field-vintor_4k_week3').val(Math.round(month_plan_units_Victor_4k*0.7));
+        //         $('#field-vintor_10k_week3').val(Math.round(month_plan_units_Victor_10k*0.7));
+        //         $('#field-encicarb_500_week3').val(Math.round(month_plan_units_Encicarb_500*0.7));
+        //         $('#field-encicarb_100_week3').val(Math.round(month_plan_units_Encicarb_100*0.7));
+        //         // $('#field-epofer_4k_week3').val(Math.round(month_plan_units_Epofer_4K*0.7));
+        //         // $('#field-epofer_10k_week3').val(Math.round(month_plan_units_Epofer_10K*0.7));
+        //         $('#field-dynulta_week3').val(Math.round(month_plan_units_Dynulta*0.7));
                 
             
            
-                $('#field-vintor_4k_week4').val(Math.round(month_plan_units_Victor_4k*1));
-                $('#field-vintor_10k_week4').val(Math.round(month_plan_units_Victor_10k*1));
-                $('#field-encicarb_500_week4').val(Math.round(month_plan_units_Encicarb_500*1));
-                $('#field-encicarb_100_week4').val(Math.round(month_plan_units_Encicarb_100*1));
-                // $('#field-epofer_4k_week4').val(Math.round(month_plan_units_Epofer_4K*1));
-                // $('#field-epofer_10k_week4').val(Math.round(month_plan_units_Epofer_10K*1));
-                $('#field-dynulta_week4').val(Math.round(month_plan_units_Dynulta*1));
+        //         $('#field-vintor_4k_week4').val(Math.round(month_plan_units_Victor_4k*1));
+        //         $('#field-vintor_10k_week4').val(Math.round(month_plan_units_Victor_10k*1));
+        //         $('#field-encicarb_500_week4').val(Math.round(month_plan_units_Encicarb_500*1));
+        //         $('#field-encicarb_100_week4').val(Math.round(month_plan_units_Encicarb_100*1));
+        //         // $('#field-epofer_4k_week4').val(Math.round(month_plan_units_Epofer_4K*1));
+        //         // $('#field-epofer_10k_week4').val(Math.round(month_plan_units_Epofer_10K*1));
+        //         $('#field-dynulta_week4').val(Math.round(month_plan_units_Dynulta*1));
                 
                 
-        })
-
-            
+        // })
+        
+        
 
         $('.edit-btn').click(function() {
+            // First make all readonly
+            // $('#execution-form input').prop('readonly', true);
+
+             // Keep only PLAN fields editable (plan with value that user filled while making plan and week selection fields)
+            $('#execution-vintor_4k_units').prop('readonly', false);
+            $('#execution-vintor_10k_units').prop('readonly', false);
+            $('#execution-encicarb_500_units').prop('readonly', false);
+            $('#execution-encicarb_100_units').prop('readonly', false);
+            $('#execution-dynulta_units').prop('readonly', false);
+
+            $('#execution-vintor_4k_week1').prop('readonly', false);
+            $('#execution-vintor_4k_week2').prop('readonly', false);
+            $('#execution-vintor_4k_week3').prop('readonly', false);
+            $('#execution-vintor_4k_week4').prop('readonly', false);
+
+            $('#execution-vintor_10k_week1').prop('readonly', false);
+            $('#execution-vintor_10k_week2').prop('readonly', false);
+            $('#execution-vintor_10k_week3').prop('readonly', false);
+            $('#execution-vintor_10k_week4').prop('readonly', false);
+
+            $('#execution-encicarb_500_week1').prop('readonly', false);
+            $('#execution-encicarb_500_week2').prop('readonly', false);
+            $('#execution-encicarb_500_week3').prop('readonly', false);
+            $('#execution-encicarb_500_week4').prop('readonly', false);
+
+            $('#execution-encicarb_100_week1').prop('readonly', false);
+            $('#execution-encicarb_100_week2').prop('readonly', false);
+            $('#execution-encicarb_100_week3').prop('readonly', false);
+            $('#execution-encicarb_100_week4').prop('readonly', false);
+
+            $('#execution-dynulta_week1').prop('readonly', false);
+            $('#execution-dynulta_week2').prop('readonly', false);
+            $('#execution-dynulta_week3').prop('readonly', false);
+            $('#execution-dynulta_week4').prop('readonly', false);
+
+            // execution fields still editable
+            // $('[id*="_exe"]').prop('readonly', false);
+
+            // percentage + total execution readonly
+            $('[id*="_percent"]').prop('readonly', true);
+            $('[id*="_units_execution"]').prop('readonly', true);
+
+
             $('#execution-form-wrapper').show(100, () => {
                 $('#add-camp-btn').hide(0);
             })
@@ -925,7 +1024,7 @@ $brandData2 = [
                 e.preventDefault();
             })
 
-            
+       
             $('#execution-speciality').prop('readonly', true)
             $('#execution-plan_date').prop('readonly', true)
             $('#execution-uid_number').prop('readonly',true);
@@ -960,6 +1059,8 @@ $brandData2 = [
                 // if(selected[k] != '')
                 // $('#execution-'+k).val(selected[k]);
             }
+
+            
             let docid = $('#execution-contact_id option').map(function() {
                 if ($(this).text().trim() == selected['contact_id']) return this;
             }).attr('value')
@@ -1014,466 +1115,547 @@ $brandData2 = [
 
 });
 
-            $('#execution-vintor_4k_units,#execution-vintor_10k_units,#execution-encicarb_500_units,#execution-encicarb_100_units,#execution-encicarb_100_units,#execution-epofer_4k_units,#execution-epofer_10k_units,#execution-dynulta_units').on('keyup',function(){
-            let week=$('#execution-select_plan_week').val();
-            console.log("week :",week);
-            let month_plan_units_Victor_4k=(parseInt($('#execution-vintor_4k_units').val()))||0;
-            let month_plan_units_Victor_10k=parseInt($('#execution-vintor_10k_units').val())||0;
-            let month_plan_units_Encicarb_500=parseInt($('#execution-encicarb_500_units').val())||0;
-            let month_plan_units_Encicarb_100=parseInt($('#execution-encicarb_100_units').val())||0;
-            // let month_plan_units_Epofer_4K=parseInt($('#execution-epofer_4k_units').val())||0;
-            // let month_plan_units_Epofer_10K=parseInt($('#execution-epofer_10k_units').val())||0;
-            let month_plan_units_dynulta=parseInt($('#execution-dynulta_units').val())||0;
-            
-            
-                $('#execution-vintor_4k_week1').val(Math.round(month_plan_units_Victor_4k*0.2));
-                $('#execution-vintor_10k_week1').val(Math.round(month_plan_units_Victor_10k*0.2));
-                $('#execution-encicarb_500_week1').val(Math.round(month_plan_units_Encicarb_500*0.2));
-                $('#execution-encicarb_100_week1').val(Math.round(month_plan_units_Encicarb_100*0.2));
-                // $('#execution-epofer_4k_week1').val(Math.round(month_plan_units_Epofer_4K*0.2));
-                // $('#execution-epofer_10k_week1').val(Math.round(month_plan_units_Epofer_10K*0.2));
-                $('#execution-dynulta_week1').val(Math.round(month_plan_units_dynulta*0.2));
+                // $('#execution-vintor_4k_units,#execution-vintor_10k_units,#execution-encicarb_500_units,#execution-encicarb_100_units,#execution-encicarb_100_units,#execution-epofer_4k_units,#execution-epofer_10k_units,#execution-dynulta_units').on('keyup',function(){
+                // let week=$('#execution-select_plan_week').val();
+                // console.log("week :",week);
+                // let month_plan_units_Victor_4k=(parseInt($('#execution-vintor_4k_units').val()))||0;
+                // let month_plan_units_Victor_10k=parseInt($('#execution-vintor_10k_units').val())||0;
+                // let month_plan_units_Encicarb_500=parseInt($('#execution-encicarb_500_units').val())||0;
+                // let month_plan_units_Encicarb_100=parseInt($('#execution-encicarb_100_units').val())||0;
+                // // let month_plan_units_Epofer_4K=parseInt($('#execution-epofer_4k_units').val())||0;
+                // // let month_plan_units_Epofer_10K=parseInt($('#execution-epofer_10k_units').val())||0;
+                // let month_plan_units_dynulta=parseInt($('#execution-dynulta_units').val())||0;
                 
-           
-                $('#execution-vintor_4k_week2').val(Math.round(month_plan_units_Victor_4k*0.4));
-                $('#execution-vintor_10k_week2').val(Math.round(month_plan_units_Victor_10k*0.4));
-                $('#execution-encicarb_500_week2').val(Math.round(month_plan_units_Encicarb_500*0.4));
-                $('#execution-encicarb_100_week2').val(Math.round(month_plan_units_Encicarb_100*0.4));
-                // $('#execution-epofer_4k_week2').val(Math.round(month_plan_units_Epofer_4K*0.4));
-                // $('#execution-epofer_10k_week2').val(Math.round(month_plan_units_Epofer_10K*0.4));
-                $('#execution-dynulta_week2').val(Math.round(month_plan_units_dynulta*0.4));
+                
+                //     $('#execution-vintor_4k_week1').val(Math.round(month_plan_units_Victor_4k*0.2));
+                //     $('#execution-vintor_10k_week1').val(Math.round(month_plan_units_Victor_10k*0.2));
+                //     $('#execution-encicarb_500_week1').val(Math.round(month_plan_units_Encicarb_500*0.2));
+                //     $('#execution-encicarb_100_week1').val(Math.round(month_plan_units_Encicarb_100*0.2));
+                //     // $('#execution-epofer_4k_week1').val(Math.round(month_plan_units_Epofer_4K*0.2));
+                //     // $('#execution-epofer_10k_week1').val(Math.round(month_plan_units_Epofer_10K*0.2));
+                //     $('#execution-dynulta_week1').val(Math.round(month_plan_units_dynulta*0.2));
+                    
+            
+                //     $('#execution-vintor_4k_week2').val(Math.round(month_plan_units_Victor_4k*0.4));
+                //     $('#execution-vintor_10k_week2').val(Math.round(month_plan_units_Victor_10k*0.4));
+                //     $('#execution-encicarb_500_week2').val(Math.round(month_plan_units_Encicarb_500*0.4));
+                //     $('#execution-encicarb_100_week2').val(Math.round(month_plan_units_Encicarb_100*0.4));
+                //     // $('#execution-epofer_4k_week2').val(Math.round(month_plan_units_Epofer_4K*0.4));
+                //     // $('#execution-epofer_10k_week2').val(Math.round(month_plan_units_Epofer_10K*0.4));
+                //     $('#execution-dynulta_week2').val(Math.round(month_plan_units_dynulta*0.4));
 
+                    
+                
+                
+                //     $('#execution-vintor_4k_week3').val(Math.round(month_plan_units_Victor_4k*0.7));
+                //     $('#execution-vintor_10k_week3').val(Math.round(month_plan_units_Victor_10k*0.7));
+                //     $('#execution-encicarb_500_week3').val(Math.round(month_plan_units_Encicarb_500*0.7));
+                //     $('#execution-encicarb_100_week3').val(Math.round(month_plan_units_Encicarb_100*0.7));
+                //     // $('#execution-epofer_4k_week3').val(Math.round(month_plan_units_Epofer_4K*0.7));
+                //     // $('#execution-epofer_10k_week3').val(Math.round(month_plan_units_Epofer_10K*0.7));
+                //     $('#execution-dynulta_week3').val(Math.round(month_plan_units_dynulta*0.7));
+                    
                 
             
-            
-                $('#execution-vintor_4k_week3').val(Math.round(month_plan_units_Victor_4k*0.7));
-                $('#execution-vintor_10k_week3').val(Math.round(month_plan_units_Victor_10k*0.7));
-                $('#execution-encicarb_500_week3').val(Math.round(month_plan_units_Encicarb_500*0.7));
-                $('#execution-encicarb_100_week3').val(Math.round(month_plan_units_Encicarb_100*0.7));
-                // $('#execution-epofer_4k_week3').val(Math.round(month_plan_units_Epofer_4K*0.7));
-                // $('#execution-epofer_10k_week3').val(Math.round(month_plan_units_Epofer_10K*0.7));
-                $('#execution-dynulta_week3').val(Math.round(month_plan_units_dynulta*0.7));
-                
-            
-           
-                $('#execution-vintor_4k_week4').val(Math.round(month_plan_units_Victor_4k*1));
-                $('#execution-vintor_10k_week4').val(Math.round(month_plan_units_Victor_10k*1));
-                $('#execution-encicarb_500_week4').val(Math.round(month_plan_units_Encicarb_500*1));
-                $('#execution-encicarb_100_week4').val(Math.round(month_plan_units_Encicarb_100*1));
-                // $('#execution-epofer_4k_week4').val(Math.round(month_plan_units_Epofer_4K*1));
-                // $('#execution-epofer_10k_week4').val(Math.round(month_plan_units_Epofer_10K*1));
-                $('#execution-dynulta_week4').val(Math.round(month_plan_units_dynulta*1));
-                
-                
-            })
+                //     $('#execution-vintor_4k_week4').val(Math.round(month_plan_units_Victor_4k*1));
+                //     $('#execution-vintor_10k_week4').val(Math.round(month_plan_units_Victor_10k*1));
+                //     $('#execution-encicarb_500_week4').val(Math.round(month_plan_units_Encicarb_500*1));
+                //     $('#execution-encicarb_100_week4').val(Math.round(month_plan_units_Encicarb_100*1));
+                //     // $('#execution-epofer_4k_week4').val(Math.round(month_plan_units_Epofer_4K*1));
+                //     // $('#execution-epofer_10k_week4').val(Math.round(month_plan_units_Epofer_10K*1));
+                //     $('#execution-dynulta_week4').val(Math.round(month_plan_units_dynulta*1));
+                    
+                    
+                // })
 
 
             $('label[for="execution-execution_week"]').html('<p class="form-label">Select Execution Week <span class="text-danger">*</span></p><p class="text-danger">*below total exe units & achv % will be calculated basis the week selected here</p>');   
             $('label[for="execution-execution_product"]').html('<p class="form-label">Execution Product <span class="text-danger">*</span></p><p class="text-danger">*Pl enter exec/achv units for the week selected above;<br/> eg if week 3 is selected, enter achv/exec units for week 3 only; accordingly total units and percentage will get calculated</p>');   
             
-            
-            $('#execution-execution_week').on('change',function(){
-                let numOfWeek=$('#execution-execution_week').val();
-                console.log("Number of Week : ",numOfWeek);
+            function calculateExecution() {
 
-                
-                // /*  New Code Calculation */
-                
-                // $('#execution-vintor_4k_units_execution').val(parseInt($('#execution-vintor_4k_week'+numOfWeek+'_exe').val())||0);
-                // $('#execution-vintor_4k_percent').val((( parseInt($('#execution-vintor_4k_units_execution').val()) / parseInt($('#execution-vintor_4k_units').val()) )*100).toFixed(2));
+                let numOfWeek = $('#execution-execution_week').val();
 
-                // $('#execution-vintor_10k_units_execution').val(parseInt($('#execution-vintor_10k_week'+numOfWeek+'_exe').val())||0);
-                // $('#execution-vintor_10k_percent').val((( parseInt($('#execution-vintor_10k_units_execution').val()) / parseInt($('#execution-vintor_10k_units').val()) )*100).toFixed(2));
-                
-                // $('#execution-encicarb_500_units_execution').val(parseInt($('#execution-encicarb_500_week'+numOfWeek+'_exe').val())||0);
-                // $('#execution-encicarb_500_percent').val((( parseInt($('#execution-encicarb_500_units_execution').val()) / parseInt($('#execution-encicarb_500_units').val()) )*100).toFixed(2));
+                if(!numOfWeek) return;
 
-                // $('#execution-encicarb_100_units_execution').val(parseInt($('#execution-encicarb_100_week'+numOfWeek+'_exe').val())||0);
-                // $('#execution-encicarb_100_percent').val((( parseInt($('#execution-encicarb_100_units_execution').val()) / parseInt($('#execution-encicarb_100_units').val()) )*100).toFixed(2));
+                // Vintor 4K
+                let v4k = parseInt($('#execution-vintor_4k_week'+numOfWeek+'_exe').val()) || 0;
+                let v4kPlan = parseInt($('#execution-vintor_4k_units').val()) || 0;
 
-                // $('#execution-epofer_4k_units_execution').val(parseInt($('#execution-epofer_4k_week'+numOfWeek+'_exe').val())||0);
-                // $('#execution-epofer_4k_percent').val((( parseInt($('#execution-epofer_4k_units_execution').val()) / parseInt($('#execution-epofer_4k_units').val()) )*100).toFixed(2));
+                $('#execution-vintor_4k_units_execution').val(v4k);
+                $('#execution-vintor_4k_percent').val(
+                    v4kPlan ? ((v4k / v4kPlan) * 100).toFixed(2) : 0
+                );
 
-                // $('#execution-epofer_10k_units_execution').val(parseInt($('#execution-epofer_10k_week'+numOfWeek+'_exe').val())||0);
-                // $('#execution-epofer_10k_percent').val((( parseInt($('#execution-epofer_10k_units_execution').val()) / parseInt($('#execution-epofer_10k_units').val()) )*100).toFixed(2));
+                // Vintor 10K
+                let v10k = parseInt($('#execution-vintor_10k_week'+numOfWeek+'_exe').val()) || 0;
+                let v10kPlan = parseInt($('#execution-vintor_10k_units').val()) || 0;
 
-                // /* End of New Code Calculation */
-
-                
-                if(numOfWeek==='4'){
-                    $('#execution-vintor_4k_week1_exe,#execution-vintor_4k_week2_exe,#execution-vintor_4k_week3_exe,#execution-vintor_4k_week4_exe').on('keyup',function(){
-                    
-                    let d=parseInt($('#execution-vintor_4k_week4_exe').val())||0;
-
-                    let total=(d);
-                    $('#execution-vintor_4k_units_execution').val(total);
-                    let oldPlanValue=$('#execution-vintor_4k_units').val();
-                    let percentage=((total/oldPlanValue)*100).toFixed(2);
-                    $('#execution-vintor_4k_percent').val(percentage);
-                    })
+                $('#execution-vintor_10k_units_execution').val(v10k);
+                $('#execution-vintor_10k_percent').val(
+                    v10kPlan ? ((v10k / v10kPlan) * 100).toFixed(2) : 0
+                );
 
 
-                    $('#execution-vintor_10k_week1_exe,#execution-vintor_10k_week2_exe,#execution-vintor_10k_week3_exe,#execution-vintor_10k_week4_exe').on('keyup',function(){
-                            
-                            let d=parseInt($('#execution-vintor_10k_week4_exe').val())||0;
+                // Vintor 6K
+                let v6k = parseInt($('#execution-vintor_6k_week'+numOfWeek+'_exe').val()) || 0;
+                let v6kPlan = parseInt($('#execution-vintor_6k_units').val()) || 0;
 
-                            let total=(d);
-                            $('#execution-vintor_10k_units_execution').val(total);
-                            let oldPlanValue=$('#execution-vintor_10k_units').val();
-                            let percentage=((total/oldPlanValue)*100).toFixed(2);
-                            $('#execution-vintor_10k_percent').val(percentage);
-                    })
+                $('#execution-vintor_6k_units_execution').val(v6k);
+                $('#execution-vintor_6k_percent').val(
+                    v6kPlan ? ((v6k / v6kPlan) * 100).toFixed(2) : 0
+                );
 
-                    $('#execution-encicarb_500_week1_exe,#execution-encicarb_500_week2_exe,#execution-encicarb_500_week3_exe,#execution-encicarb_500_week4_exe').on('keyup',function(){
-                            
-                            let d=parseInt($('#execution-encicarb_500_week4_exe').val())||0;
+                // Encicarb 500
+                let e500 = parseInt($('#execution-encicarb_500_week'+numOfWeek+'_exe').val()) || 0;
+                let e500Plan = parseInt($('#execution-encicarb_500_units').val()) || 0;
 
-                            let total=(d);
-                            $('#execution-encicarb_500_units_execution').val(total);
-                            let oldPlanValue=$('#execution-encicarb_500_units').val();
-                            let percentage=((total/oldPlanValue)*100).toFixed(2);
-                            $('#execution-encicarb_500_percent').val(percentage);
-                    })
+                $('#execution-encicarb_500_units_execution').val(e500);
+                $('#execution-encicarb_500_percent').val(
+                    e500Plan ? ((e500 / e500Plan) * 100).toFixed(2) : 0
+                );
 
-                    $('#execution-encicarb_100_week1_exe,#execution-encicarb_100_week2_exe,#execution-encicarb_100_week3_exe,#execution-encicarb_100_week4_exe').on('keyup',function(){
-                            let d=parseInt($('#execution-encicarb_100_week4_exe').val())||0;
+                // Encicarb 100
+                let e100 = parseInt($('#execution-encicarb_100_week'+numOfWeek+'_exe').val()) || 0;
+                let e100Plan = parseInt($('#execution-encicarb_100_units').val()) || 0;
 
-                            let total=(d);
-                            $('#execution-encicarb_100_units_execution').val(total);
-                            let oldPlanValue=$('#execution-encicarb_100_units').val();
-                            let percentage=((total/oldPlanValue)*100).toFixed(2);
-                            $('#execution-encicarb_100_percent').val(percentage);
-                    })
+                $('#execution-encicarb_100_units_execution').val(e100);
+                $('#execution-encicarb_100_percent').val(
+                    e100Plan ? ((e100 / e100Plan) * 100).toFixed(2) : 0
+                );
 
-                    $('#execution-epofer_4k_week1_exe,#execution-epofer_4k_week2_exe,#execution-epofer_4k_week3_exe,#execution-epofer_4k_week4_exe').on('keyup',function(){
-                            let d=parseInt($('#execution-epofer_4k_week4_exe').val())||0;
+                // Dynulta
+                let dyn = parseInt($('#execution-dynulta_week'+numOfWeek+'_exe').val()) || 0;
+                let dynPlan = parseInt($('#execution-dynulta_units').val()) || 0;
 
-                            let total=(d);
-                            $('#execution-epofer_4k_units_execution').val(total);
-                            let oldPlanValue=$('#execution-epofer_4k_units').val();
-                            let percentage=((total/oldPlanValue)*100).toFixed(2);
-                            $('#execution-epofer_4k_percent').val(percentage);
-                    })
-
-                    $('#execution-epofer_10k_week1_exe,#execution-epofer_10k_week2_exe,#execution-epofer_10k_week3_exe,#execution-epofer_10k_week4_exe').on('keyup',function(){
-                            let d=parseInt($('#execution-epofer_10k_week4_exe').val())||0;
-
-                            let total=(d);
-                            $('#execution-epofer_10k_units_execution').val(total);
-                            let oldPlanValue=$('#execution-epofer_10k_units').val();
-                            let percentage=((total/oldPlanValue)*100).toFixed(2);
-                            $('#execution-epofer_10k_percent').val(percentage);
-                    })
-
-                    $('#execution-dynulta_week1_exe,#execution-dynulta_week2_exe,#execution-dynulta_week3_exe,#execution-dynulta_week4_exe').on('keyup',function(){
-
-                        let d = parseInt($('#execution-dynulta_week4_exe').val()) || 0;
-
-                        let total = (d);
-                        $('#execution-dynulta_units_execution').val(total);
-                        let oldPlanValue = $('#execution-dynulta_units').val();
-                        let percentage = ((total / oldPlanValue) * 100).toFixed(2);
-                        $('#execution-dynulta_percent').val(percentage);
-                    });
-                }
-                else if(numOfWeek==='1'){
-                    $('#execution-vintor_4k_week1_exe,#execution-vintor_4k_week2_exe,#execution-vintor_4k_week3_exe,#execution-vintor_4k_week4_exe').on('keyup',function(){
-                    
-                    let d=parseInt($('#execution-vintor_4k_week1_exe').val())||0;
-
-                    let total=(d);
-                    $('#execution-vintor_4k_units_execution').val(total);
-                    let oldPlanValue=$('#execution-vintor_4k_units').val();
-                    let percentage=((total/oldPlanValue)*100).toFixed(2);
-                    $('#execution-vintor_4k_percent').val(percentage);
-                    })
+                $('#execution-dynulta_units_execution').val(dyn);
+                $('#execution-dynulta_percent').val(
+                    dynPlan ? ((dyn / dynPlan) * 100).toFixed(2) : 0
+                );
+            }
 
 
-                    $('#execution-vintor_10k_week1_exe,#execution-vintor_10k_week2_exe,#execution-vintor_10k_week3_exe,#execution-vintor_10k_week4_exe').on('keyup',function(){
-                            
-                            let d=parseInt($('#execution-vintor_10k_week1_exe').val())||0;
+            // Auto calculate while typing
+            $('[id*="_exe"]').on('keyup change', function () {
+                calculateExecution();
+            });
 
-                            let total=(d);
-                            $('#execution-vintor_10k_units_execution').val(total);
-                            let oldPlanValue=$('#execution-vintor_10k_units').val();
-                            let percentage=((total/oldPlanValue)*100).toFixed(2);
-                            $('#execution-vintor_10k_percent').val(percentage);
-                    })
 
-                    $('#execution-encicarb_500_week1_exe,#execution-encicarb_500_week2_exe,#execution-encicarb_500_week3_exe,#execution-encicarb_500_week4_exe').on('keyup',function(){
-                            
-                            let d=parseInt($('#execution-encicarb_500_week1_exe').val())||0;
+            // Week change readonly logic
+            $('#execution-execution_week').on('change', function () {
 
-                            let total=(d);
-                            $('#execution-encicarb_500_units_execution').val(total);
-                            let oldPlanValue=$('#execution-encicarb_500_units').val();
-                            let percentage=((total/oldPlanValue)*100).toFixed(2);
-                            $('#execution-encicarb_500_percent').val(percentage);
-                    })
+                let selectedWeek = $(this).val();
 
-                    $('#execution-encicarb_100_week1_exe,#execution-encicarb_100_week2_exe,#execution-encicarb_100_week3_exe,#execution-encicarb_100_week4_exe').on('keyup',function(){
-                            let d=parseInt($('#execution-encicarb_100_week1_exe').val())||0;
+                $('[id*="_week"][id*="_exe"]').prop('readonly', true);
 
-                            let total=(d);
-                            $('#execution-encicarb_100_units_execution').val(total);
-                            let oldPlanValue=$('#execution-encicarb_100_units').val();
-                            let percentage=((total/oldPlanValue)*100).toFixed(2);
-                            $('#execution-encicarb_100_percent').val(percentage);
-                    })
-
-                    $('#execution-epofer_4k_week1_exe,#execution-epofer_4k_week2_exe,#execution-epofer_4k_week3_exe,#execution-epofer_4k_week4_exe').on('keyup',function(){
-                            let d=parseInt($('#execution-epofer_4k_week1_exe').val())||0;
-
-                            let total=(d);
-                            $('#execution-epofer_4k_units_execution').val(total);
-                            let oldPlanValue=$('#execution-epofer_4k_units').val();
-                            let percentage=((total/oldPlanValue)*100).toFixed(2);
-                            $('#execution-epofer_4k_percent').val(percentage);
-                    })
-
-                    $('#execution-epofer_10k_week1_exe,#execution-epofer_10k_week2_exe,#execution-epofer_10k_week3_exe,#execution-epofer_10k_week4_exe').on('keyup',function(){
-                            let d=parseInt($('#execution-epofer_10k_week1_exe').val())||0;
-
-                            let total=(d);
-                            $('#execution-epofer_10k_units_execution').val(total);
-                            let oldPlanValue=$('#execution-epofer_10k_units').val();
-                            let percentage=((total/oldPlanValue)*100).toFixed(2);
-                            $('#execution-epofer_10k_percent').val(percentage);
-                    })
-
-                    $('#execution-dynulta_week1_exe,#execution-dynulta_week2_exe,#execution-dynulta_week3_exe,#execution-dynulta_week4_exe').on('keyup',function(){
-
-                        let d = parseInt($('#execution-dynulta_week1_exe').val()) || 0;
-
-                        let total = (d);
-                        $('#execution-dynulta_units_execution').val(total);
-                        let oldPlanValue = $('#execution-dynulta_units').val();
-                        let percentage = ((total / oldPlanValue) * 100).toFixed(2);
-                        $('#execution-dynulta_percent').val(percentage);
-                    });
+                if (selectedWeek) {
+                    $(`[id*="_week${selectedWeek}_exe"]`).prop('readonly', false);
                 }
 
-                else if(numOfWeek==='2'){
-                    $('#execution-vintor_4k_week1_exe,#execution-vintor_4k_week2_exe,#execution-vintor_4k_week3_exe,#execution-vintor_4k_week4_exe').on('keyup',function(){
+                calculateExecution();
+            });
+            // $('#execution-execution_week').on('change',function(){
+            //     let numOfWeek=$('#execution-execution_week').val();
+            //     console.log("Number of Week : ",numOfWeek);
+
+                
+            //     /*  New Code Calculation */
+                
+            //     // $('#execution-vintor_4k_units_execution').val(parseInt($('#execution-vintor_4k_week'+numOfWeek+'_exe').val())||0);
+            //     $('#execution-vintor_4k_percent').val((( parseInt($('#execution-vintor_4k_units_execution').val()) / parseInt($('#execution-vintor_4k_units').val()) )*100).toFixed(2));
+
+            //     $('#execution-vintor_10k_units_execution').val(parseInt($('#execution-vintor_10k_week'+numOfWeek+'_exe').val())||0);
+            //     $('#execution-vintor_10k_percent').val((( parseInt($('#execution-vintor_10k_units_execution').val()) / parseInt($('#execution-vintor_10k_units').val()) )*100).toFixed(2));
+                
+            //     $('#execution-encicarb_500_units_execution').val(parseInt($('#execution-encicarb_500_week'+numOfWeek+'_exe').val())||0);
+            //     $('#execution-encicarb_500_percent').val((( parseInt($('#execution-encicarb_500_units_execution').val()) / parseInt($('#execution-encicarb_500_units').val()) )*100).toFixed(2));
+
+            //     $('#execution-encicarb_100_units_execution').val(parseInt($('#execution-encicarb_100_week'+numOfWeek+'_exe').val())||0);
+            //     $('#execution-encicarb_100_percent').val((( parseInt($('#execution-encicarb_100_units_execution').val()) / parseInt($('#execution-encicarb_100_units').val()) )*100).toFixed(2));
+
+            //     $('#execution-epofer_4k_units_execution').val(parseInt($('#execution-epofer_4k_week'+numOfWeek+'_exe').val())||0);
+            //     $('#execution-epofer_4k_percent').val((( parseInt($('#execution-epofer_4k_units_execution').val()) / parseInt($('#execution-epofer_4k_units').val()) )*100).toFixed(2));
+
+            //     $('#execution-epofer_10k_units_execution').val(parseInt($('#execution-epofer_10k_week'+numOfWeek+'_exe').val())||0);
+            //     $('#execution-epofer_10k_percent').val((( parseInt($('#execution-epofer_10k_units_execution').val()) / parseInt($('#execution-epofer_10k_units').val()) )*100).toFixed(2));
+
+            //     /* End of New Code Calculation */
+
+                
+            //     // if(numOfWeek==='4'){
+            //     //     $('#execution-vintor_4k_week1_exe,#execution-vintor_4k_week2_exe,#execution-vintor_4k_week3_exe,#execution-vintor_4k_week4_exe').on('keyup',function(){
                     
-                    let d=parseInt($('#execution-vintor_4k_week2_exe').val())||0;
+            //     //     let d=parseInt($('#execution-vintor_4k_week4_exe').val())||0;
 
-                    let total=(d);
-                    $('#execution-vintor_4k_units_execution').val(total);
-                    let oldPlanValue=$('#execution-vintor_4k_units').val();
-                    let percentage=((total/oldPlanValue)*100).toFixed(2);
-                    $('#execution-vintor_4k_percent').val(percentage);
-                    })
+            //     //     let total=(d);
+            //     //     $('#execution-vintor_4k_units_execution').val(total);
+            //     //     let oldPlanValue=$('#execution-vintor_4k_units').val();
+            //     //     let percentage=((total/oldPlanValue)*100).toFixed(2);
+            //     //     $('#execution-vintor_4k_percent').val(percentage);
+            //     //     })
 
 
-                    $('#execution-vintor_10k_week1_exe,#execution-vintor_10k_week2_exe,#execution-vintor_10k_week3_exe,#execution-vintor_10k_week4_exe').on('keyup',function(){
+            //     //     $('#execution-vintor_10k_week1_exe,#execution-vintor_10k_week2_exe,#execution-vintor_10k_week3_exe,#execution-vintor_10k_week4_exe').on('keyup',function(){
                             
-                            let d=parseInt($('#execution-vintor_10k_week2_exe').val())||0;
+            //     //             let d=parseInt($('#execution-vintor_10k_week4_exe').val())||0;
 
-                            let total=(d);
-                            $('#execution-vintor_10k_units_execution').val(total);
-                            let oldPlanValue=$('#execution-vintor_10k_units').val();
-                            let percentage=((total/oldPlanValue)*100).toFixed(2);
-                            $('#execution-vintor_10k_percent').val(percentage);
-                    })
+            //     //             let total=(d);
+            //     //             $('#execution-vintor_10k_units_execution').val(total);
+            //     //             let oldPlanValue=$('#execution-vintor_10k_units').val();
+            //     //             let percentage=((total/oldPlanValue)*100).toFixed(2);
+            //     //             $('#execution-vintor_10k_percent').val(percentage);
+            //     //     })
 
-                    $('#execution-encicarb_500_week1_exe,#execution-encicarb_500_week2_exe,#execution-encicarb_500_week3_exe,#execution-encicarb_500_week4_exe').on('keyup',function(){
+            //     //     $('#execution-encicarb_500_week1_exe,#execution-encicarb_500_week2_exe,#execution-encicarb_500_week3_exe,#execution-encicarb_500_week4_exe').on('keyup',function(){
                             
-                            let d=parseInt($('#execution-encicarb_500_week2_exe').val())||0;
+            //     //             let d=parseInt($('#execution-encicarb_500_week4_exe').val())||0;
 
-                            let total=(d);
-                            $('#execution-encicarb_500_units_execution').val(total);
-                            let oldPlanValue=$('#execution-encicarb_500_units').val();
-                            let percentage=((total/oldPlanValue)*100).toFixed(2);
-                            $('#execution-encicarb_500_percent').val(percentage);
-                    })
+            //     //             let total=(d);
+            //     //             $('#execution-encicarb_500_units_execution').val(total);
+            //     //             let oldPlanValue=$('#execution-encicarb_500_units').val();
+            //     //             let percentage=((total/oldPlanValue)*100).toFixed(2);
+            //     //             $('#execution-encicarb_500_percent').val(percentage);
+            //     //     })
 
-                    $('#execution-encicarb_100_week1_exe,#execution-encicarb_100_week2_exe,#execution-encicarb_100_week3_exe,#execution-encicarb_100_week4_exe').on('keyup',function(){
-                            let d=parseInt($('#execution-encicarb_100_week2_exe').val())||0;
+            //     //     $('#execution-encicarb_100_week1_exe,#execution-encicarb_100_week2_exe,#execution-encicarb_100_week3_exe,#execution-encicarb_100_week4_exe').on('keyup',function(){
+            //     //             let d=parseInt($('#execution-encicarb_100_week4_exe').val())||0;
 
-                            let total=(d);
-                            $('#execution-encicarb_100_units_execution').val(total);
-                            let oldPlanValue=$('#execution-encicarb_100_units').val();
-                            let percentage=((total/oldPlanValue)*100).toFixed(2);
-                            $('#execution-encicarb_100_percent').val(percentage);
-                    })
+            //     //             let total=(d);
+            //     //             $('#execution-encicarb_100_units_execution').val(total);
+            //     //             let oldPlanValue=$('#execution-encicarb_100_units').val();
+            //     //             let percentage=((total/oldPlanValue)*100).toFixed(2);
+            //     //             $('#execution-encicarb_100_percent').val(percentage);
+            //     //     })
 
-                    $('#execution-epofer_4k_week1_exe,#execution-epofer_4k_week2_exe,#execution-epofer_4k_week3_exe,#execution-epofer_4k_week4_exe').on('keyup',function(){
-                            let d=parseInt($('#execution-epofer_4k_week2_exe').val())||0;
+            //     //     $('#execution-epofer_4k_week1_exe,#execution-epofer_4k_week2_exe,#execution-epofer_4k_week3_exe,#execution-epofer_4k_week4_exe').on('keyup',function(){
+            //     //             let d=parseInt($('#execution-epofer_4k_week4_exe').val())||0;
 
-                            let total=(d);
-                            $('#execution-epofer_4k_units_execution').val(total);
-                            let oldPlanValue=$('#execution-epofer_4k_units').val();
-                            let percentage=((total/oldPlanValue)*100).toFixed(2);
-                            $('#execution-epofer_4k_percent').val(percentage);
-                    })
+            //     //             let total=(d);
+            //     //             $('#execution-epofer_4k_units_execution').val(total);
+            //     //             let oldPlanValue=$('#execution-epofer_4k_units').val();
+            //     //             let percentage=((total/oldPlanValue)*100).toFixed(2);
+            //     //             $('#execution-epofer_4k_percent').val(percentage);
+            //     //     })
 
-                    $('#execution-epofer_10k_week1_exe,#execution-epofer_10k_week2_exe,#execution-epofer_10k_week3_exe,#execution-epofer_10k_week4_exe').on('keyup',function(){
-                            let d=parseInt($('#execution-epofer_10k_week2_exe').val())||0;
+            //     //     $('#execution-epofer_10k_week1_exe,#execution-epofer_10k_week2_exe,#execution-epofer_10k_week3_exe,#execution-epofer_10k_week4_exe').on('keyup',function(){
+            //     //             let d=parseInt($('#execution-epofer_10k_week4_exe').val())||0;
 
-                            let total=(d);
-                            $('#execution-epofer_10k_units_execution').val(total);
-                            let oldPlanValue=$('#execution-epofer_10k_units').val();
-                            let percentage=((total/oldPlanValue)*100).toFixed(2);
-                            $('#execution-epofer_10k_percent').val(percentage);
-                    })
+            //     //             let total=(d);
+            //     //             $('#execution-epofer_10k_units_execution').val(total);
+            //     //             let oldPlanValue=$('#execution-epofer_10k_units').val();
+            //     //             let percentage=((total/oldPlanValue)*100).toFixed(2);
+            //     //             $('#execution-epofer_10k_percent').val(percentage);
+            //     //     })
 
-                    $('#execution-dynulta_week1_exe,#execution-dynulta_week2_exe,#execution-dynulta_week3_exe,#execution-dynulta_week4_exe').on('keyup',function(){
+            //     //     $('#execution-dynulta_week1_exe,#execution-dynulta_week2_exe,#execution-dynulta_week3_exe,#execution-dynulta_week4_exe').on('keyup',function(){
 
-                        let d = parseInt($('#execution-dynulta_week2_exe').val()) || 0;
+            //     //         let d = parseInt($('#execution-dynulta_week4_exe').val()) || 0;
 
-                        let total = (d);
-                        $('#execution-dynulta_units_execution').val(total);
-                        let oldPlanValue = $('#execution-dynulta_units').val();
-                        let percentage = ((total / oldPlanValue) * 100).toFixed(2);
-                        $('#execution-dynulta_percent').val(percentage);
-                    });
-                }
-
-                else if(numOfWeek==='3'){
-                    $('#execution-vintor_4k_week1_exe,#execution-vintor_4k_week2_exe,#execution-vintor_4k_week3_exe,#execution-vintor_4k_week4_exe').on('keyup',function(){
+            //     //         let total = (d);
+            //     //         $('#execution-dynulta_units_execution').val(total);
+            //     //         let oldPlanValue = $('#execution-dynulta_units').val();
+            //     //         let percentage = ((total / oldPlanValue) * 100).toFixed(2);
+            //     //         $('#execution-dynulta_percent').val(percentage);
+            //     //     });
+            //     // }
+            //     else if(numOfWeek==='1'){
+            //         $('#execution-vintor_4k_week1_exe,#execution-vintor_4k_week2_exe,#execution-vintor_4k_week3_exe,#execution-vintor_4k_week4_exe').on('keyup',function(){
                     
-                    let d=parseInt($('#execution-vintor_4k_week3_exe').val())||0;
+            //         let d=parseInt($('#execution-vintor_4k_week1_exe').val())||0;
 
-                    let total=(d);
-                    $('#execution-vintor_4k_units_execution').val(total);
-                    let oldPlanValue=$('#execution-vintor_4k_units').val();
-                    let percentage=((total/oldPlanValue)*100).toFixed(2);
-                    $('#execution-vintor_4k_percent').val(percentage);
-                    })
+            //         let total=(d);
+            //         $('#execution-vintor_4k_units_execution').val(total);
+            //         let oldPlanValue=$('#execution-vintor_4k_units').val();
+            //         let percentage=((total/oldPlanValue)*100).toFixed(2);
+            //         $('#execution-vintor_4k_percent').val(percentage);
+            //         })
 
 
-                    $('#execution-vintor_10k_week1_exe,#execution-vintor_10k_week2_exe,#execution-vintor_10k_week3_exe,#execution-vintor_10k_week4_exe').on('keyup',function(){
+            //         $('#execution-vintor_10k_week1_exe,#execution-vintor_10k_week2_exe,#execution-vintor_10k_week3_exe,#execution-vintor_10k_week4_exe').on('keyup',function(){
                             
-                            let d=parseInt($('#execution-vintor_10k_week3_exe').val())||0;
+            //                 let d=parseInt($('#execution-vintor_10k_week1_exe').val())||0;
 
-                            let total=(d);
-                            $('#execution-vintor_10k_units_execution').val(total);
-                            let oldPlanValue=$('#execution-vintor_10k_units').val();
-                            let percentage=((total/oldPlanValue)*100).toFixed(2);
-                            $('#execution-vintor_10k_percent').val(percentage);
-                    })
+            //                 let total=(d);
+            //                 $('#execution-vintor_10k_units_execution').val(total);
+            //                 let oldPlanValue=$('#execution-vintor_10k_units').val();
+            //                 let percentage=((total/oldPlanValue)*100).toFixed(2);
+            //                 $('#execution-vintor_10k_percent').val(percentage);
+            //         })
 
-                    $('#execution-encicarb_500_week1_exe,#execution-encicarb_500_week2_exe,#execution-encicarb_500_week3_exe,#execution-encicarb_500_week4_exe').on('keyup',function(){
+            //         $('#execution-encicarb_500_week1_exe,#execution-encicarb_500_week2_exe,#execution-encicarb_500_week3_exe,#execution-encicarb_500_week4_exe').on('keyup',function(){
                             
-                            let d=parseInt($('#execution-encicarb_500_week3_exe').val())||0;
+            //                 let d=parseInt($('#execution-encicarb_500_week1_exe').val())||0;
 
-                            let total=(d);
-                            $('#execution-encicarb_500_units_execution').val(total);
-                            let oldPlanValue=$('#execution-encicarb_500_units').val();
-                            let percentage=((total/oldPlanValue)*100).toFixed(2);
-                            $('#execution-encicarb_500_percent').val(percentage);
-                    })
+            //                 let total=(d);
+            //                 $('#execution-encicarb_500_units_execution').val(total);
+            //                 let oldPlanValue=$('#execution-encicarb_500_units').val();
+            //                 let percentage=((total/oldPlanValue)*100).toFixed(2);
+            //                 $('#execution-encicarb_500_percent').val(percentage);
+            //         })
 
-                    $('#execution-encicarb_100_week1_exe,#execution-encicarb_100_week2_exe,#execution-encicarb_100_week3_exe,#execution-encicarb_100_week4_exe').on('keyup',function(){
-                            let d=parseInt($('#execution-encicarb_100_week3_exe').val())||0;
+            //         $('#execution-encicarb_100_week1_exe,#execution-encicarb_100_week2_exe,#execution-encicarb_100_week3_exe,#execution-encicarb_100_week4_exe').on('keyup',function(){
+            //                 let d=parseInt($('#execution-encicarb_100_week1_exe').val())||0;
 
-                            let total=(d);
-                            $('#execution-encicarb_100_units_execution').val(total);
-                            let oldPlanValue=$('#execution-encicarb_100_units').val();
-                            let percentage=((total/oldPlanValue)*100).toFixed(2);
-                            $('#execution-encicarb_100_percent').val(percentage);
-                    })
+            //                 let total=(d);
+            //                 $('#execution-encicarb_100_units_execution').val(total);
+            //                 let oldPlanValue=$('#execution-encicarb_100_units').val();
+            //                 let percentage=((total/oldPlanValue)*100).toFixed(2);
+            //                 $('#execution-encicarb_100_percent').val(percentage);
+            //         })
 
-                    $('#execution-epofer_4k_week1_exe,#execution-epofer_4k_week2_exe,#execution-epofer_4k_week3_exe,#execution-epofer_4k_week4_exe').on('keyup',function(){
-                            let d=parseInt($('#execution-epofer_4k_week3_exe').val())||0;
+            //         $('#execution-epofer_4k_week1_exe,#execution-epofer_4k_week2_exe,#execution-epofer_4k_week3_exe,#execution-epofer_4k_week4_exe').on('keyup',function(){
+            //                 let d=parseInt($('#execution-epofer_4k_week1_exe').val())||0;
 
-                            let total=(d);
-                            $('#execution-epofer_4k_units_execution').val(total);
-                            let oldPlanValue=$('#execution-epofer_4k_units').val();
-                            let percentage=((total/oldPlanValue)*100).toFixed(2);
-                            $('#execution-epofer_4k_percent').val(percentage);
-                    })
+            //                 let total=(d);
+            //                 $('#execution-epofer_4k_units_execution').val(total);
+            //                 let oldPlanValue=$('#execution-epofer_4k_units').val();
+            //                 let percentage=((total/oldPlanValue)*100).toFixed(2);
+            //                 $('#execution-epofer_4k_percent').val(percentage);
+            //         })
 
-                    $('#execution-epofer_10k_week1_exe,#execution-epofer_10k_week2_exe,#execution-epofer_10k_week3_exe,#execution-epofer_10k_week4_exe').on('keyup',function(){
-                            let d=parseInt($('#execution-epofer_10k_week3_exe').val())||0;
+            //         $('#execution-epofer_10k_week1_exe,#execution-epofer_10k_week2_exe,#execution-epofer_10k_week3_exe,#execution-epofer_10k_week4_exe').on('keyup',function(){
+            //                 let d=parseInt($('#execution-epofer_10k_week1_exe').val())||0;
 
-                            let total=(d);
-                            $('#execution-epofer_10k_units_execution').val(total);
-                            let oldPlanValue=$('#execution-epofer_10k_units').val();
-                            let percentage=((total/oldPlanValue)*100).toFixed(2);
-                            $('#execution-epofer_10k_percent').val(percentage);
-                    })
+            //                 let total=(d);
+            //                 $('#execution-epofer_10k_units_execution').val(total);
+            //                 let oldPlanValue=$('#execution-epofer_10k_units').val();
+            //                 let percentage=((total/oldPlanValue)*100).toFixed(2);
+            //                 $('#execution-epofer_10k_percent').val(percentage);
+            //         })
 
-                    $('#execution-dynulta_week1_exe,#execution-dynulta_week2_exe,#execution-dynulta_week3_exe,#execution-dynulta_week4_exe').on('keyup',function(){
+            //         $('#execution-dynulta_week1_exe,#execution-dynulta_week2_exe,#execution-dynulta_week3_exe,#execution-dynulta_week4_exe').on('keyup',function(){
 
-                        let d = parseInt($('#execution-dynulta_week3_exe').val()) || 0;
+            //             let d = parseInt($('#execution-dynulta_week1_exe').val()) || 0;
 
-                        let total = (d);
-                        $('#execution-dynulta_units_execution').val(total);
-                        let oldPlanValue = $('#execution-dynulta_units').val();
-                        let percentage = ((total / oldPlanValue) * 100).toFixed(2);
-                        $('#execution-dynulta_percent').val(percentage);
-                    });
-                }
+            //             let total = (d);
+            //             $('#execution-dynulta_units_execution').val(total);
+            //             let oldPlanValue = $('#execution-dynulta_units').val();
+            //             let percentage = ((total / oldPlanValue) * 100).toFixed(2);
+            //             $('#execution-dynulta_percent').val(percentage);
+            //         });
+            //     }
+
+            //     else if(numOfWeek==='2'){
+            //         $('#execution-vintor_4k_week1_exe,#execution-vintor_4k_week2_exe,#execution-vintor_4k_week3_exe,#execution-vintor_4k_week4_exe').on('keyup',function(){
+                    
+            //         let d=parseInt($('#execution-vintor_4k_week2_exe').val())||0;
+
+            //         let total=(d);
+            //         $('#execution-vintor_4k_units_execution').val(total);
+            //         let oldPlanValue=$('#execution-vintor_4k_units').val();
+            //         let percentage=((total/oldPlanValue)*100).toFixed(2);
+            //         $('#execution-vintor_4k_percent').val(percentage);
+            //         })
 
 
-            })
+            //         $('#execution-vintor_10k_week1_exe,#execution-vintor_10k_week2_exe,#execution-vintor_10k_week3_exe,#execution-vintor_10k_week4_exe').on('keyup',function(){
+                            
+            //                 let d=parseInt($('#execution-vintor_10k_week2_exe').val())||0;
+
+            //                 let total=(d);
+            //                 $('#execution-vintor_10k_units_execution').val(total);
+            //                 let oldPlanValue=$('#execution-vintor_10k_units').val();
+            //                 let percentage=((total/oldPlanValue)*100).toFixed(2);
+            //                 $('#execution-vintor_10k_percent').val(percentage);
+            //         })
+
+            //         $('#execution-encicarb_500_week1_exe,#execution-encicarb_500_week2_exe,#execution-encicarb_500_week3_exe,#execution-encicarb_500_week4_exe').on('keyup',function(){
+                            
+            //                 let d=parseInt($('#execution-encicarb_500_week2_exe').val())||0;
+
+            //                 let total=(d);
+            //                 $('#execution-encicarb_500_units_execution').val(total);
+            //                 let oldPlanValue=$('#execution-encicarb_500_units').val();
+            //                 let percentage=((total/oldPlanValue)*100).toFixed(2);
+            //                 $('#execution-encicarb_500_percent').val(percentage);
+            //         })
+
+            //         $('#execution-encicarb_100_week1_exe,#execution-encicarb_100_week2_exe,#execution-encicarb_100_week3_exe,#execution-encicarb_100_week4_exe').on('keyup',function(){
+            //                 let d=parseInt($('#execution-encicarb_100_week2_exe').val())||0;
+
+            //                 let total=(d);
+            //                 $('#execution-encicarb_100_units_execution').val(total);
+            //                 let oldPlanValue=$('#execution-encicarb_100_units').val();
+            //                 let percentage=((total/oldPlanValue)*100).toFixed(2);
+            //                 $('#execution-encicarb_100_percent').val(percentage);
+            //         })
+
+            //         $('#execution-epofer_4k_week1_exe,#execution-epofer_4k_week2_exe,#execution-epofer_4k_week3_exe,#execution-epofer_4k_week4_exe').on('keyup',function(){
+            //                 let d=parseInt($('#execution-epofer_4k_week2_exe').val())||0;
+
+            //                 let total=(d);
+            //                 $('#execution-epofer_4k_units_execution').val(total);
+            //                 let oldPlanValue=$('#execution-epofer_4k_units').val();
+            //                 let percentage=((total/oldPlanValue)*100).toFixed(2);
+            //                 $('#execution-epofer_4k_percent').val(percentage);
+            //         })
+
+            //         $('#execution-epofer_10k_week1_exe,#execution-epofer_10k_week2_exe,#execution-epofer_10k_week3_exe,#execution-epofer_10k_week4_exe').on('keyup',function(){
+            //                 let d=parseInt($('#execution-epofer_10k_week2_exe').val())||0;
+
+            //                 let total=(d);
+            //                 $('#execution-epofer_10k_units_execution').val(total);
+            //                 let oldPlanValue=$('#execution-epofer_10k_units').val();
+            //                 let percentage=((total/oldPlanValue)*100).toFixed(2);
+            //                 $('#execution-epofer_10k_percent').val(percentage);
+            //         })
+
+            //         $('#execution-dynulta_week1_exe,#execution-dynulta_week2_exe,#execution-dynulta_week3_exe,#execution-dynulta_week4_exe').on('keyup',function(){
+
+            //             let d = parseInt($('#execution-dynulta_week2_exe').val()) || 0;
+
+            //             let total = (d);
+            //             $('#execution-dynulta_units_execution').val(total);
+            //             let oldPlanValue = $('#execution-dynulta_units').val();
+            //             let percentage = ((total / oldPlanValue) * 100).toFixed(2);
+            //             $('#execution-dynulta_percent').val(percentage);
+            //         });
+            //     }
+
+            //     else if(numOfWeek==='3'){
+            //         $('#execution-vintor_4k_week1_exe,#execution-vintor_4k_week2_exe,#execution-vintor_4k_week3_exe,#execution-vintor_4k_week4_exe').on('keyup',function(){
+                    
+            //         let d=parseInt($('#execution-vintor_4k_week3_exe').val())||0;
+
+            //         let total=(d);
+            //         $('#execution-vintor_4k_units_execution').val(total);
+            //         let oldPlanValue=$('#execution-vintor_4k_units').val();
+            //         let percentage=((total/oldPlanValue)*100).toFixed(2);
+            //         $('#execution-vintor_4k_percent').val(percentage);
+            //         })
+
+
+            //         $('#execution-vintor_10k_week1_exe,#execution-vintor_10k_week2_exe,#execution-vintor_10k_week3_exe,#execution-vintor_10k_week4_exe').on('keyup',function(){
+                            
+            //                 let d=parseInt($('#execution-vintor_10k_week3_exe').val())||0;
+
+            //                 let total=(d);
+            //                 $('#execution-vintor_10k_units_execution').val(total);
+            //                 let oldPlanValue=$('#execution-vintor_10k_units').val();
+            //                 let percentage=((total/oldPlanValue)*100).toFixed(2);
+            //                 $('#execution-vintor_10k_percent').val(percentage);
+            //         })
+
+            //         $('#execution-encicarb_500_week1_exe,#execution-encicarb_500_week2_exe,#execution-encicarb_500_week3_exe,#execution-encicarb_500_week4_exe').on('keyup',function(){
+                            
+            //                 let d=parseInt($('#execution-encicarb_500_week3_exe').val())||0;
+
+            //                 let total=(d);
+            //                 $('#execution-encicarb_500_units_execution').val(total);
+            //                 let oldPlanValue=$('#execution-encicarb_500_units').val();
+            //                 let percentage=((total/oldPlanValue)*100).toFixed(2);
+            //                 $('#execution-encicarb_500_percent').val(percentage);
+            //         })
+
+            //         $('#execution-encicarb_100_week1_exe,#execution-encicarb_100_week2_exe,#execution-encicarb_100_week3_exe,#execution-encicarb_100_week4_exe').on('keyup',function(){
+            //                 let d=parseInt($('#execution-encicarb_100_week3_exe').val())||0;
+
+            //                 let total=(d);
+            //                 $('#execution-encicarb_100_units_execution').val(total);
+            //                 let oldPlanValue=$('#execution-encicarb_100_units').val();
+            //                 let percentage=((total/oldPlanValue)*100).toFixed(2);
+            //                 $('#execution-encicarb_100_percent').val(percentage);
+            //         })
+
+            //         $('#execution-epofer_4k_week1_exe,#execution-epofer_4k_week2_exe,#execution-epofer_4k_week3_exe,#execution-epofer_4k_week4_exe').on('keyup',function(){
+            //                 let d=parseInt($('#execution-epofer_4k_week3_exe').val())||0;
+
+            //                 let total=(d);
+            //                 $('#execution-epofer_4k_units_execution').val(total);
+            //                 let oldPlanValue=$('#execution-epofer_4k_units').val();
+            //                 let percentage=((total/oldPlanValue)*100).toFixed(2);
+            //                 $('#execution-epofer_4k_percent').val(percentage);
+            //         })
+
+            //         $('#execution-epofer_10k_week1_exe,#execution-epofer_10k_week2_exe,#execution-epofer_10k_week3_exe,#execution-epofer_10k_week4_exe').on('keyup',function(){
+            //                 let d=parseInt($('#execution-epofer_10k_week3_exe').val())||0;
+
+            //                 let total=(d);
+            //                 $('#execution-epofer_10k_units_execution').val(total);
+            //                 let oldPlanValue=$('#execution-epofer_10k_units').val();
+            //                 let percentage=((total/oldPlanValue)*100).toFixed(2);
+            //                 $('#execution-epofer_10k_percent').val(percentage);
+            //         })
+
+            //         $('#execution-dynulta_week1_exe,#execution-dynulta_week2_exe,#execution-dynulta_week3_exe,#execution-dynulta_week4_exe').on('keyup',function(){
+
+            //             let d = parseInt($('#execution-dynulta_week3_exe').val()) || 0;
+
+            //             let total = (d);
+            //             $('#execution-dynulta_units_execution').val(total);
+            //             let oldPlanValue = $('#execution-dynulta_units').val();
+            //             let percentage = ((total / oldPlanValue) * 100).toFixed(2);
+            //             $('#execution-dynulta_percent').val(percentage);
+            //         });
+            //     }
+
+
+            // })
             
 
-                //    $('#execution-vintor_4k_week1_exe,#execution-vintor_4k_week2_exe,#execution-vintor_4k_week3_exe,#execution-vintor_4k_week4_exe').on('keyup',function(){
+                    $('#execution-vintor_4k_week1_exe,#execution-vintor_4k_week2_exe,#execution-vintor_4k_week3_exe,#execution-vintor_4k_week4_exe').on('keyup',function(){
                         
-                //         let d=parseInt($('#execution-vintor_4k_week4_exe').val())||0;
+                        let d=parseInt($('#execution-vintor_4k_week4_exe').val())||0;
 
-                //         let total=(d);
-                //         $('#execution-vintor_4k_units_execution').val(total);
-                //         let oldPlanValue=$('#execution-vintor_4k_units').val();
-                //         let percentage=((total/oldPlanValue)*100).toFixed(2);
-                //         $('#execution-vintor_4k_percent').val(percentage);
-                //    })
+                         let total=(d);
+                         $('#execution-vintor_4k_units_execution').val(total);
+                      let oldPlanValue=$('#execution-vintor_4k_units').val();
+                     let percentage=((total/oldPlanValue)*100).toFixed(2);
+                        $('#execution-vintor_4k_percent').val(percentage);
+                    })
 
 
-                //    $('#execution-vintor_10k_week1_exe,#execution-vintor_10k_week2_exe,#execution-vintor_10k_week3_exe,#execution-vintor_10k_week4_exe').on('keyup',function(){
+                   $('#execution-vintor_10k_week1_exe,#execution-vintor_10k_week2_exe,#execution-vintor_10k_week3_exe,#execution-vintor_10k_week4_exe').on('keyup',function(){
                         
-                //         let d=parseInt($('#execution-vintor_10k_week4_exe').val())||0;
+                        let d=parseInt($('#execution-vintor_10k_week4_exe').val())||0;
 
-                //         let total=(d);
-                //         $('#execution-vintor_10k_units_execution').val(total);
-                //         let oldPlanValue=$('#execution-vintor_10k_units').val();
-                //         let percentage=((total/oldPlanValue)*100).toFixed(2);
-                //         $('#execution-vintor_10k_percent').val(percentage);
-                //    })
+                        let total=(d);
+                        $('#execution-vintor_10k_units_execution').val(total);
+                        let oldPlanValue=$('#execution-vintor_10k_units').val();
+                        let percentage=((total/oldPlanValue)*100).toFixed(2);
+                        $('#execution-vintor_10k_percent').val(percentage);
+                   })
 
-                //    $('#execution-encicarb_500_week1_exe,#execution-encicarb_500_week2_exe,#execution-encicarb_500_week3_exe,#execution-encicarb_500_week4_exe').on('keyup',function(){
+                   $('#execution-encicarb_500_week1_exe,#execution-encicarb_500_week2_exe,#execution-encicarb_500_week3_exe,#execution-encicarb_500_week4_exe').on('keyup',function(){
                         
-                //         let d=parseInt($('#execution-encicarb_500_week4_exe').val())||0;
+                        let d=parseInt($('#execution-encicarb_500_week4_exe').val())||0;
 
-                //         let total=(d);
-                //         $('#execution-encicarb_500_units_execution').val(total);
-                //         let oldPlanValue=$('#execution-encicarb_500_units').val();
-                //         let percentage=((total/oldPlanValue)*100).toFixed(2);
-                //         $('#execution-encicarb_500_percent').val(percentage);
-                //    })
+                        let total=(d);
+                        $('#execution-encicarb_500_units_execution').val(total);
+                        let oldPlanValue=$('#execution-encicarb_500_units').val();
+                        let percentage=((total/oldPlanValue)*100).toFixed(2);
+                        $('#execution-encicarb_500_percent').val(percentage);
+                   })
 
-                //    $('#execution-encicarb_100_week1_exe,#execution-encicarb_100_week2_exe,#execution-encicarb_100_week3_exe,#execution-encicarb_100_week4_exe').on('keyup',function(){
-                //         let d=parseInt($('#execution-encicarb_100_week4_exe').val())||0;
+                   $('#execution-encicarb_100_week1_exe,#execution-encicarb_100_week2_exe,#execution-encicarb_100_week3_exe,#execution-encicarb_100_week4_exe').on('keyup',function(){
+                        let d=parseInt($('#execution-encicarb_100_week4_exe').val())||0;
 
-                //         let total=(d);
-                //         $('#execution-encicarb_100_units_execution').val(total);
-                //         let oldPlanValue=$('#execution-encicarb_100_units').val();
-                //         let percentage=((total/oldPlanValue)*100).toFixed(2);
-                //         $('#execution-encicarb_100_percent').val(percentage);
-                //    })
+                        let total=(d);
+                        $('#execution-encicarb_100_units_execution').val(total);
+                        let oldPlanValue=$('#execution-encicarb_100_units').val();
+                        let percentage=((total/oldPlanValue)*100).toFixed(2);
+                        $('#execution-encicarb_100_percent').val(percentage);
+                   })
 
-                //    $('#execution-epofer_4k_week1_exe,#execution-epofer_4k_week2_exe,#execution-epofer_4k_week3_exe,#execution-epofer_4k_week4_exe').on('keyup',function(){
-                //         let d=parseInt($('#execution-epofer_4k_week4_exe').val())||0;
+                   $('#execution-epofer_4k_week1_exe,#execution-epofer_4k_week2_exe,#execution-epofer_4k_week3_exe,#execution-epofer_4k_week4_exe').on('keyup',function(){
+                        let d=parseInt($('#execution-epofer_4k_week4_exe').val())||0;
 
-                //         let total=(d);
-                //         $('#execution-epofer_4k_units_execution').val(total);
-                //         let oldPlanValue=$('#execution-epofer_4k_units').val();
-                //         let percentage=((total/oldPlanValue)*100).toFixed(2);
-                //         $('#execution-epofer_4k_percent').val(percentage);
-                //    })
+                        let total=(d);
+                        $('#execution-epofer_4k_units_execution').val(total);
+                        let oldPlanValue=$('#execution-epofer_4k_units').val();
+                        let percentage=((total/oldPlanValue)*100).toFixed(2);
+                        $('#execution-epofer_4k_percent').val(percentage);
+                   })
 
-                //    $('#execution-epofer_10k_week1_exe,#execution-epofer_10k_week2_exe,#execution-epofer_10k_week3_exe,#execution-epofer_10k_week4_exe').on('keyup',function(){
-                //         let d=parseInt($('#execution-epofer_10k_week4_exe').val())||0;
+                   $('#execution-epofer_10k_week1_exe,#execution-epofer_10k_week2_exe,#execution-epofer_10k_week3_exe,#execution-epofer_10k_week4_exe').on('keyup',function(){
+                        let d=parseInt($('#execution-epofer_10k_week4_exe').val())||0;
 
-                //         let total=(d);
-                //         $('#execution-epofer_10k_units_execution').val(total);
-                //         let oldPlanValue=$('#execution-epofer_10k_units').val();
-                //         let percentage=((total/oldPlanValue)*100).toFixed(2);
-                //         $('#execution-epofer_10k_percent').val(percentage);
-                //    })
+                        let total=(d);
+                        $('#execution-epofer_10k_units_execution').val(total);
+                        let oldPlanValue=$('#execution-epofer_10k_units').val();
+                        let percentage=((total/oldPlanValue)*100).toFixed(2);
+                        $('#execution-epofer_10k_percent').val(percentage);
+                   })
 
             
 
@@ -1546,58 +1728,58 @@ $brandData2 = [
 
             $('#execution-vintor_4k_units,#execution-vintor_10k_units,#execution-encicarb_500_units,#execution-encicarb_100_units,#execution-encicarb_100_units,#execution-epofer_4k_units,#execution-epofer_10k_units,#execution-dynulta_units').prop('readonly',false);
             
-            $('#execution-vintor_4k_units,#execution-vintor_10k_units,#execution-encicarb_500_units,#execution-encicarb_100_units,#execution-encicarb_100_units,#execution-epofer_4k_units,#execution-epofer_10k_units,#execution-dynulta_units').on('keyup',function(){
-                let week=$('#execution-select_plan_week').val();
-                console.log("week :",week);
-                let month_plan_units_Victor_4k=(parseInt($('#execution-vintor_4k_units').val()))||0;
-                let month_plan_units_Victor_10k=parseInt($('#execution-vintor_10k_units').val())||0;
-                let month_plan_units_Encicarb_500=parseInt($('#execution-encicarb_500_units').val())||0;
-                let month_plan_units_Encicarb_100=parseInt($('#execution-encicarb_100_units').val())||0;
-                // let month_plan_units_Epofer_4K=parseInt($('#execution-epofer_4k_units').val())||0;
-                // let month_plan_units_Epofer_10K=parseInt($('#execution-epofer_10k_units').val())||0;
-                let month_plan_units_Dynulta=parseInt($('#execution-dynulta_units').val())||0;
+            // $('#execution-vintor_4k_units,#execution-vintor_10k_units,#execution-encicarb_500_units,#execution-encicarb_100_units,#execution-encicarb_100_units,#execution-epofer_4k_units,#execution-epofer_10k_units,#execution-dynulta_units').on('keyup',function(){
+            //     let week=$('#execution-select_plan_week').val();
+            //     console.log("week :",week);
+            //     let month_plan_units_Victor_4k=(parseInt($('#execution-vintor_4k_units').val()))||0;
+            //     let month_plan_units_Victor_10k=parseInt($('#execution-vintor_10k_units').val())||0;
+            //     let month_plan_units_Encicarb_500=parseInt($('#execution-encicarb_500_units').val())||0;
+            //     let month_plan_units_Encicarb_100=parseInt($('#execution-encicarb_100_units').val())||0;
+            //     // let month_plan_units_Epofer_4K=parseInt($('#execution-epofer_4k_units').val())||0;
+            //     // let month_plan_units_Epofer_10K=parseInt($('#execution-epofer_10k_units').val())||0;
+            //     let month_plan_units_Dynulta=parseInt($('#execution-dynulta_units').val())||0;
 
 
                 
-                    $('#execution-vintor_4k_week1').val(Math.round(month_plan_units_Victor_4k*0.2));
-                    $('#execution-vintor_10k_week1').val(Math.round(month_plan_units_Victor_10k*0.2));
-                    $('#execution-encicarb_500_week1').val(Math.round(month_plan_units_Encicarb_500*0.2));
-                    $('#execution-encicarb_100_week1').val(Math.round(month_plan_units_Encicarb_100*0.2));
-                    // $('#execution-epofer_4k_week1').val(Math.round(month_plan_units_Epofer_4K*0.2));
-                    // $('#execution-epofer_10k_week1').val(Math.round(month_plan_units_Epofer_10K*0.2));
-                    $('#execution-dynulta_week1').val(Math.round(month_plan_units_Dynulta*0.2));
+            //         $('#execution-vintor_4k_week1').val(Math.round(month_plan_units_Victor_4k*0.2));
+            //         $('#execution-vintor_10k_week1').val(Math.round(month_plan_units_Victor_10k*0.2));
+            //         $('#execution-encicarb_500_week1').val(Math.round(month_plan_units_Encicarb_500*0.2));
+            //         $('#execution-encicarb_100_week1').val(Math.round(month_plan_units_Encicarb_100*0.2));
+            //         // $('#execution-epofer_4k_week1').val(Math.round(month_plan_units_Epofer_4K*0.2));
+            //         // $('#execution-epofer_10k_week1').val(Math.round(month_plan_units_Epofer_10K*0.2));
+            //         $('#execution-dynulta_week1').val(Math.round(month_plan_units_Dynulta*0.2));
                     
             
-                    $('#execution-vintor_4k_week2').val(Math.round(month_plan_units_Victor_4k*0.4));
-                    $('#execution-vintor_10k_week2').val(Math.round(month_plan_units_Victor_10k*0.4));
-                    $('#execution-encicarb_500_week2').val(Math.round(month_plan_units_Encicarb_500*0.4));
-                    $('#execution-encicarb_100_week2').val(Math.round(month_plan_units_Encicarb_100*0.4));
-                    // $('#execution-epofer_4k_week2').val(Math.round(month_plan_units_Epofer_4K*0.4));
-                    // $('#execution-epofer_10k_week2').val(Math.round(month_plan_units_Epofer_10K*0.4));
-                    $('#execution-dynulta_week2').val(Math.round(month_plan_units_Dynulta*0.4));
+            //         $('#execution-vintor_4k_week2').val(Math.round(month_plan_units_Victor_4k*0.4));
+            //         $('#execution-vintor_10k_week2').val(Math.round(month_plan_units_Victor_10k*0.4));
+            //         $('#execution-encicarb_500_week2').val(Math.round(month_plan_units_Encicarb_500*0.4));
+            //         $('#execution-encicarb_100_week2').val(Math.round(month_plan_units_Encicarb_100*0.4));
+            //         // $('#execution-epofer_4k_week2').val(Math.round(month_plan_units_Epofer_4K*0.4));
+            //         // $('#execution-epofer_10k_week2').val(Math.round(month_plan_units_Epofer_10K*0.4));
+            //         $('#execution-dynulta_week2').val(Math.round(month_plan_units_Dynulta*0.4));
                     
                 
                 
-                    $('#execution-vintor_4k_week3').val(Math.round(month_plan_units_Victor_4k*0.7));
-                    $('#execution-vintor_10k_week3').val(Math.round(month_plan_units_Victor_10k*0.7));
-                    $('#execution-encicarb_500_week3').val(Math.round(month_plan_units_Encicarb_500*0.7));
-                    $('#execution-encicarb_100_week3').val(Math.round(month_plan_units_Encicarb_100*0.7));
-                    // $('#execution-epofer_4k_week3').val(Math.round(month_plan_units_Epofer_4K*0.7));
-                    // $('#execution-epofer_10k_week3').val(Math.round(month_plan_units_Epofer_10K*0.7));
-                    $('#execution-dynulta_week3').val(Math.round(month_plan_units_Dynulta*0.7));
+            //         $('#execution-vintor_4k_week3').val(Math.round(month_plan_units_Victor_4k*0.7));
+            //         $('#execution-vintor_10k_week3').val(Math.round(month_plan_units_Victor_10k*0.7));
+            //         $('#execution-encicarb_500_week3').val(Math.round(month_plan_units_Encicarb_500*0.7));
+            //         $('#execution-encicarb_100_week3').val(Math.round(month_plan_units_Encicarb_100*0.7));
+            //         // $('#execution-epofer_4k_week3').val(Math.round(month_plan_units_Epofer_4K*0.7));
+            //         // $('#execution-epofer_10k_week3').val(Math.round(month_plan_units_Epofer_10K*0.7));
+            //         $('#execution-dynulta_week3').val(Math.round(month_plan_units_Dynulta*0.7));
                     
                 
             
-                    $('#execution-vintor_4k_week4').val(Math.round(month_plan_units_Victor_4k*1));
-                    $('#execution-vintor_10k_week4').val(Math.round(month_plan_units_Victor_10k*1));
-                    $('#execution-encicarb_500_week4').val(Math.round(month_plan_units_Encicarb_500*1));
-                    $('#execution-encicarb_100_week4').val(Math.round(month_plan_units_Encicarb_100*1));
-                    // $('#execution-epofer_4k_week4').val(Math.round(month_plan_units_Epofer_4K*1));
-                    // $('#execution-epofer_10k_week4').val(Math.round(month_plan_units_Epofer_10K*1));
-                    $('#execution-dynulta_week4').val(Math.round(month_plan_units_Dynulta*1));
+            //         $('#execution-vintor_4k_week4').val(Math.round(month_plan_units_Victor_4k*1));
+            //         $('#execution-vintor_10k_week4').val(Math.round(month_plan_units_Victor_10k*1));
+            //         $('#execution-encicarb_500_week4').val(Math.round(month_plan_units_Encicarb_500*1));
+            //         $('#execution-encicarb_100_week4').val(Math.round(month_plan_units_Encicarb_100*1));
+            //         // $('#execution-epofer_4k_week4').val(Math.round(month_plan_units_Epofer_4K*1));
+            //         // $('#execution-epofer_10k_week4').val(Math.round(month_plan_units_Epofer_10K*1));
+            //         $('#execution-dynulta_week4').val(Math.round(month_plan_units_Dynulta*1));
                     
                     
-            })
+            // })
 
 
             
@@ -1731,9 +1913,26 @@ $brandData2 = [
         //     executionexeField.setAttribute('min', executionDateField.value);
         // });
 
+
+        
+        // $('.edit-btn').click(function() {
+        //     var executionexeField = document.getElementById('execution-execution_date');
+        //     executionexeField.setAttribute('min', executionDateField.value);
+        // });
         $('.edit-btn').click(function() {
-            var executionexeField = document.getElementById('execution-execution_date');
-            executionexeField.setAttribute('min', executionDateField.value);
+
+            var executionexeField =
+                document.getElementById('execution-execution_date');
+
+            let today = new Date();
+
+            let localToday =
+                today.getFullYear() + '-' +
+                String(today.getMonth() + 1).padStart(2, '0') + '-' +
+                String(today.getDate()).padStart(2, '0');
+
+            executionexeField.setAttribute('max', localToday);
+
         });
 
 
@@ -1744,6 +1943,7 @@ $brandData2 = [
             executionexeField.setAttribute('min', executionDateField.value);
         });
 
+
     });
     </script>
 
diff --git a/resources/views/form/rapport-team3/1780482240-add652c4-0e79-4524-8ec1-fc3c8bb2b9e0.blade.php b/resources/views/form/rapport-team3/1780482240-add652c4-0e79-4524-8ec1-fc3c8bb2b9e0.blade.php
new file mode 100644
index 00000000..56b9e2e1
--- /dev/null
+++ b/resources/views/form/rapport-team3/1780482240-add652c4-0e79-4524-8ec1-fc3c8bb2b9e0.blade.php
@@ -0,0 +1,479 @@
+<!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" />
+</head>
+<div id="pageloader">
+   <img src="http://cdnjs.cloudflare.com/ajax/libs/semantic-ui/0.16.1/images/loader-large.gif" alt="processing..." />
+</div>
+<body class="loading">
+    <div class="account-pages">
+        <div class="container">
+            <div class="row justify-content-center">
+                <div class="col-md-8 col-lg-6 col-xl-5 p-0">
+                    <div class="card bg-pattern">
+                        <div class="card-body p-3 row">
+
+                            @if(Session::has('error'))<div class="alert alert-danger">{{Session::get('error')}}</div>
+                            <br>@endif
+                            @if(session('success'))<div class=" alert alert-success">{{ session('success') }}
+                            </div>
+                            <br>@endif
+                            <div class="col-8">
+                                <h4 class="page-title">{{$form->title}}</h4>
+                            </div>
+                            @if(!isset($form->is_approval) || (isset($form->is_approval) && $form->is_approval != 'yes' ) )
+                            <div class="col-4">
+                                @if($form->link_type == 'form')
+                                <a href="/form/history" class="float-end pt-1">View History</a>
+                                @else
+                                <a href="{{url()->previous()}}" class="float-end pt-1">Back</a>
+                                @endif
+                            </div>
+                            @endif
+                            @if(isset($form->user_info))
+                            <div class="col-12">
+                                <h6>Submitted By: {{$form->user_info->name}}</h6>
+                            </div>
+                            @endif
+                            <form method="POST" action="/form/submit" id="report-form" enctype="multipart/form-data">
+                                <input type="hidden" name="form_id" value="{{$form_id}}">
+                                <input type="hidden" name="user_id" value="{{$form->user_id}}">
+                                
+                                @csrf
+                                @if($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>
+                                    <select class="form-control" id="field-user_id" name="user_id" required>
+                                        <option value=""> -- Select -- </option>
+                                        @foreach($form->users as $option)
+                                        <option value="{{$option->value}}" hierarchy="{{$option->hierarchy_id}}" {{isset($question->value) && $question->value == $option->value ? 'selected':''}}>{{$option->display}}</option>
+                                        @endforeach
+                                    </select>
+                                    <input type="hidden" id="field-hierarchy_id" name="hierarchy_id" value="">
+                                </div>
+                                @endif
+                                
+
+                                @foreach($questions as $question)
+                                    <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)
+                                            @if($question->code == 'contact_id'  && isset($option->contact->type) && $option->contact->type == 'doctor' )
+                                                    <option value="{{ $option->value }}"
+                                                        @if(isset($question->value) && $question->value == $option->value) selected @endif
+                                                            @if($question->code == 'contact_id')
+                                                                msl_code="{{ (isset($option->contact->msl_code) ? $option->contact->msl_code : '') }}"
+                                                                speciality="{{ (isset($option->contact->speciality) ? $option->contact->speciality : '') }}"
+                                                            @endif
+                                                    >
+                                                        {{ $option->display }}
+                                                    </option>
+                                            @elseif($question->code != 'contact_id')
+                                                        <option value="{{ $option->value }}" {{ isset($question->value) && $question->value == $option->value ? 'selected' : '' }} {{ $question->code == 'contact_id' ? 'pcode= ' . (isset($option->contact->pcode)?$option->contact->pcode:'') . ' ' : '' }} {{ isset($question->value) && $question->value == $option->value ? 'selected' : '' }} {{ $question->code == 'contact_id' ? 'speciality= ' . (isset($option->contact->speciality) ? $option->contact->speciality :'') . ' ' : '' }} >
+                                                            {{ $option->display }}
+                                                        </option>
+                                            @endif
+                                                        
+                                            
+                                            
+                                            @endforeach
+                                            @if($question->code=='contact_id')
+                                             <option value="others" {{ isset($question->value) && $question->value == 'others' ? 'selected' : '' }}>Others</option>
+                                            @endif
+                                        </select>
+                                            @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}}[]" value="{{$option->value}}" {{isset($question->value) && $question->value != '' && in_array($option->value, $question->value) ? 'checked':''}}>
+                                                <label class="form-check-label" for="field-{{$question->code}}-{{$option->value}}">{{$option->display}}</label>
+                                            </div>
+                                            @endforeach
+                                            @break
+                                        @case('file')
+                                        @if(!isset($form->is_approval) || (isset($form->is_approval) && $form->is_approval != 'yes' ) )
+                                             <input type="file" id="field-{{$question->code}}" name="{{$question->code}}" class="form-control" value="" {{$question->required == 'yes'?'required':'' }}>
+                                        @elseif(isset($question->value))
+                                             <img src="{{$question->value}}" class="img-fluid">
+                                        @endif
+                                           
+                                            @break
+                                        @case('multitextbox')
+                                            <div class="row">
+                                                @foreach($question->options as $option)
+                                                <div class="col-6">{{$option->display}}</div>
+                                                <div class="col-6 mb-1">
+                                                    <input type="number" id="field-{{$option->value}}" name="{{$option->value}}" class="form-control" required value="{{isset($option->val)?$option->val:0}}">
+                                                </div>
+                                                @endforeach
+                                            </div>
+                                        @break
+                                        
+                                        @case('time')
+                                            <input type="time" 
+                                                id="field-{{$question->code}}" 
+                                                name="{{$question->code}}" 
+                                                class="form-control" 
+                                                {{$question->required == 'yes' ? 'required' : ''}} 
+                                                value="{{isset($question->value) ? $question->value : ''}}">
+                                        @break
+                                        
+                                    @endswitch
+                                    </div>
+                                @endforeach
+                                @if(!isset($form->is_approval) || (isset($form->is_approval) && $form->is_approval != 'yes' ) )
+                                <div class="text-center d-grid mt-3">
+                                    <button class="btn btn-primary" type="submit" id="submit-btn"> Submit </button>
+                                </div>
+                                @endif
+                            </form>
+
+                        </div> <!-- end card-body -->
+                    </div>
+                    <!-- end card -->
+
+                    <!-- end row -->
+
+                </div> <!-- end col -->
+            </div>
+            <!-- end row -->
+        </div>
+        <!-- end container -->
+    </div>
+    <!-- end page -->
+<style type="text/css">
+#pageloader {
+  background: rgba( 255, 255, 255, 0.8 );
+  display: none;
+  height: 100%;
+  position: fixed;
+  width: 100%;
+  z-index: 9999;
+}
+
+#pageloader img {
+  left: 50%;
+  margin-left: -32px;
+  margin-top: -32px;
+  position: absolute;
+  top: 50%;
+}
+</style>
+@include('layouts.shared/footer-script')
+<script src="{{asset('assets/libs/sweetalert2/sweetalert2.min.js')}}"></script>
+<script type="text/javascript">
+    jQuery(document).ready(function($){
+        
+
+         // Chemist Shop Name - Alphabetic only
+        $('#field-chemist_name').on('input', function () {
+            this.value = this.value.replace(/[^A-Za-z ]/g, '');
+        });
+
+        // Name of Staff - Alphabetic only
+        $('#field-name_of_staff').on('input', function () {
+            this.value = this.value.replace(/[^A-Za-z ]/g, '');
+        });
+        // Phone No. of Staff - Numeric only, starts with 6-9, max 10 digits
+        $('#field-phone_no_of_staff').on('input', function () {
+
+            this.value = this.value.replace(/\D/g, '');
+
+            // First digit must be 6, 7, 8, or 9
+            if (this.value.length > 0 && !/^[6-9]/.test(this.value)) {
+                this.value = '';
+                return;
+            }
+
+            this.value = this.value.slice(0, 10);
+
+        });
+
+
+
+        const respuleFields = [
+            '#field-duolin_respule',
+            '#field-foracort_respule',
+            '#field-budecort_respule',
+            '#field-levolin_respule',
+            '#field-glycohale_respule',
+            '#field-hyperneb_respule',
+            '#field-tobamist_respule',
+            '#field-budesal_respule',
+            '#field-flohale_respule',
+            '#field-inhalex_respule',
+            '#field-mucinac_respule'
+
+        ];
+
+        $(respuleFields.join(',')).on('input', function () {
+            this.value = this.value.replace(/[^0-9]/g, '');
+        });
+        $(respuleFields.join(',')).attr({
+            min: 0,
+            step: 1,
+            inputmode: 'numeric'
+        });
+        $('#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("msl_code", itm.contact.msl_code).attr('speciality',itm.contact.speciality));
+                    }
+
+                    $('#field-contact_id').change(function() {
+                        $('#field-msl_code').val($('option:selected', this).attr('msl_code'))
+                    })    
+                    
+                    $('#field-contact_id').change(function() {
+                        $('#field-speciality').val($('option:selected', this).attr('speciality'))
+                    })    
+                },
+            });
+
+            console.log(hierarchy)
+        })
+
+        $('#field-contact_id').change(function() {
+                        $('#field-speciality').val($('option:selected', this).attr('speciality'))
+                    })
+        
+        $('#field-contact_id').change(function() {
+               		 $('#field-msl_code').val($('option:selected', this).attr('msl_code'))
+        })
+
+        $('#field-msl_code,#field-speciality').attr('readonly',true);
+        
+        
+        $('#field-other_doctor_name,#field-other_speciality,#field-other_msl_code').prop({"required":false});
+        $('#field-other_doctor_name,#field-other_speciality,#field-other_msl_code').parent().hide();
+        
+
+        $('#field-contact_id').on('change',function(){
+            let dropDown=$('#field-contact_id').val();
+            if(dropDown==='others'){
+                $('#field-other_doctor_name,#field-other_speciality,#field-other_msl_code').parent().show(); 
+                $('#field-other_doctor_name,#field-other_speciality,#field-other_msl_code').prop({"required":true});
+                $('#field-speciality,#field-msl_code').parent().hide(); 
+                $('#field-speciality,#field-msl_code').prop({"required":false});
+            }
+            else{
+                $('#field-other_doctor_name,#field-other_speciality,#field-other_msl_code').parent().hide();
+                $('#field-other_doctor_name,#field-other_speciality,#field-other_msl_code').prop({"required":false});
+                $('#field-speciality,#field-msl_code').parent().show(); 
+                $('#field-speciality,#field-msl_code').prop({"required":true});
+
+            }
+        })
+
+        // $('#field-contact_id').append('<option value="others">Others</option>');
+             
+        $('#field-sitazit_d_rx,#field-sitazit_dm_rx,#field-ziten_m_rx').on('input', function() {
+                var total=(
+                        (parseInt($('#execution-sitazit_d_rx').val())*15 ||0)+
+                        (parseInt($('#execution-sitazit_dm_rx').val())*25 ||0)+
+                        (parseInt($('#execution-ziten_m_rx').val())*35 ||0)
+                );
+
+                $('#execution-total_camp_rx').val(total)
+        })    
+
+        $('#field-upload_invoice_photo,#field-bag_distribution_photo    ').on('change', function () {
+            let file = this.files[0];
+
+            if (file) {
+                let allowedTypes = ['image/png', 'image/jpg', 'image/jpeg'];
+                let maxSize = 10 * 1024 * 1024; // 10 MB
+
+                // Type validation
+                if (!allowedTypes.includes(file.type)) {
+                    alert('Only PNG, JPG, and JPEG files are allowed.');
+                    $(this).val('');
+                    return;
+                }
+
+                // Size validation
+                if (file.size > maxSize) {
+                    alert('File size should not exceed 10 MB.');
+                    $(this).val('');
+                    return;
+                }
+            }
+        });
+
+        $('#field-phone_no_of_staff')
+    .closest('.col-md-12')
+    .after('<h5 class=" d-block text-center">Order Received for Brand (Enter No. of Units per Respule)</h5>');
+
+        $(document).ready(function () {
+            $('#field-contact_id').trigger('change');
+        });
+
+        $('#field-chemist_name,#field-name_of_staff').on('input', function () {
+            this.value = this.value.replace(/[^a-zA-Z\s]/g, '');
+        });
+
+        $(document).on('change', '#field-phone_no_of_staff', function () {
+            let phone = $(this).val().trim();
+
+            
+            $(this).next('.phone-error').remove();
+
+            if (!/^\d{10}$/.test(phone)) {
+                $(this).after(
+                    '<small class="phone-error text-danger">Please enter a valid 10-digit mobile number.</small>'
+                );
+            }
+        });
+
+
+        /* $(document).on('change', '[id^="field-phone_no_of_staff"]', function () {
+            let phone = $(this).val().trim();
+
+            $(this).next('.phone-error').remove();
+
+            if (!/^\d{10}$/.test(phone)) {
+                $(this).after(
+                    '<small class="phone-error text-danger">Please enter a valid 10-digit mobile number.</small>'
+                );
+            }
+        }); */
+
+
+        
+            
+
+        $('#report-form').on('submit', function(event){
+            event.preventDefault();
+            let isValid = true;
+
+            $('[id^="field-phone_no_of_staff"]').each(function () {
+
+                let phone = $(this).val().trim();
+
+                $(this).next('.phone-error').remove();
+
+                if (!/^\d{10}$/.test(phone)) {
+
+                    $(this).after(
+                        '<small class="phone-error text-danger">Please enter a valid 10-digit mobile number.</small>'
+                    );
+
+                    isValid = false;
+                }
+            });
+
+            if (!isValid) {
+                e.preventDefault(); // Form submit थांबवेल
+            }
+
+
+
+            const formData = new FormData($('#report-form')[0]);
+            // Log form data to console
+            for (let [key, value] of formData.entries()) {
+                console.log(key, value);
+            }
+            $("#pageloader").fadeIn();
+            $.ajax({
+                type: "POST",
+                url: '/form/ajaxsubmit',
+                data: new FormData($('#report-form')[0]),
+                processData: false,
+                contentType: false,
+                success: function( data ) {
+                    $("#pageloader").fadeOut();
+                    if(data.status == 'success') {
+                        Swal.fire({
+                          title: 'Great!',
+                          text: 'Your data is successfully submitted!',
+                          icon: 'success'
+                        }).then(() => {
+                            location.reload(); // 🔥 page refresh here
+                                    });
+                        $('#report-form').trigger("reset");
+                    } else {
+                        Swal.fire({
+                            icon: 'error',
+                            title: 'Data not submitted',
+                            text: 'Something went wrong, please try again after some time!'
+                        })
+                    }
+                },
+            });
+        });
+
+            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();
+
+            var currentDate = yyyy + '-' + mm + '-' + dd;
+
+            var plandateField = document.getElementById('field-record_date');
+
+            if (plandateField) {
+                plandateField.setAttribute('min', '2026-06-01');
+                plandateField.setAttribute('max', currentDate);
+            }
+
+
+
+            for (const field of respuleFields) {
+
+            let value = $(field).val();
+
+            if (value !== '' && !/^\d+$/.test(value)) {
+
+                event.preventDefault();
+
+                Swal.fire({
+                    icon: 'error',
+                    title: 'Validation Error',
+                    text: 'Respule quantities must be whole numbers only.'
+                });
+
+                return false;
+            }
+        }
+    });
+</script>
+</body>
+
+</html>
\ No newline at end of file
diff --git a/resources/views/form/rapport-team3/1780486861-23784b46-4c61-41e1-87a8-fc54f8bbdd4e.blade.php b/resources/views/form/rapport-team3/1780486861-23784b46-4c61-41e1-87a8-fc54f8bbdd4e.blade.php
new file mode 100644
index 00000000..7afeb4f6
--- /dev/null
+++ b/resources/views/form/rapport-team3/1780486861-23784b46-4c61-41e1-87a8-fc54f8bbdd4e.blade.php
@@ -0,0 +1,477 @@
+<!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" />
+</head>
+<div id="pageloader">
+   <img src="http://cdnjs.cloudflare.com/ajax/libs/semantic-ui/0.16.1/images/loader-large.gif" alt="processing..." />
+</div>
+<body class="loading">
+    <div class="account-pages">
+        <div class="container">
+            <div class="row justify-content-center">
+                <div class="col-md-8 col-lg-6 col-xl-5 p-0">
+                    <div class="card bg-pattern">
+                        <div class="card-body p-3 row">
+
+                            @if(Session::has('error'))<div class="alert alert-danger">{{Session::get('error')}}</div>
+                            <br>@endif
+                            @if(session('success'))<div class=" alert alert-success">{{ session('success') }}
+                            </div>
+                            <br>@endif
+                            <div class="col-8">
+                                <h4 class="page-title">{{$form->title}}</h4>
+                            </div>
+                            @if(!isset($form->is_approval) || (isset($form->is_approval) && $form->is_approval != 'yes' ) )
+                            <div class="col-4">
+                                @if($form->link_type == 'form')
+                                <a href="/form/history" class="float-end pt-1">View History</a>
+                                @else
+                                <a href="{{url()->previous()}}" class="float-end pt-1">Back</a>
+                                @endif
+                            </div>
+                            @endif
+                            @if(isset($form->user_info))
+                            <div class="col-12">
+                                <h6>Submitted By: {{$form->user_info->name}}</h6>
+                            </div>
+                            @endif
+                            <form method="POST" action="/form/submit" id="report-form" enctype="multipart/form-data">
+                                <input type="hidden" name="form_id" value="{{$form_id}}">
+                                <input type="hidden" name="user_id" value="{{$form->user_id}}">
+                                
+                                @csrf
+                                @if($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>
+                                    <select class="form-control" id="field-user_id" name="user_id" required>
+                                        <option value=""> -- Select -- </option>
+                                        @foreach($form->users as $option)
+                                        <option value="{{$option->value}}" hierarchy="{{$option->hierarchy_id}}" {{isset($question->value) && $question->value == $option->value ? 'selected':''}}>{{$option->display}}</option>
+                                        @endforeach
+                                    </select>
+                                    <input type="hidden" id="field-hierarchy_id" name="hierarchy_id" value="">
+                                </div>
+                                @endif
+                                
+
+                                @foreach($questions as $question)
+                                    <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)
+                                            @if($question->code == 'contact_id'  && isset($option->contact->type) && $option->contact->type == 'doctor' )
+                                                    <option value="{{ $option->value }}"
+                                                        @if(isset($question->value) && $question->value == $option->value) selected @endif
+                                                            @if($question->code == 'contact_id')
+                                                                msl_code="{{ (isset($option->contact->msl_code) ? $option->contact->msl_code : '') }}"
+                                                                speciality="{{ (isset($option->contact->speciality) ? $option->contact->speciality : '') }}"
+                                                            @endif
+                                                    >
+                                                        {{ $option->display }}
+                                                    </option>
+                                            @elseif($question->code != 'contact_id')
+                                                        <option value="{{ $option->value }}" {{ isset($question->value) && $question->value == $option->value ? 'selected' : '' }} {{ $question->code == 'contact_id' ? 'pcode= ' . (isset($option->contact->pcode)?$option->contact->pcode:'') . ' ' : '' }} {{ isset($question->value) && $question->value == $option->value ? 'selected' : '' }} {{ $question->code == 'contact_id' ? 'speciality= ' . (isset($option->contact->speciality) ? $option->contact->speciality :'') . ' ' : '' }} >
+                                                            {{ $option->display }}
+                                                        </option>
+                                            @endif
+                                                        
+                                            
+                                            
+                                            @endforeach
+                                            @if($question->code=='contact_id')
+                                             <option value="others" {{ isset($question->value) && $question->value == 'others' ? 'selected' : '' }}>Others</option>
+                                            @endif
+                                        </select>
+                                            @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}}[]" value="{{$option->value}}" {{isset($question->value) && $question->value != '' && in_array($option->value, $question->value) ? 'checked':''}}>
+                                                <label class="form-check-label" for="field-{{$question->code}}-{{$option->value}}">{{$option->display}}</label>
+                                            </div>
+                                            @endforeach
+                                            @break
+                                        @case('file')
+                                        @if(!isset($form->is_approval) || (isset($form->is_approval) && $form->is_approval != 'yes' ) )
+                                             <input type="file" id="field-{{$question->code}}" name="{{$question->code}}" class="form-control" value="" {{$question->required == 'yes'?'required':'' }}>
+                                        @elseif(isset($question->value))
+                                             <img src="{{$question->value}}" class="img-fluid">
+                                        @endif
+                                           
+                                            @break
+                                        @case('multitextbox')
+                                            <div class="row">
+                                                @foreach($question->options as $option)
+                                                <div class="col-6">{{$option->display}}</div>
+                                                <div class="col-6 mb-1">
+                                                    <input type="number" id="field-{{$option->value}}" name="{{$option->value}}" class="form-control" required value="{{isset($option->val)?$option->val:0}}">
+                                                </div>
+                                                @endforeach
+                                            </div>
+                                        @break
+                                        
+                                        @case('time')
+                                            <input type="time" 
+                                                id="field-{{$question->code}}" 
+                                                name="{{$question->code}}" 
+                                                class="form-control" 
+                                                {{$question->required == 'yes' ? 'required' : ''}} 
+                                                value="{{isset($question->value) ? $question->value : ''}}">
+                                        @break
+                                        
+                                    @endswitch
+                                    </div>
+                                @endforeach
+                                @if(!isset($form->is_approval) || (isset($form->is_approval) && $form->is_approval != 'yes' ) )
+                                <div class="text-center d-grid mt-3">
+                                    <button class="btn btn-primary" type="submit" id="submit-btn"> Submit </button>
+                                </div>
+                                @endif
+                            </form>
+
+                        </div> <!-- end card-body -->
+                    </div>
+                    <!-- end card -->
+
+                    <!-- end row -->
+
+                </div> <!-- end col -->
+            </div>
+            <!-- end row -->
+        </div>
+        <!-- end container -->
+    </div>
+    <!-- end page -->
+<style type="text/css">
+#pageloader {
+  background: rgba( 255, 255, 255, 0.8 );
+  display: none;
+  height: 100%;
+  position: fixed;
+  width: 100%;
+  z-index: 9999;
+}
+
+#pageloader img {
+  left: 50%;
+  margin-left: -32px;
+  margin-top: -32px;
+  position: absolute;
+  top: 50%;
+}
+</style>
+@include('layouts.shared/footer-script')
+<script src="{{asset('assets/libs/sweetalert2/sweetalert2.min.js')}}"></script>
+<script type="text/javascript">
+    jQuery(document).ready(function($){
+        
+        // Chemist Shop Name - Alphabetic only
+        $('#field-chemist_name').on('input', function () {
+            this.value = this.value.replace(/[^A-Za-z ]/g, '');
+        });
+
+        // Name of Staff - Alphabetic only
+        $('#field-name_of_staff').on('input', function () {
+            this.value = this.value.replace(/[^A-Za-z ]/g, '');
+        });
+        // Phone No. of Staff - Numeric only, starts with 6-9, max 10 digits
+        $('#field-phone_no_of_staff').on('input', function () {
+
+            this.value = this.value.replace(/\D/g, '');
+
+            // First digit must be 6, 7, 8, or 9
+            if (this.value.length > 0 && !/^[6-9]/.test(this.value)) {
+                this.value = '';
+                return;
+            }
+
+            this.value = this.value.slice(0, 10);
+
+        });
+
+
+
+        const respuleFields = [
+            '#field-duolin_respule',
+            '#field-foracort_respule',
+            '#field-budecort_respule',
+            '#field-levolin_respule',
+            '#field-glycohale_respule',
+            '#field-hyperneb_respule',
+            '#field-tobamist_respule',
+            '#field-budesal_respule',
+            '#field-flohale_respule',
+            '#field-inhalex_respule',
+            '#field-mucinac_respule'
+
+        ];
+
+        $(respuleFields.join(',')).on('input', function () {
+            this.value = this.value.replace(/[^0-9]/g, '');
+        });
+        $(respuleFields.join(',')).attr({
+            min: 0,
+            step: 1,
+            inputmode: 'numeric'
+        });
+        $('#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("msl_code", itm.contact.msl_code).attr('speciality',itm.contact.speciality));
+                    }
+
+                    $('#field-contact_id').change(function() {
+                        $('#field-msl_code').val($('option:selected', this).attr('msl_code'))
+                    })    
+                    
+                    $('#field-contact_id').change(function() {
+                        $('#field-speciality').val($('option:selected', this).attr('speciality'))
+                    })    
+                },
+            });
+
+            console.log(hierarchy)
+        })
+
+        $('#field-contact_id').change(function() {
+                        $('#field-speciality').val($('option:selected', this).attr('speciality'))
+                    })
+        
+        $('#field-contact_id').change(function() {
+               		 $('#field-msl_code').val($('option:selected', this).attr('msl_code'))
+        })
+
+        $('#field-msl_code,#field-speciality').attr('readonly',true);
+        
+        
+        $('#field-other_doctor_name,#field-other_speciality,#field-other_msl_code').prop({"required":false});
+        $('#field-other_doctor_name,#field-other_speciality,#field-other_msl_code').parent().hide();
+        
+
+        $('#field-contact_id').on('change',function(){
+            let dropDown=$('#field-contact_id').val();
+            if(dropDown==='others'){
+                $('#field-other_doctor_name,#field-other_speciality,#field-other_msl_code').parent().show(); 
+                $('#field-other_doctor_name,#field-other_speciality,#field-other_msl_code').prop({"required":true});
+                $('#field-speciality,#field-msl_code').parent().hide(); 
+                $('#field-speciality,#field-msl_code').prop({"required":false});
+            }
+            else{
+                $('#field-other_doctor_name,#field-other_speciality,#field-other_msl_code').parent().hide();
+                $('#field-other_doctor_name,#field-other_speciality,#field-other_msl_code').prop({"required":false});
+                $('#field-speciality,#field-msl_code').parent().show(); 
+                $('#field-speciality,#field-msl_code').prop({"required":true});
+
+            }
+        })
+
+        // $('#field-contact_id').append('<option value="others">Others</option>');
+             
+        $('#field-sitazit_d_rx,#field-sitazit_dm_rx,#field-ziten_m_rx').on('input', function() {
+                var total=(
+                        (parseInt($('#execution-sitazit_d_rx').val())*15 ||0)+
+                        (parseInt($('#execution-sitazit_dm_rx').val())*25 ||0)+
+                        (parseInt($('#execution-ziten_m_rx').val())*35 ||0)
+                );
+
+                $('#execution-total_camp_rx').val(total)
+        })    
+
+        $('#field-upload_invoice_photo,#field-bag_distribution_photo    ').on('change', function () {
+            let file = this.files[0];
+
+            if (file) {
+                let allowedTypes = ['image/png', 'image/jpg', 'image/jpeg'];
+                let maxSize = 10 * 1024 * 1024; // 10 MB
+
+                // Type validation
+                if (!allowedTypes.includes(file.type)) {
+                    alert('Only PNG, JPG, and JPEG files are allowed.');
+                    $(this).val('');
+                    return;
+                }
+
+                // Size validation
+                if (file.size > maxSize) {
+                    alert('File size should not exceed 10 MB.');
+                    $(this).val('');
+                    return;
+                }
+            }
+        });
+
+        $(document).ready(function () {
+            $('#field-contact_id').trigger('change');
+        });
+
+        $('#field-chemist_name,#field-name_of_staff').on('input', function () {
+            this.value = this.value.replace(/[^a-zA-Z\s]/g, '');
+        });
+
+        $(document).on('change', '#field-phone_no_of_staff', function () {
+            let phone = $(this).val().trim();
+
+            
+            $(this).next('.phone-error').remove();
+
+            if (!/^\d{10}$/.test(phone)) {
+                $(this).after(
+                    '<small class="phone-error text-danger">Please enter a valid 10-digit mobile number.</small>'
+                );
+            }
+        });
+
+
+        /* $(document).on('change', '[id^="field-phone_no_of_staff"]', function () {
+            let phone = $(this).val().trim();
+
+            $(this).next('.phone-error').remove();
+
+            if (!/^\d{10}$/.test(phone)) {
+                $(this).after(
+                    '<small class="phone-error text-danger">Please enter a valid 10-digit mobile number.</small>'
+                );
+            }
+        }); */
+
+        $('#field-phone_no_of_staff')
+    .closest('.col-md-12')
+    .after('<h5 class="d-block text-center">Order Received for Brand (Enter No. of Units per Respule)</h5>');
+        
+            
+
+        $('#report-form').on('submit', function(event){
+            event.preventDefault();
+            let isValid = true;
+
+            $('[id^="field-phone_no_of_staff"]').each(function () {
+
+                let phone = $(this).val().trim();
+
+                $(this).next('.phone-error').remove();
+
+                if (!/^\d{10}$/.test(phone)) {
+
+                    $(this).after(
+                        '<small class="phone-error text-danger">Please enter a valid 10-digit mobile number.</small>'
+                    );
+
+                    isValid = false;
+                }
+            });
+
+            if (!isValid) {
+                e.preventDefault(); // Form submit थांबवेल
+            }
+
+
+
+            const formData = new FormData($('#report-form')[0]);
+            // Log form data to console
+            for (let [key, value] of formData.entries()) {
+                console.log(key, value);
+            }
+            $("#pageloader").fadeIn();
+            $.ajax({
+                type: "POST",
+                url: '/form/ajaxsubmit',
+                data: new FormData($('#report-form')[0]),
+                processData: false,
+                contentType: false,
+                success: function( data ) {
+                    $("#pageloader").fadeOut();
+                    if(data.status == 'success') {
+                        Swal.fire({
+                          title: 'Great!',
+                          text: 'Your data is successfully submitted!',
+                          icon: 'success'
+                        }).then(() => {
+                            location.reload(); // 🔥 page refresh here
+                                    });
+                        $('#report-form').trigger("reset");
+                    } else {
+                        Swal.fire({
+                            icon: 'error',
+                            title: 'Data not submitted',
+                            text: 'Something went wrong, please try again after some time!'
+                        })
+                    }
+                },
+            });
+        });
+
+            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();
+
+            var currentDate = yyyy + '-' + mm + '-' + dd;
+
+            var plandateField = document.getElementById('field-record_date');
+
+            if (plandateField) {
+                plandateField.setAttribute('min', '2026-06-01');
+                plandateField.setAttribute('max', currentDate);
+            }
+
+            
+            
+            
+            for (const field of respuleFields) {
+
+            let value = $(field).val();
+
+            if (value !== '' && !/^\d+$/.test(value)) {
+
+                event.preventDefault();
+
+                Swal.fire({
+                    icon: 'error',
+                    title: 'Validation Error',
+                    text: 'Respule quantities must be whole numbers only.'
+                });
+
+                return false;
+            }
+        }
+    });
+</script>
+</body>
+
+</html>
\ No newline at end of file
diff --git a/resources/views/form/rapport-team3/1780548606-6544d930-7144-4b75-b769-560752809662.blade.php b/resources/views/form/rapport-team3/1780548606-6544d930-7144-4b75-b769-560752809662.blade.php
new file mode 100644
index 00000000..8e44de3f
--- /dev/null
+++ b/resources/views/form/rapport-team3/1780548606-6544d930-7144-4b75-b769-560752809662.blade.php
@@ -0,0 +1,443 @@
+<!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" />
+</head>
+<div id="pageloader">
+   <img src="http://cdnjs.cloudflare.com/ajax/libs/semantic-ui/0.16.1/images/loader-large.gif" alt="processing..." />
+</div>
+<body class="loading">
+    <div class="account-pages">
+        <div class="container">
+            <div class="row justify-content-center">
+                <div class="col-md-8 col-lg-6 col-xl-5 p-0">
+                    <div class="card bg-pattern">
+                        <div class="card-body p-3 row">
+
+                            @if(Session::has('error'))<div class="alert alert-danger">{{Session::get('error')}}</div>
+                            <br>@endif
+                            @if(session('success'))<div class=" alert alert-success">{{ session('success') }}
+                            </div>
+                            <br>@endif
+                            <div class="col-8">
+                                <h4 class="page-title">{{$form->title}}</h4>
+                            </div>
+                            @if(!isset($form->is_approval) || (isset($form->is_approval) && $form->is_approval != 'yes' ) )
+                            <div class="col-4">
+                                @if($form->link_type == 'form')
+                                <a href="/form/history" class="float-end pt-1">View History</a>
+                                @else
+                                <a href="{{url()->previous()}}" class="float-end pt-1">Back</a>
+                                @endif
+                            </div>
+                            @endif
+                            @if(isset($form->user_info))
+                            <div class="col-12">
+                                <h6>Submitted By: {{$form->user_info->name}}</h6>
+                            </div>
+                            @endif
+                            <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" value="{{$id}}">
+                                @endif
+                                @if(isset($form->manager_can_submit) && $form->manager_can_submit == true)
+                                <div class="col-md-12 mb-2">
+                                    <label for="field-user_id" class="form-label"> Select User / Territory <span class="text-danger">*</span> </label>
+                                    <select class="form-control" id="field-user_id" name="user_id" required>
+                                        <option value=""> -- Select -- </option>
+                                        @foreach($form->users as $option)
+                                        <option value="{{$option->value}}" hierarchy="{{$option->hierarchy_id}}" {{isset($question->value) && $question->value == $option->value ? 'selected':''}}>{{$option->display}}</option>
+                                        @endforeach
+                                    </select>
+                                    <input type="hidden" id="field-hierarchy_id" name="hierarchy_id" value="">
+                                </div>
+                                @endif
+
+                                @foreach($questions as $question)
+                                    <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':''}}>{{$option->display}}</option>
+                                                @endforeach
+                                            </select>
+                                            @break
+                                        @case('radio')
+                                            @foreach($question->options as $option)
+                                            <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
+                                            @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)
+                                                        : [];
+                                            @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); @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" value="" {{$question->required == 'yes'?'required':'' }}>
+                                        @elseif(isset($question->value))
+                                             <img src="{{$question->value}}" class="img-fluid">
+                                        @endif
+                                           
+                                            @break
+                                        @case('multitextbox')
+                                            <div class="row">
+                                                @foreach($question->options as $option)
+                                                <div class="col-6">{{$option->display}}</div>
+                                                <div class="col-6 mb-1">
+                                                    <input type="number" id="field-{{$option->value}}" name="{{$option->value}}" class="form-control" required value="{{isset($option->val)?$option->val:0}}">
+                                                </div>
+                                                @endforeach
+                                            </div>
+                                            @break
+                                    @endswitch
+                                    </div>
+                                    {{-- added label after  phone_no_staff this field--}}
+                                    @if($question->code == 'phone_no_staff')
+                                    
+                                        <h5 class="text-center">
+                                            Order Received for Brand (Enter No. of Units per Respule)
+                                        </h5>
+                                @endif
+                                @endforeach
+                                @if(!isset($form->is_approval) || (isset($form->is_approval) && $form->is_approval != 'yes' ) )
+                                <div class="text-center d-grid mt-3">
+                                    <button class="btn btn-primary" type="submit" id="submit-btn"> Submit </button>
+                                </div>
+                                @endif
+                            </form>
+
+                        </div> <!-- end card-body -->
+                    </div>
+                    <!-- end card -->
+
+                    <!-- end row -->
+
+                </div> <!-- end col -->
+            </div>
+            <!-- end row -->
+        </div>
+        <!-- end container -->
+    </div>
+    <!-- end page -->
+<style type="text/css">
+#pageloader {
+  background: rgba( 255, 255, 255, 0.8 );
+  display: none;
+  height: 100%;
+  position: fixed;
+  width: 100%;
+  z-index: 9999;
+}
+
+#pageloader img {
+  left: 50%;
+  margin-left: -32px;
+  margin-top: -32px;
+  position: absolute;
+  top: 50%;
+}
+.form-label {
+    font-weight:bold;
+    font-size:16px;
+}
+</style>
+@include('layouts.shared/footer-script')
+<script src="{{asset('assets/libs/sweetalert2/sweetalert2.min.js')}}"></script>
+<script type="text/javascript">
+    jQuery(document).ready(function($){
+
+        // Chemist Shop Name - Alphabetic only
+        $('#field-chemist_shop_name').on('input', function () {
+            this.value = this.value.replace(/[^A-Za-z ]/g, '');
+        });
+
+        // Name of Staff - Alphabetic only
+        $('#field-name_staff').on('input', function () {
+            this.value = this.value.replace(/[^A-Za-z ]/g, '');
+        });
+
+        // Phone No. of Staff - Numeric only, max 10 digits
+        $('#field-phone_no_staff').on('input', function () {
+            this.value = this.value.replace(/\D/g, '').slice(0, 10);
+        });
+
+        const respuleFields = [
+            '#field-budecort_respule',
+            '#field-levolin_respule',
+            '#field-glycohale_respule',
+            '#field-inhalex_respule',
+            '#field-hyperneb_respule',
+            '#field-tobamist_respule'
+        ];
+
+        $(respuleFields.join(',')).on('input', function () {
+            this.value = this.value.replace(/[^0-9]/g, '');
+        });
+        $(respuleFields.join(',')).attr({
+            min: 0,
+            step: 1,
+            inputmode: 'numeric'
+        });
+
+        // upload_invoice_photo_max_10_mb
+        $('#field-upload_invoice_photo_max_10_mb').on('change', function () {
+
+            const file = this.files[0];
+            if (!file) return;
+
+            const allowedTypes = [
+                'image/jpeg',
+                'image/jpg',
+                'image/png',
+                'application/pdf'
+            ];
+
+            if (!allowedTypes.includes(file.type)) {
+                Swal.fire({
+                    icon: 'error',
+                    title: 'Invalid File',
+                    text: 'Only JPG, JPEG, PNG and PDF files are allowed.'
+                });
+
+                $(this).val('');
+            }
+        });
+
+
+        // bag_distribution_photo_jpgjpegpng_max_upto_10_mb
+        $('#field-bag_distribution_photo_jpgjpegpng_max_upto_10_mb').on('change', function () {
+
+            const file = this.files[0];
+            if (!file) return;
+
+            const allowedTypes = [
+                'image/jpeg',
+                'image/jpg',
+                'image/png'
+            ];
+
+            if (!allowedTypes.includes(file.type)) {
+                Swal.fire({
+                    icon: 'error',
+                    title: 'Invalid File',
+                    text: 'Only JPG, JPEG and PNG files are allowed.'
+                });
+
+                $(this).val('');
+            }
+        });
+        $('#field-upload_invoice_photo_max_10_mb')
+            .attr('accept', '.jpg,.jpeg,.png,.pdf');
+
+      /*
+            $('#field-bag_distribution_photo_jpgjpegpng_max_upto_10_mb')
+            .attr({
+            accept: 'image/*',
+        }); */
+         $('#field-bag_distribution_photo_jpgjpegpng_max_upto_10_mb')
+            .attr('accept', '.jpg,.jpeg,.png,.pdf');
+
+        const maxSize = 10 * 1024 * 1024; // 10 MB
+
+        $('#field-upload_invoice_photo_max_10_mb, #field-bag_distribution_photo_jpgjpegpng_max_upto_10_mb')
+        .on('change', function () {
+
+            const file = this.files[0];
+            if (!file) return;
+
+            if (file.size > maxSize) {
+
+                Swal.fire({
+                    icon: 'error',
+                    title: 'File Too Large',
+                    text: 'Maximum file size allowed is 10 MB.'
+                });
+
+                $(this).val('');
+            }
+        });
+        
+
+
+        $('#field-user_id').change(function(){
+            let hierarchy = $('option:selected', this).attr('hierarchy');
+            $('#field-hierarchy_id').val(hierarchy)
+            event.preventDefault();
+            $.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));
+                    }                    
+                },
+            });
+
+            console.log(hierarchy)
+        })
+
+
+        
+
+        $('#report-form').on('submit', function(event){
+             let phone = $('#field-phone_no_staff').val();
+
+            if(phone && !/^\d{10}$/.test(phone)){
+                event.preventDefault();
+
+                Swal.fire({
+                    icon: 'error',
+                    title: 'Validation Error',
+                    text: 'Phone No. of Staff must be exactly 10 digits.'
+                });
+
+                return false;
+            }
+
+
+            
+            event.preventDefault();
+            $("#pageloader").fadeIn();
+            $.ajax({
+                type: "POST",
+                url: '/form/ajaxsubmit',
+                data: new FormData($('#report-form')[0]),
+                processData: false,
+                contentType: false,
+                success: function( data ) {
+                    $("#pageloader").fadeOut();
+                    if(data.status == 'success') {
+                        Swal.fire({
+                          title: 'Great!',
+                          text: 'Your data is successfully submitted!',
+                          icon: 'success'
+                        })
+                        $('#report-form').trigger("reset");
+                    } else {
+                        Swal.fire({
+                            icon: 'error',
+                            title: data.hasOwnProperty('message') ? 'You are not mapped to any position code' : 'Data not submitted',
+                            text: data.hasOwnProperty('message') ? 'for resolution please email Position code, L1 Manager and L2 Manager details to support1@stratawiz.com':'Something went wrong, please try again after some time!'
+                        })
+                    }
+                },
+            });
+        });
+
+            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();
+
+            var currentDate = yyyy + '-' + mm + '-' + dd;
+
+            var plandateField = document.getElementById('field-record_date');
+
+            if (plandateField) {
+                plandateField.setAttribute('min', '2026-06-01');
+                plandateField.setAttribute('max', currentDate);
+            }
+
+
+
+            for (const field of respuleFields) {
+
+            let value = $(field).val();
+
+            if (value !== '' && !/^\d+$/.test(value)) {
+
+                event.preventDefault();
+
+                Swal.fire({
+                    icon: 'error',
+                    title: 'Validation Error',
+                    text: 'Respule quantities must be whole numbers only.'
+                });
+
+                return false;
+            }
+        }
+    });
+</script>
+</body>
+
+</html>
\ No newline at end of file
diff --git a/resources/views/form/rapport-vitalis/1776765811-664dd43c-0466-4e4d-9a15-0adaa01f5b94.blade.php b/resources/views/form/rapport-vitalis/1776765811-664dd43c-0466-4e4d-9a15-0adaa01f5b94.blade.php
index 6d13c60a..0de3b14c 100644
--- a/resources/views/form/rapport-vitalis/1776765811-664dd43c-0466-4e4d-9a15-0adaa01f5b94.blade.php
+++ b/resources/views/form/rapport-vitalis/1776765811-664dd43c-0466-4e4d-9a15-0adaa01f5b94.blade.php
@@ -84,7 +84,7 @@
                                             <option value=""> -- Select -- </option>
                                             @foreach ($question->options as $option)
                                             @if($question->code == 'contact_id'  && isset($option->contact->type) && $option->contact->type != 'chemist' )
-                                            <option value="{{ $option->value }}" {{ isset($question->value) && $question->value == $option->value ? 'selected' : '' }} {{ $question->code == 'contact_id' ? 'msl_code= ' . (isset($option->contact->msl_code)?$option->contact->msl_code:'') . ' ' : '' }} {{ isset($question->value) && $question->value == $option->value ? 'selected' : '' }} {{ $question->code == 'contact_id' ? 'speciality= ' . (isset($option->contact->speciality) ? $option->contact->speciality :'') . ' ' : '' }} >
+                                            <option value="{{ $option->value }}" {{ isset($question->value) && $question->value == $option->value ? 'selected' : '' }} {{ $question->code == 'contact_id' ? 'legacy_code= ' . (isset($option->contact->legacy_code)?$option->contact->legacy_code:'') . ' ' : '' }} {{ isset($question->value) && $question->value == $option->value ? 'selected' : '' }} {{ $question->code == 'contact_id' ? 'speciality= ' . (isset($option->contact->speciality) ? $option->contact->speciality :'') . ' ' : '' }} >
                                                 {{ $option->display }}
                                             </option>
                                             @elseif($question->code != 'contact_id')
@@ -178,6 +178,22 @@
 <script src="{{asset('assets/libs/sweetalert2/sweetalert2.min.js')}}"></script>
 <script type="text/javascript">
     jQuery(document).ready(function($){
+        // Make fields readonly
+$('#field-legacy_code,#field-speciality').prop('readonly', true);
+
+// Auto populate on doctor selection
+$(document).on('change', '#field-contact_id', function () {
+
+    let selected = $('option:selected', this);
+
+    $('#field-legacy_code').val(
+        selected.attr('legacy_code') || ''
+    );
+
+    $('#field-speciality').val(
+        selected.attr('speciality') || ''
+    );
+});
         $('#field-user_id').change(function(){
             let hierarchy = $('option:selected', this).attr('hierarchy');
             $('#field-hierarchy_id').val(hierarchy)
@@ -193,20 +209,20 @@
                     $('#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("msl_code", itm.contact.msl_code).attr('speciality',itm.contact.speciality));
+                        $('#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-msl_code').val($('option:selected', this).attr('msl_code'))
+                        $('#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)
+     
+            console.log(hierarchy);
         })
 
         /* $('#field-contact_id').change(function() {
@@ -214,29 +230,29 @@
                     })
         
         $('#field-contact_id').change(function() {
-               		 $('#field-msl_code').val($('option:selected', this).attr('msl_code'))
+               		 $('#field-legacy_code').val($('option:selected', this).attr('legacy_code'))
         })
 
-        $('#field-msl_code,#field-speciality').attr('readonly',true);
+        $('#field-legacy_code,#field-speciality').attr('readonly',true);
         
         
-        $('#field-other_doctor_name,#field-other_speciality,#field-other_msl_code').prop({"required":false});
-        $('#field-other_doctor_name,#field-other_speciality,#field-other_msl_code').parent().hide();
+        $('#field-other_doctor_name,#field-other_speciality,#field-other_legacy_code').prop({"required":false});
+        $('#field-other_doctor_name,#field-other_speciality,#field-other_legacy_code').parent().hide();
         
 
         $('#field-contact_id').on('change',function(){
             let dropDown=$('#field-contact_id').val();
             if(dropDown==='others'){
-                $('#field-other_doctor_name,#field-other_speciality,#field-other_msl_code').parent().show(); 
-                $('#field-other_doctor_name,#field-other_speciality,#field-other_msl_code').prop({"required":true});
-                $('#field-speciality,#field-msl_code').parent().hide(); 
-                $('#field-speciality,#field-msl_code').prop({"required":false});
+                $('#field-other_doctor_name,#field-other_speciality,#field-other_legacy_code').parent().show(); 
+                $('#field-other_doctor_name,#field-other_speciality,#field-other_legacy_code').prop({"required":true});
+                $('#field-speciality,#field-legacy_code').parent().hide(); 
+                $('#field-speciality,#field-legacy_code').prop({"required":false});
             }
             else{
-                $('#field-other_doctor_name,#field-other_speciality,#field-other_msl_code').parent().hide();
-                $('#field-other_doctor_name,#field-other_speciality,#field-other_msl_code').prop({"required":false});
-                $('#field-speciality,#field-msl_code').parent().show(); 
-                $('#field-speciality,#field-msl_code').prop({"required":true});
+                $('#field-other_doctor_name,#field-other_speciality,#field-other_legacy_code').parent().hide();
+                $('#field-other_doctor_name,#field-other_speciality,#field-other_legacy_code').prop({"required":false});
+                $('#field-speciality,#field-legacy_code').parent().show(); 
+                $('#field-speciality,#field-legacy_code').prop({"required":true});
 
             }
         })
diff --git a/resources/views/form/rapport-vitalis/1778759289-3911c4bf-8d55-48e3-b670-0236a84179ab.blade.php b/resources/views/form/rapport-vitalis/1778759289-3911c4bf-8d55-48e3-b670-0236a84179ab.blade.php
index 6ffcf2a4..77b91030 100644
--- a/resources/views/form/rapport-vitalis/1778759289-3911c4bf-8d55-48e3-b670-0236a84179ab.blade.php
+++ b/resources/views/form/rapport-vitalis/1778759289-3911c4bf-8d55-48e3-b670-0236a84179ab.blade.php
@@ -220,7 +220,49 @@
 <script type="text/javascript">
     jQuery(document).ready(function($){
 
+        $('#field-upload_pob_image_max_10_mb').on('change', function () {
+ 
+            const file = this.files[0];
+            if (!file) return;
 
+            const allowedTypes = [
+                'image/jpeg',
+                'image/jpg',
+                'image/png'
+            ];
+
+            if (!allowedTypes.includes(file.type)) {
+                Swal.fire({
+                    icon: 'error',
+                    title: 'Invalid File',
+                    text: 'Only JPG, JPEG and PNG files are allowed.'
+                });
+
+                $(this).val('');
+            }
+        });
+        $('#field-upload_pob_image_max_10_mb')
+            .attr('accept', '.jpg,.jpeg,.png,.pdf');
+
+        const maxSize = 10 * 1024 * 1024; // 10 MB
+
+        $('#field-upload_pob_image_max_10_mb')
+        .on('change', function () {
+
+            const file = this.files[0];
+            if (!file) return;
+
+            if (file.size > maxSize) {
+
+                Swal.fire({
+                    icon: 'error',
+                    title: 'File Too Large',
+                    text: 'Maximum file size allowed is 10 MB.'
+                });
+
+                $(this).val('');
+            }
+        });
 
      $("#field-contact_id").change(function(){