Skip to content

Commit ef736d6

Browse files
fixed download csv button and improved table situation
1 parent 2a8469e commit ef736d6

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

src/penn_chime/presentation.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -485,15 +485,16 @@ def draw_projected_admissions_table(
485485
return None
486486

487487

488-
def draw_census_table(st, census_df: pd.DataFrame, labels, day_range, as_date: bool = False):
488+
def draw_census_table(
489+
st, census_df: pd.DataFrame, labels, day_range, date_first_hospitalized: Optional[date] = None, as_date: bool = False):
489490
census_table = census_df[np.mod(census_df.index, day_range) == 0].copy()
490491
census_table.index = range(census_table.shape[0])
491492
census_table.loc[0, :] = 0
492493
census_table = census_table.dropna().astype(int)
493494

494495
if as_date:
495496
census_table = add_date_column(
496-
census_table, drop_day_column=True, date_format=DATE_FORMAT
497+
census_table, date_first_hospitalized, drop_day_column=True, date_format=DATE_FORMAT
497498
)
498499

499500
census_table.rename(labels)
@@ -510,7 +511,7 @@ def draw_raw_sir_simulation_table(st, model, parameters):
510511

511512
if as_date:
512513
infect_table = add_date_column(
513-
infect_table, drop_day_column=True, date_format=DATE_FORMAT
514+
infect_table, parameters.date_first_hospitalized, drop_day_column=True, date_format=DATE_FORMAT
514515
)
515516

516517
st.table(infect_table)
@@ -522,7 +523,7 @@ def draw_raw_sir_simulation_table(st, model, parameters):
522523

523524
def build_download_link(st, filename: str, df: pd.DataFrame, parameters: Parameters):
524525
if parameters.as_date:
525-
df = add_date_column(df, drop_day_column=True, date_format="%Y-%m-%d")
526+
df = add_date_column(df, parameters.date_first_hospitalized, drop_day_column=True, date_format="%Y-%m-%d")
526527

527528
csv = dataframe_to_base64(df)
528529
st.markdown("""

0 commit comments

Comments
 (0)