cafe-grader-web Commit - r701:f26733606a76

cafe-grader-web

Commit `r701:f26733606a76` 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

r701:f26733606a76 - Mon, 12 Mar 2018 06:36:08 - 21 files changed: 104 inserted, 29 deleted

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

                     @submission.source_filename = "live_edit.#{language.ext}"
                     @submission.language = language
                   end
                   @submission.submitted_at = Time.new.gmtime
                   @submission.ip_address = request.remote_ip
                   if GraderConfiguration.time_limit_mode? and user.contest_finished?
                     @submission.errors.add(:base,"The contest is over.")
                     prepare_list_information
                     render :action => 'list' and return
                   end
                   if @submission.valid?(@current_user)
                     if @submission.save == false
                       flash[:notice] = 'Error saving your submission'
                     elsif Task.create(:submission_id => @submission.id,
                                       :status => Task::STATUS_INQUEUE) == false
                       flash[:notice] = 'Error adding your submission to task queue'
                     end
                   else
                     prepare_list_information
                     render :action => 'list' and return
                   end
-            -     redirect_to :action => 'list'
+            +     redirect_to edit_submission_path(@submission)
                 end
                 def source
                   submission = Submission.find(params[:id])
                   if ((submission.user_id == session[:user_id]) and
                       (submission.problem != nil) and
                       (submission.problem.available))
                     send_data(submission.source,
                               {:filename => submission.download_filename,
                                 :type => 'text/plain'})
                   else
                     flash[:notice] = 'Error viewing source'
                     redirect_to :action => 'list'
                   end
                 end
                 def compiler_msg
                   @submission = Submission.find(params[:id])
                   if @submission.user_id == session[:user_id]
                     render :action => 'compiler_msg', :layout => 'empty'
                   else
                     flash[:notice] = 'Error viewing source'
                     redirect_to :action => 'list'
                   end

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

                 end
                 def turn_all_off
                   Problem.available.all.each do |problem|
                     problem.available = false
                     problem.save
                   end
                   redirect_to action: :index
                 end
                 def turn_all_on
                   Problem.where.not(available: true).each do |problem|
                     problem.available = true
                     problem.save
                   end
                   redirect_to action: :index
                 end
                 def stat
                   @problem = Problem.find(params[:id])
                   unless @problem.available or session[:admin]
                     redirect_to :controller => 'main', :action => 'list'
                     return
                   end
-            -     @submissions = Submission.includes(:user).where(problem_id: params[:id]).order(:user_id,:id)
+            +     @submissions = Submission.includes(:user).includes(:language).where(problem_id: params[:id]).order(:user_id,:id)
                   #stat summary
                   range =65
                   @histogram = { data: Array.new(range,0), summary: {} }
                   user = Hash.new(0)
                   @submissions.find_each do |sub|
                     d = (DateTime.now.in_time_zone - sub.submitted_at) / 24 / 60 / 60
                     @histogram[:data][d.to_i] += 1 if d < range
                     user[sub.user_id] = [user[sub.user_id], ((sub.try(:points) || 0) >= @problem.full_score) ? 1 : 0].max
                   end
                   @histogram[:summary][:max] = [@histogram[:data].max,1].max
                   @summary = { attempt: user.count, solve: 0 }
                   user.each_value { |v| @summary[:solve] += 1 if v == 1 }
                 end
                 def manage
                   @problems = Problem.order(date_added: :desc)
                 end
                 def do_manage
                   if params.has_key? 'change_date_added'
                     change_date_added
                   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)
                   elsif params.has_key? 'add_group'
                     group = Group.find(params[:group_id])
                     ok = []
                     failed = []
                     get_problems_from_params.each do |p|
                       begin
                         group.problems << p
                         ok << p.full_name
                       rescue => e
                         failed << p.full_name
                       end
                     end
                     flash[:success] = "The following problems are added to the group #{group.name}: " + ok.join(', ') if ok.count > 0
                     flash[:alert] = "The following problems are already in the group #{group.name}: " + failed.join(', ') if failed.count > 0
+            +     elsif params.has_key? 'add_tags'
+            +       get_problems_from_params.each do |p|
+            +         p.tag_ids += params[:tag_ids]
+            +       end
                   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
                   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, order = k.split('-')
                       problems << Problem.find(id)
                     end
                   end
                   problems
                 end
                 def get_problems_stat
                 end
                 private
                   def problem_params
-            -       params.require(:problem).permit(:name, :full_name, :full_score, :date_added, :available, :test_allowed,:output_only, :url, :description)
+            +       params.require(:problem).permit(:name, :full_name, :full_score, :date_added, :available, :test_allowed,:output_only, :url, :description, tag_ids:[])
                   end
               end

app/controllers/report_controller.rb ¶ +2

                 end
                 def show_max_score
                   #process parameters
                   #problems
                   @problems = []
                   if params[:problem_id]
                     params[:problem_id].each do |id|
                       next unless id.strip != ""
                       pid = Problem.find_by_id(id.to_i)
                       @problems << pid if pid
                     end
                   end
                   #users
                   @users = if params[:user] == "all" then
                              User.includes(:contests).includes(:contest_stat)
                            else
                              User.includes(:contests).includes(:contest_stat).where(enabled: true)
                            end
                   #set up range from param
                   @since_id = params.fetch(:from_id, 0).to_i
                   @until_id = params.fetch(:to_id, 0).to_i
