cafe-grader-web Commit - r793:8cbec24011e9

cafe-grader-web

Commit `r793:8cbec24011e9` public

parent | child

Description:

update cheat scrutinize

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

r793:8cbec24011e9 - Thu, 23 Apr 2020 06:35:42 - 4 files changed: 112 inserted, 87 deleted

app/views/report/cheat_scrutinize.html.haml created 644 ¶ +107

@@ -0,0 +1,107
	1	+ - content_for :header do
	2	+ = stylesheet_link_tag 'tablesorter-theme.cafe'
	3	+ = javascript_include_tag 'local_jquery'
	4	+
	5	+ %script{:type=>"text/javascript"}
	6	+ $(function () {
	7	+ $('#since_datetime').datetimepicker({ showButtonPanel: true, dateFormat: "yy-mm-dd", controlType: "slider"} );
	8	+ $('#until_datetime').datetimepicker({ showButtonPanel: true, dateFormat: "yy-mm-dd", controlType: "slider"} );
	9	+ $('#my_table').tablesorter({widthFixed: true, widgets: ['zebra']});
	10	+ $('#my_table2').tablesorter({widthFixed: true, widgets: ['zebra']});
	11	+ $('#sub_table').tablesorter({widthFixed: true, widgets: ['zebra']});
	12	+ });
	13	+
	14	+ %h1 Login status
	15	+
	16	+ .panel.panel-primary
	17	+ .panel-heading
	18	+ User ID and time rnage
	19	+ .panel-body
	20	+ = form_tag({session: :url }) do
	21	+ .row.form-group
	22	+ .col-md-2
	23	+ From Date:
	24	+ .col-md-4
	25	+ .input-group.date
	26	+ = text_field_tag :since_datetime, @since_time, class: 'form-control'
	27	+ %span.input-group-addon
	28	+ %span.glyphicon.glyphicon-calendar
	29	+ .row.form-group
	30	+ .col-md-2
	31	+ Until Date:
	32	+ .col-md-4
	33	+ .input-group.date
	34	+ = text_field_tag :until_datetime, @until_time, class: 'form-control'
	35	+ %span.input-group-addon
	36	+ %span.glyphicon.glyphicon-calendar
	37	+ .row.form-group
	38	+ .col-md-2
	39	+ IDs (separated by space):
	40	+ .col-md-10
	41	+ = text_field_tag 'SID', @sid, size: 40, class: 'form-control'
	42	+ .row.form-group
	43	+ .col-md-2
	44	+ .col-md-10
	45	+ =submit_tag 'query', class: 'btn btn-primary'
	46	+
	47	+ -#
	48	+ %table
	49	+ %tr
	50	+ %td{style: 'width: 120px; font-weight: bold'}= 'Login date range'
	51	+ %td{align: 'right'} since:
	52	+ %td= text_field_tag 'since_datetime', @since_time, class: 'form-control datetimepicker'
	53	+ %tr
	54	+ %td
	55	+ %td{align: 'right'} until:
	56	+ %td= text_field_tag 'until_datetime', @until_time
	57	+ %tr
	58	+ %td
	59	+ %td
	60	+ %td Blank mean no condition
	61	+ %tr
	62	+ %td{style: 'width: 120px; font-weight: bold'}= "ID"
	63	+ %td{colspan: 2}= text_field_tag 'SID', @sid, size: 40
	64	+ %tr
	65	+ %td
	66	+ %td
	67	+ %td= submit_tag 'query'
	68	+
	69	+
	70	+ %h2 Logs
	71	+
	72	+ - if @sid
	73	+ %table
	74	+ %tbody
	75	+ - @sid.each do \|id\|
	76	+ - user = User.where("login = ?",id).first
	77	+ %tr
	78	+ //%td= link_to id, controller: :user, action: :profile, id: id
	79	+ %td= link_to id, "https://www.nattee.net/java/users/profile/#{user.id}"
	80	+ %td= user.full_name
	81	+
	82	+ //%table.tablesorter-cafe#my_table
	83	+ %table.info
	84	+ %thead
	85	+ %tr.info-head
	86	+ %th Time
	87	+ %th Action
	88	+ %th IP
	89	+ %th login
	90	+ %th name
	91	+ %th problem
	92	+ %th score
	93	+ %tbody
	94	+ - if @logs
	95	+ - @logs.each do \|l\|
	96	+ %tr{class: cycle('info-even','info-odd')}
	97	+ %td= l[:submitted_at].strftime "%Y.%b.%d %H:%M:%S"
	98	+ //%td= l[:id] == -1 ? "LOGIN" : link_to("submit #{l[:id]}", controller: 'graders' , action: 'submission', id: l[:id])
	99	+ %td= l[:id] == -1 ? "LOGIN" : link_to( "submit #{l[:id]}", "https://www.nattee.net/java/graders/submission/#{l[:id]}")
	100	+ %td= l[:ip_address]
	101	+ //%td= link_to l[:login], controller: 'users', action: 'profile', id: l[:id]
	102	+ %td= link_to( l[:login], "https://www.nattee.net/java/users/profile/#{l.user_id}")
	103	+ %td= l[:full_name]
	104	+ %td= l[:id] == -1 ? "" : l.problem.name
	105	+ %td= l[:id] == -1 ? "" : l.points * 100/ l.problem.full_score
	106	+
	107	+

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

               require 'csv'
               class ReportController < ApplicationController
                 before_action :check_valid_login
                 before_action :admin_authorization, only: [:login_stat,:submission, :submission_query,
                                                            :login, :login_detail_query, :login_summary_query,
-            -                                              :stuck, :cheat_report, :cheat_scruntinize, :show_max_score, :current_score]
+            +                                              :stuck, :cheat_report, :cheat_scrutinize, :show_max_score, :current_score]
                 before_action(only: [:problem_hof]) { |c|
                   return false unless check_valid_login
                   admin_authorization unless GraderConfiguration["right.user_view_submission"]
                 }
                 def max_score
                 end
                 def current_score
                   @problems = Problem.available_problems
                   if params[:group_id]
                     @group = Group.find(params[:group_id])
                     @users = @group.users.where(enabled: true)
                   else
                     @users = User.includes(:contests).includes(:contest_stat).where(enabled: true)
                   end
                   @scorearray = calculate_max_score(@problems, @users,0,0,true)
                   #rencer accordingly
                   if params[:button] == 'download' then
                     csv = gen_csv_from_scorearray(@scorearray,@problems)
                     send_data csv, filename: 'max_score.csv'
                     GROUP BY u.id
                     HAVING count > 1
                   ) ml ON s.user_id = ml.id
                   WHERE s.submitted_at >= ? and s.submitted_at <= ?
               UNION
                 SELECT s.id,s.user_id,s.ip_address,s.submitted_at,s.problem_id
                   FROM submissions s INNER JOIN
                   (SELECT l.ip_address,COUNT(DISTINCT u.id) as count
                     FROM logins l
                     INNER JOIN users u ON l.user_id =  u.id
                     WHERE l.created_at >= ? and l.created_at <= ?
                     GROUP BY l.ip_address
                     HAVING count > 1
                   ) ml on ml.ip_address = s.ip_address
                   WHERE s.submitted_at >= ? and s.submitted_at <= ?
               ORDER BY ip_address,submitted_at
                           SQL
                   @subs = Submission.joins(:problem).find_by_sql([st,@since_time,@until_time,
                                                      @since_time,@until_time,
                                                      @since_time,@until_time,
                                                      @since_time,@until_time])
                 end
