cafe-grader-web Commit - r719:19bd5319581a

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

new file 100644

app/assets/javascripts/tags.coffee created 644 ¶ +3

@@ -0,0 +1,3
	1	+ # Place all the behaviors and hooks related to the matching controller here.
	2	+ # All this logic will automatically be available in application.js.
	3	+ # You can use CoffeeScript in this file: http://coffeescript.org/

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/tags.scss created 644 ¶ +3

@@ -0,0 +1,3
	1	+ // Place all the styles related to the tags controller here.
	2	+ // They will automatically be included in application.css.
	3	+ // You can use Sass (SCSS) here: http://sass-lang.com/

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

new file 100644

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

@@ -0,0 +1,104
	1	+ class GroupsController < ApplicationController
	2	+ before_action :set_group, only: [:show, :edit, :update, :destroy,
	3	+ :add_user, :remove_user,:remove_all_user,
	4	+ :add_problem, :remove_problem,:remove_all_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), flash: {success: "User #{user.login} was removed from the group #{@group.name}"}
	56	+ end
	57	+
	58	+ def remove_all_user
	59	+ @group.users.clear
	60	+ redirect_to group_path(@group), alert: 'All users removed'
	61	+ end
	62	+
	63	+ def remove_all_problem
	64	+ @group.problems.clear
	65	+ redirect_to group_path(@group), alert: 'All problems removed'
	66	+ end
	67	+
	68	+ def add_user
	69	+ user = User.find(params[:user_id])
	70	+ begin
	71	+ @group.users << user
	72	+ redirect_to group_path(@group), flash: { success: "User #{user.login} was add to the group #{@group.name}"}
	73	+ rescue => e
	74	+ redirect_to group_path(@group), alert: e.message
	75	+ end
	76	+ end
	77	+
	78	+ def remove_problem
	79	+ problem = Problem.find(params[:problem_id])
	80	+ @group.problems.delete(problem)
	81	+ redirect_to group_path(@group), flash: {success: "Problem #{problem.name} was removed from the group #{@group.name}" }
	82	+ end
	83	+
	84	+ def add_problem
	85	+ problem = Problem.find(params[:problem_id])
	86	+ begin
	87	+ @group.problems << problem
	88	+ redirect_to group_path(@group), flash: {success: "Problem #{problem.name} was add to the group #{@group.name}" }
	89	+ rescue => e
	90	+ redirect_to group_path(@group), alert: e.message
	91	+ end
	92	+ end
	93	+
	94	+ private
	95	+ # Use callbacks to share common setup or constraints between actions.
	96	+ def set_group
	97	+ @group = Group.find(params[:id])
	98	+ end
	99	+
	100	+ # Only allow a trusted parameter "white list" through.
	101	+ def group_params
	102	+ params.require(:group).permit(:name, :description)
	103	+ end
	104	+ end

app/controllers/tags_controller.rb created 644 ¶ +60

@@ -0,0 +1,60
	1	+ class TagsController < ApplicationController
	2	+ before_action :set_tag, only: [:show, :edit, :update, :destroy]
	3	+
	4	+ # GET /tags
	5	+ def index
	6	+ @tags = Tag.all
	7	+ end
	8	+
	9	+ # GET /tags/1
	10	+ def show
	11	+ end
	12	+
	13	+ # GET /tags/new
	14	+ def new
	15	+ @tag = Tag.new
	16	+ end
	17	+
	18	+ # GET /tags/1/edit
	19	+ def edit
	20	+ end
	21	+
	22	+ # POST /tags
	23	+ def create
	24	+ @tag = Tag.new(tag_params)
	25	+
	26	+ if @tag.save
	27	+ redirect_to @tag, notice: 'Tag was successfully created.'
	28	+ else
	29	+ render :new
	30	+ end
	31	+ end
	32	+
	33	+ # PATCH/PUT /tags/1
	34	+ def update
	35	+ if @tag.update(tag_params)
	36	+ redirect_to @tag, notice: 'Tag was successfully updated.'
	37	+ else
	38	+ render :edit
	39	+ end
	40	+ end
	41	+
	42	+ # DELETE /tags/1
	43	+ def destroy
	44	+ #remove any association
	45	+ ProblemTag.where(tag_id: @tag.id).destroy_all
	46	+ @tag.destroy
	47	+ redirect_to tags_url, notice: 'Tag was successfully destroyed.'
	48	+ end
	49	+
	50	+ private
	51	+ # Use callbacks to share common setup or constraints between actions.
	52	+ def set_tag
	53	+ @tag = Tag.find(params[:id])
	54	+ end
	55	+
	56	+ # Only allow a trusted parameter "white list" through.
	57	+ def tag_params
	58	+ params.require(:tag).permit(:name, :description, :public)
	59	+ end
	60	+ end

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

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

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

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

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

@@ -0,0 +1,13
	1	+ class Group < ActiveRecord::Base
	2	+ has_many :groups_problems, class_name: GroupProblem
	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	+
	12	+ end
	13	+

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

app/models/problem_tag.rb created 644 ¶ +8

@@ -0,0 +1,8
	1	+ class ProblemTag < ActiveRecord::Base
	2	+ self.table_name = 'problems_tags'
	3	+
	4	+ belongs_to :problem
	5	+ belongs_to :tag
	6	+
	7	+ validates_uniqueness_of :problem_id, scope: :tag_id, message: ->(object, data) { "'#{Problem.find(data[:value]).full_name}' is already has this tag" }
	8	+ end

app/models/tag.rb created 644 ¶ +4

@@ -0,0 +1,4
	1	+ class Tag < ActiveRecord::Base
	2	+ has_many :problems_tags, class_name: ProblemTag
	3	+ has_many :problems, through: :problems_tags
	4	+ end

app/views/contests/edit.html.haml created 644 ¶ +20

@@ -0,0 +1,20
	1	+ %h1 Editing contest
	2	+ = form_for(@contest) do \|f\|
	3	+ = f.error_messages
	4	+ %table
	5	+ %tr
	6	+ %td= f.label :name
	7	+ %td= f.text_field :name
	8	+ %tr
	9	+ %td= f.label :title
	10	+ %td= f.text_field :title
	11	+ %tr
	12	+ %td
	13	+ %td
	14	+ = f.check_box :enabled
	15	+ = f.label :enabled
	16	+ %p
	17	+ = f.submit 'Update'
	18	+ = link_to 'Show', @contest
	19	+ \|
	20	+ = link_to 'Back', contests_path

app/views/contests/index.html.haml created 644 ¶ +27

