cafe-grader-web Commit - r875:567f1ebe063b

cafe-grader-web

Commit `r875:567f1ebe063b` public

parent | child

Description:

user admin

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

r875:567f1ebe063b - Mon, 26 Sep 2022 21:05:12 - 8 files changed: 80 inserted, 78 deleted

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
                   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
                   contest = Contest.find(params[:contest][:id])
                   if !contest
                     flash[:notice] = 'You did not choose the contest.'
                     redirect_to :action => 'contest_management' and return
                   end
                   operation = params[:operation]
                   if not ['add','remove','assign'].include? operation
                     flash[:notice] = 'You did not choose the operation to perform.'
                     redirect_to :action => 'contest_management' and return
                   end
                   lines = params[:login_list]
                   if !lines or lines.blank?
                     flash[:notice] = 'You entered an empty list.'
                     redirect_to :action => 'contest_management' and return
                   end
                   note = []
                   users = []
                   lines.split("\n").each do |line|
                     user = User.find_by_login(line.chomp)
                     if user
                       if operation=='add'
                         if ! user.contests.include? contest
                           user.contests << contest
                         end
                       elsif operation=='remove'
                         user.contests.delete(contest)
                       else
                         user.contests = [contest]
                       end
                       if params[:reset_timer]
                         user.contest_stat.forced_logout = true
                         user.contest_stat.reset_timer_and_save
                       end
                       if params[:notification_emails]
                         send_contest_update_notification_email(user, contest)
                       end
                       note << user.login
                       users << user
                     end
                   end
                   if params[:reset_timer]
                     logout_users(users)
                   end
                   flash[:notice] = 'User(s) ' + note.join(', ') +
                     ' were successfully modified.  '
                   redirect_to :action => 'contest_management'
                 end
                 # admin management
                 def admin
                   @admins = Role.where(name: 'admin').take.users
                   @tas = Role.where(name: 'ta').take.users
                 end
                 def modify_role
                   user = User.find_by_login(params[:login])
                   role = Role.find_by_name(params[:role])
                   unless user && role
                     flash[:error] = 'Unknown user or role'
                     redirect_to admin_user_admin_index_path
                     return
                   end
                   if params[:commit] == 'Grant'
                     #grant role
                     user.roles << role
                     flash[:notice] = "User '#{user.login}' has been granted the role '#{role.name}'"
                   else
                     #revoke role
                     if user.login == 'root' && role.name == 'admin'
                       flash[:error] = 'You cannot revoke admisnistrator permission from root.'
                       redirect_to admin_user_admin_index_path
                       return
                     end
                     user.roles.delete(role)
                     flash[:notice] = "The role '#{role.name}' has been revoked from User '#{user.login}'"
                   end
                   redirect_to admin_user_admin_index_path
                 end
                 # mass mailing
                 def mass_mailing
                 end
                 def bulk_mail
                   lines = params[:login_list]
                   if !lines or lines.blank?
                     flash[:notice] = 'You entered an empty list.'
                     redirect_to :action => 'mass_mailing' and return
                   end
                   mail_subject = params[:subject]
                   if !mail_subject or mail_subject.blank?
                     flash[:notice] = 'You entered an empty mail subject.'
                     redirect_to :action => 'mass_mailing' and return
                   end
                   mail_body = params[:email_body]
                   if !mail_body or mail_body.blank?
                     flash[:notice] = 'You entered an empty mail body.'
                     redirect_to :action => 'mass_mailing' and return
                   end
                   note = []
                   users = []
                   lines.split("\n").each do |line|
                     user = User.find_by_login(line.chomp)
                     if user
                       send_mail(user.email, mail_subject, mail_body)
                       note << user.login
                     end
                   end
                   flash[:notice] = 'User(s) ' + note.join(', ') +
                     ' were successfully modified.  '
                   redirect_to :action => 'mass_mailing'
                 end
                 #bulk manage
                 def bulk_manage
                   begin
                     if params[:filter_group]
                       @users = Group.find_by(id: params[:filter_group_id]).users
                     else
                       @users = User.all
                     end
                     @users = @users.where('(login REGEXP ?) OR (remark REGEXP ?)',params[:regex],params[:regex]) unless params[:regex].blank?
                     @users.count if @users #test the sql
                   rescue Exception
                     flash[:error] = 'Regular Expression is malformed'
                     @users = nil
                   end
                   if params[:commit]
                     @action = {}
                     @action[:set_enable] = params[:enabled]
                     @action[:enabled] = params[:enable] == "1"
                     @action[:gen_password] = params[:gen_password]
                     @action[:add_group] = params[:add_group]
                     @action[:group_name] = params[:group_name]
                   end
                   if params[:commit] == "Perform"
                     if @action[:set_enable]
                       @users.update_all(enabled: @action[:enabled])
                     end
                     if @action[:gen_password]
                       @users.each do |u|
                         password = random_password
                         u.password = password
                         u.password_confirmation = password
                         u.save
                       end
                     end
                     if @action[:add_group] and @action[:group_name]
                       @group = Group.find(@action[:group_name])
                       ok = []
                       failed = []

