Upload 54 files

api/admin.py

@@ -1,5 +1,5 @@
 from django.contrib import admin
-from .models import Bhagat, Event, Attendance, Message, Notification, Region, BhajanCategory, Bhajan
+from .models import Bhagat, Event, Attendance,  Notification, Region, BhajanCategory, Bhajan
 from import_export.admin import ImportExportModelAdmin
 
 # Register your models here.
@@ -17,7 +17,7 @@ class BhajanCategoryAdmin(ImportExportModelAdmin):
     
 class BhajanAdmin(ImportExportModelAdmin):
     list_display = ('title', 'title_guj', 'category', 'lyricsBtn')
-    search_fields = ('title', 'title_guj', 'category')
+    search_fields = ('title', 'title_guj', 'category__name')
     list_filter = ('category',)
     #  'musicPreivew',
 
@@ -27,9 +27,14 @@ class EventAdmin(ImportExportModelAdmin):
     search_fields = ('title', 'date', 'region', 'is_approved', 'color')
     list_editable = ('is_approved', 'color')
 
+class NotificationAdmin(ImportExportModelAdmin):
+    list_display = ('sender', 'title','timestamp', 'notification_type')
+    list_filter = ('notification_type',)
+    search_fields = ('sender__first_name', 'title', 'notification_type')
+
 admin.site.register(Bhagat, BhagatAdmin)
 admin.site.register(Region, RegionAdmin)
 admin.site.register(BhajanCategory, BhajanCategoryAdmin)
 admin.site.register(Bhajan, BhajanAdmin)
 admin.site.register(Event, EventAdmin)
-
+admin.site.register(Notification, NotificationAdmin)

api/migrations/0011_delete_message.py

@@ -0,0 +1,15 @@
+# Generated by Django 4.2.16 on 2024-09-24 13:55
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("api", "0010_event_time"),
+    ]
+
+    operations = [
+        migrations.DeleteModel(
+            name="Message",
+        ),
+    ]

api/migrations/0012_notification_title.py

@@ -0,0 +1,17 @@
+# Generated by Django 4.2.16 on 2024-09-24 14:21
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("api", "0011_delete_message"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="notification",
+            name="title",
+            field=models.CharField(blank=True, max_length=200, null=True),
+        ),
+    ]

api/models.py

@@ -7,7 +7,7 @@ class Bhagat(AbstractUser):
     USER_TYPES = (
         ('superadmin', 'Super Admin'),
         ('regionadmin', 'Region Admin'),
-        ('monitor', 'Monitor'),
+        ('karyakarta', 'Karyakarta'),
         ('user', 'User'),
     )
     MEMBER_TYPES = (
@@ -55,20 +55,13 @@ class Attendance(models.Model):
     event = models.ForeignKey(Event, on_delete=models.CASCADE)
     status = models.CharField(max_length=20, choices=(('attending', 'Attending'), ('not_attending', 'Not Attending'), ('maybe', 'Maybe')))
 
-
-class Message(models.Model):
-    sender = models.ForeignKey(Bhagat, on_delete=models.CASCADE, related_name='sent_messages')
-    recipient = models.ForeignKey(Bhagat, on_delete=models.CASCADE, related_name='received_messages')
-    content = models.TextField()
-    timestamp = models.DateTimeField(auto_now_add=True)
-
-
 class Notification(models.Model):
     sender = models.ForeignKey(Bhagat, on_delete=models.CASCADE, related_name='sent_notifications')
     recipients = models.ManyToManyField(Bhagat, related_name='received_notifications')
+    title = models.CharField(max_length=200, blank=True, null=True)
     content = models.TextField()
     timestamp = models.DateTimeField(auto_now_add=True)
-    notification_type = models.CharField(max_length=20, choices=(('event', 'Event'), ('birthday', 'Birthday'), ('custom', 'Custom')))
+    notification_type = models.CharField(max_length=20, choices=(("orange", "Shabha"), ("green", "Activity"), ("blue", "Birthday"), ("red", "Important"), ("purple", "Gathering"), ("yellow", "Festival"), ("pink", "Custom")))
 
 class BhajanCategory(models.Model):
     name = models.CharField(max_length=100)

api/urls.py

@@ -2,16 +2,12 @@ from django.urls import path
 from . import views
 
 urlpatterns = [
-    path('', views.dashboard, name='dashboard'),
     path('dataEntry/', views.dataEntry, name='dataEntry'),
-    path('manage-users/', views.manage_users, name='manage_users'),
-    path('create-event/', views.create_event, name='create_event'),
-    path('approve-event/<int:event_id>/', views.approve_event, name='approve_event'),
-    path('update-attendance/<int:event_id>/', views.update_attendance, name='update_attendance'),
-    path('send-message/', views.send_message, name='send_message'),
     path('send-notification/', views.send_notification, name='send_notification'),
     
     path('bhajan-category-list/', views.bhajanCategoryList, name='bhajanCategoryList'),
     path('bhajan-detail/<int:id>', views.bhajanDetail, name='bhajanDetail'),
     path('event-list/', views.eventList, name='eventList'),
+    path('notification-list/', views.notificationList, name='notificationList'),
+    
 ]

api/views.py

@@ -1,11 +1,10 @@
 from django.shortcuts import render, get_object_or_404, redirect
 from django.contrib.auth.decorators import login_required, user_passes_test
 from django.http import JsonResponse, HttpResponse
-from .models import Bhagat, Event, Attendance, Message, Notification
 from django.views.decorators.http import require_POST
 from django.utils import timezone
 import json
-from .models import Bhagat, Event, Attendance, Message, Notification, Region, BhajanCategory, Bhajan
+from .models import Bhagat, Event, Attendance,  Notification, Region, BhajanCategory, Bhajan
 
 
 def is_superadmin(user):
@@ -86,6 +85,7 @@ def bhajanDetail(request,id):
         })
     return HttpResponse("Bhajan Detail Page")
 
