DigitaleAgentur___ALT
/
digitaleagenturnc
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

yt-links aktualisiert

This commit is contained in:
holger.trampe 2020-10-25 22:03:20 +01:00
parent 4ec5016251
commit dad207c296
4 changed files with 39 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
adm/templates/adm/adm_base.html
View File

@ -8,7 +8,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<meta name="description" content="">
<meta name="author" content="">
<link rel="shortcut icon" type="image/x-icon" href="{% static 'users/img/favicon.ico' %}">
<link rel="shortcut icon" type="image/x-icon" href="{% static 'users/img/favicon_neu.ico' %}">
<title>Digitale Agentur - Administrativer Bereich</title>
<!-- Custom fonts for this template-->
@ -68,8 +68,9 @@
<!-- Sidebar - Brand -->
<a class="sidebar-brand d-flex align-items-center justify-content-center" href="{% url 'users-dashboard' %}">
<i class="fas fa-laptop"></i>
<div class="sidebar-brand-text mx-2" style="">Digitale Agentur</div>
<!--<i class="fas fa-laptop"></i>
<div class="sidebar-brand-text mx-2" style="">Digitale Agentur</div>-->
<img src="{% static 'users/img/logo_neu.png' %}" width="100%">
</a>
<!-- Divider -->
<hr class="sidebar-divider my-0">

10
adm/templates/adm/adm_user_single.html
View File

@ -3,20 +3,20 @@
{% load adm_tags %}
<!-- Mitarbeier ist immer der angemeledete!!! -->
<div class="content-section col-12">
<h4>{{user.get_full_name}} aus {{user.profile.agency.name}}</h4>
<h4>{{userdata.get_full_name}} aus {{userdata.profile.agency.name}}</h4>
<hr>
<table>
<tr>
<td style="min-width: 120px;">Name</td>
<td>{{user.get_full_name}}</td>
<td>{{userdata.get_full_name}}</td>
</tr>
<tr>
<td>E-Mail</td>
<td>{{user.email}}</td>
<td>{{userdata.email}}</td>
</tr>
<tr>
<td>Letzter Login</td>
<td>{{user.last_login|default:"-"}}</td>
<td>{{userdata.last_login|default:"-"}}</td>
</tr>
</table>
<hr>
@ -32,7 +32,7 @@
</tr>
</thead>
<tbody >
{% for g in user.groups.all %}
{% for g in userdata.groups.all %}
{% getAgencyGroupName g as aggdata %}
<tr>
<td>{{aggdata.agencygroupname}}</td>

2
adm/views.py
View File

@ -154,7 +154,7 @@ class AdmUserSingle(TemplateView):
def get_context_data(self, **kwargs):
context = super().get_context_data(**kwargs)
context.update({'active_link' : "adm-users"})
context.update({'users' : User.objects.get(pk=kwargs['uspk'])})
context.update({'userdata' : User.objects.get(pk=kwargs['uspk'])})
return context

55
users/templates/users/dashboard.html
View File

@ -79,39 +79,42 @@
{% endif %}
{% if not request.user.profile.agency.module_news %}
{% if not request.user.profile.agency.module_timemanagement %}
<div class="card d-block mb-3" style="width: 60%">
{% else %}
<div class="card d-block mb-3" style="width: 38%">
{% endif %}
{% if request.user.profile.agency.module_timemanagement %}
<div class="card-body">
<h5 class="card-title">Heutige Abwesenheiten</h5>
{% if acutal_absences|length > 0 %}
<table class="table table-hover" id="table_timemanagement" >
<thead>
<tr>
<th scope="col">Mitarbeiter</th>
<th scope="col">Abwesend bis</th>
<th scope="col">Vertreter</th>
<th scope="col">&nbsp;</th>
</tr>
</thead>
<tbody id="" >
{% for ab in acutal_absences %}
<tr>
<td>
<!--<img class="commentimg mr-2" src="{{ ab.user.profile.get_photo_url }}">
<span class="us_fullname">{{ab.user.get_full_name}}</span>-->
{{ab.user.get_full_name}}
</td>
<td>{{ab.end|date:"d.m.Y"}}</td>
<td>{{ab.representator.get_full_name}}</td>
</tr>
{% endfor %}
</tbody>
</table>
{% else %}
Für heute ist keine Abwesenheit eingetragen.
<table class="table table-hover" id="table_timemanagement" >
<thead>
<tr>
<th scope="col">Mitarbeiter</th>
<th scope="col">Abwesend bis</th>
<th scope="col">Vertreter</th>
<th scope="col">&nbsp;</th>
</tr>
</thead>
<tbody id="" >
{% for ab in acutal_absences %}
<tr>
<td>
<!--<img class="commentimg mr-2" src="{{ ab.user.profile.get_photo_url }}">
<span class="us_fullname">{{ab.user.get_full_name}}</span>-->
{{ab.user.get_full_name}}
</td>
<td>{{ab.end|date:"d.m.Y"}}</td>
<td>{{ab.representator.get_full_name}}</td>
</tr>
{% endfor %}
</tbody>
</table>
{% else %}
Für heute ist keine Abwesenheit eingetragen.
{% endif %}
{% endif %}