Fix : Export des projets, n'export ne se limite plus aux résultats affichés et... (bbccd0bc) · Commits · open-source / oscar

module/Oscar/src/Oscar/Controller/ProjectController.php

+1 −3

Original line number	Diff line number	Diff line
		@@ -165,15 +165,13 @@ class ProjectController extends AbstractOscarController
		$delimiter = "\t";

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

		foreach ($projects as $p) {
		fputcsv($handler, $formatter->format($p), $delimiter);
		}

		fclose($handler);

		$downloader = new CSVDownloader();
		$downloader->downloadCSVToExcel($filePath);
		$downloader->downloadCSV($filePath);
		unlink($filePath);
		die();
		} catch (\Exception $e) {

+2 −4

Original line number	Diff line number	Diff line
		@@ -3011,7 +3011,7 @@ class ProjectGrantController extends AbstractOscarController implements UseNotif
		$idsExport = array_map('current', $qbIds->getQuery()->getResult());

		$qbIds = $qb->select('DISTINCT pr.id');
		$ids = array_map('current', $qbIds->getQuery()->getResult());
		$idsProjects = array_map('current', $qbIds->getQuery()->getResult());
		} else {
		$qbIds = $qb->select('DISTINCT c.id');
		$ids = array_map('current', $qbIds->getQuery()->getResult());
		@@ -3037,9 +3037,7 @@ class ProjectGrantController extends AbstractOscarController implements UseNotif

		$projectsIds = [];
		if ($projectview == 'on') {
		foreach ($activities as $p) {
		$projectsIds[] = $p->getId();
		}
		$projectsIds = $idsProjects;
		}

+4 −4

Original line number	Diff line number	Diff line
		@@ -143,8 +143,8 @@ class ProjectToArrayFormatter implements IProjectFormater
		$pfi[] = $activity->getCodeEOTP();
		}

		if ($activity->getType()) {
		$types[] = $activity->getType();
		if ($activity->getActivityType()) {
		$types[] = $activity->getActivityType()->getLabel();
		}

		$status[] = $activity->getStatusLabel();
		@@ -221,7 +221,7 @@ class ProjectToArrayFormatter implements IProjectFormater
		$output['amount'] = $amount;
		$output['pfi'] = implode(', ', $pfi);
		$output['oscarNum'] = implode(', ', $oscarNum);
		$output['type'] = implode(', ', $types);
		$output['types'] = implode(', ', array_unique($types));
		$output['status'] = implode(', ', $status);
		$output['start'] = implode(', ', $start);
		$output['end'] = implode(', ', $end);
		@@ -273,7 +273,7 @@ class ProjectToArrayFormatter implements IProjectFormater
		'amount' => "Montant",
		'pfi' => "N°Financier",
		'oscarNum' => "N° Oscar",
		'type' => "Types",
		'types' => "Types",
		'status' => "Statuts",
		'start' => "Débuts",
		'end' => "Fins",

+5 −7

Original line number	Diff line number	Diff line
		@@ -33,7 +33,8 @@ class UnicaenDoctrinePaginator implements \Countable, \IteratorAggregate
		/**
		* @return QueryBuilder
		*/
		public function getQueryBuilder(){
		public function getQueryBuilder()
		{
		return $this->query;
		}

		@@ -52,8 +53,6 @@ class UnicaenDoctrinePaginator implements \Countable, \IteratorAggregate
		$this->count = $paginator->count();
		}



		public function getCountPage()
		{
		return ceil($this->count() / $this->getResultsByPage());
		@@ -88,7 +87,6 @@ class UnicaenDoctrinePaginator implements \Countable, \IteratorAggregate
		}



		/**
		* (PHP 5 >= 5.1.0)<br/>
		* Count elements of an object