changed filters

similarity_page.py

@@ -308,17 +308,6 @@ def show_single_matching_page():
                     )
     
     with col3:
-        # COUNTRY SELECTION
-        country_option_s = st.multiselect(
-                'Country / Countries ',
-                COUNTRY_OPTION_LIST,
-                placeholder="All countries selected "
-                )
-        
-        filterd_country_only_checkbox_s = st.checkbox("Only matches between filtered countries ", value=True)
-
-        
-    with col4:
         # ORGA SELECTION
         orga_abbreviation = projects_df["orga_abbreviation"].unique()
         orga_full_names = projects_df["orga_full_name"].unique()
@@ -332,7 +321,17 @@ def show_single_matching_page():
         
         different_orga_checkbox_s = st.checkbox("Only matches between different organizations ", value=True)
 
-    
+        
+    with col4:
+        # COUNTRY SELECTION
+        country_option_s = st.multiselect(
+                'Country / Countries ',
+                COUNTRY_OPTION_LIST,
+                placeholder="All countries selected "
+                )
+ 
+    st.write("--------------")
+
     #selected_index = None
     if project_option:
         selected_project_index = search_list.index(project_option)
@@ -344,7 +343,12 @@ def show_single_matching_page():
 
         TOP_X_PROJECTS = 10
         filtered_df_s = filter_single(projects_df, country_code_list, orga_code_list)
-        if isinstance(filtered_df_s, pd.DataFrame) and len(filtered_df_s) != 0:
-            top_projects_df = find_similar(selected_project_index, sim_matrix, filtered_df_s, 10)
+
+        if isinstance(filtered_df_s, pd.DataFrame) and len(filtered_df_s) != 0:      
+            if different_orga_checkbox_s:
+                top_projects_df = find_similar(selected_project_index, nonsameorgas_sim_matrix, filtered_df_s, 10)
+            else:
+                top_projects_df = find_similar(selected_project_index, sim_matrix, filtered_df_s, 10)
+
             show_single_table(selected_project_index, projects_df, top_projects_df)