diff --git a/resources/views/form/rapport-lifemankind/1788596722-25ccc7d7-bf95-4fde-b6d5-6bed2d5e9eb4.blade.php b/resources/views/form/rapport-lifemankind/1788596722-25ccc7d7-bf95-4fde-b6d5-6bed2d5e9eb4.blade.php
index 3ddf82c1..630d848a 100644
--- a/resources/views/form/rapport-lifemankind/1788596722-25ccc7d7-bf95-4fde-b6d5-6bed2d5e9eb4.blade.php
+++ b/resources/views/form/rapport-lifemankind/1788596722-25ccc7d7-bf95-4fde-b6d5-6bed2d5e9eb4.blade.php
@@ -269,20 +269,30 @@
     var formData = new FormData(this);
 
     // Reset both metric values
-    formData.set('ACTUAL_GUDCEF_METRIC_CODE', '0');
-    formData.set('ACTUAL_ASTHAKIND_METRIC_CODE', '0');
+    // Get Doctor Calls Done
+var doctorCalls = $('#field-no_of_doctor_calls_done').val() || '0';
 
-    // Set selected activity metric to 1
-    if (activity === 'GUDCEF MONDAY') {
+// Reset both metrics
+formData.set('ACTUAL_GUDCEF_METRIC_CODE', '0');
+formData.set('ACTUAL_ASTHAKIND_METRIC_CODE', '0');
 
-        formData.set('ACTUAL_GUDCEF_METRIC_CODE', '1');
+// Submit Doctor Calls Done under the selected activity
+if (activity === 'GUDCEF MONDAY') {
 
-    } else if (
-        activity === 'ASTHAKIND - BEMISAAL BUDHWAAR / WINNING WEDNESDAY'
-    ) {
+    formData.set(
+        'ACTUAL_GUDCEF_METRIC_CODE',
+        doctorCalls
+    );
 
-        formData.set('ACTUAL_ASTHAKIND_METRIC_CODE', '1');
-    }
+} else if (
+    activity === 'ASTHAKIND - BEMISAAL BUDHWAAR / WINNING WEDNESDAY'
+) {
+
+    formData.set(
+        'ACTUAL_ASTHAKIND_METRIC_CODE',
+        doctorCalls
+    );
+}
 
     // Debug
     console.log('Submitting Activity:', activity);
@@ -315,6 +325,8 @@
                 });
 
                 $('#report-form').trigger("reset");
