Multiple free responses; image free responses #191
Conversation
Conflicts: app/helpers/application_helper.rb db/schema.rb
|
@kevinburleigh75 please review this PR. also please test the migrations on a copy of the production DB. @kjdav will need you to test this. changes are mostly just on the student exercise workflow, but also shows up in the XLS report and student assignment viewing page. we're going to want to get this in ASAP. |
| @@ -151,7 +152,8 @@ def redirect_maintenance | |||
| end | |||
|
|
|||
| def enable_timeout | |||
| @enable_timeout = true | |||
| # disable in development | |||
| @enable_timeout = !Rails.env.development? | |||
There was a problem hiding this comment.
Should this be !Rails.env.production? to also include the test environment?
There was a problem hiding this comment.
to include the test env should be what you say without the !
|
@kevinburleigh75 I pushed changes for your comments; @kjdav this also includes the "attach" language for the buttons, see how you like it. |
| </span> | ||
| </div> | ||
|
|
||
| <%= f.file_field :attachment, :style => 'width:97.5%%' %> |
There was a problem hiding this comment.
Is the double % after 97.5 a typo?
| padding: 8px; | ||
| } | ||
| </style> | ||
|
|
There was a problem hiding this comment.
Is the plan to move this to assets/stylesheets/ at some point?
|
I looked everything over; there are a few minor comments and one apparently real typo. The FreeResponse table has a field named "content", which is super-vague and appears to be double-booked depending on the "derived type" (caption vs response). Perhaps we should at least rename it to "text_content" or something. A similar argument could potentially be made for the "attachment" field... I say go ahead and merge it as is and we can work out these details separately. |
Multiple free responses; image free responses
Introduces ability to have multiple free responses per student exercise; can upload photos as free response, stored in S3; this preps for the upload-by-email feature