From ebf108e3541e9d2600a47951bebc96e4d2512d71 Mon Sep 17 00:00:00 2001 From: mckmonster Date: Fri, 19 Jul 2024 16:52:37 +0200 Subject: [PATCH] Add NoteManager --- actions/NotesAction.php | 36 +++---------------------- services/NoteManager.php | 58 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+), 33 deletions(-) create mode 100644 services/NoteManager.php diff --git a/actions/NotesAction.php b/actions/NotesAction.php index e32c2be..46b409e 100644 --- a/actions/NotesAction.php +++ b/actions/NotesAction.php @@ -3,8 +3,7 @@ namespace YesWiki\Meeo; use YesWiki\Core\YesWikiAction; -use YesWiki\Bazar\Service\EntryManager; -use YesWiki\Core\Service\UserManager; +use YesWiki\Meeo\Service\NoteManager; class NotesAction extends YesWikiAction { @@ -15,36 +14,7 @@ class NotesAction extends YesWikiAction public function run() { - $meeo_config = $this->params->get('meeo'); - $formId = $meeo_config['notesFormId']; - $eleveIdentifier = 'listefiche'.$meeo_config['elevesFormId'].'bf_eleve'; - $groupeEE = $meeo_config['groupeEE']; - - $entryManager = $this->getService(EntryManager::class); - $userManager = $this->getService(UserManager::class); - - if ( $userManager->isInGroup($groupeEE, admincheck: false) ) { - $eleves = $entryManager->search(['formsIds' => $meeo_config['elevesFormId']]); - $entries = $entryManager->search(['formsIds' => $formId]); - - include 'tools/meeo/libs/Bulletin.lib.php'; - - $bulletins = []; - foreach ( $eleves as $eleve) { - $bulletins[] = new Bulletin($this->wiki, $eleve, "Passerelle"); - } - // echo var_dump($eleves); - // echo var_dump($entries); - // echo var_dump($matieres); - return $this->render('@meeo/edu_notes.twig', [ - "bulletins" => $bulletins, - ]); - } else { - $entries = $entryManager->search(['formsIds' => $formId]); - - return $this->render('@meeo/eleve_notes.twig', [ - "bulletin" => $bulletin, - ]); - } + $noteManager = $this->getService(NoteManager::class); + $noteManager->viewBulletins(); } } diff --git a/services/NoteManager.php b/services/NoteManager.php new file mode 100644 index 0000000..542e627 --- /dev/null +++ b/services/NoteManager.php @@ -0,0 +1,58 @@ +wiki = $wiki; + $this->params = $params; + $this->entryManager = $entryManager; + $this->listManager = $listManager; + $this->userManager = $userManager; + } + + public function viewBulletins() { + $meeo_config = $this->params->get('meeo'); + $formId = $meeo_config['notesFormId']; + $eleveIdentifier = 'listefiche'.$meeo_config['elevesFormId'].'bf_eleve'; + $groupeEE = $meeo_config['groupeEE']; + + if ( $this->userManager->isInGroup($groupeEE, admincheck: false) ) { + $eleves = $this->entryManager->search(['formsIds' => $meeo_config['elevesFormId']]); + $entries = $this->entryManager->search(['formsIds' => $formId]); + + include 'tools/meeo/libs/Bulletin.lib.php'; + + $bulletins = []; + foreach ( $eleves as $eleve) { + $bulletins[] = new Bulletin($this->wiki, $eleve, "Passerelle"); + } + // echo var_dump($eleves); + // echo var_dump($entries); + // echo var_dump($matieres); + return $this->wiki->render('@meeo/edu_notes.twig', [ + "bulletins" => $bulletins, + ]); + } else { + $entries = $entryManager->search(['formsIds' => $formId]); + + return $this->wiki->render('@meeo/eleve_notes.twig', [ + "bulletin" => $bulletin, + ]); + } + } +} \ No newline at end of file