From 04273d0596ece471a44bd5e38e4e74231f36de4b Mon Sep 17 00:00:00 2001 From: root Date: Wed, 1 Jul 2020 15:45:29 +0200 Subject: [PATCH] nettoyage --- README.md | 3 + .../config/packages/doctrine_migrations.yaml | 6 +- src/nineskeletor-1.0/config/routes.yaml | 104 +--- src/nineskeletor-1.0/public/images/logo.png | Bin 4906 -> 14180 bytes .../src/Controller/ActivityController.php | 397 -------------- .../src/Controller/AnswerController.php | 283 ---------- .../src/Controller/DocumentController.php | 493 ------------------ .../src/Controller/HomeController.php | 14 +- .../src/Controller/MessageController.php | 268 ---------- .../src/Controller/SecurityController.php | 3 +- src/nineskeletor-1.0/src/Entity/Activity.php | 282 ---------- src/nineskeletor-1.0/src/Entity/Answer.php | 238 --------- src/nineskeletor-1.0/src/Entity/Document.php | 242 --------- src/nineskeletor-1.0/src/Entity/Group.php | 45 +- src/nineskeletor-1.0/src/Entity/Message.php | 156 ------ src/nineskeletor-1.0/src/Entity/User.php | 147 +----- .../src/Repository/ActivityRepository.php | 42 -- .../src/Repository/AnswerRepository.php | 15 - .../src/Repository/DocumentRepository.php | 15 - .../templates/Activity/edit.html.twig | 262 ---------- .../templates/Activity/list.html.twig | 125 ----- .../templates/Answer/edit.html.twig | 301 ----------- .../templates/Answer/list.html.twig | 104 ---- .../templates/Answer/view.html.twig | 304 ----------- .../templates/Cron/edit.html.twig | 59 --- .../templates/Cron/list.html.twig | 56 -- .../templates/Cron/logs.html.twig | 19 - .../templates/Crop/crop01.html.twig | 35 -- .../templates/Crop/crop02.html.twig | 71 --- .../templates/Document/close.html.twig | 8 - .../templates/Document/edit.html.twig | 52 -- .../templates/Document/record.html.twig | 302 ----------- .../templates/Document/render.html.twig | 18 - .../templates/Document/upload.html.twig | 52 -- .../templates/Document/view.html.twig | 55 -- .../templates/Form/fields.html.twig | 175 ------- .../templates/Group/edit.html.twig | 64 --- .../templates/Group/list.html.twig | 51 -- .../templates/Home/admin.html.twig | 7 - .../templates/Home/home.html.twig | 6 - .../templates/Home/login.html.twig | 36 -- .../templates/Home/mail.html.twig | 9 - .../templates/Message/close.html.twig | 8 - .../templates/Message/group.html.twig | 9 - .../templates/Message/message.html.twig | 95 ---- .../templates/User/edit.html.twig | 136 ----- .../templates/User/list.html.twig | 75 --- src/nineskeletor-1.0/templates/base.html.twig | 331 ------------ tmpl/nineskeletor.cron | 1 + 49 files changed, 26 insertions(+), 5553 deletions(-) delete mode 100755 src/nineskeletor-1.0/src/Controller/ActivityController.php delete mode 100755 src/nineskeletor-1.0/src/Controller/AnswerController.php delete mode 100755 src/nineskeletor-1.0/src/Controller/DocumentController.php delete mode 100755 src/nineskeletor-1.0/src/Controller/MessageController.php delete mode 100644 src/nineskeletor-1.0/src/Entity/Activity.php delete mode 100644 src/nineskeletor-1.0/src/Entity/Answer.php delete mode 100644 src/nineskeletor-1.0/src/Entity/Document.php delete mode 100644 src/nineskeletor-1.0/src/Entity/Message.php delete mode 100644 src/nineskeletor-1.0/src/Repository/ActivityRepository.php delete mode 100644 src/nineskeletor-1.0/src/Repository/AnswerRepository.php delete mode 100644 src/nineskeletor-1.0/src/Repository/DocumentRepository.php delete mode 100755 src/nineskeletor-1.0/templates/Activity/edit.html.twig delete mode 100644 src/nineskeletor-1.0/templates/Activity/list.html.twig delete mode 100755 src/nineskeletor-1.0/templates/Answer/edit.html.twig delete mode 100644 src/nineskeletor-1.0/templates/Answer/list.html.twig delete mode 100755 src/nineskeletor-1.0/templates/Answer/view.html.twig delete mode 100644 src/nineskeletor-1.0/templates/Cron/edit.html.twig delete mode 100644 src/nineskeletor-1.0/templates/Cron/list.html.twig delete mode 100644 src/nineskeletor-1.0/templates/Cron/logs.html.twig delete mode 100644 src/nineskeletor-1.0/templates/Crop/crop01.html.twig delete mode 100644 src/nineskeletor-1.0/templates/Crop/crop02.html.twig delete mode 100755 src/nineskeletor-1.0/templates/Document/close.html.twig delete mode 100755 src/nineskeletor-1.0/templates/Document/edit.html.twig delete mode 100644 src/nineskeletor-1.0/templates/Document/record.html.twig delete mode 100644 src/nineskeletor-1.0/templates/Document/render.html.twig delete mode 100644 src/nineskeletor-1.0/templates/Document/upload.html.twig delete mode 100644 src/nineskeletor-1.0/templates/Document/view.html.twig delete mode 100644 src/nineskeletor-1.0/templates/Form/fields.html.twig delete mode 100755 src/nineskeletor-1.0/templates/Group/edit.html.twig delete mode 100644 src/nineskeletor-1.0/templates/Group/list.html.twig delete mode 100644 src/nineskeletor-1.0/templates/Home/admin.html.twig delete mode 100644 src/nineskeletor-1.0/templates/Home/home.html.twig delete mode 100755 src/nineskeletor-1.0/templates/Home/login.html.twig delete mode 100644 src/nineskeletor-1.0/templates/Home/mail.html.twig delete mode 100755 src/nineskeletor-1.0/templates/Message/close.html.twig delete mode 100644 src/nineskeletor-1.0/templates/Message/group.html.twig delete mode 100644 src/nineskeletor-1.0/templates/Message/message.html.twig delete mode 100755 src/nineskeletor-1.0/templates/User/edit.html.twig delete mode 100644 src/nineskeletor-1.0/templates/User/list.html.twig delete mode 100644 src/nineskeletor-1.0/templates/base.html.twig create mode 100644 tmpl/nineskeletor.cron diff --git a/README.md b/README.md index 0036eb1..f6aeb7b 100644 --- a/README.md +++ b/README.md @@ -12,6 +12,8 @@ Puis effectuer les changement suivants - Renommer sso/filtres/nineskeletor.ini en sso/filtres/nineXXXX.ini - Renommer sso/filtres/nineskeletor_apps.ini en sso/filtres/nineXXXX_apps.ini - Modifier sso/filtres/nineXXXX_apps.ini et remplacer tout les nineskeletor en nineXXXX +- Renommer tmpl/nineskeletor.cron en tmpl/nineXXXX.cron +- Modifier tmpl/nineXXXX.cron et remplacer tout les nineskeletor en nineXXXX - Renommer tmpl/nineskeletor-apache.conf en tmpl/nineXXXX-apache.conf - Modifier tmpl/nineXXXX-apache.conf et remplacer tout les nineskeletor en nineXXXX - Renommer tmpl/nineskeletor-db.yml en tmpl/nineXXXX-db.yml @@ -21,6 +23,7 @@ Puis effectuer les changement suivants - Modifier src/webpack.config.js et remplacer tout les nineskeletor en nineXXXX - Renommer tmpl/nineskeletor-proxy.sh en tmpl/nineXXXX-proxy.sh - Modifier Makefile et remplacer tout les nineskeletor en nineXXXX +- Remplacer logo public/images/logo.png 2= Compilier les asset installer npm diff --git a/src/nineskeletor-1.0/config/packages/doctrine_migrations.yaml b/src/nineskeletor-1.0/config/packages/doctrine_migrations.yaml index 3bf0fbc..49c3517 100644 --- a/src/nineskeletor-1.0/config/packages/doctrine_migrations.yaml +++ b/src/nineskeletor-1.0/config/packages/doctrine_migrations.yaml @@ -1,5 +1,3 @@ doctrine_migrations: - dir_name: '%kernel.project_dir%/src/Migrations' - # namespace is arbitrary but should be different from App\Migrations - # as migrations classes should NOT be autoloaded - namespace: DoctrineMigrations + migrations_paths: + 'DoctrineMigrations': '%kernel.project_dir%/src/Migrations' \ No newline at end of file diff --git a/src/nineskeletor-1.0/config/routes.yaml b/src/nineskeletor-1.0/config/routes.yaml index 8299d64..b429c86 100644 --- a/src/nineskeletor-1.0/config/routes.yaml +++ b/src/nineskeletor-1.0/config/routes.yaml @@ -3,6 +3,10 @@ app_home: path: / defaults: { _controller: App\Controller\HomeController:home } +app_admin: + path: /admin/home + defaults: { _controller: App\Controller\HomeController:admin } + app_ckeditor_upload: path: /user/activity/upload defaults: { _controller: App\Controller\HomeController:upload } @@ -105,103 +109,3 @@ app_group_delete: app_group_select: path: /user/group/select defaults: { _controller: App\Controller\GroupController:select } - -#== Activity ======================================================================================================== -app_activity: - path: /user/activity - defaults: { _controller: App\Controller\ActivityController:list } - -app_activity_submit: - path: /master/activity/submit - defaults: { _controller: App\Controller\ActivityController:submit } - -app_activity_update: - path: /master/activity/update/{id} - defaults: { _controller: App\Controller\ActivityController:update } - -app_activity_delete: - path: /master/activity/delete/{id} - defaults: { _controller: App\Controller\ActivityController:delete } - -app_activity_archive: - path: /master/activity/archive/{id} - defaults: { _controller: App\Controller\ActivityController:archive } - -app_activity_activeactivity: - path: /user/activity/activeactivity - defaults: { _controller: App\Controller\ActivityController:activeactivity } - -#== Answer ======================================================================================================== -app_answer_update: - path: /user/answer/update/{id} - defaults: { _controller: App\Controller\AnswerController:update } - -app_answer_view: - path: /master/answer/view/{id} - defaults: { _controller: App\Controller\AnswerController:view } - -app_answer_select: - path: /master/answer/select - defaults: { _controller: App\Controller\AnswerController:select } - -#== Document ======================================================================================================== -app_document_upload: - path: /user/document/{entity}/{id}/upload - defaults: { _controller: App\Controller\DocumentController:upload } - -app_document_record: - path: /user/document/{entity}/{id}/record - defaults: { _controller: App\Controller\DocumentController:record } - -app_document_recordupload: - path: /user/document/{entity}/{id}/recordupload - defaults: { _controller: App\Controller\DocumentController:recordupload } - -app_document_listmaster: - path: /user/document/{entity}/{id}/listmaster - defaults: { _controller: App\Controller\DocumentController:list, master: true } - -app_document_listuser: - path: /user/document/{entity}/{id}/listuser - defaults: { _controller: App\Controller\DocumentController:list, master: false } - -app_document_view: - path: /user/document/{entity}/{id}/view - defaults: { _controller: App\Controller\DocumentController:view } - -app_document_show: - path: /user/document/{entity}/{id}/show - defaults: { _controller: App\Controller\DocumentController:show } - -app_document_update: - path: /user/document/{entity}/{id}/update - defaults: { _controller: App\Controller\DocumentController:update } - -app_document_delete: - path: /user/document/{entity}/{id}/delete - defaults: { _controller: App\Controller\DocumentController:delete } - -#== Message ======================================================================================================== -app_message_unread: - path: /user/message/unread - defaults: { _controller: App\Controller\MessageController:unread } - -app_message: - path: /user/message/{id} - defaults: { _controller: App\Controller\MessageController:message } - -app_message_load: - path: /user/message/{id}/load - defaults: { _controller: App\Controller\MessageController:load } - -app_message_delete: - path: /user/message/{id}/delete - defaults: { _controller: App\Controller\MessageController:delete } - -app_message_submit: - path: /user/message/{id}/submit - defaults: { _controller: App\Controller\MessageController:submit } - -app_message_group: - path: /master/message/{id}/group - defaults: { _controller: App\Controller\MessageController:messagegroup } diff --git a/src/nineskeletor-1.0/public/images/logo.png b/src/nineskeletor-1.0/public/images/logo.png index 7596de68dc8ab200557b86fb8ee18134fa2b9785..db76093055bcd4b7e2f9fb368d162216628c540c 100644 GIT binary patch literal 14180 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 diff --git a/src/nineskeletor-1.0/src/Controller/ActivityController.php b/src/nineskeletor-1.0/src/Controller/ActivityController.php deleted file mode 100755 index 06d9d24..0000000 --- a/src/nineskeletor-1.0/src/Controller/ActivityController.php +++ /dev/null @@ -1,397 +0,0 @@ -mail = $mail; } - - public function list(Request $request) - { - $em = $this->getDoctrine()->getManager(); - $user=$this->getUser(); - $activeactivity=$this->get('session')->get('activeactivity'); - - // View master - if ($user->hasRole('ROLE_ADMIN')||$user->hasRole('ROLE_MASTER')) { - $datas = $em->getRepository($this->entity)->findAllMasterActivityActive($user,$activeactivity); - - return $this->render($this->render.'list.html.twig',[ - $this->data."s" => $datas, - "useheader" => true, - "usesidebar" => ($this->getUser()->hasRole("ROLE_ADMIN")), - ]); - } - // View student - elseif($user->hasRole('ROLE_STUDENT')) { - $user=$this->getUser(); - - // Recherche de l'ensemble des activités distribuées des groupes de l'utilisateur - $datas=new ArrayCollection(); - foreach($user->getGroups() as $group) { - $activitys = $em->getRepository($this->entity)->findAllGroupActivityActive($group,$activeactivity); - - foreach($activitys as $activity) { - if($activeactivity&&$activity->getStatus()==10) continue; - if(!$activeactivity&&$activity->getStatus()<10) continue; - - - // Recherche d'une réponse pour l'utilistaeur - $answer=$em->getRepository("App:Answer")->findOneBy(["user"=>$user, "activity" => $activity]); - - // Si pas de réponse on initialise une réponse à vue - if(!$answer) { - $answer=new Answer(); - $answer->setStatus(0); - $answer->setUser($user); - $answer->setActivity($activity); - $em->persist($answer); - $em->flush(); - } - - // Si réponse non vu on la place en vu - if($answer->getStatus()==-1) { - $answer->setStatus(0); - $em->persist($answer); - $em->flush(); - - // Message - $message = new Message; - $message->setMessage("Vu"); - $message->setDeletable(false); - $message->setUser($user); - $message->setAnswer($answer); - $message->addReader($user); - $em->persist($message); - $em->flush(); - } - - $activity->setAnsweruser($answer); - $datas->add($activity); - } - } - return $this->render('Answer/list.html.twig',[ - $this->data."s" => $datas, - "useheader" => true, - "usesidebar" => ($this->getUser()->hasRole("ROLE_ADMIN")), - ]); - } - } - - public function submit(Request $request) - { - // Initialisation de l'enregistrement - $em = $this->getDoctrine()->getManager(); - $data = new Entity(); - $data->setStatus(0); - - // Création du formulaire - $form = $this->createForm(Form::class,$data,array("mode"=>"submit","status"=>$data->getStatus())); - - // Récupération des data du formulaire - $form->handleRequest($request); - - // Sur erreur - $this->getErrorForm(null,$form,$request,$data,"submit"); - - // Sur validation - if ($form->get('submit')->isClicked() && $form->isValid()) { - $data = $form->getData(); - $data->setUser($this->getUser()); - $em->persist($data); - $em->flush(); - - // Retour à la liste - return $this->redirectToRoute($this->route."_update",["id"=>$data->getId()]); - } - - // Affichage du formulaire - return $this->render($this->render.'edit.html.twig', [ - 'useheader' => true, - 'usesidebar' => ($this->getUser()->hasRole("ROLE_ADMIN")), - $this->data => $data, - 'mode' => 'submit', - 'form' => $form->createView() - ]); - } - - public function update($id,Request $request) - { - // Initialisation de l'enregistrement - $em = $this->getDoctrine()->getManager(); - $data=$em->getRepository($this->entity)->find($id); - - // Controle accès - if(!$data) - return $this->redirectToRoute($this->route); - else { - if(!$this->getUser()->Hasrole("ROLE_ADMIN")&&$this->getUser()!=$data->getUser()) - return $this->redirectToRoute($this->route); - } - - // Création du formulaire - $form = $this->createForm(Form::class,$data,array("mode"=>"update","status"=>$data->getStatus())); - - // Récupération des data du formulaire - $form->handleRequest($request); - - // Sur erreur - $this->getErrorForm(null,$form,$request,$data,"update"); - - $valid=false; - if($form->isSubmitted()&&$form->isValid()) { - if($form->get('submit')->isClicked()) - $valid=true; - - if ($form->has('distribution') && $form->get('distribution')->isClicked()) - $valid=true; - - if ($form->has('archiving') && $form->get('archiving')->isClicked()) - $valid=true; - } - - // Sur validation - if ($valid) { - $data = $form->getData(); - - // Distribution de l'activité - if ($form->has('distribution') && $form->get('distribution')->isClicked()) { - // Si réouverture - if($data->getStatus()==10) { - // Message - foreach($data->getAnswers() as $answer) { - $message=new Message; - $message->setMessage("Réouverture de l'Activité"); - $message->setDeletable(false); - $message->setUser($data->getUser()); - $message->setAnswer($answer); - $message->addReader($data->getUser()); - $em->persist($message); - $em->flush(); - - // Notification par mail de la distribution de l'activité - $to = $answer->getUser()->getEmail(); - $from = $data->getUser()->getEmail(); - $subject="Nineschool : Réouverture de l'activité"; - $body ="Activité = ".$data->getName()."
"; - $body.="Professeur = ".$data->getUser()->getDisplayname()."
"; - $body.="Matière = ".$data->getSubject()."
"; - $body.="Url = ".$this->generateUrl('app_answer_update', ["id"=>$answer->getId()], UrlGeneratorInterface::ABSOLUTE_URL); - - $this->mail->sendEmail($subject, $body, $to, $from); - } - } - - // Passage à distribuer - $data->setStatus(1); - } - - // Archivage de l'activité - if ($form->has('archiving') && $form->get('archiving')->isClicked()) { - $data->setStatus(10); - - // Message - foreach($data->getAnswers() as $answer) { - $message=new Message; - $message->setMessage("Archivage de l'Activité"); - $message->setDeletable(false); - $message->setUser($data->getUser()); - $message->setAnswer($answer); - $message->addReader($data->getUser()); - $message->addReader($answer->getUser()); - $em->persist($message); - $em->flush(); - - } - } - - $em->persist($data); - $em->flush(); - - // On initialise une réponse pour l'ensemble des élèves - if($data->getStatus()>0&&$data->getStatus()<10) - $this->initAnswer($data); - - // Retour à la liste - return $this->redirectToRoute($this->route); - } - - // Affichage du formulaire - return $this->render($this->render.'edit.html.twig', [ - 'useheader' => true, - 'usesidebar' => ($this->getUser()->hasRole("ROLE_ADMIN")), - $this->data => $data, - 'mode' => 'update', - 'form' => $form->createView() - ]); - } - - public function delete($id,Request $request) - { - // Initialisation de l'enregistrement - $em = $this->getDoctrine()->getManager(); - $data=$em->getRepository($this->entity)->find($id); - - // Controle accès - if(!$data) - return $this->redirectToRoute($this->route); - else { - if(!$this->getUser()->Hasrole("ROLE_ADMIN")&&$this->getUser()!=$data->getUser()) - return $this->redirectToRoute($this->route); - } - - // Controle avant suppression - $haveerror=false; - if($data->getStatus()!=0&&$data->getStatus()!=10) { - $request->getSession()->getFlashBag()->add("error", 'Cette activité a été distribué vous ne pouvez plus la supprimer'); - $haveerror=true; - } - - if($haveerror) { - return $this->redirectToRoute($this->route."_update",["id"=>$id]); - } - else { - $em->remove($data); - $em->flush(); - - // Retour à la liste - return $this->redirectToRoute($this->route); - } - } - - public function archive($id,Request $request) - { - // Initialisation de l'enregistrement - $em = $this->getDoctrine()->getManager(); - $data=$em->getRepository($this->entity)->find($id); - - // Controle accès - if(!$data) - return $this->redirectToRoute($this->route); - else { - if(!$this->getUser()->Hasrole("ROLE_ADMIN")&&$this->getUser()!=$data->getUser()) - return $this->redirectToRoute($this->route); - } - - // Message - foreach($data->getAnswers() as $answer) { - $message=new Message; - $message->setMessage("Archivage de l'Activité"); - $message->setDeletable(false); - $message->setUser($data->getUser()); - $message->setAnswer($answer); - $message->addReader($data->getUser()); - $message->addReader($answer->getUser()); - $em->persist($message); - $em->flush(); - } - - $data->setStatus(10); - $em->persist($data); - $em->flush(); - - // Retour à la liste - return $this->redirectToRoute($this->route); - } - - protected function initAnswer($activity) { - $em = $this->getDoctrine()->getManager(); - - // Pour chaque élève - $group=$activity->getGroup(); - foreach($group->getUsers() as $user) { - // Existe-t-il une réponse pour l'élève - if($user->hasRole("ROLE_STUDENT")) { - $answer=$em->getRepository("App:Answer")->findOneBy(["user"=>$user,"activity"=>$activity]); - if(!$answer) { - $answer=new Answer; - $answer->setActivity($activity); - $answer->setUser($user); - $answer->setStatus(-1); - - $em->persist($answer); - $em->flush(); - - // Message - $message=new Message; - $message->setMessage("Distribution de l'Activité"); - $message->setDeletable(false); - $message->setUser($activity->getUser()); - $message->setAnswer($answer); - $message->addReader($activity->getUser()); - - $em->persist($message); - $em->flush(); - - // Notification par mail de la distribution de l'activité - $to = $user->getEmail(); - $from = $activity->getUser()->getEmail(); - $subject="Nineschool : Nouvelle Activité à réaliser"; - $body ="Activité = ".$activity->getName()."
"; - $body.="Professeur = ".$activity->getUser()->getDisplayname()."
"; - $body.="Matière = ".$activity->getSubject()."
"; - $body.="Url = ".$this->generateUrl('app_answer_update', ["id"=>$answer->getId()], UrlGeneratorInterface::ABSOLUTE_URL); - - $this->mail->sendEmail($subject, $body, $to, $from); - } - } - } - } - - public function activeactivity() { - $this->get('session')->set('activeactivity',!$this->get('session')->get('activeactivity')); - return $this->redirectToRoute($this->route); - } - - protected function getErrorForm($id,$form,$request,$data,$mode) { - if ($form->get('submit')->isClicked()&&$mode=="delete") { - } - - if ($form->get('submit')->isClicked() && $mode=="submit") { - } - - if ($form->has('archiving') && $form->get('archiving')->isClicked()) { - // On s'assure que l'ensemble des réponses sont corrigés sinon message de conformation - $ok=true; - foreach($data->getAnswers() as $answer) { - if($answer->getStatus()!=15) { - $ok=false; - } - } - if(!$ok) { - $url=$this->generateUrl('app_activity_archive', ["id"=>$data->getId()]); - $form->addError(new FormError("L'ensemble des activités non pas été corrigées. Souhaitez-vous archiver l'activité malgré tout ?
Forcer l'Archivage")); - } - } - - if (($form->get('submit')->isClicked() || ($form->has('archiving') && $form->get('archiving')->isClicked()) ) && !$form->isValid()) { - $this->get('session')->getFlashBag()->clear(); - - $errors = $form->getErrors(); - foreach( $errors as $error ) { - $request->getSession()->getFlashBag()->add("error", $error->getMessage()); - } - } - } -} diff --git a/src/nineskeletor-1.0/src/Controller/AnswerController.php b/src/nineskeletor-1.0/src/Controller/AnswerController.php deleted file mode 100755 index 62e2d97..0000000 --- a/src/nineskeletor-1.0/src/Controller/AnswerController.php +++ /dev/null @@ -1,283 +0,0 @@ -mail = $mail; } - - public function update($id,Request $request) - { - // Initialisation de l'enregistrement - $em = $this->getDoctrine()->getManager(); - $data=$em->getRepository($this->entity)->find($id); - - // Controle accès - if(!$data) - return $this->redirectToRoute($this->route); - else { - if(!$this->getUser()->Hasrole("ROLE_ADMIN")&&$this->getUser()!=$data->getActivity()->getUser()&&$this->getUser()!=$data->getUser()) - return $this->redirectToRoute($this->route); - } - - // Passer la réponse en cours si l'utilisateur en cours est l'élève - if($this->getUser()==$data->getUser()&&$data->getStatus()==0) { - $data->setStatus(1); - $em->persist($data); - $em->flush(); - - // Message - $message = new Message; - $message->setMessage("En cours"); - $message->setDeletable(false); - $message->setUser($data->getUser()); - $message->setAnswer($data); - $message->addReader($data->getUser()); - $em->persist($message); - $em->flush(); - } - - // Création du formulaire - $form = $this->createForm(Form::class,$data,array("mode"=>"update","status"=>$data->getStatus(),"activitystatus"=>$data->getActivity()->getStatus())); - - // Récupération des data du formulaire - $form->handleRequest($request); - - // Sur erreur - $this->getErrorForm(null,$form,$request,$data,"update"); - - $valid=false; - if($form->isSubmitted()&&$form->isValid()) { - if($form->get('submit')->isClicked()) - $valid=true; - - if ($form->has('returned') && $form->get('returned')->isClicked()) - $valid=true; - } - - // Sur validation - if ($valid) { - $data = $form->getData(); - - // Retour de la réponse - if ($form->has('returned') && $form->get('returned')->isClicked()){ - $data->setStatus(10); - - // Message - $message=new Message; - $message->setMessage("Activité rendue"); - $message->setDeletable(false); - $message->setUser($data->getUser()); - $message->setAnswer($data); - $message->addReader($data->getUser()); - - $em->persist($message); - $em->flush(); - - // Notification par mail du rendu de l'activité - $to = $data->getActivity()->getUser()->getEmail(); - $from = $data->getUser()->getEmail(); - $subject="Nineschool : Activité rendue"; - $body ="Activité = ".$data->getActivity()->getName()."
"; - $body.="Elève = ".$data->getUser()->getDisplayname()."
"; - $body.="Matière = ".$data->getActivity()->getSubject()."
"; - $body.="Url = ".$this->generateUrl('app_answer_view', ["id"=>$data->getId()], UrlGeneratorInterface::ABSOLUTE_URL); - - $this->mail->sendEmail($subject, $body, $to, $from); - } - - - $em->persist($data); - $em->flush(); - - // Retour à la liste - return $this->redirectToRoute("app_activity"); - } - - // Affichage du formulaire - return $this->render($this->render.'edit.html.twig', [ - 'useheader' => true, - 'usesidebar' => ($this->getUser()->hasRole("ROLE_ADMIN")), - $this->data => $data, - 'mode' => 'update', - 'form' => $form->createView() - ]); - } - - public function view($id,Request $request) { - // Initialisation de l'enregistrement - $em = $this->getDoctrine()->getManager(); - $data=$em->getRepository($this->entity)->find($id); - - // Controle accès - if(!$data) - return $this->redirectToRoute($this->route); - else { - if(!$this->getUser()->Hasrole("ROLE_ADMIN")&&$this->getUser()!=$data->getActivity()->getUser()) - return $this->redirectToRoute($this->route); - } - - // Création du formulaire - $form = $this->createForm(Corrected::class,$data,array("mode"=>"update","status"=>$data->getStatus(),"activitystatus"=>$data->getActivity()->getStatus())); - - // Récupération des data du formulaire - $form->handleRequest($request); - - // Sur erreur - $this->getErrorForm(null,$form,$request,$data,"update"); - - $valid=false; - if($form->isSubmitted()&&$form->isValid()) { - if($form->get('submit')->isClicked()) - $valid=true; - - if ($form->has('corrected') && $form->get('corrected')->isClicked()) - $valid=true; - - if ($form->has('canceled') && $form->get('canceled')->isClicked()) - $valid=true; - } - - // Sur validation - if ($valid) { - $data = $form->getData(); - - // Retour de la réponse - if ($form->has('corrected') && $form->get('corrected')->isClicked()) { - $data->setStatus(15); - - // Message - $message=new Message; - $message->setMessage("Activité corrigée"); - $message->setDeletable(false); - $message->setUser($this->getUser()); - $message->setAnswer($data); - $message->addReader($this->getUser()); - - $em->persist($message); - $em->flush(); - - // Notification par mail de la correction de l'activité - $to = $data->getActivity()->getUser()->getEmail(); - $from = $data->getUser()->getEmail(); - $subject="Nineschool : Activité réouverte"; - $body ="Activité = ".$data->getActivity()->getName()."
"; - $body.="Professeur = ".$data->getActivity()->getUser()->getDisplayname()."
"; - $body.="Matière = ".$data->getActivity()->getSubject()."
"; - $body.="Url = ".$this->generateUrl('app_answer_update', ["id"=>$data->getId()], UrlGeneratorInterface::ABSOLUTE_URL); - - $this->mail->sendEmail($subject, $body, $to, $from); - } - - // Annuler le rendu de l'élève - if ($form->has('canceled') && $form->get('canceled')->isClicked()) { - $data->setStatus(2); - - // Message - $message=new Message; - $message->setMessage("Activité réouverte"); - $message->setDeletable(false); - $message->setUser($this->getUser()); - $message->setAnswer($data); - $message->addReader($this->getUser()); - - $em->persist($message); - $em->flush(); - - // Notification par mail de la réouverture de l'activité - $to = $data->getActivity()->getUser()->getEmail(); - $from = $data->getUser()->getEmail(); - $subject="Nineschool : Activité réouverte"; - $body ="Activité = ".$data->getActivity()->getName()."
"; - $body.="Professeur = ".$data->getActivity()->getUser()->getDisplayname()."
"; - $body.="Matière = ".$data->getActivity()->getSubject()."
"; - $body.="Url = ".$this->generateUrl('app_answer_update', ["id"=>$data->getId()], UrlGeneratorInterface::ABSOLUTE_URL); - - $this->mail->sendEmail($subject, $body, $to, $from); - } - - - $em->persist($data); - $em->flush(); - - // Retour à la liste - return $this->redirectToRoute("app_activity"); - } - - // Affichage du formulaire - return $this->render($this->render.'view.html.twig', [ - 'useheader' => true, - 'usesidebar' => ($this->getUser()->hasRole("ROLE_ADMIN")), - $this->data => $data, - 'mode' => 'update', - 'form' => $form->createView() - ]); - } - - public function select(Request $request) { - // S'assurer que c'est un appel ajax - if (!$request->isXmlHttpRequest()) { - return new JsonResponse(array('message' => 'Interdit'), 400); - } - - $output=array(); - $em = $this->getDoctrine()->getManager(); - $page_limit=$request->query->get('page_limit'); - $q=$request->query->get('q'); - $id=$request->query->get('activity'); - - $activity=$em->getRepository("App:Activity")->find($id); - if(!$activity) { - $response = new Response(json_encode($ret_string)); - $response->headers->set('Content-Type', 'application/json'); - return $response; - } - - $datas=$activity->getAnswers(); - foreach($datas as $data) { - array_push($output,array("id"=>$data->getId(),"text"=>$data->getDisplayname())); - } - - $ret_string["results"]=$output; - $response = new Response(json_encode($ret_string)); - $response->headers->set('Content-Type', 'application/json'); - return $response; - } - - protected function getErrorForm($id,$form,$request,$data,$mode) { - if ($form->get('submit')->isClicked()&&$mode=="delete") { - } - - if ($form->get('submit')->isClicked() && $mode=="submit") { - } - - if ($form->get('submit')->isClicked() && !$form->isValid()) { - $this->get('session')->getFlashBag()->clear(); - - $errors = $form->getErrors(); - foreach( $errors as $error ) { - $request->getSession()->getFlashBag()->add("error", $error->getMessage()); - } - } - } -} diff --git a/src/nineskeletor-1.0/src/Controller/DocumentController.php b/src/nineskeletor-1.0/src/Controller/DocumentController.php deleted file mode 100755 index 3893e0d..0000000 --- a/src/nineskeletor-1.0/src/Controller/DocumentController.php +++ /dev/null @@ -1,493 +0,0 @@ -ctrlAccessentity($entity,$id,"update")) return $this->redirectToRoute("app_activity"); - - // Rendu - return $this->render($this->render.'upload.html.twig',[ - 'useheader' => false, - 'usesidebar' => false, - 'entity' => $entity, - 'id' => $id, - ]); - } - - public function record($entity,$id) - { - // Controles d'accès en fonction de l'entité d'arrivé - if(!$this->ctrlAccessentity($entity,$id,"update")) return $this->redirectToRoute("app_activity"); - - // Rendu - return $this->render($this->render.'record.html.twig',[ - 'useheader' => false, - 'usesidebar' => false, - 'entity' => $entity, - 'id' => $id, - ]); - } - - public function recordupload($entity,$id,Request $request) - { - // Controles d'accès en fonction de l'entité d'arrivé - if(!$this->ctrlAccessentity($entity,$id,"update")) return $this->redirectToRoute("app_activity"); - - // Récupérper l'enregistrement - $content = $request->getContent(); - $name = $request->get('name'); - - // Destination - $directory = $this->getParameter('kernel.project_dir')."/uploads/document/".$entity."/".$id; - $filename = uniqid().".ogg"; - - // Ecrire sur le filesystem - $fs = new Filesystem(); - $fs->mkdir($directory); - $fp = fopen($directory."/".$filename, 'wb'); - fwrite($fp, $content); - fclose($fp); - - // Création du document - $em = $this->getDoctrine()->getManager(); - $document=new Entity(); - $document->setName($name); - $document->setFilename($filename); - $document->setRoworder(99999); - $document->setExtention("ogg"); - $document->setMinetype("video/webm"); - $document->setHavethumb(false); - $document->setEntity($entity); - - - // Rattacher le document à l'entity - switch($entity) { - case "activity": - $activity=$em->getRepository("App:Activity")->find($id); - $document->setActivity($activity); - break; - - case "corrected": - $corrected=$em->getRepository("App:Activity")->find($id); - $document->setCorrected($corrected); - break; - - case "answer": - $answer=$em->getRepository("App:Answer")->find($id); - $document->setAnswer($answer); - break; - - case "answercorrected": - $answer=$em->getRepository("App:Answer")->find($id); - $document->setAnswercorrected($answer); - break; - } - - // Sauvegarde - $em->persist($document); - $em->flush(); - - // Retour - return new Response(json_encode([])); - } - - public function list($entity,$id,$master) { - // Controles d'accès en fonction de l'entité d'arrivé - if(!$this->ctrlAccessentity($entity,$id,"view")) return $this->redirectToRoute("app_activity"); - - // Récupérer les documents - $em = $this->getDoctrine()->getManager(); - $documents=null; - switch($entity) { - case "activity": - $activity=$em->getRepository("App:Activity")->find($id); - if($activity) { - $documents=$em->getRepository("App:Document")->findBy(["activity"=>$activity]); - if($activity->getStatus()!=0) $master=false; - } - break; - - case "corrected": - $corrected=$em->getRepository("App:Activity")->find($id); - if($corrected) { - $documents=$em->getRepository("App:Document")->findBy(["corrected"=>$corrected]); - if($corrected->getStatus()==10) $master=false; - } - - break; - - case "answer": - $answer=$em->getRepository("App:Answer")->find($id); - if($answer) { - $documents=$em->getRepository("App:Document")->findBy(["answer"=>$answer]); - if($answer->getStatus()>=10) - $master=false; - if($answer->getActivity()->getStatus()==10) - $master=false; - } - break; - - case "answercorrected": - $answercorrected=$em->getRepository("App:Answer")->find($id); - if($answercorrected) { - $documents=$em->getRepository("App:Document")->findBy(["answercorrected"=>$answercorrected]); - if($answercorrected->getStatus()>=15) - $master=false; - if($answercorrected->getActivity()->getStatus()==10) - $master=false; - } - break; - } - - // Construire le tableau d'id - $output=[]; - - foreach($documents as $document) { - $tmp=[ - "id"=>$document->getId(), - "html"=>$this->thumb($document->getId(),$master), - ]; - - array_push($output,$tmp); - - } - - // Retour - return new Response(json_encode($output)); - } - - public function thumb($id,$master) - { - $em = $this->getDoctrine()->getManager(); - $data=$em->getRepository($this->entity)->find($id); - - $title=$data->getName(); - $filename=$data->getFilename(); - $description=$data->getDescription(); - $extention=$data->getExtention(); - $minetype=$data->getMinetype(); - $minefamily=explode("/",$minetype)[0]; - - switch($data->getEntity()) { - case "activity" : $identity=$data->getActivity()->getId(); break; - case "corrected" : $identity=$data->getCorrected()->getId(); break; - case "answer" : $identity=$data->getAnswer()->getId(); break; - case "answercorrected" : $identity=$data->getAnswercorrected()->getId(); break; - } - if($data->getHavethumb()) { - $directory = $this->getParameter('kernel.project_dir') . '/uploads/document/'.$data->getEntity()."/".$identity; - $dataimg = file_get_contents($directory."/thumb/".$filename); - $url="data:image/" . $extention . ";base64," . base64_encode($dataimg); - } - else { - $url="/".$this->getParameter("appAlias")."/images/files/".$extention.".png"; - } - - - return $this->renderView($this->render.'render.html.twig',[ - 'entity' => $data->getEntity(), - 'id' => $id, - 'title' => $title, - 'description' => $description, - 'url' => $url, - 'extention' => $extention, - 'minefamily' => $minefamily, - 'master' => $master, - ]); - } - - public function view($entity,$id) { - // Controles d'accès sur le document - if(!$this->ctrlAccessdocument($entity,$id,"view")) return $this->redirectToRoute("app_activity"); - - $em = $this->getDoctrine()->getManager(); - $data=$em->getRepository($this->entity)->find($id); - - switch($data->getEntity()) { - case "activity" : $identity=$data->getActivity()->getId(); break; - case "corrected" : $identity=$data->getCorrected()->getId(); break; - case "answer" : $identity=$data->getAnswer()->getId(); break; - case "answercorrected" : $identity=$data->getAnswercorrected()->getId(); break; - } - - $directory= $this->getParameter('kernel.project_dir') . '/uploads/document/'.$entity."/".$identity; - $url=$directory."/".$data->getFilename(); - $file = new file($url); - - $minetype=$file->getMimeType(); - $minefamily=explode("/",$minetype)[0]; - - if($minefamily=="text" || $minefamily=="image") { - $image=""; - if($minefamily=="image") { - $image = "data:image/" . $file->getExtension() . ";base64," . base64_encode(file_get_contents($url)); - } - - return $this->render($this->render.'view.html.twig',[ - 'useheader' => false, - 'usesidebar' => false, - 'entity' => $entity, - 'id' => $id, - 'minefamily' => $minefamily, - 'image' => $image - ]); - } - else { - $response = new BinaryFileResponse($file); - $response->setContentDisposition(ResponseHeaderBag::DISPOSITION_INLINE); - - return $response; - } - } - - public function show($entity,$id) { - // Controles d'accès sur le document - if(!$this->ctrlAccessdocument($entity,$id,"view")) return $this->redirectToRoute("app_activity"); - - $em = $this->getDoctrine()->getManager(); - $data=$em->getRepository($this->entity)->find($id); - - switch($data->getEntity()) { - case "activity" : $identity=$data->getActivity()->getId(); break; - case "corrected" : $identity=$data->getCorrected()->getId(); break; - case "answer" : $identity=$data->getAnswer()->getId(); break; - case "answercorrected" : $identity=$data->getAnswercorrected()->getId(); break; - } - - $directory= $this->getParameter('kernel.project_dir') . '/uploads/document/'.$entity."/".$identity; - $url=$directory."/".$data->getFilename(); - $file = new file($url); - - $response = new BinaryFileResponse($file); - //$response->setContentDisposition(ResponseHeaderBag::DISPOSITION_INLINE); - $name= ($data->getName()==$data->getFilename()?$data->getFilename():$data->getName().'.'.$data->getExtention()); - $response->setContentDisposition( - ResponseHeaderBag::DISPOSITION_ATTACHMENT, - $name - ); - - return $response; - } - - public function update($entity,$id,Request $request) - { - // Controles d'accès sur le document - if(!$this->ctrlAccessdocument($entity,$id,"update")) return $this->redirectToRoute("app_activity"); - - // Initialisation de l'enregistrement - $em = $this->getDoctrine()->getManager(); - $data=$em->getRepository($this->entity)->find($id); - - // Création du formulaire - $form = $this->createForm(Form::class,$data,array("mode"=>"update")); - - // Récupération des data du formulaire - $form->handleRequest($request); - - // Sur validation - if ($form->get('submit')->isClicked() && $form->isValid()) { - $data = $form->getData(); - $em->persist($data); - $em->flush(); - - return $this->render($this->render.'close.html.twig'); - } - - // Affichage du formulaire - return $this->render($this->render.'edit.html.twig', [ - 'useheader' => false, - 'usesidebar' => false, - $this->data => $data, - 'mode' => 'update', - 'form' => $form->createView(), - ]); - } - - public function delete($entity,$id,Request $request) - { - // Controles d'accès sur le document - if(!$this->ctrlAccessdocument($entity,$id,"update")) return $this->redirectToRoute("app_activity"); - - // Initialisation de l'enregistrement - $em = $this->getDoctrine()->getManager(); - $data=$em->getRepository($this->entity)->find($id); - - // Création du formulaire - $form = $this->createForm(Form::class,$data,array("mode"=>"update")); - - // Récupération des data du formulaire - $form->handleRequest($request); - - if($data) { - $em->remove($data); - $em->flush(); - - return $this->render($this->render.'close.html.twig'); - } - - // Affichage du formulaire - return $this->render($this->render.'edit.html.twig', [ - 'useheader' => false, - 'usesidebar' => false, - $this->data => $data, - 'mode' => 'update', - 'form' => $form->createView(), - ]); - } - - private function ctrlAccessentity($entity,$id,$mode) { - // Initialisation de l'enregistrement - $em = $this->getDoctrine()->getManager(); - - switch($entity) { - case "activity" : - $data=$em->getRepository("App:Activity")->find($id); - if(!$data) return false; - - $group=$data->getGroup(); - $user=$this->getUser(); - $isadmin=($user->Hasrole("ROLE_ADMIN")); - $ismaster=($user==$data->getUser()); - $ismember=($group->getUsers()->contains($this->getUser())); - - // Test visualisation = tout les membres du groupes peuvent voir l'énoncé - if(!$isadmin && !$ismaster && !$ismember) - return false; - - // Membre = Test visualisation activité que si activité non brouillon - if(!$isadmin && !$ismaster && $ismember) { - if($data->getStatus()==0) - return false; - } - - // Test modification = Impossible de modifier un document si activité non brouillon - if ($mode=="update" && ((!$isadmin && !$ismaster) || $data->getStatus()>0)) - return false; - break; - - case "corrected": - $data=$em->getRepository("App:Activity")->find($id); - if(!$data) return false; - - $group=$data->getGroup(); - $user=$this->getUser(); - $isadmin=($user->Hasrole("ROLE_ADMIN")); - $ismaster=($user==$data->getUser()); - $ismember=($group->getUsers()->contains($this->getUser())); - - // Test visualisation - if(!$isadmin && !$ismaster && !$ismember) - return false; - - // Membre = Visualisation uniquement si sa réponse est corrigée - if(!$isadmin && !$ismaster && $ismember) { - $answer=$em->getRepository("App:Answer")->findOneBy(["activity"=>$data,"user"=>$user]); - if(!$answer || $answer->getStatus()<15) - return false; - } - - // Test modification = Impossible de modifier un document si activité close - if ($mode=="update" && ((!$isadmin && !$ismaster) || $data->getStatus()==10)) - return false; - break; - - case "answer": - $data=$em->getRepository("App:Answer")->find($id); - if(!$data) return false; - - $user=$this->getUser(); - $isadmin=($user->Hasrole("ROLE_ADMIN")); - $ismaster=($user==$data->getActivity()->getUser()); - $isuser=($user==$data->getUser()); - - // Test visualisation - if(!$isadmin && !$ismaster && !$isuser) - return false; - - // Test modification = Impossible de modifier un document si réponse rendues ou activité non distribut - if ($mode=="update" && ((!$isadmin && !$isuser) || $data->getStatus()>=10 || $data->getActivity()->getStatus()!=1)) - return false; - break; - - case "answercorrected": - $data=$em->getRepository("App:Answer")->find($id); - if(!$data) return false; - - $user=$this->getUser(); - $isadmin=($user->Hasrole("ROLE_ADMIN")); - $ismaster=($user==$data->getActivity()->getUser()); - $isuser=($user==$data->getUser()); - - // Test visualisation - if(!$isadmin && !$ismaster && !$isuser) - return false; - - // Membre = Visualisation uniquement si sa réponse est rendu - if(!$isadmin && !$ismaster && $isuser) { - if($data->getStatus()<10) - return false; - } - - // Test modification = Impossible de modifier un document si réponse corrigées - if ($mode=="update" && ((!$isadmin && !$ismaster) || $data->getStatus()>=15 || $data->getActivity()->getStatus()!=1) ) - return false; - break; - } - - return true; - } - - private function ctrlAccessdocument($entity,$id,$mode) { - // Initialisation de l'enregistrement - $em = $this->getDoctrine()->getManager(); - - $document=$em->getRepository($this->entity)->find($id); - if(!$document) return false; - - switch($entity) { - case "activity" : - $data=$document->getActivity(); - return $this->ctrlAccessentity($entity,$data->getId(),$mode); - break; - - case "corrected": - $data=$document->getCorrected(); - return $this->ctrlAccessentity($entity,$data->getId(),$mode); - break; - - case "answer" : - $data=$document->getAnswer(); - return $this->ctrlAccessentity($entity,$data->getId(),$mode); - break; - - case "answercorrected" : - $data=$document->getAnswercorrected(); - return $this->ctrlAccessentity($entity,$data->getId(),$mode); - break; - } - - return true; - } - -} diff --git a/src/nineskeletor-1.0/src/Controller/HomeController.php b/src/nineskeletor-1.0/src/Controller/HomeController.php index c71ad54..f967d4f 100755 --- a/src/nineskeletor-1.0/src/Controller/HomeController.php +++ b/src/nineskeletor-1.0/src/Controller/HomeController.php @@ -11,14 +11,18 @@ class HomeController extends AbstractController { public function home() { - return $this->redirectToRoute("app_activity"); - - /* return $this->render('Home/home.html.twig',[ "useheader" => true, - "usesidebar" => ($this->getUser()?$this->getUser()->hasRole("ROLE_ADMIN"):false), + "usesidebar" => false, + ]); + } + + public function admin() + { + return $this->render('Home/admin.html.twig',[ + "useheader" => true, + "usesidebar" => true, ]); - */ } public function upload(Request $request,$access=null) { diff --git a/src/nineskeletor-1.0/src/Controller/MessageController.php b/src/nineskeletor-1.0/src/Controller/MessageController.php deleted file mode 100755 index 97d98ca..0000000 --- a/src/nineskeletor-1.0/src/Controller/MessageController.php +++ /dev/null @@ -1,268 +0,0 @@ -getDoctrine()->getManager(); - - // Création du formulaire - $data=new Entity; - $form = $this->createForm(Form::class,$data,array("mode"=>"submit")); - - // Récupération des data du formulaire - $form->handleRequest($request); - - - return $this->render('Message/message.html.twig',[ - 'id' => $id, - 'form' => $form->createView() - ]); - } - - public function messagegroup($id, Request $request) { - $em = $this->getDoctrine()->getManager(); - - // Création du formulaire - $activity=$em->getRepository("App:Activity")->find($id); - if(!$activity) return $this->redirectToRoute("app_activity"); - - // Formulaire - $form = $this->createForm(Activitymessage::class,$activity,array("mode"=>"submit","id"=>$activity->getId())); - - // Récupération des data du formulaire - $form->handleRequest($request); - - // Sur validation - if ($form->get('submit')->isClicked() && $form->isValid()) { - $data = $form->getData(); - $message = $form->get("message")->getData(); - - if($message) { - foreach($data->getAnswers() as $answer) { - $data=new Entity; - $data->setMessage($message); - $data->setUser($this->getUser()); - $data->addReader($this->getUser()); - $data->setDeletable(true); - $data->setAnswer($answer); - - $em->persist($data); - $em->flush(); - } - } - - // Fermeture de la popup - return $this->render($this->render.'close.html.twig'); - } - - return $this->render('Message/group.html.twig',[ - 'id' => $id, - 'activity' => $activity, - 'form' => $form->createView() - ]); - } - - public function load($id,Request $request) { - return new Response(json_encode($this->getMessages($id))); - } - - public function submit($id,Request $request) { - $em = $this->getDoctrine()->getManager(); - $answer=$em->getRepository("App:Answer")->find($id); - if(!$answer) { - $output=["return"=>"KO","error"=>"Utilisateur inconnu"]; - return new Response(json_encode($output)); - } - // Controler que l'on peut créer mesage sur la answer - - // Récupérer les datas envoyés en post - $html = $request->request->get('html'); - - // Création du message - $data = new Entity(); - $data->setUser($this->getUser()); - $data->setAnswer($answer); - $data->setMessage($html); - $data->setDeletable(true); - $em->persist($data); - $em->flush(); - - // Si on génère le message c'est qu'il est forcement lu - $data->addReader($this->getUser()); - - return new Response(json_encode($this->getMessages($id))); - } - - public function unread() { - $em = $this->getDoctrine()->getManager(); - $user=$this->getUser(); - $output=[]; - - // View master - if ($user->hasRole('ROLE_ADMIN')||$user->hasRole('ROLE_MASTER')) { - // Sur chaque activité de l'activité - $activitys = $em->getRepository("App:Activity")->findBy(["user"=>$user]); - foreach($activitys as $activity) { - // Sur chaque réponse de l'activité - $answers = $em->getRepository("App:Answer")->findBy(["activity"=>$activity]); - foreach($answers as $answer) { - // Statut de la réponse - switch($answer->getStatus()) { - case -1: $status = "non vu"; break; - case 0: $status = "vu"; break; - case 1: $status = "en cours"; break; - case 2: $status = "réouvert"; break; - case 10: $status = "rendu"; break; - case 15: $status = "corrigé"; break; - } - - // Initialisation du tableau des messages non lus - $tmp = [ - "id" => $answer->getId(), - "cpt" => 0, - "status" => $status - ]; - - // Sur chaque message de la réponse - $messages = $em->getRepository("App:Message")->findBy(["answer"=>$answer]); - foreach($messages as $message) { - $readers=$message->getReaders(); - if(!$readers->contains($user)) - $tmp["cpt"]=$tmp["cpt"]+1; - } - array_push($output,$tmp); - } - } - } - // View student - elseif($user->hasRole('ROLE_STUDENT')) { - $answers = $em->getRepository("App:Answer")->findBy(["user"=>$user]); - foreach($answers as $answer) { - // Statut de la réponse - switch($answer->getStatus()) { - case -1: $status = "non vu"; break; - case 0: $status = "vu"; break; - case 1: $status = "en cours"; break; - case 2: $status = "réouvert"; break; - case 10: $status = "rendu"; break; - case 15: $status = "corrigé"; break; - } - - // Initialisation du tableau des messages non lus - $tmp = [ - "id" => $answer->getId(), - "cpt" => 0, - "status" => $status - ]; - - // Sur chaque message de la réponse - $messages = $em->getRepository("App:Message")->findBy(["answer"=>$answer]); - foreach($messages as $message) { - $readers=$message->getReaders(); - if(!$readers->contains($user)) - $tmp["cpt"]=$tmp["cpt"]+1; - } - array_push($output,$tmp); - } - } - - return new Response(json_encode($output)); - } - - private function getMessages($id) { - $em = $this->getDoctrine()->getManager(); - - $datas=$em->getRepository($this->entity)->findBy(["answer"=>$id],["submitdate"=>"DESC"]); - - $return=[]; - foreach($datas as $data) { - $user=$this->getUser(); - $isadmin=($user->Hasrole("ROLE_ADMIN")); - $ismaster=($user==$data->getAnswer()->getActivity()->getUser()); - $isuser=($user==$data->getUser()); - - //Si le message est supprimable : seul le propriétaire peut supprimer - $deletable=$data->getDeletable(); - if($deletable) { - if(!$isadmin&&!$ismaster&&!$isuser) $deletable=false; - } - else{ - // Un admin peut tout supprimer - if($isadmin) $deletable=true; - } - - // Si on liste le message c'est qu'il est lu - $readers=$data->getReaders(); - if(!$readers->contains($user)) { - $data->addReader($user); - $em->persist($data); - $em->flush(); - } - - $tmp = [ - "id" => $data->getId(), - "message" => $data->getMessage(), - "submitdate" => $data->getSubmitdate()->format("d/m/Y H:i"), - "userdisplayname" => $data->getUser()->getDisplayname(), - "deletable" => $deletable - ]; - array_push($return,$tmp); - } - - return $return; - } - - public function delete($id) { - $em = $this->getDoctrine()->getManager(); - $data=$em->getRepository($this->entity)->find($id); - if(!$data) { - $output=["return"=>"KO","error"=>"Message non retrouvé"]; - return new Response(json_encode($output)); - } - - $user=$this->getUser(); - $isadmin=($user->Hasrole("ROLE_ADMIN")); - $ismaster=($user==$data->getAnswer()->getActivity()->getUser()); - $isuser=($user==$data->getUser()); - - //Si le message est supprimable : seul le propriétaire peut supprimer - $deletable=$data->getDeletable(); - if($deletable) { - if(!$isadmin&&!$ismaster&&!$isuser) $deletable=false; - } - else{ - // Un admin peut tout supprimer - if($isadmin) $deletable=true; - } - - if(!$deletable) { - $output=["return"=>"KO","error"=>"Message non supprimable"]; - return new Response(json_encode($output)); - } - - $em->remove($data); - $em->flush(); - - return new Response(json_encode([])); - } -} diff --git a/src/nineskeletor-1.0/src/Controller/SecurityController.php b/src/nineskeletor-1.0/src/Controller/SecurityController.php index a2a197b..0861cd7 100755 --- a/src/nineskeletor-1.0/src/Controller/SecurityController.php +++ b/src/nineskeletor-1.0/src/Controller/SecurityController.php @@ -158,7 +158,8 @@ class SecurityController extends AbstractController $this->get('session')->invalidate(); // Init Client CAS - \phpCAS::setDebug('/var/www/html/schedule/var/log/cas.log'); + $alias=$this->getParameter('appAlias'); + \phpCAS::setDebug('/var/www/html/'.$alias.'/var/log/cas.log'); \phpCAS::client(CAS_VERSION_2_0, $this->getParameter('casHost'), intval($this->getParameter('casPort')), is_null($this->getParameter('casPath')) ? '' : $this->getParameter('casPath'), false); \phpCAS::setNoCasServerValidation(); diff --git a/src/nineskeletor-1.0/src/Entity/Activity.php b/src/nineskeletor-1.0/src/Entity/Activity.php deleted file mode 100644 index b53ec25..0000000 --- a/src/nineskeletor-1.0/src/Entity/Activity.php +++ /dev/null @@ -1,282 +0,0 @@ -answeruser; - } - public function setAnsweruser(?Answer $answer): self - { - $this->answeruser = $answer; - - return $this; - } - - public function __construct() - { - $this->activitydocuments = new ArrayCollection(); - $this->correcteddocuments = new ArrayCollection(); - $this->answers = new ArrayCollection(); - } - - public function getId(): ?int - { - return $this->id; - } - - public function getName(): ?string - { - return $this->name; - } - - public function setName(string $name): self - { - $this->name = $name; - - return $this; - } - - public function getSubject(): ?string - { - return $this->subject; - } - - public function setSubject(?string $subject): self - { - $this->subject = $subject; - - return $this; - } - - public function getStatus(): ?int - { - return $this->status; - } - - public function setStatus(int $status): self - { - $this->status = $status; - - return $this; - } - - public function getActivity(): ?string - { - return $this->activity; - } - - public function setActivity(?string $activity): self - { - $this->activity = $activity; - - return $this; - } - - public function getCorrected(): ?string - { - return $this->corrected; - } - - public function setCorrected(?string $corrected): self - { - $this->corrected = $corrected; - - return $this; - } - - public function getUser(): ?User - { - return $this->user; - } - - public function setUser(?User $user): self - { - $this->user = $user; - - return $this; - } - - public function getGroup(): ?Group - { - return $this->group; - } - - public function setGroup(?Group $group): self - { - $this->group = $group; - - return $this; - } - - /** - * @return Collection|Document[] - */ - public function getActivitydocuments(): Collection - { - return $this->activitydocuments; - } - - public function addActivitydocument(Document $activitydocument): self - { - if (!$this->activitydocuments->contains($activitydocument)) { - $this->activitydocuments[] = $activitydocument; - $activitydocument->setActivity($this); - } - - return $this; - } - - public function removeActivitydocument(Document $activitydocument): self - { - if ($this->activitydocuments->contains($activitydocument)) { - $this->activitydocuments->removeElement($activitydocument); - // set the owning side to null (unless already changed) - if ($activitydocument->getActivity() === $this) { - $activitydocument->setActivity(null); - } - } - - return $this; - } - - /** - * @return Collection|Document[] - */ - public function getCorrecteddocuments(): Collection - { - return $this->correcteddocuments; - } - - public function addCorrecteddocument(Document $correcteddocument): self - { - if (!$this->correcteddocuments->contains($correcteddocument)) { - $this->correcteddocuments[] = $correcteddocument; - $correcteddocument->setCorrected($this); - } - - return $this; - } - - public function removeCorrecteddocument(Document $correcteddocument): self - { - if ($this->correcteddocuments->contains($correcteddocument)) { - $this->correcteddocuments->removeElement($correcteddocument); - // set the owning side to null (unless already changed) - if ($correcteddocument->getCorrected() === $this) { - $correcteddocument->setCorrected(null); - } - } - - return $this; - } - - /** - * @return Collection|Answer[] - */ - public function getAnswers(): Collection - { - return $this->answers; - } - - public function addAnswer(Answer $answer): self - { - if (!$this->answers->contains($answer)) { - $this->answers[] = $answer; - $answer->setActivity($this); - } - - return $this; - } - - public function removeAnswer(Answer $answer): self - { - if ($this->answers->contains($answer)) { - $this->answers->removeElement($answer); - // set the owning side to null (unless already changed) - if ($answer->getActivity() === $this) { - $answer->setActivity(null); - } - } - - return $this; - } - - - -} \ No newline at end of file diff --git a/src/nineskeletor-1.0/src/Entity/Answer.php b/src/nineskeletor-1.0/src/Entity/Answer.php deleted file mode 100644 index baaa7e2..0000000 --- a/src/nineskeletor-1.0/src/Entity/Answer.php +++ /dev/null @@ -1,238 +0,0 @@ -user->getDisplayname(); - } - - public function __construct() - { - $this->answerdocuments = new ArrayCollection(); - $this->answercorrecteddocuments = new ArrayCollection(); - $this->messages = new ArrayCollection(); - } - - public function getId(): ?int - { - return $this->id; - } - - public function getStatus(): ?int - { - return $this->status; - } - - public function setStatus(int $status): self - { - $this->status = $status; - - return $this; - } - - public function getAnswer(): ?string - { - return $this->answer; - } - - public function setAnswer(?string $answer): self - { - $this->answer = $answer; - - return $this; - } - - public function getAnswercorrected(): ?string - { - return $this->answercorrected; - } - - public function setAnswercorrected(?string $answercorrected): self - { - $this->answercorrected = $answercorrected; - - return $this; - } - - public function getUser(): ?User - { - return $this->user; - } - - public function setUser(?User $user): self - { - $this->user = $user; - - return $this; - } - - /** - * @return Collection|Document[] - */ - public function getAnswerdocuments(): Collection - { - return $this->answerdocuments; - } - - public function addAnswerdocument(Document $answerdocument): self - { - if (!$this->answerdocuments->contains($answerdocument)) { - $this->answerdocuments[] = $answerdocument; - $answerdocument->setAnswer($this); - } - - return $this; - } - - public function removeAnswerdocument(Document $answerdocument): self - { - if ($this->answerdocuments->contains($answerdocument)) { - $this->answerdocuments->removeElement($answerdocument); - // set the owning side to null (unless already changed) - if ($answerdocument->getAnswer() === $this) { - $answerdocument->setAnswer(null); - } - } - - return $this; - } - - /** - * @return Collection|Document[] - */ - public function getAnswercorrecteddocuments(): Collection - { - return $this->answercorrecteddocuments; - } - - public function addAnswercorrecteddocument(Document $answercorrecteddocument): self - { - if (!$this->answercorrecteddocuments->contains($answercorrecteddocument)) { - $this->answercorrecteddocuments[] = $answercorrecteddocument; - $answercorrecteddocument->setAnswercorrected($this); - } - - return $this; - } - - public function removeAnswercorrecteddocument(Document $answercorrecteddocument): self - { - if ($this->answercorrecteddocuments->contains($answercorrecteddocument)) { - $this->answercorrecteddocuments->removeElement($answercorrecteddocument); - // set the owning side to null (unless already changed) - if ($answercorrecteddocument->getAnswercorrected() === $this) { - $answercorrecteddocument->setAnswercorrected(null); - } - } - - return $this; - } - - public function getActivity(): ?Activity - { - return $this->activity; - } - - public function setActivity(?Activity $activity): self - { - $this->activity = $activity; - - return $this; - } - - /** - * @return Collection|Message[] - */ - public function getMessages(): Collection - { - return $this->messages; - } - - public function addMessage(Message $message): self - { - if (!$this->messages->contains($message)) { - $this->messages[] = $message; - $message->setAnswer($this); - } - - return $this; - } - - public function removeMessage(Message $message): self - { - if ($this->messages->contains($message)) { - $this->messages->removeElement($message); - // set the owning side to null (unless already changed) - if ($message->getAnswer() === $this) { - $message->setAnswer(null); - } - } - - return $this; - } - - - -} \ No newline at end of file diff --git a/src/nineskeletor-1.0/src/Entity/Document.php b/src/nineskeletor-1.0/src/Entity/Document.php deleted file mode 100644 index f630c4b..0000000 --- a/src/nineskeletor-1.0/src/Entity/Document.php +++ /dev/null @@ -1,242 +0,0 @@ -id; - } - - public function getName(): ?string - { - return $this->name; - } - - public function setName(string $name): self - { - $this->name = $name; - - return $this; - } - - public function getFilename(): ?string - { - return $this->filename; - } - - public function setFilename(string $filename): self - { - $this->filename = $filename; - - return $this; - } - - public function getDescription(): ?string - { - return $this->description; - } - - public function setDescription(?string $description): self - { - $this->description = $description; - - return $this; - } - - public function getEntity(): ?string - { - return $this->entity; - } - - public function setEntity(string $entity): self - { - $this->entity = $entity; - - return $this; - } - - public function getRoworder(): ?int - { - return $this->roworder; - } - - public function setRoworder(int $roworder): self - { - $this->roworder = $roworder; - - return $this; - } - - public function getExtention(): ?string - { - return $this->extention; - } - - public function setExtention(string $extention): self - { - $this->extention = $extention; - - return $this; - } - - public function getMinetype(): ?string - { - return $this->minetype; - } - - public function setMinetype(string $minetype): self - { - $this->minetype = $minetype; - - return $this; - } - - public function getHavethumb(): ?bool - { - return $this->havethumb; - } - - public function setHavethumb(bool $havethumb): self - { - $this->havethumb = $havethumb; - - return $this; - } - - public function getActivity(): ?Activity - { - return $this->activity; - } - - public function setActivity(?Activity $activity): self - { - $this->activity = $activity; - - return $this; - } - - public function getCorrected(): ?Activity - { - return $this->corrected; - } - - public function setCorrected(?Activity $corrected): self - { - $this->corrected = $corrected; - - return $this; - } - - public function getAnswer(): ?Answer - { - return $this->answer; - } - - public function setAnswer(?Answer $answer): self - { - $this->answer = $answer; - - return $this; - } - - public function getAnswercorrected(): ?Answer - { - return $this->answercorrected; - } - - public function setAnswercorrected(?Answer $answercorrected): self - { - $this->answercorrected = $answercorrected; - - return $this; - } - - -} \ No newline at end of file diff --git a/src/nineskeletor-1.0/src/Entity/Group.php b/src/nineskeletor-1.0/src/Entity/Group.php index fb8aaa6..9fd0973 100644 --- a/src/nineskeletor-1.0/src/Entity/Group.php +++ b/src/nineskeletor-1.0/src/Entity/Group.php @@ -6,12 +6,14 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; use Doctrine\ORM\Mapping as ORM; use Symfony\Component\Validator\Constraints as Assert; +use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity; /** * Group - * - * @ORM\Table(name="groupe") + * * @ORM\Entity(repositoryClass="App\Repository\GroupRepository") + * @ORM\Table(name="groupe",uniqueConstraints={@ORM\UniqueConstraint(name="name", columns={"name"})})) + * @UniqueEntity("name", message="Ce nom de groupe existe dèja") */ class Group { @@ -38,15 +40,9 @@ class Group */ protected $users; - /** - * @ORM\OneToMany(targetEntity="Activity", mappedBy="group", cascade={"persist"}, orphanRemoval=true) - */ - private $activitys; - public function __construct() { $this->users = new ArrayCollection(); - $this->activitys = new ArrayCollection(); } public function getId(): ?int @@ -106,37 +102,4 @@ class Group return $this; } - /** - * @return Collection|Activity[] - */ - public function getActivitys(): Collection - { - return $this->activitys; - } - - public function addActivity(Activity $activity): self - { - if (!$this->activitys->contains($activity)) { - $this->activitys[] = $activity; - $activity->setGroup($this); - } - - return $this; - } - - public function removeActivity(Activity $activity): self - { - if ($this->activitys->contains($activity)) { - $this->activitys->removeElement($activity); - // set the owning side to null (unless already changed) - if ($activity->getGroup() === $this) { - $activity->setGroup(null); - } - } - - return $this; - } - - - } \ No newline at end of file diff --git a/src/nineskeletor-1.0/src/Entity/Message.php b/src/nineskeletor-1.0/src/Entity/Message.php deleted file mode 100644 index 1a0577f..0000000 --- a/src/nineskeletor-1.0/src/Entity/Message.php +++ /dev/null @@ -1,156 +0,0 @@ -submitdate = new \DateTime(); - $this->readers = new ArrayCollection(); - } - - public function getId(): ?int - { - return $this->id; - } - - public function getMessage(): ?string - { - return $this->message; - } - - public function setMessage(string $message): self - { - $this->message = $message; - - return $this; - } - - public function getSubmitdate(): ?\DateTimeInterface - { - return $this->submitdate; - } - - public function setSubmitdate(\DateTimeInterface $submitdate): self - { - $this->submitdate = $submitdate; - - return $this; - } - - public function getDeletable(): ?bool - { - return $this->deletable; - } - - public function setDeletable(bool $deletable): self - { - $this->deletable = $deletable; - - return $this; - } - - public function getAnswer(): ?Answer - { - return $this->answer; - } - - public function setAnswer(?Answer $answer): self - { - $this->answer = $answer; - - return $this; - } - - public function getUser(): ?User - { - return $this->user; - } - - public function setUser(?User $user): self - { - $this->user = $user; - - return $this; - } - - /** - * @return Collection|User[] - */ - public function getReaders(): Collection - { - return $this->readers; - } - - public function addReader(User $reader): self - { - if (!$this->readers->contains($reader)) { - $this->readers[] = $reader; - } - - return $this; - } - - public function removeReader(User $reader): self - { - if ($this->readers->contains($reader)) { - $this->readers->removeElement($reader); - } - - return $this; - } - -} diff --git a/src/nineskeletor-1.0/src/Entity/User.php b/src/nineskeletor-1.0/src/Entity/User.php index 2cac5ca..623feed 100644 --- a/src/nineskeletor-1.0/src/Entity/User.php +++ b/src/nineskeletor-1.0/src/Entity/User.php @@ -13,7 +13,7 @@ use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity; * User * * @ORM\Entity(repositoryClass="App\Repository\UserRepository") - * @ORM\Table(name="user",indexes={@ORM\Index(name="username", columns={"username"})}) + * @ORM\Table(name="user",uniqueConstraints={@ORM\UniqueConstraint(name="username", columns={"username"})}) * @UniqueEntity("username", message="Ce nom d'utilisateur existe dèja") */ @@ -90,34 +90,10 @@ class User implements UserInterface, \Serializable */ private $groups; - /** - * @ORM\OneToMany(targetEntity="Activity", mappedBy="user", cascade={"persist"}, orphanRemoval=true) - */ - private $activitys; - - /** - * @ORM\OneToMany(targetEntity="Answer", mappedBy="user", cascade={"persist"}, orphanRemoval=true) - */ - private $answers; - - /** - * @ORM\OneToMany(targetEntity="Message", mappedBy="user", cascade={"persist"}, orphanRemoval=true) - */ - private $messages; - - /** - * @ORM\ManyToMany(targetEntity="Message", mappedBy="readers") - */ - protected $messagereaders; public function __construct() { $this->groups = new ArrayCollection(); - $this->activitys = new ArrayCollection(); - $this->anwsers = new ArrayCollection(); - $this->answers = new ArrayCollection(); - $this->messages = new ArrayCollection(); - $this->messagereaders = new ArrayCollection(); } public function getUsername(): ?string @@ -310,125 +286,4 @@ class User implements UserInterface, \Serializable return $this; } - /** - * @return Collection|Activity[] - */ - public function getActivitys(): Collection - { - return $this->activitys; - } - - public function addActivity(Activity $activity): self - { - if (!$this->activitys->contains($activity)) { - $this->activitys[] = $activity; - $activity->setUser($this); - } - - return $this; - } - - public function removeActivity(Activity $activity): self - { - if ($this->activitys->contains($activity)) { - $this->activitys->removeElement($activity); - // set the owning side to null (unless already changed) - if ($activity->getUser() === $this) { - $activity->setUser(null); - } - } - - return $this; - } - - /** - * @return Collection|Answer[] - */ - public function getAnswers(): Collection - { - return $this->answers; - } - - public function addAnswer(Answer $answer): self - { - if (!$this->answers->contains($answer)) { - $this->answers[] = $answer; - $answer->setUser($this); - } - - return $this; - } - - public function removeAnswer(Answer $answer): self - { - if ($this->answers->contains($answer)) { - $this->answers->removeElement($answer); - // set the owning side to null (unless already changed) - if ($answer->getUser() === $this) { - $answer->setUser(null); - } - } - - return $this; - } - - /** - * @return Collection|Message[] - */ - public function getMessages(): Collection - { - return $this->messages; - } - - public function addMessage(Message $message): self - { - if (!$this->messages->contains($message)) { - $this->messages[] = $message; - $message->setUser($this); - } - - return $this; - } - - public function removeMessage(Message $message): self - { - if ($this->messages->contains($message)) { - $this->messages->removeElement($message); - // set the owning side to null (unless already changed) - if ($message->getUser() === $this) { - $message->setUser(null); - } - } - - return $this; - } - - /** - * @return Collection|Message[] - */ - public function getMessagereaders(): Collection - { - return $this->messagereaders; - } - - public function addMessagereader(Message $messagereader): self - { - if (!$this->messagereaders->contains($messagereader)) { - $this->messagereaders[] = $messagereader; - $messagereader->addReader($this); - } - - return $this; - } - - public function removeMessagereader(Message $messagereader): self - { - if ($this->messagereaders->contains($messagereader)) { - $this->messagereaders->removeElement($messagereader); - $messagereader->removeReader($this); - } - - return $this; - } - } diff --git a/src/nineskeletor-1.0/src/Repository/ActivityRepository.php b/src/nineskeletor-1.0/src/Repository/ActivityRepository.php deleted file mode 100644 index 11afe54..0000000 --- a/src/nineskeletor-1.0/src/Repository/ActivityRepository.php +++ /dev/null @@ -1,42 +0,0 @@ -createQueryBuilder('activity') - ->Where('activity.user=:user') - ->setParameter('user',$user); - - if($activeactivity) - $qb->andWhere('activity.status<10'); - else - $qb->andWhere('activity.status=10'); - - return $qb->getQuery()->getResult(); - } - - public function findAllGroupActivityActive($group,$activeactivity) { - $qb = $this->createQueryBuilder('activity') - ->Where('activity.group=:group') - ->setParameter('group',$group); - - if($activeactivity) - $qb->andWhere('activity.status=1'); - else - $qb->andWhere('activity.status=10'); - - return $qb->getQuery()->getResult(); - } - -} diff --git a/src/nineskeletor-1.0/src/Repository/AnswerRepository.php b/src/nineskeletor-1.0/src/Repository/AnswerRepository.php deleted file mode 100644 index 16d7f1a..0000000 --- a/src/nineskeletor-1.0/src/Repository/AnswerRepository.php +++ /dev/null @@ -1,15 +0,0 @@ - - {% if mode=="update" %} - Modification ACTIVITE - {% elseif mode=="submit" %} - Création ACTIVITE - {% endif %} - - - {{ form_widget(form.submit) }} - - Annuler - - {% if mode=="update" %} - {% if activity.status==0 or activity.status==10%} - - Supprimer - - {% else %} - {{ form_widget(form.archiving) }} - {% endif %} - - {% if form.distribution is defined %} - {{ form_widget(form.distribution) }} - {% endif %} - - {% endif %} - -

