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

               gem 'best_in_place', '~> 3.0.1'
               # jquery addition
               gem 'jquery-rails'
               gem 'jquery-ui-rails'
               gem 'jquery-timepicker-addon-rails'
               gem 'jquery-tablesorter'
               gem 'jquery-countdown-rails'
               #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
               gem 'select2-rails'
               #ace editor
               gem 'ace-rails-ap'
               #paginator
               gem 'will_paginate', '~> 3.0.7'
               gem 'mail'
               gem 'rdiscount'
               gem 'dynamic_form'

Gemfile.lock ¶ +13 -1

                     i18n (~> 0.7)
                     json (~> 1.7, >= 1.7.7)
                     minitest (~> 5.1)
                     thread_safe (~> 0.3, >= 0.3.4)
                     tzinfo (~> 1.1)
                   ansi (1.5.0)
                   arel (6.0.4)
                   autoprefixer-rails (6.6.0)
                     execjs
                   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)
                     railties (>= 4.0.0, < 5.2.x)
                   coffee-script (2.4.1)
                     coffee-script-source
                     execjs
                   coffee-script-source (1.12.2)
                   concurrent-ruby (1.0.4)
                   dynamic_form (1.1.4)
                   erubis (2.7.0)
                   execjs (2.7.0)
                     activesupport (>= 4.0.1)
                     haml (>= 4.0.6, < 5.0)
                     html2haml (>= 1.0.1)
                     railties (>= 4.0.1)
                   html2haml (2.0.0)
                     erubis (~> 2.7.0)
                     haml (~> 4.0.0)
                     nokogiri (~> 1.6.0)
                     ruby_parser (~> 3.5)
                   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)
                     thor (>= 0.14, < 2.0)
                   jquery-tablesorter (1.23.3)
                     railties (>= 3.2, < 6)
                   jquery-timepicker-addon-rails (1.4.1)
                     railties (>= 3.1)
                   jquery-ui-rails (6.0.1)
                     railties (>= 3.2.16)
                   json (1.8.3)
                   loofah (2.0.3)
                   yaml_db (0.4.2)
                     rails (>= 3.0, < 5.1)
                     rake (>= 0.8.7)
               PLATFORMS
                 ruby
               DEPENDENCIES
                 ace-rails-ap
                 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
                 haml-rails
                 in_place_editing
                 jquery-countdown-rails
+            +   jquery-datatables-rails
                 jquery-rails
                 jquery-tablesorter
                 jquery-timepicker-addon-rails
                 jquery-ui-rails
                 mail
                 minitest-reporters
                 momentjs-rails
                 mysql2
                 rails (~> 4.2.0)
                 rails_bootstrap_sortable
                 rdiscount
                 rouge
                 sass-rails
                 select2-rails
                 sqlite3
                 uglifier
                 verification!
                 will_paginate (~> 3.0.7)
                 yaml_db
               BUNDLED WITH
-            -    1.13.6
+            +    1.15.4

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

               //
               // Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
               // or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path.
               //
               // It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
               // the compiled file.
               //
               // WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD
               // GO AFTER THE REQUIRES BELOW.
               //
               //= 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 ace/mode-python
               //= require ace/mode-ruby
               //= require ace/mode-pascal
               //= require ace/mode-javascript
               //= require ace/mode-java
               //= require ace/theme-merbivore
               //= require custom
               //= require jquery.countdown
               //-------------- addition from local_jquery -----------
               //= require jquery-tablesorter
               //= 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
               //x= require prototype_ujs
               //x= require effects
               //x= require dragdrop
               //x= require controls

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

               @import "jquery.countdown";
               @import "tablesorter-theme.cafe";
               //bootstrap
               @import "bootstrap-sprockets";
               @import "bootstrap";
               @import "select2";
               @import "select2-bootstrap";
               //@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;
               $bgHighlight: #06064b;
               $colDefault: #8e8eb4;
               $colHighlight: #ffffff;
               $dropDown: false;
               @font-face {
                   font-family: 'Glyphicons Halflings';
                   src: font-path('bootstrap/glyphicons-halflings-regular.eot');
                   src: font-path('bootstrap/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'),
                   background: #f5f5f5;
                   padding: 5px;
                   margin: 10px 0;
                   font-size: 12px;
                   line-height: 1.5em;
                 }
               }
               h2.contest-title {
                 margin-top: 5px;
                 margin-bottom: 5px;
               }
+            +
+            +
+            +
+            + .grader-comment {
+            +   word-wrap: break-word;
+            + }

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

                 def authorization_by_roles(allowed_roles)
                   return false unless authenticate
                   user = User.find(session[:user_id])
                   unless user.roles.detect { |role| allowed_roles.member?(role.name) }
                     unauthorized_redirect
                     return false
                   end
                 end
                 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
                 protected
                 def authenticate
                   unless session[:user_id]
                     flash[:notice] = 'You need to login'
                     if GraderConfiguration[SINGLE_USER_MODE_CONF_KEY]
                       flash[:notice] = 'You need to login but you cannot log in at this time'
                     end
                     redirect_to :controller => 'main', :action => 'login'
                     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
                     rescue
                     end
                   end
                   return true
                 end
                 def authenticate_by_ip_address
                   #this assume that we have already authenticate normally
                   unless GraderConfiguration[MULTIPLE_IP_LOGIN_CONF_KEY]

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

               class GradersController < ApplicationController
-            -   before_filter :admin_authorization, except: [ :submission ]
+            +   before_filter :admin_authorization
-            -   before_filter(only: [:submission]) {
-            -     #check if authenticated
-            -     return false unless authenticate
-            -     #admin always has privileged
-            -     if @current_user.admin?
-            -       return true
-            -     end
-            -     if GraderConfiguration["right.user_view_submission"] and Submission.find(params[:id]).problem.available?
-            -       return true
-            -     else
-            -       unauthorized_redirect
-            -       return false
-            -     end
-            -   }
                 verify :method => :post, :only => ['clear_all',
                                                    'start_exam',
                                                    'start_grading',
                                                    'stop_all',
                                                    'clear_terminated'],
                        :redirect_to => {:action => 'index'}
                 def index
                   redirect_to :action => 'list'
                 end
                     redirect_to :action => 'test_request', :id => params[:id]
                   end
                 end
                 def test_request
                   @test_request = TestRequest.find(params[:id])
                 end
                 def task
                   @task = Task.find(params[:id])
                 end
