hushasha
/
trustieforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'develop' into cxt_course

Browse Source
cxt_course
cxt 9 years ago
parent 0e8df56c9a 0e531aa529
commit 0a899550b5
69 changed files with 1081 additions and 148 deletions
Show Stats Download Patch File Download Diff File

169
app/api/mobile/apis/courses.rb
Unescape View File

@ -118,6 +118,8 @@ module Mobile
roles_ids << "10" roles_ids << "10"
end end
go_course_group = 0
if roles_ids.length <= 0 if roles_ids.length <= 0
{status:-1,message:"请至少选择一个角色"} {status:-1,message:"请至少选择一个角色"}
else else
@ -125,7 +127,9 @@ module Mobile
status = cs.join_course_roles({role: roles_ids, openid: params[:openid], invite_code: params[:invite_code]}, current_user) status = cs.join_course_roles({role: roles_ids, openid: params[:openid], invite_code: params[:invite_code]}, current_user)
{ {
status: status[:state], status: status[:state],
message:CoursesService::JoinCourseError.message(status[:state]) message:CoursesService::JoinCourseError.message(status[:state]),
go_coursegroup_flag:status[:go_coursegroup_flag],
course_id:status[:course_id]
} }
end end
end end
@ -537,6 +541,7 @@ module Mobile
present :course_id,params[:id] present :course_id,params[:id]
present :user_id,params[:user_id] present :user_id,params[:user_id]
present :member_info,my_member, with: Mobile::Entities::ProjectMember present :member_info,my_member, with: Mobile::Entities::ProjectMember
present :course_group_id,my_member.course_group_id
present :status, 0 present :status, 0
else else
present :status, -1 present :status, -1
@ -750,6 +755,168 @@ module Mobile
end end
out.merge(message: message) out.merge(message: message)
end end
desc '获取分班列表'
params do
requires :id, type: Integer
requires :token, type:String
end
get 'course_groups/:id' do
begin
authenticate!
course = Course.find(params[:id])
groups = []
groups = course.course_groups if course.course_groups
present :data,groups
present :status,0
rescue
present :status,-1
end
end
desc "加入分班"
params do
requires :id, type: Integer
requires :token, type: String
requires :course_group_id, type: Integer
end
post 'user_join_coursegroup' do
begin
authenticate!
member = Member.where(:course_id => params[:id], :user_id => current_user.id).first
raise "你还不是该班级的学生!" unless member
member.course_group_id = params[:course_group_id].to_i
member.save
present :status,0
rescue Exception=>e
present :message,e.message
present :status,-1
end
end
desc "修改分班"
params do
requires :id, type: Integer
requires :token, type: String
requires :course_group_id, type: Integer
requires :user_id, type: Integer
end
post 'user_edit_coursegroup' do
begin
authenticate!
member = Member.where(:course_id => params[:id], :user_id => params[:user_id]).first
raise "不是该班级的学生!" unless member
member.course_group_id = params[:course_group_id].to_i
member.save
present :status,0
rescue Exception=>e
present :message,e.message
present :status,-1
end
end
desc '获取分班列表带上学生'
params do
requires :id, type: Integer
requires :token, type:String
end
get 'course_groups_withstudent/:id' do
begin
authenticate!
course = Course.find(params[:id])
groups = []
groups = course.course_groups if course.course_groups
present :data,groups, with: Mobile::Entities::CourseGroup
present :status,0
rescue
present :status,-1
end
end
desc "删除分班"
params do
requires :id, type: Integer
requires :token, type: String
requires :course_group_id, type: Integer
end
post 'delete_coursegroup' do
begin
authenticate!
c = Course.find("#{params[:id]}")
my_member = c.member_principals.where("users.id=#{current_user.id}").first
roles_ids = []
my_member.roles.each do |role|
roles_ids << role.id
end
if my_member && (roles_ids.include?(3) || roles_ids.include?(7) || roles_ids.include?(9) )
else
raise "您没有该权限！"
end
CourseGroup.delete(params[:course_group_id])
present :status,0
rescue Exception=>e
present :message,e.message
present :status,-1
end
end
desc "编辑分班"
params do
requires :id, type: Integer
requires :token, type: String
end
post 'edit_coursegroup' do
begin
authenticate!
c = Course.find("#{params[:id]}")
my_member = c.member_principals.where("users.id=#{current_user.id}").first
roles_ids = []
my_member.roles.each do |role|
roles_ids << role.id
end
if my_member && (roles_ids.include?(3) || roles_ids.include?(7) || roles_ids.include?(9) )
else
raise "您没有该权限！"
end
#增加分班和修改分班名
modify_groups = params[:modify_groups]
modify_groups.each do |g|
group = CourseGroup.find(g.id)
group.name = g.id.to_s + Time.now.to_i.to_s #只能先另取个名了不然原有的两个互换的话修改不了
group.save
end
modify_groups.each do |g|
group = CourseGroup.find(g.id)
group.name = g.name
group.save
end
#增加分班和修改分班名
add_groups = params[:add_groups]
add_groups.each do |name|
group = CourseGroup.new
group.name = name
group.course_id = params[:id]
group.save
end
present :status,0
rescue Exception=>e
present :message,e.message
present :status,-1
end
end
end end
end end
end end

26
app/api/mobile/entities/activity.rb
Unescape View File

@ -109,6 +109,28 @@ module Mobile
"项目" "项目"
end end
end end
when :homework_commit_count
if ac.act_type == "HomeworkCommon"
ac.act.student_works.has_committed.count
end
when :last_commit_info
if ac.act_type == "HomeworkCommon"
if ac.act.student_works.has_committed.count > 0
lc = ac.act.student_works.has_committed.reorder("commit_time desc").first
{:lasttime=>time_from_now(lc.commit_time), :lastname=>lc.user.show_name}
end
end
when :last_score_info
if ac.act_type == "HomeworkCommon"
if ac.act.student_works.has_committed.count > 0
sw_id = "("+ac.act.student_works.map{|sw| sw.id}.join(",")+")"
student_work_scores = StudentWorksScore.where("student_work_id in #{sw_id} and score is not null").reorder("created_at desc")
unless student_work_scores.empty?
last_score = student_work_scores.first
{:lasttime=>time_from_now(last_score.created_at), :lastname=>last_score.user.show_name}
end
end
end
end end
end end
end end
@ -153,6 +175,10 @@ module Mobile
act_expose :course_project_name #课程/项目名字 act_expose :course_project_name #课程/项目名字
act_expose :syllabus_title #课程名字 act_expose :syllabus_title #课程名字
act_expose :activity_type_name #课程问答区/项目缺陷等 act_expose :activity_type_name #课程问答区/项目缺陷等
act_expose :homework_commit_count #作品提交数
act_expose :last_commit_info #最近提交信息
act_expose :last_score_info #最近评阅信息
expose :has_praise , if: lambda { |instance, options| options[:user] } do |instance, options| expose :has_praise , if: lambda { |instance, options| options[:user] } do |instance, options|
if instance.act_type == "HomeworkCommon" || instance.act_type == "News" || instance.act_type == "Message" || instance.act_type == "BlogComment" || instance.act_type == "JournalsForMessage" || instance.act_type == "Issue" if instance.act_type == "HomeworkCommon" || instance.act_type == "News" || instance.act_type == "Message" || instance.act_type == "BlogComment" || instance.act_type == "JournalsForMessage" || instance.act_type == "Issue"
has_praise = false has_praise = false

3
app/api/mobile/entities/attachment.rb
Unescape View File

@ -23,6 +23,8 @@ module Mobile
(number_to_human_size(f.filesize)).gsub("ytes", "").to_s (number_to_human_size(f.filesize)).gsub("ytes", "").to_s
when :coursename when :coursename
f.course.nil? ? "" : f.course.name f.course.nil? ? "" : f.course.name
when :syllabus_title
f.course.nil? ? "" : f.course.syllabus.nil? ? "" : f.course.syllabus.title
when :course_id when :course_id
f.course.nil? ? 0 : f.course.id f.course.nil? ? 0 : f.course.id
@ -40,6 +42,7 @@ module Mobile
attachment_expose :file_dir attachment_expose :file_dir
attachment_expose :attafile_size attachment_expose :attafile_size
attachment_expose :coursename #所属班级名 attachment_expose :coursename #所属班级名
attachment_expose :syllabus_title #所属班级名
attachment_expose :course_id #所属班级名 attachment_expose :course_id #所属班级名
expose :current_user_is_teacher, if: lambda { |instance, options| options[:user] } do |instance, options| expose :current_user_is_teacher, if: lambda { |instance, options| options[:user] } do |instance, options|
current_user = options[:user] current_user = options[:user]

1
app/api/mobile/entities/course.rb
Unescape View File

@ -54,6 +54,7 @@ module Mobile
course_expose :updated_at course_expose :updated_at
course_expose :course_student_num course_expose :course_student_num
course_expose :member_count course_expose :member_count
course_expose :groupnum
expose :can_setting, if: lambda { |instance, options| options[:user] } do |instance, options| expose :can_setting, if: lambda { |instance, options| options[:user] } do |instance, options|
current_user = options[:user] current_user = options[:user]
can_setting = false can_setting = false

19
app/api/mobile/entities/course_group.rb
Unescape View File

@ -0,0 +1,19 @@
module Mobile
module Entities
class CourseGroup < Grape::Entity
include Redmine::I18n
include ApplicationHelper
include ApiHelper
def self.course_group_expose(f)
expose f do |u,opt|
if u.is_a?(Hash) && u.key?(f)
u[f]
end
end
end
expose :id
expose :name
expose :users, using: Mobile::Entities::User
end
end
end

3
app/api/mobile/entities/exercise.rb
Unescape View File

@ -19,6 +19,8 @@ module Mobile
case field case field
when :coursename when :coursename
f.course.nil? ? "" : f.course.name f.course.nil? ? "" : f.course.name
when :syllabus_title
f.course.nil? ? "" : f.course.syllabus.nil? ? "" : f.course.syllabus.title
end end
end end
end end
@ -27,6 +29,7 @@ module Mobile
expose :exercise_name expose :exercise_name
expose :exercise_description expose :exercise_description
exercise_expose :coursename #所属班级名 exercise_expose :coursename #所属班级名
exercise_expose :syllabus_title
expose :current_user_is_teacher, if: lambda { |instance, options| options[:user] } do |instance, options| expose :current_user_is_teacher, if: lambda { |instance, options| options[:user] } do |instance, options|
current_user = options[:user] current_user = options[:user]

4
app/api/mobile/entities/homework.rb
Unescape View File

@ -39,6 +39,8 @@ module Mobile
val val
when :coursename when :coursename
f.course.nil? ? "" : f.course.name f.course.nil? ? "" : f.course.name
when :syllabus_title
f.course.nil? ? "" : f.course.syllabus.nil? ? "" : f.course.syllabus.title
end end
end end
end end
@ -49,6 +51,8 @@ module Mobile
#课程名称 #课程名称
homework_expose :course_name homework_expose :course_name
homework_expose :syllabus_title
homework_expose :course_id homework_expose :course_id
#作业发布者 #作业发布者
expose :author,using: Mobile::Entities::User do |f, opt| expose :author,using: Mobile::Entities::User do |f, opt|

5
app/api/mobile/entities/message.rb
Unescape View File

@ -22,6 +22,10 @@ module Mobile
else else
u.project.name u.project.name
end end
when :syllabus_title
if u.board.project_id == -1
u.course.syllabus.nil? ? "" : u.course.syllabus.title
end
when :lasted_comment when :lasted_comment
time_from_now u.created_on time_from_now u.created_on
when :praise_count when :praise_count
@ -50,6 +54,7 @@ module Mobile
message_expose :act_type message_expose :act_type
message_expose :act_id message_expose :act_id
message_expose :course_project_name message_expose :course_project_name
message_expose :syllabus_title
message_expose :board_id message_expose :board_id
message_expose :subject message_expose :subject
message_expose :title message_expose :title

6
app/api/mobile/entities/news.rb
Unescape View File

@ -26,6 +26,11 @@ module Mobile
f.id f.id
when :comment_count when :comment_count
f.comments.count f.comments.count
when :syllabus_title
unless f.course_id == nil
course = get_course(f.course_id)
course.syllabus.nil? ? "" : course.syllabus.title
end
end end
end end
elsif f.is_a?(::Comment) elsif f.is_a?(::Comment)
@ -89,6 +94,7 @@ module Mobile
news_expose :praise_count news_expose :praise_count
#课程名字 #课程名字
news_expose :course_name news_expose :course_name
news_expose :syllabus_title
news_expose :lasted_comment news_expose :lasted_comment
#评论 #评论

4
app/api/mobile/entities/user.rb
Unescape View File

@ -36,6 +36,8 @@ module Mobile
u.lastname u.lastname
when :mail when :mail
u.mail u.mail
when :is_me
defined? u.is_me ? u.is_me : 0
end end
end end
end end
@ -77,6 +79,8 @@ module Mobile
user_expose :name user_expose :name
user_expose :is_me
end end
end end

22
app/api/mobile/entities/whomework.rb
Unescape View File

@ -30,12 +30,30 @@ module Mobile
wh.journals_for_messages.count wh.journals_for_messages.count
when :course_name when :course_name
wh.course.name wh.course.name
when :syllabus_title
wh.course.syllabus.nil? ? "" : wh.course.syllabus.title
when :act_type when :act_type
'HomeworkCommon' 'HomeworkCommon'
when :act_id when :act_id
wh.id wh.id
when :title when :title
wh.name wh.name
when :homework_commit_count
wh.student_works.has_committed.count
when :last_commit_info
if wh.student_works.has_committed.count > 0
lc = wh.student_works.has_committed.reorder("commit_time desc").first
{:lasttime=>time_from_now(lc.commit_time), :lastname=>lc.user.show_name}
end
when :last_score_info
if wh.student_works.has_committed.count > 0
sw_id = "("+wh.student_works.map{|sw| sw.id}.join(",")+")"
student_work_scores = StudentWorksScore.where("student_work_id in #{sw_id} and score is not null").reorder("created_at desc")
unless student_work_scores.empty?
last_score = student_work_scores.first
{:lasttime=>time_from_now(last_score.created_at), :lastname=>last_score.user.show_name}
end
end
end end
end end
end end
@ -65,12 +83,16 @@ module Mobile
whomework_expose :act_type whomework_expose :act_type
whomework_expose :act_id whomework_expose :act_id
whomework_expose :course_name whomework_expose :course_name
whomework_expose :syllabus_title
whomework_expose :created_at whomework_expose :created_at
whomework_expose :absence_penalty whomework_expose :absence_penalty
whomework_expose :evaluation_start whomework_expose :evaluation_start
whomework_expose :evaluation_end whomework_expose :evaluation_end
whomework_expose :praise_count whomework_expose :praise_count
whomework_expose :comment_count whomework_expose :comment_count
whomework_expose :homework_commit_count #作品提交数
whomework_expose :last_commit_info #最近提交信息
whomework_expose :last_score_info #最近评阅信息
expose :all_children, using: Mobile::Entities::Jours do |f, opt| expose :all_children, using: Mobile::Entities::Jours do |f, opt|
#f[:journals_for_messages] if f.is_a?(Hash) && f.key?(:journals_for_messages) #f[:journals_for_messages] if f.is_a?(Hash) && f.key?(:journals_for_messages)
if f.is_a?(::HomeworkCommon) if f.is_a?(::HomeworkCommon)

3
app/models/course.rb
Unescape View File

@ -495,10 +495,11 @@ class Course < ActiveRecord::Base
def generate_qrcode def generate_qrcode
ticket = self.qrcode ticket = self.qrcode
if !ticket || ticket.size < 10 if !ticket || ticket.size < 10 || (Time.now.to_i > self.qrcode_expiretime)
response = Wechat.api.qrcode_create_scene(invite_code, 2592000) response = Wechat.api.qrcode_create_scene(invite_code, 2592000)
logger.debug "response = #{response}" logger.debug "response = #{response}"
self.qrcode = response['ticket'] self.qrcode = response['ticket']
self.qrcode_expiretime = Time.now.to_i+response['expire_seconds']
save! && reload save! && reload
ticket = qrcode ticket = qrcode
end end

3
app/models/project.rb
Unescape View File

@ -930,10 +930,11 @@ class Project < ActiveRecord::Base
def generate_qrcode def generate_qrcode
ticket = self.qrcode ticket = self.qrcode
if !ticket || ticket.size < 10 if !ticket || ticket.size < 10 || (Time.now.to_i > self.qrcode_expiretime)
response = Wechat.api.qrcode_create_scene(invite_code, 2592000) response = Wechat.api.qrcode_create_scene(invite_code, 2592000)
logger.debug "response = #{response}" logger.debug "response = #{response}"
self.qrcode = response['ticket'] self.qrcode = response['ticket']
self.qrcode_expiretime = Time.now.to_i+response['expire_seconds']
save! save!
ticket = qrcode ticket = qrcode
end end

14
app/services/courses_service.rb
Unescape View File

