Feature/quiz inline feedback

home/static/css/global/global.css

@@ -2377,4 +2377,71 @@ div.notification-confirmation{
   color: #555; 
   margin: 0; 
   margin-bottom: 5px;
+}
+.btn-danger {
+  padding: 6px 14px;       /* reduces height and width */
+  font-size: 0.9rem;       /* slightly smaller text */
+  line-height: 1.2;        /* tighter vertical spacing */
+}
+
+.btn-danger {
+  display: inline-block !important;
+  width: auto !important;
+}
+.activity-table {
+    width: 150%;
+    border-collapse: collapse;
+    border: 1px solid #ddd !important;
+}
+
+.activity-table th,
+.activity-table td {
+    padding: 10px;
+    border: 1px solid #ddd;
+    text-align: left;
+}
+
+.activity-table thead {
+    background-color: #f2f2f2;
+}
+
+.quiz-results-title {
+    text-align: center;
+    margin-bottom: 1em;
+}
+
+.quiz-results-table {
+    border-collapse: collapse;
+    width: 100%;
+    border: 1px solid #ccc;
+}
+
+.quiz-results-table th,
+.quiz-results-table td {
+    padding: 8px;
+    border: 1px solid #ccc;
+}
+
+.quiz-results-table thead {
+    background-color: #f5f5f5;
+    font-weight: bold;
+}
+
+.center-text {
+    text-align: center;
+}
+
+.quiz-link {
+    text-decoration: none;
+    color: #007BFF;
+}
+
+.quiz-link:hover {
+    text-decoration: underline;
+}
+
+.no-quiz-text {
+    text-align: center;
+    color: #666;
+    font-style: italic;
 }

iogt/settings/base.py

@@ -112,6 +112,7 @@
     "iogt.middleware.AdminLocaleMiddleware",
     'iogt.middleware.CustomRedirectMiddleware',
     'iogt_users.middlewares.RegistrationSurveyRedirectMiddleware',
+    'iogt_users.middlewares.TrackFrontendPageVisitsMiddleware',
     'external_links.middleware.RewriteExternalLinksMiddleware',
     'iogt.middleware.GlobalDataMiddleware',
     # 'admin_login.middleware.CustomAdminLoginRequiredMiddleware',

iogt/static/css/accounts.css

@@ -50,7 +50,7 @@ form label[for='id_terms_accepted'], form label[for='id_remember'], form span[id
     margin-right: 10px;
 }
 
-form input {
+form input, #id_gender {
     background-color: #f7f7f9;
     border: 1px solid #efefef;
     border-radius: 8px;
@@ -131,4 +131,8 @@ form input[type="checkbox"] {
 
   .dropdown-content label:hover {
     background-color: #f0f0f0;
-  }
+  }
+
+ .edit-profile input{
+        font-size: 14px; /* Only font-size changes */
+    }

iogt_users/forms.py

@@ -23,11 +23,25 @@ class AccountSignupForm(SignupForm):
         ),
         required=False,
     )
+    date_of_birth = forms.DateField(
+        required=True,
+        widget=forms.DateInput(attrs={"type": "date"})
+    )
+    gender = forms.ChoiceField(
+        choices=[("male", "Male"), ("female", "Female"), ("other", "Other")],
+        required=True,
+    )
+    location = forms.CharField(
+        required=False,  # optional field
+        max_length=255
+    )
     terms_accepted = forms.BooleanField(label=_('I accept the Terms and Conditions.'))
-
     field_order = [
         "username",
         "display_name",
+        "date_of_birth",
+        "gender",
+        "location",
         "password1",
         "password2",
         "terms_accepted",
@@ -44,14 +58,25 @@ def __init__(self, *args, **kwargs):
         self.fields["username"].widget = forms.TextInput(attrs={
             "placeholder": _("Choose a username that you will use to login to IoGT")
         })
+        self.fields["location"].widget =  forms.TextInput(attrs={
+            "placeholder": _("Enter a location")
+        })
+        self.fields["gender"].widget = forms.Select(
+            choices=self.fields["gender"].choices,
+            attrs={
+                "class": "form-control w-100",   # Bootstrap full width
+            }
+        )
 
         if hasattr(self, "field_order"):
             set_form_field_order(self, self.field_order)
 
     def save(self, request):
         user = super().save(request)
-        # 🔁 Run this logic in background
-        send_app_notifications.delay(user.id, notification_type='signup')
+        user.date_of_birth = self.cleaned_data["date_of_birth"]
+        user.gender = self.cleaned_data["gender"]
+        user.location = self.cleaned_data["location"]
+        user.save()
         return user
 
     def clean_username(self):

iogt_users/middlewares.py

@@ -3,6 +3,8 @@
 from django.urls import resolve, Resolver404, translate_url
 from django.utils import translation
 from django.utils.translation import gettext as _
+from django.utils.timezone import now
+from .models import PageVisit
 
 from home.models import SiteSettings
 
@@ -65,3 +67,41 @@ def __call__(self, request):
             return redirect(registration_survey.localized.url)
 
         return self.get_response(request)
+
+
+
+class TrackFrontendPageVisitsMiddleware:
+    def __init__(self, get_response):
+        self.get_response = get_response
+
+    def __call__(self, request):
+        response = self.get_response(request)
+        if request.user.is_authenticated:
+            path = request.path
+            if request.method != "GET":
+                return response
+            excluded_paths = [
+                "/admin",
+                "/static",
+                "/media",
+                "/api",
+                "/my-activity",
+                "/users/profile/my-activity"
+            ]
+            if "my-activity" in path or path.startswith("/admin") or path.startswith("/static") or path.startswith("/media") or path.startswith("/api"):
+                return response
+            if request.headers.get("x-requested-with") == "XMLHttpRequest":
+                return response
+            accept_header = request.headers.get("Accept", "")
+            if "text/html" not in accept_header:
+                return response
+            last_visit = PageVisit.objects.filter(user=request.user, page_slug=path)\
+                                          .order_by("-timestamp").first()
+            if not last_visit or (now() - last_visit.timestamp).total_seconds() > 10:
+                PageVisit.objects.create(
+                    user=request.user,
+                    page_slug=path,
+                    timestamp=now()
+                )
+        return response
+

iogt_users/migrations/0007_user_date_of_birth_user_gender_user_location_and_more.py

@@ -0,0 +1,42 @@
+# Generated by Django 5.2.4 on 2025-10-01 06:27
+
+import django.db.models.deletion
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('iogt_users', '0006_user_interactive_uuid'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='user',
+            name='date_of_birth',
+            field=models.DateField(blank=True, null=True),
+        ),
+        migrations.AddField(
+            model_name='user',
+            name='gender',
+            field=models.CharField(blank=True, choices=[('male', 'Male'), ('female', 'Female'), ('other', 'Other')], max_length=10, null=True),
+        ),
+        migrations.AddField(
+            model_name='user',
+            name='location',
+            field=models.CharField(blank=True, max_length=255, null=True),
+        ),
+        migrations.CreateModel(
+            name='PageVisit',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('page_slug', models.CharField(max_length=500)),
+                ('timestamp', models.DateTimeField(auto_now_add=True)),
+                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='page_visits', to=settings.AUTH_USER_MODEL)),
+            ],
+            options={
+                'ordering': ['-timestamp'],
+            },
+        ),
+    ]

