Update index.py

index.py

@@ -57,7 +57,7 @@ df_neg = counts[[x in ['negative'] for x in counts.FinBERT_label]]
 
 
 # app.layout 
-tab_content_1 = dbc.Container([   
+app.layout = dbc.Container([   
     dbc.Row([ # row 1
         dbc.Col([html.H1('Evolução temporal de sentimento em títulos de notícias')],
         className="text-center mt-3 mb-1")]),
@@ -149,7 +149,9 @@ tab_content_1 = dbc.Container([
              dbc.Col(dcc.Graph(id='pie-graph-2'),
                 )
      ]),
-    
+    dbc.Row([ # row 
+        dbc.Label('Lista de notícias encontradas para o tópico e meio de comunicação selecionados', className="fw-bold")
+    ]),
     dbc.Row([ # row 9
             dbc.Col(
                 dash_table.DataTable(
@@ -294,19 +296,20 @@ def update_output(selected_topic, selected_domain, start_date, end_date):
         # Calculate percentage of each label
         label_percentages_all = (label_counts_all / label_counts_all.sum()) * 100
         
+        # Define colors for each label
+        label_colors = {'positivo': '#039a4d', 'neutro': '#3c03f4', 'negativo': '#ca3919'}
         # Plot general pie chart
         pie_chart_1 = px.pie(
             values=label_percentages_all,
             names=label_percentages_all.index,
             title='Distribuição Geral',
-            color_discrete_sequence=['#039a4d', '#3c03f4', '#ca3919']
+            color_discrete_sequence=[label_colors[label] for label in label_percentages_all.index] #['#039a4d', '#3c03f4', '#ca3919']
         )
         
         # Get unique media categories
         media_categories = df_filtered['Veículos de notícias'].unique()
         
-        # Define colors for each label
-        label_colors = {'positivo': '#039a4d', 'neutro': '#3c03f4', 'negativo': '#ca3919'}
+        
                          
         # Filter DataFrame for current media category
         media_df = df_filtered[df_filtered['Veículos de notícias'] == selected_domain]
@@ -333,7 +336,7 @@ def update_output(selected_topic, selected_domain, start_date, end_date):
                                                       ordered=True)
 
         # Sort DataFrame by sentiment label and date
-        data_table_1 = media_df.sort_values(by=['FinBERT_label', 'date'])
+        data_table_1 = media_df.sort_values(by=['date', "FinBERT_label"])
     
         return line_fig_1, bar_fig_1, pie_chart_1, line_fig_2, pie_chart_2, data_table_1.to_dict('records')
     else:
@@ -371,40 +374,40 @@ def update_output(selected_topic, selected_domain, start_date, end_date):
 # )
 # def update_headlines_table(selected_topic, selected_domain, start_date, end_date):
 #     # Filtering data...
-tab_content_2 =  dcc.Markdown('''
-
-    # Sobre o projeto
-
-
-''')
-
-app.layout = html.Div(
-    [
-        dbc.Card(
-        [
-            dbc.CardHeader(
-                dbc.Tabs(
-                    [
-                        dbc.Tab(label="SentDiário", tab_id="tab-1"),
-                        dbc.Tab(label="Sobre o projeto", tab_id="tab-2"),
-                    ],
-                    id="tabs",
-                    active_tab="tab-1",
-                )
-            ),
-            dbc.CardBody(html.Div(id="content", className="card-text")),
-        ]
-        )
-    ]
-)
+# tab_content_2 =  dcc.Markdown('''
+
+#     # Sobre o projeto
+
+
+# ''')
+
+# app.layout = html.Div(
+#     [
+#         dbc.Card(
+#         [
+#             dbc.CardHeader(
+#                 dbc.Tabs(
+#                     [
+#                         dbc.Tab(label="SentDiário", tab_id="tab-1"),
+#                         dbc.Tab(label="Sobre o projeto", tab_id="tab-2"),
+#                     ],
+#                     id="tabs",
+#                     active_tab="tab-1",
+#                 )
+#             ),
+#             dbc.CardBody(html.Div(id="content", className="card-text")),
+#         ]
+#         )
+#     ]
+# )
 
-@app.callback(Output("content", "children"), [Input("tabs", "active_tab")])
-def switch_tab(at):
-    if at == "tab-1":
-        return tab_content_1
-    elif at == "tab-2":
-        return tab_content_2
-    return html.P("This shouldn't ever be displayed...")
+# @app.callback(Output("content", "children"), [Input("tabs", "active_tab")])
+# def switch_tab(at):
+#     if at == "tab-1":
+#         return tab_content_1
+#     elif at == "tab-2":
+#         return tab_content_2
+#     return html.P("This shouldn't ever be displayed...")
     
 if __name__ == '__main__':
     app.run_server(debug=True)