微信我我的资源更多按钮显示
This commit is contained in:
parent
9b17724ebf
commit
60dc0e72cf
|
@ -8,13 +8,23 @@ module Mobile
|
||||||
desc '获取所有课件'
|
desc '获取所有课件'
|
||||||
params do
|
params do
|
||||||
requires :token, type: String
|
requires :token, type: String
|
||||||
|
requires :page, type: Integer
|
||||||
end
|
end
|
||||||
get do
|
post do
|
||||||
authenticate!
|
authenticate!
|
||||||
|
page = params[:page] ? params[:page] : 0
|
||||||
|
|
||||||
rs = ResourcesService.new
|
rs = ResourcesService.new
|
||||||
# data = current_user.course_attachments
|
# data = current_user.course_attachments
|
||||||
data = rs.all_course_attachments current_user
|
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 :data, data, with: Mobile::Entities::Attachment,user: current_user
|
||||||
|
present :all_count, all_count
|
||||||
|
present :count, count
|
||||||
|
present :page, page
|
||||||
present :status, 0
|
present :status, 0
|
||||||
|
|
||||||
end
|
end
|
||||||
|
@ -24,14 +34,24 @@ module Mobile
|
||||||
desc '获取所有作业'
|
desc '获取所有作业'
|
||||||
params do
|
params do
|
||||||
requires :token, type: String
|
requires :token, type: String
|
||||||
|
requires :page, type: Integer
|
||||||
end
|
end
|
||||||
get 'homeworks' do
|
post 'homeworks' do
|
||||||
authenticate!
|
authenticate!
|
||||||
|
|
||||||
|
page = params[:page] ? params[:page] : 0
|
||||||
|
|
||||||
rs = ResourcesService.new
|
rs = ResourcesService.new
|
||||||
homeworks = rs.all_homework_commons current_user
|
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 :data, homeworks, with: Mobile::Entities::Homework,user: current_user
|
||||||
|
present :all_count, all_count
|
||||||
|
present :count, count
|
||||||
|
present :page, page
|
||||||
present :status, 0
|
present :status, 0
|
||||||
|
|
||||||
end
|
end
|
||||||
|
@ -39,13 +59,23 @@ module Mobile
|
||||||
desc '获取所有测验'
|
desc '获取所有测验'
|
||||||
params do
|
params do
|
||||||
requires :token, type: String
|
requires :token, type: String
|
||||||
|
requires :page, type: Integer
|
||||||
end
|
end
|
||||||
get 'exercies' do
|
post 'exercises' do
|
||||||
authenticate!
|
authenticate!
|
||||||
|
|
||||||
|
page = params[:page] ? params[:page] : 0
|
||||||
|
|
||||||
rs = ResourcesService.new
|
rs = ResourcesService.new
|
||||||
exercises = rs.all_exercises current_user
|
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 :data, exercises, with: Mobile::Entities::Exercise,user: current_user
|
||||||
|
present :all_count, all_count
|
||||||
|
present :count, count
|
||||||
|
present :page, page
|
||||||
present :status, 0
|
present :status, 0
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -28,31 +28,31 @@
|
||||||
|
|
||||||
<!--<script src="https://dn-demotest.qbox.me/angular.all.min.js"></script>-->
|
<!--<script src="https://dn-demotest.qbox.me/angular.all.min.js"></script>-->
|
||||||
<script src="/javascripts/wechat/build/angular.all.min.js"></script>
|
<script src="/javascripts/wechat/build/angular.all.min.js"></script>
|
||||||
<script src="/javascripts/wechat/build/app.min.js?version=20160715-1449"></script>
|
<!--<script src="/javascripts/wechat/build/app.min.js?version=20160715-1449"></script>-->
|
||||||
<!-- <script src="/javascripts/wechat/app.js"></script> -->
|
<script src="/javascripts/wechat/app.js"></script>
|
||||||
<!-- <script src="/javascripts/wechat/others/factory.js"></script> -->
|
<script src="/javascripts/wechat/others/factory.js"></script>
|
||||||
<!-- <script src="/javascripts/wechat/others/filter.js"></script> -->
|
<script src="/javascripts/wechat/others/filter.js"></script>
|
||||||
<!-- <script src="/javascripts/wechat/directives/alert.js"></script> -->
|
<script src="/javascripts/wechat/directives/alert.js"></script>
|
||||||
<!-- <script src="/javascripts/wechat/directives/form_validate.js"></script> -->
|
<script src="/javascripts/wechat/directives/form_validate.js"></script>
|
||||||
<!-- <script src="/javascripts/wechat/directives/input_auto.js"></script> -->
|
<script src="/javascripts/wechat/directives/input_auto.js"></script>
|
||||||
<!-- <script src="/javascripts/wechat/directives/loading_spinner.js"></script> -->
|
<script src="/javascripts/wechat/directives/loading_spinner.js"></script>
|
||||||
<!-- <script src="/javascripts/wechat/controllers/reg.js"></script> -->
|
<script src="/javascripts/wechat/controllers/reg.js"></script>
|
||||||
<!-- <script src="/javascripts/wechat/controllers/invite_code.js"></script> -->
|
<script src="/javascripts/wechat/controllers/invite_code.js"></script>
|
||||||
<!-- <script src="/javascripts/wechat/controllers/login.js"></script> -->
|
<script src="/javascripts/wechat/controllers/login.js"></script>
|
||||||
<!-- <script src="/javascripts/wechat/controllers/activity.js"></script> -->
|
<script src="/javascripts/wechat/controllers/activity.js"></script>
|
||||||
<!-- <script src="/javascripts/wechat/controllers/new_class.js"></script> -->
|
<script src="/javascripts/wechat/controllers/new_class.js"></script>
|
||||||
<!-- <script src="/javascripts/wechat/controllers/edit_class.js"></script> -->
|
<script src="/javascripts/wechat/controllers/edit_class.js"></script>
|
||||||
<!-- <script src="/javascripts/wechat/controllers/blog.js"></script> -->
|
<script src="/javascripts/wechat/controllers/blog.js"></script>
|
||||||
<!-- <script src="/javascripts/wechat/controllers/course_notice.js"></script> -->
|
<script src="/javascripts/wechat/controllers/course_notice.js"></script>
|
||||||
<!-- <script src="/javascripts/wechat/controllers/discussion.js"></script> -->
|
<script src="/javascripts/wechat/controllers/discussion.js"></script>
|
||||||
<!-- <script src="/javascripts/wechat/controllers/homework.js"></script> -->
|
<script src="/javascripts/wechat/controllers/homework.js"></script>
|
||||||
<!-- <script src="/javascripts/wechat/controllers/issue.js"></script> -->
|
<script src="/javascripts/wechat/controllers/issue.js"></script>
|
||||||
<!-- <script src="/javascripts/wechat/controllers/journals.js"></script> -->
|
<script src="/javascripts/wechat/controllers/journals.js"></script>
|
||||||
<!-- <script src="/javascripts/wechat/controllers/class.js"></script> -->
|
<script src="/javascripts/wechat/controllers/class.js"></script>
|
||||||
<!-- <script src="/javascripts/wechat/controllers/class_list.js"></script> -->
|
<script src="/javascripts/wechat/controllers/class_list.js"></script>
|
||||||
<!-- <script src="/javascripts/wechat/controllers/myresource.js"></script> -->
|
<script src="/javascripts/wechat/controllers/myresource.js"></script>
|
||||||
<!-- <script src="/javascripts/wechat/controllers/send_class_list.js"></script> -->
|
<script src="/javascripts/wechat/controllers/send_class_list.js"></script>
|
||||||
<!-- <script src="/javascripts/wechat/others/routes.js"></script> -->
|
<script src="/javascripts/wechat/others/routes.js"></script>
|
||||||
</body>
|
</body>
|
||||||
|
|
||||||
</html>
|
</html>
|
||||||
|
|
|
@ -15,6 +15,9 @@
|
||||||
<img src="/images/wechat/courseware.png" width="15" class="ml10 fl" /> <span class="fl ml10 resource-width">{{r.filename}}</span><a ng-click="sendFile(r)" class="fr mr10 link-blue2">发送</a><div class="cl"></div>
|
<img src="/images/wechat/courseware.png" width="15" class="ml10 fl" /> <span class="fl ml10 resource-width">{{r.filename}}</span><a ng-click="sendFile(r)" class="fr mr10 link-blue2">发送</a><div class="cl"></div>
|
||||||
<span class="f12 mt5 ml35 c-grey4 fl courseware-from-width hidden">课件来源:{{r.coursename}}</span><span class="f12 ml10 mt5 c-grey4 fl">大小:{{r.attafile_size}}</span><div class="cl"></div>
|
<span class="f12 mt5 ml35 c-grey4 fl courseware-from-width hidden">课件来源:{{r.coursename}}</span><span class="f12 ml10 mt5 c-grey4 fl">大小:{{r.attafile_size}}</span><div class="cl"></div>
|
||||||
</div>
|
</div>
|
||||||
|
<div ng-if="has_more">
|
||||||
|
<div id="more" class="more-events mt10" ng-click="loadResourceData(1,page+1);">更多</div>
|
||||||
|
</div>
|
||||||
<p ng-show="resources && resources.length<=0" class="class-test-tip">暂无课件,<br />
|
<p ng-show="resources && resources.length<=0" class="class-test-tip">暂无课件,<br />
|
||||||
请登录Trustie网站,在PC浏览器中上传课件。</p>
|
请登录Trustie网站,在PC浏览器中上传课件。</p>
|
||||||
</div>
|
</div>
|
||||||
|
@ -22,6 +25,9 @@
|
||||||
<div ng-repeat="r in homeworks|filter:{homework_name: searchText}" ng-class="['class-detail-row', 'f13', 'c-grey3', {'border-top': $first}]"><img src="/images/wechat/homework.png" width="15" class="ml10 fl" /><span class="fl ml10 resource-width">{{r.homework_name}}</span><a ng-click="sendFile(r)" class="fr mr10 link-blue2 undis">发送</a><div class="cl"></div>
|
<div ng-repeat="r in homeworks|filter:{homework_name: searchText}" ng-class="['class-detail-row', 'f13', 'c-grey3', {'border-top': $first}]"><img src="/images/wechat/homework.png" width="15" class="ml10 fl" /><span class="fl ml10 resource-width">{{r.homework_name}}</span><a ng-click="sendFile(r)" class="fr mr10 link-blue2 undis">发送</a><div class="cl"></div>
|
||||||
<span class="f12 mt5 ml35 c-grey4 fl other-from-width hidden">作业来源:{{r.coursename}}</span><div class="cl"></div>
|
<span class="f12 mt5 ml35 c-grey4 fl other-from-width hidden">作业来源:{{r.coursename}}</span><div class="cl"></div>
|
||||||
</div>
|
</div>
|
||||||
|
<div ng-if="homework_has_more">
|
||||||
|
<div id="more_homeworks" class="more-events mt10" ng-click="loadResourceData(2,homework_page+1);">更多</div>
|
||||||
|
</div>
|
||||||
<p ng-show="homeworks && homeworks.length<=0" class="class-test-tip">暂无作业,<br />
|
<p ng-show="homeworks && homeworks.length<=0" class="class-test-tip">暂无作业,<br />
|
||||||
请登录Trustie网站,在PC浏览器中创建作业。</p>
|
请登录Trustie网站,在PC浏览器中创建作业。</p>
|
||||||
</div>
|
</div>
|
||||||
|
@ -29,6 +35,9 @@
|
||||||
<div ng-repeat="r in exercise|filter:{exercise_name: searchText}" ng-class="['class-detail-row', 'f13', 'c-grey3', {'border-top': $first}]"><img src="/images/wechat/test.png" width="15" class="ml10 fl" /><span class="fl ml10 resource-width">{{r.exercise_name}}</span><a ng-click="sendFile(r)" class="fr mr10 link-blue2 undis">发送</a><div class="cl"></div>
|
<div ng-repeat="r in exercise|filter:{exercise_name: searchText}" ng-class="['class-detail-row', 'f13', 'c-grey3', {'border-top': $first}]"><img src="/images/wechat/test.png" width="15" class="ml10 fl" /><span class="fl ml10 resource-width">{{r.exercise_name}}</span><a ng-click="sendFile(r)" class="fr mr10 link-blue2 undis">发送</a><div class="cl"></div>
|
||||||
<span class="f12 mt5 ml35 c-grey4 other-from-width hidden">题目来源:{{r.coursename}}</span><div class="cl"></div>
|
<span class="f12 mt5 ml35 c-grey4 other-from-width hidden">题目来源:{{r.coursename}}</span><div class="cl"></div>
|
||||||
</div>
|
</div>
|
||||||
|
<div ng-if="exercise_has_more">
|
||||||
|
<div id="more_exercises" class="more-events mt10" ng-click="loadResourceData(3,exercise_page+1);">更多</div>
|
||||||
|
</div>
|
||||||
<p ng-show="exercise && exercise.length<=0" class="class-test-tip">暂无测验,<br />
|
<p ng-show="exercise && exercise.length<=0" class="class-test-tip">暂无测验,<br />
|
||||||
请登录Trustie网站,在PC浏览器中创建测验。</p>
|
请登录Trustie网站,在PC浏览器中创建测验。</p>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -1,37 +1,128 @@
|
||||||
app.controller('MyResourceController', ['$scope', '$http', 'auth', 'config', '$location', function($scope, $http, auth, config, $location){
|
app.controller('MyResourceController', ['$scope', '$http', 'auth', 'config', '$location', 'rms', function($scope, $http, auth, config, $location,rms){
|
||||||
var vm = $scope;
|
var vm = $scope;
|
||||||
vm.menus = ['课件', '作业', '测验'];
|
vm.menus = ['课件', '作业', '测验'];
|
||||||
|
|
||||||
vm.resources = null;
|
vm.resources = [];
|
||||||
vm.homeworks = null;
|
vm.homeworks = [];
|
||||||
vm.exercise = null;
|
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.searchText = "";
|
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);
|
||||||
|
|
||||||
|
console.log(response.data);
|
||||||
|
|
||||||
|
}, function errorCallback(response) {
|
||||||
|
});
|
||||||
|
|
||||||
|
}
|
||||||
|
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);
|
||||||
|
|
||||||
|
console.log(response.data);
|
||||||
|
|
||||||
|
}, function errorCallback(response) {
|
||||||
|
});
|
||||||
|
}
|
||||||
|
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);
|
||||||
|
|
||||||
|
console.log(response.data);
|
||||||
|
|
||||||
|
}, function errorCallback(response) {
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
vm.tab = function(index){
|
vm.tab = function(index){
|
||||||
vm.currentTab = index;
|
vm.currentTab = index;
|
||||||
vm.searchText = "";
|
vm.searchText = "";
|
||||||
if(index==1 && (!vm.resources || vm.resources.length <= 0 )){
|
|
||||||
$http.get(config.apiUrl + "resources?token="+auth.token()).then(function(response){
|
switch(index){
|
||||||
console.log(response.data);
|
//ALL
|
||||||
vm.resources = response.data.data;
|
case 1:
|
||||||
});
|
if(vm.resources.length<=0){
|
||||||
} else if(index==2 && (!vm.homeworks || vm.homeworks.length <= 0) ){
|
vm.loadResourceData(index,0);
|
||||||
$http.get(config.apiUrl + "resources/homeworks?token="+auth.token()).then(function(response){
|
}
|
||||||
console.log(response.data);
|
break;
|
||||||
vm.homeworks = response.data.data;
|
//homework
|
||||||
});
|
case 2:
|
||||||
} else if(index==3 && (!vm.exercise || vm.exercise.length <= 0) ){
|
if(vm.homeworks.length<=0){
|
||||||
$http.get(config.apiUrl + "resources/exercies?token="+auth.token()).then(function(response){
|
vm.loadResourceData(index,0);
|
||||||
console.log(response.data);
|
}
|
||||||
vm.exercise = response.data.data;
|
break;
|
||||||
});
|
//exercise
|
||||||
|
case 3:
|
||||||
|
if(vm.exercise.length<=0){
|
||||||
|
vm.loadResourceData(index,0);
|
||||||
|
}
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
vm.tab(1);
|
vm.tab(1);
|
||||||
|
|
||||||
vm.sendFile = function(r){
|
|
||||||
$location.path("/send_class_list").search({id: r.id});
|
|
||||||
}
|
|
||||||
}] );
|
}] );
|
||||||
|
|
Loading…
Reference in New Issue