app/helpers/application_helper.rb ¶ -10

               # Methods added to this helper will be available to all templates in the application.
               module ApplicationHelper
                 #new bootstrap header
                 def navbar_user_header
                   left_menu = ''
                   right_menu = ''
                   user = User.find(session[:user_id])
                   if (user!=nil) and (GraderConfiguration.show_tasks_to?(user))
                     left_menu << add_menu("#{I18n.t 'menu.tasks'}", 'tasks', 'list')
                     left_menu << add_menu("#{I18n.t 'menu.submissions'}", 'main', 'submission')
                     left_menu << add_menu("#{I18n.t 'menu.test'}", 'test', 'index')
                   end
                   if GraderConfiguration['right.user_hall_of_fame']
                     left_menu << add_menu("#{I18n.t 'menu.hall_of_fame'}", 'report', 'problem_hof')
                   end
                   right_menu << add_menu("#{content_tag(:span,'',class: 'glyphicon glyphicon-question-sign')}".html_safe, 'main', 'help')
                   right_menu << add_menu("#{content_tag(:span,'',class: 'glyphicon glyphicon-comment')}".html_safe, 'messages', 'list', {title: I18n.t('menu.messages'), data: {toggle: 'tooltip'}})
                   if GraderConfiguration['system.user_setting_enabled']
                     right_menu << add_menu("#{content_tag(:span,'',class: 'glyphicon glyphicon-cog')}".html_safe, 'users', 'index', {title: I18n.t('menu.settings'), data: {toggle: 'tooltip'}})
                   end
                   right_menu << add_menu("#{content_tag(:span,'',class: 'glyphicon glyphicon-log-out')} #{user.full_name}".html_safe, 'main', 'login', {title: I18n.t('menu.log_out'), data: {toggle: 'tooltip'}})
                   result = content_tag(:ul,left_menu.html_safe,class: 'nav navbar-nav') + content_tag(:ul,right_menu.html_safe,class: 'nav navbar-nav navbar-right')
                 end
                 def add_menu(title, controller, action, html_option = {})
                   link_option = {controller: controller, action: action}
                   html_option[:class] = (html_option[:class] || '') + " active" if current_page?(link_option)
                   content_tag(:li, link_to(title,link_option),html_option)
                 end
                 def user_header
                   menu_items = ''
                   user = User.find(session[:user_id])
                   if (user!=nil) and (session[:admin])
                     # admin menu
                     menu_items << "<b>Administrative task:</b> "
                     append_to menu_items, '[Announcements]', 'announcements', 'index'
                     append_to menu_items, '[Msg console]', 'messages', 'console'
                     append_to menu_items, '[Problems]', 'problems', 'index'
                     append_to menu_items, '[Users]', 'user_admin', 'index'
                     append_to menu_items, '[Results]', 'user_admin', 'user_stat'
                     append_to menu_items, '[Report]', 'report', 'multiple_login'
                     append_to menu_items, '[Graders]', 'graders', 'list'
                     append_to menu_items, '[Contests]', 'contest_management', 'index'
                     append_to menu_items, '[Sites]', 'sites', 'index'
                     append_to menu_items, '[System config]', 'configurations', 'index'
                     menu_items << "<br/>"
                   end
                   # main page
                   append_to menu_items, "[#{I18n.t 'menu.main'}]", 'main', 'list'
                   append_to menu_items, "[#{I18n.t 'menu.messages'}]", 'messages', 'list'
                   if (user!=nil) and (GraderConfiguration.show_tasks_to?(user))
                     append_to menu_items, "[#{I18n.t 'menu.tasks'}]", 'tasks', 'list'
                     append_to menu_items, "[#{I18n.t 'menu.submissions'}]", 'main', 'submission'
                     append_to menu_items, "[#{I18n.t 'menu.test'}]", 'test', 'index'
                   end
                   if GraderConfiguration['right.user_hall_of_fame']
                     append_to menu_items, "[#{I18n.t 'menu.hall_of_fame'}]", 'report', 'problem_hof'
                   end
                   append_to menu_items, "[#{I18n.t 'menu.help'}]", 'main', 'help'
                   if GraderConfiguration['system.user_setting_enabled']
                     append_to menu_items, "[#{I18n.t 'menu.settings'}]", 'users', 'index'
                   end
                   append_to menu_items, "[#{I18n.t 'menu.log_out'}]", 'main', 'login'
                   menu_items.html_safe
                 end
                 def append_to(option,label, controller, action)
                   option << ' ' if option!=''
                   option << link_to_unless_current(label,
                                                    :controller => controller,
                                                    :action => action)
                 end
                 def format_short_time(time)
                   now = Time.zone.now
                   st = ''
                   if (time.yday != now.yday) or (time.year != now.year)
                     st = time.strftime("%d/%m/%y ")
                   end
                   st + time.strftime("%X")
                 end
                 def format_short_duration(duration)
                   return '' if duration==nil
                   d = duration.to_f
                   return Time.at(d).gmtime.strftime("%X")
                 end
                 def format_full_time_ago(time)
                   st = time_ago_in_words(time) + ' ago (' + format_short_time(time) + ')'
                 end
                 def read_textfile(fname,max_size=2048)
                   begin
                     File.open(fname).read(max_size)
                   rescue
                     nil
                   end
                 end
                 def toggle_button(on,toggle_url,id, option={})
                   btn_size = option[:size] || 'btn-sm'
                   btn_block = option[:block] || 'btn-block'
                   link_to (on ? "Yes" : "No"), toggle_url,
                     {class: "btn #{btn_block} #{btn_size} btn-#{on ? 'success' : 'outline-secondary'} ajax-toggle",
                       id: id,
                       data: {remote: true, method: 'get'}}
                 end
                 def get_ace_mode(language)
                   # return ace mode string from Language
                   case language.pretty_name
                     when 'Pascal'
                       'ace/mode/pascal'
                     when 'C++','C'
                       'ace/mode/c_cpp'
                     when 'Ruby'
                       'ace/mode/ruby'
                     when 'Python'
                       'ace/mode/python'
                     when 'Java'
                       'ace/mode/java'
                     else
                       'ace/mode/c_cpp'
                   end
                 end
                 def user_title_bar(user)
                   header = ''
                   time_left = ''
                   #
                   # if the contest is over
                   if GraderConfiguration.time_limit_mode?
                     if user.contest_finished?
                       header = <<CONTEST_OVER
               <tr><td colspan="2" align="center">
               <span class="contest-over-msg">THE CONTEST IS OVER</span>
               </td></tr>
               CONTEST_OVER
                     end
                     if !user.contest_started?
                       time_left = "&nbsp;&nbsp;" + (t 'title_bar.contest_not_started')
                     else
                       time_left = "&nbsp;&nbsp;" + (t 'title_bar.remaining_time') +
                         " #{format_short_duration(user.contest_time_left)}"
                     end
                   end
                   #
                   # if the contest is in the anaysis mode
                   if GraderConfiguration.analysis_mode?
                     header = <<ANALYSISMODE
               <tr><td colspan="2" align="center">
               <span class="contest-over-msg">ANALYSIS MODE</span>
               </td></tr>
               ANALYSISMODE
                   end
                   contest_name = GraderConfiguration['contest.name']
                   #
                   # build real title bar
                   result = <<TITLEBAR
               <div class="title">
               <table>
               #{header}
               <tr>
               <td class="left-col">
               <br/>
               </td>
               <td class="right-col">#{contest_name}</td>
               </tr>
               </table>
               </div>
               TITLEBAR
                   result.html_safe
                 end
                 def markdown(text)
                   markdown = RDiscount.new(text)
                   markdown.to_html.html_safe
                 end
                 BOOTSTRAP_FLASH_MSG = {
                   success: 'alert-success',
                   error: 'alert-danger',
                   alert: 'alert-danger',
                   notice: 'alert-info'
                 }
                 def bootstrap_class_for(flash_type)
                   BOOTSTRAP_FLASH_MSG.fetch(flash_type.to_sym, flash_type.to_s)
                 end
-            -   def flash_messages
-            -     flash.each do |msg_type, message|
-            -       concat(content_tag(:div, message, class: "alert #{bootstrap_class_for(msg_type)} fade in") do
-            -               concat content_tag(:button, 'x', class: "close", data: { dismiss: 'alert' })
-            -               concat message
-            -             end)
-            -     end
-            -     nil
-            -   end
               end

app/javascript/application.js ¶ +4 -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"
               //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/views/layouts/application.html.haml ¶ +4 -1

               <!DOCTYPE html>
               %html
               %head
                 %title= GraderConfiguration['contest.name']
                 = stylesheet_link_tag "application", params[:controller], :media => "all"
                 = csrf_meta_tags
                 = csp_meta_tag
                 = javascript_include_tag :my_app
                 -# = javascript_import_module_tag('prepend_jquery')
                 = javascript_importmap_tags
                 = content_for :header
                 = yield :head
                 -# %link{href:"https://cdn.jsdelivr.net/npm/bootstrap@5.2.1/dist/css/bootstrap.min.css",rel:"stylesheet",integrity:"sha384-iYQeCzEYFbKjA/T2uDLTpkwGzCiq6soy8tYaI1GyVh/UjpbCx/TYkiZhlZB6+fzT",crossorigin:"anonymous"}
                 -# %script{src:"https://cdn.jsdelivr.net/npm/@popperjs/core@2.11.6/dist/umd/popper.min.js",integrity:"sha384-oBqDVmMz9ATKxIep9tiCxS/Z9fNfEXiDAYTujMAeBAsjFuCZSmKbSSUnQlmh/jp3",crossorigin:"anonymous"}
                 -# %script{src:"https://cdn.jsdelivr.net/npm/bootstrap@5.2.1/dist/js/bootstrap.bundle.min.js",integrity:"sha384-7VPbUDkoPSGFnVtYi0QogXtr74QeVeeIs99Qfg5YCF+TidwNdjvaKZX19NZ/e6oz",crossorigin:"anonymous"}
                 <link rel="preconnect" href="https://fonts.googleapis.com">
                 <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
                 -#
                   <link href="https://fonts.googleapis.com/css2?family=Bai+Jamjuree:ital,wght@0,200;0,400;0,600;1,200;1,400;1,600&family=Krub:ital,wght@0,200;0,400;0,600;1,200;1,400;1,600&family=Sarabun:ital,wght@0,200;0,400;0,600;1,200;1,400;1,600&display=swap" rel="stylesheet">
                   <link href="https://fonts.googleapis.com/css2?family=Mitr:ital,wght@0,300;1,300&family=Kodchasan:ital,wght@0,200;0,400;0,600;1,200;1,400;1,600&family=Noto+Serif+Thai:ital,wght@0,200;0,400;0,600;1,200;1,400;1,600&family=Noto+Sans+Thai:ital,wght@0,200;0,400;0,600;1,200;1,400;1,600&display=swap" rel="stylesheet">
                   <link href="https://fonts.googleapis.com/css2?family=Noto+Serif+Thai:ital,wght@0,200;0,400;0,600;1,200;1,400;1,600&family=Noto+Sans+Thai:ital,wght@0,200;0,400;0,600;1,200;1,400;1,600&display=swap" rel="stylesheet">
                 <link href="https://fonts.googleapis.com/css2?family=Noto+Serif+Thai:ital,wght@0,300;0,400;0,500;1,300;1,400;1,500&display=swap" rel="stylesheet">
                 <link href="https://fonts.googleapis.com/css2?family=Noto+Sans+Thai:ital,wght@0,300;0,400;0,500;1,300;1,400;1,500&display=swap" rel="stylesheet">
                 <link href="https://fonts.googleapis.com/css2?family=Sarabun:ital,wght@0,300;0,400;0,500;1,300;1,400;1,500&display=swap" rel="stylesheet">
               %body
                 - unless local_assigns[:skip_header]
                   = render 'layouts/header'
                 /= content_tag(:p,flash[:notice],class: 'alert alert-success') if flash[:notice]!=nil
                 .container-fluid
-            -     = flash_messages
+            +     - flash.each do |msg_type, message|
+            +       .alert.alert-dismissible.fade.show{class: bootstrap_class_for(msg_type)}
+            +         = message
+            +         %button.btn-close{type: 'button', 'data-bs-dismiss': :alert}
                   = yield

app/views/user_admin/_form.html.haml ¶ +17 -9

@@ -1,12 +1,20
1	= simple_form_for(@user) do \|f\|	1	= simple_form_for(@user) do \|f\|
2	= f.error_notification	2	= f.error_notification
3	- = f.input :login, label: 'Login'	3	+ .mb-2
4	- = f.input :~~full_name~~, label: '~~Full name~~'	4	+ = f.input :login, label: 'Login'
5	- = f.input :password	5	+ .mb-2
6	- = f.input :password_confirmation	6	+ = f.input :full_name, label: 'Full name'
7	- = f.input :email	7	+ .mb-2
8	- = f.input :~~alias~~	8	+ = f.input :password
9	- = f.input :remark	9	+ .mb-2
10	- = f.button :submit, class: 'btn btn-primary'	10	+ = f.input :password_confirmation
11	- = link_to 'Cancel', :back, class: 'btn btn-default'	11	+ .mb-2
		12	+ = f.input :email
		13	+ .mb-2
		14	+ = f.input :alias
		15	+ .mb-2
		16	+ = f.input :remark
		17	+ .mb-2
		18	+ = f.button :submit, class: 'btn btn-primary'
		19	+ = link_to 'Cancel', :back, class: 'btn btn-secondary'
