From 898c402a25f1a56802f79361ab2d97b8f7943623 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmial.com>
Date: Mon, 30 Nov 2020 21:42:23 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=80=83=E8=AF=95=E6=8F=90=E4=BA=A4ison=20?=
 =?UTF-8?q?bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 safesite/views.py | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/safesite/views.py b/safesite/views.py
index 7e487cb6..cd398aa9 100644
--- a/safesite/views.py
+++ b/safesite/views.py
@@ -6452,14 +6452,13 @@ def apiexamtestdetail(req):
         examtestobj = ExamTest.objects.get(id=testid)
         obj,created = ExamTestDetail.objects.get_or_create(examtest = examtestobj, user__userid=userid,
                 defaults={'examtest': examtestobj,'user':User.objects.get(userid=userid)})
-        obj.ison = 1
         starttime = data['starttime']
         endtime = datetime.now()
         took = (endtime - datetime.strptime(starttime, '%Y-%m-%d %H:%M:%S')).total_seconds() #计算相差多少秒
-        # if 'took' in data:
-        #     if data['took']<took:
-        #         took = data['took']
         testdetail = data['sheet']
+        obj.ison = 1
+        obj.testdetail = testdetail
+        obj.save()
         score = 0
         rights = 0
         tms = []
@@ -6501,11 +6500,9 @@ def apiexamtestdetail(req):
         obj.starttime = starttime
         obj.endtime = endtime
         obj.took = took
-        obj.testdetail = testdetail
         obj.rights = rights
         score = round(score,1)
         obj.score = score
-        obj.ison = 1
         examtestobj = obj.examtest
         totalscore = examtestobj.totalscore
         passscore = examtestobj.passscore

From e1e84771fc233c431e1d6770c08f02ffb4e141af Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmial.com>
Date: Mon, 30 Nov 2020 22:31:28 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=8F=AF=E9=87=8D=E5=A4=8D=E8=80=83?=
 =?UTF-8?q?=E8=AF=95bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 safesite/views.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/safesite/views.py b/safesite/views.py
index cd398aa9..3b1ca9d0 100644
--- a/safesite/views.py
+++ b/safesite/views.py
@@ -6388,6 +6388,9 @@ def apiexamtest(req):
             a['notinTime'] = 1
         if 'endtime' in a and a['endtime'] < datetime.now():
             a['notinTime'] = 1
+        a['ison'] = 0
+        if ExamTestDetail.objects.filter(examtest__id=id,user__userid=userid,ison=1).exists():
+            a['ison'] = 1
         return HttpResponse(json.dumps(a, cls=MyEncoder), content_type="application/json")
     elif a == 'detailtm':
         id = req.GET.get('id')