diff --git a/src/schedule-2.0/assets/js/fullcalendar.js b/src/schedule-2.0/assets/js/fullcalendar.js index ee44799..989d1a4 100644 --- a/src/schedule-2.0/assets/js/fullcalendar.js +++ b/src/schedule-2.0/assets/js/fullcalendar.js @@ -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,11 +18,11 @@ document.addEventListener('DOMContentLoaded', function() { locale: frLocale, weekNumbers: true, selectable: true, - events: 'event/load', - eventLimit:8, + events: 'event/load/'+iduser, + eventLimit:8, eventDrop: function(info) { info.revert(); - }, + }, eventRender: function (info) { eventRender(info); }, @@ -33,4 +35,4 @@ document.addEventListener('DOMContentLoaded', function() { }); global.calendar = calendar; calendar.render(); -}); +}); diff --git a/src/schedule-2.0/config/routes.yaml b/src/schedule-2.0/config/routes.yaml index 7c92a17..0300d19 100644 --- a/src/schedule-2.0/config/routes.yaml +++ b/src/schedule-2.0/config/routes.yaml @@ -22,7 +22,7 @@ app_home_selectservice: #== Security ==================================================================================================== app_login: path: /login - defaults: { _controller: App\Controller\SecurityController:login } + defaults: { _controller: App\Controller\SecurityController:login } app_logincheck: path: /logincheck @@ -53,11 +53,11 @@ app_crop02: oneup_uploader: resource: . type: uploader - + #== Cron ======================================================================================================== app_cron: path: /admin/cron - defaults: { _controller: App\Controller\CronController:list } + defaults: { _controller: App\Controller\CronController:list } app_cron_ajax_list: path: /admin/cron/ajax/list @@ -65,16 +65,16 @@ app_cron_ajax_list: app_cron_update: path: /admin/cron/update/{id} - defaults: { _controller: App\Controller\CronController:update } + defaults: { _controller: App\Controller\CronController:update } app_cron_exec: path: /admin/cron/exec/{id} - defaults: { _controller: App\Controller\CronController:exec } + defaults: { _controller: App\Controller\CronController:exec } app_cron_log: path: /admin/cron/log/{id} controller: App\Controller\Cron:log - defaults: { id: "cron" } + defaults: { id: "cron" } #== User ======================================================================================================== app_user: @@ -147,7 +147,7 @@ app_customer_update: app_customer_delete: path: /master/customer/delete/{id} defaults: { _controller: App\Controller\CustomerController:delete } - + #== Job ===================================================================================================== app_job: path: /admin/job @@ -186,7 +186,7 @@ app_project_update: app_project_delete: path: /master/project/delete/{id} defaults: { _controller: App\Controller\ProjectController:delete } - + app_project_activeproject: path: /master/project/activeproject defaults: { _controller: App\Controller\ProjectController:activeproject } @@ -207,7 +207,7 @@ app_project_users_del: app_project_users: path: /master/project/users/{id} defaults: { _controller: App\Controller\ProjectController:users } - + #== Offer ==================================================================================================== app_offer: path: /master/offer @@ -224,7 +224,7 @@ app_offer_update: app_offer_delete: path: /master/offer/delete/{id} defaults: { _controller: App\Controller\OfferController:delete } - + app_offer_activeproject: path: /master/offer/activeproject defaults: { _controller: App\Controller\OfferController:activeproject } @@ -257,7 +257,7 @@ app_task_update: app_task_delete: path: /master/task/delete/{id} defaults: { _controller: App\Controller\TaskController:delete } - + app_task_activeproject: path: /master/task/activeproject defaults: { _controller: App\Controller\TaskController:activeproject } @@ -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: @@ -402,14 +402,14 @@ app_timer_delete: app_customer_home: path: /customer defaults: { _controller: App\Controller\HomeController:customer } - + app_customer_report: path: /customer/report/{key} defaults: { _controller: App\Controller\ReportController:report, access: 'customer' } app_customer_planning: path: /customer/planning/{key} - defaults: { _controller: App\Controller\ReportController:planning, access: 'customer' } + defaults: { _controller: App\Controller\ReportController:planning, access: 'customer' } #== Export ====================================================================================================== app_export_view: @@ -418,7 +418,7 @@ app_export_view: app_export_penalty_additional: path: /export/export_penalty_additional - defaults: { _controller: App\Controller\ExportController:export_penalty_additional } + defaults: { _controller: App\Controller\ExportController:export_penalty_additional } export_project_weekly: path: /export/export_project_weekly @@ -430,11 +430,11 @@ export_full_worked_days: export_offers: path: /export/export_offers - defaults: { _controller: App\Controller\ExportController:export_offers } + defaults: { _controller: App\Controller\ExportController:export_offers } export_month_charged_days: path: /export/export_month_charged_days - defaults: { _controller: App\Controller\ExportController:export_month_charged_days } + defaults: { _controller: App\Controller\ExportController:export_month_charged_days } #== Export ====================================================================================================== @@ -445,4 +445,4 @@ app_stat_view: #== API =========================================================================================================== app_api: path: /api/{key} - defaults: { _controller: App\Controller\ApiController:api } \ No newline at end of file + defaults: { _controller: App\Controller\ApiController:api } diff --git a/src/schedule-2.0/public/build/fullcalendar.js b/src/schedule-2.0/public/build/fullcalendar.js index 58abcaa..dfc8ec6 100644 --- a/src/schedule-2.0/public/build/fullcalendar.js +++ b/src/schedule-2.0/public/build/fullcalendar.js @@ -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(); @@ -86,4 +88,4 @@ document.addEventListener('DOMContentLoaded', function () { /***/ }) },[["./assets/js/fullcalendar.js","runtime","vendors~fullcalendar"]]]); -//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIndlYnBhY2s6Ly8vLi9hc3NldHMvanMvZnVsbGNhbGVuZGFyLmpzIl0sIm5hbWVzIjpbInJlcXVpcmUiLCJjYWxlbmRhciIsImRvY3VtZW50IiwiYWRkRXZlbnRMaXN0ZW5lciIsImNhbGVuZGFyRWwiLCJnZXRFbGVtZW50QnlJZCIsIkNhbGVuZGFyIiwicGx1Z2lucyIsImludGVyYWN0aW9uUGx1Z2luIiwiZGF5R3JpZFBsdWdpbiIsImxvY2FsZSIsImZyTG9jYWxlIiwid2Vla051bWJlcnMiLCJzZWxlY3RhYmxlIiwiZXZlbnRzIiwiZXZlbnRMaW1pdCIsImV2ZW50RHJvcCIsImluZm8iLCJyZXZlcnQiLCJldmVudFJlbmRlciIsInNlbGVjdCIsInNlbGVjdGlvbkluZm8iLCJldmVudFNlbGVjdCIsImV2ZW50Q2xpY2siLCJnbG9iYWwiLCJyZW5kZXIiXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUE7QUFDQUEsbUJBQU8sQ0FBQywrRUFBRCxDQUFQOztBQUNBQSxtQkFBTyxDQUFDLHFGQUFELENBQVA7O0FBQ0FBLG1CQUFPLENBQUMscUZBQUQsQ0FBUDs7QUFFQTtBQUNBO0FBQ0E7QUFDQTtBQUVBLElBQUlDLFFBQUo7QUFDQUMsUUFBUSxDQUFDQyxnQkFBVCxDQUEwQixrQkFBMUIsRUFBOEMsWUFBVztBQUNyRCxNQUFJQyxVQUFVLEdBQUdGLFFBQVEsQ0FBQ0csY0FBVCxDQUF3QixjQUF4QixDQUFqQjtBQUNBSixVQUFRLEdBQUcsSUFBSUssMkRBQUosQ0FBYUYsVUFBYixFQUF5QjtBQUNoQ0csV0FBTyxFQUFFLENBQUVDLGlFQUFGLEVBQXFCQyw2REFBckIsQ0FEdUI7QUFFaENDLFVBQU0sRUFBRUMsdUVBRndCO0FBR2hDQyxlQUFXLEVBQUUsSUFIbUI7QUFJaENDLGNBQVUsRUFBRSxJQUpvQjtBQUtoQ0MsVUFBTSxFQUFFLFlBTHdCO0FBTWhDQyxjQUFVLEVBQUMsQ0FOcUI7QUFPaENDLGFBQVMsRUFBRSxtQkFBU0MsSUFBVCxFQUFlO0FBQ3RCQSxVQUFJLENBQUNDLE1BQUw7QUFDSCxLQVQrQjtBQVVoQ0MsZUFBVztBQUFBO0FBQUE7QUFBQTs7QUFBQTtBQUFBO0FBQUE7O0FBQUE7QUFBQSxNQUFFLFVBQVVGLElBQVYsRUFBZ0I7QUFDekJFLGlCQUFXLENBQUNGLElBQUQsQ0FBWDtBQUNILEtBRlUsQ0FWcUI7QUFhaENHLFVBQU0sRUFBRSxnQkFBU0MsYUFBVCxFQUF3QjtBQUM1QkMsaUJBQVcsQ0FBQ0QsYUFBRCxDQUFYO0FBQ0gsS0FmK0I7QUFnQmhDRSxjQUFVO0FBQUE7QUFBQTtBQUFBOztBQUFBO0FBQUE7QUFBQTs7QUFBQTtBQUFBLE1BQUUsVUFBU04sSUFBVCxFQUFlO0FBQ3ZCTSxnQkFBVSxDQUFDTixJQUFELENBQVY7QUFDSCxLQUZTO0FBaEJzQixHQUF6QixDQUFYO0FBb0JBTyxRQUFNLENBQUN2QixRQUFQLEdBQWtCQSxRQUFsQjtBQUNBQSxVQUFRLENBQUN3QixNQUFUO0FBQ0gsQ0F4QkQsRSIsImZpbGUiOiJmdWxsY2FsZW5kYXIuanMiLCJzb3VyY2VzQ29udGVudCI6WyIvLyBGdWxsY2FsZW5kYXJcbnJlcXVpcmUoJ0BmdWxsY2FsZW5kYXIvY29yZS9tYWluLmNzcycpO1xucmVxdWlyZSgnQGZ1bGxjYWxlbmRhci9kYXlncmlkL21haW4uY3NzJyk7XG5yZXF1aXJlKCdAZnVsbGNhbGVuZGFyL2RheWdyaWQvbWFpbi5jc3MnKTtcblxuaW1wb3J0IHsgQ2FsZW5kYXIgfSBmcm9tICdAZnVsbGNhbGVuZGFyL2NvcmUnO1xuaW1wb3J0IGZyTG9jYWxlIGZyb20gJ0BmdWxsY2FsZW5kYXIvY29yZS9sb2NhbGVzL2ZyLmpzJztcbmltcG9ydCBpbnRlcmFjdGlvblBsdWdpbiBmcm9tICdAZnVsbGNhbGVuZGFyL2ludGVyYWN0aW9uJztcbmltcG9ydCBkYXlHcmlkUGx1Z2luIGZyb20gJ0BmdWxsY2FsZW5kYXIvZGF5Z3JpZCc7XG5cbnZhciBjYWxlbmRhcjtcbmRvY3VtZW50LmFkZEV2ZW50TGlzdGVuZXIoJ0RPTUNvbnRlbnRMb2FkZWQnLCBmdW5jdGlvbigpIHtcbiAgICB2YXIgY2FsZW5kYXJFbCA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCdmdWxsY2FsZW5kYXInKTtcbiAgICBjYWxlbmRhciA9IG5ldyBDYWxlbmRhcihjYWxlbmRhckVsLCB7XG4gICAgICAgIHBsdWdpbnM6IFsgaW50ZXJhY3Rpb25QbHVnaW4sIGRheUdyaWRQbHVnaW4gXSxcbiAgICAgICAgbG9jYWxlOiBmckxvY2FsZSxcbiAgICAgICAgd2Vla051bWJlcnM6IHRydWUsXG4gICAgICAgIHNlbGVjdGFibGU6IHRydWUsXG4gICAgICAgIGV2ZW50czogJ2V2ZW50L2xvYWQnLFxuICAgICAgICBldmVudExpbWl0OjQsIFxuICAgICAgICBldmVudERyb3A6IGZ1bmN0aW9uKGluZm8pIHtcbiAgICAgICAgICAgIGluZm8ucmV2ZXJ0KCk7XG4gICAgICAgIH0sICAgICAgICBcbiAgICAgICAgZXZlbnRSZW5kZXI6IGZ1bmN0aW9uIChpbmZvKSB7XG4gICAgICAgICAgICBldmVudFJlbmRlcihpbmZvKTtcbiAgICAgICAgfSxcbiAgICAgICAgc2VsZWN0OiBmdW5jdGlvbihzZWxlY3Rpb25JbmZvKSB7XG4gICAgICAgICAgICBldmVudFNlbGVjdChzZWxlY3Rpb25JbmZvKTtcbiAgICAgICAgfSxcbiAgICAgICAgZXZlbnRDbGljazogZnVuY3Rpb24oaW5mbykge1xuICAgICAgICAgICAgZXZlbnRDbGljayhpbmZvKTtcbiAgICAgICAgfVxuICAgIH0pO1xuICAgIGdsb2JhbC5jYWxlbmRhciA9IGNhbGVuZGFyO1xuICAgIGNhbGVuZGFyLnJlbmRlcigpO1xufSk7ICBcbiJdLCJzb3VyY2VSb290IjoiIn0= \ No newline at end of file +//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIndlYnBhY2s6Ly8vLi9hc3NldHMvanMvZnVsbGNhbGVuZGFyLmpzIl0sIm5hbWVzIjpbInJlcXVpcmUiLCJjYWxlbmRhciIsImRvY3VtZW50IiwiYWRkRXZlbnRMaXN0ZW5lciIsImNhbGVuZGFyRWwiLCJnZXRFbGVtZW50QnlJZCIsIkNhbGVuZGFyIiwicGx1Z2lucyIsImludGVyYWN0aW9uUGx1Z2luIiwiZGF5R3JpZFBsdWdpbiIsImxvY2FsZSIsImZyTG9jYWxlIiwid2Vla051bWJlcnMiLCJzZWxlY3RhYmxlIiwiZXZlbnRzIiwiZXZlbnRMaW1pdCIsImV2ZW50RHJvcCIsImluZm8iLCJyZXZlcnQiLCJldmVudFJlbmRlciIsInNlbGVjdCIsInNlbGVjdGlvbkluZm8iLCJldmVudFNlbGVjdCIsImV2ZW50Q2xpY2siLCJnbG9iYWwiLCJyZW5kZXIiXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUE7QUFDQUEsbUJBQU8sQ0FBQywrRUFBRCxDQUFQOztBQUNBQSxtQkFBTyxDQUFDLHFGQUFELENBQVA7O0FBQ0FBLG1CQUFPLENBQUMscUZBQUQsQ0FBUDs7QUFFQTtBQUNBO0FBQ0E7QUFDQTtBQUVBLElBQUlDLFFBQUo7QUFDQUMsUUFBUSxDQUFDQyxnQkFBVCxDQUEwQixrQkFBMUIsRUFBOEMsWUFBVztBQUNyRCxNQUFJQyxVQUFVLEdBQUdGLFFBQVEsQ0FBQ0csY0FBVCxDQUF3QixjQUF4QixDQUFqQjtBQUNBSixVQUFRLEdBQUcsSUFBSUssMkRBQUosQ0FBYUYsVUFBYixFQUF5QjtBQUNoQ0csV0FBTyxFQUFFLENBQUVDLGlFQUFGLEVBQXFCQyw2REFBckIsQ0FEdUI7QUFFaENDLFVBQU0sRUFBRUMsdUVBRndCO0FBR2hDQyxlQUFXLEVBQUUsSUFIbUI7QUFJaENDLGNBQVUsRUFBRSxJQUpvQjtBQUtoQ0MsVUFBTSxFQUFFLFlBTHdCO0FBTWhDQyxjQUFVLEVBQUMsQ0FOcUI7QUFPaENDLGFBQVMsRUFBRSxtQkFBU0MsSUFBVCxFQUFlO0FBQ3RCQSxVQUFJLENBQUNDLE1BQUw7QUFDSCxLQVQrQjtBQVVoQ0MsZUFBVztBQUFBO0FBQUE7QUFBQTs7QUFBQTtBQUFBO0FBQUE7O0FBQUE7QUFBQSxNQUFFLFVBQVVGLElBQVYsRUFBZ0I7QUFDekJFLGlCQUFXLENBQUNGLElBQUQsQ0FBWDtBQUNILEtBRlUsQ0FWcUI7QUFhaENHLFVBQU0sRUFBRSxnQkFBU0MsYUFBVCxFQUF3QjtBQUM1QkMsaUJBQVcsQ0FBQ0QsYUFBRCxDQUFYO0FBQ0gsS0FmK0I7QUFnQmhDRSxjQUFVO0FBQUE7QUFBQTtBQUFBOztBQUFBO0FBQUE7QUFBQTs7QUFBQTtBQUFBLE1BQUUsVUFBU04sSUFBVCxFQUFlO0FBQ3ZCTSxnQkFBVSxDQUFDTixJQUFELENBQVY7QUFDSCxLQUZTO0FBaEJzQixHQUF6QixDQUFYO0FBb0JBTyxRQUFNLENBQUN2QixRQUFQLEdBQWtCQSxRQUFsQjtBQUNBQSxVQUFRLENBQUN3QixNQUFUO0FBQ0gsQ0F4QkQsRSIsImZpbGUiOiJmdWxsY2FsZW5kYXIuanMiLCJzb3VyY2VzQ29udGVudCI6WyIvLyBGdWxsY2FsZW5kYXJcbnJlcXVpcmUoJ0BmdWxsY2FsZW5kYXIvY29yZS9tYWluLmNzcycpO1xucmVxdWlyZSgnQGZ1bGxjYWxlbmRhci9kYXlncmlkL21haW4uY3NzJyk7XG5yZXF1aXJlKCdAZnVsbGNhbGVuZGFyL2RheWdyaWQvbWFpbi5jc3MnKTtcblxuaW1wb3J0IHsgQ2FsZW5kYXIgfSBmcm9tICdAZnVsbGNhbGVuZGFyL2NvcmUnO1xuaW1wb3J0IGZyTG9jYWxlIGZyb20gJ0BmdWxsY2FsZW5kYXIvY29yZS9sb2NhbGVzL2ZyLmpzJztcbmltcG9ydCBpbnRlcmFjdGlvblBsdWdpbiBmcm9tICdAZnVsbGNhbGVuZGFyL2ludGVyYWN0aW9uJztcbmltcG9ydCBkYXlHcmlkUGx1Z2luIGZyb20gJ0BmdWxsY2FsZW5kYXIvZGF5Z3JpZCc7XG5cbnZhciBjYWxlbmRhcjtcbmRvY3VtZW50LmFkZEV2ZW50TGlzdGVuZXIoJ0RPTUNvbnRlbnRMb2FkZWQnLCBmdW5jdGlvbigpIHtcbiAgICB2YXIgY2FsZW5kYXJFbCA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCdmdWxsY2FsZW5kYXInKTtcbiAgICBjYWxlbmRhciA9IG5ldyBDYWxlbmRhcihjYWxlbmRhckVsLCB7XG4gICAgICAgIHBsdWdpbnM6IFsgaW50ZXJhY3Rpb25QbHVnaW4sIGRheUdyaWRQbHVnaW4gXSxcbiAgICAgICAgbG9jYWxlOiBmckxvY2FsZSxcbiAgICAgICAgd2Vla051bWJlcnM6IHRydWUsXG4gICAgICAgIHNlbGVjdGFibGU6IHRydWUsXG4gICAgICAgIGV2ZW50czogJ2V2ZW50L2xvYWQnLFxuICAgICAgICBldmVudExpbWl0OjQsIFxuICAgICAgICBldmVudERyb3A6IGZ1bmN0aW9uKGluZm8pIHtcbiAgICAgICAgICAgIGluZm8ucmV2ZXJ0KCk7XG4gICAgICAgIH0sICAgICAgICBcbiAgICAgICAgZXZlbnRSZW5kZXI6IGZ1bmN0aW9uIChpbmZvKSB7XG4gICAgICAgICAgICBldmVudFJlbmRlcihpbmZvKTtcbiAgICAgICAgfSxcbiAgICAgICAgc2VsZWN0OiBmdW5jdGlvbihzZWxlY3Rpb25JbmZvKSB7XG4gICAgICAgICAgICBldmVudFNlbGVjdChzZWxlY3Rpb25JbmZvKTtcbiAgICAgICAgfSxcbiAgICAgICAgZXZlbnRDbGljazogZnVuY3Rpb24oaW5mbykge1xuICAgICAgICAgICAgZXZlbnRDbGljayhpbmZvKTtcbiAgICAgICAgfVxuICAgIH0pO1xuICAgIGdsb2JhbC5jYWxlbmRhciA9IGNhbGVuZGFyO1xuICAgIGNhbGVuZGFyLnJlbmRlcigpO1xufSk7ICBcbiJdLCJzb3VyY2VSb290IjoiIn0= diff --git a/src/schedule-2.0/src/Controller/EventController.php b/src/schedule-2.0/src/Controller/EventController.php index 153b7e4..d9671c6 100755 --- a/src/schedule-2.0/src/Controller/EventController.php +++ b/src/schedule-2.0/src/Controller/EventController.php @@ -19,7 +19,7 @@ class EventController extends AbstractController private $entity = "App:Event"; private $notificator; - public function __construct(\App\Service\notificationService $notificator) { + public function __construct(\App\Service\notificationService $notificator) { $this->notificator = $notificator; } @@ -29,7 +29,7 @@ class EventController extends AbstractController $users = $em->getRepository("App:User")->findAll(); $tasks = $em->getRepository("App:Task")->findAll(); $projects= $em->getRepository("App:Project")->findBy(["active"=>true]); - + return $this->render($this->render.'list.html.twig',[ "useheader" => true, "usesidebar" => true, @@ -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(); @@ -72,16 +72,16 @@ class EventController extends AbstractController } foreach($events as $event) { //Filtre par service - + if($this->get('session')->get('idservice')!="all") { - + $idservice=$event->getUser()->getService()->getId(); if ($idservice!=$this->get('session')->get('idservice')){ continue; } } // Filtre par project - + if($this->get('session')->get('idproject')!="all") { $idproject=$event->getTask()->getProject()->getId(); if($idproject!=$this->get('session')->get('idproject')) @@ -144,7 +144,7 @@ class EventController extends AbstractController $output=["return"=>"KO","error"=>"Tâche inconnu"]; return new Response(json_encode($output)); } - + // Convertir les dates string en date $datestart=new \DateTime($start); $dateend =new \DateTime($end); @@ -291,9 +291,9 @@ class EventController extends AbstractController $output=$this->formatEvent($event); } - return new Response(json_encode($output)); - } - + return new Response(json_encode($output)); + } + public function update(Request $request) { $em = $this->getDoctrine()->getManager(); @@ -321,8 +321,8 @@ class EventController extends AbstractController $output=["return"=>"KO","error"=>"Tâche inconnue"]; return new Response(json_encode($output)); } - - // Astreinte + + // Astreinte if($fgastreinte) { // Recherche de l'event $penalty = $em->getRepository("App:Penalty")->find($idevent); @@ -418,10 +418,10 @@ class EventController extends AbstractController $output=["return"=>"KO","error"=>"Cet intervant a déjà une tache à cette date","start"=>$datestart,"end"=>$dateend,"events"=>$tbevent]; return new Response(json_encode($output)); } - + } - + // Modification de l'évenement $event->setStart($datestart); $event->setEnd($dateend); @@ -431,14 +431,14 @@ class EventController extends AbstractController $event->setExternalTrip($externaltrip); $event->setUser($user); $event->setTask($task); - + $em->persist($event); $em->flush(); $output=$this->formatEvent($event); } - return new Response(json_encode($output)); - } + return new Response(json_encode($output)); + } public function delete(Request $request) @@ -449,7 +449,7 @@ class EventController extends AbstractController $idevent = str_replace("A","",$request->request->get('idevent')); $fgastreinte = ($request->request->get('fgastreinte')=="true"); - // Astreinte + // Astreinte if($fgastreinte) { // Recherche de l'event $penalty = $em->getRepository("App:Penalty")->find($idevent); @@ -488,19 +488,19 @@ class EventController extends AbstractController } $output=[]; - return new Response(json_encode($output)); - } + return new Response(json_encode($output)); + } public function formatEvent($event) { $editable=(!($event->getValidate())&&!($event->getValidateholiday())); - + // Si l'utilisateur en cours est différent de celui de l'event = seul MASTER - ADMIN peuvent modifier if($event->getUser()!=$this->getUser()) { if(!$this->isGranted('ROLE_ADMIN')&&!$this->isGranted('ROLE_MASTER')) $editable=false; } - - + + $tmp= [ "id"=> ($event instanceof Penalty?"A":"").$event->getId(), "title" => ($event instanceof Penalty?"ASTREINTE = ":"").$event->getTask()->getDisplayname(), @@ -532,7 +532,7 @@ class EventController extends AbstractController public function formatBreakday($event) { $editable=false; - + $tmp= [ "id"=> "B".$event->getId(), "title" => "Jour Férié", @@ -577,5 +577,5 @@ class EventController extends AbstractController $request->getSession()->getFlashBag()->add("error", $error->getMessage()); } } - } + } } diff --git a/src/schedule-2.0/src/Controller/HomeController.php b/src/schedule-2.0/src/Controller/HomeController.php index 3b30e2d..90b1c7c 100755 --- a/src/schedule-2.0/src/Controller/HomeController.php +++ b/src/schedule-2.0/src/Controller/HomeController.php @@ -39,7 +39,7 @@ class HomeController extends AbstractController $this->get('session')->set('nbmonth',$nbmonth); $output=["return"=>"OK"]; return new Response(json_encode($output)); - } + } public function selectuser(Request $request) { @@ -47,7 +47,7 @@ class HomeController extends AbstractController $this->get('session')->set('iduser',$iduser); $output=["return"=>"OK"]; return new Response(json_encode($output)); - } + } public function selectproject(Request $request) { @@ -55,7 +55,7 @@ class HomeController extends AbstractController $this->get('session')->set('idproject',$idproject); $output=["return"=>"OK"]; return new Response(json_encode($output)); - } + } public function selectservice(Request $request) {