diff --git a/app/Http/Controllers/DashboardController.php b/app/Http/Controllers/DashboardController.php index 4a0edaa5f4bb343967f1192bafe75fd205428636..c572fbf44333b2304fc518d55f15e317023b91da 100644 --- a/app/Http/Controllers/DashboardController.php +++ b/app/Http/Controllers/DashboardController.php @@ -14,15 +14,16 @@ class DashboardController extends Controller $user = Auth::user(); - if($user->isTypeAdmin()) - { + if($user->isTypeAdmin()){ return view('dashboard', ['unidades' => UnidadeQuery::all(), 'unidade_index' => 1]); - } - - if($user->isTypeTeacher()) - { + }elseif ($user->isTypeTeacher()) { return view('dashboard', ['PADs' => PAD::all(), 'menu_index'=> 0]); - } - } + }elseif ($user->isTypeDirector()) { + return view('dashboard', ['PADs' => PAD::all(), 'menu_index'=> 0]); + }elseif ($user->isTypeCoordinator()) { + return view('dashboard', ['PADs' => PAD::all(), 'menu_index'=> 0]); + } + //return redirect()->route('login'); + } } diff --git a/app/Http/Controllers/PADController.php b/app/Http/Controllers/PadController.php similarity index 100% rename from app/Http/Controllers/PADController.php rename to app/Http/Controllers/PadController.php diff --git a/app/Models/User.php b/app/Models/User.php index 329c5a6d086419d7bc7e5fec596aba6d52ef892e..f090565c46c99cad949fcf9644ad808380db02cb 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -16,7 +16,7 @@ class User extends Authenticatable const TYPE_ADMIN = 1; // Administrador const TYPE_TEACHER = 2; // Professor - const TYPE_MANAGER = 3; // Diretor + const TYPE_DIRECTOR= 3; // Diretor const TYPE_COORDINATOR = 4; // Coordenador const STATUS_ACTIVE = 1; @@ -117,8 +117,8 @@ class User extends Authenticatable /** * @return bool */ - public function isTypeMenager() { - return $this->type === self::TYPE_MANAGER; + public function isTypeDirector() { + return $this->type === self::TYPE_DIRECTOR; } /** diff --git a/composer.lock b/composer.lock index e5252dc1b24bcd8b4e49f1fdac650cd58522dccd..6d6d6aac93d21648023376f543d8dae9ff13d8f5 100644 --- a/composer.lock +++ b/composer.lock @@ -292,16 +292,16 @@ }, { "name": "doctrine/dbal", - "version": "3.3.6", + "version": "3.3.7", "source": { "type": "git", "url": "https://github.com/doctrine/dbal.git", - "reference": "9e7f76dd1cde81c62574fdffa5a9c655c847ad21" + "reference": "9f79d4650430b582f4598fe0954ef4d52fbc0a8a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/dbal/zipball/9e7f76dd1cde81c62574fdffa5a9c655c847ad21", - "reference": "9e7f76dd1cde81c62574fdffa5a9c655c847ad21", + "url": "https://api.github.com/repos/doctrine/dbal/zipball/9f79d4650430b582f4598fe0954ef4d52fbc0a8a", + "reference": "9f79d4650430b582f4598fe0954ef4d52fbc0a8a", "shasum": "" }, "require": { @@ -316,11 +316,11 @@ "require-dev": { "doctrine/coding-standard": "9.0.0", "jetbrains/phpstorm-stubs": "2022.1", - "phpstan/phpstan": "1.6.3", + "phpstan/phpstan": "1.7.13", "phpstan/phpstan-strict-rules": "^1.2", "phpunit/phpunit": "9.5.20", "psalm/plugin-phpunit": "0.16.1", - "squizlabs/php_codesniffer": "3.6.2", + "squizlabs/php_codesniffer": "3.7.0", "symfony/cache": "^5.2|^6.0", "symfony/console": "^2.7|^3.0|^4.0|^5.0|^6.0", "vimeo/psalm": "4.23.0" @@ -383,7 +383,7 @@ ], "support": { "issues": "https://github.com/doctrine/dbal/issues", - "source": "https://github.com/doctrine/dbal/tree/3.3.6" + "source": "https://github.com/doctrine/dbal/tree/3.3.7" }, "funding": [ { @@ -399,7 +399,7 @@ "type": "tidelift" } ], - "time": "2022-05-02T17:21:01+00:00" + "time": "2022-06-13T21:43:03+00:00" }, { "name": "doctrine/deprecations", @@ -977,22 +977,22 @@ }, { "name": "guzzlehttp/guzzle", - "version": "7.4.3", + "version": "7.4.5", "source": { "type": "git", "url": "https://github.com/guzzle/guzzle.git", - "reference": "74a8602c6faec9ef74b7a9391ac82c5e65b1cdab" + "reference": "1dd98b0564cb3f6bd16ce683cb755f94c10fbd82" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle/zipball/74a8602c6faec9ef74b7a9391ac82c5e65b1cdab", - "reference": "74a8602c6faec9ef74b7a9391ac82c5e65b1cdab", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/1dd98b0564cb3f6bd16ce683cb755f94c10fbd82", + "reference": "1dd98b0564cb3f6bd16ce683cb755f94c10fbd82", "shasum": "" }, "require": { "ext-json": "*", "guzzlehttp/promises": "^1.5", - "guzzlehttp/psr7": "^1.8.3 || ^2.1", + "guzzlehttp/psr7": "^1.9 || ^2.4", "php": "^7.2.5 || ^8.0", "psr/http-client": "^1.0", "symfony/deprecation-contracts": "^2.2 || ^3.0" @@ -1081,7 +1081,7 @@ ], "support": { "issues": "https://github.com/guzzle/guzzle/issues", - "source": "https://github.com/guzzle/guzzle/tree/7.4.3" + "source": "https://github.com/guzzle/guzzle/tree/7.4.5" }, "funding": [ { @@ -1097,7 +1097,7 @@ "type": "tidelift" } ], - "time": "2022-05-25T13:24:33+00:00" + "time": "2022-06-20T22:16:13+00:00" }, { "name": "guzzlehttp/promises", @@ -1185,16 +1185,16 @@ }, { "name": "guzzlehttp/psr7", - "version": "2.2.1", + "version": "2.4.0", "source": { "type": "git", "url": "https://github.com/guzzle/psr7.git", - "reference": "c94a94f120803a18554c1805ef2e539f8285f9a2" + "reference": "13388f00956b1503577598873fffb5ae994b5737" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/psr7/zipball/c94a94f120803a18554c1805ef2e539f8285f9a2", - "reference": "c94a94f120803a18554c1805ef2e539f8285f9a2", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/13388f00956b1503577598873fffb5ae994b5737", + "reference": "13388f00956b1503577598873fffb5ae994b5737", "shasum": "" }, "require": { @@ -1218,7 +1218,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.2-dev" + "dev-master": "2.4-dev" } }, "autoload": { @@ -1280,7 +1280,7 @@ ], "support": { "issues": "https://github.com/guzzle/psr7/issues", - "source": "https://github.com/guzzle/psr7/tree/2.2.1" + "source": "https://github.com/guzzle/psr7/tree/2.4.0" }, "funding": [ { @@ -1296,20 +1296,20 @@ "type": "tidelift" } ], - "time": "2022-03-20T21:55:58+00:00" + "time": "2022-06-20T21:43:11+00:00" }, { "name": "laravel/framework", - "version": "v8.83.15", + "version": "v8.83.18", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "bf8fbdd9061611b2c05562fa14f6987cc5145d78" + "reference": "db8188e9cc8359a5c6706fa9d9f55aad7f235077" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/bf8fbdd9061611b2c05562fa14f6987cc5145d78", - "reference": "bf8fbdd9061611b2c05562fa14f6987cc5145d78", + "url": "https://api.github.com/repos/laravel/framework/zipball/db8188e9cc8359a5c6706fa9d9f55aad7f235077", + "reference": "db8188e9cc8359a5c6706fa9d9f55aad7f235077", "shasum": "" }, "require": { @@ -1469,7 +1469,7 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2022-05-31T14:57:02+00:00" + "time": "2022-06-28T14:30:38+00:00" }, { "name": "laravel/sanctum", @@ -1665,16 +1665,16 @@ }, { "name": "league/commonmark", - "version": "2.3.2", + "version": "2.3.3", "source": { "type": "git", "url": "https://github.com/thephpleague/commonmark.git", - "reference": "6eddb90a9e4a1a8c5773226068fcfb48cb36812a" + "reference": "0da1dca5781dd3cfddbe328224d9a7a62571addc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/6eddb90a9e4a1a8c5773226068fcfb48cb36812a", - "reference": "6eddb90a9e4a1a8c5773226068fcfb48cb36812a", + "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/0da1dca5781dd3cfddbe328224d9a7a62571addc", + "reference": "0da1dca5781dd3cfddbe328224d9a7a62571addc", "shasum": "" }, "require": { @@ -1767,7 +1767,7 @@ "type": "tidelift" } ], - "time": "2022-06-03T14:07:39+00:00" + "time": "2022-06-07T21:28:26+00:00" }, { "name": "league/config", @@ -2003,16 +2003,16 @@ }, { "name": "monolog/monolog", - "version": "2.6.0", + "version": "2.7.0", "source": { "type": "git", "url": "https://github.com/Seldaek/monolog.git", - "reference": "247918972acd74356b0a91dfaa5adcaec069b6c0" + "reference": "5579edf28aee1190a798bfa5be8bc16c563bd524" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/247918972acd74356b0a91dfaa5adcaec069b6c0", - "reference": "247918972acd74356b0a91dfaa5adcaec069b6c0", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/5579edf28aee1190a798bfa5be8bc16c563bd524", + "reference": "5579edf28aee1190a798bfa5be8bc16c563bd524", "shasum": "" }, "require": { @@ -2091,7 +2091,7 @@ ], "support": { "issues": "https://github.com/Seldaek/monolog/issues", - "source": "https://github.com/Seldaek/monolog/tree/2.6.0" + "source": "https://github.com/Seldaek/monolog/tree/2.7.0" }, "funding": [ { @@ -2103,7 +2103,7 @@ "type": "tidelift" } ], - "time": "2022-05-10T09:36:00+00:00" + "time": "2022-06-09T08:59:12+00:00" }, { "name": "nesbot/carbon", @@ -3324,16 +3324,16 @@ }, { "name": "symfony/console", - "version": "v5.4.9", + "version": "v5.4.10", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "829d5d1bf60b2efeb0887b7436873becc71a45eb" + "reference": "4d671ab4ddac94ee439ea73649c69d9d200b5000" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/829d5d1bf60b2efeb0887b7436873becc71a45eb", - "reference": "829d5d1bf60b2efeb0887b7436873becc71a45eb", + "url": "https://api.github.com/repos/symfony/console/zipball/4d671ab4ddac94ee439ea73649c69d9d200b5000", + "reference": "4d671ab4ddac94ee439ea73649c69d9d200b5000", "shasum": "" }, "require": { @@ -3403,7 +3403,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v5.4.9" + "source": "https://github.com/symfony/console/tree/v5.4.10" }, "funding": [ { @@ -3419,7 +3419,7 @@ "type": "tidelift" } ], - "time": "2022-05-18T06:17:34+00:00" + "time": "2022-06-26T13:00:04+00:00" }, { "name": "symfony/css-selector", @@ -3489,7 +3489,7 @@ }, { "name": "symfony/deprecation-contracts", - "version": "v2.5.1", + "version": "v2.5.2", "source": { "type": "git", "url": "https://github.com/symfony/deprecation-contracts.git", @@ -3536,7 +3536,7 @@ "description": "A generic function and convention to trigger deprecation notices", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/deprecation-contracts/tree/v2.5.1" + "source": "https://github.com/symfony/deprecation-contracts/tree/v2.5.2" }, "funding": [ { @@ -3712,7 +3712,7 @@ }, { "name": "symfony/event-dispatcher-contracts", - "version": "v2.5.1", + "version": "v2.5.2", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher-contracts.git", @@ -3771,7 +3771,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v2.5.1" + "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v2.5.2" }, "funding": [ { @@ -3854,16 +3854,16 @@ }, { "name": "symfony/http-foundation", - "version": "v5.4.9", + "version": "v5.4.10", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "6b0d0e4aca38d57605dcd11e2416994b38774522" + "reference": "e7793b7906f72a8cc51054fbca9dcff7a8af1c1e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/6b0d0e4aca38d57605dcd11e2416994b38774522", - "reference": "6b0d0e4aca38d57605dcd11e2416994b38774522", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/e7793b7906f72a8cc51054fbca9dcff7a8af1c1e", + "reference": "e7793b7906f72a8cc51054fbca9dcff7a8af1c1e", "shasum": "" }, "require": { @@ -3907,7 +3907,7 @@ "description": "Defines an object-oriented layer for the HTTP specification", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-foundation/tree/v5.4.9" + "source": "https://github.com/symfony/http-foundation/tree/v5.4.10" }, "funding": [ { @@ -3923,20 +3923,20 @@ "type": "tidelift" } ], - "time": "2022-05-17T15:07:29+00:00" + "time": "2022-06-19T13:13:40+00:00" }, { "name": "symfony/http-kernel", - "version": "v5.4.9", + "version": "v5.4.10", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "34b121ad3dc761f35fe1346d2f15618f8cbf77f8" + "reference": "255ae3b0a488d78fbb34da23d3e0c059874b5948" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/34b121ad3dc761f35fe1346d2f15618f8cbf77f8", - "reference": "34b121ad3dc761f35fe1346d2f15618f8cbf77f8", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/255ae3b0a488d78fbb34da23d3e0c059874b5948", + "reference": "255ae3b0a488d78fbb34da23d3e0c059874b5948", "shasum": "" }, "require": { @@ -4019,7 +4019,7 @@ "description": "Provides a structured process for converting a Request into a Response", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-kernel/tree/v5.4.9" + "source": "https://github.com/symfony/http-kernel/tree/v5.4.10" }, "funding": [ { @@ -4035,20 +4035,20 @@ "type": "tidelift" } ], - "time": "2022-05-27T07:09:08+00:00" + "time": "2022-06-26T16:57:59+00:00" }, { "name": "symfony/mime", - "version": "v5.4.9", + "version": "v5.4.10", "source": { "type": "git", "url": "https://github.com/symfony/mime.git", - "reference": "2b3802a24e48d0cfccf885173d2aac91e73df92e" + "reference": "02265e1e5111c3cd7480387af25e82378b7ab9cc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mime/zipball/2b3802a24e48d0cfccf885173d2aac91e73df92e", - "reference": "2b3802a24e48d0cfccf885173d2aac91e73df92e", + "url": "https://api.github.com/repos/symfony/mime/zipball/02265e1e5111c3cd7480387af25e82378b7ab9cc", + "reference": "02265e1e5111c3cd7480387af25e82378b7ab9cc", "shasum": "" }, "require": { @@ -4102,7 +4102,7 @@ "mime-type" ], "support": { - "source": "https://github.com/symfony/mime/tree/v5.4.9" + "source": "https://github.com/symfony/mime/tree/v5.4.10" }, "funding": [ { @@ -4118,7 +4118,7 @@ "type": "tidelift" } ], - "time": "2022-05-21T10:24:18+00:00" + "time": "2022-06-09T12:22:40+00:00" }, { "name": "symfony/polyfill-ctype", @@ -5091,16 +5091,16 @@ }, { "name": "symfony/service-contracts", - "version": "v2.5.1", + "version": "v2.5.2", "source": { "type": "git", "url": "https://github.com/symfony/service-contracts.git", - "reference": "24d9dc654b83e91aa59f9d167b131bc3b5bea24c" + "reference": "4b426aac47d6427cc1a1d0f7e2ac724627f5966c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/service-contracts/zipball/24d9dc654b83e91aa59f9d167b131bc3b5bea24c", - "reference": "24d9dc654b83e91aa59f9d167b131bc3b5bea24c", + "url": "https://api.github.com/repos/symfony/service-contracts/zipball/4b426aac47d6427cc1a1d0f7e2ac724627f5966c", + "reference": "4b426aac47d6427cc1a1d0f7e2ac724627f5966c", "shasum": "" }, "require": { @@ -5154,7 +5154,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/service-contracts/tree/v2.5.1" + "source": "https://github.com/symfony/service-contracts/tree/v2.5.2" }, "funding": [ { @@ -5170,20 +5170,20 @@ "type": "tidelift" } ], - "time": "2022-03-13T20:07:29+00:00" + "time": "2022-05-30T19:17:29+00:00" }, { "name": "symfony/string", - "version": "v5.4.9", + "version": "v5.4.10", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "985e6a9703ef5ce32ba617c9c7d97873bb7b2a99" + "reference": "4432bc7df82a554b3e413a8570ce2fea90e94097" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/985e6a9703ef5ce32ba617c9c7d97873bb7b2a99", - "reference": "985e6a9703ef5ce32ba617c9c7d97873bb7b2a99", + "url": "https://api.github.com/repos/symfony/string/zipball/4432bc7df82a554b3e413a8570ce2fea90e94097", + "reference": "4432bc7df82a554b3e413a8570ce2fea90e94097", "shasum": "" }, "require": { @@ -5240,7 +5240,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v5.4.9" + "source": "https://github.com/symfony/string/tree/v5.4.10" }, "funding": [ { @@ -5256,7 +5256,7 @@ "type": "tidelift" } ], - "time": "2022-04-19T10:40:37+00:00" + "time": "2022-06-26T15:57:47+00:00" }, { "name": "symfony/translation", @@ -5357,16 +5357,16 @@ }, { "name": "symfony/translation-contracts", - "version": "v2.5.1", + "version": "v2.5.2", "source": { "type": "git", "url": "https://github.com/symfony/translation-contracts.git", - "reference": "1211df0afa701e45a04253110e959d4af4ef0f07" + "reference": "136b19dd05cdf0709db6537d058bcab6dd6e2dbe" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/1211df0afa701e45a04253110e959d4af4ef0f07", - "reference": "1211df0afa701e45a04253110e959d4af4ef0f07", + "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/136b19dd05cdf0709db6537d058bcab6dd6e2dbe", + "reference": "136b19dd05cdf0709db6537d058bcab6dd6e2dbe", "shasum": "" }, "require": { @@ -5415,7 +5415,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/translation-contracts/tree/v2.5.1" + "source": "https://github.com/symfony/translation-contracts/tree/v2.5.2" }, "funding": [ { @@ -5431,7 +5431,7 @@ "type": "tidelift" } ], - "time": "2022-01-02T09:53:40+00:00" + "time": "2022-06-27T16:58:25+00:00" }, { "name": "symfony/var-dumper", @@ -6246,16 +6246,16 @@ }, { "name": "laravel/breeze", - "version": "v1.9.2", + "version": "v1.10.0", "source": { "type": "git", "url": "https://github.com/laravel/breeze.git", - "reference": "6f6a2588c429ea39821ec9add48442b05fe343f7" + "reference": "e98e855ab4bde5bf0083c4a4d73c0f5b474241ae" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/breeze/zipball/6f6a2588c429ea39821ec9add48442b05fe343f7", - "reference": "6f6a2588c429ea39821ec9add48442b05fe343f7", + "url": "https://api.github.com/repos/laravel/breeze/zipball/e98e855ab4bde5bf0083c4a4d73c0f5b474241ae", + "reference": "e98e855ab4bde5bf0083c4a4d73c0f5b474241ae", "shasum": "" }, "require": { @@ -6299,20 +6299,20 @@ "issues": "https://github.com/laravel/breeze/issues", "source": "https://github.com/laravel/breeze" }, - "time": "2022-05-30T13:21:35+00:00" + "time": "2022-06-28T11:52:06+00:00" }, { "name": "laravel/sail", - "version": "v1.14.8", + "version": "v1.15.0", "source": { "type": "git", "url": "https://github.com/laravel/sail.git", - "reference": "04b425968c6a76940bddd2cfa40bf9e9ce78eee8" + "reference": "676e1ff33c1b8af657779f62f57360c376cba666" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/sail/zipball/04b425968c6a76940bddd2cfa40bf9e9ce78eee8", - "reference": "04b425968c6a76940bddd2cfa40bf9e9ce78eee8", + "url": "https://api.github.com/repos/laravel/sail/zipball/676e1ff33c1b8af657779f62f57360c376cba666", + "reference": "676e1ff33c1b8af657779f62f57360c376cba666", "shasum": "" }, "require": { @@ -6359,7 +6359,7 @@ "issues": "https://github.com/laravel/sail/issues", "source": "https://github.com/laravel/sail" }, - "time": "2022-05-31T14:48:21+00:00" + "time": "2022-06-24T13:56:11+00:00" }, { "name": "mockery/mockery", @@ -7237,16 +7237,16 @@ }, { "name": "phpunit/phpunit", - "version": "9.5.20", + "version": "9.5.21", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "12bc8879fb65aef2138b26fc633cb1e3620cffba" + "reference": "0e32b76be457de00e83213528f6bb37e2a38fcb1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/12bc8879fb65aef2138b26fc633cb1e3620cffba", - "reference": "12bc8879fb65aef2138b26fc633cb1e3620cffba", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/0e32b76be457de00e83213528f6bb37e2a38fcb1", + "reference": "0e32b76be457de00e83213528f6bb37e2a38fcb1", "shasum": "" }, "require": { @@ -7280,7 +7280,6 @@ "sebastian/version": "^3.0.2" }, "require-dev": { - "ext-pdo": "*", "phpspec/prophecy-phpunit": "^2.0.1" }, "suggest": { @@ -7324,7 +7323,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", - "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.20" + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.21" }, "funding": [ { @@ -7336,7 +7335,7 @@ "type": "github" } ], - "time": "2022-04-01T12:37:26+00:00" + "time": "2022-06-19T12:14:25+00:00" }, { "name": "sebastian/cli-parser", diff --git a/database/migrations/2022_03_20_233345_create_ref_planejamento_ches_table.php b/database/migrations/2022_03_20_233345_create_ref_planejamento_ches_table.php index 6ab3e0f7f5902e526b2b9920d4250c6e68b7d6c4..3b073dd8987d8d250cd00eeafa5aacc875ed3e2a 100644 --- a/database/migrations/2022_03_20_233345_create_ref_planejamento_ches_table.php +++ b/database/migrations/2022_03_20_233345_create_ref_planejamento_ches_table.php @@ -20,7 +20,7 @@ class CreateRefPlanejamentoChesTable extends Migration $table->float("ch_semanal", 5, 2); $table->float("ch_maxima", 5, 2); $table->foreignId('PAD_id') - ->constrained() + ->constrained('pads') ->onUpdate('cascade') ->onDelete('cascade'); diff --git a/database/seeders/UserSeeder.php b/database/seeders/UserSeeder.php index 90d75b8c509d25cc2716780437face0ebe7eb6e7..24591f588253d13730a0f1aa4091d8ac8bfd6ec3 100644 --- a/database/seeders/UserSeeder.php +++ b/database/seeders/UserSeeder.php @@ -47,5 +47,31 @@ class UserSeeder extends Seeder 'campus_id' => NULL, 'curso_id' => NULL, ]); + + //UserDirector + User::create([ + 'type' => User::TYPE_DIRECTOR, + 'name' => "Director", + 'email' => "director@upe.br", + 'email_verified_at' => null, + 'password' => Hash::make('@director'), + 'document' => "100000000", + 'status' => User::STATUS_ACTIVE, + 'campus_id' => 1, + 'curso_id' => 1, + ]); + + //UserDirector + User::create([ + 'type' => User::TYPE_COORDINATOR, + 'name' => "Coordinator", + 'email' => "coordinator@upe.br", + 'email_verified_at' => null, + 'password' => Hash::make('@coordinator'), + 'document' => "100000000", + 'status' => User::STATUS_ACTIVE, + 'campus_id' => 1, + 'curso_id' => 1, + ]); } } diff --git a/public/css/dashboard.css b/public/css/dashboard.css index 25207135906d36e7dda14f3914f1bf8e548ce9fe..747c6bf36caddc89a0a171d1f1dc4a73174e5720 100644 --- a/public/css/dashboard.css +++ b/public/css/dashboard.css @@ -29,9 +29,9 @@ header { } header .header-left-side { - width: 60vw; - background: linear-gradient(110deg, #f7f7f7 60%, #dfdfdf 60%); - padding-left: 15vh; + background-color: #f7f7f7; + padding: 1em 3em 1em 15vh; + background: linear-gradient(110deg, #f7f7f7 90%, #dfdfdf 0%); } header .header-right-side { @@ -53,7 +53,9 @@ nav { margin-left: 13vh; margin-right: 1em; border-radius: 0.5em; - border: 1px solid #dee2e6 !important; + border: 2px solid #dee2e6 !important; + padding: .5em; + } nav ul li a { @@ -65,6 +67,7 @@ nav ul .active { background-color: #dfdfdf !important; color: #17223b !important; font-weight: bold; + border-left: solid 3px #0d6efd; /* border: 1px solid #007bff; */ } @@ -72,6 +75,19 @@ nav .content-user-info { font-weight: bold; } +nav .custom-nav-link{ + display: block; + padding: .5rem 1rem; + color: #2e4363; + text-decoration: none; + border-radius: .2em; + transition: color .15s ease-in-out,background-color .15s ease-in-out,border-color .15s ease-in-out; +} + +nav .custom-nav-link:hover{ + color: #0d6efd; +} + @media (min-width: 768px) { .bd-placeholder-img-lg { font-size: 3.5rem; diff --git a/public/css/layout.css b/public/css/layout.css deleted file mode 100644 index 24b65bf07bd085826e2ea11edcfc30f1fe1edfcd..0000000000000000000000000000000000000000 --- a/public/css/layout.css +++ /dev/null @@ -1,62 +0,0 @@ -/* content que contem o preview do perfil */ -.content { - position: relative; - top: 0px; - width: 100%; - padding: 18px 6% 10px 6%; - margin: 0 0 30px 0; - border-bottom: 1px solid #dee2e6!important; -} - -header{ - background-color: #DFDFDF; - margin-bottom: 30px; -} - -header .header-left-side{ - width: 60vw; - font-family: 'Electrolize', sans-serif; - background: linear-gradient(110deg, #F7F7F7 60%, #DFDFDF 60%); - padding-left: 15vh; -} - -header .header-right-side{ - padding-right: 15vh; -} - -.main-container{ - display: flex; - flex-direction: row; -} - -main{ - min-height: 70vh; -} - -nav{ - margin-left: 13vh; - margin-right: 1em; - border-radius: .5em; - border: 1px solid #dee2e6!important; -} - -nav ul li a{ - color: #17223b; - font-size: large; -} - -nav ul .active{ - background-color: #DFDFDF!important; - color: #17223b!important; - font-weight: bold; -} - -nav .content-user-info{ - font-weight: bold; -} - -@media (min-width: 768px) { - .bd-placeholder-img-lg { - font-size: 3.5rem; - } -} \ No newline at end of file diff --git a/resources/views/dashboard.blade.php b/resources/views/dashboard.blade.php index 0fb0daead0a467c392d8ee05f0447f589722e489..98f917a6c95c577b97faecd1f7e90e736df8b52c 100644 --- a/resources/views/dashboard.blade.php +++ b/resources/views/dashboard.blade.php @@ -1,5 +1,5 @@ - @section('title', 'Home') + @section('title', 'Home')sdfsdfsdfsf
@if(Auth::user()->isTypeAdmin()) @@ -10,8 +10,8 @@ @include('layouts.user-dashboard.dashboard_teacher', ['user' => Auth::user()]) @endif - @if(Auth::user()->isTypeMenager()) - @include('layouts.user-dashboard.dashboard_menager') + @if(Auth::user()->isTypeDirector()) + @include('layouts.user-dashboard.dashboard_director') @endif @if(Auth::user()->isTypeCoordinator()) diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index b0b4fa3a1f866e740e546fdc83322804ae037be8..6e41ffdcf5c0bcf2c5f3b3e1c4a4b2e0370cc5ad 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -44,8 +44,8 @@ @include('layouts.user-jquery.jquery_teacher') @endif - @if(Auth::user()->isTypeMenager()) - @include('layouts.user-jquery.jquery_menager') + @if(Auth::user()->isTypeDirector()) + @include('layouts.user-jquery.jquery_director') @endif @if(Auth::user()->isTypeCoordinator()) diff --git a/resources/views/layouts/header.blade.php b/resources/views/layouts/header.blade.php index b5af652d4250c945e113d70647ad87a38753e75e..d685d3a29264e5413ed369e3874ce9d562aa9cce 100644 --- a/resources/views/layouts/header.blade.php +++ b/resources/views/layouts/header.blade.php @@ -7,6 +7,7 @@ class="img-fluid" width="268" height="100" alt="" />
+
diff --git a/resources/views/layouts/main.blade.php b/resources/views/layouts/main.blade.php index edd3b24399c5a0775d37101a9bbd18552d492177..5677e07cbe895b268db8027d595f977573c0d187 100644 --- a/resources/views/layouts/main.blade.php +++ b/resources/views/layouts/main.blade.php @@ -46,8 +46,8 @@ @include('layouts.user-jquery.jquery_teacher') @endif - @if (Auth::user()->isTypeMenager()) - @include('layouts.user-jquery.jquery_menager') + @if (Auth::user()->isTypeDirector()) + @include('layouts.user-jquery.jquery_director') @endif @if (Auth::user()->isTypeCoordinator()) diff --git a/resources/views/layouts/navigation.blade.php b/resources/views/layouts/navigation.blade.php index 2867a3b60f12acb1c02e46fcee5fd146b32344b2..386a36a5d36d253fe2ad1465b45ed4cee057be9a 100644 --- a/resources/views/layouts/navigation.blade.php +++ b/resources/views/layouts/navigation.blade.php @@ -24,8 +24,8 @@ @endif - @if (Auth::user()->isTypeMenager()) - @include('layouts.user-navigation.navigation_menager') + @if (Auth::user()->isTypeDirector()) + @include('layouts.user-navigation.navigation_director') @endif diff --git a/resources/views/layouts/user-dashboard/dashboard_coordinator.blade.php b/resources/views/layouts/user-dashboard/dashboard_coordinator.blade.php index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..64dca5ea2130ca614964ab91389833f75849b539 100644 --- a/resources/views/layouts/user-dashboard/dashboard_coordinator.blade.php +++ b/resources/views/layouts/user-dashboard/dashboard_coordinator.blade.php @@ -0,0 +1,50 @@ +
+
+

