cafe-grader-web Commit - r837:b9faf3362123

cafe-grader-web

Commit `r837:b9faf3362123` public

parent | child

Description:

merge

Commit status:

[Not Reviewed]

References:

merge algo

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r837:b9faf3362123 - Mon, 28 Sep 2020 09:06:49 - 7 files changed: 24 inserted, 11 deleted

app/controllers/main_controller.rb ¶ +1 -1

                     @submission.language = language
                   end
                   @submission.submitted_at = Time.new.gmtime
                   @submission.ip_address = request.remote_ip
-            -     if GraderConfiguration.time_limit_mode? and user.contest_finished?
+            +     if @current_user.admin? == false && GraderConfiguration.time_limit_mode? && @current_user.contest_finished?
                     @submission.errors.add(:base,"The contest is over.")
                     prepare_list_information
                     render :action => 'list' and return
                   end
                   if @submission.valid?(@current_user)

app/controllers/report_controller.rb ¶ +6 -4

                 def max_score
                 end
                 def current_score
                   @problems = Problem.available_problems
-            -     if params[:group_id]
+            +     if params[:group_id] && params[:users] == 'group'
                     @group = Group.find(params[:group_id])
                     @users = @group.users.where(enabled: true)
                   else
                     @users = User.includes(:contests).includes(:contest_stat).where(enabled: true)
                   end
                   @scorearray = calculate_max_score(@problems, @users,0,0,true)
                       pid = Problem.find_by_id(id.to_i)
                       @problems << pid if pid
                     end
                   end
                   #users
-            -     @users = if params[:users] == "all" then
+            +     @users = if params[:users] == "group" then
+            +                Group.find(params[:group_id]).users.all
+            +              elsif params[:users] == 'enabled'
+            +                User.includes(:contests).includes(:contest_stat).where(enabled: true)
+            +              else
                              User.includes(:contests).includes(:contest_stat)
-            -              else
-            -                User.includes(:contests).includes(:contest_stat).where(enabled: true)
                            end
                   #set up range from param
                   @since_id = params.fetch(:from_id, 0).to_i
                   @until_id = params.fetch(:to_id, 0).to_i
                   @since_id = nil if @since_id == 0

app/controllers/submissions_controller.rb ¶ +1 -1

               protected
                 def submission_authorization
                   #admin always has privileged
                   return true if @current_user.admin?
-            -     return true if @current_user.has_role?('TA') && (['show','download'].include? action_name)
+            +     return true if @current_user.has_role?('ta') && (['show','download'].include? action_name)
                   sub = Submission.find(params[:id])
                   if @current_user.available_problems.include? sub.problem
                     return true if GraderConfiguration["right.user_view_submission"] or sub.user == @current_user
                   end

app/views/report/current_score.html.haml ¶ +7 -3

               .container-fluid
                 %h1 Current Score
                 = form_tag current_score_report_path, method: 'get' do
-            -     Show only users from this group
+            +     .radio-inline
+            +       = radio_button_tag 'users', 'all', (params[:users] == 'all')
+            +       = label_tag(:users_all,'Show all users')
+            +     %br
+            +     .radio-inline
+            +       = radio_button_tag 'users', 'group', (params[:users] == 'group')
+            +       = label_tag(:users_group, 'Show only users from this group')
                   = select_tag "group_id", options_from_collection_for_select( Group.all, 'id','name',params[:group_id]), id: 'group_name',class: 'select2', style: 'width: 20em';
                   = submit_tag 'Apply',class: 'btn btn-default'
                 %br
+            -
+            -
                 = render "score_table"

app/views/report/max_score.html.haml ¶ +5

                           = radio_button_tag 'users', 'all', (params[:users] == "all")
                           All users
                       .radio
                         %label
                           = radio_button_tag 'users', 'enabled', (params[:users] == "enabled")
                           Only enabled users
+            +         .radio
+            +           %label
+            +             = radio_button_tag 'users', 'group', (params[:users] == "group")
+            +             Only users from this group
+            +             = select_tag "group_id", options_from_collection_for_select( Group.all, 'id','name',params[:group_id]), id: 'group_name',class: 'select2', style: 'width: 20em';
               .row
                 .col-md-12
                   = button_tag 'Show', class: "btn btn-primary btn-large", value: "show"
                   = button_tag 'Download CSV', class: "btn btn-primary btn-large", value: "download"
               - if @scorearray

db/schema.rb ¶ +3 -1

                 create_table "groups_problems", id: false, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
                   t.integer "problem_id", null: false
                   t.integer "group_id", null: false
                   t.index ["group_id", "problem_id"], name: "index_groups_problems_on_group_id_and_problem_id"
                 end
-            -   create_table "groups_users", id: false, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
+            +   create_table "groups_users", options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
                   t.integer "group_id", null: false
                   t.integer "user_id", null: false
                   t.index ["user_id", "group_id"], name: "index_groups_users_on_user_id_and_group_id"
                 end
                 create_table "heart_beats", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci", force: :cascade do |t|
                 create_table "logins", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci", force: :cascade do |t|
                   t.integer "user_id"
                   t.string "ip_address"
                   t.datetime "created_at", null: false
                   t.datetime "updated_at", null: false
+            +     t.index ["user_id"], name: "index_logins_on_user_id"
                 end
                 create_table "messages", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci", force: :cascade do |t|
                   t.integer "sender_id"
                   t.integer "receiver_id"
                   t.integer "replying_message_id"
                   t.integer "number"
                   t.string "source_filename"
                   t.float "max_runtime"
                   t.integer "peak_memory"
                   t.integer "effective_code_length"
                   t.string "ip_address"
+            +     t.index ["submitted_at"], name: "index_submissions_on_submitted_at"
                   t.index ["user_id", "problem_id", "number"], name: "index_submissions_on_user_id_and_problem_id_and_number", unique: true
                   t.index ["user_id", "problem_id"], name: "index_submissions_on_user_id_and_problem_id"
                 end
                 create_table "tags", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
                   t.string "name", null: false

db/seeds.rb ¶ +1 -1

                                            conf[:default_value],
                                            desc)
                 end
               end
               def seed_roles
-            -   Role.find_or_create_by(name: 'TA')
+            +   Role.find_or_create_by(name: 'ta')
                 return if Role.find_by_name('admin')
                 role = Role.create(:name => 'admin')
                 user_admin_right = Right.create(:name => 'user_admin',
                                                 :controller => 'user_admin',
                                                 :action => 'all')

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

r837:b9faf3362123 - Mon, 28 Sep 2020 09:06:49 - 7 files changed: 24 inserted, 11 deleted

Sign in to your account

Commit r837:b9faf3362123 public

Author

r837:b9faf3362123 - Mon, 28 Sep 2020 09:06:49 - 7 files changed: 24 inserted, 11 deleted

Commit `r837:b9faf3362123` public