cafe-grader-web Commit - r792:6ae18fbc4b91

cafe-grader-web

Commit `r792:6ae18fbc4b91` public

parent | child

Description:

- login report - fix bugs on pagination on user manage

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

r792:6ae18fbc4b91 - Sun, 05 Apr 2020 13:20:15 - 14 files changed: 255 inserted, 76 deleted

app/views/report/login.html.haml created 644 ¶ +130

@@ -0,0 +1,130
	1	+ - content_for :header do
	2	+ = javascript_include_tag 'local_jquery'
	3	+
	4	+ %h1 Logins detail
	5	+
	6	+ .row
	7	+ .col-md-4
	8	+ .alert.alert-info
	9	+ %ul
	10	+ %li You have to click refresh when changing the filter above
	11	+ %li Detail tab shows each logins separately
	12	+ %li Summary tab shows logins summary of each user
	13	+ .col-md-4
	14	+ = render partial: 'shared/date_filter'
	15	+ .col-md-4
	16	+ = render partial: 'shared/user_select'
	17	+
	18	+ .row.form-group
	19	+ .col-sm-12
	20	+ %ul.nav.nav-tabs
	21	+ %li.active
	22	+ %a{href: '#detail', data: {toggle: :tab}} Detail
	23	+ %li
	24	+ %a{href: '#summary', data: {toggle: :tab}} Summary
	25	+ .row
	26	+ .col-sm-12
	27	+ .tab-content
	28	+ .tab-pane.active#detail
	29	+ %table#detail-table.table.table-hover.table-condense.datatable{style: 'width: 100%'}
	30	+ .tab-pane#summary
	31	+ %table#summary-table.table.table-hover.table-condense.datatable{style: 'width: 100%'}
	32	+
	33	+
	34	+
	35	+ :javascript
	36	+ $(function() {
	37	+ detail_table = $('#detail-table').DataTable({
	38	+ dom: "<'row'<'col-sm-3'B><'col-sm-3'l><'col-sm-6'f>>" + "<'row'<'col-sm-12'tr>>" + "<'row'<'col-sm-5'i><'col-sm-7'p>>",
	39	+ autoWidth: true,
	40	+ buttons: [
	41	+ {
	42	+ text: 'Refresh',
	43	+ action: (e,dt,node,config) => {
	44	+ detail_table.clear().draw()
	45	+ detail_table.ajax.reload( () => { detail_table.columns.adjust().draw() } )
	46	+ summary_table.clear().draw()
	47	+ summary_table.ajax.reload( () => { summary_table.columns.adjust().draw() } )
	48	+ }
	49	+ },
	50	+ 'copy',
	51	+ {
	52	+ extend: 'excel',
	53	+ title: 'Login detail',
	54	+ }
	55	+ ],
	56	+ columns: [
	57	+ {title: 'User', data: 'login_text'},
	58	+ {title: 'Time', data: 'created_at'},
	59	+ {title: 'IP', data: 'ip_address'},
	60	+ ],
	61	+ ajax: {
	62	+ url: '#{login_detail_query_report_path}',
	63	+ type: 'POST',
	64	+ data: (d) => {
	65	+ d.since_datetime = $('#since_datetime').val()
	66	+ d.until_datetime = $('#until_datetime').val()
	67	+ d.users = $("input[name='users']:checked").val()
	68	+ d.groups = $("#group_id").select2('val')
	69	+ },
	70	+ dataType: 'json',
	71	+ beforeSend: (request) => {
	72	+ request.setRequestHeader('X-CSRF-Token', $('meta[name="csrf-token"]').attr('content'));
	73	+ },
	74	+ }, //end ajax
	75	+ pageLength: 25,
	76	+ processing: true,
	77	+ });
	78	+
	79	+ summary_table = $('#summary-table').DataTable({
	80	+ dom: "<'row'<'col-sm-3'B><'col-sm-3'l><'col-sm-6'f>>" + "<'row'<'col-sm-12'tr>>" + "<'row'<'col-sm-5'i><'col-sm-7'p>>",
	81	+ autoWidth: true,
	82	+ buttons: [
	83	+ {
	84	+ text: 'Refresh',
	85	+ action: (e,dt,node,config) => {
	86	+ summary_table.clear().draw()
	87	+ summary_table.ajax.reload( () => { summary_table.columns.adjust().draw() } )
	88	+ detail_table.clear().draw()
	89	+ detail_table.ajax.reload( () => { detail_table.columns.adjust().draw() } )
	90	+ }
	91	+ },
	92	+ 'copy',
	93	+ {
	94	+ extend: 'excel',
	95	+ title: 'Login summary',
	96	+ }
	97	+ ],
	98	+ columns: [
	99	+ {title: 'User', data: 'login_text'},
	100	+ {title: 'Login Count', data: 'count'},
	101	+ {title: 'Earliest', data: 'earliest'},
	102	+ {title: 'Latest', data: 'latest'},
	103	+ {title: 'IP', data: 'ip_address'},
	104	+ ],
	105	+ ajax: {
	106	+ url: '#{login_summary_query_report_path}',
	107	+ type: 'POST',
	108	+ data: (d) => {
	109	+ d.since_datetime = $('#since_datetime').val()
	110	+ d.until_datetime = $('#until_datetime').val()
	111	+ d.users = $("input[name='users']:checked").val()
	112	+ d.groups = $("#group_id").select2('val')
	113	+ },
	114	+ dataType: 'json',
	115	+ beforeSend: (request) => {
	116	+ request.setRequestHeader('X-CSRF-Token', $('meta[name="csrf-token"]').attr('content'));
	117	+ },
	118	+ }, //end ajax
	119	+ pageLength: 25,
	120	+ processing: true,
	121	+ });
	122	+
	123	+ $('.input-group.date').datetimepicker({
	124	+ format: 'YYYY-MM-DD HH:mm',
	125	+ showTodayButton: true,
	126	+ locale: 'en',
	127	+ widgetPositioning: {horizontal: 'auto', vertical: 'bottom'},
	128	+ defaultDate: moment()
	129	+ });
	130	+ });

