Team Turing Whiteboard final version

.travis.yml

@@ -24,9 +24,14 @@ env:
 notifications:
   email:
     recipients:
-      - [email protected]
-      - [email protected]
+      - [email protected]
+      - [email protected]
+      - [email protected]
+      - [email protected]
+      - [email protected]
+      #- [email protected]
+      #- [email protected]
     # on_success: [always|never|change] # default: change
     # on_failure: [always|never|change] # default: always
-    on_success: change
+    on_success: always
     on_failure: always

Gemfile

@@ -93,6 +93,9 @@ group :development, :test do
 #  gem 'autotest-growl' if RUBY_PLATFORM =~ /darwin/
 
 #  gem 'test-unit' #, '1.2.3' #Downgrading so that autotest, rspec will work
+
+# Team Turing: add this for static code analysis
+  gem 'rails_best_practices'
 end
 
 

Gemfile.lock

@@ -52,6 +52,7 @@ GEM
     addressable (2.3.4)
     archive-tar-minitar (0.5.2)
     arel (2.0.10)
+    awesome_print (1.2.0)
     aws-sdk (1.8.5)
       json (~> 1.4)
       nokogiri (>= 1.4.4)
@@ -74,6 +75,9 @@ GEM
       mime-types (~> 1.16)
       orm_adapter (~> 0.0.5)
     cocaine (0.2.0)
+    code_analyzer (0.4.3)
+      sexp_processor
+    colored (1.2)
     columnize (0.3.6)
     daemons (1.1.9)
     delayed_job (2.1.4)
@@ -182,6 +186,15 @@ GEM
       activesupport (= 3.0.20)
       bundler (~> 1.0)
       railties (= 3.0.20)
+    rails_best_practices (1.14.4)
+      activesupport
+      awesome_print
+      code_analyzer (>= 0.4.3)
+      colored
+      erubis
+      i18n
+      require_all
+      ruby-progressbar
     railties (3.0.20)
       actionpack (= 3.0.20)
       activesupport (= 3.0.20)
@@ -192,6 +205,7 @@ GEM
     rdoc (3.12.2)
       json (~> 1.4)
     recaptcha (0.3.5)
+    require_all (1.3.1)
     rest-client (1.6.7)
       mime-types (>= 1.16)
     rmagick (2.13.2)
@@ -221,6 +235,7 @@ GEM
     ruby-openid (2.2.3)
     ruby-openid-apps-discovery (1.2.0)
       ruby-openid (>= 2.1.7)
+    ruby-progressbar (1.2.0)
     ruby_core_source (0.1.5)
       archive-tar-minitar (>= 0.5.2)
     rubyzip (0.9.9)
@@ -231,6 +246,7 @@ GEM
       rubyzip
       websocket (~> 1.0.4)
     sequel (3.20.0)
+    sexp_processor (4.4.0)
     shoulda (3.4.0)
       shoulda-context (~> 1.0, >= 1.0.1)
       shoulda-matchers (~> 1.0, >= 1.4.1)
@@ -299,6 +315,7 @@ DEPENDENCIES
   pg
   rack-google_analytics
   rails (= 3.0.20)
+  rails_best_practices
   rake (= 0.8.7)
   rdoc
   recaptcha

app/controllers/deliverables_controller.rb

@@ -15,7 +15,9 @@ def index
     redirect_to my_deliverables_path(current_user)
   end
 
+
   def grading_queue_for_course
+
     @course = Course.find(params[:course_id])
 
     if @course.grading_rule.nil?
@@ -26,8 +28,13 @@ def grading_queue_for_course
       flash.now[:error] = I18n.t(:default_grading_rule_for_course)
     end
 
-    if (current_user.is_admin? || @course.faculty.include?(current_user))
+    if current_user.is_admin?
       @deliverables = Deliverable.where(:course_id => @course.id).all
+
+    elsif @course.faculty.include?(current_user)
+      # Isil - Team Turing
+      @deliverables = Deliverable.new.grading_queue_display(params[:course_id], current_user.id)
+
     else
       has_permissions_or_redirect(:admin, root_path)
     end

app/models/deliverable.rb

@@ -58,6 +58,68 @@ class Deliverable < ActiveRecord::Base
   after_save :inaccurate_course_and_assignment_check
 
 
