submissions loading changes in screenreader GB

now loads submissions like we do in GB2

closes CNVS-9886

test plan
=========
- navigate to screenreader gradebook for a large class
- verify that submission are loaded after we get enrollments back

Change-Id: I284b9c64f019c7e53e64fd1a78e23606b8a9da6a
Reviewed-on: https://gerrit.instructure.com/27724
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Simon Williams <simon@instructure.com>
Reviewed-by: Stanley Stuart <stanley@instructure.com>
Product-Review: Matthew Irish <mirish@instructure.com>
QA-Review: Matthew Irish <mirish@instructure.com>

Author: Matthew Irish

app/coffeescripts/ember/screenreader_gradebook/controllers/screenreader_gradebook_controller.coffee

@@ -1,12 +1,13 @@
 define [
+  '../../shared/xhr/fetch_all_pages'
   'i18n!sr_gradebook'
   'ember'
   'underscore'
   'compiled/AssignmentDetailsDialog'
   'compiled/AssignmentMuter'
-  ], (I18n, Ember, _,  AssignmentDetailsDialog, AssignmentMuter ) ->
+  ], (fetchAllPages, I18n, Ember, _,  AssignmentDetailsDialog, AssignmentMuter ) ->
 
-  {get} = Ember
+  {get, set} = Ember
 
   # http://emberjs.com/guides/controllers/
   # http://emberjs.com/api/classes/Ember.Controller.html
