adding action display

appStore/policyaction.py

@@ -28,37 +28,37 @@ classifier_identifier = 'policyaction'
 params  = get_classifier_params(classifier_identifier)
 
 @st.cache_data
-def to_excel(df):
-    df['Target Validation'] = 'No'
-    df['Netzero Validation'] = 'No'
-    df['GHG Validation'] = 'No'
-    df['Adapt-Mitig Validation'] = 'No'
-    df['Sector'] = 'No'
+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='Sheet1')
+    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']})                                                                                                         
+    # 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 ###
@@ -92,7 +92,7 @@ def action_display():
         if range_val !=0:
             count_action = len(hits)
             hits.drop(columns=['Target Label','Target Score','Netzero Score',
-                                'Netzero Label','GHG Label'
+                                'Netzero Label','GHG Label',
                                 'GHG Score','Action Label','Policies_Plans Label',
                                 'Policies_Plans Score','Conditional Score'],inplace=True)
             hits = hits.sort_values(by=['Action Score'], ascending=False)
@@ -101,7 +101,7 @@ def action_display():
             st.write('----------------')
 
 
-            st.caption("Filter table to select rows to keep for Target category")
+            st.caption("Filter table to select rows to keep for Action category")
             filter_dataframe(hits)
             # filtered_df = filtered_df[filtered_df.keep == True]
             # st.write('Explore the data')

appStore/target.py

@@ -114,8 +114,10 @@ def target_display():
                 st.write('**Transport Related Paragraphs**: `{}`'.format(count_transport))
             # st.write('-------------------')    
             hits.drop(columns=['Target Label','Netzero Score','GHG Score','Action Label',
-                                'Action Score','Policies_Plans Label',
+                                'Action Score','Policies_Plans Label','Indicator Label',
                                 'Policies_Plans Score','Conditional Score'],inplace=True)
+            hits = hits[['keep','text','Target Score','Netzero Label','GHG Label',
+                        'Conditional Label','Sector Label']]
             hits = hits.sort_values(by=['Target Score'], ascending=False)
             hits = hits.reset_index(drop=True)