@@ -0,0 +1,27
	1	+ %h1 Listing contests
	2	+ .infobox
	3	+ %b Go back to:
	4	+ [#{link_to 'contest management', :controller => 'contest_management', :action => 'index'}]
	5	+ %p= link_to 'New contest', new_contest_path, class: 'btn btn-success'
	6	+ %table.table.table-striped
	7	+ %tr
	8	+ %th Name
	9	+ %th Title
	10	+ %th Enabled
	11	+ %th
	12	+ %th
	13	+ %th
	14	+
	15	+ - @contests.each do \|contest\|
	16	+ - @contest = contest
	17	+ %tr
	18	+ -#%td= in_place_editor_field :contest, :name, {}, :rows => 1
	19	+ -#%td= in_place_editor_field :contest, :title, {}, :rows => 1
	20	+ -#%td= in_place_editor_field :contest, :enabled, {}, :rows => 1
	21	+ %td= best_in_place @contest, :name
	22	+ %td= best_in_place @contest, :title
	23	+ %td= best_in_place @contest, :enabled
	24	+ %td= link_to 'Show', contest
	25	+ %td= link_to 'Edit', edit_contest_path(contest)
	26	+ %td= link_to 'Destroy', contest, :confirm => 'Are you sure?', :method => :delete
	27	+ %br/

app/views/contests/new.html.haml created 644 ¶ +18

@@ -0,0 +1,18
	1	+ %h1 New contest
	2	+ = form_for(@contest) do \|f\|
	3	+ = f.error_messages
	4	+ %p
	5	+ = f.label :name
	6	+ %br/
	7	+ = f.text_field :name
	8	+ %p
	9	+ = f.label :title
	10	+ %br/
	11	+ = f.text_field :title
	12	+ %p
	13	+ = f.label :enabled
	14	+ %br/
	15	+ = f.check_box :enabled
	16	+ %p
	17	+ = f.submit 'Create'
	18	+ = link_to 'Back', contests_path

app/views/contests/show.html.haml created 644 ¶ +11

@@ -0,0 +1,11
	1	+ %h1
	2	+ Contest: #{h @contest.title}
	3	+ .infobox
	4	+ %b Go back to:
	5	+ [#{link_to 'contest management', :controller => 'contest_management', :action => 'index'}]
	6	+ %p
	7	+ %b Enabled:
	8	+ = h @contest.enabled
	9	+ = link_to 'Edit', edit_contest_path(@contest)
	10	+ \|
	11	+ = link_to 'Back', contests_path

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 ¶ +22

@@ -0,0 +1,22
	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	+
	13	+ %tbody
	14	+ - @groups.each do \|group\|
	15	+ %tr
	16	+ %td= group.name
	17	+ %td= group.description
	18	+ %td= link_to 'View', group, class: 'btn btn-default'
	19	+ %td= link_to 'Destroy', group, :method => :delete, :data => { :confirm => 'Are you sure?' }, class: 'btn btn-danger'
	20	+
	21	+ %br
	22	+

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 ¶ +73

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

app/views/tags/_form.html.haml created 644 ¶ +22

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

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

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

app/views/tags/index.html.haml created 644 ¶ +26

@@ -0,0 +1,26
	1	+ %h1 Tags
	2	+
	3	+ = link_to 'New Tag', new_tag_path, class: 'btn btn-success'
	4	+
	5	+ %table.table.table-hover
	6	+ %thead
	7	+ %tr
	8	+ %th Name
	9	+ %th Description
	10	+ %th Public
	11	+ %th
	12	+ %th
	13	+ %th
	14	+
	15	+ %tbody
	16	+ - @tags.each do \|tag\|
	17	+ %tr
	18	+ %td= tag.name
	19	+ %td= tag.description
	20	+ %td= tag.public
	21	+ %td= link_to 'Show', tag
	22	+ %td= link_to 'Edit', edit_tag_path(tag)
	23	+ %td= link_to 'Destroy', tag, :method => :delete, :data => { :confirm => 'Are you sure?' }
	24	+
	25	+ %br
	26	+

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

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

app/views/tags/show.html.haml created 644 ¶ +15

@@ -0,0 +1,15
	1	+ %p#notice= notice
	2	+
	3	+ %p
	4	+ %b Name:
	5	+ = @tag.name
	6	+ %p
	7	+ %b Description:
	8	+ = @tag.description
	9	+ %p
	10	+ %b Public:
	11	+ = @tag.public
	12	+
	13	+ = link_to 'Edit', edit_tag_path(@tag)
	14	+ \\|
	15	+ = link_to 'Back', tags_path

app/views/user_admin/_form.html.haml created 644 ¶ +38

@@ -0,0 +1,38
	1	+ = error_messages_for 'user'
	2	+ / [form:user]
	3	+ .form-group
	4	+ %label.col-md-2.control-label{for: :login} Login
	5	+ .col-md-4
	6	+ = text_field 'user', 'login', class: 'form-control'
	7	+ .col-md-6
	8	+ .form-group
	9	+ %label.col-md-2.control-label{for: :full_name} Full name
	10	+ .col-md-4
	11	+ = text_field 'user', 'full_name', class: 'form-control'
	12	+ .col-md-6
	13	+ .form-group
	14	+ %label.col-md-2.control-label{for: :password} Password
	15	+ .col-md-4
	16	+ = password_field 'user', 'password', class: 'form-control'
	17	+ .col-md-6
	18	+ .form-group
	19	+ %label.col-md-2.control-label{for: :password_confirmation} Password (confirm)
	20	+ .col-md-4
	21	+ = password_field 'user', 'password_confirmation', class: 'form-control'
	22	+ .col-md-6
	23	+ .form-group
	24	+ %label.col-md-2.control-label{for: :email} E-mail
	25	+ .col-md-4
	26	+ = email_field 'user', 'email', class: 'form-control'
	27	+ .col-md-6
	28	+ .form-group
	29	+ %label.col-md-2.control-label{for: :alias} Alias
	30	+ .col-md-4
	31	+ = text_field 'user', 'alias', class: 'form-control'
	32	+ .col-md-6
	33	+ .form-group
	34	+ %label.col-md-2.control-label{for: :remark} Remark
	35	+ .col-md-4
	36	+ = text_field 'user', 'remark', class: 'form-control'
	37	+ .col-md-6
	38	+ / [eoform:user]

app/views/user_admin/new.html.haml created 644 ¶ +7

@@ -0,0 +1,7
	1	+ %h1 New user
	2	+ = form_tag( {action: 'create'}, { class: 'form-horizontal'}) do
	3	+ = render :partial => 'form'
	4	+ .form-group
	5	+ .col-md-offset-2.col-md-10
	6	+ = submit_tag "Create", class: 'btn btn-primary'
	7	+ = link_to 'Back', :action => 'index'

app/views/user_admin/show.html.haml created 644 ¶ +14

@@ -0,0 +1,14
	1	+ %h1 User information
	2	+ - for column in User.content_columns
	3	+ %p
	4	+ %b
	5	+ = column.human_name
	6	+ \:
	7	+ = h @user.send(column.name)
	8	+ %p
	9	+ %strong Group
	10	+ \:
	11	+ = @user.groups.map{ \|x\| link_to(x.name,group_path(x)).html_safe}.join(', ').html_safe
	12	+ = link_to 'Edit', :action => 'edit', :id => @user
	13	+ \|
	14	+ = link_to 'Back', :action => 'index'

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 tags testcases).each do \|controller\|
	22	+ Rails.application.config.assets.precompile += ["#{controller}.js", "#{controller}.css"]
	23	+ end

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

db/migrate/20170914150545_create_tags.rb created 644 ¶ +11

@@ -0,0 +1,11
	1	+ class CreateTags < ActiveRecord::Migration
	2	+ def change
	3	+ create_table :tags do \|t\|
	4	+ t.string :name, null: false
	5	+ t.text :description
	6	+ t.boolean :public
	7	+
	8	+ t.timestamps null: false
	9	+ end
	10	+ end
	11	+ end

db/migrate/20170914150742_create_problem_tags.rb created 644 ¶ +10

@@ -0,0 +1,10
	1	+ class CreateProblemTags < ActiveRecord::Migration
	2	+ def change
	3	+ create_table :problems_tags do \|t\|
	4	+ t.references :problem, index: true, foreign_key: true
	5	+ t.references :tag, index: true, foreign_key: true
	6	+
	7	+ t.index [:problem_id,:tag_id], unique: true
	8	+ end
	9	+ end
	10	+ 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

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

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

test/fixtures/problem_tags.yml created 644 ¶ +9

@@ -0,0 +1,9
	1	+ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
	2	+
	3	+ one:
	4	+ problem_id:
	5	+ tag_id:
	6	+
	7	+ two:
	8	+ problem_id:
	9	+ tag_id:

test/fixtures/tags.yml created 644 ¶ +11

@@ -0,0 +1,11
	1	+ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
	2	+
	3	+ one:
	4	+ name: MyString
	5	+ description: MyString
	6	+ public:
	7	+
	8	+ two:
	9	+ name: MyString
	10	+ description: MyString
	11	+ public:

test/models/problem_tag_test.rb created 644 ¶ +7

@@ -0,0 +1,7
	1	+ require 'test_helper'
	2	+
	3	+ class ProblemTagTest < ActiveSupport::TestCase
	4	+ # test "the truth" do
	5	+ # assert true
	6	+ # end
	7	+ end

test/models/tag_test.rb created 644 ¶ +7

@@ -0,0 +1,7
	1	+ require 'test_helper'
	2	+
	3	+ class TagTest < ActiveSupport::TestCase
	4	+ # test "the truth" do
	5	+ # assert true
	6	+ # end
	7	+ end

Gemfile ¶ +4 -3

               #syntax highlighter
               gem 'rouge'
-            - #add bootstrap
+            + #bootstrap add-ons
               gem 'bootstrap-sass', '~> 3.2.0'
               gem 'bootstrap-switch-rails'
               gem 'bootstrap-toggle-rails'
               gem 'autoprefixer-rails'
-            - #bootstrap sortable
               gem 'momentjs-rails'
               gem 'rails_bootstrap_sortable'
+            + gem 'bootstrap-datepicker-rails'
+            + gem 'bootstrap3-datetimepicker-rails'
+            + gem 'jquery-datatables-rails'
               #----------- user interface -----------------
               #select 2

Gemfile.lock ¶ +13 -1

                   best_in_place (3.0.3)
                     actionpack (>= 3.2)
                     railties (>= 3.2)
+            +     bootstrap-datepicker-rails (1.7.1.1)
+            +       railties (>= 3.0)
                   bootstrap-sass (3.2.0.2)
                     sass (~> 3.2)
                   bootstrap-switch-rails (3.3.3)
                   bootstrap-toggle-rails (2.2.1.0)
+            +     bootstrap3-datetimepicker-rails (4.17.47)
+            +       momentjs-rails (>= 2.8.1)
                   builder (3.2.2)
                   coffee-rails (4.2.1)
                     coffee-script (>= 2.2.0)
                   i18n (0.7.0)
                   in_place_editing (1.2.0)
                   jquery-countdown-rails (2.0.2)
+            +     jquery-datatables-rails (3.4.0)
+            +       actionpack (>= 3.1)
+            +       jquery-rails
+            +       railties (>= 3.1)
+            +       sass-rails
                   jquery-rails (4.2.1)
                     rails-dom-testing (>= 1, < 3)
                     railties (>= 4.2.0)
                 activerecord-session_store
                 autoprefixer-rails
                 best_in_place (~> 3.0.1)
+            +   bootstrap-datepicker-rails
                 bootstrap-sass (~> 3.2.0)
                 bootstrap-switch-rails
                 bootstrap-toggle-rails
+            +   bootstrap3-datetimepicker-rails
                 coffee-rails
                 dynamic_form
                 fuzzy-string-match
                 haml-rails
                 in_place_editing
                 jquery-countdown-rails
+            +   jquery-datatables-rails
                 jquery-rails
                 jquery-tablesorter
                 jquery-timepicker-addon-rails
                 yaml_db
               BUNDLED WITH
-            -    1.13.6
+            +    1.15.4

app/assets/javascripts/application.js ¶ +6

               //
               //= require jquery
               //= require jquery_ujs
+            + //= require dataTables/jquery.dataTables
+            + //= require dataTables/bootstrap/3/jquery.dataTables.bootstrap
               //= require jquery-ui
               //= require bootstrap-sprockets
               //= require moment
+            + //= require moment/th
               //= require bootstrap-sortable
+            + //= require bootstrap-datetimepicker
               //= require select2
               //= require ace-rails-ap
               //= require ace/mode-c_cpp
               //= require best_in_place
               //= require best_in_place.jquery-ui
               //= require brython
+            + //= require bootstrap-datepicker
+            + //= require bootstrap-datetimepicker
               // since this is after blank line, it is not downloaded
               //x= require prototype

app/assets/stylesheets/application.css.scss ¶ +9

               //@import bootstrap3-switch
               @import "bootstrap-toggle";
               @import "bootstrap-sortable";
+            + @import "bootstrap-datepicker3";
+            + @import "bootstrap-datetimepicker";
+            + @import "dataTables/bootstrap/3/jquery.dataTables.bootstrap";
               //bootstrap navbar color (from)
               $bgDefault: #19197b;
                 margin-top: 5px;
                 margin-bottom: 5px;
               }