+            +     @since_id = nil if @since_id == 0
+            +     @until_id = nil if @until_id == 0
                   #calculate the routine
                   @scorearray = calculate_max_score(@problems, @users, @since_id, @until_id)
                   #rencer accordingly
                   if params[:button] == 'download' then
                     csv = gen_csv_from_scorearray(@scorearray,@problems)
                     send_data csv, filename: 'max_score.csv'
                   else
                     #render template: 'user_admin/user_stat'
                     render 'max_score'
                   end
                 end
                 def score
                   if params[:commit] == 'download csv'
                     @problems = Problem.all
                   else
                     @problems = Problem.available_problems
                   end
                   @users = User.includes(:contests, :contest_stat).where(enabled: true)
                   @scorearray = Array.new
                   @users.each do |u|

app/controllers/tags_controller.rb ¶ +2

                 end
                 # POST /tags
                 def create
                   @tag = Tag.new(tag_params)
                   if @tag.save
                     redirect_to @tag, notice: 'Tag was successfully created.'
                   else
                     render :new
                   end
                 end
                 # PATCH/PUT /tags/1
                 def update
                   if @tag.update(tag_params)
                     redirect_to @tag, notice: 'Tag was successfully updated.'
                   else
                     render :edit
                   end
                 end
                 # DELETE /tags/1
                 def destroy
+            +     #remove any association
+            +     ProblemTag.where(tag_id: @tag.id).destroy_all
                   @tag.destroy
                   redirect_to tags_url, notice: 'Tag was successfully destroyed.'
                 end
                 private
                   # Use callbacks to share common setup or constraints between actions.
                   def set_tag
                     @tag = Tag.find(params[:id])
                   end
                   # Only allow a trusted parameter "white list" through.
                   def tag_params
                     params.require(:tag).permit(:name, :description, :public)
                   end
               end

app/helpers/application_helper.rb ¶ +7 -4

                     append_to menu_items, "[#{I18n.t 'menu.test'}]", 'test', 'index'
                   end
                   if GraderConfiguration['right.user_hall_of_fame']
                     append_to menu_items, "[#{I18n.t 'menu.hall_of_fame'}]", 'report', 'problem_hof'
                   end
                   append_to menu_items, "[#{I18n.t 'menu.help'}]", 'main', 'help'
                   if GraderConfiguration['system.user_setting_enabled']
                     append_to menu_items, "[#{I18n.t 'menu.settings'}]", 'users', 'index'
                   end
                   append_to menu_items, "[#{I18n.t 'menu.log_out'}]", 'main', 'login'
                   menu_items.html_safe
                 end
                 def append_to(option,label, controller, action)
                   option << ' ' if option!=''
                   option << link_to_unless_current(label,
                                                    :controller => controller,
                                                    :action => action)
                 end
                 def format_short_time(time)
-            -     now = Time.now.gmtime
+            +     now = Time.zone.now
                   st = ''
-            -     if (time.yday != now.yday) or
+            +     if (time.yday != now.yday) or (time.year != now.year)
-            - 	(time.year != now.year)
+            +       st = time.strftime("%d/%m/%y ")
-            -       st = time.strftime("%x ")
                   end
                   st + time.strftime("%X")
                 end
                 def format_short_duration(duration)
                   return '' if duration==nil
                   d = duration.to_f
                   return Time.at(d).gmtime.strftime("%X")
                 end
+            +   def format_full_time_ago(time)
+            +     st = time_ago_in_words(time) + ' ago (' + format_short_time(time) + ')'
+            +   end
+            +
                 def read_textfile(fname,max_size=2048)
                   begin
                     File.open(fname).read(max_size)
                   rescue
                     nil
                   end
                 end
                 def toggle_button(on,toggle_url,id, option={})
                   btn_size = option[:size] || 'btn-xs'
                   link_to (on ? "Yes" : "No"), toggle_url,
                     {class: "btn btn-block #{btn_size} btn-#{on ? 'success' : 'default'} ajax-toggle",
                       id: id,
                       data: {remote: true, method: 'get'}}
                 end
                 def get_ace_mode(language)
                   # return ace mode string from Language
                   case language.pretty_name
                     when 'Pascal'
                       'ace/mode/pascal'
                     when 'C++','C'
                       'ace/mode/c_cpp'

app/models/submission.rb ¶ +2 -2

                 validate :must_have_valid_problem
                 validate :must_specify_language
                 has_one :task
                 before_save :assign_latest_number_if_new_recond
                 def self.find_last_by_user_and_problem(user_id, problem_id)
                   where("user_id = ? AND problem_id = ?",user_id,problem_id).last
                 end
                 def self.find_all_last_by_problem(problem_id)
                   # need to put in SQL command, maybe there's a better way
                   Submission.includes(:user).find_by_sql("SELECT * FROM submissions " +
               			   "WHERE id = " +
               			   "(SELECT MAX(id) FROM submissions AS subs " +
               			   "WHERE subs.user_id = submissions.user_id AND " +
                                          "problem_id = " + problem_id.to_s + " " +
               			   "GROUP BY user_id) " +
                                          "ORDER BY user_id")
                 end
                 def self.find_in_range_by_user_and_problem(user_id, problem_id,since_id,until_id)
                   records = Submission.where(problem_id: problem_id,user_id: user_id)