-            -   def cheat_scruntinize
+            +   def cheat_scrutinize
                   #convert date & time
                   date_and_time = '%Y-%m-%d %H:%M'
                   begin
                     md = params[:since_datetime].match(/(\d+)-(\d+)-(\d+) (\d+):(\d+)/)
                     @since_time = Time.zone.local(md[1].to_i,md[2].to_i,md[3].to_i,md[4].to_i,md[5].to_i)
                   rescue
                     @since_time = Time.zone.now.ago( 90.minutes)
                   end
                   begin
                     md = params[:until_datetime].match(/(\d+)-(\d+)-(\d+) (\d+):(\d+)/)
                     @until_time = Time.zone.local(md[1].to_i,md[2].to_i,md[3].to_i,md[4].to_i,md[5].to_i)
                   rescue
                     @until_time = Time.zone.now
                   end
                   #convert sid
                   @sid = params[:SID].split(/[,\s]/) if params[:SID]
                   unless @sid and @sid.size > 0
                     return
-            -       redirect_to actoin: :cheat_scruntinize
+            +       redirect_to actoin: :cheat_scrutinize
                     flash[:notice] = 'Please enter at least 1 student id'
                   end
                   mark = Array.new(@sid.size,'?')
                   condition = "(u.login = " + mark.join(' OR u.login = ') + ')'
                   @st = <<-SQL
                 SELECT l.created_at as submitted_at ,-1 as id,u.login,u.full_name,l.ip_address,"" as problem_id,"" as points,l.user_id
                 FROM logins l INNER JOIN users u on l.user_id  = u.id
                 WHERE l.created_at >= ? AND l.created_at <= ? AND #{condition}
               UNION
                 SELECT s.submitted_at,s.id,u.login,u.full_name,s.ip_address,s.problem_id,s.points,s.user_id
                 FROM submissions s INNER JOIN users u ON s.user_id = u.id
                 WHERE s.submitted_at >= ? AND s.submitted_at <= ? AND #{condition}
               ORDER BY submitted_at
                 SQL
                   p = [@st,@since_time,@until_time] + @sid + [@since_time,@until_time] + @sid
                   @logs = Submission.joins(:problem).find_by_sql(p)
                 end

