cafe-grader-web Commit - r855:ef5cd5528b8d

cafe-grader-web

Commit `r855:ef5cd5528b8d` public

parent | child

Description:

add model solution

Commit status:

[Not Reviewed]

References:

algo

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r855:ef5cd5528b8d - Fri, 04 Feb 2022 15:55:30 - 11 files changed: 210 inserted, 125 deleted

db/migrate/20220204080936_add_type_to_submission.rb created 644 ¶ +6

@@ -0,0 +1,6
	1	+ class AddTypeToSubmission < ActiveRecord::Migration[7.0]
	2	+ def change
	3	+ add_column :submissions, :tag, :integer, default: 0
	4	+ add_column :problems, :difficulty, :integer
	5	+ end
	6	+ end

app/controllers/application_controller.rb ¶ +11

@@ -39,6 +39,17
39	return true	39	return true
40	end	40	end
41		41
		42	+ #admin always count as every roles
		43	+ def role_authorization(roles)
		44	+ return false unless check_valid_login
		45	+ user = User.find(session[:user_id])
		46	+ return true if user.admin?
		47	+ roles.each do \|r\|
		48	+ return true if user.has_role?(r)
		49	+ end
		50	+ unauthorized_redirect
		51	+ end
		52	+
42	def authorization_by_roles(allowed_roles)	53	def authorization_by_roles(allowed_roles)
43	return false unless check_valid_login	54	return false unless check_valid_login
44	unless @current_user.roles.detect { \|role\| allowed_roles.member?(role.name) }	55	unless @current_user.roles.detect { \|role\| allowed_roles.member?(role.name) }

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

                   end
                   @submission.submitted_at = Time.new.gmtime
-            -     @submission.ip_address = request.remote_ip
+            +     @submission.ip_address = cookies.encrypted[:uuid]
                   if @current_user.admin? == false && GraderConfiguration.time_limit_mode? && @current_user.contest_finished?
                     @submission.errors.add(:base,"The contest is over.")

app/controllers/report_controller.rb ¶ +12 -3

                   return unless @problem
+            +     #model submisssion
+            +     @model_subs = Submission.where(problem: @problem,tag: Submission.tags[:model])
+            +
+            +
+            +     #calculate best submission
                   @by_lang = {} #aggregrate by language
                   range =65
-            -     @histogram = { data: Array.new(range,0), summary: {} }
+            +     #@histogram = { data: Array.new(range,0), summary: {} }
                   @summary = {count: 0, solve: 0, attempt: 0}
                   user = Hash.new(0)
                   Submission.where(problem_id: @problem.id).find_each do |sub|
                     #histogram
                     d = (DateTime.now.in_time_zone - sub.submitted_at) / 24 / 60 / 60
-            -       @histogram[:data][d.to_i] += 1 if d < range
+            +       #@histogram[:data][d.to_i] += 1 if d < range
                     next unless sub.points
                     @summary[:count] += 1
                     end
                   end
-            -     @histogram[:summary][:max] = [@histogram[:data].max,1].max
+            +     #@histogram[:summary][:max] = [@histogram[:data].max,1].max
                   @summary[:attempt] = user.count
                   user.each_value { |v| @summary[:solve] += 1 if v == 1 }
+            +
+            +
+            +     #for new graph
+            +     @chart_dataset = @problem.get_jschart_history.to_json.html_safe
                 end
                 def stuck #report struggling user,problem

app/controllers/submissions_controller.rb ¶ +11 -7

               class SubmissionsController < ApplicationController
+            +   before_action :set_submission, only: [:show,:download,:compiler_msg,:rejudge,:set_tag, :edit]
                 before_action :check_valid_login
                 before_action :submission_authorization, only: [:show, :download, :edit]
-            -   before_action :admin_authorization, only: [:rejudge]
+            +   before_action only: [:rejudge, :set_tag] do role_authorization([:ta]) end
                 # GET /submissions
                 # GET /submissions.json
                 # GET /submissions/1
                 # GET /submissions/1.json
                 def show
-            -     @submission = Submission.find(params[:id])
                   #log the viewing
                   user = User.find(session[:user_id])
                   SubmissionViewLog.create(user_id: session[:user_id],submission_id: @submission.id) unless user.admin?
                 end
                 def download
-            -     @submission = Submission.find(params[:id])
                   send_data(@submission.source, {:filename => @submission.download_filename, :type => 'text/plain'})
                 end
                 def compiler_msg