-            -   def submission
-            -     @submission = Submission.find(params[:id])
-            -     formatter = Rouge::Formatters::HTML.new(css_class: 'highlight', line_numbers: true )
-            -     lexer = case @submission.language.name
-            -       when "c"      then Rouge::Lexers::C.new
-            -       when "cpp"    then Rouge::Lexers::Cpp.new
-            -       when "pas"    then Rouge::Lexers::Pas.new
-            -       when "ruby"   then Rouge::Lexers::Ruby.new
-            -       when "python" then Rouge::Lexers::Python.new
-            -       when "java"   then Rouge::Lexers::Java.new
-            -       when "php"    then Rouge::Lexers::PHP.new
-            -     end
-            -     @formatted_code = formatter.format(lexer.lex(@submission.source))
-            -     @css_style = Rouge::Themes::ThankfulEyes.render(scope: '.highlight')
-            -     user = User.find(session[:user_id])
-            -     SubmissionViewLog.create(user_id: session[:user_id],submission_id: @submission.id) unless user.admin?
-            -   end
                 # various grader controls
                 def stop
                   grader_proc = GraderProcess.find(params[:id])
                   GraderScript.stop_grader(grader_proc.pid)
                   flash[:notice] = 'Grader stopped.  It may not disappear now, but it should disappear shortly.'
                   redirect_to :action => 'list'
                 end
                 def stop_all
                   GraderScript.stop_graders(GraderProcess.find_running_graders +

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

               class LoginController < ApplicationController
                 def index
                   # show login screen
                   reset_session
                   redirect_to :controller => 'main', :action => 'login'
                 end
                 def login
-            -     if (!GraderConfiguration['right.bypass_agreement']) and (!params[:accept_agree])
+            +     user = User.authenticate(params[:login], params[:password])
+            +     unless user
+            +       flash[:notice] = 'Wrong password'
+            +       redirect_to :controller => 'main', :action => 'login'
+            +       return
+            +     end
+            +
+            +     if (!GraderConfiguration['right.bypass_agreement']) and (!params[:accept_agree]) and !user.admin?
                     flash[:notice] = 'You must accept the agreement before logging in'
                     redirect_to :controller => 'main', :action => 'login'
-            -     elsif user = User.authenticate(params[:login], params[:password])
+            +       return
-            -       session[:user_id] = user.id
+            +     end
-            -       session[:admin] = user.admin?
+            +     #process logging in
+            +     session[:user_id] = user.id
+            +     session[:admin] = user.admin?
-            -       # clear forced logout flag for multicontests contest change
+            +     # clear forced logout flag for multicontests contest change
-            -       if GraderConfiguration.multicontests?
+            +     if GraderConfiguration.multicontests?
-            -         contest_stat = user.contest_stat
+            +       contest_stat = user.contest_stat
-            -         if contest_stat.respond_to? :forced_logout
+            +       if contest_stat.respond_to? :forced_logout
-            -           if contest_stat.forced_logout
+            +         if contest_stat.forced_logout
-            -             contest_stat.forced_logout = false
+            +           contest_stat.forced_logout = false
-            -             contest_stat.save
+            +           contest_stat.save
-            -           end
                       end
                     end
+            +     end
-            -       #save login information
-            -       Login.create(user_id: user.id, ip_address: request.remote_ip)
-            -       redirect_to :controller => 'main', :action => 'list'
+            +     #save login information
-            -     else
+            +     Login.create(user_id: user.id, ip_address: request.remote_ip)
-            -       flash[:notice] = 'Wrong password'
-            -       redirect_to :controller => 'main', :action => 'login'
+            +     redirect_to :controller => 'main', :action => 'list'
-            -     end
                 end
                 def site_login
                   begin
                     site = Site.find(params[:login][:site_id])
                   rescue ActiveRecord::RecordNotFound
                     site = nil
                   end
                   if site==nil
                     flash[:notice] = 'Wrong site'
                     redirect_to :controller => 'main', :action => 'login'  and return
                   end

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

                     @submission.language = language
                   end
                   @submission.submitted_at = Time.new.gmtime
                   @submission.ip_address = request.remote_ip
                   if GraderConfiguration.time_limit_mode? and user.contest_finished?
                     @submission.errors.add(:base,"The contest is over.")
                     prepare_list_information
                     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,
                                       :status => Task::STATUS_INQUEUE) == false
                       flash[:notice] = 'Error adding your submission to task queue'
                     end
                   else
                     prepare_list_information
                     render :action => 'list' and return
                   end
-            -     redirect_to :action => 'list'
+            +     redirect_to edit_submission_path(@submission)
                 end
                 def source
                   submission = Submission.find(params[:id])
                   if ((submission.user_id == session[:user_id]) and
                       (submission.problem != nil) and
                       (submission.problem.available))
                     send_data(submission.source,
                               {:filename => submission.download_filename,
                                 :type => 'text/plain'})
                   else
                     flash[:notice] = 'Error viewing source'

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

                     problem.available = true
                     problem.save
                   end
                   redirect_to action: :index
                 end
                 def stat
                   @problem = Problem.find(params[:id])
                   unless @problem.available or session[:admin]
                     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
                   @histogram = { data: Array.new(range,0), summary: {} }
                   user = Hash.new(0)
                   @submissions.find_each do |sub|
                     d = (DateTime.now.in_time_zone - sub.submitted_at) / 24 / 60 / 60
                     @histogram[:data][d.to_i] += 1 if d < range
                     user[sub.user_id] = [user[sub.user_id], ((sub.try(:points) || 0) >= @problem.full_score) ? 1 : 0].max
                   end
                   @histogram[:summary][:max] = [@histogram[:data].max,1].max
                   @problems = Problem.order(date_added: :desc)
                 end
                 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|
