cafe-grader-web Commit - r678:6d499b0bc3c9

cafe-grader-web

Commit `r678:6d499b0bc3c9` public

parent | child

Description:

make group_user and group_problem unique

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

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

                   end
                 end
                 # DELETE /groups/1
                 def destroy
                   @group.destroy
                   redirect_to groups_url, notice: 'Group was successfully destroyed.'
                 end
                 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
                   # 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)
                   end

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

                 def do_manage
                   if params.has_key? 'change_date_added'
                     change_date_added
                   elsif params.has_key? 'add_to_contest'
                     add_to_contest
                   elsif params.has_key? 'enable_problem'
                     set_available(true)
                   elsif params.has_key? 'disable_problem'
                     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
                 def import
                   @allow_test_pair_import = allow_test_pair_import?
                 end
                 def do_import
                   old_problem = Problem.find_by_name(params[:name])
                   if !allow_test_pair_import? and params.has_key? :import_to_db
                     params.delete :import_to_db
                   end

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

                       @users.update_all(enabled: @action[:enabled])
                     end
                     if @action[:gen_password]
                       @users.each do |u|
                         password = random_password
                         u.password = password
                         u.password_confirmation = password
                         u.save
                       end
                     end
                     if @action[:add_group] and @action[:group_name]
                       @group = Group.find(@action[:group_name])
-            -         @users.each { |user|  @group.users << user }
+            +         ok = []
+            +         failed = []
+            +         @users.each do |user|
+            +           begin
+            +             @group.users << user
+            +             ok << user.login
+            +           rescue => e
+            +             failed << user.login
+            +           end
+            +         end
+            +         flash[:success] = "The following users are added to the 'group #{@group.name}': " + ok.join(', ') if ok.count > 0
+            +         flash[:alert] = "The following users are already in the 'group #{@group.name}': " + failed.join(', ') if failed.count > 0
                     end
                   end
                 end
                 protected
                 def random_password(length=5)
                   chars = 'abcdefghijkmnopqrstuvwxyz23456789'
                   newpass = ""
                   length.times { newpass << chars[rand(chars.size-1)] }
                   return newpass
                 end

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

                   result.html_safe
                 end
                 def markdown(text)
                   markdown = RDiscount.new(text)
                   markdown.to_html.html_safe
                 end
                 BOOTSTRAP_FLASH_MSG = {
                   success: 'alert-success',
                   error: 'alert-danger',
-            -     alert: 'alert-block',
+            +     alert: 'alert-danger',
                   notice: 'alert-info'
                 }
                 def bootstrap_class_for(flash_type)
                   BOOTSTRAP_FLASH_MSG.fetch(flash_type.to_sym, flash_type.to_s)
                 end
                 def flash_messages
                   flash.each do |msg_type, message|
                     concat(content_tag(:div, message, class: "alert #{bootstrap_class_for(msg_type)} fade in") do
                             concat content_tag(:button, 'x', class: "close", data: { dismiss: 'alert' })
                             concat message

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

               class Problem < ActiveRecord::Base
                 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
                 validates_presence_of :name
                 validates_format_of :name, :with => /\A\w+\z/
                 validates_presence_of :full_name
                 scope :available, -> { where(available: true) }
                 DEFAULT_TIME_LIMIT = 1
                 DEFAULT_MEMORY_LIMIT = 32

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

               require 'digest/sha1'
               require 'net/pop'
               require 'net/https'
               require 'net/http'
               require 'json'
               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)}
                 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_one :contest_stat, :class_name => "UserContestStat", :dependent => :destroy

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
                 = form_tag :action => 'quick_create' do
                   %b Quick New:
                   %label{:for => "problem_name"} Name
                   = text_field 'problem', 'name'
                   |
                   %label{:for => "problem_full_name"} Full name
                   = text_field 'problem', 'full_name'
                   = submit_tag "Create"
               %table.table.table-condense.table-hover

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

                         shiftclick(start,stop,$(this).is(':checked') )
                       }
                       start = orig_stop
                     } else {
                       start = parseInt($(this).attr('id').split('-')[2]);
                     }
                   });
                 });
               %h1 Manage problems
-            - %p= link_to '[Back to problem list]', :action => 'list'
+            + %p= link_to '[Back to problem list]', problems_path
               = form_tag :action=>'do_manage' do
-            -   .submitbox.panel
+            +   .panel.panel-primary
-            -     What do you want to do to the selected problem?
+            +     .panel-heading
-            -     %br/
+            +       Action
-            -     (You can shift-click to select a range of problems)
+            +     .panel-body
-            -     %ul
+            +       .submit-box
-            -       %li
+            +         What do you want to do to the selected problem?
-            -         Change date added to
+            +         %br/
-            -         = select_date Date.current, :prefix => 'date_added'
+            +         (You can shift-click to select a range of problems)
-            -         &nbsp;&nbsp;&nbsp;
+            +         %ul
-            -         = submit_tag 'Change', :name => 'change_date_added'
+            +           %li
-            -       %li
+            +             Change date added to
-            -         Set available to
+            +             = select_date Date.current, :prefix => 'date_added'
-            -         = submit_tag 'True', :name => 'enable_problem'
+            +             &nbsp;&nbsp;&nbsp;
-            -         = submit_tag 'False', :name => 'disable_problem'
+            +             = submit_tag 'Change', :name => 'change_date_added', class: 'btn btn-default'
+            +           %li
+            +             Set available to
+            +             = submit_tag 'True', :name => 'enable_problem', class: 'btn btn-default'
+            +             = submit_tag 'False', :name => 'disable_problem', class: 'btn btn-default'
-            -       - if GraderConfiguration.multicontests?
+            +           - if GraderConfiguration.multicontests?
-            -         %li
+            +             %li
-            -           Add to
+            +               Add to
-            -           = select("contest","id",Contest.all.collect {|c| [c.title, c.id]})
+            +               = select("contest","id",Contest.all.collect {|c| [c.title, c.id]})
-            -           = submit_tag 'Add', :name => 'add_to_contest'
+            +               = submit_tag 'Add', :name => 'add_to_contest', class: 'btn btn-default'
-            -       %li
+            +           %li
-            -         Add problems to group
+            +             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'
+            +             = 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'
+            +             = submit_tag 'Add', name: 'add_group', class: 'btn btn-default'
                 %table.table.table-hover
                   %tr{style: "text-align: left;"}
                     %th= check_box_tag 'select_all'
                     %th Name
                     %th Full name
                     %th Available
                     %th Date added
                     - if GraderConfiguration.multicontests?
                       %th Contests

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

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