Update app.py

app.py

@@ -11,6 +11,17 @@ def sorting(df):
 
     return df
 
+def edit_strings(string_list):
+  edited_list = []
+  for string in string_list:
+    if "_" in string:
+      last_underscore_index = string.rfind("_")
+      edited_string = string[:last_underscore_index]
+      edited_list.append(edited_string)
+    else:
+      edited_list.append(string)
+  return edited_list
+
 def figo(plot_type, df, title, xlabel=None, ylabel=None, legend_title=None, colorscale='Plotly3', width=800, height=600):
     if plot_type == "Scatter":
         fig = go.Figure()
@@ -538,38 +549,58 @@ elif main_option == "Funnel":
     uploaded_file = st.file_uploader("Please upload your Excel file", type=["xlsx", "xls"])
     if uploaded_file:
         try:
-            #df = pd.read_excel(uploaded_file)
-            #st.subheader("Displaying the first few rows of the DataFrame")
+            df = pd.read_excel(uploaded_file)
+            st.subheader("Displaying the first few rows of the DataFrame")
+            st.dataframe(df.head())
 
-            data = {
-                'A': [10, 20, 30, np.nan, np.nan],
-                'B': [5, 10, 15, 20, 25],
-                'C': [np.nan, 100, 150, 200, 250],
-                'D': [100, np.nan, 200, 300, 400]
-            }
-            df = pd.DataFrame(data)
+            cols = edit_strings(list(df.columns))
 
-            st.dataframe(df.head())
+            st.sidebar.header("Funnul Settings")
+            single_answer = st.sidebar.multiselect(
+                'Select a single option (Single answer)', 
+                cols,
+                default=[]
+            )
+        
+            multi_answer = st.sidebar.multiselect(
+                'Select multiple options (Multi answer)', 
+                cols,
+                default=[]
+            )
+            selected_dict = {}
+        
+            for option in single_answer:
+                selected_dict[option] = "Single"
+            for option in multi_answer:
+                selected_dict[option] = "Multi"
+
+            funnel_frequency, funnel_percentage = funnel(df, selected_dict)
+            st.subheader("Percentage Table")
+            st.dataframe(funnel_percentage)
+
+            st.subheader("Frequency Table")
+            st.dataframe(funnel_frequency)
+            
             st.sidebar.header("Chart Settings")
-            bar_columns = st.sidebar.multiselect('Which columns should be displayed as bar charts?', df.columns)
-            line_columns = st.sidebar.multiselect('Which columns should be displayed as line charts?', df.columns)
+            bar_columns = st.sidebar.multiselect('Which columns should be displayed as bar charts?', funnel_percentage.columns)
+            line_columns = st.sidebar.multiselect('Which columns should be displayed as line charts?', funnel_percentage.columns)
             
-            df_cleaned = df.dropna(axis=0, how='all')
+            funnel_percentage_cleaned = funnel_percentage.dropna(axis=0, how='all')
             
             fig = go.Figure()
             
             for col in bar_columns:
-                df_col = df_cleaned[col]
-                fig.add_trace(go.Bar(x=df_cleaned.index, y=df_col, name=col))
+                funnel_percentage_col = funnel_percentage_cleaned[col]
+                fig.add_trace(go.Bar(x=funnel_percentage_cleaned.index, y=funnel_percentage_col, name=col))
             
             for col in line_columns:
-                df_col = df_cleaned[col]
-                fig.add_trace(go.Scatter(x=df_cleaned.index, y=df_col, mode='lines', name=col))
+                funnel_percentage_col = funnel_percentage_cleaned[col]
+                fig.add_trace(go.Scatter(x=funnel_percentage_cleaned.index, y=funnel_percentage_col, mode='lines', name=col))
             
             fig.update_layout(
                 title="Combined Bar and Line Chart",
-                xaxis_title="Rows",
-                yaxis_title="Value",
+                xaxis_title="Brands",
+                yaxis_title="Percentage",
                 template="plotly_dark",
                 barmode="group",
                 xaxis=dict(tickmode='linear')
@@ -577,7 +608,6 @@ elif main_option == "Funnel":
             
             st.plotly_chart(fig)
 
-
         except Exception as e:
             st.error(f"❌ Error reading the Excel file: {e}")