From adbb9efa195198531e38a703dee5e787d46444f2 Mon Sep 17 00:00:00 2001
From: Sven Augustin <sven.augustin@psi.ch>
Date: Sun, 22 May 2022 22:43:47 +0200
Subject: [PATCH] moved customized aggrid into separate file

---
 aggrid.py | 36 ++++++++++++++++++++++++++++++++++++
 stand.py  | 31 ++++---------------------------
 2 files changed, 40 insertions(+), 27 deletions(-)
 create mode 100644 aggrid.py

diff --git a/aggrid.py b/aggrid.py
new file mode 100644
index 0000000..761f47e
--- /dev/null
+++ b/aggrid.py
@@ -0,0 +1,36 @@
+from st_aggrid import AgGrid, GridOptionsBuilder
+
+from utils import make_key
+
+
+def aggrid(df, reload_data=False):
+    df = df[::-1] # display in reversed chronological order
+
+    gob = GridOptionsBuilder.from_dataframe(
+        df,
+        editable=True,
+        filterable=True,
+        groupable=True,
+        resizable=True,
+        sortable=True
+    )
+
+    gob.configure_auto_height(True)
+    go = gob.build()
+
+    response = AgGrid(
+        df,
+        go,
+        theme="streamlit",
+        fit_columns_on_grid_load=True,
+        reload_data=reload_data,
+        key=make_key(df)
+    )
+
+    df = response.get("data", df)
+    response["data"] = df[::-1] # undo reversed chronological order
+
+    return response
+
+
+
diff --git a/stand.py b/stand.py
index 2aff4c5..cf61083 100644
--- a/stand.py
+++ b/stand.py
@@ -1,10 +1,9 @@
 import streamlit as st
-from st_aggrid import AgGrid, GridOptionsBuilder
 
 import hacks
 
+from aggrid import aggrid
 from restapi import restapi
-from utils import make_key
 from utils.st_utils import get_session_id, rerun, hide_UI_elements
 from utils.df_utils import to_excel_binary
 
@@ -56,35 +55,13 @@ with col1:
 
 
 
-gob = GridOptionsBuilder.from_dataframe(
+response = aggrid(
     df,
-    editable=True,
-    filterable=True,
-    groupable=True,
-    resizable=True,
-    sortable=True
-)
-
-gob.configure_auto_height(True)
-go = gob.build()
-
-#st.write(go)
-
-response = AgGrid(
-    df[::-1],
-    go,
-
-    theme="streamlit",
-
-    fit_columns_on_grid_load=True,
-
-    reload_data=changed,
-    key=make_key(df)
+    reload_data=changed
 )
 
 
-new_df = response.get("data")#, df)
-new_df = new_df[::-1]
+new_df = response["data"]
 if not new_df.equals(df) and not changed:
     restapi.data = new_df
 #    print("old:")