+            +         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 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
                 protected
                 def allow_test_pair_import?
                   if defined? ALLOW_TEST_PAIR_IMPORT
                     return ALLOW_TEST_PAIR_IMPORT
                   else
                     return false
                   end
                 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
                   end
                 end
                 def add_to_contest
                   problems = get_problems_from_params
                   contest = Contest.find(params[:contest][:id])
                   if contest!=nil and contest.enabled
                     problems.each do |p|
                       p.contests << contest
                       problems << Problem.find(id)
                     end
                   end
                   problems
                 end
                 def get_problems_stat
                 end
                 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

                   end
                   #users
                   @users = if params[:user] == "all" then
                              User.includes(:contests).includes(:contest_stat)
                            else
                              User.includes(:contests).includes(:contest_stat).where(enabled: true)
                            end
                   #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)
                   #rencer accordingly
                   if params[:button] == 'download' then
                     csv = gen_csv_from_scorearray(@scorearray,@problems)
                     send_data csv, filename: 'max_score.csv'
                   else
                     #render template: 'user_admin/user_stat'
                     render 'max_score'
                   end

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
                 # GET /submissions.json
                 # Show problem selection and user's submission of that problem
                 def index
                   @user = @current_user
                   @problems = @user.available_problems
                   if params[:problem_id]==nil
                     @problem = nil
                     @submissions = nil
                 end
                 def compiler_msg
                   @submission = Submission.find(params[:id])
                   respond_to do |format|
                     format.js
                   end
                 end
                 #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
                 # GET /submissions/1/edit
                 def edit
                   @submission = Submission.find(params[:id])
                   @source = @submission.source.to_s
                   @problem = @submission.problem
                   @lang_id = @submission.language.id
                 end
                   end
                 end
               protected
                 def submission_authorization
                   #admin always has privileged
                   if @current_user.admin?
                     return true
                   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
                   #default to NO
                   unauthorized_redirect
                   return false
                 end
               end

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

                   filename = "#{Problem.download_file_basedir}/#{base_filename}"
                   if !FileTest.exists?(filename)
                     redirect_to :action => 'index' and return
                   end
                   send_file_to_user(filename, base_filename)
                 end
                 # 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
                   base_name = params[:file]
                   base_filename = File.basename("#{base_name}.#{params[:ext]}")
                   filename = "#{Problem.download_file_basedir}/#{params[:id]}/#{base_filename}"
                   puts "SENDING: #{filename}"
                   if !FileTest.exists?(filename)
                     redirect_to :action => 'index' and return
                   end

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

                                                   ],
                        :redirect_to => { :action => :list }
                 def index
                   @user_count = User.count
                   if params[:page] == 'all'
                     @users = User.all
                     @paginated = false
                   else
                     @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
                 def active
                   sessions = ActiveRecord::SessionStore::Session.where("updated_at >= ?", 60.minutes.ago)
                   @users = []
                   sessions.each do |session|
                     if session.data[:user_id]
                       @users << User.find(session.data[:user_id])
                     end
                   end
                   @changed = false
                   if request.request_method == 'POST'
                     @non_admin_users.each do |user|
                       password = random_password
                       user.password = password
                       user.password_confirmation = password
                       user.save
                     end
                     @changed = true
                   end
                 end
+            +
                 # contest management
                 def contests
                   @contest, @users = find_contest_and_user_from_contest_id(params[:id])
                   @contests = Contest.enabled
                 end
                 def assign_from_list
                   contest_id = params[:users_contest_id]
                   org_contest, users = find_contest_and_user_from_contest_id(contest_id)
                   contest = Contest.find(params[:new_contest][:id])
                   if !contest
                     end
                   end
                   flash[:notice] = 'User(s) ' + note.join(', ') +
                     ' were successfully modified.  '
                   redirect_to :action => 'mass_mailing'
                 end
                 #bulk manage
                 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'
                     @users = nil
                   end
                   if params[:commit]
                     @action = {}
                     @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"
                     if @action[:set_enable]
                       @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])
+            +         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 ¶ +8 -5

                   menu_items.html_safe
                 end
                 def append_to(option,label, controller, action)
                   option << ' ' if option!=''
                   option << link_to_unless_current(label,
                                                    :controller => controller,
                                                    :action => action)
                 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
                 def format_short_duration(duration)
                   return '' if duration==nil
                   d = duration.to_f
                   return Time.at(d).gmtime.strftime("%X")
                 end
+            +   def format_full_time_ago(time)
+            +     st = time_ago_in_words(time) + ' ago (' + format_short_time(time) + ')'
+            +   end
+            +
                 def read_textfile(fname,max_size=2048)
                   begin
                     File.open(fname).read(max_size)
                   rescue
                     nil
                   end
                 end
                 def toggle_button(on,toggle_url,id, option={})
                   btn_size = option[:size] || 'btn-xs'
                   link_to (on ? "Yes" : "No"), toggle_url,
                     {class: "btn btn-block #{btn_size} btn-#{on ? 'success' : 'default'} ajax-toggle",
                   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/grader_configuration.rb ¶ +5

               #
               # This class also contains various login of the system.
               #
               class GraderConfiguration < ActiveRecord::Base
                 SYSTEM_MODE_CONF_KEY = 'system.mode'
                 TEST_REQUEST_EARLY_TIMEOUT_KEY = 'contest.test_request.early_timeout'
                 MULTICONTESTS_KEY = 'system.multicontests'
                 CONTEST_TIME_LIMIT_KEY = 'contest.time_limit'
                 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
                 cattr_accessor :contest_time_str
                 cattr_accessor :contest_time
                 GraderConfiguration.config_cache = nil
                 GraderConfiguration.task_grading_info_cache = nil
                 def self.config_cached?
                   (defined? CONFIGURATION_CACHE_ENABLED) and (CONFIGURATION_CACHE_ENABLED)
                 end
                 def self.multicontests?
                   return get(MULTICONTESTS_KEY) == true
                 end
                 def self.time_limit_mode?
                   mode = get(SYSTEM_MODE_CONF_KEY)
                   return ((mode == 'contest') or (mode == 'indv-contest'))
                 end
                 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]
                   if not defined? GraderConfiguration.contest_time_str
                     GraderConfiguration.contest_time_str = nil
                   end
                   if GraderConfiguration.contest_time_str != contest_time_str
                     GraderConfiguration.contest_time_str = contest_time_str
                     if tmatch = /(\d+):(\d+)/.match(contest_time_str)
                       h = tmatch[1].to_i

