Fix issue for increments of 7.

Actually fixes #7.

Author: jkrrv

NonweeklyMeetings/NonweeklyMeetings.py

@@ -1,7 +1,8 @@
 from datetime import datetime
 from pprint import pprint
+from math import floor
 
-OrgsWithNonWeekly = q.QuerySql("""SELECT o.organizationId orgId, o.organizationName orgName FROM Organizations o WHERE o.NotWeekly = 1 AND o.OrganizationStatusId = 30 AND (o.FirstMeetingDate IS NULL OR o.FirstMeetingDate < DATEADD(DAY, -7, GETDATE())) AND (o.LastMeetingDate IS NULL OR o.LastMeetingDate > GETDATE())""")
+OrgsWithNonWeekly = q.QuerySql("""SELECT o.organizationId orgId, o.organizationName orgName FROM Organizations o WHERE o.NotWeekly = 1 AND o.OrganizationStatusId = 30 AND (o.FirstMeetingDate IS NULL OR o.FirstMeetingDate < GETDATE()) AND (o.LastMeetingDate IS NULL OR o.LastMeetingDate > GETDATE())""")
 
 for o in OrgsWithNonWeekly:
     freqs = q.QuerySql("SELECT SUBSTRING(Field, 11, 1000) freq FROM OrganizationExtra WHERE OrganizationId = {} AND Field LIKE 'Frequency:%' AND BitValue = 1".format(o.orgId))
@@ -10,7 +11,7 @@
 
     for f in freqs:
         for s in scheds:
-            week = 1 + (s.nextDate.Day - 1 - ((s.nextDate.Day - 1) % 7)) / 7
+            week = 1 + floor((s.nextDate.Day - 1) / 7)
             addMeeting = False
 
             if f.freq == 'Every Other':
@@ -39,4 +40,4 @@
             if addMeeting:
                 mtgId = model.GetMeetingIdByDateTime(o.orgId, s.nextDate, True)  # If the meeting already exists, nothing happens.
 
-                print "Meeting {} created or found for {} ({})\n<br><br>".format(mtgId, o.orgName, f.freq)
+                print "Meeting {} created or found for {} ({})\n<br><br>".format(mtgId, o.orgName, f.freq)