cafe-grader-web Commit - r672:d41325ea3a15

cafe-grader-web

Commit `r672:d41325ea3a15` public

parent | child

Description:

add problem group

Commit status:

[Not Reviewed]

References:

java

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r672:d41325ea3a15 - Mon, 11 Sep 2017 15:19:59 - 20 files changed: 365 inserted, 10 deleted

app/controllers/groups_controller.rb created 644 ¶ +86

			@@ -0,0 +1,86
		1	+ class GroupsController < ApplicationController
		2	+ before_action :set_group, only: [:show, :edit, :update, :destroy,
		3	+ :add_user, :remove_user,
		4	+ :add_problem, :remove_problem,
		5	+ ]
		6	+ before_action :authenticate, :admin_authorization
		7	+
		8	+ # GET /groups
		9	+ def index
		10	+ @groups = Group.all
		11	+ end
		12	+
		13	+ # GET /groups/1
		14	+ def show
		15	+ end
		16	+
		17	+ # GET /groups/new
		18	+ def new
		19	+ @group = Group.new
		20	+ end
		21	+
		22	+ # GET /groups/1/edit
		23	+ def edit
		24	+ end
		25	+
		26	+ # POST /groups
		27	+ def create
		28	+ @group = Group.new(group_params)
		29	+
		30	+ if @group.save
		31	+ redirect_to @group, notice: 'Group was successfully created.'
		32	+ else
		33	+ render :new
		34	+ end
		35	+ end
		36	+
		37	+ # PATCH/PUT /groups/1
		38	+ def update
		39	+ if @group.update(group_params)
		40	+ redirect_to @group, notice: 'Group was successfully updated.'
		41	+ else
		42	+ render :edit
		43	+ end
		44	+ end
		45	+
		46	+ # DELETE /groups/1
		47	+ def destroy
		48	+ @group.destroy
		49	+ redirect_to groups_url, notice: 'Group was successfully destroyed.'
		50	+ end
		51	+
		52	+ def remove_user
		53	+ user = User.find(params[:user_id])
		54	+ @group.users.delete(user)
		55	+ redirect_to group_path(@group), notice: "User #{user.login} was removed from the group #{@group.name}"
		56	+ end
		57	+
		58	+ def add_user
		59	+ user = User.find(params[:user_id])
		60	+ @group.users << user
		61	+ redirect_to group_path(@group), notice: "User #{user.login} was add to the group #{@group.name}"
		62	+ end
		63	+
		64	+ def remove_problem
		65	+ problem = Problem.find(params[:problem_id])
		66	+ @group.problems.delete(problem)
		67	+ redirect_to group_path(@group), notice: "Problem #{problem.name} was removed from the group #{@group.name}"
		68	+ end
		69	+
		70	+ def add_problem
		71	+ problem = Problem.find(params[:problem_id])
		72	+ @group.problems << problem
		73	+ redirect_to group_path(@group), notice: "Problem #{problem.name} was add to the group #{@group.name}"
		74	+ end
		75	+
		76	+ private
		77	+ # Use callbacks to share common setup or constraints between actions.
		78	+ def set_group
		79	+ @group = Group.find(params[:id])
		80	+ end
		81	+
		82	+ # Only allow a trusted parameter "white list" through.
		83	+ def group_params
		84	+ params.require(:group).permit(:name, :description)
		85	+ end
		86	+ end

app/helpers/groups_helper.rb created 644 ¶ +2

			@@ -0,0 +1,2
		1	+ module GroupsHelper
		2	+ end

app/models/group.rb created 644 ¶ +5

			@@ -0,0 +1,5
		1	+ class Group < ActiveRecord::Base
		2	+ has_and_belongs_to_many :problems
		3	+ has_and_belongs_to_many :users
		4	+ end
		5	+

app/views/groups/_form.html.haml created 644 ¶ +16

			@@ -0,0 +1,16
		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	+
		9	+ .form-group.field
		10	+ = f.label :name
		11	+ = f.text_field :name, class: 'form-control'
		12	+ .form-group.field
		13	+ = f.label :description
		14	+ = f.text_field :description, class: 'form-control'
		15	+ .form-group.actions
		16	+ = f.submit 'Save', class: 'btn btn-primary'

app/views/groups/edit.html.haml created 644 ¶ +7

			@@ -0,0 +1,7
		1	+ %h1 Editing group
		2	+
		3	+ = render 'form'
		4	+
		5	+ = link_to 'Show', @group
		6	+ \\|
		7	+ = link_to 'Back', groups_path

app/views/groups/index.html.haml created 644 ¶ +24

			@@ -0,0 +1,24
		1	+ %h1 Groups
		2	+
		3	+ %p
		4	+ = link_to 'New Group', new_group_path, class: 'btn btn-primary'
		5	+ %table.table.table-hover
		6	+ %thead
		7	+ %tr
		8	+ %th Name
		9	+ %th Description
		10	+ %th
		11	+ %th
		12	+ %th
		13	+
		14	+ %tbody
		15	+ - @groups.each do \|group\|
		16	+ %tr
		17	+ %td= group.name
		18	+ %td= group.description
		19	+ %td= link_to 'Show', group, class: 'btn btn-default'
		20	+ %td= link_to 'Edit', edit_group_path(group), class: 'btn btn-default'
		21	+ %td= link_to 'Destroy', group, :method => :delete, :data => { :confirm => 'Are you sure?' }, class: 'btn btn-danger'
		22	+
		23	+ %br
		24	+

app/views/groups/new.html.haml created 644 ¶ +5

			@@ -0,0 +1,5
		1	+ %h1 New group
		2	+
		3	+ = render 'form'
		4	+
		5	+ = link_to 'Back', groups_path

app/views/groups/show.html.haml created 644 ¶ +67

			@@ -0,0 +1,67
		1	+ %p#notice= notice
		2	+
		3	+ %p
		4	+ %b Name:
		5	+ = @group.name
		6	+ %p
		7	+ %b Description:
		8	+ = @group.description
		9	+
		10	+ %br
		11	+ = link_to 'Edit', edit_group_path(@group)
		12	+ \\|
		13	+ = link_to 'Back', groups_path
		14	+
		15	+ .row
		16	+ .col-md-6
		17	+ %h1 Users in this group
		18	+
		19	+ =form_tag add_user_group_path(@group), class: 'form-inline' do
		20	+ .form-group
		21	+ =label_tag :user_id, "User"
		22	+ =select_tag :user_id, options_from_collection_for_select(User.all,'id','full_name'), class: 'select2'
		23	+ =submit_tag "Add",class: 'btn btn-primary'
		24	+
		25	+
		26	+ %table.table.table-hover
		27	+ %thead
		28	+ %tr
		29	+ %th Login
		30	+ %th Full name
		31	+ %th Remark
		32	+ %th
		33	+
		34	+ %tbody
		35	+ - @group.users.each do \|user\|
		36	+ %tr
		37	+ %td= user.login
		38	+ %td= user.full_name
		39	+ %td= user.remark
		40	+ %td= link_to 'Remove', remove_user_group_path(@group,user), :method => :delete, :data => { :confirm => "Remove #{user.full_name}?" }, class: 'btn btn-danger'
		41	+ .col-md-6
		42	+ %h1 Problems in this group
		43	+
		44	+ =form_tag add_problem_group_path(@group), class: 'form-inline' do
		45	+ .form-group
		46	+ =label_tag :problem_id, "Problem"
		47	+ =select_tag :problem_id, options_from_collection_for_select(Problem.all,'id','full_name'), class: 'select2'
		48	+ =submit_tag "Add",class: 'btn btn-primary'
		49	+
		50	+
		51	+ %table.table.table-hover
		52	+ %thead
		53	+ %tr
		54	+ %th name
		55	+ %th Full name
		56	+ %th Full score
		57	+ %th
		58	+
		59	+ %tbody
		60	+ - @group.problems.each do \|problem\|
		61	+ %tr
		62	+ %td= problem.name
		63	+ %td= problem.full_name
		64	+ %td= problem.full_score
		65	+ %td= link_to 'Remove', remove_problem_group_path(@group,problem), :method => :delete, :data => { :confirm => "Remove #{problem.full_name}?" }, class: 'btn btn-danger'
		66	+
		67	+

db/migrate/20170911091143_create_groups.rb created 644 ¶ +30

			@@ -0,0 +1,30
		1	+ class CreateGroups < ActiveRecord::Migration
		2	+
		3	+ def change
		4	+ create_table :groups do \|t\|
		5	+ t.string :name
		6	+ t.string :description
		7	+ end
		8	+
		9	+ create_join_table :groups, :users do \|t\|
		10	+ # t.index [:group_id, :user_id]
		11	+ t.index [:user_id, :group_id]
		12	+ end
		13	+
		14	+ create_join_table :problems, :groups do \|t\|
		15	+ # t.index [:problem_id, :group_id]
		16	+ t.index [:group_id, :problem_id]
		17	+ end
		18	+
		19	+ reversible do \|change\|
		20	+ change.up do
		21	+ GraderConfiguration.where(key: 'system.use_problem_group').first_or_create(value_type: 'boolean', value: 'false',
		22	+ description: 'If true, available problem to the user will be only ones associated with the group of the user');
		23	+ end
		24	+
		25	+ change.down do
		26	+ GraderConfiguration.where(key: 'system.use_problem_group').destroy_all
		27	+ end
		28	+ end
		29	+ end
		30	+ end

test/controllers/groups_controller_test.rb created 644 ¶ +49

			@@ -0,0 +1,49
		1	+ require 'test_helper'
		2	+
		3	+ class GroupsControllerTest < ActionController::TestCase
		4	+ setup do
		5	+ @group = groups(:one)
		6	+ end
		7	+
		8	+ test "should get index" do
		9	+ get :index
		10	+ assert_response :success
		11	+ assert_not_nil assigns(:groups)
		12	+ end
		13	+
		14	+ test "should get new" do
		15	+ get :new
		16	+ assert_response :success
		17	+ end
		18	+
		19	+ test "should create group" do
		20	+ assert_difference('Group.count') do
		21	+ post :create, group: { description: @group.description, name: @group.name }
		22	+ end
		23	+
		24	+ assert_redirected_to group_path(assigns(:group))
		25	+ end
		26	+
		27	+ test "should show group" do
		28	+ get :show, id: @group
		29	+ assert_response :success
		30	+ end
		31	+
		32	+ test "should get edit" do
		33	+ get :edit, id: @group
		34	+ assert_response :success
		35	+ end
		36	+
		37	+ test "should update group" do
		38	+ patch :update, id: @group, group: { description: @group.description, name: @group.name }
		39	+ assert_redirected_to group_path(assigns(:group))
		40	+ end
		41	+
		42	+ test "should destroy group" do
		43	+ assert_difference('Group.count', -1) do
		44	+ delete :destroy, id: @group
		45	+ end
		46	+
		47	+ assert_redirected_to groups_path
		48	+ end
		49	+ end

app/controllers/problems_controller.rb ¶ +5

                     set_available(true)
                   elsif params.has_key? 'disable_problem'
                     set_available(false)
+            +     elsif params.has_key? 'add_group'
+            +       group = Group.find(params[:group_id])
+            +       get_problems_from_params.each do |p|
+            +         group.problems << p
+            +       end
                   end
                   redirect_to :action => 'manage'
                 end

app/controllers/user_admin_controller.rb ¶ +3 -4

                         u.save
                       end
                     end
-            -       if @action[:add_group]
-            -         @uses.each do |u|
+            -
-            -         end
+            +       if @action[:add_group] and @action[:group_name]
+            +         @group = Group.find(@action[:group_name])
+            +         @users.each { |user|  @group.users << user }
                     end
                   end
                 end

app/models/grader_configuration.rb ¶ +5

                 MULTIPLE_IP_LOGIN_KEY = 'right.multiple_ip_login'
                 VIEW_TESTCASE = 'right.view_testcase'
                 SINGLE_USER_KEY = 'system.single_user_mode'
+            +   SYSTEM_USE_PROBLEM_GROUP = 'system.use_problem_group'
                 cattr_accessor :config_cache
                 cattr_accessor :task_grading_info_cache
                 def self.analysis_mode?
                   return get(SYSTEM_MODE_CONF_KEY) == 'analysis'
                 end
+            +
+            +   def self.use_problem_group?
+            +     return get(SYSTEM_USE_PROBLEM_GROUP)
+            +   end
                 def self.contest_time_limit
                   contest_time_str = GraderConfiguration[CONTEST_TIME_LIMIT_KEY]

app/models/problem.rb ¶ +1

                 belongs_to :description
                 has_and_belongs_to_many :contests, :uniq => true
+            +   has_and_belongs_to_many :groups
                 has_many :test_pairs, :dependent => :delete_all
                 has_many :testcases, :dependent => :destroy

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

               class User < ActiveRecord::Base
                 has_and_belongs_to_many :roles
+            +   has_and_belongs_to_many :groups
                 has_many :test_requests, -> {order(submitted_at: DESC)}
                 def available_problems
                   if not GraderConfiguration.multicontests?
-            -       return Problem.available_problems
+            +       if GraderConfiguration.use_problem_group?
+            +         return available_problems_in_group
+            +       else
+            +         return Problem.available_problems
+            +       end
                   else
                     contest_problems = []
                     pin = {}
                   end
                 end
