-
{{r.homework_name}}发送
-
作业来源：{{r.coursename}}
-
-
-
更多
+
{{r.homework_name}}发送
+
作业来源：{{r.coursename}}
暂无作业，
请登录Trustie网站，在PC浏览器中创建作业。
-
{{r.exercise_name}}发送
-
题目来源：{{r.coursename}}
-
-
+
{{r.exercise_name}}发送
+
题目来源：{{r.coursename}}
+
暂无测验，
请登录Trustie网站，在PC浏览器中创建测验。
diff --git a/public/javascripts/wechat/controllers/myresource.js b/public/javascripts/wechat/controllers/myresource.js
index 802982266..b371ee8cc 100644
--- a/public/javascripts/wechat/controllers/myresource.js
+++ b/public/javascripts/wechat/controllers/myresource.js
@@ -1,128 +1,37 @@
-app.controller('MyResourceController', ['$scope', '$http', 'auth', 'config', '$location', 'rms', function($scope, $http, auth, config, $location,rms){
+app.controller('MyResourceController', ['$scope', '$http', 'auth', 'config', '$location', function($scope, $http, auth, config, $location){
var vm = $scope;
vm.menus = ['课件', '作业', '测验'];
- vm.resources = [];
- vm.homeworks = [];
- vm.exercise = [];
-
- 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.resources = null;
+ vm.homeworks = null;
+ vm.exercise = null;
vm.searchText = "";
- vm.sendFile = function(r){
- $location.path("/send_class_list").search({id: r.id});
- }
-
- vm.loadResourceData = function (index,page){
- if(index == 1){
- vm.page = page;
- $http({
- method: 'POST',
- url: apiUrl+ "resources",
- data: {token: auth.token(), page: page}
- }).then(function successCallback(response) {
- if(response.data.page >0) {
- vm.resources = vm.resources.concat(response.data.data);
- } else {
- vm.resources = response.data.data;
- }
-
- rms.save("resources", vm.resources);
- vm.has_more = (response.data.count + response.data.page * 10) < response.data.all_count;
- rms.save('has_more', vm.has_more);
- rms.save('page', response.data.page);
-
+ vm.tab = function(index){
+ vm.currentTab = index;
+ vm.searchText = "";
+ if(index==1 && (!vm.resources || vm.resources.length <= 0 )){
+ $http.get(config.apiUrl + "resources?token="+auth.token()).then(function(response){
console.log(response.data);
-
- }, function errorCallback(response) {
+ vm.resources = response.data.data;
});
-
- }
- else if(index==2 ){
- vm.homework_page = page;
- $http({
- method: 'POST',
- url: apiUrl+ "resources/homeworks",
- data: {token: auth.token(), page: page}
- }).then(function successCallback(response) {
- if(response.data.page >0) {
- vm.homeworks = vm.homeworks.concat(response.data.data);
- } else {
- vm.homeworks = response.data.data;
- }
-
- rms.save("homeworks", vm.homeworks);
- vm.homework_has_more = (response.data.count + response.data.page * 10) < response.data.all_count;
- rms.save('homework_has_more', vm.has_more);
- rms.save('homework_page', response.data.page);
-
+ } else if(index==2 && (!vm.homeworks || vm.homeworks.length <= 0) ){
+ $http.get(config.apiUrl + "resources/homeworks?token="+auth.token()).then(function(response){
console.log(response.data);
-
- }, function errorCallback(response) {
+ vm.homeworks = response.data.data;
});
- }
- else if(index==3 ){
- vm.exercise_page = page;
- $http({
- method: 'POST',
- url: apiUrl+ "resources/exercises",
- data: {token: auth.token(), page: page}
- }).then(function successCallback(response) {
- if(response.data.page >0) {
- vm.exercise = vm.exercise.concat(response.data.data);
- } else {
- vm.exercise = response.data.data;
- }
-
- rms.save("exercise", vm.exercise);
- vm.exercise_has_more = (response.data.count + response.data.page * 10) < response.data.all_count;
- rms.save('exercise_has_more', vm.exercise_has_more);
- rms.save('exercise_page', response.data.page);
-
+ } else if(index==3 && (!vm.exercise || vm.exercise.length <= 0) ){
+ $http.get(config.apiUrl + "resources/exercies?token="+auth.token()).then(function(response){
console.log(response.data);
-
- }, function errorCallback(response) {
+ vm.exercise = response.data.data;
});
}
}
- vm.tab = function(index){
- vm.currentTab = index;
- vm.searchText = "";
-
- switch(index){
- //ALL
- case 1:
- if(vm.resources.length<=0){
- vm.loadResourceData(index,0);
- }
- break;
- //homework
- case 2:
- if(vm.homeworks.length<=0){
- vm.loadResourceData(index,0);
- }
- break;
- //exercise
- case 3:
- if(vm.exercise.length<=0){
- vm.loadResourceData(index,0);
- }
- break;
- }
- }
-
vm.tab(1);
+ vm.sendFile = function(r){
+ $location.path("/send_class_list").search({id: r.id});
+ }
}] );
From 606393284081509c417c846c3547eec74c77b031 Mon Sep 17 00:00:00 2001
From: txz
Date: Fri, 15 Jul 2016 16:14:52 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E7=AE=A1=E7=90=86?=
=?UTF-8?q?=E4=B8=AD=EF=BC=8C=E5=AF=B9=E8=AF=BE=E7=A8=8B,=E7=8F=AD?=
=?UTF-8?q?=E7=BA=A7=E5=90=8D=E7=A7=B0=E7=BC=96=E8=BE=91=E6=97=B6=EF=BC=8C?=
=?UTF-8?q?=E5=AD=97=E4=BD=93=E5=8F=98=E7=81=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
public/assets/wechat/edit_class.html | 4 ++--
public/javascripts/wechat/controllers/edit_class.js | 4 ++++
public/stylesheets/weui/weixin.css | 2 +-
show | 0
4 files changed, 7 insertions(+), 3 deletions(-)
create mode 100644 show
diff --git a/public/assets/wechat/edit_class.html b/public/assets/wechat/edit_class.html
index c61ca8ce9..5953e046b 100644
--- a/public/assets/wechat/edit_class.html
+++ b/public/assets/wechat/edit_class.html
@@ -3,9 +3,9 @@
管理课程
diff --git a/public/javascripts/wechat/controllers/edit_class.js b/public/javascripts/wechat/controllers/edit_class.js
index 5f377e594..b5ee1a025 100644
--- a/public/javascripts/wechat/controllers/edit_class.js
+++ b/public/javascripts/wechat/controllers/edit_class.js
@@ -107,4 +107,8 @@ app.controller('EditClassController', ['$scope', '$http', 'auth', 'config', 'ale
}
+ vm.fadeText = function () {
+ $scope.change = true;
+ }
+
}] );
\ No newline at end of file
diff --git a/public/stylesheets/weui/weixin.css b/public/stylesheets/weui/weixin.css
index cc81a4c0c..4d930bbb0 100644
--- a/public/stylesheets/weui/weixin.css
+++ b/public/stylesheets/weui/weixin.css
@@ -43,7 +43,7 @@ blockquote {border:1px solid #d4d4d4; padding: 0.6em; margin: 5px 0.4em 5px 1.4e
.mr55 {margin-right:55px;}
.c-red {color:#e81a1a;}
.c-blue {color:#269ac9;}
-.c-grey {color:#9a9a9a;}
+.c-grey {color:#9a9a9a !important;}
.c-grey2 {color:#707070;}
.c-grey3 {color:#555555;}
.c-grey4 {color:#888888;}
diff --git a/show b/show
new file mode 100644
index 000000000..e69de29bb
From 60dc0e72cf8c93116f7e4b0738b476c8dd51508c Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Fri, 15 Jul 2016 16:46:27 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E6=88=91=E6=88=91?=
=?UTF-8?q?=E7=9A=84=E8=B5=84=E6=BA=90=E6=9B=B4=E5=A4=9A=E6=8C=89=E9=92=AE?=
=?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/api/mobile/apis/resources.rb | 36 ++++-
app/views/wechats/user_activities.html.erb | 50 +++----
public/assets/wechat/myresource.html | 9 ++
.../wechat/controllers/myresource.js | 129 +++++++++++++++---
4 files changed, 177 insertions(+), 47 deletions(-)
diff --git a/app/api/mobile/apis/resources.rb b/app/api/mobile/apis/resources.rb
index 16531940f..d5823d5b4 100644
--- a/app/api/mobile/apis/resources.rb
+++ b/app/api/mobile/apis/resources.rb
@@ -8,13 +8,23 @@ module Mobile
desc '获取所有课件'
params do
requires :token, type: String
+ requires :page, type: Integer
end
- get do
+ post do
authenticate!
+ page = params[:page] ? params[:page] : 0
+
rs = ResourcesService.new
# data = current_user.course_attachments
data = rs.all_course_attachments current_user
+ all_count = data.count
+ data = data.limit(10).offset(page * 10)
+ count = data.count
+
present :data, data, with: Mobile::Entities::Attachment,user: current_user
+ present :all_count, all_count
+ present :count, count
+ present :page, page
present :status, 0
end
@@ -24,14 +34,24 @@ module Mobile
desc '获取所有作业'
params do
requires :token, type: String
+ requires :page, type: Integer
end
- get 'homeworks' do
+ post 'homeworks' do
authenticate!
+ page = params[:page] ? params[:page] : 0
+
rs = ResourcesService.new
homeworks = rs.all_homework_commons current_user
+ all_count = homeworks.count
+ homeworks = homeworks.limit(10).offset(page * 10)
+ count = homeworks.count
+
present :data, homeworks, with: Mobile::Entities::Homework,user: current_user
+ present :all_count, all_count
+ present :count, count
+ present :page, page
present :status, 0
end
@@ -39,13 +59,23 @@ module Mobile
desc '获取所有测验'
params do
requires :token, type: String
+ requires :page, type: Integer
end
- get 'exercies' do
+ post 'exercises' do
authenticate!
+ page = params[:page] ? params[:page] : 0
+
rs = ResourcesService.new
exercises = rs.all_exercises current_user
+ all_count = exercises.count
+ exercises = exercises.limit(10).offset(page * 10)
+ count = exercises.count
+
present :data, exercises, with: Mobile::Entities::Exercise,user: current_user
+ present :all_count, all_count
+ present :count, count
+ present :page, page
present :status, 0
end
diff --git a/app/views/wechats/user_activities.html.erb b/app/views/wechats/user_activities.html.erb
index 5e86d32d1..cb9f4095a 100644
--- a/app/views/wechats/user_activities.html.erb
+++ b/app/views/wechats/user_activities.html.erb
@@ -28,31 +28,31 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