+            +
+            +
+            +
+            + .grader-comment {
+            +   word-wrap: break-word;
+            + }

app/controllers/application_controller.rb ¶ +11 -13

                 def testcase_authorization
                   #admin always has privileged
-            -     puts "haha"
                   if @current_user.admin?
                     return true
                   end
-            -     puts "hehe"
-            -     puts GraderConfiguration["right.view_testcase"]
                   unauthorized_redirect unless GraderConfiguration["right.view_testcase"]
                 end
                     return false
                   end
+            +
                   # check if run in single user mode
                   if GraderConfiguration[SINGLE_USER_MODE_CONF_KEY]
-            -       user = User.find_by_id(session[:user_id])
+            +       if @current_user==nil or (not @current_user.admin?)
-            -       if user==nil or (not user.admin?)
                       flash[:notice] = 'You cannot log in at this time'
                       redirect_to :controller => 'main', :action => 'login'
                       return false
                     end
-            -       unless user.enabled?
-            -         flash[:notice] = 'Your account is disabled'
-            -         redirect_to :controller => 'main', :action => 'login'
-            -         return false
-            -       end
                     return true
                   end
+            +     # check if the user is enabled
+            +     unless @current_user.enabled? or @current_user.admin?
+            +       flash[:notice] = 'Your account is disabled'
+            +       redirect_to :controller => 'main', :action => 'login'
+            +       return false
+            +     end
+            +
                   if GraderConfiguration.multicontests?
-            -       user = User.find(session[:user_id])
+            +       return true if @current_user.admin?
-            -       return true if user.admin?
                     begin
-            -         if user.contest_stat(true).forced_logout
+            +         if @current_user.contest_stat(true).forced_logout
                         flash[:notice] = 'You have been automatically logged out.'
                         redirect_to :controller => 'main', :action => 'index'
                       end

app/controllers/graders_controller.rb ¶ +1 -36