12		20

app/views/user_admin/index.html.haml ¶ +30 -35

               %h1 Users
-            - .card.border-primary
+            + .card.border-success.mb-3
-            -   .card-header.text-bg-primary.border-primary
+            +   .card-header.text-bg-success.border-success
                   Quick Add
                 .card-body
-            -     = form_with url: 'asd', class: 'row row-cols-lg-auto g-3 align-items-center'  do |f|
+            +     = 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.label 'user_login', 'Login'
+            +         = f.text_field 'login', :size => 10,class: 'form-control', placeholder: 'login'
-            -         = f.text_field 'login', :size => 10,class: 'form-control'
                     .form-group
-            -         = f.label 'user_full_name', 'Full Name'
+            +         = f.text_field 'full_name', :size => 10,class: 'form-control', placeholder: 'full name'
-            -         = f.text_field 'full_name', :size => 10,class: 'form-control'
                     .form-group
-            -         = f.label 'user_password', 'Password'
+            +         = f.password_field 'password', :size => 10,class: 'form-control', placeholder: 'password'
-            -         = f.text_field 'password', :size => 10,class: 'form-control'
                     .form-group
-            -         = f.label 'user_password_confirmation', 'Confirm'
+            +         = f.password_field 'password_confirmation', :size => 10,class: 'form-control', placeholder: 'password confirmation'
-            -         = f.text_field 'password_confirmation', :size => 10,class: 'form-control'
                     .form-group
-            -         = f.label 'user_email', 'email'
+            +         = f.text_field 'email', :size => 10,class: 'form-control', placeholder: 'email'
-            -         = f.text_field 'email', :size => 10,class: 'form-control'
+            +       =submit_tag "Create", class: 'btn btn-success align-items-bottom'
-            -       =submit_tag "Create", class: 'btn btn-primary align-items-bottom'
-            - .panel.panel-primary
+            + .card.border-success.mb-3
-            -   .panel-title.panel-heading
+            +   .card-header.text-bg-success.border-success
                   Import from site management
-            -   .panel-body
+            +   .card-body
-            -     = form_tag({:action => 'import'}, :multipart => true,class: 'form form-inline') do
+            +     = form_with url: import_user_admin_index_path, :multipart => true do |f|
-            -       .form-group
+            +       .row
-            -         = label_tag :file, 'File:'
+            +         .col-auto
-            -         .input-group
+            +           = f.label :file, 'File:', class: 'col-form-label'
-            -           %span.input-group-btn
+            +         .col-auto
-            -             %span.btn.btn-default.btn-file
+            +           = f.file_field :file, class: 'form-control'
-            -               Browse
+            +         .col-auto
-            -               = file_field_tag 'file'
+            +           = f.submit 'Submit', class: 'btn btn-secondary'
-            -           = text_field_tag '' , nil, {readonly: true, class: 'form-control'}
-            -       = submit_tag 'Submit', class: 'btn btn-default'
               %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-default btn-info'}
+            +   = link_to 'Bulk Manage', { action: :bulk_manage} , { class: 'btn btn-secondary btn-info'}
-            -   = link_to 'View administrators',{ :action => 'admin'}, { class: 'btn btn-default '}
+            +   = link_to 'View administrators',{ :action => 'admin'}, { class: 'btn btn-secondary '}
-            -   = link_to 'Random passwords',{ :action => 'random_all_passwords'}, { class: 'btn btn-default '}
+            +   = link_to 'Random passwords',{ :action => 'random_all_passwords'}, { class: 'btn btn-secondary '}
-            -   = link_to 'View active users',{ :action => 'active'}, { class: 'btn btn-default '}
+            +   = link_to 'View active users',{ :action => 'active'}, { class: 'btn btn-secondary '}
-            -   = link_to 'Mass mailing',{ :action => 'mass_mailing'}, { class: 'btn btn-default '}
+            +   = 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 'Show', {:action => 'show', :id => user}, class: 'btn btn-default btn-xs btn-block'
                     %td= link_to 'Edit', {:action => 'edit', :id => user}, class: 'btn btn-default btn-xs 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'
               %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
-            -   $('.datatable').DataTable({
+            +   $(document).on('import-map-loaded',(e) => {
-            -     'pageLength': 50
+            +     $('.datatable').DataTable({
-            -   });
+            +       'pageLength': 50
+            +     });
+            +   })

app/views/user_admin/new_list.html.haml ¶ +23 -21

               .container-fluid
                 .row
                   .col-md-6
                     %h1 Adding list of users
-            -   .row
+            +   .row.my-3
                   .col-md-6
-            -       .panel.panel-default
+            +       = form_with url: create_from_list_user_admin_index_path do |f|
-            -         .panel-heading
+            +         .row.align-items-center.mb-3
-            -           .panel-title Info
+            +           .col-auto
-            -         .panel-body
+            +             = f.submit 'Create following users',class: 'btn btn-success'
+            +           .col-auto
+            +             .form-check
+            +               = f.check_box :add_to_group, class: 'form-check-input'
+            +               = f.label :add_to_group, 'Also add these users to the following group', class: 'form-check-label'
+            +           .col-4
+            +             = f.select "group_id", options_from_collection_for_select( Group.all, 'id','name',params[:group_name]), {}, class: 'select2 form-control'
+            +         .row.mb-3
+            +           .col-12
+            +             = f.text_area :user_list, value: nil, class: 'form-control', style: 'height: 30rem'
+            +     .col-md-6
+            +       .card.card-default
+            +         .card-header
+            +           .card-title Info
+            +         .card-body
                         %ul
                           %li
                             List of user information in this format:
                             %tt user_id,name(,passwd(,alias(,remark)))
                           %li
                             Note that
                             %tt passwd, alias
                             and
                             %tt remark
                             is optional.
                           %li
                             When
                             %tt passwd
                             or
                             %tt alias
                             is empty, the original value will be used instead.
                           %li
                             If the users with the same user_id already exists, existing information will be overwritten.
                         Example:
                         %ol
                           %li
                             %pre user1,Somchai Jaidee
                             will create (or update) a user with login "user1" and setting the fullname to "Somchai Jaidee", also setting a random password.
                           %li
                             %pre user1,Somchai Jaidee,
                             will create (or update) a user with login "user1" and and setting the fullname "Somchai Jaidee". No change is made to the password unless this is a new user. If this is a new user, a random password will be generated.