@ -115,7 +115,7 @@ class CoursesService
role_name: m.roles.first.name, role_name: m.roles.first.name,
name: m.user.show_name, name: m.user.show_name,
roles_id: role_ids.include?(7) ? 7 : (role_ids.include?(9) ? 9 : 10 ), roles_id: role_ids.include?(7) ? 7 : (role_ids.include?(9) ? 9 : 10 ),
:brief_introduction => m.user.user_extensions.brief_introduction,:realname=>m.user.realname} :brief_introduction => m.user.user_extensions.brief_introduction,:realname=>m.user.realname,:is_me => current_user.id == m.user.id ? 1:0 }
# end # end
end end
@ -332,7 +332,9 @@ class CoursesService
# unless (course.is_public == 1 || current_user.member_of_course?(course) || current_user.admin?) # unless (course.is_public == 1 || current_user.member_of_course?(course) || current_user.admin?)
# raise '403' # raise '403'
# end # end
{:course => course,:syllabus_title => course.syllabus.nil? ? "":course.syllabus.title ,:work_unit => work_unit, :img_url => url_to_avatar(course),:current_user_is_member => current_user.nil? ? false : current_user.member_of_course?(course),:current_user_is_teacher => current_user.nil? ? false : is_course_teacher(current_user,course),:course_student_num => course ? course.student.count.to_s : 0} groupnum = 0
groupnum = course.course_groups.length if course.course_groups
{:course => course,:syllabus_title => course.syllabus.nil? ? "":course.syllabus.title ,:work_unit => work_unit, :img_url => "/images/"+url_to_avatar(course),:current_user_is_member => current_user.nil? ? false : current_user.member_of_course?(course),:current_user_is_teacher => current_user.nil? ? false : is_course_teacher(current_user,course),:course_student_num => course ? course.student.count.to_s : 0,:groupnum => groupnum}
end end
#创建课程 #创建课程
@ -565,6 +567,8 @@ class CoursesService
#多个角色加入课程 #多个角色加入课程
def join_course_roles params,current_user def join_course_roles params,current_user
course = Course.find_by_invite_code(params[:invite_code]) if params[:invite_code] course = Course.find_by_invite_code(params[:invite_code]) if params[:invite_code]
go_coursegroup_flag = 0
course_id = 0
@state = 10 @state = 10
if course if course
@ -621,6 +625,8 @@ class CoursesService
course.members << members course.members << members
StudentsForCourse.create(:student_id => current_user.id, :course_id => course.id) StudentsForCourse.create(:student_id => current_user.id, :course_id => course.id)
@state = 0 @state = 0
go_coursegroup_flag = 1 if course.course_groups
course_id = course.id
send_wechat_join_class_notice current_user,course,10,0 send_wechat_join_class_notice current_user,course,10,0
else else
is_stu = false is_stu = false
@ -630,6 +636,8 @@ class CoursesService
course.members << members course.members << members
StudentsForCourse.create(:student_id => current_user.id, :course_id =>course.id) StudentsForCourse.create(:student_id => current_user.id, :course_id =>course.id)
is_stu = true is_stu = true
go_coursegroup_flag = 1 if course.course_groups
course_id = course.id
send_wechat_join_class_notice current_user,course,10,0 send_wechat_join_class_notice current_user,course,10,0
end end
#如果已经发送过消息了，那么就要给个提示 #如果已经发送过消息了，那么就要给个提示
@ -674,7 +682,7 @@ class CoursesService
else else
@state = 4 @state = 4
end end
{:state => @state,:course => course} {:state => @state,:course => course,:go_coursegroup_flag => go_coursegroup_flag,:course_id=>course_id}
end end

4
app/views/courses/code_repeat.html.erb
Unescape View File

@ -28,14 +28,14 @@
<li class="chabox-w-401 chabox-txt-left" style =" text-align:left; text-indent:1em; " ><%=student_work_name%></li> <li class="chabox-w-401 chabox-txt-left" style =" text-align:left; text-indent:1em; " ><%=student_work_name%></li>
<li><%=student_work.user.show_name%></li> <li><%=student_work.user.show_name%></li>
<li><%= student_work.user.user_extensions.nil? ? "--" : student_work.user.user_extensions.student_id%> </li> <li><%= student_work.user.user_extensions.nil? ? "--" : student_work.user.user_extensions.student_id%> </li>
<li class="chabox-r-line"><%= Time.parse(format_time(student_work.created_at)).strftime("%m-%d %H:%M")%></li> <li class="chabox-r-line"><%= Time.parse(format_time(student_work.commit_time)).strftime("%m-%d %H:%M")%></li>
<% if student_work.simi_id.to_i > 0 && @works_hash[student_work.simi_id.to_i] %> <% if student_work.simi_id.to_i > 0 && @works_hash[student_work.simi_id.to_i] %>
<% simi_student_work = @works_hash[student_work.simi_id.to_i] %> <% simi_student_work = @works_hash[student_work.simi_id.to_i] %>
<% simi_student_work_name = simi_student_work.name.nil? || simi_student_work.name.empty? ? simi_student_work.user.show_name + '的作品' : simi_student_work.name%> <% simi_student_work_name = simi_student_work.name.nil? || simi_student_work.name.empty? ? simi_student_work.user.show_name + '的作品' : simi_student_work.name%>
<li class="chabox-w-401 chabox-txt-left" style =" text-align:left; text-indent:1em; " ><%=simi_student_work_name%></li> <li class="chabox-w-401 chabox-txt-left" style =" text-align:left; text-indent:1em; " ><%=simi_student_work_name%></li>
<li><%=simi_student_work.user.show_name%></li> <li><%=simi_student_work.user.show_name%></li>
<li><%= simi_student_work.user.user_extensions.nil? ? "--" : simi_student_work.user.user_extensions.student_id%></li> <li><%= simi_student_work.user.user_extensions.nil? ? "--" : simi_student_work.user.user_extensions.student_id%></li>
<li class="chabox-r-line"><%= Time.parse(format_time(simi_student_work.created_at)).strftime("%m-%d %H:%M")%></li> <li class="chabox-r-line"><%= Time.parse(format_time(simi_student_work.commit_time)).strftime("%m-%d %H:%M")%></li>
<% if student_work.simi_value.to_i >= 90 %> <% if student_work.simi_value.to_i >= 90 %>
<li style = "color:red" ><%=student_work.simi_value.to_i%>%</li> <li style = "color:red" ><%=student_work.simi_value.to_i%>%</li>
<% else %> <% else %>

47
app/views/layouts/_forbidden_new_feedback.html.erb
Unescape View File

@ -3,38 +3,49 @@
<div class="scrollsidebar" id="scrollsidebar"> <div class="scrollsidebar" id="scrollsidebar">
<div class="side_content"> <div class="side_content">
<div class="side_list"> <div class="side_list">
<div class="side_title"> <div style="background-color:#fff; padding:10px 0; border:1px solid #aaa; border-bottom:none;">
<a title="<%= l(:button_hide) %>" class="close_btn"> <span class="fontGrey3 f14 ml40" style="vertical-align:top;">问题和建议</span>
<span> <span class="hide-side-bar side-bar-circle fr mt3 mr10" title="关闭"><span class="side-bar-content" style="font-family:'微软雅黑, 宋体'">×</span></span>
</span> <span class="close_btn side-bar-circle fr mt3 mr10" title="隐藏"><span class="side-bar-content" style="left:4px; font-family:'微软雅黑, 宋体'">›</span></span>
</a>
</div> </div>
<div class="side_center"> <div style="background-color:#fff; border-left:1px solid #aaa; border-right:1px solid #aaa;">
<div class="custom_service"> <div class="custom_service tac">
<% get_memo %> <% get_memo %>
<%= form_for(@new_memo, :url => create_feedback_forum_path(@public_forum)) do |f| %> <%= form_for(@new_memo, :url => create_feedback_forum_path(@public_forum)) do |f| %>
<%= f.text_area :subject, :id=>"subject", :class => "opnionText", :placeholder => l(:label_feedback_tips) %> <%= f.text_area :subject, :id=>"subject", :class => "opnionText mb5", :placeholder => "完善您的基本资料后，可在此输入问题和建议", :disabled => "disabled" %>
<%= f.hidden_field :content,:id => 'hidden', :required => true , :value => l(:label_feedback_value) %> <%= f.hidden_field :content,:id => 'hidden', :required => true , :value => l(:label_feedback_value) %>
<label class="c_grey">您还能输入<span id="textCount" class="c_orange">50</span>个字符</label> <!--<span class="c_grey fl ml10">还能输入<span id="textCount" class="c_orange">50</span>个字符</span>-->
<a href="javascript:void(0);" class="opnionButton" style=" color:#fff;height:21px" id="" onclick=""> <!--<a href="javascript:void(0);" class="linkBlue f14 fr mr10" style="height:21px;" id="" onclick="f_submit();">-->
<%= l(:label_submit)%> <%#= l(:label_submit)%>
</a> <!--</a>-->
<div class="cl"></div>
<% end %> <% end %>
</div> </div>
<div class="mt5" style="color: #269ac9;cursor: default"> </div>
<div style="background-color:#fff; border:1px solid #aaa; border-top:none; padding-top:5px;">
<div class="fl mt5 ml10 tac">
<!--<a target="hiddentab" href="http://wpa.qq.com/msgrd?v=1&uin=1554253403&site=qq&menu=yes" style="color: #269ac9;">--> <!--<a target="hiddentab" href="http://wpa.qq.com/msgrd?v=1&uin=1554253403&site=qq&menu=yes" style="color: #269ac9;">-->
<%#= l(:label_technical_support) %> <%#= l(:label_technical_support) %>
<!--白&nbsp;&nbsp;&nbsp;羽</a> http://shang.qq.com/wpa/qunwpa?idkey=4fe2d63a4527cddce038f04f0b1d728a62082074fb4a74870a5444ee1a6910ad--> <!--白&nbsp;&nbsp;&nbsp;羽</a> http://shang.qq.com/wpa/qunwpa?idkey=4fe2d63a4527cddce038f04f0b1d728a62082074fb4a74870a5444ee1a6910ad-->
<!--<p style="text-align: center"> 请加入师姐师兄答疑群</p> <p style="text-align: center"></p>--> <!--<p style="text-align: center"> 请加入师姐师兄答疑群</p> <p style="text-align: center"></p>-->
<!--<a href="mqqapi://card/show_pslcard?src_type=internal&version=1&uin=173184401&card_type=group&source=qrcode">QQ群号：173184401</a>--> <!--<a href="mqqapi://card/show_pslcard?src_type=internal&version=1&uin=173184401&card_type=group&source=qrcode">QQ群号：173184401</a>-->
<a target="_blank" href="http://shang.qq.com/wpa/qunwpa?idkey=fb938b1f6f991fc100f3d32b6ef38b7888dd4097c71d0eb8b239eaa8749a6afd"><img border="0" src="http://pub.idqqimg.com/wpa/images/group.png" alt="Trustie师姐师兄答疑群" title="Trustie师姐师兄答疑群"></a> <a target="_blank" href="http://shang.qq.com/wpa/qunwpa?idkey=fb938b1f6f991fc100f3d32b6ef38b7888dd4097c71d0eb8b239eaa8749a6afd"><img src="/images/QQ_Logo.png" width="30" style="cursor:default; border:1px solid #ddd; padding:20px; cursor:pointer;" /></a>
<p class="fontGrey3" style="padding-bottom:10px; padding-top:3px;">加入QQ群</p>
</div>
<div class="fr mr10 tac">
<img src="/images/wechat/trustie_QR.jpg" width="80" style="display:inline-block; margin-right:-5px;" /><p class="fontGrey3" style="padding-bottom:10px;">关注官方微信</p>
</div> </div>
<div class="cl"></div>
</div> </div>
<div class="side_bottom"></div>
</div> </div>
</div> </div>
<div class="show_btn"> <div class="show_btn tac">
<span><%= l(:label_submit)%></span> <div style=" border:1px solid #aaa;">
<a href="javascript:void(0)" class="closeSidebar"></a> <div style="height:79px;">
<img src="/images/dialog.png" width="18" class="mt10 mb5" />
<span class="f14 fontBlue">提<br />问</span>
</div>
<span class="closeSidebar f16">×</span>
</div>
</div> </div>
</div> </div>

2
app/views/layouts/_new_feedback.html.erb
Unescape View File

@ -15,7 +15,7 @@
<%= f.text_area :subject, :id=>"subject", :class => "opnionText mb5", :placeholder => l(:label_feedback_tips) %> <%= f.text_area :subject, :id=>"subject", :class => "opnionText mb5", :placeholder => l(:label_feedback_tips) %>
<%= f.hidden_field :content,:id => 'hidden', :required => true , :value => l(:label_feedback_value) %> <%= f.hidden_field :content,:id => 'hidden', :required => true , :value => l(:label_feedback_value) %>
<span class="c_grey fl ml10">还能输入<span id="textCount" class="c_orange">50</span>个字符</span> <span class="c_grey fl ml10">还能输入<span id="textCount" class="c_orange">50</span>个字符</span>
<a href="javascript:void(0);" class="linkBlue f14 fr mr10" style="height:21px;" id="" onclick="f_submit();"> <a href="javascript:void(0);" class="linkBlue f12 fr mr10" style="height:21px;" id="" onclick="f_submit();">
<%= l(:label_submit)%> <%= l(:label_submit)%>
</a> </a>
<div class="cl"></div> <div class="cl"></div>

60
app/views/layouts/_user_courses.html.erb
Unescape View File

@ -1,19 +1,16 @@
<% courses.each do |course|%> <% courses.each do |course|%>
<li> <li class="pr">
<span class="user_icons_class"></span> <span class="user_icons_class"></span>
<% is_teacher = User.current.logged? && (User.current.admin? || User.current.allowed_to?(:as_teacher,course)) %> <% is_teacher = User.current.logged? && (User.current.admin? || User.current.allowed_to?(:as_teacher,course)) %>
<p href="javascript:void(0);" id="show_course_<%= course.id %>" class="course_list_menu pr" > <p href="javascript:void(0);" id="show_course_<%= course.id %>" class="course_list_menu" >
<% title = "<span class='course-name'>#{course.syllabus.title}</span>".html_safe %> <%= link_to course.syllabus.title + course.name, course_path(course.id,:host=>Setting.host_course), :target => '_blank', :class => 'hidden', :style => 'display:block;'%>
<%= link_to title, syllabus_path(course.syllabus_id), :target => '_blank', :class => 'hidden', :style => "max-width:91px; display:inline-block;"%>
<font class="fb c_grey" style="height:39px; line-height:39px; vertical-align:top;">·</font>
<% classes = "<span class='course-name'>#{course.name}</span>".html_safe %>
<%= link_to classes, course_path(course.id,:host=>Setting.host_course), :target => '_blank', :class => 'hidden', :style => "max-width:91px; display:inline-block;"%>
<span class="sub-menu-title c_dark">
课程名称：<%= course.syllabus.title %><br />
班级名称：<%= course.name+'（'+current_time_and_term(course)+'）' %><br />
班级属性：<%= course.is_public? ? '公开' : '私有' %>
</span>
</p> </p>
<div class="sub-menu-title c_dark">
<em></em>
<font></font>
<div>课程：<%= link_to course.syllabus.title, syllabus_path(course.syllabus_id), :target => '_blank' %></div>
<div>班级：<%= link_to course.name, course_path(course.id,:host=>Setting.host_course), :target => '_blank' %></div>
</div>
<%#= link_to course.name+"("+current_time_and_term_short(course)+")", course_path(course.id,:host=>Setting.host_course), <%#= link_to course.name+"("+current_time_and_term_short(course)+")", course_path(course.id,:host=>Setting.host_course),
:id => "show_course_#{course.id}", :class => 'course_list_menu hidden', :target => '_blank', :title => (course.is_public? ? "公开班级：":"私有班级：")+course.name+"（"+current_time_and_term(course)+"）"%> :id => "show_course_#{course.id}", :class => 'course_list_menu hidden', :target => '_blank', :title => (course.is_public? ? "公开班级：":"私有班级：")+course.name+"（"+current_time_and_term(course)+"）"%>
<% count = ShieldActivity.where("container_type='User' and container_id=#{user.id} and shield_type='Course' and shield_id=#{course.id}").count %> <% count = ShieldActivity.where("container_type='User' and container_id=#{user.id} and shield_type='Course' and shield_id=#{course.id}").count %>
@ -113,25 +110,26 @@
} }
$(".course_list_menu").each(function(){ $(".course_list_menu").each(function(){
var courseWidth = $(this).children().eq(0).children().width(); $(this).mouseenter(function(){
var classWidth = $(this).children().eq(2).children().width(); $(".sub-menu-title").hide();
var newClassWidth = 182 - courseWidth; $(this).next().stop();
var newCourseWidth = 182 - classWidth; $(this).next().show();
console.log(courseWidth, classWidth); });
if(courseWidth < 91 && classWidth > 91){ $(this).mouseleave(function(){
$(this).children().eq(2).css("max-width",newClassWidth + "px"); $(this).next().delay(500).hide(0);
} });
if(classWidth < 91 && courseWidth > 91){
$(this).children().eq(0).css("max-width",newCourseWidth + "px");
}
}) })
$(".course-name").each(function(){ $(".sub-menu-title").each(function(){
$(this).mouseenter(function(){ var boxWidth = $(this).width();
$(this).parent().parent().children().eq(3).show(); var leftAttr = boxWidth + 30
}); $(this).css("left",-leftAttr);
$(this).mouseleave(function(){ $(this).mouseover(function(){
$(this).parent().parent().children().eq(3).hide(); $(this).stop();
}); $(this).show();
}) });
$(this).mouseout(function(){
$(this).delay(500).hide(0);
});
});
</script> </script>

