From 7851af2fadfa2ab0b472f9983a5bb623ab43c37b Mon Sep 17 00:00:00 2001 From: Jacek Lebioda <jacek.lebioda.001@student.uni.lu> Date: Wed, 11 Jan 2017 13:59:53 +0100 Subject: [PATCH] User information + added flags --- smash/web/models.py | 10 ++++++++++ smash/web/static/flags/DE.png | Bin 0 -> 202 bytes smash/web/static/flags/FR.png | Bin 0 -> 209 bytes smash/web/static/flags/GB.png | Bin 0 -> 1269 bytes smash/web/static/flags/LU.png | Bin 0 -> 199 bytes smash/web/static/flags/PT.png | Bin 0 -> 12184 bytes smash/web/static/flags/readme.txt | 3 +++ smash/web/templates/_base.html | 6 +++--- smash/web/views.py | 5 ++++- 9 files changed, 20 insertions(+), 4 deletions(-) create mode 100644 smash/web/static/flags/DE.png create mode 100644 smash/web/static/flags/FR.png create mode 100644 smash/web/static/flags/GB.png create mode 100644 smash/web/static/flags/LU.png create mode 100644 smash/web/static/flags/PT.png create mode 100644 smash/web/static/flags/readme.txt diff --git a/smash/web/models.py b/smash/web/models.py index 18d09a95..66340e5b 100644 --- a/smash/web/models.py +++ b/smash/web/models.py @@ -113,6 +113,16 @@ class Worker (models.Model): def __str__(self): return self.firstName + " " + self.lastName + @staticmethod + def get_details(the_user): + person = Worker.objects.filter(user=the_user) + if len(person) == 0: + return ('Guest', 'Test account') + else: + # For get_*_display, see: + # https://docs.djangoproject.com/en/1.10/topics/db/models/#field-options + return (str(person[0]), person[0].get_role_display()) + class FlyingTeam(models.Model): doctor = models.ForeignKey(Worker, related_name='FlyingTeamDoctor') diff --git a/smash/web/static/flags/DE.png b/smash/web/static/flags/DE.png new file mode 100644 index 0000000000000000000000000000000000000000..9d35468c0df6666bf09847d80948d698b7c0651b GIT binary patch literal 202 zcmeAS@N?(olHy`uVBq!ia0y~yVAKJ!w=gjS$>6}BH9(3dz$e5NNZ(~(_<xS!|Ns9< z|Gee^`HV^4?k)@+tg;?J4rhT!WHAE+w=f7ZGR&GI0Tg5}@$_|Nf5^zqW1>*>`B^Sd z$i>seF(l*O+cS*33=Av`2C7r11aanUvp=8=lw_z-eZC_`Z~Ez{MLVGs-?~|k;T*8o at^HCdoXt5)tPZ^cY4LRRb6Mw<&;$Ul6hAls literal 0 HcmV?d00001 diff --git a/smash/web/static/flags/FR.png b/smash/web/static/flags/FR.png new file mode 100644 index 0000000000000000000000000000000000000000..ccc9d43715901201d4ccbb8033d27848b4688b67 GIT binary patch literal 209 zcmeAS@N?(olHy`uVBq!ia0y~yVAKJ!w=gjS$>6}BH9(3pz$e6&L3!$1P0RoP|1bK( z_zx(^nB?v5!qCAg>j6?x;1OBOz`!jG!i)^F=12eq*-JcqUD+Qpa`Tv2|CpxV2o&=3 zba4#HxcBx9BQFC32lImITb5}0eqhKGXjpPHZPtz$z3Hc)7VRX8y8iezLkeGW&NP$9 RSAixoc)I$ztaD0e0ssj6N1gxx literal 0 HcmV?d00001 diff --git a/smash/web/static/flags/GB.png b/smash/web/static/flags/GB.png new file mode 100644 index 0000000000000000000000000000000000000000..fecad794fa132320c20245bdb4d1eb35bf63b56a GIT binary patch literal 1269 zcmYLJYgCd482->yl%X|6ylXjZGo)I&%IK8Fry}JnO+Py@4Yae3*)f$anioh#CD~eK zN3Ax&E>0vq4ket_5ED~VD-jb*#EmRSm!+<`lCibbkN5sO&!6|aZ$*4uG}_6_2><{z zIfk?c01$X<E<@T{y{EzO*cx`n?@R=NPYMvYLYtsM+to$84m2cwcl9e)bHC=vpxc@U z51$SNZ5aw8YJ#_EbkB6L)UmkKM+xau6=$FRP-m(UzErATb@k2N>3=i(>h0Y8+xZ2H z#X=ltiM5I&=#*#@P;TcNV=WxBVp4Jd0Ok6RA%NQR9@eHqE_oN|U_hWg3UiC42G#(; zvS2bPBJrqh`q9|Ig!OLA?)9Tc#Fd1|UQ5xZGEUIFdp=`1qt1+q7Wdx?gR-6;vMIN{ zWgMGH`(ksOf{@x>XMFtUcxbA5>efxF#a7Gh^GjU{BW*pckn7TX>laH|*(}&m%eKFG zO|sKqVzcl`$&jDe8R9mIVISHY!#8tc4ZcAB9I}NMy(t43YA<14DQ-r9VP0jozzv3M zdX?G~RQ+QgH!OnXO&I~P+M~95Wq83*NnZ&I(=>R6Ez>LysqN#04J-AKP;c{GfM815 zYoYe6XYdooJjXb>hY_-yCLz)^^ybhPU*ak928aje>5kXr8&@x<Hz#a8hn&;P)GAPg zC1Bh`T?hoUdu#YbLa@XmLQ+C024mT59v{S?Y~`inXJ(r^ySfBFwN>*faE%pG9uYrW zkLm<FKfWkG$t%Gv?ZD~yoJ&Q>hS5{(jAI1Bgo-grsDH6Bim`d^!2Lh$8J^efI?8{B z4g@bEx8u#mLp^SrMD{Q}r(U9qU(fAGoBukXzz><!1g%g25V|pj5yD_G19GH$MVH~p ztmggKFRNVSoZ%LBgC|y^>vkFltGe!p$<>fWzFy@nBR<+FI5N9GEi<|_Tz^Q^=2ea! zS*PX0oSZ89bd;TG(oGwOzRhJKncdJzg}vlt;*=lr4YqZ^-5RLFDM`Y?h|>N|wL<y@ zsq?jWMUq7N|Dg9h=sn>-#s|>%m1n)Pa$2%KsJ#=8*e0J^Sj=^u2=p*794WkYoNd{_ z7jKJTE?fa{=A{~<J?3gzvtk{Zv@~EE10hlIt%<ra)b{JI@7IlG?Jx7|R{1<Aglpf* zC;C-(TONHTYL*uZ<LJ{v;BV)Lp!^b4e#0xsJFDJ-+F=?8U*|HR3!UJmJD}(W^$c7M z=N&$^!4+sql|$WJ<+tiCZ~GI&jlA3Bc!;I~w}yHop$IRnTPebh{<Q;cHB9<r-23ia zdgxJQGzrp^iPeErf$gfa9!2`tZi$ShnFdu4F5GwtLC`8frr{V=xdUr4X3*h5+EPGi zC20Jd7`c)$%h%67Jjd@M7f*d-<IhtX^K5=mMmlsH#>Jc{y~~*u)F4snj5c~urwype z3rQ+3jR8FyWe^~iwg(8h_RY{!Qfm?!A!SXXwUfQDR^GelBt|eV@iN*rDmh{PV(EC4 zp`-Rmuo)dr5cLqM=i@f}YZK+Yc?tC^m{!&iw|%hsCZx^Z+Ybp1!RE}igQ5s4Yu!w@ zmx-RDSKLQ11E?7Vrzt4Wuhz(=xQc`{ygC1h^@dT&Df$Ci2lMg~m*g|*4ek7c&elf) Mkij^TI5Lg%H-^wxu>b%7 literal 0 HcmV?d00001 diff --git a/smash/web/static/flags/LU.png b/smash/web/static/flags/LU.png new file mode 100644 index 0000000000000000000000000000000000000000..42c89b6279a2c83ba6a3ef3343a8ef8584bc8f37 GIT binary patch literal 199 zcmeAS@N?(olHy`uVBq!ia0y~yVAKJ!w=gjS$>6}BH9(3pz$e6&Vd1^EnwJ0n|Nr`K z(Ji1LW0JSK3quF1tOrO%fk$L90|U1(2s1Lwnj--eWH0gbb!C6Z$jxJ_D&3^K7%1f8 z>EalYaqsOJMqUO676t>=sZ)YDbGF$ZP=4NW`f1V57`^FGD*OK`OE?ECwyv2QXhK7{ Z)OnTWoSp75K&LV=c)I$ztaD0e0suN&K864Q literal 0 HcmV?d00001 diff --git a/smash/web/static/flags/PT.png b/smash/web/static/flags/PT.png new file mode 100644 index 0000000000000000000000000000000000000000..79c872c38843bf34db9cde14843a87daba385dff GIT binary patch literal 12184 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 Ai~s-t literal 0 HcmV?d00001 diff --git a/smash/web/static/flags/readme.txt b/smash/web/static/flags/readme.txt new file mode 100644 index 00000000..250b9059 --- /dev/null +++ b/smash/web/static/flags/readme.txt @@ -0,0 +1,3 @@ +Icons come from an open source project: https://github.com/googlei18n/region-flags +To add another ones, pick them from png folder, and resize to 300x180 to mantain consistency. +Then, add them in administrative panel. diff --git a/smash/web/templates/_base.html b/smash/web/templates/_base.html index 2da89ada..761871ec 100644 --- a/smash/web/templates/_base.html +++ b/smash/web/templates/_base.html @@ -152,7 +152,7 @@ desired effect <!-- The user image in the navbar--> <img src="dist/img/user2-160x160.jpg" class="user-image" alt="User Image"> {% endcomment %} - <span>Prenom Nom</span> + <span>{{ person }}</span> <i class="fa fa-gears"></i> </a> <ul class="dropdown-menu"> @@ -162,8 +162,8 @@ desired effect <img src="dist/img/user2-160x160.jpg" class="img-circle" alt="User Image"> {% endcomment %} <p> - Prenom Nom - <small>Secretary</small> + {{ person }} + <small>{{ role }}</small> </p> </li> {% comment "Uncomment if needed %} diff --git a/smash/web/views.py b/smash/web/views.py index 2705c072..c310f01a 100644 --- a/smash/web/views.py +++ b/smash/web/views.py @@ -34,14 +34,17 @@ def login(request): def logout(request): state = do_logout(request) - print state return redirect('/login?error=' + state[1]) def assignments(request): template = loader.get_template("assignments/index.html") + details = Worker.get_details(request.user) + return HttpResponse(template.render({ + 'person' : details[0], + 'role': details[1] }), request) -- GitLab