cafe-grader-web Commit - r678:6d499b0bc3c9

r678:6d499b0bc3c9 - Wed, 13 Sep 2017 10:43:35 - 16 files changed: 126 inserted, 41 deleted

app/assets/javascripts/groups.js.coffee created 644 ¶

new file 100644

app/assets/javascripts/testcases.js.coffee created 644 ¶

new file 100644

app/assets/stylesheets/groups.css.scss created 644 ¶

new file 100644

app/assets/stylesheets/testcases.css.scss created 644 ¶

new file 100644

app/models/group_problem.rb created 644 ¶ +7

@@ -0,0 +1,7
	1	+ class GroupProblem < ActiveRecord::Base
	2	+ self.table_name = 'groups_problems'
	3	+
	4	+ belongs_to :problem
	5	+ belongs_to :group
	6	+ validates_uniqueness_of :problem_id, scope: :group_id, message: ->(object, data) { "'#{Problem.find(data[:value]).full_name}' is already in the group" }
	7	+ end

app/models/group_user.rb created 644 ¶ +7

@@ -0,0 +1,7
	1	+ class GroupUser < ActiveRecord::Base
	2	+ self.table_name = 'groups_users'
	3	+
	4	+ belongs_to :user
	5	+ belongs_to :group
	6	+ validates_uniqueness_of :user_id, scope: :group_id, message: ->(object, data) { "'#{User.find(data[:value]).full_name}' is already in the group" }
	7	+ end

config/initializers/assets.rb created 644 ¶ +23

@@ -0,0 +1,23
	1	+ # Be sure to restart your server when you modify this file.
	2	+
	3	+ # Version of your assets, change this if you want to expire all your assets.
	4	+ Rails.application.config.assets.version = '1.0'
	5	+
	6	+ # Add additional assets to the asset load path.
	7	+ # Rails.application.config.assets.paths << Emoji.images_path
	8	+ # Add Yarn node_modules folder to the asset load path.
	9	+ Rails.application.config.assets.paths << Rails.root.join('node_modules')
	10	+ Rails.application.config.assets.paths << Rails.root.join('vendor/assets/fonts')
	11	+
	12	+ # Precompile additional assets.
	13	+ # application.js, application.css, and all non-JS/CSS in the app/assets
	14	+ # folder are already added.
	15	+ # Rails.application.config.assets.precompile += %w( admin.js admin.css )
	16	+
	17	+ Rails.application.config.assets.precompile += ['announcement_refresh.js','effects.js','site_update.js']
	18	+ Rails.application.config.assets.precompile += ['local_jquery.js','tablesorter-theme.cafe.css']
	19	+ %w( announcements submissions configurations contests contest_management graders heartbeat
	20	+ login main messages problems report site sites sources tasks groups
	21	+ test user_admin users ).each do \|controller\|
	22	+ Rails.application.config.assets.precompile += ["#{controller}.js", "#{controller}.css"]
	23	+ end

app/controllers/groups_controller.rb ¶ +14 -6

                 def remove_user
                   user = User.find(params[:user_id])
                   @group.users.delete(user)
-            -     redirect_to group_path(@group), notice: "User #{user.login} was removed from the group #{@group.name}"
+            +     redirect_to group_path(@group), flash: {success: "User #{user.login} was removed from the group #{@group.name}"}
                 end
                 def add_user
                   user = User.find(params[:user_id])
-            -     @group.users << user
+            +     begin
-            -     redirect_to group_path(@group), notice: "User #{user.login} was add to the group #{@group.name}"
+            +       @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
                 end
                 def remove_problem
                   problem = Problem.find(params[:problem_id])
                   @group.problems.delete(problem)
-            -     redirect_to group_path(@group), notice: "Problem #{problem.name} was removed from the group #{@group.name}"
+            +     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])
-            -     @group.problems << problem
+            +     begin
-            -     redirect_to group_path(@group), notice: "Problem #{problem.name} was add to the group #{@group.name}"
+            +       @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

