cafe-grader-web Commit - r513:3968658b7a13

cafe-grader-web

Commit `r513:3968658b7a13` public

parent | child

Description:

merge

Commit status:

[Not Reviewed]

References:

merge java

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r513:3968658b7a13 - Tue, 23 Sep 2014 11:45:03 - 13 files changed: 88 inserted, 65 deleted

app/views/messages/list_all.html.haml created 644 ¶ +13

@@ -0,0 +1,13
	1	+ = user_title_bar(@user)
	2	+
	3	+ %h1 Console: all messages
	4	+
	5	+ = link_to '[active messages]', :action => 'list_all'
	6	+
	7	+ %table
	8	+ %tr
	9	+ %th From
	10	+ %th When
	11	+ %th Message
	12	+ %th
	13	+ = render :partial => "short_message", :collection => @messages

app/assets/javascripts/local_jquery.js ⬅ ~~app/assets/javascripts/new.js~~ renamed ¶

file renamed from app/assets/javascripts/new.js to app/assets/javascripts/local_jquery.js

app/controllers/messages_controller.rb ¶ +7 -2

               class MessagesController < ApplicationController
                 before_filter :authenticate
                 verify :method => :post, :only => ['create'],
                        :redirect_to => { :action => 'list' }
                 before_filter :admin_authorization, :only => ['console','show',
-            -                                                 'reply','hide']
+            +                                                 'reply','hide','list_all']
                 def list
                   @user = User.find(session[:user_id])
                   @messages = Message.find_all_sent_by_user(@user)
                 end
+            +
                 def console
                   @user = User.find(session[:user_id])
                   @messages = Message.find_all_system_unreplied_messages
                 end
                 def show
                   @message = Message.find(params[:id])
                 end
+            +   def list_all
+            +     @user = User.find(session[:user_id])
+            +     @messages = Message.where(receiver_id: nil).order(:created_at)
+            +   end
+            +
                 def create
                   user = User.find(session[:user_id])
                   @message = Message.new(params[:message])
                   @message.sender = user
                   if !@message.save
                     render :action => 'list' and return
                   else
                     flash[:notice] = 'New message posted'
                     redirect_to :action => 'list'
                   end
                 end
                 def reply
                   user = User.find(session[:user_id])
                   @message = Message.new(params[:r_message])
                   @message.sender = user
                   if !@message.save
                     render :action => 'show' and return
                   else
                     flash[:notice] = 'Message replied'
                     rep_msg = @message.replying_message
                     rep_msg.replied = true
                     rep_msg.save
                     redirect_to :action => 'console'
                   end
                 end
                 def hide
                   message = Message.find(params[:id])
                   message.replied = true
                   message.save
                   flash[:notice] = 'Message hided (just marked replied)'
                   redirect_to :action => 'console'
                 end
                 protected
                 def build_replying_message_hierarchy(user)
                   @all_messages = {}
                   # manually build replies hierarchy (to improve efficiency)
                   [@messages, @replied_messages].each do |collection|
                     collection.each do |m|
                       @all_messages[m.id] = {:msg => m, :replies => []}
                     end
                   end
                   @all_messages.each do |m|

app/controllers/problems_controller.rb ¶ +14 -2

                   end
                 end
                 def destroy
                   Problem.find(params[:id]).destroy
                   redirect_to :action => 'list'
                 end
                 def toggle
                   @problem = Problem.find(params[:id])
                   @problem.available = !(@problem.available)
                   @problem.save
                 end
                 def turn_all_off
                   Problem.find(:all,
                                :conditions => "available = 1").each do |problem|
                     problem.available = false
                     problem.save
                   end
                   redirect_to :action => 'list'
                 end
                 def turn_all_on
                   Problem.find(:all,
                                :conditions => "available = 0").each do |problem|
                     problem.available = true
                     problem.save
                   end
                   redirect_to :action => 'list'
                 end
                 def stat
                   @problem = Problem.find(params[:id])
                   if !@problem.available
                     redirect_to :controller => 'main', :action => 'list'
                   else
                     @submissions = Submission.includes(:user).where(problem_id: params[:id]).order(:user_id,:id)
                   end
                 end
                 def manage
                   @problems = Problem.find(:all, :order => 'date_added DESC')
                 end
                 def do_manage
                   if params.has_key? 'change_date_added'
                     change_date_added