app/views/report/login_detail_query.json.jbuilder created 644 ¶ +10

@@ -0,0 +1,10
	1	+ json.draw params['draw']&.to_i
	2	+ json.recordsTotal @recordsTotal
	3	+ json.recordsFiltered @recordsFiltered
	4	+ json.data do
	5	+ json.array! @logins do \|login\|
	6	+ json.login_text login.user ? "<a href='#{stat_user_path(login.user_id)}'>(#{login.user.login})</a> #{login.user.full_name}" : '-- deletec user --'
	7	+ json.created_at login.created_at.strftime('%Y-%m-%d %H:%M')
	8	+ json.ip_address login.ip_address
	9	+ end
	10	+ end

app/views/report/login_summary_query.json.jbuilder created 644 ¶ +12

@@ -0,0 +1,12
	1	+ json.draw params['draw']&.to_i
	2	+ json.recordsTotal @recordsTotal
	3	+ json.recordsFiltered @recordsFiltered
	4	+ json.data do
	5	+ json.array! @users do \|user\|
	6	+ json.login_text "<a href='#{stat_user_path(user[:id])}'>(#{user[:login]})</a> #{user[:full_name]}"
	7	+ json.count user[:count]
	8	+ json.earliest user[:min].strftime('%Y-%m-%d %H:%M')
	9	+ json.latest user[:max].strftime('%Y-%m-%d %H:%M')
	10	+ json.ip_address user[:ip].join('<br/>')
	11	+ end
	12	+ end

db/migrate/20200405112919_add_index_to_login.rb created 644 ¶ +5

@@ -0,0 +1,5
	1	+ class AddIndexToLogin < ActiveRecord::Migration[5.2]
	2	+ def change
	3	+ add_index :logins, :user_id
	4	+ end
	5	+ end

app/controllers/report_controller.rb ¶ +68 -26

               require 'csv'
               class ReportController < ApplicationController
                 before_action :check_valid_login
