From faa78f8cf03df21f8f932f41d8a4b155753d2927 Mon Sep 17 00:00:00 2001
From: baoliang <j2eer@163.com>
Date: Mon, 23 Nov 2020 15:43:53 +0800
Subject: [PATCH] fix task records status bug

---
 polls/models.py                             |   5 +++--
 polls/views/__pycache__/task.cpython-38.pyc | Bin 3746 -> 3825 bytes
 polls/views/task.py                         |   8 ++++----
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/polls/models.py b/polls/models.py
index a309939..118bbb5 100644
--- a/polls/models.py
+++ b/polls/models.py
@@ -4,7 +4,7 @@ import datetime
 from django.contrib.auth.models import User
 from django.db import models
 
-from dashboard.models import Group
+from dashboard.models import Group, Group_user
 
 VERIFY_CODE_TYPE_CHOICES = (
     (0, 'register'),
@@ -101,7 +101,8 @@ class Task(models.Model):
         return TaskRecord.objects.filter(task=self).count()
 
     def records(self):
-        return TaskRecord.objects.filter(task=self)
+        group_ids = [group.id for group in self.groups.all()]
+        return Group_user.objects.filter(group__in=group_ids)
 
     def add_task_message(self, user_id):
         for group in self.groups.all():
diff --git a/polls/views/__pycache__/task.cpython-38.pyc b/polls/views/__pycache__/task.cpython-38.pyc
index b8167686b41dd1f45692129d64c1cd5ec70e3246..0d8d74188974e832dd84e9643087ecd0d516696e 100644
GIT binary patch
delta 1473
zcmZ8hON`r86!o(cJ0E-U|4uT~X&FjVHNzCdPh~1V6d@|Ak`5HB5ZpXZ#=(xmwIgWB
zC=vq_NK`O#kpLBGh8-*@(kxkZ!LAF|Ua{$jVb?8ec=u)cp^kiX?z`9Te%^Wcv3{qn
zt!i3AV2}IWZ=KyOtxj%j9b26^DLq95Dp18vI~hI0dCbl_IX&m(^}JKi3w$kZ7oCz`
za>{zyspu6Vn6eqC37Y&=*d&`ouX0<Z+JQaG?HQUnuxqAF(=>yYUZ;_^(8%r!!q&fS
z5)IChMKw&EH@x@XFuN|$U7!3wNHNGt$4Dtykq*@>tng4WY#TIWvN0T*0}54UKrQ%K
znqzU_OHHyI{4Sj%&7c%nBF)`bBHxl^9%Bj!)!^^w;mRCR+^->qi7uFiZ_>`C%gnnd
zFP(adIra&9C3qGipF?;WSH*``!>HvLJ+nc=Xb;@c@FxPLAdsIwSHw^17(ELM$R&is
z48qjNGhqnsnq`|E&-BCSngyN@Idn=r(}xH$g)!S=>v8<@NU)$Zvn6yyPrrKR<u>3!
zLMnJisiiYWA3;bXl!Gsn=J5tno=`bRHXRkVJ#7p7<ZZz-!Jo?8^DE2_qgb66k`XMS
zd-)!m2rk5~%(t1{#o63_@GPS2eTlu^yTP5<ACvw@+>dVx8;NnepBpD={G{OL`>}q3
z+agV06*rROB>Y1&1CeG~M2<xi??%x4RkB^$5jNDZ+AlM2;-tV>h4TXA%C<I6><}V+
zaBHlLBeclYq<(dKmX>zNI5MGSww+8X%%xlxHwn{O^>sd8xF>{A@tM>*7KJBS;Uks7
z?XN!B`{vjEYv28K;|6eroMNkhGlwz)pB&09jQXx`*r5zus=8u%XFnX6&=BD@L6`_|
zo&}9$2Dg9ta_{r6M|gyL*MFW`fZAvf3>8Avg`P36t{A@M4nk$Rp$D_f2Q>t)q1r<l
znilm0`d>sq!5rv>=U+sdm-{F(JR>-Yz%R=xvNsuo+I{WgC@!D_%Yq~VS5y|+3kZA$
zZz1D_J;qo=11>W@BWxOlwIaZAq%8z4qQ{Zp<{^QQ4E3btb=Itb<*l0(&Y<%_ncYmD
z&SpuP<Vk|4>=$DkE(R6VNb-)SXBd2@Hna2i?ft7J!$NRVU75$4bgjE?3<jp%v5m_n
z{4c|twj_60Ok*x+Yu6^c+ptLc#-Qi6*q@KtGC%5?Lp%}>P#R%!=-Rf|8u^y(O~*Nd
zsZ*FJO$~4Tl4}5MIW9F>0KbL&Qu66FF%&NjTtvXk50tZvw+BuHYcq#xHP&vP<Ry`a
NM9p(N%JGOu{sZP6M`Qp1

delta 1358
zcmZ8gOK%%h6rSU;J(*YHjNh@{gp?8{rA`AX52-C6L?s?7Dj}_yN>~%$sbe!^n==!M
zR*t+#cZfxGS%5^P1Xgs>1r`6Hi%PIzGykAF*s|iD>rmQ`bw7XSo^$Vc-oINvwd`%%
zHWcw$_kQh!ckC8CymNYc3JO!07A`~uuORtcxEMK}6BWH;RPsu4PY=sc#j8YBuNu|7
z8Yn?N(3!!^+sXkPfLE8Y#q48wNy_tV;aF}2c~)SHBzaAi-BMiVF@@p+SK$-L@+~;^
z;5OU^DDzeIG*tLyb){7k7OCooAzH-p{&*Y=8P<h>4gQUKLfG9?*WoPxQ@sK%U(0TQ
z``}vkdoYV+QzEGIe{!q!7E!v-&7?*b13w8^XXmESp385%eNHGI18G%!lPupNc%61L
z&+VqUe&qK87t&l0M|<O604x0G{DmuJI?^QT2CfiS30@G8F6_ktj&XFO9|oN`NYdPm
zKE??;q*QxBf>~mkU}0bE>vVFJZ))pKg%r6<AAJ1&7E<$Yo<~}<P#}7eV1b~@f6&&?
zyi8O&)Q+9aN=0eU(xN<NTKES4OZ$BJf{@c3MHi>Ahiy`yeFB?&ckb5mr$X*hZT|bH
z7df%s6Dz*TLH}dAv#%%mfwFH*^np4tn0{WFsDt8Ri4~4O$csYO2W7#W^GZ?~%nhnS
zuCd~`a9BT5_RWboSQ1)8*qMWd<R!tiLwjNz0VrQRnrM?OD?f8@mhMgRtg<Fl+K-t7
z5OY<%EX#^d1|ZcEKmM}QXZRYQ8s#N92^U4|NVUZ(fvixS-!~dlT%wHz0d>>`{80R*
z)(Ct4uz$->`lDg0VbC2Ri)a0AKG*Nr#jny8?-EdRk9$h&MFQ#Z6fr6%zC=KCJ;l$6
zZVO25|L2s#zeWlf*cvf8Z;Qm_98i?_4uQ<*s$i~#awKG)Tcnb+{R*)&1hU^7#OUr6
zFa>9fAJN9sQ(#(`oB|k763Y_5IVb>L=UvM;Ws<W}^WUv?=LDUVk;#{k#}#hc7ndmv
z&+hK}!(kA1LjPuf&v@9iH}YQy8@I*p+TTsn3LE&t-l#2#9JGV4yTO>s9-}F2Qgb{C
z!??Yd^uu^oJ)6AFlaB)P<K3N+kE|VySRf4K`;gB?*2*PQ8fm;vKu({EL}tCof16)v
V)<mKuD5)99fK`&XCh=qj{srzT8Fv5x

diff --git a/polls/views/task.py b/polls/views/task.py
index f883d39..583ac06 100644
--- a/polls/views/task.py
+++ b/polls/views/task.py
@@ -4,7 +4,7 @@ from django.views.decorators.csrf import csrf_exempt
 import datetime
 
 from polls.decorators import polls_login_required
-from polls.models import Message, Notice, Task, TaskAddition
+from polls.models import Message, Notice, Task, TaskAddition, TaskRecord
 from django.core.exceptions import ObjectDoesNotExist
 from polls.utils import model_to_dict, queryset_to_list, parse
 from dashboard.models import Group, Group_user, Userprofile
@@ -98,9 +98,9 @@ def get_task(request):
     n = []
     for r in records:
         p = dict()
-        p['id'] = r.id
-        p['added'] = task.added.strftime("%Y-%m-%d %H:%M:%S")
-        p['status'] = r.status
+        p['id'] = r.user_id
+        is_finished = TaskRecord.objects.filter(user_id=r.user_id, task_id=task_id)
+        p['status'] = '完成' if is_finished else '未完成'
         profile = Userprofile.objects.filter(user_id=r.user_id).first()
         p['name'] = profile.name
         p['organization'] = profile.organization.name