app/models/problem.rb ¶ +8

               class Problem < ActiveRecord::Base
                 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
                 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/submission.rb ¶ +9 -5

                   # need to put in SQL command, maybe there's a better way
                   Submission.includes(:user).find_by_sql("SELECT * FROM submissions " +
               			   "WHERE id = " +
               			   "(SELECT MAX(id) FROM submissions AS subs " +
               			   "WHERE subs.user_id = submissions.user_id AND " +
                                          "problem_id = " + problem_id.to_s + " " +
               			   "GROUP BY user_id) " +
                                          "ORDER BY user_id")
                 end
                 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
                 def self.find_last_for_all_available_problems(user_id)
                   submissions = Array.new
                   problems = Problem.available_problems
                   problems.each do |problem|
                     sub = Submission.find_last_by_user_and_problem(user_id, problem.id)
                     submissions << sub if sub!=nil
                   end
                   submissions
                 end
                 def assign_language
                   self.language = Submission.find_language_in_source(self.source,
                                                                      self.source_filename)
                 end
                 # validation codes
                 def must_specify_language
                   return if self.source==nil
                   # 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
                 end
                 def must_have_valid_problem
                   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
                 # callbacks
                 def assign_latest_number_if_new_recond
                   return if !self.new_record?
                   latest = Submission.find_last_by_user_and_problem(self.user_id, self.problem_id)
                   self.number = (latest==nil) ? 1 : latest.number + 1;
                 end
               end

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

               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_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
                   return contest_problems
                 end
                 def solve_all_available_problems?
                   available_problems.each do |p|
                     u = self
                     sub = Submission.find_last_by_user_and_problem(u.id,p.id)
                     return false if !p or !sub or sub.points < p.full_score
                   end
                   return true
                 end
+            +   #get a list of available problem
                 def available_problems
                   if not GraderConfiguration.multicontests?
-            -       return Problem.available_problems
+            +       if GraderConfiguration.use_problem_group?
+            +         return available_problems_in_group
+            +       else
+            +         return Problem.available_problems
+            +       end
                   else
                     contest_problems = []
                     pin = {}
                     contests.enabled.each do |contest|
                       contest.problems.available.each do |problem|
                         if not pin.has_key? problem.id
                           contest_problems << problem
                         end
                         pin[problem.id] = true
                       end
                     end
                     other_avaiable_problems = Problem.available.find_all {|p| pin[p.id]==nil and p.contests.length==0}
                     return contest_problems + other_avaiable_problems
                   end
                 end
+            +   def available_problems_in_group
+            +     problem = []
+            +     self.groups.each do |group|
+            +       group.problems.where(available: true).each { |p| problem << p }
+            +     end
+            +     problem.uniq!
+            +     if problem
+            +       problem.sort! do |a,b|
+            +         case
+            +         when a.date_added < b.date_added
+            +           1
+            +         when a.date_added > b.date_added
+            +           -1
+            +         else
+            +           a.name <=> b.name
+            +         end
+            +       end
+            +       return problem
+            +     else
+            +       return []
+            +     end
+            +   end
+            +
                 def can_view_problem?(problem)
-            -     if not GraderConfiguration.multicontests?
+            +     return true if admin?
-            -       return problem.available
+            +     return available_problems.include? problem
-            -     else
-            -       return problem_in_user_contests? problem
-            -     end
                 end
                 def self.clear_last_login
                   User.update_all(:last_ip => nil)
                 end
                 protected
                   def encrypt_new_password
                     return if password.blank?
                     self.salt = (10+rand(90)).to_s
                     self.hashed_password = User.encrypt(self.password,self.salt)
                   end

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

               <p>
                 <b>Title:</b>
                 <%=h @announcement.title %>
               </p>
               <p>
                 <b>Notes:</b>
                 <%=h @announcement.notes %>
               </p>
               <p>
                 <b>Body:</b>
-            -   <%=h @announcement.body %>
+            +   <%=h markdown(@announcement.body) %>
               </p>
               <p>
                 <b>Published:</b>
                 <%=h @announcement.published %>
               </p>
               <p>
                 <b>Show on front page:</b>
                 <%=h @announcement.frontpage %>
               </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.points*100/submission.problem.full_score).to_i} "
                   = " ["
                   %tt
                     = 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

               %h1= "Task: #{@task.id}"
               %p
                 User:
                 = "#{@task.submission.user.login}"
                 %br/
                 Status:
                 = "#{@task.status_str} (at #{format_short_time(@task.updated_at)})"
                 %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

                             :javascript
                               $("#countdown").countdown({until: "+#{@current_user.contest_time_left.to_i}s", layout: 'Time left: {hnn}:{mnn}:{snn}'});
                         / admin section
                         - if (@current_user!=nil) and (session[:admin])
                           / management
                           %li.dropdown
                             %a.dropdown-toggle{href: '#', data: {toggle:'dropdown'},  aria: {haspopup:"true", expanded:"false"}, role: "button"}
                               Manage
                               %span.caret
                             %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'}
                               = add_menu( 'System config', 'configurations', 'index')
                               %li.divider{role: 'separator'}
                               = add_menu( 'Sites', 'sites', 'index')
                               = add_menu( 'Contests', 'contest_management', 'index')
                           / report
                           %li.dropdown
                             %a.dropdown-toggle{href: '#', data: {toggle:'dropdown'},  aria: {haspopup:"true", expanded:"false"}, role: "button"}
                               Report
                               %span.caret

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

               - if !@hidelogin
                 =t 'login.message'
                 %br/
                 %br/
                 - if flash[:notice]
                   %hr/
                   %b= flash[:notice]
                   %hr/
                 %div{ :style => "border: solid 1px gray; padding: 4px; background: #eeeeff;"}
