From c9de30bd83b867bb80fa22ab769898ffb515db7f Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Thu, 8 Jan 2015 12:00:43 +0800 Subject: [PATCH 01/20] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=97=AE=E5=8D=B7?= =?UTF-8?q?=E8=B0=83=E6=9F=A5=E7=9B=B8=E5=85=B3=E8=A1=A8=EF=BC=8C=E4=BB=A5?= =?UTF-8?q?=E5=8F=8A=E5=AF=B9=E5=BA=94=E7=9A=84model=E3=80=81control?= =?UTF-8?q?=E3=80=81view=E7=9A=84=E6=96=87=E4=BB=B6=E5=A4=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/poll_answers_controller.rb | 0 app/controllers/poll_controller.rb | 0 app/controllers/poll_user_controller.rb | 0 app/controllers/poll_votes_controller.rb | 0 app/controllers/polls_questions_controller.rb | 0 app/models/poll_answers.rb | 3 +++ app/models/poll_questions.rb | 3 +++ app/models/poll_user.rb | 3 +++ app/models/poll_votes.rb | 3 +++ app/models/polls.rb | 3 +++ db/migrate/20150108034148_create_polls.rb | 15 +++++++++++++++ .../20150108034253_create_poll_questions.rb | 12 ++++++++++++ db/migrate/20150108034414_create_poll_answers.rb | 11 +++++++++++ db/migrate/20150108035301_create_poll_votes.rb | 12 ++++++++++++ db/migrate/20150108035338_create_poll_users.rb | 10 ++++++++++ test/unit/poll_answers_test.rb | 7 +++++++ test/unit/poll_questions_test.rb | 7 +++++++ test/unit/poll_user_test.rb | 7 +++++++ test/unit/poll_votes_test.rb | 7 +++++++ test/unit/polls_test.rb | 7 +++++++ 20 files changed, 110 insertions(+) create mode 100644 app/controllers/poll_answers_controller.rb create mode 100644 app/controllers/poll_controller.rb create mode 100644 app/controllers/poll_user_controller.rb create mode 100644 app/controllers/poll_votes_controller.rb create mode 100644 app/controllers/polls_questions_controller.rb create mode 100644 app/models/poll_answers.rb create mode 100644 app/models/poll_questions.rb create mode 100644 app/models/poll_user.rb create mode 100644 app/models/poll_votes.rb create mode 100644 app/models/polls.rb create mode 100644 db/migrate/20150108034148_create_polls.rb create mode 100644 db/migrate/20150108034253_create_poll_questions.rb create mode 100644 db/migrate/20150108034414_create_poll_answers.rb create mode 100644 db/migrate/20150108035301_create_poll_votes.rb create mode 100644 db/migrate/20150108035338_create_poll_users.rb create mode 100644 test/unit/poll_answers_test.rb create mode 100644 test/unit/poll_questions_test.rb create mode 100644 test/unit/poll_user_test.rb create mode 100644 test/unit/poll_votes_test.rb create mode 100644 test/unit/polls_test.rb diff --git a/app/controllers/poll_answers_controller.rb b/app/controllers/poll_answers_controller.rb new file mode 100644 index 000000000..e69de29bb diff --git a/app/controllers/poll_controller.rb b/app/controllers/poll_controller.rb new file mode 100644 index 000000000..e69de29bb diff --git a/app/controllers/poll_user_controller.rb b/app/controllers/poll_user_controller.rb new file mode 100644 index 000000000..e69de29bb diff --git a/app/controllers/poll_votes_controller.rb b/app/controllers/poll_votes_controller.rb new file mode 100644 index 000000000..e69de29bb diff --git a/app/controllers/polls_questions_controller.rb b/app/controllers/polls_questions_controller.rb new file mode 100644 index 000000000..e69de29bb diff --git a/app/models/poll_answers.rb b/app/models/poll_answers.rb new file mode 100644 index 000000000..b400ddf50 --- /dev/null +++ b/app/models/poll_answers.rb @@ -0,0 +1,3 @@ +class PollAnswers < ActiveRecord::Base + attr_accessible :answer_position, :answer_text, :poll_questions_id +end diff --git a/app/models/poll_questions.rb b/app/models/poll_questions.rb new file mode 100644 index 000000000..42e376aee --- /dev/null +++ b/app/models/poll_questions.rb @@ -0,0 +1,3 @@ +class PollQuestions < ActiveRecord::Base + attr_accessible :is_necessary, :polls_id, :question_title, :question_type +end diff --git a/app/models/poll_user.rb b/app/models/poll_user.rb new file mode 100644 index 000000000..f77f2ed5c --- /dev/null +++ b/app/models/poll_user.rb @@ -0,0 +1,3 @@ +class PollUser < ActiveRecord::Base + attr_accessible :poll_id, :user_id +end diff --git a/app/models/poll_votes.rb b/app/models/poll_votes.rb new file mode 100644 index 000000000..961f0d896 --- /dev/null +++ b/app/models/poll_votes.rb @@ -0,0 +1,3 @@ +class PollVotes < ActiveRecord::Base + attr_accessible :poll_answers_id, :poll_questions_id, :user_id, :vote_text +end diff --git a/app/models/polls.rb b/app/models/polls.rb new file mode 100644 index 000000000..f37c89fe2 --- /dev/null +++ b/app/models/polls.rb @@ -0,0 +1,3 @@ +class Polls < ActiveRecord::Base + attr_accessible :closed_at, :polls_group_id, :polls_name, :polls_status, :polls_type, :published_at, :user_id +end diff --git a/db/migrate/20150108034148_create_polls.rb b/db/migrate/20150108034148_create_polls.rb new file mode 100644 index 000000000..e074e08be --- /dev/null +++ b/db/migrate/20150108034148_create_polls.rb @@ -0,0 +1,15 @@ +class CreatePolls < ActiveRecord::Migration + def change + create_table :polls do |t| + t.string :polls_name + t.string :polls_type + t.integer :polls_group_id + t.integer :polls_status + t.integer :user_id + t.datetime :published_at + t.datetime :closed_at + + t.timestamps + end + end +end diff --git a/db/migrate/20150108034253_create_poll_questions.rb b/db/migrate/20150108034253_create_poll_questions.rb new file mode 100644 index 000000000..8e795deda --- /dev/null +++ b/db/migrate/20150108034253_create_poll_questions.rb @@ -0,0 +1,12 @@ +class CreatePollQuestions < ActiveRecord::Migration + def change + create_table :poll_questions do |t| + t.string :question_title + t.integer :question_type + t.integer :is_necessary + t.integer :polls_id + + t.timestamps + end + end +end diff --git a/db/migrate/20150108034414_create_poll_answers.rb b/db/migrate/20150108034414_create_poll_answers.rb new file mode 100644 index 000000000..bc9ac6d9f --- /dev/null +++ b/db/migrate/20150108034414_create_poll_answers.rb @@ -0,0 +1,11 @@ +class CreatePollAnswers < ActiveRecord::Migration + def change + create_table :poll_answers do |t| + t.integer :poll_questions_id + t.text :answer_text + t.integer :answer_position + + t.timestamps + end + end +end diff --git a/db/migrate/20150108035301_create_poll_votes.rb b/db/migrate/20150108035301_create_poll_votes.rb new file mode 100644 index 000000000..e22228dc2 --- /dev/null +++ b/db/migrate/20150108035301_create_poll_votes.rb @@ -0,0 +1,12 @@ +class CreatePollVotes < ActiveRecord::Migration + def change + create_table :poll_votes do |t| + t.integer :user_id + t.integer :poll_questions_id + t.integer :poll_answers_id + t.text :vote_text + + t.timestamps + end + end +end diff --git a/db/migrate/20150108035338_create_poll_users.rb b/db/migrate/20150108035338_create_poll_users.rb new file mode 100644 index 000000000..158937ce0 --- /dev/null +++ b/db/migrate/20150108035338_create_poll_users.rb @@ -0,0 +1,10 @@ +class CreatePollUsers < ActiveRecord::Migration + def change + create_table :poll_users do |t| + t.integer :user_id + t.integer :poll_id + + t.timestamps + end + end +end diff --git a/test/unit/poll_answers_test.rb b/test/unit/poll_answers_test.rb new file mode 100644 index 000000000..ce8f558f4 --- /dev/null +++ b/test/unit/poll_answers_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class PollAnswersTest < ActiveSupport::TestCase + # test "the truth" do + # assert true + # end +end diff --git a/test/unit/poll_questions_test.rb b/test/unit/poll_questions_test.rb new file mode 100644 index 000000000..bbe79ea40 --- /dev/null +++ b/test/unit/poll_questions_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class PollQuestionsTest < ActiveSupport::TestCase + # test "the truth" do + # assert true + # end +end diff --git a/test/unit/poll_user_test.rb b/test/unit/poll_user_test.rb new file mode 100644 index 000000000..7dab4b63f --- /dev/null +++ b/test/unit/poll_user_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class PollUserTest < ActiveSupport::TestCase + # test "the truth" do + # assert true + # end +end diff --git a/test/unit/poll_votes_test.rb b/test/unit/poll_votes_test.rb new file mode 100644 index 000000000..77ab9121e --- /dev/null +++ b/test/unit/poll_votes_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class PollVotesTest < ActiveSupport::TestCase + # test "the truth" do + # assert true + # end +end diff --git a/test/unit/polls_test.rb b/test/unit/polls_test.rb new file mode 100644 index 000000000..5217817bb --- /dev/null +++ b/test/unit/polls_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class PollsTest < ActiveSupport::TestCase + # test "the truth" do + # assert true + # end +end From 4c6ade4c08d222b9d3cf8c0d20e4cea805cc5683 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Thu, 8 Jan 2015 14:41:28 +0800 Subject: [PATCH 02/20] =?UTF-8?q?=E5=AE=9A=E4=B9=89=E5=90=84model=E4=B9=8B?= =?UTF-8?q?=E9=97=B4=E7=9A=84=E5=85=B3=E7=B3=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/poll_answers.rb | 2 ++ app/models/poll_questions.rb | 2 ++ app/models/poll_user.rb | 3 +++ app/models/poll_votes.rb | 4 +++ app/models/polls.rb | 2 ++ db/schema.rb | 47 +++++++++++++++++++++++++++++++++++- 6 files changed, 59 insertions(+), 1 deletion(-) diff --git a/app/models/poll_answers.rb b/app/models/poll_answers.rb index b400ddf50..8a8c3169a 100644 --- a/app/models/poll_answers.rb +++ b/app/models/poll_answers.rb @@ -1,3 +1,5 @@ class PollAnswers < ActiveRecord::Base attr_accessible :answer_position, :answer_text, :poll_questions_id + + belongs_to :poll_questions end diff --git a/app/models/poll_questions.rb b/app/models/poll_questions.rb index 42e376aee..ce272a218 100644 --- a/app/models/poll_questions.rb +++ b/app/models/poll_questions.rb @@ -1,3 +1,5 @@ class PollQuestions < ActiveRecord::Base attr_accessible :is_necessary, :polls_id, :question_title, :question_type + + belongs_to :polls end diff --git a/app/models/poll_user.rb b/app/models/poll_user.rb index f77f2ed5c..a03f6b17d 100644 --- a/app/models/poll_user.rb +++ b/app/models/poll_user.rb @@ -1,3 +1,6 @@ class PollUser < ActiveRecord::Base attr_accessible :poll_id, :user_id + + belongs_to :polls + belongs_to :user end diff --git a/app/models/poll_votes.rb b/app/models/poll_votes.rb index 961f0d896..fe52b4ac5 100644 --- a/app/models/poll_votes.rb +++ b/app/models/poll_votes.rb @@ -1,3 +1,7 @@ class PollVotes < ActiveRecord::Base attr_accessible :poll_answers_id, :poll_questions_id, :user_id, :vote_text + + belongs_to :poll_answers + belongs_to :poll_questions + belongs_to :user end diff --git a/app/models/polls.rb b/app/models/polls.rb index f37c89fe2..02de95dce 100644 --- a/app/models/polls.rb +++ b/app/models/polls.rb @@ -1,3 +1,5 @@ class Polls < ActiveRecord::Base attr_accessible :closed_at, :polls_group_id, :polls_name, :polls_status, :polls_type, :published_at, :user_id + + belongs_to :user end diff --git a/db/schema.rb b/db/schema.rb index 04a2e54c8..e919d4118 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20141231085350) do +ActiveRecord::Schema.define(:version => 20150108035338) do create_table "activities", :force => true do |t| t.integer "act_id", :null => false @@ -790,6 +790,51 @@ ActiveRecord::Schema.define(:version => 20141231085350) do t.integer "project_id" end + create_table "poll_answers", :force => true do |t| + t.integer "poll_questions_id" + t.text "answer_text" + t.integer "answer_position" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "poll_questions", :force => true do |t| + t.string "question_title" + t.integer "question_type" + t.integer "is_necessary" + t.integer "polls_id" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "poll_users", :force => true do |t| + t.integer "user_id" + t.integer "poll_id" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "poll_votes", :force => true do |t| + t.integer "user_id" + t.integer "poll_questions_id" + t.integer "poll_answers_id" + t.text "vote_text" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "polls", :force => true do |t| + t.string "polls_name" + t.string "polls_type" + t.integer "polls_group_id" + t.integer "polls_status" + t.integer "user_id" + t.datetime "published_at" + t.datetime "closed_at" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + create_table "praise_tread_caches", :force => true do |t| t.integer "object_id", :null => false t.string "object_type" From 2262997c31ff34dc0d1543ba20ce0f86f1e7a9d8 Mon Sep 17 00:00:00 2001 From: alan <547533434@qq.com> Date: Thu, 8 Jan 2015 16:16:59 +0800 Subject: [PATCH 03/20] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E3=80=8A=E6=96=B0?= =?UTF-8?q?=E5=BB=BA=E8=AF=BE=E7=A8=8B=E6=97=B6=EF=BC=9A=E8=AF=BE=E7=A8=8B?= =?UTF-8?q?=E5=90=8D=E4=B8=AD=E6=9C=89=E7=A9=BA=E6=A0=BC=E6=88=96=E8=80=85?= =?UTF-8?q?=E7=89=B9=E6=AE=8A=E7=AC=A6=E5=8F=B7=E4=BC=9A=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E6=97=A0=E6=95=88,=E3=80=8B=20=20=20=20=20?= =?UTF-8?q?=20=E3=80=8A=20=E7=BC=BA=E9=99=B7=20Trustie-Forge#1782=20(?= =?UTF-8?q?=E5=B7=B2=E8=A7=A3=E5=86=B3):=20lable=E6=A0=87=E7=AD=BE?= =?UTF-8?q?=E5=92=8C=E5=AF=B9=E5=BA=94=E7=9A=84=E6=98=BE=E7=A4=BA=E5=80=BC?= =?UTF-8?q?=E4=B9=8B=E9=97=B4=E9=97=B4=E8=B7=9D=E8=BF=87=E5=A4=A7=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=8C=E4=BE=8B=E5=A6=82=E4=B8=AA=E4=BA=BA?= =?UTF-8?q?=E4=B8=BB=E9=A1=B5=E5=B7=A6=E4=BE=A7=E7=9A=84=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=EF=BC=8C=E5=85=B7=E4=BD=93=E5=A6=82=E5=9B=BE=E6=89=80=E7=A4=BA?= =?UTF-8?q?=E3=80=8B=20=20=20=20=20=E3=80=8A=E6=9C=AC=E5=9C=B0=E7=89=88?= =?UTF-8?q?=E4=B8=AD=E5=85=B3=E4=BA=8E=E5=AD=A6=E7=94=9F=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E7=9A=84=E5=88=86=E7=BB=84=E5=87=BA=E7=8E=B0=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98=EF=BC=9A=E5=BD=93=E5=89=8D=E5=B7=B2=E5=AD=98=E5=9C=A8?= =?UTF-8?q?A=E7=BB=84=EF=BC=8C=E5=86=8D=E6=AC=A1=E6=B7=BB=E5=8A=A0A?= =?UTF-8?q?=E7=BB=84=E5=BA=94=E7=BB=99=E5=87=BA=E6=8F=90=E7=A4=BA=E2=80=9C?= =?UTF-8?q?A=E7=BB=84=E5=B7=B2=E5=AD=98=E5=9C=A8=E2=80=9D=EF=BC=8C?= =?UTF-8?q?=E8=AF=A5=E5=8A=9F=E8=83=BD=E7=9B=AE=E5=89=8D=E5=8F=AA=E6=9C=89?= =?UTF-8?q?=E5=9C=A8=E5=AD=A6=E7=94=9F=E5=88=97=E8=A1=A8=E9=A6=96=E6=AC=A1?= =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E6=97=B6=E6=89=8D=E6=AD=A3=E5=B8=B8=E3=80=8B?= =?UTF-8?q?=20=20=20=20=E3=80=8A=E6=89=98=E7=AE=A1=EF=BC=8C=E8=AF=BE?= =?UTF-8?q?=E7=A8=8B=EF=BC=8C=E7=AB=9E=E8=B5=9B=E4=B8=BB=E9=A1=B5=E4=B8=AD?= =?UTF-8?q?=E4=BB=BB=E6=84=8F=E7=82=B9=E5=87=BB=E6=9F=90=E4=B8=80=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=EF=BC=8C=E8=BF=9B=E5=85=A5=E8=AF=A5=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E4=B8=BB=E9=A1=B5=EF=BC=8C=E5=8F=B3=E4=B8=8A=E8=A7=92=E7=9A=84?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=8C=89=E9=92=AE=E9=A3=8E=E6=A0=BC=E5=92=8C?= =?UTF-8?q?=E5=A4=A7=E5=B0=8F=E4=B8=8D=E7=BB=9F=E4=B8=80=E3=80=82=E3=80=8B?= =?UTF-8?q?=20=20=20=20=E3=80=8A=E8=BF=9B=E5=85=A5=E6=9F=90=E7=AB=9E?= =?UTF-8?q?=E8=B5=9B=E4=B8=BB=E9=A1=B5=EF=BC=8C=E7=82=B9=E5=87=BB=E5=88=9B?= =?UTF-8?q?=E6=96=B0=E7=AB=9E=E8=B5=9B=E9=93=BE=E6=8E=A5=E6=B2=A1=E5=8F=8D?= =?UTF-8?q?=E5=BA=94=E3=80=8Bbug=20Signed-off-by:=20alan=20<547533434@qq.c?= =?UTF-8?q?om>?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/courses_controller.rb | 3 +- app/helpers/courses_helper.rb | 2 +- app/models/course.rb | 2 +- app/views/courses/member.html.erb | 31 +++++++++---------- app/views/layouts/base_contest.html.erb | 7 +++-- app/views/layouts/base_courses.html.erb | 10 ++++-- app/views/layouts/base_newcontest.html.erb | 10 +++--- app/views/layouts/base_projects.html.erb | 4 +-- app/views/layouts/base_users.html.erb | 36 +++++++++++----------- public/stylesheets/application.css | 2 +- 10 files changed, 57 insertions(+), 50 deletions(-) diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb index 87ab7e683..e76fa31dc 100644 --- a/app/controllers/courses_controller.rb +++ b/app/controllers/courses_controller.rb @@ -500,7 +500,8 @@ class CoursesController < ApplicationController end end - def course + def + course @school_id = params[:school_id] per_page_option = 10 if @school_id == "0" or @school_id.nil? diff --git a/app/helpers/courses_helper.rb b/app/helpers/courses_helper.rb index 096ce7ad8..8547ef18f 100644 --- a/app/helpers/courses_helper.rb +++ b/app/helpers/courses_helper.rb @@ -114,7 +114,7 @@ module CoursesHelper # 学生人数计算 # add by nwb def studentCount course - searchStudent(course).count.to_s#course.student.count + course.student.count.to_s#course.student.count end #课程成员数计算 diff --git a/app/models/course.rb b/app/models/course.rb index 196e7168d..c11f66d49 100644 --- a/app/models/course.rb +++ b/app/models/course.rb @@ -38,7 +38,7 @@ class Course < ActiveRecord::Base validates_presence_of :password, :term,:name validates_format_of :class_period, :with =>/^[1-9]\d*$/ - validates_format_of :name,:with =>/^[a-zA-Z0-9_\u4e00-\u9fa5]+$/ + validates_format_of :name,:with =>/^[^ ]+[a-zA-Z0-9_\u4e00-\u9fa5\s\S]+$/ validates_length_of :description, :maximum => 10000 before_save :self_validate after_create :create_board_sync diff --git a/app/views/courses/member.html.erb b/app/views/courses/member.html.erb index d199097be..81c469fd8 100644 --- a/app/views/courses/member.html.erb +++ b/app/views/courses/member.html.erb @@ -1,21 +1,19 @@ -