-            -     records = records.where('id >= ?',since_id) if since_id > 0
+            +     records = records.where('id >= ?',since_id) if since_id and since_id > 0
-            -     records = records.where('id <= ?',until_id) if until_id > 0
+            +     records = records.where('id <= ?',until_id) if until_id and until_id > 0
                   records.all
                 end
                 def self.find_last_for_all_available_problems(user_id)
                   submissions = Array.new
                   problems = Problem.available_problems
                   problems.each do |problem|
                     sub = Submission.find_last_by_user_and_problem(user_id, problem.id)
                     submissions << sub if sub!=nil
                   end
                   submissions
                 end
                 def self.find_by_user_problem_number(user_id, problem_id, number)
                   where("user_id = ? AND problem_id = ? AND number = ?",user_id,problem_id,number).first
                 end
                 def self.find_all_by_user_problem(user_id, problem_id)
                   where("user_id = ? AND problem_id = ?",user_id,problem_id)
                 end
                 def download_filename
                   if self.problem.output_only
                     return self.source_filename

app/views/application/_submission_short.html.haml ¶ +8 -6

               - if submission.nil?
                 = "-"
               - else
+            +   %strong= "Submission ID:"
+            +   = submission.id
+            +   %br
                 - unless submission.graded_at
-            -     = t 'main.submitted_at'
+            +     %strong= t 'main.submitted_at:'
-            -     = format_short_time(submission.submitted_at.localtime)
+            +     = format_full_time_ago(submission.submitted_at.localtime)
                 - else
-            -     %strong= t 'main.graded_at'
+            +     %strong= t 'main.graded_at:'
-            -     = "#{format_short_time(submission.graded_at.localtime)} "
+            +     = format_full_time_ago(submission.graded_at.localtime)
                   %br
                   - if GraderConfiguration['ui.show_score']
                     %strong=t 'main.score'
                     = "#{(submission.points*100/submission.problem.full_score).to_i} "
                   = " ["
                   %tt
                     = submission.grader_comment
                   = "]"
                   %br
                 %strong View:
                 - if GraderConfiguration.show_grading_result
                   = link_to '[detailed result]', :action => 'result', :id => submission.id
-            -     = link_to "#{t 'main.cmp_msg'}", {:action => 'compiler_msg', :id => submission.id}, {popup: true,class: 'btn btn-xs btn-info'}
+            +   = link_to "#{t 'main.cmp_msg'}", {:action => 'compiler_msg', :id => submission.id}, {popup: true,class: 'btn btn-xs btn-info'} if submission.graded_at
                 = link_to "#{t 'main.src_link'}", download_submission_path(submission.id), class: 'btn btn-xs btn-info'
                 = link_to "#{t 'main.submissions_link'}", problem_submissions_path(problem_id), class: 'btn btn-xs btn-info'

app/views/layouts/_header.html.haml ¶ +1

                         - if GraderConfiguration['right.user_hall_of_fame']
                           = add_menu("#{I18n.t 'menu.hall_of_fame'}", 'report', 'problem_hof')
                         / display MODE button (with countdown in contest mode)
                         - if GraderConfiguration.analysis_mode?
                           %div.navbar-btn.btn.btn-success#countdown= "ANALYSIS MODE"
                         - elsif GraderConfiguration.time_limit_mode?
                           - if @current_user.contest_finished?
                             %div.navbar-btn.btn.btn-danger#countdown= "Contest is over"
                           - elsif !@current_user.contest_started?
                             %div.navbar-btn.btn.btn-primary#countdown= (t 'title_bar.contest_not_started')
                           - else
                             %div.navbar-btn.btn.btn-primary#countdown asdf
                             :javascript
                               $("#countdown").countdown({until: "+#{@current_user.contest_time_left.to_i}s", layout: 'Time left: {hnn}:{mnn}:{snn}'});
                         / admin section
                         - if (@current_user!=nil) and (session[:admin])
                           / management
                           %li.dropdown
                             %a.dropdown-toggle{href: '#', data: {toggle:'dropdown'},  aria: {haspopup:"true", expanded:"false"}, role: "button"}
                               Manage
                               %span.caret
                             %ul.dropdown-menu
                               = add_menu( 'Announcements', 'announcements', 'index')
                               = add_menu( 'Problems', 'problems', 'index')