-            -     @submission = Submission.find(params[:id])
                   respond_to do |format|
                     format.js
                   end
                 # GET /submissions/1/edit
                 def edit
-            -     @submission = Submission.find(params[:id])
                   @source = @submission.source.to_s
                   @problem = @submission.problem
                   @lang_id = @submission.language.id
                 # GET /submissions/:id/rejudge
                 def rejudge
-            -     @submission = Submission.find(params[:id])
                   @task = @submission.task
                   @task.status_inqueue! if @task
                   respond_to do |format|
                   end
                 end
+            +   def set_tag
+            +     @submission.update(tag: params[:tag])
+            +     redirect_to @submission
+            +   end
+            +
               protected
                 def submission_authorization
                   unauthorized_redirect
                   return false
                 end
+            +
+            +   def set_submission
+            +     @submission = Submission.find(params[:id])
+            +   end
               end

app/models/problem.rb ¶ +22

@@ -24,6 +24,28
24	DEFAULT_TIME_LIMIT = 1	24	DEFAULT_TIME_LIMIT = 1
25	DEFAULT_MEMORY_LIMIT = 32	25	DEFAULT_MEMORY_LIMIT = 32
26		26
		27	+ def get_jschart_history
		28	+ start = 4.month.ago.beginning_of_day
		29	+ start_date = start.to_date
		30	+ count = Submission.where(problem: self).where('submitted_at >= ?', start).group('DATE(submitted_at)').count
		31	+ i = 0
		32	+ label = []
		33	+ value = []
		34	+ while (start_date + i < Time.zone.now.to_date)
		35	+ if (start_date+i).day == 1
		36	+ #label << (start_date+i).strftime("%d %b %Y")
		37	+ #label << (start_date+i).strftime("%d")
		38	+ else
		39	+ #label << ' '
		40	+ #label << (start_date+i).strftime("%d")
		41	+ end
		42	+ label << (start_date+i).strftime("%d-%b")
		43	+ value << (count[start_date+i] \|\| 0)
		44	+ i+=1
		45	+ end
		46	+ return {labels: label,datasets: [label:'sub',data: value, backgroundColor: 'rgba(54, 162, 235, 0.2)', borderColor: 'rgb(75, 192, 192)']}
		47	+ end
		48	+
27	def self.available_problems	49	def self.available_problems
28	available.order(date_added: :desc).order(:name)	50	available.order(date_added: :desc).order(:name)
29	#Problem.available.all(:order => "date_added DESC, name ASC")	51	#Problem.available.all(:order => "date_added DESC, name ASC")

app/models/submission.rb ¶ +11 -9

               class Submission < ActiveRecord::Base
+            +   enum tag: {default: 0, model: 1}, _prefix: true
+            +
                 belongs_to :language
                 belongs_to :problem
                 belongs_to :user
                 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 = " +
+            +       "WHERE id = " +
-            - 			   "(SELECT MAX(id) FROM submissions AS subs " +
+            +         "(SELECT MAX(id) FROM submissions AS subs " +
-            - 			   "WHERE subs.user_id = submissions.user_id AND " +
+            +       "WHERE subs.user_id = submissions.user_id AND " +
-            -                            "problem_id = " + problem_id.to_s + " " +
+            +         "problem_id = " + problem_id.to_s + " " +
-            - 			   "GROUP BY user_id) " +
+            +       "GROUP BY user_id) " +
-            -                            "ORDER 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)
                   i = 0
                   source.each_line do |s|
                     if s =~ option
-            - 	words = s.split
+            +         words = s.split
-            - 	return words[1]
+            +         return words[1]
                     end
                     i = i + 1
                     if i==10
-            - 	return nil
+            +         return nil
                     end
                   end
                   return nil

app/views/report/_task_hof.html.haml ¶ +116 -98

@@ -24,113 +24,131
24	}	24	}
25		25
26		26
27	- .container	27	+ .container-fluid
		28	+ .row
		29	+ .col-md-8
		30	+ .card
		31	+ .card-body
		32	+ %h2.card-title Submission History
		33	+ %canvas#chart{height: '50px'}
		34	+
		35	+ .col-md-4
		36	+ .card
		37	+ .card-body
		38	+ %h2.card-title General Info
		39	+ .row
		40	+ .col-sm-6
		41	+ Subs
		42	+ .col-sm-6
		43	+ = @summary[:count]
		44	+ .row
		45	+ .col-sm-6
		46	+ Solved/Attempted User
		47	+ .col-sm-6
		48	+ #{@summary[:solve]}/#{@summary[:attempt]} (#{(@summary[:solve]*100.0/@summary[:attempt]).round(1)}%)