-            -   before_action :admin_authorization, only: [:login_stat,:submission, :submission_query, :stuck, :cheat_report, :cheat_scruntinize, :show_max_score, :current_score]
+            +   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]
                 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'
                   else
                     #render template: 'user_admin/user_stat'
                     render 'current_score'
                   end
                 end
                 def show_max_score
                   #process parameters
                   #problems
                   @problems = []
                   if params[:problem_id]
                     params[:problem_id].each do |id|
                       next unless id.strip != ""
                       pid = Problem.find_by_id(id.to_i)
                       @problems << pid if pid
                     end
                   end
                   #users
                   @users = if params[:users] == "all" then
                              User.includes(:contests).includes(:contest_stat)
                            else
                              User.includes(:contests).includes(:contest_stat).where(enabled: true)
                            end
                   @until_id = params.fetch(:to_id, 0).to_i
                   @since_id = nil if @since_id == 0
                   @until_id = nil if @until_id == 0
                   #calculate the routine
                   @scorearray = calculate_max_score(@problems, @users, @since_id, @until_id)
                   #rencer accordingly
                   if params[:button] == 'download' then
                     csv = gen_csv_from_scorearray(@scorearray,@problems)
                     send_data csv, filename: 'max_score.csv'
                   else
                     #render template: 'user_admin/user_stat'
                     render 'max_score'
                   end
                 end
                 def score
                   if params[:commit] == 'download csv'
                     @problems = Problem.all
                   else
                     @problems = Problem.available_problems
                   end
                   @users = User.includes(:contests, :contest_stat).where(enabled: true)
                   @scorearray = Array.new
                   @users.each do |u|
                     ustat = Array.new
                     ustat[0] = u
                     @problems.each do |p|
                       sub = Submission.find_last_by_user_and_problem(u.id,p.id)
                       if (sub!=nil) and (sub.points!=nil) and p and p.full_score
                         ustat << [(sub.points.to_f*100/p.full_score).round, (sub.points>=p.full_score)]
                       else
                         ustat << [0,false]
                       end
                     end
                     @scorearray << ustat
                   end
                   if params[:commit] == 'download csv' then
                     csv = gen_csv_from_scorearray(@scorearray,@problems)
                     send_data csv, filename: 'last_score.csv'
                   else
                     render template: 'user_admin/user_stat'
                   end
                 end
-            -   def login_stat
+            +   def login
+            +   end
+            +
+            +   def login_summary_query
+            +     @users = Array.new
+            +
+            +     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 = DateTime.new(1000,1,1)
+            +     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 = DateTime.new(3000,1,1)
+            +     end
+            +
+            +     record = User
+            +       .left_outer_joins(:logins).group('users.id')
+            +       .where("logins.created_at >= ? AND logins.created_at <= ?",@since_time, @until_time)
+            +     case params[:users]
+            +     when 'enabled'
+            +       record = record.where(enabled: true)
+            +     when 'group'
+            +       record = record.joins(:groups).where(groups: {id: params[:groups]}) if params[:groups]
+            +     end
+            +
+            +     record = record.pluck("users.id,users.login,users.full_name,count(logins.created_at),min(logins.created_at),max(logins.created_at)")
+            +     record.each do |user|
+            +       x = Login.where("user_id = ? AND created_at >= ? AND created_at <= ?",
+            +                                       user[0],@since_time,@until_time)
+            +         .pluck(:ip_address).uniq
+            +       @users << { id: user[0],
+            +                    login: user[1],
+            +                    full_name: user[2],
+            +                    count: user[3],
+            +                    min: user[4],
+            +                    max: user[5],
+            +                    ip: x
+            +                  }
+            +     end
+            +   end
+            +
+            +   def login_detail_query
                   @logins = Array.new
                   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 = DateTime.new(1000,1,1)
                   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 = DateTime.new(3000,1,1)
                   end
-            -     User.all.each do |user|
+            +     @logins = Login.includes(:user).where("logins.created_at >= ? AND logins.created_at <= ?",@since_time, @until_time)
-            -       @logins << { id: user.id,
+            +     case params[:users]
-            -                    login: user.login,
+            +     when 'enabled'
-            -                    full_name: user.full_name,
+            +       @logins = @logins.where(users: {enabled: true})
-            -                    count: Login.where("user_id = ? AND created_at >= ? AND created_at <= ?",
+            +     when 'group'
-            -                                       user.id,@since_time,@until_time)
+            +       @logins = @logins.joins(user: :groups).where(user: {groups: {id: params[:groups]}}) if params[:groups]
-            -                           .count(:id),
-            -                    min: Login.where("user_id = ? AND created_at >= ? AND created_at <= ?",
-            -                                       user.id,@since_time,@until_time)
-            -                           .minimum(:created_at),
-            -                    max: Login.where("user_id = ? AND created_at >= ? AND created_at <= ?",
-            -                                       user.id,@since_time,@until_time)
-            -                           .maximum(:created_at),
-            -                     ip: Login.where("user_id = ? AND created_at >= ? AND created_at <= ?",
-            -                                       user.id,@since_time,@until_time)
-            -                           .select(:ip_address).uniq
-            -                  }
                   end
                 end
                 def submission
                 end
                 def submission_query
                   @submissions = Submission
                     .includes(:problem).includes(:user).includes(:language)
-            -     if params[:problem]
+            +     case params[:users]
-            -       @submission = @submission.where(problem_id: params[:problem])
+            +     when 'enabled'
+            +       @submissions = @submissions.where(users: {enabled: true})
+            +     when 'group'
+            +       @submissions = @submissions.joins(user: :groups).where(user: {groups: {id: params[:groups]}}) if params[:groups]
                   end
