Merge pull request #1499 from learning-unlimited/fix-finaid-scripts

Fix finaid scripts to run properly.

Author: benjaminjkraft

esp/useful_scripts/finaid_approve.py

@@ -4,52 +4,45 @@
 # 
 # Approves not-yet-approved requests where both answers are non-blank/None/whitespace
 # and prints the email address of these users to the screen. Make sure to configure
-# PROGRAM_ID and PROGRAM_COST (in dollars) below.
+# PROGRAM_ID below.
 #
 
 from script_setup import *
 
 from esp.program.models import FinancialAidRequest
 from esp.accounting.models import FinancialAidGrant
 
+import re
+
 
 # CONFIGURATION
-PROGRAM = "Splash! 2013"
-PROGRAM_COST = 40
+PROGRAM = "Splash 2014"
 
 
 # ITERATE & APPROVE REQUESTS
-reqs = FinancialAidRequest.objects.filter(done = False, program__name=PROGRAM).exclude(household_income = None, extra_explaination = None)
-
-print reqs.count()
+reqs = FinancialAidRequest.objects.filter(program__name=PROGRAM)
 
 print "New Approvals:"
 approved_any = False
 
-emails = []
-errors = []
+def is_blank(x):
+    return x is None or re.match(r'^(\s)*$', x)
 
 for req in reqs:
-#    if (req.household_income is None or re.match(r'^(\s)*$', req.household_income)) and \
-#        (req.extra_explaination is None or re.match(r'(\s)*$', req.extra_explaination)):
-
-#    if req.household_income is None and req.extra_explaination is None:
-#       continue
-
-    print req.user
+    if is_blank(req.household_income) and is_blank(req.extra_explaination):
+        continue
 
-    if req.financialaidgrant_set.all().count() != 0 : continue
+    if req.approved:
+        continue
 
-    e = req.user.email
-    print e
-    emails.append(e)
+    print req.user.email
     try:
         f = FinancialAidGrant(request = req, percent = 100)
         f.save()
         req.done = True
         req.save()
     except:
-        errors.append(req.user)
+        print "Error on user %s" % req.user.id
     approved_any = True
 
 if not approved_any:

esp/useful_scripts/finaid_autoapproved.py

@@ -2,30 +2,38 @@
 #
 # Display Auto-Approved Financial Aid Requests
 # 
-# Displays financial aid requests where the student has reported that they
-# receive free or reduced-price lunch so that these students can be
-# contacted after the initial email batch has been sent. Sorted by date,
-# descending. Make sure to update PROGRAM_ID before running.
-#
-# This script should be run from the manage.py shell
+# Displays financial aid requests that have been approved or autoapproved,
+# sorted by date, so that students can be emailed easily.  Make sure to update
+# PROGRAM_ID before running.
 #
 
 from script_setup import *
 
 from esp.program.models import FinancialAidRequest
 
 # CONFIGURATION
-PROGRAM = "Splash! 2013"
+PROGRAM = "Splash 2014"
 
 # ITERATE & APPROVE REQUESTS
-reqs = FinancialAidRequest.objects.filter(program__name=PROGRAM).exclude(done=False)
+reqs = FinancialAidRequest.objects.filter(program__name=PROGRAM)
+tagged_reqs = {}
 
 print "Auto-Approved Requests"
-if reqs.count() == 0:
-    print "  No requests"
-
-last_date = None
-
-print ", ".join([ req.user.email for req in reqs ])
 
+for req in reqs:
+    if not req.approved:
+        continue
+    date = min(x['timestamp'].date() for x in req.financialaidgrant_set.values())
+    lst = tagged_reqs.get(date, [])
+    lst.append(req)
+    tagged_reqs[date] = lst
+
+dates = tagged_reqs.keys()
+dates.sort()
+for date in dates:
+    print "  " + str(date) + ":"
+    for req in tagged_reqs[date]:
+        print "    %s <%s>" % (req.user.name(), req.user.email)
 
+if reqs.count() == 0:
+    print "  No requests"