From 58cc523ddb48fbec89d0afbc2c6e344d818a226b Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Tue, 6 Dec 2022 12:12:41 +0100 Subject: [PATCH] wait #5626 @3 --- app/Http/Controllers/Admin/CrudController.php | 2 +- .../Operations/TeamLeave/ICSOperation.php | 87 +++++ .../Controllers/Admin/UsersCrudController.php | 2 +- app/Models/TeamLeave.php | 10 + app/Widgets.php | 8 + composer.json | 1 + composer.lock | 366 ++++++++++-------- resources/views/team/leave/calendar.blade.php | 34 ++ routes/backpack/custom.php | 24 +- 9 files changed, 355 insertions(+), 179 deletions(-) create mode 100644 app/Http/Controllers/Admin/Operations/TeamLeave/ICSOperation.php create mode 100644 resources/views/team/leave/calendar.blade.php diff --git a/app/Http/Controllers/Admin/CrudController.php b/app/Http/Controllers/Admin/CrudController.php index bed63b7f7..560a9461f 100644 --- a/app/Http/Controllers/Admin/CrudController.php +++ b/app/Http/Controllers/Admin/CrudController.php @@ -19,7 +19,7 @@ class CrudController extends \Cubist\Backpack\Magic\Controllers\CubistMagicContr /* */ - protected $_modelNamespace = 'App\Models\Base\ToolboxHRModel'; + protected $_modelNamespace = 'App\Models\Base\ToolboxSettingsModel'; protected $_routeURL = ''; protected $_singular = ''; protected $_plural = ''; diff --git a/app/Http/Controllers/Admin/Operations/TeamLeave/ICSOperation.php b/app/Http/Controllers/Admin/Operations/TeamLeave/ICSOperation.php new file mode 100644 index 000000000..0af4f4c4d --- /dev/null +++ b/app/Http/Controllers/Admin/Operations/TeamLeave/ICSOperation.php @@ -0,0 +1,87 @@ +withoutMiddleware([VerifyCsrfToken::class, Authenticate::class, CheckIfAdmin::class]); + } + + protected function ics() + { + $calendar = new Calendar(); + $calendar->setProdId('FluidbookToolbox'); + $calendar->setTimezone(new \DateTimeZone('Europe/Paris')); + $calendar->setName('Planning Vacances'); + + $users = []; + + foreach (TeamLeave::where('public', '1')->get() as $leave) { + if (!isset($users[$leave->worker])) { + $users[$leave->worker] = User::withoutGlobalScopes()->find($leave->worker); + } + /** @var User $user */ + $user = $users[$leave->worker]; + + /** @var $leave TeamLeave */ + $event = new CalendarEvent(); + $event + ->setStart($leave->start_day) + ->setEnd($leave->end_day->modify('+1 day')) + ->setColor($user->planning_color) + ->setDescription('test') + ->setAllDay(true) + ->setSummary($user->firstname) + ->setUid('cubedesigners-toolbox-holidays-' . $leave->id); + + $calendar->addEvent($event); + + } + + $calendarExport = new CalendarExport(new CalendarStream(), new Formatter()); + $calendarExport->addCalendar($calendar); + + return response($calendarExport->getStream(), 200, ['Content-type' => 'text/calendar', 'Access-Control-Allow-Origin' => '*']); + } + + public static function getEventsAsArray() + { + $users = []; + $res = []; + + foreach (TeamLeave::where('public', '1')->get() as $leave) { + if (!isset($users[$leave->worker])) { + $users[$leave->worker] = User::withoutGlobalScopes()->find($leave->worker); + } + /** @var User $user */ + $user = $users[$leave->worker]; + + /** @var $leave TeamLeave */ + /* + * title : 'event3', + start : '2010-01-09T12:30:00', + allDay : false // will make the time show + */ + $event = ['title' => $user->firstname, 'start' => $leave->start_day->format('c'), 'end' => $leave->end_day->modify('+1 day')->format('c'), 'allDay' => true, 'color' => $user->planning_color]; + + + $res[] = $event; + + } + return $res; + } +} diff --git a/app/Http/Controllers/Admin/UsersCrudController.php b/app/Http/Controllers/Admin/UsersCrudController.php index 63ffb0d9f..c32f5f1a1 100644 --- a/app/Http/Controllers/Admin/UsersCrudController.php +++ b/app/Http/Controllers/Admin/UsersCrudController.php @@ -18,7 +18,7 @@ class UsersCrudController extends \Cubist\Backpack\Magic\Controllers\CubistMagic __('utilisateurs') */ - protected $_modelNamespace = 'App\Models\CubedesignersTeamMember'; + protected $_modelNamespace = 'App\Models\AuthUser'; protected $_routeURL = 'users'; protected $_singular = 'utilisateur'; protected $_plural = 'utilisateurs'; diff --git a/app/Models/TeamLeave.php b/app/Models/TeamLeave.php index 3ed6e8641..566633a65 100644 --- a/app/Models/TeamLeave.php +++ b/app/Models/TeamLeave.php @@ -2,7 +2,9 @@ namespace App\Models; +use App\Http\Controllers\Admin\Operations\TeamLeave\ICSOperation; use App\Models\Base\ToolboxHRModel; +use App\Widgets; use Cubist\Backpack\Magic\Fields\Checkbox; use Cubist\Backpack\Magic\Fields\Date; use Cubist\Backpack\Magic\Fields\Number; @@ -20,6 +22,8 @@ class TeamLeave extends ToolboxHRModel static $_permissionBase = 'team-leave'; + protected $_operations=[ICSOperation::class]; + protected $_enableClone = false; protected $_enableDeletion = true; @@ -56,4 +60,10 @@ class TeamLeave extends ToolboxHRModel $this->addField('recorded_month', Date::class, __('Comptabilisé'), ['column' => true, 'column_format' => 'YYYY-MM', 'can' => self::$_permissionBase . ':admin']); $this->addField('comment', Text::class, __('Commentaire'), ['column' => true, 'can' => self::$_permissionBase . ':admin']); } + + public function addWidgets() + { + Widgets::teamWidgets(); + + } } diff --git a/app/Widgets.php b/app/Widgets.php index 87c8e18b1..db86b9a3d 100644 --- a/app/Widgets.php +++ b/app/Widgets.php @@ -42,4 +42,12 @@ class Widgets ]); } } + + public static function teamWidgets() + { + Widget::add([ + 'type' => 'view', + 'view' => 'team.leave.calendar', + ]); + } } diff --git a/composer.json b/composer.json index 80865ed8e..147ac34bb 100644 --- a/composer.json +++ b/composer.json @@ -40,6 +40,7 @@ "fluidbook/tools": "dev-master", "hollodotme/fast-cgi-client": "^3.1", "jolicode/slack-php-api": "^v4.5", + "jsvrcek/ics": "^0.8.4", "league/csv": "^9.8", "mxl/laravel-job": "^1.3", "nyholm/psr7": "^1.5", diff --git a/composer.lock b/composer.lock index 6fe4e97da..d4140d92a 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "3acc2c7a3b11e59ea58e6a1d34a3ad5f", + "content-hash": "043b6be87f9609bf0e916a312f216d5a", "packages": [ { "name": "ahmadshah/lucy", @@ -573,16 +573,16 @@ }, { "name": "backpack/revise-operation", - "version": "1.0.10", + "version": "1.0.11", "source": { "type": "git", "url": "https://github.com/Laravel-Backpack/revise-operation.git", - "reference": "eb0401021fc784e35a948d5a56040279b82c4d68" + "reference": "eb7f4c47dbff070566abf726bfddea7a73b98f2c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Laravel-Backpack/revise-operation/zipball/eb0401021fc784e35a948d5a56040279b82c4d68", - "reference": "eb0401021fc784e35a948d5a56040279b82c4d68", + "url": "https://api.github.com/repos/Laravel-Backpack/revise-operation/zipball/eb7f4c47dbff070566abf726bfddea7a73b98f2c", + "reference": "eb7f4c47dbff070566abf726bfddea7a73b98f2c", "shasum": "" }, "require": { @@ -637,9 +637,9 @@ ], "support": { "issues": "https://github.com/Laravel-Backpack/revise-operation/issues", - "source": "https://github.com/Laravel-Backpack/revise-operation/tree/1.0.10" + "source": "https://github.com/Laravel-Backpack/revise-operation/tree/1.0.11" }, - "time": "2022-02-15T10:28:11+00:00" + "time": "2022-11-08T18:44:03+00:00" }, { "name": "barryvdh/laravel-debugbar", @@ -1122,12 +1122,12 @@ "version": "v0.11.0", "source": { "type": "git", - "url": "https://github.com/calebporzio/parental.git", + "url": "https://github.com/tighten/parental.git", "reference": "33344dae4069236ea65f525f605ccf08cac47729" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/calebporzio/parental/zipball/33344dae4069236ea65f525f605ccf08cac47729", + "url": "https://api.github.com/repos/tighten/parental/zipball/33344dae4069236ea65f525f605ccf08cac47729", "reference": "33344dae4069236ea65f525f605ccf08cac47729", "shasum": "" }, @@ -1157,8 +1157,7 @@ ], "description": "A simple eloquent trait that allows relationships to be accessed through child models.", "support": { - "issues": "https://github.com/calebporzio/parental/issues", - "source": "https://github.com/calebporzio/parental/tree/master" + "source": "https://github.com/tighten/parental/tree/v0.11.0" }, "funding": [ { @@ -1661,13 +1660,13 @@ "source": { "type": "git", "url": "git://git.cubedesigners.com/cubist_cms-back.git", - "reference": "0f0dca276748e1bd7e17f7bd50f8298acc75850a" + "reference": "d185a85328cf38abdc30dbc868bf272c8ea70f6d" }, "dist": { "type": "tar", - "url": "https://composer.cubedesigners.com/dist/cubist/cms-back/cubist-cms-back-dev-master-4f5da8.tar", - "reference": "0f0dca276748e1bd7e17f7bd50f8298acc75850a", - "shasum": "165263152ccbb3023e2f47987a952d6c3234862f" + "url": "https://composer.cubedesigners.com/dist/cubist/cms-back/cubist-cms-back-dev-master-e044ea.tar", + "reference": "d185a85328cf38abdc30dbc868bf272c8ea70f6d", + "shasum": "a42b9f5aa5ace9a1bdb3429f0e38604a8fdbb7d4" }, "require": { "backpack/backupmanager": "^3.0", @@ -1748,7 +1747,7 @@ } ], "description": "Cubist Backpack extension", - "time": "2022-11-03T18:49:30+00:00" + "time": "2022-11-17T08:59:51+00:00" }, { "name": "cubist/cms-front", @@ -2170,13 +2169,13 @@ "source": { "type": "git", "url": "git://git.cubedesigners.com/cubist_util.git", - "reference": "75ae132b8f2e1d349f68c75ab461b491294a53ef" + "reference": "6e5805930a5eea67d44919bb7250917afab06d68" }, "dist": { "type": "tar", - "url": "https://composer.cubedesigners.com/dist/cubist/util/cubist-util-dev-master-f8ed7c.tar", - "reference": "75ae132b8f2e1d349f68c75ab461b491294a53ef", - "shasum": "85d5db94b723ba67671638381374777fb0338057" + "url": "https://composer.cubedesigners.com/dist/cubist/util/cubist-util-dev-master-b542a7.tar", + "reference": "6e5805930a5eea67d44919bb7250917afab06d68", + "shasum": "ab7d4f0324a196b34430cf88576b67dba4e7544b" }, "require": { "cubist/net": "dev-master", @@ -2208,7 +2207,7 @@ } ], "description": "Utilities class", - "time": "2022-09-07T08:21:52+00:00" + "time": "2022-11-23T13:56:08+00:00" }, { "name": "cviebrock/eloquent-sluggable", @@ -4323,7 +4322,7 @@ }, { "name": "jane-php/json-schema-runtime", - "version": "v7.3.2", + "version": "v7.4.0", "source": { "type": "git", "url": "https://github.com/janephp/json-schema-runtime.git", @@ -4379,13 +4378,13 @@ ], "description": "Jane runtime Library", "support": { - "source": "https://github.com/janephp/json-schema-runtime/tree/v7.3.2" + "source": "https://github.com/janephp/json-schema-runtime/tree/v7.4.0" }, "time": "2021-12-16T13:26:58+00:00" }, { "name": "jane-php/open-api-runtime", - "version": "v7.3.2", + "version": "v7.4.0", "source": { "type": "git", "url": "https://github.com/janephp/open-api-runtime.git", @@ -4442,7 +4441,7 @@ ], "description": "Jane OpenAPI Runtime Library, dependencies and utility class for a library generated by jane/openapi", "support": { - "source": "https://github.com/janephp/open-api-runtime/tree/v7.3.2" + "source": "https://github.com/janephp/open-api-runtime/tree/v7.4.0" }, "time": "2021-12-16T13:26:58+00:00" }, @@ -4653,6 +4652,58 @@ }, "time": "2022-03-30T14:52:47+00:00" }, + { + "name": "jsvrcek/ics", + "version": "0.8.4", + "source": { + "type": "git", + "url": "https://github.com/jasvrcek/ICS.git", + "reference": "e2156614096d58fa8a92609e70002808c2374158" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/jasvrcek/ICS/zipball/e2156614096d58fa8a92609e70002808c2374158", + "reference": "e2156614096d58fa8a92609e70002808c2374158", + "shasum": "" + }, + "require": { + "php": ">=5.6" + }, + "require-dev": { + "phpunit/phpunit": "^4.8 || ^5.5 || >=6.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Jsvrcek\\ICS\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Justin Svrcek", + "homepage": "https://github.com/jasvrcek" + } + ], + "description": "abstraction layer for creating multi-byte safe RFC 5545 compliant .ics files", + "homepage": "https://github.com/jasvrcek/ICS", + "keywords": [ + ".ics", + "RFC 5545", + "calendar", + "export", + "ical", + "multi-byte safe" + ], + "support": { + "issues": "https://github.com/jasvrcek/ICS/issues", + "source": "https://github.com/jasvrcek/ICS/tree/0.8.4" + }, + "time": "2022-06-03T14:24:07+00:00" + }, { "name": "laravel-lang/lang", "version": "10.9.5", @@ -6053,16 +6104,16 @@ }, { "name": "mobiledetect/mobiledetectlib", - "version": "2.8.39", + "version": "2.8.41", "source": { "type": "git", "url": "https://github.com/serbanghita/Mobile-Detect.git", - "reference": "0fd6753003fc870f6e229bae869cc1337c99bc45" + "reference": "fc9cccd4d3706d5a7537b562b59cc18f9e4c0cb1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/serbanghita/Mobile-Detect/zipball/0fd6753003fc870f6e229bae869cc1337c99bc45", - "reference": "0fd6753003fc870f6e229bae869cc1337c99bc45", + "url": "https://api.github.com/repos/serbanghita/Mobile-Detect/zipball/fc9cccd4d3706d5a7537b562b59cc18f9e4c0cb1", + "reference": "fc9cccd4d3706d5a7537b562b59cc18f9e4c0cb1", "shasum": "" }, "require": { @@ -6103,9 +6154,9 @@ ], "support": { "issues": "https://github.com/serbanghita/Mobile-Detect/issues", - "source": "https://github.com/serbanghita/Mobile-Detect/tree/2.8.39" + "source": "https://github.com/serbanghita/Mobile-Detect/tree/2.8.41" }, - "time": "2022-02-17T19:24:25+00:00" + "time": "2022-11-08T18:31:26+00:00" }, { "name": "monolog/monolog", @@ -6333,16 +6384,16 @@ }, { "name": "nesbot/carbon", - "version": "2.62.1", + "version": "2.63.0", "source": { "type": "git", "url": "https://github.com/briannesbitt/Carbon.git", - "reference": "01bc4cdefe98ef58d1f9cb31bdbbddddf2a88f7a" + "reference": "ad35dd71a6a212b98e4b87e97389b6fa85f0e347" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/01bc4cdefe98ef58d1f9cb31bdbbddddf2a88f7a", - "reference": "01bc4cdefe98ef58d1f9cb31bdbbddddf2a88f7a", + "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/ad35dd71a6a212b98e4b87e97389b6fa85f0e347", + "reference": "ad35dd71a6a212b98e4b87e97389b6fa85f0e347", "shasum": "" }, "require": { @@ -6431,7 +6482,7 @@ "type": "tidelift" } ], - "time": "2022-09-02T07:48:13+00:00" + "time": "2022-10-30T18:34:28+00:00" }, { "name": "neutron/temporary-filesystem", @@ -8072,21 +8123,20 @@ }, { "name": "ramsey/uuid", - "version": "4.5.1", + "version": "4.6.0", "source": { "type": "git", "url": "https://github.com/ramsey/uuid.git", - "reference": "a161a26d917604dc6d3aa25100fddf2556e9f35d" + "reference": "ad63bc700e7d021039e30ce464eba384c4a1d40f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ramsey/uuid/zipball/a161a26d917604dc6d3aa25100fddf2556e9f35d", - "reference": "a161a26d917604dc6d3aa25100fddf2556e9f35d", + "url": "https://api.github.com/repos/ramsey/uuid/zipball/ad63bc700e7d021039e30ce464eba384c4a1d40f", + "reference": "ad63bc700e7d021039e30ce464eba384c4a1d40f", "shasum": "" }, "require": { "brick/math": "^0.8.8 || ^0.9 || ^0.10", - "ext-ctype": "*", "ext-json": "*", "php": "^8.0", "ramsey/collection": "^1.0" @@ -8118,7 +8168,6 @@ }, "suggest": { "ext-bcmath": "Enables faster math with arbitrary-precision integers using BCMath.", - "ext-ctype": "Enables faster processing of character classification using ctype functions.", "ext-gmp": "Enables faster math with arbitrary-precision integers using GMP.", "ext-uuid": "Enables the use of PeclUuidTimeGenerator and PeclUuidRandomGenerator.", "paragonie/random-lib": "Provides RandomLib for use with the RandomLibAdapter", @@ -8150,7 +8199,7 @@ ], "support": { "issues": "https://github.com/ramsey/uuid/issues", - "source": "https://github.com/ramsey/uuid/tree/4.5.1" + "source": "https://github.com/ramsey/uuid/tree/4.6.0" }, "funding": [ { @@ -8162,7 +8211,7 @@ "type": "tidelift" } ], - "time": "2022-09-16T03:22:46+00:00" + "time": "2022-11-05T23:03:38+00:00" }, { "name": "react/promise", @@ -8716,16 +8765,16 @@ }, { "name": "spatie/laravel-medialibrary", - "version": "9.12.3", + "version": "9.12.4", "source": { "type": "git", "url": "https://github.com/spatie/laravel-medialibrary.git", - "reference": "a20456679f29a725b37947980408fc15c3477b08" + "reference": "4763bd27ccaf08da80102019fc98c39431640c4f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/laravel-medialibrary/zipball/a20456679f29a725b37947980408fc15c3477b08", - "reference": "a20456679f29a725b37947980408fc15c3477b08", + "url": "https://api.github.com/repos/spatie/laravel-medialibrary/zipball/4763bd27ccaf08da80102019fc98c39431640c4f", + "reference": "4763bd27ccaf08da80102019fc98c39431640c4f", "shasum": "" }, "require": { @@ -8807,7 +8856,7 @@ ], "support": { "issues": "https://github.com/spatie/laravel-medialibrary/issues", - "source": "https://github.com/spatie/laravel-medialibrary/tree/9.12.3" + "source": "https://github.com/spatie/laravel-medialibrary/tree/9.12.4" }, "funding": [ { @@ -8819,7 +8868,7 @@ "type": "github" } ], - "time": "2022-04-07T22:29:32+00:00" + "time": "2022-11-09T20:34:04+00:00" }, { "name": "spatie/laravel-package-tools", @@ -8882,16 +8931,16 @@ }, { "name": "spatie/laravel-permission", - "version": "5.5.16", + "version": "5.7.0", "source": { "type": "git", "url": "https://github.com/spatie/laravel-permission.git", - "reference": "e57a67b51a02cbfcd074ed68786897db1dbbf2fa" + "reference": "3a9bc00e6d338a9c61f830af654aa5c326407632" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/laravel-permission/zipball/e57a67b51a02cbfcd074ed68786897db1dbbf2fa", - "reference": "e57a67b51a02cbfcd074ed68786897db1dbbf2fa", + "url": "https://api.github.com/repos/spatie/laravel-permission/zipball/3a9bc00e6d338a9c61f830af654aa5c326407632", + "reference": "3a9bc00e6d338a9c61f830af654aa5c326407632", "shasum": "" }, "require": { @@ -8952,7 +9001,7 @@ ], "support": { "issues": "https://github.com/spatie/laravel-permission/issues", - "source": "https://github.com/spatie/laravel-permission/tree/5.5.16" + "source": "https://github.com/spatie/laravel-permission/tree/5.7.0" }, "funding": [ { @@ -8960,7 +9009,7 @@ "type": "github" } ], - "time": "2022-10-23T02:49:28+00:00" + "time": "2022-11-23T07:01:37+00:00" }, { "name": "spatie/laravel-signal-aware-command", @@ -10481,16 +10530,16 @@ }, { "name": "symfony/polyfill-ctype", - "version": "v1.26.0", + "version": "v1.27.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "6fd1b9a79f6e3cf65f9e679b23af304cd9e010d4" + "reference": "5bbc823adecdae860bb64756d639ecfec17b050a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/6fd1b9a79f6e3cf65f9e679b23af304cd9e010d4", - "reference": "6fd1b9a79f6e3cf65f9e679b23af304cd9e010d4", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/5bbc823adecdae860bb64756d639ecfec17b050a", + "reference": "5bbc823adecdae860bb64756d639ecfec17b050a", "shasum": "" }, "require": { @@ -10505,7 +10554,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.26-dev" + "dev-main": "1.27-dev" }, "thanks": { "name": "symfony/polyfill", @@ -10543,7 +10592,7 @@ "portable" ], "support": { - "source": "https://github.com/symfony/polyfill-ctype/tree/v1.26.0" + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.27.0" }, "funding": [ { @@ -10559,20 +10608,20 @@ "type": "tidelift" } ], - "time": "2022-05-24T11:49:31+00:00" + "time": "2022-11-03T14:55:06+00:00" }, { "name": "symfony/polyfill-iconv", - "version": "v1.26.0", + "version": "v1.27.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-iconv.git", - "reference": "143f1881e655bebca1312722af8068de235ae5dc" + "reference": "927013f3aac555983a5059aada98e1907d842695" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/143f1881e655bebca1312722af8068de235ae5dc", - "reference": "143f1881e655bebca1312722af8068de235ae5dc", + "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/927013f3aac555983a5059aada98e1907d842695", + "reference": "927013f3aac555983a5059aada98e1907d842695", "shasum": "" }, "require": { @@ -10587,7 +10636,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.26-dev" + "dev-main": "1.27-dev" }, "thanks": { "name": "symfony/polyfill", @@ -10626,7 +10675,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-iconv/tree/v1.26.0" + "source": "https://github.com/symfony/polyfill-iconv/tree/v1.27.0" }, "funding": [ { @@ -10642,20 +10691,20 @@ "type": "tidelift" } ], - "time": "2022-05-24T11:49:31+00:00" + "time": "2022-11-03T14:55:06+00:00" }, { "name": "symfony/polyfill-intl-grapheme", - "version": "v1.26.0", + "version": "v1.27.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-grapheme.git", - "reference": "433d05519ce6990bf3530fba6957499d327395c2" + "reference": "511a08c03c1960e08a883f4cffcacd219b758354" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/433d05519ce6990bf3530fba6957499d327395c2", - "reference": "433d05519ce6990bf3530fba6957499d327395c2", + "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/511a08c03c1960e08a883f4cffcacd219b758354", + "reference": "511a08c03c1960e08a883f4cffcacd219b758354", "shasum": "" }, "require": { @@ -10667,7 +10716,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.26-dev" + "dev-main": "1.27-dev" }, "thanks": { "name": "symfony/polyfill", @@ -10707,7 +10756,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.26.0" + "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.27.0" }, "funding": [ { @@ -10723,20 +10772,20 @@ "type": "tidelift" } ], - "time": "2022-05-24T11:49:31+00:00" + "time": "2022-11-03T14:55:06+00:00" }, { "name": "symfony/polyfill-intl-idn", - "version": "v1.26.0", + "version": "v1.27.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-idn.git", - "reference": "59a8d271f00dd0e4c2e518104cc7963f655a1aa8" + "reference": "639084e360537a19f9ee352433b84ce831f3d2da" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/59a8d271f00dd0e4c2e518104cc7963f655a1aa8", - "reference": "59a8d271f00dd0e4c2e518104cc7963f655a1aa8", + "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/639084e360537a19f9ee352433b84ce831f3d2da", + "reference": "639084e360537a19f9ee352433b84ce831f3d2da", "shasum": "" }, "require": { @@ -10750,7 +10799,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.26-dev" + "dev-main": "1.27-dev" }, "thanks": { "name": "symfony/polyfill", @@ -10794,7 +10843,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.26.0" + "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.27.0" }, "funding": [ { @@ -10810,20 +10859,20 @@ "type": "tidelift" } ], - "time": "2022-05-24T11:49:31+00:00" + "time": "2022-11-03T14:55:06+00:00" }, { "name": "symfony/polyfill-intl-normalizer", - "version": "v1.26.0", + "version": "v1.27.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-normalizer.git", - "reference": "219aa369ceff116e673852dce47c3a41794c14bd" + "reference": "19bd1e4fcd5b91116f14d8533c57831ed00571b6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/219aa369ceff116e673852dce47c3a41794c14bd", - "reference": "219aa369ceff116e673852dce47c3a41794c14bd", + "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/19bd1e4fcd5b91116f14d8533c57831ed00571b6", + "reference": "19bd1e4fcd5b91116f14d8533c57831ed00571b6", "shasum": "" }, "require": { @@ -10835,7 +10884,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.26-dev" + "dev-main": "1.27-dev" }, "thanks": { "name": "symfony/polyfill", @@ -10878,7 +10927,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.26.0" + "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.27.0" }, "funding": [ { @@ -10894,20 +10943,20 @@ "type": "tidelift" } ], - "time": "2022-05-24T11:49:31+00:00" + "time": "2022-11-03T14:55:06+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.26.0", + "version": "v1.27.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e" + "reference": "8ad114f6b39e2c98a8b0e3bd907732c207c2b534" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e", - "reference": "9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/8ad114f6b39e2c98a8b0e3bd907732c207c2b534", + "reference": "8ad114f6b39e2c98a8b0e3bd907732c207c2b534", "shasum": "" }, "require": { @@ -10922,7 +10971,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.26-dev" + "dev-main": "1.27-dev" }, "thanks": { "name": "symfony/polyfill", @@ -10961,7 +11010,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.26.0" + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.27.0" }, "funding": [ { @@ -10977,20 +11026,20 @@ "type": "tidelift" } ], - "time": "2022-05-24T11:49:31+00:00" + "time": "2022-11-03T14:55:06+00:00" }, { "name": "symfony/polyfill-php72", - "version": "v1.26.0", + "version": "v1.27.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php72.git", - "reference": "bf44a9fd41feaac72b074de600314a93e2ae78e2" + "reference": "869329b1e9894268a8a61dabb69153029b7a8c97" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/bf44a9fd41feaac72b074de600314a93e2ae78e2", - "reference": "bf44a9fd41feaac72b074de600314a93e2ae78e2", + "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/869329b1e9894268a8a61dabb69153029b7a8c97", + "reference": "869329b1e9894268a8a61dabb69153029b7a8c97", "shasum": "" }, "require": { @@ -10999,7 +11048,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.26-dev" + "dev-main": "1.27-dev" }, "thanks": { "name": "symfony/polyfill", @@ -11037,7 +11086,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php72/tree/v1.26.0" + "source": "https://github.com/symfony/polyfill-php72/tree/v1.27.0" }, "funding": [ { @@ -11053,20 +11102,20 @@ "type": "tidelift" } ], - "time": "2022-05-24T11:49:31+00:00" + "time": "2022-11-03T14:55:06+00:00" }, { "name": "symfony/polyfill-php73", - "version": "v1.26.0", + "version": "v1.27.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php73.git", - "reference": "e440d35fa0286f77fb45b79a03fedbeda9307e85" + "reference": "9e8ecb5f92152187c4799efd3c96b78ccab18ff9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/e440d35fa0286f77fb45b79a03fedbeda9307e85", - "reference": "e440d35fa0286f77fb45b79a03fedbeda9307e85", + "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/9e8ecb5f92152187c4799efd3c96b78ccab18ff9", + "reference": "9e8ecb5f92152187c4799efd3c96b78ccab18ff9", "shasum": "" }, "require": { @@ -11075,7 +11124,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.26-dev" + "dev-main": "1.27-dev" }, "thanks": { "name": "symfony/polyfill", @@ -11116,7 +11165,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php73/tree/v1.26.0" + "source": "https://github.com/symfony/polyfill-php73/tree/v1.27.0" }, "funding": [ { @@ -11132,20 +11181,20 @@ "type": "tidelift" } ], - "time": "2022-05-24T11:49:31+00:00" + "time": "2022-11-03T14:55:06+00:00" }, { "name": "symfony/polyfill-php80", - "version": "v1.26.0", + "version": "v1.27.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php80.git", - "reference": "cfa0ae98841b9e461207c13ab093d76b0fa7bace" + "reference": "7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/cfa0ae98841b9e461207c13ab093d76b0fa7bace", - "reference": "cfa0ae98841b9e461207c13ab093d76b0fa7bace", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936", + "reference": "7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936", "shasum": "" }, "require": { @@ -11154,7 +11203,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.26-dev" + "dev-main": "1.27-dev" }, "thanks": { "name": "symfony/polyfill", @@ -11199,7 +11248,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php80/tree/v1.26.0" + "source": "https://github.com/symfony/polyfill-php80/tree/v1.27.0" }, "funding": [ { @@ -11215,20 +11264,20 @@ "type": "tidelift" } ], - "time": "2022-05-10T07:21:04+00:00" + "time": "2022-11-03T14:55:06+00:00" }, { "name": "symfony/polyfill-php81", - "version": "v1.26.0", + "version": "v1.27.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php81.git", - "reference": "13f6d1271c663dc5ae9fb843a8f16521db7687a1" + "reference": "707403074c8ea6e2edaf8794b0157a0bfa52157a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/13f6d1271c663dc5ae9fb843a8f16521db7687a1", - "reference": "13f6d1271c663dc5ae9fb843a8f16521db7687a1", + "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/707403074c8ea6e2edaf8794b0157a0bfa52157a", + "reference": "707403074c8ea6e2edaf8794b0157a0bfa52157a", "shasum": "" }, "require": { @@ -11237,7 +11286,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.26-dev" + "dev-main": "1.27-dev" }, "thanks": { "name": "symfony/polyfill", @@ -11278,7 +11327,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php81/tree/v1.26.0" + "source": "https://github.com/symfony/polyfill-php81/tree/v1.27.0" }, "funding": [ { @@ -11294,7 +11343,7 @@ "type": "tidelift" } ], - "time": "2022-05-24T11:49:31+00:00" + "time": "2022-11-03T14:55:06+00:00" }, { "name": "symfony/process", @@ -12625,16 +12674,16 @@ }, { "name": "composer/pcre", - "version": "3.0.0", + "version": "3.1.0", "source": { "type": "git", "url": "https://github.com/composer/pcre.git", - "reference": "e300eb6c535192decd27a85bc72a9290f0d6b3bd" + "reference": "4bff79ddd77851fe3cdd11616ed3f92841ba5bd2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/pcre/zipball/e300eb6c535192decd27a85bc72a9290f0d6b3bd", - "reference": "e300eb6c535192decd27a85bc72a9290f0d6b3bd", + "url": "https://api.github.com/repos/composer/pcre/zipball/4bff79ddd77851fe3cdd11616ed3f92841ba5bd2", + "reference": "4bff79ddd77851fe3cdd11616ed3f92841ba5bd2", "shasum": "" }, "require": { @@ -12676,7 +12725,7 @@ ], "support": { "issues": "https://github.com/composer/pcre/issues", - "source": "https://github.com/composer/pcre/tree/3.0.0" + "source": "https://github.com/composer/pcre/tree/3.1.0" }, "funding": [ { @@ -12692,7 +12741,7 @@ "type": "tidelift" } ], - "time": "2022-02-25T20:21:48+00:00" + "time": "2022-11-17T09:50:14+00:00" }, { "name": "doctrine/instantiator", @@ -13033,26 +13082,27 @@ }, { "name": "fzaninotto/faker", - "version": "v1.9.2", + "version": "dev-master", "source": { "type": "git", "url": "https://github.com/fzaninotto/Faker.git", - "reference": "848d8125239d7dbf8ab25cb7f054f1a630e68c2e" + "reference": "5ffe7db6c80f441f150fc88008d64e64af66634b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/fzaninotto/Faker/zipball/848d8125239d7dbf8ab25cb7f054f1a630e68c2e", - "reference": "848d8125239d7dbf8ab25cb7f054f1a630e68c2e", + "url": "https://api.github.com/repos/fzaninotto/Faker/zipball/5ffe7db6c80f441f150fc88008d64e64af66634b", + "reference": "5ffe7db6c80f441f150fc88008d64e64af66634b", "shasum": "" }, "require": { - "php": "^5.3.3 || ^7.0" + "php": "^5.3.3 || ^7.0 || ^8.0" }, "require-dev": { "ext-intl": "*", "phpunit/phpunit": "^4.8.35 || ^5.7", "squizlabs/php_codesniffer": "^2.9.2" }, + "default-branch": true, "type": "library", "extra": { "branch-alias": { @@ -13081,10 +13131,10 @@ ], "support": { "issues": "https://github.com/fzaninotto/Faker/issues", - "source": "https://github.com/fzaninotto/Faker/tree/v1.9.2" + "source": "https://github.com/fzaninotto/Faker/tree/master" }, "abandoned": true, - "time": "2020-12-11T09:56:16+00:00" + "time": "2020-12-11T09:59:14+00:00" }, { "name": "hamcrest/hamcrest-php", @@ -13139,16 +13189,16 @@ }, { "name": "laravel/tinker", - "version": "v2.7.2", + "version": "v2.7.3", "source": { "type": "git", "url": "https://github.com/laravel/tinker.git", - "reference": "dff39b661e827dae6e092412f976658df82dbac5" + "reference": "5062061b4924af3392225dd482ca7b4d85d8b8ef" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/tinker/zipball/dff39b661e827dae6e092412f976658df82dbac5", - "reference": "dff39b661e827dae6e092412f976658df82dbac5", + "url": "https://api.github.com/repos/laravel/tinker/zipball/5062061b4924af3392225dd482ca7b4d85d8b8ef", + "reference": "5062061b4924af3392225dd482ca7b4d85d8b8ef", "shasum": "" }, "require": { @@ -13201,9 +13251,9 @@ ], "support": { "issues": "https://github.com/laravel/tinker/issues", - "source": "https://github.com/laravel/tinker/tree/v2.7.2" + "source": "https://github.com/laravel/tinker/tree/v2.7.3" }, - "time": "2022-03-23T12:38:24+00:00" + "time": "2022-11-09T15:11:38+00:00" }, { "name": "mockery/mockery", @@ -13338,16 +13388,16 @@ }, { "name": "nikic/php-parser", - "version": "v4.15.1", + "version": "v4.15.2", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "0ef6c55a3f47f89d7a374e6f835197a0b5fcf900" + "reference": "f59bbe44bf7d96f24f3e2b4ddc21cd52c1d2adbc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/0ef6c55a3f47f89d7a374e6f835197a0b5fcf900", - "reference": "0ef6c55a3f47f89d7a374e6f835197a0b5fcf900", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/f59bbe44bf7d96f24f3e2b4ddc21cd52c1d2adbc", + "reference": "f59bbe44bf7d96f24f3e2b4ddc21cd52c1d2adbc", "shasum": "" }, "require": { @@ -13388,9 +13438,9 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v4.15.1" + "source": "https://github.com/nikic/PHP-Parser/tree/v4.15.2" }, - "time": "2022-09-04T07:30:47+00:00" + "time": "2022-11-12T15:38:23+00:00" }, { "name": "nunomaduro/collision", @@ -14095,16 +14145,16 @@ }, { "name": "psy/psysh", - "version": "v0.11.8", + "version": "v0.11.9", "source": { "type": "git", "url": "https://github.com/bobthecow/psysh.git", - "reference": "f455acf3645262ae389b10e9beba0c358aa6994e" + "reference": "1acec99d6684a54ff92f8b548a4e41b566963778" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/bobthecow/psysh/zipball/f455acf3645262ae389b10e9beba0c358aa6994e", - "reference": "f455acf3645262ae389b10e9beba0c358aa6994e", + "url": "https://api.github.com/repos/bobthecow/psysh/zipball/1acec99d6684a54ff92f8b548a4e41b566963778", + "reference": "1acec99d6684a54ff92f8b548a4e41b566963778", "shasum": "" }, "require": { @@ -14165,9 +14215,9 @@ ], "support": { "issues": "https://github.com/bobthecow/psysh/issues", - "source": "https://github.com/bobthecow/psysh/tree/v0.11.8" + "source": "https://github.com/bobthecow/psysh/tree/v0.11.9" }, - "time": "2022-07-28T14:25:11+00:00" + "time": "2022-11-06T15:29:46+00:00" }, { "name": "sebastian/code-unit-reverse-lookup", @@ -14978,5 +15028,5 @@ "ext-zlib": "*" }, "platform-dev": [], - "plugin-api-version": "2.1.0" + "plugin-api-version": "2.3.0" } diff --git a/resources/views/team/leave/calendar.blade.php b/resources/views/team/leave/calendar.blade.php new file mode 100644 index 000000000..8fbdc8bbd --- /dev/null +++ b/resources/views/team/leave/calendar.blade.php @@ -0,0 +1,34 @@ + + + + + + + +
diff --git a/routes/backpack/custom.php b/routes/backpack/custom.php index 651ddff66..a0931c777 100644 --- a/routes/backpack/custom.php +++ b/routes/backpack/custom.php @@ -5,29 +5,15 @@ Route::group([ 'namespace' => 'App\Http\Controllers\Admin', ], function () { // custom admin routes try { - Route::crud('elearning-media', 'ElearningMediaCrudController'); - Route::crud('toolbox-translate', 'ToolboxTranslateCrudController'); - Route::crud('quiztranslation', 'QuiztranslationCrudController'); - Route::crud('team-emails', 'TeamEmailsCrudController'); - Route::crud('fluidbook-quote', 'FluidbookQuoteCrudController'); + Route::crud('users', 'UsersCrudController'); Route::crud('locale', 'LocaleCrudController'); - Route::crud('tool-sprite', 'ToolSpriteCrudController'); - Route::crud('users', 'UsersCrudController'); - Route::crud('users', 'UsersCrudController'); - Route::crud('quiz', 'QuizCrudController'); Route::crud('page', 'PageCrudController'); - Route::crud('settings', 'SettingsCrudController'); - Route::crud('fluidbook-collection', 'FluidbookCollectionCrudController'); - Route::crud('fluidbook-document', 'FluidbookDocumentCrudController'); - Route::crud('fluidbook-publication', 'FluidbookPublicationCrudController'); Route::crud('quizatttempt', 'QuizatttemptCrudController'); - Route::crud('elearning-package', 'ElearningPackageCrudController'); - Route::crud('fluidbook-theme', 'FluidbookThemeCrudController'); - Route::crud('company', 'CompanyCrudController'); + Route::crud('quiztranslation', 'QuiztranslationCrudController'); + Route::crud('settings', 'SettingsCrudController'); Route::crud('signature', 'SignatureCrudController'); - Route::crud('fluidbook-iconset', 'FluidbookIconsetCrudController'); - Route::crud('users', 'UsersCrudController'); - Route::crud('fluidbook-translate', 'FluidbookTranslateCrudController'); + Route::crud('team-emails', 'TeamEmailsCrudController'); + Route::crud('toolbox-translate', 'ToolboxTranslateCrudController'); } catch(\Throwable $e) { } -- 2.39.5