Skip to content

Commit 778faa0

Browse files
author
Davida Marion
committed
image uploader fully working;
1 parent 19c06a5 commit 778faa0

File tree

4 files changed

+11
-4
lines changed

4 files changed

+11
-4
lines changed

README.md

+7-2
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,19 @@ Currently an Adie can:
1010
- Input details about the problem, including what type of problem it is, and an estimated length of time the question will take
1111
- Remove herself once she's been helped.
1212
- Push the relax button to help work off some of the stress
13+
- Avatars attached to the names so that a TA knows which Adie needs help
14+
- Sign in or some sort of authentication so that only an Adie can add/remove herself from the list
1315

1416
Features to Come:
1517

1618

17-
- Avatars attached to the names so that a TA knows which Adie needs help
18-
- Sign in or some sort of authentication so that only an Adie can add/remove herself from the list
19+
- Extra fields for the Adie to detail what steps they've taken
1920
- A wait time (note: this will depend on the number/efficacy of the TAs, so this is a bit harder than just summing up the estimated time)
2021
- Adding more than one Adie to a problem, in the case of pair-programming
22+
- TA sign-in (does it look different?)
23+
- Incentivize helping people ahead of you on the list?
24+
- Adding rating/TA to helped solution
25+
2126

2227

2328
Note:

app/assets/stylesheets/application.css

+2
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
font-variant: small-caps;
66
}
77

8+
89
.container {
910
width: 600px;
1011
margin: 50px auto;
@@ -73,5 +74,6 @@ td .helped:hover {
7374
}
7475

7576
.navbar {
77+
7678

7779
}

app/models/adie.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
class Adie < ActiveRecord::Base
22
has_secure_password
33
validates :name, presence: true, uniqueness: { case_sensitive: false }
4-
has_many :problems
4+
has_many :problems #but a dude ain't one
55
mount_uploader :adatar, AdatarUploader
66

77
end

app/views/problems/analysis.html.erb

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<tbody>
1616
<% @problems.sort_by {|problem| problem.created_at}.each do |problem| %>
1717
<tr>
18-
<td><%= Adie.find(problem.adie_id) %></td>
18+
<td><%= Adie.find(problem.adie_id).name %></td>
1919
<td><%= problem.type %></td>
2020
<td><%= problem.estimate %></td>
2121
<td><%= problem.description %></td>

0 commit comments

Comments
 (0)