will/Open-Source-Access-Control-Web-Interface
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More contract tweaks

Browse Source
This commit is contained in:
Will Bradley
2014-03-02 21:48:49 -07:00
parent d8311fa7cc
commit 3cd6c59df0
14 changed files with 53 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/views/users/index.html.erb
View File

@@ -34,18 +34,18 @@
<% end %>
<tr>
<th></th>
<th><a href="?sort=name">Name</a></th>
<th><a href="?sort=member">Member?</a></th>
<th><a href="?full=full&sort=name">Name</a></th>
<th><a href="?full=full&sort=member">Member?</a></th>
<% if current_user.admin? then %><th><a href="?sort=email">Email</a></th><% end %>
<% if current_user.admin? then %>
<th><a href="?sort=orientation">Orientation?</a></th>
<th><a href="?full=full&sort=orientation">Orientation?</a></th>
<% end %>
<th><a href="?sort=waiver">Waiver?</a></th>
<th><a href="?sort=card">Card?</a></th>
<th><a href="?sort=instructor">Instructor?</a></th>
<th><a href="?full=full&sort=waiver">Waiver?</a></th>
<th><a href="?full=full&sort=card">Card?</a></th>
<th><a href="?full=full&sort=instructor">Instructor?</a></th>
<% if current_user.admin? then %><th><a href="?sort=admin">Admin?</a></th><% end %>
<% @certifications.each do |c| %>
<th><a href="?sort=cert&cert=<%= c.id %>"><%= c.name %></a></th>
<th><a href="?full=full&sort=cert&cert=<%= c.id %>"><%= c.name %></a></th>
<% end %>
<th></th>
<th></th>
@@ -61,7 +61,7 @@
<% if current_user.admin? then %><td>
<%= unless user.orientation.blank? then raw("<span class='hoverinfo' title='"+user.orientation.strftime("%B %d %Y")+"'>&#x2713;</span>") end %>
</td><% end %>
<td><%= unless user.waiver.blank? then raw("<span class='hoverinfo' title='"+user.waiver.strftime("%B %d %Y")+"'>&#x2713;</span>") end %></td>
<td><%= unless user.contracts.blank? then raw("<span class='hoverinfo' title='"+user.contracts.first.signed_at.strftime("%B %d %Y")+"'>&#x2713;</span>") end %></td>
<td><%= unless user.cards.blank? then raw("<span class='iconinfo'>&#x2713;</span>") end %></td>
<td><%= if user.instructor? then raw("<span class='iconinfo'>&#x2713;</a>") end %></td>
<% if current_user.admin? then %><td><%= if user.admin? then raw("<span class='iconinfo'>&#x2713;</a>") end %></td><% end %>

12
app/views/users/show.html.erb
View File

@@ -173,9 +173,15 @@ margin-right: auto;
<%= @user.waiver.strftime("%B %d %Y") unless @user.waiver.blank? %><br/>
<b>Contracts:</b> <%= link_to "+ Add", new_contract_path, :class => 'btn' if can? :create, Contract %>
<ul>
<% @user.contracts.each do |contract| %>
<li><%= link_to contract.signed_at.strftime("%B %d %Y"), contract %></li>
<% end %>
<% @user.contracts.each do |contract| %>
<li>
<% if can? :read, contract %>
<%= link_to contract.signed_at.strftime("%B %d %Y"), contract %>
<% else %>
<%= contract.signed_at.strftime("%B %d %Y") %>
<% end %>
</li>
<% end %>
</ul>
</p>