|
|
|
@ -116,6 +116,34 @@ module CoursesHelper
|
|
|
|
|
@course.journals_for_messages.where('m_parent_id IS NULL').count
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
#当前学期
|
|
|
|
|
def current_time_and_term course
|
|
|
|
|
str = ""
|
|
|
|
|
term = cur_course_term
|
|
|
|
|
if (course.time == course.end_time && course.term == course.end_term) || (course.end_term.nil? && course.end_time.nil?) || course.time > Time.now.year
|
|
|
|
|
str = course.time.to_s + course.term.to_s
|
|
|
|
|
elsif course.time == Time.now.year && set_term_value(cur_course_term) <= set_term_value(course.term)
|
|
|
|
|
str = course.time.to_s + course.term.to_s
|
|
|
|
|
elsif course.end_time < Time.now.year || (course.end_time == Time.now.year && set_term_value(cur_course_term) >= set_term_value(course.term))
|
|
|
|
|
str = course.end_time.to_s + course.end_term.to_s
|
|
|
|
|
else
|
|
|
|
|
str = Time.now.year.to_s + cur_course_term.to_s
|
|
|
|
|
end
|
|
|
|
|
str
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
def set_term_value term
|
|
|
|
|
val = 0
|
|
|
|
|
if term == "春季学期"
|
|
|
|
|
val = 1
|
|
|
|
|
elsif term == "夏季学期"
|
|
|
|
|
val = 2
|
|
|
|
|
elsif term == "秋季学期"
|
|
|
|
|
val = 3
|
|
|
|
|
end
|
|
|
|
|
val
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
# 返回学生数量,即roles表中定义的Reporter
|
|
|
|
|
#def studentCount project
|
|
|
|
|
# searchStudent(project).count
|
|
|
|
@ -562,7 +590,7 @@ module CoursesHelper
|
|
|
|
|
type = []
|
|
|
|
|
month = Time.now.month
|
|
|
|
|
now_year = year.nil? ? Time.now.year : (Time.now.year <= year ? Time.now.year : year)
|
|
|
|
|
year = month < 3 && now_year >=Time.now.year ? now_year - 1 : now_year
|
|
|
|
|
year = month < 2 && now_year >=Time.now.year ? now_year - 1 : now_year
|
|
|
|
|
for i in (year..year + 10)
|
|
|
|
|
option = []
|
|
|
|
|
option << i
|
|
|
|
@ -592,8 +620,10 @@ module CoursesHelper
|
|
|
|
|
|
|
|
|
|
def cur_course_term
|
|
|
|
|
month = Time.now.month
|
|
|
|
|
if month >= 9 || month < 3
|
|
|
|
|
if month >= 9 || month < 2
|
|
|
|
|
term = "秋季学期"
|
|
|
|
|
elsif (month >= 7 && Time.now.day >= 15) || month == 8
|
|
|
|
|
term = "夏季学期"
|
|
|
|
|
else
|
|
|
|
|
term = "春季学期"
|
|
|
|
|
end
|
|
|
|
@ -603,7 +633,7 @@ module CoursesHelper
|
|
|
|
|
def course_in_current_or_next_term course
|
|
|
|
|
is_current_term = false
|
|
|
|
|
is_next_term = false
|
|
|
|
|
year_now = Time.now.month < 3 ? Time.now.year - 1:Time.now.year
|
|
|
|
|
year_now = Time.now.month < 2 ? Time.now.year - 1:Time.now.year
|
|
|
|
|
if course.time == year_now && course.term == cur_course_term
|
|
|
|
|
is_current_term = true
|
|
|
|
|
end
|
|
|
|
@ -612,6 +642,7 @@ module CoursesHelper
|
|
|
|
|
elsif cur_course_term == "春季学期" && course.time == year_now && course.term == "夏季学期"
|
|
|
|
|
is_next_term = true
|
|
|
|
|
elsif cur_course_term == "夏季学期" && course.time == year_now && course.term == "秋季学期"
|
|
|
|
|
is_next_term = true
|
|
|
|
|
end
|
|
|
|
|
is_current_term || is_next_term
|
|
|
|
|
end
|
|
|
|
|