Skip to content

Commit 083d1b8

Browse files
20wildmanj20wildmanj
authored
Lint views/groups (#1965)
* begin linting views/groups * fix form autocomplete errors
1 parent d0757a4 commit 083d1b8

File tree

6 files changed

+56
-32
lines changed

6 files changed

+56
-32
lines changed

‎app/views/groups/_form.html.erb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<%= form_for @group, url: [@course, @assessment, @group], builder: FormBuilderWithDateTimeInput do |f| %>
1+
<%= form_for @group, url: course_assessment_group_url(@course, @assessment, @group), builder: FormBuilderWithDateTimeInput do |f| %>
22
<%= f.text_field :name, help_text: "Change the name of this group." %>
33

44
<%= f.submit "Change Name" %>

‎app/views/groups/_list_item.html.erb‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
<li>
22
<h3><%= group.name %></h3>
3-
<p><b><%= group.assessment_user_data.all.map{|aud| aud.course_user_datum.full_name }.join(", ") %></b></p>
3+
<p><b><%= group.assessment_user_data.all.map{ |aud| aud.course_user_datum.full_name }.join(", ") %></b></p>
44
<p>
5-
<%= link_to "Ask to Join Group", [:join, @course, @assessment, group], method: :post %>
5+
<%= link_to "Ask to Join Group", join_course_assessment_group_path(@course, @assessment, group), method: :post %>
66
<% if @cud.instructor then %>
7-
| <%= link_to "View", [@course, @assessment, group] %>
8-
| <%= link_to "Destroy", [@course, @assessment, group], method: :delete, data: { confirm: "Are you sure you want to disband this group?" } %>
7+
| <%= link_to "View", course_assessment_group_path(@course, @assessment, group) %>
8+
| <%= link_to "Destroy", course_assessment_group_path(@course, @assessment, group),
9+
method: :delete, data: { confirm: "Are you sure you want to disband this group?" } %>
910
<% end %>
1011
</p>
11-
</li>
12+
</li>

‎app/views/groups/_new_form.html.erb‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
<%= form_tag [@course, @assessment, @group] do %>
1+
<%= form_tag action: :create do %>
22
<div class="form-group">
33
<label class="control-label" for="group_name">Group Name</label>
4-
<%= text_field_tag :group_name, nil, class: "form-control" %>
4+
<%= text_field_tag :group_name, nil, class: "form-control", autocomplete: "off" %>
55
<p class="help-block">Set the name of this group.</p>
66
</div>
77

88
<div class="form-group">
99
<label class="control-label" for="member_email">Partner Email</label>
10-
<%= text_field_tag :member_email, nil, class: "form-control" %>
10+
<%= text_field_tag :member_email, nil, class: "form-control", autocomplete: "email" %>
1111
<p class="help-block">The email of your desired partner. They will need to confirm their membership.</p>
1212
</div>
1313

14-
<%= submit_tag "Create Group", class:"btn btn-primary" %>
15-
<% end %>
14+
<%= submit_tag "Create Group", class: "btn btn-primary" %>
15+
<% end %>

‎app/views/groups/index.html.erb‎

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1+
<% @title = "Groups" %>
2+
3+
<h2>Groups</h2>
14
<% if @groups.size > 0 then %>
2-
<h2>Groups</h2>
35

4-
<table class=prettyBorder >
6+
<table class=prettyBorder>
57
<tr>
68
<th>Group Name</th>
79

@@ -14,7 +16,7 @@
1416

1517
<% @groups.each do |group| %>
1618
<tr>
17-
<td><%= link_to group.name, [@course, @assessment, group] %></td>
19+
<td><%= link_to group.name, course_assessment_group_path(@course, @assessment, group) %></td>
1820

1921
<% group.assessment_user_data.each do |aud| %>
2022
<% cud = aud.course_user_datum %>
@@ -31,17 +33,25 @@
3133
<% end %>
3234

3335
<td>
34-
<%= link_to "Edit", [@course, @assessment, group] %> |
35-
<%= link_to "Destroy", [@course, @assessment, group], method: :delete, data: { confirm: "Are you sure you want to disband this group?" } %>
36+
<%= link_to "Edit", course_assessment_group_path(@course, @assessment, group) %> |
37+
<%= link_to "Destroy", course_assessment_group_path(@course, @assessment, group),
38+
method: :delete, data: { confirm: "Are you sure you want to disband this group?" } %>
3639
</td>
3740
</tr>
3841
<% end %>
3942
</table>
4043
<% else %>
41-
<h2>No Groups have been set yet.</h2>
44+
<p>
45+
No Groups have been set yet.
46+
</p>
4247
<% end %>
4348

44-
<h3><%= link_to 'Create New Group', [:new, @course, @assessment, :group] %></h3>
49+
<br>
50+
<%= link_to new_course_assessment_group_path(@course, @assessment) do %>
51+
<span class="btn primary">
52+
Create New Group
53+
</span>
54+
<% end %>
4555

4656
<% if @grouplessCUDs.size > 0 then %>
4757
<h2>Users Without Groups</h2>
@@ -57,6 +67,6 @@
5767
<h2>Load Groups from Another Assessment</h2>
5868
<%= form_tag [:import, @course, @assessment, :groups] do %>
5969
<%= select_tag :ass, options_from_collection_for_select(@groupAssessments, :id, :name) %>
60-
<%= submit_tag 'Go!', class: "btn btn-primary" %>
70+
<%= submit_tag 'Import Groups', class: "btn btn-primary" %>
6171
<% end %>
6272
<% end %>

‎app/views/groups/new.html.erb‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
<h2>Create a Group</h2>
1+
<% @title = "New Group" %>
2+
3+
<h2>Create New Group</h2>
24

35
<%= render "new_form" %>
46

@@ -9,7 +11,7 @@
911
<% @grouplessCUDs.each do |cud| %>
1012
<% if cud.id != @cud.id && cud.student? then %>
1113
<li><b><%= cud.email %></b>
12-
(<%= link_to "Invite to Group", [@course, @assessment, @group, member_id: cud.id], method: :post %>)
14+
(<%= link_to "Invite to Group", [@course, @assessment, @group, { member_id: cud.id }], method: :post %>)
1315
</li>
1416
<% end %>
1517
<% end %>
@@ -21,7 +23,7 @@
2123
2224
<ul class="gray-box">
2325
<% @unfullGroups.each do |group| %>
24-
<%= render "list_item", {group: group} %>
26+
<%= render "list_item", { group: group } %>
2527
<% end %>
2628
</ul>
2729
<% end %>

‎app/views/groups/show.html.erb‎

Lines changed: 21 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1+
<% @title = @group.name %>
12
<h2>Group: <%= @group.name %></h2>
23

34
<% if @aud.group_id == @group.id or @cud.instructor then %>
45
<% if (@aud.membership_status & AssessmentUserDatum::MEMBER_CONFIRMED) == 0 then %>
56
<p>You have not confirmed your group membership yet.</p>
6-
<%= link_to "Confirm Membership", [:join, @course, @assessment, @group], method: :post %> |
7-
<%= link_to "Deny Membership", [:leave, @course, @assessment, @group], method: :post %>
7+
<%= link_to "Confirm Membership", join_course_assessment_group_path(@course, @assessment, @group), method: :post %> |
8+
<%= link_to "Deny Membership", leave_course_assessment_group_path(@course, @assessment, @group), method: :post %>
89
<% elsif (@aud.membership_status & AssessmentUserDatum::GROUP_CONFIRMED) == 0 then %>
910
<p>Your group has not confirmed your membership yet.</p>
1011
<% end %>
@@ -22,14 +23,22 @@
2223
<% if !aud.group_confirmed(AssessmentUserDatum::MEMBER_CONFIRMED) then %>
2324
<p>This Member has not Confirmed their Membership yet.</p>
2425
<% if @group.is_member(@aud) or @cud.instructor then %>
25-
<p><%= link_to "Cancel Request", [:leave, @course, @assessment, @group, member_id: cud.id], method: :post %></p>
26+
<p>
27+
<%= link_to "Cancel Request",
28+
leave_course_assessment_group_path(@course, @assessment, @group, member_id: cud.id),
29+
method: :post %>
30+
</p>
2631
<% end %>
2732
<% elsif !aud.group_confirmed(AssessmentUserDatum::GROUP_CONFIRMED) then %>
2833
<p>This Member has not been Confirmed by the Group yet.</p>
2934
<% if @group.is_member(@aud) or @cud.instructor then %>
3035
<p>
31-
<%= link_to "Confirm Membership", [:add, @course, @assessment, @group, member_id: cud.id], method: :post %> |
32-
<%= link_to "Deny Membership", [:leave, @course, @assessment, @group, member_id: cud.id], method: :post %>
36+
<%= link_to "Confirm Membership",
37+
add_course_assessment_group_path(@course, @assessment, @group, member_id: cud.id),
38+
method: :post %> |
39+
<%= link_to "Deny Membership",
40+
leave_course_assessment_group_path(@course, @assessment, @group, member_id: cud.id),
41+
method: :post %>
3342
</p>
3443
<% end %>
3544
<% end %>
@@ -40,14 +49,14 @@
4049
<% if @group.is_member(@aud) or @cud.instructor then %>
4150
<% if @group.assessment_user_data.size < @assessment.group_size then %>
4251
<h2>Invite Another Student to Join This Group</h2>
43-
<%= form_tag [:add, @course, @assessment, @group] do %>
52+
<%= form_tag add_course_assessment_group_path(@course, @assessment, @group) do %>
4453
<div class="form-group">
4554
<label class="control-label" for="member_email">Partner Email</label>
46-
<%= text_field_tag :member_email, nil, class: "form-control" %>
55+
<%= text_field_tag :member_email, nil, class: "form-control", autocomplete: "email" %>
4756
<p class="help-block">The email of your desired partner. They will need to confirm their membership.</p>
4857
</div>
4958

50-
<%= submit_tag "Invite to Group", class:"btn btn-primary" %>
59+
<%= submit_tag "Invite to Group", class: "btn btn-primary" %>
5160
<% end %>
5261
<% end %>
5362
<% end %>
@@ -58,7 +67,8 @@
5867
<% @grouplessCUDs.each do |cud| %>
5968
<% if cud.id != @cud.id && cud.student? then %>
6069
<li><b><%= cud.email %></b>
61-
(<%= link_to "Invite to Group", [:add, @course, @assessment, @group, member_id: cud.id], method: :post %>)
70+
(<%= link_to "Invite to Group", add_course_assessment_group_path(@course, @assessment, @group, member_id: cud.id),
71+
method: :post %>)
6272
</li>
6373
<% end %>
6474
<% end %>
@@ -67,7 +77,8 @@
6777

6878
<div style="margin-top: 1em">
6979
<% if @group.is_member(@aud) then %>
70-
<%= link_to "Leave Group", [:leave, @course, @assessment, @group], {method: :post, data: {confirm: "Are you sure you want to leave your group?"}} %> |
80+
<%= link_to "Leave Group", leave_course_assessment_group_path(@course, @assessment, @group),
81+
{ method: :post, data: { confirm: "Are you sure you want to leave your group?" } } %> |
7182
<% end %>
7283
<%= groups_back_link %>
7384
</div>

0 commit comments

Comments
 (0)