+
 def eventList(request):
     events = Event.objects.all()
     eventArr = []
@@ -106,74 +106,20 @@ def eventList(request):
         })
     return JsonResponse({"events": eventArr})
 
-@login_required
-def dashboard(request):
-    user = request.user
-    context = {
-        'user': user,
-    }
-    if user.user_type == 'superadmin':
-        context['users'] = Bhagat.objects.all()
-        context['events'] = Event.objects.all()
-    elif user.user_type == 'regionadmin':
-        context['monitors'] = Bhagat.objects.filter(user_type='monitor', region=user.region)
-        context['users'] = Bhagat.objects.filter(user_type='user', region=user.region)
-        context['events'] = Event.objects.filter(region=user.region)
-    elif user.user_type == 'monitor':
-        context['users'] = Bhagat.objects.filter(assigned_to=user)
-        context['events'] = Event.objects.filter(region=user.region)
-    else:  # regular user
-        context['events'] = Event.objects.filter(region=user.region, is_approved=True)
-
-    return render(request, 'dashboard.html', context)
-
-
-@user_passes_test(is_superadmin)
-def manage_users(request):
-    if request.method == 'POST':
-        # Handle user creation/modification
-        pass
-    users = Bhagat.objects.all()
-    return render(request, 'manage_users.html', {'users': users})
-
-
-@user_passes_test(is_regionadmin)
-def create_event(request):
-    if request.method == 'POST':
-        # Handle event creation
-        pass
-    return render(request, 'create_event.html')
-
+def notificationList(request):
+    notifications = Notification.objects.all()
+    notificationArr = []
+    for notification in notifications:
+        notificationArr.append({
+            "sender":notification.sender.__str__(),
+            "category": notification.sender.user_type,
+            "title":notification.title,
+            "content":notification.content,
+            "timestamp":notification.timestamp.strftime("%b %d, %Y | %I:%M %p"),
+            "notification_type":notification.notification_type
+        })
+    return JsonResponse({"notifications": notificationArr})
 
-@user_passes_test(is_superadmin)
-def approve_event(request, event_id):
-    event = get_object_or_404(Event, id=event_id)
-    event.is_approved = True
-    event.save()
-    return redirect('event_list')
-
-
-@login_required
-@require_POST
-def update_attendance(request, event_id):
-    event = get_object_or_404(Event, id=event_id)
-    status = request.POST.get('status')
-    attendance, created = Attendance.objects.update_or_create(
-        user=request.user,
-        event=event,
-        defaults={'status': status}
-    )
-    return JsonResponse({'status': 'success'})
-
-
-@login_required
-def send_message(request):
-    if request.method == 'POST':
-        recipient_id = request.POST.get('recipient')
-        content = request.POST.get('content')
-        recipient = get_object_or_404(Bhagat, id=recipient_id)
-        Message.objects.create(sender=request.user, recipient=recipient, content=content)
-    return redirect('messages')
 
 
 @user_passes_test(is_superadmin)

hsapssconnect/settings.py

@@ -116,7 +116,7 @@ AUTH_PASSWORD_VALIDATORS = [
 
 LANGUAGE_CODE = "en-us"
 
-TIME_ZONE = "UTC"
+TIME_ZONE = "EST"
 
 USE_I18N = True