-            -     case params[:users]
+            +     case params[:problems]
                   when 'enabled'
-            -       @submissions = @submissions.where('user.enabled': true)
+            +       @submissions = @submissions.where(problems: {available: true})
-            -     when 'group'
+            +     when 'selected'
-            -       @submissions = @submissions.joins(user: :groups).where(user: {groups: {id: params[:groups]}}) if params[:groups]
+            +       @submissions = @submissions.where(problem_id: params[:problem_id])
                   end
                   #set default
                   params[:since_datetime] = Date.today.to_s if params[:since_datetime].blank?
                   @submissions, @recordsTotal, @recordsFiltered = process_query_record( @submissions,
                     global_search: ['user.login','user.full_name','problem.name','problem.full_name','points'],
                     date_filter: 'submitted_at',
                     date_param_since: 'since_datetime',
                     date_param_until: 'until_datetime',
                     hard_limit: 100_000
                   )
                 end
+            +   def login
+            +   end
+            +
                 def problem_hof
                   # gen problem list
                   @user = User.find(session[:user_id])
                   @problems = @user.available_problems
                   # get selected problems or the default
                   if params[:id]
                     begin
                       @problem = Problem.available.find(params[:id])
                     rescue
                       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: {} }
                   @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
                     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)
                     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
                     if sub.max_runtime and sub.max_runtime < @by_lang[lang.pretty_name][:runtime][:value]

app/controllers/user_admin_controller.rb ¶ -7

               require 'csv'
               class UserAdminController < ApplicationController
                 include MailHelperMethods
                 before_action :admin_authorization
                 def index
                   @user_count = User.count
-            -     if params[:page] == 'all'
-            -       @users = User.all
-            -       @paginated = false
-            -     else
-            -       @users = User.paginate :page => params[:page]
-            -       @paginated = true
-            -     end
                   @users = User.all
                   @hidden_columns = ['hashed_password', 'salt', 'created_at', 'updated_at']
                   @contests = Contest.enabled
                 end
                 def active
                   sessions = ActiveRecord::SessionStore::Session.where("updated_at >= ?", 60.minutes.ago)
                   @users = []
                   sessions.each do |session|
                     if session.data[:user_id]
                       @users << User.find(session.data[:user_id])
                     end
                   end
                 end
                 def show
                   @user = User.find(params[:id])
                 end
                 def new
                   @user = User.new
                 end
                 def create
                   @user = User.new(user_params)
                   @user.activated = true
                   if @user.save
                     flash[:notice] = 'User was successfully created.'
                     redirect_to :action => 'index'
                   else
                     render :action => 'new'
                   end
                 end
                 def clear_last_ip
                   @user = User.find(params[:id])
                   @user.last_ip = nil
                   @user.save
                   redirect_to action: 'index', page: params[:page]
                 end
                 def create_from_list
                   lines = params[:user_list]
                   note = []
                   error_note = []
                   error_msg = nil
                   ok_user = []

app/models/user.rb ¶ +2

               require 'digest/sha1'
               require 'net/pop'
               require 'net/https'
               require 'net/http'
               require 'json'
               class User < ActiveRecord::Base
                 has_and_belongs_to_many :roles
                 #has_and_belongs_to_many :groups
                 has_many :groups_users, class_name: 'GroupUser'
                 has_many :groups, :through => :groups_users
                 has_many :test_requests, -> {order(submitted_at: :desc)}
                 has_many :messages, -> { order(created_at: :desc) },
                          :class_name => "Message",
                          :foreign_key => "sender_id"
                 has_many :replied_messages, -> { order(created_at: :desc) },
                          :class_name => "Message",
                          :foreign_key => "receiver_id"
+            +   has_many :logins
+            +
                 has_one :contest_stat, :class_name => "UserContestStat", :dependent => :destroy
                 belongs_to :site
                 belongs_to :country
                 has_and_belongs_to_many :contests, -> { order(:name)}
                 scope :activated_users, -> {where activated: true}
                 validates_presence_of :login
                 validates_uniqueness_of :login
                 validates_format_of :login, :with => /\A[\_A-Za-z0-9]+\z/
                 validates_length_of :login, :within => 3..30
                 validates_presence_of :full_name
                 validates_length_of :full_name, :minimum => 1
                 validates_presence_of :password, :if => :password_required?
                 validates_length_of :password, :within => 4..50, :if => :password_required?
                 validates_confirmation_of :password, :if => :password_required?
                 validates_format_of :email,
                                     :with => /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\Z/i,
                                     :if => :email_validation?
                 validate :uniqueness_of_email_from_activated_users,
                          :if => :email_validation?
                 validate :enough_time_interval_between_same_email_registrations,
                          :if => :email_validation?
                 # these are for ytopc
                 # disable for now
                 #validates_presence_of :province
                 attr_accessor :password
                 before_save :encrypt_new_password
                 before_save :assign_default_site
                 before_save :assign_default_contest
                 # this is for will_paginate
                 cattr_reader :per_page
                 @@per_page = 50
                 def self.authenticate(login, password)
                   user = find_by_login(login)
                   if user
                     return user if user.authenticated?(password)
                   end

