Merge branch 'master' of https://e.coding.net/ctcdevteam/safesite

safesite/views.py

@@ -6398,6 +6398,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')
@@ -6462,14 +6465,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 = []
@@ -6511,11 +6513,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