28	.row	49	.row
29	.col-md-4	50	.col-md-4
30	- %h2 Overall Stat	51	+ .card
31	- %table.table.table-hover	52	+ .card-body
32	- %thead	53	+ %h2.card-title Model submission
33	- %tr
34	- %th
35	- %th
36	- %tbody
37	- %tr
38	- %td.info_param Submissions
39	- %td= @summary[:count]
40	- %tr
41	- %td.info_param Solved/Attempted User
42	- %td #{@summary[:solve]}/#{@summary[:attempt]} (#{(@summary[:solve]*100.0/@summary[:attempt]).round(1)}%)
43	- - if @best
44	- %tr
45	- %td.info_param Best Runtime
46	- %td
47	- by #{link_to @best[:runtime][:user], stat_user_path(@best[:runtime][:user_id])}
48	- %br
49	- using <span class="text-success">#{@best[:runtime][:lang]}</span>
50	- %br
51	- with <span class="text-success">#{@best[:runtime][:value] * 1000} milliseconds</span>
52	- %br
53	- at submission
54	- = link_to "#" + @best[:runtime][:sub_id].to_s, submission_path(@best[:runtime][:sub_id])
55	-
56	- %tr
57	- %td.info_param
58	- Best Memory Usage
59	- %sup{ id: "xmem_remark",
60	- style: "position:relative; color: blue;",
61	- data: {toggle: 'tooltip', placement: 'top', animation: 'false', delay: 20},
62	- title: "This counts only for submission with 100% score. Right now, java is excluded from memory usage competition. (Because it always uses 2GB memory...)"}
63	- [?]
64	- %td
65	- by #{link_to @best[:memory][:user], stat_user_path(@best[:memory][:user_id])}
66	- %br
67	- using <span class="text-success">#{@best[:memory][:lang]}</span>
68	- %br
69	- with <span class="text-success">#{number_with_delimiter(@best[:memory][:value])} kbytes </span>
70	- %br
71	- at submission
72	- = link_to "#" + @best[:memory][:sub_id].to_s, submission_path(@best[:memory][:sub_id])
73	-
74	- %tr
75	- %td.info_param Shortest Code
76	- %td
77	- by #{link_to @best[:length][:user], stat_user_path(@best[:length][:user_id])}
78	- %br
79	- using <span class="text-success">#{@best[:length][:lang]}</span>
80	- %br
81	- with <span class="text-success">#{@best[:length][:value]} bytes</span>
82	- %br
83	- at submission
84	- = link_to "#" + @best[:length][:sub_id].to_s, submission_path(@best[:length][:sub_id])
85	-
86	- %tr
87	- %td.info_param First solver
88	- %td
89	- - if @best[:first][:user] != '(NULL)'
90	- #{link_to @best[:first][:user], stat_user_path(@best[:first][:user_id])} is the first solver
91	- %br
92	- using <span class="text-success">#{@best[:first][:lang]}</span>
93	- %br
94	- on <span class="text-success">#{@best[:first][:value]}</span>
95	- %br
96	- at submission
97	- = link_to "#" + @best[:first][:sub_id].to_s, submission_path( @best[:first][:sub_id])
98	- - else
99	- no first solver
100	- .col-md-8
101	- - if @best
102	- %h2 By Language
103	%table.table.table-hover	54	%table.table.table-hover
104	%thead	55	%thead
105	%tr	56	%tr
106	- %th ~~Language~~	57	+ %th #Sub
107	- %th ~~Best runtime (ms)~~	58	+ %th Author
108	- %th Best memory (kbytes)
109	- %th Shortest Code (bytes)
110	- %th First solver
111	%tbody	59	%tbody
112	- - @~~by_lang~~.each do \|~~lang~~,~~value~~\|	60	+ - @model_subs.each do \|sub\|
113	%tr	61	%tr
114	- %td= lang	62	+ %td= link_to "##{sub.id}", submission_path(sub)
		63	+ %td= sub.user.full_name
		64	+ .col-md-8
		65	+ - if @best
		66	+ .card
		67	+ .card-body
		68	+ %h2.card-title Top Submissions
		69	+ %table.table.table-hover
		70	+ %thead
		71	+ %tr
		72	+ %th Language
		73	+ %th Best runtime (ms)
		74	+ %th Best memory (kbytes)
		75	+ %th Shortest Code (bytes)
		76	+ %th First solver
		77	+ %tbody
		78	+ %tr.bg-warning
