Commit 01c852d9 authored by Jean-Baptiste Oellers's avatar Jean-Baptiste Oellers
Browse files

Ajout colonne type avec arborescence pour export excel des activités

parent 780ce036

module/Oscar/src/Oscar/Entity/Activity.php

+3 −1
Changes for module/Oscar/src/Oscar/Entity/Activity.php: 3 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -2724,7 +2724,7 @@ class Activity implements ResourceInterface 
        return $datas;

    }



    public function csv($dateFormat = 'Y-m-d')

    public function csv($dateFormat = 'Y-m-d', $activityTypeChainFormatted)

    {

        return array(

            'ID'                                   => $this->getId(),
@@ -2742,6 +2742,7 @@ class Activity implements ResourceInterface 
            'numéro SAIC'                          => $this->getCentaureNumConvention(),

            'numéro oscar'                         => $this->getOscarNum(),

            'Type'                                 => $this->getActivityType() ? (string)$this->getActivityType() : '',

            'Type avec arborescence'               => $activityTypeChainFormatted,

            'Statut'                               => Activity::getStatusLabel(),

            'Début'                                => $this->getDateStart() ? $this->getDateStart()->format(

                $dateFormat
@@ -2803,6 +2804,7 @@ class Activity implements ResourceInterface 
            'numéro SAIC',

            'numéro oscar',

            'Type',

            'Type avec arborescence',

            'Statut',

            'Début',

            'Fin',

module/Oscar/src/Oscar/Strategy/Activity/ExportDatas.php

+9 −4
Changes for module/Oscar/src/Oscar/Strategy/Activity/ExportDatas.php: 9 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@ use Oscar\Service\OscarConfigurationService; 
use Oscar\Service\OscarUserContext;

use Oscar\Service\OscarUserContextFactory;

use Oscar\Service\ProjectGrantService;

use Oscar\Traits\UseActivityTypeService;

use Oscar\Traits\UseActivityTypeServiceTrait;

use Oscar\Traits\UseEntityManager;

use Oscar\Traits\UseEntityManagerTrait;

use Oscar\Traits\UseOscarConfigurationService;
@@ -29,9 +31,9 @@ use Oscar\Traits\UseOscarUserContextServiceTrait; 
use Oscar\Traits\UseProjectGrantService;

use Oscar\Traits\UseProjectGrantServiceTrait;



class ExportDatas implements UseOscarConfigurationService, UseProjectGrantService, UseEntityManager, UseOscarUserContextService

class ExportDatas implements UseOscarConfigurationService, UseProjectGrantService, UseEntityManager, UseOscarUserContextService, UseActivityTypeService

{

    use UseOscarConfigurationServiceTrait, UseProjectGrantServiceTrait, UseEntityManagerTrait, UseOscarUserContextServiceTrait;

    use UseOscarConfigurationServiceTrait, UseProjectGrantServiceTrait, UseEntityManagerTrait, UseOscarUserContextServiceTrait, UseActivityTypeServiceTrait;



    private ?string $rewriteDateFormat = null;
@@ -42,6 +44,7 @@ class ExportDatas implements UseOscarConfigurationService, UseProjectGrantServic 
    {

        $this->setProjectGrantService($pgs);

        $this->setOscarConfigurationService($pgs->getOscarConfigurationService());

        $this->setActivityTypeService($pgs->getActivityTypeService());

        $this->setEntityManager($pgs->getEntityManager());

        $this->setOscarUserContextService($ouc);

        if( $rewriteDateFormat === null ){
@@ -264,8 +267,10 @@ class ExportDatas implements UseOscarConfigurationService, UseProjectGrantServic 
                    }

                }





                foreach ( $entity->csv($dateFormat) as $col=>$value ){

                $activityTypeChainFormatted = $entity->getActivityType() ? $this->getActivityTypeService()->getActivityTypeChainFormatted(

                    $entity->getActivityType()

                ) : '';

                foreach ( $entity->csv($dateFormat, $activityTypeChainFormatted) as $col=>$value ){

                    if( $columns[$col] === true )

                        $datas[] = $value;

                }