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

FIX : Export des versements depuisla liste des activités (Modification du délimiteur)

parent c5f23374

module/Oscar/src/Oscar/Controller/ProjectGrantController.php

+9 −7
Original line number Diff line number Diff line
@@ -941,7 +941,6 @@ class ProjectGrantController extends AbstractOscarController implements UseNotif 
            $paramID = $this->params()->fromQuery('ids', '');

        }





        if (!$paramID) {

            return $this->getResponseBadRequest();

        }
@@ -963,9 +962,12 @@ class ProjectGrantController extends AbstractOscarController implements UseNotif 
            $organizations);



        $formatter = new ActivityPaymentFormatter();

        $formatter->setRolesOrganizations($this->getOscarConfigurationService()->getConfiguration('export.payments.organizations'));

        $formatter->setRolesPerson($this->getOscarConfigurationService()->getConfiguration('export.payments.persons'));

        $formatter->setSeparator($this->getOscarConfigurationService()->getConfiguration('export.payments.separator'));



        $options = $this->getOscarConfigurationService()->getPayementsConfig();



        $formatter->setRolesOrganizations($options['organizations']);

        $formatter->setRolesPerson($options['persons']);

        $formatter->setSeparator($options['separator']);



        $csv = [];
@@ -976,13 +978,13 @@ class ProjectGrantController extends AbstractOscarController implements UseNotif 
        $handler = fopen($filePath, 'w');





        $delimiter = ";";

        $delimiter = "\t";

        $enclosure = "\"";

        fputcsv($handler, $formatter->csvHeaders());

        fputcsv($handler, $formatter->csvHeaders(), $delimiter);



        /** @var ActivityPayment $payment */

        foreach ($payments as $payment) {

            fputcsv($handler, $formatter->format($payment));

            fputcsv($handler, $formatter->format($payment), $delimiter);

        }



        fclose($handler);

module/Oscar/src/Oscar/Formatter/ActivityPaymentFormatter.php

+10 −10
Original line number Diff line number Diff line
@@ -78,20 +78,20 @@ class ActivityPaymentFormatter extends AbstractCSVFormatter implements IFormatte 


    public function csvHeaders(){

        $headers = [

            'ID du versement',

            "ID du versement",

            "PFI de l'activité",

            "Montant de l'activité",

            "N°Oscar d'activité",

            'Intitulé de l\'Activité',

            "Intitulé de l'Activité",

            "Début de l'activité",

            "Fin de l'activité",

            'N° de pièce du versement',

            'Montant du versement',

            'Devise du versement',

            'Commentaire du versement',

            'État du versement',

            'Date prévue du versement',

            'Date réalisé du versement'

            "N° de pièce du versement",

            "Montant du versement",

            "Devise du versement",

            "Commentaire du versement",

            "État du versement",

            "Date prévue du versement",

            "Date réalisé du versement"

        ];



        // Entêtes des organisation
@@ -179,6 +179,6 @@ class ActivityPaymentFormatter extends AbstractCSVFormatter implements IFormatte 
            }

        }



        return $datasReturned;

        return array_values($datasReturned);

    }

}
 
 No newline at end of file

module/Oscar/src/Oscar/Service/OscarConfigurationService.php

+9 −0
Original line number Diff line number Diff line
@@ -74,6 +74,15 @@ class OscarConfigurationService implements ServiceLocatorAwareInterface 
        return $config;

    }



    public function getPayementsConfig(){

        return $this->getOptionalConfiguration('payements', [

            'separator' => '$$',

            'persons' => '',

            'organizations' => ''

        ]);

    }





    /**

     * @param $key

     * @param null $defaultValue