status: Save members did not send count in profile

amfoss · Mar 16, 2020 · 1ce9be2 · 1ce9be2
1 parent 7f6922b
commit 1ce9be2
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/members/admin.py b/members/admin.py
@@ -32,7 +32,7 @@ class ProfileAdmin(admin.ModelAdmin):
                 'user',
                 ('first_name', 'last_name', 'profile_pic'),
                 ('email', 'phone'),
-                ('telegram_id', 'githubUsername')
+                ('telegram_id', 'githubUsername', 'didNotSendStreak')
             ]
         }),
         ('Additional Details', {
@@ -51,6 +51,7 @@ class ProfileAdmin(admin.ModelAdmin):
         }),
 
     ]
+    readonly_fields = ('didNotSendStreak', )
     inlines = (sp_inline, wexp_inline, eq_inline)
     list_display = ('first_name', 'last_name', 'batch')
     list_filter = ('batch',)

diff --git a/members/models.py b/members/models.py
@@ -150,6 +150,7 @@ def get_resume_path(self, filename):
     interests = models.ManyToManyField(Skill, related_name='interests', blank=True)
     expertise = models.ManyToManyField(Skill, related_name='expertise', blank=True)
     experiences = models.ManyToManyField(Organization, related_name='WorkExperiences', through='WorkExperience')
+    didNotSendStreak = models.IntegerField(default=0)
     qualifications = models.ManyToManyField(
                 Organization,
                 related_name='EducationalQualifications',

diff --git a/status/StatusUpdateReporter.py b/status/StatusUpdateReporter.py
@@ -3,7 +3,6 @@
 from pytz import timezone
 import telegram
 from status.models import Thread, DailyLog, Message, StatusException
-from college.models import Profile
 from members.models import Group
 from members.models import Profile as UserProfile
 
@@ -58,7 +57,7 @@ def getBatchName(y):
 
     @staticmethod
     def groupMembersByBatch(members, year):
-        return Profile.objects.filter(user__in=members, admissionYear=year)
+        return UserProfile.objects.filter(user__in=members, batch=year)
 
     @staticmethod
     def getLastSendStr(last_send, expected_date):
@@ -116,6 +115,9 @@ def generateBatchWiseDNSReport(self, members, year):
                 if lastSend:
                     lastSend = self.getLastSendStr(lastSend,
                                                    self.getMemberLastRequiredDate(member.user))
+                    profile = UserProfile.objects.get(user=member.user)
+                    profile.didNotSendStreak = lastSend
+                    profile.save()
                     memberHistory = self.getMemberHistory(member.user)
                     message += ' [ ' + lastSend + ', ' + memberHistory + ']'
                 else: