diff --git a/app/api/mobile/apis/resources.rb b/app/api/mobile/apis/resources.rb index c2fcfa754..6dfe8e599 100644 --- a/app/api/mobile/apis/resources.rb +++ b/app/api/mobile/apis/resources.rb @@ -56,7 +56,7 @@ module Mobile authenticate! rs = ResourcesService.new - ori, flag, save_message = rs.send_resource_to_course(params) + ori, flag, save_message = rs.send_resource_to_course(current_user,params) if flag present :status, 0 else diff --git a/app/api/mobile/apis/syllabuses.rb b/app/api/mobile/apis/syllabuses.rb index 682929a90..57db4cb9e 100644 --- a/app/api/mobile/apis/syllabuses.rb +++ b/app/api/mobile/apis/syllabuses.rb @@ -28,7 +28,7 @@ module Mobile ss = SyllabusesService.new sy = ::Syllabus.find(params[:id]) - + sy.courses = sy.courses.not_deleted sy = ss.judge_can_setting(sy,current_user) present :data, sy, with: Mobile::Entities::Syllabus diff --git a/app/services/resources_service.rb b/app/services/resources_service.rb index 827fc3efd..a0fec585a 100644 --- a/app/services/resources_service.rb +++ b/app/services/resources_service.rb @@ -3,7 +3,7 @@ class ResourcesService #发送资源到课程 - def send_resource_to_course params + def send_resource_to_course user,params send_id = params[:send_id] @ori = Attachment.find_by_id(send_id) course_ids = params[:course_ids] @@ -26,7 +26,7 @@ class ResourcesService attach_copied_obj.tag_list.add(@ori.tag_list) # tag关联 attach_copied_obj.container = Course.find(id) attach_copied_obj.created_on = Time.now - attach_copied_obj.author_id = User.current.id + attach_copied_obj.author_id = user.id attach_copied_obj.is_public = 0 attach_copied_obj.copy_from = @ori.copy_from.nil? ? @ori.id : @ori.copy_from #发送要添加copy_from if attach_copied_obj.attachtype == nil diff --git a/app/services/syllabuses_service.rb b/app/services/syllabuses_service.rb index 28f52a8be..c0750890a 100644 --- a/app/services/syllabuses_service.rb +++ b/app/services/syllabuses_service.rb @@ -46,28 +46,16 @@ class SyllabusesService courses = user.courses.not_deleted syllabus_ids = courses.empty? ? '(-1)' : "(" + courses.map{|course| !course.syllabus_id.nil? && course.syllabus_id}.join(",") + ")" syllabuses = Syllabus.where("id in #{syllabus_ids} or user_id = #{user.id}").order("updated_at desc") + + user.syllabuses.each do |syllabus| + syllabus.courses = syllabus.courses.not_deleted + end + syllabuses.to_a << other #管理权限 can_setting syllabuses.each do |s| - s = judge_can_setting(s,user) - - # s[:can_setting] = s.user_id == user.id ? true : false - # s.courses.each do |c| - # c[:can_setting] = false - # - # member = c.members.where("user_id=#{user.id} and course_id=#{c.id}")[0] - # roleName = member.roles[0].name if member - # - # if roleName && (roleName == "TeachingAsistant" || roleName == "Teacher" ) - # c[:can_setting] = true - # end - # - # if c.tea_id == user.id - # c[:can_setting] = true - # end - # end end syllabuses @@ -138,8 +126,8 @@ class SyllabusesService #新增班级 add_courses = option[:add_courses] add_courses.each do |c| - course = ::Course.new(c) - course.name = add_courses + course = Course.new() + course.name = c course.tea_id = user.id course.syllabus_id = sy.id course.update_default_value diff --git a/public/assets/wechat/class.html b/public/assets/wechat/class.html index fa52c9ea4..6f8354259 100644 --- a/public/assets/wechat/class.html +++ b/public/assets/wechat/class.html @@ -1,18 +1,21 @@
{{course.name}}邀请码
-
+
+ {{menu}} +
+ -
- -
-
-
-
+ + + + + + -
-
+ +
diff --git a/public/assets/wechat/send_class_list.html b/public/assets/wechat/send_class_list.html index 699d6c34f..6d1860e0c 100644 --- a/public/assets/wechat/send_class_list.html +++ b/public/assets/wechat/send_class_list.html @@ -5,10 +5,10 @@
发送课程列表
-
+
{{syllabus.title}}
    -
    • +
diff --git a/public/javascripts/wechat/build/app.min.js b/public/javascripts/wechat/build/app.min.js index ea8984ad0..bec28a587 100644 --- a/public/javascripts/wechat/build/app.min.js +++ b/public/javascripts/wechat/build/app.min.js @@ -3,7 +3,7 @@ app.factory("alertService",function(){function t(){this.title=null,this.message= app.filter("safeHtml",["$sce",function(t){return function(n){return t.trustAsHtml(n)}}]),app.filter("identify",function(){return function(t){return"TeachingAsistant"==t?"教辅":""}}); app.controller("ActivityController",["$anchorScroll","$location","$scope","$http","$timeout","auth","rms","common","alertService",function(e,a,t,c,o,i,r,s,n){t.replaceUrl=function(e){return e},t.menus=["所有动态","课程动态","项目动态"],t.alertService=n.create(),console.log("ActivityController load"),t.page=r.get("page")||0,t.activities=r.get("activities")||[],t.has_more=r.get("has_more"),t.course_page=r.get("course_page")||0,t.course_activities=r.get("course_activities")||[],t.course_has_more=r.get("course_has_more"),t.project_page=r.get("project_page")||0,t.project_activities=r.get("project_activities")||[],t.project_has_more=r.get("project_has_more"),t.loadActData=function(e,a){switch(container_type="All",e){case 1:container_type="All",t.page=a;break;case 2:container_type="Course",t.course_page=a;break;case 3:container_type="Project",t.project_page=a}c({method:"POST",url:apiUrl+"activities",data:{token:i.token(),page:a,container_type:container_type}}).then(function(e){if(e.data.page>0)switch(e.data.container_type){case"All":t.activities=t.activities.concat(e.data.data);break;case"Course":t.course_activities=t.course_activities.concat(e.data.data);break;case"Project":t.project_activities=t.project_activities.concat(e.data.data);break;case 3:}else switch(e.data.container_type){case"All":t.activities=e.data.data;break;case"Course":t.course_activities=e.data.data;break;case"Project":t.project_activities=e.data.data;break;case 3:}switch(e.data.container_type){case"All":r.save("activities",t.activities),t.has_more=e.data.count+10*e.data.page