Bugs gelöst
This commit is contained in:
Holger Trampe
parent
cb1d6e9c67
commit
cc99b4b341
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -41,10 +41,12 @@
|
|||
<td>{{agn.lastactivity}}</td>
|
||||
<td><a href="{% url 'managagn' agn.pk %}">{% if outstanding %}<i class="fas fa-info-circle" data-toggle="tooltip" data-placement="top" title="Es gibt ausstehende Einladung."></i> {% endif %}{{agsum}}</a></td>
|
||||
<td>{{agn.standards.all|length}}</td>
|
||||
<td>
|
||||
<td style="min-width: 50px">
|
||||
{% if is_adminag %}
|
||||
<a style="float: right; margin-left: 5px" class="btn btn-secondary btn-sm " data-toggle="tooltip" data-placement="top" title="Verbund löschen" href="{% url 'delagn' agn.pk %}"><small><i class="fas fa-trash"></i></small></a>
|
||||
<a style="float: right; margin-left: 5px" class="btn btn-secondary btn-sm" href="{% url 'updateagn' agn.pk %}" data-toggle="tooltip" data-placement="top" title="Verbund bearbeiten"><small><i class="fas fa-pen"></i></small></a>
|
||||
<span style="float: right !important;">
|
||||
<a class="btn btn-secondary btn-sm" href="{% url 'updateagn' agn.pk %}" data-toggle="tooltip" data-placement="top" title="Verbund bearbeiten"><small><i class="fas fa-pen"></i></small></a>
|
||||
<a style="" class="btn btn-secondary btn-sm " data-toggle="tooltip" data-placement="top" title="Verbund löschen" href="{% url 'delagn' agn.pk %}"><small><i class="fas fa-trash"></i></small></a>
|
||||
</span>
|
||||
{% else %}
|
||||
<button style="float: right; margin-left: 5px" class="btn btn-secondary btn-sm " data-toggle="tooltip" data-placement="top" title="Treten Sie aus diesem Verbund aus." onclick="javascript:showDelAgFromAgn('{{agn.name}}', {{agn.pk}})"><small><i class="fas fa-door-open"></i></small></button>
|
||||
{% endif %}
|
||||
|
|
|
|||
|
|
@ -23,14 +23,12 @@
|
|||
<button class="btn btn-link" data-toggle="collapse" data-target="#agroup_{{aggroup.pk}}_card" aria-expanded="false" aria-controls="agroup_{{aggroup.pk}}_card">
|
||||
<span id="groupname_{{aggroup.pk}}" >Gruppe <b>{{aggroup.agencygroupname}} </b></span><small>(<span id="groupcounter_{{aggroup.pk}}">{{varcounter}}</span>)</small>
|
||||
</button>
|
||||
{% if not aggroup.savefordel %}
|
||||
<button type="button" style="float: right" class="btn btn-primary btn-sm" onclick="javascript:changeGroupName({{aggroup.pk}})" data-toggle="tooltip" data-placement="top" title="Gruppennamen andern"><small><i class="fas fa-pen"></i></small></button>
|
||||
{% endif %}
|
||||
|
||||
{% if not aggroup.savefordel %}
|
||||
<button style="float: right" type="button" class="btn btn-danger btn-sm mr-1" onclick="javascript:delGroup({{aggroup.pk}})" data-toggle="tooltip" data-placement="top" title="Gruppe löschen. Nur möglich, bei selbst erstellten Gruppen."><i class="fas fa-trash"></i></button>
|
||||
<button style="float: right" type="button" class="btn btn-secondary btn-sm " onclick="javascript:delGroup({{aggroup.pk}})" data-toggle="tooltip" data-placement="top" title="Gruppe löschen. Nur möglich, bei selbst erstellten Gruppen."><i class="fas fa-trash"></i></button>
|
||||
{% endif %}
|
||||
{% if not aggroup.savefordel %}
|
||||
<button type="button" style="float: right" class="btn btn-secondary btn-sm mr-1" onclick="javascript:changeGroupName({{aggroup.pk}})" data-toggle="tooltip" data-placement="top" title="Gruppennamen andern"><small><i class="fas fa-pen"></i></small></button>
|
||||
{% endif %}
|
||||
|
||||
</h5>
|
||||
</div>
|
||||
|
||||
|
|
|
|||
|
|
@ -39,8 +39,9 @@ noclickeffect:active { border-style: outset !important;}
|
|||
<button class="btn noclickeffect" data-toggle="collapse" data-target="#area_content_{{area.pk}}" aria-expanded="false" aria-controls="area_content_{{area.pk}}">
|
||||
<span id="areaname_{{area.pk}}" style="color: #ffffff">Bereich <b>{{area.name}} </b></span>
|
||||
</button>
|
||||
<button type="button" style="float: right" class="btn btn-light btn-sm" onclick="javascript:addArea({{area.pk}})" data-toggle="tooltip" data-placement="top" title="Bereichsnamen und -farbe ändern"><small><i class="fas fa-pen"></i></small></button>
|
||||
<button style="float: right" type="button" class="btn btn-light btn-sm mr-1" onclick="javascript:delArea({{area.pk}})" data-toggle="tooltip" data-placement="top" title="Bereich löschen"><i class="fas fa-trash"></i></button>
|
||||
|
||||
<button style="float: right" type="button" class="btn btn-light btn-sm " onclick="javascript:delArea({{area.pk}})" data-toggle="tooltip" data-placement="top" title="Bereich löschen"><i class="fas fa-trash"></i></button>
|
||||
<button type="button" style="float: right" class="btn btn-light btn-sm mr-1" onclick="javascript:addArea({{area.pk}})" data-toggle="tooltip" data-placement="top" title="Bereichsnamen und -farbe ändern"><small><i class="fas fa-pen"></i></small></button>
|
||||
</h5>
|
||||
</div>
|
||||
<div id="area_content_{{area.pk}}" class="collapse" data-labelledby="area_{{area.pk}}" data-parent="#sortableAreas">
|
||||
|
|
@ -64,9 +65,9 @@ noclickeffect:active { border-style: outset !important;}
|
|||
<td>{{ task.area.name }}</td>
|
||||
<td>{{ task.created_area_by.first_name }} {{ task.created_area_by.last_name }}</td>
|
||||
<td>{{ task.created_area_date }}</td>
|
||||
<td>
|
||||
<button style="float: right" class="btn btn-sm btn-secondary " onclick="javascript:updateTaskComplete({{task.pk}})" data-toggle="tooltip" data-placement="top" title="Tätigkeit bearbeiten"><small><i class="fas fa-pen"></i></small></button>
|
||||
<button style="float: right" type="button" class="btn btn-secondary btn-sm mr-1" onclick="javascript:delTask({{task.pk}})" data-toggle="tooltip" data-placement="top" title="Tätigkeit löschen"><i class="fas fa-trash"></i></button>
|
||||
<td>
|
||||
<button style="float: right" type="button" class="btn btn-secondary btn-sm" onclick="javascript:delTask({{task.pk}})" data-toggle="tooltip" data-placement="top" title="Tätigkeit löschen"><i class="fas fa-trash"></i></button>
|
||||
<button style="float: right" class="btn btn-sm btn-secondary mr-1 " onclick="javascript:updateTaskComplete({{task.pk}})" data-toggle="tooltip" data-placement="top" title="Tätigkeit bearbeiten"><small><i class="fas fa-pen"></i></small></button>
|
||||
</td>
|
||||
</tr>
|
||||
{% endif %}
|
||||
|
|
@ -76,7 +77,6 @@ noclickeffect:active { border-style: outset !important;}
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{% endfor %}
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -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 #####################################
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
Binary file not shown.
|
Before Width: | Height: | Size: 5.9 KiB After Width: | Height: | Size: 1.9 KiB |
Loading…
Reference in New Issue