From dfa027297c2196cafb9784a475250bb22f4bef25 Mon Sep 17 00:00:00 2001 From: Jeppe Krogh Date: Fri, 17 Jan 2025 14:21:51 +0100 Subject: [PATCH 01/22] Added report data model --- .../BillableUnbilledHoursReportData.php | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 src/Model/Reports/BillableUnbilledHoursReportData.php diff --git a/src/Model/Reports/BillableUnbilledHoursReportData.php b/src/Model/Reports/BillableUnbilledHoursReportData.php new file mode 100644 index 00000000..95f0ce5b --- /dev/null +++ b/src/Model/Reports/BillableUnbilledHoursReportData.php @@ -0,0 +1,22 @@ + */ + public ArrayCollection $projectData; + + + public function __construct() + { + $this->projectData = new ArrayCollection(); + } + +} From c0cf7ed09cb1528724427240ce93879db7a58f87 Mon Sep 17 00:00:00 2001 From: Jeppe Krogh Date: Fri, 17 Jan 2025 14:22:06 +0100 Subject: [PATCH 02/22] Added form data model --- src/Model/Reports/BillableUnbilledHoursReportFormData.php | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 src/Model/Reports/BillableUnbilledHoursReportFormData.php diff --git a/src/Model/Reports/BillableUnbilledHoursReportFormData.php b/src/Model/Reports/BillableUnbilledHoursReportFormData.php new file mode 100644 index 00000000..03f29839 --- /dev/null +++ b/src/Model/Reports/BillableUnbilledHoursReportFormData.php @@ -0,0 +1,8 @@ + Date: Fri, 17 Jan 2025 14:22:29 +0100 Subject: [PATCH 03/22] Added type --- src/Form/BillableUnbilledHoursReportType.php | 55 ++++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 src/Form/BillableUnbilledHoursReportType.php diff --git a/src/Form/BillableUnbilledHoursReportType.php b/src/Form/BillableUnbilledHoursReportType.php new file mode 100644 index 00000000..b33f0108 --- /dev/null +++ b/src/Form/BillableUnbilledHoursReportType.php @@ -0,0 +1,55 @@ +add('year', ChoiceType::class, [ + 'label' => 'billable_unbilled_hours_report.year', + 'label_attr' => ['class' => 'label'], + 'attr' => ['class' => 'form-element '], + 'help_attr' => ['class' => 'form-help'], + 'row_attr' => ['class' => 'form-row'], + 'required' => false, + 'data' => $yearChoices[date('Y')], + 'choices' => $yearChoices, + 'placeholder' => null, + ]) + ->add('submit', SubmitType::class, [ + 'label' => 'billable_unbilled_hours_report.submit', + 'attr' => [ + 'class' => 'hour-report-submit button', + ], + ]); + } + + public function configureOptions(OptionsResolver $resolver): void + { + $resolver->setDefaults([ + 'data_class' => BillableUnbilledHoursReportFormData::class, + 'attr' => [ + 'data-sprint-report-target' => 'form', + ], + 'years' => null, + ]); + } +} From c6aab0533aa37bae587c8cd8e86472c770a6edb0 Mon Sep 17 00:00:00 2001 From: Jeppe Krogh Date: Fri, 17 Jan 2025 14:22:56 +0100 Subject: [PATCH 04/22] Controller progress --- .../BillableUnbilledHoursReportController.php | 65 +++++++++++++++++++ 1 file changed, 65 insertions(+) create mode 100644 src/Controller/BillableUnbilledHoursReportController.php diff --git a/src/Controller/BillableUnbilledHoursReportController.php b/src/Controller/BillableUnbilledHoursReportController.php new file mode 100644 index 00000000..9228a652 --- /dev/null +++ b/src/Controller/BillableUnbilledHoursReportController.php @@ -0,0 +1,65 @@ +createForm(BillableUnbilledHoursReportType::class, $reportFormData, [ + 'action' => $this->generateUrl('app_billable_unbilled_hours_report'), + 'method' => 'GET', + 'attr' => [ + 'id' => 'sprint_report', + ], + 'years' => [ + (new \DateTime())->modify('-1 year')->format('Y'), + (new \DateTime())->format('Y'), + ], + 'csrf_protection' => false, + ]); + + $form->handleRequest($request); + + if ($form->isSubmitted() && $form->isValid()) { + $year = $form->get('year')->getData(); + + try { + $reportData = $this->billableUnbilledHoursReportService->getBillableUnbilledHoursReport($year); + } catch (\Exception $e) { + $error = $e->getMessage(); + } + } + + return $this->render('reports/reports.html.twig', [ + 'controller_name' => 'BillableUnbilledHoursReportController', + 'form' => $form, + 'error' => $error, + 'data' => $reportData, + 'mode' => $mode, + ]); + } +} From 21dbe614d74e01638d8fc7a98359740aa56f2cb8 Mon Sep 17 00:00:00 2001 From: Jeppe Krogh Date: Fri, 17 Jan 2025 14:23:36 +0100 Subject: [PATCH 05/22] Modified method in worklogRepository to return a broader set of data --- src/Repository/WorklogRepository.php | 34 +++++++++++++++------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/src/Repository/WorklogRepository.php b/src/Repository/WorklogRepository.php index 76160a0b..d969ac08 100644 --- a/src/Repository/WorklogRepository.php +++ b/src/Repository/WorklogRepository.php @@ -113,7 +113,7 @@ public function findWorklogsByWorkerAndDateRange(string $workerIdentifier, \Date ->getQuery()->getResult(); } - public function findBillableWorklogsByWorkerAndDateRange(string $workerIdentifier, \DateTime $dateFrom, \DateTime $dateTo) + public function findBillableWorklogsByWorkerAndDateRange(\DateTime $dateFrom, \DateTime $dateTo, ?string $workerIdentifier = null) { $nonBillableEpics = NonBillableEpicsEnum::getAsArray(); $nonBillableVersions = NonBillableVersionsEnum::getAsArray(); @@ -125,29 +125,31 @@ public function findBillableWorklogsByWorkerAndDateRange(string $workerIdentifie ->leftJoin('issue.epics', 'epic') ->leftJoin('issue.versions', 'version'); - return $qb - ->where($qb->expr()->between('worklog.started', ':dateFrom', ':dateTo')) - ->andWhere('worklog.worker = :worker') + $qb->where($qb->expr()->between('worklog.started', ':dateFrom', ':dateTo')) ->andWhere($qb->expr()->andX( - $qb->expr()->eq('project.isBillable', '1'), + $qb->expr()->eq('project.isBillable', '1') )) - // notIn will only work if the string it is checked against is not null ->andWhere($qb->expr()->orX( $qb->expr()->isNull('epic.title'), - $qb->expr()->notIn('epic.title', ':nonBillableEpics'), + $qb->expr()->notIn('epic.title', ':nonBillableEpics') )) ->andWhere($qb->expr()->orX( $qb->expr()->isNull('version.name'), $qb->expr()->notIn('version.name', ':nonBillableVersions') - )) - ->setParameters([ - 'worker' => $workerIdentifier, - 'dateFrom' => $dateFrom, - 'dateTo' => $dateTo, - 'nonBillableEpics' => array_values($nonBillableEpics), - 'nonBillableVersions' => array_values($nonBillableVersions), - ]) - ->getQuery()->getResult(); + )); + + // Add the worker condition only when provided + if ($workerIdentifier !== null) { + $qb->andWhere('worklog.worker = :worker') + ->setParameter('worker', $workerIdentifier); + } + + return $qb->setParameters([ + 'dateFrom' => $dateFrom, + 'dateTo' => $dateTo, + 'nonBillableEpics' => array_values($nonBillableEpics), + 'nonBillableVersions' => array_values($nonBillableVersions), + ])->getQuery()->getResult(); } public function findBilledWorklogsByWorkerAndDateRange(string $workerIdentifier, \DateTime $dateFrom, \DateTime $dateTo) From da2f4c7e9b89d25f4227ec21e830b1e7a2a70d1a Mon Sep 17 00:00:00 2001 From: Jeppe Krogh Date: Fri, 17 Jan 2025 14:26:20 +0100 Subject: [PATCH 06/22] Added service --- .../BillableUnbilledHoursReportService.php | 79 +++++++++++++++++++ 1 file changed, 79 insertions(+) create mode 100644 src/Service/BillableUnbilledHoursReportService.php diff --git a/src/Service/BillableUnbilledHoursReportService.php b/src/Service/BillableUnbilledHoursReportService.php new file mode 100644 index 00000000..f2ff6d33 --- /dev/null +++ b/src/Service/BillableUnbilledHoursReportService.php @@ -0,0 +1,79 @@ + $dateFrom, 'dateTo' => $dateTo] = $this->dateTimeHelper->getFirstAndLastDateOfYear($year); + + $billableWorklogs = $this->worklogRepository->findBillableWorklogsByWorkerAndDateRange($dateFrom, $dateTo); + + $projectData = []; + $projectTotals = []; // To store total hours per project + $totalHoursForAllProjects = 0; // To store the global total hours across all projects + + foreach ($billableWorklogs as $billableWorklog) { + if ($billableWorklog->isBilled() === false) { + $projectName = $billableWorklog->getProject()->getName(); + $issueName = $billableWorklog->getIssue()->getName(); + + // Initialize issue data if not already set + if (!isset($projectData[$projectName][$issueName])) { + $projectData[$projectName][$issueName] = [ + 'worklogs' => [], + 'totalHours' => 0 + ]; + } + + $workerIdentifier = $billableWorklog->getWorker(); + $workerName = $this-> + // Add the worklog to the issue + $projectData[$projectName][$issueName]['worklogs'][] = [ + "worker" => $billableWorklog->getWorker(), + "description" => $billableWorklog->getDescription(), + "hours" => $billableWorklog->getTimeSpentSeconds() * self::SECONDS_TO_HOURS + ]; + + // Increment the issue total hours + $projectData[$projectName][$issueName]['totalHours'] += $billableWorklog->getTimeSpentSeconds() * self::SECONDS_TO_HOURS; + + // Initialize project total if not already set + if (!isset($projectTotals[$projectName])) { + $projectTotals[$projectName] = 0; + } + + // Add to the project total hours + $projectTotals[$projectName] += $billableWorklog->getTimeSpentSeconds() * self::SECONDS_TO_HOURS; + + // Add to the global total hours + $totalHoursForAllProjects += $billableWorklog->getTimeSpentSeconds() * self::SECONDS_TO_HOURS; + } + } + + // Add project data, project totals, and global total to the report data + $billableUnbilledHoursReportData->projectData->add($projectData); + $billableUnbilledHoursReportData->projectTotals = $projectTotals; + $billableUnbilledHoursReportData->totalHoursForAllProjects = $totalHoursForAllProjects; + + return $billableUnbilledHoursReportData; + } + +} From dee4aa8689d75ac9c0d16b76fc33a31bbcc5d24f Mon Sep 17 00:00:00 2001 From: Jeppe Krogh Date: Fri, 17 Jan 2025 14:26:58 +0100 Subject: [PATCH 07/22] Corrected use of modified worklog repo method --- src/Service/InvoicingRateReportService.php | 2 +- src/Service/WorkloadReportService.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Service/InvoicingRateReportService.php b/src/Service/InvoicingRateReportService.php index 1ebd8b29..849df0bb 100644 --- a/src/Service/InvoicingRateReportService.php +++ b/src/Service/InvoicingRateReportService.php @@ -254,7 +254,7 @@ private function getWorklogs(InvoicingRateReportViewModeEnum $viewMode, string $ return match ($viewMode) { InvoicingRateReportViewModeEnum::SUMMARY => [ $this->worklogRepository->findWorklogsByWorkerAndDateRange($workerIdentifier, $dateFrom, $dateTo), - $this->worklogRepository->findBillableWorklogsByWorkerAndDateRange($workerIdentifier, $dateFrom, $dateTo), + $this->worklogRepository->findBillableWorklogsByWorkerAndDateRange($dateFrom, $dateTo, $workerIdentifier), $this->worklogRepository->findBilledWorklogsByWorkerAndDateRange($workerIdentifier, $dateFrom, $dateTo), ], }; diff --git a/src/Service/WorkloadReportService.php b/src/Service/WorkloadReportService.php index b8e4a621..e3ddbd5d 100644 --- a/src/Service/WorkloadReportService.php +++ b/src/Service/WorkloadReportService.php @@ -221,7 +221,7 @@ private function getWorklogs(ViewModeEnum $viewMode, string $workerIdentifier, \ { return match ($viewMode) { ViewModeEnum::WORKLOAD => $this->worklogRepository->findWorklogsByWorkerAndDateRange($workerIdentifier, $dateFrom, $dateTo), - ViewModeEnum::BILLABLE => $this->worklogRepository->findBillableWorklogsByWorkerAndDateRange($workerIdentifier, $dateFrom, $dateTo), + ViewModeEnum::BILLABLE => $this->worklogRepository->findBillableWorklogsByWorkerAndDateRange($dateFrom, $dateTo, $workerIdentifier), ViewModeEnum::BILLED => $this->worklogRepository->findBilledWorklogsByWorkerAndDateRange($workerIdentifier, $dateFrom, $dateTo), }; } From 9fb6d64218ccd1a60fe4ea6a96b26780056d0680 Mon Sep 17 00:00:00 2001 From: Jeppe Krogh Date: Fri, 17 Jan 2025 14:27:45 +0100 Subject: [PATCH 08/22] Added new report to navigation --- templates/components/navigation.html.twig | 1 + 1 file changed, 1 insertion(+) diff --git a/templates/components/navigation.html.twig b/templates/components/navigation.html.twig index 5683c5bb..134859b0 100644 --- a/templates/components/navigation.html.twig +++ b/templates/components/navigation.html.twig @@ -31,6 +31,7 @@
    {{ include('components/navigation-item.html.twig', {title: 'navigation.management_report'|trans, role: 'ROLE_REPORT', route: path('app_management_reports_create')}) }} {{ include('components/navigation-item.html.twig', {title: 'navigation.forecast_report'|trans, role: 'ROLE_REPORT', route: path('app_forecast_report')}) }} + {{ include('components/navigation-item.html.twig', {title: 'navigation.billable_unbilled_hours_report'|trans, role: 'ROLE_REPORT', route: path('app_billable_unbilled_hours_report')}) }} {{ include('components/navigation-item.html.twig', {title: 'navigation.hour_report'|trans, role: 'ROLE_REPORT', route: path('app_hour_report')}) }} {{ include('components/navigation-item.html.twig', {title: 'navigation.workload_report'|trans, role: 'ROLE_REPORT', route: path('app_workload_report')}) }} {{ include('components/navigation-item.html.twig', {title: 'navigation.invoicing_rate_report'|trans, role: 'ROLE_REPORT', route: path('app_invoicing_rate_report')}) }} From e39f74163bfab1accf977eb1d57e49835e41d79f Mon Sep 17 00:00:00 2001 From: Jeppe Krogh Date: Fri, 17 Jan 2025 14:28:03 +0100 Subject: [PATCH 09/22] Added twig for new report --- .../billable_unbilled_hours_report.html.twig | 86 +++++++++++++++++++ 1 file changed, 86 insertions(+) create mode 100644 templates/reports/billable_unbilled_hours_report.html.twig diff --git a/templates/reports/billable_unbilled_hours_report.html.twig b/templates/reports/billable_unbilled_hours_report.html.twig new file mode 100644 index 00000000..f28e1106 --- /dev/null +++ b/templates/reports/billable_unbilled_hours_report.html.twig @@ -0,0 +1,86 @@ +
    + + + + + + + + + {% for projectName, issues in data.projectData[0] %} + + + + + + + + {% for issueName, issueData in issues %} + + + + + + + + {% for worklog in issueData.worklogs %} + + + + + {% endfor %} + {% endfor %} + + {% endfor %} + + + + + + + + +
    + {{ 'hour_report.project_name'|trans }} + + {{ 'hour_report.total_hours'|trans }} +
    +
    + + {{ projectName }} + + +
    +     		+ {{ data.projectTotals[projectName]|default(0) }} +
    +
    + +   {{ issueName }} + + +
    +     		+ {{ issueData.totalHours|default(0) }} +
    +     {{ worklog.worker }} - {{ worklog.description }} + + {{ worklog.hours }} +
    + {{ 'hour_report.total'|trans }} + + {{ data.totalHoursForAllProjects|default(0) }} +
    +
    From d48cf4a2809a63a33d9ba135e432b1cca71730c5 Mon Sep 17 00:00:00 2001 From: Jeppe Krogh Date: Fri, 17 Jan 2025 14:32:00 +0100 Subject: [PATCH 10/22] Updated changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 03b36d8e..0db427b8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +* [PR-195](https://github.com/itk-dev/economics/pull/195) + 3602: Added billable unbilled hours report. * [PR-194](https://github.com/itk-dev/economics/pull/194) 2299: Added amount to invoices list. Removed data provider. * [PR-193](https://github.com/itk-dev/economics/pull/193) From bc5ca643266e5c09eaf6af2940c9834e4ea3686c Mon Sep 17 00:00:00 2001 From: Jeppe Krogh Date: Mon, 20 Jan 2025 08:36:35 +0100 Subject: [PATCH 11/22] Fix constructor formatting in BillableUnbilledHoursReportController --- src/Controller/BillableUnbilledHoursReportController.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/Controller/BillableUnbilledHoursReportController.php b/src/Controller/BillableUnbilledHoursReportController.php index 9228a652..8a45029a 100644 --- a/src/Controller/BillableUnbilledHoursReportController.php +++ b/src/Controller/BillableUnbilledHoursReportController.php @@ -17,8 +17,7 @@ class BillableUnbilledHoursReportController extends AbstractController { public function __construct( private readonly BillableUnbilledHoursReportService $billableUnbilledHoursReportService, - ) - { + ) { } #[Route('/', name: 'app_billable_unbilled_hours_report')] From 3fe63d4519d1402fc0243f8ecf497aa98d5e2f5b Mon Sep 17 00:00:00 2001 From: Jeppe Krogh Date: Mon, 20 Jan 2025 08:36:35 +0100 Subject: [PATCH 12/22] Remove unused imports and clean up in BillableUnbilledHoursReportData --- src/Model/Reports/BillableUnbilledHoursReportData.php | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/Model/Reports/BillableUnbilledHoursReportData.php b/src/Model/Reports/BillableUnbilledHoursReportData.php index 95f0ce5b..4e927758 100644 --- a/src/Model/Reports/BillableUnbilledHoursReportData.php +++ b/src/Model/Reports/BillableUnbilledHoursReportData.php @@ -3,20 +3,16 @@ namespace App\Model\Reports; use Doctrine\Common\Collections\ArrayCollection; -use Doctrine\Common\Collections\Collection; class BillableUnbilledHoursReportData { public string $id; - /** @var ArrayCollection */ public ArrayCollection $projectData; - public function __construct() { $this->projectData = new ArrayCollection(); } - } From 85f9d4127707686a3e1c0680f016e8e284c2d141 Mon Sep 17 00:00:00 2001 From: Jeppe Krogh Date: Mon, 20 Jan 2025 08:36:35 +0100 Subject: [PATCH 13/22] Refactor condition check for workerIdentifier in WorklogRepository --- src/Repository/WorklogRepository.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Repository/WorklogRepository.php b/src/Repository/WorklogRepository.php index d969ac08..6c769d8c 100644 --- a/src/Repository/WorklogRepository.php +++ b/src/Repository/WorklogRepository.php @@ -139,7 +139,7 @@ public function findBillableWorklogsByWorkerAndDateRange(\DateTime $dateFrom, \D )); // Add the worker condition only when provided - if ($workerIdentifier !== null) { + if (null !== $workerIdentifier) { $qb->andWhere('worklog.worker = :worker') ->setParameter('worker', $workerIdentifier); } From 6935d6f3d7ad0013231810fd6f9dc8f83f14d233 Mon Sep 17 00:00:00 2001 From: Jeppe Krogh Date: Mon, 20 Jan 2025 08:36:35 +0100 Subject: [PATCH 14/22] Add WorkerRepository and Translator; improve condition checks in BillableUnbilledHoursReportService --- .../BillableUnbilledHoursReportService.php | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/src/Service/BillableUnbilledHoursReportService.php b/src/Service/BillableUnbilledHoursReportService.php index f2ff6d33..1bf6992b 100644 --- a/src/Service/BillableUnbilledHoursReportService.php +++ b/src/Service/BillableUnbilledHoursReportService.php @@ -3,24 +3,25 @@ namespace App\Service; use App\Model\Reports\BillableUnbilledHoursReportData; +use App\Repository\WorkerRepository; use App\Repository\WorklogRepository; +use Symfony\Contracts\Translation\TranslatorInterface; class BillableUnbilledHoursReportService { - private const SECONDS_TO_HOURS = 1 / 3600; public function __construct( private readonly WorklogRepository $worklogRepository, private readonly DateTimeHelper $dateTimeHelper, + private readonly WorkerRepository $workerRepository, + private readonly TranslatorInterface $translator, ) { } - public function getBillableUnbilledHoursReport( int $year, ): BillableUnbilledHoursReportData { - $billableUnbilledHoursReportData = new BillableUnbilledHoursReportData(); ['dateFrom' => $dateFrom, 'dateTo' => $dateTo] = $this->dateTimeHelper->getFirstAndLastDateOfYear($year); @@ -31,7 +32,7 @@ public function getBillableUnbilledHoursReport( $totalHoursForAllProjects = 0; // To store the global total hours across all projects foreach ($billableWorklogs as $billableWorklog) { - if ($billableWorklog->isBilled() === false) { + if (false === $billableWorklog->isBilled()) { $projectName = $billableWorklog->getProject()->getName(); $issueName = $billableWorklog->getIssue()->getName(); @@ -39,17 +40,18 @@ public function getBillableUnbilledHoursReport( if (!isset($projectData[$projectName][$issueName])) { $projectData[$projectName][$issueName] = [ 'worklogs' => [], - 'totalHours' => 0 + 'totalHours' => 0, ]; } $workerIdentifier = $billableWorklog->getWorker(); - $workerName = $this-> + $workerName = ($this->workerRepository->findOneBy(['email' => $workerIdentifier]))?->getName() ?? ''; + // Add the worklog to the issue $projectData[$projectName][$issueName]['worklogs'][] = [ - "worker" => $billableWorklog->getWorker(), - "description" => $billableWorklog->getDescription(), - "hours" => $billableWorklog->getTimeSpentSeconds() * self::SECONDS_TO_HOURS + 'worker' => !empty($workerName) ? $workerName : $this->translator->trans('billable_unbilled_hours_report.no_worker'), + 'description' => !empty($billableWorklog->getDescription()) ? $billableWorklog->getDescription() : $this->translator->trans('billable_unbilled_hours_report.no_description'), + 'hours' => $billableWorklog->getTimeSpentSeconds() * self::SECONDS_TO_HOURS, ]; // Increment the issue total hours @@ -75,5 +77,4 @@ public function getBillableUnbilledHoursReport( return $billableUnbilledHoursReportData; } - } From b748ef5b3e6f1bfafda5f9b7ffd4de3ad69e2171 Mon Sep 17 00:00:00 2001 From: Jeppe Krogh Date: Mon, 20 Jan 2025 08:36:35 +0100 Subject: [PATCH 15/22] Update template translations and improve layout in billable_unbilled_hours_report --- .../billable_unbilled_hours_report.html.twig | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/templates/reports/billable_unbilled_hours_report.html.twig b/templates/reports/billable_unbilled_hours_report.html.twig index f28e1106..1a81b78d 100644 --- a/templates/reports/billable_unbilled_hours_report.html.twig +++ b/templates/reports/billable_unbilled_hours_report.html.twig @@ -4,10 +4,10 @@ - {{ 'hour_report.project_name'|trans }} + {{ 'billable_unbilled_hours_report.projects'|trans }} - {{ 'hour_report.total_hours'|trans }} + {{ 'billable_unbilled_hours_report.unbilled_hours'|trans }} @@ -24,8 +24,8 @@ @@ -40,14 +40,14 @@
    -   {{ issueName }} + {{ issueName }}
    @@ -60,7 +60,7 @@ {% for worklog in issueData.worklogs %} -     {{ worklog.worker }} - {{ worklog.description }} + {{ worklog.worker }}
    {{ worklog.description }} {{ worklog.hours }} @@ -75,7 +75,7 @@ - {{ 'hour_report.total'|trans }} + {{ 'billable_unbilled_hours_report.total'|trans }} {{ data.totalHoursForAllProjects|default(0) }} From 6df6369dc2b6c691c5952fb9ae2416db4e6bc155 Mon Sep 17 00:00:00 2001 From: Jeppe Krogh Date: Mon, 20 Jan 2025 08:36:35 +0100 Subject: [PATCH 16/22] Add Danish translations for billable_unbilled_hours_report messages --- translations/messages.da.yaml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/translations/messages.da.yaml b/translations/messages.da.yaml index 7277db67..5141a7e6 100644 --- a/translations/messages.da.yaml +++ b/translations/messages.da.yaml @@ -783,3 +783,13 @@ forecast_report: invoiced_recorded_hours: 'Bogførte timer' missing_hours: 'Rest timer' total: 'Total' + +billable_unbilled_hours_report: + no_description: 'Ingen beskrivelse' + no_worker: 'Ingen medarbejder' + submit: 'Hent' + total: 'Total' + unbilled_hours: 'Ufakturerede timer' + projects: 'Projekter' + year: 'År' + title: 'Ufakturerede fakturerbare timer' From 457052ed777023caa51920e70ff3b72df6962cae Mon Sep 17 00:00:00 2001 From: Jeppe Krogh Date: Mon, 20 Jan 2025 09:04:08 +0100 Subject: [PATCH 17/22] Coding standards --- src/Model/Reports/BillableUnbilledHoursReportData.php | 4 +++- src/Service/BillableUnbilledHoursReportService.php | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/Model/Reports/BillableUnbilledHoursReportData.php b/src/Model/Reports/BillableUnbilledHoursReportData.php index 4e927758..541abbc4 100644 --- a/src/Model/Reports/BillableUnbilledHoursReportData.php +++ b/src/Model/Reports/BillableUnbilledHoursReportData.php @@ -8,8 +8,10 @@ class BillableUnbilledHoursReportData { public string $id; - /** @var ArrayCollection */ + /** @var ArrayCollection */ public ArrayCollection $projectData; + public array $projectTotals; + public int|float $totalHoursForAllProjects; public function __construct() { diff --git a/src/Service/BillableUnbilledHoursReportService.php b/src/Service/BillableUnbilledHoursReportService.php index 1bf6992b..60b7c0c2 100644 --- a/src/Service/BillableUnbilledHoursReportService.php +++ b/src/Service/BillableUnbilledHoursReportService.php @@ -28,8 +28,8 @@ public function getBillableUnbilledHoursReport( $billableWorklogs = $this->worklogRepository->findBillableWorklogsByWorkerAndDateRange($dateFrom, $dateTo); $projectData = []; - $projectTotals = []; // To store total hours per project - $totalHoursForAllProjects = 0; // To store the global total hours across all projects + $projectTotals = []; + $totalHoursForAllProjects = 0; foreach ($billableWorklogs as $billableWorklog) { if (false === $billableWorklog->isBilled()) { @@ -45,7 +45,7 @@ public function getBillableUnbilledHoursReport( } $workerIdentifier = $billableWorklog->getWorker(); - $workerName = ($this->workerRepository->findOneBy(['email' => $workerIdentifier]))?->getName() ?? ''; + $workerName = $this->workerRepository->findOneBy(['email' => $workerIdentifier])?->getName() ?? ''; // Add the worklog to the issue $projectData[$projectName][$issueName]['worklogs'][] = [ From 896d16701798af8025a9c4b6d8f1b3d11923dea2 Mon Sep 17 00:00:00 2001 From: Jeppe Krogh Date: Mon, 20 Jan 2025 09:08:56 +0100 Subject: [PATCH 18/22] Added translation --- translations/messages.da.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/translations/messages.da.yaml b/translations/messages.da.yaml index 5141a7e6..e74b2e6b 100644 --- a/translations/messages.da.yaml +++ b/translations/messages.da.yaml @@ -26,6 +26,7 @@ navigation: worker: "Medarbejdere" subscription: "Abonnementer" invoicing_rate_report: "Udfaktureringsrapport" + billable_unbilled_hours_report: 'Ufakturerede timer' planning: title: 'Planlægning' From 6e7c3c96e91c8ad94aa68bb011111ffd4ff2c4b2 Mon Sep 17 00:00:00 2001 From: Jeppe Krogh Date: Mon, 20 Jan 2025 09:13:03 +0100 Subject: [PATCH 19/22] Added link to issue --- src/Service/BillableUnbilledHoursReportService.php | 2 ++ templates/reports/billable_unbilled_hours_report.html.twig | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Service/BillableUnbilledHoursReportService.php b/src/Service/BillableUnbilledHoursReportService.php index 60b7c0c2..0fd32eb6 100644 --- a/src/Service/BillableUnbilledHoursReportService.php +++ b/src/Service/BillableUnbilledHoursReportService.php @@ -41,6 +41,8 @@ public function getBillableUnbilledHoursReport( $projectData[$projectName][$issueName] = [ 'worklogs' => [], 'totalHours' => 0, + 'id' => $billableWorklog->getIssue()->getProjectTrackerId(), + 'linkToIssue' => $billableWorklog->getIssue()->getLinkToIssue(), ]; } diff --git a/templates/reports/billable_unbilled_hours_report.html.twig b/templates/reports/billable_unbilled_hours_report.html.twig index 1a81b78d..e77d16dd 100644 --- a/templates/reports/billable_unbilled_hours_report.html.twig +++ b/templates/reports/billable_unbilled_hours_report.html.twig @@ -40,7 +40,7 @@
    - {{ issueName }} + {{ issueName }} #{{ issueData.id }}