Upload app.py

app.py

@@ -4,21 +4,26 @@ from datetime import datetime
 import os
 import configparser  # For activating the config
 
-
-global_user_data = [] #For appending user_data
+global_user_data = []  # For appending user_data
 
 
 # Function to initialize session state
 def initialize_session_state():
     if 'data' not in st.session_state:
-        st.session_state.data = {}
+        st.session_state.data = []
+    if 'alphabet_counter' not in st.session_state:
+        st.session_state.alphabet_counter = 0
+    if 'serial_counter' not in st.session_state:
+        st.session_state.serial_counter = -1
+
 
 # Function to save user data
-def save_user_data(user_name, user_data):
-    st.session_state.data[user_name] = user_data
+def save_user_data(user_data):
+    st.session_state.data.append(user_data)
+
 
 # Function to generate PM_id
-def generate_pm_id(user_data):
+def generate_rule_id(user_data):
     company_id = user_data.get('Company ID', '')
     ordering_channels = user_data.get('Ordering Channels', '')
     fulfilling_location = user_data.get('Fulfilling Location', '')
@@ -32,7 +37,7 @@ def generate_pm_id(user_data):
     company_id = company_id.zfill(5)[:5]
 
     # Extract first 2 characters from each field
-    pm_id_parts = [
+    rule_id_parts = [
         company_id[:5],
         ordering_channels[:2],
         fulfilling_location[:2],
@@ -44,24 +49,57 @@ def generate_pm_id(user_data):
         threshold[:2]
     ]
 
-    pm_id = '_'.join(pm_id_parts)  # Join parts with underscore
-    return pm_id
+    rule_id = '_'.join(rule_id_parts)  # Join parts with underscore
+    return rule_id
+
+
+# Function to generate Plan ID
+def generate_plan_id(user_data):
+    initialize_session_state()  # Ensure session state is initialized
+
+    alphabet_counter = st.session_state.alphabet_counter
+    serial_counter = st.session_state.serial_counter
+
+    company_id = user_data.get('Company ID', '')  # Get company_id from user_data
+
+    # Increment serial counter and reset if it reaches 999999
+    serial_counter += 1
+    if serial_counter > 999999:
+        serial_counter = 0
+        alphabet_counter += 1
+
+    # Save updated counters back to session state
+    st.session_state['alphabet_counter'] = alphabet_counter
+    st.session_state['serial_counter'] = serial_counter
+
+    # Calculate alphabet ('a' to 'z')
+    current_alphabet = chr(alphabet_counter % 26 + ord('a'))
+
+    # Format serial counter as six-digit number
+    serial_number = str(serial_counter).zfill(6)
+
+    # Get the first 5 characters of company_id and pad it with zeros
+    company_id_part = company_id[:5].zfill(5)
+
+    # Generate the plan_id
+    plan_id = f"{company_id_part}_{current_alphabet}_{serial_number}"
+
+    return plan_id
+
 
 # Function to display saved records as a table and save to CSV
 def display_saved_records():
     st.subheader(":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'
-    
-    # Generate PM_id column
-    df['PM_id'] = df.apply(generate_pm_id, axis=1)
-    
-    # Display DataFrame with increased height
-    st.write(df.style.set_table_attributes('style="font-size: 14px; line-height: 18px; width: auto; height: auto;"'))
-
-    # Save records to CSV
+    df = pd.DataFrame(st.session_state.data)
+
     if not df.empty:
+        # Apply generate_rule_id function to each row to generate rule_id
+        df['rule_id'] = df.apply(lambda row: generate_rule_id(row), axis=1)
+
+        # Display DataFrame with increased height
+        st.write(df.style.set_table_attributes('style="font-size: 14px; line-height: 18px; width: auto; height: auto;"'))
+
+        # Save records to CSV
         folder_path = "data"  # Folder name
         os.makedirs(folder_path, exist_ok=True)  # Create folder if it doesn't exist
         file_path = os.path.join(folder_path, "records.csv")
@@ -76,6 +114,7 @@ def display_saved_records():
             mime="text/csv",
         )
 
+
 # Function to load theme configuration
 def load_theme_config():
     config = configparser.ConfigParser()
@@ -85,12 +124,12 @@ def load_theme_config():
     theme_settings = config['theme']
     return theme_settings
 
+
 # Initialize session state
 initialize_session_state()
 
 theme_settings = load_theme_config()
 
-
 # Apply theme settings to Streamlit
 st.set_page_config(
     page_title="Plan maker",
@@ -100,60 +139,79 @@ st.set_page_config(
 )
 
 
-
 # Section 1: Plan Info
-st.sidebar.image('Fynd_logo2.png', width = 270)
+st.sidebar.image('Fynd_logo2.png', width=300)
+st.sidebar.title(":blue[Plan maker]")
 user_name = st.sidebar.text_input("Enter your name:")
 st.sidebar.title("Section 1: Plan Info")
+v1 = ["Commerce India", "Reliance", "Commerce Global", "Government Projects", "Individual BH"]
+business_head = st.sidebar.selectbox("Business Head", [""] + v1, help="Enter the name of Business head")
+company_id = st.sidebar.text_input("Company ID", help="Enter the company ID")
+company_name = st.sidebar.text_input("Company Name", help="Enter the company name")
+bundle_by = st.sidebar.radio(options=["Single value", "Feature specific"], label="Bundle by", index=None)
+if bundle_by == "Single value":
+    user_input = st.sidebar.text_input("Enter the Commercial value:")
+elif bundle_by == "Feature specific":
+    user_input = st.sidebar.text_input("Enter multiple values:")
+
 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")
 plan_start_date = st.sidebar.date_input("Plan Start Date", value=datetime.now(), help="Select the start date of the plan")
-a1 = ["GoFynd", "Uniket", "B2B", "Marketplaces", "StoreOS", "Website", "ONDC", "OMS", "TMS", "WMS", "GMC", "Catalog Cloud", "FCP"]
-ordering_channels = st.sidebar.selectbox("Product lines", [""]+a1, help="Select the ordering channels")
+
 
 # Section 2: Company Info
-st.sidebar.title("Section 2: Company Info")
-company_id = st.sidebar.text_input("Company ID", help="Enter the company ID")
-company_name = st.sidebar.text_input("Company Name", help="Enter the company name")
+st.sidebar.title("Section 2: Rule Info")
+a1 = ["GoFynd", "Uniket", "B2B", "Marketplaces", "StoreOS", "Storefronts", "ONDC", "Fynd OMS", "Fynd TMS", "Fynd WMS",
+      "GMC", "Catalog Cloud", "Fynd Commerce Platform", "Logistics", "PixelBin", "Boltic", "CoPilot"]
+ordering_channels = st.sidebar.selectbox("Product lines", [""] + a1, help="Select the ordering channels")
 
 # Layer 1: Mapping of Ordering channels with Fulfilling location
-if "TMS" in ordering_channels or "GMC" in ordering_channels or "Catalog Cloud" in ordering_channels:
+if "Fynd TMS" in ordering_channels or "GMC" in ordering_channels or "Catalog Cloud" in ordering_channels:
     fulfilling_location = None
     application_id = None
 else:
     abc = ["Store", "Warehouse"]
-    fulfilling_location = st.sidebar.selectbox("Fulfilling Location",[""] +  abc, help="Select the fulfilling location")
+    fulfilling_location = st.sidebar.selectbox("Fulfilling Location", [""] + abc, help="Select the fulfilling location")
     application_id = st.sidebar.text_input("Application ID", key="application_id_input", help="Enter the application ID")
 
 # Section 3: Defining products for each dropdown
-product_options = ["B2B", "Marketplaces", "StoreOS", "Website", "ONDC", "OMS", "TMS", "WMS", "GMC", "Catalog Cloud", "FCP"], 
-fee_type_options = ["Development", "Subscription", "Maintenance", "Transaction", "Minimum Guarantee", "Logistics", "Packaging", "SLA", "Licensing"]
-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"]
+product_options = ["B2B", "Marketplaces", "StoreOS", "Storefronts", "ONDC", "Fynd OMS", "Fynd TMS", "Fynd WMS", "GMC",
+                   "Catalog Cloud", "Fynd Commerce Platform", "Logistics", "Logistics", "PixelBin", "Boltic",
+                   "CoPilot"]
+fee_type_options = ["Development", "Subscription", "Maintenance", "Transaction", "Minimum Guarantee", "Logistics",
+                    "Packaging", "SLA", "Licensing"]
+fee_nature_options = ["Fixed %", "Flat currency", "Slab based", "As per rate card"]
+variable_options = ["Bag", "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"]
 
-# In the first column, display the image
-st.image("Fynd copy.png", width=200)
-
-st.title(":violet[Plan maker]")
-
 # Mapping index
 fee_config = {
     'fee_type_mapping': {
-        "ONDC": ["Development","Subscription", "Maintenance", "Transaction", "Minimum Guarantee", "Logistics", "Marketing", "SLA"],
-        "GoFynd": ["Transaction","Logistics","Marketing", "Packaging", "SLA"],
-        "B2B": ["Development","Subscription","Maintenance", "Transaction", "Minimum Guarantee", "Logistics", "Packaging"],
-        "Marketplaces": ["Development","Subscription","Maintenance", "Transaction", "Minimum Guarantee"],
-        "StoreOS": ["Development","Subscription","Maintenance", "Licensing", "Transaction", "Minimum Guarantee", "Logistics", "Packaging"],
-        "Website": ["Development","Subscription","Maintenance", "Transaction", "Minimum Guarantee", "Logistics"],
-        "TMS": ["Development","Subscription","Maintenance", "Licensing", "Logistics"],
-        "WMS": ["Development","Subscription","Maintenance", "Licensing", "Transaction", "Minimum Guarantee", "Logistics", "Packaging"],
-        "GMC": ["Development","Subscription","Maintenance"],
-        "Catalog Cloud": ["Development","Subscription","Maintenance"],
-        "Uniket": ["Transaction","Logistics","Marketing","Packaging","SLA"],
-        "OMS": ["Development","Subscription","Maintenance", "Transaction", "Minimum Guarantee"]
+        "ONDC": ["Development", "Subscription", "Maintenance", "Transaction", "Minimum Guarantee", "Logistics",
+                 "Marketing", "SLA"],
+        "GoFynd": ["Transaction", "Logistics", "Marketing", "Packaging", "SLA"],
+        "B2B": ["Development", "Subscription", "Maintenance", "Transaction", "Minimum Guarantee", "Logistics",
+                "Packaging"],
+        "Marketplaces": ["Development", "Subscription", "Maintenance", "Transaction", "Minimum Guarantee"],
+        "StoreOS": ["Development", "Subscription", "Maintenance", "Licensing", "Transaction", "Minimum Guarantee",
+                    "Logistics", "Packaging"],
+        "Storefronts": ["Development", "Subscription", "Maintenance", "Transaction", "Minimum Guarantee", "Logistics"],
+        "Fynd TMS": ["Development", "Subscription", "Maintenance", "Licensing", "Logistics"],
+        "Fynd WMS": ["Development", "Subscription", "Maintenance", "Licensing", "Transaction", "Minimum Guarantee",
+                     "Logistics", "Packaging"],
+        "GMC": ["Development", "Subscription", "Maintenance"],
+        "Catalog Cloud": ["Development", "Subscription", "Maintenance"],
+        "Uniket": ["Transaction", "Logistics", "Marketing", "Packaging", "SLA"],
+        "Fynd OMS": ["Development", "Subscription", "Maintenance", "Transaction", "Minimum Guarantee"],
+        "Fynd Commerce Platform": ["Subscription"],
+        "Logistics": ["Logistics"],
+        "PixelBin": ["Subscription"],
+        "Boltic": ["Subscription"],
+        "CoPilot": ["Subscription"],
+
     }
 }
 
@@ -163,61 +221,63 @@ var_config = {
         "Subscription": ["Application", "Extension", "Integration", "Platform"],
         "Maintenance": ["Application", "Extension", "Integration"],
         "Licensing": ["Store", "User"],
-        "Transaction": ["Bag", "Order", "Shipment"],
-        "Minimum Guarantee": ["Bag", "Order", "Shipment"],
-        "SLA": ["Bag", "Order", "Shipment"],
-        "Logistics":["Shipment"],
-        "Marketing":["Bag","Order"],
-        "Packaging":["Shipment"]
+        "Transaction": ["Bag", "Shipment"],
+        "Minimum Guarantee": ["Bag", "Shipment"],
+        "SLA": ["Bag", "Shipment"],
+        "Logistics": ["Shipment"],
+        "Marketing": ["Bag"],
+        "Packaging": ["Shipment"]
     }
 }
 
 char_config = {
-    'chargeable_on_mapping' :{
+    'chargeable_on_mapping': {
         "Application": ["Developed", "Installed"],
         "Extension": ["Developed", "Installed", "Subscribed"],
         "Integration": ["Developed", "Installed"],
         "Store": ["Added", "Active"],
         "User": ["Added", "Active"],
         "Bag": ["Placed", "Invoiced", "Delivered", "Return window", "Cancel", "RTO", "DTO"],
-        "Order": ["Placed", "Invoiced", "Delivered", "Return window", "Cancel", "RTO", "DTO"],
-        "Shipment":["Placed", "Invoiced", "Delivered", "Return window", "All", "Picked", "RTO", "DTO","Packed", "Cancel"],
+        "Shipment": ["Placed", "Invoiced", "Delivered", "Return window", "All", "Picked", "RTO", "DTO", "Packed",
+                     "Cancel"],
         "Platform": ["Subscribed"],
     }
 }
 
+
 # 2nd layer: Mapping of Ordering channels with fee types
 fee_type_mapping = fee_config['fee_type_mapping']
-selected_fee_type = st.selectbox("Fee Type", [""] + fee_type_mapping.get(ordering_channels, []), help="Select the type of fee")
+selected_fee_type = st.selectbox("Fee Type", [""] + fee_type_mapping.get(ordering_channels, []),
+                                 help="Select the type of fee")
 
-# 3rd layer mapping: Mapping of Fee type with variables 
+# 3rd layer mapping: Mapping of Fee type with variables
 variable_type_mapping = var_config["variable_type_mapping"]
-selected_variable_type = st.selectbox("Variable Type", [""] + variable_type_mapping.get(selected_fee_type, []), help="Select the type of variable")
+selected_variable_type = st.selectbox("Variable Type", [""] + variable_type_mapping.get(selected_fee_type, []),
+                                      help="Select the type of variable")
 
-# 4th layer mapping: Mapping of Fee type with variables 
+# 4th layer mapping: Mapping of Fee type with variables
 chargeable_on_mapping = char_config["chargeable_on_mapping"]
-selected_chargeable_on = st.selectbox("Chargeable on", [""] + chargeable_on_mapping.get(selected_variable_type, []), help="Select the type of Chargeable")
+selected_chargeable_on = st.selectbox("Chargeable on", [""] + chargeable_on_mapping.get(selected_variable_type, []),
+                                       help="Select the type of Chargeable")
 
 # 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"])
+slabs_df = pd.DataFrame(columns=["Slab", "Max_value", "Commercial_value", "Usage", "Capping/Min_Guarantee_value", "Threshold"])
 
 ttt = ["Fixed %", "Flat currency", "Slab based"]
-selected_fee_nature = st.selectbox("Fee Nature:",[""]+ ttt, key="fee_nature_select")
+selected_fee_nature = st.selectbox("Fee Nature:", [""] + ttt, key="fee_nature_select")
 
 if selected_fee_nature == "Slab based":
     st.write("Enter values for Slab based fee structure:")
 
-# Function to add data to DataFrame
-
     # Initialize an empty list to store data rows
-    global_new_row = []
+    global_data_rows = []
 
     def add_data(slab, max_value, user_input, Usage, Capping_or_Minimum_Guarantee, threshold):
-    # Convert values to int if not None
-        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
+        # Convert values to int if not None
+        max_value = int(max_value.strip()) if max_value else None
+        user_input = int(user_input.strip()) if user_input else None
+        Usage = int(Usage.strip()) if Usage else None
+        Capping_or_Minimum_Guarantee = int(Capping_or_Minimum_Guarantee.strip()) if Capping_or_Minimum_Guarantee else None
 
         new_row = {
             "Slab": slab,
@@ -228,15 +288,15 @@ if selected_fee_nature == "Slab based":
             "Threshold": threshold
         }
 
-    # Append new_row to global list
-        global_new_row.append(new_row)
+        # Append new_row to global list of rows
+        global_data_rows.append(new_row)
 
-# Streamlit UI code
+    # Streamlit UI code
     def main():
         st.title("Slab Data Management")
 
-    # Inputs for adding data
-    # Input fields for user data
+        # Inputs for adding data
+        # Input fields for user data
         col1, col2 = st.columns([2, 2])
 
         with col1:
@@ -248,34 +308,36 @@ if selected_fee_nature == "Slab based":
         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")
+            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")
 
-    # Button to add data
+        # Button to add data
         if st.button("Add Data", key="add_data_button"):
             add_data(slab, max_value, user_input, Usage, Capping_or_Minimum_Guarantee, threshold)
             st.success(f"Data for Slab '{slab}' added successfully!")
 
-    # Display global_new_row in a table
-        if global_new_row:
+        # Display all rows in a table
+        if global_data_rows:
             st.subheader("Added Slabs")
-            st.table(global_new_row)
+            for i, row in enumerate(global_data_rows):
+                st.write(f"Entry {i + 1}:")
+                st.table([row])
 
     if __name__ == "__main__":
         main()
-    
 
 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")
 
     # 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")
+    Capping_or_Minimum_Guarantee = st.number_input(f"Enter the Capping/Minimum Guarantee 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:", [""]+ abc)
+    threshold = st.selectbox("Choose a threshold option:", [""] + abc)
 
     initial_expected_billing = Product
 
@@ -286,15 +348,15 @@ elif selected_fee_nature in ["Fixed %", "Flat currency"]:
     else:
         expected_billing = initial_expected_billing  # Default to initial Product value if no threshold selected
 
-    st.write(f"Expected Billing: {expected_billing}")
+    st.write(f"Expected Billing (excluding GST): {expected_billing}")
 
-selected_plan_validity = st.selectbox("Plan Validity", [""]+ plan_validity_options, help="Select the plan validity", key = "plan_vd_2")
-selected_payment_method = st.selectbox("Payment Method", [""]+ payment_method_options, help="Select the payment method", key = "py_vd_2")
+selected_plan_validity = st.selectbox("Plan Validity", [""] + plan_validity_options, help="Select the plan validity", key="plan_vd_2")
+selected_payment_method = st.selectbox("Payment Method", [""] + payment_method_options, help="Select the payment method", key="py_vd_2")
 
 # Submit button
 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,
@@ -314,17 +376,19 @@ if st.button("Submit"):
         "Expected Billing": expected_billing,
         "Plan Validity": selected_plan_validity,
         "Payment Method": selected_payment_method,
-        }
+    }
 
-        global_user_data.append(user_data)
-        
+    global_user_data.append((user_name, user_data))
 
     # Generate PM_id and add it to user_data
-        pm_id = generate_pm_id(user_data)
-        user_data['PM_id'] = pm_id
+    rule_id = generate_rule_id(user_data)
+    user_data['rule_id'] = rule_id
+
+    # Generate Plan ID and add it to user_data
+    plan_id = generate_plan_id(user_data)
+    user_data['plan_id'] = plan_id
 
-        save_user_data(user_name, user_data)  # Save user data after submission
+    save_user_data(user_data)  # Save user data after submission
 
-        # Display saved records
-        display_saved_records()
-  
+    # Display saved records
+    display_saved_records()