+
{{project.name}}
>
{{project.member_count}}人
diff --git a/public/javascripts/wechat/controllers/class.js b/public/javascripts/wechat/controllers/class.js
index 75e1709cc..d28d9a6aa 100644
--- a/public/javascripts/wechat/controllers/class.js
+++ b/public/javascripts/wechat/controllers/class.js
@@ -139,11 +139,19 @@ app.controller('ClassController', ['$scope', 'config','$http', 'auth','$location
var resetMenu = function(is_teacher){
vm.isTeacher = is_teacher;
if(is_teacher){
- vm.menus = ["课件", "作业", "小测验", "学生管理"];
+ vm.menus = ["课件", "作业", "测验", "成员管理"];
} else {
vm.menus = ['课件', "我的同学"];
}
}
+ vm.onSetting = function(user){
+ rms.save('current_edit_member', user);
+ $location.path("/edit_class_member").search({id: courseid,user_id: user.id});
+ };
+
+
+
+
}]);
\ 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 5f377e594..0a09ce1e3 100644
--- a/public/javascripts/wechat/controllers/edit_class.js
+++ b/public/javascripts/wechat/controllers/edit_class.js
@@ -47,7 +47,7 @@ app.controller('EditClassController', ['$scope', '$http', 'auth', 'config', 'ale
token: auth.token()
}).then(function(response){
if(response.data.status!=0){
- vm.alertService_1.showMessage('出错了', response.data.message);
+ vm.alertService_1.showMessage('提示', response.data.message);
} else {
vm.alertService_1.showMessage('提示', '删除班级成功', function(){
vm.syllabus.courses.splice(index, 1);
diff --git a/public/javascripts/wechat/controllers/edit_class_member.js b/public/javascripts/wechat/controllers/edit_class_member.js
new file mode 100644
index 000000000..4de6213d9
--- /dev/null
+++ b/public/javascripts/wechat/controllers/edit_class_member.js
@@ -0,0 +1,71 @@
+
+
+app.controller('EditClassMemberController', ['$scope', '$http', 'auth', 'config', 'alertService','$location','$routeParams','rms', function($scope, $http, auth, config, alertService, $location,$routeParams, rms){
+ var vm = $scope;
+
+// vm.current_edit_member = rms.get('current_edit_member');
+ vm.current_edit_member = null;
+
+ vm.alertService = alertService.create();
+
+ var course_id = $routeParams.id;
+ var user_id = $routeParams.user_id;
+ 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);
+ } else {
+ course_id = response.data.course_id;
+ user_id = response.data.user_id;
+ vm.current_edit_member = response.data.member_info;
+ vm.current_roles_id = vm.current_edit_member.roles_id;
+ }
+ });
+ }
+
+ console.log(vm.current_edit_member);
+
+ vm.cancel = function(){
+ vm.alertService.showMessage('提示', '您确定不对角色进行变更吗？', function(){
+// rms.save("project_master_members",[]);
+// rms.save("project_develop_members",[]);
+// rms.save("project_report_members",[]);
+ window.history.back();
+// $location.path("/project").search({id: project_id});
+ });
+ };
+
+ vm.edit_member_role = function(){
+ if(vm.current_roles_id == vm.current_edit_member.roles_id){
+ vm.alertService.showMessage('提示', "该用户当前已是该角色");
+ return;
+ }
+
+ $http.post(config.apiUrl+'courses/edit_member_role', {
+ token: auth.token(),
+ id: course_id,
+ user_id:vm.current_edit_member.user.id,
+ role_id:vm.current_edit_member.roles_id
+ }).then(function(response){
+ if(response.data.status!=0){
+ vm.alertService.showMessage('提示', response.data.message);
+ } else {
+ vm.alertService.showMessage('提示', '修改角色成功', function(){
+// window.history.back();
+ $location.path("/class").search({id: course_id});
+ });
+ }
+ });
+
+
+ };
+
+ vm.selectRole = function(role_id){
+ vm.current_edit_member.roles_id = role_id;
+ }
+
+}] );
\ No newline at end of file
diff --git a/public/javascripts/wechat/controllers/edit_project_member.js b/public/javascripts/wechat/controllers/edit_project_member.js
new file mode 100644
index 000000000..b7725c954
--- /dev/null
+++ b/public/javascripts/wechat/controllers/edit_project_member.js
@@ -0,0 +1,80 @@
+
+
+app.controller('EditProjectMemberController', ['$scope', '$http', 'auth', 'config', 'alertService','$location','$routeParams','rms', function($scope, $http, auth, config, alertService, $location,$routeParams, rms){
+ var vm = $scope;
+
+// vm.current_edit_member = rms.get('current_edit_member');
+
+ vm.current_edit_member = null;
+
+ vm.alertService = alertService.create();
+
+ var project_id = $routeParams.id;
+ var user_id = $routeParams.user_id;
+ if(!vm.current_edit_member){
+ $http.post(config.apiUrl+'projects/get_member_info', {
+ token: auth.token(),
+ id: project_id,
+ user_id:user_id
+ }).then(function(response){
+ if(response.data.status!=0){
+ vm.alertService.showMessage('提示', response.data.message);
+ } else {
+ project_id = response.data.project_id;
+ user_id = response.data.user_id;
+ vm.current_edit_member = response.data.member_info;
+ vm.current_roles_id = vm.current_edit_member.roles_id;
+ }
+ });
+ }
+
+ console.log(vm.current_edit_member);
+
+ vm.cancel = function(){
+ vm.alertService.showMessage('提示', '您确定不对角色进行变更吗？', function(){
+// rms.save("project_master_members",[]);
+// rms.save("project_develop_members",[]);
+// rms.save("project_report_members",[]);
+ window.history.back();
+// $location.path("/project").search({id: project_id});
+ });
+ };
+
+ vm.edit_member_role = function(){
+ if(vm.current_roles_id == vm.current_edit_member.roles_id){
+ vm.alertService.showMessage('提示', "该用户当前已是该角色");
+ return;
+ }
+
+ $http.post(config.apiUrl+'projects/edit_member_role', {
+ token: auth.token(),
+ id: project_id,
+ user_id:vm.current_edit_member.user.id,
+ role_id:vm.current_edit_member.roles_id
+ }).then(function(response){
+ if(response.data.status!=0){
+ vm.alertService.showMessage('提示', response.data.message);
+ } else {
+ vm.alertService.showMessage('提示', '修改角色成功', function(){
+ rms.save('project_activities_page',0);
+ rms.save("project_activities",[]);
+ rms.save("project_has_more",false);
+ rms.save("project",null);
+ rms.save("project_master_members",[]);
+ rms.save("project_develop_members",[]);
+ rms.save("project_report_members",[]);
+ rms.save('tab_num',null);
+// window.history.back();
+ $location.path("/project").search({id: project_id});
+ });
+ }
+ });
+
+
+ };
+
+ vm.selectRole = function(role_id){
+ vm.current_edit_member.roles_id = role_id;
+ }
+
+}] );
\ No newline at end of file
diff --git a/public/javascripts/wechat/controllers/new_project.js b/public/javascripts/wechat/controllers/new_project.js
new file mode 100644
index 000000000..6eb6a1caa
--- /dev/null
+++ b/public/javascripts/wechat/controllers/new_project.js
@@ -0,0 +1,47 @@
+
+
+app.controller('NewProjectController', ['$scope', '$http', 'auth', 'config', 'alertService','$location','rms', function($scope, $http, auth, config, alertService, $location,rms){
+ var vm = $scope;
+
+ vm.alertService = alertService.create();
+
+ vm.project = {
+ name:""
+ };
+
+ vm.addClass = function(){
+ vm.syllabus.courses.push({});
+ };
+
+ vm.deleteClass = function(index){
+ vm.syllabus.courses.splice(index, 1);
+ }
+
+ vm.newProject = function (frm, project) {
+ frm.$setSubmitted();
+ console.log(project);
+
+ if(!frm.$valid){
+ console.log(frm.$error);
+ return;
+ }
+
+ $http.post(config.apiUrl+"projects/create", {
+ token: auth.token(),
+ name: project.name
+ }).then(function(response){
+ if(response.data.status!=0){
+ vm.alertService.showMessage('出错了', response.data.message);
+ } else {
+ vm.alertService.showMessage('提示', '新建项目成功', function(){
+// window.history.back();
+ rms.save('projects',[]);
+ $location.path("/project_list");
+ });
+ }
+ console.log(response.data.data);
+ });
+
+ }
+
+}] );
\ No newline at end of file
diff --git a/public/javascripts/wechat/controllers/project.js b/public/javascripts/wechat/controllers/project.js
index 569ea3dd3..6c97c9efc 100644
--- a/public/javascripts/wechat/controllers/project.js
+++ b/public/javascripts/wechat/controllers/project.js
@@ -10,10 +10,15 @@ app.controller('ProjectController', ['$scope', 'config','$http','$timeout', 'aut
vm.project_activities = rms.get("project_activities") || [];
vm.project_has_more = rms.get("project_has_more");
- vm.project = rms.get("project")
+ vm.project = rms.get("project") || null;
- vm.project_members = [];
- vm.project_members_page = 0;
+
+// vm.project_members_page = rms.get('project_members_page') || 0;
+ vm.project_master_members = rms.get("project_master_members") || [];
+ vm.project_develop_members = rms.get("project_develop_members") || [];
+ vm.project_report_members = rms.get("project_report_members") || [];
+
+// vm.project_members_has_more = rms.get("project_members_has_more");
vm.alertService = alertService.create();
@@ -25,17 +30,55 @@ app.controller('ProjectController', ['$scope', 'config','$http','$timeout', 'aut
data:{token:auth.token(),page:page}
}).then(function successCallback(response) {
console.log(response.data);
- vm.project_activities_page = response.data.page;
- if(response.data.page > 0)
- {
- vm.project_activities = vm.project_activities.concat(response.data.data);
+ if(response.data.status == 0){
+ vm.project_activities_page = response.data.page;
+ if(response.data.page > 0)
+ {
+ vm.project_activities = vm.project_activities.concat(response.data.data);
+ }
+ else{
+ vm.project_activities = response.data.data;
+ vm.project_activities_page = 0;
+ vm.project_has_more = (response.data.count + response.data.page * 10) < response.data.all_count;
+ }
+ }
+ else{
+ vm.alertService.showMessage('提示', response.data.message);
+ }
+
+
+ }, function errorCallback(response) {
+ });
+ }
+
+ vm.getMembers = function(page){
+ $http({
+ method: 'POST',
+ url: apiUrl + "projects/members?id=" + projectid,
+ data:{token:auth.token(),page:page}
+ }).then(function successCallback(response) {
+ console.log(response.data);
+ if(response.data.status == 0){
+// vm.project_members_page = response.data.page;
+// if(response.data.page > 0)
+// {
+// vm.project_members = vm.project_members.concat(response.data.data);
+// }
+// else{
+// vm.project_members = response.data.data;
+// vm.project_members_page = 0;
+// vm.project_members_has_more = (response.data.count + response.data.page * 10) < response.data.all_count;
+// }
+ vm.project_master_members = response.data.master_members;
+ vm.project_develop_members = response.data.develop_members;
+ vm.project_report_members = response.data.report_members;
+
}
else{
- vm.project_activities = response.data.data;
- vm.project_activities_page = 0;
- vm.project_has_more = (response.data.count + response.data.page * 10) < response.data.all_count;
+ vm.alertService.showMessage('提示', response.data.message);
}
+
}, function errorCallback(response) {
});
}
@@ -53,19 +96,14 @@ app.controller('ProjectController', ['$scope', 'config','$http','$timeout', 'aut
vm.currentTab = index;
vm.searchText = '';
- if(index == 1){
+ if(index == 1 && vm.project_activities.length <= 0 ){
vm.getActivities(0);
}
- else if(index == 2){
- $http.get(config.apiUrl + 'projects/members?token='+auth.token()+'&project_id='+projectid).then(
- function(response) {
- console.log(response.data);
- vm.project_activities = response.data.data;
- }
- )
+ else if(index == 2 && vm.project_master_members.length <= 0){
+ vm.getMembers(0);
}
- rms.save("tab_num",$scope.currentTab);
+ rms.save("tab_num",vm.currentTab);
};
//初始化TAB按钮
@@ -75,7 +113,6 @@ app.controller('ProjectController', ['$scope', 'config','$http','$timeout', 'aut
} else {
vm.menus = ['项目动态', "我的伙伴"];
}
-
}
if(vm.project){
resetMenu(vm.project.can_setting);
@@ -134,4 +171,19 @@ app.controller('ProjectController', ['$scope', 'config','$http','$timeout', 'aut
common.decreaseCommonPraise(act);
};
+ vm.onSetting = function(data){
+ rms.save('current_edit_member', data);
+
+ rms.save('project_activities_page',vm.project_activities_page);
+ rms.save("project_activities",vm.project_activities);
+ rms.save("project_has_more",vm.project_has_more);
+
+ rms.save("project",vm.project);
+ rms.save("project_master_members",vm.project_master_members);
+ rms.save("project_develop_members",vm.project_develop_members);
+ rms.save("project_report_members",vm.project_report_members);
+
+ $location.path("/edit_project_member").search({id: projectid,user_id: data.user.id});
+ };
+
}]);
\ No newline at end of file
diff --git a/public/javascripts/wechat/controllers/project_list.js b/public/javascripts/wechat/controllers/project_list.js
index 4576a81ef..ffa4ef9c0 100644
--- a/public/javascripts/wechat/controllers/project_list.js
+++ b/public/javascripts/wechat/controllers/project_list.js
@@ -6,7 +6,8 @@
app.controller('ProjectListController', ['$scope', 'config', 'auth', '$http', '$location', 'alertService','rms',
function ($scope, config, auth, $http, $location, alertService,rms) {
var vm = $scope;
- vm.projects = rms.get('projects') || [];
+// vm.projects = rms.get('projects') || [];
+ vm.projects = [];
vm.alertService_1 = alertService.create();
vm.alertService_3 = alertService.create();
@@ -26,29 +27,27 @@ app.controller('ProjectListController', ['$scope', 'config', 'auth', '$http', '$
}
vm.goProject = function (project_id) {
+
+ rms.save('project_activities_page',0);
+ rms.save("project_activities",[]);
+ rms.save("project_has_more",false);
+ rms.save("project",null);
+ rms.save('project_members_page',0);
+ rms.save("project_members",[]);
+ rms.save("project_members_has_more",false);
+ rms.save('tab_num',null);
console.log(project_id);
$location.path("/project").search({id: project_id});
- }
+ };
vm.newProject = function () {
- //先判断下权限
- $http.post(config.apiUrl + "projects/auth",{token: auth.token()} ).then(
- function (response) {
- console.log(response.data);
- if (response.data.auth == 0) {
- vm.alertService_1.showMessage('提示', '非教师身份不能创建课程哦~');
- }
- else{
- $location.path("/new_project");
- }
- }
- );
- }
+ $location.path("/new_project");
+ };
vm.joinProject = function () {
vm.alertService_3.showMessage('提示', '请输入6位项目邀请码(不区分大小写)', function(){
- if (vm.alertService_3.invite && vm.alertService_3.invite.length == 5) {
- $http.post(config.apiUrl + "courses/join", {
+ if (vm.alertService_3.invite && vm.alertService_3.invite.length == 6) {
+ $http.post(config.apiUrl + "projects/join", {
token: auth.token(),
invite_code: vm.alertService_3.invite
}).then(function (response) {
@@ -58,7 +57,7 @@ app.controller('ProjectListController', ['$scope', 'config', 'auth', '$http', '$
} else {
vm.alertService_1.showMessage('提示', '加入项目成功');
vm.alertService_3.invite = "";
- loadClassList();
+ loadProjectList();
}
});
} else {
diff --git a/public/javascripts/wechat/others/routes.js b/public/javascripts/wechat/others/routes.js
index 458f45360..a2b57d7e9 100644
--- a/public/javascripts/wechat/others/routes.js
+++ b/public/javascripts/wechat/others/routes.js
@@ -34,11 +34,14 @@ app.config(['$routeProvider',"$httpProvider", "$locationProvider",'config', func
.when('/new_class', makeRoute('new_class.html', 'NewClassController'))
.when('/edit_class', makeRoute('edit_class.html', 'EditClassController'))
.when('/class_list', makeRoute('class_list.html', 'ClassListController'))
+ .when('/edit_class_member', makeRoute('edit_class_member.html', 'EditClassMemberController'))
.when('/myresource', makeRoute('myresource.html', 'MyResourceController'))
.when('/invite_code', {templateUrl: rootPath + 'invite_code.html', controller: 'InviteCodeController'})
.when('/send_class_list', makeRoute('send_class_list.html', 'SendClassListController'))
.when('/project_list', makeRoute('project_list.html', 'ProjectListController'))
.when('/project', makeRoute('project.html', 'ProjectController'))
+ .when('/edit_project_member', makeRoute('edit_project_member.html', 'EditProjectMemberController'))
+ .when('/new_project', makeRoute('new_project.html', 'NewProjectController'))
.otherwise({
redirectTo: '/activites'
});
diff --git a/public/stylesheets/weui/weixin.css b/public/stylesheets/weui/weixin.css
index 9eb8a670b..bf8ee0bad 100644
--- a/public/stylesheets/weui/weixin.css
+++ b/public/stylesheets/weui/weixin.css
@@ -191,9 +191,9 @@ a.underline {text-decoration:underline;}
.class-detail-search {width:100%; height:33px; color:#999; background-color:#fff; border:none; outline:none;}
.border-top {border-top:1px solid #ccc;}
.class-detail-row {width:100%; line-height:18px; padding:10px 0; border-bottom:1px solid #ccc; background-color:#fff;}
-.class-member-row {width:100%; line-height:18px; padding:5px 0; border-bottom:1px solid #ccc; background-color:#fff;}
+.class-member-row {width:100%; line-height:18px; padding:5px 0; border-bottom:1px solid #ccc; background-color:#fff; position:relative;}
.class-test-tip {text-align:center; font-size:13px; color:#444; padding-top:40px;}
-.img-circle {border-radius:50%;}
+.img-circle {border-radius:50% !important;}
.member-banner {height:24px; line-height:24px; text-align:center; vertical-align:middle; background-color:#dfdfdf;}
.resource-width {width:76%;}
.courseware-from-width {max-width:57%;}
- 
+ 
+
+