-
+<%= render :partial => "hightchars" %>
+质量分析
-
+
质量分析
+项目代码质量分析报告
@@ -12,28 +12,28 @@
质量等级
-<%= @complexity["msr"][9]["frmt_val"] %>
+<%= @complexity["msr"][9]["frmt_val"] %>
复杂度
-<%= @complexity["msr"][6]["val"] %>
+<%= @complexity["msr"][6]["val"] %>
代码重复度
-<%= @complexity["msr"][7]["frmt_val"] %>
+<%= @complexity["msr"][7]["frmt_val"] %>
注释率
-<%= @complexity["msr"][5]["frmt_val"] %>
+<%= @complexity["msr"][5]["frmt_val"] %>
质量等级<%= score_sqale_rating(@complexity["msr"][9]["val"]) %>/5分可定性评价为：质量<%= sqale_rating_status(@complexity["msr"][9]["val"])[0] %>
+ 质量等级<%= score_sqale_rating(@complexity["msr"][9]["val"].to_i) %>/5分可定性评价为：质量<%= sqale_rating_status(@complexity["msr"][9]["val"])[0] %>
质量问题
@@ -46,7 +46,7 @@
信息<%= @sonar_issues["msr"][5]["frmt_val"] %>%;">
代码规模可定性评价为：<%= lines_scale(@complexity["msr"][0]["frmt_val"]) %>
+ 代码规模可定性评价为：<%= lines_scale(@complexity["msr"][0]["frmt_val"].to_i) %>
代码行数
diff --git a/app/views/repositories/show.html.erb b/app/views/repositories/show.html.erb index 124e3ef4d..5f4288262 100644 --- a/app/views/repositories/show.html.erb +++ b/app/views/repositories/show.html.erb @@ -2,13 +2,13 @@<%= render :partial => 'breadcrumbs', :locals => {:path => @path, :kind => 'dir', :revision => @rev} %>
<% if @entries.nil? %>
diff --git a/db/migrate/20160624103411_add_name_to_quality_analyses.rb b/db/migrate/20160624103411_add_name_to_quality_analyses.rb
deleted file mode 100644
index bf61fd5ac..000000000
--- a/db/migrate/20160624103411_add_name_to_quality_analyses.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class AddNameToQualityAnalyses < ActiveRecord::Migration
- def change
- add_column :quality_analyses, :language, :string
- end
-end
diff --git a/db/migrate/20160627090316_add_sonar_name_to_quality_analyses.rb b/db/migrate/20160627090316_add_sonar_name_to_quality_analyses.rb
new file mode 100644
index 000000000..c69b5c909
--- /dev/null
+++ b/db/migrate/20160627090316_add_sonar_name_to_quality_analyses.rb
@@ -0,0 +1,5 @@
+class AddSonarNameToQualityAnalyses < ActiveRecord::Migration
+ def change
+ add_column :quality_analyses, :sonar_name, :string
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index ee2da177b..16f39f6a1 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 => 20160624055127) do
+ActiveRecord::Schema.define(:version => 20160627090316) do
create_table "activities", :force => true do |t|
t.integer "act_id", :null => false
@@ -1844,6 +1844,7 @@ ActiveRecord::Schema.define(:version => 20160624055127) do
t.string "path"
t.string "branch"
t.string "language"
+ t.string "sonar_name"
end
create_table "queries", :force => true do |t|
From f930bbddad7eb88c1884878dade392e132627342 Mon Sep 17 00:00:00 2001
From: Your Name
Date: Tue, 28 Jun 2016 09:45:45 +0800
Subject: [PATCH 07/64] modified create
---
.../quality_analysis_controller.rb | 77 +++++++++++--------
1 file changed, 44 insertions(+), 33 deletions(-)
diff --git a/app/controllers/quality_analysis_controller.rb b/app/controllers/quality_analysis_controller.rb
index 9a5745dc1..bff369eaf 100644
--- a/app/controllers/quality_analysis_controller.rb
+++ b/app/controllers/quality_analysis_controller.rb
@@ -14,43 +14,53 @@ class QualityAnalysisController < ApplicationController
end
def create
- user_name = User.find(params[:user_id]).try(:login)
- identifier = params[:identifier]
- job_name = "#{user_name}:#{identifier}"
- # Checks if the given job exists in Jenkins.
- unless @client.job.exists?(job_name)
- @g = Gitlab.client
- branch = params[:branch].blank? ? "master" : params[:branch]
- language = params[:language]
- path = params[:path]
- qa = QualityAnalysis.where(:project_id => @project.id).first
- version = qa.nil? ? 1 : qa.sonar_version + 1
- properties = "sonar.projectKey=#{user_name}:#{identifier}
+ begin
+ user_name = User.find(params[:user_id]).try(:login)
+ identifier = params[:identifier]
+ # REDO
+ job_name = "#{user_name}:#{identifier}"
+
+ # Checks if the given job exists in Jenkins.
+ unless @client.job.exists?(job_name)
+ @g = Gitlab.client
+ branch = params[:branch].blank? ? "master" : params[:branch]
+ language = params[:language]
+ path = params[:path]
+ qa = QualityAnalysis.where(:project_id => @project.id).first
+ version = qa.nil? ? 1 : qa.sonar_version + 1
+ properties = "sonar.projectKey=#{user_name}:#{identifier}
sonar.projectName=#{user_name}:#{identifier}
sonar.projectVersion=#{version}
sonar.sources=#{path}
sonar.language=#{language.downcase}
sonar.sourceEncoding=utf-8"
- git_url = @gitlab_address.to_s+"/"+@project.owner.to_s+"/"+ identifier + "."+"git"
- # modify config.yml
- @doc = Nokogiri::XML(File.open(File.join(Rails.root, 'tmp', 'config.xml')))
- @doc.at_xpath("//hudson.plugins.git.UserRemoteConfig/url").content = git_url
- @doc.at_xpath("//hudson.plugins.git.BranchSpec/name").content = "*/#{branch}"
- @doc.at_xpath("//hudson.plugins.sonar.SonarRunnerBuilder/properties").content = properties # sonar-properties
- @client.job.create("#{user_name}_#{identifier}", @doc.to_xml)
- # relace gitlab hook
- @g.add_project_hook(@project.gpid, @jenkins_address + "/project/#{user_name}_#{identifier}")
- # build job
- opts = {'build_start_timeout' => 30, 'cancel_on_build_start_timeout' => true}
- code = @client.job.build("#{user_name}_#{identifier}", opts)
- # sucessed will return "201"
- raise "Unable to build job: #{user_name}_#{identifier}" unless code == '201'
- if qa.blank? && code == '201'
- QualityAnalysis.create(:project_id => @project.id, :author_login => user_name, :rep_identifier => identifier,
- :sonar_version => version, :path => path, :branch => branch, :language => language, :sonar_name => job_name)
- else
- qa.update_attribute(:sonar_version, version)
+ git_url = @gitlab_address.to_s+"/"+@project.owner.to_s+"/"+ identifier + "."+"git"
+
+ # modify config.yml
+ @doc = Nokogiri::XML(File.open(File.join(Rails.root, 'tmp', 'config.xml')))
+ @doc.at_xpath("//hudson.plugins.git.UserRemoteConfig/url").content = git_url
+ @doc.at_xpath("//hudson.plugins.git.BranchSpec/name").content = "*/#{branch}"
+ @doc.at_xpath("//hudson.plugins.sonar.SonarRunnerBuilder/properties").content = properties # sonar-properties
+
+ # return '200' if successed
+ jenkins_job = @client.job.create("#{user_name}_#{identifier}", @doc.to_xml)
+
+ # replace gitlab hook
+ @g.add_project_hook(@project.gpid, @jenkins_address + "/project/#{user_name}_#{identifier}")
+ # build job
+ logger.error("Test#{jenkins_job}")
+
+ # return '201' if successed
+ code = @client.job.build("#{user_name}_#{identifier}")
+ if qa.blank?
+ QualityAnalysis.create(:project_id => @project.id, :author_login => user_name, :rep_identifier => identifier,
+ :sonar_version => version, :path => path, :branch => branch, :language => language, :sonar_name => job_name)
+ else
+ qa.update_attribute(:sonar_version, version)
+ end
end
+ rescue => e
+ puts e
end
end
@@ -90,10 +100,11 @@ class QualityAnalysisController < ApplicationController
def connect_jenkins
@gitlab_address = Redmine::Configuration['gitlab_address']
@jenkins_address = Redmine::Configuration['jenkins_address']
+
# connect jenkins
@client = JenkinsApi::Client.new(:server_url => @jenkins_address, :username => "temp", :password => '123123')
- rescue
- logger.error("failed to connect Jenkins")
+ rescue => e
+ logger.error("failed to connect Jenkins ==> #{e}")
end
end
From dd6b19a8b543234d1f9d2fa879a583bf3d1f4cb7 Mon Sep 17 00:00:00 2001
From: Your Name
Date: Tue, 28 Jun 2016 14:48:09 +0800
Subject: [PATCH 08/64] some status of sonar
---
.../quality_analysis_controller.rb | 66 +++++++++++--------
app/models/quality_analysis.rb | 2 +-
.../quality_analysis/_result_list.html.erb | 6 +-
.../repositories/_quality_analysis.html.erb | 2 +-
4 files changed, 45 insertions(+), 31 deletions(-)
diff --git a/app/controllers/quality_analysis_controller.rb b/app/controllers/quality_analysis_controller.rb
index bff369eaf..7de4bedab 100644
--- a/app/controllers/quality_analysis_controller.rb
+++ b/app/controllers/quality_analysis_controller.rb
@@ -17,19 +17,20 @@ class QualityAnalysisController < ApplicationController
begin
user_name = User.find(params[:user_id]).try(:login)
identifier = params[:identifier]
+ rep_id = params[:rep_id]
# REDO
- job_name = "#{user_name}:#{identifier}"
+ job_name = "#{user_name}-#{rep_id}"
# Checks if the given job exists in Jenkins.
unless @client.job.exists?(job_name)
@g = Gitlab.client
- branch = params[:branch].blank? ? "master" : params[:branch]
+ branch = params[:branch]
language = params[:language]
path = params[:path]
- qa = QualityAnalysis.where(:project_id => @project.id).first
+ qa = QualityAnalysis.where(:project_id => @project.id, :author_login => user_name).first
version = qa.nil? ? 1 : qa.sonar_version + 1
- properties = "sonar.projectKey=#{user_name}:#{identifier}
- sonar.projectName=#{user_name}:#{identifier}
+ properties = "sonar.projectKey=#{user_name}:#{rep_id}
+ sonar.projectName=#{user_name}:#{rep_id}
sonar.projectVersion=#{version}
sonar.sources=#{path}
sonar.language=#{language.downcase}
@@ -43,18 +44,20 @@ class QualityAnalysisController < ApplicationController
@doc.at_xpath("//hudson.plugins.sonar.SonarRunnerBuilder/properties").content = properties # sonar-properties
# return '200' if successed
- jenkins_job = @client.job.create("#{user_name}_#{identifier}", @doc.to_xml)
+ jenkins_job = @client.job.create("#{job_name}", @doc.to_xml)
# replace gitlab hook
- @g.add_project_hook(@project.gpid, @jenkins_address + "/project/#{user_name}_#{identifier}")
+ @g.add_project_hook(@project.gpid, @jenkins_address + "/project/#{job_name}")
# build job
- logger.error("Test#{jenkins_job}")
-
- # return '201' if successed
- code = @client.job.build("#{user_name}_#{identifier}")
- if qa.blank?
+ logger.error("Jenkins status of create ==> #{jenkins_job}")
+ # return '201' if build successed
+ code = @client.job.build("#{job_name}")
+ logger.error("build result ==> #{code}")
+ d = @client.delete("#{job_name}") if jenkins_job == '200' && code != '201'
+ logger.error("delete result ==> #{code}")
+ if qa.blank? && code == '201'
QualityAnalysis.create(:project_id => @project.id, :author_login => user_name, :rep_identifier => identifier,
- :sonar_version => version, :path => path, :branch => branch, :language => language, :sonar_name => job_name)
+ :sonar_version => version, :path => path, :branch => branch, :language => language, :sonar_name => "#{user_name}:#{rep_id}")
else
qa.update_attribute(:sonar_version, version)
end
@@ -62,23 +65,34 @@ class QualityAnalysisController < ApplicationController
rescue => e
puts e
end
+ respond_to do |format|
+ format.html{redirect_to project_quality_analysis_path(:project_id => @project.id, :resource_id => "#{user_name}:#{rep_id}")}
+ format.js
+ end
end
+ # resource_id: login + @repository.id
def index
- @sonar_address = Redmine::Configuration['sonar_address']
- projects_date = open(@sonar_address + "/api/projects/index").read
- arr = JSON.parse(projects_date).map {|m| m["nm"]} # ["Hjqreturn:cc_rep", "Hjqreturn:putong", "Hjqreturn:sonar_rep2", "shitou:sonar_rep"]
- if params[:resource_id].nil?
- @quality_analyses = QualityAnalysis.where("sonar_name in #{arr}")
- else
- qa = QualityAnalysis.where(:project_id => @project.id).first
- @resource_id = qa.author_login+":"+qa.rep_identifier
- @name_flag = false
- complexity_date = open(@sonar_address + "/api/resources/index?resource=#{@resource_id}&depth=0&metrics=sqale_rating,function_complexity,duplicated_lines_density,comment_lines_density,sqale_index,lines,file_line,files,functions,classes,directories").read
- @complexity =JSON.parse(complexity_date).first
- # issue_date = open(@sonar_address + "/api/resources/index?resource=#{@resource_id}&depth=0&metrics=blocker_violations,critical_violations,major_violations,minor_violations,info_violations,violations").read
- # @sonar_issues = JSON.parse(issue_date).first
+ begin
+ @resource_id = params[:resource_id]
+ @sonar_address = Redmine::Configuration['sonar_address']
+ # projects_date = open(@sonar_address + "/api/projects/index").read
+ # @arr = JSON.parse(projects_date).map {|m| m["nm"]} # ["Hjqreturn:cc_rep", "Hjqreturn:putong", "Hjqreturn:sonar_rep2", "shitou:sonar_rep"]
+ if params[:resource_id].nil?
+ @name_flag = true
+ # @quality_analyses = QualityAnalysis.where("sonar_name in (#{arr.empty? ? '0': arr.join(',')})")
+ @quality_analyses = QualityAnalysis.where(:project_id => @project.id)
+ else
+ qa = QualityAnalysis.where(:project_id => @project.id).first
+ complexity_date = open(@sonar_address + "/api/resources/index?resource=#{@resource_id}&depth=0&metrics=sqale_rating,function_complexity,duplicated_lines_density,comment_lines_density,sqale_index,lines,file_line,files,functions,classes,directories").read
+ @complexity =JSON.parse(complexity_date).first
+ issue_date = open(@sonar_address + "/api/resources/index?resource=#{@resource_id}&depth=0&metrics=blocker_violations,critical_violations,major_violations,minor_violations,info_violations,violations").read
+ @sonar_issues = JSON.parse(issue_date).first
+ end
+ rescue => e
+ puts e
end
+
end
# Find project of id params[:project_id]
diff --git a/app/models/quality_analysis.rb b/app/models/quality_analysis.rb
index 229be9826..8b8034c65 100644
--- a/app/models/quality_analysis.rb
+++ b/app/models/quality_analysis.rb
@@ -1,5 +1,5 @@
class QualityAnalysis < ActiveRecord::Base
- attr_accessible :author_login, :project_id, :rep_identifier, :sonar_version, :branch, :path, :rep_identifier, :language
+ attr_accessible :author_login, :project_id, :rep_identifier, :sonar_version, :branch, :path, :rep_identifier, :language, :sonar_name
def user_rep_name
self.author_login+":"+self.rep_identifier
diff --git a/app/views/quality_analysis/_result_list.html.erb b/app/views/quality_analysis/_result_list.html.erb
index 507ded0fe..845049cea 100644
--- a/app/views/quality_analysis/_result_list.html.erb
+++ b/app/views/quality_analysis/_result_list.html.erb
@@ -6,17 +6,17 @@
版本
分支
语言
- 时间
+ lujing
<% if @quality_analyses.count >0 %>
<% @quality_analyses.each do |qa| %>
-
-
- <%=link_to "#{qa.author_login}:#{qa.rep_identifier}", project_quality_analysis_path(:resource_id => qa.author_login+":"+qa.rep_identifier, :branch => qa.branch.nil? ? "master" : qa.branch), :class => "analysis-result-name fl fontBlue2" %> +
- <%=link_to "#{qa.author_login}:#{qa.rep_identifier}", project_quality_analysis_path(:resource_id => qa.sonar_name, :branch => qa.branch.nil? ? "master" : qa.branch), :class => "analysis-result-name fl fontBlue2" %>
- 1.0
- <%= qa.branch %>
- <%= qa.language %> -
- <%= format_time(qa.created_at) %> +
- <%= qa.path %>
代码质量分析
- <%= form_tag( url_for(:controller => 'quality_analysis', :action => 'create', :project_id => @project.id, :user_id => User.current.id, :identifier => @repository.identifier), :remote => true, :id => 'quality_analyses_form') do %>
+ <%= form_tag( url_for(:controller => 'quality_analysis', :action => 'create', :project_id => @project.id, :user_id => User.current.id, :identifier => @repository.identifier, :rep_id => @repository.id), :remote => true, :id => 'quality_analyses_form') do %>
From 383483de269bdf40c739c9b911a257f6101bc39a Mon Sep 17 00:00:00 2001
From: cxt
Date: Tue, 28 Jun 2016 15:13:04 +0800
Subject: [PATCH 09/64] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=A4=A7=E7=BA=B2?=
=?UTF-8?q?=E7=9A=84=E5=B7=A6=E4=BE=A7=E6=A0=8Fbase=EF=BC=8C=E6=96=B0?=
=?UTF-8?q?=E5=BB=BA=E8=AF=BE=E7=A8=8B=E5=A4=A7=E7=BA=B2=E3=80=81=E6=96=B0?=
=?UTF-8?q?=E5=BB=BA=E7=8F=AD=E7=BA=A7=E7=9A=84=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/controllers/courses_controller.rb | 1 +
app/controllers/syllabuses_controller.rb | 37 +++-
app/controllers/tags_controller.rb | 8 +
app/helpers/courses_helper.rb | 16 ++
app/helpers/syllabuses_helper.rb | 3 +
app/helpers/tags_helper.rb | 2 +
app/models/syllabus.rb | 4 +-
app/services/courses_service.rb | 1 +
app/views/courses/new.html.erb | 20 ++-
app/views/layouts/_syllabus_info.html.erb | 25 +++
app/views/layouts/_user_courses.html.erb | 4 +-
app/views/layouts/base_syllabus.html.erb | 158 ++++++++++++++++++
app/views/layouts/new_base.html.erb | 2 +-
app/views/layouts/new_base_user.html.erb | 5 +-
app/views/syllabuses/new.html.erb | 27 +++
app/views/syllabuses/show.html.erb | 0
app/views/tags/_syllabus_tag.html.erb | 5 +
.../tags/_tag_syllabus_new_name.html.erb | 28 ++++
app/views/tags/remove_tag.js.erb | 3 +
app/views/tags/tag_save.js.erb | 4 +
config/locales/zh.yml | 8 +-
config/routes.rb | 12 ++
.../20160627074232_add_column_to_syllabus.rb | 12 ++
db/schema.rb | 26 ++-
public/images/syllabus.jpg | Bin 0 -> 16760 bytes
public/javascripts/course.js | 40 ++++-
public/javascripts/syllabus.js | 9 +
public/stylesheets/courses.css | 4 +-
public/stylesheets/syllabus.css | 155 +++++++++++++++++
29 files changed, 599 insertions(+), 20 deletions(-)
create mode 100644 app/views/layouts/_syllabus_info.html.erb
create mode 100644 app/views/layouts/base_syllabus.html.erb
create mode 100644 app/views/syllabuses/new.html.erb
create mode 100644 app/views/syllabuses/show.html.erb
create mode 100644 app/views/tags/_syllabus_tag.html.erb
create mode 100644 app/views/tags/_tag_syllabus_new_name.html.erb
create mode 100644 db/migrate/20160627074232_add_column_to_syllabus.rb
create mode 100644 public/images/syllabus.jpg
create mode 100644 public/javascripts/syllabus.js
create mode 100644 public/stylesheets/syllabus.css
diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index 7dea90e4b..e81251f63 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -715,6 +715,7 @@ class CoursesController < ApplicationController
@trackers = Tracker.sorted.all
@course = Course.new
@course.safe_attributes = params[:course]
+ @syllabus = Syllabus.where("id = #{params[:syllabus_id].to_i}").first if params[:syllabus_id]
# month = Time.now.month
render :layout => 'new_base'
else
diff --git a/app/controllers/syllabuses_controller.rb b/app/controllers/syllabuses_controller.rb
index 69982b99a..5ee3224bd 100644
--- a/app/controllers/syllabuses_controller.rb
+++ b/app/controllers/syllabuses_controller.rb
@@ -8,8 +8,43 @@ class SyllabusesController < ApplicationController
end
def show
- @courses = @syllabus.courses
+ #@courses = @syllabus.courses
+ respond_to do |format|
+ format.js
+ format.html{render :layout => 'base_syllabus'}
+ format.api
+ end
+ end
+
+ def new
+ if User.current.login?
+ @syllabus = Syllabus.new
+ render :layout => 'new_base'
+ else
+ redirect_to signin_url
+ end
+ end
+ def create
+ if User.current.user_extensions.identity
+ @syllabus = Syllabus.new
+ @syllabus.title = params[:title]
+ @syllabus.eng_name = params[:eng_name]
+ @syllabus.user_id = User.current.id
+ if @syllabus && @syllabus.save
+ respond_to do |format|
+ flash[:notice] = l(:notice_successful_create)
+ format.html {redirect_to syllabus_path(@syllabus)}
+ format.api { render :action => 'show', :status => :created, :location => url_for(:controller => 'syllabuses', :action => 'show', :id => @syllabus.id) }
+ end
+ else
+ respond_to do |format|
+ flash[:notice] = l(:notice_create_failed)
+ format.html { redirect_to new_syllabus_path } #Added by young
+ format.api { render_validation_errors(@syllabus) }
+ end
+ end
+ end
end
private
diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb
index 2c390025e..e66f88848 100644
--- a/app/controllers/tags_controller.rb
+++ b/app/controllers/tags_controller.rb
@@ -13,6 +13,7 @@ class TagsController < ApplicationController
include ForumsHelper
include AttachmentsHelper
include ContestsHelper
+ include SyllabusesHelper
include ActsAsTaggableOn::TagsHelper
include TagsHelper
include FilesHelper
@@ -529,6 +530,8 @@ class TagsController < ApplicationController
@obj = Course.find_by_id(@obj_id)
when '10'
@obj = Attachment.find_by_id(@obj_id)
+ when '11'
+ @obj = Syllabus.find_by_id(@obj_id)
else
@obj = nil
end
@@ -619,6 +622,9 @@ class TagsController < ApplicationController
when '9' then
@obj = Course.find_by_id(obj_id)
@obj_pages, @courses_results, @results_count = for_pagination(get_courses_by_tag(selected_tags))
+ when '11' then
+ @obj = Syllabus.find_by_id(obj_id)
+ @obj_pages, @syllabuses_results, @results_count = for_pagination(get_syllabuses_by_tag(selected_tags))
else
@obj = nil
end
@@ -684,6 +690,8 @@ class TagsController < ApplicationController
return 'Course'
when '10'
return 'Attachment'
+ when '11'
+ return 'Syllabus'
else
render_error :message => e.message
return
diff --git a/app/helpers/courses_helper.rb b/app/helpers/courses_helper.rb
index 47d343e8f..fd3be1369 100644
--- a/app/helpers/courses_helper.rb
+++ b/app/helpers/courses_helper.rb
@@ -667,6 +667,22 @@ module CoursesHelper
is_current_term || is_next_term
end
+ #课程大纲下拉框
+ def syllabus_option
+ type = []
+ option1 = []
+ option1 << "请选择课程"
+ option1 << 0
+ type << option1
+ Syllabus.all.each do |syllabus|
+ option = []
+ option << syllabus.title
+ option << syllabus.id
+ type << option
+ end
+ type
+ end
+
#获取课程动态
def get_course_activity courses, activities
@course_ids=activities.keys()
diff --git a/app/helpers/syllabuses_helper.rb b/app/helpers/syllabuses_helper.rb
index dac84937b..d5284586e 100644
--- a/app/helpers/syllabuses_helper.rb
+++ b/app/helpers/syllabuses_helper.rb
@@ -1,2 +1,5 @@
module SyllabusesHelper
+ def get_syllabuses_by_tag(tag_name)
+ Syllabus.tagged_with(tag_name).order('updated_at desc')
+ end
end
diff --git a/app/helpers/tags_helper.rb b/app/helpers/tags_helper.rb
index 8847f4163..54753807d 100644
--- a/app/helpers/tags_helper.rb
+++ b/app/helpers/tags_helper.rb
@@ -23,6 +23,8 @@ module TagsHelper
@obj= Course.find_by_id(obj_id)
when '10'
@obj = Attachment.find_by_id(obj_id)
+ when '11'
+ @obj = Syllabus.find_by_id(obj_id)
else
raise Exception, '[TagsHelper] ===> tag type unknow.'
end
diff --git a/app/models/syllabus.rb b/app/models/syllabus.rb
index 7d6319955..b1bdfd5aa 100644
--- a/app/models/syllabus.rb
+++ b/app/models/syllabus.rb
@@ -1,5 +1,7 @@
class Syllabus < ActiveRecord::Base
+ acts_as_taggable
+
belongs_to :user
has_many :courses
- attr_accessible :description, :title
+ attr_accessible :description, :title, :eng_name, :type, :credit, :hours, :theory_hours, :practice_hours, :applicable_major, :pre_course
end
diff --git a/app/services/courses_service.rb b/app/services/courses_service.rb
index 60c053997..b7b5e73ac 100644
--- a/app/services/courses_service.rb
+++ b/app/services/courses_service.rb
@@ -201,6 +201,7 @@ class CoursesService
#@course.safe_attributes(current_user,params[:course])
#@course.password = params[:course][:password]
@course.tea_id = current_user.id
+ @course.syllabus_id = params[:syllabus_id].to_i
@course.term = params[:term]
@course.time = params[:time]
@course.end_term = params[:end_term]
diff --git a/app/views/courses/new.html.erb b/app/views/courses/new.html.erb
index ddaf17ae8..d3326480f 100644
--- a/app/views/courses/new.html.erb
+++ b/app/views/courses/new.html.erb
@@ -4,12 +4,22 @@
-
<%= labelled_form_for @course do |f| %>
+
- + + <% if @syllabus.nil? %> + <%= select_tag :syllabus_id,options_for_select(syllabus_option,@course.syllabus_id), {:id=>"new_syllabus_id", :class=>"syllabus_input"} %> + <% else %> + <%=@syllabus.title %> + + <% end %> + + + +
- - - - +
- @@ -49,13 +59,13 @@
- - （选中后课外用户可见该课程，否则仅对课内成员可见） + （选中后班级外用户可见该班级，否则仅对班级内成员可见）
- - （选中后课外用户可见学生列表，否则仅对课内成员可见） + （选中后班级外用户可见学生列表，否则仅对班级内成员可见）
-
diff --git a/app/views/layouts/_syllabus_info.html.erb b/app/views/layouts/_syllabus_info.html.erb
new file mode 100644
index 000000000..4e7bc1f7b
--- /dev/null
+++ b/app/views/layouts/_syllabus_info.html.erb
@@ -0,0 +1,25 @@
++ <%= image_tag("../images/syllabus.jpg",width:"60px", height: "60px") %> ++++ +
<%=@syllabus.title %>
+ +++ + \ No newline at end of file diff --git a/app/views/layouts/_user_courses.html.erb b/app/views/layouts/_user_courses.html.erb index ff18e68bd..546a5b14b 100644 --- a/app/views/layouts/_user_courses.html.erb +++ b/app/views/layouts/_user_courses.html.erb @@ -47,7 +47,7 @@ <%= link_to "+",course_boards_path(course, :flag => true, :is_new => 1), :class => 'fr fb', :title => '发布帖子',:target => '_blank' %>+ <% if @syllabus.eng_name && !@syllabus.eng_name.empty? %> + <%= @syllabus.eng_name %> + <% else%> + 课程英文名称 + <% end %> + <% if User.current == @syllabus.user %> + <%= link_to image_tag("../images/signature_edit.png",width:"12px", height: "12px"), "javascript:void(0);", :onclick => "show_edit_eng_name();"%> + <% end %> ++
- <% if User.current == @user %>
+ <% if User.current == user %>
-
<% if count == 0 %>
<%= link_to "屏蔽动态", shield_activities_path(:user_id => user.id, :course_id => course.id), :method => 'post',:remote => true %>
@@ -84,7 +84,7 @@
<% end%>
+
+
+
+
+
+<% is_current_user = User.current.logged? && User.current == @user%>
+
+
+++ +<%= render :partial => 'layouts/footer' %> + + + + + + +++ <%= render :partial => 'layouts/new_feedback' %> ++++ <%=render :partial => 'layouts/syllabus_info' %> ++ + + +++ ++ 班级 ++ + <% courses = User.current.courses.visible.where("is_delete =? and syllabus_id =?", 0, @syllabus.id).select("courses.*,(SELECT MAX(updated_at) FROM `course_activities` WHERE course_activities.course_id = courses.id) AS a").order("a desc").limit(5) %> + +++
-
+
- + + +
++标签:
++ <%= render :partial => 'tags/syllabus_tag', :locals => {:obj => @syllabus,:object_flag => "11"}%> ++ +访问计数 343 （自2016年5月）+ ++ <%= yield %> ++
