restructure download

appStore/policyaction.py

@@ -28,17 +28,60 @@ classifier_identifier = 'policyaction'
 params  = get_classifier_params(classifier_identifier)
 
 @st.cache_data
-def to_excel(df, hits):
+def to_excel(df):
+    # df['Target Validation'] = 'No'
+    # df['Netzero Validation'] = 'No'
+    # df['GHG Validation'] = 'No'
+    # df['Adapt-Mitig Validation'] = 'No'
+    # df['Sector'] = 'No'
     len_df = len(df)
     output = BytesIO()
     writer = pd.ExcelWriter(output, engine='xlsxwriter')
     df.to_excel(writer, index=False, sheet_name='rawdata')
-    if 'keep' in hits.columns:
-        hits = hits[hits.keep == True]
-        hits = hits.reset_index(drop=True)
-        hits.drop(columns = ['keep'], inplace=True)
+    if 'target_hits' in st.session_state:
+        target_hits = st.session_state['target_hits']
+        if 'keep' in target_hits.columns:
+            target_hits = target_hits[target_hits.keep == True]
+            target_hits = target_hits.reset_index(drop=True)
+            target_hits.drop(columns = ['keep'], inplace=True)
+            target_hits.to_excel(writer,index=False,sheet_name = 'Target')
+        else:
+            target_hits = target_hits.sort_values(by=['Target Score'], ascending=False)
+            target_hits = target_hits.reset_index(drop=True)
+            target_hits.to_excel(writer,index=False,sheet_name = 'Target')
+
+    else:
+        target_hits = df[df['Target Label'] == True]
+        target_hits.drop(columns=['Target Label','Netzero Score','GHG Score','Action Label',
+                                'Action Score','Policies_Plans Label','Indicator Label',
+                                'Policies_Plans Score','Conditional Score'],inplace=True)
+        target_hits = target_hits.sort_values(by=['Target Score'], ascending=False)
+        target_hits = target_hits.reset_index(drop=True)
+        target_hits.to_excel(writer,index=False,sheet_name = 'Target')
+
+
+    if 'action_hits' in st.session_state:
+        action_hits = st.session_state['action_hits']
+        if 'keep' in action_hits.columns:
+            action_hits = action_hits[action_hits.keep == True]
+            action_hits = action_hits.reset_index(drop=True)
+            action_hits.drop(columns = ['keep'], inplace=True)
+            action_hits.to_excel(writer,index=False,sheet_name = 'Action')  
+        else:
+            action_hits = action_hits.sort_values(by=['Action Score'], ascending=False)
+            action_hits = action_hits.reset_index(drop=True)
+            action_hits.to_excel(writer,index=False,sheet_name = 'Action') 
+    else:
+        action_hits = df[df['Action Label'] == True]
+        action_hits.drop(columns=['Target Label','Target Score','Netzero Score',
+                                'Netzero Label','GHG Label',
+                                'GHG Score','Action Label','Policies_Plans Label',
+                                'Policies_Plans Score','Conditional Score'],inplace=True)
+        action_hits = action_hits.sort_values(by=['Action Score'], ascending=False)
+        action_hits = action_hits.reset_index(drop=True)
+        action_hits.to_excel(writer,index=False,sheet_name = 'Action') 
+            
     # hits = hits.drop(columns = ['Target Score','Netzero Score','GHG Score'])
-    hits.to_excel(writer,index=False,sheet_name = 'Action')
     workbook = writer.book
     # worksheet = writer.sheets['Sheet1']
     # worksheet.data_validation('L2:L{}'.format(len_df), 
@@ -59,6 +102,37 @@ def to_excel(df, hits):
     writer.save()
     processed_data = output.getvalue()
     return processed_data
