From 4cc49e4e9f86176e2411f8d80b6b0840ed242a11 Mon Sep 17 00:00:00 2001 From: bglacial Date: Wed, 16 Jan 2019 00:35:01 +0100 Subject: [PATCH] =?UTF-8?q?Renommage=20d'une=20table=20Gestion=20invers?= =?UTF-8?q?=C3=A9e=20des=20cl=C3=A9s=20=C3=A9trang=C3=A8res.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- timelaps/__pycache__/admin.cpython-36.pyc | Bin 405 -> 408 bytes timelaps/__pycache__/models.cpython-36.pyc | Bin 2477 -> 2560 bytes .../__pycache__/serializers.cpython-36.pyc | Bin 2495 -> 3415 bytes timelaps/__pycache__/urls.cpython-36.pyc | Bin 599 -> 605 bytes timelaps/__pycache__/views.cpython-36.pyc | Bin 2327 -> 2089 bytes timelaps/serializers.py | 34 +++++++++--------- timelaps/views.py | 29 ++++++++++----- 7 files changed, 38 insertions(+), 25 deletions(-) diff --git a/timelaps/__pycache__/admin.cpython-36.pyc b/timelaps/__pycache__/admin.cpython-36.pyc index 4d3c8dbf51875e3ff323cda0916da8cc97da6b2a..49efea4cdda19fb5c590e69d922309cf9ea5d6d7 100644 GIT binary patch delta 31 mcmbQrJcF6jn3tF9ZI)e(-9}DnMh+g=y!6EM)Rf7Zj5z>-+6aLF delta 28 jcmbQiJe8T#n3tDJW{qWx^+rxwKy5frjUfm{Z(8`mKcI1T$-;eX$u3tj^Kx8Qqmq*m_3iDJ-)Ddo-$g2uu(;*BdiI9 zO*$%qmG)+RQ;NsU?W|K+9n?+CivZ+yy(2~U%SU7CFyN~O#=D|n;w8Mee5Uz*C-)s;6yoxZ9DZj8+k(1rTA!>H>n8P{7Oa?Wz z=*}3vdf`rAJ5D8_J`4sD!OptZtrxo8dUbCJo4=Z^Rlcp(~mEb zK{fAnuBm;XD$@MM`u4{9=9UzVhav2>RFdZFal5TL-O=o+_Otq3Zi-DK=irvImH8kS zu|Ai1lq@BVbtlu^W4(Zq7xBo%WA#m0%r?YM9h&>iW-IO@;~9M*CVN2%hLM{inlx)T zg&?giCIZbv+K(t7s5)sut*#(rZ^sZR7+9NZB-!rFW9Ta0gcb-#z~}&3>xTYjP4w=f zs0_&>L-LHtzf8q5LlQ$Vz=*gOX#e|6dMG2qW40yK$D;fni|AXjobh*3`?hM;_K7?G zcw;9pA&-K7B`R!IzZWMjjBLd`#vQf7rB;MTO{nT$;?i~EFTKnX*6%~yiL*tA)08u8 wGZ)Zt1#d#mqs=UHk9KoG_ng&$`kXCJ*5#~IKso)&6c=xZK{_@ZGvX*E)m)EUlgFzHt z1X0qQRY}jT$DI&u)EtB@S(P>)b@_(wrcrbu(md#sx zz%Uz=Q!wV5xlF8XmSlT5k2E1y`4w9|CxkQbyQ7_3UiFefm#*zogtj+BMX@SjyP>&op&(aSa6V2UL&~mHRYou*Cqczbjo=2Mu@U_NKFN*io+ z18wlK+iP=|XXD6Dv_XGMZFbK&AlFD!Vz+JnE=zNBKOD`^*UIEM1tE+JK_?h=mg%xE zc>}f(d)u@1CC~l<9`HV#z0u#2t&<;;%ivOqpK-9)ur{qfmIB)0fVMfHE92X%{p4|N z_en@n7E*<>b*@kraoWX|^?)}|U&DL@^DUcYUhA{&H{chEW_x~{JR6y7!Y}%(`NheZ z)GM-#dgV`3S6^jeaphuh<&rbxs9UqIFq1pZxkR$!AQ{cAut^fRv&Lf{vMYF1u1*Q* z^&=#K6$9uyexD`w>6Fn8NCz2Qb_ROF2A3v&xZ2$lO literal 2495 zcmbuB%Wl&^6ozMfi*rwtf?6b4z$z^21=|P}sS>M3sO`!^8d;gCFgO=x+@fY%o&kwR zV9VpomQ`MW1uM>RoW!vp1Ur#ObN-q0+w<9;;}^|l?d#9M+wT@3KS<^WF*$`peSwA( zP9rj=KBa^k+>DGX@|tjq+n))y1$}Sco4y5#!z-XvQpE6+@haZ4)kSaCay(InK0CTx9Z-u;ETW4>wm(Kd{WNITb|h`9Pj zWD`!EG`|MkcoKWuI}^9wtJy3HM?oA;C(4V%v5111V!DZJY* zwWw@EXV|x71yA8(Q^f}5&1sjt7HXJ{$;yDnrAfTSYk%&oi(n*5Q15N$C(NY-mj%3Y z>(Lg@m30`D4Q$p#GfTrY*Wf4)rvurDZv_YAf^gawa69ix&^gQ*?8IXyllS0*jEeK= zLN-1{D?S((<^yk#D#d5p;2(T&@*aF}lPJyyvwImn7#HNzx)Q;-1fJe@{!Tg;&fNpf zaVa)i5M zS4cd|s?u&Mr0*>2?EE;{WO7a$VhgM&!+s^VbxV99Ho&ya#VmgJ*A4s`%vM+gpt>2B z_22akzZRaNM_S)79`@_HC54LFwS*e}X(~TR9M(=!sFiM?W5M1$OG#Cfxcf`o;v~Mu f5}#Lzh$MRcX#v_DEWZq1B2tC<4eA51v7DHA^*;1Ti3EG}_{@F(wKoDBeY+7Uwl delta 40 vcmcc1a-D_Kn3tC;hTAsg(L~OttlTB3iMbQM9pDu7$t*4j0dgiEVw?>C5%CVH diff --git a/timelaps/__pycache__/views.cpython-36.pyc b/timelaps/__pycache__/views.cpython-36.pyc index 6235d8ad183bbafa702c4647f2caa5bd483ad976..6f747312e9120938e11f63b88e18e86ac4adb430 100644 GIT binary patch delta 335 zcmXw#Jxc>Y5QcYd_wLpsClW4lA@L)kge$DH6T}bfBuMNIn;(UW^|t;GaZb#@JoCQHFaz^ke_aXo!Z6q$A6|X?@43j@4iUfiS2m=GdK3WB7Lq$v|1oClJ+f?kq@*_QeATlWLNsVeAyo?_Ko zh&dS%0ZnoTf677SlrVBebPj?(LA9i3J(Ue)A*@%*?79#MSO>|hH@?kOu2qDaREV(N zu$YumCDbx4CquPfb=U^dJo;Yx15ViNiNfweOrL-00!wL~1QmKS0^#VO{;DQiP#KA&ZR<)Bl-DHF9D6~qI zL%H^}2Yv&G9ys$GkT~y&pTf*;sjxL~X5OsV^Je#Z``c=?+iXT#xA#A`*pKL0*yy~{ z*1cEBIDZ@7?KLoZqtncpCLzSM5LN)ht?Nqu%j@Mo!|m-J@QMg3iSQ&9z6wMrJ;9_e zYBG@FS0d_?9gu#l*veOG8_N$`%}>AZh{JlRoYRvbcSnj(6O)WBADC=h<};J>xpqfo z(zPlb>>SS%GqgKH<+|1RWFq-Mr%suFk7ia`t|#RoqtfKWa&%5-lk&!5$xL#nv@Dnd zm0BKB5P&NH^TA$#**$;-8IchM^v>xS`YQ7w^IR|rM{EI#FDQ5_y$gEgFMQDHzwT4f z#+S!aoM9Yee9bMdNbCY;!YWOL52A`rnq|kcX$;cit1kbis)o%v^j3bDf>ql4K@s45 z%zdmp01&LwZaT=6unJLebExjP`14Ge6RX@)pllt0&=&0V{5N~@ykU?r4TK2c27p+5 zhqEmIi34SHlIl}sOdIQ6gog-^@;|}m#ytohgIPRX4+2_lFaK1#gezM0O&b0M<`AiN diff --git a/timelaps/serializers.py b/timelaps/serializers.py index a22255a..f97b3e9 100644 --- a/timelaps/serializers.py +++ b/timelaps/serializers.py @@ -4,40 +4,42 @@ from .models import * class DriverSerializer(serializers.ModelSerializer): class Meta: model = Driver - fields = '__all__' + fields = ('first_name','last_name') class RaceSerializer(serializers.ModelSerializer): class Meta: model = Race - fields = '__all__' + fields = ('name','start_date','end_date','duration', 'comment','fk_rules') class RelaySerializer(serializers.ModelSerializer): class Meta: model = Relay - fields = '__all__' + fields = ('relay_start','relay_end','has_refuel','pilot_chrono','pilot_chrono', 'comment','team_pilot') class RulesSerializer(serializers.ModelSerializer): class Meta: model = Rules - fields = '__all__' + fields = ('min_stand_duration', 'max_autonomy_dry', 'max_autonomy_wet', 'max_driving_duration', 'relay_default_duration') class TeamSerializer(serializers.ModelSerializer): class Meta: model = Team - fields = '__all__' + fields = ('name', 'comment') -class TeamPilotSerializer(serializers.ModelSerializer): +class EngagedPilotSerializer(serializers.ModelSerializer): class Meta: - model = TeamPilot - fields = '__all__' + model = EngagedPilot + fields = ('order','team','pilot','race') -class RelayPilotSerializer(serializers.ModelSerializer): +class EngagedPilotsSerializer(serializers.ModelSerializer): + relaysv2 = RelaySerializer(many=True) class Meta: - model = Relay - #fields = ('relay_start','relay_end','has_refuel','pilot_chrono','comment','team_pilot','race') - fields = '__all__' - ''' - To get linked elements référenced by a foreign key, use depth to adjust the depth of the request. - ''' - depth = 2 + model = EngagedPilot + fields = ('order','team','pilot','race', 'relaysv2') + +class ListRelaysByRaceAndTeamSerializer(serializers.ModelSerializer): + racev2 = EngagedPilotsSerializer(many=True) + class Meta: + model = Race + fields = ('name','start_date','end_date','duration', 'comment','fk_rules', 'racev2') \ No newline at end of file diff --git a/timelaps/views.py b/timelaps/views.py index c5844c9..07dd2b9 100644 --- a/timelaps/views.py +++ b/timelaps/views.py @@ -32,16 +32,26 @@ class ListTeamView(generics.ListAPIView): queryset = Team.objects.all() serializer_class = TeamSerializer -class ListTeamPilotView(generics.ListAPIView): - queryset = TeamPilot.objects.all() - serializer_class = TeamPilotSerializer - +class ListEngagedPilotView(generics.ListAPIView): + queryset = EngagedPilot.objects.all() + serializer_class = EngagedPilotSerializer class ListRelaysByRaceAndTeamView(generics.ListAPIView): - """ - Getting the params from the url with the "self.kwargs.get" - and filter with thoses in the relays relation - """ + serializer_class = ListRelaysByRaceAndTeamSerializer + def get_queryset(self): + raceid = self.kwargs['raceid'] + teamid = self.kwargs['teamid'] + return Race.objects.filter(id=raceid) + +""" + def get_queryset(self): + raceid = self.kwargs['raceid'] + teamid = self.kwargs['teamid'] + return Relay.objects.filter(team_pilot__team=teamid).filter(team_pilot__race=raceid) + +class ListRelaysByRaceAndTeamView(generics.ListAPIView): + #Getting the params from the url with the "self.kwargs.get" + #and filter with thoses in the relays relation serializer_class = RelayPilotSerializer lookup_url_raceid = "raceid" lookup_url_teamid = "teamid" @@ -50,4 +60,5 @@ class ListRelaysByRaceAndTeamView(generics.ListAPIView): raceid = self.kwargs.get(self.lookup_url_raceid) teamid = self.kwargs.get(self.lookup_url_teamid) relays = Relay.objects.filter(team_pilot__team=teamid).filter(team_pilot__race=raceid) - return relays \ No newline at end of file + return relays +""" \ No newline at end of file