+  # Grading queue
+  def grading_queue_display(course_id, faculty_id, options = nil)
+
+    # Default grading queue filters
+    options = {"ungraded" => 1, "drafted" => 0, "graded" => 0, "is_my_teams" => 1, "deliverable_name" => ''} if options.nil?
+
+    queue = nil
+
+    # Check: Are there teams in this course? If there are, and the "filter by teams is on", filter by teams
+    # or by individuals in a faculty's teams.
+
+    course_has_teams = Team.find_by_sql(["SELECT * FROM teams WHERE course_id = ? LIMIT 1", course_id])
+
+    if course_has_teams.empty?
+      # Show them everyone in the course
+      #queue = Deliverable.where(:course_id => course_id).all
+      queue = Deliverable.find_by_sql(["SELECT * FROM deliverables WHERE course_id = ?", course_id])
+
+    else
+      # By default, the faculty see their teams or individuals in their teams with ungraded deliverables
+      if options['is_my_teams'] == 1
+
+        sql = "SELECT a.name AS assignment_name, d.id AS deliverable_id, d.updated_at, a.task_number, t.name AS owner_name, d.creator_id, dav.attachment_file_name AS attachment_file_name, a.is_team_deliverable, dav.id AS attachment_versions, c.name AS course_name
+                FROM deliverables d
+                INNER JOIN assignments a ON d.assignment_id = a.id
+                INNER JOIN teams t ON t.id = d.team_id
+                INNER JOIN courses c ON c.id = a.course_id
+                INNER JOIN deliverable_attachment_versions dav ON dav.deliverable_id = d.id
+              WHERE d.course_id = ? AND t.primary_faculty_id = ?"
+
+        #queue = Deliverable.find_by_sql([sql, course_id, assignment_id])
+        queue = Deliverable.find_by_sql([sql, course_id, faculty_id])
+
+        # This course may have teams, but this deliverable may not be a team deliverable. In that case:
+        if queue.nil?
+          sql = "SELECT a.name AS assignment_name, d.updated_at AS last_updated, a.task_number,
+              u.human_name AS owner_name, d.creator_id, dav.attachment_file_name AS attachment_file_name, a.is_team_deliverable,
+              dav.id AS attachment_versions
+             FROM deliverables d
+             INNER JOIN assignments a ON d.assignment_id = a.id
+             INNER JOIN users u ON u.id = d.creator_id
+             INNER JOIN deliverable_attachment_versions dav ON dav.deliverable_id = d.id
+             WHERE d.course_id = ? AND a.id = ?"
+
+          queue = Deliverable.find_by_sql([sql, course_id, assignment_id])
+
+        end # end 'Teams in course but individual deliverable'
+
+      else
+
+        # Do not filter by my teams, show everyone
+        #queue = Deliverable.where(:course_id => course_id).all
+        queue = Deliverable.find_by_sql(["SELECT * FROM deliverables WHERE course_id = ?", course_id])
+
+      end # end 'Filter by my teams'
+
+    end # end 'Course has teams '
+
+    return queue
+
+  end
+
   # To get the owner of the deliverable
   def unique_course_task_owner?
     if self.is_team_deliverable?

app/views/deliverables/_deliverable_listing_professor.html.erb

@@ -1,5 +1,26 @@
 <% reset_cycle %>
 <% customised_name= nomenclature_assignment_or_deliverable %>
+
+<% if deliverables.nil? %>
+    <p>No deliverables!</p>
+<% else %>
+    <% deliverables.each do |deliverable| %>
+        <p><%= deliverable.attributes['task_number'] %></p>
+        <p><%= deliverable.attributes['owner_name'] %></p>
+        <p><%= deliverable.attributes['assignment_name'] %></p>
+        <p><%= deliverable.attributes['updated_at'] %></p>
+        <p><%= deliverable.get_grade_status %></p>
+    <% end %>
+<% end %>
+
+
+<div class="row">
+ <div class="panel panel-default">
+   <div class="panel-body" style="background-color: #f5f5f5;border-radius: 5px;padding: 10px">
+     panel-bodypanel-bodypanel-bodypanel-bodypanel-bodypanel-bodypanel-bodypanel-bodypanel-bodypanel-body
+   </div>
+ </div>
+</div>
 <table class="twikiTable sortable cmu_table" cellpadding="0" cellspacing="0" width="685">
   <thead>
   <tr>
@@ -21,7 +42,7 @@
   </thead>
 
   <% deliverables.each do |deliverable| %>
-      <tr class="<%= cycle('twikiTableOdd', 'twikiTableEven') %> <%= deliverable.get_grade_status %>">
+      <tr class="<%= cycle('twikiTableOdd', 'twikiTableEven') %> <%= deliverable.get_grade_status %> "data-toggle="collapse" data-target="#collapse<%= deliverable.attributes['deliverable_id'] %>">
         <% unless skip_course_column %>
             <% if deliverable.course %>
                 <td><%= h deliverable.course.name %></td>
@@ -37,39 +58,48 @@
                 <td><%= h deliverable.assignment.task_number %></td>
             <% end %>
         <% end %>
-        <td><%= "Team " if deliverable.is_team_deliverable? %><%= deliverable.owner_name %></td>
-        <% latest_attachment = deliverable.attachment_versions.first %>
-        <% unless latest_attachment.attachment_file_name.nil? %>
-            <td><%= deliverable.assignment_name%> (<%= link_to "download", latest_attachment.attachment.url %>)</td>
-        <% else %>
-            <td><%= deliverable.assignment_name %></td>
-        <% end %>
+        <td><%#= "Team " if deliverable.is_team_deliverable? %><%#= deliverable.attributes[:owner] %></td>
+        <%# latest_attachment = deliverable.attributes[:attachment_versions] %>
+        <%# unless latest_attachment.attributes[:attachment_file_name].nil? %>
+            <td><%#= deliverable.assignment_name %> (<%#= link_to "download", latest_attachment.attachment.url %>)</td>
+        <%# else %>
+            <td><%#= deliverable.assignment_name %></td>
+        <% #end %>
 
         <td>
 
