save csf file - complete assign route

server/controllers/admin.py

@@ -996,6 +996,8 @@ def calculate_slips(cid, aid):
             user_id=current_user.id,
             assign_id=assign.id,
             timescale=timescale,
+            show_results=form.show_results.data,
+            result_kind='link',
             )
         return redirect(url_for('.course_job', cid=cid, job_id=job.id))
 

server/forms.py

@@ -564,6 +564,7 @@ class SlipCalculatorForm(BaseForm):
                             choices=[(c, c.title()) for c in TIMESCALES],
                             validators=[validators.required()],
                             description="Time scale for slip calculation.")
+    show_results = BooleanField('Show Results', default=False)
 
 ##########
 # Canvas #

server/jobs/slips.py

@@ -4,7 +4,8 @@
 import csv
 
 from server import jobs
-from server.models import Assignment
+from server.models import Assignment, ExternalFile
+from server.utils import encode_id, local_time, output_csv_iterable
 from server.constants import TIMESCALES
 
 timescales = {'days':86400, 'hours':3600, 'minutes':60}
@@ -13,21 +14,15 @@ def timediff(created, deadline, timescale):
     secs_over = (created - deadline).total_seconds()
     return math.ceil(secs_over / timescales[timescale.lower()])
 
-def csv_data(header, rows):
-    output = io.StringIO()
-    writer = csv.writer(output, quoting=csv.QUOTE_NONNUMERIC)
-    writer.writerow(header)
-    [writer.writerow(row) for row in rows]
-    return output.getvalue()
-
 @jobs.background_job
-def calculate_slips(assign_id, timescale):
+def calculate_slips(assign_id, timescale, show_results):
     logger = jobs.get_job_logger()
     job = jobs.get_current_job()
 
     logger.info('Calculating Slip {}...'.format(timescale.title()))
 
     assignment = Assignment.query.get(assign_id)
+    course = assignment.course
     subms = assignment.course_submissions(include_empty=False)
     deadline = assignment.due_date
 
@@ -39,12 +34,25 @@ def get_row(subm):
 
     header = ('User Email', 'Slip {} Used'.format(timescale.title()))
     rows = (get_row(subm) for subm in subms)
-    data = csv_data(header, rows)
-
-    logger.info(repr(data))
-
-    # upload = ExternalFile.upload(csv_data, user_id=1, course_id=1,
-    #     name='temp.okfile', prefix='jobs/example/')
-
+    logger.info('Outputting csv...\n')
+    csv_iterable = output_csv_iterable(header, rows)
+
+    logger.info('Uploading...')
+    created_time = local_time(dt.now(), course, fmt='%m-%d-%I-%M-%p')
+    csv_name = '{}_{}.csv'.format(assignment.name.replace('/', '-'), created_time)
+    upload = ExternalFile.upload(csv_iterable, 
+                user_id=job.user.id, course_id=course.id, name=csv_name, 
+                prefix='jobs/slips/{}'.format(course.offering))
+    logger.info('Saved as: {}'.format(upload.object_name))
+
+    download_link = "/files/{}".format(encode_id(upload.id))
+    logger.info('Download link: {} (see "result" above)\n'.format(download_link))
+
+    if show_results:
+        logger.info('Results:\n')
+        csv_data = ''.join([row.decode('utf-8') for row in csv_iterable])
+        logger.info(csv_data)
+
+    return download_link
 
 

server/templates/staff/jobs/calculate_slips.html

@@ -31,8 +31,10 @@ <h1>
     <div class="col-md-12">
       <div class="box">
         <div class="box-body">
+          <p> Calculate slips and save as a .csv file. </p>
           {% call forms.render_form(form, action_text='Calculate Slips') %}
             {{ forms.render_field(form.timescale) }}
+            {{ forms.render_checkbox_field(form.show_results) }}
           {% endcall %}
         </div>
       </div>

server/utils.py

@@ -236,6 +236,16 @@ def chunks(l, n):
         prev_index = index
 
 
+def output_csv_iterable(header, rows):
+    """ Generate csv string for given header list and list of rows (lists). """
+    output = StringIO()
+    writer = csv.writer(output, quoting=csv.QUOTE_NONNUMERIC)
+    writer.writerow(header)
+    [writer.writerow(row) for row in rows]
+    rows = output.getvalue().split('\r\n')
+    return [bytes(row + '\r\n', 'utf-8') for row in rows]
+
+
 def generate_csv(query, items, selector_fn):
     """ Generate csv export of scores for assignment.
         selector_fn: 1 arg function that returns a list of dictionaries