Update app.py

app.py

@@ -66,13 +66,13 @@ def display_prediction_tables_and_plots(prediction_tables, baseline_bmd, baselin
         tscore_values = [baseline_tscore] + list(table['Predicted T-score'])
 
         # Create BMD plot
-        trace_bmd = go.Scatter(x=years, y=bmd_values, mode='lines+markers', name=f'{drug} (BMD)')
+        trace_bmd = go.Scatter(x=years, y=bmd_values, mode='lines+markers', name=f'{drug} (BMD)', line=dict(color='blue'))
         fig_bmd = go.Figure(data=[trace_bmd], layout=go.Layout(title=f'{drug} - Predicted BMD over Time', xaxis=dict(title='Years'), yaxis=dict(title='BMD (g/cm²)')))
         
         # Create T-score plot
-        trace_tscore = go.Scatter(x=years, y=tscore_values, mode='lines+markers', name=f'{drug} (T-score)', yaxis='y2')
-        fig_tscore = go.Figure(data=[trace_tscore], layout=go.Layout(title=f'{drug} - Predicted T-score over Time', xaxis=dict(title='Years'), yaxis2=dict(title='T-score', overlaying='y', side='right')))
-        
+        trace_tscore = go.Scatter(x=years, y=tscore_values, mode='lines+markers', name=f'{drug} (T-score)', line=dict(color='green'))
+        fig_tscore = go.Figure(data=[trace_tscore], layout=go.Layout(title=f'{drug} - Predicted T-score over Time', xaxis=dict(title='Years'), yaxis=dict(title='T-score')))
+
         # Display the plots
         col1, col2 = st.columns(2)
         with col1:
@@ -80,6 +80,16 @@ def display_prediction_tables_and_plots(prediction_tables, baseline_bmd, baselin
         with col2:
             st.plotly_chart(fig_tscore)
 
+        # Step 6: Check if goal is achieved and show the predicted BMD and T-score for each year
+        goal_achieved = False
+        for i, row in table.iterrows():
+            if row['Predicted T-score'] >= -2.49:
+                st.success(f"Goal achieved for {drug} at year {row['Year']} with T-score = {row['Predicted T-score']:.2f}")
+                goal_achieved = True
+                break
+        if not goal_achieved:
+            st.warning(f"Goal not achieved for {drug}")
+
 # Step 6: Calculate T-score from adjusted BMD
 def calculate_tscore_from_bmd(bmd_patient, c_avg, c_sd):
     return (bmd_patient - c_avg) / c_sd