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: 76 inserted, 14 deleted

app/controllers/problems_controller.rb ¶ -1

                 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)
                   #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
                   @histogram[:summary][:max] = [@histogram[:data].max,1].max
                   @summary = { attempt: user.count, solve: 0 }
                   user.each_value { |v| @summary[:solve] += 1 if v == 1 }
                 end

app/controllers/report_controller.rb ¶ -1

                       redirect_to action: :problem_hof
                       flash[:notice] = 'Error: submissions for that problem are not viewable.'
                       return
                     end
                   end
                   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
                     @summary[:count] += 1
                     user[sub.user_id] = [user[sub.user_id], (sub.points >= @problem.full_score) ? 1 : 0].max
                     lang = Language.find_by_id(sub.language_id)
                     next unless lang

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

                       user.save
                       send_new_password_email(user)
                       flash[:notice] = 'New password has been mailed to you.'
                     end
                   else
                     flash[:notice] = I18n.t 'registration.password_retrieval.no_email'
                   end
                   redirect_to :action => 'forget'
                 end
                 def profile
                   @user = User.find(params[:id])
-            -     @submission = Submission.where(user_id: params[:id]).all
+            +     @submission = Submission.includes(:problem).where(user_id: params[:id])
+            +
+            +     range = 120
+            +     @histogram = { data: Array.new(range,0), summary: {} }
+            +     @summary = {count: 0, solve: 0, attempt: 0}
+            +     problem = Hash.new(0)
+            +
+            +     @submission.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
+            +
+            +       @summary[:count] += 1
+            +       problem[sub.problem] = [problem[sub.problem], (sub.points >= sub.problem.full_score) ? 1 : 0].max
+            +     end
+            +
+            +     @histogram[:summary][:max] = [@histogram[:data].max,1].max
+            +     @summary[:attempt] = problem.count
+            +     problem.each_value { |v| @summary[:solve] += 1 if v == 1 }
                 end
                 protected
                 def verify_online_registration
                   if !GraderConfiguration['system.online_registration']
                     redirect_to :controller => 'main', :action => 'login'
                   end
                 end
                 def send_confirmation_email(user)
                   contest_name = GraderConfiguration['contest.name']

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

                   background-color: lightblue;
                 }
                 .hist_fill {
                   width: #{bar_width-1}px;
                   position: absolute;
                   background-color: #eee;
                 }
                 .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;" }
                 // draw horizontal line
                 - line = 3
                 - line.times do |i|
                   - top = graph_height - graph_height * (i+0.5)/ line
                   %div{style: "position:absolute;width: #{graph_width-21}px;height: 1px;left: 20px;top:#{top}px;background-color: #333;"}
                   %div.hist_text{style: "position:absolute;left: 0px;top:#{top-6}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
                   %tr.info-head
                     %th Stat
                     %th Value
                 %tbody
                   %tr{class: cycle('info-even','info-odd')}
                     %td.info_param Submissions
                     %td #{@summary[:solve]}/#{@summary[:attempt]} (#{(@summary[:solve]*100.0/@summary[:attempt]).round(1)}%)
                   - if @best
                     %tr{class: cycle('info-even','info-odd')}
                       %td.info_param Best Runtime
                       %td
                         by #{link_to @best[:runtime][:user], controller:'users', action:'profile', id:@best[:memory][:user_id]}
                         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])
                     %tr{class: cycle('info-even','info-odd')}
                       %td.info_param Shortest Code
                       %td
                         by #{link_to @best[:length][:user], controller:'users', action:'profile', id:@best[:length][:user_id]}
                         using <span class="hof_language">#{@best[:length][:lang]}</span>
                         at submission
                         = link_to("#" + @best[:length][:sub_id].to_s, controller: 'graders' , action: 'submission', id: @best[:length][:sub_id])
                     %tr{class: cycle('info-even','info-odd')}
                       %td.info_param First solver
                       %td
                         #{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
                       %th Language
                       %th Best runtime (ms)
                       %th Best memory (kbytes)
                       %th Shortest Code (bytes)
                       %th First solver
                   %tbody

app/views/users/profile.html.haml ¶ +18 -4

               - content_for :header do
                 = javascript_include_tag 'local_jquery'
-            - %script{:type=>"text/javascript"}
+            + :javascript
                 $(function () {
                   $('#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
                     %th Problem full name
                     %th Language
                     %th Submitted at
                     %th Result
                     %th Score
                     - if session[:admin]

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: 76 inserted, 14 deleted

Sign in to your account

Commit r458:df535657f72c public

Author

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

Commit `r458:df535657f72c` public