cafe-grader-web Commit - r681:bc0fcfe3abaa

cafe-grader-web

Commit `r681:bc0fcfe3abaa` public

parent | child

Description:

tag

Commit status:

[Not Reviewed]

References:

java

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r681:bc0fcfe3abaa - Sat, 16 Sep 2017 03:20:15 - 23 files changed: 283 inserted, 3 deleted

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/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/controllers/tags_controller.rb created 644 ¶ +58

@@ -0,0 +1,58
	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	+ @tag.destroy
	45	+ redirect_to tags_url, notice: 'Tag was successfully destroyed.'
	46	+ end
	47	+
	48	+ private
	49	+ # Use callbacks to share common setup or constraints between actions.
	50	+ def set_tag
	51	+ @tag = Tag.find(params[:id])
	52	+ end
	53	+
	54	+ # Only allow a trusted parameter "white list" through.
	55	+ def tag_params
	56	+ params.require(:tag).permit(:name, :description, :public)
	57	+ end
	58	+ end

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

@@ -0,0 +1,2
	1	+ module TagsHelper
	2	+ 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/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

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/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

app/models/group_user.rb ¶ +1 -1

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

app/models/problem.rb ¶ +3

               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
                 def self.available_problems
                   available.order(date_added: :desc).order(:name)
                   #Problem.available.all(:order => "date_added DESC, name ASC")
                 end
                 def self.create_from_import_form_params(params, old_problem=nil)
                   org_problem = old_problem || Problem.new
                   import_params, problem = Problem.extract_params_and_check(params,
                                                                             org_problem)
                   if !problem.errors.empty?
                     return problem, 'Error importing'

config/initializers/assets.rb ¶ +1 -1

               # Be sure to restart your server when you modify this file.
               # Version of your assets, change this if you want to expire all your assets.
               Rails.application.config.assets.version = '1.0'
               # Add additional assets to the asset load path.
               # Rails.application.config.assets.paths << Emoji.images_path
               # Add Yarn node_modules folder to the asset load path.
               Rails.application.config.assets.paths << Rails.root.join('node_modules')
               Rails.application.config.assets.paths << Rails.root.join('vendor/assets/fonts')
               # Precompile additional assets.
               # application.js, application.css, and all non-JS/CSS in the app/assets
               # folder are already added.
               # Rails.application.config.assets.precompile += %w( admin.js admin.css )
               Rails.application.config.assets.precompile += ['announcement_refresh.js','effects.js','site_update.js']
               Rails.application.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 groups
-            -     test user_admin users ).each do |controller|
+            +     test user_admin users tags).each do |controller|
                 Rails.application.config.assets.precompile += ["#{controller}.js", "#{controller}.css"]
               end

config/routes.rb ¶ +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','toggle_front'
                   end
                 end
                 resources :problems do
                   member do
                     get 'toggle'
                     get 'toggle_test'
                     get 'toggle_view_testcase'
                     get 'stat'
                   end

db/schema.rb ¶ +20 -1

               # encoding: UTF-8
               # 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: 20170911091143) 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
                 create_table "contests", force: :cascade do |t|
                   t.string   "title",      limit: 255
                   t.boolean  "enabled"
                   t.datetime "created_at",             null: false
                   t.datetime "updated_at",             null: false
                   t.string   "name",       limit: 255
                 end
                 create_table "contests_problems", id: false, force: :cascade do |t|
                   t.integer "contest_id", limit: 4
                   t.integer "problem_id", limit: 4
                 create_table "messages", force: :cascade do |t|
                   t.integer  "sender_id",           limit: 4
                   t.integer  "receiver_id",         limit: 4
                   t.integer  "replying_message_id", limit: 4
                   t.text     "body",                limit: 65535
                   t.boolean  "replied"
                   t.datetime "created_at",                        null: false
                   t.datetime "updated_at",                        null: false
                 end
                 create_table "problems", force: :cascade do |t|
                   t.string  "name",                 limit: 30
                   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
                 create_table "roles", force: :cascade do |t|
                   t.string "name", limit: 255
                 end
                 create_table "roles_users", id: false, force: :cascade do |t|
                   t.integer "role_id", limit: 4
                   t.integer "user_id", limit: 4
                 end
                 add_index "roles_users", ["user_id"], name: "index_roles_users_on_user_id", using: :btree
                 create_table "submissions", force: :cascade do |t|
                   t.integer  "user_id",               limit: 4
                   t.integer  "problem_id",            limit: 4
                   t.integer  "language_id",           limit: 4
                   t.text     "source",                limit: 65535
                   t.binary   "binary",                limit: 65535
                   t.datetime "submitted_at"
                   t.datetime "compiled_at"
                   t.text     "compiler_message",      limit: 65535
                   t.datetime "graded_at"
                   t.integer  "points",                limit: 4
                   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.text     "solution",   limit: 16777215
                   t.datetime "created_at",                  null: false
                   t.datetime "updated_at",                  null: false
                 end
                 create_table "test_requests", force: :cascade do |t|
                   t.integer  "user_id",          limit: 4
                   t.integer  "problem_id",       limit: 4
                   t.integer  "submission_id",    limit: 4
                   t.string   "input_file_name",  limit: 255
                   t.string   "output_file_name", limit: 255
                   t.string   "running_stat",     limit: 255
                   t.datetime "updated_at",              null: false
                   t.boolean  "forced_logout"
                 end
                 create_table "users", force: :cascade do |t|
                   t.string   "login",           limit: 50
                   t.string   "full_name",       limit: 255
                   t.string   "hashed_password", limit: 255
                   t.string   "salt",            limit: 5
                   t.string   "alias",           limit: 255
                   t.string   "email",           limit: 255
                   t.integer  "site_id",         limit: 4
                   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

Write
Preview

You need to be logged in to leave comments. Login now

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository permissions settings

Sign in to your account

Author

r681:bc0fcfe3abaa - Sat, 16 Sep 2017 03:20:15 - 23 files changed: 283 inserted, 3 deleted

Sign in to your account

Commit r681:bc0fcfe3abaa public

Author

r681:bc0fcfe3abaa - Sat, 16 Sep 2017 03:20:15 - 23 files changed: 283 inserted, 3 deleted

Commit `r681:bc0fcfe3abaa` public