cafe-grader-web Commit - r795:08d968fa05d5

cafe-grader-web

Commit `r795:08d968fa05d5` public

parent | child

Description:

group enable

Commit status:

[Not Reviewed]

References:

algo

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r795:08d968fa05d5 - Thu, 13 Aug 2020 10:52:41 - 11 files changed: 54 inserted, 17 deleted

app/views/groups/toggle.js.haml created 644 ¶ +8

@@ -0,0 +1,8
	1	+ = render partial: 'toggle_button',
	2	+ locals: {button_id: "#group-enabled-#{@group.id}",button_on: @group.enabled }
	3	+ :plain
	4	+ r = $("#group-#{@group.id}");
	5	+ r.removeClass('success');
	6	+ r.removeClass('danger');
	7	+ r.addClass("#{@group.enabled? ? 'success' : 'danger'}");
	8	+

db/migrate/20200813083020_add_enabled_to_group.rb created 644 ¶ +5

@@ -0,0 +1,5
	1	+ class AddEnabledToGroup < ActiveRecord::Migration[5.2]
	2	+ def change
	3	+ add_column :groups, :enabled, :boolean, default: true
	4	+ end
	5	+ end

app/controllers/groups_controller.rb ¶ +7 -1

               class GroupsController < ApplicationController
                 before_action :set_group, only: [:show, :edit, :update, :destroy,
                                                  :add_user, :remove_user,:remove_all_user,
                                                  :add_problem, :remove_problem,:remove_all_problem,
+            +                                    :toggle,
                                                 ]
                 before_action :admin_authorization
                 # GET /groups
                 def index
                   @groups = Group.all
                 end
                 # GET /groups/1
                 def show
                 end
                 # GET /groups/new
                 def new
                   @group = Group.new
                 end
                 # GET /groups/1/edit
                 def edit
                 end
                 # POST /groups
                 def create
                   @group = Group.new(group_params)
                   if @group.save
                     redirect_to @group, notice: 'Group was successfully created.'
                   else
                     render :new
                   end
                 end
                 # PATCH/PUT /groups/1
                 def update
                   if @group.update(group_params)
                     redirect_to @group, notice: 'Group was successfully updated.'
                   else
                     render :edit
                   end
                 end
                 # DELETE /groups/1
                 def destroy
                   @group.destroy
                   redirect_to groups_url, notice: 'Group was successfully destroyed.'
                 end
+            +   def toggle
+            +     @group.enabled = @group.enabled? ? false : true
+            +     @group.save
+            +   end
+            +
                 def remove_user
                   user = User.find(params[:user_id])
                   @group.users.delete(user)
                   redirect_to group_path(@group), flash: {success: "User #{user.login} was removed from the group #{@group.name}"}
                 end
                 def remove_all_user
                   @group.users.clear
                   redirect_to group_path(@group), alert: 'All users removed'
                 end
                 def remove_all_problem
                   @group.problems.clear
                   redirect_to group_path(@group), alert: 'All problems removed'
                 end
                 def add_user
                   user = User.find(params[:user_id])
                   begin
                     @group.users << user
                     redirect_to group_path(@group), flash: { success: "User #{user.login} was add to the group #{@group.name}"}
                   rescue => e
                     redirect_to group_path(@group), alert: e.message
                   end
                 def remove_problem
                   problem = Problem.find(params[:problem_id])
                   @group.problems.delete(problem)
                   redirect_to group_path(@group), flash: {success: "Problem #{problem.name} was removed from the group #{@group.name}" }
                 end
                 def add_problem
                   problem = Problem.find(params[:problem_id])
                   begin
                     @group.problems << problem
                     redirect_to group_path(@group), flash: {success: "Problem #{problem.name} was add to the group #{@group.name}" }
                   rescue => e
                     redirect_to group_path(@group), alert: e.message
                   end
                 end
                 private
                   # Use callbacks to share common setup or constraints between actions.
                   def set_group
                     @group = Group.find(params[:id])
                   end
                   # Only allow a trusted parameter "white list" through.
                   def group_params
-            -       params.require(:group).permit(:name, :description)
+            +       params.require(:group).permit(:name, :description, :enabled)
                   end
               end

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

                 # announcement refreshing and hiding methods
                 def announcements
                   if params.has_key? 'recent'
                     prepare_announcements(params[:recent])
                   else
                     prepare_announcements
                   end
                   render(:partial => 'announcement',
                          :collection => @announcements,
                          :locals => {:announcement_effect => true})
                 end
                 def confirm_contest_start
                   user = User.find(session[:user_id])
                   if request.method == 'POST'
                     user.update_start_time
                     redirect_to :action => 'list'
                   else
                     @contests = user.contests
                     @user = user
                   end
                 end
+            +
                 protected
                 def prepare_announcements(recent=nil)
                   if GraderConfiguration.show_tasks_to?(@user)
                     @announcements = Announcement.published(true)
                   else
                     @announcements = Announcement.published
                   end
                   if recent!=nil
                     recent_id = recent.to_i
                     @announcements = @announcements.find_all { |a| a.id > recent_id }
                   end
                 end
                 def prepare_list_information
                   @user = User.find(session[:user_id])
                   if not GraderConfiguration.multicontests?
                     @problems = @user.available_problems
                   else
                     @contest_problems = @user.available_problems_group_by_contests
                     @problems = @user.available_problems
                   end
                   @prob_submissions = {}
                   @problems.each do |p|

