From 210b669909b578468e94aa01f8cfba5bd5b01b4f Mon Sep 17 00:00:00 2001 From: afornerot Date: Wed, 9 Oct 2019 17:01:41 +0200 Subject: [PATCH] =?UTF-8?q?mise=20=C3=A0=20jour=20pour=20rest?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CoreBundle/Command/data/core-init-01.sql | 2 +- .../CoreBundle/Controller/RestController.php | 13 ++ .../public/themes/transnum/style.css | 2 +- .../CoreBundle/Resources/views/base.html.twig | 2 +- .../CronBundle/Command/InitDataCommand.php | 131 +----------------- .../Resources/views/Chat/client.html.twig | 2 +- 6 files changed, 23 insertions(+), 129 deletions(-) diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Command/data/core-init-01.sql b/src/ninegate-1.0/src/Cadoles/CoreBundle/Command/data/core-init-01.sql index 1b2bd43d..8b485653 100644 --- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Command/data/core-init-01.sql +++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Command/data/core-init-01.sql @@ -8,7 +8,7 @@ INSERT IGNORE INTO `niveau01` (`id`, `label`, `siren`) VALUES (-100, 'DRAAF', '130007107'); INSERT IGNORE INTO `user` (`id`, `niveau01_id`, `username`, `firstname`, `lastname`, `password`, `email`, `avatar`, `role`,`siren`,`authlevel`) VALUES -(-100, -100, 'admin', 'Administrateur', 'draaf', '{SSHA}M+3m6aLkROJycqRqpYLqd0X6BOfvLMZm +(-100, -100, 'admin', 'Administrateur', 'draaf', '{SSHA}oHrljV00WDOVTiNtiKKmRtI13Y7XhUSj ', 'admin@ldapbundle.ac-arno.fr', 'admin.jpg', 'ROLE_ADMIN', '130007107', 'simple'); diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/RestController.php b/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/RestController.php index 480d0b3d..440b12f0 100644 --- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/RestController.php +++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/RestController.php @@ -54,6 +54,7 @@ class RestController extends Controller $output["bookmarks"] = []; $output["items"] = []; $output["itemcategorys"] = []; + $output["groups"] = []; $bookmarks=null; $items=null; @@ -61,6 +62,7 @@ class RestController extends Controller $weburl="https://".$this->getParameter("weburl")."/".$this->getParameter("alias")."/"; $em->getRepository("CadolesPortalBundle:Item")->getUserItems($user,$bookmarks,$items,$itemcategorys,null,3); + $this->getDoctrine()->getRepository("CadolesPortalBundle:Page")->getPagesUser($user,null,$entity,$pagesuser,$pagesadmin,$groupsshared); // Construction de la réponse $output["user"]["firstname"] = $user->getFirstname(); @@ -69,6 +71,7 @@ class RestController extends Controller $output["user"]["avatar"] = $weburl."uploads/avatar/".$user->getAvatar(); $output["user"]["niveau01"] = $user->getNiveau01()->getLabel(); $output["user"]["niveau02"] = ($user->getNiveau02()?$user->getNiveau02()->getLabel():null); + $output["user"]["role"] = $user->getRole(); if($bookmarks) { foreach($bookmarks as $bookmark) { @@ -114,6 +117,16 @@ class RestController extends Controller } } + if($groupsshared) { + foreach($groupsshared as $groupshared) { + $tmp=[]; + $tmp["id"] = $groupshared->getId(); + $tmp["title"] = $groupshared->getLabel(); + + array_push($output["groups"],$tmp); + } + } + // Retour diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/transnum/style.css b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/transnum/style.css index ff534bf6..78ce34bb 100644 --- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/transnum/style.css +++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/transnum/style.css @@ -72,7 +72,7 @@ body.simple { .grid .grid-preview { width: 15%; - min-width: 142px; + min-width: 138px; } .grid .grid-preview .grid-item-title { diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/base.html.twig b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/base.html.twig index 1fcf1279..c8410877 100644 --- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/base.html.twig +++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/base.html.twig @@ -133,7 +133,7 @@ -
+
{% block pagewrapper %} diff --git a/src/ninegate-1.0/src/Cadoles/CronBundle/Command/InitDataCommand.php b/src/ninegate-1.0/src/Cadoles/CronBundle/Command/InitDataCommand.php index 78850123..8326303b 100644 --- a/src/ninegate-1.0/src/Cadoles/CronBundle/Command/InitDataCommand.php +++ b/src/ninegate-1.0/src/Cadoles/CronBundle/Command/InitDataCommand.php @@ -42,6 +42,12 @@ class InitDataCommand extends ContainerAwareCommand } protected function insertCron() { + + // afin de forcer les ID sur certaines entités + $metadata = $this->entityManager->getClassMetaData(get_class($entity)); + $metadata->setIdGeneratorType(ClassMetadata::GENERATOR_TYPE_NONE); + $metadata->setIdGenerator(new AssignedGenerator()); + // Job Mail // Toute les minutes $entity = $this->entityManager->getRepository('CadolesCronBundle:Cron')->find(1); @@ -59,131 +65,6 @@ class InitDataCommand extends ContainerAwareCommand $this->entityManager->persist($entity); } - - // afin de forcer les ID sur certaines entités - $metadata = $this->entityManager->getClassMetaData(get_class($entity)); - $metadata->setIdGeneratorType(ClassMetadata::GENERATOR_TYPE_NONE); - $metadata->setIdGenerator(new AssignedGenerator()); - - // Job synchronisation des comptes utilisateur - // Toute les 24h à 3h00 - $entity = $this->entityManager->getRepository('CadolesCronBundle:Cron')->find(100); - if(!$entity) { - $entity = new Cron; - $nextdate=$entity->getSubmitdate(); - $nextdate->setTime(3,0); - $entity->setCommand("Core:Synchro"); - $entity->setDescription("Synchronisation des Comptes Utilisateurs"); - $entity->setId(100); - $entity->setStatut(2); - $entity->setRepeatcall(0); - $entity->setRepeatexec(0); - $entity->setRepeatinterval(86400); - $entity->setNextexecdate($nextdate); - $entity->setJsonargument('{"simulate":"false"}'); - $this->entityManager->persist($entity); - } - - // Job purge des registrations obsolètes - // Toute les 5mn - $entity = $this->entityManager->getRepository('CadolesCronBundle:Cron')->find(110); - if(!$entity) { - $entity = new Cron; - $entity->setCommand("Core:PurgeRegistration"); - $entity->setDescription("Purge des Inscriptions obsolètes"); - $entity->setId(110); - $entity->setStatut(2); - $entity->setRepeatcall(0); - $entity->setRepeatexec(0); - $entity->setRepeatinterval(300); - $entity->setNextexecdate($entity->getSubmitdate()); - $this->entityManager->persist($entity); - } - - // Job de purge des fichiers obsolète - // Toute les 24h à 3h00 - $entity = $this->entityManager->getRepository('CadolesCronBundle:Cron')->find(200); - if(!$entity) { - $entity = new Cron; - $nextdate=$entity->getSubmitdate(); - $nextdate->setTime(3,0); - $entity->setCommand("Core:PurgeFile"); - $entity->setDescription("Suppression des fichiers obsolètes"); - $entity->setId(200); - $entity->setStatut(2); - $entity->setRepeatcall(0); - $entity->setRepeatexec(0); - $entity->setRepeatinterval(86400); - $entity->setNextexecdate($nextdate); - $this->entityManager->persist($entity); - } - - // CRON PORTAIL - // Job purge des registrations obsolètes - // Toute les 5mn - $portal_activate = $this->getContainer()->getParameter('portal_activate'); - $calendar_activate = $this->getContainer()->getParameter('calendar_activate'); - $entity = $this->entityManager->getRepository('CadolesCronBundle:Cron')->find(1000); - if(!$entity&&($portal_activate||$calendar_activate)) { - $entity = new Cron; - $entity->setCommand("Portal:SynchroICS"); - $entity->setDescription("Synchronisation des Calendriers Utilisateurs liés à une URL ICS"); - $entity->setId(1000); - $entity->setStatut(2); - $entity->setRepeatcall(0); - $entity->setRepeatexec(0); - $entity->setRepeatinterval(600); - $entity->setNextexecdate($entity->getSubmitdate()); - $this->entityManager->persist($entity); - } - elseif($entity&&!($portal_activate||$calendar_activate)) { - $this->entityManager->remove($entity); - } - - // Job de récupération des sondages Limesurvey - // Toute les 6h - $activate_widlimesurvey = $this->getContainer()->getParameter('activate_widlimesurvey'); - $entity = $this->entityManager->getRepository('CadolesCronBundle:Cron')->find(1010); - if(!$entity&&$activate_widlimesurvey) { - $entity = new Cron; - $nextdate=$entity->getSubmitdate(); - $nextdate->setTime(1,0); - $entity->setCommand("Portal:GetLimesurvey"); - $entity->setDescription("Récupération des sondages Limesurvey"); - $entity->setId(1010); - $entity->setStatut(2); - $entity->setRepeatcall(0); - $entity->setRepeatexec(0); - $entity->setRepeatinterval(21600); - $entity->setNextexecdate($nextdate); - $this->entityManager->persist($entity); - } - elseif($entity&&!$activate_widlimesurvey) { - $this->entityManager->remove($entity); - } - - // Job de récupération des cours Moodle - // Toute les 6h - $activate_widmoodle = $this->getContainer()->getParameter('activate_widmoodle'); - $entity = $this->entityManager->getRepository('CadolesCronBundle:Cron')->find(1020); - if(!$entity&&$activate_widmoodle) { - $entity = new Cron; - $nextdate=$entity->getSubmitdate(); - $nextdate->setTime(1,0); - $entity->setCommand("Portal:GetMoodle"); - $entity->setDescription("Récupération des cours Moodle "); - $entity->setId(1020); - $entity->setStatut(2); - $entity->setRepeatcall(0); - $entity->setRepeatexec(0); - $entity->setRepeatinterval(21600); - $entity->setNextexecdate($nextdate); - $this->entityManager->persist($entity); - } - elseif($entity&&!$activate_widmoodle) { - $this->entityManager->remove($entity); - } - $this->entityManager->flush(); } } diff --git a/src/ninegate-1.0/src/Cadoles/WebsocketBundle/Resources/views/Chat/client.html.twig b/src/ninegate-1.0/src/Cadoles/WebsocketBundle/Resources/views/Chat/client.html.twig index 245b6b8f..3208b15d 100644 --- a/src/ninegate-1.0/src/Cadoles/WebsocketBundle/Resources/views/Chat/client.html.twig +++ b/src/ninegate-1.0/src/Cadoles/WebsocketBundle/Resources/views/Chat/client.html.twig @@ -9,7 +9,7 @@ } {% else %} #page-wrapper { - //padding: 5px 25px 0px 15px; + padding: 5px 25px 0px 15px; //background: transparent; } {% endif %}