+            + :javascript
+            +   $(document).on('import-map-loaded',(e) => {
+            +     $('.select2').select2()
+            +   });
-            -   .row
-            -     .col-md-6
-            -       = form_tag :action => 'create_from_list' do
-            -         .form-group
-            -           = submit_tag 'Create following users',class: 'btn btn-success'
-            -         .form-group
-            -           .div.checkbox
-            -             %label
-            -               = check_box_tag :add_to_group
-            -               Also add these users to the following group
-            -             = select_tag "group_id", options_from_collection_for_select( Group.all, 'id','name',params[:group_name]), id: 'group_name',class: 'select2'
-            -         .form-group
-            -           = text_area_tag 'user_list', nil, :rows => 50, :cols => 80
-            -     .col-md-6

config/initializers/new_framework_defaults_5_2.rb ¶ +1 -1

               # Be sure to restart your server when you modify this file.
               #
               # This file contains migration options to ease your Rails 5.2 upgrade.
               #
               # Once upgraded flip defaults one by one to migrate to the new default.
               #
               # Read the Guide for Upgrading Ruby on Rails for more info on each option.
               # Make Active Record use stable #cache_key alongside new #cache_version method.
               # This is needed for recyclable cache keys.
               # Rails.application.config.active_record.cache_versioning = true
               # Use AES-256-GCM authenticated encryption for encrypted cookies.
               # Also, embed cookie expiry in signed or encrypted cookies for increased security.
               #
               # This option is not backwards compatible with earlier Rails versions.
               # It's best enabled when your entire app is migrated and stable on 5.2.
               #
               # Existing cookies will be converted on read then written with the new scheme.
               # Rails.application.config.action_dispatch.use_authenticated_cookie_encryption = true
               # Use AES-256-GCM authenticated encryption as default cipher for encrypting messages
               # instead of AES-256-CBC, when use_authenticated_message_encryption is set to true.
               # Rails.application.config.active_support.use_authenticated_message_encryption = true
               # Add default protection from forgery to ActionController::Base instead of in
               # ApplicationController.
               # Rails.application.config.action_controller.default_protect_from_forgery = true
               # Store boolean values are in sqlite3 databases as 1 and 0 instead of 't' and
               # 'f' after migrating old data.
               # Rails.application.config.active_record.sqlite3.represent_boolean_as_integer = true
               # Use SHA-1 instead of MD5 to generate non-sensitive digests, such as the ETag header.
               # Rails.application.config.active_support.use_sha1_digests = true
               # Make `form_with` generate id attributes for any generated HTML tags.
-            - # Rails.application.config.action_view.form_with_generates_ids = true
+            + Rails.application.config.action_view.form_with_generates_ids = true

Write
Preview

You need to be logged in to leave comments. Login now

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository permissions settings

Sign in to your account

Author

r875:567f1ebe063b - Mon, 26 Sep 2022 21:05:12 - 8 files changed: 80 inserted, 78 deleted

Sign in to your account

Commit r875:567f1ebe063b public

Author

r875:567f1ebe063b - Mon, 26 Sep 2022 21:05:12 - 8 files changed: 80 inserted, 78 deleted

Commit `r875:567f1ebe063b` public