cafe-grader-web Commit - r877:93c4562b9761

cafe-grader-web

Commit `r877:93c4562b9761` public

parent | child

Description:

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

r877:93c4562b9761 - Tue, 27 Sep 2022 14:13:46 - The requested commit is too big and content was truncated. 14 files changed. Show full diff

vendor/javascript/chart.js created 644 ¶

new file 100644

app/assets/stylesheets/my_bootstrap_var.css.scss ¶ +4

@@ -1,1 +1,5
1	$font-size-base: 0.875rem;	1	$font-size-base: 0.875rem;
		2	+
		3	+ $primary: #0074d9;
		4	+ //$danger: #ff4136;
		5	+

app/controllers/user_admin_controller.rb ¶ +1

               require 'csv'
               class UserAdminController < ApplicationController
                 include MailHelperMethods
                 before_action :admin_authorization
                 def index
                   @user_count = User.count
                   @users = User.all
                   @hidden_columns = ['hashed_password', 'salt', 'created_at', 'updated_at']
                   @contests = Contest.enabled
                   @user = User.new
                 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
+            +     byebug
                   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]
                   res = User.create_from_list(lines)
                   error_logins = res[:error_logins]
                   error_msg = res[:first_error]
                   ok_user = res[:created_users]
                   #add to group
                   if params[:add_to_group]
                     group = Group.find_by(id: params[:group_id])&.add_users_skip_existing(ok_user)
                   end
                   # show flash
                   if ok_user.count > 0
                     flash[:success] = "#{ok_user.count} user(s) was created or updated successfully"
                   end
                   if error_logins.size > 0
                     flash[:error] = "Following user(s) failed to be created: " + error_logins.join(', ') + ". The error of the first failed one are: " + error_msg;
                   end
                   redirect_to :action => 'index'
                 end
                 def edit
                   @user = User.find(params[:id])
                 end
                 def update
                   @user = User.find(params[:id])
                   if @user.update_attributes(user_params)
                     flash[:notice] = 'User was successfully updated.'
                     redirect_to :action => 'show', :id => @user
                   else
                     render :action => 'edit'
                   end
                 end
                 def destroy
                   User.find(params[:id]).destroy
                   redirect_to :action => 'index'
                 end
                 def user_stat
                   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 user_stat_max
                   if params[:commit] == 'download csv'
                     @problems = Problem.all
                   else
                     @problems = Problem.available_problems
                   end
                   @users = User.includes(:contests).includes(:contest_stat).all
                   @scorearray = Array.new
                   #set up range from param
                   since_id = params.fetch(:since_id, 0).to_i
                   until_id = params.fetch(:until_id, 0).to_i
                   @users.each do |u|
                     ustat = Array.new
                     ustat[0] = u
                     @problems.each do |p|
                       max_points = 0
                       Submission.find_in_range_by_user_and_problem(u.id,p.id,since_id,until_id).each do |sub|
                         max_points = sub.points if sub and sub.points and (sub.points > max_points)
                       end
                       ustat << [(max_points.to_f*100/p.full_score).round, (max_points>=p.full_score)]
                     end
                     @scorearray << ustat
                   end
                   if params[:commit] == 'download csv' then
                     csv = gen_csv_from_scorearray(@scorearray,@problems)
                     send_data csv, filename: 'max_score.csv'
                   else
                     render template: 'user_admin/user_stat'
                   end
                 end
                 def import
                   if params[:file]==''
                     flash[:notice] = 'Error importing no file'
                     redirect_to :action => 'index' and return
                   end
                   import_from_file(params[:file])
                 end
                 def random_all_passwords
                   users = User.all
                   @prefix = params[:prefix] || ''
                   @non_admin_users = User.find_non_admin_with_prefix(@prefix)
                   @changed = false
                   if params[:commit] == 'Go ahead'
                     @non_admin_users.each do |user|
                       password = random_password
                       user.password = password
                       user.password_confirmation = password
                       user.save
                     end
                     @changed = true
                   end
                 end
                 # contest management
                 def contests
                   @contest, @users = find_contest_and_user_from_contest_id(params[:id])
                   @contests = Contest.enabled
                 end
                 def assign_from_list
                   contest_id = params[:users_contest_id]
                   org_contest, users = find_contest_and_user_from_contest_id(contest_id)
                   contest = Contest.find(params[:new_contest][:id])
                   if !contest
                     flash[:notice] = 'Error: no contest'
                     redirect_to :action => 'contests', :id =>contest_id
                   end
                   note = []
                   users.each do |u|
                     u.contests = [contest]
                     note << u.login
                   end
                   flash[:notice] = 'User(s) ' + note.join(', ') +
                     " were successfully reassigned to #{contest.title}."
                   redirect_to :action => 'contests', :id =>contest.id
                 end
                 def add_to_contest
                   user = User.find(params[:id])
                   contest = Contest.find(params[:contest_id])
                   if user and contest
                     user.contests << contest
                   end
                   redirect_to :action => 'index'
                 end
                 def remove_from_contest
                   user = User.find(params[:id])
                   contest = Contest.find(params[:contest_id])
                   if user and contest
                     user.contests.delete(contest)
                   end
                   redirect_to :action => 'index'
                 end
                 def contest_management
                 end
                 def manage_contest

