diff --git a/dump.rdb b/dump.rdb index edf7747..d21c9aa 100644 Binary files a/dump.rdb and b/dump.rdb differ diff --git a/timemanagement/forms.py b/timemanagement/forms.py index 905c100..03013e9 100644 --- a/timemanagement/forms.py +++ b/timemanagement/forms.py @@ -148,11 +148,12 @@ class UpdateWorkdayForm(forms.ModelForm): labels = { "start" : "Start", "end" : "Ende", - "target" : "Zielarbeitszeit" + "target" : "Zielarbeitszeit", + "freefield" : "Notiz" } fields = [ - "start", "end", "target" + "start", "end", "target", "freefield" ] widgets = { 'start': DatePickerInput(options={"format":'HH:mm', "locale":'de'}), @@ -172,11 +173,12 @@ class AddWorkdayForm(forms.ModelForm): labels = { "start" : "Start", "end" : "Ende", - "target" : "Zielarbeitszeit" + "target" : "Zielarbeitszeit", + "freefield" : "Notiz" } fields = [ - "start", "end", "target" + "start", "end", "target", "freefield" ] widgets = { 'start': DatePickerInput(options={"format":'DD.MM.YYYY HH:mm', "locale":'de'}), diff --git a/timemanagement/models.py b/timemanagement/models.py index b4a342f..cbc7bd2 100644 --- a/timemanagement/models.py +++ b/timemanagement/models.py @@ -15,6 +15,7 @@ class Workday(models.Model): start = models.DateTimeField(default=None, null=True, blank=True) end = models.DateTimeField(default=None, null=True, blank=True) target = models.FloatField(default=8.0) + freefield = models.TextField(max_length=10000, default="", blank=True) history = HistoricalRecords() class Breaks(models.Model): diff --git a/timemanagement/templates/timemanagement/timemanagement_add.html b/timemanagement/templates/timemanagement/timemanagement_add.html index f1e4938..9e983b3 100644 --- a/timemanagement/templates/timemanagement/timemanagement_add.html +++ b/timemanagement/templates/timemanagement/timemanagement_add.html @@ -5,16 +5,16 @@ {% if request.user.profile.agency.module_timemanagement %} -
+

Arbeitstag {% if team == 1 %} von {{user.get_full_name}} {% endif %} hinzufügen

Start- und Endzeitpunkt
-
+
{% csrf_token %} {{form.media}} {{form|crispy}} -
+
Abbrechen diff --git a/timemanagement/templates/timemanagement/timemanagement_singleview.html b/timemanagement/templates/timemanagement/timemanagement_singleview.html index 25173d6..9660519 100644 --- a/timemanagement/templates/timemanagement/timemanagement_singleview.html +++ b/timemanagement/templates/timemanagement/timemanagement_singleview.html @@ -293,7 +293,7 @@ {% endfor %} - + {% counterWDreset %} {% for workday in workdays %} @@ -307,8 +307,34 @@ {% counterWDUp %} + + {% if workday.freefield != "" %} + + + + + + {% endif %} + {% if breakmonthline < da %} - + {% endif %} {% endif %} diff --git a/timemanagement/templates/timemanagement/timemanagement_teamview_single.html b/timemanagement/templates/timemanagement/timemanagement_teamview_single.html index bff0374..0392dd1 100644 --- a/timemanagement/templates/timemanagement/timemanagement_teamview_single.html +++ b/timemanagement/templates/timemanagement/timemanagement_teamview_single.html @@ -310,7 +310,7 @@ {% endif %} {% endfor %} - + {% counterWDreset %} {% for workday in workdays %} @@ -325,6 +325,32 @@ {% counterWDUp %} + {% if workday.freefield != "" %} + + + + + + {% endif %} + + diff --git a/timemanagement/templates/timemanagement/timemanagement_update.html b/timemanagement/templates/timemanagement/timemanagement_update.html index 8d83637..b1b8988 100644 --- a/timemanagement/templates/timemanagement/timemanagement_update.html +++ b/timemanagement/templates/timemanagement/timemanagement_update.html @@ -3,17 +3,17 @@ {% load crispy_forms_tags %} {% load counter_tag %} {% if request.user.profile.agency.module_timemanagement %} -
+

Arbeitstag am {{workday.start|date:"d.m.Y"}} {% if team == 1 %} von {{user.get_full_name}} {% endif %} bearbeiten

Start- und Endzeitpunkt
-
+ {% csrf_token %} {{form.media}} {{form|crispy}} -
+
Pausen {% if team == 1 %} diff --git a/timemanagement/views.py b/timemanagement/views.py index fb03c10..276d602 100644 --- a/timemanagement/views.py +++ b/timemanagement/views.py @@ -347,7 +347,7 @@ def TimeManagementTeamSingle(request, pk, activemonth=False, activeyear=False): # Requestet User has no rights... else: - messages.success(request, f'Das würfen Sie nicht!') + messages.success(request, f'Das dürfen Sie nicht!') return redirect("tm-management") @@ -425,6 +425,7 @@ def TimeUpdate(request, pk, team=0): workday.start = start workday.end = end + workday.freefield = form["freefield"].value() workday.target = form["target"].value() workday.save() messages.success(request, f'Arbeitstag aktualisiert') @@ -457,7 +458,7 @@ def TimeAdd(request, team=0, pk=0): #end = datetime.datetime(int(workday.end.year), int(workday.end.month), int(workday.end.day), int(((str(form["end"].value()).split(":"))[0])), int(((str(form["end"].value()).split(":"))[1]))) - workday = Workday(start=form.cleaned_data["start"], end=form.cleaned_data["end"], target=form.cleaned_data["target"], user=user, agency=request.user.profile.agency) + workday = Workday(start=form.cleaned_data["start"], end=form.cleaned_data["end"], target=form.cleaned_data["target"], user=user, freefield=form.cleaned_data["freefield"], agency=request.user.profile.agency) if workday.start.day != workday.end.day or workday.start.month != workday.end.month or workday.start.year != workday.end.year or workday.start > workday.end: messages.success(request, f'Der Arbeitstag darf nur an einem Tag stattfinden und das Ende muss nach dem Anfang liegen.')