-            -     else params.has_key? 'add_to_contest'
+            +     elsif params.has_key? 'add_to_contest'
                     add_to_contest
+            +     elsif params.has_key? 'enable_problem'
+            +       set_available(true)
+            +     elsif params.has_key? 'disable_problem'
+            +       set_available(false)
                   end
                   redirect_to :action => 'manage'
                 end
                 def import
                   @allow_test_pair_import = allow_test_pair_import?
                 end
                 def do_import
                   old_problem = Problem.find_by_name(params[:name])
                   if !allow_test_pair_import? and params.has_key? :import_to_db
                     params.delete :import_to_db
                   end
                   @problem, import_log = Problem.create_from_import_form_params(params,
                                                                                 old_problem)
                   if !@problem.errors.empty?
                     render :action => 'import' and return
                   end
                   if old_problem!=nil
                     flash[:notice] = "The test data has been replaced for problem #{@problem.name}"
                   end
                   @log = import_log
                 end
                 def remove_contest
                   problem = Problem.find(params[:id])
                   contest = Contest.find(params[:contest_id])
                   if problem!=nil and contest!=nil
                     problem.contests.delete(contest)
                   end
                   redirect_to :action => 'manage'
                 end
                 ##################################
                 protected
                 def allow_test_pair_import?
                   if defined? ALLOW_TEST_PAIR_IMPORT
                     return ALLOW_TEST_PAIR_IMPORT
                   else
                     return false
                   end
                 end
                 def change_date_added
                   problems = get_problems_from_params
                   year = params[:date_added][:year].to_i
                   month = params[:date_added][:month].to_i
                   day = params[:date_added][:day].to_i
                   date = Date.new(year,month,day)
                   problems.each do |p|
                     p.date_added = date
                     p.save
                   end
                 end
                 def add_to_contest
                   problems = get_problems_from_params
                   contest = Contest.find(params[:contest][:id])
                   if contest!=nil and contest.enabled
                     problems.each do |p|
                       p.contests << contest
                     end
                   end
                 end
+            +   def set_available(avail)
+            +     problems = get_problems_from_params
+            +     problems.each do |p|
+            +       p.available = avail
+            +       p.save
+            +     end
+            +   end
+            +
                 def get_problems_from_params
                   problems = []
                   params.keys.each do |k|
                     if k.index('prob-')==0
-            -         name, id = k.split('-')
+            +         name, id, order = k.split('-')
                       problems << Problem.find(id)
                     end
                   end
                   problems
                 end
               end

app/models/message.rb ¶ +1 -1

               class Message < ActiveRecord::Base
                 belongs_to :sender, :class_name => "User"
                 belongs_to :receiver, :class_name => "User"
                 belongs_to :replying_message, :class_name => "Message"
                 # commented manually do it
                 #
                 #has_many :replied_messages, {
                 #  :class_name => "Message",
                 #  :foreign_key => "replying_message_id"
                 #}
                 #
                 attr_accessor :replied_messages
                 def self.find_all_sent_by_user(user)
                   messages = user.messages
                   replied_messages = user.replied_messages
                   Message.build_replying_message_hierarchy messages, replied_messages
                   return messages
                 end
+            +
                 def self.find_all_system_unreplied_messages
                   self.find(:all,
                             :conditions => 'ISNULL(receiver_id) ' +
                                            'AND (ISNULL(replied) OR replied=0)',
                             :order => 'created_at')
                 end
                 def self.build_replying_message_hierarchy(*args)
                   # manually build replies hierarchy (to improve efficiency)
                   all_messages = {}
                   args.each do |collection|
                     collection.each do |m|
                       all_messages[m.id] = m
                       m.replied_messages = []
                     end
                   end
                   all_messages.each_value do |m|
                     rep_id = m.replying_message_id
                     if all_messages[rep_id]!=nil
                       all_messages[rep_id].add_replied_message(m)
                     end
                   end
                 end
                 def add_replied_message(m)
                   if @replied_messages==nil
                     @replied_messages = [m]
                   else
                     @replied_messages << m
                   end
                   @replied_messages
                 end
               end

app/views/messages/_short_message.html.haml ¶ +2 -1

               %tr
                 - if short_message.sender
                   %td=h short_message.sender.full_name
                 - else
                   %td (user deleted)
                 %td= "#{short_message.created_at}"
                 %td=h truncate(short_message.body)
                 %td
                   - if short_message.sender
                     = link_to "[reply]", :action => 'show', :id => short_message.id
