diff --git a/Clubs/__pycache__/models.cpython-310.pyc b/Clubs/__pycache__/models.cpython-310.pyc index 7fdf897..642403c 100644 Binary files a/Clubs/__pycache__/models.cpython-310.pyc and b/Clubs/__pycache__/models.cpython-310.pyc differ diff --git a/Clubs/__pycache__/views.cpython-310.pyc b/Clubs/__pycache__/views.cpython-310.pyc index ff53b47..02c8153 100644 Binary files a/Clubs/__pycache__/views.cpython-310.pyc and b/Clubs/__pycache__/views.cpython-310.pyc differ diff --git a/Clubs/__pycache__/views_schedule.cpython-310.pyc b/Clubs/__pycache__/views_schedule.cpython-310.pyc index 5a75955..5255626 100644 Binary files a/Clubs/__pycache__/views_schedule.cpython-310.pyc and b/Clubs/__pycache__/views_schedule.cpython-310.pyc differ diff --git a/Clubs/models.py b/Clubs/models.py index 9f1f9e9..a236feb 100644 --- a/Clubs/models.py +++ b/Clubs/models.py @@ -90,17 +90,20 @@ class Request(models.Model): status = models.CharField(choices=ACCEPTED, max_length=30) def save(self, *args, **kwargs): - clubID = self.club.id - receiverClub = Club.objects.get(id=clubID) - authorizedMembers = receiverClub.authorizedMembers() - for member in authorizedMembers: + if(self.status == 'NO'): + clubID = self.club.id + receiverClub = Club.objects.get(id=clubID) + authorizedMembers = receiverClub.authorizedMembers() myNotification = Notification( message="A user sent a request to join your club!", userSender=self.user, ) + print("save creates a notification") myNotification.save() - authorizedUser = User.objects.get(id=member.user_id) - myNotification.userReceiver.add(authorizedUser) + + for member in authorizedMembers: + authorizedUser = User.objects.get(id=member.user_id) + myNotification.userReceiver.add(authorizedUser) super(Request, self).save(*args, **kwargs) diff --git a/Clubs/templates/Clubs/clubMembers.html b/Clubs/templates/Clubs/clubMembers.html index 31ec5ad..7dc30ff 100644 --- a/Clubs/templates/Clubs/clubMembers.html +++ b/Clubs/templates/Clubs/clubMembers.html @@ -8,7 +8,7 @@
+ vh-100 overflow-hidden"> {% if Club.name %}

@@ -18,7 +18,7 @@

Members

 {% endif %} -
diff --git a/Clubs/templates/Clubs/clubRequests.html b/Clubs/templates/Clubs/clubRequests.html index 6d09bf4..0358805 100644 --- a/Clubs/templates/Clubs/clubRequests.html +++ b/Clubs/templates/Clubs/clubRequests.html @@ -37,13 +37,13 @@

{{ userRequest.0.belt }}

{% csrf_token %} -
-
diff --git a/Clubs/templates/Clubs/memberProfileModal.html b/Clubs/templates/Clubs/memberProfileModal.html index e3abcee..2f494f5 100644 --- a/Clubs/templates/Clubs/memberProfileModal.html +++ b/Clubs/templates/Clubs/memberProfileModal.html @@ -10,7 +10,8 @@
- diff --git a/Clubs/views.py b/Clubs/views.py index 0853061..8246aa6 100644 --- a/Clubs/views.py +++ b/Clubs/views.py @@ -19,15 +19,6 @@ def userHasClub(request): except: return False -def checkRequests(): - requests = Request.objects.filter(status = 'YES') - for item in requests: - newMember = UserMembership(user_id=item.user_id, - club_id=item.club_id, - ) - newMember.save() - item.delete() - @login_required def ClubsIndex(request): @@ -85,9 +76,12 @@ def ClubsIndex(request): # profilesDict[profile] = member # # return profilesDict + + + + @login_required def clubMembers(request): - checkRequests() profilesDict, requestsDict = {}, {} authorized = False try: @@ -243,10 +237,17 @@ def handleRequest(request, requestID): if request.method == 'POST': myrequest.status = 'YES' - myrequest.save() + newMember = UserMembership(user_id=myrequest.user_id, + club_id=myrequest.club_id, + ) + newMember.save() + myrequest.delete() + if request.method == 'DELETE': - myrequest.status = 'REJECTED' - myrequest.save() + # myrequest.status = 'REJECTED' + myrequest.delete() + + return clubMembers(request) diff --git a/Clubs/views_schedule.py b/Clubs/views_schedule.py index 6461fe9..c738aa0 100644 --- a/Clubs/views_schedule.py +++ b/Clubs/views_schedule.py @@ -1,7 +1,7 @@ from django.shortcuts import render, HttpResponseRedirect, reverse from datetime import datetime, date from .models import Schedule, UserMembership -from .utilis import Calendar + from django.contrib.auth.decorators import login_required from main.views import getBaseTemplate from .forms import ScheduleForm diff --git a/Journal/templates/Journal/create_reloadContent.html b/Journal/templates/Journal/create_reloadContent.html index e9404d9..bca8574 100644 --- a/Journal/templates/Journal/create_reloadContent.html +++ b/Journal/templates/Journal/create_reloadContent.html @@ -9,14 +9,14 @@ {#
#} {#
#} -
+
-
+
-
+
{% load static %}
@@ -34,7 +34,7 @@

To do manager

