Skip to content

Commit 0a92df0

Browse files
GitauHarrisonGitauHarrison
committed
Chore: Remove unnecessary items from the index page
- items and mounts of income/expenses/assets/liabilities - Only display the total amounts, their differences and status check
1 parent c75411d commit 0a92df0

3 files changed

Lines changed: 47 additions & 170 deletions

File tree

‎app/routes.py‎

Lines changed: 0 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -49,31 +49,14 @@ def index():
4949

5050
# Income
5151
user_income_data = income_data(user)
52-
income_amounts = user_income_data[1]
53-
income_items = user_income_data[2]
5452
income_total = user_income_data[3]
5553
income_years = list(user_income_data[0].keys())
5654

57-
if income_years == []:
58-
num_amounts = 0
59-
else:
60-
for year in income_years:
61-
num_amounts = len(income_amounts[year])
62-
6355
# Expenses
6456
user_expenses_data = expenses_data(user)
65-
expenses_amounts = user_expenses_data[1]
66-
expenses_items = user_expenses_data[2]
6757
expenses_total = user_expenses_data[3]
6858
expenses_years = list(user_expenses_data[0].keys())
6959

70-
# Catch if expenses_years is empty
71-
if income_years == [] or expenses_years == []:
72-
num_expenses_amounts = 0
73-
else:
74-
for year in expenses_years:
75-
num_expenses_amounts = len(expenses_amounts[year])
76-
7760
# List differences in income and expenses per year
7861
income_expenses_differences_per_year = []
7962
for year in income_years:
@@ -85,27 +68,13 @@ def index():
8568

8669
# Liabilities
8770
user_liabilities_data = liabilities_data(user)
88-
liabilities_amounts = user_liabilities_data[1]
89-
liabilities_items = user_liabilities_data[2]
9071
liabilities_total = user_liabilities_data[3]
9172
liabilities_years = list(user_liabilities_data[0].keys())
92-
if liabilities_years == []:
93-
num_liabilities_amounts = 0
94-
else:
95-
for year in liabilities_years:
96-
num_liabilities_amounts = len(liabilities_amounts[year])
9773

9874
# Assets
9975
user_assests_data = assets_data(user)
100-
assets_amounts = user_assests_data[1]
101-
assets_items = user_assests_data[2]
10276
assets_total = user_assests_data[3]
10377
assets_years = list(user_assests_data[0].keys())
104-
if assets_years == [] or liabilities_years == []:
105-
num_assets_amounts = 0
106-
else:
107-
for year in assets_years:
108-
num_assets_amounts = len(assets_amounts[year])
10978

11079
# List differences in assets and liabilities per year
11180
assets_liabilities_differences_per_year = []
@@ -122,32 +91,20 @@ def index():
12291
user=user,
12392

12493
# Income
125-
income_amounts=income_amounts,
126-
income_items=income_items,
12794
income_total=income_total,
12895
income_years=income_years,
129-
num_amounts=num_amounts,
13096

13197
# Liabilities
132-
liabilities_amounts=liabilities_amounts,
133-
liabilities_items=liabilities_items,
13498
liabilities_total=liabilities_total,
13599
liabilities_years=liabilities_years,
136-
num_liabilities_amounts=num_liabilities_amounts,
137100

138101
# Expenses
139-
expenses_amounts=expenses_amounts,
140-
expenses_items=expenses_items,
141102
expenses_total=expenses_total,
142103
expenses_years=expenses_years,
143-
num_expenses_amounts=num_expenses_amounts,
144104

145105
# Assets
146-
assets_amounts=assets_amounts,
147-
assets_items=assets_items,
148106
assets_total=assets_total,
149107
assets_years=assets_years,
150-
num_assets_amounts=num_assets_amounts,
151108

152109
# Comparison
153110
income_expenses_differences_per_year_dict=income_expenses_differences_per_year_dict,