+            +                 = add_menu( 'Tags', 'tags', 'index')
                               = add_menu( 'Users', 'user_admin', 'index')
                               = add_menu( 'User Groups', 'groups', 'index')
                               = add_menu( 'Graders', 'graders', 'list')
                               = add_menu( 'Message ', 'messages', 'console')
                               %li.divider{role: 'separator'}
                               = add_menu( 'System config', 'configurations', 'index')
                               %li.divider{role: 'separator'}
                               = add_menu( 'Sites', 'sites', 'index')
                               = add_menu( 'Contests', 'contest_management', 'index')
                           / report
                           %li.dropdown
                             %a.dropdown-toggle{href: '#', data: {toggle:'dropdown'},  aria: {haspopup:"true", expanded:"false"}, role: "button"}
                               Report
                               %span.caret
                             %ul.dropdown-menu
                               = add_menu( 'Current Score', 'report', 'current_score')
                               = add_menu( 'Score Report', 'report', 'max_score')
                               = add_menu( 'Report', 'report', 'multiple_login')
                           - if (ungraded = Submission.where('graded_at is null').where('submitted_at < ?', 1.minutes.ago).count) > 0
                             =link_to "#{ungraded} backlogs!",
                               grader_list_path,
                               class: 'navbar-btn btn btn-default btn-warning', data: {toggle: 'tooltip'},title: 'Number of ungraded submission'
                       %ul.nav.navbar-nav.navbar-right

app/views/problems/_form.html.haml ¶ +3

               = error_messages_for 'problem'
               / [form:problem]
               .form-group
                 %label{:for => "problem_name"} Name
                 = text_field 'problem', 'name', class: 'form-control'
                 %small
                   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.
               .form-group
                 %label{:for => "problem_full_name"} Full name
                 = text_field 'problem', 'full_name', class: 'form-control'
               .form-group
                 %label{:for => "problem_full_score"} Full score
                 = text_field 'problem', 'full_score', class: 'form-control'
               .form-group
+            +   %label{:for => "problem_full_score"} Tags
+            +   = collection_select(:problem, :tag_ids, Tag.all, :id, :name,  {}, {multiple: true, class: 'form-control select2'})
+            + .form-group
                 %label{:for => "problem_date_added"} Date added
                 = date_select 'problem', 'date_added', class: 'form-control'
               - # TODO: these should be put in model Problem, but I can't think of
               - #       nice default values for them.  These values look fine only
               - #       in this case (of lazily adding new problems).
               - @problem.available = true if @problem!=nil and @problem.available==nil
               - @problem.test_allowed = true if @problem!=nil and @problem.test_allowed==nil
               - @problem.output_only = false if @problem!=nil and @problem.output_only==nil
               .checkbox
                 %label{:for => "problem_available"}
                   = check_box :problem, :available
                   Available?
               .checkbox
                 %label{:for => "problem_test_allowed"}
                   = check_box :problem, :test_allowed
                   Test allowed?
               .checkbox
                 %label{:for => "problem_output_only"}
                   = check_box :problem, :output_only
                   Output only?
               = error_messages_for 'description'
               .form-group
                 %label{:for => "description_body"} Description
                 %br/

app/views/problems/index.html.haml ¶ +5

               - content_for :head do
                 = stylesheet_link_tag 'problems'
               %h1 Problems
               %p
                 = link_to 'Import problems', {:action => 'import'}, class: 'btn btn-success btn-sm'
                 = link_to 'New problem', new_problem_path, class: 'btn btn-success btn-sm'
                 = link_to 'Bulk Manage', { action: 'manage'}, class: 'btn btn-info btn-sm'
                 = link_to 'Turn off all problems', {:action => 'turn_all_off'}, class: 'btn btn-default btn-sm'
                 = link_to 'Turn on all problems', {:action => 'turn_all_on'}, class: 'btn btn-default btn-sm'
               .submitbox
                 = form_tag :action => 'quick_create' do
                   %b Quick New:
                   %label{:for => "problem_name"} Name
                   = text_field 'problem', 'name'
                   |
                   %label{:for => "problem_full_name"} Full name
                   = text_field 'problem', 'full_name'
                   = submit_tag "Create"
               %table.table.table-condense.table-hover
                 %thead
                   %th Name
                   %th Full name
                   %th.text-right Full score
+            +     %th Tags
                   %th
                     Submit
                     %sup{class: 'text-primary',data: {toggle: 'tooltip'}, title: 'Admin can always submit to any problem' } [?]
                   %th Date added
                   %th.text-center
                     Avail?
                     %sup{class: 'text-primary',data: {toggle: 'tooltip'}, title: 'Let user submits to this problem?' } [?]
                   %th.text-center
                     View Data?
                     %sup{class: 'text-primary',data: {toggle: 'tooltip'}, title: 'Let user view the testcase of this problem?' } [?]
                   %th.text-center
                     Test?
                     %sup{class: 'text-primary',data: {toggle: 'tooltip'}, title: 'Let user uses test interface on this problem?' } [?]
                   - if GraderConfiguration.multicontests?
                     %th Contests
                 - for problem in @problems
                   %tr{:class => "#{(problem.available) ? "success" : "danger"}", :id => "prob-#{problem.id}", :name => "prob-#{problem.id}"}
                     - @problem=problem
                     %td= problem.name #in_place_editor_field :problem, :name, {}, :rows=>1
                     %td
                       = problem.full_name #in_place_editor_field :problem, :full_name, {}, :rows=>1
                       = link_to_description_if_any "[#{t 'main.problem_desc'}] <span class='glyphicon glyphicon-file'></span>".html_safe, problem
                     %td.text-right= problem.full_score #in_place_editor_field :problem, :full_score, {}, :rows=>1