iogt_users/migrations/0008_deleteduserlog.py

@@ -0,0 +1,23 @@
+# Generated by Django 5.2.4 on 2025-10-07 10:47
+
+import django.utils.timezone
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('iogt_users', '0007_user_date_of_birth_user_gender_user_location_and_more'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='DeletedUserLog',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('user_id', models.IntegerField(help_text='Internal user ID (non-identifiable)')),
+                ('deletion_time', models.DateTimeField(default=django.utils.timezone.now)),
+                ('reason', models.TextField(blank=True, null=True)),
+            ],
+        ),
+    ]

iogt_users/migrations/0009_quizattempt.py

@@ -0,0 +1,31 @@
+# Generated by Django 5.2.4 on 2025-10-08 03:19
+
+import django.db.models.deletion
+import django.utils.timezone
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('iogt_users', '0008_deleteduserlog'),
+        ('questionnaires', '0033_survey_notification_tags'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='QuizAttempt',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('score', models.FloatField()),
+                ('attempt_number', models.PositiveIntegerField(default=1)),
+                ('completed_at', models.DateTimeField(default=django.utils.timezone.now)),
+                ('quiz', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='questionnaires.quiz')),
+                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+            ],
+            options={
+                'ordering': ['-completed_at'],
+            },
+        ),
+    ]

iogt_users/models.py

@@ -4,9 +4,10 @@
 from django.contrib.auth import get_user_model
 from django.contrib.auth.models import AbstractUser
 from django.db import models
+from django.utils import timezone
 from django.db.models.signals import post_save
 from django.dispatch import receiver
-from rest_framework_simplejwt.tokens import RefreshToken
+from rest_framework_simplejwt.tokens import RefreshToken 
 
 
 class User(AbstractUser):
@@ -22,6 +23,14 @@ class User(AbstractUser):
     has_viewed_registration_survey = models.BooleanField(default=False)
 
     interactive_uuid = models.CharField(max_length=255, null=True, blank=True)
+    date_of_birth = models.DateField(null=True, blank=True)
+    gender = models.CharField(
+        max_length=10,
+        choices=[("male", "Male"), ("female", "Female"), ("other", "Other")],
+        null=True, blank=True
+    )
+    location = models.CharField(max_length=255, null=True, blank=True)
+
 
     autocomplete_search_field = 'username'
 
@@ -86,3 +95,39 @@ def __str__(self):
 def create_user_profile(sender, instance, created, **kwargs):
     if created:
         Profile.objects.create(user=instance)
+
+
+class PageVisit(models.Model):
+    user = models.ForeignKey(get_user_model(), on_delete=models.CASCADE, related_name="page_visits")
+    page_slug = models.CharField(max_length=500)  # URL path
+    timestamp = models.DateTimeField(auto_now_add=True)
+
+    class Meta:
+        ordering = ["-timestamp"]
+
+    def __str__(self):
+        return f"{self.user.username} visited {self.page_slug} at {self.timestamp}"
+
+
+class DeletedUserLog(models.Model):
+    user_id = models.IntegerField(help_text="Internal user ID (non-identifiable)")
+    deletion_time = models.DateTimeField(default=timezone.now)
+    reason = models.TextField(blank=True, null=True)
+
+    def __str__(self):
+        return f"User ID {self.user_id} deleted at {self.deletion_time}"
+
+
+class QuizAttempt(models.Model):
+    from questionnaires.models import Quiz
+    user = models.ForeignKey(get_user_model(), on_delete=models.CASCADE)
+    quiz = models.ForeignKey(Quiz, on_delete=models.CASCADE)
+    score = models.FloatField()
+    attempt_number = models.PositiveIntegerField(default=1)
+    completed_at = models.DateTimeField(default=timezone.now)
+
+    class Meta:
+        ordering = ["-completed_at"]  # latest first
+
+    def __str__(self):
+        return f"{self.user.username} - {self.quiz.title} (Attempt {self.attempt_number})"