From 3714f18213081f8ed8239ed9f90311f65de20956 Mon Sep 17 00:00:00 2001 From: Testing wala User Date: Sun, 18 Feb 2024 21:46:02 +0530 Subject: [PATCH 1/4] added phone number feature and updated latest event data --- corpus/robotrix/forms.py | 1 + corpus/robotrix/migrations/0001_initial.py | 8 +- corpus/robotrix/models.py | 5 + corpus/robotrix/views.py | 11 ++- .../templates/robotrix/admin/team_page.html | 2 + corpus/templates/robotrix/admin/teams.html | 2 +- corpus/templates/robotrix/admin/users.html | 2 + corpus/templates/robotrix/home.html | 92 ++++++------------- corpus/templates/robotrix/index.html | 17 +--- corpus/templates/robotrix/register.html | 14 ++- 10 files changed, 69 insertions(+), 85 deletions(-) diff --git a/corpus/robotrix/forms.py b/corpus/robotrix/forms.py index e62f581a..f241105f 100644 --- a/corpus/robotrix/forms.py +++ b/corpus/robotrix/forms.py @@ -16,6 +16,7 @@ class Meta: "roll_no", "ieee_member", "ieee_membership_no", + "phone_no", ] def clean(self): diff --git a/corpus/robotrix/migrations/0001_initial.py b/corpus/robotrix/migrations/0001_initial.py index 582650f8..08404e2d 100644 --- a/corpus/robotrix/migrations/0001_initial.py +++ b/corpus/robotrix/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 4.2.4 on 2024-01-24 13:40 +# Generated by Django 4.2.4 on 2024-02-18 14:33 import django.db.models.deletion from django.conf import settings from django.db import migrations @@ -73,6 +73,12 @@ class Migration(migrations.Migration): ("roll_no", models.CharField(blank=True, max_length=8, null=True)), ("ieee_member", models.BooleanField(default=False)), ("ieee_membership_no", models.BigIntegerField(blank=True, null=True)), + ( + "phone_no", + models.CharField( + max_length=15, unique=True, verbose_name="Phone Number" + ), + ), ], ), migrations.CreateModel( diff --git a/corpus/robotrix/models.py b/corpus/robotrix/models.py index 35d9008f..3c0a2bc9 100644 --- a/corpus/robotrix/models.py +++ b/corpus/robotrix/models.py @@ -12,6 +12,11 @@ class RobotrixUser(models.Model): roll_no = models.CharField(max_length=8, blank=True, null=True) ieee_member = models.BooleanField(default=False) ieee_membership_no = models.BigIntegerField(blank=True, null=True) + phone_no = models.CharField( + max_length=15, + unique=True, + verbose_name="Phone Number", + ) team = models.ForeignKey( "Team", on_delete=models.CASCADE, related_name="team", blank=True, null=True ) diff --git a/corpus/robotrix/views.py b/corpus/robotrix/views.py index 9d4ab15f..2da86bd3 100644 --- a/corpus/robotrix/views.py +++ b/corpus/robotrix/views.py @@ -31,7 +31,7 @@ def home(request): config = ModuleConfiguration.objects.get(module_name="robotrix").module_config try: - if request.user.is_authenticated: + if request.user.is_authenticated and not RobotrixUser.DoesNotExist: args["registered"] = True except RobotrixUser.DoesNotExist: args["registered"] = False @@ -527,12 +527,17 @@ def team_download(request): response["Content-Disposition"] = 'attachment; filename="teams.csv"' writer = csv.writer(response) - writer.writerow(["First Name", "Last Name", "Email"]) + writer.writerow(["First Name", "Last Name", "Email", "Phone Number"]) for team in Team.objects.filter(payment_status__in=["P", "E"]): leader = team.team_leader writer.writerow( - [leader.user.first_name, leader.user.last_name, leader.user.email] + [ + leader.user.first_name, + leader.user.last_name, + leader.user.email, + leader.user.phone_no, + ] ) return response diff --git a/corpus/templates/robotrix/admin/team_page.html b/corpus/templates/robotrix/admin/team_page.html index 36300b55..136248c8 100644 --- a/corpus/templates/robotrix/admin/team_page.html +++ b/corpus/templates/robotrix/admin/team_page.html @@ -19,6 +19,7 @@