{#
#} - +
diff --git a/Notifications/__pycache__/consumers.cpython-310.pyc b/Notifications/__pycache__/consumers.cpython-310.pyc deleted file mode 100644 index b1d279a..0000000 Binary files a/Notifications/__pycache__/consumers.cpython-310.pyc and /dev/null differ diff --git a/Notifications/__pycache__/routing.cpython-310.pyc b/Notifications/__pycache__/routing.cpython-310.pyc deleted file mode 100644 index 08fb474..0000000 Binary files a/Notifications/__pycache__/routing.cpython-310.pyc and /dev/null differ diff --git a/Notifications/__pycache__/urls.cpython-310.pyc b/Notifications/__pycache__/urls.cpython-310.pyc index f106e8c..796979c 100644 Binary files a/Notifications/__pycache__/urls.cpython-310.pyc and b/Notifications/__pycache__/urls.cpython-310.pyc differ diff --git a/Notifications/__pycache__/views.cpython-310.pyc b/Notifications/__pycache__/views.cpython-310.pyc index 006f3fe..810f453 100644 Binary files a/Notifications/__pycache__/views.cpython-310.pyc and b/Notifications/__pycache__/views.cpython-310.pyc differ diff --git a/Notifications/consumers.py b/Notifications/consumers.py deleted file mode 100644 index c5c29d6..0000000 --- a/Notifications/consumers.py +++ /dev/null @@ -1,9 +0,0 @@ -from channels.generic.websocket import WebsocketConsumer - -class WSConsumer(WebsocketConsumer): - def connect(self): - # self.accept() - self.send({ - "type": "telegram.message", - "text": "You said:text" - }) diff --git a/Notifications/routing.py b/Notifications/routing.py deleted file mode 100644 index 84e4022..0000000 --- a/Notifications/routing.py +++ /dev/null @@ -1,7 +0,0 @@ -from django.urls import path -from . import consumers - - -# ws_urlpatterns = [ -# path('ws/notify', consumers.WSConsumer.as_asgi()) -# ] \ No newline at end of file diff --git a/Notifications/templates/Notifications/allNotifications.html b/Notifications/templates/Notifications/allNotifications.html new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/Notifications/templates/Notifications/allNotifications.html @@ -0,0 +1 @@ + diff --git a/Notifications/templates/Notifications/notificationIcon.html b/Notifications/templates/Notifications/notificationIcon.html index f0a98a0..4c757cb 100644 --- a/Notifications/templates/Notifications/notificationIcon.html +++ b/Notifications/templates/Notifications/notificationIcon.html @@ -1,25 +1,33 @@
- + -{#
#} -{# {% if notifications %}#} -{# {% for item in notifications %}#} -{#

{{ item.message }}

#} -{#

{{ item.timestamp }}

#} +
+ Read All + + {% if notifications %} + {% for item in notifications %} + {{ item.message }} {{ item.timestamp }} {#

{{ item.is_read }}

#} -{##} -{# {% endfor %}#} -{# {% endif %}#} -{##} -{#

Show all notifications

#} -{#
#} + + {% endfor %} + {% endif %} + +{# Show all notifications#} +
\ No newline at end of file diff --git a/Notifications/urls.py b/Notifications/urls.py index db260fa..30352ab 100644 --- a/Notifications/urls.py +++ b/Notifications/urls.py @@ -3,7 +3,9 @@ urlpatterns = [ - path('notifications/', views.notifications, name="notifications"), + # path('notifications/', views.notifications, name="notifications"), + # path('allNotifications/', views.allNotifications, name="allNotifications"), + path('clearNotifications/', views.clearNotifications, name="clearNotifications"), ] htmx_urlpatterns = [ diff --git a/Notifications/views.py b/Notifications/views.py index a4f949c..109e610 100644 --- a/Notifications/views.py +++ b/Notifications/views.py @@ -1,11 +1,23 @@ from django.shortcuts import render from .models import Notification + + # Create your views here. -def notifications (request): - myNotifications = Notification.objects.filter(userReceiver = request.user.id) - context = { - 'notifications' : myNotifications - } - return render \ No newline at end of file +def notifi(request): + return Notification.objects.filter(userReceiver=request.user.id) + + +def notifications(request): + return {'notifications': notifi(request)} + + +def clearNotifications(request): + if request.method == 'DELETE': + myset = Notification.objects.filter(userReceiver=request.user) + for x in myset: + x.userReceiver.remove(request.user.id) + + + return render(request, "Notifications/notificationIcon.html", {'notifications' : notifi(request)}) diff --git a/WorkoutJournal/templates/BJJournal/BJR_Techniques/BJR_Techniques_List.html b/WorkoutJournal/templates/BJJournal/BJR_Techniques/BJR_Techniques_List.html index 300d880..ea22062 100644 --- a/WorkoutJournal/templates/BJJournal/BJR_Techniques/BJR_Techniques_List.html +++ b/WorkoutJournal/templates/BJJournal/BJR_Techniques/BJR_Techniques_List.html @@ -1,4 +1,4 @@ -
+

Techniques List

diff --git a/WorkoutJournal/templates/BJJournal/BJR_Techniques/BJR_Techniques_types.html b/WorkoutJournal/templates/BJJournal/BJR_Techniques/BJR_Techniques_types.html index c608afa..868ddb7 100644 --- a/WorkoutJournal/templates/BJJournal/BJR_Techniques/BJR_Techniques_types.html +++ b/WorkoutJournal/templates/BJJournal/BJR_Techniques/BJR_Techniques_types.html @@ -1,11 +1,12 @@ {% load static %} -

Technique type

{% for choice in TechForm.type %} -
+
{{ choice.choice_label }}