cafe-grader-web Commit - r413:889d5737bb5f

cafe-grader-web

Commit `r413:889d5737bb5f` public

parent | child

Description:

add submission report

Commit status:

[Not Reviewed]

References:

java

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r413:889d5737bb5f - Thu, 28 Aug 2014 16:44:29 - 6 files changed: 118 inserted, 23 deleted

app/views/report/_report_menu.html.haml created 644 ¶ +6

@@ -0,0 +1,6
	1	+
	2	+ .task-menu
	3	+ Reports
	4	+ %br/
	5	+ = link_to '[Submission]', :action => 'submission_stat'
	6	+ = link_to '[Login]', :action => 'login_stat'

app/views/report/submission_stat.html.haml created 644 ¶ +41

@@ -0,0 +1,41
	1	+ - content_for :header do
	2	+ = javascript_include_tag 'new'
	3	+
	4	+ %script{:type=>"text/javascript"}
	5	+ $(function () {
	6	+ $('#since_datetime').datetimepicker({ showButtonPanel: true, dateFormat: "yy-mm-dd", controlType: "slider"} );
	7	+ $('#until_datetime').datetimepicker({ showButtonPanel: true, dateFormat: "yy-mm-dd", controlType: "slider"} );
	8	+ });
	9	+
	10	+
	11	+ %h1 Login status
	12	+
	13	+
	14	+
	15	+
	16	+ =render partial: 'report_menu'
	17	+ =render partial: 'date_range', locals: {param_text: 'Submission date range:', title: 'Query submission stat in the range' }
	18	+
	19	+ %table.info
	20	+ %thead
	21	+ %tr.info-head
	22	+ %th login
	23	+ %th full name
	24	+ %th total submissions
	25	+ %th submissions
	26	+ %tbody
	27	+ - @submissions.each do \|user_id,data\|
	28	+ %tr{class: cycle('info-even','info-odd')}
	29	+ %td= data[:login]
	30	+ %td= data[:full_name]
	31	+ %td= data[:count]
	32	+ %td
	33	+ - data[:sub].each do \|prob_id,sub_data\|
	34	+ = "#{sub_data[:prob_name]}: ["
	35	+ - st = []
	36	+ - sub_data[:sub_ids].each do \|id\|
	37	+ - st << link_to(id, controller: 'graders' , action: 'submission', id: id)
	38	+ = raw st.join ', '
	39	+ = ']'
	40	+ %br/
	41	+

app/controllers/report_controller.rb ¶ +59 -7

@@ -1,18 +1,70
1	class ReportController < ApplicationController	1	class ReportController < ApplicationController
2	def login_stat	2	def login_stat
3	@logins = Array.new	3	@logins = Array.new
4	- login = Login.all
5		4
6	- date_and_time = '%y-%m-%d %H:%M'	5	+ date_and_time = '%Y-%m-%d %H:%M'
7	- since_time = strptime(params[:since_datetime],date_and_time)	6	+ begin
8	- ~~until~~_time = strptime(params[:~~until~~_datetime],date_and_time)	7	+ @since_time = DateTime.strptime(params[:since_datetime],date_and_time)
		8	+ rescue
		9	+ @since_time = DateTime.new(1000,1,1)
		10	+ end
		11	+ begin
		12	+ @until_time = DateTime.strptime(params[:until_datetime],date_and_time)
		13	+ rescue
		14	+ @until_time = DateTime.new(3000,1,1)
		15	+ end
9		16
10	User.all.each do \|user\|	17	User.all.each do \|user\|
11	@logins << { login: user.login,	18	@logins << { login: user.login,
12	full_name: user.full_name,	19	full_name: user.full_name,
13	- count: Login.where(user_id: ~~user~~.id).~~count~~(~~:id~~),	20	+ count: Login.where("user_id = ? AND created_at >= ? AND created_at <= ?",
14	- min: Login.where(user_id: user.id).maximum(:created_at),	21	+ user.id,@since_time,@until_time)
15	- max: Login.where(user_id: user.id).minimum(:created_at) }	22	+ .count(:id),
		23	+ min: Login.where("user_id = ? AND created_at >= ? AND created_at <= ?",
		24	+ user.id,@since_time,@until_time)
		25	+ .minimum(:created_at),
		26	+ max: Login.where("user_id = ? AND created_at >= ? AND created_at <= ?",
		27	+ user.id,@since_time,@until_time)
		28	+ .maximum(:created_at)
		29	+ }
		30	+ end
		31	+ end
		32	+
		33	+ def submission_stat
		34	+
		35	+ date_and_time = '%Y-%m-%d %H:%M'
		36	+ begin
		37	+ @since_time = DateTime.strptime(params[:since_datetime],date_and_time)
		38	+ rescue
		39	+ @since_time = DateTime.new(1000,1,1)
		40	+ end
		41	+ begin
		42	+ @until_time = DateTime.strptime(params[:until_datetime],date_and_time)
		43	+ rescue
		44	+ @until_time = DateTime.new(3000,1,1)
		45	+ end
		46	+
		47	+ @submissions = {}
		48	+
		49	+ User.find_each do \|user\|
		50	+ @submissions[user.id] = { login: user.login, full_name: user.full_name, count: 0, sub: { } }
		51	+ end
		52	+
		53	+ Submission.where("submitted_at >= ? AND submitted_at <= ?",@since_time,@until_time).find_each do \|s\|
		54	+ if not @submissions[s.user_id][:sub].has_key?(s.problem_id)
		55	+ a = nil
		56	+ begin
		57	+ a = Problem.find(s.problem_id)
		58	+ rescue
		59	+ a = nil
		60	+ end
		61	+ @submissions[s.user_id][:sub][s.problem_id] =
		62	+ { prob_name: (a ? a.full_name : '(NULL)'),
		63	+ sub_ids: [s.id] }
		64	+ else
		65	+ @submissions[s.user_id][:sub][s.problem_id][:sub_ids] << s.id
		66	+ end
		67	+ @submissions[s.user_id][:count] += 1