115	%td	79	%td
116	- = link_to value[:runtime][:user], stat_user_path(value[:runtime][:user_id])	80	+ Overall
		81	+ %td
		82	+ by #{link_to @best[:runtime][:user], stat_user_path(@best[:runtime][:user_id])}
		83	+ %br
		84	+ using <span class="text-success">#{@best[:runtime][:lang]}</span>
		85	+ %br
		86	+ with <span class="text-success">#{@best[:runtime][:value] * 1000} milliseconds</span>
		87	+ %br= link_to "#" + @best[:runtime][:sub_id].to_s, submission_path(@best[:runtime][:sub_id])
		88	+ %td
		89	+ by #{link_to @best[:memory][:user], stat_user_path(@best[:memory][:user_id])}
117	%br	90	%br
118	- = "#{(value[:runtime][:value] * 1000).to_i} @"	91	+ using <span class="text-success">#{@best[:memory][:lang]}</span>
119	- = link_to "#" + value[:runtime][:sub_id].to_s, submission_path( value[:runtime][:sub_id])	92	+ %br
		93	+ with <span class="text-success">#{number_with_delimiter(@best[:memory][:value])} kbytes </span>
		94	+ %br= link_to "#" + @best[:memory][:sub_id].to_s, submission_path(@best[:memory][:sub_id])
		95	+ %td
		96	+ by #{link_to @best[:length][:user], stat_user_path(@best[:length][:user_id])}
		97	+ %br
		98	+ using <span class="text-success">#{@best[:length][:lang]}</span>
		99	+ %br
		100	+ with <span class="text-success">#{@best[:length][:value]} bytes</span>
		101	+ %br= link_to "#" + @best[:length][:sub_id].to_s, submission_path(@best[:length][:sub_id])
120	%td	102	%td
121	- = link_to value[:memory][:user], stat_user_path( value[:memory][:user_id])	103	+ - if @best[:first][:user] != '(NULL)'
122	- %br	104	+ #{link_to @best[:first][:user], stat_user_path(@best[:first][:user_id])} is the first solver
123	- = "#{number_with_delimiter(value[:memory][:value])} @"	105	+ %br
124	- = link_to "#" + value[:memory][:sub_id].to_s, submission_path(value[:memory][:sub_id])	106	+ using <span class="text-success">#{@best[:first][:lang]}</span>
125	- ~~%td~~	107	+ %br
126	- = link_to value[:length][:user], stat_user_path(value[:length][:user_id])	108	+ on <span class="text-success">#{@best[:first][:value]}</span>
127	- %br	109	+ %br= link_to "#" + @best[:first][:sub_id].to_s, submission_path( @best[:first][:sub_id])
128	- = "#{value[:length][:value]} @"	110	+ - else
129	- = link_to "#" + value[:length][:sub_id].to_s, submission_path(value[:length][:sub_id])	111	+ no first solver
130	- %td	112	+ - @by_lang.each do \|lang,value\|
131	- - if value[:first][:user] != '(NULL)' #TODO: i know... this is wrong...	113	+ %tr
132	- = link_to value[:first][:user], stat_user_path(value[:first][:user_id])	114	+ %td= lang
		115	+ %td
		116	+ = link_to value[:runtime][:user], stat_user_path(value[:runtime][:user_id])
		117	+ %br
		118	+ = "#{(value[:runtime][:value] * 1000).to_i} @"
		119	+ = link_to "#" + value[:runtime][:sub_id].to_s, submission_path( value[:runtime][:sub_id])
		120	+ %td
		121	+ = link_to value[:memory][:user], stat_user_path( value[:memory][:user_id])
		122	+ %br
		123	+ = "#{number_with_delimiter(value[:memory][:value])} @"
		124	+ = link_to "#" + value[:memory][:sub_id].to_s, submission_path(value[:memory][:sub_id])
		125	+ %td
		126	+ = link_to value[:length][:user], stat_user_path(value[:length][:user_id])
