Commit 919a6133 authored by Stephane Bouvry's avatar Stephane Bouvry
Browse files

- Désactivation de certaines commandes inutilisées 

- Ajout d'un mode "aperçu" pour la procédure de relance des feuilles de temps (--preview)
parent 19f7015a

module/Oscar/src/Oscar/Command/OscarTimesheetActivityPeriodCommand.php→module/Oscar/src/Oscar/Command/OscarTimesheetActivityPeriodCommandOff.php

+1 −1
Changes for module/Oscar/src/Oscar/Command/OscarTimesheetActivityPeriodCommandOff.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ use Symfony\Component\Console\Output\OutputInterface; 
use Symfony\Component\Console\Style\SymfonyStyle;

use Zend\Validator\Date;



class OscarTimesheetActivityPeriodCommand extends OscarCommandAbstract

class OscarTimesheetActivityPeriodCommandOff extends OscarCommandAbstract

{

    protected static $defaultName = 'timesheets:activity-period-infos';

module/Oscar/src/Oscar/Command/OscarTimesheetDeclarerRecallCommand.php

deleted100644 → 0
+0 −178
Changes for module/Oscar/src/Oscar/Command/OscarTimesheetDeclarerRecallCommand.php: 0 added lines, 178 removed lines.
Original line number Diff line number Diff line 
<?php

/**

 * Created by PhpStorm.

 * User: bouvry

 * Date: 04/10/19

 * Time: 11:49

 */



namespace Oscar\Command;





use Doctrine\ORM\NoResultException;

use Moment\Moment;

use Oscar\Entity\Authentification;

use Oscar\Entity\LogActivity;

use Oscar\Entity\Person;

use Oscar\Entity\Role;

use Oscar\Entity\WorkPackage;

use Oscar\Entity\WorkPackagePerson;

use Oscar\Service\ConnectorService;

use Oscar\Service\MailingService;

use Oscar\Service\OscarConfigurationService;

use Oscar\Service\OscarMailerService;

use Oscar\Service\OscarUserContext;

use Oscar\Service\PersonService;

use Oscar\Service\TimesheetService;

use Oscar\Utils\DateTimeUtils;

use Symfony\Component\Console\Helper\Table;

use Symfony\Component\Console\Input\ArgvInput;

use Symfony\Component\Console\Input\InputArgument;

use Symfony\Component\Console\Input\InputInterface;

use Symfony\Component\Console\Input\InputOption;

use Symfony\Component\Console\Output\OutputInterface;

use Symfony\Component\Console\Style\SymfonyStyle;

use UnicaenApp\Service\Mailer\MailerService;

use Zend\Validator\Date;



class OscarTimesheetDeclarerRecallCommand extends OscarAdvancedCommandAbstract

{

    protected static $defaultName = 'timesheets:declarer-recall';



    const OPT_FORCE = "force";

    const OPT_DECLARER = "declarer";

    const OPT_PERIOD = "period";

    const OPT_PROCESSDATE = "processdate";



    const ARG_PERSONID = "personid";



    protected function configure()

    {

        $this

            ->setDescription("Relance ponctuelle d'un déclarant")

            ->addOption(

                self::OPT_PROCESSDATE,

                null,

                InputOption::VALUE_OPTIONAL,

                "Date effective du rappel",

                null

            )

            ->addOption(

                self::OPT_PERIOD,

                null,

                InputOption::VALUE_OPTIONAL,

                "Période (par défaut, période en cours)",

                null

            )

            ->addOption(

                self::OPTION_FORCE,

                null,

                InputOption::VALUE_OPTIONAL,

                "Forcer l'envoi du mail même si ça n'est pas necessaire",

                false

            )

            ->addArgument(

                self::ARG_PERSONID,

                InputArgument::OPTIONAL,

                "ID du déclarant"

            );

    }



    protected function execute(InputInterface $input, OutputInterface $output): int

