parent
1ae23bafe4
commit
653b98d832
@ -0,0 +1,35 @@
|
|||||||
|
module Mobile
|
||||||
|
module Entities
|
||||||
|
class ProjectMember < Grape::Entity
|
||||||
|
include Redmine::I18n
|
||||||
|
include ApplicationHelper
|
||||||
|
include ApiHelper
|
||||||
|
def self.member_expose(f)
|
||||||
|
expose f do |u,opt|
|
||||||
|
if u.is_a?(Hash) && u.key?(f)
|
||||||
|
u[f]
|
||||||
|
elsif u.is_a?(::Member)
|
||||||
|
if u.respond_to?(f)
|
||||||
|
u.send(f)
|
||||||
|
else
|
||||||
|
case f
|
||||||
|
when :roles_id
|
||||||
|
u.roles[0].id
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
expose :user, using: Mobile::Entities::User do |c, opt|
|
||||||
|
if c.is_a?(::Member)
|
||||||
|
c.user
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
member_expose :roles_id
|
||||||
|
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
@ -0,0 +1,21 @@
|
|||||||
|
<div class="post-container">
|
||||||
|
<div loading-spinner></div>
|
||||||
|
<div ng-show="current_edit_member" class="post-container" style="padding-bottom:50px;">
|
||||||
|
<div class="blue-title">角色变更</div>
|
||||||
|
<div class="class-detail-row f13 c-grey3"><img ng-src="/images/wechat/{{current_edit_member.user.gender==0 ? 'male' : 'female'}}.jpg" 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"><span class="fl ml10">角色</span></div>
|
||||||
|
<ul class="class-list f13 c-grey3">
|
||||||
|
<li><span class="fl ml10 class-list-name hidden">教师</span><span ng-click="selectRole(9)" ng-class="['login-box', 'fr', 'mr10', 'mt12','img-circle', {'checked': current_edit_member.roles_id == 9}]"></span></li>
|
||||||
|
<li><span class="fl ml10 class-list-name hidden">教辅</span><span ng-click="selectRole(7)" ng-class="['login-box', 'fr', 'mr10', 'mt12','img-circle', {'checked': current_edit_member.roles_id == 7}]"></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','img-circle', {'checked': current_edit_member.roles_id == 10}]"></span></li>
|
||||||
|
</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="edit_member_role()" class="weixin-tab link-blue2 border-top">确定</a>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
<my-alert message="alertService.message" title="alertService.title" visible="alertService.visible" cb="alertService.cb"></my-alert>
|
||||||
|
</div>
|
||||||
@ -0,0 +1,21 @@
|
|||||||
|
<div class="post-container">
|
||||||
|
<div loading-spinner></div>
|
||||||
|
<div ng-show="current_edit_member" class="post-container" style="padding-bottom:50px;">
|
||||||
|
<div class="blue-title">角色变更</div>
|
||||||
|
<div class="class-detail-row f13 c-grey3"><img ng-src="/images/wechat/{{current_edit_member.user.gender==0 ? 'male' : 'female'}}.jpg" width="30" class="fl ml10 img-circle mt4" /><span class="fl mt10 ml10">{{current_edit_member.user.real_name == "" ? current_edit_member.user.name : current_edit_member.user.real_name}}</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"><span class="fl ml10">角色</span></div>
|
||||||
|
<ul class="class-list f13 c-grey3">
|
||||||
|
<li><span class="fl ml10 class-list-name hidden">管理人员</span><span ng-click="selectRole(3)" ng-class="['login-box', 'fr', 'mr10', 'mt12','img-circle', {'checked': current_edit_member.roles_id == 3}]"></span></li>
|
||||||
|
<li><span class="fl ml10 class-list-name hidden">开发人员</span><span ng-click="selectRole(4)" ng-class="['login-box', 'fr', 'mr10', 'mt12','img-circle', {'checked': current_edit_member.roles_id == 4}]"></span></li>
|
||||||
|
<li class="border-bottom-none"><span class="fl ml10 class-list-name hidden">报告人员</span><span ng-click="selectRole(5)" ng-class="['login-box', 'fr', 'mr10', 'mt12','img-circle', {'checked': current_edit_member.roles_id == 5}]"></span></li>
|
||||||
|
</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="edit_member_role()" class="weixin-tab link-blue2 border-top">确定</a>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
<my-alert message="alertService.message" title="alertService.title" visible="alertService.visible" cb="alertService.cb"></my-alert>
|
||||||
|
</div>
|
||||||
@ -0,0 +1,11 @@
|
|||||||
|
<div class="post-container">
|
||||||
|
<div loading-spinner></div>
|
||||||
|
|
||||||
|
<div class="blue-title">新建项目</div>
|
||||||
|
<form novalidate name="classForm">
|
||||||
|
<div class="course-list-row f13 c-grey3 mt30"><span class="fl ml15 c-grey3">项目</span><input class="new-class-input ml25" ng-model="project.name" required placeholder="例如：团队写作方法与机制研究" /></div>
|
||||||
|
<a ng-click="newProject(classForm, project)" ng-class="['finish-btn', {'btn-disabled':!classForm.$valid} ]" >完成</a>
|
||||||
|
</form>
|
||||||
|
|
||||||
|
<my-alert message="alertService.message" title="alertService.title" visible="alertService.visible" cb="alertService.cb"></my-alert>
|
||||||
|
</div>
|
||||||
@ -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;
|
||||||
|
}
|
||||||
|
|
||||||
|
}] );
|
||||||
@ -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;
|
||||||
|
}
|
||||||
|
|
||||||
|
}] );
|
||||||
@ -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);
|
||||||
|
});
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
}] );
|
||||||
Loading…
Reference in new issue