-            -     = link_to "[hide]", :action => 'hide', :id => short_message.id
+            +     - if params[:action] != 'list_all'
+            +       = link_to "[hide]", :action => 'hide', :id => short_message.id

app/views/problems/manage.html.haml ¶ +46 -4

               - content_for :head do
                 = stylesheet_link_tag 'problems'
+            +   = javascript_include_tag 'local_jquery'
+            +
+            + :javascript
+            +   $(document).ready( function() {
+            +     function shiftclick(start,stop,value) {
+            +       $('tr input').each( function(id,input) {
+            +         var $input=$(input);
+            +         var iid=parseInt($input.attr('id').split('-')[2]);
+            +         if(iid>=start&&iid<=stop){
+            +         $input.prop('checked',value)
+            +         }
+            +       });
+            +     }
+            +
+            +     $('tr input').click( function(e)  {
+            +       if (e.shiftKey) {
+            +         stop = parseInt($(this).attr('id').split('-')[2]);
+            +         var orig_stop = stop
+            +         if (typeof start !== 'undefined') {
+            +           if (start > stop) {
+            +             var tmp = start;
+            +             start = stop;
+            +             stop = tmp;
+            +           }
+            +           shiftclick(start,stop,$(this).is(':checked') )
+            +         }
+            +         start = orig_stop
+            +       } else {
+            +         start = parseInt($(this).attr('id').split('-')[2]);
+            +       }
+            +     });
+            +   });
+            +
               %h1 Manage problems
               %p= link_to '[Back to problem list]', :action => 'list'
               = form_tag :action=>'do_manage' do
                 .submitbox
-            -     What do you want to do?
+            +     What do you want to do to the selected problem?
                   %br/
+            +     (You can shift-click to select a range of problems)
                   %ul
                     %li
                       Change date added to
                       = select_date Date.current, :prefix => 'date_added'
                       &nbsp;&nbsp;&nbsp;
                       = submit_tag 'Change', :name => 'change_date_added'
+            +       %li
+            +         Set available to
+            +         = submit_tag 'True', :name => 'enable_problem'
+            +         = submit_tag 'False', :name => 'disable_problem'
                     - if GraderConfiguration.multicontests?
                       %li
                         Add to
                         = select("contest","id",Contest.all.collect {|c| [c.title, c.id]})
                         = submit_tag 'Add', :name => 'add_to_contest'
                 %table
-            -     %tr
+            +     %tr{style: "text-align: left;"}
-            -       %th/
+            +       %th= check_box_tag 'select_all'
                     %th Name
                     %th Full name
+            +       %th Available
                     %th Date added
                     - if GraderConfiguration.multicontests?
                       %th Contests
+            +     - num = 0
                   - for problem in @problems
+            +       - num += 1
                     %tr{:id => "row-prob-#{problem.id}", :name=> "prob-#{problem.id}"}
-            -         %td= check_box_tag "prob-#{problem.id}"
+            +         %td= check_box_tag "prob-#{problem.id}-#{num}"
                       %td= problem.name
                       %td= problem.full_name
+            +         %td= problem.available
                       %td= problem.date_added
                       - if GraderConfiguration.multicontests?
                         %td
                           - problem.contests.each do |contest|
                             = "(#{contest.name} [#{link_to 'x', :action => 'remove_contest', :id => problem.id, :contest_id => contest.id }])"

app/views/report/login_stat.html.haml ¶ +1 -1

               - content_for :header do
                 = stylesheet_link_tag 'tablesorter-theme.cafe'
