From 5633ffec4d1e0795836a7a1a1c7f8c7da430dd86 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Thu, 20 Feb 2020 19:44:03 +0800 Subject: [PATCH] =?UTF-8?q?=E9=98=B2=E6=AD=A2=E6=8F=90=E5=89=8D=E7=AD=94?= =?UTF-8?q?=E5=8D=B7=EF=BC=8C=E7=BB=9F=E4=B8=80=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- safesite/views.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/safesite/views.py b/safesite/views.py index 2e853f73..0392764b 100644 --- a/safesite/views.py +++ b/safesite/views.py @@ -6014,6 +6014,9 @@ def apiexamtest(req): id = req.GET.get('id') a = ExamTest.objects.filter(id=id).values('id', 'num', 'name', 'starttime', 'endtime', 'duration', 'totalscore', 'passscore', 'exampaper__total', 'createtime', 'state', 'exampaper__name', 'createuser__name', 'type', 'qrcode')[0] + a['notinTime'] = 0 + if a['starttime'] > datetime.now() or a['endtime'] < datetime.now(): + a['notinTime'] = 1 objs = ExamTestDetail.objects.filter(examtest__id=id).order_by('-score').values( 'id', 'user__name', 'user__ubelongpart__partname', 'took', 'score', 'ison', 'passcode','starttime') a['cjrydetail'] = list(objs) @@ -6028,7 +6031,7 @@ def apiexamtest(req): objs = ExamPaperDetail.objects.filter(exampaper=test.exampaper).order_by('question__type','?').values( 'id', 'question__id', 'score', 'question__title', 'question__type', 'question__answer', 'question__right', 'question__resolution') duration = test.duration - data = {'duration': duration, 'tms': list(objs)} + data = {'duration': duration, 'tms': list(objs), 'starttime':datetime.now().strftime('%Y-%m-%d %H:%M:%S')} return JsonResponse(data) elif a == 'exportword': data = json.loads(req.body.decode('utf-8')) @@ -6082,9 +6085,8 @@ def apiexamtestdetail(req): data = json.loads(req.body.decode('utf-8')) testid = data['testid'] starttime = data['starttime'] - endtime = data['endtime'] - took = (datetime.strptime(endtime, '%Y-%m-%d %H:%M:%S') - - datetime.strptime(starttime, '%Y-%m-%d %H:%M:%S')).total_seconds() #计算相差多少秒 + endtime = datetime.now() + took = (endtime - datetime.strptime(starttime, '%Y-%m-%d %H:%M:%S')).total_seconds() #计算相差多少秒 testdetail = data['sheet'] score = 0 rights = 0