diff --git a/resources/views/form/rapport-glenmarkcv/1779787418-c5969925-b986-4dc6-b867-0e18922c1f88.blade.php b/resources/views/form/rapport-glenmarkcv/1779787418-c5969925-b986-4dc6-b867-0e18922c1f88.blade.php
index 282ac9e1..fe106e6e 100644
--- a/resources/views/form/rapport-glenmarkcv/1779787418-c5969925-b986-4dc6-b867-0e18922c1f88.blade.php
+++ b/resources/views/form/rapport-glenmarkcv/1779787418-c5969925-b986-4dc6-b867-0e18922c1f88.blade.php
@@ -271,6 +271,10 @@
              
 
             $('#field-select_brand').on('change',function(){
+                // Reset all unit/value field values
+            $('input[id*="_units"], input[id*="_value"]').val('');
+            $('#field-total_pob_units').val(0);
+            $('#field-total_pob_value').val(0);
 
                 let dropDown = $('#field-select_brand').val();
 
@@ -280,9 +284,9 @@
                 $('#field-sitazit_d_10100_pob_units, #field-sitazit_d_550_pob_units, #field-sitazit_dm_er_100010_pob_units, #field-sitazit_dm_er_50010_pob_units, #field-sitazit_d_10100_pob_value, #field-sitazit_d_550_pob_value, #field-sitazit_dm_er_100010_pob_value, #field-sitazit_dm_er_50010_pob_value, #field-eptus_25mg_units, #field-eptus_50_mg_units, #field-eptus_t_10_kit_units, #field-eptus_t_20_kit_units, #field-eptus_25mg_value, #field-eptus_50_mg_value, #field-eptus_t_10_kit_value, #field-eptus_t_20_kit_value, #field-lo_bg_05_mg_units, #field-lo_bg_05_mg_value, #field-ziten_m_20_mg_1000_mg_units, #field-ziten_m_20_mg_500_mg_units, #field-ziten_units, #field-ziten_m_20_mg_1000_mg_value, #field-ziten_m_20_mg_500_mg_value, #field-ziten_value, #field-total_pob_units, #field-total_pob_value').parent().hide();
 
 
-                // =====================
+                 
                 // Sitazit
-                // =====================
+                 
                 if(dropDown === 'Sitazit'){
 
                     $('#field-sitazit_d_10100_pob_units, #field-sitazit_d_550_pob_units, #field-sitazit_dm_er_100010_pob_units, #field-sitazit_dm_er_50010_pob_units, #field-sitazit_d_10100_pob_value, #field-sitazit_d_550_pob_value, #field-sitazit_dm_er_100010_pob_value, #field-sitazit_dm_er_50010_pob_value').prop({"required":true});
@@ -294,9 +298,9 @@
                 }
 
 
-                // =====================
+                 
                 // Eptus
-                // =====================
+                 
                 else if(dropDown === 'Eptus'){
 
                     $('#field-eptus_25mg_units, #field-eptus_50_mg_units, #field-eptus_t_10_kit_units, #field-eptus_t_20_kit_units, #field-eptus_25mg_value, #field-eptus_50_mg_value, #field-eptus_t_10_kit_value, #field-eptus_t_20_kit_value').prop({"required":true});
@@ -308,9 +312,9 @@
                 }
 
 
-                // =====================
+                 
                 // LOBG
-                // =====================
+                 
                 else if(dropDown === 'LOBG'){
 
                     $('#field-lo_bg_05_mg_units, #field-lo_bg_05_mg_value').prop({"required":true});
@@ -322,9 +326,9 @@
                 }
 
 
-                // =====================
+                 
                 // Ziten
-                // =====================
+                 
                 else if(dropDown === 'Ziten'){
 
                     $('#field-ziten_m_20_mg_1000_mg_units, #field-ziten_m_20_mg_500_mg_units, #field-ziten_units, #field-ziten_m_20_mg_1000_mg_value, #field-ziten_m_20_mg_500_mg_value, #field-ziten_value').prop({"required":true});
@@ -343,12 +347,19 @@
             // Formula = Units * 100
              
 
-            function calculateField(unitField, valueField){
+            // Auto Calculation Function
+
+            function calculateField(unitField, valueField, ptsValue){
 
                 $(unitField).on('input', function(){
-                    const pts_value = 100;
-                    let units = parseFloat($(this).val()) || 0;
-                    let value = units * pts_value;
+
+                    let units = parseInt($(this).val()) || 0;
+
+                    // Formula = Units × PTS
+                    let value = units * ptsValue;
+
+                    // Round to 2 decimal
+                    value = value.toFixed(2);
 
                     $(valueField).val(value);
 
@@ -361,25 +372,51 @@
             // Total Calculation
              
 
-            function calculateTotals(){
+        //     function calculateTotals(){
+
+        //     let totalUnits = 0;
+        //     let totalValue = 0;
+
+             
+        //     // Total Units (Visible Only)
+             
+        //     $('input[id*="_units"]:visible').each(function(){
+
+        //         if($(this).attr('id') !== 'field-total_pob_units'){
+
+        //             totalUnits += parseFloat($(this).val()) || 0;
+        //         }
+        //     });
+
+             
+        //     // Total Value (Visible Only)
+             
+        //     $('input[id*="_value"]:visible').each(function(){
+
+        //         if($(this).attr('id') !== 'field-total_pob_value'){
+
+        //             totalValue += parseFloat($(this).val()) || 0;
+        //         }
+        //     });
+
+        //     $('#field-total_pob_units').val(totalUnits);
+        //     $('#field-total_pob_value').val(totalValue);
+        // }
+        function calculateTotals(){
 
             let totalUnits = 0;
             let totalValue = 0;
 
-             
-            // Total Units (Visible Only)
-             
+            // Total Units
             $('input[id*="_units"]:visible').each(function(){
 
                 if($(this).attr('id') !== 'field-total_pob_units'){
 
-                    totalUnits += parseFloat($(this).val()) || 0;
+                    totalUnits += parseInt($(this).val()) || 0;
                 }
             });
 
-             
-            // Total Value (Visible Only)
-             
+            // Total Value
             $('input[id*="_value"]:visible').each(function(){
 
                 if($(this).attr('id') !== 'field-total_pob_value'){
@@ -389,7 +426,9 @@
             });
 
             $('#field-total_pob_units').val(totalUnits);
-            $('#field-total_pob_value').val(totalValue);
+
+            // Round total value
+            $('#field-total_pob_value').val(totalValue.toFixed(2));
         }
 
 
@@ -397,25 +436,96 @@
             // Bind Calculations
              
 
+                         
             // Sitazit
-            calculateField('#field-sitazit_d_10100_pob_units', '#field-sitazit_d_10100_pob_value');
-            calculateField('#field-sitazit_d_550_pob_units', '#field-sitazit_d_550_pob_value');
-            calculateField('#field-sitazit_dm_er_100010_pob_units', '#field-sitazit_dm_er_100010_pob_value');
-            calculateField('#field-sitazit_dm_er_50010_pob_units', '#field-sitazit_dm_er_50010_pob_value');
+             
 
+            calculateField(
+                '#field-sitazit_d_10100_pob_units',
+                '#field-sitazit_d_10100_pob_value',
+                160.71
+            );
+
+            calculateField(
+                '#field-sitazit_d_550_pob_units',
+                '#field-sitazit_d_550_pob_value',
+                114.75
+            );
+
+            calculateField(
+                '#field-sitazit_dm_er_100010_pob_units',
+                '#field-sitazit_dm_er_100010_pob_value',
+                182.25
+            );
+
+            calculateField(
+                '#field-sitazit_dm_er_50010_pob_units',
+                '#field-sitazit_dm_er_50010_pob_value',
+                168.10
+            );
+
+
+             
             // Eptus
-            calculateField('#field-eptus_25mg_units', '#field-eptus_25mg_value');
-            calculateField('#field-eptus_50_mg_units', '#field-eptus_50_mg_value');
-            calculateField('#field-eptus_t_10_kit_units', '#field-eptus_t_10_kit_value');
-            calculateField('#field-eptus_t_20_kit_units', '#field-eptus_t_20_kit_value');
+             
 
+            calculateField(
+                '#field-eptus_25mg_units',
+                '#field-eptus_25mg_value',
+                207.96
+            );
+
+            calculateField(
+                '#field-eptus_50_mg_units',
+                '#field-eptus_50_mg_value',
+                326.25
+            );
+
+            calculateField(
+                '#field-eptus_t_10_kit_units',
+                '#field-eptus_t_10_kit_value',
+                225
+            );
+
+            calculateField(
+                '#field-eptus_t_20_kit_units',
+                '#field-eptus_t_20_kit_value',
+                242.36
+            );
+
+
+             
             // LOBG
-            calculateField('#field-lo_bg_05_mg_units', '#field-lo_bg_05_mg_value');
+             
 
+            calculateField(
+                '#field-lo_bg_05_mg_units',
+                '#field-lo_bg_05_mg_value',
+                73.93
+            );
+
+
+             
             // Ziten
-            calculateField('#field-ziten_m_20_mg_1000_mg_units', '#field-ziten_m_20_mg_1000_mg_value');
-            calculateField('#field-ziten_m_20_mg_500_mg_units', '#field-ziten_m_20_mg_500_mg_value');
-            calculateField('#field-ziten_units', '#field-ziten_value');
+             
+
+            calculateField(
+                '#field-ziten_m_20_mg_1000_mg_units',
+                '#field-ziten_m_20_mg_1000_mg_value',
+                78.64
+            );
+
+            calculateField(
+                '#field-ziten_m_20_mg_500_mg_units',
+                '#field-ziten_m_20_mg_500_mg_value',
+                82.29
+            );
+
+            calculateField(
+                '#field-ziten_units',
+                '#field-ziten_value',
+                63.64
+            );
 
             // Allow Only Positive Whole Numbers
             // No Decimal & No Negative