4
app/views/layouts/new_base_user.html.erb
Unescape View File

@ -163,7 +163,7 @@
<ul class="users_accordion mb10"> <ul class="users_accordion mb10">
<li id="user_01" class="user_icons_course"> <li id="user_01" class="user_icons_course">
<%= link_to '班级',{:controller => "users", :action => "user_courselist", :id => @user.id}, :id => "user_course_list" %> <%= link_to '班级',{:controller => "users", :action => "user_courselist", :id => @user.id}, :id => "user_course_list" %>
<font class="show-all-sub"><%= link_to '全部',{:controller => "users", :action => "user_courselist", :id => @user.id}, :class => "linkGrey2" %></font> <font class="show-all-sub"><%= link_to '全部',{:controller => "users", :action => "user_courselist", :id => @user.id}, :style => "color:#aaa;" %></font>
<% courses = @user.favorite_courses.visible.where("is_delete =?", 0).select("courses.*,(SELECT MAX(updated_at) FROM `course_activities` WHERE course_activities.course_id = courses.id) AS a").order("a desc").limit(10) %> <% courses = @user.favorite_courses.visible.where("is_delete =?", 0).select("courses.*,(SELECT MAX(updated_at) FROM `course_activities` WHERE course_activities.course_id = courses.id) AS a").order("a desc").limit(10) %>
<div class="<%= courses.empty? ? 'none' : ''%>" id="homepage_left_course_list"> <div class="<%= courses.empty? ? 'none' : ''%>" id="homepage_left_course_list">
<%=render :partial => 'layouts/homepage_left_course_list', :locals => {:courses => courses} %> <%=render :partial => 'layouts/homepage_left_course_list', :locals => {:courses => courses} %>
@ -191,7 +191,7 @@
<ul class="users_accordion mb10"> <ul class="users_accordion mb10">
<li id="user_06" class="user_icons_project"> <li id="user_06" class="user_icons_project">
<%= link_to '项目',{:controller => "users", :action => "user_projectlist", :id => @user.id}, :id => 'user_project_list'%> <%= link_to '项目',{:controller => "users", :action => "user_projectlist", :id => @user.id}, :id => 'user_project_list'%>
<font class="show-all-sub"><%= link_to '全部',{:controller => "users", :action => "user_projectlist", :id => @user.id}, :class => 'linkGrey2'%></font> <font class="show-all-sub"><%= link_to '全部',{:controller => "users", :action => "user_projectlist", :id => @user.id}, :style => "color:#aaa;" %></font>
<% projects = @user.favorite_projects.visible.select("projects.*, (SELECT MAX(updated_at) FROM `forge_activities` WHERE forge_activities.project_id = projects.id) AS a").order("a desc").limit(10)%> <% projects = @user.favorite_projects.visible.select("projects.*, (SELECT MAX(updated_at) FROM `forge_activities` WHERE forge_activities.project_id = projects.id) AS a").order("a desc").limit(10)%>
<div class="<%= projects.empty? ? 'none' : ''%>" id="homepage_left_project_list"> <div class="<%= projects.empty? ? 'none' : ''%>" id="homepage_left_project_list">
<%=render :partial => 'layouts/homepage_left_project_list', :locals => {:projects => projects} %> <%=render :partial => 'layouts/homepage_left_project_list', :locals => {:projects => projects} %>

2
app/views/memos/show.html.erb
Unescape View File

@ -89,7 +89,7 @@
<%= link_to image_tag(url_to_avatar(reply.author), :width => 33,:height => 33), user_path(reply.author) %> <%= link_to image_tag(url_to_avatar(reply.author), :width => 33,:height => 33), user_path(reply.author) %>
</div> </div>
<div class="homepagePostReplyDes"> <div class="homepagePostReplyDes">
<div class="homepagePostReplyPublisher"><a href="<%=user_path(reply.author)%>" class="newsBlue mr10 f14"><%= reply.author.name%></a><%= format_date(reply.created_at) %></div> <div class="homepagePostReplyPublisher"><a href="<%=user_path(reply.author)%>" class="newsBlue mr10 f14"><%= reply.author.show_name%></a><%= format_date(reply.created_at) %></div>
<div class="homepagePostReplyContent break_word" id="activity_description_<%= reply.id %>"><%= reply.content.gsub(/script/, "script&nbsp").html_safe %></div> <div class="homepagePostReplyContent break_word" id="activity_description_<%= reply.id %>"><%= reply.content.gsub(/script/, "script&nbsp").html_safe %></div>
</div> </div>
<script type="text/javascript"> <script type="text/javascript">

8
app/views/projects/_development_group.html.erb
Unescape View File

@ -13,7 +13,7 @@
<% end %> <% end %>
<% if User.current.member_of?(@project) %> <% if User.current.member_of?(@project) %>
<%= link_to "+"+l(:label_release_issue), new_project_issue_path(@project) , :class => "subnav_green" %> <%= link_to "", new_project_issue_path(@project) , :class => "publish-icon fr mr10 mt2", :title => "发布问题" %>
<% end %> <% end %>
</div> </div>
<% end %> <% end %>
@ -24,7 +24,7 @@
<a class="subnav_num">(<%= @project.project_score.board_num %>)</a> <a class="subnav_num">(<%= @project.project_score.board_num %>)</a>
<% end %> <% end %>
<% if User.current.member_of?(@project) %> <% if User.current.member_of?(@project) %>
<%= link_to "+"+l(:project_module_boards_post), project_boards_path(@project, :flag => true), :layout => 'base_projects', :class => "subnav_green ml105" %> <%= link_to "", project_boards_path(@project, :flag => true), :layout => 'base_projects', :class => "publish-icon fr mr10 mt2", :title => "发布新帖" %>
<% end %> <% end %>
</div> </div>
<% end%> <% end%>
@ -36,7 +36,7 @@
<% end %> <% end %>
<% if User.current.member_of?(@project) %> <% if User.current.member_of?(@project) %>
<%#= link_to "+"+l(:label_upload_source), project_files_path(@project,:flag => true), :class => "subnav_green ml95" %> <%#= link_to "+"+l(:label_upload_source), project_files_path(@project,:flag => true), :class => "subnav_green ml95" %>
<a class="subnav_green m195" href="javascript:void(0);" onclick="project_files_upload();">+上传资源</a> <a class="publish-icon fr mr10 mt2" href="javascript:void(0);" onclick="project_files_upload();" title="上传资源"></a>
<% end %> <% end %>
</div> </div>
<% end %> <% end %>
@ -46,7 +46,7 @@
<%= link_to "Pull Requests", project_pull_requests_path(@project), :class => "f14 c_blue02" %> <%= link_to "Pull Requests", project_pull_requests_path(@project), :class => "f14 c_blue02" %>
<%= link_to "(#{pull_request_count(@project)})", project_pull_requests_path(@project), :class => "subnav_num c_orange",:id=>'project_files_count_nav' %> <%= link_to "(#{pull_request_count(@project)})", project_pull_requests_path(@project), :class => "subnav_num c_orange",:id=>'project_files_count_nav' %>
<% if User.current.member_of?(@project) %> <% if User.current.member_of?(@project) %>
<%= link_to "+新建请求", new_project_pull_request_path(:project_id => @project.id), :class => "subnav_green" %> <%= link_to "", new_project_pull_request_path(:project_id => @project.id), :class => "publish-icon fr mr10 mt2", :title => "新建请求" %>
<% end %> <% end %>
</div> </div>
<% end %> <% end %>

4
app/views/student_work/_programing_work_show.html.erb
Unescape View File

@ -3,7 +3,7 @@
<ul> <ul>
<li class="fl" > <li class="fl" >
<span class="tit_fb">上交时间：</span> <span class="tit_fb">上交时间：</span>
<%=format_time work.created_at %> <%=format_time work.commit_time %>
<a href="javascript:void(0);" class="linkBlue mt5 mb5" style="margin-left:165px; width: 24px;" onclick="$('#about_hwork_<%= work.id%>').html('');">收起</a> <a href="javascript:void(0);" class="linkBlue mt5 mb5" style="margin-left:165px; width: 24px;" onclick="$('#about_hwork_<%= work.id%>').html('');">收起</a>
</li> </li>
@ -43,7 +43,7 @@
第<%= work.student_work_tests.count - index%>次测试 第<%= work.student_work_tests.count - index%>次测试
</p> </p>
<span class="fr c_grey"> <span class="fr c_grey">
<%= test.created_at.to_s(:db) %> <%= format_time(test.created_at).to_s %>
</span> </span>
<div class="cl"></div> <div class="cl"></div>
</div> </div>

2
app/views/student_work/_show.html.erb
Unescape View File

@ -12,7 +12,7 @@
<ul> <ul>
<li class="fl" > <li class="fl" >
<span class="tit_fb">上交时间：</span> <span class="tit_fb">上交时间：</span>
<%=format_time work.created_at %> <%=format_time work.commit_time %>
</li> </li>
<% if work.user == User.current && Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") >= Time.now.strftime("%Y-%m-%d") %> <% if work.user == User.current && Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") >= Time.now.strftime("%Y-%m-%d") %>

6
app/views/syllabuses/members.html.erb
Unescape View File

@ -13,8 +13,11 @@
<div id="sy_tab_con_3"> <div id="sy_tab_con_3">
<div class="sy_new_tablebox clear"> <div class="sy_new_tablebox clear">
<%= render :partial => 'syllabus_member_list' %> <%= render :partial => 'syllabus_member_list' %>
<a href="javascript:void(0);" class="fl sy_btn_green" onclick="toggle_search();">添加成员</a> <% if User.current == @syllabus.user %>
<a href="javascript:void(0);" class="fl sy_btn_green" onclick="toggle_search();">添加成员</a>
<% end %>
</div> </div>
<% if User.current == @syllabus.user %>
<div class="sy_new_tchbox clear <%= @show == 1 ? '' : 'undis' %>" id="sy_search_box"> <div class="sy_new_tchbox clear <%= @show == 1 ? '' : 'undis' %>" id="sy_search_box">
<%= form_tag url_for(:controller => 'syllabus_member', :action => 'create', :syllabus => @syllabus),:id => 'syllabus_member_add_form', :remote => true do |f|%> <%= form_tag url_for(:controller => 'syllabus_member', :action => 'create', :syllabus => @syllabus),:id => 'syllabus_member_add_form', :remote => true do |f|%>
<input hidden="hidden" value="true" name="flag"> <input hidden="hidden" value="true" name="flag">
@ -32,6 +35,7 @@
<a href="javascript:void(0);" class="fl sy_btn_grey mr5" onclick="reset_search();">取消</a> <a href="javascript:void(0);" class="fl sy_btn_grey mr5" onclick="reset_search();">取消</a>
<% end%> <% end%>
</div> </div>
<% end %>
</div> </div>
<script> <script>

2
app/views/users/_homework_repository_list.html.erb
Unescape View File

@ -8,7 +8,7 @@
<div class="fl "> <div class="fl ">
<h3 class="sy_classlist_title fl"> <h3 class="sy_classlist_title fl">
<% if type == "1" %> <% if type == "1" %>
<%=link_to homework.name, student_work_index_path(:homework => homework), :class => 'hw_cgrey', :target => "_blank" %> <%=link_to homework.name, student_work_index_path(:homework => homework), :class => 'linkGrey5', :target => "_blank" %>
<% else %> <% else %>
<%=homework.name %> <%=homework.name %>
<% end %> <% end %>

8
app/views/users/_manage_homework_list.html.erb
Unescape View File

@ -20,13 +20,13 @@
</span> </span>
<span class="mr15 fl">类别：<%=homework.homework_type_ch %></span> <span class="mr15 fl">类别：<%=homework.homework_type_ch %></span>
<span class="fl">作品：</span> <span class="fl">作品：</span>
<span class="sy_corange hw_w20 fl "><%=homework.student_works.has_committed.count %></span> <span class="sy_corange hw_w30 fl "><%=homework.student_works.has_committed.count %></span>
<span class="fl">/</span> <span class="fl">/</span>
<span class="sy_cgrey hw_w20 fl mr15"><%= homework.homework_type == 3 ? '--' : homework.course.student.count %></span> <span class="sy_cgrey hw_w30 fl mr15"><%= homework.homework_type == 3 ? '--' : homework.course.student.count %></span>
<span class="fl">待评阅：</span> <span class="fl">待评阅：</span>
<span class="sy_corange hw_w20 fl"><%= homework.student_works.has_committed.where("teacher_score is null and teaching_asistant_score is null").count %></span> <span class="sy_corange hw_w30 fl"><%= homework.student_works.has_committed.where("teacher_score is null and teaching_asistant_score is null").count %></span>
<span class="fl">/</span> <span class="fl">/</span>
<span class="sy_cgrey hw_w20 fl mr15"><%=homework.student_works.has_committed.count %></span> <span class="sy_cgrey hw_w30 fl mr15"><%=homework.student_works.has_committed.count %></span>
<span class="mr15 fl">发布时间： <span class="mr15 fl">发布时间：
<% if homework.publish_time %> <% if homework.publish_time %>
<%= format_date(homework.publish_time) %> <%= format_date(homework.publish_time) %>

5
app/views/users/_resources_list.html.erb
Unescape View File

@ -267,4 +267,9 @@
} }
} }
$(".resource-list-from").each(function(){
var titleContent = $(this).text();
$(this).attr("title",titleContent);
});
</script> </script>

5
db/migrate/20160918024056_add_qrcode_expiretime_to_courses.rb
Unescape View File

@ -0,0 +1,5 @@
class AddQrcodeExpiretimeToCourses < ActiveRecord::Migration
def change
add_column :courses, :qrcode_expiretime, :integer, :default => 0
end
end

5
db/migrate/20160918024214_add_qrcode_expiretime_to_projects.rb
Unescape View File

@ -0,0 +1,5 @@
class AddQrcodeExpiretimeToProjects < ActiveRecord::Migration
def change
add_column :projects, :qrcode_expiretime, :integer, :default => 0
end
end

26
public/assets/wechat/activities.html
Unescape View File