‎app/static/css/styles.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ p {
8787
color: #950019;
8888
}
8989
.success {
90-
font-size: 30px;
90+
font-size: 25px;
9191
color: #00a65a;
9292
}
9393
.normal {

‎app/templates/index.html‎

Lines changed: 46 additions & 126 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ <h3 class="panel-title">Income</h3>
1515
</div>
1616
<div class="panel-body">
1717

18-
<table class="table table-striped">
18+
<table id="income" class="table table-striped">
1919
<thead>
2020
<tr>
2121
<th>Year</th>
@@ -31,28 +31,6 @@ <h3 class="panel-title">Income</h3>
3131
{% endfor %}
3232
</tbody>
3333
</table>
34-
<hr>
35-
36-
<table id="income" class="table table-striped">
37-
<thead>
38-
<tr>
39-
<th>Year</th>
40-
<th>Item</th>
41-
<th>Amount</th>
42-
</tr>
43-
</thead>
44-
<tbody>
45-
{% for year in income_years %}
46-
{% for rep in range(num_amounts) %}
47-
<tr>
48-
<td>{{ year }}</td>
49-
<td>{{ income_items[year][rep] }}</td>
50-
<td>{{ income_amounts[year][rep] }}</td>
51-
</tr>
52-
{% endfor %}
53-
{% endfor %}
54-
</tbody>
55-
</table>
5634

5735
</div>
5836
</div>
@@ -64,7 +42,7 @@ <h3 class="panel-title">Expenses</h3>
6442
</div>
6543
<div class="panel-body">
6644

67-
<table class="table table-striped">
45+
<table id="expenses" class="table table-striped">
6846
<thead>
6947
<tr>
7048
<th>Year</th>
@@ -80,50 +58,32 @@ <h3 class="panel-title">Expenses</h3>
8058
{% endfor %}
8159
</tbody>
8260
</table>
83-
<hr>
84-
85-
<table id="expenses" class="table table-striped">
86-
<thead>
87-
<tr>
88-
<th>Year</th>
89-
<th>Item</th>
90-
<th>Amount</th>
91-
</tr>
92-
</thead>
93-
<tbody>
94-
{% for year in expenses_years %}
95-
{% for rep in range(num_expenses_amounts) %}
96-
<tr>
97-
<td>{{ year }}</td>
98-
<td>{{ expenses_items[year][rep] }}</td>
99-
<td>{{ expenses_amounts[year][rep] }}</td>
100-
</tr>
101-
{% endfor %}
102-
{% endfor %}
103-
</tbody>
104-
</table>
105-
61+
10662
</div>
10763
</div>
10864
</div>
10965
</div>
110-
<div class="row text-center status">
111-
<div class="col-md-12">
66+
<div class="row status">
67+
<div class="col-md-3"></div>
68+
<div class="col-md-6">
11269
<h3 class="comparison">INCOME - EXPENSES STATUS</h3>
113-
{% for year, amount_difference in income_expenses_differences_per_year_dict.items() %}
114-
{% if amount_difference < 0 %}
115-
<p class="danger">
116-
{{ year }} You are overspending by {{ amount_difference }}
117-
</p>
118-
{% elif amount_difference > 0 %}
119-
<p class="success">
120-
{{ year }} You are underspending by {{ amount_difference }}
121-
</p>
122-
{% else %}
123-
<p class="normal">{{ year }} You are on track</p>
124-
{% endif %}
125-
{% endfor %}
70+
<ul>
71+
{% for year, amount_difference in income_expenses_differences_per_year_dict.items() %}
72+
{% if amount_difference < 0 %}
73+
<li class="danger">
74+
{{ year }}: You are overspending by {{ amount_difference }}
75+
</li>
76+
{% elif amount_difference > 0 %}
77+
<li class="success">
78+
{{ year }}: You are underspending by {{ amount_difference }}
79+
</li>
80+
{% else %}
81+
<li class="normal">{{ year }}: You are on track</li>
82+
{% endif %}
83+
{% endfor %}
84+
</ul>
12685
</div>
86+
<div class="col-md-3"></div>
12787
</div>
12888
<div class="row">
12989
<div class="col-md-6">
@@ -133,7 +93,7 @@ <h3 class="panel-title">Assets</h3>
13393
</div>
13494
<div class="panel-body">
13595

136-
<table class="table table-striped">
96+
<table id="assets" class="table table-striped">
13797
<thead>
13898
<tr>
13999
<th>Year</th>
@@ -149,29 +109,7 @@ <h3 class="panel-title">Assets</h3>
149109
{% endfor %}
150110
</tbody>
151111
</table>
152-
<hr>
153-
154-
<table id="assets" class="table table-striped">
155-
<thead>
156-
<tr>
157-
<th>Year</th>
158-
<th>Item</th>
159-
<th>Amount</th>
160-
</tr>
161-
</thead>
162-
<tbody>
163-
{% for year in assets_years %}
164-
{% for rep in range(num_assets_amounts) %}
165-
<tr>
166-
<td>{{ year }}</td>
167-
<td>{{ assets_items[year][rep] }}</td>
168-
<td>{{ assets_amounts[year][rep] }}</td>
169-
</tr>
170-
{% endfor %}
171-
{% endfor %}
172-
</tbody>
173-
</table>
174-
112+
175113
</div>
176114
</div>
177115
</div>
@@ -182,7 +120,7 @@ <h3 class="panel-title">Liabilities</h3>
182120
</div>
183121
<div class="panel-body">
184122

185-
<table class="table table-striped">
123+
<table id="liabilities" class="table table-striped">
186124
<thead>
187125
<tr>
188126
<th>Year</th>
@@ -198,50 +136,32 @@ <h3 class="panel-title">Liabilities</h3>
198136
{% endfor %}
199137
</tbody>
200138
</table>
201-
<hr>
202-
203-
<table id="liabilities" class="table table-striped">
204-
<thead>
205-
<tr>
206-
<th>Year</th>
207-
<th>Item</th>
208-
<th>Amount</th>
209-
</tr>
210-
</thead>
211-
<tbody>
212-
{% for year in liabilities_years %}
213-
{% for rep in range(num_liabilities_amounts) %}
214-
<tr>
215-
<td>{{ year }}</td>
216-
<td>{{ liabilities_items[year][rep] }}</td>
217-
<td>{{ liabilities_amounts[year][rep] }}</td>
218-
</tr>
219-
{% endfor %}
220-
{% endfor %}
221-
</tbody>
222-
</table>
223-
139+
224140
</div>
225141
</div>
226142
</div>
227143
</div>
228-
<div class="row text-center status">
229-
<div class="col-md-12">
230-
<h3>ASSETS - LIABILITIES STATUS</h3>
231-
{% for year, amount_difference in assets_liabilities_differences_per_year_dict.items() %}
232-
{% if amount_difference < 0 %}
233-
<p class="danger">
234-
{{ year }} You are overspending by {{ amount_difference }}
235-
</p>
236-
{% elif amount_difference > 0 %}
237-
<p class="success">
238-
{{ year }} You are underspending by {{ amount_difference }}
239-
</p>
240-
{% else %}
241-
<p class="normal">{{ year }} You are on track</p>
242-
{% endif %}
243-
{% endfor %}
144+
<div class="row status">
145+
<div class="col-md-3"></div>
146+
<div class="col-md-6">
147+
<h3 class="comparison">ASSETS - LIABILITIES STATUS</h3>
148+
<ul>
149+
{% for year, amount_difference in assets_liabilities_differences_per_year_dict.items() %}
150+
{% if amount_difference < 0 %}
151+
<li class="danger">
152+
{{ year }}: You are overspending by {{ amount_difference }}
153+
</li>
154+
{% elif amount_difference > 0 %}
155+
<li class="success">
156+
{{ year }}: You are underspending by {{ amount_difference }}
157+
</li>
158+
{% else %}
159+
<li class="normal">{{ year }}: You are on track</li>
160+
{% endif %}
161+
{% endfor %}
162+
</ul>
244163
</div>
164+
<div class="col-md-3"></div>
245165
</div>
246166
{% endblock %}
247167

0 commit comments

Comments
 (0)