cafe-grader-web Commit - r665:ecbd1a5dbc27

cafe-grader-web

Commit `r665:ecbd1a5dbc27` public

parent | child

Description:

merge with master

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

r665:ecbd1a5dbc27 - Sat, 19 Aug 2017 14:13:43 - 7 files changed: 108 inserted, 8 deleted

app/views/announcements/edit.html.haml created 644 ¶ +34

			@@ -0,0 +1,34
		1	+ .container-fluid
		2	+ %h1 Editing announcement
		3	+ = error_messages_for :announcement
		4	+ .row
		5	+ .col-md-6
		6	+ = form_for(@announcement) do \|f\|
		7	+ .form-group
		8	+ %label Title
		9	+ = f.text_field :title, class: 'form-control'
		10	+ .form-group
		11	+ %label Notes
		12	+ (shown internally, used to organize announcements)
		13	+ = f.text_field :notes, class: 'form-control'
		14	+ .form-group
		15	+ %label Body
		16	+ = f.text_area :body, class: 'form-control', style: 'height: 200px;'
		17	+ .form-group
		18	+ %label Author
		19	+ = f.text_field :author, class: 'form-control'
		20	+ .checkbox
		21	+ %label
		22	+ = f.check_box :published
		23	+ Published
		24	+ .checkbox
		25	+ %label
		26	+ = f.check_box :frontpage
		27	+ Show on front page?
		28	+ .checkbox
		29	+ %label
		30	+ = f.check_box :contest_only
		31	+ Show only in contest?
		32	+ = f.submit "Update", class: 'btn btn-primary'
		33	+ = link_to 'Show', @announcement, class: 'btn btn-default'
		34	+ = link_to 'Back', announcements_path, class: 'btn btn-default'

app/views/problems/_form.html.haml created 644 ¶ +52

			@@ -0,0 +1,52
		1	+ = error_messages_for 'problem'
		2	+ / [form:problem]
		3	+ .form-group
		4	+ %label{:for => "problem_name"} Name
		5	+ = text_field 'problem', 'name', class: 'form-control'
		6	+ %small
		7	+ Do not directly edit the problem name, unless you know what you are doing. If you want to change the name, use the name change button in the problem management menu instead.
		8	+ .form-group
		9	+ %label{:for => "problem_full_name"} Full name
		10	+ = text_field 'problem', 'full_name', class: 'form-control'
		11	+ .form-group
		12	+ %label{:for => "problem_full_score"} Full score
		13	+ = text_field 'problem', 'full_score', class: 'form-control'
		14	+ .form-group
		15	+ %label{:for => "problem_date_added"} Date added
		16	+ = date_select 'problem', 'date_added', class: 'form-control'
		17	+ - # TODO: these should be put in model Problem, but I can't think of
		18	+ - # nice default values for them. These values look fine only
		19	+ - # in this case (of lazily adding new problems).
		20	+ - @problem.available = true if @problem!=nil and @problem.available==nil
		21	+ - @problem.test_allowed = true if @problem!=nil and @problem.test_allowed==nil
		22	+ - @problem.output_only = false if @problem!=nil and @problem.output_only==nil
		23	+ .checkbox
		24	+ %label{:for => "problem_available"}
		25	+ = check_box :problem, :available
		26	+ Available?
		27	+ .checkbox
		28	+ %label{:for => "problem_test_allowed"}
		29	+ = check_box :problem, :test_allowed
		30	+ Test allowed?
		31	+ .checkbox
		32	+ %label{:for => "problem_output_only"}
		33	+ = check_box :problem, :output_only
		34	+ Output only?
		35	+ = error_messages_for 'description'
		36	+ .form-group
		37	+ %label{:for => "description_body"} Description
		38	+ %br/
		39	+ = text_area :description, :body, :rows => 10, :cols => 80,class: 'form-control'
		40	+ .form-group
		41	+ %label{:for => "description_markdowned"} Markdowned?
		42	+ = select "description", \|
		43	+ "markdowned", \|
		44	+ [['True',true],['False',false]], \|
		45	+ {:selected => (@description) ? @description.markdowned : false } \|
		46	+ .form-group
		47	+ %label{:for => "problem_url"} URL
		48	+ %br/
		49	+ = text_field 'problem', 'url',class: 'form-control'
		50	+ %p
		51	+ Task PDF #{file_field_tag 'file'}
		52	+ / [eoform:problem]

