From 86b7f2437ba11b3242b1f6be423cec815e756283 Mon Sep 17 00:00:00 2001 From: pb Date: Sat, 21 Jun 2025 21:01:03 +0200 Subject: [PATCH] modification rendu diagramme --- main.py | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/main.py b/main.py index 4d1bee3..1738711 100644 --- a/main.py +++ b/main.py @@ -62,7 +62,11 @@ def create_accounting_sankey(cursor, save_dir): year = datetime.datetime.now().year first_day = rf'{year}-01-01' reserves = int(get_bank_reserves(cursor, first_day)) - NR.append(('reserves au début de l\'année', reserves, {'label_pos':'left'})) + ro_name = 'reserves au début de l\'année' + ra_name = 'reserves aujourd\'hui' + t_name = 'Total' + NR.append((ro_name, reserves, {'label_pos':'left'})) + flows.append((ro_name, t_name, reserves)) # lister les comptes de charges et produit accounts = get_income_and_expense_accounts(cursor) @@ -78,23 +82,24 @@ def create_accounting_sankey(cursor, save_dir): if a.type == 6 : tmp_tot = tot_deb-tot_cred if tmp_tot > 0 : - NC.append((a.label, tmp_tot, {'label_pos':'right'})) - flows.append(('Total', a.label, tmp_tot)) + NC.append((a.label, tmp_tot, {'label_pos':'right', 'color':'#007e97' })) + flows.append((t_name, a.label, tmp_tot)) else : tmp_tot = tot_cred-tot_deb if tmp_tot > 0 : tot += tmp_tot - NR.append((a.label, tmp_tot, {'label_pos':'left'})) - flows.append((a.label, 'Total', tmp_tot)) + NR.append((a.label, tmp_tot, {'label_pos':'left', 'color':'#007e97' })) + flows.append((a.label, t_name, tmp_tot)) - NC.insert(0, ('reserves aujourd\'hui', tmp_res, {'label_pos':'right'})) + NC.insert(0, (ra_name, tmp_res, {'label_pos':'right'})) + flows.append((t_name, ra_name, tmp_res)) nodes = [ NR, - [('Total', tot, {'label_pos':'top'})], + [('Total', tot, {'label_pos':'top', 'color':'#007e97'})], NC ] - plt.figure(figsize=(25, 10), dpi=144) + plt.figure(figsize=(30, 10), dpi=144) s = Sankey( flows=flows, nodes=nodes, @@ -217,16 +222,16 @@ def get_budget_elements(budget:list[BudgetLine]): revenue = line.revenue if charge != 0 and revenue == 0: total += charge - CL.append((desc, charge, {'label_pos':'right'})) + CL.append((desc, charge, {'label_pos':'right', 'color':'#007e97' })) flows.append(('Total', desc, charge)) elif charge == 0 and revenue != 0: - RL.append((desc, revenue, {'label_pos':'left'})) + RL.append((desc, revenue, {'label_pos':'left', 'color':'#007e97' })) flows.append((desc, 'Total', revenue)) nodes = [ RL, - [('Total', total)], + [('Total', total, {'label_pos':'top', 'color':'#007e97' })], CL ]