+            +   def available_problems_in_group
+            +     problem = []
+            +     self.groups.each do |group|
+            +       group.problems.where(available: true).each { |p| problem << p }
+            +     end
+            +     return problem.uniq
+            +   end
+            +
                 def can_view_problem?(problem)
                   if not GraderConfiguration.multicontests?
                     return problem.available

app/views/problems/manage.html.haml ¶ +7 -2

               %p= link_to '[Back to problem list]', :action => 'list'
               = form_tag :action=>'do_manage' do
-            -   .submitbox
+            +   .submitbox.panel
                   What do you want to do to the selected problem?
                   %br/
                   (You can shift-click to select a range of problems)
                         Add to
                         = select("contest","id",Contest.all.collect {|c| [c.title, c.id]})
                         = submit_tag 'Add', :name => 'add_to_contest'
+            +       %li
+            +         Add problems to group
+            +         = select_tag "group_id", options_from_collection_for_select( Group.all, 'id','name',params[:group_name]), id: 'group_name',class: 'select2'
+            +         = submit_tag 'Add', name: 'add_group'
+            +
-            -   %table
+            +   %table.table.table-hover
                   %tr{style: "text-align: left;"}
                     %th= check_box_tag 'select_all'
                     %th Name

app/views/user_admin/bulk_manage.html.haml ¶ +1 -1

                             Add users to group
                         %label.col-md-3.control-label.text-right Group name
                         .col-md-5
-            -             = text_field_tag "group_name", params[:group_name], id: 'group_name',class: 'form-control select2'
+            +             = select_tag "group_name", options_from_collection_for_select( Group.all, 'id','name',params[:group_name]), id: 'group_name',class: 'form-control select2'
               .row

config/routes.rb ¶ +8

                     get 'import'
                     get 'manage'
                   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'
+            +       post 'add_problem', to: 'groups#add_problem', as: 'add_problem'
+            +       delete 'remove_problem/:problem_id', to: 'groups#remove_problem', as: 'remove_problem'
+            +     end
                 end
                 resources :testcases, only: [] do

db/schema.rb ¶ +20 -1

               #
               # It's strongly recommended that you check this file into your version control system.
-            - ActiveRecord::Schema.define(version: 20170427070345) do
+            + ActiveRecord::Schema.define(version: 20170911091143) do
                 create_table "announcements", force: :cascade do |t|
                   t.string   "author",       limit: 255
                 add_index "grader_processes", ["host", "pid"], name: "index_grader_processes_on_ip_and_pid", using: :btree
+            +   create_table "groups", force: :cascade do |t|
+            +     t.string "name",        limit: 255
+            +     t.string "description", limit: 255
+            +   end
+            +
+            +   create_table "groups_problems", id: false, force: :cascade do |t|
+            +     t.integer "problem_id", limit: 4, null: false
+            +     t.integer "group_id",   limit: 4, null: false
+            +   end
+            +
+            +   add_index "groups_problems", ["group_id", "problem_id"], name: "index_groups_problems_on_group_id_and_problem_id", using: :btree
+            +
+            +   create_table "groups_users", id: false, force: :cascade do |t|
+            +     t.integer "group_id", limit: 4, null: false
+            +     t.integer "user_id",  limit: 4, null: false
+            +   end
+            +
+            +   add_index "groups_users", ["user_id", "group_id"], name: "index_groups_users_on_user_id_and_group_id", using: :btree
+            +
                 create_table "heart_beats", force: :cascade do |t|
                   t.integer  "user_id",    limit: 4
                   t.string   "ip_address", limit: 255

db/seeds.rb ¶ +10 -1

                    :value_type => 'string',
                    :default_value => 'none',
                    :description => "New user will be assigned to this contest automatically, if it exists.  Set to 'none' if there is no default contest."
-            -    }
+            +    },
+            +
+            +    {
+            +      :key => 'system.use_problem_group',
+            +      :value_type => 'boolean',
+            +      :default_value => 'false',
+            +      :description => "If true, available problem to the user will be only ones associated with the group of the user."
+            +    },
+            +
+            +
                 ]

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

r672:d41325ea3a15 - Mon, 11 Sep 2017 15:19:59 - 20 files changed: 365 inserted, 10 deleted

Sign in to your account

Commit r672:d41325ea3a15 public

Author

r672:d41325ea3a15 - Mon, 11 Sep 2017 15:19:59 - 20 files changed: 365 inserted, 10 deleted

Commit `r672:d41325ea3a15` public