Version 1 hotfix #13 for merge

app.py

@@ -192,6 +192,7 @@ def merge_forecast_data(actual, predicted, future):
     future.rename(columns={future.columns[0]: "Future Forecasted Sales"}, inplace=True)
 
     merged_dataframe = pd.merge_ordered(actual, predicted, on='Date', suffixes=('_Actual', '_Predicted'))
+    merged_dataframe = pd.merge_ordered(merged_dataframe, future, on='Date')
     return merged_dataframe
 
 # TAPAS Model
@@ -234,11 +235,6 @@ def get_converted_answer(table, query):
     converted_answer = convert_answer(get_answer(table, query))
     return converted_answer
 
-
-# Web Application
-st.title("Forecasting Dashboard 📈")
-st.subheader("Welcome User, start forecasting by uploading your file in the sidebar!")
-
 # Session States
 if 'uploaded' not in st.session_state:
     st.session_state.uploaded = False
@@ -246,6 +242,11 @@ if 'uploaded' not in st.session_state:
 if 'forecasted' not in st.session_state:
     st.session_state.forecasted = False
 
+# Web Application
+st.title("Forecasting Dashboard 📈")
+if not st.session_state.uploaded:
+  st.subheader("Welcome User, start forecasting by uploading your file in the sidebar!")
+
 # Sidebar Menu
 with st.sidebar:
     # TODO Name for product