cafe-grader-web Commit - r458:df535657f72c

cafe-grader-web

Commit `r458:df535657f72c` public

parent | child

Description:

add more stat

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

r458:df535657f72c - Sun, 28 Sep 2014 04:25:24 - 6 files changed: 77 inserted, 15 deleted

app/controllers/problems_controller.rb ¶ -1

                   end
                   @submissions = Submission.includes(:user).where(problem_id: params[:id]).order(:user_id,:id)
                   #stat summary
                   range =65
                   @histogram = { data: Array.new(range,0), summary: {} }
-            -     @histogram[:data] = Array.new(range,0)
                   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.points >= @problem.full_score) ? 1 : 0].max
                   end

app/controllers/report_controller.rb ¶ -1

                   return unless @problem
                   @by_lang = {} #aggregrate by language
                   range =65
                   @histogram = { data: Array.new(range,0), summary: {} }
-            -     @histogram[:data] = Array.new(range,0)
                   @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

app/controllers/users_controller.rb ¶ +19 -1

@@ -108,13 +108,31
108	end	108	end
109	redirect_to :action => 'forget'	109	redirect_to :action => 'forget'
110	end	110	end
111		111
112	def profile	112	def profile
113	@user = User.find(params[:id])	113	@user = User.find(params[:id])
114	- @submission = Submission.where(user_id: params[:id]).~~all~~	114	+ @submission = Submission.includes(:problem).where(user_id: params[:id])
		115	+
		116	+ range = 120
		117	+ @histogram = { data: Array.new(range,0), summary: {} }
		118	+ @summary = {count: 0, solve: 0, attempt: 0}
		119	+ problem = Hash.new(0)
		120	+
		121	+ @submission.find_each do \|sub\|
		122	+ #histogram
		123	+ d = (DateTime.now.in_time_zone - sub.submitted_at) / 24 / 60 / 60
		124	+ @histogram[:data][d.to_i] += 1 if d < range
		125	+
		126	+ @summary[:count] += 1
		127	+ problem[sub.problem] = [problem[sub.problem], (sub.points >= sub.problem.full_score) ? 1 : 0].max
		128	+ end
		129	+
		130	+ @histogram[:summary][:max] = [@histogram[:data].max,1].max
		131	+ @summary[:attempt] = problem.count
		132	+ problem.each_value { \|v\| @summary[:solve] += 1 if v == 1 }
115	end	133	end
116		134
117	protected	135	protected
118		136
119	def verify_online_registration	137	def verify_online_registration
120	if !GraderConfiguration['system.online_registration']	138	if !GraderConfiguration['system.online_registration']

app/views/application/_bar_graph.html.haml ¶ +1 -1

                 }
                 .hist_text {
                   position: absolute;
                   font-size:5px;
                 }
-            - %div{style: "position: relative; width: #{graph_width}px; height: 150px; background-color:#fff;" }
+            + %div{style: "position: relative; width: #{graph_width}px; height: 125px; background-color:#fff;" }
                 //draw background
                 - histogram[:data].each_index do |i|
                   - height = histogram[:data][i] * graph_height / histogram[:summary][:max]
                   - top = graph_height - height
                   - left = graph_width - (i+1)*bar_width
                   %div.hist_fill{style: "top: 0px; height: #{graph_height - height}px; left: #{left}px;" }

app/views/report/_task_hof.html.haml ¶ +38 -6

+            + - content_for :header do
+            +   = javascript_include_tag 'local_jquery'
+            +
+            + :javascript
+            +   $(document).ready( function() {
+            +     $("#mem_remark").hover( function() {
+            +       $("#mem_remark_box").show();
+            +     }, function() {
+            +       $("#mem_remark_box").hide();
+            +     });
+            +   });
+            +   alert("hahaha");
               :css
                 .hof_user { color: orangered; font-style: italic; }
                 .hof_language { color: green; font-style: italic; }
                 .hof_value { color: deeppink;font-style: italic; }
                 .info_param { font-weight: bold;text-align: right; }
