Upload 7 files

app.py

@@ -2,7 +2,7 @@ import streamlit as st
 import pandas as pd
 from datetime import datetime
 import os
-import configparser  # For activating the config theme
+import configparser  # For activating the config
 
 # Function to initialize session state
 def initialize_session_state():
@@ -10,8 +10,8 @@ def initialize_session_state():
         st.session_state.data = {}
 
 # Function to save user data
-def save_user_data(user_name, data):
-    st.session_state.data[user_name] = data
+def save_user_data(user_name, user_data):
+    st.session_state.data[user_name] = user_data
 
 # Function to generate PM_id
 def generate_pm_id(user_data):
@@ -41,10 +41,9 @@ def generate_pm_id(user_data):
     pm_id = '_'.join(pm_id_parts)  # Join parts with underscore
     return pm_id
 
-
 # Function to display saved records as a table and save to CSV
 def display_saved_records():
-    st.title("Saved Records")
+    st.write(":violet[Saved Records]")
     df = pd.DataFrame.from_dict(st.session_state.data, orient='index')
     df.reset_index(inplace=True)  # Reset index to convert index (user_name) to a regular column
     df.rename(columns={'index': 'User Name'}, inplace=True)  # Rename the index column to 'User Name'
@@ -85,6 +84,7 @@ initialize_session_state()
 
 theme_settings = load_theme_config()
 
