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: 132 inserted, 57 deleted

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

                     prepare_list_information
                     render :action => 'list' and return
                   end
-            -     redirect_to :action => 'list'
+            +     redirect_to edit_submission_path(@submission)
                 end
                 def source

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

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

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

app/controllers/tags_controller.rb ¶ +2

                 # 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

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

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

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

                 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

app/views/application/_submission_short.html.haml ¶ +11 -9

               - 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.grader_comment
                   = "]"
                   %br
-            -     %strong View:
+            +   %strong View:
-            -     - if GraderConfiguration.show_grading_result
+            +   - if GraderConfiguration.show_grading_result
-            -       = link_to '[detailed result]', :action => 'result', :id => submission.id
+            +     = 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

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

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

                 %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

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

                   %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' } [?]
                       = 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}")

app/views/problems/manage.html.haml ¶ +39 -28

@@ -49,7 +49,7
49	(You can shift-click to select a range of problems)	49	(You can shift-click to select a range of problems)
50	%ul.form-inline	50	%ul.form-inline
51	%li	51	%li
52	- Change date added to	52	+ Change "Date added" to
53	.input-group.date	53	.input-group.date
54	= text_field_tag :date_added, class: 'form-control'	54	= text_field_tag :date_added, class: 'form-control'
55	%span.input-group-addon	55	%span.input-group-addon
@@ -58,44 +58,53
58		58
59	= submit_tag 'Change', :name => 'change_date_added', class: 'btn btn-primary btn-sm'	59	= submit_tag 'Change', :name => 'change_date_added', class: 'btn btn-primary btn-sm'
60	%li	60	%li
61	- Set available to	61	+ Set "Available" to
62	= submit_tag 'True', :name => 'enable_problem', class: 'btn btn-primary btn-sm'	62	= submit_tag 'True', :name => 'enable_problem', class: 'btn btn-primary btn-sm'
63	= submit_tag 'False', :name => 'disable_problem', class: 'btn btn-primary btn-sm'	63	= submit_tag 'False', :name => 'disable_problem', class: 'btn btn-primary btn-sm'
64		64
65	- if GraderConfiguration.multicontests?	65	- if GraderConfiguration.multicontests?
66	%li	66	%li
67	- Add to	67	+ Add selected problems to contest
68	= select("contest","id",Contest.all.collect {\|c\| [c.title, c.id]})	68	= select("contest","id",Contest.all.collect {\|c\| [c.title, c.id]})
69	= submit_tag 'Add', :name => 'add_to_contest', class: 'btn btn-primary btn-sm'	69	= submit_tag 'Add', :name => 'add_to_contest', class: 'btn btn-primary btn-sm'
70	%li	70	%li
71	- Add problems to group	71	+ Add selected problems to user group
72	= select_tag "group_id", options_from_collection_for_select( Group.all, 'id','name',params[:group_name]), id: 'group_name',class: 'select2'	72	= select_tag "group_id", options_from_collection_for_select( Group.all, 'id','name',params[:group_name]), id: 'group_name',class: 'select2'
73	- = submit_tag 'Add', name: 'add_group', class: 'btn btn-~~default~~'	73	+ = submit_tag 'Add', name: 'add_group', class: 'btn btn-primary'
74	-	74	+ %li
		75	+ Add the following tags to the selected problems
		76	+ = 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"}
		77	+ = submit_tag 'Add', name: 'add_tags', class: 'btn btn-primary'
75		78
76	- %table.table.table-hover	79	+ %table.table.table-hover.datatable
77	- %tr{style: "text-align: left;"}	80	+ %thead
78	- %th= check_box_tag 'select_all'	81	+ %tr{style: "text-align: left;"}
79	- %th Name	82	+ %th= check_box_tag 'select_all'
80	- %th ~~Full n~~ame	83	+ %th Name
81	- %th ~~Availabl~~e	84	+ %th Full name
82	- %th ~~Date added~~	85	+ %th Tags
83	- - if GraderConfiguration.multicontests?	86	+ %th Available
84	- %th ~~Contests~~	87	+ %th Date added
		88	+ - if GraderConfiguration.multicontests?
		89	+ %th Contests
85		90
86	- - num = 0	91	+ %tbody
87	- - for problem in @problems	92	+ - num = 0
88	- - num += 1	93	+ - for problem in @problems
89	- %tr{:id => "row-prob-#{problem.id}", :name=> "prob-#{problem.id}"}	94	+ - num += 1
90	- %td= check_box_tag "prob-#{problem.id}-#{num}"	95	+ %tr{:id => "row-prob-#{problem.id}", :name=> "prob-#{problem.id}"}
91	- %td= problem.name	96	+ %td= check_box_tag "prob-#{problem.id}-#{num}"
92	- %td= problem.~~full_~~name	97	+ %td= problem.name
93	- %td= problem.~~availabl~~e	98	+ %td= problem.full_name
94	- %td= problem.date_added
95	- - if GraderConfiguration.multicontests?
96	%td	99	%td
97	- - problem.~~contest~~s.each do \|~~contes~~t\|	100	+ - problem.tags.each do \|t\|
98	- = "(#{contest.name} [#{link_to 'x', :action => 'remove_contest', :id => problem.id, :contest_id => contest.id }])"	101	+ %span.label.label-default= t.name
		102	+ %td= problem.available
		103	+ %td= problem.date_added
		104	+ - if GraderConfiguration.multicontests?
		105	+ %td
		106	+ - problem.contests.each do \|contest\|
		107	+ = "(#{contest.name} [#{link_to 'x', :action => 'remove_contest', :id => problem.id, :contest_id => contest.id }])"
99		108
100	:javascript	109	:javascript
101	$('.input-group.date').datetimepicker({	110	$('.input-group.date').datetimepicker({
@@ -104,4 +113,6
104	widgetPositioning: {horizontal: 'auto', vertical: 'bottom'},	113	widgetPositioning: {horizontal: 'auto', vertical: 'bottom'},
105		114
106	});	115	});
107	-	116	+ $('.datatable').DataTable({
		117	+ paging: false
		118	+ });

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

                       %th Login
                       %th Name
                       %th Submitted_at
+            +         %th language
                       %th Points
                       %th comment
                       %th IP
                         %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

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

@@ -12,6 +12,9
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
@@ -27,8 +30,40
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-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

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

               :javascript
                 $('.input-group.date').datetimepicker({
                   format: 'DD/MMM/YYYY HH:mm',
+            +     showTodayButton: true,
                 });

app/views/submissions/edit.html.haml ¶ +5 -4

                         = 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
-            -           - if @submission
+            +           %div#latest_status
-            -             = render :partial => 'submission_short',
+            +             - if @submission
-            -               :locals => {submission: @submission, problem_name: @problem.name, problem_id: @problem.id }
+            +               = 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.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

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

               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

                   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,

lib/testdata_importer.rb ¶ +4 -2

                   @problem = problem
                 end
-            -   def import_from_file(tempfile,
+            +   #Create or update problem according to the parameter
-            -                        time_limit,
+            +   def import_from_file(tempfile,
+            +                        time_limit,
                                      memory_limit,
                                      checker_name='text',
                                      import_to_db=false)
                   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)

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: 132 inserted, 57 deleted

Sign in to your account

Commit r701:f26733606a76 public

Author

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

Commit `r701:f26733606a76` public