Update appStore/tapp_display.py

appStore/tapp_display.py

@@ -33,6 +33,11 @@ def targets():
         df = df[df.TargetLabel==True].reset_index(drop=True)
         df['keep'] = True
         df.drop(columns = ['ActionLabel','PolicyLabel','PlansLabel'], inplace=True)
+        cols = list(df.columns)
+        sector_cols = list(set(cols) - {'TargetLabel','MitigationLabel','AdaptationLabel','GHGLabel','NetzeroLabel','NonGHGLabel','text','keep','page'})
+        sector_cols.sort()
+        df['Sector'] = df.apply(lambda x: [col for col in sector_cols if x[col] == True],axis=1)
+        df['Sub-Target'] = df.apply(lambda x: [col for col in ['GHGLabel','NetzeroLabel','NonGHGLabel'] if x[col] == True ],axis=1)
         st.session_state['target_hits'] = df
         st.session_state['netzero'] = netzero_placeholder
     
@@ -65,14 +70,7 @@ def target_display():
                 st.write('**NonGHG Target Related Paragraphs**: `{}`'.format(count_nonghg))
                 st.write('**Adaptation Related Paragraphs**: `{}`'.format(count_adaptation))
             #st.write('----------------')
-
-            
             
-            cols = list(hits.columns)
-            sector_cols = list(set(cols) - {'TargetLabel','MitigationLabel','AdaptationLabel','GHGLabel','NetzeroLabel','NonGHGLabel','text','keep','page'})
-            sector_cols.sort()
-            hits['Sector'] = hits.apply(lambda x: [col for col in sector_cols if x[col] == True],axis=1)
-            hits['Sub-Target'] = hits.apply(lambda x: [col for col in ['GHGLabel','NetzeroLabel','NonGHGLabel'] if x[col] == True ],axis=1)
             st.session_state['target_hits'] = hits[['keep','text','Sector','Sub-Target','page','MitigationLabel','AdaptationLabel']]
             placeholder= []
             for col in sector_cols:
@@ -97,6 +95,10 @@ def actions():
         df = df[df.ActionLabel==True].reset_index(drop=True)
         df['keep'] = True
         df.drop(columns = ['TargetLabel','PolicyLabel','PlansLabel','GHGLabel','NetzeroLabel','NonGHGLabel'], inplace=True)
+        cols = list(df.columns)
+        sector_cols = list(set(cols) - {'ActionLabel','MitigationLabel','AdaptationLabel','GHGLabel','NetzeroLabel','NonGHGLabel','text','keep','page'})
+        sector_cols.sort()
+        df['Sector'] = df.apply(lambda x: [col for col in sector_cols if x[col] == True],axis=1)
         st.session_state['action_hits'] = df
     
 def action_display():
@@ -121,10 +123,7 @@ def action_display():
                 st.write('**Adaptation Related Paragraphs**: `{}`'.format(count_adaptation))
             #st.write('----------------')
             #st.markdown("<h4 style='text-align: left; color: black;'> Sectoral Action Related Paragraphs Count </h4>", unsafe_allow_html=True)
-            cols = list(hits.columns)
-            sector_cols = list(set(cols) - {'ActionLabel','MitigationLabel','AdaptationLabel','GHGLabel','NetzeroLabel','NonGHGLabel','text','keep','page'})
-            sector_cols.sort()
-            hits['Sector'] = hits.apply(lambda x: [col for col in sector_cols if x[col] == True],axis=1)
+            
             st.session_state['action_hits'] = hits[['text','page','keep','Sector','MitigationLabel','AdaptationLabel',]]
             #hits['Sub-Target'] = hits.apply(lambda x: [col for col in ['GHGLabel','NetzeroLabel','NonGHGLabel'] if x[col] == True ],axis=1)
             placeholder= []
@@ -149,6 +148,10 @@ def policy():
         df = df[df.PolicyLabel==True].reset_index(drop=True)
         df['keep'] = True
         df.drop(columns = ['TargetLabel','ActionLabel','PlansLabel','GHGLabel','NetzeroLabel','NonGHGLabel'], inplace=True)
+        cols = list(df.columns)
+        sector_cols = list(set(cols) - {'PolicyLabel','MitigationLabel','AdaptationLabel','GHGLabel','NetzeroLabel','NonGHGLabel','text','keep','page'})
+        sector_cols.sort()
+        df['Sector'] = df.apply(lambda x: [col for col in sector_cols if x[col] == True],axis=1)
         st.session_state['policy_hits'] = df
     
 def policy_display():
@@ -173,10 +176,6 @@ def policy_display():
                 st.write('**Adaptation Related Paragraphs**: `{}`'.format(count_adaptation))
             #st.write('----------------')
             
-            cols = list(hits.columns)
-            sector_cols = list(set(cols) - {'PolicyLabel','MitigationLabel','AdaptationLabel','GHGLabel','NetzeroLabel','NonGHGLabel','text','keep','page'})
-            sector_cols.sort()
-            hits['Sector'] = hits.apply(lambda x: [col for col in sector_cols if x[col] == True],axis=1)
             st.session_state['policy_hits'] = hits[['text','page','keep','Sector','MitigationLabel','AdaptationLabel']]
             placeholder= []
             for col in sector_cols:
@@ -197,6 +196,10 @@ def plans():
         df = df[df.PlansLabel==True].reset_index(drop=True)
         df['keep'] = True
         df.drop(columns = ['TargetLabel','PolicyLabel','ActionLabel','GHGLabel','NetzeroLabel','NonGHGLabel'], inplace=True)
+        cols = list(df.columns)
+        sector_cols = list(set(cols) - {'PlansLabel','MitigationLabel','AdaptationLabel','GHGLabel','NetzeroLabel','NonGHGLabel','text','keep','page'})
+        sector_cols.sort()
+        df['Sector'] = df.apply(lambda x: [col for col in sector_cols if x[col] == True],axis=1)
         st.session_state['plan_hits'] = df
     
 def plans_display():
@@ -221,10 +224,6 @@ def plans_display():
                 st.write('**Adaptation Related Paragraphs**: `{}`'.format(count_adaptation))
             #st.write('----------------')
             
-            cols = list(hits.columns)
-            sector_cols = list(set(cols) - {'PlansLabel','MitigationLabel','AdaptationLabel','GHGLabel','NetzeroLabel','NonGHGLabel','text','keep','page'})
-            sector_cols.sort()
-            hits['Sector'] = hits.apply(lambda x: [col for col in sector_cols if x[col] == True],axis=1)
             st.session_state['plan_hits'] = hits[['text','page','keep','Sector','MitigationLabel','AdaptationLabel']]
             placeholder= []
             for col in sector_cols: