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

FIX Le CSV des partenaires est bien ajouté dans le ZIP pour une activité

parent 0fe7c6eb

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

+1 −1
Original line number Diff line number Diff line
@@ -2866,7 +2866,7 @@ class ProjectGrantController extends AbstractOscarController implements UseNotif 
                    $this->getProjectGrantService()->getPCRUService()->addToPool($activity);

                    break;



                case 'download':

                case 'download-pcru':

                    $this->getProjectGrantService()->getPCRUService()->downloadOne($activity);

                    break;

            }

module/Oscar/src/Oscar/Service/PCRUService.php

+7 −2
Original line number Diff line number Diff line
@@ -189,8 +189,9 @@ class PCRUService implements UseLoggerService, UseOscarConfigurationService, Use 
        $num = $activity->getOscarNum();



        $ziptmp = "/tmp/pcru-preview-zip-$num-" . uniqid() . ".zip";

        $csvtmp = "/tmp/pcru-preview-csv-$num-" . uniqid() . ".zip";

        $pdftmp = "/tmp/pcru-preview-pdf-$num-" . uniqid() . ".zip";

        $csvtmp = "/tmp/pcru-preview-csv-$num-" . uniqid() . ".csv";

        $pdftmp = "/tmp/pcru-preview-pdf-$num-" . uniqid() . ".pdf";

        $orgtmp = "/tmp/pcru-preview-org-$num-" . uniqid() . ".csv";



        // Récupération des données

        $pcruInfos = $this->getPcruInfosActivity($activity);
@@ -204,6 +205,8 @@ class PCRUService implements UseLoggerService, UseOscarConfigurationService, Use 
        $csvFile = new PCRUCvsFile($this);

        $csvFile->addEntry($pcruInfos);

        $csvFile->writeContratsCsv($csvtmp);

        $csvFile->writePartenairesCSV($orgtmp);



        file_put_contents($pdftmp, $csvFile->getDocumentSignedFromPcruInfo($pcruInfos));



        // Création de l'archive
@@ -212,6 +215,8 @@ class PCRUService implements UseLoggerService, UseOscarConfigurationService, Use 
            throw new OscarException("Impossible de créer l'archive");

        }

        $zip->addFile($csvtmp, 'contrats.csv');

        if( file_exists($orgtmp) )

            $zip->addFile($orgtmp, 'partenaires.csv');

        $zip->addFile($pdftmp, $num . '.pdf');

        $zip->close();