Version 1 hotfix #24 for merge

app.py

@@ -192,7 +192,6 @@ def merge_forecast_data(actual, predicted, future):
     future.rename(columns={future.columns[0]: "Future Forecasted Sales"}, inplace=True)
 
     merged_dataframe = pd.concat([actual, predicted, future], axis=1)
-    merged_dataframe = merged_dataframe.fillna(-1)
     merged_dataframe = merged_dataframe.reset_index()
     return merged_dataframe
 
@@ -374,9 +373,9 @@ if (st.session_state.uploaded):
       merged_data = merge_forecast_data(df['Sales'], fitted_series, future_fitted_series)
       
       fig = go.Figure()
-      fig.add_trace(go.Scatter(x=merged_data['index'], y=merged_data['Sales_Actual'], mode='lines', name='Actual Sales'))
-      fig.add_trace(go.Scatter(x=merged_data['index'], y=merged_data['Sales_Predicted'], mode='lines', name='Predicted Sales'))
-      fig.add_trace(go.Scatter(x=merged_data['index'], y=merged_data['Sales_Forecasted'], mode='lines', name='Forecasted Sales'))
+      fig.add_trace(go.Scatter(x=merged_data[merged_data.columns[0]], y=merged_data['Actual Sales'], mode='lines', name='Actual Sales'))
+      fig.add_trace(go.Scatter(x=merged_data[merged_data.columns[0]], y=merged_data['Predicted Sales'], mode='lines', name='Predicted Sales'))
+      fig.add_trace(go.Scatter(x=merged_data[merged_data.columns[0]], y=merged_data['Forecasted Future Sales'], mode='lines', name='Forecasted Future Sales'))
       fig.update_layout(title='Forecasted Sales Data', xaxis_title='Date', yaxis_title='Sales')
       col[0].plotly_chart(fig)
       col[0].write(f"MAPE score: {acc['mape']} (lower is better)")