config/routes.rb ¶ +2 -2

                     get 'clear_stat'
                     get 'clear_all_stat'
                     get 'change_contest_mode'
                   end
                 end
                 #get 'user_admin', to: 'user_admin#index'
                 #get 'user_admin/bulk_manage', to: 'user_admin#bulk_manage', as: 'bulk_manage_user_admin'
                 #post 'user_admin', to: 'user_admin#create'
                 #delete 'user_admin/:id', to: 'user_admin#destroy', as: 'user_admin_destroy'
                 #singular resource
                 #---- BEWARE ---- singular resource maps to plural controller by default, we can override by provide controller name directly
                 #report
                 resource :report, only: [], controller: 'report' do
                   get 'login'
                   get 'multiple_login'
                   get 'problem_hof(/:id)', action: 'problem_hof', as: 'problem_hof'
                   get 'current_score(/:group_id)', action: 'current_score', as: 'current_score'
                   get 'max_score'
                   post 'show_max_score'
                   get 'stuck'
                   get 'cheat_report'
                   post 'cheat_report'
-            -     get 'cheat_scruntinize'
+            +     get 'cheat_scrutinize'
-            -     post 'cheat_scruntinize'
+            +     post 'cheat_scrutinize'
                   get 'submission'
                   post 'submission_query'
                   get 'login_stat'
                   post 'login_stat'
                   get 'login'
                   post 'login_summary_query'
                   post 'login_detail_query'
                 end
                 #get 'report/current_score', to: 'report#current_score', as: 'report_current_score'
                 #get 'report/problem_hof(/:id)', to: 'report#problem_hof', as: 'report_problem_hof'
                 #get "report/login"
                 #get 'report/max_score', to: 'report#max_score', as: 'report_max_score'
                 #post 'report/show_max_score', to: 'report#show_max_score', as: 'report_show_max_score'
                 resource :main, only: [], controller: 'main' do
                   get 'login'
                   get 'logout'
                   get 'list'
                   get 'submission(/:id)', action: 'submission', as: 'main_submission'
                   get 'announcements'
                   get 'help'
                   post 'submit'
                 end
                 #main

app/views/report/cheat_scruntinize.html.haml removed ¶ -82

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

r793:8cbec24011e9 - Thu, 23 Apr 2020 06:35:42 - 4 files changed: 112 inserted, 87 deleted

Sign in to your account

Commit r793:8cbec24011e9 public

Author

r793:8cbec24011e9 - Thu, 23 Apr 2020 06:35:42 - 4 files changed: 112 inserted, 87 deleted

Commit `r793:8cbec24011e9` public