Update page_files/Categorized_Search.py

page_files/Categorized_Search.py

@@ -6,6 +6,8 @@ import pandas as pd
 import streamlit as st
 from PIL import Image
 
+from streamlit_scroll_to_top import scroll_to_here
+
 from data_loader import get_all_sections, load_material_data
 import streamlit.components.v1 as components
 def clear_search():
@@ -429,6 +431,7 @@ defaults = {
     "inspect_section": None,
     "inspect_property": None,
     "_reset_prop_checks": False,
+    "_scroll_to_results": False, 
 }
 
 for key, value in defaults.items():
@@ -749,6 +752,15 @@ with right_col:
                 "Fibers": "🟠 FIBER",
             }
 
+            matrix_fiber_filtered = (
+                "Composites" in st.session_state.active_classes
+                and (st.session_state.selected_matrix != "All" or st.session_state.selected_fiber != "All")
+            )
+
+            if page_meta.empty and matrix_fiber_filtered:
+                st.info("There's no such material with this combination of Matrix and Fiber.")
+
+
             if not page_meta.empty:
                 table_df = page_meta.copy()
 
@@ -942,6 +954,88 @@ with right_col:
                     )
                     st.session_state.inspect_section = section_choice
 
+                    # properties_df = (
+                    #     material_df[material_df["section"] == section_choice][
+                    #         ["property_name", "section"]
+                    #     ]
+                    #     .drop_duplicates()
+                    #     .reset_index(drop=True)
+                    # )
+                    # #st.dataframe(properties_df, use_container_width=True, hide_index=True, height=240)
+                    # rows_html = "".join(
+                    #     f"<tr><td style='padding:8px 12px;font-size:0.82rem;color:#111827;border-bottom:1px solid #f8fafc;'>{row['property_name']}</td>"
+                    #     f"<td style='padding:8px 12px;font-size:0.82rem;color:#64748b;border-bottom:1px solid #f8fafc;'>{row['section']}</td></tr>"
+                    #     for _, row in properties_df.iterrows()
+                    # )
+                    # st.markdown(f"""
+                    #     <div style='border:1px solid #edf2f7;border-radius:8px;overflow:hidden;max-height:240px;overflow-y:auto;'>
+                    #         <table style='width:100%;border-collapse:collapse;'>
+                    #             <thead>
+                    #                 <tr style='background:#f8fafc;'>
+                    #                     <th style='padding:8px 12px;font-size:0.64rem;font-weight:700;letter-spacing:1px;color:#94a3b8;text-align:left;border-bottom:1px solid #edf2f7;'>PROPERTY NAME</th>
+                    #                     <th style='padding:8px 12px;font-size:0.64rem;font-weight:700;letter-spacing:1px;color:#94a3b8;text-align:left;border-bottom:1px solid #edf2f7;'>SECTION</th>
+                    #                 </tr>
+                    #             </thead>
+                    #             <tbody>{rows_html}</tbody>
+                    #         </table>
+                    #     </div>
+                    # """, unsafe_allow_html=True)
+                    # property_options = properties_df["property_name"].dropna().tolist()
+                    # if property_options:
+                    #     if st.session_state.inspect_property not in property_options:
+                    #         st.session_state.inspect_property = property_options[0]
+
+                    #     property_choice = st.selectbox(
+                    #         "Property",
+                    #         property_options,
+                    #         index=property_options.index(st.session_state.inspect_property),
+                    #         key="inspect_property_select",
+                    #     )
+                    #     st.session_state.inspect_property = property_choice
+
+                    #     # if st.button("Display", key="inspect_search", type="primary"):
+                    #     #     result = all_data[
+                    #     #         (all_data["material_abbreviation"] == selected_abbr)
+                    #     #         & (all_data["property_name"] == property_choice)
+                    #     #         & (all_data["value"].notna())
+                    #     #     ]
+
+                    #     #     if result.empty:
+                    #     #         st.warning("No data found for this material-property combination")
+                    #     #     else:
+                    #     #         st.subheader("Property Data")
+                    #     #         st.dataframe(result.T, use_container_width=True)
+
+                    #     #         st.subheader("Property Graph")
+                    #     #         image_path = Path("images") / f"{selected_abbr}_{property_choice}.png"
+                    #     #         if image_path.exists():
+                    #     #             image = Image.open(image_path)
+                    #     #             st.image(image, use_container_width=True, caption="Stress strain curve")
+                    #     #         else:
+                    #     #             st.caption("No plot image available for this material-property pair.")
+
+                    #     if st.button("Display", key="inspect_search", type="primary"):
+                    #         result = all_data[
+                    #             (all_data["material_abbreviation"] == selected_abbr)
+                    #             & (all_data["property_name"] == property_choice)
+                    #             & (all_data["value"].notna())
+                    #         ]
+
+                    #         if result.empty:
+                    #             st.warning("No data found for this material-property combination")
+                    #         else:
+                    #             st.subheader("Property Data")
+                    #             st.dataframe(result.T, use_container_width=True)
+
+                    #             st.subheader("Property Graph")
+                    #             image_path = Path("images") / f"{selected_abbr}_{property_choice}.png"
+                    #             if image_path.exists():
+                    #                 image = Image.open(image_path)
+                    #                 st.image(image, use_container_width=True, caption="Stress strain curve")
+                    #             else:
+                    #                 st.caption("No plot image available for this material-property pair.")
+
+                    #             st.session_state._scroll_to_results = True
                     properties_df = (
                         material_df[material_df["section"] == section_choice][
                             ["property_name", "section"]
@@ -949,39 +1043,35 @@ with right_col:
                         .drop_duplicates()
                         .reset_index(drop=True)
                     )
-                    #st.dataframe(properties_df, use_container_width=True, hide_index=True, height=240)
-                    rows_html = "".join(
-                        f"<tr><td style='padding:8px 12px;font-size:0.82rem;color:#111827;border-bottom:1px solid #f8fafc;'>{row['property_name']}</td>"
-                        f"<td style='padding:8px 12px;font-size:0.82rem;color:#64748b;border-bottom:1px solid #f8fafc;'>{row['section']}</td></tr>"
-                        for _, row in properties_df.iterrows()
+
+                    property_event = st.dataframe(
+                        properties_df,
+                        use_container_width=True,
+                        hide_index=True,
+                        height=240,
+                        on_select="rerun",
+                        selection_mode="single-row",
+                        key="inspect_properties_table",
+                        column_config={
+                            "property_name": st.column_config.TextColumn("PROPERTY NAME"),
+                            "section": st.column_config.TextColumn("SECTION"),
+                        },
                     )
-                    st.markdown(f"""
-                        <div style='border:1px solid #edf2f7;border-radius:8px;overflow:hidden;max-height:240px;overflow-y:auto;'>
-                            <table style='width:100%;border-collapse:collapse;'>
-                                <thead>
-                                    <tr style='background:#f8fafc;'>
-                                        <th style='padding:8px 12px;font-size:0.64rem;font-weight:700;letter-spacing:1px;color:#94a3b8;text-align:left;border-bottom:1px solid #edf2f7;'>PROPERTY NAME</th>
-                                        <th style='padding:8px 12px;font-size:0.64rem;font-weight:700;letter-spacing:1px;color:#94a3b8;text-align:left;border-bottom:1px solid #edf2f7;'>SECTION</th>
-                                    </tr>
-                                </thead>
-                                <tbody>{rows_html}</tbody>
-                            </table>
-                        </div>
-                    """, unsafe_allow_html=True)
-                    property_options = properties_df["property_name"].dropna().tolist()
-                    if property_options:
-                        if st.session_state.inspect_property not in property_options:
-                            st.session_state.inspect_property = property_options[0]
-
-                        property_choice = st.selectbox(
-                            "Property",
-                            property_options,
-                            index=property_options.index(st.session_state.inspect_property),
-                            key="inspect_property_select",
-                        )
-                        st.session_state.inspect_property = property_choice
 
-                        if st.button("Search", key="inspect_search", type="primary"):
+                    selected_indices = property_event.selection.rows if property_event and property_event.selection else []
+
+                    if selected_indices:
+                        property_choice = properties_df.iloc[selected_indices[0]]["property_name"]
+                        st.session_state.inspect_property = property_choice
+                    elif st.session_state.inspect_property in properties_df["property_name"].tolist():
+                        property_choice = st.session_state.inspect_property
+                    else:
+                        property_choice = None
+
+                    if st.button("Display", key="inspect_search", type="primary"):
+                        if not property_choice:
+                            st.warning("Please select a property from the property table!")
+                        else:
                             result = all_data[
                                 (all_data["material_abbreviation"] == selected_abbr)
                                 & (all_data["property_name"] == property_choice)
@@ -1002,6 +1092,12 @@ with right_col:
                                 else:
                                     st.caption("No plot image available for this material-property pair.")
 
+                                st.session_state._scroll_to_results = True
+
+                        if st.session_state._scroll_to_results:
+                            scroll_to_here(0, key="inspect_results_scroll")
+                            st.session_state._scroll_to_results = False
+