@ -37,10 +37,15 @@
<div class="post-all-content" ng-bind-html="act.description|safeHtml" ellipsis-show></div> <div class="post-all-content" ng-bind-html="act.description|safeHtml" ellipsis-show></div>
<span class="mr15 f12 c-grey2">迟交扣分：{{act.homework_common_detail.late_penalty}}分</span> <span ng-if="!act.homework_common_detail.anonymous_comment" class="f12 c-grey2">匿评开启时间：{{act.homework_common_detail.evaluation_start}}</span><br /> <span class="mr15 f12 c-grey2">迟交扣分：{{act.homework_common_detail.late_penalty}}分</span> <span ng-if="!act.homework_common_detail.anonymous_comment" class="f12 c-grey2">匿评开启时间：{{act.homework_common_detail.evaluation_start}}</span><br />
<span ng-if="!act.homework_common_detail.anonymous_comment" class="mr15 f12 c-grey2">缺评扣分：{{act.homework_common_detail.absence_penalty}}分/作品</span> <span ng-if="!act.homework_common_detail.anonymous_comment" class="f12 c-grey2">匿评关闭时间：{{act.homework_common_detail.evaluation_end}}</span> <span ng-if="!act.homework_common_detail.anonymous_comment" class="mr15 f12 c-grey2">缺评扣分：{{act.homework_common_detail.absence_penalty}}分/作品</span> <span ng-if="!act.homework_common_detail.anonymous_comment" class="f12 c-grey2">匿评关闭时间：{{act.homework_common_detail.evaluation_end}}</span>
<div ng-if="act.homework_common_detail.homework_commit_count > 0" class="f13 c-grey2">作品提交数：<span class="c-blue">{{act.homework_common_detail.homework_commit_count}}</span></div>
<div class="f13 c-grey2">
<div ng-if="act.homework_common_detail.last_commit_info">#{{act.homework_common_detail.last_commit_info.lasttime}} <span class="c-blue ml5 mr5">{{act.homework_common_detail.last_commit_info.lastname}}</span> 提交了作品</div>
<div ng-if="act.homework_common_detail.last_score_info">#{{act.homework_common_detail.last_score_info.lasttime}} <span class="c-blue ml5 mr5">{{act.homework_common_detail.last_score_info.lastname}}</span> 评阅了作品</div>
</div>
</div> </div>
<div class="cl"></div> <div class="cl"></div>
</div> </div>
<div class="post-dynamic-from hidden fl c-grey3">来源: <span ng-click = "goClass(act.course_project_id)" class="c-blue">{{act.course_project_name}}</span></div> <div class="post-dynamic-from hidden fl c-grey3">来源: <span ng-click = "goClass(act.course_project_id)" class="c-blue">{{act.syllabus_title}}<font class="fb" style="height:18px; line-height:18px; vertical-align:top; margin:0 3px;">·</font>{{act.course_project_name}}</span></div>
<div class="fr f13"> <div class="fr f13">
<div ng-if="!act.praise_count" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>赞</span></div> <div ng-if="!act.praise_count" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>赞</span></div>
<div ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{act.praise_count}}</span></div> <div ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{act.praise_count}}</span></div>
@ -75,7 +80,7 @@
</div> </div>
<div class="cl"></div> <div class="cl"></div>
</div> </div>
<div class="post-dynamic-from hidden fl c-grey3">来源: <span ng-click = "goClass(act.course_project_id)" class="c-blue">{{act.course_project_name}}</span></div> <div class="post-dynamic-from hidden fl c-grey3">来源: <span ng-click = "goClass(act.course_project_id)" class="c-blue">{{act.syllabus_title}}<font class="fb" style="height:18px; line-height:18px; vertical-align:top; margin:0 3px;">·</font>{{act.course_project_name}}</span></div>
<div class="fr f13"> <div class="fr f13">
<div ng-if="!act.praise_count" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>赞</span></div> <div ng-if="!act.praise_count" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>赞</span></div>
<div ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{act.praise_count}}</span></div> <div ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{act.praise_count}}</span></div>
@ -111,7 +116,7 @@
<!--<a herf="javascript:void(0);" class="c-grey2 f13 fr mt5 mb10 post-more mr20 undis" text-auto-height>点击展开</a>--> <!--<a herf="javascript:void(0);" class="c-grey2 f13 fr mt5 mb10 post-more mr20 undis" text-auto-height>点击展开</a>-->
<div class="cl"></div> <div class="cl"></div>
</div> </div>
<div class="post-dynamic-from hidden fl c-grey3">来源: <span ng-click = "goClass(act.course_project_id)" class="c-blue">{{act.course_project_name}}</span></div> <div class="post-dynamic-from hidden fl c-grey3">来源: <span ng-click = "goClass(act.course_project_id)" class="c-blue">{{act.syllabus_title}}<font class="fb" style="height:18px; line-height:18px; vertical-align:top; margin:0 3px;">·</font>{{act.course_project_name}}</span></div>
<div class="fr f13"> <div class="fr f13">
<div ng-if="!act.praise_count" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>赞</span></div> <div ng-if="!act.praise_count" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>赞</span></div>
<div ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{act.praise_count}}</span></div> <div ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{act.praise_count}}</span></div>
@ -147,7 +152,7 @@
<!--<a herf="javascript:void(0);" class="c-grey2 f13 fr mt5 mb10 post-more mr20 undis" text-auto-height>点击展开</a>--> <!--<a herf="javascript:void(0);" class="c-grey2 f13 fr mt5 mb10 post-more mr20 undis" text-auto-height>点击展开</a>-->
<div class="cl"></div> <div class="cl"></div>
</div> </div>
<div class="post-dynamic-from hidden fl c-grey3">来源: <span ng-click = "goClass(act.course_project_id)" class="c-blue">{{act.course_project_name}}</span></div> <div class="post-dynamic-from hidden fl c-grey3">来源: <span ng-click = "goClass(act.course_project_id)" class="c-blue">{{act.syllabus_title}}<font class="fb" style="height:18px; line-height:18px; vertical-align:top; margin:0 3px;">·</font>{{act.course_project_name}}</span></div>
<!--<div class="fr f13">--> <!--<div class="fr f13">-->
<!--<div ng-if="!act.praise_count" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>赞</span></div>--> <!--<div ng-if="!act.praise_count" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>赞</span></div>-->
<!--<div ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{act.praise_count}}</span></div>--> <!--<div ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{act.praise_count}}</span></div>-->
@ -402,10 +407,15 @@
<div class="post-all-content" ng-bind-html="act.description|safeHtml" ellipsis-show></div> <div class="post-all-content" ng-bind-html="act.description|safeHtml" ellipsis-show></div>
<span class="mr15 f13 c-grey2">迟交扣分：{{act.homework_common_detail.late_penalty}}分</span> <span ng-if="!act.homework_common_detail.anonymous_comment" class="f13 c-grey2">匿评开启时间：{{act.homework_common_detail.evaluation_start}}</span><br /> <span class="mr15 f13 c-grey2">迟交扣分：{{act.homework_common_detail.late_penalty}}分</span> <span ng-if="!act.homework_common_detail.anonymous_comment" class="f13 c-grey2">匿评开启时间：{{act.homework_common_detail.evaluation_start}}</span><br />
<span ng-if="!act.homework_common_detail.anonymous_comment" class="mr15 f13 c-grey2">缺评扣分：{{act.homework_common_detail.absence_penalty}}分/作品</span> <span ng-if="!act.homework_common_detail.anonymous_comment" class="f13 c-grey2">匿评关闭时间：{{act.homework_common_detail.evaluation_end}}</span> <span ng-if="!act.homework_common_detail.anonymous_comment" class="mr15 f13 c-grey2">缺评扣分：{{act.homework_common_detail.absence_penalty}}分/作品</span> <span ng-if="!act.homework_common_detail.anonymous_comment" class="f13 c-grey2">匿评关闭时间：{{act.homework_common_detail.evaluation_end}}</span>
<div ng-if="act.homework_common_detail.homework_commit_count > 0" class="f13 c-grey2">作品提交数：<span class="c-blue">{{act.homework_common_detail.homework_commit_count}}</span></div>
<div class="f13 c-grey2">
<div ng-if="act.homework_common_detail.last_commit_info">#{{act.homework_common_detail.last_commit_info.lasttime}} <span class="c-blue ml5 mr5">{{act.homework_common_detail.last_commit_info.lastname}}</span> 提交了作品</div>
<div ng-if="act.homework_common_detail.last_score_info">#{{act.homework_common_detail.last_score_info.lasttime}} <span class="c-blue ml5 mr5">{{act.homework_common_detail.last_score_info.lastname}}</span> 评阅了作品</div>
</div>
</div> </div>
<div class="cl"></div> <div class="cl"></div>
</div> </div>
<div class="post-dynamic-from hidden fl c-grey3">来源: <span ng-click = "goClass(act.course_project_id)" class="c-blue">{{act.course_project_name}}</span></div> <div class="post-dynamic-from hidden fl c-grey3">来源: <span ng-click = "goClass(act.course_project_id)" class="c-blue">{{act.syllabus_title}}<font class="fb" style="height:18px; line-height:18px; vertical-align:top; margin:0 3px;">·</font>{{act.course_project_name}}</span></div>
<div class="fr f13"> <div class="fr f13">
<div ng-if="!act.praise_count" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>赞</span></div> <div ng-if="!act.praise_count" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>赞</span></div>
<div ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{act.praise_count}}</span></div> <div ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{act.praise_count}}</span></div>
@ -440,7 +450,7 @@
</div> </div>
<div class="cl"></div> <div class="cl"></div>
</div> </div>
<div class="post-dynamic-from hidden fl c-grey3">来源: <span ng-click = "goClass(act.course_project_id)" class="c-blue">{{act.course_project_name}}</span></div> <div class="post-dynamic-from hidden fl c-grey3">来源: <span ng-click = "goClass(act.course_project_id)" class="c-blue">{{act.syllabus_title}}<font class="fb" style="height:18px; line-height:18px; vertical-align:top; margin:0 3px;">·</font>{{act.course_project_name}}</span></div>
<div class="fr f13"> <div class="fr f13">
<div ng-if="!act.praise_count" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>赞</span></div> <div ng-if="!act.praise_count" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>赞</span></div>
<div ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{act.praise_count}}</span></div> <div ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{act.praise_count}}</span></div>
@ -476,7 +486,7 @@
<!--<a herf="javascript:void(0);" class="c-grey2 f13 fr mt5 mb10 post-more mr20 undis" text-auto-height>点击展开</a>--> <!--<a herf="javascript:void(0);" class="c-grey2 f13 fr mt5 mb10 post-more mr20 undis" text-auto-height>点击展开</a>-->
<div class="cl"></div> <div class="cl"></div>
</div> </div>
<div class="post-dynamic-from hidden fl c-grey3">来源: <span ng-click = "goClass(act.course_project_id)" class="c-blue">{{act.course_project_name}}</span></div> <div class="post-dynamic-from hidden fl c-grey3">来源: <span ng-click = "goClass(act.course_project_id)" class="c-blue">{{act.syllabus_title}}<font class="fb" style="height:18px; line-height:18px; vertical-align:top; margin:0 3px;">·</font>{{act.course_project_name}}</span></div>
<div class="fr f13"> <div class="fr f13">
<div ng-if="!act.praise_count" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>赞</span></div> <div ng-if="!act.praise_count" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>赞</span></div>
<div ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{act.praise_count}}</span></div> <div ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{act.praise_count}}</span></div>
@ -512,7 +522,7 @@
<!--<a herf="javascript:void(0);" class="c-grey2 f13 fr mt5 mb10 post-more mr20 undis" text-auto-height>点击展开</a>--> <!--<a herf="javascript:void(0);" class="c-grey2 f13 fr mt5 mb10 post-more mr20 undis" text-auto-height>点击展开</a>-->
<div class="cl"></div> <div class="cl"></div>
</div> </div>
<div class="post-dynamic-from hidden fl c-grey3">来源: <span ng-click = "goClass(act.course_project_id)" class="c-blue">{{act.course_project_name}}</span></div> <div class="post-dynamic-from hidden fl c-grey3">来源: <span ng-click = "goClass(act.course_project_id)" class="c-blue">{{act.syllabus_title}}<font class="fb" style="height:18px; line-height:18px; vertical-align:top; margin:0 3px;">·</font>{{act.course_project_name}}</span></div>
<!--<div class="fr f13">--> <!--<div class="fr f13">-->
<!--<div ng-if="!act.praise_count" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>赞</span></div>--> <!--<div ng-if="!act.praise_count" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>赞</span></div>-->
<!--<div ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{act.praise_count}}</span></div>--> <!--<div ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>{{act.praise_count}}</span></div>-->

1
public/assets/wechat/app.html
Unescape View File

@ -41,6 +41,7 @@
<script src="/javascripts/wechat/directives/at_delete_link.js"></script> <script src="/javascripts/wechat/directives/at_delete_link.js"></script>
<script src="/javascripts/wechat/directives/iphone_recognize.js"></script> <script src="/javascripts/wechat/directives/iphone_recognize.js"></script>
<script src="/javascripts/wechat/directives/multi_reply.js"></script> <script src="/javascripts/wechat/directives/multi_reply.js"></script>
<script src="/javascripts/wechat/directives/img_preview.js"></script>
<script src="/javascripts/wechat/controllers/reg.js"></script> <script src="/javascripts/wechat/controllers/reg.js"></script>
<script src="/javascripts/wechat/controllers/login.js"></script> <script src="/javascripts/wechat/controllers/login.js"></script>
<script src="/javascripts/wechat/controllers/activity.js"></script> <script src="/javascripts/wechat/controllers/activity.js"></script>

2
public/assets/wechat/blog_detail.html
Unescape View File

@ -25,7 +25,7 @@
<div class="post-dynamic-title c-black fb">{{blog.title}}<img ng-if="blog.locked" src="/images/locked.png" style="display:inline-block;" /></div> <div class="post-dynamic-title c-black fb">{{blog.title}}<img ng-if="blog.locked" src="/images/locked.png" style="display:inline-block;" /></div>
<div class="c-grey4 f13 mt5"><span class="mr10">博客</span><span>{{blog.created_at}}</span></div> <div class="c-grey4 f13 mt5"><span class="mr10">博客</span><span>{{blog.created_at}}</span></div>
<div class="f13 c-black mt5 text-control post-all-content" ng-bind-html="blog.content|safeHtml"></div> <div class="f13 c-black mt5 text-control post-all-content" ng-bind-html="blog.content|safeHtml" img-preview></div>
<div class="cl"></div> <div class="cl"></div>
</div> </div>
<div class="fr f13"> <div class="fr f13">

7
public/assets/wechat/class.html
Unescape View File

@ -1,6 +1,6 @@
<div class="post-container"> <div class="post-container">
<div loading-spinner></div> <div loading-spinner></div>
<div class="class-detail-name"><span class="course-name-width hidden inline-block">{{course.name}}</span><span ng-click="invite()" class="f13 blue-title-sub">邀请码</span></div> <div class="class-detail-name"><span class="course-name-width hidden inline-block">{{course.syllabus_title}}<font ng-if="course.syllabus_title != null" class="fb" style="height:39px; line-height:39px; vertical-align:top; margin:0 3px;">·</font>{{course.name}}</span><span ng-click="invite()" class="f13 blue-title-sub">邀请码</span></div>
<div class="tab-wrap"> <div class="tab-wrap">
<a ng-click="tab($index+1)" ng-repeat="menu in menus" id="class_tab_1" href="javascript:void(0);" ng-class="['weixin-tab', {'class-tab-active': currentTab == $index+1}]">{{menu}}</a> <a ng-click="tab($index+1)" ng-repeat="menu in menus" id="class_tab_1" href="javascript:void(0);" ng-class="['weixin-tab', {'class-tab-active': currentTab == $index+1}]">{{menu}}</a>
</div> </div>
@ -25,7 +25,7 @@
<div class="post-wrapper"> <div class="post-wrapper">
<div class="post-main"> <div class="post-main">
<div dataID = "{{act.act_id}}" ng-click="goDetail('homework',act.act_id, act.id)" id="act_{{act.id}}"> <div dataID = "{{act.act_id}}" ng-click="goDetail('homework',act.act_id, act.id)" id="act_{{act.id}}">
<div class="post-avatar fl mr10"><img ng-src="{{replaceUrl(act.author.img_url)}}" width="30" height="30" class="border-radius img-circle" /></div> <div class="post-avatar fl mr10"><img female="{{replaceUrl(act.author.img_url)}}" width="30" height="30" class="border-radius img-circle" /></div>
<div class="post-dynamic-author hidden fl"> <div class="post-dynamic-author hidden fl">
<span>{{act.author.real_name}}</span> <span>{{act.author.real_name}}</span>
<img ng-if="act.author.gender == '0'" src="images/wechat/male.png" width="14" class="ml5" /> <img ng-if="act.author.gender == '0'" src="images/wechat/male.png" width="14" class="ml5" />
@ -256,12 +256,15 @@
<div class="class-member-row f13 c-grey3" ng-repeat="student in students|filter:searchText"> <div class="class-member-row f13 c-grey3" ng-repeat="student in students|filter:searchText">
<img ng-src="{{student.img_url}}" width="30" height="30" class="fl ml10 img-circle" /><span class="fl ml10 mt5">{{student.name}}</span><img ng-src="/images/wechat/{{student.gender==0 ? 'male' : 'female'}}.png" width="15" class="fl ml10 mt5" /> <img ng-src="{{student.img_url}}" width="30" height="30" class="fl ml10 img-circle" /><span class="fl ml10 mt5">{{student.name}}</span><img ng-src="/images/wechat/{{student.gender==0 ? 'male' : 'female'}}.png" width="15" class="fl ml10 mt5" />
<img src="/images/wechat/setting.png" ng-show = "isTeacher" width="15" class="class-list-setting" ng-click="onSetting(student)" /> <img src="/images/wechat/setting.png" ng-show = "isTeacher" width="15" class="class-list-setting" ng-click="onSetting(student)" />
<img src="/images/wechat/setting.png" ng-show = "!isTeacher && student.is_me==1" width="15" class="class-list-setting" ng-click="onSetting_1(student)" />
<div class="cl"></div> <div class="cl"></div>
</div> </div>
<div ng-show="course.is_member" class="bottom-tab-wrap mt10" ng-class="{'undis': !showClassMate}"> <div ng-show="course.is_member" class="bottom-tab-wrap mt10" ng-class="{'undis': !showClassMate}">
<a ng-show="!course.is_creator" ng-click="quit()" class="weixin-tab link-blue2 border-top">退出班级</a> <a ng-show="!course.is_creator" ng-click="quit()" class="weixin-tab link-blue2 border-top">退出班级</a>
<a ng-show="isTeacher" ng-click="goEditGroup()" class="weixin-tab link-blue2 border-top">分班管理</a>
</div> </div>
</div> </div>
<div ng-class="{'undis': !showHomework}"> <div ng-class="{'undis': !showHomework}">

20
public/assets/wechat/class_group.html
Unescape View File

@ -0,0 +1,20 @@
<div class="post-container">
<div loading-spinner></div>
<div class="class-detail-name"><span class="course-name-width hidden inline-block">分班管理</span></div>
<div ng-repeat="group in groups">
<div class="member-banner f13 c-grey3" ng-class="{'mt10':!$first}">{{group.name+"("+group.users.length+")"}}</div>
<div class="class-member-row f13 c-grey3" ng-repeat="user in group.users">
<img ng-src="{{user.img_url}}" width="30" height="30" class="fl ml10 img-circle" /><span class="fl ml10 mt5">{{user.realname == "" ? user.name : user.realname}}</span><img ng-src="/images/wechat/{{user.gender==0 ? 'male' : 'female'}}.png" width="15" class="fl ml10 mt5" />
<div class="cl"></div>
</div>
</div>
<div ng-show="course.is_member" class="bottom-tab-wrap mt10">
<a ng-show="course.current_user_is_teacher" ng-click="goEditGroup()" class="weixin-tab link-blue2 border-top">编辑</a>
</div>
<div ng-show="tip_1" class="blue-title">{{tip_1}}</div>
<my-alert message="alertService.message" title="alertService.title" visible="alertService.visible" cb="alertService.cb"></my-alert>
</div>

2
public/assets/wechat/class_publishissue.html
Unescape View File