app/views/layouts/_header.html.haml ¶ +1

                               %span.caret
                             %ul.dropdown-menu
                               = add_menu("View", 'submissions', 'index')
                               = add_menu("Self Test", 'test', 'index')
                         / hall of fame
                         - if GraderConfiguration['right.user_hall_of_fame']
                           = add_menu("#{I18n.t 'menu.hall_of_fame'}", 'report', 'problem_hof')
                         / display MODE button (with countdown in contest mode)
                         - if GraderConfiguration.analysis_mode?
                           %div.navbar-btn.btn.btn-success#countdown= "ANALYSIS MODE"
                         - elsif GraderConfiguration.time_limit_mode?
                           - if @current_user.contest_finished?
                             %div.navbar-btn.btn.btn-danger#countdown= "Contest is over"
                           - elsif !@current_user.contest_started?
                             %div.navbar-btn.btn.btn-primary#countdown= (t 'title_bar.contest_not_started')
                           - else
                             %div.navbar-btn.btn.btn-primary#countdown asdf
                             :javascript
                               $("#countdown").countdown({until: "+#{@current_user.contest_time_left.to_i}s", layout: 'Time left: {hnn}:{mnn}:{snn}'});
                         / admin section
                         - if (@current_user!=nil) and (session[:admin])
                           / management
                           %li.dropdown
                             %a.dropdown-toggle{href: '#', data: {toggle:'dropdown'},  aria: {haspopup:"true", expanded:"false"}, role: "button"}
                               Manage
                               %span.caret
                             %ul.dropdown-menu
                               = add_menu( 'Announcements', 'announcements', 'index')
                               = add_menu( 'Problems', 'problems', 'index')
                               = add_menu( 'Tags', 'tags', 'index')
                               = add_menu( 'Users', 'user_admin', 'index')
                               = add_menu( 'User Groups', 'groups', 'index')
                               = add_menu( 'Graders', 'graders', 'list')
                               = add_menu( 'Message ', 'messages', 'console')
                               %li.divider{role: 'separator'}
                               = add_menu( 'System config', 'configurations', 'index')
                               %li.divider{role: 'separator'}
                               = add_menu( 'Sites', 'sites', 'index')
                               = add_menu( 'Contests', 'contest_management', 'index')
                           / report
                           %li.dropdown
                             %a.dropdown-toggle{href: '#', data: {toggle:'dropdown'},  aria: {haspopup:"true", expanded:"false"}, role: "button"}
                               Report
                               %span.caret
                             %ul.dropdown-menu
                               = add_menu( 'Current Score', 'report', 'current_score')
                               = add_menu( 'Score Report', 'report', 'max_score')
                               = add_menu( 'Submission Report', 'report', 'submission')
