-
+ {% if recent_heroes %}
+ Available Donors
+Hero Community
@@ -239,6 +300,35 @@
+
+ {% endif %}
+
@@ -263,59 +353,61 @@
-
+
+
+ Live: Today's Heroes (Last 24h)
+
+ {{ recent_heroes.count }} Active
+
+
+ {% for hero in recent_heroes %}
+
+
+ {% if hero.donor.user and hero.donor.user.profile.profile_pic %}
+ 
+ {% else %}
+
+ {% endfor %}
+
+ {{ hero.donor.blood_group }}
+
+ {% endif %}
+
+
+ {{ hero.donor.name }}
+Saved Life {{ hero.date|timesince }} ago
+
- {% for donor in donors %}
-
-
-
- {% if donor.user and donor.user.profile.profile_pic %}
- 
-
- {{ donor.blood_group }}
-
- {% else %}
-
{{ donor.blood_group }}
- {% endif %}
+
+
diff --git a/core/templates/core/lives_saved.html b/core/templates/core/lives_saved.html
new file mode 100644
index 0000000..becbc6a
--- /dev/null
+++ b/core/templates/core/lives_saved.html
@@ -0,0 +1,91 @@
+{% extends 'base.html' %}
+{% load static %}
+
+{% block content %}
+
+ {% for donor in donors %}
+
@@ -370,9 +462,11 @@
+ {% if user.is_staff %}
+ {% endif %}
+
+
-
+ {% if donor.user and donor.user.profile.profile_pic %}
+
+
+ {{ donor.blood_group }}
+
+ {% else %}
+
+ {{ donor.blood_group }}
+ {% endif %}
+
+
+
+ {{ donor.name }} + {% if donor.is_verified %} + + {% endif %} + {% if donor.distance and donor.distance < 1000 %} + + {{ donor.distance|floatformat:1 }} km + + {% endif %} +
+{{ donor.location }}, {{ donor.district }}
+
-
-
- - {{ donor.name }} - {% if donor.is_verified %} - - {% endif %} - {% if donor.distance and donor.distance < 1000 %} - - {{ donor.distance|floatformat:1 }} km +
-
- {% empty %}
-
-
- {% if donor.is_available %}Available{% else %}Unavailable{% endif %}
-
-
-
+ {% empty %}
+ Last Donated: {{ donor.last_donation_date|default:"Never" }}
-
+
+
+ {% endfor %}
No donors match your search criteria.
-
-
- {% endfor %}
No donors match your search criteria.
-
{% for req in blood_requests %}
@@ -413,7 +507,7 @@
-
+
{% empty %}
+ {% if user.is_staff %}
Manage Banks
+ {% endif %}
Blood Bank Inventory
{% for bank in blood_banks %}
@@ -423,17 +517,23 @@
24/7 Available
- A+ : {{ bank.stock_a_plus }}
- B+ : {{ bank.stock_b_plus }}
- O+ : {{ bank.stock_o_plus }}
- AB+ : {{ bank.stock_ab_plus }}
+ A+: {{ bank.stock_a_plus }}
+ A-: {{ bank.stock_a_minus }}
+ B+: {{ bank.stock_b_plus }}
+ B-: {{ bank.stock_b_minus }}
+ O+: {{ bank.stock_o_plus }}
+ O-: {{ bank.stock_o_minus }}
+ AB+: {{ bank.stock_ab_plus }}
+ AB-: {{ bank.stock_ab_minus }}
No blood banks registered.
{% endfor %}
+
+{% endblock %}
diff --git a/core/urls.py b/core/urls.py
index 3cb4ff1..18c4bf7 100644
--- a/core/urls.py
+++ b/core/urls.py
@@ -40,4 +40,5 @@ urlpatterns = [
path("update-location/", views.update_location, name="update_location"),
path("emergency-sms/", views.emergency_sms, name="emergency_sms"),
path("donation-history/", views.donation_history, name="donation_history"),
+ path("lives-saved/", views.lives_saved, name="lives_saved"),
]
diff --git a/core/views.py b/core/views.py
index 736ba8a..9795189 100644
--- a/core/views.py
+++ b/core/views.py
@@ -285,6 +285,13 @@ def home(request):
actual_completed = DonationEvent.objects.filter(is_completed=True).count()
completed_donations = actual_completed + demo_donations
+ # Find Recent Heroes (Last 24 Hours)
+ last_24_hours = timezone.now() - timezone.timedelta(hours=24)
+ recent_heroes = DonationEvent.objects.filter(
+ is_completed=True,
+ date__gte=last_24_hours
+ ).select_related('donor').order_by('-date')
+
stats = {
"total_donors": Donor.objects.count() + demo_donors,
"active_requests": BloodRequest.objects.filter(
@@ -315,11 +322,12 @@ def home(request):
]
context = {
- "donors": donor_list_data[:8],
+ "donors": donor_list_data[:15], # Increased count for scrollability
"blood_requests": blood_requests[:6],
"blood_banks": blood_banks,
"blood_groups": [g[0] for g in BLOOD_GROUPS],
"stats": stats,
+ "recent_heroes": recent_heroes,
"project_name": "RaktaPulse",
"current_time": timezone.now(),
"myths_vs_facts": myths_vs_facts,
@@ -333,6 +341,8 @@ def home(request):
)
context["involved_events"] = involved_events
context["user_badges"] = request.user.profile.badges.all()
+ context["unread_notifications_count"] = request.user.notifications.filter(is_read=False).count()
+ context["unread_messages_count"] = Message.objects.filter(receiver=request.user, is_read=False).count()
return render(request, "core/index.html", context)
@@ -478,17 +488,72 @@ def request_blood(request):
}
return render(request, 'core/request_blood.html', context)
+import csv
+from django.http import HttpResponse
+
@login_required
def donation_history(request):
- """View to display the full history of completed donations."""
+ """View to display the full history of completed donations with filtering and export."""
completed_donations = DonationEvent.objects.filter(is_completed=True).select_related('donor_user', 'request').order_by('-date')
+ # Filtering
+ blood_group = request.GET.get('blood_group')
+ location = request.GET.get('location')
+ export = request.GET.get('export')
+
+ if blood_group:
+ completed_donations = completed_donations.filter(request__blood_group=blood_group)
+ if location:
+ completed_donations = completed_donations.filter(request__location__icontains=location)
+
+ # Export to CSV
+ if export == 'csv':
+ response = HttpResponse(content_type='text/csv')
+ response['Content-Disposition'] = 'attachment; filename="donation_history.csv"'
+
+ writer = csv.writer(response)
+ writer.writerow(['Donor', 'Blood Group', 'Patient', 'Location', 'Hospital', 'Date'])
+
+ for donation in completed_donations:
+ writer.writerow([
+ donation.donor_user.username if donation.donor_user else donation.donor.name,
+ donation.request.blood_group,
+ donation.request.patient_name,
+ donation.request.location,
+ donation.request.hospital,
+ donation.date.strftime('%Y-%m-%d %H:%M')
+ ])
+ return response
+
context = {
'donations': completed_donations,
- 'title': 'Donation History & Lives Saved'
+ 'title': 'Donation History',
+ 'blood_groups': [g[0] for g in BLOOD_GROUPS],
+ 'current_filters': {
+ 'blood_group': blood_group,
+ 'location': location
+ }
}
return render(request, 'core/donation_history.html', context)
+@login_required
+def lives_saved(request):
+ """View to display the impact and lives saved through donations."""
+ completed_donations = DonationEvent.objects.filter(is_completed=True).select_related('donor_user', 'request').order_by('-date')
+
+ total_donations = completed_donations.count()
+ # Demo data from home view to keep consistency
+ demo_donations = 157
+ total_impact = (total_donations + demo_donations) * 3
+
+ context = {
+ 'donations': completed_donations[:10], # Show recent impact
+ 'total_donations': total_donations + demo_donations,
+ 'total_impact': total_impact,
+ 'title': 'Lives Saved & Community Impact',
+ }
+ return render(request, 'core/lives_saved.html', context)
+
@login_required
@login_required
def vaccination_dashboard(request):
+
+
+
+
+ {{ title }}
+Every single donation has the potential to save up to three lives. Together, we are building a safer community.
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ total_impact }}
+Total Lives Saved
+
+
+
+
+
+
+
+
+
+ {{ total_donations }}
+Successful Donations
+
+
+
+
+
+
+ Recent Life-Saving Events
+
+
+
+
+
+
+
+ | Hero | +Impact | +Location | +Date | +
|---|---|---|---|
|
+ {{ donation.donor_user.username }}
+ Verified Donor
+ |
+ + + 3 Lives Saved + + | +
+ {{ donation.request.location }}
+ |
+
+ {{ donation.date|date:"M d, Y" }}
+ |
+
|
+ No recent events to display. + |
+ |||