Unwanted fields deleted

SonyShrestha · Jun 8, 2024 · a3fd945 · a3fd945
1 parent 6ca2a06
commit a3fd945
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/Website/pages/cust_purchase_expected_expiry.py b/Website/pages/cust_purchase_expected_expiry.py
@@ -31,12 +31,12 @@ def cust_purchase_expected_expiry():
         df = df[df['score']==100]
 
         df = df[["customer_name", "product_name", "purchase_date", "expected_expiry_date"]]
-        df['customer_name'] = df['customer_name'].str.strip()
-        df['product_name'] = df['product_name'].str.strip()
-
-        # Convert 'purchase_date' and 'expected_expiry_date' to datetime
         df['purchase_date'] = pd.to_datetime(df['purchase_date'])
         df['expected_expiry_date'] = pd.to_datetime(df['expected_expiry_date'])
+
+        df = df[df['expected_expiry_date'] >= df['purchase_date'] + pd.DateOffset(days=10)]
+        df['customer_name'] = df['customer_name'].str.strip()
+        df['product_name'] = df['product_name'].str.strip()
 
 
         distinct_customer = df['customer_name'].drop_duplicates().sort_values().tolist()

diff --git a/Website/pages/dynamic_pricing_streamlit.py b/Website/pages/dynamic_pricing_streamlit.py
@@ -158,7 +158,7 @@ def convert_df_to_csv(df):
     st.write("### Select Columns to Display")
     all_columns = filtered_df.columns.tolist()
     filtered_df = filtered_df[filtered_df['Score']==100]
-    all_columns = [col for col in all_columns if col not in ['product_in_avg_expiry_file','Score']]
+    all_columns = [col for col in all_columns if col not in ['product_in_avg_expiry_file','Score','Expiry Date']]
     selected_columns = st.multiselect("Select Columns", all_columns, default=all_columns)