+            +       %td
+            +         - problem.tags.each do |t|
+            +           - #%button.btn.btn-default.btn-xs= t.name
+            +           %span.label.label-default= t.name
                     %td= link_to "Submit", direct_edit_problem_submissions_path(problem,@current_user.id), class: 'btn btn-xs btn-primary'
                     %td= problem.date_added
                     %td= toggle_button(@problem.available?, toggle_problem_path(@problem), "problem-avail-#{@problem.id}")
                     %td= toggle_button(@problem.view_testcase?, toggle_view_testcase_problem_path(@problem), "problem-view-testcase-#{@problem.id}")
                     %td= toggle_button(@problem.test_allowed?, toggle_test_problem_path(@problem), "problem-test-#{@problem.id}")
                     - if GraderConfiguration.multicontests?
                       %td
                         = problem.contests.collect { |c| c.name }.join(', ')
                     %td= link_to 'Stat', {:action => 'stat', :id => problem.id}, class: 'btn btn-info btn-xs btn-block'
                     %td= link_to 'Show', {:action => 'show', :id => problem}, class: 'btn btn-info btn-xs btn-block'
                     %td= link_to 'Edit', {:action => 'edit', :id => problem}, class: 'btn btn-info btn-xs btn-block'
                     %td= link_to 'Destroy', { :action => 'destroy', :id => problem }, :confirm => 'Are you sure?', :method => :delete, class: 'btn btn-danger btn-xs btn-block'
               %br/
               = link_to '[New problem]', :action => 'new'

app/views/problems/manage.html.haml ¶ +19 -8

                       }
                       start = orig_stop
                     } else {
                       start = parseInt($(this).attr('id').split('-')[2]);
                     }
                   });
                 });
               %h1 Manage problems
               %p= link_to '[Back to problem list]', problems_path
               = form_tag :action=>'do_manage' do
                 .panel.panel-primary
                   .panel-heading
                     Action
                   .panel-body
                     .submit-box
                       What do you want to do to the selected problem?
                       %br/
                       (You can shift-click to select a range of problems)
                       %ul.form-inline
                         %li
-            -             Change date added to
+            +             Change "Date added" to
                           .input-group.date
                             = text_field_tag :date_added, class: 'form-control'
                             %span.input-group-addon
                               %span.glyphicon.glyphicon-calendar
                           -# = select_date Date.current, :prefix => 'date_added'
                           &nbsp;&nbsp;&nbsp;
                           = submit_tag 'Change', :name => 'change_date_added', class: 'btn btn-primary btn-sm'
                         %li
-            -             Set available to
+            +             Set "Available" to
                           = submit_tag 'True', :name => 'enable_problem', class: 'btn btn-primary btn-sm'
                           = submit_tag 'False', :name => 'disable_problem', class: 'btn btn-primary btn-sm'
                         - if GraderConfiguration.multicontests?
                           %li
-            -               Add to
+            +               Add selected problems to contest
                             = select("contest","id",Contest.all.collect {|c| [c.title, c.id]})
                             = submit_tag 'Add', :name => 'add_to_contest', class: 'btn btn-primary btn-sm'
                         %li
-            -             Add problems to group
+            +             Add selected problems to user group
                           = select_tag "group_id", options_from_collection_for_select( Group.all, 'id','name',params[:group_name]), id: 'group_name',class: 'select2'
-            -             = submit_tag 'Add', name: 'add_group', class: 'btn btn-default'
+            +             = submit_tag 'Add', name: 'add_group', class: 'btn btn-primary'
+            +           %li
+            +             Add the following tags to the selected problems
+            +             = select_tag "tag_ids", options_from_collection_for_select( Tag.all, 'id','name'), id: 'tags_name',class: 'select2', multiple: true, data: {placeholder: 'Select tags by clicking', width: "200px"}
+            +             = submit_tag 'Add', name: 'add_tags', class: 'btn btn-primary'
+            +   %table.table.table-hover.datatable
-            -   %table.table.table-hover
+            +     %thead
                     %tr{style: "text-align: left;"}
                       %th= check_box_tag 'select_all'
                       %th Name
                       %th Full name
+            +         %th Tags
                       %th Available
                       %th Date added
                       - if GraderConfiguration.multicontests?
                         %th Contests
+            +     %tbody
                     - 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}-#{num}"
                         %td= problem.name
                         %td= problem.full_name
+            +           %td
+            +             - problem.tags.each do |t|
+            +               %span.label.label-default= t.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 }])"
               :javascript
                 $('.input-group.date').datetimepicker({
                   format: 'DD/MMM/YYYY',
                   showTodayButton: true,
                   widgetPositioning: {horizontal: 'auto', vertical: 'bottom'},
                 });
