Update app.py

app.py

@@ -6,24 +6,23 @@ import io
 
 st.set_page_config(page_title="Construction Estimator", layout="centered")
 
-def calculate_scaled_quantities(base_qty_df, covered_area):
+def calculate_scaled_quantities(base_qty_df, covered_area, floors):
     """
     base_qty_df: DataFrame with columns: Material, Unit, Quantity_per_1000sqft
     covered_area: float, in sqft
+    floors: int, total floors (including ground floor)
 
-    Returns a DataFrame with scaled quantities according to covered area
+    Returns a DataFrame with scaled quantities according to covered area and floors
     """
     scale_factor = covered_area / 1000
-    base_qty_df['Scaled Quantity'] = base_qty_df['Quantity_per_1000sqft'] * scale_factor
+    ground_floor_qty = base_qty_df['Quantity_per_1000sqft'] * scale_factor
+    # Additional floors at 80% of ground floor quantities
+    additional_floors_qty = ground_floor_qty * 0.8 * (floors - 1) if floors > 1 else 0
+
+    base_qty_df['Scaled Quantity'] = ground_floor_qty + additional_floors_qty
     return base_qty_df
 
 def calculate_costs(qty_df, rates_df):
-    """
-    qty_df: DataFrame with scaled quantities (Material, Unit, Scaled Quantity)
-    rates_df: DataFrame with columns: Material, Unit, Rate_per_Unit
-
-    Returns a DataFrame with cost calculations
-    """
     df = pd.merge(qty_df, rates_df, on=['Material', 'Unit'], how='left')
     df['Amount'] = df['Scaled Quantity'] * df['Rate_per_Unit']
     df.fillna({'Rate_per_Unit':0, 'Amount':0}, inplace=True)
@@ -73,9 +72,9 @@ def draw_floor_plan(rooms, baths, living, car_porch, covered_area):
     return buf
 
 def main():
-    st.title("🧱 Construction Material Estimator")
+    st.title("🧱 Construction Material Estimator with Floors")
 
-    st.markdown("Upload **Base Quantities per 1000 sqft** and **Material Rates** Excel files. Then enter project details to calculate detailed BOQ and cost.")
+    st.markdown("Upload **Base Quantities per 1000 sqft** and **Material Rates** Excel files. Then enter project details including number of floors.")
 
     qty_file = st.file_uploader("Upload Base Quantities Excel (Material, Unit, Quantity_per_1000sqft)", type=["xlsx", "xls"])
     rate_file = st.file_uploader("Upload Material Rates Excel (Material, Unit, Rate_per_Unit)", type=["xlsx", "xls"])
@@ -85,7 +84,6 @@ def main():
             qty_df = pd.read_excel(qty_file)
             rate_df = pd.read_excel(rate_file)
 
-            # Validate expected columns
             required_qty_cols = {'Material', 'Unit', 'Quantity_per_1000sqft'}
             required_rate_cols = {'Material', 'Unit', 'Rate_per_Unit'}
 
@@ -97,13 +95,14 @@ def main():
                 return
 
             covered_area = st.number_input("Covered Area (sqft)", min_value=100, value=1200)
+            floors = st.number_input("Number of Floors", min_value=1, value=1)
             rooms = st.number_input("Number of Rooms", min_value=0, value=3)
             baths = st.number_input("Number of Bathrooms", min_value=0, value=2)
             living = st.number_input("Number of Living Rooms", min_value=0, value=1)
             car_porch = st.number_input("Number of Car Porches", min_value=0, value=1)
 
             if st.button("Calculate BOQ & Cost"):
-                scaled_qty_df = calculate_scaled_quantities(qty_df, covered_area)
+                scaled_qty_df = calculate_scaled_quantities(qty_df, covered_area, floors)
                 cost_df = calculate_costs(scaled_qty_df, rate_df)
                 boq_table = generate_boq_table(cost_df)