1580 temat pracy dyplomowej nie traci głosów

zapisy/apps/notifications/signals.py

@@ -169,11 +169,29 @@ def notify_board_members_about_voting(sender: Thesis, **kwargs) -> None:
     users = [voter.user for voter in all_voters if voter not in accepting_voters]
     target = reverse('theses:selected_thesis', args=[thesis.id])
 
+    operation = 'create'
+    if 'operation' in kwargs:
+        operation = kwargs['operation']
+
+    if operation == 'modify':
+        if 'notify_only_voted' in kwargs and kwargs['notify_only_voted']:
+            already_voted = [v.owner for v in thesis.thesis_votes.all() if v.vote != ThesisVote.NONE]
+            users = [voter.user for voter in already_voted]
+        notify_selected_users(
+            users,
+            Notification(get_id(), get_time(),
+                         NotificationType.THESIS_VOTING_HAS_BEEN_ACTIVATED, {
+                'title': thesis.title,
+                'status': 'zmodyfikowanym',
+            }, target))
+        return
+
     notify_selected_users(
         users,
         Notification(get_id(), get_time(),
                      NotificationType.THESIS_VOTING_HAS_BEEN_ACTIVATED, {
-            'title': thesis.title
+            'title': thesis.title,
+            'status': 'nowym',
         }, target))
 
 

zapisy/apps/notifications/templates.py

@@ -36,7 +36,7 @@ class NotificationType(str, Enum):
     NotificationType.NEWS_HAS_BEEN_ADDED_HIGH_PRIORITY:
     "Dodano nową wiadomość w aktualnościach:\n# {title}\n\n{contents}",
     NotificationType.THESIS_VOTING_HAS_BEEN_ACTIVATED:
-    'W pracy dyplomowej "{title}" pojawiła się możliwość głosowania.',
+    'W {status} temacie pracy dyplomowej "{title}" pojawiła się możliwość głosowania.',
     NotificationType.THESIS_HAS_BEEN_ACCEPTED:
     'Praca dyplomowa "{title}" została zaakceptowana przez komisję.',
 }
@@ -59,7 +59,7 @@ class NotificationType(str, Enum):
     NotificationType.NEWS_HAS_BEEN_ADDED_HIGH_PRIORITY:
     "{title}",
     NotificationType.THESIS_VOTING_HAS_BEEN_ACTIVATED:
-    'W pracy dyplomowej "{title}" pojawiła się możliwość głosowania.',
+    'W {status} temacie pracy dyplomowej "{title}" pojawiła się możliwość głosowania.',
     NotificationType.THESIS_HAS_BEEN_ACCEPTED:
     'Praca dyplomowa "{title}" została zaakceptowana.',
 }

zapisy/apps/theses/enums.py

@@ -28,3 +28,6 @@ class ThesisVote(models.IntegerChoices):
     NONE = 1, "brak głosu"
     REJECTED = 2, "odrzucona"
     ACCEPTED = 3, "zaakceptowana"
+
+
+SIGNIFICANT_FIELDS = ['title', 'supporting_advisor', 'kind', 'max_number_of_students', 'description']

zapisy/apps/theses/forms.py

@@ -4,7 +4,7 @@
 from django.utils import timezone
 
 from apps.common import widgets as common_widgets
-from apps.theses.enums import ThesisKind, ThesisStatus, ThesisVote
+from apps.theses.enums import ThesisKind, ThesisStatus, ThesisVote, SIGNIFICANT_FIELDS
 from apps.theses.models import MAX_THESIS_TITLE_LEN, Remark, Thesis, Vote
 from apps.users.models import Employee, Student
 from apps.theses.validators import MAX_MAX_ASSIGNED_STUDENTS
@@ -127,11 +127,11 @@ def save(self, commit=True):
         instance.modified = timezone.now()
 
         status = self.status
+        instance.significant_field_changed = False
 
-        if len(set(self.changed_data).intersection([
-                'title', 'supporting_advisor', 'kind',
-                'max_number_of_students', 'description'])) > 0:
+        if len(set(self.changed_data).intersection(SIGNIFICANT_FIELDS)) > 0:
             instance.status = ThesisStatus.BEING_EVALUATED.value
+            instance.significant_field_changed = True
         elif status == ThesisStatus.ACCEPTED.value and 'students' in self.data:
             instance.status = ThesisStatus.IN_PROGRESS.value
         elif status == ThesisStatus.IN_PROGRESS.value and 'students' not in self.data:

zapisy/apps/theses/models.py

@@ -107,9 +107,22 @@ def save(self, *args, **kwargs):
         """
         old = self.pk and type(self).objects.get(pk=self.pk)
         super(Thesis, self).save(*args, **kwargs)
-        if not old or (old.status != ThesisStatus.BEING_EVALUATED and self.status == ThesisStatus.BEING_EVALUATED):
+        if not old:
+            self.thesis_votes.filter(vote__in=[ThesisVote.ACCEPTED, ThesisVote.REJECTED]).update(vote=ThesisVote.NONE)
             thesis_voting_activated.send(sender=self.__class__, instance=self)
 
+        if old and old.status != ThesisStatus.BEING_EVALUATED and self.status == ThesisStatus.BEING_EVALUATED:
+            # in case of new thesis titile send notification to all board members
+            self.thesis_votes.filter(vote__in=[ThesisVote.ACCEPTED, ThesisVote.REJECTED]).update(vote=ThesisVote.NONE)
+            thesis_voting_activated.send(sender=self.__class__, instance=self, operation='modify')
+        if old and (old.status == ThesisStatus.BEING_EVALUATED and
+                    self.status == ThesisStatus.BEING_EVALUATED and
+                    self.significant_field_changed):
+            # send notification only to the board memebers who already accepted the thesis
+            thesis_voting_activated.send(sender=self.__class__, instance=self, operation='modify',
+                                         notify_only_voted=True)
+            self.thesis_votes.filter(vote__in=[ThesisVote.ACCEPTED, ThesisVote.REJECTED]).update(vote=ThesisVote.NONE)
+
     def get_accepted_votes(self):
         return len(self.thesis_votes.filter(vote=ThesisVote.ACCEPTED))