cafe-grader-web

Commit r877:93c4562b9761 public

parent | child
Description:
manage
Commit status:
[Not Reviewed]
References:
default
Diff options:
Raw Diff | Patch Diff | Download Diff | Ignore whitespace | Increase context
Comments:
0 Commit comments 0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Side by Side Unified
Expand All Files Collapse All Files Wide Mode Diff
Add another comment
Browse Files

r877:93c4562b9761 - - The requested commit is too big and content was truncated. 14 files changed. Show full diff

Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
new file 100644
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -1,1 +1,5
1 1 $font-size-base: 0.875rem;
2 +
3 + $primary: #0074d9;
4 + //$danger: #ff4136;
5 +
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -1,133 +1,134
1 1 require 'csv'
2 2
3 3 class UserAdminController < ApplicationController
4 4
5 5 include MailHelperMethods
6 6
7 7 before_action :admin_authorization
8 8
9 9 def index
10 10 @user_count = User.count
11 11 @users = User.all
12 12 @hidden_columns = ['hashed_password', 'salt', 'created_at', 'updated_at']
13 13 @contests = Contest.enabled
14 14 @user = User.new
15 15 end
16 16
17 17 def active
18 18 sessions = ActiveRecord::SessionStore::Session.where("updated_at >= ?", 60.minutes.ago)
19 19 @users = []
20 20 sessions.each do |session|
21 21 if session.data[:user_id]
22 22 @users << User.find(session.data[:user_id])
23 23 end
24 24 end
25 25 end
26 26
27 27 def show
28 28 @user = User.find(params[:id])
29 29 end
30 30
31 31 def new
32 32 @user = User.new
33 33 end
34 34
35 35 def create
36 36 @user = User.new(user_params)
37 37 @user.activated = true
38 + byebug
38 39 if @user.save
39 40 flash[:notice] = 'User was successfully created.'
40 41 redirect_to :action => 'index'
41 42 else
42 43 render :action => 'new'
43 44 end
44 45 end
45 46
46 47 def clear_last_ip
47 48 @user = User.find(params[:id])
48 49 @user.last_ip = nil
49 50 @user.save
50 51 redirect_to action: 'index', page: params[:page]
51 52 end
52 53
53 54 def create_from_list
54 55 lines = params[:user_list]
55 56
56 57
57 58 res = User.create_from_list(lines)
58 59 error_logins = res[:error_logins]
59 60 error_msg = res[:first_error]
60 61 ok_user = res[:created_users]
61 62
62 63
63 64 #add to group
64 65 if params[:add_to_group]
65 66 group = Group.find_by(id: params[:group_id])&.add_users_skip_existing(ok_user)
66 67 end
67 68
68 69 # show flash
69 70 if ok_user.count > 0
70 71 flash[:success] = "#{ok_user.count} user(s) was created or updated successfully"
71 72 end
72 73 if error_logins.size > 0
73 74 flash[:error] = "Following user(s) failed to be created: " + error_logins.join(', ') + ". The error of the first failed one are: " + error_msg;
74 75 end
75 76 redirect_to :action => 'index'
76 77 end
77 78
78 79 def edit
79 80 @user = User.find(params[:id])
80 81 end
81 82
82 83 def update
83 84 @user = User.find(params[:id])
84 85 if @user.update_attributes(user_params)
85 86 flash[:notice] = 'User was successfully updated.'
86 87 redirect_to :action => 'show', :id => @user
87 88 else
88 89 render :action => 'edit'
89 90 end
90 91 end
91 92
92 93 def destroy
93 94 User.find(params[:id]).destroy
94 95 redirect_to :action => 'index'
95 96 end
96 97
97 98 def user_stat
98 99 if params[:commit] == 'download csv'
99 100 @problems = Problem.all
100 101 else
101 102 @problems = Problem.available_problems
102 103 end
103 104 @users = User.includes(:contests, :contest_stat).where(enabled: true)
104 105 @scorearray = Array.new
105 106 @users.each do |u|
106 107 ustat = Array.new
107 108 ustat[0] = u
108 109 @problems.each do |p|
109 110 sub = Submission.find_last_by_user_and_problem(u.id,p.id)
110 111 if (sub!=nil) and (sub.points!=nil) and p and p.full_score
111 112 ustat << [(sub.points.to_f*100/p.full_score).round, (sub.points>=p.full_score)]
112 113 else
113 114 ustat << [0,false]
114 115 end
115 116 end
116 117 @scorearray << ustat
117 118 end
118 119 if params[:commit] == 'download csv' then
119 120 csv = gen_csv_from_scorearray(@scorearray,@problems)
120 121 send_data csv, filename: 'last_score.csv'
121 122 else
122 123 render template: 'user_admin/user_stat'
123 124 end
124 125 end
125 126
126 127 def user_stat_max
127 128 if params[:commit] == 'download csv'
128 129 @problems = Problem.all
129 130 else
130 131 @problems = Problem.available_problems
131 132 end
132 133 @users = User.includes(:contests).includes(:contest_stat).all
133 134 @scorearray = Array.new
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -1,56 +1,57
1 1 // Configure your import map in config/importmap.rb. Read more: https://github.com/rails/importmap-rails
2 2 //import "@hotwired/turbo-rails"
3 3 //import "controllers"
4 4 //
5 5
6 6
7 7 //bootstrap
8 8 //import "bootstrap"
9 9 //window.bootstrap = bootstrap
10 10
11 11 //datatable
12 12 //import 'datatables-bundle'
13 13 import "pdfmake"
14 14 import "pdfmake-vfs"
15 15 import "jszip"
16 16 import "datatables"
17 17 import "datatables-bs5"
18 18 import "datatables-editor"
19 19 import "datatables-editor-bs5"
20 20 import "datatables-autofill"
21 21 import "datatables-autofill-bs5"
22 22 import "datatables-button"
23 23 import "datatables-button-bs5"
24 24 import "datatables-button-colvis"
25 25 import "datatables-button-html5"
26 26 import "datatables-button-print"
27 27 import "datatables-colrecorder"
28 28 import "datatables-datetime"
29 29 import "datatables-fixedcolumns"
30 30 import "datatables-fixedheader"
31 31 import "datatables-keytable"
32 32 import "datatables-responsive"
33 33 import "datatables-responsive-bs5"
34 34 import "datatables-rowgroup"
35 35 import "datatables-rowreorder"
36 36 import "datatables-scroller"
37 37 import "datatables-searchbuilder"
38 38 import "datatables-searchbuilder-bs5"
39 39 import "datatables-searchpanes"
40 40 import "datatables-searchpanes-bs5"
41 41 import "datatables-select"
42 42 import "datatables-staterestore"
43 43 import "datatables-staterestore-bs5"
44 44 /* */
45 45
46 46 import "select2"
47 + import "chart"
47 48
48 49 //my own customization
49 50 import 'custom'
50 51
51 52
52 53 //trigger import map ready
53 54 console.log('application.js ready')
54 55 window.importmapScriptsLoaded = true
55 56 const import_map_loaded = new CustomEvent('import-map-loaded', { });
56 57 document.dispatchEvent(import_map_loaded);
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -1,48 +1,45
1 1 $(document).on('change', '.btn-file :file', function() {
2 2 var input, label, numFiles;
3 3 input = $(this);
4 4 numFiles = input.get(0).files ? input.get(0).files.length : 1;
5 5 label = input.val().replace(/\\/g, '/').replace(/.*\//, '');
6 6 input.trigger('fileselect', [numFiles, label]);
7 7 });
8 8
9 9 $(function() {
10 10 var e;
11 11 $(".select2").select2({
12 12 theme: "bootstrap-5",
13 13 //selectionCssClass: "select2--small",
14 14 //dropdownCssClass: "select2--small",
15 15 });
16 16
17 17 $('.btn-file :file').on('fileselect', function(event, numFiles, label) {
18 18 var input, log;
19 19 input = $(this).parents('.input-group').find(':text');
20 20 log = numFiles > 1 ? numFiles + ' files selected' : label;
21 21 if (input.length) {
22 22 input.val(log);
23 23 } else {
24 24 if (log) {
25 25 alert(log);
26 26 }
27 27 }
28 28 });
29 29 $('.ajax-toggle').on('click', function(event) {
30 30 var target;
31 31 target = $(event.target);
32 32 target.removeClass('btn-default');
33 33 target.removeClass('btn-success');
34 34 target.addClass('btn-warning');
35 35 target.text('...');
36 36 });
37 37 if ($("#editor").length > 0) {
38 38 e = ace.edit("editor");
39 39 e.setTheme('ace/theme/merbivore');
40 40 e.getSession().setTabSize(2);
41 41 e.getSession().setUseSoftTabs(true);
42 42 }
43 43
44 44 //jQuery(".best_in_place").best_in_place();
45 45 });
46 -
47 - // ---
48 - // generated by coffee-script 1.9.2
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -1,149 +1,149
1 1 require 'digest/sha1'
2 2 require 'net/pop'
3 3 require 'net/https'
4 4 require 'net/http'
5 5 require 'json'
6 6
7 7 class User < ActiveRecord::Base
8 8
9 9 has_and_belongs_to_many :roles
10 10
11 11 #has_and_belongs_to_many :groups
12 12 has_many :groups_users, class_name: 'GroupUser'
13 13 has_many :groups, :through => :groups_users
14 14
15 15 has_many :test_requests, -> {order(submitted_at: :desc)}
16 16
17 17 has_many :messages, -> { order(created_at: :desc) },
18 18 :class_name => "Message",
19 19 :foreign_key => "sender_id"
20 20
21 21 has_many :replied_messages, -> { order(created_at: :desc) },
22 22 :class_name => "Message",
23 23 :foreign_key => "receiver_id"
24 24
25 25 has_many :logins
26 26
27 27 has_one :contest_stat, :class_name => "UserContestStat", :dependent => :destroy
28 28
29 - belongs_to :site
30 - belongs_to :country
29 + belongs_to :site, optional: true
30 + belongs_to :country, optional: true
31 31
32 32 has_and_belongs_to_many :contests, -> { order(:name)}
33 33
34 34 scope :activated_users, -> {where activated: true}
35 35
36 36 validates_presence_of :login
37 37 validates_uniqueness_of :login
38 38 validates_format_of :login, :with => /\A[\_A-Za-z0-9]+\z/
39 39 validates_length_of :login, :within => 3..30
40 40
41 41 validates_presence_of :full_name
42 42 validates_length_of :full_name, :minimum => 1
43 43
44 44 validates_presence_of :password, :if => :password_required?
45 45 validates_length_of :password, :within => 4..50, :if => :password_required?
46 46 validates_confirmation_of :password, :if => :password_required?
47 47
48 - validates_format_of :email,
49 - :with => /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\Z/i,
48 + validates_format_of :email,
49 + :with => /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\Z/i,
50 50 :if => :email_validation?
51 - validate :uniqueness_of_email_from_activated_users,
51 + validate :uniqueness_of_email_from_activated_users,
52 52 :if => :email_validation?
53 - validate :enough_time_interval_between_same_email_registrations,
53 + validate :enough_time_interval_between_same_email_registrations,
54 54 :if => :email_validation?
55 55
56 56 # these are for ytopc
57 57 # disable for now
58 58 #validates_presence_of :province
59 59
60 60 attr_accessor :password
61 61
62 62 before_save :encrypt_new_password
63 63 before_save :assign_default_site
64 64 before_save :assign_default_contest
65 65
66 66 # this is for will_paginate
67 67 cattr_reader :per_page
68 68 @@per_page = 50
69 69
70 70 def self.authenticate(login, password)
71 71 user = find_by_login(login)
72 72 if user
73 73 return user if user.authenticated?(password)
74 74 end
75 75 end
76 76
77 77 def authenticated?(password)
78 78 if self.activated
79 79 hashed_password == User.encrypt(password,self.salt)
80 80 else
81 81 false
82 82 end
83 83 end
84 84
85 85 def login_with_name
86 86 "[#{login}] #{full_name}"
87 87 end
88 88
89 89 def admin?
90 90 has_role?('admin')
91 91 end
92 92
93 93 def has_role?(role)
94 94 self.roles.where(name: [role,'admin']).count > 0
95 95 end
96 96
97 97 def email_for_editing
98 98 if self.email==nil
99 99 "(unknown)"
100 100 elsif self.email==''
101 101 "(blank)"
102 102 else
103 103 self.email
104 104 end
105 105 end
106 106
107 107 def email_for_editing=(e)
108 108 self.email=e
109 109 end
110 110
111 111 def alias_for_editing
112 112 if self.alias==nil
113 113 "(unknown)"
114 114 elsif self.alias==''
115 115 "(blank)"
116 116 else
117 117 self.alias
118 118 end
119 119 end
120 120
121 121 def alias_for_editing=(e)
122 122 self.alias=e
123 123 end
124 124
125 125 def activation_key
126 126 if self.hashed_password==nil
127 127 encrypt_new_password
128 128 end
129 129 Digest::SHA1.hexdigest(self.hashed_password)[0..7]
130 130 end
131 131
132 132 def verify_activation_key(key)
133 133 key == activation_key
134 134 end
135 135
136 136 def self.random_password(length=5)
137 137 chars = 'abcdefghjkmnopqrstuvwxyz'
138 138 password = ''
139 139 length.times { password << chars[rand(chars.length - 1)] }
140 140 password
141 141 end
142 142
143 143
144 144 # Contest information
145 145
146 146 def self.find_users_with_no_contest()
147 147 users = User.all
148 148 return users.find_all { |u| u.contests.length == 0 }
149 149 end
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -1,82 +1,82
1 1 - content_for :head do
2 2 <meta http-equiv ="refresh" content="60"/>
3 3
4 4 %h1 Grader information
5 5
6 6 %p
7 7 = link_to 'Refresh', { :action => 'list' }, class: 'btn btn-info'
8 8
9 9 .panel.panel-primary
10 10 .panel-heading
11 11 Grader control:
12 12 .panel-body
13 - =link_to 'Start Graders in grading env', { action: 'start_grading'}, class: 'btn btn-default'
14 - =link_to 'Start Graders in exam env', { action: 'start_exam'}, class: 'btn btn-default'
15 - =link_to 'Stop all running Graders', { action: 'stop_all'}, class: 'btn btn-default'
16 - =link_to 'Clear all data', { action: 'clear_all'}, class: 'btn btn-default'
13 + =link_to 'Start Graders in grading env', { action: 'start_grading'}, class: 'btn btn-secondary'
14 + =link_to 'Start Graders in exam env', { action: 'start_exam'}, class: 'btn btn-secondary'
15 + =link_to 'Stop all running Graders', { action: 'stop_all'}, class: 'btn btn-secondary'
16 + =link_to 'Clear all data', { action: 'clear_all'}, class: 'btn btn-secondary'
17 17
18 18 .row
19 19 .col-md-6
20 20 - if @last_task
21 21 Last task:
22 22 = link_to "#{@last_task.id}", :action => 'view', :id => @last_task.id, :type => 'Task'
23 23
24 24 %br/
25 25
26 26 - if @last_test_request
27 27 Last test_request:
28 28 = link_to "#{@last_test_request.id}", :action => 'view', :id => @last_test_request.id, :type => 'TestRequest'
29 29
30 30 %h2 Current graders
31 31
32 32 = render :partial => 'grader_list', :locals => {:grader_list => @grader_processes}
33 33
34 34 %h2 Stalled graders
35 35
36 36 = render :partial => 'grader_list', :locals => {:grader_list => @stalled_processes}
37 37
38 38 %h2 Terminated graders
39 39
40 40 %p= link_to 'Clear data for terminated graders', { action: 'clear_terminated'}, class: 'btn btn-default', method: 'post'
41 41
42 42 = render :partial => 'grader_list', :locals => {:grader_list => @terminated_processes}
43 43 .col-md-6
44 44 %h2 Last 20 submissions
45 45 %table.table.table-striped.table-condensed
46 46 %thead
47 47 %th ID
48 48 %th User
49 49 %th Problem
50 50 %th Submitted
51 51 %th Graded
52 52 %th Result
53 53 %tbody
54 54 - @submission.each do |sub|
55 55 %tr.inactive
56 56 %td= link_to sub.id, submission_path(sub.id)
57 57 %td= ("" unless sub.user) || link_to(sub.try(:user).try(:full_name), stat_user_path(sub.user.id))
58 58 %td= ("" unless sub.problem) || link_to(sub.try(:problem).try(:full_name), stat_problem_path(sub.problem.id))
59 59 %td= "#{time_ago_in_words(sub.submitted_at)} ago"
60 60 %td= sub.graded_at ? "#{time_ago_in_words(sub.graded_at)} ago" : " "
61 61 %td= sub.grader_comment
62 62 %h2 Ungraded submission
63 63 %table.table.table-striped.table-condensed
64 64 %thead
65 65 %th ID
66 66 %th User
67 67 %th Problem
68 68 %th Submitted
69 69 %th Graded
70 70 %th Result
71 71 %tbody
72 72 - @backlog_submission.each do |sub|
73 73 %tr.inactive
74 74 %td= link_to sub.id, submission_path(sub.id)
75 75 %td= ("" unless sub.user) || link_to( sub.try(:user).try(:full_name), stat_user_path(sub.user.id))
76 76 %td= ("" unless sub.problem) || link_to( sub.try(:problem).try(:full_name), stat_problem_path(sub.problem.id))
77 77 %td= "#{time_ago_in_words(sub.submitted_at)} ago"
78 78 %td= sub.graded_at ? "#{time_ago_in_words(sub.graded_at)} ago" : " "
79 79 %td= sub.grader_comment
80 80
81 81
82 82
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -1,27 +1,7
1 - = form_for @group do |f|
2 - - if @group.errors.any?
3 - #error_explanation
4 - %h2= "#{pluralize(@group.errors.count, "error")} prohibited this group from being saved:"
5 - %ul
6 - - @group.errors.full_messages.each do |msg|
7 - %li= msg
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'
1 + .row
2 + .col-md-6
3 + = simple_form_for @group do |f|
4 + = f.input :name
5 + = f.input :description
6 + = f.input :enabled
7 + = f.button :submit, class: 'btn btn-primary'
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -1,7 +1,9
1 1 %h1 Editing group
2 2
3 3 = render 'form'
4 4
5 - = link_to 'Show', @group
6 - \|
7 - = link_to 'Back', groups_path
5 + .row.my-3
6 + .col-auto
7 + = link_to 'Edit members and problems', @group, class: 'btn btn-info'
8 + .col-auto
9 + = link_to 'Back', groups_path, class: 'btn btn-secondary'
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -1,24 +1,23
1 1 %h1 Groups
2 2
3 3 %p
4 - = link_to 'New Group', new_group_path, class: 'btn btn-primary'
4 + = link_to 'New Group', new_group_path, class: 'btn btn-success'
5 5 %table.table.table-hover
6 6 %thead
7 7 %tr
8 8 %th Name
9 9 %th Description
10 10 %th Enabled?
11 11 %th
12 - %th
13 -
14 12 %tbody
15 13 - @groups.each do |group|
16 14 %tr{:class => "#{(group.enabled?) ? "success" : "danger"}", id: "group-#{group.id}"}
17 15 %td= group.name
18 16 %td= group.description
19 - %td= toggle_button(group.enabled?, toggle_group_path(group), "group-enabled-#{group.id}", size: ' ', block: ' ')
20 - %td= link_to 'View', group, class: 'btn btn-default'
21 - %td= link_to 'Destroy', group, :method => :delete, :data => { :confirm => 'Are you sure?' }, class: 'btn btn-danger'
17 + %td= toggle_button(group.enabled?, toggle_group_path(group), "group-enabled-#{group.id}", block: ' ')
18 + %td
19 + = link_to 'Edit members and problems', group, class: 'btn btn-secondary btn-sm'
20 + = link_to 'Destroy', group, :method => :delete, :data => { :confirm => 'Are you sure?' }, class: 'btn btn-danger btn-sm'
22 21
23 22 %br
24 23
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -1,82 +1,92
1 - .container-fluid
2 - .row
3 - .col-md-6
4 - %h1 Group #{@group.name}
5 - .row
6 - .col-md-6
7 - %b Description:
8 - = @group.description
9 - %br
10 - = link_to 'Edit', edit_group_path(@group), class: 'btn btn-primary'
11 - .row
12 - .col-md-12
13 - %h1 Group details
14 - .row
15 - .col-md-6
16 - .panel.panel-default
17 - .panel-heading
18 - .panel-title Users in this group
19 - .panel-body
20 - %ul
21 - %li
22 - If you want to add several users to a group, it may be easier to just re-import those users in
23 - = link_to 'New list of users', new_list_user_admin_index_path
24 - page. You can also use
25 - = link_to 'Bulk Manage User', bulk_manage_user_admin_index_path
26 - page.
27 - =form_tag add_user_group_path(@group), class: 'form-inline' do
28 - .form-group
29 - =label_tag :user_id, "User"
1 + .row.mb-3
2 + .col-md-6
3 + %h1 Editing Group members and problems
4 + .row.mb-3
5 + .col-md-6
6 + %b Name:
7 + = @group.name
8 + .row.mb-3
9 + .col-md-6
10 + %b Description:
11 + = @group.description
12 + .row.mb-3
13 + .col-md-6
14 + = link_to 'Edit', edit_group_path(@group), class: 'btn btn-primary'
15 + .row.mb-3
16 + .col-md-12
17 + %h1 Group details
18 + .row
19 + .col-md-6
20 + .card
21 + .card-header
22 + Users in this group
23 + .card-body
24 + %ul
25 + %li
26 + If you want to add several users to a group, it may be easier to just re-import those users in
27 + = link_to 'New list of users', new_list_user_admin_index_path
28 + page. You can also use
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 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
35 - %thead
36 - %tr
37 - %th Login
38 - %th Full name
39 - %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'
41 + %table.table.table-hover
42 + %thead
43 + %tr
44 + %th Login
45 + %th Full name
46 + %th Remark
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
43 - - @group.users.each do |user|
44 - %tr
45 - %td= user.login
46 - %td= user.full_name
47 - %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'
49 - .col-md-6
50 - .panel.panel-default
51 - .panel-heading
52 - .panel-title Problems
53 - .panel-body
54 - %ul
55 - %li
56 - 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
58 - page
59 - =form_tag add_problem_group_path(@group), class: 'form-inline' do
60 - .form-group
61 - =label_tag :problem_id, "Problem"
49 + %tbody
50 + - @group.users.each do |user|
51 + %tr
52 + %td= user.login
53 + %td= user.full_name
54 + %td= user.remark
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'
56 + .col-md-6
57 + .card
58 + .card-header
59 + Problems
60 + .card-body
61 + %ul
62 + %li
63 + If you want to add several problem to a group, it may be easier to bulk manage them in the
64 + = link_to 'Bulk Manage Problems', manage_problems_path
65 + page
66 + =form_tag add_problem_group_path(@group) do
67 + .row
68 + .col-auto
69 + =label_tag :problem_id, "Problem",class: 'col-form-label'
70 + .col-auto
62 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
67 - %thead
68 - %tr
69 - %th name
70 - %th Full name
71 - %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'
76 + %table.table.table-hover
77 + %thead
78 + %tr
79 + %th name
80 + %th Full name
81 + %th Full score
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
75 - - @group.problems.each do |problem|
76 - %tr
77 - %td= problem.name
78 - %td= problem.full_name
79 - %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'
84 + %tbody
85 + - @group.problems.each do |problem|
86 + %tr
87 + %td= problem.name
88 + %td= problem.full_name
89 + %td= problem.full_score
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
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -42,114 +42,115
42 42 = @summary[:count]
43 43 .row
44 44 .col-sm-6
45 45 Solved/Attempted User
46 46 .col-sm-6
47 47 #{@summary[:solve]}/#{@summary[:attempt]} (#{(@summary[:solve]*100.0/@summary[:attempt]).round(1)}%)
48 48 .row.mb-3
49 49 .col-md-4
50 50 .card
51 51 .card-body
52 52 %h2.card-title Model submission
53 53 %table.table.table-hover
54 54 %thead
55 55 %tr
56 56 %th #Sub (lang)
57 57 %th Author
58 58 %tbody
59 59 - @model_subs.each do |sub|
60 60 %tr
61 61 %td
62 62 = link_to "##{sub.id}", submission_path(sub)
63 63 = "(#{sub.language.pretty_name})"
64 64 %td= sub.user.full_name
65 65 .col-md-8
66 66 - if @best
67 67 .card
68 68 .card-body
69 69 %h2.card-title Top Submissions
70 70 %table.table.table-hover
71 71 %thead
72 72 %tr
73 73 %th Language
74 74 %th Best runtime (ms)
75 75 %th Best memory (kbytes)
76 76 %th Shortest Code (bytes)
77 77 %th First solver
78 78 %tbody
79 79 %tr.bg-warning
80 80 %td
81 81 Overall
82 82 %td
83 83 by #{link_to @best[:runtime][:user], stat_user_path(@best[:runtime][:user_id])}
84 84 %br
85 85 using <span class="text-success">#{@best[:runtime][:lang]}</span>
86 86 %br
87 87 with <span class="text-success">#{@best[:runtime][:value] * 1000} milliseconds</span>
88 88 %br= link_to "#" + @best[:runtime][:sub_id].to_s, submission_path(@best[:runtime][:sub_id])
89 89 %td
90 90 by #{link_to @best[:memory][:user], stat_user_path(@best[:memory][:user_id])}
91 91 %br
92 92 using <span class="text-success">#{@best[:memory][:lang]}</span>
93 93 %br
94 94 with <span class="text-success">#{number_with_delimiter(@best[:memory][:value])} kbytes </span>
95 95 %br= link_to "#" + @best[:memory][:sub_id].to_s, submission_path(@best[:memory][:sub_id])
96 96 %td
97 97 by #{link_to @best[:length][:user], stat_user_path(@best[:length][:user_id])}
98 98 %br
99 99 using <span class="text-success">#{@best[:length][:lang]}</span>
100 100 %br
101 101 with <span class="text-success">#{@best[:length][:value]} bytes</span>
102 102 %br= link_to "#" + @best[:length][:sub_id].to_s, submission_path(@best[:length][:sub_id])
103 103 %td
104 104 - if @best[:first][:user] != '(NULL)'
105 105 #{link_to @best[:first][:user], stat_user_path(@best[:first][:user_id])} is the first solver
106 106 %br
107 107 using <span class="text-success">#{@best[:first][:lang]}</span>
108 108 %br
109 109 on <span class="text-success">#{@best[:first][:value]}</span>
110 110 %br= link_to "#" + @best[:first][:sub_id].to_s, submission_path( @best[:first][:sub_id])
111 111 - else
112 112 no first solver
113 113 - @by_lang.each do |lang,value|
114 114 %tr
115 115 %td= lang
116 116 %td
117 117 = link_to value[:runtime][:user], stat_user_path(value[:runtime][:user_id])
118 118 %br
119 119 = "#{(value[:runtime][:value] * 1000).to_i} @"
120 120 = link_to "#" + value[:runtime][:sub_id].to_s, submission_path( value[:runtime][:sub_id])
121 121 %td
122 122 = link_to value[:memory][:user], stat_user_path( value[:memory][:user_id])
123 123 %br
124 124 = "#{number_with_delimiter(value[:memory][:value])} @"
125 125 = link_to "#" + value[:memory][:sub_id].to_s, submission_path(value[:memory][:sub_id])
126 126 %td
127 127 = link_to value[:length][:user], stat_user_path(value[:length][:user_id])
128 128 %br
129 129 = "#{value[:length][:value]} @"
130 130 = link_to "#" + value[:length][:sub_id].to_s, submission_path(value[:length][:sub_id])
131 131 %td
132 132 - if value[:first][:user] != '(NULL)' #TODO: i know... this is wrong...
133 133 = link_to value[:first][:user], stat_user_path(value[:first][:user_id])
134 134 %br
135 135 = "#{value[:first][:value]} @"
136 136 = link_to "#" + value[:first][:sub_id].to_s, submission_path( value[:first][:sub_id])
137 137
138 - %script{src:"https://cdn.jsdelivr.net/npm/chart.js"}
139 138 :javascript
140 - data = #{@chart_dataset}
141 - config = {
142 - type: 'bar',
143 - data: data,
144 - options: {
145 - plugins: {
146 - legend: {
147 - display: false
139 + $(document).on('import-map-loaded',(e) => {
140 + data = #{@chart_dataset}
141 + config = {
142 + type: 'bar',
143 + data: data,
144 + options: {
145 + plugins: {
146 + legend: {
147 + display: false
148 + },
148 149 },
149 - },
150 + }
150 151 }
151 - }
152 - Chart.defaults.font.size = 15
153 - //Chart.defaults.font.family = 'Sarabun Light'
154 - chart = new Chart($('#chart'),config)
152 + Chart.defaults.font.size = 15
153 + //Chart.defaults.font.family = 'Sarabun Light'
154 + chart = new Chart($('#chart'),config)
155 + });
155 156
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -1,101 +1,91
1 1 %h1 Users
2 2
3 3 .card.border-success.mb-3
4 4 .card-header.text-bg-success.border-success
5 5 Quick Add
6 6 .card-body
7 7 = form_with url: user_admin_index_path, scope: :user, class: 'row row-cols-lg-auto g-3 align-items-center' do |f|
8 8 .col-12
9 9 = f.text_field 'login', :size => 10,class: 'form-control', placeholder: 'login'
10 10 .form-group
11 11 = f.text_field 'full_name', :size => 10,class: 'form-control', placeholder: 'full name'
12 12 .form-group
13 13 = f.password_field 'password', :size => 10,class: 'form-control', placeholder: 'password'
14 14 .form-group
15 15 = f.password_field 'password_confirmation', :size => 10,class: 'form-control', placeholder: 'password confirmation'
16 16 .form-group
17 17 = f.text_field 'email', :size => 10,class: 'form-control', placeholder: 'email'
18 18 =submit_tag "Create", class: 'btn btn-success align-items-bottom'
19 19
20 20 .card.border-success.mb-3
21 21 .card-header.text-bg-success.border-success
22 22 Import from site management
23 23 .card-body
24 24 = form_with url: import_user_admin_index_path, :multipart => true do |f|
25 25 .row
26 26 .col-auto
27 27 = f.label :file, 'File:', class: 'col-form-label'
28 28 .col-auto
29 29 = f.file_field :file, class: 'form-control'
30 30 .col-auto
31 31 = f.submit 'Submit', class: 'btn btn-secondary'
32 32
33 33
34 34 %p
35 35 = link_to '+ New user', { :action => 'new' }, { class: 'btn btn-success '}
36 36 = link_to '+ New list of users', { :action => 'new_list' }, { class: 'btn btn-success '}
37 37 = link_to 'Bulk Manage', { action: :bulk_manage} , { class: 'btn btn-secondary btn-info'}
38 38 = link_to 'View administrators',{ :action => 'admin'}, { class: 'btn btn-secondary '}
39 39 = link_to 'Random passwords',{ :action => 'random_all_passwords'}, { class: 'btn btn-secondary '}
40 40 = link_to 'View active users',{ :action => 'active'}, { class: 'btn btn-secondary '}
41 41 = link_to 'Mass mailing',{ :action => 'mass_mailing'}, { class: 'btn btn-secondary '}
42 42
43 43 - if GraderConfiguration.multicontests?
44 44 %br/
45 45 %b Multi-contest:
46 46 = link_to '[Manage bulk users in contests]', :action => 'contest_management'
47 47 View users in:
48 48 - @contests.each do |contest|
49 49 = link_to "[#{contest.name}]", :action => 'contests', :id => contest.id
50 50 = link_to "[no contest]", :action => 'contests', :id => 'none'
51 51
52 - -# Total #{@user_count} users |
53 - -# - if !@paginated
54 - -# Display all users.
55 - -# \#{link_to '[show in pages]', :action => 'index', :page => '1'}
56 - -# - else
57 - -# Display in pages.
58 - -# \#{link_to '[display all]', :action => 'index', :page => 'all'} |
59 - -# \#{will_paginate @users, :container => false}
60 -
61 -
62 52 %table.table.table-hover.table-condense.datatable
63 53 %thead
64 54 %th Login
65 55 %th Full name
66 56 %th email
67 57 %th Remark
68 58 %th
69 59 Activated
70 60 %sup{class: 'text-primary',data: {toggle: 'tooltip', placement: 'top'}, title: 'User has already confirmed the email?' } [?]
71 61 %th
72 62 Enabled
73 63 %sup{class: 'text-primary',data: {toggle: 'tooltip', placement: 'top'}, title: 'Allow the user to login?' } [?]
74 64 %th Last IP
75 65 %th
76 66 %th
77 67 %th
78 68 %th
79 69 - for user in @users
80 70 %tr
81 71 %td= link_to user.login, stat_user_path(user)
82 72 %td= user.full_name
83 73 %td= user.email
84 74 %td= user.remark
85 75 %td= toggle_button(user.activated?, toggle_activate_user_path(user),"toggle_activate_user_#{user.id}")
86 76 %td= toggle_button(user.enabled?, toggle_enable_user_path(user),"toggle_enable_user_#{user.id}")
87 77 %td= user.last_ip
88 - %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'
89 - %td= link_to 'Show', {:action => 'show', :id => user}, class: 'btn btn-default btn-xs btn-block'
90 - %td= link_to 'Edit', {:action => 'edit', :id => user}, class: 'btn btn-default btn-xs btn-block'
91 - %td= link_to 'Destroy', {action: :destroy, id: user}, data: {confirm: 'Are you sure?'}, method: :delete, class: 'btn btn-danger btn-xs btn-block'
78 + %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'
79 + %td= link_to 'Show', {:action => 'show', :id => user}, class: 'btn btn-secondary btn-sm btn-block'
80 + %td= link_to 'Edit', {:action => 'edit', :id => user}, class: 'btn btn-secondary btn-sm btn-block'
81 + %td= link_to 'Destroy', {action: :destroy, id: user}, data: {confirm: 'Are you sure?'}, method: :delete, class: 'btn btn-danger btn-sm btn-block'
92 82 %br/
93 83 = link_to '+ New user', { :action => 'new' }, { class: 'btn btn-success '}
94 84 = link_to '+ New list of users', { :action => 'new_list' }, { class: 'btn btn-success '}
95 85
96 86 :javascript
97 87 $(document).on('import-map-loaded',(e) => {
98 88 $('.datatable').DataTable({
99 89 'pageLength': 50
100 90 });
101 91 })
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -1,57 +1,58
1 1 # Pin npm packages by running ./bin/importmap
2 2
3 3 #entry point
4 4 pin "application"
5 5 pin "prepend_jquery"
6 6 #pin "my_sprocket"
7 7 pin_all_from "app/javascript/controllers", under: "controllers"
8 8
9 9 #we don't need jquery in importmap because we use sprocket version
10 10 #pin "jquery", to: 'my_jquery.js', preload: true
11 11 #pin "bootstrap", to: "bootstrap.bundle.min.js", preload: true
12 12 #no need popper, because bundled already in bootstrap
13 13 #pin "@popperjs/core", to: "https://ga.jspm.io/npm:@popperjs/core@2.11.6/lib/index.js"
14 14
15 15 # datatable
16 16 # I have to fix vfs_font.js for this to work
17 17 pin "jszip", to: "jszip.min.js"
18 18 pin "pdfmake"
19 19 pin "pdfmake-vfs", to: 'datatables/pdfmake-0.1.36/vfs_fonts.js'
20 20
21 21 pin "datatables-bundle", to: 'datatables/datatables.js'
22 22 pin "datatables", to: "datatables/DataTables-1.12.1/js/jquery.dataTables.js"
23 23 pin "datatables-bs5", to: "datatables/DataTables-1.12.1/js/dataTables.bootstrap5.js"
24 24 pin "datatables-editor", to: "datatables/Editor-2.0.9/js/dataTables.editor.js"
25 25 pin "datatables-editor-bs5", to: "datatables/Editor-2.0.9/js/editor.bootstrap5.min.js"
26 26 pin "datatables-autofill", to: "datatables/AutoFill-2.4.0/js/dataTables.autoFill.js"
27 27 pin "datatables-autofill-bs5", to: "datatables/AutoFill-2.4.0/js/autoFill.bootstrap5.js"
28 28 pin "datatables-button", to: "datatables/Buttons-2.2.3/js/dataTables.buttons.js"
29 29 pin "datatables-button-bs5", to: "datatables/Buttons-2.2.3/js/buttons.bootstrap5.js"
30 30 pin "datatables-button-colvis", to: "datatables/Buttons-2.2.3/js/buttons.colVis.js"
31 31 pin "datatables-button-html5", to: "datatables/Buttons-2.2.3/js/buttons.html5.js"
32 32 pin "datatables-button-print", to: "datatables/Buttons-2.2.3/js/buttons.print.js"
33 33 pin "datatables-colrecorder", to: "datatables/ColReorder-1.5.6/js/dataTables.colReorder.js"
34 34 pin "datatables-datetime", to: "datatables/DateTime-1.1.2/js/dataTables.dateTime.js"
35 35 pin "datatables-fixedcolumns", to: "datatables/FixedColumns-4.1.0/js/dataTables.fixedColumns.js"
36 36 pin "datatables-fixedheader", to: "datatables/FixedHeader-3.2.4/js/dataTables.fixedHeader.js"
37 37 pin "datatables-keytable", to: "datatables/KeyTable-2.7.0/js/dataTables.keyTable.js"
38 38 pin "datatables-responsive", to: "datatables/Responsive-2.3.0/js/dataTables.responsive.js"
39 39 pin "datatables-responsive-bs5", to: "datatables/Responsive-2.3.0/js/responsive.bootstrap5.js"
40 40 pin "datatables-rowgroup", to: "datatables/RowGroup-1.2.0/js/dataTables.rowGroup.js"
41 41 pin "datatables-rowreorder", to: "datatables/RowReorder-1.2.8/js/dataTables.rowReorder.js"
42 42 pin "datatables-scroller", to: "datatables/Scroller-2.0.7/js/dataTables.scroller.js"
43 43 pin "datatables-searchbuilder", to: "datatables/SearchBuilder-1.3.4/js/dataTables.searchBuilder.js"
44 44 pin "datatables-searchbuilder-bs5", to: "datatables/SearchBuilder-1.3.4/js/searchBuilder.bootstrap5.js"
45 45 pin "datatables-searchpanes", to: "datatables/SearchPanes-2.0.2/js/dataTables.searchPanes.js"
46 46 pin "datatables-searchpanes-bs5", to: "datatables/SearchPanes-2.0.2/js/searchPanes.bootstrap5.js"
47 47 pin "datatables-select", to: "datatables/Select-1.4.0/js/dataTables.select.js"
48 48 pin "datatables-staterestore", to: "datatables/StateRestore-1.1.1/js/dataTables.stateRestore.js"
49 49 pin "datatables-staterestore-bs5", to: "datatables/StateRestore-1.1.1/js/stateRestore.bootstrap5.js"
50 50
51 51 #select2
52 52 pin "select2", to: "select2.min.js"
53 53
54 54 #my local js
55 55 pin "custom", to: "custom.js"
56 56
57 57 #pin "ace-rails-ap"
58 + pin "chart", to: 'chart.js' # @3.9.1
You need to be logged in to leave comments. Login now