Members

Name Email + Phone Number From NITK? College Name IEEE Member? @@ -31,6 +32,7 @@

Members

{{ forloop.counter }} {{ member.user }} {{ member.user.email }} + {{ member.user.phone_no }} {{ member.from_nitk|yesno:"Yes,No" }} {{ member.college_name }} {{ member.ieee_member|yesno:"Yes,No" }} diff --git a/corpus/templates/robotrix/admin/teams.html b/corpus/templates/robotrix/admin/teams.html index 1074f180..1d19110c 100644 --- a/corpus/templates/robotrix/admin/teams.html +++ b/corpus/templates/robotrix/admin/teams.html @@ -40,7 +40,7 @@

Team Management

Back
Download Team List + class="btn btn-primary text-black font-bold no-underline">Download Team Leaders List
diff --git a/corpus/templates/robotrix/admin/users.html b/corpus/templates/robotrix/admin/users.html index 768e0920..bbc03715 100644 --- a/corpus/templates/robotrix/admin/users.html +++ b/corpus/templates/robotrix/admin/users.html @@ -29,6 +29,7 @@

Stats

Name Email + Phone Number From NITK? College Name IEEE Member? @@ -42,6 +43,7 @@

Stats

{{ forloop.counter }} {{ user.user }} {{ user.user.email }} + {{ user.phone_no }} {{ user.from_nitk|yesno:"Yes,No" }} {{ user.college_name }} {{ user.ieee_member|yesno:"Yes,No" }} diff --git a/corpus/templates/robotrix/home.html b/corpus/templates/robotrix/home.html index ce15580e..9dd87288 100644 --- a/corpus/templates/robotrix/home.html +++ b/corpus/templates/robotrix/home.html @@ -75,7 +75,7 @@ {% comment %} Hero Section {% endcomment %}
+ class="hero min-h-[50vh] min-w-screen">

Robotrix 2024


@@ -85,7 +85,7 @@

A 24-Hour Robotics Hackathon



NATIONAL INSTITUTE OF TECHNOLOGY KARNATAKA

-

22nd February - 9th March 2024

+

24th February - 10th March 2024

{% if registration_active and not registration_done and not registered %} Register Now {% elif registration_done and not registered %} @@ -117,7 +117,7 @@

KNOW ABOUT ROBO you with interesting problem statements to ensure a fun-filled learning experience. In addition to the hackathon, a workshop will also be conducted before the final event to enhance your experience with us!
-

Open to 1st and 2nd year B.Tech students from all over India!

+

Open to 1st, 2nd and 3rd year B.Tech students from all over India!


@@ -211,50 +211,7 @@

Prize -->
-

Top 2 Teams receive prizes from a pool of 5000 INR

-
- - - - - - - - - - - - - - - -
-
-
-
- {% comment %} First prize cup icon svg {% endcomment %} - First Prize -
-
-
- 		- First Prize -
- {% comment %} Desktop Support Technician {% endcomment %} - 		3000 INR
-
-
-
- {% comment %} Second prize cup icon svg {% endcomment %} - Second Prize -
-
-
- 		- Second Prize -
- 		2000 INR
-
+

Top 2 Teams receive Prizes worth 5000 INR !

{% comment %}

Prizes and goodies to be announced soon !

{% endcomment %}
@@ -303,12 +260,12 @@

SCHEDULE