+            +   $('.datatable').DataTable({
+            +     paging: false
+            +   });

app/views/problems/stat.html.haml ¶ +2

                 %thead
                   %tr.info-head
                     %th Stat
                     %th Value
                 %tbody
                   %tr{class: cycle('info-even','info-odd')}
                     %td Submissions
                     %td= @submissions.count
                   %tr{class: cycle('info-even','info-odd')}
                     %td Solved/Attempted User
                     %td #{@summary[:solve]}/#{@summary[:attempt]} (#{(@summary[:solve]*100.0/@summary[:attempt]).round(1)}%)
               %h2 Submissions Count
               = render partial: 'application/bar_graph', locals: { histogram: @histogram }
               %h2 Submissions
               - if @submissions and @submissions.count > 0
                 %table#main_table.table.table-condensed.table-striped
                   %thead
                     %tr
                       %th ID
                       %th Login
                       %th Name
                       %th Submitted_at
+            +         %th language
                       %th Points
                       %th comment
                       %th IP
                   %tbody
                     - row_odd,curr = true,''
                     - @submissions.each do |sub|
                       - next unless sub.user
                       - row_odd,curr = !row_odd, sub.user if curr != sub.user
                       %tr
                         %td= link_to sub.id, submission_path(sub)
                         %td= link_to sub.user.login, stat_user_path(sub.user)
                         %td= sub.user.full_name
                         %td{data: {order: sub.submitted_at}}= time_ago_in_words(sub.submitted_at) + " ago"
+            +           %td= sub.language.name
                         %td= sub.points
                         %td.fix-width= sub.grader_comment
                         %td= sub.ip_address
               - else
                 No submission
               :javascript
                 $("#main_table").DataTable({
                   paging: false
                 });

app/views/report/_score_table.html.haml ¶ +35

               %table.table.sortable.table-striped.table-bordered.table-condensed
                 %thead
                   %tr
                     %th Login
                     %th Name
                     / %th Activated?
                     / %th Logged_in
                     / %th Contest(s)
                     %th Remark
                     - @problems.each do |p|
                       %th.text-right= p.name.gsub('_',' ')
                     %th.text-right Total
                     %th.text-right Passed
                 %tbody
+            +     - sum = Array.new(@scorearray[0].count,0)
+            +     - nonzero = Array.new(@scorearray[0].count,0)
+            +     - full = Array.new(@scorearray[0].count,0)
                   - @scorearray.each do |sc|
                     %tr
                       - total,num_passed = 0,0
                       - sc.each_index do |i|
                         - if i == 0
                           %td= link_to sc[i].login, stat_user_path(sc[i])
                           %td= sc[i].full_name
                           / %td= sc[i].activated
                           / %td= sc[i].try(:contest_stat).try(:started_at) ? 'yes' : 'no'
                           / %td= sc[i].contests.collect {|c| c.name}.join(', ')
                           %td= sc[i].remark
                         - else
                           %td.text-right= sc[i][0]
                           - total += sc[i][0]
                           - num_passed += 1 if sc[i][1]
+            +             - sum[i] += sc[i][0]
+            +             - nonzero[i] += 1 if sc[i][0] > 0
+            +             - full[i] += 1 if sc[i][1]
                       %td.text-right= total
                       %td.text-right= num_passed
+            +     %tfoot
+            +       %tr
+            +         %td Summation
+            +         %td
+            +         %td
+            +         - sum.each.with_index do |s,i|
+            +           - next if i == 0
+            +           %td.text-right= number_with_delimiter(s)
+            +         %td
+            +         %td
+            +       %tr
+            +         %td partial solver
+            +         %td
+            +         %td
+            +         - nonzero.each.with_index do |s,i|
+            +           - next if i == 0
+            +           %td.text-right= number_with_delimiter(s)
+            +         %td
+            +         %td
+            +       %tr
+            +         %td Full solver
+            +         %td
+            +         %td
+            +         - full.each.with_index do |s,i|
+            +           - next if i == 0
+            +           %td.text-right= number_with_delimiter(s)
+            +         %td
+            +         %td
+            +
               :javascript
                 $.bootstrapSortable(true,'reversed')

app/views/report/max_score.html.haml ¶ +2 -2

                       = label_tag :problem_id, "Problems"
                       = select_tag 'problem_id[]',
                           options_for_select(Problem.all.collect {|p| ["[#{p.name}] #{p.full_name}", p.id]},params[:problem_id]),
                           { class: 'select2 form-control', multiple: "true" }
                 .col-md-4
                   .panel.panel-primary
                     .panel-heading
                       Submission range
                     .panel-body
                       %p
                         Input minimum and maximum range of submission ID that should be included. A blank value for min and max means -1 and infinity, respectively.
                       .form-group
                         = label_tag :from, "Min"
                         = text_field_tag 'from_id', @since_id, class: "form-control"
                       .form-group
                         = label_tag :from, "Max"
                         = text_field_tag 'to_id', @until_id, class: "form-control"
                 .col-md-4
                   .panel.panel-primary
                     .panel-heading
                       Users
                     .panel-body
                       .radio
                         %label