- - {% if app.session.flashbag.has('error') %} -
- Erreur
- {% for flashMessage in app.session.flashbag.get('error') %} - {{ flashMessage | raw }}
- {% endfor %} -
- {% endif %} - - {% if app.session.flashbag.has('notice') %} -
- Information
- {% for flashMessage in app.session.flashbag.get('notice') %} - {{ flashMessage }}
- {% endfor %} -
- {% endif %} - -

Entête

-
-
-
-
- Informations -
- -
- {{ form_row(form.name) }} - {{ form_row(form.subject) }} - {{ form_row(form.group) }} -
-
-
-
- -
-

Enoncés

-
-
- {% if mode == "submit" %} -
-
- Pièces Jointes -
- -
- Vous pourrez rattacher des pièces jointes une fois l'activité créée. -
-
- {% else %} -
-
- Pièces Jointes - {% if activity.status == 0 %} - - - {% endif %} -
- -
-
-
- - {% endif %} - -
- -
-
-
- Description -
- -
- {{ form_widget(form.activity) }} -
-
-
-
- - -
-

Corrigés

-
-
- {% if mode == "submit" %} -
-
- Pièces Jointes -
- -
- Vous pourrez rattacher des pièces jointes une fois l'activité créée. -
-
- {% else %} -
-
- Pièces Jointes - {% if activity.status < 10 %} - - - {% endif %} -
- -
-
-
- - {% endif %} - -
- -
-
-
- Description -
- -
- {{ form_widget(form.corrected) }} -
-
-
-
- -{{ form_end(form) }} - - -{% endblock %} - -{% block localjavascript %} - $(document).ready(function() { - loadDocument(); - $("#activity_name").focus(); - }); - - {% if mode != "submit" %} - function myupload(entity) { - url='{{ path('app_document_upload',{'entity': 'xxxxx', 'id':activity.id }) }}'; - url=url.replace('xxxxx',entity); - ModalLoad('mymodal','Pièces Jointes',url); - } - - function myrecord(entity) { - url='{{ path('app_document_record',{'entity': 'xxxxx', 'id':activity.id }) }}'; - url=url.replace('xxxxx',entity); - ModalLoad('mymodal','Enregistrement',url); - } - - function myviewer(entity,id) { - url='{{ path('app_document_view',{'entity': 'yyyyy', 'id':'xxxxx' }) }}'; - url=url.replace('xxxxx',id); - url=url.replace('yyyyy',entity); - - ModalLoad('mymodal','Pièce Jointe',url); - } - - function mydownload(entity,id) { - url='{{ path('app_document_show',{'entity': 'yyyyy', 'id':'xxxxx' }) }}'; - url=url.replace('xxxxx',id); - url=url.replace('yyyyy',entity); - - document.location=url; - } - - function myedit(entity,id) { - url='{{ path('app_document_update',{'entity': 'yyyyy', 'id':'xxxxx' }) }}'; - url=url.replace('xxxxx',id); - url=url.replace('yyyyy',entity); - - ModalLoad('mymodal','Pièce Jointe',url); - } - - $('#mymodal').on('hidden.bs.modal', function (e) { - loadDocument(); - }); - - - - function loadDocument() { - // Sur fermeture de la modal on recharge les PJ - $.ajax({ - type: "POST", - url: "{{ path('app_document_listmaster',{entity:'activity',id:activity.id}) }}", - success: function (response) { - response=JSON.parse(response); - if(response.return=="KO") { - alert(response.error); - } - else { - // On vide le conteneur document - $("#activitydocuments").empty(); - - // On reconstruit la liste - for (doc of response) { - $("#activitydocuments").append(doc.html); - } - } - } - }); - - // Sur fermeture de la modal on recharge les PJ - $.ajax({ - type: "POST", - url: "{{ path('app_document_listmaster',{entity:'corrected',id:activity.id}) }}", - success: function (response) { - response=JSON.parse(response); - if(response.return=="KO") { - alert(response.error); - } - else { - // On vide le conteneur document - $("#correcteddocuments").empty(); - - // On reconstruit la liste - for (doc of response) { - $("#correcteddocuments").append(doc.html); - } - } - } - }); - } - {%endif%} - -{% endblock %} diff --git a/src/nineskeletor-1.0/templates/Activity/list.html.twig b/src/nineskeletor-1.0/templates/Activity/list.html.twig deleted file mode 100644 index 2785f37..0000000 --- a/src/nineskeletor-1.0/templates/Activity/list.html.twig +++ /dev/null @@ -1,125 +0,0 @@ -{% extends "base.html.twig" %} - -{% block body %} -

-ACTIVITES -

- -

Ajouter

- -
-
- Liste des Activités -
- - -
-
- -
-
- - - - - - - - - - - - {% for activity in activitys %} - - - - - - - - {% endfor %} - -
ActionNomStatutGroupeElèves
- - - {{activity.name}} - {% if activity.status == 0 %} - brouillon - {% elseif activity.status == 1 %} - distribué - {% else %} - clos - {% endif %} - {{activity.group.name}} - {% set answerusers = [] %} - - {% for answer in activity.answers %} - {% set answerusers = answerusers|merge([answer.user.id]) %} - - 0 - {{ answer.user.displayname }} = - - -
- {% endfor %} - - {% if activity.status > 0 %} - {% for user in activity.group.users %} - {% if user.id not in answerusers and "ROLE_STUDENT" in user.roles %} - 0{{ user.displayname }} = non vu
- {% endif %} - {% endfor %} - {% endif %} -
-
-
-
-{% endblock %} - -{% block localjavascript %} - $(document).ready(function() { - $('#dataTables').DataTable({ - columnDefs: [ { "targets": "no-sort", "orderable": false }, { "targets": "no-string", "type" : "num" } ], - responsive: true, - iDisplayLength: 100, - order: [[ 1, "asc" ]] - }); - - myloadMessage(); - }); - - function myloadMessage() { - $.ajax({ - type: "POST", - url: "{{ path("app_message_unread") }}", - success: function (response) { - response=JSON.parse(response); - if(response.return=="KO") { - alert(response.error); - } - else { - $(".badge").removeClass("badge-danger").removeClass("badge-success").addClass("badge-success"); - - for (answer of response) { - $("#badge"+answer.id).html(answer.cpt); - if(answer.cpt>0) $("#badge"+answer.id).removeClass("badge-success").addClass("badge-danger"); - $("#status"+answer.id).html(answer.status); - } - } - } - }); - } - - function mymessage(id) { - url='{{ path('app_message_group',{'id':'xxxxx' }) }}'; - url=url.replace('xxxxx',id); - - ModalLoad('mymodal','Message aux Elèves',url); - } - - $('#switchactive').change(function() { - window.location="{{ path('app_activity_activeactivity' )}}"; - }); - - window.setInterval(myloadMessage, 5000); -{% endblock %} \ No newline at end of file diff --git a/src/nineskeletor-1.0/templates/Answer/edit.html.twig b/src/nineskeletor-1.0/templates/Answer/edit.html.twig deleted file mode 100755 index d05f8dc..0000000 --- a/src/nineskeletor-1.0/templates/Answer/edit.html.twig +++ /dev/null @@ -1,301 +0,0 @@ -{% extends 'base.html.twig' %} - -{% block body %} -{{ form_start(form) }} -
-
-

- ACTIVITE = {{ answer.activity.name }} -

- - {{ form_widget(form.submit) }} - - Annuler - - {% if mode=="update" %} - {% if answer.status<10 and answer.activity.status==1%} - {{ form_widget(form.returned) }} - {% endif %} - {% endif %} - -

- - {% if app.session.flashbag.has('error') %} -
- Erreur
- {% for flashMessage in app.session.flashbag.get('error') %} - {{ flashMessage }}
- {% endfor %} -
- {% endif %} - - {% if app.session.flashbag.has('notice') %} -
- Information
- {% for flashMessage in app.session.flashbag.get('notice') %} - {{ flashMessage }}
- {% endfor %} -
- {% endif %} - - {% if answer.status == 15 %} -
-
-

Corrigé

-
-
-
-
- Appréciation -
- -
- {{ answer.answercorrected | raw }} -
-
- - {% if answer.activity.corrected %} -
-
-
- Corrigé -
- -
- {{ answer.activity.corrected | raw }} -
-
- {% endif %} -
- -
-
-
- Pièces Jointes de l'Appréciation -
- -
-
-
- - {% if answer.activity.correcteddocuments %} -
-
-
- Pièces Jointes de la Correction -
- -
-
-
- {% endif %} -
-
-
- {% endif %} - -
-
-

Enoncés

-
-
- Informations -
- -
- Titre = {{ answer.activity.name}}
- Matière = {{ answer.activity.subject}}
- -
- {{ answer.activity.activity|raw}} -
-
- -
-
-
- Pièces Jointes -
- -
-
-
- -
- -
-

Activité

-
-
- Description -
- -
- {{ form_widget(form.answer) }} -
-
- -
-
-
- Pièces Jointes - {% if answer.status < 10 and answer.activity.status == 1 %} - - - {% endif %} -
- -
-
-
-
-
-
- -
-

Messages

- {{ render_esi(controller('App\\Controller\\MessageController::message', { 'id': answer.id })) }} -
-
-{{ form_end(form) }} - - -{% endblock %} - -{% block localjavascript %} - $(document).ready(function() { - loadDocument(); - $("#anwser_anwser").focus(); - }); - - {% if mode != "submit" %} - function myupload(entity) { - url='{{ path('app_document_upload',{'entity': 'xxxxx', 'id':answer.id }) }}'; - url=url.replace('xxxxx',entity); - ModalLoad('mymodal','Pièces Jointes',url); - } - - function myrecord(entity) { - url='{{ path('app_document_record',{'entity': 'xxxxx', 'id':answer.id }) }}'; - url=url.replace('xxxxx',entity); - ModalLoad('mymodal','Enregistrement',url); - } - - function myviewer(entity,id) { - url='{{ path('app_document_view',{'entity': 'yyyyy', 'id':'xxxxx' }) }}'; - url=url.replace('xxxxx',id); - url=url.replace('yyyyy',entity); - - ModalLoad('mymodal','Pièce Jointe',url); - } - - function mydownload(entity,id) { - url='{{ path('app_document_show',{'entity': 'yyyyy', 'id':'xxxxx' }) }}'; - url=url.replace('xxxxx',id); - url=url.replace('yyyyy',entity); - - document.location=url; - } - - function myedit(entity,id) { - url='{{ path('app_document_update',{'entity': 'yyyyy', 'id':'xxxxx' }) }}'; - url=url.replace('xxxxx',id); - url=url.replace('yyyyy',entity); - - ModalLoad('mymodal','Pièce Jointe',url); - } - - $('#mymodal').on('hidden.bs.modal', function (e) { - loadDocument(); - }); - - - - function loadDocument() { - // Sur fermeture de la modal on recharge les PJ - $.ajax({ - type: "POST", - url: "{{ path('app_document_listuser',{entity:'activity',id:answer.activity.id}) }}", - success: function (response) { - response=JSON.parse(response); - if(response.return=="KO") { - alert(response.error); - } - else { - // On vide le conteneur document - $("#activitydocuments").empty(); - - // On reconstruit la liste - for (doc of response) { - $("#activitydocuments").append(doc.html); - } - } - } - }); - - $.ajax({ - type: "POST", - url: "{{ path('app_document_listmaster',{entity:'answer',id:answer.id}) }}", - success: function (response) { - response=JSON.parse(response); - if(response.return=="KO") { - alert(response.error); - } - else { - // On vide le conteneur document - $("#answerdocuments").empty(); - - // On reconstruit la liste - for (doc of response) { - $("#answerdocuments").append(doc.html); - } - } - } - }); - - // Sur fermeture de la modal on recharge les PJ - $.ajax({ - type: "POST", - url: "{{ path('app_document_listuser',{entity:'corrected',id:answer.activity.id}) }}", - success: function (response) { - response=JSON.parse(response); - if(response.return=="KO") { - alert(response.error); - } - else { - // On vide le conteneur document - $("#correcteddocuments").empty(); - - // On reconstruit la liste - for (doc of response) { - $("#correcteddocuments").append(doc.html); - } - } - } - }); - - // Sur fermeture de la modal on recharge les PJ - $.ajax({ - type: "POST", - url: "{{ path('app_document_listuser',{entity:'answercorrected',id:answer.id}) }}", - success: function (response) { - response=JSON.parse(response); - if(response.return=="KO") { - alert(response.error); - } - else { - // On vide le conteneur document - $("#answercorrecteddocuments").empty(); - - // On reconstruit la liste - for (doc of response) { - $("#answercorrecteddocuments").append(doc.html); - } - } - } - }); - - } - {%endif%} - -{% endblock %} diff --git a/src/nineskeletor-1.0/templates/Answer/list.html.twig b/src/nineskeletor-1.0/templates/Answer/list.html.twig deleted file mode 100644 index 6120c76..0000000 --- a/src/nineskeletor-1.0/templates/Answer/list.html.twig +++ /dev/null @@ -1,104 +0,0 @@ -{% extends "base.html.twig" %} - -{% block body %} -

-ACTIVITES -

- -
-
- Liste des Activités -
- - -
-
- -
-
- - - - - - - - - - - - - {% for activity in activitys %} - - - - - - - - - {% endfor %} - -
ActionNomProfesseurMatièreStatut
- - 0{{activity.name}}{{activity.user.displayname}}{{activity.subject}} - - {% if activity.answeruser.status == 0 %} - vu - {% elseif activity.answeruser.status == 1 %} - en cours - {% elseif activity.answeruser.status == 2 %} - réouvert - {% elseif activity.answeruser.status == 10 %} - rendu - {% elseif activity.answeruser.status == 15 %} - corrigé - {% endif %} - -
-
-
-
-{% endblock %} - -{% block localjavascript %} - $(document).ready(function() { - $('#dataTables').DataTable({ - columnDefs: [ { "targets": "no-sort", "orderable": false }, { "targets": "no-string", "type" : "num" } ], - responsive: true, - iDisplayLength: 100, - order: [[ 1, "asc" ]] - }); - - myloadMessage(); - }); - - function myloadMessage() { - $.ajax({ - type: "POST", - url: "{{ path("app_message_unread") }}", - success: function (response) { - response=JSON.parse(response); - if(response.return=="KO") { - alert(response.error); - } - else { - $(".badge").removeClass("badge-danger").removeClass("badge-success").addClass("badge-success"); - - for (answer of response) { - $("#badge"+answer.id).html(answer.cpt); - if(answer.cpt>0) $("#badge"+answer.id).removeClass("badge-success").addClass("badge-danger"); - $("#status"+answer.id).html(answer.status); - } - } - } - }); - } - - $('#switchactive').change(function() { - window.location="{{ path('app_activity_activeactivity' )}}"; - }); - - window.setInterval(myloadMessage, 5000); - -{% endblock %} \ No newline at end of file diff --git a/src/nineskeletor-1.0/templates/Answer/view.html.twig b/src/nineskeletor-1.0/templates/Answer/view.html.twig deleted file mode 100755 index b0f8809..0000000 --- a/src/nineskeletor-1.0/templates/Answer/view.html.twig +++ /dev/null @@ -1,304 +0,0 @@ -{% extends 'base.html.twig' %} - -{% block body %} -{{ form_start(form) }} -
-
-

- ACTIVITE = {{ answer.activity.name }} = {{ answer.user.displayname }} -

- - {{ form_widget(form.submit) }} - - Annuler - - {% if mode=="update" %} - {% if answer.status>=10 and answer.status<15 and answer.activity.status==1 %} - {{ form_widget(form.corrected) }} - {{ form_widget(form.canceled) }} - {% endif %} - {% endif %} - -

- - {% if app.session.flashbag.has('error') %} -
- Erreur
- {% for flashMessage in app.session.flashbag.get('error') %} - {{ flashMessage }}
- {% endfor %} -
- {% endif %} - - {% if app.session.flashbag.has('notice') %} -
- Information
- {% for flashMessage in app.session.flashbag.get('notice') %} - {{ flashMessage }}
- {% endfor %} -
- {% endif %} - - {% if form.answercorrected is defined %} -
-
-

Corrigé

-
-
-
-
- Appréciation -
- -
- {{ form_widget(form.answercorrected) }} -
-
- - {% if answer.activity.corrected %} -
-
-
- Corrigé -
- -
- {{ answer.activity.corrected | raw }} -
-
- {% endif %} -
- -
-
-
- Pièces Jointes de l'Appréciation - {% if answer.status>=10 and answer.status<15 and answer.activity.status==1 %} - - - {% endif %} -
- -
-
-
- - {% if answer.activity.correcteddocuments %} -
-
-
- Pièces Jointes de la Correction -
- -
-
-
- {% endif %} -
-
-
- {% endif %} - -
-
-

Enoncés

-
-
- Informations -
- -
- Titre = {{ answer.activity.name}}
- {% if answer.activity.subject %} - Matière = {{ answer.activity.subject}}
- {% endif %} - -
- {{ answer.activity.activity|raw}} -
-
- -
-
-
- Pièces Jointes -
- -
-
-
- -
- -
-

Activité

-
-
- Description -
- -
- {{ answer.answer|raw}} -
-
- -
-
-
- Pièces Jointes -
- -
-
-
-
-
-
- -
-

Messages

- {{ render_esi(controller('App\\Controller\\MessageController::message', { 'id': answer.id })) }} -
-
-{{ form_end(form) }} - - -{% endblock %} - -{% block localjavascript %} - $(document).ready(function() { - loadDocument(); - $("#anwser_anwser").focus(); - }); - - {% if mode != "submit" %} - function myupload(entity) { - url='{{ path('app_document_upload',{'entity': 'xxxxx', 'id':answer.id }) }}'; - url=url.replace('xxxxx',entity); - ModalLoad('mymodal','Pièces Jointes',url); - } - - function myrecord(entity) { - url='{{ path('app_document_record',{'entity': 'xxxxx', 'id':answer.id }) }}'; - url=url.replace('xxxxx',entity); - ModalLoad('mymodal','Enregistrement',url); - } - - function myviewer(entity,id) { - url='{{ path('app_document_view',{'entity': 'yyyyy', 'id':'xxxxx' }) }}'; - url=url.replace('xxxxx',id); - url=url.replace('yyyyy',entity); - - ModalLoad('mymodal','Pièce Jointe',url); - } - - function mydownload(entity,id) { - url='{{ path('app_document_show',{'entity': 'yyyyy', 'id':'xxxxx' }) }}'; - url=url.replace('xxxxx',id); - url=url.replace('yyyyy',entity); - - document.location=url; - } - - function myedit(entity,id) { - url='{{ path('app_document_update',{'entity': 'yyyyy', 'id':'xxxxx' }) }}'; - url=url.replace('xxxxx',id); - url=url.replace('yyyyy',entity); - - ModalLoad('mymodal','Pièce Jointe',url); - } - - $('#mymodal').on('hidden.bs.modal', function (e) { - loadDocument(); - }); - - - - function loadDocument() { - // Sur fermeture de la modal on recharge les PJ - $.ajax({ - type: "POST", - url: "{{ path('app_document_listuser',{entity:'activity',id:answer.activity.id}) }}", - success: function (response) { - response=JSON.parse(response); - if(response.return=="KO") { - alert(response.error); - } - else { - // On vide le conteneur document - $("#activitydocuments").empty(); - - // On reconstruit la liste - for (doc of response) { - $("#activitydocuments").append(doc.html); - } - } - } - }); - - $.ajax({ - type: "POST", - url: "{{ path('app_document_listuser',{entity:'answer',id:answer.id}) }}", - success: function (response) { - response=JSON.parse(response); - if(response.return=="KO") { - alert(response.error); - } - else { - // On vide le conteneur document - $("#answerdocuments").empty(); - - // On reconstruit la liste - for (doc of response) { - $("#answerdocuments").append(doc.html); - } - } - } - }); - - // Sur fermeture de la modal on recharge les PJ - $.ajax({ - type: "POST", - url: "{{ path('app_document_listuser',{entity:'corrected',id:answer.activity.id}) }}", - success: function (response) { - response=JSON.parse(response); - if(response.return=="KO") { - alert(response.error); - } - else { - // On vide le conteneur document - $("#correcteddocuments").empty(); - - // On reconstruit la liste - for (doc of response) { - $("#correcteddocuments").append(doc.html); - } - } - } - }); - - // Sur fermeture de la modal on recharge les PJ - $.ajax({ - type: "POST", - url: "{{ path('app_document_listmaster',{entity:'answercorrected',id:answer.id}) }}", - success: function (response) { - response=JSON.parse(response); - if(response.return=="KO") { - alert(response.error); - } - else { - // On vide le conteneur document - $("#answercorrecteddocuments").empty(); - - // On reconstruit la liste - for (doc of response) { - $("#answercorrecteddocuments").append(doc.html); - } - } - } - }); - - } - {%endif%} - -{% endblock %} diff --git a/src/nineskeletor-1.0/templates/Cron/edit.html.twig b/src/nineskeletor-1.0/templates/Cron/edit.html.twig deleted file mode 100644 index 91b6c8f..0000000 --- a/src/nineskeletor-1.0/templates/Cron/edit.html.twig +++ /dev/null @@ -1,59 +0,0 @@ - -{% extends 'base.html.twig' %} - -{% block body %} -{{ form_start(form) }} -

- {% if mode=="update" %} - Modification JOB - {% endif %} -

- - {{ form_widget(form.submit) }} - - Annuler - -

- - {% if app.session.flashbag.has('error') %} -
- Erreur
- {% for flashMessage in app.session.flashbag.get('error') %} - {{ flashMessage }}
- {% endfor %} -
- {% endif %} - - {% if app.session.flashbag.has('notice') %} -
- Information
- {% for flashMessage in app.session.flashbag.get('notice') %} - {{ flashMessage }}
- {% endfor %} -
- {% endif %} -
-
- Informations -
- -
- {{ form_row(form.command) }} - {{ form_row(form.jsonargument) }} - {{ form_row(form.statut) }} - {{ form_row(form.repeatcall) }} - {{ form_row(form.repeatinterval) }} - {{ form_row(form.nextexecdate) }} -
-
-{{ form_end(form) }} -{% endblock %} - -{% block localjavascript %} - $(document).ready(function() { - $("#command").focus(); - }); -{% endblock %} - - - diff --git a/src/nineskeletor-1.0/templates/Cron/list.html.twig b/src/nineskeletor-1.0/templates/Cron/list.html.twig deleted file mode 100644 index dde3511..0000000 --- a/src/nineskeletor-1.0/templates/Cron/list.html.twig +++ /dev/null @@ -1,56 +0,0 @@ -{% extends "base.html.twig" %} - -{% block body %} -

-JOBS -

- -
-
- Liste des Jobs -
- -
-
- - - - - - - - - - - - - {% for cron in crons %} - - - - - - - - - {% endfor %} - -
ActionOrderCommandDescriptionStatutProchaine exécution
- - {{cron.id}}{{cron.command}}{{cron.description}}{{cron.statutlabel}}{{cron.nextexecdate|date("d/m/Y H:i")}}
-
-
-
-{% endblock %} - -{% block localjavascript %} - $(document).ready(function() { - $('#dataTables').DataTable({ - columnDefs: [ { "targets": "no-sort", "orderable": false }, { "targets": "no-string", "type" : "num" } ], - responsive: true, - iDisplayLength: 100, - order: [[ 1, "asc" ]] - }); - }); -{% endblock %} - diff --git a/src/nineskeletor-1.0/templates/Cron/logs.html.twig b/src/nineskeletor-1.0/templates/Cron/logs.html.twig deleted file mode 100644 index 0988633..0000000 --- a/src/nineskeletor-1.0/templates/Cron/logs.html.twig +++ /dev/null @@ -1,19 +0,0 @@ -{% extends "CRWhizBundle::base.html.twig" %} - -{% block body %} -

{{ title }}

- - Log CRON - Log PROD - Log DEV -

-
-
- Logs -
- -
- {{ content | nl2br }} -
-
-{% endblock %} \ No newline at end of file diff --git a/src/nineskeletor-1.0/templates/Crop/crop01.html.twig b/src/nineskeletor-1.0/templates/Crop/crop01.html.twig deleted file mode 100644 index da5966e..0000000 --- a/src/nineskeletor-1.0/templates/Crop/crop01.html.twig +++ /dev/null @@ -1,35 +0,0 @@ -{% extends 'base.html.twig' %} - -{% block head_style %} - {{ encore_entry_link_tags('app') }} - {{ encore_entry_link_tags('dropzone') }} -{% endblock head_style %} - - -{% block body %} -

- - -
- - {{ encore_entry_script_tags('dropzone') }} -{% endblock %} - - - -{% block localjavascript %} - window.parent.$(".modal-title").html("ETAPE 1 - Téléchargez votre image"); - - Dropzone.options.MyDropZone = { - maxFiles: 1, - acceptedMimeTypes: 'image/*', - //renameFilename: false, - success: function(file, response){ - $(location).attr('href',"{{ path('app_crop02') }}"); - } - } - - function closeModal() { - window.parent.$("#extraLargeModal").modal('hide'); - } -{% endblock %} diff --git a/src/nineskeletor-1.0/templates/Crop/crop02.html.twig b/src/nineskeletor-1.0/templates/Crop/crop02.html.twig deleted file mode 100644 index ada9256..0000000 --- a/src/nineskeletor-1.0/templates/Crop/crop02.html.twig +++ /dev/null @@ -1,71 +0,0 @@ -{% extends 'base.html.twig' %} - -{% block body %} - {{ form_start(form) }} - {{ form_widget(form.submit) }} - - -
- Thumbnail Preview -
- -
-
-
-
- {{ form_end(form) }} - -{% endblock %} - - -{% block localjavascript %} - function move(data) { - $('#form_x').val(data.xScaledToImage); - $('#form_y').val(data.yScaledToImage); - - preview(); - } - - function resize(data) { - $('#form_w').val(data.widthScaledToImage); - $('#form_h').val(data.heightScaledToImage); - - preview(); - } - - function preview(data) { - var scaleX = 90 / $('#form_w').val(); - var scaleY = 90 / $('#form_h').val(); - - $('#preview img').css({ - width: Math.round(scaleX * $('#largeimg').width()) + 'px', - height: Math.round(scaleY * $('#largeimg').height()) + 'px', - marginLeft: '-' + Math.round(scaleX * $('#form_x').val()) + 'px', - marginTop: '-' + Math.round(scaleY * $('#form_y').val()) + 'px' - }); - - } - - function reportThumb() { - window.parent.$("#user_avatar").val("thumb_{{ app.session.get('uploadavatar') }}"); - window.parent.$("#user_avatar_img").attr("src","/{{ appAlias }}/uploads/avatar/thumb_{{ app.session.get('uploadavatar') }}"); - closeModal(); - } - - function closeModal() { - window.parent.$("#extraLargeModal").modal('hide'); - } - - $(document).ready(function() { - window.parent.$(".modal-title").html("ETAPE 2 - Découper votre image"); - - $('#largeimg').CropSelectJs({ - imageSrc: "/{{ appAlias }}/uploads/avatar/{{ app.session.get('uploadavatar') }}", - selectionResize: function(data) { resize(data); }, - selectionMove: function(data) { move(data); }, - }); - $('#largeimg').CropSelectJs('setSelectionAspectRatio',1); - - - }); -{% endblock %} diff --git a/src/nineskeletor-1.0/templates/Document/close.html.twig b/src/nineskeletor-1.0/templates/Document/close.html.twig deleted file mode 100755 index 6a7cb25..0000000 --- a/src/nineskeletor-1.0/templates/Document/close.html.twig +++ /dev/null @@ -1,8 +0,0 @@ -{% extends 'base.html.twig' %} - -{% block body %} - -{% endblock %} - diff --git a/src/nineskeletor-1.0/templates/Document/edit.html.twig b/src/nineskeletor-1.0/templates/Document/edit.html.twig deleted file mode 100755 index fa7d237..0000000 --- a/src/nineskeletor-1.0/templates/Document/edit.html.twig +++ /dev/null @@ -1,52 +0,0 @@ -{% extends 'base.html.twig' %} - -{% block body %} -{{ form_start(form) }} - {{ form_widget(form.submit) }} - - - - {% if mode=="update" %} - - Supprimer - - {% endif %} - -

- - {% if app.session.flashbag.has('error') %} -
- Erreur
- {% for flashMessage in app.session.flashbag.get('error') %} - {{ flashMessage }}
- {% endfor %} -
- {% endif %} - - {% if app.session.flashbag.has('notice') %} -
- Information
- {% for flashMessage in app.session.flashbag.get('notice') %} - {{ flashMessage }}
- {% endfor %} -
- {% endif %} - - {{ form_row(form.name) }} - {{ form_row(form.description) }} -{{ form_end(form) }} - -{% endblock %} - -{% block localjavascript %} - $(document).ready(function() { - $("#document_name").focus(); - }); - - function closeModal() { - window.parent.$("#mymodal").modal('hide'); - } -{% endblock %} diff --git a/src/nineskeletor-1.0/templates/Document/record.html.twig b/src/nineskeletor-1.0/templates/Document/record.html.twig deleted file mode 100644 index ee35250..0000000 --- a/src/nineskeletor-1.0/templates/Document/record.html.twig +++ /dev/null @@ -1,302 +0,0 @@ -{% extends "base.html.twig" %} - -{% block localstyle %} - .main-controls { - padding: 0.5rem 0; - } - - canvas { - display: block; - margin-bottom: 0.5rem; - } - - #buttons button { - font-size: 1rem; - padding: 1rem; - width: 100%; - } - - #buttons i { - margin-right: 5px; - } - - - - /* Make the clips use as much space as possible, and also show a scrollbar when there are too many clips to show in the available space */ - .sound-clips { - flex: 1; - overflow: auto; - } - - section, article { - display: block; - } - - .clip { - padding-bottom: 1rem; - } - - audio { - width: 100%; - display: block; - margin: 1rem auto 0.5rem; - } - - .clip p { - display: inline-block; - font-size: 1rem; - } - - .clip button { - font-size: 1rem; - float: right; - } - - - aside { - position: fixed; - top: 0; - left: 0; - width: 100%; - height: 100%; - transform: translateX(100%); - transition: 0.3s all ease-out; - background-color: #efefef; - padding: 1rem; - } - - aside p { - font-size: 1.2rem; - margin: 0.5rem 0; - } - - aside a { - color: #666; - } - - /* Toggled State of information box */ - input[type=checkbox]:checked ~ aside { - transform: translateX(0); - } - - /* Cursor when clip name is clicked over */ - .clip p { - cursor: pointer; - } - -{% endblock %} - -{% block body %} -
- -
- - -
-
- -
- - -
- -{% endblock %} - -{% block localjavascript %} - // set up basic variables for app - const record = document.querySelector('.record'); - const stop = document.querySelector('.stop'); - const soundClips = document.querySelector('.sound-clips'); - const canvas = document.querySelector('.visualizer'); - const mainSection = document.querySelector('.main-controls'); - - // disable stop button while not recording - $('.stop').hide(); - - // visualiser setup - create web audio api context and canvas - let audioCtx; - const canvasCtx = canvas.getContext("2d"); - - //main block for doing the audio recording - if (navigator.mediaDevices.getUserMedia) { - console.log('getUserMedia supported.'); - - const constraints = { audio: true }; - let chunks = []; - - let onSuccess = function(stream) { - const mediaRecorder = new MediaRecorder(stream); - - visualize(stream); - - record.onclick = function() { - mediaRecorder.start(); - console.log(mediaRecorder.state); - console.log("recorder started"); - record.style.background = "red"; - - $(".stop").show(); - $(".record").hide(); - } - - stop.onclick = function() { - mediaRecorder.stop(); - console.log(mediaRecorder.state); - console.log("recorder stopped"); - record.style.background = ""; - record.style.color = ""; - - $(".stop").hide(); - $(".record").show(); - } - - mediaRecorder.onstop = function(e) { - console.log("data available after MediaRecorder.stop() called."); - - const clipName = prompt("Nom de l'enregistrement ?",'Activite'); - - const clipContainer = document.createElement('article'); - const clipLabel = document.createElement('p'); - const audio = document.createElement('audio'); - const deleteButton = document.createElement('button'); - const addButton = document.createElement('button'); - - clipContainer.classList.add('clip'); - audio.setAttribute('controls', ''); - deleteButton.textContent = 'Supprimer'; - deleteButton.className = 'delete btn btn-danger'; - addButton.textContent = "Ajouter à l'Activité"; - addButton.className = 'add btn btn-success mr-2'; - - if(clipName === null) { - clipLabel.textContent = 'My unnamed clip'; - } else { - clipLabel.textContent = clipName; - } - - clipContainer.appendChild(audio); - clipContainer.appendChild(clipLabel); - clipContainer.appendChild(deleteButton); - clipContainer.appendChild(addButton); - soundClips.appendChild(clipContainer); - - audio.controls = true; - const blob = new Blob(chunks, { 'type' : 'audio/ogg; codecs=opus' }); - chunks = []; - const audioURL = window.URL.createObjectURL(blob); - audio.src = audioURL; - console.log("recorder stopped"); - - deleteButton.onclick = function(e) { - let evtTgt = e.target; - evtTgt.parentNode.parentNode.removeChild(evtTgt.parentNode); - } - - addButton.onclick = function(e) { - url='{{ path('app_document_recordupload',{entity:entity,id:id,name:'xxxxx'})}}'; - url=url.replace('xxxxx',clipName); - - fetch(url, { - method: 'POST', - body: blob, - }) - .then(response => response.json()) - .then(result => { - let evtTgt = e.target; - evtTgt.parentNode.parentNode.removeChild(evtTgt.parentNode); - }) - .catch(error => { - console.error('Error:', error); - }); - } - - clipLabel.onclick = function() { - const existingName = clipLabel.textContent; - const newClipName = prompt("Nom de l'enregistrement ?",existingName); - - if(newClipName === null) { - clipLabel.textContent = existingName; - } else { - clipLabel.textContent = newClipName; - } - } - } - - mediaRecorder.ondataavailable = function(e) { - chunks.push(e.data); - } - } - - let onError = function(err) { - console.log('The following error occured: ' + err); - } - - navigator.mediaDevices.getUserMedia(constraints).then(onSuccess, onError); - } - else { - console.log('getUserMedia not supported on your browser!'); - } - - function visualize(stream) { - if(!audioCtx) { - audioCtx = new AudioContext(); - } - - const source = audioCtx.createMediaStreamSource(stream); - - const analyser = audioCtx.createAnalyser(); - analyser.fftSize = 2048; - const bufferLength = analyser.frequencyBinCount; - const dataArray = new Uint8Array(bufferLength); - - source.connect(analyser); - - draw() - - function draw() { - const WIDTH = canvas.width - const HEIGHT = canvas.height; - - requestAnimationFrame(draw); - - analyser.getByteTimeDomainData(dataArray); - - canvasCtx.fillStyle = 'rgb(200, 200, 200)'; - canvasCtx.fillRect(0, 0, WIDTH, HEIGHT); - - canvasCtx.lineWidth = 2; - canvasCtx.strokeStyle = 'rgb(0, 0, 0)'; - - canvasCtx.beginPath(); - - let sliceWidth = WIDTH * 1.0 / bufferLength; - let x = 0; - - - for(let i = 0; i < bufferLength; i++) { - let v = dataArray[i] / 128.0; - let y = v * HEIGHT/2; - - if(i === 0) { - canvasCtx.moveTo(x, y); - } - else { - canvasCtx.lineTo(x, y); - } - - x += sliceWidth; - } - - canvasCtx.lineTo(canvas.width, canvas.height/2); - canvasCtx.stroke(); - - } - } - - window.onresize = function() { - canvas.width = mainSection.offsetWidth; - } - - window.onresize(); - -{% endblock %} \ No newline at end of file diff --git a/src/nineskeletor-1.0/templates/Document/render.html.twig b/src/nineskeletor-1.0/templates/Document/render.html.twig deleted file mode 100644 index 710cafa..0000000 --- a/src/nineskeletor-1.0/templates/Document/render.html.twig +++ /dev/null @@ -1,18 +0,0 @@ -
- -
-
{{title}}
- - {% if minefamily=="image" or minefamily=="image" or minefamily=="video" or extention=="pdf" %} - - {% endif %} - - - - {% if master %} - - {% endif %} - - {{ description|raw }} -
-
\ No newline at end of file diff --git a/src/nineskeletor-1.0/templates/Document/upload.html.twig b/src/nineskeletor-1.0/templates/Document/upload.html.twig deleted file mode 100644 index a250bef..0000000 --- a/src/nineskeletor-1.0/templates/Document/upload.html.twig +++ /dev/null @@ -1,52 +0,0 @@ -{% extends 'base.html.twig' %} - -{% block head_style %} - {{ encore_entry_link_tags('app') }} - {{ encore_entry_link_tags('dropzone') }} -{% endblock head_style %} - - -{% block body %} - - - - - {{ encore_entry_script_tags('dropzone') }} -{% endblock %} - - - -{% block localjavascript %} - Dropzone.options.MyDropZone = { - init: function() { - var totalFiles = 0; - var completeFiles = 0; - - this.on("sending", function(file, xhr, formData) { - formData.append("nameentity", "{{ entity }}"); - formData.append("identity", "{{ id }}"); - }); - - this.on("addedfile", function (file) { - totalFiles += 1; - }); - - this.on("removed file", function (file) { - totalFiles -= 1; - }); - - this.on("complete", function (file) { - completeFiles += 1; - if (completeFiles === totalFiles) { - window.parent.$("#mymodal").modal('hide'); - } - }); - }, - success: function( file, response ){ - } - } - - function closeModal() { - window.parent.$("#mymodal").modal('hide'); - } -{% endblock %} \ No newline at end of file diff --git a/src/nineskeletor-1.0/templates/Document/view.html.twig b/src/nineskeletor-1.0/templates/Document/view.html.twig deleted file mode 100644 index dd8031a..0000000 --- a/src/nineskeletor-1.0/templates/Document/view.html.twig +++ /dev/null @@ -1,55 +0,0 @@ -{% extends 'base.html.twig' %} - -{% block body %} - {% if minefamily == "image" %} - - {% else %} - - {% endif %} -{% endblock %} - - -{% block localjavascript %} - $(document).ready(function() { - $(window).resize(function() { - AjustFrame(); - }); - - AjustFrame(); - }); - - // Ajustement des frames - function AjustFrame() { - var heightbody = $('html').height(); - var heightheader = $('.nav').height(); - var heightframe = 600; - console.log(heightbody); - var widthbody = $('body').width(); - - if($("#frameviewfile").length>0) { - $("#frameviewfile").height(heightframe); - } - - if($("#image").length>0) { - widthbody=widthbody-250; - if(widthbody<950) widthbody="100%"; - - console.log("euhe"+widthbody); - //$("#image").css({}); - $("#image").css("height","auto"); - $("#image").css("max-width",widthbody); - if($("#image").height()>heightframe) { - $("#image").css({height:heightframe}); - - - } - - } - } -{% endblock %} - - - - diff --git a/src/nineskeletor-1.0/templates/Form/fields.html.twig b/src/nineskeletor-1.0/templates/Form/fields.html.twig deleted file mode 100644 index 03835d7..0000000 --- a/src/nineskeletor-1.0/templates/Form/fields.html.twig +++ /dev/null @@ -1,175 +0,0 @@ -{% extends 'form_div_layout.html.twig' %} - -{# Voir https://github.com/symfony/symfony/blob/master/src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig #} - -{# On commence par simplement ajouter le form-group au row de nos formulaires #} -{% block form_row -%} - {% set attr = attr|merge({'help': (attr.help|default(true)) }) %} -
- {{- form_label(form) }} - {{- form_widget(form) }} - {{ form_errors(form) }} -
-{%- endblock form_row %} - -{# Puis on modifie très simplement nos input et textarea -les plus importants pour y ajouter le class imposée par Bootstrap 3 #} -{% block textarea_widget %} - {% set attr = attr|merge({'class': attr.class|default('') ~ ' form-control'}) %} - {{ parent() }} -{% endblock textarea_widget %} - -{% block form_widget_simple %} - {% set attr = attr|merge({'class': attr.class|default('') ~ ' form-control'}) %} - {{ parent() }} -{% endblock form_widget_simple %} - -{% block form_label -%} - {% set label_attr = label_attr|merge({'class': (label_attr.class|default('') ~ ' control-label')|trim}) %} - {% if 'checkbox' not in block_prefixes %} - {% if label is not same as(false) -%} - {% if not compound -%} - {% set label_attr = label_attr|merge({'for': id}) %} - {%- endif %} - {% if required -%} - {% set label_attr = label_attr|merge({'class': (label_attr.class|default('') ~ ' required')|trim}) %} - {%- endif %} - {% if label is empty -%} - {% set label = name|humanize %} - {%- endif -%} - - - {{ label|trans({}, translation_domain)|raw }} - {% if required %}*{% endif %} - - {%- endif %} - {% endif %} -{%- endblock form_label %} - -{# et enfin les erreurs #} -{% block form_errors %} - {% if errors|length > 0 %} - {% if attr.help is defined and attr.help %} -

- {% for error in errors %} - {{ error.message }}
- {% endfor %} -

- {% else %} -
- - {% for error in errors %} - {{ error.message|raw }}
- {% endfor %} -
- {% endif %} - {% endif %} -{% endblock form_errors %} - -{# Personnalisation des boutons #} -{% block button_widget -%} - {% if label is empty -%} - {% set label = name|humanize %} - {%- endif -%} - {% set attr = attr|merge({'class': (attr.class|default('') ~ '')|trim}) %} - -{%- endblock button_widget %} - -{# Personnalisation des attributs des boutons #} -{% block button_attributes -%} - {% if type is defined and type == 'submit' -%} - {% set class = 'btn-primary' %} - {% else %} - {% set class = 'btn-default' %} - {%- endif -%} - - {% set attr = attr|merge({'class': (attr.class|default('') ~ ' btn ' ~ class)|trim}) %} - {{ parent() }} -{%- endblock button_attributes %} - - -{# Personnalisation des select #} -{% block choice_widget_collapsed %} - {% set attr = attr|merge({'class': (attr.class|default('') ~ ' form-control')|trim}) %} - {{ parent() }} -{%- endblock choice_widget_collapsed %} - -{% block choice_widget %} - {% if expanded %} -
    - {% for child in form %} -
  • - {{ form_widget(child) }} - {{ form_label(child) }} -
    • - {% endfor %} -
- {% else %} - {{ parent() }} - {% endif %} -{% endblock choice_widget %} - -{% block checkbox_widget %} - -{% endblock checkbox_widget %} - -{% block radio_widget %} -    -{% endblock radio_widget %} - -{# Inline date marcro #} -{% macro date_form_widget(form) %} -
- {{ form_widget(form) }} -
-{% endmacro %} - -{# Inline date #} -{% block date_widget %} - {% if widget == 'single_text' %} - {{ block('form_widget_simple') }} - {% else %} - {% import _self as self %} -
- {{ date_pattern|replace({ - '{{ year }}': self.date_form_widget(form.year), - '{{ month }}': self.date_form_widget(form.month), - '{{ day }}': self.date_form_widget(form.day), - })|raw }} -
- {% endif %} -{% endblock date_widget %} - -{# Inline date_time -{% block time_widget %} - {% if widget == 'single_text' %} - {{ block('form_widget_simple') }} - {% else %} - {% import _self as self %} -
- {{ time_pattern|replace({ - '{{ hour }}': self.date_form_widget(form.hour), - '{{ minute }}': self.date_form_widget(form.minute), - })|raw }} -
- {% endif %} -{% endblock time_widget %} -#} - -{% block file_widget %} - {% set type = type|default('file') %} - -{% endblock file_widget %} diff --git a/src/nineskeletor-1.0/templates/Group/edit.html.twig b/src/nineskeletor-1.0/templates/Group/edit.html.twig deleted file mode 100755 index 92c58a5..0000000 --- a/src/nineskeletor-1.0/templates/Group/edit.html.twig +++ /dev/null @@ -1,64 +0,0 @@ -{% extends 'base.html.twig' %} - -{% block body %} -{{ form_start(form) }} -

- {% if mode=="update" %} - Modification GROUPE - {% elseif mode=="submit" %} - Création GROUPE - {% endif %} -

- - {{ form_widget(form.submit) }} - - Annuler - - {% if mode=="update" %} - - Supprimer - - {% endif %} - -

- - {% if app.session.flashbag.has('error') %} -
- Erreur
- {% for flashMessage in app.session.flashbag.get('error') %} - {{ flashMessage }}
- {% endfor %} -
- {% endif %} - - {% if app.session.flashbag.has('notice') %} -
- Information
- {% for flashMessage in app.session.flashbag.get('notice') %} - {{ flashMessage }}
- {% endfor %} -
- {% endif %} - -
-
- Informations -
- -
- {{ form_row(form.name) }} - {{ form_row(form.users) }} -
-
-{{ form_end(form) }} - -{% endblock %} - -{% block localjavascript %} - $(document).ready(function() { - $("#group_name").focus(); - }); -{% endblock %} diff --git a/src/nineskeletor-1.0/templates/Group/list.html.twig b/src/nineskeletor-1.0/templates/Group/list.html.twig deleted file mode 100644 index a643786..0000000 --- a/src/nineskeletor-1.0/templates/Group/list.html.twig +++ /dev/null @@ -1,51 +0,0 @@ -{% extends "base.html.twig" %} - -{% block body %} -

-GROUPES -

- -

Ajouter

- -
-
- Liste des Groupes -
- -
-
- - - - - - - - - {% for group in groups %} - - - - - {% endfor %} - -
ActionNom
- {% if not group.ldapfilter %} - - {% endif %} - {{group.name}}
-
-
-
-{% endblock %} - -{% block localjavascript %} - $(document).ready(function() { - $('#dataTables').DataTable({ - columnDefs: [ { "targets": "no-sort", "orderable": false }, { "targets": "no-string", "type" : "num" } ], - responsive: true, - iDisplayLength: 100, - order: [[ 1, "asc" ]] - }); - }); -{% endblock %} \ No newline at end of file diff --git a/src/nineskeletor-1.0/templates/Home/admin.html.twig b/src/nineskeletor-1.0/templates/Home/admin.html.twig deleted file mode 100644 index 8352af0..0000000 --- a/src/nineskeletor-1.0/templates/Home/admin.html.twig +++ /dev/null @@ -1,7 +0,0 @@ -{% extends "CRWhizBundle::base.html.twig" %} - -{% block body %} - - - -{% endblock %} \ No newline at end of file diff --git a/src/nineskeletor-1.0/templates/Home/home.html.twig b/src/nineskeletor-1.0/templates/Home/home.html.twig deleted file mode 100644 index 643f0d8..0000000 --- a/src/nineskeletor-1.0/templates/Home/home.html.twig +++ /dev/null @@ -1,6 +0,0 @@ -{% extends "base.html.twig" %} - -{% block body %} - -{% endblock %} - diff --git a/src/nineskeletor-1.0/templates/Home/login.html.twig b/src/nineskeletor-1.0/templates/Home/login.html.twig deleted file mode 100755 index 54b9806..0000000 --- a/src/nineskeletor-1.0/templates/Home/login.html.twig +++ /dev/null @@ -1,36 +0,0 @@ -{% extends "base.html.twig" %} - -{% block localstyle %} - body { - background-color: #efefef; - } - .homecard { - padding-top: 20px; - } -{% endblock %} - -{% block body %} -
-
-

{{appName}}

- -
-
- {% if error %} -
{{ error.messageKey|trans(error.messageData, 'security') }}
- {% endif %} - - - - - - - - - - -
-
- -
-{% endblock %} \ No newline at end of file diff --git a/src/nineskeletor-1.0/templates/Home/mail.html.twig b/src/nineskeletor-1.0/templates/Home/mail.html.twig deleted file mode 100644 index a99b325..0000000 --- a/src/nineskeletor-1.0/templates/Home/mail.html.twig +++ /dev/null @@ -1,9 +0,0 @@ -{% block subject %} - {{ subject }} -{% endblock %} - -{% block body %} -{% autoescape %} -

{{ body|raw }}

-{% endautoescape %} -{% endblock %} \ No newline at end of file diff --git a/src/nineskeletor-1.0/templates/Message/close.html.twig b/src/nineskeletor-1.0/templates/Message/close.html.twig deleted file mode 100755 index 6a7cb25..0000000 --- a/src/nineskeletor-1.0/templates/Message/close.html.twig +++ /dev/null @@ -1,8 +0,0 @@ -{% extends 'base.html.twig' %} - -{% block body %} - -{% endblock %} - diff --git a/src/nineskeletor-1.0/templates/Message/group.html.twig b/src/nineskeletor-1.0/templates/Message/group.html.twig deleted file mode 100644 index b8d9758..0000000 --- a/src/nineskeletor-1.0/templates/Message/group.html.twig +++ /dev/null @@ -1,9 +0,0 @@ -{% extends 'base.html.twig' %} - -{% block body %} - {{ form_start(form) }} - - {{ form_row(form.message) }} - {{ form_row(form.answers) }} - {{ form_end(form) }} -{% endblock %} diff --git a/src/nineskeletor-1.0/templates/Message/message.html.twig b/src/nineskeletor-1.0/templates/Message/message.html.twig deleted file mode 100644 index 814769c..0000000 --- a/src/nineskeletor-1.0/templates/Message/message.html.twig +++ /dev/null @@ -1,95 +0,0 @@ -{{ form_widget(form.message) }} - -
-
- \ No newline at end of file diff --git a/src/nineskeletor-1.0/templates/User/edit.html.twig b/src/nineskeletor-1.0/templates/User/edit.html.twig deleted file mode 100755 index e62a103..0000000 --- a/src/nineskeletor-1.0/templates/User/edit.html.twig +++ /dev/null @@ -1,136 +0,0 @@ -{% extends 'base.html.twig' %} - -{% block body %} -{{ form_start(form) }} -

- {% if mode=="update" %} - Modification UTILISATEUR - {% elseif mode=="submit" %} - Création UTILISATEUR - {% elseif mode=="profil" %} - Profil UTILISATEUR - {% endif %} -

- - {{ form_widget(form.submit) }} - - {% if mode=="profil" %} - Annuler - {% else %} - Annuler - {% endif %} - - {% if mode=="update" %} - - Supprimer - - {% endif %} - -

- - {% if app.session.flashbag.has('error') %} -
- Erreur
- {% for flashMessage in app.session.flashbag.get('error') %} - {{ flashMessage }}
- {% endfor %} -
- {% endif %} - - {% if app.session.flashbag.has('notice') %} -
- Information
- {% for flashMessage in app.session.flashbag.get('notice') %} - {{ flashMessage }}
- {% endfor %} -
- {% endif %} - -
- {% set avatar= "noavatar.png" %} - {% if user.avatar %} - {% set avatar= user.avatar %} - {% endif %} - - {{ form_widget(form.avatar) }} - Modifier -
- -
-
-
-
- Informations -
- -
- {{ form_row(form.username) }} - {% if form.password is defined %} - {{ form_row(form.password) }} - {%endif%} - {{ form_row(form.lastname) }} - {{ form_row(form.firstname) }} - {{ form_row(form.email) }} - {{ form_row(form.apikey) }} -
-
-
- -
- {% if form.roles is defined %} -
-
- Organisation -
- -
- {{ form_row(form.groups) }} - {{ form_row(form.roles) }} -
-
- {%endif%} -
-
-{{ form_end(form) }} - - - - -{% endblock %} - -{% block localjavascript %} - $(document).ready(function() { - $("#user_password_first").val(""); - $("#user_login").focus(); - }); - - $("#user_avatar_img").on('load', function() { - - }) - $("#user_avatar_img").on('error', function(){ - console.log("la"); - var imgSrc = $(this).attr('src'); - if(imgSrc!="/{{appAlias}}/uploads/avatar/") - $(this).attr('src',imgSrc); - }); - - function showModal() { - $("#frameModal").attr("src","{{path("app_crop01")}}"); - $("#extraLargeModal").modal("show"); - } -{% endblock %} diff --git a/src/nineskeletor-1.0/templates/User/list.html.twig b/src/nineskeletor-1.0/templates/User/list.html.twig deleted file mode 100644 index e6d4b50..0000000 --- a/src/nineskeletor-1.0/templates/User/list.html.twig +++ /dev/null @@ -1,75 +0,0 @@ -{% extends "base.html.twig" %} - -{% block body %} -

-UTILISATEURS -

- -

Ajouter

- -
-
- Liste des Utilisateurs -
- -
-
- - - - - - - - - - - - - - {% for user in users %} - - - - - - - - - - {% endfor %} - -
ActionAvatarLoginPrénomNomRôlesGroupes
- - {{user.username}}{{user.firstname}}{{user.lastname}} - {%for role in user.roles %} - {%if role=="ROLE_ADMIN" %} - Administrateur
- {%elseif role=="ROLE_MASTER" %} - Professeur
- {%elseif role=="ROLE_STUDENT" %} - Elève
- {%elseif role=="ROLE_USER" %} - Utilisateur
- {%endif%} - {% endfor %} - 		- {% for group in user.groups %} - {{ group.name }}
- {% endfor %} -
-
-
-
-{% endblock %} - -{% block localjavascript %} - $(document).ready(function() { - $('#dataTables').DataTable({ - columnDefs: [ { "targets": "no-sort", "orderable": false }, { "targets": "no-string", "type" : "num" } ], - responsive: true, - iDisplayLength: 100, - order: [[ 2, "asc" ]] - }); - }); -{% endblock %} \ No newline at end of file diff --git a/src/nineskeletor-1.0/templates/base.html.twig b/src/nineskeletor-1.0/templates/base.html.twig deleted file mode 100644 index 6c8b871..0000000 --- a/src/nineskeletor-1.0/templates/base.html.twig +++ /dev/null @@ -1,331 +0,0 @@ - - - {% set color = app.session.get('color') %} - - - - {% block title %}{{ appName }}{% endblock %} - - - - {% block head_style %} - {{ encore_entry_link_tags('app') }} - {% endblock head_style %} - - {% block stylesheets %}{% endblock %} - - - - - - - - - {% if useheader is defined and useheader %} - - {% endif %} - -
- {% set contentsidebar="" %} - {% if usesidebar is defined and usesidebar %} - {% set contentsidebar="contentsidebar" %} - - - {%endif%} - - -
- {% block body %} - - {% endblock %} -
-
- - - - - {{ encore_entry_script_tags('app') }} - - {% block localexternalscript %} - - {% endblock %} - - - - - - diff --git a/tmpl/nineskeletor.cron b/tmpl/nineskeletor.cron new file mode 100644 index 0000000..ebe9322 --- /dev/null +++ b/tmpl/nineskeletor.cron @@ -0,0 +1 @@ +* * * * * root /var/www/html/nineskeletor/scripts/cron.sh &>/dev/null