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

                 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

app/javascript/application.js ¶ +1

               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

                   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 ¶ +2 -2

                 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

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'

app/views/groups/_form.html.haml ¶ +5 -25

@@ -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	1	.row
14	.col-md-6	2	.col-md-6
15	- .form-group.field	3	+ = simple_form_for @group do \|f\|
16	- = f.label :description	4	+ = f.input :name
17	- = f.text_field :description, class: 'form-control'	5	+ = f.input :description
18	- .row	6	+ = f.input :enabled
19	- .col-md-6	7	+ = f.button :submit, class: 'btn btn-primary'
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 ¶ +29 -19

-            - .container-fluid
+            + .row.mb-3
-            -   .row
                 .col-md-6
-            -       %h1 Group #{@group.name}
+            +     %h1 Editing Group members and problems
-            -   .row
+            + .row.mb-3
+            +   .col-md-6
+            +     %b Name:
+            +     = @group.name
+            + .row.mb-3
                 .col-md-6
                   %b Description:
                   = @group.description
-            -       %br
+            + .row.mb-3
+            +   .col-md-6
                   = link_to 'Edit', edit_group_path(@group), class: 'btn btn-primary'
-            -   .row
+            + .row.mb-3
                 .col-md-12
                   %h1 Group details
               .row
                 .col-md-6
-            -       .panel.panel-default
+            +     .card
-            -         .panel-heading
+            +       .card-header
-            -           .panel-title Users in this group
+            +         Users in this group
-            -         .panel-body
+            +       .card-body
                       %ul
                         %li
                           If you want to add several users to a group, it may be easier to just re-import those users in
                           = link_to 'New list of users', new_list_user_admin_index_path
                           page. You can also use
                           = link_to 'Bulk Manage User', bulk_manage_user_admin_index_path
                           page.
                       =form_tag add_user_group_path(@group), class: 'form-inline' do
-            -             .form-group
+            +           .row
-            -               =label_tag :user_id, "User"
+            +             .col-auto
+            +               =label_tag :user_id, "User", class: 'col-form-label'
+            +             .col-auto
                             =select_tag :user_id, options_from_collection_for_select(User.all,'id','login_with_name'), class: 'select2', style: 'width: 25em';
+            +             .col-auto
                             =submit_tag "Add",class: 'btn btn-primary'
                       %table.table.table-hover
                         %thead
                           %tr
                             %th Login
                             %th Full name
                             %th Remark
                             %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'
                         %tbody
                           - @group.users.each do |user|
                             %tr
                               %td= user.login
                               %td= user.full_name
                               %td= user.remark
                               %td= link_to 'Remove', remove_user_group_path(@group,user), :method => :delete, :data => { :confirm => "Remove #{user.full_name}?" }, class: 'btn btn-danger btn-sm'
                 .col-md-6
-            -       .panel.panel-default
+            +     .card
-            -         .panel-heading
+            +       .card-header
-            -           .panel-title Problems
+            +         Problems
-            -         .panel-body
+            +       .card-body
                       %ul
                         %li
                           If you want to add several problem to a group, it may be easier to bulk manage them in the
                           = link_to 'Bulk Manage Problems', manage_problems_path
                           page
-            -           =form_tag add_problem_group_path(@group), class: 'form-inline' do
+            +         =form_tag add_problem_group_path(@group) do
-            -             .form-group
+            +           .row
-            -               =label_tag :problem_id, "Problem"
+            +             .col-auto
+            +               =label_tag :problem_id, "Problem",class: 'col-form-label'
+            +             .col-auto
                             =select_tag :problem_id, options_from_collection_for_select(Problem.all,'id','long_name'), class: 'select2', style: 'width: 25em';
+            +             .col-auto
                             =submit_tag "Add",class: 'btn btn-primary'
                       %table.table.table-hover
                         %thead
                           %tr
                             %th name
                             %th Full name
                             %th Full score
                             %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'
                         %tbody

app/views/report/_task_hof.html.haml ¶ +2 -1

                                 %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
+            +   $(document).on('import-map-loaded',(e) => {
                   data = #{@chart_dataset}
                   config = {
                     type: 'bar',
                     data: data,
                     options: {
                       plugins: {
                         legend: {
                           display: false
                         },
                       },
                     }
                   }
                   Chart.defaults.font.size = 15
                   //Chart.defaults.font.family = 'Sarabun Light'
                   chart = new Chart($('#chart'),config)
+            +   });

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

                 = 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
                   %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 "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

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

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