-            -     = form_tag login_login_path do
+            +     = form_tag login_login_path, {class: 'form-horizontal'} do
-            -       %table
+            +       .form-group
-            -         %tr
+            +         =label_tag :login, "Login",class: 'col-sm-3 control-label'
-            -           %td{:align => "right"}
+            +         .col-sm-9
-            -             ="#{t 'login_label'}:"
+            +           =text_field_tag :login, nil, class: 'form-control'
-            -           %td= text_field_tag 'login'
+            +       .form-group
-            -         %tr
+            +         =label_tag :password, "Password", class: 'col-sm-3 control-label'
-            -           %td{:align => "right"}
+            +         .col-sm-9
-            -             ="#{t 'password_label'}:"
+            +           =password_field_tag :password, nil, class: 'form-control'
-            -           %td= password_field_tag
+            +       - unless GraderConfiguration['right.bypass_agreement']
-            -         - unless GraderConfiguration['right.bypass_agreement']
+            +         .form-group
-            -           %tr
+            +           .col-sm-offset-3.col-sm-9
-            -             %td{:align => "right"}= check_box_tag 'accept_agree'
+            +             .checkbox
-            -             %td ยอมรับข้อตกลงการใช้งาน
+            +               %label
+            +                 = check_box_tag 'accept_agree'
-            -       = submit_tag t('login.login_submit')
+            +                 ยอมรับข้อตกลงการใช้งาน
+            +
+            +       .form-group
+            +         .col-sm-offset-3.col-sm-9
+            +           = submit_tag t('login.login_submit'), class: 'btn btn-primary'
               %br/
               - if GraderConfiguration['system.online_registration']
                 =t 'login.participation'
                 %b
                   = "#{t 'login.please'} "
                   = link_to "#{t 'login.register'}", :controller => :users, :action => :new
                 %br/
                 = link_to "#{t 'login.forget_password'}", :controller => :users, :action => :forget

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

                 %td
                   - if @current_user and @current_user.admin?
                     = link_to problem.name, stat_problem_path(problem)
                   - else
                     = "#{problem.name}"
                 %td
                   = "#{problem.full_name}"
                   %br
                   = 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 }
                 %td
                   - if @prob_submissions[problem.id][:submission]
                     = link_to 'Edit', edit_submission_path(@prob_submissions[problem.id][:submission]), class: 'btn btn-success'
                   - else
                     = link_to 'New', direct_edit_problem_submissions_path(problem.id), class: 'btn btn-success'

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

               - else
                 - unless submission.graded_at
                   = t 'main.submitted_at'
                   = format_short_time(submission.submitted_at.localtime)
                 - else
                   %strong= t 'main.graded_at'
                   = "#{format_short_time(submission.graded_at.localtime)} "
                   %br
                   - if GraderConfiguration['ui.show_score']
                     %strong=t 'main.score'
                     = "#{(submission.points*100/submission.problem.full_score).to_i} "
                   = " ["
-            -     %tt
+            +     %tt.grader-comment
                     = submission.grader_comment
                   = "]"
                   %br
                   %strong View:
                   - if GraderConfiguration.show_grading_result
                     = 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'}", compiler_msg_submission_path(submission.id), {popup: true,remote: true,class: 'btn btn-xs btn-info'}
                 = link_to "#{t 'main.src_link'}",{:action => 'source', :id => 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'
                 - if GraderConfiguration.show_testcase
                   = link_to "testcases", show_problem_testcases_path(problem_id), class: 'btn btn-xs btn-info'

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

               .form-group
                 %label{:for => "problem_name"} Name
                 = text_field 'problem', 'name', class: 'form-control'
                 %small
                   Do not directly edit the problem name, unless you know what you are doing. If you want to change the name, use the name change button in the problem management menu instead.
               .form-group
                 %label{:for => "problem_full_name"} Full name
                 = text_field 'problem', 'full_name', class: 'form-control'
               .form-group
                 %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
               - #       nice default values for them.  These values look fine only
               - #       in this case (of lazily adding new problems).
               - @problem.available = true if @problem!=nil and @problem.available==nil
               - @problem.test_allowed = true if @problem!=nil and @problem.test_allowed==nil
               - @problem.output_only = false if @problem!=nil and @problem.output_only==nil
               .checkbox
                 %label{:for => "problem_available"}
                   = check_box :problem, :available
                   Available?

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
                 = 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
                 %thead
                   %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?
                     %sup{class: 'text-primary',data: {toggle: 'tooltip'}, title: 'Let user submits to this problem?' } [?]
                   %th.text-center
                     View Data?
                     %sup{class: 'text-primary',data: {toggle: 'tooltip'}, title: 'Let user view the testcase of this problem?' } [?]
                   %th.text-center
                     Test?
                     %sup{class: 'text-primary',data: {toggle: 'tooltip'}, title: 'Let user uses test interface on this problem?' } [?]
                   - if GraderConfiguration.multicontests?
                     %th Contests
                 - for problem in @problems
                   %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}")
                     %td= toggle_button(@problem.test_allowed?, toggle_test_problem_path(@problem), "problem-test-#{@problem.id}")
                     - if GraderConfiguration.multicontests?
                       %td
                         = problem.contests.collect { |c| c.name }.join(', ')
                     %td= link_to 'Stat', {:action => 'stat', :id => problem.id}, class: 'btn btn-info btn-xs btn-block'
                     %td= link_to 'Show', {:action => 'show', :id => problem}, class: 'btn btn-info btn-xs btn-block'
                     %td= link_to 'Edit', {:action => 'edit', :id => problem}, class: 'btn btn-info btn-xs btn-block'
                     %td= link_to 'Destroy', { :action => 'destroy', :id => problem }, :confirm => 'Are you sure?', :method => :delete, class: 'btn btn-danger btn-xs btn-block'
               %br/

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

@@ -27,59 +27,92
27	shiftclick(start,stop,$(this).is(':checked') )	27	shiftclick(start,stop,$(this).is(':checked') )
28	}	28	}
29	start = orig_stop	29	start = orig_stop
30	} else {	30	} else {
31	start = parseInt($(this).attr('id').split('-')[2]);	31	start = parseInt($(this).attr('id').split('-')[2]);
32	}	32	}
33	});	33	});
34	});	34	});
35		35
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

                   %tr{class: cycle('info-even','info-odd')}
                     %td Submissions
                     %td= @submissions.count
                   %tr{class: cycle('info-even','info-odd')}
                     %td Solved/Attempted User
                     %td #{@summary[:solve]}/#{@summary[:attempt]} (#{(@summary[:solve]*100.0/@summary[:attempt]).round(1)}%)
               %h2 Submissions Count
               = render partial: 'application/bar_graph', locals: { histogram: @histogram }
               %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
                   %tbody
                     - row_odd,curr = true,''
                     - @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

                   %tr
                     %th Login
                     %th Name
                     / %th Activated?
                     / %th Logged_in
                     / %th Contest(s)
                     %th Remark
                     - @problems.each do |p|
                       %th.text-right= p.name.gsub('_',' ')
                     %th.text-right Total
                     %th.text-right Passed
                 %tbody
