Merge branch 'main' into privacy-policy-page

Author: Tyler Gonsalves

code/mymedic/static/css/dashboard.css

@@ -210,6 +210,55 @@
   font-weight: 500;
 }
 
+
+/* Appointment Card Section */
+.appointments-container {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 1.5rem;
+  justify-content: flex-start;
+  margin-top: 2rem;
+}
+
+.appointments-section .card {
+  width: 260px;
+  height: 200px;
+  padding: 1.2rem 1rem;
+  margin-bottom: 3rem;
+  border-radius: 12px;
+  background-color: #ffffff;
+  box-shadow: 0 8px 24px rgba(0, 0, 0, 0.08);
+  text-align: center;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+}
+
+
+.appointment-date {
+  font-size: 1.1rem;
+  font-weight: 600;
+  margin-bottom: 0.5rem;
+  color: #20b2aa;
+}
+
+.appointment-detail {
+  font-size: 0.95rem;
+  color: #444;
+  margin-bottom: 1rem;
+}
+
+.appointments-section .card form {
+  margin-top: auto;
+}
+
+.appointments-section .btn-danger {
+  background-color: #dc3545;
+  border-color: #dc3545;
+  font-weight: 500;
+}
+
+
 /* Responsive */
 @media (max-width: 768px) {
   .welcome-title {
@@ -224,4 +273,4 @@
   .dashboard-main {
     padding: 1rem 0;
   }
-}
+}

code/mymedic/tests/users/__init__.py

@@ -0,0 +1,30 @@
+from django.test import TestCase, Client
+from django.contrib.auth.models import User
+from users.models import Appointment
+from django.urls import reverse
+from datetime import date
+
+class AppointmentTests(TestCase):
+    def setUp(self):
+        self.client = Client()
+        self.user = User.objects.create_user(username='testuser', password='testpass')
+        self.appointment = Appointment.objects.create(
+            user=self.user,
+            patient_name='testuser',
+            doctor_name='Dr. House',
+            date=date.today(),
+            reason='Annual Checkup'
+        )
+
+    def test_appointment_shows_on_dashboard(self):
+        self.client.login(username='testuser', password='testpass')
+        response = self.client.get(reverse('dashboard'))
+        self.assertEqual(response.status_code, 200)
+        self.assertContains(response, 'Dr. House')
+        self.assertContains(response, 'Annual Checkup')
+
+    def test_cancel_appointment(self):
+        self.client.login(username='testuser', password='testpass')
+        response = self.client.post(reverse('cancel_appointment', args=[self.appointment.id]))
+        self.assertRedirects(response, reverse('dashboard'))
+        self.assertFalse(Appointment.objects.filter(id=self.appointment.id).exists())

code/mymedic/tests/users/test_appointments.py

@@ -1,6 +1,8 @@
 """This module registers the user models with django"""
 from django.contrib import admin
 from .models import Patient
+from .models import Appointment
 
 # Register your models here.
-admin.site.register(Patient)
+admin.site.register(Patient)
+admin.site.register(Appointment)

code/mymedic/users/admin.py

@@ -0,0 +1,27 @@
+# Generated by Django 4.2.21 on 2025-06-15 07:18
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('users', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Appointment',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('patient_name', models.CharField(max_length=100)),
+                ('doctor_name', models.CharField(max_length=100)),
+                ('date', models.DateField()),
+                ('reason', models.CharField(max_length=200)),
+                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+            ],
+        ),
+    ]

code/mymedic/users/migrations/0002_appointment.py

@@ -11,6 +11,7 @@
 Verified: ✅ Unit tested, reviewed
 """
 from django.db import models
+from django.contrib.auth.models import User 
 
 # Create your models here.
 class Patient(models.Model):
@@ -23,4 +24,15 @@ class Patient(models.Model):
     date_of_birth = models.DateField(blank=True, null=True)
 
     def __str__(self):
-        return f"{self.first_name} {self.last_name} ({self.email})"
+        return f"{self.first_name} {self.last_name} ({self.email})"
+    
+
+class Appointment(models.Model):
+    user = models.ForeignKey(User, on_delete=models.CASCADE)
+    patient_name = models.CharField(max_length=100)
+    doctor_name = models.CharField(max_length=100)
+    date = models.DateField()
+    reason = models.CharField(max_length=200)
+
+    def __str__(self):
+        return f"{self.date} - {self.patient_name} with {self.doctor_name}"

code/mymedic/users/models.py

@@ -99,6 +99,25 @@ <h3 class="stat-number">1</h3>
         </div>
       </div>
 
+      <!-- Upcoming Appointments -->
+      <div class="appointments-section">
+        <h3 class="section-title">Your Upcoming Appointments</h3>
+        <div class="appointments-container">
+          {% for appointment in appointments %}
+            <div class="card">
+              <div class="appointment-date">{{ appointment.date|date:"F d, Y" }}</div>
+              <div class="appointment-detail">Appointment with {{ appointment.doctor_name }}</div>
+              <div class="appointment-reason">{{ appointment.reason }}</div>
+              <form method="POST" action="{% url 'cancel_appointment' appointment.id %}" onsubmit="return confirm('Are you sure you want to cancel this appointment?');">
+                {% csrf_token %}
+                <button type="submit" class="btn btn-danger">Cancel</button>
+              </form>              
+            </div>
+          {% endfor %}
+        </div>
+      </div>
+
+      
       <!-- Quick Actions -->
       <div class="actions-section">
         <div class="row">
@@ -134,6 +153,7 @@ <h4 class="action-title">Prescriptions</h4>
         </div>
       </div>
 
+
       <!-- Recent Activity -->
       <div class="activity-section">
         <div class="row">

code/mymedic/users/templates/users/dashboard.html

@@ -8,6 +8,7 @@
     path('profile', views.profile, name='profile'),
     path('mlogout', views.mlogout, name='mlogout'),
     path('', views.mlogin, name=''),  # Default route to login
+    path('cancel/<int:appointment_id>/', views.cancel_appointment, name='cancel_appointment'),
     path("privacy/", views.privacy_policy, name="privacy_policy"),
 
 ]

code/mymedic/users/urls.py

@@ -18,6 +18,8 @@
 from .models import Patient
 from django.contrib.auth.decorators import login_required
 from django.contrib import messages
+from users.models import Appointment
+from django.shortcuts import get_object_or_404
 
 # Create your views here.
 def register(request):
@@ -77,7 +79,8 @@ def dashboard(request):
     """
     Render the dashboard view for users.
     """
-    return render(request, 'users/dashboard.html')
+    appointments = Appointment.objects.filter(user=request.user).order_by('date')
+    return render(request, 'users/dashboard.html', {'appointments': appointments})
 
 @login_required(login_url='mlogin')
 def profile(request):
@@ -114,6 +117,14 @@ def profile(request):
             return redirect("profile")
     else:
         return render(request, 'users/profile.html', context={"form": form})
+
+@login_required(login_url='mlogin')
+def cancel_appointment(request, appointment_id):
+    appointment = get_object_or_404(Appointment, id=appointment_id, user=request.user)
+    if request.method == "POST":
+        appointment.delete()
+        messages.success(request, "Appointment canceled successfully.")
+    return redirect("dashboard")
 
 def privacy_policy(request):
     return render(request, 'users/privacy_policy.html')