From 5e1350e72d70e3ed2f6bdb9eddfd1f7239cd29b1 Mon Sep 17 00:00:00 2001 From: Adarsh Murthy Date: Mon, 22 May 2017 09:39:04 -0400 Subject: [PATCH] Fix income statement UI view. --- blocnote/apps/financialInputs/views.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/blocnote/apps/financialInputs/views.py b/blocnote/apps/financialInputs/views.py index d6a160a..cb4ec7a 100644 --- a/blocnote/apps/financialInputs/views.py +++ b/blocnote/apps/financialInputs/views.py @@ -920,17 +920,19 @@ class IncomeStatementTable(View): """ objs = self.model.objects.filter(building_id=building_id) instance = {} - instance['present'] = False if objs: instance['present'] = True result = [] + temp_result = {} for obj in objs: record = {} record['year'] = obj.year record['revenue'] = obj.revenue record['utility_expense'] = obj.utility_expense record['non_utility_operating_expense'] = obj.non_utility_operating_expense - result.append(record) + temp_result[obj.year] = record + for sorted_year in sorted(temp_result): + result.append(temp_result[sorted_year]) instance['result'] = result return JsonResponse({'instance': instance}) -- GitLab