app/controllers/problems_controller.rb ¶ +11 -1

                     set_available(false)
                   elsif params.has_key? 'add_group'
                     group = Group.find(params[:group_id])
+            +       ok = []
+            +       failed = []
                     get_problems_from_params.each do |p|
-            -         group.problems << p
+            +         begin
+            +           group.problems << p
+            +           ok << p.full_name
+            +         rescue => e
+            +           failed << p.full_name
+            +         end
                     end
+            +       flash[:success] = "The following problems are added to the group #{group.name}: " + ok.join(', ') if ok.count > 0
+            +       flash[:alert] = "The following problems are already in the group #{group.name}: " + failed.join(', ') if failed.count > 0
                   end
+            +
                   redirect_to :action => 'manage'
                 end

app/controllers/user_admin_controller.rb ¶ +12 -1

@@ -442,7 +442,18
442	end	442	end
443	if @action[:add_group] and @action[:group_name]	443	if @action[:add_group] and @action[:group_name]
444	@group = Group.find(@action[:group_name])	444	@group = Group.find(@action[:group_name])
445	- @users.each { \|user\| @group.users << user }	445	+ ok = []
		446	+ failed = []
		447	+ @users.each do \|user\|
		448	+ begin
		449	+ @group.users << user
		450	+ ok << user.login
		451	+ rescue => e
		452	+ failed << user.login
		453	+ end
		454	+ end
		455	+ flash[:success] = "The following users are added to the 'group #{@group.name}': " + ok.join(', ') if ok.count > 0
		456	+ flash[:alert] = "The following users are already in the 'group #{@group.name}': " + failed.join(', ') if failed.count > 0
446	end	457	end
447	end	458	end
448	end	459	end

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

                 BOOTSTRAP_FLASH_MSG = {
                   success: 'alert-success',
                   error: 'alert-danger',
-            -     alert: 'alert-block',
+            +     alert: 'alert-danger',
                   notice: 'alert-info'
                 }

app/models/group.rb ¶ +10 -2

@@ -1,5 +1,13
1	class Group < ActiveRecord::Base	1	class Group < ActiveRecord::Base
2	- has_and_belongs_to_many :problems	2	+ has_many :groups_problems, class_name: GroupProblem
3	- has_and_belongs_to_many :users	3	+ has_many :problems, :through => :groups_problems
		4	+
		5	+ has_many :groups_users, class_name: GroupUser
		6	+ has_many :users, :through => :groups_users
		7	+
		8	+ #has_and_belongs_to_many :problems
		9	+ #has_and_belongs_to_many :users
		10	+
		11	+
4	end	12	end
5		13

app/models/problem.rb ¶ +5 -1

                 belongs_to :description
                 has_and_belongs_to_many :contests, :uniq => true
-            -   has_and_belongs_to_many :groups
+            +   #has_and_belongs_to_many :groups
+            +   has_many :groups_problems, class_name: GroupProblem
+            +   has_many :groups, :through => :groups_problems
+            +
                 has_many :test_pairs, :dependent => :delete_all
                 has_many :testcases, :dependent => :destroy

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

               class User < ActiveRecord::Base
                 has_and_belongs_to_many :roles
-            -   has_and_belongs_to_many :groups
+            +   #has_and_belongs_to_many :groups
+            +   has_many :groups_users, class_name: GroupUser
+            +   has_many :groups, :through => :groups_users
                 has_many :test_requests, -> {order(submitted_at: DESC)}

app/views/problems/index.html.haml ¶ +4 -4

               - content_for :head do
                 = stylesheet_link_tag 'problems'
-            - %h1 Listing problems
+            + %h1 Problems
               %p