@@ -1,22 +1,6
1	class GradersController < ApplicationController	1	class GradersController < ApplicationController
2		2
3	- before_filter :admin_authorization, ~~except~~: [ ~~:submission~~ ]	3	+ before_filter :admin_authorization
4	- before_filter(only: [:submission]) {
5	- #check if authenticated
6	- return false unless authenticate
7	-
8	- #admin always has privileged
9	- if @current_user.admin?
10	- return true
11	- end
12	-
13	- if GraderConfiguration["right.user_view_submission"] and Submission.find(params[:id]).problem.available?
14	- return true
15	- else
16	- unauthorized_redirect
17	- return false
18	- end
19	- }
20		4
21	verify :method => :post, :only => ['clear_all',	5	verify :method => :post, :only => ['clear_all',
22	'start_exam',	6	'start_exam',
@@ -77,25 +61,6
77	@task = Task.find(params[:id])	61	@task = Task.find(params[:id])
78	end	62	end
79		63
80	- def submission
81	- @submission = Submission.find(params[:id])
82	- formatter = Rouge::Formatters::HTML.new(css_class: 'highlight', line_numbers: true )
83	- lexer = case @submission.language.name
84	- when "c" then Rouge::Lexers::C.new
85	- when "cpp" then Rouge::Lexers::Cpp.new
86	- when "pas" then Rouge::Lexers::Pas.new
87	- when "ruby" then Rouge::Lexers::Ruby.new
88	- when "python" then Rouge::Lexers::Python.new
89	- when "java" then Rouge::Lexers::Java.new
90	- when "php" then Rouge::Lexers::PHP.new
91	- end
92	- @formatted_code = formatter.format(lexer.lex(@submission.source))
93	- @css_style = Rouge::Themes::ThankfulEyes.render(scope: '.highlight')
94	-
95	- user = User.find(session[:user_id])
96	- SubmissionViewLog.create(user_id: session[:user_id],submission_id: @submission.id) unless user.admin?
97	-
98	- end
99		64
100	# various grader controls	65	# various grader controls
101		66

app/controllers/login_controller.rb ¶ +26 -20

@@ -7,32 +7,38
7	end	7	end
8		8
9	def login	9	def login
10	- if (!GraderConfiguration['right.bypass_agreement']) and (!params[:accept_agree])	10	+ user = User.authenticate(params[:login], params[:password])
		11	+ unless user
		12	+ flash[:notice] = 'Wrong password'
		13	+ redirect_to :controller => 'main', :action => 'login'
		14	+ return
		15	+ end
		16	+
		17	+ if (!GraderConfiguration['right.bypass_agreement']) and (!params[:accept_agree]) and !user.admin?
11	flash[:notice] = 'You must accept the agreement before logging in'	18	flash[:notice] = 'You must accept the agreement before logging in'
12	redirect_to :controller => 'main', :action => 'login'	19	redirect_to :controller => 'main', :action => 'login'
13	- elsif user = User.authenticate(params[:login], params[:password])	20	+ return
14	- session[:user_id] = user.id	21	+ end
15	- session[:admin] = user.admin?	22	+
		23	+ #process logging in
		24	+ session[:user_id] = user.id
		25	+ session[:admin] = user.admin?
16		26
17	- # clear forced logout flag for multicontests contest change	27	+ # clear forced logout flag for multicontests contest change
18	- if GraderConfiguration.multicontests?	28	+ if GraderConfiguration.multicontests?
19	- contest_stat = user.contest_stat	29	+ contest_stat = user.contest_stat
20	- if contest_stat.respond_to? :forced_logout	30	+ if contest_stat.respond_to? :forced_logout
21	- if contest_stat.forced_logout	31	+ if contest_stat.forced_logout
22	- contest_stat.forced_logout = false	32	+ contest_stat.forced_logout = false
23	- contest_stat.save	33	+ contest_stat.save
24	- end
25	end	34	end
26	end	35	end
27	-	36	+ end
28	- #save login information
29	- Login.create(user_id: user.id, ip_address: request.remote_ip)
30		37
31	- redirect_to :controller => 'main', :action => 'list'	38	+ #save login information
32	- else	39	+ Login.create(user_id: user.id, ip_address: request.remote_ip)
33	- flash[:notice] = 'Wrong password'	40	+
34	- redirect_to :controller => 'main', :action => 'l~~ogin~~'	41	+ redirect_to :controller => 'main', :action => 'list'
35	- end
36	end	42	end
37		43
38	def site_login	44	def site_login

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

                     render :action => 'list' and return
                   end
-            -     if @submission.valid?
+            +     if @submission.valid?(@current_user)
                     if @submission.save == false
                       flash[:notice] = 'Error saving your submission'
                     elsif Task.create(:submission_id => @submission.id,
                     prepare_list_information
                     render :action => 'list' and return
                   end
-            -     redirect_to :action => 'list'
+            +     redirect_to edit_submission_path(@submission)
                 end
                 def source

app/controllers/problems_controller.rb ¶ +22 -6

                     redirect_to :controller => 'main', :action => 'list'
                     return
                   end
-            -     @submissions = Submission.includes(:user).where(problem_id: params[:id]).order(:user_id,:id)
+            +     @submissions = Submission.includes(:user).includes(:language).where(problem_id: params[:id]).order(:user_id,:id)
                   #stat summary
                   range =65
                     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|
+            +         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
+            +     elsif params.has_key? 'add_tags'
+            +       get_problems_from_params.each do |p|
+            +         p.tag_ids += params[:tag_ids]
+            +       end
                   end
+            +
                   redirect_to :action => 'manage'
                 end
                 def change_date_added
                   problems = get_problems_from_params
-            -     year = params[:date_added][:year].to_i
+            +     date = Date.parse(params[:date_added])
-            -     month = params[:date_added][:month].to_i
-            -     day = params[:date_added][:day].to_i
-            -     date = Date.new(year,month,day)
                   problems.each do |p|
                     p.date_added = date
                     p.save
                 private
                   def problem_params
-            -       params.require(:problem).permit(:name, :full_name, :full_score, :date_added, :available, :test_allowed,:output_only, :url, :description)
+            +       params.require(:problem).permit(:name, :full_name, :full_score, :date_added, :available, :test_allowed,:output_only, :url, :description, tag_ids:[])
                   end
               end

app/controllers/report_controller.rb ¶ +2

                   #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
+            +     @until_id = nil if @until_id == 0
                   #calculate the routine
                   @scorearray = calculate_max_score(@problems, @users, @since_id, @until_id)

app/controllers/submissions_controller.rb ¶ +10 -3

               class SubmissionsController < ApplicationController
                 before_action :authenticate
-            -   before_action :submission_authorization, only: [:show, :direct_edit_submission, :download, :edit]
+            +   before_action :submission_authorization, only: [:show, :download, :edit]
                 before_action :admin_authorization, only: [:rejudge]
                 # GET /submissions
                 #on-site new submission on specific problem
                 def direct_edit_problem
                   @problem = Problem.find(params[:problem_id])
+            +     unless @current_user.can_view_problem?(@problem)
+            +       unauthorized_redirect
+            +       return
+            +     end
                   @source = ''
+            +     if (params[:view_latest])
+            +       sub = Submission.find_last_by_user_and_problem(@current_user.id,@problem.id)
+            +       @source = @submission.source.to_s if @submission and @submission.source
+            +     end
                   render 'edit'
                 end
                   end
                   sub = Submission.find(params[:id])
-            -     if sub.problem.available?
+            +     if @current_user.available_problems.include? sub.problem
-            -       puts "sub = #{sub.user.id}, current = #{@current_user.id}"
                     return true if GraderConfiguration["right.user_view_submission"] or sub.user == @current_user
                   end

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

                 # this has problem-level access control
                 def download
                   problem = Problem.find(params[:id])
-            -     if !problem or !problem.available or !@user.can_view_problem? problem
+            +     unless @current_user.can_view_problem? problem
                     redirect_to :action => 'index' and return
                   end

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

                     @users = User.paginate :page => params[:page]
                     @paginated = true
                   end
+            +     @users = User.all
                   @hidden_columns = ['hashed_password', 'salt', 'created_at', 'updated_at']
                   @contests = Contest.enabled
                 end
                   end
                 end
+            +
                 # contest management
                 def contests
                 def bulk_manage
                   begin
-            -       @users = User.where('login REGEXP ?',params[:regex]) if params[:regex]
+            +       @users = User.where('(login REGEXP ?) OR (remark REGEXP ?)',params[:regex],params[:regex]) if params[:regex]
                     @users.count if @users #i don't know why I have to call count, but if I won't exception is not raised
                   rescue Exception
                     flash[:error] = 'Regular Expression is malformed'
                     @action[:set_enable] = params[:enabled]
                     @action[:enabled] = params[:enable] == "1"
                     @action[:gen_password] = params[:gen_password]
+            +       @action[:add_group] = params[:add_group]
+            +       @action[:group_name] = params[:group_name]
                   end
                   if params[:commit] == "Perform"
                         u.save
                       end
                     end
+            +       if @action[:add_group] and @action[:group_name]
+            +         @group = Group.find(@action[:group_name])
+            +         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

app/helpers/application_helper.rb ¶ +8 -5

                 end
                 def format_short_time(time)
-            -     now = Time.now.gmtime
+            +     now = Time.zone.now
                   st = ''
-            -     if (time.yday != now.yday) or
+            +     if (time.yday != now.yday) or (time.year != now.year)
-            - 	(time.year != now.year)
+            +       st = time.strftime("%d/%m/%y ")
-            -       st = time.strftime("%x ")
                   end
                   st + time.strftime("%X")
                 end
                   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)
                 BOOTSTRAP_FLASH_MSG = {
                   success: 'alert-success',
                   error: 'alert-danger',
-            -     alert: 'alert-block',
+            +     alert: 'alert-danger',
                   notice: 'alert-info'
                 }

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 ¶ +8

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

app/models/submission.rb ¶ +9 -5

                 def self.find_in_range_by_user_and_problem(user_id, problem_id,since_id,until_id)
                   records = Submission.where(problem_id: problem_id,user_id: user_id)
-            -     records = records.where('id >= ?',since_id) if since_id > 0
+            +     records = records.where('id >= ?',since_id) if since_id and since_id > 0
-            -     records = records.where('id <= ?',until_id) if until_id > 0
+            +     records = records.where('id <= ?',until_id) if until_id and until_id > 0
                   records.all
                 end
                   # for output_only tasks
                   return if self.problem!=nil and self.problem.output_only
+            +
                   if self.language==nil
                     errors.add('source',"Cannot detect language. Did you submit a correct source file?") unless self.language!=nil
                   end
                   return if self.source==nil
                   if self.problem==nil
                     errors.add('problem',"must be specified.")
-            -     elsif (!self.problem.available) and (self.new_record?)
+            +     else
-            -       errors.add('problem',"must be valid.")
+            +       #admin always have right
+            +       return if self.user.admin?
+            +
+            +       #check if user has the right to submit the problem
+            +       errors.add('problem',"must be valid.") if (!self.user.available_problems.include?(self.problem)) and (self.new_record?)
                   end
                 end

app/models/user.rb ¶ +35 -6

@@ -8,6 +8,10
8		8
9	has_and_belongs_to_many :roles	9	has_and_belongs_to_many :roles
10		10
		11	+ #has_and_belongs_to_many :groups
		12	+ has_many :groups_users, class_name: GroupUser
		13	+ has_many :groups, :through => :groups_users
		14	+
11	has_many :test_requests, -> {order(submitted_at: DESC)}	15	has_many :test_requests, -> {order(submitted_at: DESC)}
12		16
13	has_many :messages, -> { order(created_at: DESC) },	17	has_many :messages, -> { order(created_at: DESC) },
@@ -240,9 +244,14
240	return true	244	return true
241	end	245	end
242		246
		247	+ #get a list of available problem
243	def available_problems	248	def available_problems
244	if not GraderConfiguration.multicontests?	249	if not GraderConfiguration.multicontests?
245	- return Problem.available_problems	250	+ if GraderConfiguration.use_problem_group?
		251	+ return available_problems_in_group
		252	+ else
		253	+ return Problem.available_problems
		254	+ end
246	else	255	else
247	contest_problems = []	256	contest_problems = []
248	pin = {}	257	pin = {}
@@ -259,12 +268,32
259	end	268	end
260	end	269	end
261		270
		271	+ def available_problems_in_group
		272	+ problem = []
		273	+ self.groups.each do \|group\|
		274	+ group.problems.where(available: true).each { \|p\| problem << p }
		275	+ end
		276	+ problem.uniq!
		277	+ if problem
		278	+ problem.sort! do \|a,b\|
		279	+ case
		280	+ when a.date_added < b.date_added
		281	+ 1
		282	+ when a.date_added > b.date_added
		283	+ -1
		284	+ else
		285	+ a.name <=> b.name
		286	+ end
		287	+ end
		288	+ return problem
		289	+ else
		290	+ return []
		291	+ end
		292	+ end
		293	+
262	def can_view_problem?(problem)	294	def can_view_problem?(problem)
263	- if not GraderConfiguration.multicontests?	295	+ return true if admin?
264	- return problem.available	296	+ return available_problems.include? problem
265	- else
266	- return problem_in_user_contests? problem
267	- end
268	end	297	end
269		298
270	def self.clear_last_login	299	def self.clear_last_login

app/views/announcements/show.html.erb ¶ +1 -1

               <p>
                 <b>Body:</b>
-            -   <%=h @announcement.body %>
+            +   <%=h markdown(@announcement.body) %>
               </p>
               <p>

app/views/application/_submission_short.html.haml ¶ +11 -9

               - if submission.nil?
                 = "-"
               - else
+            +   %strong= "Submission ID:"
+            +   = submission.id
+            +   %br
                 - unless submission.graded_at
-            -     = t 'main.submitted_at'
+            +     %strong= t 'main.submitted_at:'
-            -     = format_short_time(submission.submitted_at.localtime)
+            +     = format_full_time_ago(submission.submitted_at.localtime)
                 - else
-            -     %strong= t 'main.graded_at'
+            +     %strong= t 'main.graded_at:'
-            -     = "#{format_short_time(submission.graded_at.localtime)} "
+            +     = format_full_time_ago(submission.graded_at.localtime)
                   %br
                   - if GraderConfiguration['ui.show_score']
                     %strong=t 'main.score'
                     = submission.grader_comment
                   = "]"
                   %br
-            -     %strong View:
+            +   %strong View:
-            -     - if GraderConfiguration.show_grading_result
+            +   - if GraderConfiguration.show_grading_result
-            -       = link_to '[detailed result]', :action => 'result', :id => submission.id
+            +     = link_to '[detailed result]', :action => 'result', :id => submission.id
-            -     = link_to "#{t 'main.cmp_msg'}", {:action => 'compiler_msg', :id => submission.id}, {popup: true,class: 'btn btn-xs btn-info'}
+            +   = link_to "#{t 'main.cmp_msg'}", {:action => 'compiler_msg', :id => submission.id}, {popup: true,class: 'btn btn-xs btn-info'} if submission.graded_at
                 = link_to "#{t 'main.src_link'}", download_submission_path(submission.id), class: 'btn btn-xs btn-info'
                 = link_to "#{t 'main.submissions_link'}", problem_submissions_path(problem_id), class: 'btn btn-xs btn-info'

app/views/graders/task.html.haml ¶ +1 -1

                 %br/
                 = "Submission: #{@task.submission_id}"
                 - if @task.submission !=nil
-            -     = link_to '[view submission]', :action => 'submission', :id => @task.submission.id
+            +     = link_to '[view submission]', submission_path( @task.submission.id )
                 %br/
                 = "Submitted at: #{format_short_time(@task.created_at)}"
                 %br/

app/views/layouts/_header.html.haml ¶ +2

                             %ul.dropdown-menu
                               = add_menu( 'Announcements', 'announcements', 'index')
                               = add_menu( 'Problems', 'problems', 'index')
+            +                 = add_menu( 'Tags', 'tags', 'index')
                               = add_menu( 'Users', 'user_admin', 'index')
+            +                 = add_menu( 'User Groups', 'groups', 'index')
                               = add_menu( 'Graders', 'graders', 'list')
                               = add_menu( 'Message ', 'messages', 'console')
                               %li.divider{role: 'separator'}

app/views/main/_login_box.html.haml ¶ +20 -16

@@ -12,22 +12,26
12	%hr/	12	%hr/
13		13
14	%div{ :style => "border: solid 1px gray; padding: 4px; background: #eeeeff;"}	14	%div{ :style => "border: solid 1px gray; padding: 4px; background: #eeeeff;"}
15	- = form_tag login_login_path do	15	+ = form_tag login_login_path, {class: 'form-horizontal'} do
16	- %table	16	+ .form-group
17	- %tr	17	+ =label_tag :login, "Login",class: 'col-sm-3 control-label'
18	- %td{:align => "right"}	18	+ .col-sm-9
19	- ="#{t 'login_label'}:"	19	+ =text_field_tag :login, nil, class: 'form-control'
20	- %td= text_field_tag 'login'	20	+ .form-group
21	- %tr	21	+ =label_tag :password, "Password", class: 'col-sm-3 control-label'
22	- %td{:align => "right"}	22	+ .col-sm-9
23	- ="#{t 'password_label'}:"	23	+ =password_field_tag :password, nil, class: 'form-control'
24	- %td= password_field_tag	24	+ - unless GraderConfiguration['right.bypass_agreement']
25	- - unless GraderConfiguration['right.bypass_agreement']	25	+ .form-group
26	- %tr	26	+ .col-sm-offset-3.col-sm-9
27	- %td{:align => "right"}= check_box_tag 'accept_agree'	27	+ .checkbox
28	- %td ยอมรับข้อตกลงการใช้งาน	28	+ %label
29	-	29	+ = check_box_tag 'accept_agree'
30	- = submit_tag t('login.login_submit')	30	+ ยอมรับข้อตกลงการใช้งาน
		31	+
		32	+ .form-group
		33	+ .col-sm-offset-3.col-sm-9
		34	+ = submit_tag t('login.login_submit'), class: 'btn btn-primary'
31	%br/	35	%br/
32		36
33	- if GraderConfiguration['system.online_registration']	37	- if GraderConfiguration['system.online_registration']

app/views/main/_problem.html.haml ¶ +1 -1

                   = link_to_description_if_any "[#{t 'main.problem_desc'}] <span class='glyphicon glyphicon-file'></span>".html_safe, problem
                 %td
                   = @prob_submissions[problem.id][:count]
-            -     = link_to "[subs]", main_submission_path(problem.id)
+            +     -#= link_to "[subs]", main_submission_path(problem.id)
                 %td
                   = render :partial => 'submission_short',
                     :locals => {:submission => @prob_submissions[problem.id][:submission], :problem_name => problem.name, :problem_id => problem.id }

app/views/main/_submission_short.html.haml ¶ +1 -1

                     %strong=t 'main.score'
                     = "#{(submission.points*100/submission.problem.full_score).to_i} "
                   = " ["
-            -     %tt
+            +     %tt.grader-comment
                     = submission.grader_comment
                   = "]"
                   %br

app/views/main/login.html.haml ¶ +9 -10

@@ -1,12 +1,11
1	%h1= GraderConfiguration['ui.front.title']	1	%h1= GraderConfiguration['ui.front.title']
2		2
3	- %table	3	+ .row
4	- %tr	4	+ .col-md-6
5	- %td	5	+ - if @announcements.length!=0
6	- - if @announcements.length!=0	6	+ .announcementbox{:style => 'margin-top: 0px'}
7	- .announcementbox{:style => 'margin-top: 0px'}	7	+ %span{:class => 'title'}
8	- %span{:class => 'title'}	8	+ Announcements
9	- Announcements	9	+ = render :partial => 'announcement', :collection => @announcements
10	- = render :partial => 'announcement', :collection => @announcements	10	+ .col-md-4{style: "padding-left: 20px;"}
11	- %td{:style => 'vertical-align: top; width: 40%; padding-left: 20px;'}	11	+ = render :partial => 'login_box'
12	- = render :partial => 'login_box'

app/views/problems/_form.html.haml ¶ +3

                 %label{:for => "problem_full_score"} Full score
                 = text_field 'problem', 'full_score', class: 'form-control'
               .form-group
+            +   %label{:for => "problem_full_score"} Tags
+            +   = collection_select(:problem, :tag_ids, Tag.all, :id, :name,  {}, {multiple: true, class: 'form-control select2'})
+            + .form-group
                 %label{:for => "problem_date_added"} Date added
                 = date_select 'problem', 'date_added', class: 'form-control'
               - # TODO: these should be put in model Problem, but I can't think of

app/views/problems/index.html.haml ¶ +16 -5

               - 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
                   %th Name
                   %th Full name
                   %th.text-right Full score
+            +     %th Tags
+            +     %th
+            +       Submit
+            +       %sup{class: 'text-primary',data: {toggle: 'tooltip'}, title: 'Admin can always submit to any problem' } [?]
                   %th Date added
                   %th.text-center
                     Avail?
                   %tr{:class => "#{(problem.available) ? "success" : "danger"}", :id => "prob-#{problem.id}", :name => "prob-#{problem.id}"}
                     - @problem=problem
                     %td= problem.name #in_place_editor_field :problem, :name, {}, :rows=>1
-            -       %td= problem.full_name #in_place_editor_field :problem, :full_name, {}, :rows=>1
+            +       %td
+            +         = problem.full_name #in_place_editor_field :problem, :full_name, {}, :rows=>1
+            +         = link_to_description_if_any "[#{t 'main.problem_desc'}] <span class='glyphicon glyphicon-file'></span>".html_safe, problem
                     %td.text-right= problem.full_score #in_place_editor_field :problem, :full_score, {}, :rows=>1
+            +       %td
+            +         - problem.tags.each do |t|
+            +           - #%button.btn.btn-default.btn-xs= t.name
+            +           %span.label.label-default= t.name
+            +       %td= link_to "Submit", direct_edit_problem_submissions_path(problem,@current_user.id), class: 'btn btn-xs btn-primary'
                     %td= problem.date_added
                     %td= toggle_button(@problem.available?, toggle_problem_path(@problem), "problem-avail-#{@problem.id}")
                     %td= toggle_button(@problem.view_testcase?, toggle_view_testcase_problem_path(@problem), "problem-view-testcase-#{@problem.id}")

app/views/problems/manage.html.haml ¶ +74 -41

@@ -36,50 +36,83
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	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.form-inline
51	- = submit_tag 'Change', :name => 'change_date_added'	51	+ %li
52	- %li	52	+ Change "Date added" to
53	- Set available to	53	+ .input-group.date
54	- = submit_tag 'True', :name => 'enable_problem'	54	+ = text_field_tag :date_added, class: 'form-control'
55	- = submit_tag 'False', :name => 'disable_problem'	55	+ %span.input-group-addon
		56	+ %span.glyphicon.glyphicon-calendar
		57	+ -# = select_date Date.current, :prefix => 'date_added'
		58	+
		59	+ = submit_tag 'Change', :name => 'change_date_added', class: 'btn btn-primary btn-sm'
		60	+ %li
		61	+ Set "Available" to
		62	+ = submit_tag 'True', :name => 'enable_problem', class: 'btn btn-primary btn-sm'
		63	+ = submit_tag 'False', :name => 'disable_problem', class: 'btn btn-primary btn-sm'
56		64
57	- - if GraderConfiguration.multicontests?	65	+ - if GraderConfiguration.multicontests?
58	- %li	66	+ %li
59	- Add to	67	+ Add selected problems to contest
60	- = select("contest","id",Contest.all.collect {\|c\| [c.title, c.id]})	68	+ = select("contest","id",Contest.all.collect {\|c\| [c.title, c.id]})
61	- = submit_tag 'Add', :name => 'add_to_contest'	69	+ = submit_tag 'Add', :name => 'add_to_contest', class: 'btn btn-primary btn-sm'
		70	+ %li
		71	+ Add selected problems to user group
		72	+ = select_tag "group_id", options_from_collection_for_select( Group.all, 'id','name',params[:group_name]), id: 'group_name',class: 'select2'
		73	+ = submit_tag 'Add', name: 'add_group', class: 'btn btn-primary'
		74	+ %li
		75	+ Add the following tags to the selected problems
		76	+ = select_tag "tag_ids", options_from_collection_for_select( Tag.all, 'id','name'), id: 'tags_name',class: 'select2', multiple: true, data: {placeholder: 'Select tags by clicking', width: "200px"}
		77	+ = submit_tag 'Add', name: 'add_tags', class: 'btn btn-primary'
62		78
63	- %table	79	+ %table.table.table-hover.datatable
64	- %tr{style: "text-align: left;"}	80	+ %thead
65	- %th= check_box_tag 'select_all'	81	+ %tr{style: "text-align: left;"}
66	- %th Name	82	+ %th= check_box_tag 'select_all'
67	- %th ~~Full n~~ame	83	+ %th Name
68	- %th ~~Availabl~~e	84	+ %th Full name
69	- %th ~~Date added~~	85	+ %th Tags
70	- - if GraderConfiguration.multicontests?	86	+ %th Available
71	- %th ~~Contests~~	87	+ %th Date added
		88	+ - if GraderConfiguration.multicontests?
		89	+ %th Contests
72		90
73	- - num = 0	91	+ %tbody
74	- - for problem in @problems	92	+ - num = 0
75	- - num += 1	93	+ - for problem in @problems
76	- %tr{:id => "row-prob-#{problem.id}", :name=> "prob-#{problem.id}"}	94	+ - num += 1
77	- %td= check_box_tag "prob-#{problem.id}-#{num}"	95	+ %tr{:id => "row-prob-#{problem.id}", :name=> "prob-#{problem.id}"}
78	- %td= problem.name	96	+ %td= check_box_tag "prob-#{problem.id}-#{num}"
79	- %td= problem.~~full_~~name	97	+ %td= problem.name
80	- %td= problem.~~availabl~~e	98	+ %td= problem.full_name
81	- %td= problem.date_added
82	- - if GraderConfiguration.multicontests?
83	%td	99	%td
84	- - problem.~~contest~~s.each do \|~~contes~~t\|	100	+ - problem.tags.each do \|t\|
85	- = "(#{contest.name} [#{link_to 'x', :action => 'remove_contest', :id => problem.id, :contest_id => contest.id }])"	101	+ %span.label.label-default= t.name
		102	+ %td= problem.available
		103	+ %td= problem.date_added
		104	+ - if GraderConfiguration.multicontests?
		105	+ %td
		106	+ - problem.contests.each do \|contest\|
		107	+ = "(#{contest.name} [#{link_to 'x', :action => 'remove_contest', :id => problem.id, :contest_id => contest.id }])"
		108	+
		109	+ :javascript
		110	+ $('.input-group.date').datetimepicker({
		111	+ format: 'DD/MMM/YYYY',
		112	+ showTodayButton: true,
		113	+ widgetPositioning: {horizontal: 'auto', vertical: 'bottom'},
		114	+
		115	+ });
		116	+ $('.datatable').DataTable({
		117	+ paging: false
		118	+ });

app/views/problems/stat.html.haml ¶ +10 -4

               %h2 Submissions
               - if @submissions and @submissions.count > 0
-            -   %table.info#main_table
+            +   %table#main_table.table.table-condensed.table-striped
                   %thead
-            -       %tr.info-head
+            +       %tr
                       %th ID
                       %th Login
                       %th Name
                       %th Submitted_at
+            +         %th language
                       %th Points
                       %th comment
                       %th IP
                     - @submissions.each do |sub|
                       - next unless sub.user
                       - row_odd,curr = !row_odd, sub.user if curr != sub.user
-            -         %tr{class: row_odd ? "info-odd" : "info-even"}
+            +         %tr
                         %td= link_to sub.id, submission_path(sub)
                         %td= link_to sub.user.login, stat_user_path(sub.user)
                         %td= sub.user.full_name
-            -           %td= time_ago_in_words(sub.submitted_at) + " ago"
+            +           %td{data: {order: sub.submitted_at}}= time_ago_in_words(sub.submitted_at) + " ago"
+            +           %td= sub.language.name
                         %td= sub.points
                         %td.fix-width= sub.grader_comment
                         %td= sub.ip_address
               - else
                 No submission
+            + :javascript
+            +   $("#main_table").DataTable({
+            +     paging: false
+            +   });

app/views/report/_score_table.html.haml ¶ +35

@@ -12,6 +12,9
12	%th.text-right Total	12	%th.text-right Total
13	%th.text-right Passed	13	%th.text-right Passed
14	%tbody	14	%tbody
		15	+ - sum = Array.new(@scorearray[0].count,0)
		16	+ - nonzero = Array.new(@scorearray[0].count,0)
		17	+ - full = Array.new(@scorearray[0].count,0)
15	- @scorearray.each do \|sc\|	18	- @scorearray.each do \|sc\|
16	%tr	19	%tr
17	- total,num_passed = 0,0	20	- total,num_passed = 0,0
@@ -27,8 +30,40
27	%td.text-right= sc[i][0]	30	%td.text-right= sc[i][0]
28	- total += sc[i][0]	31	- total += sc[i][0]
29	- num_passed += 1 if sc[i][1]	32	- num_passed += 1 if sc[i][1]
		33	+ - sum[i] += sc[i][0]
		34	+ - nonzero[i] += 1 if sc[i][0] > 0
		35	+ - full[i] += 1 if sc[i][1]
30	%td.text-right= total	36	%td.text-right= total
31	%td.text-right= num_passed	37	%td.text-right= num_passed
		38	+ %tfoot
		39	+ %tr
		40	+ %td Summation
		41	+ %td
		42	+ %td
		43	+ - sum.each.with_index do \|s,i\|
		44	+ - next if i == 0
		45	+ %td.text-right= number_with_delimiter(s)
		46	+ %td
		47	+ %td
		48	+ %tr
		49	+ %td partial solver
		50	+ %td
		51	+ %td
		52	+ - nonzero.each.with_index do \|s,i\|
		53	+ - next if i == 0
		54	+ %td.text-right= number_with_delimiter(s)
		55	+ %td
		56	+ %td
		57	+ %tr
		58	+ %td Full solver
		59	+ %td
		60	+ %td
		61	+ - full.each.with_index do \|s,i\|
		62	+ - next if i == 0
		63	+ %td.text-right= number_with_delimiter(s)
		64	+ %td
		65	+ %td
		66	+
32		67
33	:javascript	68	:javascript
34	$.bootstrapSortable(true,'reversed')	69	$.bootstrapSortable(true,'reversed')

app/views/report/max_score.html.haml ¶ +2 -2

                     .panel-body
                       .radio
                         %label
-            -             = radio_button_tag 'users', 'all', true
+            +             = radio_button_tag 'users', 'all', (params[:users] == "all")
                           All users
                       .radio
                         %label
-            -             = radio_button_tag 'users', 'enabled'
+            +             = radio_button_tag 'users', 'enabled', (params[:users] == "enabled")
                           Only enabled users
               .row
                 .col-md-12

app/views/sites/edit.html.haml ¶ +30 -18

@@ -1,24 +1,36
1	%h1 Editing site	1	%h1 Editing site
2	= error_messages_for :site	2	= error_messages_for :site
3	= form_for(@site) do \|f\|	3	= form_for(@site) do \|f\|
4	- %p	4	+ .row
5	- %b Name	5	+ .col-md-4
6	- %br/	6	+ .form-group.field
7	- = f.text_field :name	7	+ = f.label :name, "Name"
8	- %p	8	+ = f.text_field :name, class: 'form-control'
9	- %b Password	9	+ .form-group.field
10	- %br/	10	+ = f.label :password, "Password"
11	- = f.text_field :password	11	+ = f.text_field :password, class: 'form-control'
12	- %p	12	+ .form-group.field
13	- %b Started	13	+ = f.label :started, "Started"
14	- %br/	14	+ = f.check_box :started, class: 'form-control'
15	- = f.check_box :started	15	+ .form-group.field
16	- %p	16	+ = f.label :start_time, "Start time"
17	- %b Start time	17	+ -# = f.datetime_select :start_time, :include_blank => true
18	- %br/	18	+ .input-group.date
19	- = f.datetime_select :start_time, :include_blank => true	19	+ = f.text_field :start_time, class:'form-control' , value: (@site.start_time ? @site.start_time.strftime('%d/%b/%Y %H:%M') : '')
20	- %p	20	+ %span.input-group-addon
21	- = f.submit "Update"	21	+ %span.glyphicon.glyphicon-calendar
		22	+ .actions
		23	+ = f.submit "Update", class: 'btn btn-primary'
		24	+ .col-md-8
		25	+
22	= link_to 'Show', @site	26	= link_to 'Show', @site
23	\|	27	\|
24	= link_to 'Back', sites_path	28	= link_to 'Back', sites_path
		29	+
		30	+
		31	+ :javascript
		32	+ $('.input-group.date').datetimepicker({
		33	+ format: 'DD/MMM/YYYY HH:mm',
		34	+ showTodayButton: true,
		35	+ });
		36	+

app/views/submissions/edit.html.haml ¶ +7 -4

                   .col-md-8
                     %div#editor{style: 'height: 500px; border-radius: 7px; font-size: 14px;'}
                   .col-md-4
+            +       - # submission form
                     = form_tag({controller: :main, :action => 'submit'}, :multipart => true, class: 'form') do
                       = hidden_field_tag 'editor_text', @source
                       .form-group
                         = submit_tag 'Submit', class: 'btn btn-success', id: 'live_submit',
                           data: {confirm: "Submitting this source code for task #{@problem.long_name}?"}
-            -       .panel.panel-info
+            +       - # latest submission status
+            +       .panel{class: (@submission && @submission.graded_at) ? "panel-info" : "panel-warning"}
                       .panel-heading
                         Latest Submission Status
                         = link_to "Refresh",get_latest_submission_status_submissions_path(@submission.user,@problem), class: "btn btn-default btn-sm", remote: true if @submission
                       .panel-body
-            -           - if @submission
+            +           %div#latest_status
-            -             = render :partial => 'submission_short',
+            +             - if @submission
-            -               :locals => {submission: @submission, problem_name: @problem.name, problem_id: @problem.id }
+            +               = render :partial => 'submission_short',
+            +                 :locals => {submission: @submission, problem_name: @problem.name, problem_id: @problem.id }
                 .row
                   .col-md-12
                     %h2 Console

app/views/submissions/get_latest_submission_status.js.haml ¶ +1 -1

@@ -1,2 +1,2
1	:plain	1	:plain
2	- $("#latest_status").html("#{j render({partial: 'submission_short', locals: {submission: @submission, problem_name: @problem.name}})}")	2	+ $("#latest_status").html("#{j render({partial: 'submission_short', locals: {submission: @submission, problem_name: @problem.name, problem_id: @problem.id}})}")

app/views/user_admin/bulk_manage.html.haml ¶ +9

@@ -46,6 +46,15
46	%label.checkbox-inline	46	%label.checkbox-inline
47	= check_box_tag "gen_password", true, params[:gen_password]	47	= check_box_tag "gen_password", true, params[:gen_password]
48	Generate new random password	48	Generate new random password
		49	+ .row.form-group
		50	+ .col-md-4
		51	+ %label.checkbox-inline
		52	+ = check_box_tag "add_group", true, params[:add_group]
		53	+ Add users to group
		54	+ %label.col-md-3.control-label.text-right Group name
		55	+ .col-md-5
		56	+ = select_tag "group_name", options_from_collection_for_select( Group.all, 'id','name',params[:group_name]), id: 'group_name',class: 'form-control select2'
		57	+
49		58
50	.row	59	.row
51	.col-md-12	60	.col-md-12

app/views/user_admin/edit.html.haml ¶ +4 -2

               %h1 Editing user
-            - = form_tag :action => 'update', :id => @user do
+            + = form_tag( {:action => 'update', :id => @user}, {class: 'form-horizontal'}) do
                 = error_messages_for 'user'
                 = render partial: "form"
-            -   = submit_tag "Edit"
+            +   .form-group
+            +     .col-md-offset-2.col-md-4
+            +       = submit_tag "Edit", class: 'btn btn-primary'
               = link_to 'Show', :action => 'show', :id => @user

app/views/user_admin/index.html.haml ¶ +17 -12

-            - %h1 Listing users
+            + %h1 Users
               .panel.panel-primary
                 .panel-title.panel-heading
               %p
                 = link_to '+ New user', { :action => 'new' }, { class: 'btn btn-success '}
                 = link_to '+ New list of users', { :action => 'new_list' }, { class: 'btn btn-success '}
+            +   = link_to 'Bulk Manage', bulk_manage_user_admin_path , { class: 'btn btn-default btn-info'}
                 = link_to 'View administrators',{ :action => 'admin'}, { class: 'btn btn-default '}
-            -   = link_to 'Bulk Manage', bulk_manage_user_admin_path , { class: 'btn btn-default '}
                 = link_to 'Random passwords',{ :action => 'random_all_passwords'}, { class: 'btn btn-default '}
                 = link_to 'View active users',{ :action => 'active'}, { class: 'btn btn-default '}
                 = link_to 'Mass mailing',{ :action => 'mass_mailing'}, { class: 'btn btn-default '}
                   = link_to "[#{contest.name}]", :action => 'contests', :id => contest.id
                 = link_to "[no contest]", :action => 'contests', :id => 'none'
-            - Total #{@user_count} users |
+            + -# Total #{@user_count} users |
-            - - if !@paginated
+            + -# - if !@paginated
-            -   Display all users.
+            + -#   Display all users.
-            -   \#{link_to '[show in pages]', :action => 'index', :page => '1'}
+            + -#   \#{link_to '[show in pages]', :action => 'index', :page => '1'}
-            - - else
+            + -# - else
-            -   Display in pages.
+            + -#   Display in pages.
-            -   \#{link_to '[display all]', :action => 'index', :page => 'all'} |
+            + -#   \#{link_to '[display all]', :action => 'index', :page => 'all'} |
-            -   \#{will_paginate @users, :container => false}
+            + -#   \#{will_paginate @users, :container => false}
-            - %table.table.table-hover.table-condense
+            + %table.table.table-hover.table-condense.datatable
                 %thead
                   %th Login
                   %th Full name
                     %td= link_to 'Clear IP', {:action => 'clear_last_ip', :id => user, :page=>params[:page]}, :confirm => 'This will reset last logging in ip of the user, are you sure?', class: 'btn btn-default btn-xs btn-block'
                     %td= link_to 'Show', {:action => 'show', :id => user}, class: 'btn btn-default btn-xs btn-block'
                     %td= link_to 'Edit', {:action => 'edit', :id => user}, class: 'btn btn-default btn-xs btn-block'
-            -       %td= link_to 'Destroy', { :action => 'destroy', :id => user }, :confirm => 'Are you sure?', :method => :delete, class: 'btn btn-danger btn-xs btn-block'
+            +       %td= link_to 'Destroy', user_admin_destroy_path(user), data: {confirm: 'Are you sure?'}, method: :delete, class: 'btn btn-danger btn-xs btn-block'
               %br/
               = link_to '+ New user', { :action => 'new' }, { class: 'btn btn-success '}
               = link_to '+ New list of users', { :action => 'new_list' }, { class: 'btn btn-success '}
+            +
+            + :javascript
+            +   $('.datatable').DataTable({
+            +     'pageLength': 50
+            +   });

app/views/users/stat.html.haml ¶ +5 -1

               =render partial: 'application/bar_graph', locals: {histogram: @histogram, param: {bar_width: 7}}
-            - %table.tablesorter-cafe#submission_table
+            + %table#submission_table.table.table-striped
                 %thead
                   %tr
                     %th ID
+            + :javascript
+            +   $("#submission_table").DataTable({
+            +     paging: false
+            +   });

config/application.rb.SAMPLE ¶ +1 -1

                   config.assets.precompile += ['local_jquery.js','tablesorter-theme.cafe.css']
                   %w( announcements submissions configurations contests contest_management graders heartbeat
                       login main messages problems report site sites sources tasks
-            -         test user_admin users ).each do |controller|
+            +         test user_admin users testcases).each do |controller|
                     config.assets.precompile += ["#{controller}.js", "#{controller}.css"]
                   end
                 end

config/routes.rb ¶ +17 -1

               CafeGrader::Application.routes.draw do
+            +   resources :tags
                 get "sources/direct_edit"
                 root :to => 'main#login'
                     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'
+            +       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'
+            +     end
+            +     collection do
+            +
+            +     end
                 end
                 resources :testcases, only: [] do
                   end
                   collection do
                     get 'prob/:problem_id', to: 'submissions#index', as: 'problem'
-            -       get 'direct_edit_problem/:problem_id', to: 'submissions#direct_edit_problem', as: 'direct_edit_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
                 get 'user_admin/bulk_manage', to: 'user_admin#bulk_manage', as: 'bulk_manage_user_admin'
+            +   post 'user_admin', to: 'user_admin#create'
+            +   delete 'user_admin/:id', to: 'user_admin#destroy', as: 'user_admin_destroy'
                 #report
                 get 'report/current_score', to: 'report#current_score', as: 'report_current_score'

db/schema.rb ¶ +39 -1

@@ -11,7 +11,7
11	#	11	#
12	# It's strongly recommended that you check this file into your version control system.	12	# It's strongly recommended that you check this file into your version control system.
13		13
14	- ActiveRecord::Schema.define(version: 20170~~427070345~~) do	14	+ ActiveRecord::Schema.define(version: 20170914150742) do
15		15
16	create_table "announcements", force: :cascade do \|t\|	16	create_table "announcements", force: :cascade do \|t\|
17	t.string "author", limit: 255	17	t.string "author", limit: 255
@@ -79,6 +79,25
79		79
80	add_index "grader_processes", ["host", "pid"], name: "index_grader_processes_on_ip_and_pid", using: :btree	80	add_index "grader_processes", ["host", "pid"], name: "index_grader_processes_on_ip_and_pid", using: :btree
81		81
		82	+ create_table "groups", force: :cascade do \|t\|
		83	+ t.string "name", limit: 255
		84	+ t.string "description", limit: 255
		85	+ end
		86	+
		87	+ create_table "groups_problems", id: false, force: :cascade do \|t\|
		88	+ t.integer "problem_id", limit: 4, null: false
		89	+ t.integer "group_id", limit: 4, null: false
		90	+ end
		91	+
		92	+ add_index "groups_problems", ["group_id", "problem_id"], name: "index_groups_problems_on_group_id_and_problem_id", using: :btree
		93	+
		94	+ create_table "groups_users", id: false, force: :cascade do \|t\|
		95	+ t.integer "group_id", limit: 4, null: false
		96	+ t.integer "user_id", limit: 4, null: false
		97	+ end
		98	+
		99	+ add_index "groups_users", ["user_id", "group_id"], name: "index_groups_users_on_user_id_and_group_id", using: :btree
		100	+
82	create_table "heart_beats", force: :cascade do \|t\|	101	create_table "heart_beats", force: :cascade do \|t\|
83	t.integer "user_id", limit: 4	102	t.integer "user_id", limit: 4
84	t.string "ip_address", limit: 255	103	t.string "ip_address", limit: 255
@@ -127,6 +146,15
127	t.boolean "view_testcase"	146	t.boolean "view_testcase"
128	end	147	end
129		148
		149	+ create_table "problems_tags", force: :cascade do \|t\|
		150	+ t.integer "problem_id", limit: 4
		151	+ t.integer "tag_id", limit: 4
		152	+ end
		153	+
		154	+ add_index "problems_tags", ["problem_id", "tag_id"], name: "index_problems_tags_on_problem_id_and_tag_id", unique: true, using: :btree
		155	+ add_index "problems_tags", ["problem_id"], name: "index_problems_tags_on_problem_id", using: :btree
		156	+ add_index "problems_tags", ["tag_id"], name: "index_problems_tags_on_tag_id", using: :btree
		157	+
130	create_table "rights", force: :cascade do \|t\|	158	create_table "rights", force: :cascade do \|t\|
131	t.string "name", limit: 255	159	t.string "name", limit: 255
132	t.string "controller", limit: 255	160	t.string "controller", limit: 255
@@ -200,6 +228,14
200	add_index "submissions", ["user_id", "problem_id", "number"], name: "index_submissions_on_user_id_and_problem_id_and_number", unique: true, using: :btree	228	add_index "submissions", ["user_id", "problem_id", "number"], name: "index_submissions_on_user_id_and_problem_id_and_number", unique: true, using: :btree
201	add_index "submissions", ["user_id", "problem_id"], name: "index_submissions_on_user_id_and_problem_id", using: :btree	229	add_index "submissions", ["user_id", "problem_id"], name: "index_submissions_on_user_id_and_problem_id", using: :btree
202		230
		231	+ create_table "tags", force: :cascade do \|t\|
		232	+ t.string "name", limit: 255, null: false
		233	+ t.text "description", limit: 65535
		234	+ t.boolean "public"
		235	+ t.datetime "created_at", null: false
		236	+ t.datetime "updated_at", null: false
		237	+ end
		238	+
203	create_table "tasks", force: :cascade do \|t\|	239	create_table "tasks", force: :cascade do \|t\|
204	t.integer "submission_id", limit: 4	240	t.integer "submission_id", limit: 4
205	t.datetime "created_at"	241	t.datetime "created_at"
@@ -280,4 +316,6
280		316
281	add_index "users", ["login"], name: "index_users_on_login", unique: true, using: :btree	317	add_index "users", ["login"], name: "index_users_on_login", unique: true, using: :btree
282		318
		319	+ add_foreign_key "problems_tags", "problems"
		320	+ add_foreign_key "problems_tags", "tags"
283	end	321	end

db/seeds.rb ¶ +10 -1

@@ -163,7 +163,16
163	:value_type => 'string',	163	:value_type => 'string',
164	:default_value => 'none',	164	:default_value => 'none',
165	:description => "New user will be assigned to this contest automatically, if it exists. Set to 'none' if there is no default contest."	165	:description => "New user will be assigned to this contest automatically, if it exists. Set to 'none' if there is no default contest."
166	- }	166	+ },
		167	+
		168	+ {
		169	+ :key => 'system.use_problem_group',
		170	+ :value_type => 'boolean',
		171	+ :default_value => 'false',
		172	+ :description => "If true, available problem to the user will be only ones associated with the group of the user."
		173	+ },
		174	+
		175	+
