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

                       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

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

                 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|
                       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
                 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

                              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

app/controllers/tags_controller.rb ¶ +2

                     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.

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

                   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

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

               			   "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

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

                             %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')

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

                 %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

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

                   = 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?
                     - @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?

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

                     .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 }])"
                 $('.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
                       %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|
                       - 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

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

@@ -9,12 +9,15
9	%th Remark	9	%th Remark
10	- @problems.each do \|p\|	10	- @problems.each do \|p\|
11	%th.text-right= p.name.gsub('_',' ')	11	%th.text-right= p.name.gsub('_',' ')
12	%th.text-right Total	12	%th.text-right Total
13	%th.text-right Passed	13	%th.text-right Passed
14	%tbody	14	%tbody
		15	+ - sum = Array.new(@scorearray[0].count,0)
		16	+ - nonzero = Array.new(@scorearray[0].count,0)
		17	+ - full = Array.new(@scorearray[0].count,0)
15	- @scorearray.each do \|sc\|	18	- @scorearray.each do \|sc\|
16	%tr	19	%tr
17	- total,num_passed = 0,0	20	- total,num_passed = 0,0
18	- sc.each_index do \|i\|	21	- sc.each_index do \|i\|
19	- if i == 0	22	- if i == 0
20	%td= link_to sc[i].login, stat_user_path(sc[i])	23	%td= link_to sc[i].login, stat_user_path(sc[i])
@@ -24,11 +27,43
24	/ %td= sc[i].contests.collect {\|c\| c.name}.join(', ')	27	/ %td= sc[i].contests.collect {\|c\| c.name}.join(', ')
25	%td= sc[i].remark	28	%td= sc[i].remark
26	- else	29	- else
27	%td.text-right= sc[i][0]	30	%td.text-right= sc[i][0]
28	- total += sc[i][0]	31	- total += sc[i][0]
29	- num_passed += 1 if sc[i][1]	32	- num_passed += 1 if sc[i][1]
		33	+ - sum[i] += sc[i][0]
		34	+ - nonzero[i] += 1 if sc[i][0] > 0
		35	+ - full[i] += 1 if sc[i][1]
30	%td.text-right= total	36	%td.text-right= total
31	%td.text-right= num_passed	37	%td.text-right= num_passed
		38	+ %tfoot
		39	+ %tr
		40	+ %td Summation
		41	+ %td
		42	+ %td
		43	+ - sum.each.with_index do \|s,i\|
		44	+ - next if i == 0
		45	+ %td.text-right= number_with_delimiter(s)
		46	+ %td
		47	+ %td
		48	+ %tr
		49	+ %td partial solver
		50	+ %td
		51	+ %td
		52	+ - nonzero.each.with_index do \|s,i\|
		53	+ - next if i == 0
		54	+ %td.text-right= number_with_delimiter(s)
		55	+ %td
		56	+ %td
		57	+ %tr
		58	+ %td Full solver
		59	+ %td
		60	+ %td
		61	+ - full.each.with_index do \|s,i\|
		62	+ - next if i == 0
		63	+ %td.text-right= number_with_delimiter(s)
		64	+ %td
		65	+ %td
		66	+
32		67
33	:javascript	68	:javascript
34	$.bootstrapSortable(true,'reversed')	69	$.bootstrapSortable(true,'reversed')

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

                   .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"

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

               = 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

                         = 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

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

                   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

               # 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

                 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?

lib/testdata_importer.rb ¶ +2

                 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)
                 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

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