diff --git a/schoolapps/dashboard/templates/dashboard/index.html b/schoolapps/dashboard/templates/dashboard/index.html index f0afd002203d7c59c64f7bbee93a65d5228e9fd9..34a623753e55904f9deccb2bb4df3b1b52640240 100755 --- a/schoolapps/dashboard/templates/dashboard/index.html +++ b/schoolapps/dashboard/templates/dashboard/index.html @@ -3,10 +3,31 @@ <main> <p class="flow-text">Willkommen bei SchoolApps!</p> + <div class="row"> + <div class="col s12"> + <h5>Dein Status</h5> + </div> + <div class="col"><i class="material-icons left green-text">check_circle</i>{{ user_type_formatted }}</div> + {% if user_type == 1 or user_type == 2 %} + <div class="col"><i class="material-icons left green-text">check_circle</i>Deine + Klassen: {{ classes|join:", " }}</div> + <div class="col"><i class="material-icons left green-text">check_circle</i>Deine + Kurse: {{ courses|join:", " }}</div> + {% endif %} + {% if user_type == 1 %} + <div class="col"><i class="material-icons left green-text">check_circle</i>Deine + Fächer: {{ subjects|join:", " }}</div> + {% endif %} + {% if user_type == 1 or has_wifi == True %} + <div class="col"><i class="material-icons left green-text">check_circle</i>WLAN</div> + {% else %} + <div class="col"><i class="material-icons left red-text">close</i>Kein WLAN</div> + {% endif %} + </div> <div class="row"> <div class="col s12 m6"> - <h4>Letzte Aktivitäten</h4> + <h5>Letzte Aktivitäten</h5> {% if activities %} <ul class="collection"> @@ -29,7 +50,7 @@ </div> <div class="col s12 m6"> - <h4>Letzte Benachrichtigungen</h4> + <h5>Letzte Benachrichtigungen</h5> {% if notifications %} <ul class="collection"> diff --git a/schoolapps/dashboard/views.py b/schoolapps/dashboard/views.py index 04f264c6676280e8f7a126030bc7f60eb3b06b29..ee8eca52599e309b476564d1c1ff23edc5232cee 100755 --- a/schoolapps/dashboard/views.py +++ b/schoolapps/dashboard/views.py @@ -6,6 +6,7 @@ from .models import Activity, register_notification from mailer import send_mail_with_template from userinformation import UserInformation + # Create your views here. @login_required @@ -25,9 +26,16 @@ def index(request): # Load notifications notifications = request.user.notifications.all().filter(user=request.user).order_by('-created_at') + # user_type = UserInformation.user_type(request.user) context = { 'activities': activities, 'notifications': notifications, + 'user_type': UserInformation.user_type(request.user), + 'user_type_formatted': UserInformation.user_type_formatted(request.user), + 'classes': UserInformation.user_classes(request.user), + 'courses': UserInformation.user_courses(request.user), + 'subjects': UserInformation.user_subjects(request.user), + 'has_wifi': UserInformation.user_has_wifi(request.user) } return render(request, 'dashboard/index.html', context) diff --git a/schoolapps/userinformation.py b/schoolapps/userinformation.py index b9ae821aff0ed2e4a985b393853e95a2a0057188..184b36943095439fb833d0cfae9a9e4397d63b42 100644 --- a/schoolapps/userinformation.py +++ b/schoolapps/userinformation.py @@ -28,6 +28,16 @@ class UserInformation: else: return UserInformation.OTHER + @staticmethod + def _user_type_formatted(user_type): + return "Lehrer" if user_type == UserInformation.TEACHER else ( + "Schüler" if user_type == UserInformation.STUDENT else "Sonstiges Mitglied") + + @staticmethod + def user_type_formatted(user): + user_type = UserInformation.user_type(user) + return UserInformation._user_type_formatted(user_type) + @staticmethod def user_classes(user): groups = UserInformation.user_groups(user) @@ -47,7 +57,7 @@ class UserInformation: return classes @staticmethod - def has_wifi(user): + def user_has_wifi(user): groups = UserInformation.user_groups(user) if "teachers" in groups or "students-wifi" in groups: return True