167		176
168	]	177	]
169		178

lib/grader_script.rb ¶ +1

                   GraderScript.call_grader "#{env} test_request -err-log &"
                 end
+            +   #call the import problem script
                 def self.call_import_problem(problem_name,
                                              problem_dir,
                                              time_limit=1,

lib/testdata_importer.rb ¶ +4 -2

                   @problem = problem
                 end
-            -   def import_from_file(tempfile,
+            +   #Create or update problem according to the parameter
-            -                        time_limit,
+            +   def import_from_file(tempfile,
+            +                        time_limit,
                                      memory_limit,
                                      checker_name='text',
                                      import_to_db=false)
                   return filename.slice(i..len)
                 end
+            +   # extract an archive file located at +tempfile+ to the +raw_dir+
                 def extract(tempfile)
                   testdata_filename = save_testdata_file(tempfile)
                   ext = TestdataImporter.long_ext(tempfile.original_filename)

app/views/contests/edit.html.erb removed ¶ -29

deleted file

app/views/contests/index.html.erb removed ¶ -29

deleted file

app/views/contests/new.html.erb removed ¶ -23

deleted file

app/views/contests/show.html.erb removed ¶ -14

deleted file

app/views/graders/submission.html.haml removed ¶ -87

deleted file

app/views/user_admin/_form.html.erb removed ¶ -25

deleted file

app/views/user_admin/new.html.erb removed ¶ -8

deleted file

app/views/user_admin/show.html.erb removed ¶ -10

deleted file

Sign in to your account

Author

r719:19bd5319581a - Sat, 10 Mar 2018 07:31:57 - 95 files changed: 1275 inserted, 462 deleted

	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

Commit r719:19bd5319581a public

Author

r719:19bd5319581a - Sat, 10 Mar 2018 07:31:57 - 95 files changed: 1275 inserted, 462 deleted

Commit `r719:19bd5319581a` public