16	end	68	end
17	end	69	end
18	end	70	end

app/views/report/_date_range.html.haml ¶ +5 -1

               = form_tag({session: :url })  do
                 .submitbox
                   %table
                     %tr
-            -         %td{colspan: 6, style: 'font-weight: bold'} Query maximum score in submission range
+            +         %td{colspan: 6, style: 'font-weight: bold'}= title
                     %tr
                       %td{style: 'width: 120px; font-weight: bold'}= param_text
                       %td{align: 'right'} since:
                       %td= text_field_tag 'since_datetime'
                     %tr
                       %td
                       %td{align: 'right'} until:
                       %td= text_field_tag 'until_datetime'
                     %tr
                       %td
                       %td
+            +         %td Blank mean no condition
+            +       %tr
+            +         %td
+            +         %td
                       %td= submit_tag 'query'

app/views/report/login_stat.html.haml ¶ +4 -15

                 = javascript_include_tag 'new'
               %script{:type=>"text/javascript"}
                 $(function () {
                 $('#since_datetime').datetimepicker({ showButtonPanel: true, dateFormat: "yy-mm-dd", controlType: "slider"} );
                 $('#until_datetime').datetimepicker({ showButtonPanel: true, dateFormat: "yy-mm-dd", controlType: "slider"} );
                 });
               %h1 Login status
+            + =render partial: 'report_menu'
-            - .task-menu
+            + =render partial: 'date_range', locals: {param_text: 'Login date range:', title: 'Query login stat in the range'  }
-            -   Reports
-            -   %br/
-            -   = link_to '[Submission]', :action => 'submit_stat'
-            -   = link_to '[Login]', :action => 'login_stat'
-            - =render partial: 'date_range', locals: {param_text: 'Submission range:'  }
-            - hahaha
-            - =params[:since_datetime]
               %table.info
                 %thead
                   %tr.info-head
                     %th login
                     %th full name
                     %th login count
                     %th earliest
                     %th latest
                 %tbody
                   - @logins.each do |l|
                     %tr{class: cycle('info-even','info-odd')}
                       %td= l[:login]
                       %td= l[:full_name]
                       %td= l[:count]
-            -         %td= l[:min]
+            +         %td= l[:min] ? l[:min].in_time_zone.strftime('%Y-%m-%d %H:%M') : ''
-            -         %td= l[:max]
+            +         %td= l[:max] ? l[:max].in_time_zone.strftime('%Y-%m-%d %H:%M') : ''

db/schema.rb ¶ +3

                   t.integer  "problem_id"
                   t.integer  "language_id"
                   t.text     "source"
                   t.binary   "binary"
                   t.datetime "submitted_at"
                   t.datetime "compiled_at"
                   t.text     "compiler_message"
                   t.datetime "graded_at"
                   t.integer  "points"
                   t.text     "grader_comment"
                   t.integer  "number"
                   t.string   "source_filename"
+            +     t.float    "max_runtime"
+            +     t.integer  "peak_memory"
+            +     t.integer  "effective_code_length"
                 end
                 add_index "submissions", ["user_id", "problem_id", "number"], :name => "index_submissions_on_user_id_and_problem_id_and_number", :unique => true
                 add_index "submissions", ["user_id", "problem_id"], :name => "index_submissions_on_user_id_and_problem_id"
                 create_table "tasks", :force => true do |t|
                   t.integer  "submission_id"
                   t.datetime "created_at"
                   t.integer  "status"
                   t.datetime "updated_at"
                 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

r413:889d5737bb5f - Thu, 28 Aug 2014 16:44:29 - 6 files changed: 118 inserted, 23 deleted

Sign in to your account

Commit r413:889d5737bb5f public

Author

r413:889d5737bb5f - Thu, 28 Aug 2014 16:44:29 - 6 files changed: 118 inserted, 23 deleted

Commit `r413:889d5737bb5f` public