app/helpers/application_helper.rb ¶ +2 -1

                   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-xs'
+            +     btn_block = option[:block] || 'btn-block'
                   link_to (on ? "Yes" : "No"), toggle_url,
-            -       {class: "btn btn-block #{btn_size} btn-#{on ? 'success' : 'default'} ajax-toggle",
+            +       {class: "btn #{btn_block} #{btn_size} btn-#{on ? 'success' : 'default'} 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

app/models/user.rb ¶ +4 -1

                     #if this is a normal mode
                     #we show problem based on problem_group, if the config said so
                     if GraderConfiguration.use_problem_group?
                       return available_problems_in_group
                     else
                       return Problem.available_problems
                     end
                   else
                     #this is multi contest mode
                     contest_problems = []
                     pin = {}
                     contests.enabled.each do |contest|
                       contest.problems.available.each do |problem|
                         if not pin.has_key? problem.id
                           contest_problems << problem
                         end
                         pin[problem.id] = true
                       end
                     end
                     other_avaiable_problems = Problem.available.find_all {|p| pin[p.id]==nil and p.contests.length==0}
                     return contest_problems + other_avaiable_problems
                   end
                 end
+            +   # new feature, get list of available problem in all enabled group that the user belongs to
                 def available_problems_in_group
                   problem = []
-            -     self.groups.each do |group|
+            +     self.groups.where(enabled: true).each do |group|
                     group.problems.where(available: true).each { |p| problem << p }
                   end
                   problem.uniq!
                   if problem
                     problem.sort! do |a,b|
                       case
                       when a.date_added < b.date_added
                       when a.date_added > b.date_added
                         -1
                       else
                         a.name <=> b.name
                       end
                     end
                     return problem
                   else
                     return []
                   end
                 end
+            +   #check if the user has the right to view that problem
+            +   #this also consider group based problem policy
                 def can_view_problem?(problem)
                   return true if admin?
                   return available_problems.include? problem
                 end
                 def self.clear_last_login
                   User.update_all(:last_ip => nil)
                 end
                 protected
                   def encrypt_new_password
                     return if password.blank?
                     self.salt = (10+rand(90)).to_s
                     self.hashed_password = User.encrypt(self.password,self.salt)
                   end
                   def assign_default_site
                     # have to catch error when migrating (because self.site is not available).
                     begin
                       if self.site==nil
                         self.site = Site.find_by_name('default')
                         if self.site==nil
                           self.site = Site.find(1)  # when 'default has be renamed'
                         end

app/views/application/_submission.html.haml ¶ +1 -1

               %tr
                 %td{:align => "center"}
                   = submission.number
                 %td.text-right
                   = link_to "##{submission.id}", submission_path(submission.id)
                 %td
                   = l submission.submitted_at, format: :long
                   = "( #{time_ago_in_words(submission.submitted_at)} ago)"
                 %td
                   = submission.source_filename
                   = " (#{submission.language.pretty_name}) "
-            -     = link_to('[load]',{:action => 'source', :id => submission.id})
+            +     = link_to '[load]', download_submission_path(submission)
                 %td
                   - if submission.graded_at
                     = "Graded at #{format_short_time(submission.graded_at)}."
                     %br/
                     = "Score: #{(submission.points*100/submission.problem.full_score).to_i} " if GraderConfiguration['ui.show_score']
                     = " ["
                     %tt
                       = submission.grader_comment
                     = "]"
                 %td
                   = render :partial => 'compiler_message', :locals => {:compiler_message => submission.compiler_message }
                 %td
                   = link_to 'Edit', edit_submission_path(submission.id), class: 'btn btn-success'

app/views/groups/_form.html.haml ¶ +20 -9

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

app/views/groups/index.html.haml ¶ +3 -1

               %h1 Groups
               %p
                 = link_to 'New Group', new_group_path, class: 'btn btn-primary'
               %table.table.table-hover
                 %thead
                   %tr
                     %th Name
                     %th Description
+            +       %th Enabled?
                     %th
                     %th
                 %tbody
                   - @groups.each do |group|
-            -       %tr
+            +       %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= link_to 'View', group, class: 'btn btn-default'
                       %td= link_to 'Destroy', group, :method => :delete, :data => { :confirm => 'Are you sure?' }, class: 'btn btn-danger'
               %br

config/routes.rb ¶ +1 -1

                     get 'toggle'
                     get 'toggle_test'
                     get 'toggle_view_testcase'
                     get 'stat'
                   end
                   collection do
                     get 'turn_all_off'
                     get 'turn_all_on'
                     get 'import'
                     get 'manage'
                     get 'quick_create'
                     post 'do_manage'
                     post 'do_import'
                   end
                 end
                 resources :groups do
                   member do
                     post 'add_user', to: 'groups#add_user', as: 'add_user'
                     delete 'remove_user/:user_id', to: 'groups#remove_user', as: 'remove_user'
                     delete 'remove_all_user', to: 'groups#remove_all_user', as: 'remove_all_user'
                     post 'add_problem', to: 'groups#add_problem', as: 'add_problem'
                     delete 'remove_problem/:problem_id', to: 'groups#remove_problem', as: 'remove_problem'
                     delete 'remove_all_problem', to: 'groups#remove_all_problem', as: 'remove_all_problem'
+            +       get 'toggle'
                   end
                   collection do
                   end
                 end
                 resources :testcases, only: [] do
                   member do
                     get 'download_input'
                     get 'download_sol'
                   end
                   collection do
                     get 'show_problem/:problem_id(/:test_num)' => 'testcases#show_problem', as: 'show_problem'
                   end
                 end
                 resources :grader_configuration, controller: 'configurations' do
                   collection do
                     get 'set_exam_right(/:value)', action: 'set_exam_right', as: 'set_exam_right'
                   end
                 end
                 resources :users do
                   member do
                     get 'toggle_activate', 'toggle_enable'
                     get 'stat'
                   end
                   collection do
                     get 'profile'
                     post 'chg_passwd'
                   end
                 end
                 resources :submissions do
                   member do
                     get 'download'
                     get 'compiler_msg'
                     get 'rejudge'
-            -       get 'source'
                   end
                   collection do
                     get 'prob/:problem_id', to: 'submissions#index', as: 'problem'
                     get 'direct_edit_problem/:problem_id(/:user_id)', to: 'submissions#direct_edit_problem', as: 'direct_edit_problem'
                     get 'get_latest_submission_status/:uid/:pid', to: 'submissions#get_latest_submission_status', as: 'get_latest_submission_status'
                   end
                 end
                 #user admin
                 resources :user_admin  do
                   collection do
                     match 'bulk_manage', via: [:get, :post]
                     get 'bulk_mail'
                     get 'user_stat'
                     get 'import'
                     get 'new_list'
                     get 'admin'
                     get 'active'
                     get 'mass_mailing'
                     get 'revoke_admin'
                     post 'grant_admin'
                     match 'create_from_list', via: [:get, :post]
                     match 'random_all_passwords', via: [:get, :post]

db/schema.rb ¶ +2 -1

               # This file is auto-generated from the current state of the database. Instead
               # of editing this file, please use the migrations feature of Active Record to
               # incrementally modify your database, and then regenerate this schema definition.
               #
               # Note that this schema.rb definition is the authoritative source for your
               # database schema. If you need to create the application database on another
               # system, you should be using db:schema:load, not running all the migrations
               # from scratch. The latter is a flawed and unsustainable approach (the more migrations
               # you'll amass, the slower it'll run and the greater likelihood for issues).
               #
               # It's strongly recommended that you check this file into your version control system.
-            - ActiveRecord::Schema.define(version: 2018_06_12_102327) do
+            + ActiveRecord::Schema.define(version: 2020_08_13_083020) do
                 create_table "announcements", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
                   t.string "author"
                   t.text "body"
                   t.boolean "published"
                   t.datetime "created_at"
                   t.datetime "updated_at"
                   t.boolean "frontpage", default: false
                   t.boolean "contest_only", default: false
                   t.string "title"
                   t.string "notes"
                 end
                 create_table "contests", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
                   t.string "title"
                   t.boolean "enabled"
                   t.datetime "created_at"
                   t.datetime "updated_at"
                   t.string "name"
                 end
                 create_table "contests_problems", id: false, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
                   t.integer "contest_id"
                   t.integer "problem_id"
                   t.string "key"
                   t.string "value_type"
                   t.string "value"
                   t.datetime "created_at"
                   t.datetime "updated_at"
                   t.text "description"
                 end
                 create_table "grader_processes", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
                   t.string "host"
                   t.integer "pid"
                   t.string "mode"
                   t.boolean "active"
                   t.datetime "created_at"
                   t.datetime "updated_at"
                   t.integer "task_id"
                   t.string "task_type"
                   t.boolean "terminated"
                   t.index ["host", "pid"], name: "index_grader_processes_on_host_and_pid"
                 end
                 create_table "groups", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
                   t.string "name"
                   t.string "description"
+            +     t.boolean "enabled", default: true
                 end
                 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|
                   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=latin1", force: :cascade do |t|
                   t.integer "user_id"
                   t.string "ip_address"
                   t.datetime "created_at"
                   t.datetime "updated_at"
                   t.string "status"
                   t.index ["updated_at"], name: "index_heart_beats_on_updated_at"
                 end
                 create_table "languages", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|

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

r795:08d968fa05d5 - Thu, 13 Aug 2020 10:52:41 - 11 files changed: 54 inserted, 17 deleted

Sign in to your account

Commit r795:08d968fa05d5 public

Author

r795:08d968fa05d5 - Thu, 13 Aug 2020 10:52:41 - 11 files changed: 54 inserted, 17 deleted

Commit `r795:08d968fa05d5` public