-
+
Rollen
diff --git a/accounts/templates/accounts/tables/user/archive_edit_form.html b/accounts/templates/accounts/tables/user/archive_edit_form.html
index a780962..c58effb 100644
--- a/accounts/templates/accounts/tables/user/archive_edit_form.html
+++ b/accounts/templates/accounts/tables/user/archive_edit_form.html
@@ -91,7 +91,7 @@
type="text"
disabled
value="{{ item.last_login|date:'d.m.Y H:i' }}"
- class="border rounded px-3 py-2 w-full bg-slate-100">
+ class="border rounded px-3 py-2 w-full bg-slate-100 dark:bg-slate-700">
diff --git a/accounts/templates/accounts/tables/user/edit_form.html b/accounts/templates/accounts/tables/user/edit_form.html
index 1352f10..59a08b1 100644
--- a/accounts/templates/accounts/tables/user/edit_form.html
+++ b/accounts/templates/accounts/tables/user/edit_form.html
@@ -86,12 +86,11 @@
Letzter Login
-
+ class="border rounded px-3 py-2 w-full bg-slate-100 dark:bg-slate-700">
diff --git a/config/settings.py b/config/settings.py
index 2a721be..79946b1 100644
--- a/config/settings.py
+++ b/config/settings.py
@@ -22,6 +22,7 @@ INSTALLED_APPS = [
'time_tracking',
'tailwind',
'theme',
+ 'django_apscheduler',
"django_tables2",
"django_filters",
'django.contrib.admin',
@@ -83,6 +84,9 @@ USE_I18N = True
USE_TZ = True
STATIC_URL = 'static/'
+STATICFILES_DIRS = [
+ BASE_DIR / "static",
+]
STATIC_ROOT = BASE_DIR / 'staticfiles'
TAILWIND_APP_NAME = 'theme'
diff --git a/core/context_processors.py b/core/context_processors.py
index bf9f1bd..5dcd2de 100644
--- a/core/context_processors.py
+++ b/core/context_processors.py
@@ -1,17 +1,23 @@
-from projects.models import ProjectMembership
+from projects.models import ProjectMembership, Project
from .models import CompanySetting
def project_switcher(request):
if not request.user.is_authenticated:
- return {"user_projects": []}
+ return {"user_projects": [], "archived_count": 0}
memberships = ProjectMembership.objects.select_related("project").filter(
user=request.user,
project__active=True
)
+ archived_count = ProjectMembership.objects.filter(
+ user=request.user,
+ project__active=False
+ ).count()
+
return {
- "user_projects": [m.project for m in memberships]
+ "user_projects": [m.project for m in memberships],
+ "archived_count": archived_count,
}
diff --git a/core/forms/base.py b/core/forms/base.py
index 193a9e7..4ab8661 100644
--- a/core/forms/base.py
+++ b/core/forms/base.py
@@ -4,10 +4,13 @@ from django import forms
class BaseForm(forms.ModelForm):
default_class = (
- "w-full px-4 py-3 rounded-lg border border-slate-300 dark:border-slate-600 "
- "bg-slate-50 dark:bg-slate-700 text-slate-900 dark:text-white "
- "placeholder-slate-400 focus:outline-none focus:ring-2 focus:ring-blue-500 "
- "focus:border-transparent transition"
+ "w-full px-4 py-2 rounded-lg border mt-1 "
+ "border-slate-300 dark:border-slate-600 "
+ "bg-slate-50 dark:bg-slate-700 "
+ "text-slate-900 dark:text-white "
+ "placeholder-slate-400 focus:outline-none "
+ "focus:border-transparent transition "
+ "[--tw-ring-color:var(--company-color)] focus:ring-2 "
)
def apply_style(self):
diff --git a/core/migrations/0001_initial.py b/core/migrations/0001_initial.py
index 967f750..5794c96 100644
--- a/core/migrations/0001_initial.py
+++ b/core/migrations/0001_initial.py
@@ -1,4 +1,4 @@
-# Generated by Django 6.0.6 on 2026-06-27 17:19
+# Generated by Django 6.0.6 on 2026-06-28 10:19
from django.db import migrations, models
@@ -18,6 +18,7 @@ class Migration(migrations.Migration):
('companyname', models.CharField(max_length=255, verbose_name='Firmenname')),
('name', models.CharField(max_length=255, verbose_name='Geschäftsführer')),
('logo', models.ImageField(blank=True, null=True, upload_to='company/', verbose_name='Logo')),
+ ('favicon', models.ImageField(blank=True, null=True, upload_to='company/', verbose_name='Favicon')),
('slogan', models.CharField(blank=True, max_length=255, verbose_name='Slogan')),
('color', models.CharField(default='#0f172a', max_length=20, verbose_name='Farbe')),
('street', models.CharField(max_length=255, verbose_name='Straße')),
diff --git a/core/models.py b/core/models.py
index 3b1f118..c0a35dc 100644
--- a/core/models.py
+++ b/core/models.py
@@ -5,6 +5,7 @@ class CompanySetting(models.Model):
companyname = models.CharField(max_length=255,verbose_name="Firmenname")
name = models.CharField(max_length=255,verbose_name="Geschäftsführer")
logo = models.ImageField(upload_to="company/",blank=True,null=True,verbose_name="Logo")
+ favicon = models.ImageField(upload_to="company/",blank=True,null=True,verbose_name="Favicon")
slogan = models.CharField(max_length=255,blank=True,verbose_name="Slogan")
color = models.CharField(max_length=20,default="#0f172a",verbose_name="Farbe")
street = models.CharField(max_length=255,verbose_name="Straße")
diff --git a/core/templates/base.html b/core/templates/base.html
index 97cfb1a..4a4e977 100644
--- a/core/templates/base.html
+++ b/core/templates/base.html
@@ -18,6 +18,11 @@
{% tailwind_css %}
+ {% if company_settings.favicon %}
+