+            +   .tooltip {
+            +     font-family: Verdana,sans-serif;
+            +     font-weight: normal;
+            +     text-align: left;
+            +     font-size: 1.0em;
+            +     color: black;
+            +     line-height: 1.1;
+            +     display: none;
+            +     min-width: 20em;
+            +     position: absolute;
+            +     left: 25px;
+            +     bottom: 5px;
+            +     border: 1px solid;
+            +     padding: 5px;
+            +     background-color: #FFF;
+            +     word-wrap: break-word;
+            +     z-index: 9999;
+            +     overflow: auto;
+            +   }
               %h1 (#{Problem.find(params[:id]).name}) #{Problem.find(params[:id]).full_name}
               %h2 Problem Stat
               %table.info
                 %thead
                         using <span class="hof_language">#{@best[:runtime][:lang]}</span>
                         with <span class="hof_value">#{@best[:runtime][:value] * 1000} milliseconds</span>
                         at submission
                         = link_to("#" + @best[:runtime][:sub_id].to_s, controller: 'graders', action: 'submission', id:@best[:runtime][:sub_id])
                     %tr{class: cycle('info-even','info-odd')}
-            -         %td.info_param Best Memory Usage
+            +         %td.info_param
+            +           Best Memory Usage
+            +           %sup{ id: "mem_remark", style: "position:relative; color: blue;"}
+            +             [?]
+            +             %span.tooltip#mem_remark_box
+            +               This counts only for submission with 100% score.
+            +               Right now, java is excluded from memory usage competition. (Because it always uses 2GB memory...)
                       %td
                         by #{link_to @best[:memory][:user], controller:'users', action:'profile', id:@best[:memory][:user_id]}
                         using <span class="hof_language">#{@best[:memory][:lang]}</span>
                         with <span class="hof_value">#{number_with_delimiter(@best[:memory][:value])} kbytes </span>
                         at submission
                         = link_to("#" + @best[:memory][:sub_id].to_s, controller: 'graders' , action: 'submission', id:@best[:memory][:sub_id])
                         #{link_to @best[:first][:user], controller:'users', action:'profile', id:@best[:first][:user_id]} is the first solver
                         using <span class="hof_language">#{@best[:first][:lang]}</span>
                         on <span class="hof_value">#{@best[:first][:value]}</span>
                         at submission
                         = link_to("#" + @best[:first][:sub_id].to_s, controller: 'graders' , action: 'submission', id: @best[:first][:sub_id])
-            - %p
-            -   This counts only for submission with 100% score <br/>
-            -   Right now, java is excluded from memory usage competition. (Because it always uses 2GB memory...)
               - if @best
                 %h2 By language
                 %table.info
                   %thead
                     %tr.info-head

app/views/users/profile.html.haml ¶ +19 -5

               - content_for :header do
                 = javascript_include_tag 'local_jquery'
-            - %script{:type=>"text/javascript"}
+            + :javascript
                 $(function () {
-            -   $('#submission_table').tablesorter({widgets: ['zebra']});
+            +     $('#submission_table').tablesorter({widgets: ['zebra']});
                 });
               :css
                 .fix-width {
                   font-family: Droid Sans Mono,Consolas, monospace, mono, Courier New, Courier;
                 }
-            - %h1= @user.full_name + ' Profile'
+            + %h1= @user.full_name
-            - %h2 Basic info
               <b>Login:</b> #{@user.login} <br/>
               <b>Full name:</b> #{@user.full_name} <br />
               %h2 Problem Stat
+            + %table.info
+            +   %thead
+            +     %tr.info-head
+            +       %th Stat
+            +       %th Value
+            +   %tbody
+            +     %tr{class: cycle('info-even','info-odd')}
+            +       %td.info_param Submissions
+            +       %td= @summary[:count]
+            +     %tr{class: cycle('info-even','info-odd')}
+            +       %td.info_param Solved/Attempted Problem
+            +       %td #{@summary[:solve]}/#{@summary[:attempt]} (#{(@summary[:solve]*100.0/@summary[:attempt]).round(1)}%)
-            - %h2 Submissions
+            + %h2 Submission History
+            +
+            + =render partial: 'application/bar_graph', locals: {histogram: @histogram, param: {bar_width: 7}}
+            +
               %table.tablesorter-cafe#submission_table
                 %thead
                   %tr
                     %th ID
                     %th Problem code

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

r458:df535657f72c - Sun, 28 Sep 2014 04:25:24 - 6 files changed: 77 inserted, 15 deleted

Sign in to your account

Commit r458:df535657f72c public

Author

r458:df535657f72c - Sun, 28 Sep 2014 04:25:24 - 6 files changed: 77 inserted, 15 deleted

Commit `r458:df535657f72c` public