-            -   = javascript_include_tag 'new'
+            +   = javascript_include_tag 'local_jquery'
               %script{:type=>"text/javascript"}
                 $(function () {
                 $('#since_datetime').datetimepicker({ showButtonPanel: true, dateFormat: "yy-mm-dd", controlType: "slider"} );
                 $('#until_datetime').datetimepicker({ showButtonPanel: true, dateFormat: "yy-mm-dd", controlType: "slider"} );
                 $('#my_table').tablesorter({widthFixed: true, widgets: ['zebra']});
                 });
               %h1 Login status
               =render partial: 'report_menu'
               =render partial: 'date_range', locals: {param_text: 'Login date range:', title: 'Query login stat in the range'  }
               %table.tablesorter-cafe#my_table
                 %thead
                   %tr
                     %th login
                     %th full name
                     %th login count
                     %th earliest
                     %th latest
                     %th IP
                 %tbody
                   - @logins.each do |l|
                     %tr{class: cycle('info-even','info-odd')}
                       %td= link_to l[:login], controller: 'users', action: 'profile', id: l[:id]
                       %td= l[:full_name]
                       %td= l[:count]
                       %td= l[:min] ? l[:min].in_time_zone.strftime('%Y-%m-%d %H:%M') : ''
                       %td= l[:max] ? "#{l[:max].in_time_zone.strftime('%Y-%m-%d %H:%M.%S')} (#{time_ago_in_words(l[:max].in_time_zone)}  ago)" : ''
                       %td
                         - l[:ip].each do |ip|
                           #{ip.ip_address} <br/>

app/views/report/submission_stat.html.haml ¶ +1 -1

               - content_for :header do
-            -   = javascript_include_tag 'new'
+            +   = javascript_include_tag 'local_jquery'
               %script{:type=>"text/javascript"}
                 $(function () {
                 $('#since_datetime').datetimepicker({ showButtonPanel: true, dateFormat: "yy-mm-dd", controlType: "slider"} );
                 $('#until_datetime').datetimepicker({ showButtonPanel: true, dateFormat: "yy-mm-dd", controlType: "slider"} );
                 });
               %h1 Login status
               =render partial: 'report_menu'
               =render partial: 'date_range', locals: {param_text: 'Submission date range:', title: 'Query submission stat in the range'  }
               %table.info
                 %thead
                   %tr.info-head
                     %th login
                     %th full name
                     %th total submissions
                     %th submissions
                 %tbody
                   - @submissions.each do |user_id,data|
                     %tr{class: cycle('info-even','info-odd')}
                       %td= data[:login]
                       %td= data[:full_name]
                       %td= data[:count]
                       %td
                         - data[:sub].each do |prob_id,sub_data|
                           = "#{sub_data[:prob_name]}: ["
                           - st = []
                           - sub_data[:sub_ids].each do |id|
                             - st << link_to(id, controller: 'graders' , action: 'submission', id: id)
                           = raw st.join ', '
                           = ']'
                           %br/

app/views/user_admin/user_stat.html.haml ¶ +1 -1

               - content_for :header do
-            -   = javascript_include_tag 'new'
+            +   = javascript_include_tag 'local_jquery'
                 = stylesheet_link_tag 'tablesorter-theme.cafe'
               %script{:type=>"text/javascript"}
                 $(function () {
                 $('#since_datetime').datetimepicker({ showButtonPanel: true, dateFormat: "yy-mm-dd", controlType: "slider"} );
                 $('#until_datetime').datetimepicker({ showButtonPanel: true, dateFormat: "yy-mm-dd", controlType: "slider"} );
                 $('#my_table').tablesorter({widgets: ['zebra']});
                 });
               %h1 User grading results
               %h2= params[:action] == 'user_stat' ? "Show scores from latest submission" : "Show max scores in submission range"
               - if @problem and @problem.errors
                 =error_messages_for 'problem'
               = render partial: 'submission_range'
               - if params[:action] == 'user_stat'
                 %h3 Latest score
                 = link_to '[download csv with all problems]', controller: :user_admin, action: :user_stat, commit: 'download csv'
               - else
                 %h3 Max score
                 = link_to '[Show only latest submissions]', controller: :user_admin, action: :user_stat
                 = link_to '[download csv with all problems]', controller: :user_admin, action: :user_stat_max, commit: 'download csv'
               %table.tablesorter-cafe#my_table
                 %thead
                   %tr
                     %th User
                     %th Name
                     %th Activated?
                     %th Logged in
                     %th Contest(s)
                     %th Section
                     - @problems.each do |p|
                       %th= p.name
                     %th Total
                     %th Passed
                 %tbody
                   - @scorearray.each do |sc|
                     %tr{class: cycle('info-even','info-odd')}
                       - total,num_passed = 0,0
                       - sc.each_index do |i|
                         - if i == 0
                           %td= link_to sc[i].login, controller: 'users', action: 'profile', id: sc[i]
                           %td= sc[i].full_name
                           %td= sc[i].activated