@ -1,7 +1,7 @@
<div class="post-container"> <div class="post-container">
<div loading-spinner></div> <div loading-spinner></div>
<div class="blue-title">{{current_course.name}}</div> <div class="blue-title"><span class="course-name-width hidden inline-block">{{current_course.syllabus_title}}<font ng-if="current_course.syllabus_title != null" class="fb" style="height:39px; line-height:39px; vertical-align:top; margin:0 3px;">·</font>{{current_course.name}}</span></div>
<div class="course-list-row f13 c-grey3 mt30"><span class="fl ml15 c-grey3">标题</span><input class="new-class-input ml25" ng-model="issuetitle" placeholder="发起讨论，请先输入标题(限128字符)" maxlength="128"></div> <div class="course-list-row f13 c-grey3 mt30"><span class="fl ml15 c-grey3">标题</span><input class="new-class-input ml25" ng-model="issuetitle" placeholder="发起讨论，请先输入标题(限128字符)" maxlength="128"></div>
<div class="full-width-wrap mt15 mb50"><textarea class="full-width-textarea" ng-model="issue" placeholder="请输入您的讨论内容~"></textarea></div> <div class="full-width-wrap mt15 mb50"><textarea class="full-width-textarea" ng-model="issue" placeholder="请输入您的讨论内容~"></textarea></div>
<div class="bottom-tab-wrap mt10"> <div class="bottom-tab-wrap mt10">

2
public/assets/wechat/class_publishnotice.html
Unescape View File

@ -1,7 +1,7 @@
<div class="post-container"> <div class="post-container">
<div loading-spinner></div> <div loading-spinner></div>
<div class="blue-title">{{current_course.name}}</div> <div class="blue-title"><span class="course-name-width hidden inline-block">{{current_course.syllabus_title}}<font ng-if="current_course.syllabus_title != null" class="fb" style="height:39px; line-height:39px; vertical-align:top; margin:0 3px;">·</font>{{current_course.name}}</span></div>
<div class="course-list-row f13 c-grey3 mt30"><span class="fl ml15 c-grey3">标题</span><input class="new-class-input ml25" ng-model="noticetitle" placeholder="发布通知，请先输入标题(限64字符)" maxlength="64"></div> <div class="course-list-row f13 c-grey3 mt30"><span class="fl ml15 c-grey3">标题</span><input class="new-class-input ml25" ng-model="noticetitle" placeholder="发布通知，请先输入标题(限64字符)" maxlength="64"></div>
<div class="full-width-wrap mt15 mb50"><textarea class="full-width-textarea" ng-model="notice" placeholder="请输入您的通知内容~"></textarea></div> <div class="full-width-wrap mt15 mb50"><textarea class="full-width-textarea" ng-model="notice" placeholder="请输入您的通知内容~"></textarea></div>
<div class="bottom-tab-wrap mt10"> <div class="bottom-tab-wrap mt10">

4
public/assets/wechat/course_discussion.html
Unescape View File

@ -24,8 +24,8 @@
<div class="cl"></div> <div class="cl"></div>
<div class="ml40"> <div class="ml40">
<div class="post-dynamic-title c-black fb">{{discussion.subject}}<img ng-if="discussion.locked" src="/images/locked.png" style="display:inline-block;" /></div> <div class="post-dynamic-title c-black fb">{{discussion.subject}}<img ng-if="discussion.locked" src="/images/locked.png" style="display:inline-block;" /></div>
<div class="c-grey4 f13 mt5"><span class="mr10">{{discussion.course_project_name}} - 班级讨论区</span><span>{{discussion.created_on}}</span></div> <div class="c-grey4 f13 mt5"><span class="mr10">{{discussion.syllabus_title}}<font class="fb" style="height:18px; line-height:18px; vertical-align:top; margin:0 3px;">·</font>{{discussion.course_project_name}} - 班级讨论区</span><span>{{discussion.created_on}}</span></div>
<div class="f13 c-black mt5 text-control post-all-content" ng-bind-html="discussion.content|safeHtml"></div> <div class="f13 c-black mt5 text-control post-all-content" ng-bind-html="discussion.content|safeHtml" img-preview></div>
<div class="cl"></div> <div class="cl"></div>
<div class="fr f13"> <div class="fr f13">
<div ng-if="!discussion.praise_count" ng-click="addPraise(discussion);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>赞</span></div> <div ng-if="!discussion.praise_count" ng-click="addPraise(discussion);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>赞</span></div>

4
public/assets/wechat/course_notice.html
Unescape View File

@ -23,8 +23,8 @@
<div class="cl"></div> <div class="cl"></div>
<div class="ml40"> <div class="ml40">
<div class="post-dynamic-title c-black fb">{{news.title}}</div> <div class="post-dynamic-title c-black fb">{{news.title}}</div>
<div class="c-grey4 f13 mt5"><span class="mr10">{{news.course_name}} - 课程通知</span><span>{{news.created_on}}</span></div> <div class="c-grey4 f13 mt5"><span class="mr10">{{news.syllabus_title}}<font class="fb" style="height:18px; line-height:18px; vertical-align:top; margin:0 3px;">·</font>{{news.course_name}} - 课程通知</span><span>{{news.created_on}}</span></div>
<div class="f13 c-black mt5 text-control post-all-content" ng-bind-html="news.description|safeHtml"></div> <div class="f13 c-black mt5 text-control post-all-content" ng-bind-html="news.description|safeHtml" img-preview></div>
<div class="cl"></div> <div class="cl"></div>
<div class="fr f13"> <div class="fr f13">
<div ng-if="!news.praise_count" ng-click="addPraise(news);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>赞</span></div> <div ng-if="!news.praise_count" ng-click="addPraise(news);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>赞</span></div>

14
public/assets/wechat/edit_class_group.html
Unescape View File

@ -0,0 +1,14 @@
<div class="post-container">
<div loading-spinner></div>
<div class="blue-title">分班管理</div>
<div class="class-detail-row f13 c-grey3"><img ng-src="{{course.img_url}}" class="fl ml10 img-circle mt4" width="30" height="30"><span class="fl mt10 ml10 ng-binding">{{course.syllabus_title}}<font ng-if="course.syllabus_title != null" class="fb" style="height:18px; line-height:18px; vertical-align:top; margin:0 3px;">·</font>{{course.name}}</span><div class="cl"></div> </div>
<form novalidate name="groupForm">
<div class="course-list-row f13 c-grey3 mt10" ng-repeat="group in groups" ><span class="fl ml15 c-grey3">分班名称</span><input ng-change="group.change = true" required ng-class="['new-class-input ml25', {'c-grey':group.change} ]" ng-model="group.tmpname" placeholder="如：16级1班" maxlength="20" /><a ng-click="deleteGroup($index)" class="fr mr10 c-grey6 delete-class-link">删除</a></div>
<div class="tac"><a ng-click="addGroup()" class="link-blue2 f13 mt15 inline-block add-class-link">+新增分班</a></div>
<a ng-click="newGroup(groupForm, groups)" ng-class="['finish-btn', {'btn-disabled':!groupForm.$valid} ]" >完成</a>
</form>
<my-alert message="alertService.message" title="alertService.title" visible="alertService.visible" cb="alertService.cb"></my-alert>
<my-alert2 message="alertService_2.message" title="alertService_2.title" visible="alertService_2.visible" cb="alertService_2.cb"></my-alert2>
</div>

16
public/assets/wechat/edit_class_member.html
Unescape View File

@ -4,15 +4,25 @@
<div class="blue-title">成员管理</div> <div class="blue-title">成员管理</div>
<div class="class-detail-row f13 c-grey3"><img ng-src="{{current_edit_member.user.img_url}}" width="30" class="fl ml10 img-circle mt4" /><span class="fl mt10 ml10">{{current_edit_member.user.realname == "" ? current_edit_member.user.name : current_edit_member.user.realname}}</span><img ng-src="/images/wechat/{{current_edit_member.user.gender==0 ? 'male' : 'female'}}.png" width="15" class="fl ml10 mt10" /><div class="cl"></div> </div> <div class="class-detail-row f13 c-grey3"><img ng-src="{{current_edit_member.user.img_url}}" width="30" class="fl ml10 img-circle mt4" /><span class="fl mt10 ml10">{{current_edit_member.user.realname == "" ? current_edit_member.user.name : current_edit_member.user.realname}}</span><img ng-src="/images/wechat/{{current_edit_member.user.gender==0 ? 'male' : 'female'}}.png" width="15" class="fl ml10 mt10" /><div class="cl"></div> </div>
<div class="course-list-row f13 c-grey3 mt10" ng-click="clickChangeRole()"><span class="fl ml10">角色变更</span></div> <div class="course-list-row f13 c-grey3 mt10" ng-click="clickChangeRole()"><span class="fl ml10">角色变更</span></div>
<ul class="class-list f13 c-grey3" ng-class="{'undis':current_edit_member.show}"> <ul class="class-list f13 c-grey3" ng-class="{'undis':!show_1}">
<li><span class="fl ml10 class-list-name hidden">教师</span><span ng-click="selectRole(9)" ng-class="['login-box', 'fr', 'mr10', 'mt12', {'bg-grey':assistant,'checked': teacher}]"></span></li> <li><span class="fl ml10 class-list-name hidden">教师</span><span ng-click="selectRole(9)" ng-class="['login-box', 'fr', 'mr10', 'mt12', {'bg-grey':assistant,'checked': teacher}]"></span></li>
<li><span class="fl ml10 class-list-name hidden">助教</span><span ng-click="selectRole(7)" ng-class="['login-box', 'fr', 'mr10', 'mt12', {'bg-grey':teacher, 'checked': assistant}]"></span></li> <li><span class="fl ml10 class-list-name hidden">助教</span><span ng-click="selectRole(7)" ng-class="['login-box', 'fr', 'mr10', 'mt12', {'bg-grey':teacher, 'checked': assistant}]"></span></li>
<li class="border-bottom-none"><span class="fl ml10 class-list-name hidden">学生</span><span ng-click="selectRole(10)" ng-class="['login-box', 'fr', 'mr10', 'mt12', {'checked': student}]"></span></li> <li class="border-bottom-none"><span class="fl ml10 class-list-name hidden">学生</span><span ng-click="selectRole(10)" ng-class="['login-box', 'fr', 'mr10', 'mt12', {'checked': student}]"></span></li>
</ul> </ul>
<div class="course-list-row f13 c-grey3 mt10" ng-click="current_edit_member.show = !current_edit_member.show;buttongrey = false;" id="manageDelete"><span class="fl ml10">删除成员</span></div> <div class="course-list-row f13 c-grey3 mt10" ng-click="clickDeleteMember()" id="manageDelete"><span class="fl ml10">删除成员</span></div>
<ul class="class-list f13 c-grey3" ng-class="{'undis':!current_edit_member.show}"> <ul class="class-list f13 c-grey3" ng-class="{'undis':!show_2}">
<li class="border-bottom-none"><span class="fl ml10 class-list-name hidden">删除</span><input type="radio" name="delete" class="fr mr10 mt12" checked="checked" /></li> <li class="border-bottom-none"><span class="fl ml10 class-list-name hidden">删除</span><input type="radio" name="delete" class="fr mr10 mt12" checked="checked" /></li>
</ul> </ul>
<div class="course-list-row f13 c-grey3 mt10" ng-click="clickSelectGroup()" id="manageDelete"><span class="fl ml10">编辑分班</span></div>
<ul class="class-list f13 c-grey3" ng-class="{'undis':!show_3}">
<li ng-class="{'border-bottom-none':groups.length == 0}"><span class="fl ml10 class-list-name hidden">暂无</span><span ng-click="selectGroup(0)" class="login-box fr mr10 mt12 img-circle" ng-class="[{'checked': selectid == 0}]"></span></li>
<div ng-repeat="group in groups">
<li ng-class="{'border-bottom-none':$last}"><span class="fl ml10 class-list-name hidden">{{group.course_group.name}}</span><span ng-click="selectGroup(group.course_group.id)" class="login-box fr mr10 mt12 img-circle" ng-class="[{'checked': selectid == group.course_group.id}]"></span></li>
<!--<li class="border-bottom-none"><span class="fl ml10 class-list-name hidden">分班2</span><span class="login-box fr mr10 mt12 img-circle" ng-class="['login-box', 'fr', 'mr10', 'mt12', {'checked': student}]"></span></li>-->
</div>
</ul>
<div class="bottom-tab-wrap mt10"> <div class="bottom-tab-wrap mt10">
<a href="javascript:void(0);" ng-click="cancel()" class="weixin-tab c-grey border-top">取消</a> <a href="javascript:void(0);" ng-click="cancel()" class="weixin-tab c-grey border-top">取消</a>
<a href="javascript:void(0);" ng-click="edit_member_role()" class="weixin-tab border-top" ng-class="[{'bg-grey c-white':buttongrey},{'link-blue2':!buttongrey}]" >确定</a> <a href="javascript:void(0);" ng-click="edit_member_role()" class="weixin-tab border-top" ng-class="[{'bg-grey c-white':buttongrey},{'link-blue2':!buttongrey}]" >确定</a>

9
public/assets/wechat/edit_userinfo.html
Unescape View File

@ -12,6 +12,7 @@
<form name="regFrm" novalidate> <form name="regFrm" novalidate>
<div class="course-list-row f13 c-grey3 mt10"><span class="fl ml15 c-grey3">姓名</span><input class="new-class-input ml25" ng-model="lastname" placeholder="请输入您的真实姓名" maxlength="30" /></div> <div class="course-list-row f13 c-grey3 mt10"><span class="fl ml15 c-grey3">姓名</span><input class="new-class-input ml25" ng-model="lastname" placeholder="请输入您的真实姓名" maxlength="30" /></div>
<div ng-show="lastname == '' " class="c-red f12 mt5 ml65">姓名不能为空</div>
<div class="course-list-row f13 c-grey3 mt10" style="height:auto;"> <div class="course-list-row f13 c-grey3 mt10" style="height:auto;">
<div class="mt5" style="line-height:20px"> <div class="mt5" style="line-height:20px">
<span class="ml15 c-grey3">性别</span> <span class="ml15 c-grey3">性别</span>
@ -28,10 +29,10 @@
<div class="course-list-row f13 c-grey3 mt10"> <div class="course-list-row f13 c-grey3 mt10">
<span class="fl ml15 c-grey3">邮箱</span> <span class="fl ml15 c-grey3">邮箱</span>
<input class="new-class-input ml25" type="email" name="email" ng-model="mail" placeholder="请输入您的邮箱地址" maxlength="60" /> <input class="new-class-input ml25" type="email" name="email" ng-model="mail" placeholder="请输入您的邮箱地址" maxlength="60" />
<div ng-show="regFrm.$submitted || regFrm.email.$touched"> </div>
<span class="f12 c-red fl ml15" ng-show="regFrm.email.$error.required">电子邮箱地址不能为空</span> <div ng-show="regFrm.$submitted || regFrm.email.$touched">
<span class="f12 c-red fl ml15" ng-show="regFrm.email.$error.email">电子邮箱地址不合法</span> <span class="f12 c-red ml65" ng-show="regFrm.email.$error.required">电子邮箱地址不能为空</span>
</div> <span class="f12 c-red ml65" ng-show="regFrm.email.$error.email">电子邮箱地址不合法</span>
</div> </div>
<div ng-show="lastname == '' " class="f12 c-grey6 mt10 ml15"> <div ng-show="lastname == '' " class="f12 c-grey6 mt10 ml15">
<span class="f13 c-grey3">提示</span> <span class="f13 c-grey3">提示</span>

9
public/assets/wechat/homework_detail.html
Unescape View File

@ -23,13 +23,18 @@
<div class="cl"></div> <div class="cl"></div>
<div class="ml40"> <div class="ml40">
<div class="post-dynamic-title c-black fb">{{homework.name}}</div> <div class="post-dynamic-title c-black fb">{{homework.name}}</div>
<div class="c-grey4 mt5 f13"><span class="mr10">{{homework.course_name}} - <span ng-if="homework.homework_type == 1">普通作业</span><span ng-if="homework.homework_type == 2">编程作业</span><span ng-if="homework.homework_type == 3">分组作业</span></span><span>{{homework.publish_time}}</span></div> <div class="c-grey4 mt5 f13"><span class="mr10">{{homework.syllabus_title}}<font class="fb" style="height:18px; line-height:18px; vertical-align:top; margin:0 3px;">·</font>{{homework.course_name}} - <span ng-if="homework.homework_type == 1">普通作业</span><span ng-if="homework.homework_type == 2">编程作业</span><span ng-if="homework.homework_type == 3">分组作业</span></span><span>{{homework.publish_time}}</span></div>
<div class="f13 c-black mt5 text-control post-all-content" ng-bind-html="homework.description|safeHtml"></div> <div class="f13 c-black mt5 text-control post-all-content" ng-bind-html="homework.description|safeHtml" img-preview></div>
<span class="c-grey f12 mr15">迟交扣分：{{homework.late_penalty}}分</span> <span class="c-grey f12 mr15">迟交扣分：{{homework.late_penalty}}分</span>
<span ng-if="!homework.anonymous_comment" class="c-grey f12">匿评开启时间：{{homework.evaluation_start}}</span><br /> <span ng-if="!homework.anonymous_comment" class="c-grey f12">匿评开启时间：{{homework.evaluation_start}}</span><br />
<span ng-if="!homework.anonymous_comment" class="c-grey f12 mr15">缺评扣分：{{homework.absence_penalty}}分/作品</span> <span ng-if="!homework.anonymous_comment" class="c-grey f12 mr15">缺评扣分：{{homework.absence_penalty}}分/作品</span>
<span ng-if="!homework.anonymous_comment" class="c-grey f12">匿评关闭时间：{{homework.evaluation_end}}</span> <span ng-if="!homework.anonymous_comment" class="c-grey f12">匿评关闭时间：{{homework.evaluation_end}}</span>
<div class="cl"></div> <div class="cl"></div>
<div ng-if="homework.homework_commit_count > 0" class="f12 c-grey mt5 mb5">作品提交数：<span class="c-blue">{{homework.homework_commit_count}}</span></div>
<div class="f12 c-grey mb5">
<div ng-if="homework.last_commit_info">#{{homework.last_commit_info.lasttime}} <span class="c-blue ml5 mr5">{{homework.last_commit_info.lastname}}</span> 提交了作品</div>
<div ng-if="homework.last_score_info">#{{homework.last_score_info.lasttime}} <span class="c-blue ml5 mr5">{{homework.last_score_info.lastname}}</span> 评阅了作品</div>
</div>
</div> </div>
<div class="fr f13"> <div class="fr f13">
<div ng-if="!homework.praise_count" ng-click="addPraise(homework);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>赞</span></div> <div ng-if="!homework.praise_count" ng-click="addPraise(homework);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>赞</span></div>

