Commit c8e65a6d authored by Stephane Bouvry's avatar Stephane Bouvry
Browse files

Fix : Les notifications calculent les personnes avec des Jalons/Versements à... 

Fix : Les notifications calculent les personnes avec des Jalons/Versements à traiter en plus de notifications non-lues
parent 5e8ccd1a

module/Oscar/src/Oscar/Command/OscarNotificationsMailsPersonsCommand.php

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ class OscarNotificationsMailsPersonsCommand extends OscarCommandAbstract 
        /** @var PersonService $personService */

        $personService = $this->getServicemanager()->get(PersonService::class);

        try {

            $personService->mailPersonsWithUnreadNotification($dateRef->format('Y-m-d H:i:s'), $io);

            $personService->notificationsPersons($dateRef->format('Y-m-d H:i:s'), $io);

        } catch (\Exception $e) {

            $io->error($e->getMessage());

            return self::FAILURE;

module/Oscar/src/Oscar/Entity/ActivityDate.php

+9 −0
Original line number Diff line number Diff line
@@ -426,4 +426,13 @@ class ActivityDate implements ITrackable 
            'dateStart' => $this->getDateStartStr(),

        ];

    }



    /**

     * @param DateTime $param

     * @return bool

     */

    public function isBefore(DateTime $param) :bool

    {

        return $this->getDateStart() < $param;

    }

}

module/Oscar/src/Oscar/Entity/ActivityDateRepository.php

+4 −0
Original line number Diff line number Diff line
@@ -245,4 +245,8 @@ class ActivityDateRepository extends EntityRepository 
        $query->select('COUNT(m.id) as total');

        return $query->getQuery()->getSingleScalarResult();

    }



    public function getMilestonesLate(string $dateRef)

    {

    }

}

module/Oscar/src/Oscar/Entity/ActivityRepository.php

+2 −1
Original line number Diff line number Diff line
@@ -62,7 +62,8 @@ class ActivityRepository extends EntityRepository 
        $queryBuilder = $this->createQueryBuilder('a')

            ->innerJoin('a.milestones', 'm')

            ->innerJoin('m.type', 't')

            ->where('t.finishable = true AND m.dateStart < :dateRef AND (m.finished IS NULL OR m.finished < 100)');

            ->where('t.finishable = true AND m.dateStart < :dateRef AND (m.finished IS NULL OR m.finished < 100)')

        ;



        $pameters = [

            'dateRef' => $dateRef

module/Oscar/src/Oscar/Entity/Repository/ActivityPaymentRepository.php

+11 −0
Original line number Diff line number Diff line
@@ -9,7 +9,18 @@ 
namespace Oscar\Entity\Repository;



use Doctrine\ORM\EntityRepository;

use Oscar\Entity\ActivityPayment;



class ActivityPaymentRepository extends EntityRepository

{

    public function getPaymentsLate(string $date): array

    {

        $qb = $this->createQueryBuilder('p');

        $qb->where('p.datePredicted < :date')

            ->andWhere('p.status = :status')

            ->setParameter('status', ActivityPayment::STATUS_PREVISIONNEL)

            ->setParameter('date', $date);



        return $qb->getQuery()->getResult();

    }

}