Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(redmine): Display billable hours #599

Merged
merged 1 commit into from
Feb 11, 2025
Merged

feat(redmine): Display billable hours #599

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 13 additions & 1 deletion backend/timed/redmine/management/commands/redmine_report.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import redminelib
from django.conf import settings
from django.core.management.base import BaseCommand
from django.db.models import Count, Sum
from django.db.models import Count, Q, Sum
from django.template.loader import get_template
from django.utils import timezone

Expand Down Expand Up @@ -53,6 +53,12 @@ def handle(self, *args, **options):
Project.objects.filter(id__in=affected_projects)
.order_by("name")
.annotate(total_hours=Sum("tasks__reports__duration"))
.annotate(
billable_hours=Sum(
"tasks__reports__duration",
filter=Q(tasks__reports__not_billable=False),
)
)
)

for project in projects:
Expand All @@ -62,6 +68,11 @@ def handle(self, *args, **options):
else 0.0
)
total_hours = project.total_hours.total_seconds() / 3600
billable_hours = (
(project.billable_hours.total_seconds() / 3600)
if project.billable_hours
else 0
)
try:
issue = redmine.issue.get(project.redmine_project.issue_id)
reports = Report.objects.filter(
Expand All @@ -75,6 +86,7 @@ def handle(self, *args, **options):
"hours": hours.total_seconds() / 3600,
"last_days": last_days,
"total_hours": total_hours,
"billable_hours": billable_hours,
"estimated_hours": estimated_hours,
"reports": reports,
}
Expand Down
1 change: 1 addition & 0 deletions backend/timed/redmine/templates/redmine/weekly_report.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ Customer: {{project.customer.name}}
Project: {{project.name}}
Hours in last {{last_days}} days: {{hours}}
Total hours: {{total_hours}}
Billable hours: {{billable_hours}}
Estimated hours: {{estimated_hours}}


Expand Down
14 changes: 12 additions & 2 deletions backend/timed/redmine/tests/test_redmine_report.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ def test_redmine_report(freezer, mocker, report_factory, not_billable, review):
)
report_hours = report.duration.total_seconds() / 3600
estimated_hours = report.task.project.estimated_time.total_seconds() / 3600
billable_hours = 0 if not_billable else report_hours
RedmineProject.objects.create(project=report.task.project, issue_id=1000)
# report not attached to redmine
other = report_factory()
Expand All @@ -38,6 +39,7 @@ def test_redmine_report(freezer, mocker, report_factory, not_billable, review):
redmine_instance.issue.get.assert_called_once_with(1000)
assert issue.custom_fields == [{"id": 0, "value": report_hours}]
assert f"Total hours: {report_hours}" in issue.notes
assert f"Billable hours: {billable_hours}" in issue.notes
assert f"Estimated hours: {estimated_hours}" in issue.notes
assert f"Hours in last 7 days: {report_hours}\n" in issue.notes
assert report.comment in issue.notes
Expand Down Expand Up @@ -97,18 +99,25 @@ def test_redmine_report_calculate_total_hours(freezer, mocker, task, report_fact
redmine_class.return_value = redmine_instance

freezer.move_to("2017-07-15")
reports = report_factory.create_batch(10, task=task)
reports = report_factory.create_batch(5, task=task)
reports += report_factory.create_batch(5, task=task, not_billable=True)

freezer.move_to("2017-07-24")
reports_last_seven_days = report_factory.create_batch(10, task=task)
reports_last_seven_days = report_factory.create_batch(5, task=task)
reports_last_seven_days += report_factory.create_batch(
5, task=task, not_billable=True
)

total_hours_last_seven_days = 0
for report in reports_last_seven_days:
total_hours_last_seven_days += report.duration.total_seconds() / 3600

total_hours = 0
billable_hours = 0
for report in reports + reports_last_seven_days:
total_hours += report.duration.total_seconds() / 3600
if not report.not_billable:
billable_hours += report.duration.total_seconds() / 3600

RedmineProject.objects.create(project=task.project, issue_id=1000)

Expand All @@ -117,4 +126,5 @@ def test_redmine_report_calculate_total_hours(freezer, mocker, task, report_fact

redmine_instance.issue.get.assert_called_once_with(1000)
assert f"Total hours: {total_hours}" in issue.notes
assert f"Billable hours: {billable_hours}" in issue.notes
assert f"Hours in last 7 days: {total_hours_last_seven_days}\n" in issue.notes
Loading