diff --git a/reader.py b/reader.py index 179d321..9c31b45 100644 --- a/reader.py +++ b/reader.py @@ -132,28 +132,27 @@ class MonthlyTransactions: info.extend([k, v]) p = """ -\t\t\t\t{0} Report -Income\t\t\tFixed Expenses\t\tVariable Expenses -{1}\t{2}\t{11}\t\t{12}\t{25}\t\t{26} -{3}\t{4}\t{13}\t{14}\t{27}\t{28} -{5}\t{6}\t{15}\t{16}\t{29}\t{30} -{7}\t{8}\t{17}\t\t{18}\t{31}\t{32} -{9}\t{10}\t{19}\t\t{20}\t{33}\t{34} -\t\t\t{21}\t\t{22}\t{35}\t\t{36} -\t\t\t{23}\t{24}\t{37}\t\t{38} -\t\t\t\t\t\t{39}\t\t{40} -\t\t\t\t\t\t{41}\t\t{42} -\t\t\t\t\t\t{43}\t\t{44} -\t\t\t\t\t\t{45}\t\t{46} -\t\t\t\t\t\t{47}\t{48} -\t\t\t\t\t\t{49}\t\t{50} -\t\t\t\t\t\t{51}\t{52} +{0:>40} Report +Income Fixed Expenses Variable Expenses +{1:<16}{2:>9.2f} {11:<16}{12:>9.2f} {25:<16}{26:>9.2f} +{3:<16}{4:>9.2f} {13:<16}{14:>9.2f} {27:<16}{28:>9.2f} +{5:<16}{6:>9.2f} {15:<16}{16:>9.2f} {29:<16}{30:>9.2f} +{7:<16}{8:>9.2f} {17:<16}{18:>9.2f} {31:<16}{32:>9.2f} +{9:<16}{10:>9.2f} {19:<16}{20:>9.2f} {33:<16}{34:>9.2f} + {21:<16}{22:>9.2f} {35:<16}{36:>9.2f} + {23:<16}{24:>9.2f} {37:<16}{38:>9.2f} + {39:<16}{40:>9.2f} + {41:<16}{42:>9.2f} + {43:<16}{44:>9.2f} + {45:<16}{46:>9.2f} + {47:<16}{48:>9.2f} + {49:<16}{50:>9.2f} + {51:<16}{52:>9.2f} -\t\t{53}\t\t\t{54}\t\t\t{55} +{53:>25.2f} {54:>25.2f} {55:>25.2f} -Expenses:\t{56} -Net:\t\t{57} - """.format( +Expenses:{56:>16.2f} +Net:{57:>21.2f}""".format( self.month.strftime("%B"), *info, self.income(),