zcdsj
/
examtest
mirror of https://e.coding.net/ctcdevteam/examtest.git
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ios token

This commit is contained in:
caoqianming 2020-04-20 20:27:36 +08:00
parent 2ce15794fe
commit c6863eed94
4 changed files with 47 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test_mini/pages/moni/index.js
View File

@ -74,7 +74,7 @@ Page({
},
genPaper: function () {
api.request('/examtest/workscope/' + this.data.workId + '/monitest', 'GET').then(res => {
api.request('/examtest/workscope/' + this.data.workId + '/monitest/', 'GET').then(res => {
try {
wx.setStorageSync('examtest', res.data)
} catch (e) { }

2
test_mini/pages/test/list.js
View File

@ -35,7 +35,7 @@ Page({
},
getList: function () {
var that = this
api.request('/examtest/examtest/self', 'POST', that.data.query).then(res => {
api.request('/examtest/examtest/self/', 'GET', that.data.query).then(res => {
if (that.data.query.page == 1) {
that.data.results = res.data.results
} else {

6
test_server/examtest/views.py
View File

@ -62,9 +62,7 @@ class WorkScopeViewSet(ModelViewSet):
queryset = self.get_serializer_class().setup_eager_loading(queryset)
return queryset
@action(methods=['get'], detail=True,url_path='monitest', url_name='gen_monitest',
authentication_classes=[],permission_classes=[],
perms_map=[{'get':'gen_monitest'}])
@action(methods=['get'], detail=True,url_path='monitest', url_name='gen_monitest', perms_map=[{'get':'gen_monitest'}])
def monitest(self, request, pk=None):
'''
生成自助模拟考试
@ -167,7 +165,7 @@ class ExamTestViewSet(ModelViewSet):
filter_backends = [DjangoFilterBackend, SearchFilter, OrderingFilter]
filterset_fields = ['type','is_pass']
@action(methods=['get','post'], detail=False,url_path='self', url_name='selftest', perms_map = [{'*':'my_examtest'}])
@action(methods=['get'], detail=False,url_path='self', url_name='selftest', perms_map = [{'*':'my_examtest'}])
def selftest(self, request, pk=None):
'''
个人考试记录

86
test_server/utils/custom.py
View File

@ -21,55 +21,55 @@ class CommonPagination(PageNumberPagination):
"""
page_size = 10
page_size_query_param = 'limit'
def paginate_queryset(self, queryset, request, view=None):
"""
重写该方法,确保post请求也可分页
"""
page_size = self.get_page_size(request)
if not page_size:
return None
# def paginate_queryset(self, queryset, request, view=None):
# """
# 重写该方法,确保post请求也可分页
# """
# page_size = self.get_page_size(request)
# if not page_size:
# return None
paginator = self.django_paginator_class(queryset, page_size)
if self.page_query_param in request.query_params:
page_number = request.query_params.get(self.page_query_param)
elif self.page_query_param in request.data:
page_number = request.data.get(self.page_query_param)
else:
page_number = 1
if page_number in self.last_page_strings:
page_number = paginator.num_pages
# paginator = self.django_paginator_class(queryset, page_size)
# if self.page_query_param in request.query_params:
# page_number = request.query_params.get(self.page_query_param)
# elif self.page_query_param in request.data:
# page_number = request.data.get(self.page_query_param)
# else:
# page_number = 1
# if page_number in self.last_page_strings:
# page_number = paginator.num_pages
try:
self.page = paginator.page(page_number)
except InvalidPage as exc:
msg = self.invalid_page_message.format(
page_number=page_number, message=str(exc)
)
raise NotFound(msg)
# try:
# self.page = paginator.page(page_number)
# except InvalidPage as exc:
# msg = self.invalid_page_message.format(
# page_number=page_number, message=str(exc)
# )
# raise NotFound(msg)
if paginator.num_pages > 1 and self.template is not None:
# The browsable API should display pagination controls.
self.display_page_controls = True
# if paginator.num_pages > 1 and self.template is not None:
# # The browsable API should display pagination controls.
# self.display_page_controls = True
self.request = request
return list(self.page)
# self.request = request
# return list(self.page)
def get_page_size(self, request):
if self.page_size_query_param:
try:
if self.page_size_query_param in request.query_params:
page_size = request.query_params.get(self.page_size_query_param)
else:
page_size = request.data.get(self.page_size_query_param)
return _positive_int(
page_size,
strict=True,
cutoff=self.max_page_size
)
except (KeyError, ValueError):
pass
# def get_page_size(self, request):
# if self.page_size_query_param:
# try:
# if self.page_size_query_param in request.query_params:
# page_size = request.query_params.get(self.page_size_query_param)
# else:
# page_size = request.data.get(self.page_size_query_param)
# return _positive_int(
# page_size,
# strict=True,
# cutoff=self.max_page_size
# )
# except (KeyError, ValueError):
# pass
return self.page_size
# return self.page_size
class TreeSerializer(serializers.Serializer):