    {

        parent::execute($input, $output);



        // Argument ALL

        $personId = $input->getArgument(self::ARG_PERSONID);



        /// OPTIONS and PARAMETERS

        $processDate = $input->getOption(self::OPT_PROCESSDATE);

        $processDate = new \DateTime($processDate);



        $force = $input->getOption(self::OPTION_FORCE) === null;



        // Période

        $period = $input->getOption(self::OPT_PERIOD);



        $helps = [];



        if (!$period) {

            $period = null;

            $periodText = " (Période non-spécifée)";

            $helps[] = "l'option '--period=<PERIOD>' permet de spécifier la période sous la forme YYYY-MM (ou 'now' pour la période en cours)";

        } else {

            if ($period == 'now') {

                $period = (new \DateTime())->format('Y-m');

            }

            $periodInfos = DateTimeUtils::periodBounds($period);

            $periodlabel = $periodInfos['periodLabel'];

            $periodText = " (Pour la période $periodlabel)";

        }



        if ($personId == null) {

            $this->getIO()->title("Liste des déclarants $periodText");



            $declarers = $this->getPersonService()->getPersonsByIds(

                $period == null ?

                    $this->getPersonService()->getDeclarersIds() :

                    $this->getPersonService()->getDeclarersIdsPeriod($period)

            );

            $headers = ['ID', 'Personne', 'Email', "Identifiant"];

            $rows = [];

            foreach ($declarers as $declarer) {

                $rows[] = [

                    $declarer->getId(),

                    $declarer->getDisplayName(),

                    $declarer->getEmail(),

                    $declarer->getLadapLogin()

                ];

            }

            $this->getIO()->table($headers, $rows);

            $this->getIO()->comment("Vous pouvez utiliser l'ID de la personne en fin de commande");

        } else {

            // Déclarant

            $declarer = $this->getPersonService()->getPersonById($personId, true);



            if (!$period) {

                $periods = $this->getTimesheetService()->getPeriodsPerson($declarer);

                $rows = [];

                foreach ($periods as $period) {

                    $rows[] = [$period, DateTimeUtils::periodBounds($period)['periodLabel']];

                }

                $this->getIO()->title("Périodes pour la personne $declarer");

                $headers = ["Code", "Période"];

                $this->getIO()->table($headers, $rows);

                $this->getIO()->comment("Utiliser --period=CODE_PERIOD pour déclencher le rappel");

            } else {

                $this->getIO()->title("Rappel pour $declarer $periodText");

                if ($this->getTimesheetService()->isDeclarerAtPeriod($declarer, $period)) {

                    $result = $this->getTimesheetService()->recallProcess($declarer->getId(), $period, $processDate, $force);



                    $this->getIO()->writeln(sprintf("Infos : <bold>%s</bold>", $result['recall_info']));

                    $this->getIO()->writeln(sprintf("Date du traitement : <bold>%s</bold>", $processDate->format('Y-m-d H:i:s')));

                    $this->getIO()->writeln(sprintf("Temps MIN/MAX attendu : <bold>%s/%s</bold>", $result['min'], $result['max']));

                    $this->getIO()->writeln(sprintf("Temps DELCARE/ATTENDU : <bold>%s</bold> / <bold>%s</bold>", $result['total'], $result['needed']));

                    $this->getIO()->writeln(sprintf("Mail envoyé : <bold>%s</bold>", $result['mailSend'] ? 'OUI' : 'NON'));

                    $this->getIO()->writeln(sprintf("Jour écoulé depuis le dernier envoi : <bold>%s</bold>", $result['since_last']));

                    $this->getIO()->writeln(sprintf("Jours entre chaque envoi : <bold>%s</bold>", $result['days_beetween']));

                    $this->getIO()->writeln(sprintf("Conflit : <bold>%s</bold>", $result['hasConflict'] ? 'OUI' : 'non'));

                    $this->getIO()->writeln(sprintf("Dernière relance envoyée : <bold>%s</bold>", $result['lastSend']));

                    $this->getIO()->writeln(sprintf("Relance envoyées pour cette période : <bold>%s</bold>", $result['recalls']));



                } else {

                    $this->getIO()->warning("'$declarer' n'est pas déclarant pour la période '$periodlabel'");

                }

            }

        }



        return 1;

    }



    /**

     * @return TimesheetService

     */

    protected function getTimesheetService(): TimesheetService

    {

        return $this->getServicemanager()->get(TimesheetService::class);

    }

}
 
