From 22f2538245f33e490edd716921fe910d54319b19 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Mon, 17 Feb 2020 14:40:00 +0800 Subject: [PATCH 1/3] get_user_from_username --- safesite/views.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/safesite/views.py b/safesite/views.py index 98531937..72fdb8fc 100644 --- a/safesite/views.py +++ b/safesite/views.py @@ -4278,6 +4278,14 @@ def apiuser(req): userdict = userlist[0] userdict['companyname'] = companyname return HttpResponse(json.dumps(userdict, cls=MyEncoder), content_type="application/json") + elif a == 'get_user_from_username': + username = req.GET.get('username') + if username: + objs = User.objects.filter(username=username) + if objs.exists(): + userdata = objs.values('name','username','ubelongpart__partname','usecomp__partname') + return JsonResponse({"code": 1, "data": list(userdata)[0]}) + return JsonResponse({"code":0}) elif a == 'detailself': userid = req.session['userid'] companyid = getcompany(userid) From 4d03740bc90f9da4ae5b37d6feef05c7ee22dcc4 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Mon, 17 Feb 2020 15:00:21 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=8C=89=E9=A2=98=E5=9E=8B=E6=8E=92?= =?UTF-8?q?=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- safesite/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/safesite/views.py b/safesite/views.py index 72fdb8fc..20477000 100644 --- a/safesite/views.py +++ b/safesite/views.py @@ -6005,7 +6005,7 @@ def apiexamtest(req): elif a == 'detailtm': id = req.GET.get('id') test = ExamTest.objects.get(id=id) - objs = ExamPaperDetail.objects.filter(exampaper=test.exampaper).values( + 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)} From 7cef248038993a96c90cd2ea96ded03d29ee862c Mon Sep 17 00:00:00 2001 From: caoqianming Date: Mon, 17 Feb 2020 15:09:55 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=8C=89=E9=A2=98=E5=9E=8B=E6=8E=92?= =?UTF-8?q?=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- safesite/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/safesite/views.py b/safesite/views.py index 20477000..bb623ce6 100644 --- a/safesite/views.py +++ b/safesite/views.py @@ -6005,7 +6005,7 @@ def apiexamtest(req): elif a == 'detailtm': id = req.GET.get('id') test = ExamTest.objects.get(id=id) - objs = ExamPaperDetail.objects.filter(exampaper=test.exampaper).order_by('question_type').values( + 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)}