From 393f5564d3fdb3571c22f5c691c9ac0e78ffa8f8 Mon Sep 17 00:00:00 2001 From: Oliver Roick Date: Tue, 16 May 2017 12:02:55 +0200 Subject: [PATCH] Drop tenure_type_label for imports and exports --- cadasta/organization/download/shape.py | 3 +-- cadasta/organization/download/xls.py | 3 +-- cadasta/organization/importers/xls.py | 5 +--- .../tests/files/test_conditionals.xlsx | Bin 8423 -> 8268 bytes .../tests/files/test_download.xlsx | Bin 11504 -> 11360 bytes .../tests/files/test_one_to_many.xlsx | Bin 11022 -> 10963 bytes cadasta/organization/tests/test_downloads.py | 4 +-- cadasta/search/export/base.py | 2 +- cadasta/search/tests/test_export.py | 24 ++++++------------ 9 files changed, 14 insertions(+), 27 deletions(-) diff --git a/cadasta/organization/download/shape.py b/cadasta/organization/download/shape.py index 3000c5817..677611dc6 100644 --- a/cadasta/organization/download/shape.py +++ b/cadasta/organization/download/shape.py @@ -46,8 +46,7 @@ def write_relationships(self, filename): content_type = ContentType.objects.get(app_label='party', model='tenurerelationship') self.write_items(filename, relationships, content_type, - ('id', 'party_id', 'spatial_unit_id', 'tenure_type', - 'tenure_type_label')) + ('id', 'party_id', 'spatial_unit_id', 'tenure_type')) def write_parties(self, filename): parties = self.project.parties.all() diff --git a/cadasta/organization/download/xls.py b/cadasta/organization/download/xls.py index ec2c80b86..69f7ddd78 100644 --- a/cadasta/organization/download/xls.py +++ b/cadasta/organization/download/xls.py @@ -60,8 +60,7 @@ def write_relationships(self): content_type = ContentType.objects.get(app_label='party', model='tenurerelationship') self.write_items(worksheet, relationships, content_type, - ['party_id', 'spatial_unit_id', 'tenure_type', - 'tenure_type_label']) + ['party_id', 'spatial_unit_id', 'tenure_type']) def make_download(self, f_name): path = os.path.join(settings.MEDIA_ROOT, 'temp/{}.xlsx'.format(f_name)) diff --git a/cadasta/organization/importers/xls.py b/cadasta/organization/importers/xls.py index 4a31b62bd..e7f7eae42 100644 --- a/cadasta/organization/importers/xls.py +++ b/cadasta/organization/importers/xls.py @@ -75,10 +75,7 @@ def get_csv_from_dataframe(df, entity_types): right_on='party::id', how='outer' ) # drop unused columns - drop_cols = [ - 'spatialunit::id', 'party::id', - 'tenurerelationship::tenure_type_label' - ] + drop_cols = ['spatialunit::id', 'party::id'] merged.drop(drop_cols, inplace=True, axis=1) return merged.to_csv(index=False, index_label=False) diff --git a/cadasta/organization/tests/files/test_conditionals.xlsx b/cadasta/organization/tests/files/test_conditionals.xlsx index 14123ef76cc891f79c9e29f787e537cca33d0a9c..26c37ce21e45a4bb007b3aa7297e7447e8a33bf4 100644 GIT binary patch delta 3828 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 Lfph=vAI<*(850em delta 4025 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 JhyRc9{{Re1UE%-$ diff --git a/cadasta/organization/tests/files/test_download.xlsx b/cadasta/organization/tests/files/test_download.xlsx index da397800ceb1b7ee85ce2da56251757beff0e4be..d4142ed3c243a6138edae2d4aceb17372db8766b 100644 GIT binary patch delta 5248 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 CoKa{1 diff --git a/cadasta/organization/tests/files/test_one_to_many.xlsx b/cadasta/organization/tests/files/test_one_to_many.xlsx index 836b2af9b53e0dc268f064dae9cfdcc73a4c7217..20357d02ad057855ff85429b703e34695fc1886e 100644 GIT binary patch delta 2789 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 delta 2798 zcmZ9Oc{~&TAIE3HnENQcCdbN5j)sX0ML8l$w!W@%{@k}ke{$rswJCR>bzI}YEF zTW>X)-@`OzrW%&55>cA;ykMgTQnj$dCxhzBc;O#3msjQY#eoT6+ha=QTt)Goy{+4* z(aRf2fhP|qlGL~0f5oQ>&sKV`yys>mTYIH|x3Nwa>~MD>^)z!v7HK(?Tm?DO7N*j3 zN~-_i!_ZX$xUSdG8?Wz~E?G+8s1Ihd$>PpOkDsgh7|fr@ka|{Y?KTEvqHJcaA6nXK zrCo+a5!S5rw=#R<904t*O#`XNP7z)@%JW)X&QAHmaWJ*}X?TrS_%S#4@3>}LvyH&a ze=tmf6y5qI`PhB?ov$OoET7!yH6rIXvcj{6>t z&Cr0lfjjia0nuyJHx*>1r zw{+6xX!Mfdyo-a-^?Bk_<>pxQ0rJIa5q9U3``)K&qd&nfIk>1JW;Zi)%u1qOf9bzO z?7Nf%3{Ova)ZpQ0b|2DHEKE5SaMYhgpFYo|WBheN9i7hz z*y6P1Cge)u6eUjcInc^f^^p&Fu;Ljm=Y>U`lSR)|M;+})48))OEPZ-|6_K>sgnhN$ zByK&0jW`#}j(r2%$KomJ{v`p{l1)jD|L3&MC3Z}8#P4l?4vHN{Q?*#RPJ%;107xAm z=r!=ndQJ6Ws`59EAn`s~9CPy=BQRh;NDF)JS6okLz7SEB#2sEc$5?FmwPv-UAo;T* zqB>a46?hJeO)9@v@S#FbCCs^!^Xh5gq`<9w!QK41*f8f(P79f5@8TnO5@kn11rIzO z8p{RizsU6nhP*%fk1?Un{b-oPar^1OfLUYGsTwjx9HO?x3Ema<|xj$K2*MTFK$deGA`VmFp0s>YyE zETBnyFzLjQ{z>S{_p|!Q-ZSR;&dDI>A;zS}ta@qFKQ0Lm9JZaW==t34=$=QFnZLVM zRPr3<@MIJJLPEmxqt2M?Soh6*>U0 zk6ZNL*L^|8+RVX{8vy9S7eOv!k@Sv+NIy@H=eRvvTiO$&m?|Y@k}bNdAJ}sz^2{<2 z+iqAf{oR8jz0j{l>Ha{(ZKhsse(0l#6Bgovg7S*7kZ%Goz3I;Y6O7+(M$@V1G4rFj zqd{kslKq6=h>S}!AM#TcmPCzsyl2#HB9T_m?xHN>D-NneMsumDcSsagOCg6xL{2Xl z2u;*Mn8ejPEa1%U$k(Ru$e;gg_D4DqdgzB&C;#qlQ`l5PglQNy!gdNNS^%q64RuMC zYu^^^Wj+-s(;~!*8bNQ&Oslx6(b3O!G+!#L2bX90ziL+H^8yD1wthW~@}8y*0-p4r zk@g{&Sn4w)Yd)3(92c+=t>aH6fJTiX!uH-ErRoCh0AnxdI=3*p!dr3msLfWTit!t= z0h}IkT6soC`0S)uLvGn)CJ;;#NmTfp;_J4uy-QcLi;5*N5Z%&1UKedUVgI<*Yxfj6 znwRaZ`1#EtkDWN&(Y2Vd5(%T+dx->dQMX1BEx*o8VZM~K+hf?|cVwMm72n=_C+{9k zs}tckw$Of(UNCfAN8330(0psDUe7oXu4(wd3m0=-;Bg96vT^&S!^*S}&(tEkUTbfT znU*l$z+LRSgL@NzygBYD=B@ECOXlL+naZ+aC+gPE=Oi=UD8MyEhYj z)(I~H3^uS9LD7}ai9$Up$j*bTIwNJYDqd+$5y{q-n^EJnIc83$KP3^I9SWm+S?A?; z)WIB-UgK?t9E}@qc%*h58uh?>(48WH445pY`tTLnT>gj z$xg3&FXQpRd$Ok6uzE#eH#lJTa%iY+&0^g>ZtRcz+%%HkQ^O2>RQAB`wg)Qxu)vI;rLQHwOj;Dx8!M+`=Vx zolcoRrVa_*r}=1uDhNHeRwf+?ns^V=%a*w`Ae#sqt+z>a(FcrbODiAR8Wb}A)Yg9u zdl2Kdwa;N^<9owgas%3>O;2=u;#@`ZER`na+8L= zn4vw4nYwRLlzmkDl7SBr00+|@1w=&o`^cTpwxR_?&S+XD$G5TV!SycwR*=3ryO zdCI9OggM}M_qL5NWH>Z9&;IHdg0+%bx0RNwpl)Urc;#(z$fA&1?Z>JWZ*&WD**IV` z%%Xbq;mVPVJr1yat^<_BH7xqJ{gG$cVB&!W2&AHs=0SB|JTB+tp?gcV@e4<2$eYGV z@@B*Cp1eIw7BV|=b2_0FNVHiTuDT*lHAD7Akt-iB`PqL$dTwlx63DTm^u!Tb;t8_+ zoOgi~uet;&fzRjsWzct?JZ9q7lu+d@zWG1AXBdKcZA$HfUv`qdm_j>2@w~5&-Xp6u zB)TfMq&kTeFp&JEN0NYlSHnvY^K(XZ@$sD0v&5UCP@OY~#EBpa9fiA#*bUkL@r=|X zP#Tc!{|1gP{x*#-VcNe6_-z=9O&ujYHp7)pvq@Dt&*rX@0h=heF`IYb#{cgh8E_rh wUzYMeUzZpF@XN0L_fhf6%24+DC1q)j^LRgH2s?Z5Guy)xl@+-cV85pS1#lfU`Tzg` diff --git a/cadasta/organization/tests/test_downloads.py b/cadasta/organization/tests/test_downloads.py index 1bf3486c8..a712b55d4 100644 --- a/cadasta/organization/tests/test_downloads.py +++ b/cadasta/organization/tests/test_downloads.py @@ -512,11 +512,11 @@ def test_write_relationships(self): for i, row in enumerate(csvreader): if i == 0: assert row == ['id', 'party_id', 'spatial_unit_id', - 'tenure_type', 'tenure_type_label'] + 'tenure_type'] else: assert row == [ self.tenurerelationship.id, self.parties[0].id, - self.spatialunit_1.id, 'CR', 'Eigentum'] + self.spatialunit_1.id, 'CR'] # remove this so other tests pass os.remove(filename) diff --git a/cadasta/search/export/base.py b/cadasta/search/export/base.py index a600584d8..abd47e981 100644 --- a/cadasta/search/export/base.py +++ b/cadasta/search/export/base.py @@ -47,7 +47,7 @@ def __init__(self, project): model='tenurerelationship'), 'schema_attrs': schema_attrs['party.tenurerelationship'], 'model_attrs': ['id', 'party_id', 'spatial_unit_id', - 'tenure_type_id', 'tenure_type_label'], + 'tenure_type_id'], }, } diff --git a/cadasta/search/tests/test_export.py b/cadasta/search/tests/test_export.py index 70fedce88..663c61a29 100644 --- a/cadasta/search/tests/test_export.py +++ b/cadasta/search/tests/test_export.py @@ -125,11 +125,9 @@ def test_init(self): assert list(attrs.keys()) == ['notes'] assert metadatum['model_attrs'] == ['id', 'party_id', 'spatial_unit_id', - 'tenure_type_id', - 'tenure_type_label'] + 'tenure_type_id'] assert list(metadatum['attr_columns'].keys()) == [ - 'id', 'party_id', 'spatial_unit_id', 'tenure_type_id', - 'tenure_type_label', 'notes'] + 'id', 'party_id', 'spatial_unit_id', 'tenure_type_id', 'notes'] def test_get_attr_values(self): location_data = { @@ -361,14 +359,12 @@ def test_make_download_standalone(self): assert rows[0][1] == 'party_id' assert rows[0][2] == 'spatial_unit_id' assert rows[0][3] == 'tenure_type_id' - assert rows[0][4] == 'tenure_type_label' - assert rows[0][5] == 'notes' + assert rows[0][4] == 'notes' assert rows[1][0] == 'ID2' assert rows[1][1] == 'ID1' assert rows[1][2] == 'ID0' assert rows[1][3] == 'CU' - assert rows[1][4] == "Customary Rights" - assert rows[1][5] == "The best relationship!" + assert rows[1][4] == "The best relationship!" def test_make_download_not_standalone(self): ensure_dirs() @@ -516,14 +512,12 @@ def test_make_download(self): assert ws['B1'].value == 'party_id' assert ws['C1'].value == 'spatial_unit_id' assert ws['D1'].value == 'tenure_type_id' - assert ws['E1'].value == 'tenure_type_label' - assert ws['F1'].value == 'notes' + assert ws['E1'].value == 'notes' assert ws['A2'].value == 'ID2' assert ws['B2'].value == 'ID1' assert ws['C2'].value == 'ID0' assert ws['D2'].value == 'CU' - assert ws['E2'].value == "Customary Rights" - assert ws['F2'].value == "The best relationship!" + assert ws['E2'].value == "The best relationship!" def test_make_download_empty(self): ensure_dirs() @@ -794,14 +788,12 @@ def test_make_download(self): assert ws['B1'].value == 'party_id' assert ws['C1'].value == 'spatial_unit_id' assert ws['D1'].value == 'tenure_type_id' - assert ws['E1'].value == 'tenure_type_label' - assert ws['F1'].value == 'notes' + assert ws['E1'].value == 'notes' assert ws['A2'].value == 'ID2' assert ws['B2'].value == 'ID1' assert ws['C2'].value == 'ID0' assert ws['D2'].value == 'CU' - assert ws['E2'].value == "Customary Rights" - assert ws['F2'].value == "The best relationship!" + assert ws['E2'].value == "The best relationship!" def test_make_download_empty(self): ensure_dirs()