Bem Vindo ao PAD

+
+
+

+ + + + Atividades a serem realizdas +

+
+
+ +
+
+ +
+
+

Dimenções-PAD

+
+
+
+
+
Special title treatment
+

With supporting text below as a natural lead-in to additional content.

+ Go somewhere +
+
+
+
+
Special title treatment
+

With supporting text below as a natural lead-in to additional content.

+
+
+
+
+
Special title treatment
+

With supporting text below as a natural lead-in to additional content.

+ Go somewhere +
+
+
+
diff --git a/resources/views/layouts/user-dashboard/dashboard_menager.blade.php b/resources/views/layouts/user-dashboard/dashboard_director.blade.php similarity index 100% rename from resources/views/layouts/user-dashboard/dashboard_menager.blade.php rename to resources/views/layouts/user-dashboard/dashboard_director.blade.php diff --git a/resources/views/layouts/user-navigation/navigation_admin.blade.php b/resources/views/layouts/user-navigation/navigation_admin.blade.php index 3117151669fc2145b4c42905444c66df0ba3303b..a14ca5ddccca7f7ef9a0881418dd36c320663db7 100644 --- a/resources/views/layouts/user-navigation/navigation_admin.blade.php +++ b/resources/views/layouts/user-navigation/navigation_admin.blade.php @@ -1,37 +1,37 @@