@@ -22,7 +22,7 @@
请登录Trustie网站，在PC浏览器中上传课件。
- 
{{r.homework_name}}发送
+
{{r.homework_name}}发送
+
@@ -32,7 +32,7 @@
请登录Trustie网站，在PC浏览器中创建作业。
- 
{{r.exercise_name}}发送
+
{{r.exercise_name}}发送
+
diff --git a/public/javascripts/wechat/controllers/class.js b/public/javascripts/wechat/controllers/class.js
index 87703b681..cf2a3ee88 100644
--- a/public/javascripts/wechat/controllers/class.js
+++ b/public/javascripts/wechat/controllers/class.js
@@ -1,4 +1,4 @@
-app.controller('ClassController', ['$scope', 'config','$http', 'auth','$location','$routeParams', function($scope, config, $http, auth, $location, $routeParams){
+app.controller('ClassController', ['$scope', 'config','$http', 'auth','$location','$routeParams','alertService', function($scope, config, $http, auth, $location, $routeParams,alertService){
var vm = $scope;
var courseid = $routeParams.id;
@@ -97,15 +97,14 @@ app.controller('ClassController', ['$scope', 'config','$http', 'auth','$location
}
}
-
-
-
vm.course = {};
vm.students = [];
vm.teachers = [];
vm.resources = [];
vm.homeworks = [];
vm.exercises = [];
+
+ vm.alertService = alertService.create();
vm.invite = function(){
$location.path("/invite_code").search({id: courseid});
@@ -118,9 +117,16 @@ app.controller('ClassController', ['$scope', 'config','$http', 'auth','$location
$http.get(config.apiUrl+ 'courses/'+courseid+"?token="+auth.token()).then(
function(response) {
console.log(response.data);
- vm.course = response.data.data;
- resetMenu(vm.course.current_user_is_teacher);
- vm.tab(1);
+
+ if (response.data.status == 0){
+ vm.course = response.data.data;
+ resetMenu(vm.course.current_user_is_teacher);
+ vm.tab(1);
+ }
+ else{
+ vm.alertService.showMessage('提示', response.data.message);
+ }
+
}
);
diff --git a/public/javascripts/wechat/controllers/myresource.js b/public/javascripts/wechat/controllers/myresource.js
index fb564cde8..15428bb34 100644
--- a/public/javascripts/wechat/controllers/myresource.js
+++ b/public/javascripts/wechat/controllers/myresource.js
@@ -10,21 +10,30 @@ app.controller('MyResourceController', ['$scope', '$http', 'auth', 'config', '$l
vm.homeworks_tag = false;
vm.exercises_tag = false;
+ //课件
vm.page = rms.get('page') || 0;
vm.resources = rms.get("resources") || [];
vm.has_more = rms.get("has_more");
+ //作业
vm.homework_page = rms.get('homework_page') || 0;
vm.homeworks = rms.get("homeworks") || [];
vm.homework_has_more = rms.get("homework_has_more");
+ //测验
vm.exercise_page = rms.get('exercise_page') || 0;
vm.exercise = rms.get("exercise") || [];
vm.exercise_has_more = rms.get("exercise_has_more");
vm.searchText = "";
- vm.sendFile = function(r){
+ //发送类别 1课件 2作业 3测验
+ vm.myresource_sendIndex = rms.get('myresource_sendIndex') || 1;
+
+ vm.sendFile = function(r,index){
+ vm.myresource_sendIndex = index;
+ rms.save('myresource_sendIndex',index);
+
$location.path("/send_class_list").search({id: r.id});
}
diff --git a/public/javascripts/wechat/controllers/send_class_list.js b/public/javascripts/wechat/controllers/send_class_list.js
index 16875af9f..c80943e39 100644
--- a/public/javascripts/wechat/controllers/send_class_list.js
+++ b/public/javascripts/wechat/controllers/send_class_list.js
@@ -2,6 +2,9 @@ app.controller('SendClassListController', ['$scope', '$http','$routeParams', 'co
var vm = $scope;
var send_id = $routeParams.id;
+ //发送类别 1课件 2作业 3测验
+ vm.myresource_sendIndex = rms.get('myresource_sendIndex') || 1;
+
vm.alertService = alertService.create();
vm.syllabuses = [];
@@ -39,7 +42,7 @@ app.controller('SendClassListController', ['$scope', '$http','$routeParams', 'co
}
$http.post(config.apiUrl + "resources/send", {
- token: auth.token(), course_ids: course_ids, send_id: send_id
+ token: auth.token(), course_ids: course_ids, send_id: send_id,send_type:vm.myresource_sendIndex
}).then(function(response){
console.log(response.data);
if(response.data.status == 0){