+
 # Apply theme settings to Streamlit
 st.set_page_config(
     page_title="Plan maker",
@@ -93,10 +93,11 @@ st.set_page_config(
     initial_sidebar_state="auto",  # "auto", "expanded", "collapsed"
 )
 
-# User name & email id
-user_name = st.sidebar.text_input("Enter your name:")
+
 
 # Section 1: Plan Info
+st.sidebar.image('Fynd_logo2.png', width = 400)
+user_name = st.sidebar.text_input("Enter your name:")
 st.sidebar.title("Section 1: Plan Info")
 plan_name = st.sidebar.text_input("Plan Name", help="Enter the name of the plan")
 plan_description = st.sidebar.text_area("Plan Description", max_chars=250, help="Describe the plan")
@@ -121,18 +122,14 @@ else:
 # Section 3: Defining products for each dropdown
 product_options = ["B2B", "Marketplaces", "StoreOS", "Website", "ONDC", "OMS", "TMS", "WMS", "GMC", "Catalog Cloud"]
 fee_type_options = ["Development", "Subscription", "Maintenance", "Transaction", "Minimum Guarantee", "Logistics", "Packaging", "SLA", "Licensing"]
-fee_nature_options = ["Fixed %", "Flat currency","Slab based"]
+fee_nature_options = ["Fixed %", "Flat currency", "Slab based"]
 variable_options = ["Bag", "Order", "Shipment", "Application", "Extension", "Integration", "Store", "User"]
 chargeable_on_options = ["Developed", "Installed", "Placed", "Invoiced", "Delivered", "Return window", "All", "Picked", "RTO", "DTO", "Packed"]
 plan_validity_options = ["One time", "Monthly", "Quarterly", "Bi-Annually", "Annually"]
 payment_method_options = ["Prepaid", "Postpaid"]
 
-# Create a layout with two columns
-col1, col2, col3 = st.columns([1, 3, 2])
-
 # In the first column, display the image
-with col1:
-    st.image("Fynd copy.png", width=200)
+st.image("Fynd copy.png", width=200)
 
 st.title(":violet[Plan maker]")
 
@@ -194,43 +191,124 @@ selected_variable_type = st.selectbox("Variable Type", ["--please select--"] + v
 chargeable_on_mapping = char_config["chargeable_on_mapping"]
 selected_chargeable_on = st.selectbox("Chargeable on", ["--please select--"] + chargeable_on_mapping.get(selected_variable_type, []), help="Select the type of Chargeable")
 
-# 5th layer: Mapping of fee types with variables and chargeable on
-selected_fee_nature = st.selectbox("Fee Nature", ["--please select--"]+fee_nature_options, help="Select the fee nature")
+# Create an empty DataFrame with the desired column names
+slabs_df = pd.DataFrame(columns=["Slab", "Max_value", "Commercial_value", "Usage","Capping/Min_Guarantee_value", "Threshold"])
+
+selected_fee_nature = st.selectbox("Fee Nature:", ["Fixed %", "Flat currency", "Slab based"], key="fee_nature_select")
+
+if selected_fee_nature == "Slab based":
+    st.write("Enter values for Slab based fee structure:")
+
+    # Input fields for user data
+    col1, col2 = st.columns([2, 2])
+
+    with col1:
+        slab = st.selectbox("Slab:", [1, 2, 3], key="slab_select")
+    with col2:
+        max_value = st.text_input("Max value:", key="max_value_input")
+    with col1:
+        user_input = st.text_input("Commercial Value:", key="user_input")
+    with col2:
+        Usage = st.text_input("Usage:", key="Usage_input")
+    with col1:
+        Capping_or_Minimum_Guarantee= st.text_input("Capping/Min_Guarantee:", key="Capping_or_Minimum_Guarantee_input")
+    with col2:
+        threshold = st.text_input("Threshold:", key="threshold_input")
+
+    # Function to add data to DataFrame
+    def add_data(slabs_df, slab, max_value, user_input, Usage, Capping_or_Minimum_Guarantee, threshold):
+
+        max_value = int(max_value) if max_value else None
+        user_input = int(user_input) if user_input else None
+        Usage = int(Usage) if Usage else None
+        Capping_or_Minimum_Guarantee = int(Capping_or_Minimum_Guarantee) if Capping_or_Minimum_Guarantee else None
+
+        new_row = {
+            "Slab": slab,
+            "Max_value": max_value,
+            "Commercial_value": user_input,
+            "Usage": Usage,
+            "Capping/Min_Guarantee_value": Capping_or_Minimum_Guarantee,
+            "Threshold": threshold
+        }
+        new_row_df = pd.DataFrame([new_row])
+        slabs_df = pd.concat([slabs_df, new_row_df], ignore_index=True)
+        return slabs_df
+
+    # Button to add data
+    if st.button("Add Data", key="add_data_button"):
+        slabs_df = add_data(slabs_df, slab, max_value, user_input, Usage, Capping_or_Minimum_Guarantee, threshold)
+
+    # Display the updated DataFrame
+    st.write("Updated Slab Data:")
+    st.table(slabs_df)
+
+    selected_plan_validity = st.selectbox("Plan Validity", ["--please select--"] + plan_validity_options, help="Select the plan validity")
+    selected_payment_method = st.selectbox("Payment Method", ["--please select--"] + payment_method_options, help="Select the payment method")
+
+# Submit button
+    if st.button("Submit"):
+    # Save user data
+        user_data = {
+        "Plan Name": plan_name,
+        "Plan Description": plan_description,
+        "Plan Start Date": plan_start_date,
+        "Ordering Channels": ordering_channels,
+        "Company ID": company_id,
+        "Company Name": company_name,
+        "Fulfilling Location": fulfilling_location,
+        "Application ID": application_id,
+        "Fee Type": selected_fee_type,
+        "Variable": selected_variable_type,
+        "Chargeable on": selected_chargeable_on,
+        "Fee Nature": selected_fee_nature,
+        "Commercial value": user_input,
+        "Usage limit": Usage,
+        "Minimum/Capping value": Capping_or_Minimum_Guarantee,
+        "Threshold option": threshold,
+        "Plan Validity": selected_plan_validity,
+        "Payment Method": selected_payment_method,
+        }
+
+    # Generate PM_id and add it to user_data
+        pm_id = generate_pm_id(user_data)
+        user_data['PM_id'] = pm_id
 
-if selected_fee_nature in ["Fixed %", "Flat currency"]:
-    user_input = st.number_input("Please enter Commerical value:",  min_value=0.0, help="Enter a valid number")
-elif selected_fee_nature == "Slab based":
-    st.write("Please input values for the 3x3 table:")
-    table_data = [[st.number_input(f"Row {i+1}, Column {j+1}", value=0, step=1) for j in range(3)] for i in range(3)]
-    df = pd.DataFrame(table_data, columns=["Column 1", "Column 2", "Column 3"])
-    st.write(df)    
+        save_user_data(user_name, user_data)  # Save user data after submission
 
-# 6th layer: Expected Billing
-Usage = st.number_input(f"Enter the usage limit for {selected_variable_type}", min_value=0.0, help="Enter the usage limit")
-Capping_or_Minimum_Guarantee = st.number_input(f"Enter the Capping/Minimum Value for {selected_variable_type}", min_value = 0.0, help = "Enter the Capping/Minimum Gauarntee value")
-Product = Usage*user_input if selected_fee_nature in ["Fixed %", "Flat currency"] else 0
+        # Display saved records
+        display_saved_records()
 
-abc = ['Capping value', 'Minimum Guarantee']
-threshold = st.selectbox("Choose a threshold option:", ["--please select--"] + abc)
 
-initial_expected_billing = Product
+elif selected_fee_nature in ["Fixed %", "Flat currency"]:
+    user_input = st.number_input("Please enter Commercial value:", min_value=0.0, help="Enter a valid number")
 
-if threshold == 'Capping value':
-    expected_billing = Product if Capping_or_Minimum_Guarantee > Product else Capping_or_Minimum_Guarantee
-elif threshold == 'Minimum Guarantee':
-    expected_billing = Product if Capping_or_Minimum_Guarantee < Product else Capping_or_Minimum_Guarantee
-else:
-    expected_billing = initial_expected_billing  # Default to initial Product value if no threshold selected
+    # 6th layer: Expected Billing
+    Usage = st.number_input(f"Enter the usage limit for {selected_variable_type}", min_value=0.0, help="Enter the usage limit")
+    Capping_or_Minimum_Guarantee = st.number_input(f"Enter the Capping/Minimum Value for {selected_variable_type}", min_value=0.0, help="Enter the Capping/Minimum Gauarntee value")
+    Product = Usage * user_input if selected_fee_nature in ["Fixed %", "Flat currency"] else 0
+
+    abc = ['Capping value', 'Minimum Guarantee']
+    threshold = st.selectbox("Choose a threshold option:", ["--please select--"] + abc)
+
+    initial_expected_billing = Product
 
-st.write(f"Expected Billing: {expected_billing}")
+    if threshold == 'Capping value':
+        expected_billing = Product if Capping_or_Minimum_Guarantee > Product else Capping_or_Minimum_Guarantee
+    elif threshold == 'Minimum Guarantee':
+        expected_billing = Product if Capping_or_Minimum_Guarantee < Product else Capping_or_Minimum_Guarantee
+    else:
+        expected_billing = initial_expected_billing  # Default to initial Product value if no threshold selected
 
-selected_plan_validity = st.selectbox("Plan Validity", ["--please select--"]+plan_validity_options, help="Select the plan validity")
-selected_payment_method = st.selectbox("Payment Method",["--please select--"]+payment_method_options, help="Select the payment method")
+    st.write(f"Expected Billing: {expected_billing}")
+
+    selected_plan_validity = st.selectbox("Plan Validity", ["--please select--"] + plan_validity_options, help="Select the plan validity")
+    selected_payment_method = st.selectbox("Payment Method", ["--please select--"] + payment_method_options, help="Select the payment method")
 
 # Submit button
-if st.button("Submit"):
+    if st.button("Submit"):
     # Save user data
-    user_data = {
+        user_data = {
         "Plan Name": plan_name,
         "Plan Description": plan_description,
         "Plan Start Date": plan_start_date,
@@ -250,13 +328,13 @@ if st.button("Submit"):
         "Expected Billing": expected_billing,
         "Plan Validity": selected_plan_validity,
         "Payment Method": selected_payment_method,
-    }
-    
+        }
+
     # Generate PM_id and add it to user_data
-    pm_id = generate_pm_id(user_data)
-    user_data['PM_id'] = pm_id
-    
-    save_user_data(user_name, user_data)
+        pm_id = generate_pm_id(user_data)
+        user_data['PM_id'] = pm_id
+
+        save_user_data(user_name, user_data)  # Save user data after submission
 
-# Display saved records
-display_saved_records()
+        # Display saved records
+        display_saved_records()

i.ipynb

@@ -0,0 +1 @@
+print("Hello")

requirements.txt

@@ -1,10 +1,11 @@
-altair==5.3.0
+altair==4.2.2
 attrs==23.2.0
 blinker==1.8.2
 cachetools==5.3.3
 certifi==2024.6.2
 charset-normalizer==3.3.2
 click==8.1.7
+entrypoints==0.4
 gitdb==4.0.11
 GitPython==3.1.43
 google-api-core==2.19.0
@@ -41,6 +42,7 @@ pydeck==0.9.1
 Pygments==2.18.0
 pyparsing==3.1.2
 python-dateutil==2.9.0.post0
+python-decouple==3.8
 pytz==2024.1
 referencing==0.35.1
 requests==2.32.3
@@ -51,6 +53,7 @@ rsa==4.9
 six==1.16.0
 smmap==5.0.1
 streamlit==1.35.0
+streamlit-aggrid==1.0.5
 tenacity==8.3.0
 toml==0.10.2
 toolz==0.12.1