2
public/assets/wechat/invite_code.html
Unescape View File

@ -1,7 +1,7 @@
<div class="post-container"> <div class="post-container">
<div class="qr-code-wrap"> <div class="qr-code-wrap">
<div class="qr-code-box"> <div class="qr-code-box">
<div class="share-class-name">{{course.name}}</div> <div class="share-class-name">{{course.syllabus_title}}<font ng-if="course.syllabus_title != null" class="fb" style="height:25px; line-height:25px; vertical-align:top; margin:0 3px;">·</font>{{course.name}}</div>
<div class="qr-img-wrap"><img ng-src="https://mp.weixin.qq.com/cgi-bin/showqrcode?ticket={{course.qrcode}}" width="152" class="qr-code-img" /></div> <div class="qr-img-wrap"><img ng-src="https://mp.weixin.qq.com/cgi-bin/showqrcode?ticket={{course.qrcode}}" width="152" class="qr-code-img" /></div>
<div class="invitation-code-wrap">邀请码：{{course.invite_code}}</div> <div class="invitation-code-wrap">邀请码：{{course.invite_code}}</div>
</div> </div>

2
public/assets/wechat/issue_detail.html
Unescape View File

@ -26,7 +26,7 @@
<div class="post-dynamic-title c-black fb">{{issue.subject}}</div> <div class="post-dynamic-title c-black fb">{{issue.subject}}</div>
<div class="c-grey4 f13 mt5"><span class="mr10">{{issue.project_name}} - 项目问题</span><span>{{issue.created_on}}</span></div> <div class="c-grey4 f13 mt5"><span class="mr10">{{issue.project_name}} - 项目问题</span><span>{{issue.created_on}}</span></div>
<div class="f13 c-black mt5 text-control post-all-content" ng-bind-html="issue.description|safeHtml"></div> <div class="f13 c-black mt5 text-control post-all-content" ng-bind-html="issue.description|safeHtml" img-preview></div>
<span class="c-grey f12 mr15">状&nbsp;&nbsp;&nbsp;态：{{issue.issue_status}}</span> <span class="c-grey f12 mr15">状&nbsp;&nbsp;&nbsp;态：{{issue.issue_status}}</span>
<span class="c-grey f12">优先级：{{issue.issue_priority}}</span><br/> <span class="c-grey f12">优先级：{{issue.issue_priority}}</span><br/>
<span class="c-grey f12 mr15">指派给：{{issue.issue_assigned_to}}</span> <span class="c-grey f12 mr15">指派给：{{issue.issue_assigned_to}}</span>

34
public/assets/wechat/join_classgroup.html
Unescape View File

@ -0,0 +1,34 @@
<div class="post-container">
<div loading-spinner></div>
<div ng-show="current_course" class="post-container" style="padding-bottom:50px;">
<div class="blue-title">欢迎加入班级</div>
<div class="class-detail-row f13 c-grey3"><img ng-src="{{current_course.img_url}}" class="fl ml10 img-circle mt4" width="30" height="30"><span class="fl mt10 ml10 ng-binding">{{course.syllabus_title}}<font ng-if="course.syllabus_title != null" class="fb" style="height:18px; line-height:18px; vertical-align:top; margin:0 3px;">·</font>{{current_course.name}}</span><div class="cl"></div> </div>
<div class="course-list-row f13 c-grey3 mt10"><span class="fl ml15">选择分班</span></div>
<ul class="class-list f13 c-grey3">
<li ng-class="{'border-bottom-none':groups.length == 0}"><span class="fl ml10 class-list-name hidden">暂无</span><span ng-click="selectGroup(0)" class="login-box fr mr10 mt12 img-circle" ng-class="[{'checked': selectid == 0}]"></span></li>
<div ng-repeat="group in groups">
<li ng-class="{'border-bottom-none':$last}"><span class="fl ml10 class-list-name hidden">{{group.course_group.name}}</span><span ng-click="selectGroup(group.course_group.id)" class="login-box fr mr10 mt12 img-circle" ng-class="[{'checked': selectid == group.course_group.id}]"></span></li>
<!--<li class="border-bottom-none"><span class="fl ml10 class-list-name hidden">分班2</span><span class="login-box fr mr10 mt12 img-circle" ng-class="['login-box', 'fr', 'mr10', 'mt12', {'checked': student}]"></span></li>-->
</div>
</ul>
<div class="f12 c-grey6 mt10 ml15">
<span class="f13 c-grey3">提示</span>
<ul class="mb15 mt5 ml10 new-tip">
<li><span class="project-intro-dot">•</span>该班级存在分班信息，请选择属于您的小班</li>
<li><span class="project-intro-dot">•</span>老师可以在班级的成员管理页，对所有成员进行修改</li>
<li><span class="project-intro-dot">•</span>学生可以在班级的我的同学页，对自己进行修改</li>
</ul>
</div>
<div class="bottom-tab-wrap mt10">
<a ng-click="cancel()" ng-click="cancel()" class="weixin-tab c-grey border-top">跳过</a>
<a ng-click="confirm()" ng-click="joinClass()" class="weixin-tab link-blue2 border-top">确认</a>
</div>
</div>
<div ng-show="tip_1" class="blue-title">{{tip_1}}</div>
<my-alert message="alertService.message" title="alertService.title" visible="alertService.visible" cb="alertService.cb"></my-alert>
</div>

2
public/assets/wechat/jour_message_detail.html
Unescape View File

@ -24,7 +24,7 @@
<div class="ml40"> <div class="ml40">
<div class="c-grey4 f13 mt5"><span class="mr10">留言</span><span>{{message.created_on}}</span></div> <div class="c-grey4 f13 mt5"><span class="mr10">留言</span><span>{{message.created_on}}</span></div>
<div class="f13 c-black mt5 text-control post-all-content" ng-bind-html="message.content|safeHtml"></div> <div class="f13 c-black mt5 text-control post-all-content" ng-bind-html="message.content|safeHtml" img-preview></div>
<div class="cl"></div> <div class="cl"></div>
<div class="fr f13"> <div class="fr f13">
<div ng-if="!message.praise_count" ng-click="addPraise(message);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>赞</span></div> <div ng-if="!message.praise_count" ng-click="addPraise(message);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>赞</span></div>

4
public/assets/wechat/myresource.html
Unescape View File

@ -13,7 +13,7 @@
<div ng-class="{'undis': currentTab!=1}"> <div ng-class="{'undis': currentTab!=1}">
<div ng-repeat="r in resources|filter:{filename:searchText}" ng-class="['class-detail-row', 'f13', 'c-grey3', {'border-top': $first}]"> <div ng-repeat="r in resources|filter:{filename:searchText}" ng-class="['class-detail-row', 'f13', 'c-grey3', {'border-top': $first}]">
<img src="/images/wechat/courseware.png" width="15" class="ml10 fl" /> <a ng-href="{{g_localhost}}/attachments/download/{{r.id}}/{{r.filename}}?type=wechat" target="_blank" class="fl ml10 resource-width">{{r.filename}}</a><a ng-show="r.current_user_is_teacher" ng-click="sendFile(r,1)" class="fr mr10 link-blue2">发送</a><div class="cl"></div> <img src="/images/wechat/courseware.png" width="15" class="ml10 fl" /> <a ng-href="{{g_localhost}}/attachments/download/{{r.id}}/{{r.filename}}?type=wechat" target="_blank" class="fl ml10 resource-width">{{r.filename}}</a><a ng-show="r.current_user_is_teacher" ng-click="sendFile(r,1)" class="fr mr10 link-blue2">发送</a><div class="cl"></div>
<span class="f12 mt5 ml35 c-grey4 fl courseware-from-width hidden">课件来源：{{r.coursename}}</span><span class="f12 ml10 mt5 c-grey4 fl">大小：{{r.attafile_size}}</span><div class="cl"></div> <span class="f12 mt5 ml35 c-grey4 fl courseware-from-width hidden">课件来源：{{r.syllabus_title}}<font class="fb" style="height:18px; line-height:18px; vertical-align:top; margin:0 3px;">·</font>{{r.coursename}}</span><span class="f12 ml10 mt5 c-grey4 fl">大小：{{r.attafile_size}}</span><div class="cl"></div>
</div> </div>
<div ng-if="has_more"> <div ng-if="has_more">
<div id="more" class="more-events mt10" ng-click="loadResourceData(1,page+1);">更多</div> <div id="more" class="more-events mt10" ng-click="loadResourceData(1,page+1);">更多</div>
@ -24,7 +24,7 @@
</div> </div>
<div ng-class="{'undis': currentTab!=2}"> <div ng-class="{'undis': currentTab!=2}">
<div ng-repeat="r in homeworks|filter:{homework_name: searchText}" ng-class="['class-detail-row', 'f13', 'c-grey3', {'border-top': $first}]"><img src="/images/wechat/homework.png" width="15" class="ml10 fl" /><span ng-click="goHomeworkDetail(r.id)" class="fl ml10 resource-width">{{r.homework_name}}</span><a ng-show="r.current_user_is_teacher" ng-click="sendFile(r,2)" class="fr mr10 link-blue2 ">发送</a><div class="cl"></div> <div ng-repeat="r in homeworks|filter:{homework_name: searchText}" ng-class="['class-detail-row', 'f13', 'c-grey3', {'border-top': $first}]"><img src="/images/wechat/homework.png" width="15" class="ml10 fl" /><span ng-click="goHomeworkDetail(r.id)" class="fl ml10 resource-width">{{r.homework_name}}</span><a ng-show="r.current_user_is_teacher" ng-click="sendFile(r,2)" class="fr mr10 link-blue2 ">发送</a><div class="cl"></div>
<span class="f12 mt5 ml35 c-grey4 fl other-from-width hidden">作业来源：{{r.coursename}}</span><div class="cl"></div> <span class="f12 mt5 ml35 c-grey4 fl other-from-width hidden">作业来源：{{r.syllabus_title}}<font class="fb" style="height:18px; line-height:18px; vertical-align:top; margin:0 3px;">·</font>{{r.coursename}}</span><div class="cl"></div>
</div> </div>
<div ng-if="homework_has_more"> <div ng-if="homework_has_more">
<div id="more_homeworks" class="more-events mt10" ng-click="loadResourceData(2,homework_page+1);">更多</div> <div id="more_homeworks" class="more-events mt10" ng-click="loadResourceData(2,homework_page+1);">更多</div>

2
public/assets/wechat/project_discussion.html
Unescape View File

@ -25,7 +25,7 @@
<div class="post-dynamic-title c-black fb">{{discussion.subject}}<img ng-if="discussion.locked" src="/images/locked.png" style="display:inline-block;" /></div> <div class="post-dynamic-title c-black fb">{{discussion.subject}}<img ng-if="discussion.locked" src="/images/locked.png" style="display:inline-block;" /></div>
<div class="c-grey4 f13 mt5"><span class="mr10">{{discussion.course_project_name}} - 项目讨论区</span><span>{{discussion.created_on}}</span></div> <div class="c-grey4 f13 mt5"><span class="mr10">{{discussion.course_project_name}} - 项目讨论区</span><span>{{discussion.created_on}}</span></div>
<div class="f13 c-black mt5 text-control post-all-content" ng-bind-html="discussion.content|safeHtml"></div> <div class="f13 c-black mt5 text-control post-all-content" ng-bind-html="discussion.content|safeHtml" img-preview></div>
<div class="cl"></div> <div class="cl"></div>
<div class="fr f13"> <div class="fr f13">
<div ng-if="!discussion.praise_count" ng-click="addPraise(discussion);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>赞</span></div> <div ng-if="!discussion.praise_count" ng-click="addPraise(discussion);"><img src="/images/wechat/w_praise.png" width="20" style="vertical-align:top; margin-top:2px;" class="mr5" /><span>赞</span></div>

4
public/assets/wechat/review_class_member.html
Unescape View File

@ -2,7 +2,7 @@
<div loading-spinner></div> <div loading-spinner></div>
<div ng-show="current_course && current_review_member " class="post-container" style="padding-bottom:50px;"> <div ng-show="current_course && current_review_member " class="post-container" style="padding-bottom:50px;">
<div ng-show="status==0"> <div ng-show="status==0">
<div class="blue-title">{{current_course.name}}</div> <div class="blue-title"><span class="course-name-width hidden inline-block">{{current_course.syllabus_title}}<font ng-if="current_course.syllabus_title != null" class="fb" style="height:39px; line-height:39px; vertical-align:top; margin:0 3px;">·</font>{{current_course.name}}</span></div>
<div class="class-detail-row f13 c-grey3"><img ng-src="{{current_review_member.img_url}}" width="30" class="fl ml10 img-circle mt4" /><span class="fl mt10 ml10">{{current_review_member.realname == "" ? current_review_member.name : current_review_member.realname}}</span><img ng-src="/images/wechat/{{current_review_member.gender==0 ? 'male' : 'female'}}.png" width="15" class="fl ml10 mt10" /><div class="cl"></div> </div> <div class="class-detail-row f13 c-grey3"><img ng-src="{{current_review_member.img_url}}" width="30" class="fl ml10 img-circle mt4" /><span class="fl mt10 ml10">{{current_review_member.realname == "" ? current_review_member.name : current_review_member.realname}}</span><img ng-src="/images/wechat/{{current_review_member.gender==0 ? 'male' : 'female'}}.png" width="15" class="fl ml10 mt10" /><div class="cl"></div> </div>
<div class="course-list-row f13 c-grey3 mt10"><span class="fl ml10">角色</span></div> <div class="course-list-row f13 c-grey3 mt10"><span class="fl ml10">角色</span></div>
<ul class="class-list f13 c-grey3"> <ul class="class-list f13 c-grey3">
@ -29,7 +29,7 @@
</div> </div>
<div ng-show="current_course && !current_review_member "> <div ng-show="current_course && !current_review_member ">
<div class="blue-title">{{current_course.name}}</div> <div class="blue-title"><span class="course-name-width hidden inline-block">{{current_course.syllabus_title}}<font ng-if="current_course.syllabus_title != null" class="fb" style="height:39px; line-height:39px; vertical-align:top; margin:0 3px;">·</font>{{current_course.name}}</span></div>
<div class="tac sn-font-grey2" style="margin-top:50px;">{{tip_2}}</div> <div class="tac sn-font-grey2" style="margin-top:50px;">{{tip_2}}</div>
</div> </div>

28
public/assets/wechat/select_my_coursegroup.html
Unescape View File

@ -0,0 +1,28 @@
<div class="post-container">
<div loading-spinner></div>
<div class="post-container" style="padding-bottom:50px;">
<div class="blue-title">我的信息</div>
<div class="class-detail-row f13 c-grey3"><img ng-src="{{current_edit_member.user.img_url}}" class="fl ml10 img-circle mt4" width="30" height="30"><span class="fl mt10 ml10 ng-binding">{{current_edit_member.user.realname == "" ? current_edit_member.user.name : current_edit_member.user.realname}}</span><img ng-src="/images/wechat/{{current_edit_member.user.gender==0 ? 'male' : 'female'}}.png" class="fl ml10 mt10" width="15"><div class="cl"></div> </div>
<div class="course-list-row f13 c-grey3 mt10"><span class="fl ml15">角色</span></div>
<div class="f13 ml35 mt10 c-grey3">学生</div>
<div class="course-list-row f13 c-grey3 mt10"><span class="fl ml15">选择分班</span></div>
<ul class="class-list f13 c-grey3">
<li ng-class="{'border-bottom-none':groups.length == 0}"><span class="fl ml10 class-list-name hidden">暂无</span><span ng-click="selectGroup(0)" class="login-box fr mr10 mt12 img-circle" ng-class="[{'checked': selectid == 0}]"></span></li>
<div ng-repeat="group in groups">
<li ng-class="{'border-bottom-none':$last}"><span class="fl ml10 class-list-name hidden">{{group.course_group.name}}</span><span ng-click="selectGroup(group.course_group.id)" class="login-box fr mr10 mt12 img-circle" ng-class="[{'checked': selectid == group.course_group.id}]"></span></li>
<!--<li class="border-bottom-none"><span class="fl ml10 class-list-name hidden">分班2</span><span class="login-box fr mr10 mt12 img-circle" ng-class="['login-box', 'fr', 'mr10', 'mt12', {'checked': student}]"></span></li>-->
</div>
</ul>
<div class="bottom-tab-wrap mt10">
<a href="javascript:void(0);" ng-click="cancel()" class="weixin-tab c-grey border-top">取消</a>
<a href="javascript:void(0);" ng-click="confirm()" class="weixin-tab link-blue2 border-top">确定</a>
</div>
</div>
<div ng-show="tip_1" class="blue-title">{{tip_1}}</div>
<div ng-show="tip_2" class="blue-title">{{tip_2}}</div>
<my-alert message="alertService.message" title="alertService.title" visible="alertService.visible" cb="alertService.cb"></my-alert>
</div>

