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: 173 inserted, 142 deleted

app/controllers/problems_controller.rb ¶ +3

                     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

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

                   @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] = {

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

                   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|

app/models/user.rb ¶ +15

                 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 = []

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

app/views/problems/manage.html.haml ¶ +44 -34

               - 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
                         - 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
+            +
+            +   $(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
                 });
+            +   });

app/views/problems/stat.html.haml ¶ +41 -14

               :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'}
+            +
+            +   .col-md-4
+            +     .card
+            +       .card-body
+            +         %h2.card-title General Info
               .row
-            -   .col-md-2
-            -     %strong Name:
-            -   .col-md-10
+            +           .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-md-2.strong
-            -     %strong Submissions:
-            -   .col-md-10
+            +           .col-sm-6
+            +             Subs
+            +           .col-sm-6
                   = @submissions.count
               .row
-            -   .col-md-2.strong
-            -     %strong Solved/Attemped User
-            -   .col-md-10
+            +           .col-sm-6
+            +             Solved/Attempted User
+            +           .col-sm-6
                   #{@summary[:solve]}/#{@summary[:attempt]} (#{(@summary[:solve]*100.0/@summary[:attempt]).round(1)}%)
+            -
-            - %h2 Submissions Count
-            - = render partial: 'application/bar_graph', locals: { histogram: @histogram }
+            -
               %h2 Submissions
               - if @submissions and @submissions.count > 0
                 %table#main_table.table.table-condensed.table-striped
                   %thead
                     %tr
                       %th ID
                         %td.fix-width= sub.grader_comment
                         %td= sub.ip_address
               - else
                 No submission
               :javascript
+            +   $(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 ¶ +56 -31

		@@ -1,45 +1,49
1		- - content_for :header do
2		- = javascript_include_tag 'local_jquery'
3		-
4		- :javascript
5		- $(function () {
6		- $('#submission_table').tablesorter({widgets: ['zebra']});
7		- });
8	1
9	2	:css
10	3	.fix-width {
11	4	font-family: Droid Sans Mono,Consolas, monospace, mono, Courier New, Courier;
12	5	}
13	6
14		- %h1= @user.full_name
	7	+ %h1 User stats
	8	+ %h5.text-secondary= @user.login
	9	+
	10	+ .row.my-3
	11	+ .col-md-8
	12	+ .card
	13	+ .card-body
	14	+ %h2.card-title Sub Info
	15	+ %canvas#chart{height: '50px'}
15	16
16		- <b>Login:</b> #{@user.login} <br/>
17		- <b>Full name:</b> #{@user.full_name} <br />
	17	+ .col-md-4
	18	+ .card
	19	+ .card-body
	20	+ %h2.card-title General Info
	21	+ .row
	22	+ .col-sm-6.fw-bold
	23	+ Login
	24	+ .col-sm-6
	25	+ = @user.login
	26	+ .row
	27	+ .col-sm-6.fw-bold
	28	+ Full name
	29	+ .col-sm-6
	30	+ = @user.full_name
	31	+ .row
	32	+ .col-sm-6.fw-bold
	33	+ Subs
	34	+ .col-sm-6
	35	+ = @summary[:count]
	36	+ .row
	37	+ .col-sm-6.fw-bold
	38	+ Solved/Attempted Problem
	39	+ .col-sm-6
	40	+ #{@summary[:solve]}/#{@summary[:attempt]} (#{(@summary[:solve]*100.0/@summary[:attempt]).round(1)}%)
18	41
19	42
20		- %h2 Problem Stat
21		- %table.info
22		- %thead
23		- %tr.info-head
24		- %th Stat
25		- %th Value
26		- %tbody
27		- %tr{class: cycle('info-even','info-odd')}
28		- %td.info_param Submissions
29		- %td= @summary[:count]
30		- %tr{class: cycle('info-even','info-odd')}
31		- %td.info_param Solved/Attempted Problem
32		- %td #{@summary[:solve]}/#{@summary[:attempt]} (#{(@summary[:solve]*100.0/@summary[:attempt]).round(1)}%)
33		-
34		- %h2 Submission History
35		-
36		- =render partial: 'application/bar_graph', locals: {histogram: @histogram, param: {bar_width: 7}}
37		-
38		-
39		- %table#submission_table.table.table-striped
	43	+ %table#main_table.table.table-striped
40	44	%thead
41	45	%tr
42	46	%th ID
43	47	%th Problem code
44	48	%th Problem full name
45	49	%th Language
		@@ -62,9 +66,30
62	66	- if session[:admin]
63	67	%td= s.ip_address
64	68
65	69
66	70
67	71	:javascript
68		- $("#submission_table").DataTable({
	72	+ $(document).on('import-map-loaded',(e) => {
	73	+ //init datatable
	74	+ $("#main_table").DataTable({
69	75	paging: false
70	76	});
	77	+
	78	+ //history graph
	79	+ data = #{@chart_dataset}
	80	+ config = {
	81	+ type: 'bar',
	82	+ data: data,
	83	+ options: {
	84	+ plugins: {
	85	+ legend: {
	86	+ display: false
	87	+ },
	88	+ },
	89	+ }
	90	+ }
	91	+ Chart.defaults.font.size = 15
	92	+ //Chart.defaults.font.family = 'Sarabun Light'
	93	+ chart = new Chart($('#chart'),config)
	94	+ });
	95	+

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: 173 inserted, 142 deleted

Sign in to your account

Commit r880:31e27f513ce9 public

Author

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

Commit `r880:31e27f513ce9` public