 No newline at end of file

module/Oscar/src/Oscar/Command/OscarTimesheetPersonPeriodInfosCommand.php→module/Oscar/src/Oscar/Command/OscarTimesheetPersonPeriodInfosCommandOff.php

+1 −1
Changes for module/Oscar/src/Oscar/Command/OscarTimesheetPersonPeriodInfosCommandOff.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ use Symfony\Component\Console\Output\OutputInterface; 
use Symfony\Component\Console\Style\SymfonyStyle;

use Zend\Validator\Date;



class OscarTimesheetPersonPeriodInfosCommand extends OscarCommandAbstract

class OscarTimesheetPersonPeriodInfosCommandOff extends OscarCommandAbstract

{

    protected static $defaultName = 'timesheets:person-period-infos';

module/Oscar/src/Oscar/Command/OscarTimesheetRecallsCommand.php

+8 −2
Changes for module/Oscar/src/Oscar/Command/OscarTimesheetRecallsCommand.php: 8 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ class OscarTimesheetRecallsCommand extends OscarAdvancedCommandAbstract 
        $this

            ->setDescription("Relance automatique des feuilles de temps")

            ->addOption("purge", null, InputOption::VALUE_OPTIONAL, "Suppression des données (dev)", false)

            ->addOption("preview", null, InputOption::VALUE_OPTIONAL, "Aperçu (affiche les personnes concernées)", false)

            ->addOption("processdate", null, InputOption::VALUE_OPTIONAL, "Date d'execution", false)

        ;

    }
@@ -53,6 +54,8 @@ class OscarTimesheetRecallsCommand extends OscarAdvancedCommandAbstract 
        $processArg = $input->getOption('processdate');



        $purge = $input->getOption('purge');

        $preview = $input->getOption('preview') !== false;