+            +                 = add_menu( 'Login Report', 'report', 'login')
                           - if (ungraded = Submission.where('graded_at is null').where('submitted_at < ?', 1.minutes.ago).count) > 0
                             =link_to "#{ungraded} backlogs!",
                               grader_list_path,
                               class: 'navbar-btn btn btn-default btn-warning', data: {toggle: 'tooltip'},title: 'Number of ungraded submission'
                       %ul.nav.navbar-nav.navbar-right
                         = add_menu("#{content_tag(:span,'',class: 'glyphicon glyphicon-question-sign')}".html_safe, 'main', 'help')
                         = add_menu("#{content_tag(:span,'',class: 'glyphicon glyphicon-comment')}".html_safe, 'messages', 'index', {title: I18n.t('menu.messages'), data: {toggle: 'tooltip'}})
                         - if GraderConfiguration['system.user_setting_enabled']
                           = add_menu("#{content_tag(:span,'',class: 'glyphicon glyphicon-cog', id: 'user_profile')}".html_safe, 'users', 'profile', {title: I18n.t('menu.settings'), data: {toggle: 'tooltip'}})
                         = add_menu("#{content_tag(:span,'',class: 'glyphicon glyphicon-log-out')} #{@current_user.full_name}".html_safe, 'main', 'login', {title: I18n.t('menu.log_out'), data: {toggle: 'tooltip'}})
               /
                 - if (@current_user!=nil) and (session[:admin])
                   %nav.navbar.navbar-fixed-top.navbar-inverse.secondnavbar
                     .container-fluid
                       .collapse.navbar-collapse
                         %ul.nav.navbar-nav
                           = add_menu( '[Announcements]', 'announcements', 'index')
                           = add_menu( '[Msg console]', 'messages', 'console')
                           = add_menu( '[Problems]', 'problems', 'index')
                           = add_menu( '[Users]', 'user_admin', 'index')
                           = add_menu( '[Results]', 'user_admin', 'user_stat')
                           = add_menu( '[Report]', 'report', 'multiple_login')
                           = add_menu( '[Graders]', 'graders', 'list')
                           = add_menu( '[Contests]', 'contest_management', 'index')
                           = add_menu( '[Sites]', 'sites', 'index')
                           = add_menu( '[System config]', 'configurations', 'index')

app/views/report/submission.html.haml ¶ +7 -2

               - content_for :header do
                 = javascript_include_tag 'local_jquery'
               %h1 Submissions detail
               .row
                 .col-md-4
                   = render partial: 'shared/problem_select'
                 .col-md-4
                   = render partial: 'shared/date_filter'
                 .col-md-4
                   = render partial: 'shared/user_select'
               .row
                 .col-md-6
                   .alert.alert-info
                     %ul
                       %li Display a maximum of 100,000 entries to save computation power
                       %li You have to click refresh when changing the filter above
               .row
                 .col-sm-12
                   %table.table.table-hover.table-condense.datatable{style: 'width: 100%'}
               :javascript
                 $(function() {
                   submission_table = $('.datatable').DataTable({
                     dom: "<'row'<'col-sm-3'B><'col-sm-3'l><'col-sm-6'f>>" + "<'row'<'col-sm-12'tr>>" + "<'row'<'col-sm-5'i><'col-sm-7'p>>",
                     autoWidth: true,
                     buttons: [
                       {
                         text: 'Refresh',
                         action: (e,dt,node,config) => {
                           submission_table.clear().draw()
                           submission_table.ajax.reload( () => { submission_table.columns.adjust().draw() } )
                         }
                       },
-            -         'copy', 'excel'
+            +         'copy',
+            +         {
+            +           extend: 'excel',
+            +           title: 'Submission detail'
+            +         }
                     ],
                     columns: [
                       {title: 'Sub ID', data: 'id'},
                       {title: 'User', data: 'user.login'},
                       {title: 'Problem', data: 'problem.long_name'},
                       {title: 'Language', data: 'language.pretty_name'},
                       {title: 'Submit at', data: 'submitted_at'},
                       {title: 'Result', data: 'grader_comment'},
                       {title: 'Score', data: 'points'},
                       {title: 'IP', data: 'ip_address'},
                     ],
                     ajax: {
                       url: '#{submission_query_report_path}',
                       type: 'POST',
                       data: (d) =>  {
                         d.since_datetime = $('#since_datetime').val()
                         d.until_datetime = $('#until_datetime').val()
                         d.users = $("input[name='users']:checked").val()
-            -           d.problems = $("#problem_id").select2('val')
                         d.groups = $("#group_id").select2('val')
+            +           d.problems = $("input[name='problems']:checked").val()
+            +           d.problem_id = $("#problem_id").select2('val')
                       },
                       dataType: 'json',
                       beforeSend: (request) => {
                         request.setRequestHeader('X-CSRF-Token', $('meta[name="csrf-token"]').attr('content'));
                       },
                     }, //end ajax
                     'pageLength': 50,
                     processing: true,
                   });
                   $('.input-group.date').datetimepicker({
                     format: 'YYYY-MM-DD',
                     showTodayButton: true,
                     locale: 'en',
                     widgetPositioning: {horizontal: 'auto', vertical: 'bottom'},
                     defaultDate: moment()
                   });
                 });

app/views/shared/_problem_select.html.haml ¶ +12 -3

