github/plane
0
0
Fork 1
mirror of https://github.com/makeplane/plane synced 2024-06-14 14:31:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: analytics data ordering (#1059)

Browse Source
This commit is contained in:
pablohashescobar 2023-05-17 00:45:59 +05:30 committed by GitHub
parent d575e8ec6b
commit e696a3741c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
apiserver/plane/utils/analytics_plot.py
View File

@ -8,6 +8,9 @@ from django.db.models.functions import Coalesce, ExtractMonth, ExtractYear, Conc
def build_graph_plot(queryset, x_axis, y_axis, segment=None): def build_graph_plot(queryset, x_axis, y_axis, segment=None):
temp_axis = x_axis
if x_axis in ["created_at", "start_date", "target_date", "completed_at"]: if x_axis in ["created_at", "start_date", "target_date", "completed_at"]:
year = ExtractYear(x_axis) year = ExtractYear(x_axis)
month = ExtractMonth(x_axis) month = ExtractMonth(x_axis)
@ -61,7 +64,13 @@ def build_graph_plot(queryset, x_axis, y_axis, segment=None):
result_values = list(queryset) result_values = list(queryset)
grouped_data = {} grouped_data = {}
for date, items in groupby(result_values, key=lambda x: x[str("dimension")]): for key, items in groupby(result_values, key=lambda x: x[str("dimension")]):
grouped_data[str(date)] = list(items) grouped_data[str(key)] = list(items)
return grouped_data sorted_data = grouped_data
if temp_axis == "priority":
order = ["low", "medium", "high", "urgent", "None"]
sorted_data = {key: grouped_data[key] for key in order if key in grouped_data}
else:
sorted_data = dict(sorted(grouped_data.items(), key=lambda x: (x[0] is "None", x[0])))
return sorted_data