New controlling plugin: Amount of working hours

[idemus]

Hi,
we have different customers and for each customer we have different projects, activities to create billable timesheets.
The working contract has it's own project for the internal customer (our own company).
The working time overview under the menue working contract sums up all activities from all customers/projects.
Is it possible to set a default 'Customer/Project' in the user properties "working contract" which is then taken into account for the working hours overview?

Best regards
Klaus

[kevinpapst]

The working contract has it's own project for the internal customer (our own company).

I don't know what this means. Are you talking about the old MR plugin?

This is not the old plugin 😁 the new one works different: all booked time is working time.

If you want to track attendance and project times in parallel, you need to use two distinct user accounts for that.

[idemus]

That was the same way in the old MR plugin.
A second user account is not a solution. Would it be possible that you'll implement it in future as a feature?

[idemus]

I'll try on my own with a "modification" in your coding. I know that I'll loose it when there are updates without manually updating my insertion again and again...
Could you please tell me where I can find the query which fetches the entries for the working time overview?

[kevinpapst]

Start searching from here: https://github.com/kimai/kimai/blob/main/src/WorkingTime/WorkingTimeService.php#L51

[kevinpapst]

And please share your changes, who knows ...

[idemus]

Hi Kevin,

here my changes I've done in WorkingTimeService.php:

• adding third parameter $project in function private function getYearStatistics(\DateTimeInterface $year, User $user, int $project ): array

• adding addwhere in the select:
  ->andWhere($qb->expr()->eq('t.project', ':project'))
  ->setParameter('project', $project)

• calling the function in line 71 with projectid (hard coded because it's only for my own use).
  $stats = $this->getYearStatistics($yearDate, $user, 4);

Now I get only those timesheets created under my project which is considered for working time (and not times booked on customer projects for billable reasons).

Best regards
Klaus

[kevinpapst]

Really that easy? In that case, I might add it to core.
Please let me know if you find any issues, so I can help improving it

[Wbrugger]

Hello,

this is exactly my Problem with the new Plugin. Please adopt the solution from idemus quick. I have a own feature request #175.

Best Regards,

WBrugger

[Wbrugger]

Special thx to idemus :)

I have changed the code in the Module like him. But i filtered by activity not by project.

71 if ($stats === null) {
$stats = $this->getYearStatistics($yearDate, $user, 6); // Added activity Hardcoded
}

143 $qb
144 ->select('COALESCE(SUM(t.duration), 0) as duration')
145 ->addSelect('DATE(t.date) as day')
146 ->where($qb->expr()->isNotNull('t.end'))
147 ->andWhere($qb->expr()->between('t.date', ':begin', ':end'))
148 ->andWhere($qb->expr()->eq('t.user', ':user'))
149 ->andWhere($qb->expr()->eq('t.activity', ':activity')) //try to filter activity
150 ->setParameter('end', $end->format('Y-m-d'))
152 ->setParameter('user', $user->getId())
153 ->setParameter('activity', $activity) //Set activity Value
154 ->addGroupBy('day')
155 ;

I have tested the chnges. Working like a charme :)

Best Regards,

WBrugger

[wobouser]

thanks for the input to @idemus and @Wbrugger
that would have been a good interim solution for us.

unfortunately, neither solution works for me.
I don't know if something has been fundamentally changed in the WorkingTimeService.php so far (an indication of this is that the line numbers from the examples no longer match the current code).
I have tried both ways (actvities & projects).

my wish would actually be that there is the possibility to record the working time as a project or activity.
we also have times that cannot be productively assigned to a customer.
so it is important for us to have a come and go time in order to record attendance in the company due to legal regulations

[idemus]

@wobouser
Here is my coding I've inserted in file WorkingTimeService.php (search for "insertion") which is working with plugin version 1.8.
Maybe this could help you:
[...]
public function getYear(User $user, \DateTimeInterface $yearDate, \DateTimeInterface $until): Year
{
$yearTimes = $this->workingTimeRepository->findForYear($user, $yearDate);
$existing = [];
foreach ($yearTimes as $workingTime) {
$existing[$workingTime->getDate()->format('Y-m-d')] = $workingTime;
}

    $year = new Year(\DateTimeImmutable::createFromInterface($yearDate), $user);

    $stats = null;
    $firstDay = $user->getWorkStartingDay();

    foreach ($year->getMonths() as $month) {
        foreach ($month->getDays() as $day) {
            $key = $day->getDay()->format('Y-m-d');
            if (\array_key_exists($key, $existing)) {
                $day->setWorkingTime($existing[$key]);
                continue;
            }

            if ($stats === null) {
            **/* begin of insertion
               filter working time overview to a specific project */
                $stats = $this->getYearStatistics($yearDate, $user, 4);
            /* end of insertion */**
            }

            $dayDate = $day->getDay();
            $result = new WorkingTime($user, $dayDate);

            if ($firstDay === null || $firstDay <= $dayDate) {
                $result->setExpectedTime($user->getWorkHoursForDay($dayDate));
            }

            if (\array_key_exists($key, $stats)) {
                $result->setActualTime($stats[$key]);
            }

            $day->setWorkingTime($result);
        }
    }

    $event = new WorkingTimeYearEvent($year, $until);
    $this->eventDispatcher->dispatch($event);

    return $year;
}

[...]

/**
 * @param \DateTimeInterface $year
 * @param User $user
 * begin of insertion
 * filter working time overview to a specific project
 * @param int $project
 * end of insertion
 * @return array<string, int>
 */
private function getYearStatistics(\DateTimeInterface $year, User $user, **int $project** ): array
{
    $dateTimeFactory = DateTimeFactory::createByUser($user);
    $begin = $dateTimeFactory->createStartOfYear($year);
    $end = $dateTimeFactory->createEndOfYear($year);

    $qb = $this->timesheetRepository->createQueryBuilder('t');

    $qb
        ->select('COALESCE(SUM(t.duration), 0) as duration')
        ->addSelect('DATE(t.date) as day')
        ->where($qb->expr()->isNotNull('t.end'))
        ->andWhere($qb->expr()->between('t.begin', ':begin', ':end'))
        ->andWhere($qb->expr()->eq('t.user', ':user'))
        **/* begin of insertion
           filter working time overview to a specific project */
        ->andWhere($qb->expr()->eq('t.project', ':project'))
         /* end of insertion */**
        ->setParameter('begin', $begin)
        ->setParameter('end', $end)
        ->setParameter('user', $user->getId())
        **/* begin of insertion
          filter working time overview to a specific project */
        ->setParameter('project', $project)
        /* end of insertion */**
        ->addGroupBy('day')
    ;
    $results = $qb->getQuery()->getResult();

    $durations = [];
    foreach ($results as $row) {
        $durations[$row['day']] = (int) $row['duration'];
    }

    return $durations; // @phpstan-ignore-line
}

}

Best regards
Klaus

[wobouser]

ps:
currently the working time recording only counts activities that have been entered.
this means that if i charge a customer 6 hours for a project, only these 6 hours are listed in the working time recording even though i was at the company for 8 hours.
conversely, this means that I am missing 2 hours

[idemus]

@wobouser
That's why we've introduced a company internal project "Working Time" which have to be booked with working time per day in parallel. Therefore you can use the plugin "time period insert" where you can create timesheet entries in mass for recurring entries.

[wobouser]

and another small addition (but that's just optics):
the problem with the above solution is that i then have my attendance + work done listed in my weekly overview.

example:
7 hours project for the customer + 8 hours present in the company results in a total of 15 hours in my daily overview ^^

[idemus]

@wobouser
see my answer above. By introducing a project where only company internal working hours, holidays, sick leaves, etc. and no billable hours from customer projects are created, won't have that problem.