app/views/users/profile.html.haml ¶ +1 -1

               - content_for :header do
-            -   = javascript_include_tag 'new'
+            +   = javascript_include_tag 'local_jquery'
               %script{:type=>"text/javascript"}
                 $(function () {
                 $('#submission_table').tablesorter({widgets: ['zebra']});
                 });
               :css
                 .fix-width {
                   font-family: Droid Sans Mono,Consolas, monospace, mono, Courier New, Courier;
                 }
               %h1= @user.full_name + ' Profile'
               %h2 Basic info
               <b>Login:</b> #{@user.login} <br/>
               <b>Full name:</b> #{@user.full_name} <br />
               %h2 Problem Stat
               %h2 Submissions
               %table.tablesorter-cafe#submission_table
                 %thead
                   %tr
                     %th ID
                     %th Problem code
                     %th Problem full name
                     %th Language
                     %th Submitted at
                     %th Result
                     %th Score
                     - if session[:admin]
                       %th IP
                 %tbody
                   - @submission.each do |s|
                     - next unless s.problem
                     %tr
                       %td= link_to "#{s.id}", controller: "graders", action: "submission", id: s.id
                       %td= s.problem.name
                       %td= s.problem.full_name
                       %td= s.language.pretty_name
                       %td  #{s.submitted_at.strftime('%Y-%m-%d %H:%M')} (#{time_ago_in_words(s.submitted_at)} ago)
                       %td.fix-width= s.grader_comment
                       %td= (s.points*100)/s.problem.full_score
                       - if session[:admin]
                         %td= s.ip_address

config/application.rb.SAMPLE ¶ +1 -1

                   # Application configuration should go into files in config/initializers
                   # -- all .rb files in that directory are automatically loaded.
                   # Custom directories with classes and modules you want to be autoloadable.
                   config.autoload_paths += %W(#{config.root}/lib)
                   # Only load the plugins named here, in the order given (default is alphabetical).
                   # :all can be used as a placeholder for all plugins not explicitly named.
                   # config.plugins = [ :exception_notification, :ssl_requirement, :all ]
                   # Activate observers that should always be running.
                   # config.active_record.observers = :cacher, :garbage_collector, :forum_observer
                   # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
                   # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
                   config.time_zone = 'UTC'
                   # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
                   # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
                   config.i18n.default_locale = :en
                   # Configure the default encoding used in templates for Ruby 1.9.
                   config.encoding = "utf-8"
                   # Configure sensitive parameters which will be filtered from the log file.
                   config.filter_parameters += [:password]
                   # Enable escaping HTML in JSON.
                   config.active_support.escape_html_entities_in_json = true
                   # Use SQL instead of Active Record's schema dumper when creating the database.
                   # This is necessary if your schema can't be completely dumped by the schema dumper,
                   # like if you have constraints or database-specific column types
                   # config.active_record.schema_format = :sql
                   # Enforce whitelist mode for mass assignment.
                   # This will create an empty whitelist of attributes available for mass-assignment for all models
                   # in your app. As such, your models will need to explicitly whitelist or blacklist accessible
                   # parameters by using an attr_accessible or attr_protected declaration.
                   config.active_record.whitelist_attributes = false
                   # Enable the asset pipeline
                   config.assets.enabled = true
                   # Version of your assets, change this if you want to expire all your assets
                   config.assets.version = '1.0'
                   config.assets.precompile += ['announcement_refresh.js','effects.js','site_update.js','graders.css','problems.css']
-            -     config.assets.precompile += ['new.js','tablesorter-theme.cafe.css']
+            +     config.assets.precompile += ['local_jquery.js','tablesorter-theme.cafe.css']
                 end
               end

app/views/user_admin/user_stat_max.html.haml removed ¶ -50

deleted file

Write
Preview

You need to be logged in to leave comments. Login now

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository permissions settings

Sign in to your account

Author

r513:3968658b7a13 - Tue, 23 Sep 2014 11:45:03 - 13 files changed: 88 inserted, 65 deleted

Sign in to your account

Commit r513:3968658b7a13 public

Author

r513:3968658b7a13 - Tue, 23 Sep 2014 11:45:03 - 13 files changed: 88 inserted, 65 deleted

Commit `r513:3968658b7a13` public