Edit achievements

contributors/urls.py

@@ -106,6 +106,11 @@
         views.achievements.AchievementListView.as_view(),
         name='achievements',
     ),
+    path(
+        'contributor_achievements/<slug:slug>',
+        views.contributor_achievements.ContributorAchievementListView.as_view(),  # noqa: E501
+        name='contributor_achievements',
+    ),
     path(
         'landing/',
         views.landing.LandingView.as_view(),

contributors/views/__init__.py

@@ -2,6 +2,7 @@
     about,
     achievements,
     config,
+    contributor_achievements,
     contributor_compare,
     filters,
     home,

contributors/views/contributor_achievements.py

@@ -0,0 +1,109 @@
+from django.db.models import Count, Q, Sum  # noqa: WPS235, WPS347
+from django.db.models.functions import Coalesce
+from django.views import generic
+
+from contributors.models import Contributor, Repository
+
+ID = 'id'
+
+
+class ContributorAchievementListView(generic.ListView):
+    """Achievement list."""
+
+    template_name = 'contributor/contributor_achievements_list.html'
+    model = Contributor
+    contributors = Contributor.objects.with_contributions()
+
+    pull_request_ranges_for_achievements = [100, 50, 25, 10, 1]
+    commit_ranges_for_achievements = [200, 100, 50, 25, 1]
+    issue_ranges_for_achievements = [50, 25, 10, 5, 1]
+    comment_ranges_for_achievements = [200, 100, 50, 25, 1]
+    edition_ranges_for_achievements = [1000, 500, 250, 100, 1]
+
+    def get_context_data(self, **kwargs):
+        """Add context data for achievement list."""
+        self.contributors_amount = Contributor.objects.count()
+        context = super().get_context_data(**kwargs)
+        contributors = Contributor.objects.with_contributions()
+        current_contributor = (
+            Contributor.objects.get(login=self.kwargs['slug'])
+        )
+
+        repositories = Repository.objects.select_related(
+            'organization',
+        ).filter(
+            is_visible=True,
+            contribution__contributor=current_contributor,
+        ).annotate(
+            commits=Count('id', filter=Q(contribution__type='cit')),
+            additions=Coalesce(Sum('contribution__stats__additions'), 0),
+            deletions=Coalesce(Sum('contribution__stats__deletions'), 0),
+            pull_requests=Count(
+                'contribution', filter=Q(contribution__type='pr'),
+            ),
+            issues=Count('contribution', filter=Q(contribution__type='iss')),
+            comments=Count('contribution', filter=Q(contribution__type='cnt')),
+        ).order_by('organization', 'name')
+
+        contributions = repositories.values().aggregate(
+            contributor_deletions=Sum('deletions'),
+            contributor_additions=Sum('additions'),
+            contributor_commits=Sum('commits'),
+            contributor_pull_requests=Sum('pull_requests'),
+            contributor_issues=Sum('issues'),
+            contributor_comments=Sum('comments'),
+        )
+
+        context['commits'] = contributions['contributor_commits']
+        context['pull_requests'] = contributions['contributor_pull_requests']
+        context['issues'] = contributions['contributor_issues']
+        context['comments'] = contributions['contributor_commits']
+        context['total_editions'] = (
+            contributions['contributor_additions'] + contributions['contributor_deletions']  # noqa: E501
+        )
+        context['total_actions'] = sum(contributions.values())
+        context['pull_request_ranges_for_achievements'] = (
+            self.pull_request_ranges_for_achievements
+        )
+        context['current_contributor'] = current_contributor
+        context['contributors_amount'] = self.contributors_amount
+        context['contributors_with_any_contribution'] = (
+            contributors.filter(contribution_amount__gte=1).count()
+        )
+
+        # Pull request achievements:
+        for pr_num in self.pull_request_ranges_for_achievements:
+            context[f'contributor_pull_requests_gte_{pr_num}'] = pr_num
+            context[f'contributors_pull_requests_gte_{pr_num}'] = (
+                contributors.filter(pull_requests__gte=pr_num).count()
+            )
+
+        # Commit achievements:
+        for commit_num in self.commit_ranges_for_achievements:
+            context[f'contributor_commits_gte_{commit_num}'] = commit_num
+            context[f'contributors_commits_gte_{commit_num}'] = (
+                contributors.filter(commits__gte=commit_num).count()
+            )
+
+        # Issue achievements:
+        for issue_num in self.issue_ranges_for_achievements:
+            context[f'contributor_issues_gte_{issue_num}'] = issue_num
+            context[f'contributors_issues_gte_{issue_num}'] = (
+                contributors.filter(issues__gte=issue_num).count()
+            )
+
+        # Comment achievements:
+        for comment_num in self.comment_ranges_for_achievements:
+            context[f'contributor_comments_gte_{comment_num}'] = comment_num
+            context[f'contributors_comments_gte_{comment_num}'] = (
+                contributors.filter(comments__gte=comment_num).count()
+            )
+
+        # Edition achievements:
+        for ed_num in self.edition_ranges_for_achievements:
+            context[f'contributor_editions_gte_{ed_num}'] = ed_num
+            context[f'contributors_editions_gte_{ed_num}'] = (
+                contributors.filter(editions__gte=ed_num).count()
+            )
+
+        return context

templates/components/footer.html

@@ -7,7 +7,22 @@
       </ul>
     </div>
     <div class="col">
-      <p class="h6">{% trans "Other projects" %}</p>
+      <ul class="list-unstyled my-0">
+        <div class="row">
+          <div class="col">
+            <li><p class="h6">{% trans "Other projects" %}</p></li>
+          </div>
+          <div class="col">
+            <li> </li>
+          </div>
+          <div class="col">
+            <li><p class="h6">{% trans "Useful resources" %}</p></li>
+          </div>
+          <div class="col">
+            <li><a target="_blank" href="{% url 'contributors:achievements' %}">{% trans "Common statistics" %}</a></li>
+          </div>
+        </div>
+      </ul>
       <hr>
       <ul class="list-unstyled my-0">
         <div class="row">
@@ -22,18 +37,18 @@
             <li><a target="_blank" href="http://codebattle.hexlet.io">Codebattle</a></li>
             <li><a target="_blank" href="http://code-basics.com">Code Basics</a></li>
           </div>
+          <div class="col">
+            <li><a target="_blank" href="http://guides.hexlet.io">Hexlet Guides</a></li>
+            <li><a target="_blank" href="http://ru.hexlet.io/knowledge">{% trans "Knowledge base" %}</a></li>
+            <li><a target="_blank" href="http://ru.hexlet.io/pages/recommended-books">{% trans "Recommended books" %}</a></li>
+            <li><a target="_blank" href="http://ru.hexlet.io/blog">{% trans "Blog" %}</a></li>
+          </div>
+          <div class="col">
+            <li> </li>
+          </div>
         </div>
       </ul>
-    </div>
-    <div class="col">
-      <p class="h6">{% trans "Useful resources" %}</p>
-      <hr>
-        <ul class="list-unstyled my-0">
-          <li><a target="_blank" href="http://guides.hexlet.io">Hexlet Guides</a></li>
-          <li><a target="_blank" href="http://ru.hexlet.io/knowledge">{% trans "Knowledge base" %}</a></li>
-          <li><a target="_blank" href="http://ru.hexlet.io/pages/recommended-books">{% trans "Recommended books" %}</a></li>
-          <li><a target="_blank" href="http://ru.hexlet.io/blog">{% trans "Blog" %}</a></li>
-        </ul>
+
     </div>
   </div>
 </div>

templates/components/tables/contributor_achievement_percentage_field.html

@@ -0,0 +1,18 @@
+{% load i18n static mathfilters %}
+
+<div class="progress d-flex justify-content-between" style="height: max-content;">
+  <div class="bg-info text-dark text-start aligns-items-center" role="progressbar" style="width: {{ contribution|div:achievement_made_count|mul:100|floatformat:0 }}%;" aria-valuenow="25" aria-valuemin="0" aria-valuemax="100">
+    <dl class="p-2 fs-6 mb-0" style="width:50vw;">
+      <dt>{% trans achievement_name %}</dt>
+      <dd class="mb-0">{% trans achievement_description %}</dd>
+    </dl>
+  </div>
+
+  <div class="p-2 fs-6 d-flex justify-content-center align-items-center">
+    {% if contribution|div:achievement_made_count|mul:100 > 100 %}
+      100.0%
+    {% else %}
+      {{ contribution|div:achievement_made_count|mul:100|floatformat:1 }}%
+    {% endif %}
+  </div>
+</div>