cafe-grader-web Commit - r880:31e27f513ce9

cafe-grader-web

Commit `r880:31e27f513ce9` public

parent | child

Description:

wip

Commit status:

[Not Reviewed]

References:

default

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r880:31e27f513ce9 - Fri, 07 Oct 2022 04:48:27 - 9 files changed: 191 inserted, 160 deleted

app/controllers/problems_controller.rb ¶ +3

                   range =65
                   @histogram = { data: Array.new(range,0), summary: {} }
                   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.try(:points) || 0) >= @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 }
+            +
+            +     #for new graph
+            +     @chart_dataset = @problem.get_jschart_history.to_json.html_safe
                 end
                 def manage
                   @problems = Problem.order(date_added: :desc)
                 end
                 def do_manage
                   if params.has_key? 'change_date_added' and params[:date_added].strip.empty? == false
                     change_date_added
                   elsif params.has_key? 'add_to_contest'
                     add_to_contest
                   elsif params.has_key? 'enable_problem'

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

                   #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: {} }
                   @summary = {count: 0, solve: 0, attempt: 0}
                   user = Hash.new(0)
-            -     Submission.where(problem_id: @problem.id).find_each do |sub|
+            +     Submission.where(problem_id: @problem.id).includes(:language).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
                     next unless sub.points
                     @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)
+            +       #lang = Language.find_by_id(sub.language_id)
+            +       lang = sub.language
                     next unless lang
                     next unless sub.points >= @problem.full_score
                     #initialize
                     unless @by_lang.has_key?(lang.pretty_name)
                       @by_lang[lang.pretty_name] = {
                         runtime: { avail: false, value: 2**30-1 },
                         memory: { avail: false, value: 2**30-1 },
                         length: { avail: false, value: 2**30-1 },
                         first: { avail: false, value: DateTime.new(3000,1,1) }
                       }
                     end

app/controllers/users_controller.rb ¶ +2 -8

                       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 stat
                   @user = User.find(params[:id])
-            -     @submission = Submission.joins(:problem).where(user_id: params[:id])
+            +     @submission = Submission.joins(:problem).includes(:problem).includes(:language).where(user_id: params[:id])
                   @submission = @submission.where('problems.available = true') unless current_user.admin?