app/views/problems/edit.html.haml created 644 ¶ +14

			@@ -0,0 +1,14
		1	+ .container-fluid
		2	+ = form_for @problem,url:{action: 'update'},html: {multipart: true} do
		3	+ .row
		4	+ .col-md-6
		5	+ %h1 Editing problem
		6	+ = render :partial => 'form'
		7	+ .row
		8	+ .col-md-4
		9	+ = submit_tag 'Edit', class: 'btn btn-primary btn-block'
		10	+ .col-md-4
		11	+ = link_to 'Show', {:action => 'show', :id => @problem}, class: 'btn btn-default btn-block'
		12	+ .col-md-4
		13	+ = link_to 'Back', problems_path, class: 'btn btn-default btn-block'
		14	+ .div{style: 'height: 5em'}

spec/models/testcases_spec.rb created 644 ¶ +5

			@@ -0,0 +1,5
		1	+ require 'spec_helper'
		2	+
		3	+ describe Testcases do
		4	+ pending "add some examples to (or delete) #{__FILE__}"
		5	+ end

app/controllers/report_controller.rb ¶ +1 -1

                                         .select(:ip_address).uniq
                                }
                   end
                 end
                 def submission_stat
                   date_and_time = '%Y-%m-%d %H:%M'
                   begin
                     @since_time = DateTime.strptime(params[:since_datetime],date_and_time)
                   rescue
                     @since_time = DateTime.new(1000,1,1)
                   end
                   begin
                     @until_time = DateTime.strptime(params[:until_datetime],date_and_time)
                   rescue
                     @until_time = DateTime.new(3000,1,1)
                   end
                   @submissions = {}
                   User.find_each do |user|
                     @submissions[user.id] = { login: user.login, full_name: user.full_name, count: 0, sub: { } }
                   end
                   Submission.where("submitted_at >= ? AND submitted_at <= ?",@since_time,@until_time).find_each do |s|
                     if @submissions[s.user_id]
                       if not @submissions[s.user_id][:sub].has_key?(s.problem_id)
                         a = Problem.find_by_id(s.problem_id)
                         @submissions[s.user_id][:sub][s.problem_id] =
                           { prob_name: (a ? a.full_name : '(NULL)'),
                             sub_ids: [s.id] }
                       else
                         @submissions[s.user_id][:sub][s.problem_id][:sub_ids] << s.id
                       end
                       @submissions[s.user_id][:count] += 1
                     end
                   end
                 end
                 def problem_hof
                   # gen problem list
                   @user = User.find(session[:user_id])
                   @problems = @user.available_problems
                   # get selected problems or the default
                   if params[:id]
                     begin
                       @problem = Problem.available.find(params[:id])
                     rescue
                       redirect_to action: :problem_hof
                       flash[:notice] = 'Error: submissions for that problem are not viewable.'
                       return
                     end
                   end
                   return unless @problem
                   @by_lang = {} #aggregrate by language
                   range =65
                   @histogram = { data: Array.new(range,0), summary: {} }
                   @summary = {count: 0, solve: 0, attempt: 0}
                   user = Hash.new(0)
                   Submission.where(problem_id: @problem.id).find_each do |sub|
                     #histogram
                     d = (DateTime.now.in_time_zone - sub.submitted_at) / 24 / 60 / 60
                     @histogram[:data][d.to_i] += 1 if d < range
                     next unless sub.points
                     @summary[:count] += 1
                     user[sub.user_id] = [user[sub.user_id], (sub.points >= @problem.full_score) ? 1 : 0].max
                     lang = Language.find_by_id(sub.language_id)
                     next unless lang
                     next unless sub.points >= @problem.full_score
                     #initialize
                     unless @by_lang.has_key?(lang.pretty_name)
                       @by_lang[lang.pretty_name] = {
                         runtime: { avail: false, value: 2**30-1 },
                         memory: { avail: false, value: 2**30-1 },
                         length: { avail: false, value: 2**30-1 },
                         first: { avail: false, value: DateTime.new(3000,1,1) }
                       }
                     end
                     if sub.max_runtime and sub.max_runtime < @by_lang[lang.pretty_name][:runtime][:value]
                       @by_lang[lang.pretty_name][:runtime] = { avail: true, user_id: sub.user_id, value: sub.max_runtime, sub_id: sub.id }
                     end
                     if sub.peak_memory and sub.peak_memory < @by_lang[lang.pretty_name][:memory][:value]
                       @by_lang[lang.pretty_name][:memory] = { avail: true, user_id: sub.user_id, value: sub.peak_memory, sub_id: sub.id }
                     end
