diff --git a/blocnote/apps/financialInputs/views.py b/blocnote/apps/financialInputs/views.py index d6a160ad12a0f545d4329833fe5ff0d0fa7c1944..cb4ec7a075349964258692e44adc424be01c5b82 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})