BIN
public/images/new_project/icons_issue.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 197 KiB

BIN
public/images/user/icons_user_leftnav.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.4 KiB

After

Width:  |  Height:  |  Size: 3.4 KiB

BIN
public/images/user/user_navmore_icons.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

27
public/javascripts/wechat/controllers/class.js
Unescape View File

@ -247,7 +247,6 @@ app.controller('ClassController', ['$scope', 'config','$http', 'auth','$location
resetMenu(vm.course.current_user_is_teacher,vm.currentTab); resetMenu(vm.course.current_user_is_teacher,vm.currentTab);
} }
vm.onSetting = function(user){ vm.onSetting = function(user){
rms.save('current_edit_member', user); rms.save('current_edit_member', user);
rms.save("course",vm.course); rms.save("course",vm.course);
@ -255,6 +254,13 @@ app.controller('ClassController', ['$scope', 'config','$http', 'auth','$location
$location.path("/edit_class_member").search({id: courseid,user_id: user.id}); $location.path("/edit_class_member").search({id: courseid,user_id: user.id});
}; };
vm.onSetting_1 = function(user){
rms.save('current_edit_member', user);
rms.save("course",vm.course);
rms.save("tab_num",vm.currentTab);
$location.path("/select_my_coursegroup").search({id: courseid,user_id: user.id});
};
vm.review = function(user){ vm.review = function(user){
rms.save('current_review_member', user); rms.save('current_review_member', user);
rms.save('current_course', vm.course); rms.save('current_course', vm.course);
@ -361,5 +367,24 @@ app.controller('ClassController', ['$scope', 'config','$http', 'auth','$location
}; };
vm.goEditGroup = function(){
if(!vm.isTeacher){
return;
}
rms.save('course_activities_page',vm.course_activities_page);
rms.save("course_activities",vm.course_activities);
rms.save('course_has_more', vm.course_has_more);
rms.save("tab_num",vm.currentTab);
rms.save("course",vm.course);
rms.save('current_course', vm.course);
if(vm.course.groupnum == 0){
$location.path("/edit_class_group").search({id: courseid});
}
else{
$location.path("/class_group").search({id: courseid});
}
}
}]); }]);

48
public/javascripts/wechat/controllers/class_group.js
Unescape View File

@ -0,0 +1,48 @@
app.controller('ClassGroupController', ['$scope', 'config','$http', 'auth','$location','$routeParams','alertService','rms','common','$timeout', function($scope, config, $http, auth, $location, $routeParams,alertService,rms,common,$timeout){
// common.checkLogin();
$scope.replaceUrl = function(url){
return url;
};
var vm = $scope;
var courseid = $routeParams.id;
vm.alertService = alertService.create();
if(!vm.course){
$http.get(config.apiUrl+ 'courses/'+courseid+"?token="+auth.token()).then(
function(response) {
console.log(response.data);
if (response.data.status == 0){
vm.course = response.data.data;
console.log("courses");
console.log(response.data.data);
}
else{
vm.alertService.showMessage('提示', response.data.message);
}
if(!vm.course){
vm.tip_1 = "该班级不存在或已被删除";
}
}
);
}
$http.get(config.apiUrl + 'courses/course_groups_withstudent/'+courseid+'?token='+auth.token()).then(
function(response) {
console.log("groups=");
console.log(response);
if(response.data.status == 0) {
vm.groups = response.data.data;
}
else{
vm.groups = [];
}
});
vm.goEditGroup = function(){
$location.path("/edit_class_group").search({id: courseid});
}
}]);

2
public/javascripts/wechat/controllers/edit_class.js
Unescape View File

@ -63,7 +63,7 @@ app.controller('EditClassController', ['$scope', '$http', 'auth', 'config', 'ale
vm.syllabus.courses.splice(index, 1); vm.syllabus.courses.splice(index, 1);
} }
} };
vm.newClass = function (frm, syllabus) { vm.newClass = function (frm, syllabus) {
frm.$setSubmitted(); frm.$setSubmitted();

136
public/javascripts/wechat/controllers/edit_class_group.js
Unescape View File

@ -0,0 +1,136 @@
app.controller('EditClassGroupController', ['$scope', '$http', 'auth', 'config', 'alertService','$location','$routeParams','rms','common', function($scope, $http, auth, config, alertService, $location,$routeParams, rms,common){
var vm = $scope;
var courseid = $routeParams.id;
vm.alertService = alertService.create();
vm.alertService_2 = alertService.create();
if(!vm.course){
$http.get(config.apiUrl+ 'courses/'+courseid+"?token="+auth.token()).then(
function(response) {
console.log(response.data);
if (response.data.status == 0){
vm.course = response.data.data;
console.log("courses");
console.log(response.data.data);
}
else{
vm.alertService.showMessage('提示', response.data.message);
}
if(!vm.course){
vm.tip_1 = "该班级不存在或已被删除";
}
}
);
}
$http.get(config.apiUrl + 'courses/course_groups/'+courseid+'?token='+auth.token()).then(
function(response) {
console.log("groups=");
console.log(response);
if(response.data.status == 0) {
vm.groups = response.data.data;
for(var i in vm.groups){
vm.groups[i].tmpname = vm.groups[i].course_group.name;
}
}
else{
vm.groups = [];
}
});
vm.addGroup = function(){
vm.groups.push({tmpname:""});
};
vm.deleteGroup = function(index){
var group = vm.groups[index];
if(group.course_group){
vm.alertService_2.showMessage('提示', '您确定要删除该分班吗？', function() {
$http.post(config.apiUrl+'courses/delete_coursegroup', {
token: auth.token(),
id: courseid,
course_group_id:group.course_group.id
}).then(function(response){
console.log(response);
if(response.data.status == 0){
vm.alertService.showMessage('提示', "删除成功!",function(){
vm.groups.splice(index, 1);
});
} else {
vm.alertService.showMessage('提示', response.data.message);
}
});
});
} else {
vm.groups.splice(index, 1);
}
};
vm.newGroup = function (frm, groups) {
frm.$setSubmitted();
console.log(groups);
if(!frm.$valid){
console.log(frm.$error);
return;
}
if(vm.groups.length == 0){
$location.path("/class").search({id: courseid,tag:1});
return;
}
//不能有相同名称的分班
for(var i=0;i< vm.groups.length-1;i++) {
for (var j=i+1;j<vm.groups.length;j++){
if(vm.groups[i].tmpname == vm.groups[j].tmpname){
vm.alertService.showMessage('提示', "分班名称不能重复!");
return;
}
}
};
var add_groups = [];
var modify_groups = [];
for(var i in vm.groups){
var group = vm.groups[i];
if(!group.course_group){
add_groups.push(group.tmpname);
}
else if(group.tmpname != group.course_group.name){
modify_groups.push({id:group.course_group.id,name:group.tmpname});
}
}
if(add_groups.length == 0 && modify_groups.length == 0){
vm.alertService.showMessage('提示', "保存分班成功!",function(){
$location.path("/class").search({id: courseid,tag:1});
return;
});
}
//编辑分班
$http.post(config.apiUrl+'courses/edit_coursegroup', {
token: auth.token(),
id: courseid,
add_groups: add_groups,
modify_groups: modify_groups
}).then(function(response){
console.log(response);
if(response.data.status == 0){
vm.alertService.showMessage('提示', "保存分班成功!",function(){
$location.path("/class").search({id: courseid,tag:1});
});
} else {
vm.alertService.showMessage('提示', response.data.message,function(){
$location.path("/class").search({id: courseid,tag:1});
});
}
});
}
}] );

87
public/javascripts/wechat/controllers/edit_class_member.js
Unescape View File

@ -24,6 +24,11 @@ app.controller('EditClassMemberController', ['$scope', '$http', 'auth', 'config'
vm.tmpstudent = false; //学生 vm.tmpstudent = false; //学生
vm.buttongrey = true; vm.buttongrey = true;
vm.selectid = 0;
vm.show_1 = true;
vm.show_2 = false;
vm.show_3 = false;
if(!vm.current_edit_member){ if(!vm.current_edit_member){
@ -42,6 +47,8 @@ app.controller('EditClassMemberController', ['$scope', '$http', 'auth', 'config'
user_id = response.data.user_id; user_id = response.data.user_id;
vm.current_edit_member = response.data.member_info; vm.current_edit_member = response.data.member_info;
vm.current_roles_id = vm.current_edit_member.roles_id; vm.current_roles_id = vm.current_edit_member.roles_id;
vm.selectid = response.data.course_group_id;
vm.course_group_id = vm.selectid;
for(var i in vm.current_roles_id){ for(var i in vm.current_roles_id){
if(vm.current_roles_id[i] == 9){ if(vm.current_roles_id[i] == 9){
@ -57,6 +64,18 @@ app.controller('EditClassMemberController', ['$scope', '$http', 'auth', 'config'
vm.tmpstudent = true; vm.tmpstudent = true;
} }
} }
$http.get(config.apiUrl + 'courses/course_groups/'+course_id+'?token='+auth.token()).then(
function(response) {
console.log("groups=");
console.log(response);
if(response.data.status == 0) {
vm.groups = response.data.data;
}
else{
vm.groups = [];
}
});
} }
}); });
} }
@ -96,10 +115,29 @@ app.controller('EditClassMemberController', ['$scope', '$http', 'auth', 'config'
return; return;
} }
if(vm.current_edit_member.show){ if(vm.show_2){
//删除成员 //删除成员
vm.deleteMember(vm.current_edit_member.user.id); vm.deleteMember(vm.current_edit_member.user.id);
} }
else if(vm.show_3){
//加入分班
$http.post(config.apiUrl+'courses/user_edit_coursegroup', {
token: auth.token(),
id: course_id,
course_group_id:vm.selectid,
user_id:vm.current_edit_member.user.id
}).then(function(response){
console.log(response);
if(response.data.status == 0){
vm.alertService.showMessage('提示', "修改分班成功!",function(){
$location.path("/class").search({id: course_id,tag:1});
});
} else {
vm.alertService.showMessage('提示', response.data.message);
}
});
}
else{ else{
if((vm.teacher == vm.tmpteacher)&& (vm.assistant == vm.tmpassistant)&&(vm.student == vm.tmpstudent)){ if((vm.teacher == vm.tmpteacher)&& (vm.assistant == vm.tmpassistant)&&(vm.student == vm.tmpstudent)){
vm.alertService.showMessage('提示', "该用户当前已是该角色"); vm.alertService.showMessage('提示', "该用户当前已是该角色");
@ -159,14 +197,53 @@ app.controller('EditClassMemberController', ['$scope', '$http', 'auth', 'config'
}; };
vm.clickDeleteMember = function(){
vm.show_2 = !vm.show_2;
if(vm.show_2){
vm.show_1 = false;
vm.show_3 = false;
vm.buttongrey = false;
}
};
vm.clickChangeRole = function(){ vm.clickChangeRole = function(){
vm.current_edit_member.show = !vm.current_edit_member.show; vm.show_1 = !vm.show_1;
if((vm.teacher == vm.tmpteacher)&& (vm.assistant == vm.tmpassistant)&&(vm.student == vm.tmpstudent)){
vm.buttongrey = true; if(vm.show_1){
vm.show_2 = false;
vm.show_3 = false;
if((vm.teacher == vm.tmpteacher)&& (vm.assistant == vm.tmpassistant)&&(vm.student == vm.tmpstudent)){
vm.buttongrey = true;
}
else{
vm.buttongrey = false;
}
} }
else{ };
vm.clickSelectGroup = function(){
vm.show_3 = !vm.show_3;
if(vm.show_3){
vm.show_1 = false;
vm.show_2 = false;
if(vm.selectid != vm.course_group_id){
vm.buttongrey = false;
}
else{
vm.buttongrey = true;
}
}
};
vm.selectGroup = function(id){
vm.selectid = id;
if(vm.course_group_id != vm.selectid){
vm.buttongrey = false; vm.buttongrey = false;
} }
else{
vm.buttongrey = true;
}
}; };
}] ); }] );

14
public/javascripts/wechat/controllers/join_class.js
Unescape View File

@ -55,13 +55,23 @@ app.controller('JoinClassController', ['$scope', '$http', 'auth', 'config', 'ale
assistant_flag:vm.assistant, assistant_flag:vm.assistant,
student_flag:vm.student student_flag:vm.student
}).then(function(response){ }).then(function(response){
console.log(response);
if(response.data.status == 0){ if(response.data.status == 0){
vm.alertService.showMessage('提示', response.data.message,function(){ vm.alertService.showMessage('提示', response.data.message,function(){
rms.save('syllabuses',[]); rms.save('syllabuses',[]);
$location.path("/class_list"); if(response.data.go_coursegroup_flag == 0){
$location.path("/class_list");
}
else{
$location.path("/join_classgroup").search({id: response.data.course_id});
}
}); });
} else { } else {
vm.alertService.showMessage('提示', response.data.message); vm.alertService.showMessage('提示', response.data.message,function(){
if(response.data.go_coursegroup_flag == 1) {
$location.path("/join_classgroup").search({id: response.data.course_id});
}
});
} }
}); });
}; };

83
public/javascripts/wechat/controllers/join_classgroup.js
Unescape View File

@ -0,0 +1,83 @@
app.controller('JoinClassGroupController', ['$scope', '$http', 'auth', 'config', 'alertService','$location','$routeParams','rms','wx','common', function($scope, $http, auth, config, alertService, $location,$routeParams, rms,wx,common){
var vm = $scope;
var course_id = $routeParams.id;
vm.alertService = alertService.create();
vm.selectid = null;
$http.get(config.apiUrl+ 'courses/'+course_id+"?token="+auth.token()).then(
function(response) {
console.log(response.data);
if (response.data.status == 0){
vm.current_course = response.data.data;
console.log("courses=");
console.log(response.data.data);
if(vm.current_course){
$http.get(config.apiUrl + 'courses/course_groups/'+course_id+'?token='+auth.token()).then(
function(response) {
console.log("groups=");
console.log(response);
if(response.data.status == 0) {
vm.groups = response.data.data;
}
else{
vm.groups = [];
}
});
}
}
else{
vm.alertService.showMessage('提示', response.data.message);
}
if(!vm.current_course){
vm.tip_1 = "该班级不存在或已被删除";
}
}
);
vm.selectGroup = function(id){
vm.selectid = id;
};
vm.cancel = function(){
rms.save('syllabuses',[]);
$location.path("/class_list");
};
vm.confirm = function(){
if(vm.selectid == null){
vm.alertService.showMessage('提示', "请选择分班!");
return;
}
if(vm.selectid == 0){
rms.save('syllabuses',[]);
$location.path("/class_list");
return;
}
//加入分班
$http.post(config.apiUrl+'courses/user_join_coursegroup', {
token: auth.token(),
id: course_id,
course_group_id:vm.selectid
}).then(function(response){
console.log(response);
if(response.data.status == 0){
vm.alertService.showMessage('提示', "选择分班成功!",function(){
rms.save('syllabuses',[]);
$location.path("/class_list");
});
} else {
vm.alertService.showMessage('提示', response.data.message,function(){
rms.save('syllabuses',[]);
$location.path("/class_list");
});
}
});
};
}] );

117
public/javascripts/wechat/controllers/select_my_coursegroup.js
Unescape View File