+# def to_excel(df, hits):
+#     len_df = len(df)
+#     output = BytesIO()
+#     writer = pd.ExcelWriter(output, engine='xlsxwriter')
+#     df.to_excel(writer, index=False, sheet_name='rawdata')
+#     if 'keep' in hits.columns:
+#         hits = hits[hits.keep == True]
+#         hits = hits.reset_index(drop=True)
+#         hits.drop(columns = ['keep'], inplace=True)
+#     # hits = hits.drop(columns = ['Target Score','Netzero Score','GHG Score'])
+#     hits.to_excel(writer,index=False,sheet_name = 'Action')
+#     workbook = writer.book
+#     # worksheet = writer.sheets['Sheet1']
+#     # worksheet.data_validation('L2:L{}'.format(len_df), 
+#     #                           {'validate': 'list', 
+#     #                            'source': ['No', 'Yes', 'Discard']})
+#     # worksheet.data_validation('M2:L{}'.format(len_df), 
+#     #                           {'validate': 'list', 
+#     #                            'source': ['No', 'Yes', 'Discard']})
+#     # worksheet.data_validation('N2:L{}'.format(len_df), 
+#     #                           {'validate': 'list', 
+#     #                            'source': ['No', 'Yes', 'Discard']})
+#     # worksheet.data_validation('O2:L{}'.format(len_df), 
+#     #                           {'validate': 'list', 
+#     #                            'source': ['No', 'Yes', 'Discard']})
+#     # worksheet.data_validation('P2:L{}'.format(len_df), 
+#     #                           {'validate': 'list', 
+#     #                            'source': ['No', 'Yes', 'Discard']})                                                                                                         
+#     writer.save()
+#     processed_data = output.getvalue()
+#     return processed_data
 def app():
 
     ### Main app code ###
@@ -106,10 +180,11 @@ def action_display():
             # filtered_df = filtered_df[filtered_df.keep == True]
             # st.write('Explore the data')
             # AgGrid(hits)
-            df_xlsx = to_excel(df,st.session_state['action_hits'])
+            
             
             with st.sidebar:
                 st.write('-------------')
+                df_xlsx = to_excel(df)
                 st.download_button(label='📥 Download Result',
                             data=df_xlsx ,
                             file_name= os.path.splitext(os.path.basename(st.session_state['filename']))[0]+'.xlsx')
@@ -202,6 +277,8 @@ def filter_dataframe(df: pd.DataFrame) -> pd.DataFrame:
                 if user_text_input:
                     df = df[df[column].str.contains(user_text_input)]
         df['keep'] = True
+        df = df[['keep','text','Action Score','Conditional Label',
+        'Sector Label','Adapt-Mitig Label','Indicator Label','page']]
         df = st.data_editor(
                   df,
                   column_config={

appStore/target.py

@@ -52,9 +52,6 @@ def to_excel(df):
             target_hits.drop(columns = ['keep'], inplace=True)
             target_hits.to_excel(writer,index=False,sheet_name = 'Target')
         else:
-            target_hits.drop(columns=['Target Label','Netzero Score','GHG Score','Action Label',
-                                'Action Score','Policies_Plans Label','Indicator Label',
-                                'Policies_Plans Score','Conditional Score'],inplace=True)
             target_hits = target_hits.sort_values(by=['Target Score'], ascending=False)
             target_hits = target_hits.reset_index(drop=True)
             target_hits.to_excel(writer,index=False,sheet_name = 'Target')
@@ -77,10 +74,6 @@ def to_excel(df):
             action_hits.drop(columns = ['keep'], inplace=True)
             action_hits.to_excel(writer,index=False,sheet_name = 'Action')  
         else:
-            action_hits.drop(columns=['Target Label','Target Score','Netzero Score',
-                                'Netzero Label','GHG Label',
-                                'GHG Score','Action Label','Policies_Plans Label',
-                                'Policies_Plans Score','Conditional Score'],inplace=True)
             action_hits = action_hits.sort_values(by=['Action Score'], ascending=False)
             action_hits = action_hits.reset_index(drop=True)
             action_hits.to_excel(writer,index=False,sheet_name = 'Action')