133	%br	127	%br
134	- = "#{value[:~~first~~][:value]} @"	128	+ = "#{value[:length][:value]} @"
135	- = link_to "#" + value[:~~first~~][:sub_id].to_s, submission_path( value[:~~first~~][:sub_id])	129	+ = link_to "#" + value[:length][:sub_id].to_s, submission_path(value[:length][:sub_id])
		130	+ %td
		131	+ - if value[:first][:user] != '(NULL)' #TODO: i know... this is wrong...
		132	+ = link_to value[:first][:user], stat_user_path(value[:first][:user_id])
		133	+ %br
		134	+ = "#{value[:first][:value]} @"
		135	+ = link_to "#" + value[:first][:sub_id].to_s, submission_path( value[:first][:sub_id])
136		136
		137	+ %script{src:"https://cdn.jsdelivr.net/npm/chart.js"}
		138	+ :javascript
		139	+ data = #{@chart_dataset}
		140	+ config = {
		141	+ type: 'bar',
		142	+ data: data,
		143	+ options: {
		144	+ plugins: {
		145	+ legend: {
		146	+ display: false
		147	+ },
		148	+ },
		149	+ }
		150	+ }
		151	+ Chart.defaults.font.size = 15
		152	+ //Chart.defaults.font.family = 'Sarabun Light'
		153	+ chart = new Chart($('#chart'),config)
		154	+

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

                 Please select a problem.
               - else
                 %h1 [#{Problem.find(params[:id]).name}] #{Problem.find(params[:id]).full_name}
-            -   %h2 Submission History
+            +   -# %h2 Submission History
-            -   =render partial: 'application/bar_graph', locals: { histogram: @histogram }
+            +   -# =render partial: 'application/bar_graph', locals: { histogram: @histogram }
                 =render partial: 'task_hof'

app/views/submissions/show.html.haml ¶ +17 -5

@@ -89,11 +89,6
89	%td	89	%td
90	%button.btn.btn-info.btn-xs{type: 'button', data: {toggle: 'modal', target: '#compiler'}}	90	%button.btn.btn-info.btn-xs{type: 'button', data: {toggle: 'modal', target: '#compiler'}}
91	view	91	view
92	- - if session[:admin]
93	- %tr
94	- %td.text-right
95	- %strong IP
96	- %td #{@submission.ip_address}
97	%tr	92	%tr
98	%td.text-right	93	%td.text-right
99	%strong Grading Task Status	94	%strong Grading Task Status
@@ -101,6 +96,23
101	= @task.status_str if @task	96	= @task.status_str if @task
102	- if session[:admin]	97	- if session[:admin]
103	= link_to "rejudge", rejudge_submission_path, data: {remote: true}, class: 'btn btn-info btn-xs'	98	= link_to "rejudge", rejudge_submission_path, data: {remote: true}, class: 'btn btn-info btn-xs'
		99	+ - if session[:admin]
		100	+ %tr
		101	+ %td.text-right
		102	+ %strong IP
		103	+ %td #{@submission.ip_address}
		104	+ %tr
		105	+ %td.text-right
		106	+ %strong Model solution
		107	+ %td
		108	+ - if @submission.tag_model?
		109	+ YES
		110	+ - if session[:admin]
		111	+ = link_to "remove model status", set_tag_submission_path(@submission, tag: :default), class: 'btn btn-warning btn-xs'
		112	+ - else
		113	+ No
		114	+ - if session[:admin]
		115	+ = link_to "set as model solution", set_tag_submission_path(@submission, tag: :model), class: 'btn btn-success btn-xs'
104		116
105		117
106	.modal.fade#compiler{tabindex: -1,role: 'dialog'}	118	.modal.fade#compiler{tabindex: -1,role: 'dialog'}

config/routes.rb ¶ +1

                     get 'download'
                     get 'compiler_msg'
                     get 'rejudge'
+            +       get 'set_tag'
                   end
                   collection do
                     get 'prob/:problem_id', to: 'submissions#index', as: 'problem'

Write
Preview

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

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

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

Sign in to your account

Commit r855:ef5cd5528b8d public

Author

r855:ef5cd5528b8d - Fri, 04 Feb 2022 15:55:30 - 11 files changed: 210 inserted, 125 deleted

Commit `r855:ef5cd5528b8d` public