app/javascript/application.js ¶ +1

               // Configure your import map in config/importmap.rb. Read more: https://github.com/rails/importmap-rails
               //import "@hotwired/turbo-rails"
               //import "controllers"
               //
               //bootstrap
               //import "bootstrap"
               //window.bootstrap = bootstrap
               //datatable
               //import 'datatables-bundle'
               import "pdfmake"
               import "pdfmake-vfs"
               import "jszip"
               import "datatables"
               import "datatables-bs5"
               import "datatables-editor"
               import "datatables-editor-bs5"
               import "datatables-autofill"
               import "datatables-autofill-bs5"
               import "datatables-button"
               import "datatables-button-bs5"
               import "datatables-button-colvis"
               import "datatables-button-html5"
               import "datatables-button-print"
               import "datatables-colrecorder"
               import "datatables-datetime"
               import "datatables-fixedcolumns"
               import "datatables-fixedheader"
               import "datatables-keytable"
               import "datatables-responsive"
               import "datatables-responsive-bs5"
               import "datatables-rowgroup"
               import "datatables-rowreorder"
               import "datatables-scroller"
               import "datatables-searchbuilder"
               import "datatables-searchbuilder-bs5"
               import "datatables-searchpanes"
               import "datatables-searchpanes-bs5"
               import "datatables-select"
               import "datatables-staterestore"
               import "datatables-staterestore-bs5"
               /* */
               import "select2"
+            + import "chart"
               //my own customization
               import 'custom'
               //trigger import map ready
               console.log('application.js ready')
               window.importmapScriptsLoaded = true
               const import_map_loaded = new CustomEvent('import-map-loaded', { });
               document.dispatchEvent(import_map_loaded);