+            +     - sum = Array.new(@scorearray[0].count,0)
+            +     - nonzero = Array.new(@scorearray[0].count,0)
+            +     - full = Array.new(@scorearray[0].count,0)
                   - @scorearray.each do |sc|
                     %tr
                       - total,num_passed = 0,0
                       - sc.each_index do |i|
                         - if i == 0
                           %td= link_to sc[i].login, stat_user_path(sc[i])
                           %td= sc[i].full_name
                           / %td= sc[i].activated
                           / %td= sc[i].try(:contest_stat).try(:started_at) ? 'yes' : 'no'
                           / %td= sc[i].contests.collect {|c| c.name}.join(', ')
                           %td= sc[i].remark
                         - else
                           %td.text-right= sc[i][0]
                           - total += sc[i][0]
                           - num_passed += 1 if sc[i][1]
+            +             - sum[i] += sc[i][0]
+            +             - nonzero[i] += 1 if sc[i][0] > 0
+            +             - full[i] += 1 if sc[i][1]
                       %td.text-right= total
                       %td.text-right= num_passed
+            +     %tfoot
+            +       %tr
+            +         %td Summation
+            +         %td
+            +         %td
+            +         - sum.each.with_index do |s,i|
+            +           - next if i == 0
+            +           %td.text-right= number_with_delimiter(s)
+            +         %td
+            +         %td
+            +       %tr
+            +         %td partial solver
+            +         %td
+            +         %td
+            +         - nonzero.each.with_index do |s,i|
+            +           - next if i == 0
+            +           %td.text-right= number_with_delimiter(s)
+            +         %td
+            +         %td
+            +       %tr
+            +         %td Full solver
+            +         %td
+            +         %td
+            +         - full.each.with_index do |s,i|
+            +           - next if i == 0
+            +           %td.text-right= number_with_delimiter(s)
+            +         %td
+            +         %td
+            +
               :javascript
                 $.bootstrapSortable(true,'reversed')

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

                         = label_tag :from, "Min"
                         = text_field_tag 'from_id', @since_id, class: "form-control"
                       .form-group
                         = label_tag :from, "Max"
                         = text_field_tag 'to_id', @until_id, class: "form-control"
                 .col-md-4
                   .panel.panel-primary
                     .panel-heading
                       Users
                     .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
                   = button_tag 'Show', class: "btn btn-primary btn-large", value: "show"
                   = button_tag 'Download CSV', class: "btn btn-primary btn-large", value: "download"
               - if @scorearray
                 %h2 Result
                 =render "score_table"

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

               %br
               %textarea#text_sourcecode{style: "display:none"}~ @source
               .container
                 .row
                   .col-md-12
                     .alert.alert-info
                       Write your code in the following box, choose language, and click submit button when finished
                 .row
                   .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
                       = hidden_field_tag 'submission[problem_id]', @problem.id
                       .form-group
                         = label_tag "Task:"
                         = text_field_tag 'asdf', "#{@problem.long_name}", class: 'form-control', disabled: true
                       .form-group
                         = label_tag 'Language'
                         = select_tag 'language_id', options_from_collection_for_select(Language.all, 'id', 'pretty_name', @lang_id || Language.find_by_pretty_name("Python").id || Language.first.id), class: 'form-control select', style: "width: 100px"
                       .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
                     %textarea#console{style: 'height: 100%; width: 100%;background-color:#000;color:#fff;font-family: consolas, monaco, "Droid Sans Mono";',rows: 20}
               :javascript
                 $(document).ready(function() {
                   e = ace.edit("editor")
                   e.setValue($("#text_sourcecode").val());
                   e.gotoLine(1);
                   $("#language_id").trigger('change');
                   brython();

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

                           %label.radio-inline
                             = radio_button_tag "enable", 1, params[:enable] == '1', id: 'enable-yes'
                             Yes
                         .col-md-3
                           %label.radio-inline
                             = radio_button_tag "enable", 0, params[:enable] == '0', id: 'enable-no'
                             No
                       .row.form-group
                         .col-md-6
                           %label.checkbox-inline
                             = check_box_tag "gen_password", true, params[:gen_password]
                             Generate new random password
+            +         .row.form-group
+            +           .col-md-4
+            +             %label.checkbox-inline
+            +               = check_box_tag "add_group", true, params[:add_group]
+            +               Add users to group
+            +           %label.col-md-3.control-label.text-right Group name
+            +           .col-md-5
+            +             = select_tag "group_name", options_from_collection_for_select( Group.all, 'id','name',params[:group_name]), id: 'group_name',class: 'form-control select2'
+            +
               .row
                 .col-md-12
                   = submit_tag "Preview Result", class: 'btn btn-default'
               - if @users
                 .row
                   .col-md-4
                     - if @action
                       %h2 Confirmation
                       - if @action[:set_enable]
                         .alert.alert-info The following users will be set #{(@action[:enabled] ? 'enable' : 'disable')}.
                       - if @action[:gen_password]

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
               |
               = link_to 'Back', :action => 'list'

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

-            - %h1 Listing users
+            + %h1 Users
               .panel.panel-primary
                 .panel-title.panel-heading
                   Quick Add
                 .panel-body
                   = form_tag( {method: 'post'}, {class: 'form-inline'})  do
                     .form-group
                       = label_tag 'user_login', 'Login'
                       = text_field 'user', 'login', :size => 10,class: 'form-control'
                     .form-group
                       = label_tag 'user_full_name', 'Full Name'
                       = text_field 'user', 'full_name', :size => 10,class: 'form-control'
                       .input-group
                         %span.input-group-btn
                           %span.btn.btn-default.btn-file
                             Browse
                             = file_field_tag 'file'
                         = text_field_tag '' , nil, {readonly: true, class: 'form-control'}
                     = submit_tag 'Submit', class: 'btn btn-default'
               %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 '}
               - if GraderConfiguration.multicontests?
                 %br/
                 %b Multi-contest:
                 = link_to '[Manage bulk users in contests]', :action => 'contest_management'
                 View users in:
                 - @contests.each do |contest|
                   = 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
                   %th email
                   %th Remark
                   %th
                     Activated
                     %sup{class: 'text-primary',data: {toggle: 'tooltip', placement: 'top'}, title: 'User has already confirmed the email?' } [?]
                   %th
                     Enabled
                     %sup{class: 'text-primary',data: {toggle: 'tooltip', placement: 'top'}, title: 'Allow the user to login?' } [?]
                   %th Last IP
                 - for user in @users
                   %tr
                     %td= link_to user.login, stat_user_path(user)
                     %td= user.full_name
                     %td= user.email
                     %td= user.remark
                     %td= toggle_button(user.activated?, toggle_activate_user_path(user),"toggle_activate_user_#{user.id}")
                     %td= toggle_button(user.enabled?, toggle_enable_user_path(user),"toggle_enable_user_#{user.id}")
                     %td= user.last_ip
                     %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

                   %tr{class: cycle('info-even','info-odd')}
                     %td.info_param Submissions
                     %td= @summary[:count]
                   %tr{class: cycle('info-even','info-odd')}
                     %td.info_param Solved/Attempted Problem
                     %td #{@summary[:solve]}/#{@summary[:attempt]} (#{(@summary[:solve]*100.0/@summary[:attempt]).round(1)}%)
               %h2 Submission History
               =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
                     %th Problem code
                     %th Problem full name
                     %th Language
                     %th Submitted at
                     %th Result
                     %th Score
                     - if session[:admin]
                       %th IP
                 %tbody
                       %td= link_to s.id, submission_path(s)
                       %td= link_to s.problem.name, stat_problem_path(s.problem)
                       %td= s.problem.full_name
                       %td= s.language.pretty_name
                       %td  #{s.submitted_at.strftime('%Y-%m-%d %H:%M')} (#{time_ago_in_words(s.submitted_at)} ago)
                       %td.fix-width= s.grader_comment
                       %td= ( s.try(:points) ? (s.points*100/s.problem.full_score)  : '' )
                       - if session[:admin]
                         %td= s.ip_address
+            + :javascript
+            +   $("#submission_table").DataTable({
+            +     paging: false
+            +   });

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

                   # ---------------- IMPORTANT ----------------------
                   # If we deploy the app into a subdir name "grader", be sure to do "rake assets:precompile RAILS_RELATIVE_URL_ROOT=/grader"
                   # moreover, using the following line instead also known to works
                   #config.action_controller.relative_url_root = '/grader'
                   #font path
                   config.assets.paths << "#{Rails}/vendor/assets/fonts"
                   config.assets.precompile += ['announcement_refresh.js','effects.js','site_update.js']
                   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
               end

config/routes.rb ¶ +17 -1

               CafeGrader::Application.routes.draw do
+            +   resources :tags
                 get "sources/direct_edit"
                 root :to => 'main#login'
                 #logins
                 get 'login/login',  to: 'login#login'
                 resources :contests
                 resources :sites
                 resources :announcements do
                   member do
                     get 'toggle'
                     get 'toggle_test'
                     get 'toggle_view_testcase'
                     get 'stat'
                   end
                   collection do
                     get 'turn_all_off'
                     get 'turn_all_on'
                     get 'import'
                     get 'manage'
                   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
                   member do
                     get 'download_input'
                     get 'download_sol'
                   end
                   collection do
                     get 'show_problem/:problem_id(/:test_num)' => 'testcases#show_problem', as: 'show_problem'
                   end
                 end
                     get 'stat'
                   end
                 end
                 resources :submissions do
                   member do
                     get 'download'
                     get 'compiler_msg'
                     get 'rejudge'
                   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
                 #main
                 get "main/list"
                 get 'main/submission(/:id)', to: 'main#submission', as: 'main_submission'
                 #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'
                 get 'report/problem_hof(/:id)', to: 'report#problem_hof', as: 'report_problem_hof'
                 get "report/login"
                 get 'report/max_score', to: 'report#max_score', as: 'report_max_score'
                 post 'report/show_max_score', to: 'report#show_max_score', as: 'report_show_max_score'
                 #
                 get 'tasks/view/:file.:ext' => 'tasks#view'
                 get 'tasks/download/:id/:file.:ext' => 'tasks#download'

db/schema.rb ¶ +39 -1

               # This file is auto-generated from the current state of the database. Instead
               # of editing this file, please use the migrations feature of Active Record to
               # incrementally modify your database, and then regenerate this schema definition.
               #
               # Note that this schema.rb definition is the authoritative source for your
               # database schema. If you need to create the application database on another
               # system, you should be using db:schema:load, not running all the migrations
               # from scratch. The latter is a flawed and unsustainable approach (the more migrations
               # you'll amass, the slower it'll run and the greater likelihood for issues).
               #
               # It's strongly recommended that you check this file into your version control system.
-            - ActiveRecord::Schema.define(version: 20170427070345) do
+            + ActiveRecord::Schema.define(version: 20170914150742) do
                 create_table "announcements", force: :cascade do |t|
                   t.string   "author",       limit: 255
                   t.text     "body",         limit: 65535
                   t.boolean  "published"
                   t.datetime "created_at",                                 null: false
                   t.datetime "updated_at",                                 null: false
                   t.boolean  "frontpage",                  default: false
                   t.boolean  "contest_only",               default: false
                   t.string   "title",        limit: 255
                   t.string   "notes",        limit: 255
                 end
                   t.integer  "pid",        limit: 4
                   t.string   "mode",       limit: 255
                   t.boolean  "active"
                   t.datetime "created_at",             null: false
                   t.datetime "updated_at",             null: false
                   t.integer  "task_id",    limit: 4
                   t.string   "task_type",  limit: 255
                   t.boolean  "terminated"
                 end
                 add_index "grader_processes", ["host", "pid"], name: "index_grader_processes_on_ip_and_pid", using: :btree
+            +   create_table "groups", force: :cascade do |t|
+            +     t.string "name",        limit: 255
+            +     t.string "description", limit: 255
+            +   end
+            +
+            +   create_table "groups_problems", id: false, force: :cascade do |t|
+            +     t.integer "problem_id", limit: 4, null: false
+            +     t.integer "group_id",   limit: 4, null: false
+            +   end
+            +
+            +   add_index "groups_problems", ["group_id", "problem_id"], name: "index_groups_problems_on_group_id_and_problem_id", using: :btree
+            +
+            +   create_table "groups_users", id: false, force: :cascade do |t|
+            +     t.integer "group_id", limit: 4, null: false
+            +     t.integer "user_id",  limit: 4, null: false
+            +   end
+            +
+            +   add_index "groups_users", ["user_id", "group_id"], name: "index_groups_users_on_user_id_and_group_id", using: :btree
+            +
                 create_table "heart_beats", force: :cascade do |t|
                   t.integer  "user_id",    limit: 4
                   t.string   "ip_address", limit: 255
                   t.datetime "created_at",             null: false
                   t.datetime "updated_at",             null: false
                   t.string   "status",     limit: 255
                 end
                 add_index "heart_beats", ["updated_at"], name: "index_heart_beats_on_updated_at", using: :btree
                 create_table "languages", force: :cascade do |t|
                   t.string "name",        limit: 10
                   t.string  "full_name",            limit: 255
                   t.integer "full_score",           limit: 4
                   t.date    "date_added"
                   t.boolean "available"
                   t.string  "url",                  limit: 255
                   t.integer "description_id",       limit: 4
                   t.boolean "test_allowed"
                   t.boolean "output_only"
                   t.string  "description_filename", limit: 255
                   t.boolean "view_testcase"
                 end
+            +   create_table "problems_tags", force: :cascade do |t|
+            +     t.integer "problem_id", limit: 4
+            +     t.integer "tag_id",     limit: 4
+            +   end
+            +
+            +   add_index "problems_tags", ["problem_id", "tag_id"], name: "index_problems_tags_on_problem_id_and_tag_id", unique: true, using: :btree
+            +   add_index "problems_tags", ["problem_id"], name: "index_problems_tags_on_problem_id", using: :btree
+            +   add_index "problems_tags", ["tag_id"], name: "index_problems_tags_on_tag_id", using: :btree
+            +
                 create_table "rights", force: :cascade do |t|
                   t.string "name",       limit: 255
                   t.string "controller", limit: 255
                   t.string "action",     limit: 255
                 end
                 create_table "rights_roles", id: false, force: :cascade do |t|
                   t.integer "right_id", limit: 4
                   t.integer "role_id",  limit: 4
                 end
                 add_index "rights_roles", ["role_id"], name: "index_rights_roles_on_role_id", using: :btree
                   t.text     "grader_comment",        limit: 65535
                   t.integer  "number",                limit: 4
                   t.string   "source_filename",       limit: 255
                   t.float    "max_runtime",           limit: 24
                   t.integer  "peak_memory",           limit: 4
                   t.integer  "effective_code_length", limit: 4
                   t.string   "ip_address",            limit: 255
                 end
                 add_index "submissions", ["user_id", "problem_id", "number"], name: "index_submissions_on_user_id_and_problem_id_and_number", unique: true, using: :btree
                 add_index "submissions", ["user_id", "problem_id"], name: "index_submissions_on_user_id_and_problem_id", using: :btree
+            +   create_table "tags", force: :cascade do |t|
+            +     t.string   "name",        limit: 255,   null: false
+            +     t.text     "description", limit: 65535
+            +     t.boolean  "public"
+            +     t.datetime "created_at",                null: false
+            +     t.datetime "updated_at",                null: false
+            +   end
+            +
                 create_table "tasks", force: :cascade do |t|
                   t.integer  "submission_id", limit: 4
                   t.datetime "created_at"
                   t.integer  "status",        limit: 4
                   t.datetime "updated_at"
                 end
                 add_index "tasks", ["submission_id"], name: "index_tasks_on_submission_id", using: :btree
                 create_table "test_pairs", force: :cascade do |t|
                   t.integer  "problem_id", limit: 4
                   t.text     "input",      limit: 16777215
                   t.integer  "country_id",      limit: 4
                   t.boolean  "activated",                   default: false
                   t.datetime "created_at"
                   t.datetime "updated_at"
                   t.boolean  "enabled",                     default: true
                   t.string   "remark",          limit: 255
                   t.string   "last_ip",         limit: 255
                   t.string   "section",         limit: 255
                 end
                 add_index "users", ["login"], name: "index_users_on_login", unique: true, using: :btree
+            +   add_foreign_key "problems_tags", "problems"
+            +   add_foreign_key "problems_tags", "tags"
               end

db/seeds.rb ¶ +10 -1

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

lib/grader_script.rb ¶ +1

                 end
                 def self.stop_graders(pids)
                   pid_str = (pids.map { |process| process.pid.to_s }).join ' '
                   GraderScript.call_grader "stop #{pid_str}"
                 end
                 def self.start_grader(env)
                   GraderScript.call_grader "#{env} queue --err-log &"
                   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,
                                              memory_limit=32,
                                              checker_name='text')
                   if GraderScript.grader_control_enabled?
                     cur_dir = `pwd`.chomp
                     Dir.chdir(GRADER_ROOT_DIR)
                     script_name = File.join(GRADER_ROOT_DIR, "scripts/import_problem")
                     cmd = "#{script_name} #{problem_name} #{problem_dir} #{checker_name}" +
                       " -t #{time_limit} -m #{memory_limit}"

lib/testdata_importer.rb ¶ +4 -2

               require 'tmpdir'
               class TestdataImporter
                 attr :log_msg
                 def initialize(problem)
                   @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)
                   dirname = extract(tempfile)
                   return false if not dirname
                   if not import_to_db
                     @log_msg = GraderScript.call_import_problem(@problem.name,
                                                                 dirname,
                                                                 time_limit,
                                                                 memory_limit,
                                                                 checker_name)
                   return true
                 end
                 protected
                 def self.long_ext(filename)
                   i = filename.index('.')
                   len = filename.length
                   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)
                   extract_dir = File.join(GraderScript.raw_dir, @problem.name)
                   if File.exists? extract_dir
                     backup_count = 0
                     begin
                       backup_count += 1
                       backup_dirname = "#{extract_dir}.backup.#{backup_count}"
                     end while File.exists? backup_dirname
                     File.rename(extract_dir, backup_dirname)

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