Skip to content

Commiting changes #324

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kamya390 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Commiting changes #324

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 46 additions & 0 deletions app/views/participants/_participant_details.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@

<div>
<h2>Directory Information</h2>
<p>
<strong>EPPN:</strong> <%= Current.user.eppn %><br />
<strong>Phone:</strong> <%= Current.user.formatted_phone_number %><br />
<strong>Department:</strong> <%= Current.user.department %><br />
<strong>Student Class:</strong> <%= Current.user.student_class %>
</p>

<h2>Memberships</h2>
<% if Current.user.memberships.blank? %>
None yet.
<% else %>
<ul class="list-unstyled">
<% Current.user.memberships.each do |membership| %>
<li>
<%= link_to membership.organization.name, membership.organization %>
</li>
<% end %>
</ul>
<% end %>

<h2>Certifications</h2>
<% if Current.user.certifications.blank? %>
<p>None yet.</p>
<% else %>
<ul class="list-unstyled">
<% Current.user.certifications.each do |cert| %>
<li>
<%= cert.certification_type.name %>
</li>
<% end %>
</ul>
<% end %>

<h2>Tools</h2>
<% if Current.user.checkouts.current.blank? %>
<p>No tools checked out.</p>
<% else %>
<ul class="list-unstyled">
<% Current.user.checkouts.current.each do |checkout| %>
<li><%= link_to checkout.tool.formatted_name, checkout.tool %> - <%= date_and_time checkout.checked_out_at %> for <%= link_to checkout.organization.short_name, checkout.organization %></li>
<% end %>
</ul>
<% end %>
7 changes: 5 additions & 2 deletions app/views/welcome/_participant.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@

<div class="content">
<div>
<%= t('welcome.html', name: Current.user.name) %>
<%= render 'participants/participant_details' %>
</div>
</div><div class="sidebar">
<%= render 'layouts/sidebar_defaults' %>
<%= render 'layouts/sidebar_defaults' %>

</div>
</div>
9 changes: 4 additions & 5 deletions app/views/welcome/_scc.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,10 @@
<div class="content">
<div>
<%= t('welcome.html', name: Current.user.name) %>
<%= render 'notes/stickies', notes: @notes %>

<%= render 'tool_cart/tool_cart' %>
<%= render 'participants/participant_details' %>
</div>
</div><div class="sidebar">
<%= render 'layouts/sidebar_defaults' %>
<%= render 'organization_timeline_entries/queue_sidebar' %>

</div>
</div>

2 changes: 2 additions & 0 deletions app/views/welcome/index.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,5 @@
<% else %>
<%= render 'participant' %>
<% end %>