Skip to content
This repository has been archived by the owner on Jun 26, 2023. It is now read-only.

Reading View -- send data collected from frontend to the database #108

Merged
merged 41 commits into from
Nov 13, 2019
Merged

Reading View -- send data collected from frontend to the database #108

merged 41 commits into from
Nov 13, 2019

Conversation

amy-lei
Copy link
Contributor

@amy-lei amy-lei commented Nov 10, 2019

  • every time the next button is pressed, scroll data, view time, and responses are sent to the backend
  • adjusted models to reflect frontend data structure

Fixed #62 #63

samimak37 and others added 30 commits November 1, 2019 15:00
@samimak37
Added test Question/Response Handling
0c7b790
@samimak37
Merge branch 'master' into reading_view_question_implementation
4c91787
@samimak37
Added response change capabilities
8152bc7
@opheez
Restructure segmentResponseArray and removed SegmentQuestion component
b7d3b71 
segmentResponseArray now includes an object per question, SegmentQuestion component and sumbit button were removed. Text is automatically updated when in text box
@samimak37
Merge branch 'master' into reading_view_question_implementation
1747f57
@samimak37
Copied Luke's changes into branch
543b555
@samimak37
Minor edits to fix question crashing
88ecb25
@Dylan-Weber
Changed context text to pull from an array and separated the building…
8c479d2 
… of fields into its own function
@Dylan-Weber
Disabled back button on the first segment
8a48876
@Dylan-Weber
Removed next button on the last segment
a593a03
@Dylan-Weber
The state no longer stays in rereading mode when the back button is p…
bab694b 
…ressed
@Dylan-Weber
Made the segment start at 0 again (sorry about that!)
1fb9deb
@Dylan-Weber
Revert "Changed context text to pull from an array and separated the …
72905f2 
…building of fields into its own function"

This reverts commit 8c479d2.
@Dylan-Weber
Revert "Disabled back button on the first segment"
ac67364 
This reverts commit 8a48876.
@Dylan-Weber
Revert "The state no longer stays in rereading mode when the back but…
ff83c5d 
…ton is pressed"

This reverts commit bab694b.
@Dylan-Weber
Revert "Removed next button on the last segment"
2d8f24a 
This reverts commit a593a03.
@Dylan-Weber
Reverted all but the first of the commits I made yesterday (11/6). I …
25327bd 
…realized they are better on their own branch.

Branch disable_back_and_next_buttons has that code now.

Sorry for all of the revert commits. I'm not quite sure how to elegantly return to an old commit in github desktop.
@meesuekim
Merge branch 'master' into reading_view_global_questions
90fec8d
@samimak37
Update reading_view.js
6c01cb2
@samimak37
Merge branch 'reading_view_global_questions' of https://github.com/dh…
3bdeba2 
…mit/rereading into reading_view_global_questions
@samimak37
Added StudentReadingData to API, allowed creation of new instances
95d0dd4
@samimak37
Revert "Added StudentReadingData to API, allowed creation of new inst…
b790679 
…ances"

This reverts commit 95d0dd4.
@samimak37
Revert "Revert "Added StudentReadingData to API, allowed creation of …
d03bff7 
…new instances""

This reverts commit b790679.
@Dylan-Weber
Merge branch 'reading_view_question_implementation' into reading_view…
1ffa61b 
…_front_to_back
@Dylan-Weber
Merge branch 'reading_view_scroll' into reading_view_front_to_back
5768836
@Dylan-Weber
changed comment to be more accurate to the present
0bc611f
@Dylan-Weber
Merge branch 'reading_view_questions_api' into reading_view_front_to_…
5f6d0d7 
…back
@amy-lei
for jason
9fcca20
@amy-lei
sends data to the api
6557c11
@amy-lei
fixed formatting
6305f4b
@ryaanahmed
Copy link
Member

THANKS all for this work -- pretty huge. I'm going to take over this branch and clean this up / merge it into master tomorrow morning. If you see anything here that needs clarification before I do that, please make a note on those thread or DM me on Slack.

@ryaanahmed
Copy link
Member

Will merge #107 in first as that work involves adding some features that this PR then refactors.

ryaanahmed
ryaanahmed approved these changes Nov 13, 2019
View reviewed changes
Copy link
Member

@ryaanahmed ryaanahmed left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Merging! Lots of great work here, thanks all.

There's still a major bug to squash before this is ready for primetime -- will make an issue -- but merging this now, as it's big progress in the right direction.

@ryaanahmed ryaanahmed merged commit 548d862 into master Nov 13, 2019
@ryaanahmed ryaanahmed deleted the reading_view_front_to_back branch November 13, 2019 20:04
@ryaanahmed ryaanahmed mentioned this pull request Nov 13, 2019
Closed
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@ryaanahmed ryaanahmed ryaanahmed approved these changes

Assignees

@opheez opheez

@JasonLin43212 JasonLin43212

@Dylan-Weber Dylan-Weber

@amy-lei amy-lei

@samimak37 samimak37

@meesuekim meesuekim

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Wire up new database models to reading view
7 participants
@amy-lei @ryaanahmed @opheez @JasonLin43212 @Dylan-Weber @samimak37 @meesuekim