@@ -1,10 +1,19
1	.panel.panel-primary	1	.panel.panel-primary
2	.panel-heading	2	.panel-heading
3	Problems	3	Problems
4	.panel-body	4	.panel-body
5	- %p	5	+ .radio
6	- Select problem(s) to be included in the report	6	+ %label
7	- = label_tag :problem_id, "Problems"	7	+ = radio_button_tag 'problems', 'all', (params[:users] == "all")
		8	+ All problems
		9	+ .radio
		10	+ %label
		11	+ = radio_button_tag 'problems', 'enabled', (params[:users] == "enabled"), checked: true
		12	+ Only problems with available = "yes"
		13	+ .radio
		14	+ %label
		15	+ = radio_button_tag 'problems', 'selected', (params[:users] == "group")
		16	+ Only these selected problems
8	= select_tag 'problem_id[]',	17	= select_tag 'problem_id[]',
9	options_for_select(Problem.all.collect {\|p\| ["[#{p.name}] #{p.full_name}", p.id]},params[:problem_id]),	18	options_for_select(Problem.all.collect {\|p\| ["[#{p.name}] #{p.full_name}", p.id]},params[:problem_id]),
10	{ id: :problem_id, class: 'select2 form-control', multiple: "true" }	19	{ id: :problem_id, class: 'select2 form-control', multiple: "true" }

app/views/shared/_user_select.html.haml ¶ +1 -1

               .panel.panel-primary
                 .panel-heading
                   Users
                 .panel-body
                   .radio
                     %label
                       = radio_button_tag 'users', 'all', (params[:users] == "all")
                       All users
                   .radio
                     %label
-            -         = radio_button_tag 'users', 'enabled', (params[:users] == "enabled")
+            +         = radio_button_tag 'users', 'enabled', (params[:users] == "enabled"), checked: true
                       Only enabled users
                   .radio
                     %label
                       = radio_button_tag 'users', 'group', (params[:users] == "group")
                       Only these groups
                   = select_tag 'group_id[]',
                       options_for_select(Group.all.collect {|g| ["[#{g.name}] #{g.description}", g.id]}),
                       { id: 'group_id', class: 'select2 form-control', multiple: "true"}

config/routes.rb ¶ +5

                     get 'bulk_mail'
                     get 'user_stat'
                     get 'import'
                     get 'new_list'
                     get 'admin'
                     get 'active'
                     get 'mass_mailing'
                     get 'revoke_admin'
                     post 'grant_admin'
                     match 'create_from_list', via: [:get, :post]
                     match 'random_all_passwords', via: [:get, :post]
                   end
                   member do
                     get 'clear_last_ip'
                   end
                 end
                 resources :contest_management, only: [:index] do
                   collection do
                     get 'user_stat'
                     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'
                   post 'cheat_scruntinize'
                   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
                 #get "main/list"
                 #get 'main/submission(/:id)', to: 'main#submission', as: 'main_submission'
                 #post 'main/submit', to: 'main#submit'
                 #get 'main/announcements', to: 'main#announcements'
                 #
                 get 'tasks/view/:file.:ext' => 'tasks#view'
                 get 'tasks/download/:id/:file.:ext' => 'tasks#download'
                 get 'heartbeat/:id/edit' => 'heartbeat#edit'
                 #grader
                 get 'graders/list', to: 'graders#list', as: 'grader_list'
                 namespace :graders do
                   get 'task/:id/:type', action: 'task', as: 'task'
                   get 'view/:id/:type', action: 'view', as: 'view'
                   get 'clear/:id', action: 'clear', as: 'clear'
                   get 'stop'
                   get 'stop_all'
                   get 'clear_all'
                   get 'clear_terminated'
                   get 'start_grading'
                   get 'start_exam'
                 end
                 # See how all your routes lay out with "rake routes"
                 # This is a legacy wild controller route that's not recommended for RESTful applications.
                 # Note: This route will make all actions in every controller accessible via GET requests.

db/schema.rb ¶ +2 -1

               # This file is auto-generated from the current state of the database. Instead
               # of editing this file, please use the migrations feature of Active Record to
               # incrementally modify your database, and then regenerate this schema definition.
               #
               # Note that this schema.rb definition is the authoritative source for your
               # database schema. If you need to create the application database on another
               # system, you should be using db:schema:load, not running all the migrations
               # from scratch. The latter is a flawed and unsustainable approach (the more migrations
               # you'll amass, the slower it'll run and the greater likelihood for issues).
               #
               # It's strongly recommended that you check this file into your version control system.
