Cadoles/schedule
21
0
Fork 0
Code Issues 3 Pull Requests Releases Wiki Activity

Merge branch 'master' into dist/eole/2.7.2/master

Browse Source
This commit is contained in:
Arnaud Fornerot
2021-03-03 16:16:59 +01:00
parent b14fc3d0e1 ce10df9293
commit 6f9acdf7ad
5 changed files with 57 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/schedule-2.0/assets/js/fullcalendar.js
View File

@@ -9,6 +9,8 @@ import interactionPlugin from '@fullcalendar/interaction';
import dayGridPlugin from '@fullcalendar/daygrid';
var calendar;
var e = document.getElementById("sideuser");
var iduser = e.value;
document.addEventListener('DOMContentLoaded', function() {
var calendarEl = document.getElementById('fullcalendar');
calendar = new Calendar(calendarEl, {
@@ -16,7 +18,7 @@ document.addEventListener('DOMContentLoaded', function() {
locale: frLocale,
weekNumbers: true,
selectable: true,
events: 'event/load',
events: 'event/load/'+iduser,
eventLimit:8,
eventDrop: function(info) {
info.revert();

2
src/schedule-2.0/config/routes.yaml
View File

@@ -268,7 +268,7 @@ app_event:
defaults: { _controller: App\Controller\EventController:list }
app_event_load:
path: /user/event/load
path: /user/event/load/{id}
defaults: { _controller: App\Controller\EventController:load }
app_event_submit:

4
src/schedule-2.0/public/build/fullcalendar.js
View File

@@ -36,6 +36,8 @@ __webpack_require__(/*! @fullcalendar/daygrid/main.css */ "./node_modules/@fullc
var calendar;
var e = document.getElementById("sideuser");
var iduser = e.value;
document.addEventListener('DOMContentLoaded', function () {
var calendarEl = document.getElementById('fullcalendar');
calendar = new _fullcalendar_core__WEBPACK_IMPORTED_MODULE_3__["Calendar"](calendarEl, {
@@ -43,7 +45,7 @@ document.addEventListener('DOMContentLoaded', function () {
locale: _fullcalendar_core_locales_fr_js__WEBPACK_IMPORTED_MODULE_4___default.a,
weekNumbers: true,
selectable: true,
events: 'event/load',
events: 'event/load/'+iduser,
eventLimit: 8,
eventDrop: function eventDrop(info) {
info.revert();

4
src/schedule-2.0/src/Controller/EventController.php
View File

@@ -38,13 +38,13 @@ class EventController extends AbstractController
]);
}
public function load(Request $request)
public function load($iduser, Request $request)
{
$em = $this->getDoctrine()->getManager();
$tbevents=[];
$start = $request->query->get('start');
$end = $request->query->get('end');
$iduser=$this->get("session")->get("iduser");
//$iduser=$this->get("session")->get("iduser");
// Evenements
if($iduser=="all") {
$events=$em->getRepository("App:Event")->findAll();