        if( $purge === null ){

            $recalls = $this->getOrganizationService()->getEntityManager()->getRepository(RecallDeclaration::class)->findAll();

            if($this->ask("Reset complet des procédures de rappel ? (y)")){
@@ -83,7 +86,8 @@ class OscarTimesheetRecallsCommand extends OscarAdvancedCommandAbstract 
        );



        foreach ($declarers as $declarer) {

            $result = $this->getTimesheetService()->recallProcess($declarer->getId(), $period->getPeriodCode(), $processDate, $force);



            $result = $this->getTimesheetService()->recallProcess($declarer->getId(), $period->getPeriodCode(), $processDate, $force, $preview);

            if( $result['mailSend'] ){

                $snd = "<green>Mail envoyé</green>";

            } else {
@@ -109,7 +113,9 @@ class OscarTimesheetRecallsCommand extends OscarAdvancedCommandAbstract 
                $period->getYear(),

                $period->getMonth(),

                $processDate,

                $force);

                $force,

                $preview

            );



            if( $result['mailSend'] ){

                $snd = "<green>Mail envoyé</green>";

module/Oscar/src/Oscar/Command/OscarTimesheetValidatorRecallCommand.php

deleted100644 → 0
+0 −164
Changes for module/Oscar/src/Oscar/Command/OscarTimesheetValidatorRecallCommand.php: 0 added lines, 164 removed lines.
Original line number Diff line number Diff line 
<?php

/**

 * Created by PhpStorm.

 * User: bouvry

 * Date: 04/10/19

 * Time: 11:49

 */



namespace Oscar\Command;





use Doctrine\ORM\NoResultException;

use Moment\Moment;

use Oscar\Entity\Authentification;

use Oscar\Entity\LogActivity;

use Oscar\Entity\Person;

use Oscar\Entity\Role;

use Oscar\Entity\WorkPackage;

use Oscar\Entity\WorkPackagePerson;

use Oscar\Service\ConnectorService;

use Oscar\Service\MailingService;

use Oscar\Service\OscarConfigurationService;

use Oscar\Service\OscarMailerService;

use Oscar\Service\OscarUserContext;

use Oscar\Service\PersonService;

use Oscar\Service\TimesheetService;

use Oscar\Utils\DateTimeUtils;

use Oscar\Utils\PeriodInfos;

use Symfony\Component\Console\Helper\Table;

use Symfony\Component\Console\Input\ArgvInput;

use Symfony\Component\Console\Input\InputArgument;

use Symfony\Component\Console\Input\InputInterface;

use Symfony\Component\Console\Input\InputOption;

use Symfony\Component\Console\Output\OutputInterface;

use Symfony\Component\Console\Style\SymfonyStyle;

use UnicaenApp\Service\Mailer\MailerService;

use Zend\Validator\Date;



class OscarTimesheetValidatorRecallCommand extends OscarAdvancedCommandAbstract

{

    protected static $defaultName = 'timesheets:validator-recall';



    const OPT_FORCE = "force";

    const OPT_VALIDATOR = "validator";

    const OPT_PERIOD = "period";

    const OPT_PROCESSDATE = "processdate";



    const ARG_PERSONID = "personid";



    protected function configure()

    {

        $this

            ->setDescription("Relance ponctuelle d'un déclarant")

            ->addOption(

                self::OPT_PROCESSDATE,

                null,

                InputOption::VALUE_OPTIONAL,

                "Date effective du rappel",

                null

            )

            ->addOption(

                self::OPT_PERIOD,

                null,

                InputOption::VALUE_OPTIONAL,

                "Période (par défaut, période en cours)",

                null

            )

            ->addOption(

                self::OPTION_FORCE,

                null,

                InputOption::VALUE_OPTIONAL,

                "Forcer l'envoi du mail même si ça n'est pas necessaire",

                false

            )

            ->addArgument(

                self::ARG_PERSONID,

                InputArgument::OPTIONAL,

                "ID du déclarant"

            );

    }



    protected function execute(InputInterface $input, OutputInterface $output): int

    {

        parent::execute($input, $output);



        // Argument ALL

        $personId = $input->getArgument(self::ARG_PERSONID);



        /// OPTIONS and PARAMETERS

        $processDate = $input->getOption(self::OPT_PROCESSDATE);

        $processDate = new \DateTime($processDate);



        $force = $input->getOption(self::OPTION_FORCE) === null;



        // Période

        $period = $input->getOption(self::OPT_PERIOD);



        $helps = [];



        if (!$period) {

            $period = null;

            $periodText = " (Période non-spécifée)";

            $helps[] = "l'option '--period=<PERIOD>' permet de spécifier la période sous la forme YYYY-MM (ou 'now' pour la période en cours)";

        } else {

            if ($period == 'now') {

                $period = (new \DateTime())->format('Y-m');

            }

            $periodInfos = DateTimeUtils::periodBounds($period);

            $periodlabel = $periodInfos['periodLabel'];

            $periodText = " (Pour la période $periodlabel)";

        }



        if ($personId == null) {

            $this->getIO()->title("Liste des validateurs $periodText");



            $validators = $this->getPersonService()->getPersonsByIds(

                $period == null ?

                    $this->getPersonService()->getValidatorsIds() :

                    $this->getPersonService()->getValidatorsIdsPeriod($period)

            );

            $headers = ['ID', 'Personne', 'Email', "Identifiant"];

            $rows = [];

            foreach ($validators as $validator) {

                $rows[] = [

                    $validator->getId(),

                    $validator->getDisplayName(),

                    $validator->getEmail(),

                    $validator->getLadapLogin()

                ];

            }

            $this->getIO()->table($headers, $rows);

            $this->getIO()->comment("Vous pouvez utiliser l'ID de la personne pour afficher les détails");

        } else {



            $validator = $this->getPersonService()->getPersonById($personId, true);



            if (!$period) {

                $periods = $this->getTimesheetService()->getPeriodsValidator($validator);

                $rows = [];

                foreach ($periods as $period) {

                    $periodInfos = PeriodInfos::getPeriodInfosObj($period);

                    $rows[] = [$periodInfos->getPeriodCode(), $periodInfos->getPeriodLabel()];

                }

                $this->getIO()->title("Périodes pour $validator où des validations sont à faire");

                $headers = ["Code", "Période"];

                $this->getIO()->table($headers, $rows);

                $this->getIO()->comment("Utiliser --period=CODE_PERIOD pour déclencher le rappel");

            } else {

                $this->getIO()->title("Rappel pour $validator $periodText");



            }

        }



        return 1;

    }



    /**

     * @return TimesheetService

     */

    protected function getTimesheetService(): TimesheetService

    {

        return $this->getServicemanager()->get(TimesheetService::class);

    }

}
 
 No newline at end of file