Commit 816095b4 authored by Stephane Bouvry's avatar Stephane Bouvry
Browse files

Merge branch 'master' of git.unicaen.fr:open-source/oscar into starling

parents 1289c9ac 20215a9b

module/Oscar/src/Oscar/Entity/RecallDeclaration.php

+1 −1
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ class RecallDeclaration 


    public function getShipmentsLogs() :string

    {

        return implode($this->getShipments(), "\n");

        return implode( "\n", $this->getShipments() );

    }



    public function getPeriod() :string

module/Oscar/src/Oscar/Import/ImportLaboratory.php

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ class ImportLaboratory extends AbstractImportStrategy 
                'cleaner'   => function( $data ) { return $this->cleanBullshitStr($data);}

            ),

        ]);

        $query = sprintf("SELECT CLEUNIK, TYPE, %s FROM OSCAR_PARTENAIRE", implode($hydrator->listFields(), ','));

        $query = sprintf("SELECT CLEUNIK, TYPE, %s FROM OSCAR_PARTENAIRE", implode(',', $hydrator->listFields()));

        $this->getLogger()->info($query);

        $stid = oci_parse($c, $query);

        oci_execute($stid);

module/Oscar/src/Oscar/Import/ImportPartners.php

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ class ImportPartners extends AbstractImportStrategy 
                'cleaner'   => function( $data ) { return $this->cleanBullshitStr($data);}

            ),

        ]);

        $query = sprintf("SELECT CLEUNIK, TYPE, %s FROM OSCAR_PARTENAIRE_AVEC_UFR", implode($hydrator->listFields(), ','));

        $query = sprintf("SELECT CLEUNIK, TYPE, %s FROM OSCAR_PARTENAIRE_AVEC_UFR", implode(',', $hydrator->listFields()));

        $this->getLogger()->info($query);

        $stid = oci_parse($c, $query);

        oci_execute($stid);

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

+1 −1
Original line number Diff line number Diff line
@@ -877,7 +877,7 @@ class PCRUService implements UseLoggerService, UseOscarConfigurationService, Use 
        } else {

            foreach($json_errors->contratsWithErrors as $error){

                $activityOscarId = $error->id;

                $errors = implode($error->errors, ", ");

                $errors = implode(', ', $error->errors );

                $this->log("Activity mark as error '$activityOscarId' : '$errors'");

                $pcruinfos = $this->getActivityPCRUInfoRepository()->getPcruInfoActivityFromOscarId($activityOscarId);

                $pcruinfos->setErrorsRemote($errors)