diff --git a/home/templates/home/index.html b/home/templates/home/index.html index eb5ae6a..f53be6d 100644 --- a/home/templates/home/index.html +++ b/home/templates/home/index.html @@ -66,36 +66,7 @@ background: #1C2331 !important; } } - - @@ -441,13 +412,8 @@
LDK

Past organizers

- -
-
+
+
Card Image @@ -504,14 +470,9 @@
Amit Kumar
-
+
- -
+
Card ImageLovedeep Singh Kamal
-
+
Card ImageDivyansh Upadhyay
- -
+
@@ -655,12 +611,7 @@
Ankit Sangwan
- -
+
Card Image - + \ No newline at end of file diff --git a/user_profile/templates/user_profile/issue_card.html b/user_profile/templates/user_profile/issue_card.html new file mode 100644 index 0000000..f1474f4 --- /dev/null +++ b/user_profile/templates/user_profile/issue_card.html @@ -0,0 +1,30 @@ + + + +
+
+
Total Issues Solved:
+

+ +

{{ totalProblemsSolved }}
+

+
+ +
+
+
+
Very-easy Issue.: {{ veasyProblems }}
+
+
+
Easy Issue: {{ easyProblems }}
+
+
+
Medium Issue: {{ mediumProblems }}
+
+
+
Hard Issue: {{ hardProblems }}
+
+
+
+
+ diff --git a/user_profile/templates/user_profile/profile.html b/user_profile/templates/user_profile/profile.html index 6aab79a..9dc4101 100644 --- 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 index 4660fe0..3d1aedc 100644 --- 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: