Update app.py

app.py

@@ -25,28 +25,21 @@ def generate_patient_id(phone, last_sequence):
     current_year = today.year
     current_month = today.month
     
-    # Check if year or month has changed
     if last_sequence["year"] != current_year or last_sequence["month"] != current_month:
-        # Reset sequence for new year/month
         last_sequence["year"] = current_year
         last_sequence["month"] = current_month
         last_sequence["number"] = 1
     else:
-        # Increment sequence number
         last_sequence["number"] += 1
     
-    # Format patient ID
     patient_id = f"{current_year}{current_month:02d}{last_sequence['number']:05d}"
     return patient_id
 
 # Patient Registration Tab
 def registration_interface(name, father_name, age, phone, address, pincode):
     patients, last_sequence = load_data()
-    
-    # Generate patient ID
     patient_id = generate_patient_id(phone, last_sequence)
     
-    # Add patient details to data
     patients[patient_id] = {
         "name": name,
         "father_name": father_name,
@@ -58,24 +51,23 @@ def registration_interface(name, father_name, age, phone, address, pincode):
         "total_cost": 0
     }
     
-    # Save data and updated sequence
     save_data(patients, last_sequence)
     return f"Patient Registered. Patient ID: {patient_id}"
 
 # Tests Selection Tab
 def test_interface(categories):
     available_tests = get_tests_by_category(categories)
-    return gr.update(choices=available_tests)  # Update dropdown with available tests
+    return gr.update(choices=available_tests)
 
 def confirm_tests_interface(patient_id, selected_tests):
-    patients, last_sequence = load_data()  # Load both patients and last_sequence
-    response = select_tests(patient_id, selected_tests, patients)  # Update patients directly
-    save_data(patients, last_sequence)  # Save both patients and last_sequence
+    patients, last_sequence = load_data()
+    response = select_tests(patient_id, selected_tests, patients)
+    save_data(patients, last_sequence)
     return response
 
 # Billing Tab
 def billing_interface(patient_id):
-    patients, _ = load_data()  # Load patients and ignore last_sequence
+    patients, _ = load_data()
     if patient_id in patients:
         billing_info = fetch_billing(patient_id, patients)
         return billing_info
@@ -87,37 +79,40 @@ with gr.Blocks() as app:
     gr.Markdown("<h1 style='text-align: center;'>👩🏻‍🔬🅢🅐🅣🅗🅚🅡🅤🅣🅗🅐 🅛🅘🅜🅢🔬</h1>", elem_id="header")
 
     with gr.Tab("Patient Registration"):
+        gr.Markdown("<h2>Register a New Patient</h2>")
         with gr.Row():
-            name = gr.Textbox(label="Patient Name", placeholder="Enter patient name", elem_id="name_field", lines=1)
-            father_name = gr.Textbox(label="Father/Husband Name", placeholder="Enter father or husband name", elem_id="father_name_field", lines=1)
+            name = gr.Textbox(label="Patient Name", placeholder="Enter patient's full name", elem_id="name_field")
+            father_name = gr.Textbox(label="Father/Husband's Name", placeholder="Enter father/husband's full name", elem_id="father_name_field")
         with gr.Row():
-            age = gr.Number(label="Age", value=None, minimum=0, maximum=99, elem_id="age_field")
-            phone = gr.Number(label="Phone Number", value=None, elem_id="phone_field")
+            age = gr.Number(label="Age", value=None, minimum=1, maximum=120, elem_id="age_field")
+            phone = gr.Textbox(label="Phone Number", placeholder="Enter a valid 10-digit phone number", elem_id="phone_field")
         with gr.Row():
-            address = gr.Textbox(label="Address", placeholder="Enter address", lines=2)
-            pincode = gr.Number(label="Pincode", value=None, elem_id="pincode_field")
-        register_button = gr.Button("Register Patient")
-        registration_output = gr.Textbox(label="Registration Output")
+            address = gr.Textbox(label="Address", placeholder="Enter full address", lines=2, elem_id="address_field")
+            pincode = gr.Textbox(label="Pincode", placeholder="Enter area pincode", elem_id="pincode_field")
 
+        register_button = gr.Button("Register Patient", elem_id="register_button")
+        registration_output = gr.Textbox(label="Registration Output", elem_id="registration_output", interactive=False)
         register_button.click(registration_interface, [name, father_name, age, phone, address, pincode], registration_output)
 
     with gr.Tab("Tests"):
-        patient_id_test = gr.Textbox(label="Patient ID")
+        gr.Markdown("<h2>Select Tests for the Patient</h2>")
+        patient_id_test = gr.Textbox(label="Patient ID", placeholder="Enter Patient ID")
         categories = gr.CheckboxGroup(
             ["Haematology", "Clinical Pathology", "Biochemistry", "Microbiology", "Specific Diseases", "Serology", "Radiology", "Other Diagnostic Tests"],
             label="Select Test Categories"
         )
         available_tests = gr.CheckboxGroup(label="Available Tests")
-        confirm_button = gr.Button("Confirm Tests")
-        test_output = gr.Textbox(label="Test Selection Output")
+        confirm_button = gr.Button("Confirm Selected Tests")
+        test_output = gr.Textbox(label="Test Selection Output", elem_id="test_output", interactive=False)
 
-        categories.change(test_interface, inputs=categories, outputs=available_tests)  # Update available tests based on selected categories
+        categories.change(test_interface, inputs=categories, outputs=available_tests)
         confirm_button.click(confirm_tests_interface, [patient_id_test, available_tests], test_output)
 
     with gr.Tab("Billing"):
-        patient_id_bill = gr.Textbox(label="Patient ID")
-        fetch_button = gr.Button("Fetch Billing")
-        billing_output = gr.Textbox(label="Billing Information")
+        gr.Markdown("<h2>Billing Information</h2>")
+        patient_id_bill = gr.Textbox(label="Patient ID", placeholder="Enter Patient ID for Billing")
+        fetch_button = gr.Button("Fetch Billing Details")
+        billing_output = gr.Textbox(label="Billing Information", interactive=False, elem_id="billing_output")
         fetch_button.click(billing_interface, [patient_id_bill], billing_output)
 
 # Custom CSS styling