app/javascript/custom.js ¶ -3

               $(document).on('change', '.btn-file :file', function() {
                 var input, label, numFiles;
                 input = $(this);
                 numFiles = input.get(0).files ? input.get(0).files.length : 1;
                 label = input.val().replace(/\\/g, '/').replace(/.*\//, '');
                 input.trigger('fileselect', [numFiles, label]);
               });
               $(function() {
                 var e;
                 $(".select2").select2({
                   theme: "bootstrap-5",
                   //selectionCssClass: "select2--small",
                   //dropdownCssClass: "select2--small",
                 });
                 $('.btn-file :file').on('fileselect', function(event, numFiles, label) {
                   var input, log;
                   input = $(this).parents('.input-group').find(':text');
                   log = numFiles > 1 ? numFiles + ' files selected' : label;
                   if (input.length) {
                     input.val(log);
                   } else {
                     if (log) {
                       alert(log);
                     }
                   }
                 });
                 $('.ajax-toggle').on('click', function(event) {
                   var target;
                   target = $(event.target);
                   target.removeClass('btn-default');
                   target.removeClass('btn-success');
                   target.addClass('btn-warning');
                   target.text('...');
                 });
                 if ($("#editor").length > 0) {
                   e = ace.edit("editor");
                   e.setTheme('ace/theme/merbivore');
                   e.getSession().setTabSize(2);
                   e.getSession().setUseSoftTabs(true);
                 }
                 //jQuery(".best_in_place").best_in_place();
               });
-            - // ---
-            - // generated by coffee-script 1.9.2

app/models/user.rb ¶ +6 -6

               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 :site, optional: true
-            -   belongs_to :country
+            +   belongs_to :country, optional: true
                 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,
+            +   validates_format_of :email,
-            -                       :with => /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\Z/i,
+            +                       :with => /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\Z/i,
                                     :if => :email_validation?
-            -   validate :uniqueness_of_email_from_activated_users,
+            +   validate :uniqueness_of_email_from_activated_users,
                          :if => :email_validation?
-            -   validate :enough_time_interval_between_same_email_registrations,
+            +   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
                 end
                 def authenticated?(password)
                   if self.activated
                     hashed_password == User.encrypt(password,self.salt)
                   else
                     false
                   end
                 end
                 def login_with_name
                   "[#{login}] #{full_name}"
                 end
                 def admin?
                   has_role?('admin')
                 end
                 def has_role?(role)
                   self.roles.where(name: [role,'admin']).count > 0
                 end
                 def email_for_editing
                   if self.email==nil
                     "(unknown)"
                   elsif self.email==''
                     "(blank)"
                   else
                     self.email
                   end
                 end
                 def email_for_editing=(e)
                   self.email=e
                 end
                 def alias_for_editing
                   if self.alias==nil
                     "(unknown)"
                   elsif self.alias==''
                     "(blank)"
                   else
                     self.alias
                   end
                 end
                 def alias_for_editing=(e)
                   self.alias=e
                 end
                 def activation_key
                   if self.hashed_password==nil
                     encrypt_new_password
                   end
                   Digest::SHA1.hexdigest(self.hashed_password)[0..7]
                 end
                 def verify_activation_key(key)
                   key == activation_key
                 end
                 def self.random_password(length=5)
                   chars = 'abcdefghjkmnopqrstuvwxyz'
                   password = ''
                   length.times { password << chars[rand(chars.length - 1)] }
                   password
                 end
                 # Contest information
                 def self.find_users_with_no_contest()
                   users = User.all
                   return users.find_all { |u| u.contests.length == 0 }
                 end
                 def contest_time_left
                   if GraderConfiguration.contest_mode?
                     return nil if site==nil
                     return site.time_left
                   elsif GraderConfiguration.indv_contest_mode?
                     time_limit = GraderConfiguration.contest_time_limit
                     if time_limit == nil
                       return nil
                     end
                     if contest_stat==nil or contest_stat.started_at==nil
                       return (Time.now.gmtime + time_limit) - Time.now.gmtime
                     else
                       finish_time = contest_stat.started_at + time_limit
                       current_time = Time.now.gmtime
                       if current_time > finish_time
                         return 0
                       else
                         return finish_time - current_time
                       end
                     end
                   else
                     return nil
                   end
                 end
                 def contest_finished?
                   if GraderConfiguration.contest_mode?
                     return false if site==nil
                     return site.finished?
                   elsif GraderConfiguration.indv_contest_mode?
                     return false if self.contest_stat==nil
                     return contest_time_left == 0
                   else
                     return false
                   end
                 end
                 def contest_started?
                   if GraderConfiguration.indv_contest_mode?
                     stat = self.contest_stat
                     return ((stat != nil) and (stat.started_at != nil))
                   elsif GraderConfiguration.contest_mode?
                     return true if site==nil
                     return site.started
                   else
                     return true
                   end
                 end
                 def update_start_time
                   stat = self.contest_stat
                   if stat.nil? or stat.started_at.nil?
                     stat ||= UserContestStat.new(:user => self)
                     stat.started_at = Time.now.gmtime
                     stat.save
                   end
                 end
                 def problem_in_user_contests?(problem)
                   problem_contests = problem.contests.all
                   if problem_contests.length == 0   # this is public contest
                     return true
                   end
                   contests.each do |contest|
                     if problem_contests.find {|c| c.id == contest.id }
                       return true
                     end
                   end
                   return false
                 end
                 def available_problems_group_by_contests
                   contest_problems = []
                   pin = {}
                   contests.enabled.each do |contest|
                     available_problems = contest.problems.available
                     contest_problems << {
                       :contest => contest,
                       :problems => available_problems
                     }
                     available_problems.each {|p| pin[p.id] = true}
                   end
                   other_avaiable_problems = Problem.available.find_all {|p| pin[p.id]==nil and p.contests.length==0}
                   contest_problems << {
                     :contest => nil,
                     :problems => other_avaiable_problems
                   }
                   return contest_problems
                 end
                 def solve_all_available_problems?
                   available_problems.each do |p|

app/views/graders/list.html.haml ¶ +4 -4

               - content_for :head do
                 <meta http-equiv ="refresh" content="60"/>
               %h1 Grader information
               %p
                 = link_to 'Refresh', { :action => 'list' }, class: 'btn btn-info'
               .panel.panel-primary
                 .panel-heading
                   Grader control:
                 .panel-body
-            -     =link_to 'Start Graders in grading env', { action: 'start_grading'}, class: 'btn btn-default'
+            +     =link_to 'Start Graders in grading env', { action: 'start_grading'}, class: 'btn btn-secondary'
-            -     =link_to 'Start Graders in exam env', { action: 'start_exam'}, class: 'btn btn-default'
+            +     =link_to 'Start Graders in exam env', { action: 'start_exam'}, class: 'btn btn-secondary'
-            -     =link_to 'Stop all running Graders', { action: 'stop_all'}, class: 'btn btn-default'
+            +     =link_to 'Stop all running Graders', { action: 'stop_all'}, class: 'btn btn-secondary'
-            -     =link_to 'Clear all data', { action: 'clear_all'}, class: 'btn btn-default'
+            +     =link_to 'Clear all data', { action: 'clear_all'}, class: 'btn btn-secondary'
               .row
                 .col-md-6
                   - if @last_task
                     Last task:
                     = link_to "#{@last_task.id}", :action => 'view', :id => @last_task.id, :type => 'Task'
                     %br/
                   - if @last_test_request
                     Last test_request:
                     = link_to "#{@last_test_request.id}", :action => 'view', :id => @last_test_request.id, :type => 'TestRequest'
                   %h2 Current graders
                   = render :partial => 'grader_list', :locals => {:grader_list => @grader_processes}
                   %h2 Stalled graders
                   = render :partial => 'grader_list', :locals => {:grader_list => @stalled_processes}
                   %h2 Terminated graders
                   %p= link_to 'Clear data for terminated graders', { action: 'clear_terminated'}, class: 'btn btn-default', method: 'post'
                   = render :partial => 'grader_list', :locals => {:grader_list => @terminated_processes}
                 .col-md-6
                   %h2 Last 20 submissions
                   %table.table.table-striped.table-condensed
                     %thead
                       %th ID
                       %th User
                       %th Problem
                       %th Submitted
                       %th Graded
                       %th Result
                     %tbody
                       - @submission.each do |sub|
                         %tr.inactive
                           %td= link_to sub.id, submission_path(sub.id)
                           %td= ("" unless sub.user) || link_to(sub.try(:user).try(:full_name), stat_user_path(sub.user.id))
                           %td= ("" unless sub.problem) || link_to(sub.try(:problem).try(:full_name), stat_problem_path(sub.problem.id))
                           %td= "#{time_ago_in_words(sub.submitted_at)} ago"
                           %td= sub.graded_at ? "#{time_ago_in_words(sub.graded_at)} ago" : " "
                           %td= sub.grader_comment
                   %h2 Ungraded submission
                   %table.table.table-striped.table-condensed
                     %thead
                       %th ID
                       %th User
                       %th Problem
                       %th Submitted
                       %th Graded
                       %th Result
                     %tbody
                       - @backlog_submission.each do |sub|
                         %tr.inactive
                           %td= link_to sub.id, submission_path(sub.id)
                           %td= ("" unless sub.user) || link_to( sub.try(:user).try(:full_name), stat_user_path(sub.user.id))
                           %td= ("" unless sub.problem) || link_to( sub.try(:problem).try(:full_name), stat_problem_path(sub.problem.id))
                           %td= "#{time_ago_in_words(sub.submitted_at)} ago"
                           %td= sub.graded_at ? "#{time_ago_in_words(sub.graded_at)} ago" : " "
                           %td= sub.grader_comment

app/views/groups/_form.html.haml ¶ +7 -27

@@ -1,27 +1,7
1	- = form_for @group do \|f\|	1	+ .row
2	- - if @group.errors.any?	2	+ .col-md-6
3	- #error_explanation	3	+ = simple_form_for @group do \|f\|
4	- %h2= "#{pluralize(@group.errors.count, "error")} prohibited this group from being saved:"	4	+ = f.input :name
5	- %ul	5	+ = f.input :description
6	- - @group.errors.full_messages.each do \|msg\|	6	+ = f.input :enabled
7	- %li= msg	7	+ = f.button :submit, class: 'btn btn-primary'
8	- .row
9	- .col-md-6
10	- .form-group.field
11	- = f.label :name
12	- = f.text_field :name, class: 'form-control'
13	- .row
14	- .col-md-6
15	- .form-group.field
16	- = f.label :description
17	- = f.text_field :description, class: 'form-control'
18	- .row
19	- .col-md-6
20	- .checkbox
21	- = f.label :enabled do
22	- = f.check_box :enabled
23	- Enabled
24	- .row
25	- .col-md-6
26	- .form-group.actions
27	- = f.submit 'Save', class: 'btn btn-primary'

app/views/groups/edit.html.haml ¶ +5 -3

               %h1 Editing group
               = render 'form'
-            - = link_to 'Show', @group
+            + .row.my-3
-            - \|
+            +   .col-auto
-            - = link_to 'Back', groups_path
+            +     = link_to 'Edit members and problems', @group, class: 'btn btn-info'
+            +   .col-auto
+            +     = link_to 'Back', groups_path, class: 'btn btn-secondary'

app/views/groups/index.html.haml ¶ +5 -6

               %h1 Groups
               %p
-            -   = link_to 'New Group', new_group_path, class: 'btn btn-primary'
+            +   = link_to 'New Group', new_group_path, class: 'btn btn-success'
               %table.table.table-hover
                 %thead
                   %tr
                     %th Name
                     %th Description
                     %th Enabled?
                     %th
-            -       %th
                 %tbody
                   - @groups.each do |group|
                     %tr{:class => "#{(group.enabled?) ? "success" : "danger"}", id: "group-#{group.id}"}
                       %td= group.name
                       %td= group.description
-            -         %td= toggle_button(group.enabled?, toggle_group_path(group), "group-enabled-#{group.id}", size: ' ', block: ' ')
+            +         %td= toggle_button(group.enabled?, toggle_group_path(group), "group-enabled-#{group.id}", block: ' ')
-            -         %td= link_to 'View', group, class: 'btn btn-default'
+            +         %td
-            -         %td= link_to 'Destroy', group, :method => :delete, :data => { :confirm => 'Are you sure?' }, class: 'btn btn-danger'
+            +           = link_to 'Edit members and problems', group, class: 'btn btn-secondary btn-sm'
+            +           = link_to 'Destroy', group, :method => :delete, :data => { :confirm => 'Are you sure?' }, class: 'btn btn-danger btn-sm'
               %br

app/views/groups/show.html.haml ¶ +82 -72

@@ -1,82 +1,92
1	- .container-fluid	1	+ .row.mb-3
2	- .row	2	+ .col-md-6
3	- .col-md-6	3	+ %h1 Editing Group members and problems
4	- %h1 Group #{@group.name}	4	+ .row.mb-3
5	- .row	5	+ .col-md-6
6	- .col-md-6	6	+ %b Name:
7	- %b Description:	7	+ = @group.name
8	- = @group.description	8	+ .row.mb-3
9	- %br	9	+ .col-md-6
10	- = link_to 'Edit', edit_group_path(@group), class: 'btn btn-primary'	10	+ %b Description:
11	- .row	11	+ = @group.description
12	- .col-md-12	12	+ .row.mb-3
13	- %h1 Group details	13	+ .col-md-6
14	- .row	14	+ = link_to 'Edit', edit_group_path(@group), class: 'btn btn-primary'
15	- .col-md-6	15	+ .row.mb-3
16	- .panel.panel-default	16	+ .col-md-12
17	- .panel-heading	17	+ %h1 Group details
18	- .panel-title Users in this group	18	+ .row
19	- .panel-body	19	+ .col-md-6
20	- %ul	20	+ .card
21	- %li	21	+ .card-header
22	- If you want to add several users to a group, it may be easier to just re-import those users in	22	+ Users in this group
23	- = link_to 'New list of users', new_list_user_admin_index_path	23	+ .card-body
24	- page. You can also use	24	+ %ul
25	- = link_to 'Bulk Manage User', bulk_manage_user_admin_index_path	25	+ %li
26	- page.	26	+ If you want to add several users to a group, it may be easier to just re-import those users in
27	- =form_tag add_user_group_path(@group), class: 'form-inline' do	27	+ = link_to 'New list of users', new_list_user_admin_index_path
28	- .form-group	28	+ page. You can also use
29	- =label_tag :user_id, "User"	29	+ = link_to 'Bulk Manage User', bulk_manage_user_admin_index_path
		30	+ page.
		31	+ =form_tag add_user_group_path(@group), class: 'form-inline' do
		32	+ .row
		33	+ .col-auto
		34	+ =label_tag :user_id, "User", class: 'col-form-label'
		35	+ .col-auto
30	=select_tag :user_id, options_from_collection_for_select(User.all,'id','login_with_name'), class: 'select2', style: 'width: 25em';	36	=select_tag :user_id, options_from_collection_for_select(User.all,'id','login_with_name'), class: 'select2', style: 'width: 25em';
31	- =submit_tag "Add",class: 'btn btn-primary'	37	+ .col-auto
		38	+ =submit_tag "Add",class: 'btn btn-primary'
32		39
33		40
34	- %table.table.table-hover	41	+ %table.table.table-hover
35	- %thead	42	+ %thead
36	- %tr	43	+ %tr
37	- %th Login	44	+ %th Login
38	- %th Full name	45	+ %th Full name
39	- %th Remark	46	+ %th Remark
40	- %th= link_to 'Remove All', remove_all_user_group_path(@group), method: :delete, :data => { :confirm => "Remove ALL USERS from group?" }, class: 'btn btn-danger btn-sm'	47	+ %th= link_to 'Remove All', remove_all_user_group_path(@group), method: :delete, :data => { :confirm => "Remove ALL USERS from group?" }, class: 'btn btn-danger btn-sm'
41		48
42	- %tbody	49	+ %tbody
43	- - @group.users.each do \|user\|	50	+ - @group.users.each do \|user\|
44	- %tr	51	+ %tr
45	- %td= user.login	52	+ %td= user.login
46	- %td= user.full_name	53	+ %td= user.full_name
47	- %td= user.remark	54	+ %td= user.remark
48	- %td= link_to 'Remove', remove_user_group_path(@group,user), :method => :delete, :data => { :confirm => "Remove #{user.full_name}?" }, class: 'btn btn-danger btn-sm'	55	+ %td= link_to 'Remove', remove_user_group_path(@group,user), :method => :delete, :data => { :confirm => "Remove #{user.full_name}?" }, class: 'btn btn-danger btn-sm'
49	- .col-md-6	56	+ .col-md-6
50	- .panel.panel-default	57	+ .card
51	- ~~.panel-heading~~	58	+ .card-header
52	- ~~.panel-title~~ Problems	59	+ Problems
53	- ~~.panel~~-body	60	+ .card-body
54	- %ul	61	+ %ul
55	- %li	62	+ %li
56	- If you want to add several problem to a group, it may be easier to bulk manage them in the	63	+ If you want to add several problem to a group, it may be easier to bulk manage them in the
57	- = link_to 'Bulk Manage Problems', manage_problems_path	64	+ = link_to 'Bulk Manage Problems', manage_problems_path
58	- page	65	+ page
59	- =form_tag add_problem_group_path(@group), ~~class~~: ~~'form-inline'~~ do	66	+ =form_tag add_problem_group_path(@group) do
60	- ~~.form-group~~	67	+ .row
61	- =label_tag :problem_id, "Problem"	68	+ .col-auto
		69	+ =label_tag :problem_id, "Problem",class: 'col-form-label'
		70	+ .col-auto
62	=select_tag :problem_id, options_from_collection_for_select(Problem.all,'id','long_name'), class: 'select2', style: 'width: 25em';	71	=select_tag :problem_id, options_from_collection_for_select(Problem.all,'id','long_name'), class: 'select2', style: 'width: 25em';
63	- =submit_tag "Add",class: 'btn btn-primary'	72	+ .col-auto
		73	+ =submit_tag "Add",class: 'btn btn-primary'
64		74
65		75
66	- %table.table.table-hover	76	+ %table.table.table-hover
67	- %thead	77	+ %thead
68	- %tr	78	+ %tr
69	- %th name	79	+ %th name
70	- %th Full name	80	+ %th Full name
71	- %th Full score	81	+ %th Full score
72	- %th= link_to 'Remove All', remove_all_problem_group_path(@group), method: :delete, :data => { :confirm => "Remove ALL PROBLEMS from group?" }, class: 'btn btn-danger btn-sm'	82	+ %th= link_to 'Remove All', remove_all_problem_group_path(@group), method: :delete, :data => { :confirm => "Remove ALL PROBLEMS from group?" }, class: 'btn btn-danger btn-sm'
73		83
74	- %tbody	84	+ %tbody
75	- - @group.problems.each do \|problem\|	85	+ - @group.problems.each do \|problem\|
76	- %tr	86	+ %tr
77	- %td= problem.name	87	+ %td= problem.name
78	- %td= problem.full_name	88	+ %td= problem.full_name
79	- %td= problem.full_score	89	+ %td= problem.full_score
80	- %td= link_to 'Remove', remove_problem_group_path(@group,problem), :method => :delete, :data => { :confirm => "Remove #{problem.full_name}?" }, class: 'btn btn-danger btn-sm'	90	+ %td= link_to 'Remove', remove_problem_group_path(@group,problem), :method => :delete, :data => { :confirm => "Remove #{problem.full_name}?" }, class: 'btn btn-danger btn-sm'
81		91
82		92

app/views/report/_task_hof.html.haml ¶ +15 -14

               :css
                 .hof_user { color: orangered; font-style: italic; }
                 .hof_language { color: green; font-style: italic; }
                 .hof_value { color: deeppink;font-style: italic; }
                 .info_param { font-weight: bold;text-align: right; }
                 .tooltip {
                   font-family: Verdana,sans-serif;
                   font-weight: normal;
                   text-align: left;
                   font-size: 1.0em;
                   color: black;
                   line-height: 1.1;
                   display: none;
                   min-width: 20em;
                   position: absolute;
                   left: 25px;
                   bottom: 5px;
                   border: 1px solid;
                   padding: 5px;
                   background-color: #FFF;
                   word-wrap: break-word;
                   z-index: 9999;
                   overflow: auto;
                 }
               .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-sm-6
                           Subs
                         .col-sm-6
                           = @summary[:count]
                       .row
                         .col-sm-6
                           Solved/Attempted User
                         .col-sm-6
                           #{@summary[:solve]}/#{@summary[:attempt]} (#{(@summary[:solve]*100.0/@summary[:attempt]).round(1)}%)
               .row.mb-3
                 .col-md-4
                   .card
                     .card-body
                       %h2.card-title Model submission
                       %table.table.table-hover
                         %thead
                           %tr
                             %th #Sub (lang)
                             %th Author
                         %tbody
                           - @model_subs.each do |sub|
                             %tr
                               %td
                                 = link_to "##{sub.id}", submission_path(sub)
                                 = "(#{sub.language.pretty_name})"
                               %td= sub.user.full_name
                 .col-md-8
                   - if @best
                     .card
                       .card-body
                         %h2.card-title Top Submissions
                         %table.table.table-hover
                           %thead
                             %tr
                               %th Language
                               %th Best runtime (ms)
                               %th Best memory (kbytes)
                               %th Shortest Code (bytes)
                               %th First solver
                           %tbody
                             %tr.bg-warning
                               %td
                                 Overall
                               %td
                                 by #{link_to @best[:runtime][:user], stat_user_path(@best[:runtime][:user_id])}
                                 %br
                                 using <span class="text-success">#{@best[:runtime][:lang]}</span>
                                 %br
                                 with <span class="text-success">#{@best[:runtime][:value] * 1000} milliseconds</span>
                                 %br= link_to "#" + @best[:runtime][:sub_id].to_s, submission_path(@best[:runtime][:sub_id])
                               %td
                                 by #{link_to @best[:memory][:user], stat_user_path(@best[:memory][:user_id])}
                                 %br
                                 using <span class="text-success">#{@best[:memory][:lang]}</span>
                                 %br
                                 with <span class="text-success">#{number_with_delimiter(@best[:memory][:value])} kbytes </span>
                                 %br= link_to "#" + @best[:memory][:sub_id].to_s, submission_path(@best[:memory][:sub_id])
                               %td
                                 by #{link_to @best[:length][:user], stat_user_path(@best[:length][:user_id])}
                                 %br
                                 using <span class="text-success">#{@best[:length][:lang]}</span>
                                 %br
                                 with  <span class="text-success">#{@best[:length][:value]} bytes</span>
                                 %br= link_to "#" + @best[:length][:sub_id].to_s, submission_path(@best[:length][:sub_id])
                               %td
                                 - if @best[:first][:user] != '(NULL)'
                                   #{link_to @best[:first][:user], stat_user_path(@best[:first][:user_id])} is the first solver
                                   %br
                                   using <span class="text-success">#{@best[:first][:lang]}</span>
                                   %br
                                   on <span class="text-success">#{@best[:first][:value]}</span>
                                   %br= link_to "#" + @best[:first][:sub_id].to_s, submission_path( @best[:first][:sub_id])
                                 - else
                                   no first solver
                             - @by_lang.each do |lang,value|
                               %tr
                                 %td= lang
                                 %td
                                   = link_to value[:runtime][:user], stat_user_path(value[:runtime][:user_id])
                                   %br
                                   = "#{(value[:runtime][:value] * 1000).to_i} @"
                                   = link_to "#" + value[:runtime][:sub_id].to_s, submission_path( value[:runtime][:sub_id])
                                 %td
                                   = link_to value[:memory][:user], stat_user_path( value[:memory][:user_id])
                                   %br
                                   = "#{number_with_delimiter(value[:memory][:value])} @"
                                   = link_to "#" + value[:memory][:sub_id].to_s, submission_path(value[:memory][:sub_id])
                                 %td
                                   = link_to value[:length][:user], stat_user_path(value[:length][:user_id])
                                   %br
                                   = "#{value[:length][:value]} @"
                                   = link_to "#" + value[:length][:sub_id].to_s, submission_path(value[:length][:sub_id])
                                 %td
                                   - if value[:first][:user] != '(NULL)' #TODO: i know... this is wrong...
                                     = link_to value[:first][:user], stat_user_path(value[:first][:user_id])
                                     %br
                                     = "#{value[:first][:value]} @"
                                     = link_to "#" + value[:first][:sub_id].to_s, submission_path( value[:first][:sub_id])
-            - %script{src:"https://cdn.jsdelivr.net/npm/chart.js"}
               :javascript
-            -   data = #{@chart_dataset}
+            +   $(document).on('import-map-loaded',(e) => {
-            -   config = {
+            +     data = #{@chart_dataset}
-            -     type: 'bar',
+            +     config = {
-            -     data: data,
+            +       type: 'bar',
-            -     options: {
+            +       data: data,
-            -       plugins: {
+            +       options: {
-            -         legend: {
+            +         plugins: {
-            -           display: false
+            +           legend: {
+            +             display: false
+            +           },
                       },
-            -       },
+            +       }
                   }
-            -   }
+            +     Chart.defaults.font.size = 15
-            -   Chart.defaults.font.size = 15
+            +     //Chart.defaults.font.family = 'Sarabun Light'
-            -   //Chart.defaults.font.family = 'Sarabun Light'
+            +     chart = new Chart($('#chart'),config)
-            -   chart = new Chart($('#chart'),config)
+            +   });

app/views/user_admin/index.html.haml ¶ +4 -14

               %h1 Users
               .card.border-success.mb-3
                 .card-header.text-bg-success.border-success
                   Quick Add
                 .card-body
                   = form_with url: user_admin_index_path, scope: :user,  class: 'row row-cols-lg-auto g-3 align-items-center'  do |f|
                     .col-12
                       = f.text_field 'login', :size => 10,class: 'form-control', placeholder: 'login'
                     .form-group
                       = f.text_field 'full_name', :size => 10,class: 'form-control', placeholder: 'full name'
                     .form-group
                       = f.password_field 'password', :size => 10,class: 'form-control', placeholder: 'password'
                     .form-group
                       = f.password_field 'password_confirmation', :size => 10,class: 'form-control', placeholder: 'password confirmation'
                     .form-group
                       = f.text_field 'email', :size => 10,class: 'form-control', placeholder: 'email'
                     =submit_tag "Create", class: 'btn btn-success align-items-bottom'
               .card.border-success.mb-3
                 .card-header.text-bg-success.border-success
                   Import from site management
                 .card-body
                   = form_with url: import_user_admin_index_path, :multipart => true do |f|
                     .row
                       .col-auto
                         = f.label :file, 'File:', class: 'col-form-label'
                       .col-auto
                         = f.file_field :file, class: 'form-control'
                       .col-auto
                         = f.submit 'Submit', class: 'btn btn-secondary'
               %p
                 = link_to '+ New user', { :action => 'new' }, { class: 'btn btn-success '}
                 = link_to '+ New list of users', { :action => 'new_list' }, { class: 'btn btn-success '}
                 = link_to 'Bulk Manage', { action: :bulk_manage} , { class: 'btn btn-secondary btn-info'}
                 = link_to 'View administrators',{ :action => 'admin'}, { class: 'btn btn-secondary '}
                 = link_to 'Random passwords',{ :action => 'random_all_passwords'}, { class: 'btn btn-secondary '}
                 = link_to 'View active users',{ :action => 'active'}, { class: 'btn btn-secondary '}
                 = link_to 'Mass mailing',{ :action => 'mass_mailing'}, { class: 'btn btn-secondary '}
               - if GraderConfiguration.multicontests?
                 %br/
                 %b Multi-contest:
                 = link_to '[Manage bulk users in contests]', :action => 'contest_management'
                 View users in:
                 - @contests.each do |contest|
                   = link_to "[#{contest.name}]", :action => 'contests', :id => contest.id
                 = link_to "[no contest]", :action => 'contests', :id => 'none'
-            - -# Total #{@user_count} users |
-            - -# - if !@paginated
-            - -#   Display all users.
-            - -#   \#{link_to '[show in pages]', :action => 'index', :page => '1'}
-            - -# - else
-            - -#   Display in pages.
-            - -#   \#{link_to '[display all]', :action => 'index', :page => 'all'} |
-            - -#   \#{will_paginate @users, :container => false}
               %table.table.table-hover.table-condense.datatable
                 %thead
                   %th Login
                   %th Full name
                   %th email
                   %th Remark
                   %th
                     Activated
                     %sup{class: 'text-primary',data: {toggle: 'tooltip', placement: 'top'}, title: 'User has already confirmed the email?' } [?]
                   %th
                     Enabled
                     %sup{class: 'text-primary',data: {toggle: 'tooltip', placement: 'top'}, title: 'Allow the user to login?' } [?]
                   %th Last IP
                   %th
                   %th
                   %th
                   %th
                 - for user in @users
                   %tr
                     %td= link_to user.login, stat_user_path(user)
                     %td= user.full_name
                     %td= user.email
                     %td= user.remark
                     %td= toggle_button(user.activated?, toggle_activate_user_path(user),"toggle_activate_user_#{user.id}")
                     %td= toggle_button(user.enabled?, toggle_enable_user_path(user),"toggle_enable_user_#{user.id}")
                     %td= user.last_ip
-            -       %td= link_to 'Clear IP', {:action => 'clear_last_ip', :id => user, :page=>params[:page]}, :confirm => 'This will reset last logging in ip of the user, are you sure?', class: 'btn btn-default btn-xs btn-block'
+            +       %td= link_to 'Clear IP', {:action => 'clear_last_ip', :id => user, :page=>params[:page]}, :confirm => 'This will reset last logging in ip of the user, are you sure?', class: 'btn btn-secondary btn-sm btn-block'
-            -       %td= link_to 'Show', {:action => 'show', :id => user}, class: 'btn btn-default btn-xs btn-block'
+            +       %td= link_to 'Show', {:action => 'show', :id => user}, class: 'btn btn-secondary btn-sm btn-block'
-            -       %td= link_to 'Edit', {:action => 'edit', :id => user}, class: 'btn btn-default btn-xs btn-block'
+            +       %td= link_to 'Edit', {:action => 'edit', :id => user}, class: 'btn btn-secondary btn-sm btn-block'
-            -       %td= link_to 'Destroy', {action: :destroy, id: user}, data: {confirm: 'Are you sure?'}, method: :delete, class: 'btn btn-danger btn-xs btn-block'
+            +       %td= link_to 'Destroy', {action: :destroy, id: user}, data: {confirm: 'Are you sure?'}, method: :delete, class: 'btn btn-danger btn-sm btn-block'
               %br/
               = link_to '+ New user', { :action => 'new' }, { class: 'btn btn-success '}
               = link_to '+ New list of users', { :action => 'new_list' }, { class: 'btn btn-success '}
               :javascript
                 $(document).on('import-map-loaded',(e) => {
                   $('.datatable').DataTable({
                     'pageLength': 50
                   });
                 })

config/importmap.rb ¶ +1

               # Pin npm packages by running ./bin/importmap
               #entry point
               pin "application"
               pin "prepend_jquery"
               #pin "my_sprocket"
               pin_all_from "app/javascript/controllers", under: "controllers"
               #we don't need jquery in importmap because we use sprocket version
               #pin "jquery", to: 'my_jquery.js', preload: true
               #pin "bootstrap", to: "bootstrap.bundle.min.js", preload: true
               #no need popper, because bundled already in bootstrap
               #pin "@popperjs/core", to: "https://ga.jspm.io/npm:@popperjs/core@2.11.6/lib/index.js"
               # datatable
               # I have to fix vfs_font.js for this to work
               pin "jszip", to: "jszip.min.js"
               pin "pdfmake"
               pin "pdfmake-vfs", to: 'datatables/pdfmake-0.1.36/vfs_fonts.js'
               pin "datatables-bundle", to: 'datatables/datatables.js'
               pin "datatables", to: "datatables/DataTables-1.12.1/js/jquery.dataTables.js"
               pin "datatables-bs5", to: "datatables/DataTables-1.12.1/js/dataTables.bootstrap5.js"
               pin "datatables-editor", to: "datatables/Editor-2.0.9/js/dataTables.editor.js"
               pin "datatables-editor-bs5", to: "datatables/Editor-2.0.9/js/editor.bootstrap5.min.js"
               pin "datatables-autofill", to: "datatables/AutoFill-2.4.0/js/dataTables.autoFill.js"
               pin "datatables-autofill-bs5", to: "datatables/AutoFill-2.4.0/js/autoFill.bootstrap5.js"
               pin "datatables-button", to: "datatables/Buttons-2.2.3/js/dataTables.buttons.js"
               pin "datatables-button-bs5", to: "datatables/Buttons-2.2.3/js/buttons.bootstrap5.js"
               pin "datatables-button-colvis", to: "datatables/Buttons-2.2.3/js/buttons.colVis.js"
               pin "datatables-button-html5", to: "datatables/Buttons-2.2.3/js/buttons.html5.js"
               pin "datatables-button-print", to: "datatables/Buttons-2.2.3/js/buttons.print.js"
               pin "datatables-colrecorder", to: "datatables/ColReorder-1.5.6/js/dataTables.colReorder.js"
               pin "datatables-datetime", to: "datatables/DateTime-1.1.2/js/dataTables.dateTime.js"
               pin "datatables-fixedcolumns", to: "datatables/FixedColumns-4.1.0/js/dataTables.fixedColumns.js"
               pin "datatables-fixedheader", to: "datatables/FixedHeader-3.2.4/js/dataTables.fixedHeader.js"
               pin "datatables-keytable", to: "datatables/KeyTable-2.7.0/js/dataTables.keyTable.js"
               pin "datatables-responsive", to: "datatables/Responsive-2.3.0/js/dataTables.responsive.js"
               pin "datatables-responsive-bs5", to: "datatables/Responsive-2.3.0/js/responsive.bootstrap5.js"
               pin "datatables-rowgroup", to: "datatables/RowGroup-1.2.0/js/dataTables.rowGroup.js"
               pin "datatables-rowreorder", to: "datatables/RowReorder-1.2.8/js/dataTables.rowReorder.js"
               pin "datatables-scroller", to: "datatables/Scroller-2.0.7/js/dataTables.scroller.js"
               pin "datatables-searchbuilder", to: "datatables/SearchBuilder-1.3.4/js/dataTables.searchBuilder.js"
               pin "datatables-searchbuilder-bs5", to: "datatables/SearchBuilder-1.3.4/js/searchBuilder.bootstrap5.js"
               pin "datatables-searchpanes", to: "datatables/SearchPanes-2.0.2/js/dataTables.searchPanes.js"
               pin "datatables-searchpanes-bs5", to: "datatables/SearchPanes-2.0.2/js/searchPanes.bootstrap5.js"
               pin "datatables-select", to: "datatables/Select-1.4.0/js/dataTables.select.js"
               pin "datatables-staterestore", to: "datatables/StateRestore-1.1.1/js/dataTables.stateRestore.js"
               pin "datatables-staterestore-bs5", to: "datatables/StateRestore-1.1.1/js/stateRestore.bootstrap5.js"
               #select2
               pin "select2", to: "select2.min.js"
               #my local js
               pin "custom", to: "custom.js"
               #pin "ace-rails-ap"
+            + pin "chart", to: 'chart.js' # @3.9.1

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

Commit r877:93c4562b9761 public

Author

r877:93c4562b9761 - Tue, 27 Sep 2022 14:13:46 - The requested commit is too big and content was truncated. 14 files changed. Show full diff

Commit `r877:93c4562b9761` public