+                // Re-trigger activity change logic to return form to initial state
+                $('#field-activity_name').trigger('change');
 
             } else {
                 Swal.fire({
@@ -437,113 +449,158 @@ function hideActivityFields() {
 }
 
 
-// Hide activity-specific fields when page loads
-hideActivityFields();
 
 
 $('#field-activity_name').on('change', function () {
 
-    var activity = $(this).val();
+    // Use the displayed activity name
+    var activity = $('#field-activity_name option:selected').text().trim();
 
-    // Hide both groups first
+    console.log("ACTIVITY CHANGED:", activity);
+
+    // Always hide both groups first
     hideActivityFields();
 
 
+    // =========================
     // GUDCEF MONDAY
+    // =========================
     if (activity === 'GUDCEF MONDAY') {
 
-    $('#field-day_of_activity_for_gudcef_monday')
-        .closest('.col-md-12')
-        .show()
-        .find('input, select, textarea')
-        .prop('required', true);
+        $('#field-day_of_activity_for_gudcef_monday')
+            .closest('.col-md-12')
+            .show()
+            .find('input, select, textarea')
+            .prop('required', true);
 
-    $('#field-number_of_gudcef_monday_input_distributed_to_doctors')
-        .closest('.col-md-12')
-        .show()
-        .find('input, select, textarea')
-        .prop('required', true);
+        $('#field-number_of_gudcef_monday_input_distributed_to_doctors')
+            .closest('.col-md-12')
+            .show()
+            .find('input, select, textarea')
+            .prop('required', true);
 
-    $('#field-amount_of_pob_generated_for_gudcef_on_gudcef_monday_activity')
-        .closest('.col-md-12')
-        .show()
-        .find('input, select, textarea')
-        .prop('required', true);
+        $('#field-amount_of_pob_generated_for_gudcef_on_gudcef_monday_activity')
+            .closest('.col-md-12')
+            .show()
+            .find('input, select, textarea')
+            .prop('required', true);
 
-    $('#field-number_of_doctors_showing_positive_intent_for_prescription_support')
-        .closest('.col-md-12')
-        .show()
-        .find('input, select, textarea')
-        .prop('required', true);
-}
+        $('#field-number_of_doctors_showing_positive_intent_for_prescription_support')
+            .closest('.col-md-12')
+            .show()
+            .find('input, select, textarea')
+            .prop('required', true);
+    }
 
 
-    // ASTHAKIND - BEMISAAL BUDHWAAR / WINNING WEDNESDAY
+    // =========================
+    // BEMISAAL / WINNING WEDNESDAY
+    // =========================
     else if (
-    activity === 'ASTHAKIND - BEMISAAL BUDHWAAR / WINNING WEDNESDAY'
-) {
+        activity === 'ASTHAKIND - BEMISAAL BUDHWAAR / WINNING WEDNESDAY'
+    ) {
 
-    $('#field-week_of_activity_for_bemisaal_budhwaar_winning_wednesday')
-        .closest('.col-md-12')
-        .show()
-        .find('input, select, textarea')
-        .prop('required', true);
+        $('#field-week_of_activity_for_bemisaal_budhwaar_winning_wednesday')
+            .closest('.col-md-12')
+            .show()
+            .find('input, select, textarea')
+            .prop('required', true);
 
-    $('#field-no_of_doctors_where_asthakind_was_detailed_as_p1')
-        .closest('.col-md-12')
-        .show()
-        .find('input, select, textarea')
-        .prop('required', true);
+        $('#field-no_of_doctors_where_asthakind_was_detailed_as_p1')
+            .closest('.col-md-12')
+            .show()
+            .find('input, select, textarea')
+            .prop('required', true);
 
-    $('#field-no_of_chemist_call_done')
-        .closest('.col-md-12')
-        .show()
-        .find('input, select, textarea')
-        .prop('required', true);
+        $('#field-no_of_chemist_call_done')
+            .closest('.col-md-12')
+            .show()
+            .find('input, select, textarea')
+            .prop('required', true);
 
-    $('#field-amount_of_pob_generated')
-        .closest('.col-md-12')
-        .show()
-        .find('input, select, textarea')
-        .prop('required', true);
+        $('#field-amount_of_pob_generated')
+            .closest('.col-md-12')
+            .show()
+            .find('input, select, textarea')
+            .prop('required', true);
 
-    $('#field-no_of_doctors_converted_for_asthakind')
-        .closest('.col-md-12')
-        .show()
-        .find('input, select, textarea')
-        .prop('required', true);
-}
+        $('#field-no_of_doctors_converted_for_asthakind')
+            .closest('.col-md-12')
+            .show()
+            .find('input, select, textarea')
+            .prop('required', true);
+    }
+
+});
 
 
 $('#field-activity_name').on('change', function () {
 
     var activity = $('#field-activity_name option:selected').text().trim();
 
-    console.log("ACTIVITY SELECTED:", activity);
+    var doctorCalls = $('#field-no_of_doctor_calls_done').val() || '0';
 
+    // Reset both metrics
     $('#activity_gudcef_metric').val('0');
     $('#activity_asthakind_metric').val('0');
 
+    // Send Doctor Calls Done to the selected activity
     if (activity === 'GUDCEF MONDAY') {
 
-        $('#activity_gudcef_metric').val('1');
+        $('#activity_gudcef_metric').val(doctorCalls);
 
-    } else if (activity === 'ASTHAKIND - BEMISAAL BUDHWAAR / WINNING WEDNESDAY') {
+    } else if (
+        activity === 'ASTHAKIND - BEMISAAL BUDHWAAR / WINNING WEDNESDAY'
+    ) {
 
-        $('#activity_asthakind_metric').val('1');
+        $('#activity_asthakind_metric').val(doctorCalls);
     }
 
+    console.log("ACTIVITY:", activity);
+    console.log("DOCTOR CALLS:", doctorCalls);
     console.log(
-        "GUDCEF =", $('#activity_gudcef_metric').val()
+        "GUDCEF METRIC:",
+        $('#activity_gudcef_metric').val()
     );
-
     console.log(
-        "ASTHAKIND =", $('#activity_asthakind_metric').val()
+        "ASTHAKIND METRIC:",
+        $('#activity_asthakind_metric').val()
     );
 });
+$('#field-no_of_doctor_calls_done').on('input', function () {
+
+    var doctorCalls = $(this).val() || '0';
+
+    var activity = $('#field-activity_name option:selected').text().trim();
+
+    if (activity === 'GUDCEF MONDAY') {
+
+        $('#activity_gudcef_metric').val(doctorCalls);
+        $('#activity_asthakind_metric').val('0');
+
+    } else if (
+        activity === 'ASTHAKIND - BEMISAAL BUDHWAAR / WINNING WEDNESDAY'
+    ) {
+
+        $('#activity_asthakind_metric').val(doctorCalls);
+        $('#activity_gudcef_metric').val('0');
+
+    }
 
 });
-    });
+
+@if($id)
+
+    // EDIT MODE
+    $('#field-activity_name').trigger('change');
+
+@else
+
+    // NEW FORM
+    hideActivityFields();
+
+@endif
+});
 </script>
 </body>