From c81d01b7963efc9f90cb59623638d19bf84a15cf Mon Sep 17 00:00:00 2001 From: tomtom5152 Date: Wed, 5 Nov 2014 23:27:33 +0000 Subject: [PATCH] Started work on user importing. RENAMED EXISTING USERS TO PREVENT CONFLICTS --- RIGS/admin.py | 1 + RIGS/importer.py | 30 +++++++++++++++++++++++++++++- db.sqlite3 | Bin 1192960 -> 1192960 bytes 3 files changed, 30 insertions(+), 1 deletion(-) diff --git a/RIGS/admin.py b/RIGS/admin.py index 08fd73ff..bdec5cdd 100644 --- a/RIGS/admin.py +++ b/RIGS/admin.py @@ -3,6 +3,7 @@ from RIGS import models import reversion # Register your models here. +admin.site.register(models.Profile) admin.site.register(models.Person, reversion.VersionAdmin) admin.site.register(models.Organisation, reversion.VersionAdmin) admin.site.register(models.VatRate, reversion.VersionAdmin) diff --git a/RIGS/importer.py b/RIGS/importer.py index 6b359982..11981b08 100644 --- a/RIGS/importer.py +++ b/RIGS/importer.py @@ -25,6 +25,27 @@ def setup_cursor(): return None +def import_users(): + cursor = setup_cursor() + if cursor is None: + return + sql = """SELECT `id`, `login`, `password`, `email`, `first_name`, `last_name`, `verified`, `initials`, `phone_number` FROM `users`""" + cursor.execute(sql) + for row in cursor.fetchall(): + try: + object = models.Profile.objects.get(pk=row[0]) + object.first_name = row[3] + object.last_name = row[4] + object.initials = row[6] + object.phone_number = row[7] + object.save() + except ObjectDoesNotExist: + object = models.Profile(pk=row[0], username=row[1], email=row[3], first_name=row[4], last_name=row[5], + active=row[6], initials=row[7], phone_number=row[8]) + object.set_unusable_password() + object.save() + + def import_people(): cursor = setup_cursor() if cursor is None: @@ -113,11 +134,18 @@ def import_venues(delete=False): object.save() +def import_events(): + cursor = setup_cursor() + if cursor is None: + return + + def main(): # import_people() # import_organisations() # import_vat_rates() - import_venues(True) + # import_venues(True) + import_events() if __name__ == "__main__": diff --git a/db.sqlite3 b/db.sqlite3 index 4845327bef55a58c2a1a1484e85fccde9f6e463a..87f60d2ace948afcf4b65f6e2d11bb26bfe98e97 100644 GIT binary patch delta 1629 zcmb7EZEO@p7@nDT?)G->ws+ern9>8b6>}i=db{^k8jZAo6sgcC(Wt1sa3`(SqqNrm zYJ~zxtMQ}Q3lpqS5=fN<(!w>jS_KZoACeLkNtKwWiHYX^$$|3QGn>_Q* zJM+x*&dxjUY#XcHHdfnHg2#7xmf-Qj4Z9hZdMDTxto3fRufXB-C-xP|*%JB@!I$tZ zJPIB%O5P+-kcIdvK7tdt0&z9wIJR|_B%*3(DPDm^&94T_Rkhq7QnWyo7Oe6w@8u9>4SR1 zl^|LS+u<=NCclsYvVmxL0*~Mx9L4j|MU+KbrzKYZt(CKU;{d*2Uwja&&^0)K4G;sl zJ~d#`2M4Tc9Gs?HL%exN?$%o}au2qdaaY4i{o1G2`8boc(w&^H5s&0JZ*zlV(aVon zznLZ;hC^IgCVZEv73gLf!%Go&HORFTuf$7vy$d?{*I8k+$ih~@#LhzeQdVf}8a^Qy zu<64m#JW-IQ3O$P)Hux)!KZdrdkQ;Ci4%2t1GZ90Qf;VJhht;v0cZA>B z$L=bsS^h|;2b+AcSdv1b7?5~FAB$S2vd_=Q_TB@m$-6#FHf?z-e2blFoeimwslEdi{2%o>)9P);4$7u#%-g2a zG$q$Hu5DeL;Jfw<3yc08?`}I&yEY9=1_}%~^-aUBH)LxK>PM)b+eTd5`76!hEWW4N z<vKPGh^o#k5VQ-r6=$MS%%8rQ)D3z@YxF|`V=QD*wrsok`{QHNSVFpf1z? zNo8KYTo}xJBvTvAL@_R06MWpgSE>-bDb0#XswI)j{gV5RK$SmS6%6_OY9#Dey(#s! zNmcVzh9jCk>`nReCiQb!+3%)>IE%Q_Lp(O35QKlixi>I{caO^M@;qUt&4p@m>pO1* N{zsds{iE{Je*v_b#U%g$ delta 1092 zcmY+De`s4(6vxlK=QclH@|Jg#Y_@5T)E`7#?UF2E6a*W~utQ-T7QtW8!a7B2)|Qky zMV81Ub3Yp*z0PhR4mQg&*X`BZGSQ}gI$I|)YdcU1g0x6o>7=c;{e~cJ?EYG zJ?C-Xy_xxz%zVp0Em_D1o5{k}_Cbxf3ai>75-Ie!_K>*wscTQV#zj(qH}Nb!gF!k? zPtoV-cCtdQ5t)zheZ)*<2Pt#mIGFAu7qJkE8|HX!Hw(D%2H*y+;xaDcJpPD3;4I!! zoo<*sUc^HAG&8?CeW=E}2*BcQtfl)q4|Mc(rJY6d+2LVL`w#+jf&!3l3hvP;4&pJh zY4j-!kr6vmidXTnGN!C}FFpwX+CMQ}G>fwR*L$%Co3WbSrWa{9jgY%!jGQF<$bGN? zA466c^|(zQE|MsUrXqPPH*$q2r~(yCQ6)#N*xKBJ`PqzkVcb?HzyI8JKXF(C`>;p0 z?6%L4QrX6i2$nIniBPEOb%RtBgE$Dl8Z5y)%!v;ij`~(otv*j(mUo41_V|l&EB})j zmj1y!mTs^umaa41(%+fe(%+cN(lw@uhn}#{Y<8K#FXYH4yp4!9$%~~HJ9|yA_iW2z zrEGs%T$-?ZtSF}M;}Prcb4)C1XY(h=76sKb#25I5h~+WifU ziCApc&bF63AMfmasWa7)KG-W7hqMQ)|E**jh-Gxv>3YKHOoHeg(mHrUG?s`&BI$## zsyh))#Ki277WOs78WX!36Pj8EigSQ-xUA;i!g`Kj^1mTe$2#YK_D#nssI9c296uvt z2qd?DUQ@UfZn=J5clxUc?FTCOjOTzEiaTho|GKW&qVUN6>&8jWl3;?+CXKhmu`Z)l z1g4CDyf$ehvGldUT3Hj6LAWQ4j17OnyKqLF>N4&T;di($!gV}AF3Srcz7tCiaMp@% zlC8p?=Ii;SPj2nwcf70_&VVqE@;CI`Fr`|Va6vr*F>r$VJzAtr82ownJh{3C|{}zCFwj zYb-{)H(!xwN4cM<@{(-&%r-zuW1KnA4`af