<%= t.id %>
<% t.users.each do |u| %>
diff --git a/app/views/admins/email.html.erb b/app/views/admins/email.html.erb
new file mode 100644
index 00000000..a33d0ff7
--- /dev/null
+++ b/app/views/admins/email.html.erb
@@ -0,0 +1,30 @@
+
+ Email Team
+
+
+
Send Email to Team
+
+
+
If subject left blank, subject of email will be: "You have a new message for CS169 from EnrollMe"
+
+
+
+
+ <%=form_for @email, url: {action: "create_email"} do |f| %>
+
+
+
+
+ <% end %>
+
+
+
Email Sent!
+
+ Successfully sent e-mails to:
+
+ <% @email_array.each do |email1| %>
+ <%=email1%>
+ <% end %>
+
+
+
Import Students From CSV
+
+
+
Import Students From CSV
+ Make sure CSV is of the following format:
+ Name | Student ID | User ID | Role |Email Address | Sections | Majors | Terms in Attendance | Units | Grading Basis | Waitlist Position
+
+
+ <%= form_tag import_users_path, multipart: true do %>
+ <%= file_field_tag :file %>
+
+
+ <% if !@admin.TAadmin %>
<%= link_to "Download this data", download_team_info_path(:status => params[:status] ||= "Pending | Approved"), {method: 'get', class: "btn btn-primary btn-sm"} %>
<%= link_to "Email me this data", admins_email_path(:status => params[:status] ||= "Pending | Approved"), {method: 'post', class: 'btn btn-success btn-sm'} %>
+ <%= link_to "Import Student Data", import_page_path, {class: 'btn btn-primary btn-sm'} %>
+ <% end %>
-
+
- Team ID Members Status Discussions Team ID Members Status Discussions Send Email
<% @teams_li.each do |t| %>
@@ -53,34 +62,43 @@
Approved
<% d = Discussion.find_by_id(t.discussion_id) %>
- <%= link_to "Disapprove", admin_disapprove_team_path(:team_id => t.id), {:id=>"disapprove_#{t.id}", :class=>'btn btn-xs btn-danger'} %>
- <%= link_to "Undo Approve", admin_undo_approve_team_path(:team_id => t.id), {:id=>"undo_approve_#{t.id}", :class=>'btn btn-xs btn-warning'} %>
+ <% if !@admin.TAadmin %>
+ <%= link_to "Disapprove", admin_disapprove_team_path(:team_id => t.id), {:id=>"disapprove_#{t.id}", :class=>'btn btn-xs btn-danger'} %>
+ <%= link_to "Undo Approve", admin_undo_approve_team_path(:team_id => t.id), {:id=>"undo_approve_#{t.id}", :class=>'btn btn-xs btn-warning'} %>
+ <% end %>
<%= d.info %>
-
+
<% elsif t.submitted? %>
Pending
<% s = Submission.find_by_id(t.submission_id) %>
- <%= link_to "Approve", admin_approve_team_path(:team_id => t, :disc=> "#{s.disc1id}"), {:id=>"approve_1", :class=>'btn btn-xs btn-success'} %>
+ <% if !@admin.TAadmin %>
+ <%= link_to "Approve", admin_approve_team_path(:team_id => t, :disc=> "#{s.disc1id}"), {:id=>"approve_1", :class=>'btn btn-xs btn-success'} %>
+ <% end %>
<%= label "disc_#{s.disc1id}", Discussion.find_by_id(s.disc1id).info %>
<% else %>
Forming
+ <%= link_to "Send Email", admins_send_email_path(:team_id => t), {:id=>"sendemail_#{t.id}", :class=>'btn btn-xs btn-success'} %>
+
<% end %>
-
-
diff --git a/app/views/admins/new.html.erb b/app/views/admins/new.html.erb
index 3069a0b4..9048b9fe 100644
--- a/app/views/admins/new.html.erb
+++ b/app/views/admins/new.html.erb
@@ -1,10 +1,13 @@
Admin Sign Up
-
Create a New Admin
- <%= form_for @admin, url: {action: "create"}, class: "form-horizontal" do |f| %>
+
Create a New Admin, <%= @admin.name %>
+ <%= form_for @new_admin, url: {action: "create"}, class: "form-horizontal" do |f| %>
- <%= render 'shared/basic_info', {:f => f, :user => @admin} %>
+ <%= render 'shared/basic_info', {:f => f, :user => @new_admin} %>
+ <%= radio_button_tag "type_admin", "ta" %> TA Admin
+ <%= radio_button_tag "type_admin", "enroll" %> Enrollment Admin
+
- Admin Name Delete Admin
+ Admin Name Delete Admin Admin Type
<% Admin.all.each do |a| %>
<% if a.id != @admin.id %>
@@ -17,6 +17,7 @@
<%= check_box_tag "delete_#{a.name}", true %>
+ <%= a.enrollmeadmin ? "Enrollment" : (a.superadmin ? "Super Admin" : "TA")%>
<% end %>
<% end %>
@@ -34,7 +35,7 @@
- Admin Name Transfer SuperAdmin Status
+ Admin Name Transfer SuperAdmin Status Admin Type
<% Admin.all.each do |a| %>
<% if a.id != @admin.id %>
@@ -43,6 +44,7 @@
<%= radio_button_tag "transfer_admin", a.id %>
+ <%= a.enrollmeadmin ? "Enrollment" : (a.superadmin ? "Super Admin" : "TA")%>
<% end %>
<% end %>
diff --git a/app/views/admins/unapproved.html.erb b/app/views/admins/unapproved.html.erb
new file mode 100644
index 00000000..a6ce43cf
--- /dev/null
+++ b/app/views/admins/unapproved.html.erb
@@ -0,0 +1,53 @@
+
+ List of Unapproved Teams
+
+
+
Unapproved Teams:
+
+
+ Team ID Members Status Discussions Send Email
+
+ <% @unapproved_teams.each do |t| %>
+
+ <%= link_to t.id, team_path(t.id) %>
+
+ <% t.users.each do |u| %>
+ <%= link_to u.name, user_path(u.id) %>
+ <% if t.approved? %>
+ Approved
+ <% d = Discussion.find_by_id(t.discussion_id) %>
+
+ <%= link_to "Disapprove", admin_disapprove_team_path(:team_id => t.id), {:id=>"disapprove_#{t.id}", :class=>'btn btn-xs btn-danger'} %>
+ <%= link_to "Undo Approve", admin_undo_approve_team_path(:team_id => t.id), {:id=>"undo_approve_#{t.id}", :class=>'btn btn-xs btn-warning'} %>
+ <%= d.info %>
+
+ <% elsif t.submitted? %>
+ Pending
+ <% s = Submission.find_by_id(t.submission_id) %>
+
+ <%= link_to "Approve", admin_approve_team_path(:team_id => t, :disc=> "#{s.disc1id}"), {:id=>"approve_1", :class=>'btn btn-xs btn-success'} %>
+ <%= label "disc_#{s.disc1id}", Discussion.find_by_id(s.disc1id).info %>
+
+ <% else %>
+ Forming
+
+ <%= link_to "Send Email", admins_send_email_path(:team_id => t), {:id=>"sendemail_#{t.id}", :class=>'btn btn-xs btn-success'} %>
+
+
+ <% end %>
+
+
+
CCN
Discussion Times
Seats Open
+ Capacity
<% @discussions.each do |d| %>
@@ -30,6 +34,7 @@
<%= d.number %>
<%= "#{d.day} #{d.time}" %>
+ <%= d.seats_open %>
<%= d.capacity %>
<% end %>
@@ -39,7 +44,7 @@
diff --git a/app/views/group/create.html.erb b/app/views/group/create.html.erb
new file mode 100644
index 00000000..2ccd5623
--- /dev/null
+++ b/app/views/group/create.html.erb
@@ -0,0 +1,64 @@
+
+
+
+
+
+
+ Admin Home
+
+
<%= "Create Groups" %>
+
+
+
+ <%= form_tag({:action => "merge"}) do %>
+
+
+ Team ID
+ Members
+ Status
+ Discussions
+
+
+ <% @teams_li.each do |t| %>
+ <% if t.approved? %>
+
+ <%= check_box(t.id, "selected", class:"group_checkbox", id:"team_#{t.id}")%>
+ <%= link_to t.id, team_path(t.id) %>
+
+ <% t.users.each do |u| %>
+ <%= link_to u.name, user_path(u.id) %>
+
+ Approved
+ <% d = Discussion.find_by_id(t.discussion_id) %>
+
+ <%= d.info %>
+
+ <% end %>
+
+ <% end %>
+
+
+
+ <%= submit_tag("Create Group", :class => 'btn btn-xs btn-success')%>
+ <% end %>
+
+
+
+ <%= form_tag({:action => "random", :method => "post"}) %>
+ <%= submit_tag("Group randomly", :class => 'btn btn-xs btn-success')%>
+
+
+
+
+
+
+ <%= link_to "Back", admins_path, {:class=>"btn btn-default"} %>
+
+
+
+
+
Admin Home
+
+
<%= "View Groups" %>
+
+
+
+ <%= form_tag({:action => "unmerge", :method => "post"}) do %>
+
+
+ Group ID
+ Team 1 ID
+ Team 2 ID
+ Discussion
+
+
+
+ <% @groups_li.each do |g| %>
+
+ <%= check_box(g.id, "group", id:"group_#{g.id}") %>
+ <%= g.id %>
+ <%= g.team1_id %>
+ <%= g.team2_id %>
+ <%= Discussion.find_by_id(g.discussion_id).number %>
+
+ <% end %>
+
+
+ <%= submit_tag("Destroy Group", :class => 'btn btn-xs btn-danger') %>
+ <% end %>
+
+
+ <%= link_to "Back", admins_path, {:class=>"btn btn-default"} %>
+
+
+
+
+
+
Warning: Please do not use any email aliases - you will not be able to sign in. You must be able to sign into CalNet and/or Gmail using the email provided here.
diff --git a/app/views/shared/_head.html.erb b/app/views/shared/_head.html.erb
index bfe88832..ef64805b 100644
--- a/app/views/shared/_head.html.erb
+++ b/app/views/shared/_head.html.erb
@@ -26,8 +26,9 @@
<% else %>
<%= link_to "Help", '/admin/tutorial' %>
<%= link_to "My Info", admin_path(session[:user_id]), {method: 'get'} %>
- <%= link_to "Register New Admin", new_admin_path, {method: 'get'} %>
+
<% if Admin.find(session[:user_id]).superadmin == true %>
+ <%= link_to "Register New Admin", new_admin_path, {method: 'get'} %>
<%= link_to "Manage Admins", superadmin_path, {method: :get} %>
<%= link_to "Reset Semester", reset_semester_path, {method: :get} %>
<% end %>
diff --git a/app/views/team/mygroup.html.erb b/app/views/team/mygroup.html.erb
new file mode 100644
index 00000000..18533f53
--- /dev/null
+++ b/app/views/team/mygroup.html.erb
@@ -0,0 +1,67 @@
+
+
+ My Group
+
+
+
+
My Group
+
+
Group #<%= @group.id%>
+
+
+
+
Members
+
+
+ Student
+ EECS/CS Major?
+ Email
+
+
+ <% Team.find_by_id(@group.team1_id).users.each do |u| %>
+
+ <%= u.name %>
+ <%= u.major == "DECLARED CS/EECS Major" ? "•" : "No" %>
+ <%= u.email %>
+
+ <%= form_tag edit_team_path(:id => @team.id), method: :get do %>
+ <%= hidden_field_tag :unwanted_user, u.id %>
+ <%= submit_tag "Remove", :id=>"remove_#{u.name}", :class=>"btn btn-default", data: { confirm: "Are you sure you want to remove #{u.name} from your team?" } %>
+ <% end %>
+
+
+ <% end %>
+ <% Team.find_by_id(@group.team2_id).users.each do |u| %>
+
+ <%= u.name %>
+ <%= u.major == "DECLARED CS/EECS Major" ? "•" : "No" %>
+ <%= u.email %>
+
+ <%= form_tag edit_team_path(:id => @team.id), method: :get do %>
+ <%= hidden_field_tag :unwanted_user, u.id %>
+ <%= submit_tag "Remove", :id=>"remove_#{u.name}", :class=>"btn btn-default", data: { confirm: "Are you sure you want to remove #{u.name} from your team?" } %>
+ <% end %>
+
+
+ <% end %>
+
+
+
+
+
Group Discussion Information
+ <% disc = Discussion.find(@team.discussion_id) %>
+ <%= "CCN: #{disc.number} | Time: #{disc.day} #{disc.time}" %>
+
+
+
+
+
+ <%= link_to "Back", team_path, {:class=>"btn btn-default"} %>
+
+
My Team
-
-
My Team
+ Team #<%= @team.id%>
<%= "Team Password: " + @team.passcode.to_s %>
@@ -40,7 +39,9 @@
- <%= button_to "Discussions", discussion_index_path, {method: :get, class: "btn"} %>
+ <%= button_to "Discussions", discussion_index_path, {method: :get, class: "btn btn-default"} %>
+
-
- Team has been submitted!
+
+ Team has been submitted!
<% elsif Discussion.valid_discs_for(@team).count == 0 %>
There are no available discussions.
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index b2f1da59..31fd4d2d 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -10,6 +10,6 @@
Team Password: <%= @user.team.nil? ? "Not yet on a team" : @user.team.passcode %>
<%= link_to "Back", '#', onclick: "history.back()", class: 'btn btn-primary' %>
- <%= link_to "Edit", edit_user_path(params[:id]), {class: 'btn', :method => 'get'} %>
+ <%= link_to "Edit", edit_user_path(params[:id]), {class: 'btn btn-default', :method => 'get'} %>