From 6d87face15a7996bcdb36227807e5dccfda8cc64 Mon Sep 17 00:00:00 2001 From: timofejmalinin Date: Sun, 3 Sep 2023 21:07:12 +0400 Subject: [PATCH] fix other objects --- service/migrations/0030_auto_20230903_2006.py | 35 ++++++++++++++++++ service/models.py | 2 + Другие объекты.xlsx | Bin 8758 -> 8786 bytes 3 files changed, 37 insertions(+) create mode 100644 service/migrations/0030_auto_20230903_2006.py diff --git a/service/migrations/0030_auto_20230903_2006.py b/service/migrations/0030_auto_20230903_2006.py new file mode 100644 index 0000000..49ea2d8 --- /dev/null +++ b/service/migrations/0030_auto_20230903_2006.py @@ -0,0 +1,35 @@ +# Generated by Django 3.2 on 2023-09-03 17:06 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('service', '0029_alter_placementpoint_postamat_id'), + ] + + operations = [ + migrations.AlterModelOptions( + name='otherobjects', + options={'ordering': ('id',), 'verbose_name': 'Прочий объект', 'verbose_name_plural': 'Прочие объекты'}, + ), + migrations.AlterModelOptions( + name='placementpoint', + options={'ordering': ('id',), 'verbose_name': 'Точка', 'verbose_name_plural': 'Точки'}, + ), + migrations.AlterModelOptions( + name='post_and_pvz', + options={'ordering': ('id',), 'verbose_name': 'Постамат или ПВЗ', 'verbose_name_plural': 'Постаматы и ПВЗ'}, + ), + migrations.AddField( + model_name='otherobjects', + name='param3', + field=models.FloatField(blank=True, null=True), + ), + migrations.AddField( + model_name='otherobjects', + name='param4', + field=models.FloatField(blank=True, null=True), + ), + ] diff --git a/service/models.py b/service/models.py index c8f14ba..413b763 100644 --- a/service/models.py +++ b/service/models.py @@ -130,6 +130,8 @@ class OtherObjects(models.Model): group = models.ForeignKey('OtherObjectsGroup', default=None, related_name='other_objects', on_delete=models.CASCADE) param1 = models.FloatField(blank=True, null=True) param2 = models.TextField(blank=True, null=True) + param3 = models.FloatField(blank=True, null=True) + param4 = models.FloatField(blank=True, null=True) visible = models.BooleanField(default=True) diff --git a/Другие объекты.xlsx b/Другие объекты.xlsx index 909cf2d2ecf7209796356bbf70572ec1bb9805c0..0752d9a505ebae6fa6e029bcb97be732e78844b5 100644 GIT binary patch delta 2070 zcmZ9NdpOgJAIHDi<{Fb9&fHsPrG+R8F-mg6T+S+C3lq7{X6bNh?2sXsTt+ks2l*jV zq-?o`VPQ&EDQs@>b6F0N+jjgqzvtFC};}c@C|lZxbw*aB(H{l4ArnO~uncPa6UY&zZCNw|~N; z!vQz<*zt~BFse}DegQqBehb}NADnf_XVG|((m-|}X$nVI@?B1T*Q-67pjVqc{I<94 zjs7jd?f_b~S>#g$UJ+4x#YP}+6FeGM{0cKksa$TD<`7Qq&h3?m#@=GD23`}XK4;uz zHK@o82tkwqYbmJe`~*SbO=I)Wtyv{c`4OvrsU3t5myFp7-1^(xVoy$F-g*rn@-8 z*T32^laBQnx^1HEQxSEGSh%L)QOo!;ucd9f_{^aEN7WfVWo<{~kEjVJDPgW{jy#7* z8Jk6czz0UdQ^#H6jGE7OrTN}=sV5h;S9|LW;Sy05CI>aQr>R)HnX>AP9EFxSg~YzU zI(_J^`dvKPzwP&N+iFKq`4!B;;&O`?<;-g;xS=6AoEuCc!nGKQ4S!0wA1* z=e~SW0}GdDq1~MjR$}i-Q3^rOA3c*!yby-Dz6qnI+bxlfG8CKx&9rRWrJ2r_7TT!? z>Lx#u)OG1S^D+fT>=_|EW^jH4^qxTaD8*-^hu1`t4AM(RrFHpi?%vu8o*}r5;>Sj7 zAl@IEEVq=ZiSdV44z=UKR;ZP#jz@0yX6=+~c5P-Pu$qK8eLcQh8kcCZC(27LrY(Re zurR(Ez)$>%(rs*WNdw|Ll6qcuTW-t~xe{U>374!W7bzGU2IjsL)fMz;mM)er`oKC@ zN-bWmeOlpm#rr%4*2keV;6n2wSUJLmR#(e@k^)sUGa__s@ zvBwtd&Xdf3@d5NvylTUf&DenR8;>)xW?QKa+}b56{0CspD!0${iT=#kw}`Y_7v=#g z)9qnvW?rt6n3SvX*i~f(-s7#rQC)VmZb8g{>dcF3rhp(XLDv!45mSvOS4Iew&I;JA z!=W=txTr?jFRqnE-Yq^fv5dBvE$Fxz?)HsmpIryW^gYN@>2}+9${xK|f;!8nj8P9# z?-!h@3s+C4N1V`)F=hRfQ8iow4miC&IVF%OXuZxhE2&R81*0XrS29?_jjs(-bT&qM z3{%)3Y-oWgGkvnu`jD>f{?#V3y8j16KeK3b&vVnUFbS$m#8D#e#Dj?hmH~e zp!^S4uLkaP*Y8{eIVddP>VM%HI&dnu-AEBK5Dkx1tRqgAmSyilrr0}mFHb4ay<*Gq4X@Zpaup5c!`W4&+q>rSlpgYA$@NkxcRHueu(6z{vAQK#Bj-4IOM4H_N6m$T z5G4DKun2$rFNLX2hx`O{YlcCX8Z`jhYOl#9fo@Y}reTY*cnhW1dywCfLaos#0Nmwz z8pQEH?~9|pP(WW6<6zmh>N3N|Hk`YjpKIVtg-1|5%+*;nDa?o@!ScVhm@!e>l?j-y z&&K~qMw2-5M&(YKf>}QFqVXJ0#LfYSvkZAz8iZ?8ab1;JnsI3my5MR_qJox!pJJ?w zboqThOTO5t6af4UU+2Yp delta 2032 zcmZ9Ndpy&N8^^b7WVFd;VTV~)40B23mPu|AVN@p9b21xaE|aj-hD6FYMNCtZ+-kX{ zDH?K55vAmeB$qBmDko+~=l4gi*YEl3dA&aWd|uDUeSm-83Q*-7_j~i(fww0I&ullvbD%ao) z-_CwYnFm2Eq{AU^76$7#kKB9q&+6D1olfK5*`D~m16FP9nq!yM*b|2tGHx?_wMAg$ z@Y0B2Sg!I+q;#LL9J}9!Qhn4Pl#w8Air#){#sIcGIcdt)X?m*HSz*faky`E6`*R zGB?dL8Hx-=X7o-Cv&_9V13jtm`zgsjG5X)RL!79k^AZws!s7@BCsJ{^Qbviy6<`mC zgr;?8L#NLv*<<7z2wC-_zq zF<|%cbhD%`tX%{O8vHrS8!N^NkLfIt_ua=xmzS-Rjd(au>nIAdjoDHFKSnIi z9)3Gn$?!LMb#$DdKzcH0-k<-WrgWEGDS&dt+@Jcb@fWr=fO*-aDmP-#<^=b!v4=l^1)6dD@m+u*7+;ep5t_gOX)3-faVQkXA$c>I$|0F!@9Gp~b)CZoy6 zd(`E8Tvr(NpYud=zpe@z|3ORXQ0*D@-C)Lxz57Q~dy4;n#cMaS-p9)|I6L1MTYE%m z8t#Fhsr?Vo)5KhZA8{&4srNi9GTsyEyb(cW8n5#GCmKNV{svOcw_b@@7OkWHxcY9ideu^~9V(|3Gw_liUl#-*K5+4Ge>&p7x^$>0wD_A#Zj3MEF0( zPGKEGMjH-WehgV&g|t+o1AbPNc#l<^bF5T~Xi|M7pe(^+xsA}ruWyOg!N1j5tbgy| z=g%K6*V~aE7$V>&g3ToqC&pi|ZW$n8VnB-vByW Lw@Gu*zodTwWlXBs