-            -             = radio_button_tag 'users', 'all', true
+            +             = radio_button_tag 'users', 'all', (params[:users] == "all")
                           All users
                       .radio
                         %label
-            -             = radio_button_tag 'users', 'enabled'
+            +             = radio_button_tag 'users', 'enabled', (params[:users] == "enabled")
                           Only enabled users
               .row
                 .col-md-12
                   = button_tag 'Show', class: "btn btn-primary btn-large", value: "show"
                   = button_tag 'Download CSV', class: "btn btn-primary btn-large", value: "download"
               - if @scorearray
                 %h2 Result
                 =render "score_table"

app/views/sites/edit.html.haml ¶ +1

                       = f.label :password, "Password"
                       = f.text_field :password, class: 'form-control'
                     .form-group.field
                       = f.label :started, "Started"
                       = f.check_box :started, class: 'form-control'
                     .form-group.field
                       = f.label :start_time, "Start time"
                       -# = f.datetime_select :start_time, :include_blank => true
                       .input-group.date
                         = f.text_field :start_time, class:'form-control' , value: (@site.start_time ? @site.start_time.strftime('%d/%b/%Y %H:%M') : '')
                         %span.input-group-addon
                           %span.glyphicon.glyphicon-calendar
                     .actions
                       = f.submit "Update", class: 'btn btn-primary'
                   .col-md-8
               = link_to 'Show', @site
               |
               = link_to 'Back', sites_path
               :javascript
                 $('.input-group.date').datetimepicker({
                   format: 'DD/MMM/YYYY HH:mm',
+            +     showTodayButton: true,
                 });

app/views/submissions/edit.html.haml ¶ +2 -1

                 .row
                   .col-md-12
                     .alert.alert-info
                       Write your code in the following box, choose language, and click submit button when finished
                 .row
                   .col-md-8
                     %div#editor{style: 'height: 500px; border-radius: 7px; font-size: 14px;'}
                   .col-md-4
                     - # submission form
                     = form_tag({controller: :main, :action => 'submit'}, :multipart => true, class: 'form') do
                       = hidden_field_tag 'editor_text', @source
                       = hidden_field_tag 'submission[problem_id]', @problem.id
                       .form-group
                         = label_tag "Task:"
                         = text_field_tag 'asdf', "#{@problem.long_name}", class: 'form-control', disabled: true
                       .form-group
                         = label_tag 'Language'
                         = select_tag 'language_id', options_from_collection_for_select(Language.all, 'id', 'pretty_name', @lang_id || Language.find_by_pretty_name("Python").id || Language.first.id), class: 'form-control select', style: "width: 100px"
                       .form-group
                         = submit_tag 'Submit', class: 'btn btn-success', id: 'live_submit',
                           data: {confirm: "Submitting this source code for task #{@problem.long_name}?"}
                     - # latest submission status
-            -       .panel.panel-info
+            +       .panel{class: (@submission && @submission.graded_at) ? "panel-info" : "panel-warning"}
                       .panel-heading
                         Latest Submission Status
                         = link_to "Refresh",get_latest_submission_status_submissions_path(@submission.user,@problem), class: "btn btn-default btn-sm", remote: true if @submission
                       .panel-body
+            +           %div#latest_status
                           - if @submission
                             = render :partial => 'submission_short',
                               :locals => {submission: @submission, problem_name: @problem.name, problem_id: @problem.id }
                 .row
                   .col-md-12
                     %h2 Console
                     %textarea#console{style: 'height: 100%; width: 100%;background-color:#000;color:#fff;font-family: consolas, monaco, "Droid Sans Mono";',rows: 20}
               :javascript
                 $(document).ready(function() {
                   e = ace.edit("editor")
                   e.setValue($("#text_sourcecode").val());
                   e.gotoLine(1);
                   $("#language_id").trigger('change');
                   brython();
                 });
               %script#__main__{type:'text/python3'}
                 :plain
                   import sys
                   import traceback
                   from browser import document as doc

app/views/submissions/get_latest_submission_status.js.haml ¶ +1 -1

@@ -1,2 +1,2
1	:plain	1	:plain
2	- $("#latest_status").html("#{j render({partial: 'submission_short', locals: {submission: @submission, problem_name: @problem.name}})}")	2	+ $("#latest_status").html("#{j render({partial: 'submission_short', locals: {submission: @submission, problem_name: @problem.name, problem_id: @problem.id}})}")

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

                   # 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
                   # 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|
+            +         test user_admin users testcases).each do |controller|
                     config.assets.precompile += ["#{controller}.js", "#{controller}.css"]
                   end
                 end
               end

config/initializers/assets.rb ¶ +1 -1

               # Be sure to restart your server when you modify this file.
               # Version of your assets, change this if you want to expire all your assets.
               Rails.application.config.assets.version = '1.0'
               # Add additional assets to the asset load path.
               # Rails.application.config.assets.paths << Emoji.images_path
               # Add Yarn node_modules folder to the asset load path.
               Rails.application.config.assets.paths << Rails.root.join('node_modules')
               Rails.application.config.assets.paths << Rails.root.join('vendor/assets/fonts')
               # Precompile additional assets.
               # application.js, application.css, and all non-JS/CSS in the app/assets
               # folder are already added.
               # Rails.application.config.assets.precompile += %w( admin.js admin.css )
               Rails.application.config.assets.precompile += ['announcement_refresh.js','effects.js','site_update.js']
               Rails.application.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 groups
