1580 temat pracy dyplomowej nie traci głosów

zapisy/apps/notifications/signals.py

@@ -163,17 +163,28 @@ def notify_that_news_was_added(sender: News, **kwargs) -> None:
 @receiver(thesis_voting_activated, sender=Thesis)
 def notify_board_members_about_voting(sender: Thesis, **kwargs) -> None:
     thesis = kwargs['instance']
+    notify_all = kwargs['notify_all']
+    is_new = kwargs['is_new']
 
     all_voters = get_theses_board()
     accepting_voters = [v.owner for v in thesis.thesis_votes.all() if v.vote == ThesisVote.ACCEPTED]
     users = [voter.user for voter in all_voters if voter not in accepting_voters]
     target = reverse('theses:selected_thesis', args=[thesis.id])
 
+    status = 'nowym'
+    if not is_new:
+        status = 'zmodyfikowanym'
+
+    if not notify_all:
+        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
+            'title': thesis.title,
+            'status': status,
         }, 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/forms.py

@@ -10,6 +10,9 @@
 from apps.theses.validators import MAX_MAX_ASSIGNED_STUDENTS
 
 
+SIGNIFICANT_FIELDS = ['title', 'supporting_advisor', 'kind', 'max_number_of_students', 'description']
+
+
 class ThesisFormAdmin(forms.ModelForm):
     class Meta:
         model = Thesis
@@ -127,11 +130,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,8 +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):
-            thesis_voting_activated.send(sender=self.__class__, instance=self)
+
+        if not old:
+            thesis_voting_activated.send(sender=self.__class__, instance=self, is_new=True, notify_all=True)
+
+        if old and old.status != ThesisStatus.BEING_EVALUATED and self.status == ThesisStatus.BEING_EVALUATED:
+            # in case of new thesis title 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, is_new=False, notify_all=True)
+
+        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 members who already voted on the thesis
+            thesis_voting_activated.send(sender=self.__class__, instance=self, is_new=False,
+                                         notify_all=False)
+            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))