X-Git-Url: http://gitweb.pimeys.fr/?a=blobdiff_plain;f=sum_transacs_by_categorie.py;h=39dfb67569e4356564ccf42e5d3b0b44e0980d16;hb=efd7b4f2f56e629efc15bb64c8d9a2fa09c3becc;hp=3e26574d5fe95fc6a92dd25ec39453331cb0cfc8;hpb=e0db13fbfc70a500ec82244f3cbc871b0ecbf5a0;p=scripts-20-100.git

diff --git a/sum_transacs_by_categorie.py b/sum_transacs_by_categorie.py
index 3e26574..39dfb67 100755
--- a/sum_transacs_by_categorie.py
+++ b/sum_transacs_by_categorie.py
@@ -29,6 +29,7 @@ def get_sum(descriptions, debut, fin):
           AND date >= %(debut)s
           AND date < %(fin)s
           AND destinataire = 0
+          AND montant != 0
           AND description = ANY (%(descriptions)s);
     """
     con, cur = getcursor()
@@ -36,16 +37,23 @@ def get_sum(descriptions, debut, fin):
     s = cur.fetchone()["s"] or 0
     return s
 
-def get_dates(y, m, d):
+def get_dates(y, m, d, yf, mf, df):
     """
     Donne les dates de découpage de ``d``/``m``/``y`` à ``d-1``/``m``/``y+1``.
     """
-    dates = ["%s-%s-%s" % (y, m, d)]
-    for i in range(m + 1, 13):
-        dates.append("%s-%s-01" % (y, i))
-    for i in range(1, m):
-        dates.append("%s-%s-01" % (y + 1, i))
-    dates.append("%s-%s-%s" % (y + 1, m, d - 1))
+    dates = ["%d-%02d-%02d" % (y, m, d)]
+    m += 1
+    if m == 13:
+        m = 1
+        y += 1
+    while (y, m) <= (yf, mf):
+        dates.append("%d-%02d-01" % (y, m))
+        m += 1
+        if m == 13:
+            m = 1
+            y += 1
+    # On a atteint le dernier mois
+    dates.append("%d-%02d-%02d" % (yf, mf, df))
     return dates
 
 def get_year_sums(dates, filename):
@@ -64,7 +72,8 @@ if __name__ == "__main__":
     filenames = sys.argv[1:]
     print filenames
     y, m, d = 2015, 2, 16
-    dates = get_dates(y, m, d)
+    yf, mf, df = 2016, 2, 18
+    dates = get_dates(y, m, d, yf, mf, df)
     ys = {}
     for fn in filenames:
         ys[fn] = get_year_sums(dates, fn)
@@ -78,7 +87,7 @@ if __name__ == "__main__":
         )
 
     print "totaux"
-    print "%s-%s-%s\t %s-%s-%s\t %s" % (y, m, d, y+1, m, d-1,
+    print "%s-%s-%s\t %s-%s-%s\t %s" % (y, m, d, yf, mf, df,
         "\t".join([str(sum(ys[fn])) for fn in filenames]),)
     print "total"
     print str(sum([sum(ys[fn]) for fn in filenames]))