-            -     test user_admin users tags).each do |controller|
+            +     test user_admin users tags testcases).each do |controller|
                 Rails.application.config.assets.precompile += ["#{controller}.js", "#{controller}.css"]
               end

lib/grader_script.rb ¶ +1

                   File.join GRADER_ROOT_DIR, "raw"
                 end
                 def self.call_grader(params)
                   if GraderScript.grader_control_enabled?
                     cmd = File.join(GRADER_ROOT_DIR, "scripts/grader") + " " + params
                     system(cmd)
                   end
                 end
                 def self.stop_grader(pid)
                   GraderScript.call_grader "stop #{pid}"
                 end
                 def self.stop_graders(pids)
                   pid_str = (pids.map { |process| process.pid.to_s }).join ' '
                   GraderScript.call_grader "stop #{pid_str}"
                 end
                 def self.start_grader(env)
                   GraderScript.call_grader "#{env} queue --err-log &"
                   GraderScript.call_grader "#{env} test_request -err-log &"
                 end
+            +   #call the import problem script
                 def self.call_import_problem(problem_name,
                                              problem_dir,
                                              time_limit=1,
                                              memory_limit=32,
                                              checker_name='text')
                   if GraderScript.grader_control_enabled?
                     cur_dir = `pwd`.chomp
                     Dir.chdir(GRADER_ROOT_DIR)
                     script_name = File.join(GRADER_ROOT_DIR, "scripts/import_problem")
                     cmd = "#{script_name} #{problem_name} #{problem_dir} #{checker_name}" +
                       " -t #{time_limit} -m #{memory_limit}"
                     output = `#{cmd}`
                     Dir.chdir(cur_dir)
                     return "import CMD: #{cmd}\n" + output
                   end
                   return ''
                 end
                 def self.call_import_testcase(problem_name)
                   if GraderScript.grader_control_enabled?

lib/testdata_importer.rb ¶ +2

               require 'tmpdir'
               class TestdataImporter
                 attr :log_msg
                 def initialize(problem)
                   @problem = problem
                 end
+            +   #Create or update problem according to the parameter
                 def import_from_file(tempfile,
                                      time_limit,
                                      memory_limit,
                                      checker_name='text',
                                      import_to_db=false)
                   dirname = extract(tempfile)
                   return false if not dirname
                   if not import_to_db
                     @log_msg = GraderScript.call_import_problem(@problem.name,
                                                                 dirname,
                                                                 time_limit,
                                                                 memory_limit,
                                                                 checker_name)
                   else
                     # Import test data to test pairs.
                     @problem.test_pairs.clear
                     if import_test_pairs(dirname)
                       test_pair_count = TestPair.count :conditions => "problem_id = #{@problem.id}"
                       @log_msg = "Importing test pair successful. (#{test_pair_count} test pairs imported)"
                     else
                       @log_msg = "Importing test pair failed. (0 test pairs imported)"
                     end
                   end
                   @log_msg << import_problem_description(dirname)
                   @log_msg << import_problem_pdf(dirname)
                   @log_msg << import_full_score(dirname)
                   #import test data
                   @log_msg << GraderScript.call_import_testcase(@problem.name)
                   return true
                 end
                 protected
                 def self.long_ext(filename)
                   i = filename.index('.')
                   len = filename.length
                   return filename.slice(i..len)
                 end
+            +   # extract an archive file located at +tempfile+ to the +raw_dir+
                 def extract(tempfile)
                   testdata_filename = save_testdata_file(tempfile)
                   ext = TestdataImporter.long_ext(tempfile.original_filename)
                   extract_dir = File.join(GraderScript.raw_dir, @problem.name)
                   if File.exists? extract_dir
                     backup_count = 0
                     begin
                       backup_count += 1
                       backup_dirname = "#{extract_dir}.backup.#{backup_count}"
                     end while File.exists? backup_dirname
                     File.rename(extract_dir, backup_dirname)
                   end
                   Dir.mkdir extract_dir
                   if ext=='.tar.gz' or ext=='.tgz'
                     cmd = "tar -zxvf #{testdata_filename} -C #{extract_dir}"
                   elsif ext=='.tar'
                     cmd = "tar -xvf #{testdata_filename} -C #{extract_dir}"
                   elsif ext=='.zip'
                     cmd = "unzip -o #{testdata_filename} -d #{extract_dir}"
                   else
                     return nil
                   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

Author

r701:f26733606a76 - Mon, 12 Mar 2018 06:36:08 - 21 files changed: 104 inserted, 29 deleted

Sign in to your account

Commit r701:f26733606a76 public

Author

r701:f26733606a76 - Mon, 12 Mar 2018 06:36:08 - 21 files changed: 104 inserted, 29 deleted

Commit `r701:f26733606a76` public