-          <% if deliverable.get_grade_status==:graded %>
-             Yes
-          <% elsif deliverable.get_grade_status==:drafted %>
-             No (Draft)
-          <% elsif deliverable.get_grade_status==:ungraded %>
-             No
-          <% end %>
+          <% #if deliverable.get_grade_status==:graded %>
+              Yes
+          <% #elsif deliverable.get_grade_status==:drafted %>
+              No (Draft)
+          <% #elsif deliverable.get_grade_status==:ungraded %>
+              No
+          <% #end %>
         </td>
 
 
-              <% if  deliverable.get_grade_status==:graded %>
-                  <td><%= link_to 'Review Grade', deliverable %></td>
-              <%else%>
-                <td><%= link_to 'Give Grade', deliverable %></td>
-            <%end%>
+        <% #if  #deliverable.get_grade_status==:graded %>
+            <td><%#= link_to 'Review Grade', deliverable %></td>
+        <%#else%>
+            <td><%#= link_to 'Give Grade', deliverable %></td>
+        <%#end%>
 
         <!--
       <td>
-          <% if deliverable.current_attachment != nil and deliverable.current_attachment.attachment_file_name != nil %>
-              <%= link_to deliverable.current_attachment.attachment_file_name, deliverable.current_attachment.attachment.url %>
-          <% end %>
+          <%# if deliverable.current_attachment != nil and deliverable.current_attachment.attachment_file_name != nil %>
+              <%#= link_to deliverable.current_attachment.attachment_file_name, deliverable.current_attachment.attachment.url %>
+          <%# end %>
       </td>
 -->
       </tr>
+      <tr>
+        <td colspan="4">
+          <div id="collapse<%= deliverable.attributes['deliverable_id'] %>" class="panel-collapse collapse">
+            <div class="panel-body">
+              Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid. 3 wolf moon officia aute, non cupidatat skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod. Brunch 3 wolf moon tempor, sunt aliqua put a bird on it squid single-origin coffee nulla assumenda shoreditch et. Nihil anim keffiyeh helvetica, craft beer labore wes anderson cred nesciunt sapiente ea proident. Ad vegan excepteur butcher vice lomo. Leggings occaecat craft beer farm-to-table, raw denim aesthetic synth nesciunt you probably haven't heard of them accusamus labore sustainable VHS.
+            </div>
+          </div>
+        </td>
+      </tr>
   <% end %>
 </table>

app/views/deliverables/grading_queue_for_course.html.erb

@@ -1,11 +1,15 @@
 <h1><%= @course.display_for_course_page %></h1>
 <%= render :partial=>"layouts/grade_book_sub_menu" %>
+<!--
 <h2>Submitted <%= nomenclature_assignment_or_deliverable%>s</h2>
+-->
 
+<!--
 <div class="rounded staff">
   <%= image_tag("/images/professor.jpg", :size => "50x50", :border => "0", :alt => "Only faculty can see this information", :title => "Faculty Role") %>
   <span class="instructions">Note: we will be improving this screen during the Spring 2013 semester by integrating in new student code. </span>
 </div>
+-->
 
 
 <div>
@@ -74,10 +78,11 @@
       </script>
       <!-- <div style='border-right: solid 3px #7f7f7f;'> -->
 
-
+<!--
         <h2>Search</h2>
+-->
 
-
+<!--
         <div id='filterBox'>
           <input id='filterInputBox' value='Page is still loading' disabled maxlength='30' size='30' type='text' placeholder="Enter search keywords"/>
           <%= image_tag("/images/tablesorter/cross.png", :width => "16", :height => "16", :id => "filterClearOne", :title => 'Click to clear filter.', :alt => 'Clear Filter Image') %> <br/>
@@ -90,6 +95,18 @@
         <input id="filter_ungraded" class="filter_status" checked="true" type="checkbox"/><label for="filter_ungraded">Ungraded</label> &nbsp; &nbsp;
         <input id="filter_drafted" class="filter_status" checked="true" type="checkbox"/><label for="filter_drafted">Drafted</label> </br>
       </div>
+-->
+
+  <div id="container" style="background-color: #ffffff">
+    <div id="filter_search_box" style="padding: 10px">
+      Placeholder for search and filter box.
+    </div>
 
+    <hr>
+
+    <div id="deliverables" style="padding: 10px">
       <%= render :partial => "deliverable_listing_professor", :locals => {:deliverables => @deliverables, :skip_course_column => true} %>
-      <br/>
+
+    </div>
+  </div>
+</div>

app/views/layouts/cmu_sv.html.erb

@@ -32,6 +32,11 @@
   <title><%= (title = yield :title) ? title : 'Silicon Valley Campus - Carnegie Mellon University' %></title>
   <%= yield :javascript %>
   <%= yield :head %>
+
+  <!-- 10/16/2013 David Lee -->
+  <%= stylesheet_link_tag "/stylesheets/bootstrap.min.css", :media => "screen", :rel => "stylesheet" %>
+  <%= javascript_include_tag 'collapse.js', 'transition.js' %>
+
 </head>
 
 <body>