Update pages/market_rent_estimation.py

pages/market_rent_estimation.py

@@ -38,59 +38,6 @@ def main():
     sorted_indexes = df_properties_filtered.index[sorted_indices]
     reordered_df_properties_filtered = df_properties_filtered.loc[sorted_indexes]
 
-    with tab2:
-        st.title('Combined estimation')
-        if 'user_select_value' not in st.session_state:
-            st.session_state['user_select_value'] = ""
-        if 'year_buit' not in st.session_state:
-            st.session_state['year_buit'] = ""
-        if 'submarket_val' not in st.session_state:
-            st.session_state['submarket_val'] = ""
-        if 'market_val' not in st.session_state:
-            st.session_state['market_val'] = ""
-
-        box_contents = [
-            {"header": "Address", "content": st.session_state['user_select_value']},
-            {"header": "LSF", "content": str(st.session_state['property_lsf'])},
-            {"header": "Sub-Market", "content": st.session_state['submarket_val']},
-            {"header": "Market", "content": st.session_state['market_val']}
-        ]
-
-        # Divide the layout into four columns
-        col1, col2, col3, col4 = st.columns(4)
-        
-        for i, col in enumerate([col1, col2, col3, col4]):
-            col.markdown(f"""
-                <div style="padding: 20px; margin: 10px; text-align: center;">
-                    <h3 style="font-size: small;">{box_contents[i]['header']}</h3>
-                    <p style="font-size: small;">{box_contents[i]['content']}</p>
-                </div>
-            """, unsafe_allow_html=True)
-            
-        # Add padding between the boxes and the slider
-        st.markdown('<style>div[data-testid="stBlock"]{margin-top: 20px;}</style>', unsafe_allow_html=True)
-        
-        def safe_eval(val):
-            try:
-                return ast.literal_eval(val)
-            except (ValueError, SyntaxError):
-                return val
-                 
-        average_rent = reordered_df_properties_filtered['rent_combined'].mean()
-        
-        x1 ="Comps " + str(average_rent)
-        x3="Rent " + str(st.session_state['prediction'])
-        
-        # x2 = (st.session_state['prediction']+average_rent)/2
-        
-        pick = st.select_slider(
-        "Combined estimation ",
-        options=[x1, x3],
-        value=x1)
-        
-        back_to_serach_tab1 = st.button("Search page")
-        if back_to_serach_tab1:
-            st.switch_page("app.py")
         
     #comps page
     with tab1:
@@ -134,7 +81,12 @@ def main():
         col_1_1, col_1_2 = st.columns([2, 1])
         with col_1_1:
             st.write('Comps list:')
-            display_df = st.table(filtered_data)
+            sort_column = st.selectbox('Select column to sort by:', filtered_data.columns[1:])
+            # display_df = st.table(filtered_data)
+            if sort_column:
+                filtered_data_sorted = filtered_data.sort_values(by=sort_column, ascending=False)          
+            st.dataframe(filtered_data_sorted)
+
         with col_1_2:
         # Create a map object
             m = folium.Map(width=500, height=440, location=(reordered_df_properties_filtered['lat'].mean(), reordered_df_properties_filtered['long'].mean()), zoom_start=9)
@@ -195,6 +147,61 @@ def main():
         if back_to_serach_tab2:
             st.switch_page("app.py")
             
+    with tab2:
+        st.title('Combined estimation')
+        if 'user_select_value' not in st.session_state:
+            st.session_state['user_select_value'] = ""
+        if 'year_buit' not in st.session_state:
+            st.session_state['year_buit'] = ""
+        if 'submarket_val' not in st.session_state:
+            st.session_state['submarket_val'] = ""
+        if 'market_val' not in st.session_state:
+            st.session_state['market_val'] = ""
+
+        box_contents = [
+            {"header": "Address", "content": st.session_state['user_select_value']},
+            {"header": "LSF", "content": str(st.session_state['property_lsf'])},
+            {"header": "Sub-Market", "content": st.session_state['submarket_val']},
+            {"header": "Market", "content": st.session_state['market_val']}
+        ]
+
+        # Divide the layout into four columns
+        col1, col2, col3, col4 = st.columns(4)
+        
+        for i, col in enumerate([col1, col2, col3, col4]):
+            col.markdown(f"""
+                <div style="padding: 20px; margin: 10px; text-align: center;">
+                    <h3 style="font-size: small;">{box_contents[i]['header']}</h3>
+                    <p style="font-size: small;">{box_contents[i]['content']}</p>
+                </div>
+            """, unsafe_allow_html=True)
+            
+        # Add padding between the boxes and the slider
+        st.markdown('<style>div[data-testid="stBlock"]{margin-top: 20px;}</style>', unsafe_allow_html=True)
+        
+        def safe_eval(val):
+            try:
+                return ast.literal_eval(val)
+            except (ValueError, SyntaxError):
+                return val
+                 
+        average_rent = reordered_df_properties_filtered['rent_combined'].mean()
+        
+        x1 ="Comps " + str(average_rent)
+        x3="Rent " + str(st.session_state['prediction'])
+        
+        # x2 = (st.session_state['prediction']+average_rent)/2
+        
+        pick = st.select_slider(
+        "Combined estimation ",
+        options=[x1, x3],
+        value=x1)
+        
+        back_to_serach_tab1 = st.button("Search page")
+        if back_to_serach_tab1:
+            st.switch_page("app.py")
+
+            
 
 if __name__ == "__main__":
     main()