From 330fcec3650f10cb02b6a50be70f9e4c7b3ce665 Mon Sep 17 00:00:00 2001
From: patrick <patrick@fet.at>
Date: Thu, 4 Feb 2021 10:15:31 +0000
Subject: [PATCH] show firstname if available

---
 fet2020/members/models.py     | 13 +++++++++++++
 fet2020/templates/layout.html | 10 +++++++++-
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/fet2020/members/models.py b/fet2020/members/models.py
index dc9e8167..363f5ca2 100644
--- a/fet2020/members/models.py
+++ b/fet2020/members/models.py
@@ -1,9 +1,11 @@
+from django.contrib.auth.models import User
 from django.core.validators import RegexValidator, ValidationError
 from django.db import models
 from django.utils.text import slugify
 from django.utils.translation import gettext_lazy as _
 
 from easy_thumbnails.fields import ThumbnailerImageField
+import logging
 
 from .managers import (
     MemberManager,
@@ -13,6 +15,8 @@ from .managers import (
     InactiveJobMemberManager,
 )
 
+logger = logging.getLogger(__name__)
+
 
 class Member(models.Model):
     firstname = models.CharField("Vorname", max_length=128)
@@ -72,6 +76,15 @@ class Member(models.Model):
         if not "@fet.at" in self.mailaccount:
             raise ValidationError(_("In der Mailadresse fehlt die Domäne."))
 
+        if self.username:
+            try:
+                user = User.objects.get(username=self.username.lower())
+            except User.DoesNotExist as e:
+                logger.info("Username does not exist. Error: {}".format(e))
+            else:
+                user.first_name = self.firstname
+                user.save()
+
     def __str__(self):
         return self.firstname + " " + self.surname
 
diff --git a/fet2020/templates/layout.html b/fet2020/templates/layout.html
index ecd98b86..26961578 100644
--- a/fet2020/templates/layout.html
+++ b/fet2020/templates/layout.html
@@ -51,7 +51,15 @@ footer {
     <div class="top-bar-right">
         <ul class="dropdown vertical medium-horizontal menu" data-responsive-menu="drilldown medium-dropdown" data-animate-heigt="true">
             {% if request.user.is_authenticated %}
-                <li><a role="menuitem" style="color: black; background: lightgrey">Hallo {{ request.user.username }}</a></li>
+                <li>
+                    <a role="menuitem" style="color: black; background: lightgrey">Hallo 
+                    {% if request.user.first_name %}
+                        {{ request.user.first_name }}
+                    {% else %}
+                        {{ request.user.username }}
+                    {% endif %}
+                    </a>
+                </li>          
                 <li><a href="/admin" style="background: lightgrey;">Admin</a></li>
                 <li><a href="{% url 'tasks' %}" style="background: lightgrey;">Tasks</a></li>
                 <li><a href="https://legacy.fet.at/home/intern" style="background: lightgrey;">Intern</a></li>