altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 4 Packages Projects Releases Wiki Activity

fix: fix statistics for RFCs to show properly. (#8139)

Browse source
This commit is contained in:
Tero Kivinen 2024-11-03 18:29:53 +02:00 committed by GitHub
parent deb58a1a63
commit 19d80ffc83
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 17 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
ietf/stats/views.py
View file

@ -596,14 +596,17 @@ def document_stats(request, stats_type=None):
elif any(stats_type == t[0] for t in possible_yearly_stats_types): elif any(stats_type == t[0] for t in possible_yearly_stats_types):
person_filters = Q(documentauthor__document__type="draft")
# filter persons # filter persons
rfc_state = State.objects.get(type="rfc", slug="published") rfc_state = State.objects.get(type="rfc", slug="published")
if document_type == "rfc": if document_type == "rfc":
person_filters = Q(documentauthor__document__type="rfc")
person_filters &= Q(documentauthor__document__states=rfc_state) person_filters &= Q(documentauthor__document__states=rfc_state)
elif document_type == "draft": elif document_type == "draft":
person_filters = Q(documentauthor__document__type="draft")
person_filters &= ~Q(documentauthor__document__states=rfc_state) person_filters &= ~Q(documentauthor__document__states=rfc_state)
else:
person_filters = Q(documentauthor__document__type="rfc")
person_filters |= Q(documentauthor__document__type="draft")
doc_years = defaultdict(set) doc_years = defaultdict(set)
@ -625,8 +628,8 @@ def document_stats(request, stats_type=None):
).values_list("source", flat=True)[:1] ).values_list("source", flat=True)[:1]
) )
) )
.values_list("draft", "time") .values_list("doc", "time")
.order_by("draft") .order_by("doc")
) )
for doc_id, time in rfcevent_qs.iterator(): for doc_id, time in rfcevent_qs.iterator():
@ -663,9 +666,11 @@ def document_stats(request, stats_type=None):
for name, affiliation, doc in name_affiliation_doc_set: for name, affiliation, doc in name_affiliation_doc_set:
a = aliases.get(affiliation, affiliation) a = aliases.get(affiliation, affiliation)
if a: if a:
for year in doc_years.get(doc): years = doc_years.get(doc)
if years_from <= year <= years_to: if years:
bins[(year, a)].add(name) for year in years:
if years_from <= year <= years_to:
bins[(year, a)].add(name)
add_labeled_top_series_from_bins(chart_data, bins, limit=8) add_labeled_top_series_from_bins(chart_data, bins, limit=8)
@ -724,9 +729,11 @@ def document_stats(request, stats_type=None):
continent_name = country_to_continent.get(country_name, "") continent_name = country_to_continent.get(country_name, "")
if continent_name: if continent_name:
for year in doc_years.get(doc): years = doc_years.get(doc)
if years_from <= year <= years_to: if years:
bins[(year, continent_name)].add(name) for year in years:
if years_from <= year <= years_to:
bins[(year, continent_name)].add(name)
add_labeled_top_series_from_bins(chart_data, bins, limit=8) add_labeled_top_series_from_bins(chart_data, bins, limit=8)