Jon Solow commited on
Commit
0e25142
·
1 Parent(s): 0f65f49

Show latest scraped date based on filter

Browse files
Files changed (1) hide show
  1. src/pages/3_ECR.py +8 -6
src/pages/3_ECR.py CHANGED
@@ -22,12 +22,10 @@ def load_data():
22
  # Merge ADP
23
  data = load_adp()
24
  ranking_type_list = sorted(list(data.ranking_type.unique()))
25
- latest_scrape_date = data.scrape_date.max()
26
- return data, ranking_type_list, latest_scrape_date
27
 
28
 
29
- def filtered_keeper_dataframe(data: pd.DataFrame, ranking_type_list: list[str], latest_scrape_date: str):
30
- st.write(f"Scraped data as of: {latest_scrape_date}")
31
  default_ix = ranking_type_list.index("ppr-superflex-cheatsheets")
32
  ranking_type_selected = st.selectbox("ECR Format:", ranking_type_list, index=default_ix)
33
  ranking_type_filter = data["ranking_type"] == ranking_type_selected
@@ -57,6 +55,10 @@ def filtered_keeper_dataframe(data: pd.DataFrame, ranking_type_list: list[str],
57
  else:
58
  show_columns = id_cols + adp_cols
59
 
 
 
 
 
60
  filtered_data = filter_dataframe(data.loc[ranking_type_filter, show_columns])
61
  st.dataframe(
62
  filtered_data,
@@ -76,10 +78,10 @@ def get_keeper_app():
76
  st.set_page_config(page_title=keeper_title, page_icon=DEFAULT_ICON, layout="wide")
77
  get_authorization_button()
78
  st.title(keeper_title)
79
- data, ecr_type_list, latest_scrape_date = load_data()
80
 
81
  with st.container():
82
- filtered_keeper_dataframe(data, ecr_type_list, latest_scrape_date)
83
 
84
 
85
  if __name__ == "__main__":
 
22
  # Merge ADP
23
  data = load_adp()
24
  ranking_type_list = sorted(list(data.ranking_type.unique()))
25
+ return data, ranking_type_list
 
26
 
27
 
28
+ def filtered_ecr_dataframe(data: pd.DataFrame, ranking_type_list: list[str]):
 
29
  default_ix = ranking_type_list.index("ppr-superflex-cheatsheets")
30
  ranking_type_selected = st.selectbox("ECR Format:", ranking_type_list, index=default_ix)
31
  ranking_type_filter = data["ranking_type"] == ranking_type_selected
 
55
  else:
56
  show_columns = id_cols + adp_cols
57
 
58
+ data_filtered_by_ranking_type = data.loc[ranking_type_filter]
59
+ latest_scrape_date = data_filtered_by_ranking_type.scrape_date.max()
60
+ st.write(f"Scraped data as of: {latest_scrape_date}")
61
+
62
  filtered_data = filter_dataframe(data.loc[ranking_type_filter, show_columns])
63
  st.dataframe(
64
  filtered_data,
 
78
  st.set_page_config(page_title=keeper_title, page_icon=DEFAULT_ICON, layout="wide")
79
  get_authorization_button()
80
  st.title(keeper_title)
81
+ data, ecr_type_list = load_data()
82
 
83
  with st.container():
84
+ filtered_ecr_dataframe(data, ecr_type_list)
85
 
86
 
87
  if __name__ == "__main__":