[bde/stats/depenses.py] Encore des confusions dépenses/gains

[scripts-20-100.git] / bde / stats / depenses.py

diff --git a/bde/stats/depenses.py b/bde/stats/depenses.py
index d790975aab122ea228b895fe4e12726b3bad8fd1..5ea5c9c0c34677b399e926914a2a0799a791f34d 100755 (executable)
--- a/bde/stats/depenses.py
+++ b/bde/stats/depenses.py
@@ -3,12 +3,11 @@
 
 """Affiche les dépenses totales d'un compte par année + total"""
 
-import psycopg2
-import psycopg2.extras
-
 import sys
 import argparse
 
+import base
+
 create_temp_table = """
  SELECT extract(year FROM date) AS annee,
        %(select_month)s
@@ -38,21 +37,14 @@ display_all = """ SELECT * FROM past
  ;
 """
 
-display_sum = """ SELECT sum(gains) AS gains, sum(depenses) AS depenses
+display_sum = """ SELECT sum(depenses) AS depenses, sum(gains) AS gains
  FROM past
  ;
 """
 
-def get_cursor():
-    """Ouvre une connexion à la bdd."""
-    con = psycopg2.connect(database="note")
-    con.set_client_encoding("utf-8")
-    cur = con.cursor(cursor_factory = psycopg2.extras.DictCursor)
-    return (con, cur)
-
 def get_depenses(idbde, bymonth=False):
     """Récupère toutes les dépenses/gains du compte ``idbde``"""
-    con, cur = get_cursor()
+    con, cur = base.getcursor()
     modifiers = {"select_month" : "", "comma_month" : ""}
     params = {"idbde" : idbde}
     if bymonth:
@@ -68,7 +60,7 @@ def get_depenses(idbde, bymonth=False):
 def display_depenses(idbde, all, tot, bymonth=False):
     """Pretty-printing des résultats."""
     month = "\tmois" if bymonth else ""
-    print "Compte %s:\nannee%s\tgains\tdépenses" % (idbde, month)
+    print "Compte %s:\nannee%s\tdépenses\tgains" % (idbde, month)
     for li in all:
         if bymonth:
             li = [int(li[0]), int(li[1]), li[2], li[3]]
@@ -76,7 +68,7 @@ def display_depenses(idbde, all, tot, bymonth=False):
         else:
             li = [int(li[0]), li[1], li[2]]
             print "%s\t%s\t\t%s" % tuple(li)
-    print "\nTotal :\n\tgains\tdépenses"
+    print "\nTotal :\n\tdépenses\tgains"
     print "\t%s\t\t%s\n" % tuple(tot)
 
 if __name__ == "__main__":