diff --git a/dasettings/forms.py b/dasettings/forms.py
index a42438c..a6b8ff5 100644
--- a/dasettings/forms.py
+++ b/dasettings/forms.py
@@ -60,6 +60,8 @@ 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']
+
+
# Usertime Form
class UserTimeForm(forms.ModelForm):
class Meta:
@@ -75,11 +77,15 @@ class UserTimeForm(forms.ModelForm):
"wd_th" : "Donnerstag",
"wd_fr" : "Freitag",
}
- fields = ["holiday", "loose_holidedate", "startdate", "holiday_start", "wd_mo", "wd_tu", "wd_we", "wd_th", "wd_fr"]
+ fields = ["startdate", "wd_mo", "wd_tu", "wd_we", "wd_th", "wd_fr", "holiday", "loose_holidedate", "holiday_start", ]
widgets = {
- 'loose_holidedate': DatePickerInput(options={"format":'DD.MM', "locale":'de'}),
+ 'loose_holidedate': DatePickerInput(options={"format":'DD.MM.', "locale":'de'}),
"startdate" : DatePickerInput(options={"format":'DD.MM.YYYY', "locale":'de'})
}
+
+ def __init__(self, *args, **kwargs):
+ super().__init__(*args, **kwargs)
+ self.fields['startdate'].required = True
# PERMISSION GROUPS FORM
diff --git a/dasettings/templates/dasettings/agencynetwork_content.html b/dasettings/templates/dasettings/agencynetwork_content.html
index 1282c57..25df9d6 100644
--- a/dasettings/templates/dasettings/agencynetwork_content.html
+++ b/dasettings/templates/dasettings/agencynetwork_content.html
@@ -41,10 +41,12 @@
| {{agn.lastactivity}} |
{% if outstanding %} {% endif %}{{agsum}} |
{{agn.standards.all|length}} |
-
+ |
{% if is_adminag %}
-
-
+
+
+
+
{% else %}
{% endif %}
diff --git a/dasettings/templates/dasettings/groups_content.html b/dasettings/templates/dasettings/groups_content.html
index 4ab1de6..905667c 100644
--- a/dasettings/templates/dasettings/groups_content.html
+++ b/dasettings/templates/dasettings/groups_content.html
@@ -23,14 +23,12 @@
- {% if not aggroup.savefordel %}
-
- {% endif %}
-
{% if not aggroup.savefordel %}
-
+
+ {% endif %}
+ {% if not aggroup.savefordel %}
+
{% endif %}
-
diff --git a/dasettings/templates/dasettings/structure_content.html b/dasettings/templates/dasettings/structure_content.html
index 22d27cb..38e1a4b 100644
--- a/dasettings/templates/dasettings/structure_content.html
+++ b/dasettings/templates/dasettings/structure_content.html
@@ -39,8 +39,9 @@ noclickeffect:active { border-style: outset !important;}
-
-
+
+
+
@@ -64,9 +65,9 @@ noclickeffect:active { border-style: outset !important;}
| {{ task.area.name }} |
{{ task.created_area_by.first_name }} {{ task.created_area_by.last_name }} |
{{ task.created_area_date }} |
-
-
-
+ |
+
+
|
{% endif %}
@@ -76,7 +77,6 @@ noclickeffect:active { border-style: outset !important;}
-
{% endfor %}
diff --git a/digitaleagentur/__pycache__/settings.cpython-38.pyc b/digitaleagentur/__pycache__/settings.cpython-38.pyc
index c0cb3e8..6e440fa 100644
Binary files a/digitaleagentur/__pycache__/settings.cpython-38.pyc and b/digitaleagentur/__pycache__/settings.cpython-38.pyc differ
diff --git a/digitaleagentur/settings.py b/digitaleagentur/settings.py
index 1fc8714..6403933 100644
--- a/digitaleagentur/settings.py
+++ b/digitaleagentur/settings.py
@@ -14,32 +14,32 @@ import os
# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
-############################################## DEV #####################################
-BASE_URL = "https://dev01.digitale-agentur.com/"
+############################################## PROD #####################################
+BASE_URL = "https://digitale-agentur.com/"
CRONAPIKEY = "gCddsaz6NOnE9QbXZM5LasdEk122D"
MAILINFOKEY = "jka7sd8iukashdna78skduJAHDsu6dilaksdjba65a68iadbhjak"
# SECURITY WARNING: don't run with debug turned on in production!
-DEBUG = True
+DEBUG = False
-# MAIL DEV
+# MAIL PROD
EMAIL_HOST = 'smtp.strato.de'
EMAIL_PORT = 587
EMAIL_USE_TLS = True
-EMAIL_HOST_USER = "support@dev01.digitale-agentur.com"
-EMAIL_HOST_PASSWORD = "n2xd7emyKZFb6UREzvbintuUIG"
-DEFAULT_FROM_EMAIL = "support@dev01.digitale-agentur.com"
+EMAIL_HOST_USER = "noreply@digitale-agentur.com"
+EMAIL_HOST_PASSWORD = "48c3n6YggZBuPyShtqOQ"
+DEFAULT_FROM_EMAIL = "noreply@digitale-agentur.com"
-# DEV
+# PROD
DATABASES = {
'default': {
'ENGINE': 'django.db.backends.mysql',
- 'NAME' : 'digitaleagentur_dev01',
- 'USER' : 'digitaleagentur_dev01',
- 'PASSWORD' : 't3TvtGAOkFHYXdJlUMIu9u3U',
+ 'NAME' : 'digitaleagentur',
+ 'USER' : 'digitaleagentur',
+ 'PASSWORD' : 'H9hzbzyBqtUCnZlIwL1qSrzh',
'PORT' : 3306
}
}
-############################################## DEV #####################################
+############################################## PROD #####################################
diff --git a/media/default.jpg b/media/default.jpg
index 1fb7d8c..23056ff 100644
Binary files a/media/default.jpg and b/media/default.jpg differ