@@ -55,12 +56,11 @@ define [
       subs_proxy = @get('submissions')
       selected = @get('selectedSubmission')
       submissions.forEach (submission) =>
-        submissionsForStudent = subs_proxy.findBy('user_id', submission.user_id).submissions
-        oldSubmission = submissionsForStudent.find (sub) ->
-          submission.assignment_id == sub.assignment_id
+        submissionsForStudent = subs_proxy.findBy('user_id', submission.user_id)
+        oldSubmission = submissionsForStudent.submissions.findBy('assignment_id', submission.assignment_id)
 
-        submissionsForStudent.removeObject oldSubmission
-        submissionsForStudent.addObject submission
+        submissionsForStudent.submissions.removeObject oldSubmission
+        submissionsForStudent.submissions.addObject submission
         @updateSubmission submission, students.findBy('id', submission.user_id)
         if selected and selected.assignment_id == submission.assignment_id and selected.user_id == submission.user_id
           @set('selectedSubmission', submission)
@@ -83,28 +83,40 @@ define [
     #selectedAssignment
 
     studentGrades: (->
-      selected = @get('selectedStudent').enrollment.grades
+      selected = @get('selectedStudent')
+      return null if not selected
+      #will always find the first one, but this should be OK
+      enrollment = @get('enrollments').findBy('user_id', selected.id)
+      enrollment.grades
     ).property('selectedStudent')
 
+    fetchStudentSubmissions: (->
+      Ember.run.once =>
+        notYetLoaded = @get('students').filter (student) ->
+          return false if get(student, 'isLoaded') or get(student, 'isLoading')
+          set(student, 'isLoading', true)
+          student
+
+        return unless notYetLoaded.length
+        student_ids = notYetLoaded.mapBy('id')
+        fetchAllPages(ENV.GRADEBOOK_OPTIONS.submissions_url, student_ids: student_ids,  @get('submissions'))
+    ).observes('students.@each').on('init')
+
     submissionsLoaded: (->
       submissions = @get('submissions')
       submissions.forEach ((submission) ->
         student = @get('students').findBy('id', submission.user_id)
-        Ember.set(student, 'isLoaded', true)
+        submission.submissions.forEach ((s) ->
+          @updateSubmission(s, student)
+        ), this
+        set(student, 'isLoading', false)
+        set(student, 'isLoaded', true)
       ), this
     ).observes('submissions.@each')
 
     updateSubmission: (submission, student) ->
       submission.submitted_at = $.parseFromISO(submission.submitted_at) if submission.submitted_at
-      student["assignment_#{submission.assignment_id}"] = submission
-
-    studentLoadedObserver: (->
-      @get('students').filterBy('isLoaded', true).forEach (student) =>
-        @get('submissions').findBy('user_id', student.id).submissions?.forEach ((submission) ->
-          return if student["assignment_#{submission.assignment_id}"]
-          @updateSubmission(submission, student)
-        ), this
-    ).observes('students.@each.isLoaded')
+      set(student, "assignment_#{submission.assignment_id}", submission)
 
     assignments: (->
       _.flatten(@get('assignment_groups').map (ag) -> ag.assignments)
@@ -119,12 +131,11 @@ define [
     selectedSubmission: (->
       return null unless @get('selectedStudent')? and @get('selectedAssignment')?
       student = @get 'selectedStudent'
-      sub = @get('submissions').findBy('user_id', student.id).submissions?.find (submission) =>
-        submission.user_id == @get('selectedStudent').id and
-          submission.assignment_id == @get('selectedAssignment').id
+      assignment = @get 'selectedAssignment'
+      sub = get student, "assignment_#{assignment.id}"
       sub or {
-        user_id: @get('selectedStudent').id
-        assignment_id: @get('selectedAssignment').id
+        user_id: student.id
+        assignment_id: assignment.id
       }
     ).property('selectedStudent', 'selectedAssignment')
 

app/coffeescripts/ember/screenreader_gradebook/routes/screenreader_gradebook_route.coffee

@@ -1,16 +1,14 @@
 define [
   'ember',
   'ic-ajax',
-  '../../shared/xhr/fetch_all_pages',
-  'underscore'
+  '../../shared/xhr/fetch_all_pages'
 ]
-, (Ember, ajax, fetchAllPages, _) ->
+, (Ember, ajax, fetchAllPages) ->
 
   ScreenreaderGradebookRoute = Ember.Route.extend
 
     model: ->
-      #TODO figure out why submissions isn't paginating
       enrollments: fetchAllPages(ENV.GRADEBOOK_OPTIONS.students_url)
       assignment_groups: fetchAllPages(ENV.GRADEBOOK_OPTIONS.assignment_groups_url)
-      submissions: fetchAllPages(ENV.GRADEBOOK_OPTIONS.submissions_url, student_ids: 'all')
+      submissions: Em.ArrayProxy.create(content: [])
       sections: fetchAllPages(ENV.GRADEBOOK_OPTIONS.sections_url)

app/coffeescripts/ember/screenreader_gradebook/templates/screenreader_gradebook.hbs

@@ -151,23 +151,20 @@
 
 <!-- student -->
 <!-- -------- -->
-
 {{#if selectedStudent}}
-{{#with selectedStudent}}
 
 <div id="student_information">
 
   <h2>Student Information</h2>
 
-  <div>Selected Student: {{name}}</div>
+  <div>Selected Student: {{selectedStudent.name}}</div>
 
   <!-- what section they are in -->
 
   <div>Section: Section 3</div>
-
   <!-- secondary id -->
-  {{#unless isLoaded}}
-  <div>Secondary ID: {{login_id}}</div>
+  {{#if selectedStudent.isLoaded}}
+  <div>Secondary ID: {{selectedStudent.login_id}}</div>
 
   <!-- final score/grade -->
 
@@ -178,11 +175,10 @@
   <div>Assignment Group Grade: 30% (50% of grade)</div>
   {{else}}
   <p>Submissions for this student are still loading...</p>
-  {{/unless}}
+  {{/if}}
 
 </div>
 
-{{/with}}
 {{/if}}
 
 <!-- assignment -->

app/coffeescripts/ember/screenreader_gradebook/tests/app.spec.coffee

@@ -15,20 +15,23 @@ define [
       Ember.run App, 'destroy'
 
   test 'fetches enrollments', ->
-    controller = App.__container__.lookup('controller:screenreader_gradebook')
-    equal controller.get('enrollments').objectAt(0).user.name, 'Bob'
-    equal controller.get('enrollments').objectAt(1).user.name, 'Fred'
+    visit('/').then ->
+      controller = App.__container__.lookup('controller:screenreader_gradebook')
+      equal controller.get('enrollments').objectAt(0).user.name, 'Bob'
+      equal controller.get('enrollments').objectAt(1).user.name, 'Fred'
 
   test 'fetches assignment_groups', ->
-    controller = App.__container__.lookup('controller:screenreader_gradebook')
-    equal controller.get('assignment_groups').objectAt(0).name, 'AG1'
+    visit('/').then ->
+      controller = App.__container__.lookup('controller:screenreader_gradebook')
+      equal controller.get('assignment_groups').objectAt(0).name, 'AG1'
 
   #test 'fetches submissions', ->
     #controller = App.__container__.lookup('controller:screenreader_gradebook')
     #equal controller.get('submissions').objectAt(0).submissions[0].grade, '3'
     #equal controller.get('submissions').objectAt(1).submissions[0].grade, '9'
 
   test 'fetches sections', ->
-    controller = App.__container__.lookup('controller:screenreader_gradebook')
-    equal controller.get('sections').objectAt(0).name, 'Section 1'
-    equal controller.get('sections').objectAt(1).name, 'Section 2'
+    visit('/').then ->
+      controller = App.__container__.lookup('controller:screenreader_gradebook')
+      equal controller.get('sections').objectAt(0).name, 'Section 1'
+      equal controller.get('sections').objectAt(1).name, 'Section 2'

app/coffeescripts/ember/screenreader_gradebook/tests/controllers/screenreader_gradebook.spec.coffee

@@ -14,13 +14,14 @@ define [
 
   setup = ->
     App = startApp()
-    @srgb = SRGController.create()
-    @srgb.set('model', {
-      enrollments: Ember.ArrayProxy.create(content: clone fixtures.students)
-      assignment_groups: Ember.ArrayProxy.create(content: clone fixtures.assignment_groups)
-      submissions: Ember.ArrayProxy.create(content: clone fixtures.submissions)
-      sections: Ember.ArrayProxy.create(content: clone fixtures.sections)
-    })
+    Ember.run.join =>
+      @srgb = SRGController.create()
+      @srgb.set('model', {
+        enrollments: Ember.ArrayProxy.create(content: clone fixtures.students)
+        assignment_groups: Ember.ArrayProxy.create(content: clone fixtures.assignment_groups)
+        submissions: Ember.ArrayProxy.create(content: [])
+        sections: Ember.ArrayProxy.create(content: clone fixtures.sections)
+      })
 
 
   module 'screenreader_gradebook_controller',
@@ -30,24 +31,29 @@ define [
       Ember.run App, 'destroy'
 
   test 'calculates students properly', ->
-    equal @srgb.get('students.length'), 2
-    equal @srgb.get('students.firstObject').name, fixtures.students[0].user.name
+    andThen =>
+      equal @srgb.get('students.length'), 2
+      equal @srgb.get('students.firstObject').name, fixtures.students[0].user.name
 
   test 'calculates assignments properly', ->
-    equal @srgb.get('assignments.length'), 2
-    equal @srgb.get('assignments.firstObject').name, fixtures.assignment_groups[0].assignments[0].name
+    andThen =>
+      equal @srgb.get('assignments.length'), 2
+      equal @srgb.get('assignments.firstObject').name, fixtures.assignment_groups[0].assignments[0].name
 
   test 'studentsHash returns the expected hash', ->
-    _.each @srgb.studentsHash(), (obj) =>
-      strictEqual @srgb.get('students').findBy('id', obj.id), obj
+    andThen =>
+      _.each @srgb.studentsHash(), (obj) =>
+        strictEqual @srgb.get('students').findBy('id', obj.id), obj
 
   test 'assignmentGroupsHash retuns the expected hash', ->
-    _.each @srgb.assignmentGroupsHash(), (obj) =>
-      strictEqual @srgb.get('assignment_groups').findBy('id', obj.id), obj
+    andThen =>
+      _.each @srgb.assignmentGroupsHash(), (obj) =>
+        strictEqual @srgb.get('assignment_groups').findBy('id', obj.id), obj
 
   test 'student objects have isLoaded flag set to true once submissions are loaded', ->
-    @srgb.get('students').forEach (s) ->
-      equal Ember.get(s, 'isLoaded'), true
+    andThen =>
+      @srgb.get('students').forEach (s) ->
+        equal Ember.get(s, 'isLoaded'), true
 
   test 'updateSubmission attaches the submission to the student', ->
     student = clone fixtures.students[0].user
@@ -57,14 +63,15 @@ define [
     strictEqual student["assignment_#{submission.assignment_id}"], submission
 
   test 'selectedSubmissionGrade is - if there is no selectedSubmission', ->
-    equal @srgb.get('selectedSubmissionGrade'), '-'
+    andThen =>
+      equal @srgb.get('selectedSubmissionGrade'), '-'
 
 
   module 'screenreader_gradebook_controller: with selected student',
     setup: ->
       setup.call this
-      student = @srgb.get('students.firstObject')
       Ember.run =>
+        student = @srgb.get('students.firstObject')
         @srgb.set('selectedStudent', student)
     teardown: ->
       Ember.run App, 'destroy'
@@ -75,28 +82,31 @@ define [
   module 'screenreader_gradebook_controller: with selected student and selected assignment',
     setup: ->
       setup.call this
-      @student = @srgb.get('students.firstObject')
-      @assignment = @srgb.get('assignments.firstObject')
       Ember.run =>
+        @student = @srgb.get('students.firstObject')
+        @assignment = @srgb.get('assignments.firstObject')
         @srgb.set('selectedStudent', @student)
         @srgb.set('selectedAssignment', @assignment)
 
     teardown: ->
       Ember.run App, 'destroy'
 
   test 'selectedSubmissionGrade is computed properly', ->
-    equal @srgb.get('selectedSubmissionGrade'), fixtures.submissions[0].submissions[0].grade
+    andThen =>
+      equal @srgb.get('selectedSubmissionGrade'), fixtures.submissions[0].submissions[0].grade
 
   test 'assignmentDetails is computed properly', ->
-    ad = @srgb.get('assignmentDetails')
-    selectedAssignment = @srgb.get('selectedAssignment')
-    strictEqual ad.assignment, selectedAssignment
-    strictEqual ad.cnt, 0
+    andThen =>
+      ad = @srgb.get('assignmentDetails')
+      selectedAssignment = @srgb.get('selectedAssignment')
+      strictEqual ad.assignment, selectedAssignment
+      strictEqual ad.cnt, 0
 
   test 'selectedSubmission is computed properly', ->
-    selectedSubmission = @srgb.get('selectedSubmission')
-    sub = _.find(fixtures.submissions, (s) => s.user_id == @student.id)
-    submission = _.find(sub.submissions, (s) => s.assignment_id == @assignment.id)
-    _.each submission, (val, key) =>
-      equal selectedSubmission[key], val, "#{key} is the expected value on selectedSubmission"
+    andThen =>
+      selectedSubmission = @srgb.get('selectedSubmission')
+      sub = _.find(fixtures.submissions, (s) => s.user_id == @student.id)
+      submission = _.find(sub.submissions, (s) => s.assignment_id == @assignment.id)
+      _.each submission, (val, key) =>
+        equal selectedSubmission[key], val, "#{key} is the expected value on selectedSubmission"
 

app/coffeescripts/ember/screenreader_gradebook/tests/integration/dialogs.spec.coffee

@@ -29,7 +29,7 @@ define [
     server.respond 'POST', url, [
       200
       'Content-Type': 'application/json'
-      JSON.stringify response
+      JSON.stringify Ember.copy response, true
     ]
 
   module 'screenreader_gradebook: dialogs open and close',
@@ -39,10 +39,12 @@ define [
       Ember.run App, 'destroy'
 
   test 'upload scores dialog displays properly', ->
-    visit('/').then -> openAndCloseDialog('#upload', 'Choose a CSV to Upload')
+    visit('/')
+    openAndCloseDialog('#upload', 'Choose a CSV to Upload')
 
   test 'set group weights dialog displays propery', ->
-    visit('/').then -> openAndCloseDialog('#ag_weights', 'Manage assignment group weighting')
+    visit('/')
+    openAndCloseDialog('#ag_weights', 'Manage assignment group weighting')
 
 
   module 'screenreader_gradebook: assignment dialogs open and close',
@@ -62,12 +64,12 @@ define [
       #openAndCloseDialog('#message_students', "Message students for #{@selected.name}")
 
   test 'default grade dialog displays properly', ->
-    visit('/').then =>
-      openAndCloseDialog('#set_default_grade', "Default grade for #{@selected.name}")
+    visit('/')
+    openAndCloseDialog('#set_default_grade', "Default grade for #{@selected.name}")
 
   test 'curve grades dialog displays properly', ->
-    visit('/').then =>
-      openAndCloseDialog('#curve_grades', "Curve Grades for #{@selected.name}")
+    visit('/')
+    openAndCloseDialog('#curve_grades', "Curve Grades for #{@selected.name}")
 
 
   module 'screenreader_gradebook: assignment dialogs saving',
@@ -79,6 +81,7 @@ define [
       @server = sinon.fakeServer.create()
       @alert = sinon.stub(window, 'alert')
       Ember.run =>
+        controller.set('submissions', Em.copy fixtures.submissions, true)
         controller.set('selectedAssignment', @selAssignment)
         controller.set('selectedStudent', @selStudent)
 
@@ -94,14 +97,15 @@ define [
   test 'default grade dialog updates the current students grade', ->
     $dialog = null
     server = @server
-    visit('/').then ->
-      openDialog('#set_default_grade').then ->
+    visit('/').then =>
+      openDialog('#set_default_grade').then =>
         $dialog = find('.ui-dialog:visible', 'body')
-        fillIn(find('[name=default_grade]', $dialog), 100).then ->
-          click(find('[name=overwrite_existing_grades]', $dialog)).then ->
+        fillIn(find('[name=default_grade]', $dialog), 100).then =>
+          click(find('[name=overwrite_existing_grades]', $dialog)).then =>
             click('.button_type_submit', $dialog)
-            sendSuccess(server, "/courses/#{ENV.GRADEBOOK_OPTIONS.context_id}/gradebook/update_submission", fixtures.set_default_grade_response)
+            sendSuccess(@server, "/courses/#{ENV.GRADEBOOK_OPTIONS.context_id}/gradebook/update_submission", fixtures.set_default_grade_response)
+
 
     andThen ->
-      Ember.run.next ->
-        equal parseInt(find('#student_and_assignment_grade').val(), 10), 100
+      equal parseInt(find('#student_and_assignment_grade').val(), 10), 100
+