-            -     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
                     next unless sub.problem
                     problem[sub.problem] = [problem[sub.problem], ( (sub.try(:points) || 0) >= 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 }
+            +     @chart_dataset = @user.get_jschart_user_sub_history.to_json.html_safe
                 end
                 def toggle_activate
                   @user = User.find(params[:id])
                   @user.update_attributes( activated:  !@user.activated? )
                   respond_to do |format|
                     format.js { render partial: 'toggle_button',
                                 locals: {button_id: "#toggle_activate_user_#{@user.id}",button_on: @user.activated? } }
                   end
                 end
                 def toggle_enable

app/models/user.rb ¶ +15

                 #check if the user has the right to view that problem
                 #this also consider group based problem policy
                 def can_view_problem?(problem)
                   return true if admin?
                   return available_problems.include? problem
                 end
                 def self.clear_last_login
                   User.update_all(:last_ip => nil)
                 end
+            +   def get_jschart_user_sub_history
+            +     start = 4.month.ago.beginning_of_day
+            +     start_date = start.to_date
+            +     count = Submission.where(user: self).where('submitted_at >= ?', start).group('DATE(submitted_at)').count
+            +     i = 0
+            +     label = []
+            +     value = []
+            +     while (start_date + i < Time.zone.now.to_date)
+            +       label << (start_date+i).strftime("%d-%b")
+            +       value << (count[start_date+i] || 0)
+            +       i+=1
+            +     end
+            +     return {labels: label,datasets: [label:'sub',data: value, backgroundColor: 'rgba(54, 162, 235, 0.2)', borderColor: 'rgb(75, 192, 192)']}
+            +   end
+            +
                 #create multiple user, one per lines of input
                 def self.create_from_list(lines)
                   error_logins = []
                   first_error = nil
                   created_users = []
                   lines.split("\n").each do |line|
                     #split with large limit, this will cause consecutive ',' to be result in a blank
                     items = line.chomp.split(',',1000)
                     if items.length>=2
                       login = items[0]
                       full_name = items[1]

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

               - if submission.nil?
                 = "-"
               - else
                 - if local_assigns[:show_id]
                   .row
-            -       .col-3.text-secondary
-            -         Sub ID:
-            -       %strong.col-9= submission.id
+            +       .col-3.fw-bold
+            +         Sub ID
+            +       .col-9.text-secondary-x= submission.id
                 - unless submission.graded_at
                   .row
-            -       .col-3.text-secondary= t 'main.submitted_at'
-            -       %strong.col-9= format_full_time_ago(submission.submitted_at.localtime)
+            +       .col-3.fw-bold= t 'main.submitted_at'
+            +       .col-9.text-secondary-x= format_full_time_ago(submission.submitted_at.localtime)
                 - else
                   .row
-            -       .col-3.text-secondary= t 'main.graded_at'
-            -       %strong.col-9= format_full_time_ago(submission.graded_at.localtime)
+            +       .col-3.fw-bold= t 'main.graded_at'
+            +       .col-9.text-secondary-x= format_full_time_ago(submission.graded_at.localtime)
                   - if GraderConfiguration['ui.show_score']
                     .row
-            -         .col-3.text-secondary=t 'main.score'
-            -         %strong.col-9
+            +         .col-3.fw-bold=t 'main.score'
+            +         .col-9.text-secondary-x
                         = (submission.points*100/submission.problem.full_score).to_i
                         %tt.grader-comment
                           = " [#{submission.grader_comment}]"
                 - if local_assigns[:show_button]
                   - if submission.graded_at
                     - if GraderConfiguration.show_grading_result
                       = link_to '[detailed result]', :action => 'result', :id => submission.id
                     = link_to "#{t 'main.cmp_msg'}", compiler_msg_submission_path(submission), {popup: true,remote: true,class: 'btn btn-sm btn-info'}
                   = link_to "#{t 'main.src_link'}",download_submission_path(submission), class: 'btn btn-sm btn-info'
                   = link_to "#{t 'main.submissions_link'}", problem_submissions_path(submission.problem.id), class: 'btn btn-sm btn-info'
                   - if GraderConfiguration.show_testcase
                     = link_to "testcases", show_problem_testcases_path(submission.problem.id), class: 'btn btn-sm btn-info'

app/views/problems/manage.html.haml ¶ +52 -42

               - content_for :head do
                 = stylesheet_link_tag 'problems'
                 = javascript_include_tag 'local_jquery'
-            - :javascript
-            -   $(document).ready( function() {
-            -     function shiftclick(start,stop,value) {
-            -       $('tr input').each( function(id,input) {
-            -         var $input=$(input);
-            -         var iid=parseInt($input.attr('id').split('-')[2]);
-            -         if(iid>=start&&iid<=stop){
-            -         $input.prop('checked',value)
-            -         }
-            -       });
-            -     }
+            -
-            -     $('tr input').click( function(e)  {
-            -       if (e.shiftKey) {
-            -         stop = parseInt($(this).attr('id').split('-')[2]);
-            -         var orig_stop = stop
-            -         if (typeof start !== 'undefined') {
-            -           if (start > stop) {
-            -             var tmp = start;
-            -             start = stop;
-            -             stop = tmp;
-            -           }
-            -           shiftclick(start,stop,$(this).is(':checked') )
-            -         }
-            -         start = orig_stop
-            -       } else {
-            -         start = parseInt($(this).attr('id').split('-')[2]);
-            -       }
-            -     });
-            -   });
               %h1 Manage problems
               %p= link_to '[Back to problem list]', problems_path
-            - = form_tag :action=>'do_manage' do
-            -   .panel.panel-primary
-            -     .panel-heading
+            + = form_with url: do_manage_problems_path do |f|
+            +   .card.border-primary.mb-2
+            +     .card-header.text-bg-primary.border-primary
                     Action
-            -     .panel-body
+            +     .card-body
                     .submit-box
                       What do you want to do to the selected problem?
                       %br/
                       (You can shift-click to select a range of problems)
+            +         .row
+            +           .col-md-auto
+            +             = f.check_box :change_date_added, class: 'form-check-input'
+            +           .col-md-auto
+            +             .form-check-label
+            +               Change "Date added" to
+            +           .col-md-auto
+            +
                       %ul.form-inline
                         %li
                           Change "Date added" to
                           .input-group.date
                             = text_field_tag :date_added, class: 'form-control'
                             %span.input-group-addon
                               %span.glyphicon.glyphicon-calendar
                           -# = select_date Date.current, :prefix => 'date_added'
                           &nbsp;&nbsp;&nbsp;
                           = submit_tag 'Change', :name => 'change_date_added', class: 'btn btn-primary btn-sm'
                         %li
                           Set "Available" to
                         %td= problem.full_name
                         %td
                           - problem.tags.each do |t|
                             %span.label.label-default= t.name
                         %td= problem.available
                         %td= problem.date_added
                         - if GraderConfiguration.multicontests?
                           %td
                             - problem.contests.each do |contest|
                               = "(#{contest.name} [#{link_to 'x', :action => 'remove_contest', :id => problem.id, :contest_id => contest.id }])"
               :javascript
-            -   $('.input-group.date').datetimepicker({
-            -     format: 'DD/MMM/YYYY',
-            -     showTodayButton: true,
-            -     locale: 'en',
-            -     widgetPositioning: {horizontal: 'auto', vertical: 'bottom'},
+            +
+            +   $(document).on('import-map-loaded', function() {
+            +     function shiftclick(start,stop,value) {
+            +       $('tr input').each( function(id,input) {
+            +         var $input=$(input);
+            +         var iid=parseInt($input.attr('id').split('-')[2]);
+            +         if(iid>=start&&iid<=stop){
+            +         $input.prop('checked',value)
+            +         }
+            +       });
+            +     }
+            +     $('tr input').click( function(e)  {
+            +       if (e.shiftKey) {
+            +         stop = parseInt($(this).attr('id').split('-')[2]);
+            +         var orig_stop = stop
+            +         if (typeof start !== 'undefined') {
+            +           if (start > stop) {
+            +             var tmp = start;
+            +             start = stop;
+            +             stop = tmp;
+            +           }
+            +           shiftclick(start,stop,$(this).is(':checked') )
+            +         }
+            +         start = orig_stop
+            +       } else {
+            +         start = parseInt($(this).attr('id').split('-')[2]);
+            +       }
+            +     });
+            +
+            +     $('.input-group.date').datetimepicker({
+            +       format: 'DD/MMM/YYYY',
+            +       showTodayButton: true,
+            +       locale: 'en',
+            +       widgetPositioning: {horizontal: 'auto', vertical: 'bottom'},
+            +
+            +     });
+            +
+            +     $('.datatable').DataTable({
+            +       paging: false
+            +     });
                 });
-            -   $('.datatable').DataTable({
-            -     paging: false
-            -   });

app/views/problems/stat.html.haml ¶ +50 -23

               :css
                 .fix-width {
                   font-family: "Consolas, Monaco, Droid Sans Mono,Mono, Monospace,Courier"
                 }
               %h1 Problem stat: #{@problem.name}
-            - %h2 Overview
+            +
+            + .row.mb-3
+            +   .col-md-8
+            +     .card
+            +       .card-body
+            +         %h2.card-title Submission History
+            +         %canvas#chart{height: '50px'}
-            - .row
-            -   .col-md-2
-            -     %strong Name:
-            -   .col-md-10
-            -     = @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
-            - .row
-            -   .col-md-2.strong
-            -     %strong Submissions:
-            -   .col-md-10
-            -     = @submissions.count
-            - .row
-            -   .col-md-2.strong
-            -     %strong Solved/Attemped User
-            -   .col-md-10
-            -     #{@summary[:solve]}/#{@summary[:attempt]} (#{(@summary[:solve]*100.0/@summary[:attempt]).round(1)}%)
+            -
+            -
-            - %h2 Submissions Count
-            - = render partial: 'application/bar_graph', locals: { histogram: @histogram }
+            +   .col-md-4
+            +     .card
+            +       .card-body
+            +         %h2.card-title General Info
+            +         .row
+            +           .col-sm-6
+            +             Name
+            +           .col-sm-6
+            +             = @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
+            +         .row
+            +           .col-sm-6
+            +             Subs
+            +           .col-sm-6
+            +             = @submissions.count
+            +         .row
+            +           .col-sm-6
+            +             Solved/Attempted User
+            +           .col-sm-6
+            +             #{@summary[:solve]}/#{@summary[:attempt]} (#{(@summary[:solve]*100.0/@summary[:attempt]).round(1)}%)
               %h2 Submissions
               - if @submissions and @submissions.count > 0
                 %table#main_table.table.table-condensed.table-striped
                   %thead
                     %tr
                       %th ID
                       %th Login
                       %th Name
                       %th Submitted_at
                       %th language
                       %th Points
                         %td= link_to sub.id, submission_path(sub)
                         %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
               - else
                 No submission
               :javascript
-            -   $("#main_table").DataTable({
-            -     paging: false
+            +   $(document).on('import-map-loaded',(e) => {
+            +     //init datatable
+            +     $("#main_table").DataTable({
+            +       paging: false
+            +     });
+            +
+            +     //history graph
+            +     data = #{@chart_dataset}
+            +     config = {
+            +       type: 'bar',
+            +       data: data,
+            +       options: {
+            +         plugins: {
+            +           legend: {
+            +             display: false
+            +           },
+            +         },
+            +       }
+            +     }
+            +     Chart.defaults.font.size = 15
+            +     //Chart.defaults.font.family = 'Sarabun Light'
+            +     chart = new Chart($('#chart'),config)
                 });
+            +

app/views/users/stat.html.haml ¶ +57 -32

-            - - content_for :header do
-            -   = javascript_include_tag 'local_jquery'
+            -
-            - :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
+            + %h1 User stats
+            + %h5.text-secondary= @user.login
+            +
+            + .row.my-3
+            +   .col-md-8
+            +     .card
+            +       .card-body
+            +         %h2.card-title Sub Info
+            +         %canvas#chart{height: '50px'}
-            - <b>Login:</b> #{@user.login} <br/>
-            - <b>Full name:</b> #{@user.full_name} <br />
+            +   .col-md-4
+            +     .card
+            +       .card-body
+            +         %h2.card-title General Info
+            +         .row
+            +           .col-sm-6.fw-bold
+            +             Login
+            +           .col-sm-6
+            +             = @user.login
+            +         .row
+            +           .col-sm-6.fw-bold
+            +             Full name
+            +           .col-sm-6
+            +             = @user.full_name
+            +         .row
+            +           .col-sm-6.fw-bold
+            +             Subs
+            +           .col-sm-6
+            +             = @summary[:count]
+            +         .row
+            +           .col-sm-6.fw-bold
+            +             Solved/Attempted Problem
+            +           .col-sm-6
+            +             #{@summary[:solve]}/#{@summary[:attempt]} (#{(@summary[:solve]*100.0/@summary[:attempt]).round(1)}%)
-            - %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 Submission History
+            -
-            - =render partial: 'application/bar_graph', locals: {histogram: @histogram, param: {bar_width: 7}}
+            -
+            -
-            - %table#submission_table.table.table-striped
+            + %table#main_table.table.table-striped
                 %thead
                   %tr
                     %th ID
                     %th Problem code
                     %th Problem full name
                     %th Language
                     %th Submitted at
                     %th Result
                     %th Score
                     - if session[:admin]
                       %th IP
                 %tbody
                       %td= link_to s.problem.name, stat_problem_path(s.problem)
                       %td= s.problem.full_name
                       %td= s.language.pretty_name
                       %td  #{s.submitted_at.strftime('%Y-%m-%d %H:%M')} (#{time_ago_in_words(s.submitted_at)} ago)
                       %td.fix-width= s.grader_comment
                       %td= ( s.try(:points) ? (s.points*100/s.problem.full_score)  : '' )
                       - if session[:admin]
                         %td= s.ip_address
               :javascript
-            -   $("#submission_table").DataTable({
-            -     paging: false
+            +   $(document).on('import-map-loaded',(e) => {
+            +     //init datatable
+            +     $("#main_table").DataTable({
+            +       paging: false
+            +     });
+            +
+            +     //history graph
+            +     data = #{@chart_dataset}
+            +     config = {
+            +       type: 'bar',
+            +       data: data,
+            +       options: {
+            +         plugins: {
+            +           legend: {
+            +             display: false
+            +           },
+            +         },
+            +       }
+            +     }
+            +     Chart.defaults.font.size = 15
+            +     //Chart.defaults.font.family = 'Sarabun Light'
+            +     chart = new Chart($('#chart'),config)
                 });
+            +

app/views/application/_bar_graph.html.haml removed ¶ -44

deleted file

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

r880:31e27f513ce9 - Fri, 07 Oct 2022 04:48:27 - 9 files changed: 191 inserted, 160 deleted

Sign in to your account

Commit r880:31e27f513ce9 public

Author

r880:31e27f513ce9 - Fri, 07 Oct 2022 04:48:27 - 9 files changed: 191 inserted, 160 deleted

Commit `r880:31e27f513ce9` public