Updated: Conflict resolve

ContriHUB · Oct 20, 2024 · 071564b · 071564b
1 parent d47262d
commit 071564b
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 1 deletion.
diff --git a/user_profile/templates/user_profile/issue_card.html b/user_profile/templates/user_profile/issue_card.html
@@ -0,0 +1,30 @@
+
+
+
+<div class='d-flex justify-content-center gap-3 mb-4 flex-wrap'>
+    <div class='px-5 py-3 fs-1 bg-white align-content-center' style='width: 200px; border-radius: 7px;'>  <!-- Left column for total problems -->
+        <h5>Total Issues Solved:</h5>
+        <p>
+
+            <div>{{ totalProblemsSolved }}</div>
+        </p>
+    </div>
+
+    <div class='d-flex flex-column p-3 bg-white' style='border-radius: 7px; height: 100%;'>
+        <div class="d-flex flex-column flex-grow-1 gap-1 ">
+            <div class="w-100 badge badge-pill flex-grow-1 align-content-center" style="background-color: #33b5e5; padding: .75rem 3rem;">
+                <div class="box fs-6">Very-easy Issue.: {{ veasyProblems }}</div>
+            </div>
+            <div class="w-100 badge badge-pill flex-grow-1 align-content-center" style="background-color: #00b74a; padding: .75rem 3rem;">
+                <div class="box fs-6">Easy Issue: {{ easyProblems }}</div>
+            </div>
+            <div class="w-100 badge badge-pill flex-grow-1 align-content-center" style="background-color: #ffa900; padding: .75rem 3rem;">
+                <div class="box fs-6">Medium Issue: {{ mediumProblems }}</div>
+            </div>
+            <div class="w-100 badge badge-pill flex-grow-1 align-content-center" style="background-color: #ff3547; padding: .75rem 3rem;">
+                <div class="box fs-6">Hard Issue: {{ hardProblems }}</div>
+            </div>
+        </div>
+    </div>
+</div>
+
diff --git a/user_profile/templates/user_profile/profile.html b/user_profile/templates/user_profile/profile.html
@@ -24,6 +24,8 @@
 
     {% if user.is_authenticated %}
         {% include "user_profile/profile-card.html" %}
+        {% include "user_profile/issue_card.html" %}
+
 
         {% comment %}
             In Django templates you can use the "get_FOO_display()" method, that will return the readable alias

diff --git a/user_profile/views.py b/user_profile/views.py
@@ -58,6 +58,11 @@ def profile(request, username):
             pending_pr_requests_for_mentor = pr_requests_for_mentor.filter(state=3).order_by("submitted_at")
             pr_requests_for_mentor = chain(pending_pr_requests_for_mentor,
                                            accepted_pr_requests_for_mentor, rejected_pr_requests_for_mentor)
+            easyProblems=PullRequest.objects.filter(contributor=user,issue__level=1,state=1).count()
+            mediumProblems=PullRequest.objects.filter(contributor=user,issue__level=2,state=1).count()
+            hardProblems=PullRequest.objects.filter(contributor=user,issue__level=3,state=1).count()
+            veasyProblems=PullRequest.objects.filter(contributor=user,issue__level=4,state=1).count()
+            totalProblemsSolved = PullRequest.objects.filter(contributor=user, state=1).count()
 
             pr_form = PRSubmissionForm()
             judge_form = PRJudgeForm()
@@ -74,7 +79,12 @@ def profile(request, username):
                 "assignment_requests_for_mentor": assignment_requests_for_mentor,
                 'pr_form': pr_form,
                 "judge_form": judge_form,
-                "native_profile": native_profile
+                "native_profile": native_profile,
+                "easyProblems": easyProblems,
+                "mediumProblems": mediumProblems,
+                "hardProblems": hardProblems,
+                "veasyProblems": veasyProblems,
+                "totalProblemsSolved": totalProblemsSolved,
             }
             return render(request, 'user_profile/profile.html', context=context)
         else: