diff --git a/.cred b/.cred
deleted file mode 100644
index ea260ec..0000000
--- a/.cred
+++ /dev/null
@@ -1,3 +0,0 @@
-https://holger.trampe:Zerogoogle123_@git.vhevents.de/
-https://holger.trampe:Zerogoogle123_@git.vhevents.de/
-https://holger.trampe:Zerogoogle123_@git.vhevents.de/
diff --git a/.gitignore b/.gitignore
index ec80125..7d9d49e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,8 @@ media/agencydata/*
digitaleagentur/__pycache__/*
digitaleagentur/sec.py
+.cred
+
collectedstatic/*
media/userprofilepics/*
diff --git a/dasettings/forms.py b/dasettings/forms.py
index e8e82ae..54de4d8 100644
--- a/dasettings/forms.py
+++ b/dasettings/forms.py
@@ -1,7 +1,7 @@
from django import forms
from django.db import models
from django.contrib.auth.models import User
-from users.models import AgencyGroup, Agency, Profile, AgencyJob, AgencyNetwork, UserTime
+from users.models import AgencyGroup, Agency, Profile, AgencyJob, AgencyNetwork, UserTime, UserNotifications
from PIL import Image
from bootstrap_datepicker_plus import DatePickerInput
from django.utils.translation import gettext as _
@@ -35,6 +35,7 @@ class UsersSelfChangeForm(forms.ModelForm):
fields = ['email']
# Form für die Benachrichtigungseinstellungen
+'''
class UsersNotificationForm(forms.ModelForm):
class Meta:
@@ -49,6 +50,200 @@ class UsersNotificationForm(forms.ModelForm):
}
#fields = ['news_mail', 'news_push', 'user_standard_public_mail', 'user_standard_public_push', 'agency_new_standard_mail', 'agency_new_standard_push', 'add_new_group_mail', 'add_new_group_push', 'add_task_mail', 'add_task_push', 'user_messages_mail', 'user_messages_push']
fields = ['news_mail', 'news_push', 'agency_new_standard_mail', 'agency_new_standard_push', 'add_new_group_mail', 'add_new_group_push', 'add_task_mail', 'add_task_push', 'user_messages_mail', 'user_messages_push']
+'''
+# Form für die Benachrichtigungseinstellungen STANDARDS
+class UsersNotificationFormStandard(forms.ModelForm):
+
+ class Meta:
+ model = UserNotifications
+ labels = {
+ "standard_created_mail" : "Neuer Standard",
+ "standard_update_mail" : "Standard verändert",
+ "standard_delete_mail" : "Standard gelöscht",
+ "standard_created_unpub_mail" : "Neuer, unveröffentlichter Standard"
+
+ }
+ fields = [
+ 'standard_created_mail',
+ 'standard_created_push',
+ 'standard_update_mail',
+ 'standard_update_push',
+ 'standard_delete_mail',
+ 'standard_delete_push',
+ 'standard_created_unpub_mail',
+ 'standard_created_unpub_push',
+ ]
+
+
+# Form für die Benachrichtigungseinstellungen NEWS
+class UsersNotificationFormNews(forms.ModelForm):
+
+ class Meta:
+ model = UserNotifications
+ labels = {
+ "news_created_mail" : "Neuer Agenturnews",
+
+ }
+ fields = [
+ 'news_created_mail',
+ 'news_created_push',
+ ]
+
+# Form für die Benachrichtigungseinstellungen MESSAGES
+class UsersNotificationFormMessages(forms.ModelForm):
+
+ class Meta:
+ model = UserNotifications
+ labels = {
+ "message_received_mail" : "Neuer Mitteilung",
+
+ }
+ fields = [
+ 'message_received_mail',
+ 'message_received_push',
+ ]
+
+# Form für die Benachrichtigungseinstellungen CHAT
+class UsersNotificationFormChat(forms.ModelForm):
+
+ class Meta:
+ model = UserNotifications
+ labels = {
+ "chat_received_mail" : "Verpasste Chatnachrichten",
+ "chat_room_activity_mail" : "Raumaktivitäten",
+
+ }
+ fields = [
+ 'chat_received_mail',
+ 'chat_received_push',
+ 'chat_room_activity_mail',
+ 'chat_room_activity_push',
+ ]
+
+# Form für die Benachrichtigungseinstellungen FILES
+class UsersNotificationFormFiles(forms.ModelForm):
+
+ class Meta:
+ model = UserNotifications
+ labels = {
+ "filedir_created_mail" : "Datei/Ordner erstellt",
+ "filedir_update_mail" : "Datei/Ordner aktualisiert",
+ "filedir_delete_mail" : "Datei/Ordner gelöscht",
+
+ }
+ fields = [
+ 'filedir_created_mail',
+ 'filedir_created_push',
+ 'filedir_update_mail',
+ 'filedir_update_push',
+ 'filedir_delete_mail',
+ 'filedir_delete_push',
+ ]
+
+# Form für die Benachrichtigungseinstellungen ABSENCE AND TIME
+class UsersNotificationFormAbTime(forms.ModelForm):
+
+ class Meta:
+ model = UserNotifications
+ labels = {
+ "absence_created_mail" : "Anfrage erstellt",
+ "absence_user_is_rep_mail" : "Als Vertreter eingesetzt",
+ "absence_user_is_rep_reminder_mail" : "Erinnerung für Vertretung",
+ "time_data_changed_push" : "Datei/Ordner gelöscht",
+ }
+ fields = [
+ 'absence_created_mail',
+ 'absence_created_push',
+ 'absence_user_is_rep_mail',
+ 'absence_user_is_rep_push',
+ 'absence_user_is_rep_reminder_mail',
+ 'absence_user_is_rep_reminder_push',
+ 'time_data_changed_mail',
+ 'time_data_changed_push',
+ ]
+
+# Form für die Benachrichtigungseinstellungen GRUPPEN
+class UsersNotificationFormGroups(forms.ModelForm):
+
+ class Meta:
+ model = UserNotifications
+ labels = {
+ "group_activity_mail" : "Mitgliedschaftsänderung",
+ "group_rights_mail" : "Rechteänderung",
+
+ }
+ fields = [
+ 'group_activity_mail',
+ 'group_activity_push',
+ 'group_rights_mail',
+ 'group_rights_push',
+ ]
+
+# Form für die Benachrichtigungseinstellungen GRUPPEN
+class UsersNotificationFormAgn(forms.ModelForm):
+
+ class Meta:
+ model = UserNotifications
+ labels = {
+ "agn_standard_created_mail" : "Neuer Standard",
+ "agn_standard_copied_mail" : "Standard wurde übernommen",
+ "agn_standard_comment_mail" : "Kommentar zu Standard aus meiner Agentur",
+ "agn_standard_comment_react_mail" : "Reaktion zu meinem Kommentar",
+ "agn_own_change_mail" : "Änderungen meiner Mitgliedschaften",
+ "agn_other_change_mail" : "Änderungen anderer Mitgliedschaften",
+
+ }
+ fields = [
+ 'agn_standard_created_mail',
+ 'agn_standard_created_push',
+ 'agn_standard_copied_mail',
+ 'agn_standard_copied_push',
+ 'agn_standard_comment_mail',
+ 'agn_standard_comment_push',
+ 'agn_standard_comment_react_mail',
+ 'agn_standard_comment_react_push',
+ 'agn_own_change_mail',
+ 'agn_own_change_push',
+ 'agn_other_change_mail',
+ 'agn_other_change_push',
+ ]
+
+
+class UsersNotificationFormOrganizer(forms.ModelForm):
+
+ class Meta:
+ model = UserNotifications
+ labels = {
+ "ql_created_mail" : "Quicklink erstellt",
+ "ql_update_mail" : "Quicklink aktualisiert",
+ "ql_delete_mail" : "Quicklink gelöscht",
+ "contact_created_mail" : "Kontakt erstellt",
+ "contact_update_mail" : "Kontakt aktualisiert",
+ "contact_delete_push" : "Kontakt gelöscht",
+ "password_created_mail" : "Passwort erstellt",
+ "password_update_mail" : "Passwort aktualisiert",
+ "password_delete_mail" : "Passwort gelöscht",
+ }
+ fields = [
+ 'ql_created_mail',
+ 'ql_created_push',
+ 'ql_update_mail',
+ 'ql_update_push',
+ 'ql_delete_mail',
+ 'ql_delete_push',
+ 'contact_created_mail',
+ 'contact_created_push',
+ 'contact_update_mail',
+ 'contact_update_push',
+ 'contact_delete_mail',
+ 'contact_delete_push',
+ 'password_created_mail',
+ 'password_created_push',
+ 'password_update_mail',
+ 'password_update_push',
+ 'password_delete_mail',
+ 'password_delete_push',
+ ]
diff --git a/dasettings/templates/dasettings/notifications_content.html b/dasettings/templates/dasettings/notifications_content.html
index 6a1f722..75d5307 100644
--- a/dasettings/templates/dasettings/notifications_content.html
+++ b/dasettings/templates/dasettings/notifications_content.html
@@ -1,28 +1,347 @@
{% load crispy_forms_tags %}
-
-
-
- | Benachrichtigung |
- E-Mail |
- Push |
-
-
-
-{% for formfield in notificationform %}
- {% if forloop.counter|divisibleby:2 %}
- {{formfield}} |
-
- {% else %}
-
- | {{formfield.label_tag}} |
- {{formfield}} |
- {% endif %}
-{% endfor %}
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ | Benachrichtigung |
+ E-Mail |
+ Push |
+
+
+
+ {% for formfield in notificationforms_standard %}
+ {% if forloop.counter|divisibleby:2 %}
+ {{formfield}} |
+
+ {% else %}
+
+ | {{formfield.label_tag}} |
+ {{formfield}} |
+ {% endif %}
+ {% endfor %}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ | Benachrichtigung |
+ E-Mail |
+ Push |
+
+
+
+ {% for formfield in notificationforms_news %}
+ {% if forloop.counter|divisibleby:2 %}
+ {{formfield}} |
+
+ {% else %}
+
+ | {{formfield.label_tag}} |
+ {{formfield}} |
+ {% endif %}
+ {% endfor %}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ | Benachrichtigung |
+ E-Mail |
+ Push |
+
+
+
+ {% for formfield in notificationforms_groups %}
+ {% if forloop.counter|divisibleby:2 %}
+ {{formfield}} |
+
+ {% else %}
+
+ | {{formfield.label_tag}} |
+ {{formfield}} |
+ {% endif %}
+ {% endfor %}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ | Benachrichtigung |
+ E-Mail |
+ Push |
+
+
+
+ {% for formfield in notificationforms_files %}
+ {% if forloop.counter|divisibleby:2 %}
+ {{formfield}} |
+
+ {% else %}
+
+ | {{formfield.label_tag}} |
+ {{formfield}} |
+ {% endif %}
+ {% endfor %}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ | Benachrichtigung |
+ E-Mail |
+ Push |
+
+
+
+ {% for formfield in notificationforms_organizer %}
+ {% if forloop.counter|divisibleby:2 %}
+ {{formfield}} |
+
+ {% else %}
+
+ | {{formfield.label_tag}} |
+ {{formfield}} |
+ {% endif %}
+ {% endfor %}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ | Benachrichtigung |
+ E-Mail |
+ Push |
+
+
+
+ {% for formfield in notificationforms_messages %}
+ {% if forloop.counter|divisibleby:2 %}
+ {{formfield}} |
+
+ {% else %}
+
+ | {{formfield.label_tag}} |
+ {{formfield}} |
+ {% endif %}
+ {% endfor %}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ | Benachrichtigung |
+ E-Mail |
+ Push |
+
+
+
+ {% for formfield in notificationforms_chat %}
+ {% if forloop.counter|divisibleby:2 %}
+ {{formfield}} |
+
+ {% else %}
+
+ | {{formfield.label_tag}} |
+ {{formfield}} |
+ {% endif %}
+ {% endfor %}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ | Benachrichtigung |
+ E-Mail |
+ Push |
+
+
+
+ {% for formfield in notificationforms_abtime %}
+ {% if forloop.counter|divisibleby:2 %}
+ {{formfield}} |
+
+ {% else %}
+
+ | {{formfield.label_tag}} |
+ {{formfield}} |
+ {% endif %}
+ {% endfor %}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ | Benachrichtigung |
+ E-Mail |
+ Push |
+
+
+
+ {% for formfield in notificationforms_agn %}
+ {% if forloop.counter|divisibleby:2 %}
+ {{formfield}} |
+
+ {% else %}
+
+ | {{formfield.label_tag}} |
+ {{formfield}} |
+ {% endif %}
+ {% endfor %}
+
+
+
+
+
+
+