Cadoles
/
ninegate
20
0
Fork 0
Code Issues 29 Pull Requests Projects 1 Releases Wiki Activity

Merge branch 'master' into dist/envole/6/master

This commit is contained in:
Arnaud Fornerot 2020-06-26 15:46:34 +02:00
parent ba41570721 151be1a66e
commit d1637e4efa
2 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/CalendareventController.php
View File

@ -19,9 +19,10 @@ class CalendareventController extends Controller
public function loadAction(Request $request,$access="config") public function loadAction(Request $request,$access="config")
{ {
// S'assurer que c'est un appel ajax // S'assurer que c'est un appel ajax
if (!$request->isXmlHttpRequest()) return new JsonResponse(array('message' => 'Interdit'), 400); // if (!$request->isXmlHttpRequest()) return new JsonResponse(array('message' => 'Interdit'), 400);
$output=array(); $events=array();
$eventids=array();
$idcalendar = $request->query->get('idcalendar'); $idcalendar = $request->query->get('idcalendar');
$start = $request->query->get('start'); $start = $request->query->get('start');
$end = $request->query->get('end'); $end = $request->query->get('end');
@ -62,15 +63,23 @@ class CalendareventController extends Controller
$tmp['color'] = "#".(is_null($calendar->getColor())?$this->get('session')->get('color')["main"]:$calendar->getColor()); $tmp['color'] = "#".(is_null($calendar->getColor())?$this->get('session')->get('color')["main"]:$calendar->getColor());
$tmp['allDay'] = $calendarevent->getAllday(); $tmp['allDay'] = $calendarevent->getAllday();
$tmp['calendar'] = $calendar->getId(); $tmp['calendar'] = $calendar->getId();
$tmp['editable'] = $calendar->getCanupdate(); $tmp['editable'] = $calendarevent->getCalendar()->getCanupdate();
array_push($output,$tmp); array_push($events,$tmp);
array_push($eventids,$tmp["id"]);
} }
} }
if($idcalendar==0) { // On récupére les évenement partagé de l'utilisateur
$calendareventsshared = $this->getDoctrine()->getRepository("CadolesPortalBundle:Calendarevent")->getCalendareventShareByDate($this->getUser(),$start,$end); if($this->getUser()) {
foreach($calendareventsshared as $calendarevent) {
$calendarevents = $this->getDoctrine()->getRepository("CadolesPortalBundle:Calendarevent")->getCalendareventGroupsShareByDate($this->getUser(),$start,$end);
foreach($calendarevents as $calendarevent) {
if($idcalendar>0) {
if(!$calendarevent->getGroups()->contains($calendar->getGroups()[0])) continue;
}
$tmp=[]; $tmp=[];
$tmp['id'] = strval($calendarevent->getId()); $tmp['id'] = strval($calendarevent->getId());
$tmp['title'] = $calendarevent->getName(); $tmp['title'] = $calendarevent->getName();
@ -80,13 +89,16 @@ class CalendareventController extends Controller
$tmp['color'] = "#".(is_null($calendar->getColor())?$this->get('session')->get('color')["main"]:$calendar->getColor()); $tmp['color'] = "#".(is_null($calendar->getColor())?$this->get('session')->get('color')["main"]:$calendar->getColor());
$tmp['allDay'] = $calendarevent->getAllday(); $tmp['allDay'] = $calendarevent->getAllday();
$tmp['calendar'] = $calendar->getId(); $tmp['calendar'] = $calendar->getId();
$tmp['editable'] = $calendar->getCanupdate(); $tmp['editable'] = $calendarevent->getCalendar()->getCanupdate();
array_push($output,$tmp); if(!in_array($tmp['id'],$eventids)) {
array_push($events,$tmp);
array_push($eventids,$tmp["id"]);
}
} }
} }
$response = new Response(json_encode($output)); $response = new Response(json_encode($events));
$response->headers->set('Content-Type', 'application/text'); $response->headers->set('Content-Type', 'application/text');
return $response; return $response;
} }

4
src/ninegate-1.0/src/Cadoles/PortalBundle/Repository/CalendareventRepository.php
View File

@ -82,10 +82,6 @@ class CalendareventRepository extends EntityRepository
->andWhere('groupe=usergroupe.group') ->andWhere('groupe=usergroupe.group')
->andWhere('usergroupe.user=:user') ->andWhere('usergroupe.user=:user')
->from('CadolesCoreBundle:UserGroup','proprio')
->andWhere('proprio.group=groupe')
->andWhere('proprio.user=calendar.user')
->setParameter('fgcanshare',true) ->setParameter('fgcanshare',true)
->setParameter('user',$user) ->setParameter('user',$user)
->setParameter('start',$start) ->setParameter('start',$start)