From 8150b1363f792c08b3222c09fdcbe340afc23176 Mon Sep 17 00:00:00 2001
From: alazo <alain.zosso@webzos.com>
Date: Fri, 17 Aug 2018 18:11:00 +0200
Subject: [PATCH] Fix importation fields for MP

---
 .../test_files/CLOEE2_Export_Ester_2018.xls   | Bin 11776 -> 12800 bytes
 stages/tests.py                               |   2 +-
 stages/views/imports.py                       |  12 ++++++++----
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/stages/test_files/CLOEE2_Export_Ester_2018.xls b/stages/test_files/CLOEE2_Export_Ester_2018.xls
index 19b7d401dd03833a3ea3d87cd8de27b7a408d1be..b01e5597effc846ae0e5790192e9ecb1a9cd68e3 100644
GIT binary patch
delta 2145
zcmb7FOK%%h6h3q9#P&GJ<l*-utrOY?vT*Y#aRLIIMkAEgc@QUML6C_`q*zL9<0ME~
zP=|+v5G;_cgxIuVQ&6)ZG%TtLDi$n2f`|n_011f&ifBXy5{Nc@XJ$NO(h8|}G}rT;
z$2Vubd+znt!q&_0_cuq#9<4+jpFQOf@irLRao;;UJmfoUKSy_;6Q3y8y%mo-KneN=
z<|dLEUud`D`&6h6bd?lJ!YDh`1##0SUs2B~3HgQE9oD@>0`Z-=75na#zpH6qN}LAn
zll{SG7h8yotdSp|o}8I8^0PBjTFo#H>)6!X^pqVkXJqq}(`P5LMza;dhMC!k3pH#^
zj!k5lLM57*%H_wiW4W9mKMZD`_Y-9oSIdP`F^7_-IHP}PFgY?Zl1!(Q!^4czqsf86
zq2!szlf&sK(b`gFvAkR;rdF)POr=~*U0eqDAWF?8$8yGiyd8W}o^Fa8bES<+acQlz
zGRI6{NrM*TqoXGCh|3%!TCZ%DmrKRedM(MOmPXUOr;iHqa?_txo#vsQk6we`Jl<*!
zn`$yvaNUV%4i<R2)8b+ec_<c$IDRjA>BXe$Zy-Ot6NJzh%oo7*hwl1SQmeGr<Qjt1
z0YVptC`5azi^CMAd|iBmBJ^&^^+zfCpZpl%I_CQ06sK6-2PLSQpv!G;fQ}Zb6+i+F
zfnm+?kYAvWF?2e~jfPmwv@tkp<BmLP!x~|H-@tPQxpzsG`z`q@eqr&USRZ~Z<Of1G
z*(d-MaF7bb8Mm-gh=M@(Um-g)3}4WU<&20K8MS?!g;kH(5ZVxzsE9_)3AwH5RsMJ`
zNWmg&xN69QEEeOEV4oL-%o@UuYyjeYZsj!s@s78U52(XIexQ(p0uYSP11nO++ags5
z1_7~K=u40(s2ZeK1?CT~2^4Lmv>*n34_&x-HJk{1wb|ZwSmN;V=P4+n)8-1ne#J;&
zzHp}06}J5m`0vsXe_a$V7TS7A42YY-LUABIcr3&u?ee=;z1n5lc*|&X%t7_K2~)Rw
z6P9j*ShwR&WW8>@K@)uZneP#3j0AN%h;{365bO3xO*etHcXbmF)J>qnH97$T){V=p
z*G)igjZQlB9YCjmcpU^5Pouuy!kEwfyq~tT6KIVE7EeV0YuD=}vv!X<h_!pnL8f*<
z`?LeQIN%eomHY?130Pr1<~8yh%&5D8_Dikub||F8<x7!tfR~&{Tz(XZ!?qL3;je)`
zyxcqzrYB)~bkoD@$wN0iIy}$Fw|n%Kc5|C4_&7WT<W7%Xy`g-JCQ!`N>xXZD-Tdq3
zUfX+b&^DdF7UW&dUCAY^(Gpc?k;=481u9aCR)AK43seHmz*{!$7ZE}9(-E$xVOvE;
z0eS1lc*0_=J_O|rWgD7{|1Fg@Sw|_GW}#eI%6#1hY(;#+8eY9pSL_Q9t~PUDwGTsT
zajLT0+jafKf~R=|Y|Oaz&y`obve0|ne|GrP*Ym?aD)M!2|L#}4p9>`<H~QWbzjW{Z
I-Ph>(7g!NcGXMYp

delta 1331
zcmZux+e;K-6hHILy7%4L+w5)BwIGuWu?s8_fnsASsoSpg5XMrJ&;^CE$66)mO%Oit
zF?x}R9#Xg0B>#eZ=&7fu$0YW}h`_ernOSEnoZ<Vv`JHp-obx;9%q-kqm|pIWq^Nbp
zh~n!PRH6TAHk-VXQ1Geqxqju1vf+8C)|Y*6g)9WT@<wn(Y<cCY;8-z3TZ$ixXlhBJ
z?{u9sqDI+r>}_OmW<5j#XATQy*2>AAP|<f^ISO2mGoedIf<&VemFm#t!Aix96P3!7
z!_|wE<Ab9UX0=i>hh#K7kb%|d@zPYKYp`OT@)4P{GdE}FAIa75`8LFuFy)tUP7X%O
zYJtwkmB`OpmaZbYkDgE%v51~WbSoRi3hv#k=3s%R-KdLIQYjxuJ9-a!sM_V~+sI4X
zVHf)lXH9dlpJFvQa0PLS({|9s2};nd0}hguq@|RrPf_Zh_jS@K-|6bpl&1Uv0vXEC
z%ebp&^2&Y!B%)RYRBPwX_yrn|D@(_?F=&lu$r$`E;|@A9smAV9H>n*mAEbxfaoQtv
z3k0*UA=<Q1(y~ppbUKh9I@>Z06aZ3$7kftT#f%zzV6B24XcTgg3gX<)r-F4J%2U}C
zEz34oMjT5o5c9SzeL(Ep_UQ-0w9<QIsUUWq5~~9H%4>m`u&F^Df(e&t(;ApC8P*+b
zxnKvFRx4=*c1Fut9P$@t9{aVka~*IGQVP0jwBAcWlW-Ezf%ucN(@F#Jr@2P~W|slf
z<!Hj_NViOQPBqBw7X+ph)sTycTunm_ZLU1?npJalDo|&at2m4+Y?vy4rA$>|9i++;
zHPmK5W(>#x;@Sz6K%)~s^cs$_Z#zYsuW<MZ@X@Ssv6ErG9gZvJ+vy;SF3=9GK`t62
zn28wq8$2kS9RE%<QXBn{YvgJ4K!)ZuxJUKv<b#+T?lz+KkSiz+o|<y5+mK(6ch*ZM
zGs;HKv>GYGdH`!-cmA^~@Aek_^S>JB?zMkX<f5m){-O7sP!jTS-!t*Cz5ct;tNsO4
C*sh`g

diff --git a/stages/tests.py b/stages/tests.py
index 73edc15..65d190f 100644
--- a/stages/tests.py
+++ b/stages/tests.py
@@ -578,8 +578,8 @@ class ImportTests(TestCase):
         # Student already existed, klass changed
         student1 = Student.objects.get(ext_id=11111)
         self.assertEqual(student1.klass.name, '2MPTS ASE1')
-        self.assertEqual(student1.option_ase.name, 'Accompagnement des enfants')
         self.assertEqual(student1.city, 'Le Locle')
+        self.assertEqual(student1.email, 'seraphin.lampion@rpn.ch')
         # Castafiore was archived
         stud_arch = Student.objects.get(ext_id=22222)
         self.assertTrue(stud_arch.archived)
diff --git a/stages/views/imports.py b/stages/views/imports.py
index 30ed94e..cd19f45 100644
--- a/stages/views/imports.py
+++ b/stages/views/imports.py
@@ -101,7 +101,7 @@ class StudentImportView(ImportViewBase):
         'ENT_NPA': 'pcode',
         'ENT_LOCALITE': 'city',
         'ENT_TEL': 'tel',
-        'ENT_CODE_CANTON' : 'district',
+        'ENT_CODE_CANTON': 'district',
     }
     mapping_option_ase = {
         'GEN': 'Généraliste',
@@ -111,7 +111,7 @@ class StudentImportView(ImportViewBase):
         'PAG': 'Accompagnement des personnes âgées',
     }
     # Those values are always taken from the import file
-    fields_to_overwrite = ['klass', 'login_rpn']
+    fields_to_overwrite = ['klass', 'district', 'login_rpn']
     klasses_to_skip = []
 
     def get_form_kwargs(self):
@@ -300,11 +300,15 @@ class StudentEsterImportView(StudentImportView):
         'ELE_AVS': 'avs',
         'ELE_SEXE': 'gender',
         'INS_CLASSE': 'klass',
-        'PROF_DOMAINE_SPEC': 'option_ase',
+        'ELE_CODE_CANTON': 'district',
+        'ELE_TEL_PRIVE': 'tel',
+        'ELE_TEL_MOBILE': 'mobile',
+        'ELE_EMAIL_RPN': 'email',
+        'ELE_COMPTE_RPN': 'login_rpn',
     }
     corporation_mapping = None
     # Those values are always taken from the import file
-    fields_to_overwrite = ['klass', 'street', 'city', 'option_ase']
+    fields_to_overwrite = ['klass', 'street', 'city','district', 'tel', 'mobile', 'email', 'login_rpn']
     klasses_to_skip = ['1CMS*']  # Abandon classes 1CMS ASE + 1CMS ASSC
 
     @property