diff --git a/public/assets/wechat/review_class_member.html b/public/assets/wechat/review_class_member.html
index e066c48f0..b1f0dacc5 100644
--- a/public/assets/wechat/review_class_member.html
+++ b/public/assets/wechat/review_class_member.html
@@ -2,7 +2,7 @@
-
{{current_course.name}}
+
{{current_course.syllabus_title}}·{{current_course.name}}
![]()
{{current_review_member.realname == "" ? current_review_member.name : current_review_member.realname}}![]()
角色
-
{{current_course.name}}
+
{{current_course.syllabus_title}}·{{current_course.name}}
{{tip_2}}
diff --git a/public/assets/wechat/select_my_coursegroup.html b/public/assets/wechat/select_my_coursegroup.html
new file mode 100644
index 000000000..cc7a65753
--- /dev/null
+++ b/public/assets/wechat/select_my_coursegroup.html
@@ -0,0 +1,28 @@
+
+
+
+
我的信息
+
![]()
{{current_edit_member.user.realname == "" ? current_edit_member.user.name : current_edit_member.user.realname}}![]()
+
角色
+
学生
+
选择分班
+
+
+
+
+
+
{{tip_1}}
+
{{tip_2}}
+
+
+
diff --git a/public/javascripts/wechat/controllers/class.js b/public/javascripts/wechat/controllers/class.js
index ea394a1ff..70c5d839d 100644
--- a/public/javascripts/wechat/controllers/class.js
+++ b/public/javascripts/wechat/controllers/class.js
@@ -247,7 +247,6 @@ app.controller('ClassController', ['$scope', 'config','$http', 'auth','$location
resetMenu(vm.course.current_user_is_teacher,vm.currentTab);
}
-
vm.onSetting = function(user){
rms.save('current_edit_member', user);
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});
};
+ 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){
rms.save('current_review_member', user);
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});
+ }
+ }
}]);
\ No newline at end of file
diff --git a/public/javascripts/wechat/controllers/class_group.js b/public/javascripts/wechat/controllers/class_group.js
new file mode 100644
index 000000000..77de92332
--- /dev/null
+++ b/public/javascripts/wechat/controllers/class_group.js
@@ -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});
+ }
+
+}]);
\ No newline at end of file
diff --git a/public/javascripts/wechat/controllers/edit_class.js b/public/javascripts/wechat/controllers/edit_class.js
index d61c25353..6cb50da1a 100644
--- a/public/javascripts/wechat/controllers/edit_class.js
+++ b/public/javascripts/wechat/controllers/edit_class.js
@@ -63,7 +63,7 @@ app.controller('EditClassController', ['$scope', '$http', 'auth', 'config', 'ale
vm.syllabus.courses.splice(index, 1);
}
- }
+ };
vm.newClass = function (frm, syllabus) {
frm.$setSubmitted();
diff --git a/public/javascripts/wechat/controllers/edit_class_group.js b/public/javascripts/wechat/controllers/edit_class_group.js
new file mode 100644
index 000000000..e80b35869
--- /dev/null
+++ b/public/javascripts/wechat/controllers/edit_class_group.js
@@ -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
赞
{{course.name}} 
@@ -256,12 +256,15 @@
+