- -
Preliminary test
+ +
Expert talk
- -
+
+
  • @@ -316,11 +273,12 @@

    SCHEDULE

    - -
    Expert talk
    + +
    Qualifying test
    -
    +
    +
  • @@ -330,9 +288,9 @@

    SCHEDULE

    Session 1 on Coppeliasim
    -
    -
    +
    +
  • @@ -344,7 +302,8 @@

    SCHEDULE

    Assignment
    -
    +
    +
  • @@ -357,7 +316,8 @@

    SCHEDULE

    Session 2 on Coppeliasim
    -
    +
    +
  • @@ -433,7 +393,7 @@

    SCHEDULE

    - 1st or 2nd year B.Tech students from any engineering college and any branch in India are eligible to participate. + 1st, 2nd or 3rd year B.Tech students from any engineering college and any branch in India are eligible to participate.

    @@ -481,7 +441,7 @@

    SCHEDULE

    -
    +

    SCHEDULE

    -
    +

    SCHEDULE

    -
    +

    SCHEDULE

    -
    +

    SCHEDULE

    -
    +

    SCHEDULE

    -
    +

    SCHEDULE

    -
    +

    .hero { - background-color: rgba(0, 0, 0, 0.5); - background-image: url("{% static 'img/ieee-robotrix.png' %}"); + background-color: rgba(0, 0, 0, 0.6); + background-image: url("{% static 'img/robotrix/robotrix_logo.png' %}"); background-size: cover; background-position: center; background-blend-mode: overlay; @@ -67,7 +67,7 @@
    - Robotrix Logo +

    Robotrix

    24-Hour Signal Processing Hackathon

    NATIONAL INSTITUTE OF TECHNOLOGY KARNATAKA

    @@ -120,16 +120,7 @@

    Edit Team

    - {% if team.payment_status == "P" or team.payment_status == "E" %} -
    -

    Join the Discord Server

    - - - - - -
    - {% endif %} + {% if team.payment_status == "U" %}
    diff --git a/corpus/templates/robotrix/register.html b/corpus/templates/robotrix/register.html index 8c843204..d93e07fe 100644 --- a/corpus/templates/robotrix/register.html +++ b/corpus/templates/robotrix/register.html @@ -57,6 +57,18 @@

    Register for Robotrix

    {% endif %}
    +
    + + {{ form.phone_no }} + {% if form.phone_no.errors %} +
    + +
    + {% endif %} +
    +
    @@ -84,7 +96,7 @@

    Register for Robotrix

    - +
    From 8602faccd9127c9bc212f33ab71866a6a7342c2c Mon Sep 17 00:00:00 2001 From: Testing wala User Date: Sun, 18 Feb 2024 23:02:50 +0530 Subject: [PATCH 2/4] fixed registration display issues on home page --- corpus/robotrix/views.py | 4 +++- corpus/templates/robotrix/home.html | 5 +++-- .../templates/static/img/robotrix/robo_small.png | Bin 0 -> 9895 bytes 3 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 corpus/templates/static/img/robotrix/robo_small.png diff --git a/corpus/robotrix/views.py b/corpus/robotrix/views.py index 2da86bd3..6008ac4f 100644 --- a/corpus/robotrix/views.py +++ b/corpus/robotrix/views.py @@ -31,8 +31,10 @@ def home(request): config = ModuleConfiguration.objects.get(module_name="robotrix").module_config try: - if request.user.is_authenticated and not RobotrixUser.DoesNotExist: + if request.user.is_authenticated: + robotrix_user = RobotrixUser.objects.get(user=request.user) args["registered"] = True + args["robotrix_user"] = robotrix_user except RobotrixUser.DoesNotExist: args["registered"] = False diff --git a/corpus/templates/robotrix/home.html b/corpus/templates/robotrix/home.html index 9dd87288..1799f950 100644 --- a/corpus/templates/robotrix/home.html +++ b/corpus/templates/robotrix/home.html @@ -24,6 +24,7 @@ } .hero { background-size: cover; + /* background-image: url("{% static 'img/robotrix/robo_small.png' %}"); */ } } @@ -89,11 +90,11 @@

    Register Now {% elif registration_done and not registered %} - Registerations Closed + Registrations Closed {% elif registered %} Go to Dashboard {% else %} - Registerations Opening Soon + Registrations Opening Soon {% endif %}
    diff --git a/corpus/templates/static/img/robotrix/robo_small.png b/corpus/templates/static/img/robotrix/robo_small.png new file mode 100644 index 0000000000000000000000000000000000000000..3040938ebd3206cd1b20380c8917237794107bd1 GIT binary patch literal 9895 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 Date: Sun, 18 Feb 2024 23:20:53 +0530 Subject: [PATCH 3/4] home page logo changes --- corpus/templates/robotrix/home.html | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/corpus/templates/robotrix/home.html b/corpus/templates/robotrix/home.html index 1799f950..2bf6a901 100644 --- a/corpus/templates/robotrix/home.html +++ b/corpus/templates/robotrix/home.html @@ -11,10 +11,11 @@ .hero { background-color: rgba(0, 0, 0, 0.6); - background-image: url("{% static 'img/robotrix/robotrix_logo.png' %}"); + /* background-image: url("{% static 'img/robotrix/robotrix_logo.png' %}"); */ background-size: cover; background-position: center; background-blend-mode: overlay; + height: 25%; } /* Small screens (default full width) */ @@ -23,8 +24,8 @@ max-width: 70%; } .hero { - background-size: cover; - /* background-image: url("{% static 'img/robotrix/robo_small.png' %}"); */ + background-size: contain; + background-image: url("{% static 'img/robotrix/robo_small.png' %}"); } } @@ -35,6 +36,7 @@ } .hero { background-size: contain; + background-image: url("{% static 'img/robotrix/robotrix_logo.png' %}"); } } @@ -45,6 +47,7 @@ } .hero { background-size: 60%; /* Adjust the size based on your preference */ + background-image: url("{% static 'img/robotrix/robotrix_logo.png' %}"); } } @@ -55,6 +58,7 @@ } .hero { background-size: 70%; /* Adjust the size based on your preference */ + background-image: url("{% static 'img/robotrix/robotrix_logo.png' %}"); } } From 56c1e9f5b09b496a567f4334e28f6bed698d20dc Mon Sep 17 00:00:00 2001 From: Testing wala User Date: Sun, 18 Feb 2024 23:31:02 +0530 Subject: [PATCH 4/4] minor typo and other fixes --- corpus/robotrix/tests/__init__.py | 0 corpus/robotrix/tests/test_models.py | 0 corpus/robotrix/tests/test_urls.py | 80 ---------------------------- corpus/robotrix/tests/test_views.py | 13 ----- corpus/templates/robotrix/home.html | 2 +- corpus/templates/robotrix/index.html | 4 +- 6 files changed, 3 insertions(+), 96 deletions(-) delete mode 100644 corpus/robotrix/tests/__init__.py delete mode 100644 corpus/robotrix/tests/test_models.py delete mode 100644 corpus/robotrix/tests/test_urls.py delete mode 100644 corpus/robotrix/tests/test_views.py diff --git a/corpus/robotrix/tests/__init__.py b/corpus/robotrix/tests/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/corpus/robotrix/tests/test_models.py b/corpus/robotrix/tests/test_models.py deleted file mode 100644 index e69de29b..00000000 diff --git a/corpus/robotrix/tests/test_urls.py b/corpus/robotrix/tests/test_urls.py deleted file mode 100644 index d34f493e..00000000 --- a/corpus/robotrix/tests/test_urls.py +++ /dev/null @@ -1,80 +0,0 @@ -from django.test import SimpleTestCase -from django.urls import resolve -from django.urls import reverse -from robotrix.views import add_member -from robotrix.views import admin -from robotrix.views import announcements_management -from robotrix.views import create_team -from robotrix.views import delete_announcement -from robotrix.views import delete_payment_proof -from robotrix.views import home -from robotrix.views import index -from robotrix.views import mark_payment_complete -from robotrix.views import mark_payment_incomplete -from robotrix.views import register -from robotrix.views import team_management -from robotrix.views import team_page -from robotrix.views import upload_payment_proof -from robotrix.views import user_management - - -class UrlsTestCase(SimpleTestCase): - def test_home_url_is_resolved(self): - url = reverse("robotrix_home") - self.assertEquals(resolve(url).func, home) - - def test_index_url_is_resolved(self): - url = reverse("robotrix_index") - self.assertEquals(resolve(url).func, index) - - def test_register_url_is_resolved(self): - url = reverse("robotrix_register") - self.assertEquals(resolve(url).func, register) - - def test_create_team_url_is_resolved(self): - url = reverse("robotrix_create_team") - self.assertEquals(resolve(url).func, create_team) - - def test_add_member_url_is_resolved(self): - url = reverse("robotrix_add_member2") - self.assertEquals(resolve(url).func, add_member) - - def test_upload_payment_proof_url_is_resolved(self): - url = reverse("robotrix_upload_payment_proof") - self.assertEquals(resolve(url).func, upload_payment_proof) - - def test_delete_payment_proof_url_is_resolved(self): - url = reverse("robotrix_delete_payment_proof") - self.assertEquals(resolve(url).func, delete_payment_proof) - - def test_admin_url_is_resolved(self): - url = reverse("robotrix_admin") - self.assertEquals(resolve(url).func, admin) - - def test_team_management_url_is_resolved(self): - url = reverse("robotrix_admin_teams") - self.assertEquals(resolve(url).func, team_management) - - def test_team_page_url_is_resolved(self): - url = reverse("robotrix_admin_team_page", args=[1]) - self.assertEquals(resolve(url).func, team_page) - - def test_user_management_url_is_resolved(self): - url = reverse("robotrix_admin_users") - self.assertEquals(resolve(url).func, user_management) - - def test_announcements_management_url_is_resolved(self): - url = reverse("robotrix_announcements") - self.assertEquals(resolve(url).func, announcements_management) - - def test_delete_announcement_url_is_resolved(self): - url = reverse("robotrix_delete_announcement", args=[1]) - self.assertEquals(resolve(url).func, delete_announcement) - - def test_mark_payment_complete_url_is_resolved(self): - url = reverse("robotrix_admin_mark_payment_complete", args=[1]) - self.assertEquals(resolve(url).func, mark_payment_complete) - - def test_mark_payment_incomplete_url_is_resolved(self): - url = reverse("robotrix_admin_mark_payment_incomplete", args=[1]) - self.assertEquals(resolve(url).func, mark_payment_incomplete) diff --git a/corpus/robotrix/tests/test_views.py b/corpus/robotrix/tests/test_views.py deleted file mode 100644 index 460d6492..00000000 --- a/corpus/robotrix/tests/test_views.py +++ /dev/null @@ -1,13 +0,0 @@ -from django.test import Client -from django.test import TestCase -from django.urls import reverse - - -class ViewsTestCase(TestCase): - def setUp(self): - self.client = Client() - - def test_home_view_GET(self): - response = self.client.get(reverse("robotrix_home")) - self.assertEqual(response.status_code, 200) - self.assertTemplateUsed(response, "robotrix/home.html") diff --git a/corpus/templates/robotrix/home.html b/corpus/templates/robotrix/home.html index 2bf6a901..1371d09f 100644 --- a/corpus/templates/robotrix/home.html +++ b/corpus/templates/robotrix/home.html @@ -87,7 +87,7 @@

    Admin {% endif %} -

    A 24-Hour Robotics Hackathon



    +

    24-Hour Robotics Hackathon



    NATIONAL INSTITUTE OF TECHNOLOGY KARNATAKA

    24th February - 10th March 2024

    diff --git a/corpus/templates/robotrix/index.html b/corpus/templates/robotrix/index.html index d9856431..5a90db09 100644 --- a/corpus/templates/robotrix/index.html +++ b/corpus/templates/robotrix/index.html @@ -69,9 +69,9 @@

    Robotrix

    -

    24-Hour Signal Processing Hackathon

    +

    24-Hour Robotics Hackathon

    NATIONAL INSTITUTE OF TECHNOLOGY KARNATAKA

    -

    10th - 13th January 2024

    +

    24th February - 10th March 2024

    {% comment %} Registrations Opening soon {% endcomment %}