Loading module/Application/src/Application/Controller/StatistiqueController.php +19 −4 Changes for module/Application/src/Application/Controller/StatistiqueController.php: 19 added lines, 4 removed lines. Original line number Diff line number Diff line Loading @@ -28,7 +28,7 @@ class StatistiqueController extends AbstractController /** TODO prendre les non substitué **/ $ecoles = $this->getStructureService()->getAllStructuresAffichablesByType(TypeStructure::CODE_ECOLE_DOCTORALE, 'libelle'); $unites = $this->getStructureService()->getAllStructuresAffichablesByType(TypeStructure::CODE_UNITE_RECHERCHE, 'libelle'); $etablissements = $this->getEtablissementService()->getRepository()->findAllEtablissementsMembres(); $etablissements = $this->getEtablissementService()->getRepository()->findAllEtablissementsInscriptions(); /** * Certaines statistiques exploites le genre de la personne et nécessite de récupérer Loading @@ -46,6 +46,18 @@ class StatistiqueController extends AbstractController $structureType = $this->params()->fromQuery("structure_type"); $structureId = $this->params()->fromQuery("structure_id"); $structure = null; switch ($structureType) { case "ED" : $structure = $this->getEcoleDoctoraleService()->getRepository()->findOneBy(['id'=>$structureId]); break; case "UR" : $structure = $this->getUniteRechercheService()->getRepository()->findOneBy(['id'=>$structureId]); break; case "ETAB" : $structure = $this->getEtablissementService()->getRepository()->findOneBy(['id'=>$structureId]); break; } $qb = $this->decorateWithStructure($qb, $structureType, $structureId); $dateType = $this->params()->fromQuery("date_type"); Loading @@ -53,6 +65,7 @@ class StatistiqueController extends AbstractController $dateFin = $this->params()->fromQuery("date_max"); $qb = $this->decorateWithDate($qb, $dateType, $dateDebut, $dateFin); $theses = $qb->getQuery()->execute(); Loading @@ -62,7 +75,9 @@ class StatistiqueController extends AbstractController 'ecoles' => $ecoles, 'unites' => $unites, 'etablissements' => $etablissements, // 'structure_id' => $structureId, 'type' => $structureType, 'structure' => $structure, ]); } Loading @@ -84,8 +99,8 @@ class StatistiqueController extends AbstractController $unite = $this->getUniteRechercheService()->getRepository()->findOneBy(['id'=>$id]); return $qb->andWhere("t.uniteRecherche = :ur") ->setParameter(":ur", $unite); case "Etab" : $etablissement = $this->getEtablissementService()->getRepository()->find($id); case "ETAB" : $etablissement = $this->getEtablissementService()->getRepository()->findOneBy(['id'=>$id]); return $qb->andWhere("t.etablissement = :etab") ->setParameter("etab", $etablissement); } Loading module/Application/view/application/statistique/index.phtml +28 Changes for module/Application/view/application/statistique/index.phtml: 28 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -8,11 +8,15 @@ use Application\Entity\Db\Etablissement; use Application\Entity\Db\Structure; /** * @see \Application\Controller\StatistiqueController::indexAction() * @var PhpRenderer $this * @var These[] $theses * @var EcoleDoctorale[] $ecoles * @var UniteRecherche[] $unites * @var Etablissement[] $etablissements * * @var string $type * @var Structure $structure */ Loading @@ -25,6 +29,12 @@ $this->headTitle($this->translate("Statistiques")); <h1 class="page-header first"><?php echo $this->translate("Statistiques") ?> <span class="badge"><?php echo count($theses) . " thèses"?></span></h1> <?php if ($type !== null) : ?> Sélection courante : [<?php echo $type; ?>] <?php echo ($structure)?$structure->getLibelle():"Pas de structure"; ?> <?php else : ?> Aucune sélection <?php endif; ?> <div id="selector"> <form id="selection" method="get" action=""> <h4>Type de structure : </h4> Loading Loading @@ -480,6 +490,7 @@ function generateEffectifParPays($effectifsInscription, $start , $end) { $code = []; $code["AFGHAN(E)"] = "Afghanistan"; $code["ALGERIEN(NE)"] = "Algeria"; $code["ALGÉRIEN(NE)"] = "Algeria"; $code["ALLEMAND(E)"] = "Germany"; $code["AMERICAIN(E)"] = "United States"; $code["ANDORRAN(NE)"] = "Andorra"; Loading @@ -495,12 +506,15 @@ function generateEffectifParPays($effectifsInscription, $start , $end) { $code["BELGE"] = "Belgium"; $code["BENGALI(E)"] = "Bengladesh"; $code["BENINOIS(E)"] = "Benin"; $code["BÉNINOIS(E)"] = "Benin"; $code["BOLIVIEN(NE)"] = "Bolivia"; $code["BOSNIAQUE"] = "Bosnia"; $code["BRESILIEN(NE)"] = "Brazil"; $code["BRÉSILIEN(NE)"] = "Brazil"; $code["BRITANNIQUE"] = "United Kingdom"; $code["BULGARE"] = "Bulgaria"; $code["BURKINABE"] = "Burkina Faso"; $code["BURKINABEEN(NE)"] = "Burkina Faso"; $code["BURUNDAIS(E)"] = "Burundi"; $code["CAMBODGIEN(NE)"] = "Combodia"; $code["CAMEROUNAIS(E)"] = "Cameroon"; Loading @@ -514,6 +528,7 @@ function generateEffectifParPays($effectifsInscription, $start , $end) { $code["COMORIEN(NE)"] = "Comoros"; $code["CONGOLAIS(E)"] = "Congo"; $code["COSTARICIEN(NE)"] = "Costa Rica"; $code["COSTARICAIN(E)"] = "Costa Rica"; $code["CROATE"] = "Croatia"; $code["CUBAIN(E)"] = "Cuba"; $code["DANOIS(E)"] = "Denmark"; Loading @@ -522,10 +537,13 @@ function generateEffectifParPays($effectifsInscription, $start , $end) { $code["EGYPTIEN(NE)"] = "Egypt"; $code["EL SALVADOR"] = "El Salvador"; $code["EL SALVADORIEN(NE)"] = "El Salvador"; $code["EMIRATIS(IE)"] = "United Arab Emirates"; $code["EQUATORIEN(NE)"] = "Equatorial Guinea"; $code["ESPAGNOL(E)"] = "Spain"; $code["ETRANGER"] = ""; $code["FINLANDAIS(E)"] = "Finland"; $code["FRANCAIS(E)"] = "France"; $code["FRANÇAIS(E)"] = "France"; $code["GABONAIS(E)"] = "Gabon"; $code["GEORGIEN(NE)"] = "Georgia"; $code["GHANEEN(NE)"] = "Ghana"; Loading @@ -536,6 +554,7 @@ function generateEffectifParPays($effectifsInscription, $start , $end) { $code["HONGROIS(E)"] = "Hungary"; $code["INDIEN(NE)"] = "India"; $code["INDONESIEN(NE)"] = "Indonesia"; $code["INDONÉSIEN(NE)"] = "Indonesia"; $code["IRAKIEN(NE)"] = "Iraq"; $code["IRANIEN(NE)"] = "Iran"; $code["IRLANDAIS(E)"] = "Ireland"; Loading @@ -546,6 +565,7 @@ function generateEffectifParPays($effectifsInscription, $start , $end) { $code["JAPONAIS(E)"] = "Japan"; $code["JORDANIEN(NE)"] = "Jordan"; $code["KAZAKH"] = "Kazakhstan"; $code["KAZAKH(E)"] = "Kazakhstan"; $code["KENYAN(NE)"] = "Kenya"; $code["KOWEITIEN(NE)"] = "Kuwait"; $code["LAOTIEN(NE)"] = "Laos"; Loading @@ -555,6 +575,8 @@ function generateEffectifParPays($effectifsInscription, $start , $end) { $code["LITHUANIEN(NE)"] = "Lithuania"; $code["LUXEMBOURGEOIS(E)"] = "Luxembourg"; $code["MALAIS(E)"] = "Malaysia"; $code["MALAISIEN(E)"] = "Malaysia"; $code["MALAISIEN(NE)"] = "Malaysia"; $code["MALAWIEN(NE)"] = "Malawi"; $code["MALGACHE"] = "Madagascar"; $code["MALIEN(NE)"] = "Mali"; Loading @@ -572,6 +594,7 @@ function generateEffectifParPays($effectifsInscription, $start , $end) { $code["NICARAGUAIS(E)"] = "Nicaragua"; $code["NIGERIEN(NE)"] = "Nigeria"; $code["NIGERIAN(E)"] = "Nigeria"; $code["NIGÉRIEN(NE)"] = "Nigeria"; $code["NORVEGIEN(NE)"] = "Norway"; $code["OUGANDAIS(E)"] = "Uganda"; $code["PAKISTANAIS(E)"] = "Pakistan"; Loading @@ -588,9 +611,12 @@ function generateEffectifParPays($effectifsInscription, $start , $end) { $code["RUSSE"] = "Russia"; $code["SAOUDIEN(NE)"] = "Saudi Arabia"; $code["SENEGALAIS(E)"] = "Senegal"; $code["SÉNÉGALAIS(E)"] = "Senegal"; $code["SALVADORIEN(NE)"] = "El Salvador"; $code["SERBE"] = "Serbia"; $code["SLOVAQUE"] = "Slovakia"; $code["SOUDANAIS(E)"] = "Sudan"; $code["SRI LANKAIS(E)"] = "Sri Lanka"; $code["SUD COREEN(NE)"] = "Korea, Republic of"; $code["SUEDOIS(E)"] = "Sweden"; $code["SUISSE"] = "Switzerland"; Loading @@ -598,9 +624,11 @@ function generateEffectifParPays($effectifsInscription, $start , $end) { $code["TCHADIEN(NE)"] = "Chad"; $code["TCHEQUE"] = "Czechia"; $code["THAILANDAIS(E)"] = "Thailand"; $code["THAÏLANDAIS(E)"] = "Thailand"; $code["TOGOLAIS(E)"] = "Togo"; $code["TUNISIEN(NE)"] = "Tunisia"; $code["TURC (TURQUE)"] = "Turkey"; $code["TURC(QUE)"] = "Turkey"; $code["UKRAINIEN(NE)"] = "Ukraine"; $code["EMIRATS ARABES UNIS"] = "United Arab Emirates"; $code["VENEZUELIEN(NE)"] = "Venezuela"; Loading Loading
module/Application/src/Application/Controller/StatistiqueController.php +19 −4 Changes for module/Application/src/Application/Controller/StatistiqueController.php: 19 added lines, 4 removed lines. Original line number Diff line number Diff line Loading @@ -28,7 +28,7 @@ class StatistiqueController extends AbstractController /** TODO prendre les non substitué **/ $ecoles = $this->getStructureService()->getAllStructuresAffichablesByType(TypeStructure::CODE_ECOLE_DOCTORALE, 'libelle'); $unites = $this->getStructureService()->getAllStructuresAffichablesByType(TypeStructure::CODE_UNITE_RECHERCHE, 'libelle'); $etablissements = $this->getEtablissementService()->getRepository()->findAllEtablissementsMembres(); $etablissements = $this->getEtablissementService()->getRepository()->findAllEtablissementsInscriptions(); /** * Certaines statistiques exploites le genre de la personne et nécessite de récupérer Loading @@ -46,6 +46,18 @@ class StatistiqueController extends AbstractController $structureType = $this->params()->fromQuery("structure_type"); $structureId = $this->params()->fromQuery("structure_id"); $structure = null; switch ($structureType) { case "ED" : $structure = $this->getEcoleDoctoraleService()->getRepository()->findOneBy(['id'=>$structureId]); break; case "UR" : $structure = $this->getUniteRechercheService()->getRepository()->findOneBy(['id'=>$structureId]); break; case "ETAB" : $structure = $this->getEtablissementService()->getRepository()->findOneBy(['id'=>$structureId]); break; } $qb = $this->decorateWithStructure($qb, $structureType, $structureId); $dateType = $this->params()->fromQuery("date_type"); Loading @@ -53,6 +65,7 @@ class StatistiqueController extends AbstractController $dateFin = $this->params()->fromQuery("date_max"); $qb = $this->decorateWithDate($qb, $dateType, $dateDebut, $dateFin); $theses = $qb->getQuery()->execute(); Loading @@ -62,7 +75,9 @@ class StatistiqueController extends AbstractController 'ecoles' => $ecoles, 'unites' => $unites, 'etablissements' => $etablissements, // 'structure_id' => $structureId, 'type' => $structureType, 'structure' => $structure, ]); } Loading @@ -84,8 +99,8 @@ class StatistiqueController extends AbstractController $unite = $this->getUniteRechercheService()->getRepository()->findOneBy(['id'=>$id]); return $qb->andWhere("t.uniteRecherche = :ur") ->setParameter(":ur", $unite); case "Etab" : $etablissement = $this->getEtablissementService()->getRepository()->find($id); case "ETAB" : $etablissement = $this->getEtablissementService()->getRepository()->findOneBy(['id'=>$id]); return $qb->andWhere("t.etablissement = :etab") ->setParameter("etab", $etablissement); } Loading
module/Application/view/application/statistique/index.phtml +28 Changes for module/Application/view/application/statistique/index.phtml: 28 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -8,11 +8,15 @@ use Application\Entity\Db\Etablissement; use Application\Entity\Db\Structure; /** * @see \Application\Controller\StatistiqueController::indexAction() * @var PhpRenderer $this * @var These[] $theses * @var EcoleDoctorale[] $ecoles * @var UniteRecherche[] $unites * @var Etablissement[] $etablissements * * @var string $type * @var Structure $structure */ Loading @@ -25,6 +29,12 @@ $this->headTitle($this->translate("Statistiques")); <h1 class="page-header first"><?php echo $this->translate("Statistiques") ?> <span class="badge"><?php echo count($theses) . " thèses"?></span></h1> <?php if ($type !== null) : ?> Sélection courante : [<?php echo $type; ?>] <?php echo ($structure)?$structure->getLibelle():"Pas de structure"; ?> <?php else : ?> Aucune sélection <?php endif; ?> <div id="selector"> <form id="selection" method="get" action=""> <h4>Type de structure : </h4> Loading Loading @@ -480,6 +490,7 @@ function generateEffectifParPays($effectifsInscription, $start , $end) { $code = []; $code["AFGHAN(E)"] = "Afghanistan"; $code["ALGERIEN(NE)"] = "Algeria"; $code["ALGÉRIEN(NE)"] = "Algeria"; $code["ALLEMAND(E)"] = "Germany"; $code["AMERICAIN(E)"] = "United States"; $code["ANDORRAN(NE)"] = "Andorra"; Loading @@ -495,12 +506,15 @@ function generateEffectifParPays($effectifsInscription, $start , $end) { $code["BELGE"] = "Belgium"; $code["BENGALI(E)"] = "Bengladesh"; $code["BENINOIS(E)"] = "Benin"; $code["BÉNINOIS(E)"] = "Benin"; $code["BOLIVIEN(NE)"] = "Bolivia"; $code["BOSNIAQUE"] = "Bosnia"; $code["BRESILIEN(NE)"] = "Brazil"; $code["BRÉSILIEN(NE)"] = "Brazil"; $code["BRITANNIQUE"] = "United Kingdom"; $code["BULGARE"] = "Bulgaria"; $code["BURKINABE"] = "Burkina Faso"; $code["BURKINABEEN(NE)"] = "Burkina Faso"; $code["BURUNDAIS(E)"] = "Burundi"; $code["CAMBODGIEN(NE)"] = "Combodia"; $code["CAMEROUNAIS(E)"] = "Cameroon"; Loading @@ -514,6 +528,7 @@ function generateEffectifParPays($effectifsInscription, $start , $end) { $code["COMORIEN(NE)"] = "Comoros"; $code["CONGOLAIS(E)"] = "Congo"; $code["COSTARICIEN(NE)"] = "Costa Rica"; $code["COSTARICAIN(E)"] = "Costa Rica"; $code["CROATE"] = "Croatia"; $code["CUBAIN(E)"] = "Cuba"; $code["DANOIS(E)"] = "Denmark"; Loading @@ -522,10 +537,13 @@ function generateEffectifParPays($effectifsInscription, $start , $end) { $code["EGYPTIEN(NE)"] = "Egypt"; $code["EL SALVADOR"] = "El Salvador"; $code["EL SALVADORIEN(NE)"] = "El Salvador"; $code["EMIRATIS(IE)"] = "United Arab Emirates"; $code["EQUATORIEN(NE)"] = "Equatorial Guinea"; $code["ESPAGNOL(E)"] = "Spain"; $code["ETRANGER"] = ""; $code["FINLANDAIS(E)"] = "Finland"; $code["FRANCAIS(E)"] = "France"; $code["FRANÇAIS(E)"] = "France"; $code["GABONAIS(E)"] = "Gabon"; $code["GEORGIEN(NE)"] = "Georgia"; $code["GHANEEN(NE)"] = "Ghana"; Loading @@ -536,6 +554,7 @@ function generateEffectifParPays($effectifsInscription, $start , $end) { $code["HONGROIS(E)"] = "Hungary"; $code["INDIEN(NE)"] = "India"; $code["INDONESIEN(NE)"] = "Indonesia"; $code["INDONÉSIEN(NE)"] = "Indonesia"; $code["IRAKIEN(NE)"] = "Iraq"; $code["IRANIEN(NE)"] = "Iran"; $code["IRLANDAIS(E)"] = "Ireland"; Loading @@ -546,6 +565,7 @@ function generateEffectifParPays($effectifsInscription, $start , $end) { $code["JAPONAIS(E)"] = "Japan"; $code["JORDANIEN(NE)"] = "Jordan"; $code["KAZAKH"] = "Kazakhstan"; $code["KAZAKH(E)"] = "Kazakhstan"; $code["KENYAN(NE)"] = "Kenya"; $code["KOWEITIEN(NE)"] = "Kuwait"; $code["LAOTIEN(NE)"] = "Laos"; Loading @@ -555,6 +575,8 @@ function generateEffectifParPays($effectifsInscription, $start , $end) { $code["LITHUANIEN(NE)"] = "Lithuania"; $code["LUXEMBOURGEOIS(E)"] = "Luxembourg"; $code["MALAIS(E)"] = "Malaysia"; $code["MALAISIEN(E)"] = "Malaysia"; $code["MALAISIEN(NE)"] = "Malaysia"; $code["MALAWIEN(NE)"] = "Malawi"; $code["MALGACHE"] = "Madagascar"; $code["MALIEN(NE)"] = "Mali"; Loading @@ -572,6 +594,7 @@ function generateEffectifParPays($effectifsInscription, $start , $end) { $code["NICARAGUAIS(E)"] = "Nicaragua"; $code["NIGERIEN(NE)"] = "Nigeria"; $code["NIGERIAN(E)"] = "Nigeria"; $code["NIGÉRIEN(NE)"] = "Nigeria"; $code["NORVEGIEN(NE)"] = "Norway"; $code["OUGANDAIS(E)"] = "Uganda"; $code["PAKISTANAIS(E)"] = "Pakistan"; Loading @@ -588,9 +611,12 @@ function generateEffectifParPays($effectifsInscription, $start , $end) { $code["RUSSE"] = "Russia"; $code["SAOUDIEN(NE)"] = "Saudi Arabia"; $code["SENEGALAIS(E)"] = "Senegal"; $code["SÉNÉGALAIS(E)"] = "Senegal"; $code["SALVADORIEN(NE)"] = "El Salvador"; $code["SERBE"] = "Serbia"; $code["SLOVAQUE"] = "Slovakia"; $code["SOUDANAIS(E)"] = "Sudan"; $code["SRI LANKAIS(E)"] = "Sri Lanka"; $code["SUD COREEN(NE)"] = "Korea, Republic of"; $code["SUEDOIS(E)"] = "Sweden"; $code["SUISSE"] = "Switzerland"; Loading @@ -598,9 +624,11 @@ function generateEffectifParPays($effectifsInscription, $start , $end) { $code["TCHADIEN(NE)"] = "Chad"; $code["TCHEQUE"] = "Czechia"; $code["THAILANDAIS(E)"] = "Thailand"; $code["THAÏLANDAIS(E)"] = "Thailand"; $code["TOGOLAIS(E)"] = "Togo"; $code["TUNISIEN(NE)"] = "Tunisia"; $code["TURC (TURQUE)"] = "Turkey"; $code["TURC(QUE)"] = "Turkey"; $code["UKRAINIEN(NE)"] = "Ukraine"; $code["EMIRATS ARABES UNIS"] = "United Arab Emirates"; $code["VENEZUELIEN(NE)"] = "Venezuela"; Loading