-            -       if sub.submitted_at and sub.submitted_at < @by_lang[lang.pretty_name][:first][:value] and
+            +       if sub.submitted_at and sub.submitted_at < @by_lang[lang.pretty_name][:first][:value] and sub.user and
                         !sub.user.admin?
                       @by_lang[lang.pretty_name][:first] = { avail: true, user_id: sub.user_id, value: sub.submitted_at, sub_id: sub.id }
                     end
                     if @by_lang[lang.pretty_name][:length][:value] > sub.effective_code_length
                       @by_lang[lang.pretty_name][:length] = { avail: true, user_id: sub.user_id, value: sub.effective_code_length, sub_id: sub.id }
                     end
                   end
                   #process user_id
                   @by_lang.each do |lang,prop|
                     prop.each do |k,v|
                       v[:user] = User.exists?(v[:user_id]) ? User.find(v[:user_id]).full_name : "(NULL)"
                     end
                   end
                   #sum into best
                   if @by_lang and @by_lang.first
                     @best = @by_lang.first[1].clone
                     @by_lang.each do |lang,prop|
                       if @best[:runtime][:value] >= prop[:runtime][:value]
                         @best[:runtime] = prop[:runtime]
                         @best[:runtime][:lang] = lang
                       end
                       if @best[:memory][:value] >= prop[:memory][:value]
                         @best[:memory] = prop[:memory]
                         @best[:memory][:lang] = lang
                       end
                       if @best[:length][:value] >= prop[:length][:value]
                         @best[:length] = prop[:length]
                         @best[:length][:lang] = lang
                       end
                       if @best[:first][:value] >= prop[:first][:value]
                         @best[:first] = prop[:first]
                         @best[:first][:lang] = lang
                       end
                     end
                   end
                   @histogram[:summary][:max] = [@histogram[:data].max,1].max
                   @summary[:attempt] = user.count
                   user.each_value { |v| @summary[:solve] += 1 if v == 1 }
                 end
                 def stuck #report struggling user,problem
                   # init
                   user,problem = nil
                   solve = true
                   tries = 0
                   @struggle = Array.new
                   record = {}
                   Submission.includes(:problem,:user).order(:problem_id,:user_id).find_each do |sub|
                     next unless sub.problem and sub.user
                     if user != sub.user_id or problem != sub.problem_id
                       @struggle << { user: record[:user], problem: record[:problem], tries: tries } unless solve
                       record = {user: sub.user, problem: sub.problem}
                       user,problem = sub.user_id, sub.problem_id
                       solve = false
                       tries = 0
                     end
                     if sub.points >= sub.problem.full_score
                       solve = true
                     else
                       tries += 1
                     end
                   end
                   @struggle.sort!{|a,b| b[:tries] <=> a[:tries] }
                   @struggle = @struggle[0..50]
                 end
                 def multiple_login
                   #user with multiple IP
                   raw = Submission.joins(:user).joins(:problem).where("problems.available != 0").group("login,ip_address").order(:login)
                   last,count = 0,0
                   first = 0
                   @users = []
                   raw.each do |r|
                     if last != r.user.login
                       count = 1
                       last = r.user.login
                       first = r
                     else
                       @users << first if count == 1
                       @users << r
                       count += 1
                     end
                   end
                   #IP with multiple user
                   raw = Submission.joins(:user).joins(:problem).where("problems.available != 0").group("login,ip_address").order(:ip_address)
                   last,count = 0,0
                   first = 0
                   @ip = []
                   raw.each do |r|
                     if last != r.ip_address

