Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions employees/forms.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,13 @@

from bootstrap_datepicker_plus import DatePickerInput
from django import forms
from django.core.exceptions import ValidationError
from django.db.models import QuerySet
from django.forms import TextInput
from django.utils.dateparse import parse_duration

from common.convert import timedelta_to_string
from employees.common.strings import ReportValidationStrings
from employees.models import Report


Expand All @@ -17,7 +22,27 @@ def __init__(self, queryset: QuerySet, *args: Any, **kwargs: Any) -> None:
self.fields["projects"].choices = [(project.id, project.name) for project in queryset]


class DurationInput(TextInput):
def format_value(self, value: str) -> str:
return timedelta_to_string(parse_duration(value))


class DurationFieldForm(forms.DurationField):
widget = DurationInput

def clean(self, value: str) -> str:
if value.count(":") != 1:
raise ValidationError(message=ReportValidationStrings.WORK_HOURS_WRONG_FORMAT.value)
hours, minutes = value.split(":")
if not hours.isdigit() or not minutes.isdigit():
raise ValidationError(message=ReportValidationStrings.WORK_HOURS_WRONG_FORMAT.value)
return f"{hours}:{minutes}:00"


class AdminReportForm(forms.ModelForm):

work_hours = DurationFieldForm()

class Meta:
model = Report
fields = ("date", "description", "task_activities", "project", "work_hours")
Expand Down
51 changes: 51 additions & 0 deletions employees/tests/test_unit_custom_forms.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
import datetime

import assertpy
import pytest
from django.core.exceptions import ValidationError
from django.test import TestCase

from employees.common.strings import ReportValidationStrings
from employees.forms import DurationFieldForm
from employees.forms import ProjectJoinForm
from managers.models import Project


class ProjectJoinFormTests(TestCase):
def test_project_join_form_should_create_choice_field_with_project_name_and_id_based_on_queryset_provided_in_constructor(
self
):
queryset_length = 10
for i in range(queryset_length):
project = Project(name=f"Test Project {i}", start_date=datetime.datetime.now())
project.full_clean()
project.save()
queryset = Project.objects.all()
form = ProjectJoinForm(queryset)
choices = form.fields["projects"].choices
self.assertIsNotNone(choices)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it is redundant: below asserion makes sure we won't have None ;)

self.assertEqual(len(choices), queryset_length)
for i in range(queryset_length):
self.assertEqual(choices[i][0], queryset[i].id)
self.assertEqual(choices[i][1], queryset[i].name)


class TestDurationFieldForm:
def _test_duration_field_form(self, initial_value: str, input_value: str) -> str: # pylint: disable=no-self-use
duration_field_form = DurationFieldForm(initial=initial_value)
return duration_field_form.clean(input_value)

@pytest.mark.parametrize(
("initial_value", "input_value", "expected_value"), [("08:00", "8:00", "8:00:00"), ("08:00", "8:0", "8:0:00")]
)
def test_that_correct_work_hours_is_same_as_assumpted(self, initial_value, input_value, expected_value):
assertpy.assert_that(self._test_duration_field_form(initial_value, input_value)).is_equal_to(expected_value)

@pytest.mark.parametrize(
("initial_value", "input_value"),
[("08:00", ":00"), ("08:00", "8:"), ("08:00", ":"), ("08:00", ""), ("08:00", "four:zero"), ("08:00", "8:zero")],
)
def test_that_incorrect_work_hours_will_raise_exception(self, initial_value, input_value):
with pytest.raises(ValidationError) as exception:
self._test_duration_field_form(initial_value, input_value)
assertpy.assert_that(exception.value.message).is_equal_to(ReportValidationStrings.WORK_HOURS_WRONG_FORMAT.value)
25 changes: 0 additions & 25 deletions employees/tests/test_unit_project_join_form.py

This file was deleted.

2 changes: 1 addition & 1 deletion employees/tests/test_views.py
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ def setUp(self):
"project": self.report.project.pk,
"author": self.report.author.pk,
"task_activities": self.report.task_activities.pk,
"work_hours": self.report.work_hours,
"work_hours": self.report.work_hours_str,
}

def test_project_report_detail_view_should_display_report_details(self):
Expand Down