-            -   = link_to 'New problem', new_problem_path, class: 'btn btn-default btn-sm'
+            +   = link_to 'Import problems', {:action => 'import'}, class: 'btn btn-success btn-sm'
-            -   = link_to 'Manage problems', { action: 'manage'}, class: 'btn btn-default btn-sm'
+            +   = link_to 'New problem', new_problem_path, class: 'btn btn-success btn-sm'
-            -   = link_to 'Import problems', {:action => 'import'}, class: 'btn btn-default btn-sm'
+            +   = link_to 'Bulk Manage', { action: 'manage'}, class: 'btn btn-info btn-sm'
                 = link_to 'Turn off all problems', {:action => 'turn_all_off'}, class: 'btn btn-default btn-sm'
                 = link_to 'Turn on all problems', {:action => 'turn_all_on'}, class: 'btn btn-default btn-sm'
               .submitbox

app/views/problems/manage.html.haml ¶ +28 -24

@@ -36,33 +36,37
36		36
37	%h1 Manage problems	37	%h1 Manage problems
38		38
39	- %p= link_to '[Back to problem list]', ~~:action~~ => ~~'list'~~	39	+ %p= link_to '[Back to problem list]', problems_path
40		40
41	= form_tag :action=>'do_manage' do	41	= form_tag :action=>'do_manage' do
42	- .submitbox.panel	42	+ .panel.panel-primary
43	- What do you want to do to the selected problem?	43	+ .panel-heading
44	- %br/	44	+ Action
45	- (You can shift-click to select a range of problems)	45	+ .panel-body
46	- %ul	46	+ .submit-box
47	- %li	47	+ What do you want to do to the selected problem?
48	- Change date added to	48	+ %br/
49	- = select_date Date.current, :prefix => 'date_added'	49	+ (You can shift-click to select a range of problems)
50	-	50	+ %ul
51	- = submit_tag 'Change', :name => 'change_date_added'	51	+ %li
52	- %li	52	+ Change date added to
53	- Set available to	53	+ = select_date Date.current, :prefix => 'date_added'
54	- = submit_tag 'True', :name => 'enable_problem'	54	+
55	- = submit_tag 'False', :name => 'disable_problem'	55	+ = submit_tag 'Change', :name => 'change_date_added', class: 'btn btn-default'
		56	+ %li
		57	+ Set available to
		58	+ = submit_tag 'True', :name => 'enable_problem', class: 'btn btn-default'
		59	+ = submit_tag 'False', :name => 'disable_problem', class: 'btn btn-default'
56		60
57	- - if GraderConfiguration.multicontests?	61	+ - if GraderConfiguration.multicontests?
58	- %li	62	+ %li
59	- Add to	63	+ Add to
60	- = select("contest","id",Contest.all.collect {\|c\| [c.title, c.id]})	64	+ = select("contest","id",Contest.all.collect {\|c\| [c.title, c.id]})
61	- = submit_tag 'Add', :name => 'add_to_contest'	65	+ = submit_tag 'Add', :name => 'add_to_contest', class: 'btn btn-default'
62	- %li	66	+ %li
63	- Add problems to group	67	+ Add problems to group
64	- = select_tag "group_id", options_from_collection_for_select( Group.all, 'id','name',params[:group_name]), id: 'group_name',class: 'select2'	68	+ = select_tag "group_id", options_from_collection_for_select( Group.all, 'id','name',params[:group_name]), id: 'group_name',class: 'select2'
65	- = submit_tag 'Add', name: 'add_group'	69	+ = submit_tag 'Add', name: 'add_group', class: 'btn btn-default'
66		70
67		71
68	%table.table.table-hover	72	%table.table.table-hover

	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

r678:6d499b0bc3c9 - Wed, 13 Sep 2017 10:43:35 - 16 files changed: 126 inserted, 41 deleted

Sign in to your account

Commit r678:6d499b0bc3c9 public

Author

r678:6d499b0bc3c9 - Wed, 13 Sep 2017 10:43:35 - 16 files changed: 126 inserted, 41 deleted

Commit `r678:6d499b0bc3c9` public