Loading module/Application/src/Application/Controller/Factory/FichierTheseControllerFactory.php +4 −0 Changes for module/Application/src/Application/Controller/Factory/FichierTheseControllerFactory.php: 4 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -4,6 +4,7 @@ namespace Application\Controller\Factory; use Application\Controller\FichierTheseController; use Application\Service\Fichier\FichierService; use Application\Service\Individu\IndividuService; use Application\Service\Notification\NotificationService; use Application\Service\These\TheseService; use Application\Service\VersionFichier\VersionFichierService; Loading @@ -24,17 +25,20 @@ class FichierTheseControllerFactory * @var FichierService $fichierService * @var VersionFichierService $versionFichierService * @var NotificationService $notificationService * @var IndividuService $individuService */ $theseService = $controllerManager->getServiceLocator()->get('TheseService'); $fichierService = $controllerManager->getServiceLocator()->get('FichierService'); $versionFichierService = $controllerManager->getServiceLocator()->get('VersionFichierService'); $notificationService = $controllerManager->getServiceLocator()->get('NotificationService'); $individuService = $controllerManager->getServiceLocator()->get('IndividuService'); $controller = new FichierTheseController(); $controller->setTheseService($theseService); $controller->setFichierService($fichierService); $controller->setVersionFichierService($versionFichierService); $controller->setNotificationService($notificationService); $controller->setIndividuService($individuService); return $controller; } Loading module/Application/src/Application/Controller/FichierTheseController.php +12 −6 Changes for module/Application/src/Application/Controller/FichierTheseController.php: 12 added lines, 6 removed lines. Original line number Diff line number Diff line Loading @@ -3,6 +3,7 @@ namespace Application\Controller; use Application\Entity\Db\Fichier; use Application\Entity\Db\Individu; use Application\Entity\Db\NatureFichier; use Application\Entity\Db\VersionFichier; use Application\Filter\IdifyFilterAwareTrait; Loading @@ -11,6 +12,7 @@ use Application\RouteMatch; use Application\Service\Fichier\Exception\DepotImpossibleException; use Application\Service\Fichier\Exception\ValidationImpossibleException; use Application\Service\Fichier\FichierServiceAwareTrait; use Application\Service\Individu\IndividuServiceAwareTrait; use Application\Service\Notification\NotificationServiceAwareTrait; use Application\Service\These\TheseServiceAwareTrait; use Application\Service\VersionFichier\VersionFichierServiceAwareTrait; Loading @@ -31,6 +33,7 @@ class FichierTheseController extends AbstractController use VersionFichierServiceAwareTrait; use IdifyFilterAwareTrait; use NotificationServiceAwareTrait; use IndividuServiceAwareTrait; const UPLOAD_MAX_FILESIZE = '500M'; Loading @@ -41,11 +44,16 @@ class FichierTheseController extends AbstractController */ $needsRedirect = false; $queryParams = $this->params()->fromQuery(); $data = $this->params()->fromPost('individu'); $version = $this->params()->fromQuery('version'); $recherche = $this->params()->fromQuery('texte'); $sort = $this->params()->fromQuery('sort'); $individuId = null; if (!empty($data['id'])) { $individuId = $data['id']; } if ($sort === null) { // null <=> paramètre absent // tri par défaut : datePremiereInscription $queryParams = array_merge($queryParams, ['sort' => 'f.nom', 'direction' => Sortable::ASC]); Loading Loading @@ -73,11 +81,9 @@ class FichierTheseController extends AbstractController $qb->andWhere('ver.code = :version') ->setParameter("version" , $version); } if (isset($recherche) && $recherche !== '') { // $qb->andWhere("i.prenom1 like :recherche OR i.nomUsuel like :recherche OR t.titre like :recherche OR f.nomOriginal like :recherche") ->setParameter("recherche", '%'.$recherche.'%'); if (isset($individuId) && $individuId !== '') { $qb->andWhere('i.id = :individuId') ->setParameter("individuId" , $individuId); } Loading module/Application/view/application/fichier-these/deposes.phtml +19 −0 Changes for module/Application/view/application/fichier-these/deposes.phtml: 19 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -12,6 +12,8 @@ use Application\Entity\Db\Fichier; use Application\Provider\Privilege\ThesePrivileges; use Application\View\Renderer\PhpRenderer; use Zend\Paginator\Paginator; use UnicaenApp\Form\Element\SearchAndSelect; ?> Loading @@ -28,6 +30,23 @@ use Zend\Paginator\Paginator; <div class="pull-left"> <?php echo $this->partial('partial/form-filtrage') ?> </div> <form method="post" action="<?php echo $url ?>"> <div class="pull-right"> <input type='submit' value='Filtrer' /> </div> <div class="pull-right"> <?php $sas = new SearchAndSelect('individu'); $sas->setLabel($this->translate("Filtrage selon un doctorant :")); $sas->setAttribute('class', 'individu-finder'); $sas->setAutocompleteSource($this->url('utilisateur/rechercher-individu',[],[],true)); echo $this->formControlGroup($sas, 'formSearchAndSelect'); ?> </div> </form> <!--<div class="pull-right">--> <!-- --><?php //echo $this->partial('partial/form-recherche', ['text' => $text]) ?> <!--</div>--> Loading Loading
module/Application/src/Application/Controller/Factory/FichierTheseControllerFactory.php +4 −0 Changes for module/Application/src/Application/Controller/Factory/FichierTheseControllerFactory.php: 4 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -4,6 +4,7 @@ namespace Application\Controller\Factory; use Application\Controller\FichierTheseController; use Application\Service\Fichier\FichierService; use Application\Service\Individu\IndividuService; use Application\Service\Notification\NotificationService; use Application\Service\These\TheseService; use Application\Service\VersionFichier\VersionFichierService; Loading @@ -24,17 +25,20 @@ class FichierTheseControllerFactory * @var FichierService $fichierService * @var VersionFichierService $versionFichierService * @var NotificationService $notificationService * @var IndividuService $individuService */ $theseService = $controllerManager->getServiceLocator()->get('TheseService'); $fichierService = $controllerManager->getServiceLocator()->get('FichierService'); $versionFichierService = $controllerManager->getServiceLocator()->get('VersionFichierService'); $notificationService = $controllerManager->getServiceLocator()->get('NotificationService'); $individuService = $controllerManager->getServiceLocator()->get('IndividuService'); $controller = new FichierTheseController(); $controller->setTheseService($theseService); $controller->setFichierService($fichierService); $controller->setVersionFichierService($versionFichierService); $controller->setNotificationService($notificationService); $controller->setIndividuService($individuService); return $controller; } Loading
module/Application/src/Application/Controller/FichierTheseController.php +12 −6 Changes for module/Application/src/Application/Controller/FichierTheseController.php: 12 added lines, 6 removed lines. Original line number Diff line number Diff line Loading @@ -3,6 +3,7 @@ namespace Application\Controller; use Application\Entity\Db\Fichier; use Application\Entity\Db\Individu; use Application\Entity\Db\NatureFichier; use Application\Entity\Db\VersionFichier; use Application\Filter\IdifyFilterAwareTrait; Loading @@ -11,6 +12,7 @@ use Application\RouteMatch; use Application\Service\Fichier\Exception\DepotImpossibleException; use Application\Service\Fichier\Exception\ValidationImpossibleException; use Application\Service\Fichier\FichierServiceAwareTrait; use Application\Service\Individu\IndividuServiceAwareTrait; use Application\Service\Notification\NotificationServiceAwareTrait; use Application\Service\These\TheseServiceAwareTrait; use Application\Service\VersionFichier\VersionFichierServiceAwareTrait; Loading @@ -31,6 +33,7 @@ class FichierTheseController extends AbstractController use VersionFichierServiceAwareTrait; use IdifyFilterAwareTrait; use NotificationServiceAwareTrait; use IndividuServiceAwareTrait; const UPLOAD_MAX_FILESIZE = '500M'; Loading @@ -41,11 +44,16 @@ class FichierTheseController extends AbstractController */ $needsRedirect = false; $queryParams = $this->params()->fromQuery(); $data = $this->params()->fromPost('individu'); $version = $this->params()->fromQuery('version'); $recherche = $this->params()->fromQuery('texte'); $sort = $this->params()->fromQuery('sort'); $individuId = null; if (!empty($data['id'])) { $individuId = $data['id']; } if ($sort === null) { // null <=> paramètre absent // tri par défaut : datePremiereInscription $queryParams = array_merge($queryParams, ['sort' => 'f.nom', 'direction' => Sortable::ASC]); Loading Loading @@ -73,11 +81,9 @@ class FichierTheseController extends AbstractController $qb->andWhere('ver.code = :version') ->setParameter("version" , $version); } if (isset($recherche) && $recherche !== '') { // $qb->andWhere("i.prenom1 like :recherche OR i.nomUsuel like :recherche OR t.titre like :recherche OR f.nomOriginal like :recherche") ->setParameter("recherche", '%'.$recherche.'%'); if (isset($individuId) && $individuId !== '') { $qb->andWhere('i.id = :individuId') ->setParameter("individuId" , $individuId); } Loading
module/Application/view/application/fichier-these/deposes.phtml +19 −0 Changes for module/Application/view/application/fichier-these/deposes.phtml: 19 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -12,6 +12,8 @@ use Application\Entity\Db\Fichier; use Application\Provider\Privilege\ThesePrivileges; use Application\View\Renderer\PhpRenderer; use Zend\Paginator\Paginator; use UnicaenApp\Form\Element\SearchAndSelect; ?> Loading @@ -28,6 +30,23 @@ use Zend\Paginator\Paginator; <div class="pull-left"> <?php echo $this->partial('partial/form-filtrage') ?> </div> <form method="post" action="<?php echo $url ?>"> <div class="pull-right"> <input type='submit' value='Filtrer' /> </div> <div class="pull-right"> <?php $sas = new SearchAndSelect('individu'); $sas->setLabel($this->translate("Filtrage selon un doctorant :")); $sas->setAttribute('class', 'individu-finder'); $sas->setAutocompleteSource($this->url('utilisateur/rechercher-individu',[],[],true)); echo $this->formControlGroup($sas, 'formSearchAndSelect'); ?> </div> </form> <!--<div class="pull-right">--> <!-- --><?php //echo $this->partial('partial/form-recherche', ['text' => $text]) ?> <!--</div>--> Loading