app/controllers/users_controller.rb ¶ +2 -1

                 verify :method => :post, :only => [:chg_passwd],
                        :redirect_to => { :action => :index }
                 #in_place_edit_for :user, :alias_for_editing
                 #in_place_edit_for :user, :email_for_editing
                 def index
                   if !GraderConfiguration['system.user_setting_enabled']
                     redirect_to :controller => 'main', :action => 'list'
                   else
                     @user = User.find(session[:user_id])
                   end
                 end
                 def chg_passwd
                   user = User.find(session[:user_id])
                   user.password = params[:passwd]
                   user.password_confirmation = params[:passwd_verify]
                   if user.save
                     flash[:notice] = 'password changed'
                   else
                     flash[:notice] = 'Error: password changing failed'
                   end
                   redirect_to :action => 'index'
                 end
                 def new
                   @user = User.new
                   render :action => 'new', :layout => 'empty'
                 end
                 def register
                   if(params[:cancel])
                     redirect_to :controller => 'main', :action => 'login'
                     return
                   end
                   @user = User.new(user_params)
                   @user.password_confirmation = @user.password = User.random_password
                   @user.activated = false
                   if (@user.valid?) and (@user.save)
                     if send_confirmation_email(@user)
                       render :action => 'new_splash', :layout => 'empty'
                     else
                       @admin_email = GraderConfiguration['system.admin_email']
                       render :action => 'email_error', :layout => 'empty'
                     end
                   else
                     @user.errors.add(:base,"Email cannot be blank") if @user.email==''
                     render :action => 'new', :layout => 'empty'
                   end
                 end
                 def confirm
                   login = params[:login]
                   key = params[:activation]
                   @user = User.find_by_login(login)
                   if (@user) and (@user.verify_activation_key(key))
                     if @user.valid?  # check uniquenss of email
                       @user.activated = true
                       @user.save
                       @result = :successful
                     else
                       @result = :email_used
                     end
                   else
                     @result = :failed
                   end
                   render :action => 'confirm', :layout => 'empty'
                 end
                 def forget
                   render :action => 'forget', :layout => 'empty'
                 end
                 def retrieve_password
                   email = params[:email]
                   user = User.find_by_email(email)
                   if user
                     last_updated_time = user.updated_at || user.created_at || (Time.now.gmtime - 1.hour)
                     if last_updated_time > Time.now.gmtime - 5.minutes
                       flash[:notice] = 'The account has recently created or new password has recently been requested.  Please wait for 5 minutes'
                     else
                       user.password = user.password_confirmation = User.random_password
                       user.save
                       send_new_password_email(user)
                       flash[:notice] = 'New password has been mailed to you.'
                     end
                   else
                     flash[:notice] = I18n.t 'registration.password_retrieval.no_email'
                   end
                   redirect_to :action => 'forget'
                 end
                 def stat
                   @user = User.find(params[:id])
