Update order of Dismissed and last message

app.py

@@ -164,25 +164,9 @@ def nuc_monitor(usr_start_date, usr_end_date, past_date, mongo_db_data):
     current_datetime_str = current_datetime.strftime("%Y-%m-%d")
 
     # nuclear_unav = mongo_unavs.copy()[(mongo_unavs.copy()["production_type"] == "NUCLEAR") & (mongo_unavs.copy()["updated_date"] <= past_date_str)]
-    print(past_date_str)
-    nuclear_unav = mongo_unavs[
-    (mongo_unavs["production_type"] == "NUCLEAR") &
-    # (mongo_unavs["updated_date"] <= past_date_str) &
-    (mongo_unavs["status"] != "DISMISSED")]
-
-    # if photo_date == True:
-    #     nuclear_unav = merged_df.copy()[(merged_df.copy()["production_type"] == "NUCLEAR") & (merged_df.copy()["updated_date"] <= past_date_str)]
-    #     photo_date = True
-    # else: # need to add updated_date as a conditional to get the newest for that day
-    #     nuclear_unav = merged_df.copy()[(merged_df.copy()["production_type"] == "NUCLEAR") & (merged_df.copy()["updated_date"] <= end_date_str)]
-
-# --------------------------- HERE IS THE CHANGE TO GET ONLY ACTIVE OR ACTIVE AND INACTIVE --------------------------- #
-
-    # --------------------- SECOND DATA CLEANING ------------------------ #    
-    # This filter should take only the most recent id and discard the rest
-
-    # Sort by updated date
-    sorted_df = nuclear_unav.copy().sort_values(by='updated_date')
+    # print(past_date_str)
+        # Sort by updated date
+    sorted_df = mongo_unavs.copy().sort_values(by='updated_date')
 
     sorted_df = sorted_df.copy().reset_index(drop=True)
 
@@ -200,6 +184,24 @@ def nuc_monitor(usr_start_date, usr_end_date, past_date, mongo_db_data):
 
     filtered_id_df = filtered_id_df.copy().reset_index(drop=True)
 
+    filtered_df = filtered_id_df[
+    (filtered_id_df["production_type"] == "NUCLEAR") &
+    # (mongo_unavs["updated_date"] <= past_date_str) &
+    (filtered_id_df["status"] != "DISMISSED")]
+
+    # if photo_date == True:
+    #     nuclear_unav = merged_df.copy()[(merged_df.copy()["production_type"] == "NUCLEAR") & (merged_df.copy()["updated_date"] <= past_date_str)]
+    #     photo_date = True
+    # else: # need to add updated_date as a conditional to get the newest for that day
+    #     nuclear_unav = merged_df.copy()[(merged_df.copy()["production_type"] == "NUCLEAR") & (merged_df.copy()["updated_date"] <= end_date_str)]
+
+# --------------------------- HERE IS THE CHANGE TO GET ONLY ACTIVE OR ACTIVE AND INACTIVE --------------------------- #
+
+    # --------------------- SECOND DATA CLEANING ------------------------ #    
+    # This filter should take only the most recent id and discard the rest
+
+
+
     # This filter should take all the dates with unavs that include days with unavs in the range of the start and end date
 
 
@@ -210,8 +212,6 @@ def nuc_monitor(usr_start_date, usr_end_date, past_date, mongo_db_data):
     # Need to eventually do a filter that takes the most restrictive updated identifier instead of the most recent when there 
     # is an overlap
     
-    filtered_df = filtered_id_df.copy()
-
     # Update available_capacity where the condition is True
 
     # Standardize datetime in dataframe