-            - ActiveRecord::Schema.define(version: 2020_04_04_142959) do
+            + ActiveRecord::Schema.define(version: 2020_04_05_112919) do
                 create_table "announcements", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
                   t.string "author"
                   t.text "body", limit: 16777215
                   t.boolean "published"
                   t.datetime "created_at", null: false
                   t.datetime "updated_at", null: false
                   t.boolean "frontpage", default: false
                   t.boolean "contest_only", default: false
                   t.string "title"
                   t.string "notes"
                 end
                 create_table "contests", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
                   t.string "title"
                   t.boolean "enabled"
                   t.datetime "created_at", null: false
                   t.datetime "updated_at", null: false
                   t.string "name"
                 end
                 create_table "contests_problems", id: false, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
                   t.integer "contest_id"
                   t.integer "problem_id"
                 end
                 create_table "contests_users", id: false, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
                   t.integer "contest_id"
                   t.integer "user_id"
                 end
                 create_table "countries", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
                   t.string "name"
                   t.datetime "created_at", null: false
                   t.datetime "updated_at", null: false
                 end
                 create_table "descriptions", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
                   t.text "body", limit: 16777215
                   t.boolean "markdowned"
                   t.datetime "created_at", null: false
                   t.datetime "updated_at", null: false
                 end
                 create_table "grader_configurations", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
                   t.string "key"
                   t.string "value_type"
                   t.string "value"
                   t.string "mode"
                   t.boolean "active"
                   t.datetime "created_at", null: false
                   t.datetime "updated_at", null: false
                   t.integer "task_id"
                   t.string "task_type"
                   t.boolean "terminated"
                   t.index ["host", "pid"], name: "index_grader_processes_on_ip_and_pid"
                 end
                 create_table "groups", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
                   t.string "name"
                   t.string "description"
                 end
                 create_table "groups_problems", id: false, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
                   t.integer "problem_id", null: false
                   t.integer "group_id", null: false
                   t.index ["group_id", "problem_id"], name: "index_groups_problems_on_group_id_and_problem_id"
                 end
                 create_table "groups_users", options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
                   t.integer "group_id", null: false
                   t.integer "user_id", null: false
                   t.index ["user_id", "group_id"], name: "index_groups_users_on_user_id_and_group_id"
                 end
                 create_table "heart_beats", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
                   t.integer "user_id"
                   t.string "ip_address"
                   t.datetime "created_at", null: false
                   t.datetime "updated_at", null: false
                   t.string "status"
                   t.index ["updated_at"], name: "index_heart_beats_on_updated_at"
                 end
                 create_table "languages", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
                   t.string "name", limit: 10
                   t.string "pretty_name"
                   t.string "ext", limit: 10
                   t.string "common_ext"
                 end
                 create_table "logins", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
                   t.integer "user_id"
                   t.string "ip_address"
                   t.datetime "created_at", null: false
                   t.datetime "updated_at", null: false
+            +     t.index ["user_id"], name: "index_logins_on_user_id"
                 end
                 create_table "messages", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
                   t.integer "sender_id"
                   t.integer "receiver_id"
                   t.integer "replying_message_id"
                   t.text "body", limit: 16777215
                   t.boolean "replied"
                   t.datetime "created_at", null: false
                   t.datetime "updated_at", null: false
                 end
                 create_table "problems", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
                   t.string "name", limit: 100
                   t.string "full_name"
                   t.integer "full_score"
                   t.date "date_added"
                   t.boolean "available"
                   t.string "url"
                   t.integer "description_id"
                   t.boolean "test_allowed"
                   t.boolean "output_only"
                   t.string "description_filename"
                   t.boolean "view_testcase"
                 end
                 create_table "problems_tags", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
                   t.integer "problem_id"
                   t.integer "tag_id"
                   t.index ["problem_id", "tag_id"], name: "index_problems_tags_on_problem_id_and_tag_id", unique: true
                   t.index ["problem_id"], name: "index_problems_tags_on_problem_id"
                   t.index ["tag_id"], name: "index_problems_tags_on_tag_id"
                 end
                 create_table "rights", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
                   t.string "name"
                   t.string "controller"
                   t.string "action"
                 end
                 create_table "rights_roles", id: false, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
                   t.integer "right_id"
                   t.integer "role_id"
                   t.index ["role_id"], name: "index_rights_roles_on_role_id"
                 end
                 create_table "roles", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
                   t.string "name"

app/views/report/login_stat.html.haml removed ¶ -36

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

r792:6ae18fbc4b91 - Sun, 05 Apr 2020 13:20:15 - 14 files changed: 255 inserted, 76 deleted

Sign in to your account

Commit r792:6ae18fbc4b91 public

Author

r792:6ae18fbc4b91 - Sun, 05 Apr 2020 13:20:15 - 14 files changed: 255 inserted, 76 deleted

Commit `r792:6ae18fbc4b91` public