@ -0,0 +1,117 @@
app.controller('SelectMyCourseGroupController', ['$scope', '$http', 'auth', 'config', 'alertService','$location','$routeParams','rms','common', function($scope, $http, auth, config, alertService, $location,$routeParams, rms,common){
// common.checkLogin();
var vm = $scope;
vm.current_review_member = rms.get('current_review_member');
vm.alertService = alertService.create();
vm.tip_1 = "";
vm.tip_2 = "";
var course_id = $routeParams.id;
var user_id = $routeParams.user_id;
vm.selectid = null;
if(!vm.current_course){
$http.get(config.apiUrl+ 'courses/'+course_id+"?token="+auth.token()).then(
function(response) {
console.log(response.data);
if (response.data.status == 0){
vm.current_course = response.data.data;
console.log("courses");
console.log(response.data.data);
}
else{
vm.alertService.showMessage('提示', response.data.message);
}
if(!vm.current_course){
vm.tip_1 = "该班级不存在或已被删除";
}
}
);
}
if(!vm.current_edit_member){
$http.post(config.apiUrl+'courses/get_member_info', {
token: auth.token(),
id: course_id,
user_id:user_id
}).then(function(response){
if(response.data.status!=0){
vm.alertService.showMessage('提示', response.data.message,function(){
$location.path("/class").search({id: course_id,tag:1});
});
} else {
console.log(response);
course_id = response.data.course_id;
vm.current_edit_member = response.data.member_info;
vm.current_roles_id = vm.current_edit_member.roles_id;
vm.selectid = response.data.course_group_id;
vm.course_group_id = vm.selectid;
for(var i in vm.current_roles_id){
if(vm.current_roles_id[i] == 10){
vm.student = true;
}
}
if(!vm.student){
vm.tip_2 = "您不是该班级的学生!";
}
else{
$http.get(config.apiUrl + 'courses/course_groups/'+course_id+'?token='+auth.token()).then(
function(response) {
console.log("groups=");
console.log(response);
if(response.data.status == 0) {
vm.groups = response.data.data;
}
else{
vm.groups = [];
}
});
}
}
});
}
vm.cancel = function(){
window.history.back();
};
vm.confirm = function(){
if(vm.course_group_id == vm.selectid){
$location.path("/class").search({id: course_id,tag:1});
return;
}
//加入分班
$http.post(config.apiUrl+'courses/user_edit_coursegroup', {
token: auth.token(),
id: course_id,
course_group_id:vm.selectid,
user_id:user_id
}).then(function(response){
console.log(response);
if(response.data.status == 0){
vm.alertService.showMessage('提示', "修改分班成功!",function(){
$location.path("/class").search({id: course_id,tag:1});
});
} else {
vm.alertService.showMessage('提示', response.data.message,function(){
$location.path("/class").search({id: course_id,tag:1});
});
}
});
};
vm.selectGroup = function(id){
vm.selectid = id;
};
}] );

22
public/javascripts/wechat/directives/img_preview.js
Unescape View File

@ -0,0 +1,22 @@
/**
* Created by ttang on 2016/9/20.
*/
app.directive('imgPreview',["$timeout",'wx',function(timer,wx){
return{
restrict: 'A',
scope: {},
link: function(scope, element){
timer(function(){
var srcList = [];
$.each($(".post-all-content img"),function(i,item){
if(item.src){
srcList.push(item.src);
$(item).click(function(e){
wx.previewImage({current:this.src,urls:srcList});
});
}
});
})
}
}
}]);

4
public/javascripts/wechat/others/routes.js
Unescape View File

@ -33,15 +33,19 @@ app.config(['$routeProvider',"$httpProvider", "$locationProvider",'config', func
.when('/class', makeRoute('class.html', 'ClassController')) .when('/class', makeRoute('class.html', 'ClassController'))
.when('/new_class', makeRoute('new_class.html', 'NewClassController')) .when('/new_class', makeRoute('new_class.html', 'NewClassController'))
.when('/edit_class', makeRoute('edit_class.html', 'EditClassController')) .when('/edit_class', makeRoute('edit_class.html', 'EditClassController'))
.when('/edit_class_group', makeRoute('edit_class_group.html', 'EditClassGroupController'))
.when('/class_list', makeRoute('class_list.html', 'ClassListController')) .when('/class_list', makeRoute('class_list.html', 'ClassListController'))
.when('/edit_class_member', makeRoute('edit_class_member.html', 'EditClassMemberController')) .when('/edit_class_member', makeRoute('edit_class_member.html', 'EditClassMemberController'))
.when('/myresource', makeRoute('myresource.html', 'MyResourceController')) .when('/myresource', makeRoute('myresource.html', 'MyResourceController'))
.when('/invite_code', {templateUrl: rootPath + 'invite_code.html', controller: 'InviteCodeController'}) .when('/invite_code', {templateUrl: rootPath + 'invite_code.html', controller: 'InviteCodeController'})
.when('/send_class_list', makeRoute('send_class_list.html', 'SendClassListController')) .when('/send_class_list', makeRoute('send_class_list.html', 'SendClassListController'))
.when('/join_class', makeRoute('join_class.html', 'JoinClassController')) .when('/join_class', makeRoute('join_class.html', 'JoinClassController'))
.when('/join_classgroup', makeRoute('join_classgroup.html', 'JoinClassGroupController'))
.when('/review_class_member', makeRoute('review_class_member.html', 'ReviewClassMemberController')) .when('/review_class_member', makeRoute('review_class_member.html', 'ReviewClassMemberController'))
.when('/select_my_coursegroup', makeRoute('select_my_coursegroup.html', 'SelectMyCourseGroupController'))
.when('/class_publishnotice', makeRoute('class_publishnotice.html', 'ClassPublishNoticeController')) .when('/class_publishnotice', makeRoute('class_publishnotice.html', 'ClassPublishNoticeController'))
.when('/class_publishissue', makeRoute('class_publishissue.html', 'ClassPublishIssueController')) .when('/class_publishissue', makeRoute('class_publishissue.html', 'ClassPublishIssueController'))
.when('/class_group', makeRoute('class_group.html', 'ClassGroupController'))
.when('/project_list', makeRoute('project_list.html', 'ProjectListController')) .when('/project_list', makeRoute('project_list.html', 'ProjectListController'))
.when('/project', makeRoute('project.html', 'ProjectController')) .when('/project', makeRoute('project.html', 'ProjectController'))
.when('/edit_project_member', makeRoute('edit_project_member.html', 'EditProjectMemberController')) .when('/edit_project_member', makeRoute('edit_project_member.html', 'EditProjectMemberController'))

23
public/stylesheets/css/common.css
Unescape View File

@ -429,7 +429,7 @@ a.linkGrey3:hover {color:#000000;}
a.linkGrey4 {color:#484848;} a.linkGrey4 {color:#484848;}
a.linkGrey4:hover {color:#297fb8;} a.linkGrey4:hover {color:#297fb8;}
a.linkGrey5 {color:#484848;} a.linkGrey5 {color:#484848;}
a.linkGrey5:hover {color:#3498db;} a.linkGrey5:hover {color:#3498db !important;}
a.linkGrey6 {color:#484848 !important;} a.linkGrey6 {color:#484848 !important;}
a.linkGrey6:hover {color:#ffffff !important;} a.linkGrey6:hover {color:#ffffff !important;}
a.linkGrey7 {color:#888888;} a.linkGrey7 {color:#888888;}
@ -452,27 +452,6 @@ a.submit_btn2:hover {background-color: #297fb8;}
.wlist_select a { background-color:#48aac9; color:#fff;} .wlist_select a { background-color:#48aac9; color:#fff;}
/*add by Tim*/ /*add by Tim*/
a.linkBlue {color:#269ac9;}
a.linkBlue:hover {color:#297fb8;}
a.buttonBlue {background-color:#269ac9;}
a.buttonBlue:hover {background-color:#297fb8;}
a.linkGrey {color:#484848;}
a.linkGrey:hover {color:#269ac9;}
a.bBlue {background-color:#3498db;}
a.bBlue:hover {background-color:#297fb8;}
.fontGrey {color:#cecece;}
.fontGrey2 {color:#888888;}
a.linkBlue2 {color:#3498db;}
a.linkBlue2:hover {color:#297fb8;}
a.linkOrange {color:#ff7143;}
a.linkGrey2 {color:#888888;}
a.linkGrey2:hover {color:#484848;}
a.linkGrey4 {color:#484848;}
a.linkGrey5 {color:#484848;}
a.linkGrey5:hover {color:#3498db;}
a.submit_btn {border:1px solid #3498db; padding:3px 10px; border-radius:3px; color:#3498db;}
a.submit_btn:hover {background-color:#3498db; color:#ffffff;}
input.submit_btn {border:1px solid #3498db; padding:3px 10px; border-radius:3px; color:#3498db;} input.submit_btn {border:1px solid #3498db; padding:3px 10px; border-radius:3px; color:#3498db;}
input.submit_btn:hover {background-color:#3498db; color:#ffffff;} input.submit_btn:hover {background-color:#3498db; color:#ffffff;}
a.yellowBtn{ display:inline-block;color:#0d90c3; height:22px;} a.yellowBtn{ display:inline-block;color:#0d90c3; height:22px;}

4
public/stylesheets/css/project.css
Unescape View File

@ -555,3 +555,7 @@ a:hover.upload_btn_grey{background:#8a8a8a;}
.icons_project_star{background: url(/images/syllabus/sy_icons_star.png) 0px -27px no-repeat; width:20px; height:20px; display:block; float:left;} .icons_project_star{background: url(/images/syllabus/sy_icons_star.png) 0px -27px no-repeat; width:20px; height:20px; display:block; float:left;}
.new_projectlist_more{ text-align:center;} .new_projectlist_more{ text-align:center;}
.new_projectlist_more a:hover{ color:#3b94d6;} .new_projectlist_more a:hover{ color:#3b94d6;}
/*发布新样式*/
.publish-icon {background:url("/images/new_project/icons_issue.png") 0px -82px no-repeat; width:18px; height:18px; display:block;}
.publish-icon:hover {background:url("/images/new_project/icons_issue.png") -25px -82px no-repeat;}

9
public/stylesheets/css/structure.css
Unescape View File

@ -596,7 +596,7 @@ a.user_leftinfo_img { display:block; width:80px; height:80px; margin:15px auto;}
.user_sub_menu li a:hover,.user_sub_menu li a:target { color:#3b94d6; background:#fff url(/images/user/user_navmore_icons.png) 0px 0px no-repeat;} .user_sub_menu li a:hover,.user_sub_menu li a:target { color:#3b94d6; background:#fff url(/images/user/user_navmore_icons.png) 0px 0px no-repeat;}
.user_sub_menu li a:hover,.user_sub_menu li a:target{} .user_sub_menu li a:hover,.user_sub_menu li a:target{}
.user_sub_menu li:last-child a { } .user_sub_menu li:last-child a { }
.user_sub_menu li p {padding:0 15px 0 25px; border:1px solid #e5e5e5; border-bottom:none; background:#f8f8f8;} .user_sub_menu li p {padding:0 18px 0 25px; border:1px solid #e5e5e5; border-bottom:none; background:#f8f8f8;}
.user_sub_menu li p:hover {background:#fff;} .user_sub_menu li p:hover {background:#fff;}
.user_sub_menu li p:hover a {background:#fff;} .user_sub_menu li p:hover a {background:#fff;}
.user_sub_menu li p:hover,.user_sub_menu li p:target {color:#3b94d6; background:#fff url(/images/user/user_navmore_icons.png) 0px 0px no-repeat;} .user_sub_menu li p:hover,.user_sub_menu li p:target {color:#3b94d6; background:#fff url(/images/user/user_navmore_icons.png) 0px 0px no-repeat;}
@ -640,9 +640,12 @@ a.user_navmorebox .user_icons_closeclass{
background:url(/images/user/icons_user_leftnav.png) -25px -347px no-repeat; background:url(/images/user/icons_user_leftnav.png) -25px -347px no-repeat;
} }
.show-all-sub {position:absolute; top:18px; right:15px;} .show-all-sub {position:absolute; top:18px; right:15px;}
.sub-menu-title {position:absolute; border:1px solid #ddd; background-color:#fff; padding:2px 5px; z-index:99; white-space:nowrap; left:25px; top:35px; display:none;} .sub-menu-title {position:absolute; background-color:#fff; padding:5px 10px; z-index:99; white-space:nowrap; top:-2px; box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5); display:none; color:#aaa;}
.sub-menu-title div a {background-color:#fff; height:auto; line-height:1; font-size:12px; color:#aaa;}
.sub-menu-title em {display:block; border-width:8px; position:absolute;top:16px; right:-16px; border-style:dashed dashed dashed solid; border-color:transparent transparent transparent #fff; font-size:0; line-height:0; z-index:1;}
.sub-menu-title font {display:block; border-width:8px; position:absolute;top:17px; right:-17px; border-style:dashed dashed dashed solid; border-color:transparent transparent transparent rgba(146, 153, 169, 0.5); font-size:0; line-height:0;}
/* 个人主页左侧导航更多功能 */ /* 个人主页左侧导航更多功能 */
.user_navmore_box {position:absolute; width:15px; height:15px; right:13px; top:17px; cursor:pointer;} .user_navmore_box {position:absolute; width:15px; height:15px; right:12px; top:17px; cursor:pointer;}
.user_navmore_box ul li:hover ul {display:block; } .user_navmore_box ul li:hover ul {display:block; }
.user_navmore_icons {background:url(/images/user/icons_user_leftnav.png) -15px -34px no-repeat; width:19px; height:15px; } .user_navmore_icons {background:url(/images/user/icons_user_leftnav.png) -15px -34px no-repeat; width:19px; height:15px; }
.user_navmore_icons:hover {background:url(/images/user/icons_user_leftnav.png) -30px -34px no-repeat;} .user_navmore_icons:hover {background:url(/images/user/icons_user_leftnav.png) -30px -34px no-repeat;}

2
public/stylesheets/nyan.css
Unescape View File

@ -1447,7 +1447,7 @@ ul.contest-notification-list li span{
.xls { .xls {
/*background: url('../images/icon_excel.gif') no-repeat scroll 1px 50% transparent;*/ /*background: url('../images/icon_excel.gif') no-repeat scroll 1px 50% transparent;*/
/*padding: 2px 0px 3px 16px;*/ /*padding: 2px 0px 3px 16px;*/
font-family:微软雅黑 !important; font-family:"微软雅黑" !important;
font-size: 12px !important; font-size: 12px !important;
color: #136b3b !important; color: #136b3b !important;
font-weight:normal !important; font-weight:normal !important;

6
public/stylesheets/sy_public.css
Unescape View File

@ -38,7 +38,7 @@ a.hw_btn_green2{
border:1px solid #60b25e; border:1px solid #60b25e;
background:#fff; background:#fff;
text-align: center; text-align: center;
font-size: 14px; font-size: 12px;
padding:0 10px; padding:0 10px;
height: 30px; height: 30px;
line-height: 30px; line-height: 30px;
@ -71,14 +71,14 @@ a:hover.hw_corange{ color: #e1412b;}
.hw_cir_lorange{ background:#f79981;} .hw_cir_lorange{ background:#f79981;}
.hw_cir_lgreen{ background:#7ecfa2;} .hw_cir_lgreen{ background:#7ecfa2;}
.hw_w20{ width:20px; display:block; text-align:center;} .hw_w20{ width:20px; display:block; text-align:center;}
.hw_w20{ width:20px; display:block; text-align:center;} .hw_w30{ width:30px; display:block; text-align:center;}
/* 按钮*/ /* 按钮*/
a.btn_orange_big{ a.btn_orange_big{
display:inline-block; display:inline-block;
border: 1px solid #ee4a1f; border: 1px solid #ee4a1f;
color: #ee4a1f; color: #ee4a1f;
text-align: center; text-align: center;
font-size: 14px; font-size: 12px;
padding:0 10px; padding:0 10px;
height: 30px; height: 30px;
line-height: 30px; line-height: 30px;

5
public/stylesheets/weui/weixin.css
Unescape View File

@ -43,6 +43,7 @@ blockquote {border:1px solid #d4d4d4; padding: 0.6em; margin: 5px 0.4em 5px 1.4e
.mr25 {margin-right:25px;} .mr25 {margin-right:25px;}
.ml55 {margin-left:55px;} .ml55 {margin-left:55px;}
.mr55 {margin-right:55px;} .mr55 {margin-right:55px;}
.ml65 {margin-left:65px;}
.c-red {color:#e81a1a;} .c-red {color:#e81a1a;}
.c-blue {color:#269ac9;} .c-blue {color:#269ac9;}
.c-grey {color:#9a9a9a !important;} .c-grey {color:#9a9a9a !important;}
@ -147,7 +148,7 @@ a.underline {text-decoration:underline;}
.post-dynamic-author {width:50%; height:30px; line-height:30px; font-size:14px; color:#5b5b5b; vertical-align:middle;} .post-dynamic-author {width:50%; height:30px; line-height:30px; font-size:14px; color:#5b5b5b; vertical-align:middle;}
.post-dynamic-time {height:30px; line-height:30px; vertical-align:middle;} .post-dynamic-time {height:30px; line-height:30px; vertical-align:middle;}
.post-dynamic-title {font-size:15px;} .post-dynamic-title {font-size:15px;}
.post-dynamic-from {width:50%; font-size:13px;} .post-dynamic-from {width:55%; font-size:13px;}
.post-box-shadow {box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5);} .post-box-shadow {box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5);}
.post-reply-author {width:50%; height:20px; line-height:20px; font-size:12px; color:#5d5d5d; vertical-align:middle;} .post-reply-author {width:50%; height:20px; line-height:20px; font-size:12px; color:#5d5d5d; vertical-align:middle;}
.post-reply-time {height:20px; line-height:20px; vertical-align:middle;} .post-reply-time {height:20px; line-height:20px; vertical-align:middle;}
@ -203,7 +204,7 @@ a.underline {text-decoration:underline;}
.img-circle {border-radius:50% !important;} .img-circle {border-radius:50% !important;}
.member-banner {height:24px; line-height:24px; text-align:center; vertical-align:middle; background-color:#dfdfdf;} .member-banner {height:24px; line-height:24px; text-align:center; vertical-align:middle; background-color:#dfdfdf;}
.resource-width {width:76%;} .resource-width {width:76%;}
.courseware-from-width {max-width:57%;} .courseware-from-width {max-width:50%;}
.other-from-width {max-width:80%;} .other-from-width {max-width:80%;}
.course-name-width {width:68%;} .course-name-width {width:68%;}

Write Preview
Loading…
Cancel
Save