-            -     @submission = Submission.includes(:problem).where(user_id: params[:id])
+            +     @submission = Submission.joins(:problem).where(user_id: params[:id])
+            +     @submission = @submission.where('problems.available = true') unless current_user.admin?
                   range = 120
                   @histogram = { data: Array.new(range,0), summary: {} }
                   @summary = {count: 0, solve: 0, attempt: 0}
                   problem = Hash.new(0)
                   @submission.find_each do |sub|
                     #histogram
                     d = (DateTime.now.in_time_zone - sub.submitted_at) / 24 / 60 / 60
                     @histogram[:data][d.to_i] += 1 if d < range
                     @summary[:count] += 1
                     next unless sub.problem
                     problem[sub.problem] = [problem[sub.problem], ( (sub.try(:points) || 0) >= sub.problem.full_score) ? 1 : 0].max
                   end
                   @histogram[:summary][:max] = [@histogram[:data].max,1].max
                   @summary[:attempt] = problem.count
                   problem.each_value { |v| @summary[:solve] += 1 if v == 1 }
                 end
                 def toggle_activate
                   @user = User.find(params[:id])
                   @user.update_attributes( activated:  !@user.activated? )
                   respond_to do |format|
                     format.js { render partial: 'toggle_button',
                                 locals: {button_id: "#toggle_activate_user_#{@user.id}",button_on: @user.activated? } }
                   end
                 end
                 def toggle_enable
                   @user = User.find(params[:id])
                   @user.update_attributes( enabled:  !@user.enabled? )
                   respond_to do |format|
                     format.js { render partial: 'toggle_button',
                                 locals: {button_id: "#toggle_enable_user_#{@user.id}",button_on: @user.enabled? } }
                   end
                 end
                 protected
                 def verify_online_registration
                   if !GraderConfiguration['system.online_registration']
                     redirect_to :controller => 'main', :action => 'login'
                   end
                 end
                 def send_confirmation_email(user)
                   contest_name = GraderConfiguration['contest.name']
                   activation_url = url_for(:action => 'confirm',
                                            :login => user.login,
                                            :activation => user.activation_key)
                   home_url = url_for(:controller => 'main', :action => 'index')
                   mail_subject = "[#{contest_name}] Confirmation"
                   mail_body = t('registration.email_body', {
                                   :full_name => user.full_name,
                                   :contest_name => contest_name,
                                   :login => user.login,
                                   :password => user.password,
                                   :activation_url => activation_url,
                                   :admin_email => GraderConfiguration['system.admin_email']
                                 })
                   logger.info mail_body
                   send_mail(user.email, mail_subject, mail_body)
                 end
                 def send_new_password_email(user)
                   contest_name = GraderConfiguration['contest.name']
                   mail_subject = "[#{contest_name}] Password recovery"
                   mail_body = t('registration.password_retrieval.email_body', {
                                   :full_name => user.full_name,
                                   :contest_name => contest_name,
                                   :login => user.login,
                                   :password => user.password,
                                   :admin_email => GraderConfiguration['system.admin_email']
                                 })
                   logger.info mail_body
                   send_mail(user.email, mail_subject, mail_body)
                 end
                 # allow viewing of regular user profile only when options allow so
                 # only admins can view admins profile
                 def profile_authorization
                   #if view admins' profile, allow only admin
                   return false unless(params[:id])
                   user = User.find(params[:id])
                   return false unless user
                   return admin_authorization if user.admin?
                   return true if GraderConfiguration["right.user_view_submission"]
                   #finally, we allow only admin
                   admin_authorization

config/application.rb.SAMPLE ¶ -6

               require File.expand_path('../boot', __FILE__)
               require 'rails/all'
               if defined?(Bundler)
                 # If you precompile assets before deploying to production, use this line
                 Bundler.require(*Rails.groups(:assets => %w(development test)))
                 # If you want your assets lazily compiled in production, use this line
                 # Bundler.require(:default, :assets, Rails.env)
               end
               module CafeGrader
                 class Application < Rails::Application
                   # Settings in config/environments/* take precedence over those specified here.
                   # 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'
                   # ---------------- IMPORTANT ----------------------
                   # If we deploy the app into a subdir name "grader", be sure to do "rake assets:precompile RAILS_RELATIVE_URL_ROOT=/grader"
                   # moreover, using the following line instead also known to works
                   #config.action_controller.relative_url_root = '/grader'
                   #font path
                   config.assets.paths << "#{Rails}/vendor/assets/fonts"
                   config.assets.precompile += ['announcement_refresh.js','effects.js','site_update.js']
                   config.assets.precompile += ['local_jquery.js','tablesorter-theme.cafe.css']
                   %w( announcements submissions configurations contests contest_management graders heartbeat
                       login main messages problems report site sites sources tasks
                       test user_admin users ).each do |controller|
                     config.assets.precompile += ["#{controller}.js", "#{controller}.css"]
                   end
                 end
               end

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

Commit r665:ecbd1a5dbc27 public

Author

r665:ecbd1a5dbc27 - Sat, 19 Aug 2017 14:13:43 - 7 files changed: 108 inserted, 8 deleted

Commit `r665:ecbd1a5dbc27` public