diff --git a/database/seeds/AvaliadorSeeder.php b/database/seeds/AvaliadorSeeder.php index 12138dab603463c5c8c4278a3aa6f101853e993c..e2d072b62d34eae858d5e5baf29aae57e11efeef 100644 --- a/database/seeds/AvaliadorSeeder.php +++ b/database/seeds/AvaliadorSeeder.php @@ -19,17 +19,17 @@ class AvaliadorSeeder extends Seeder 'area_id' => 1, ]); - $aval = App\Avaliador::find(1); - $evento = App\Evento::find(1); - $trabalho = App\Trabalho::find(1); - $trabalho2 = App\Trabalho::find(2); + // $aval = App\Avaliador::find(1); + // $evento = App\Evento::find(1); + // $trabalho = App\Trabalho::find(1); + // $trabalho2 = App\Trabalho::find(2); - $aval->eventos()->attach($evento); - $aval->trabalhos()->attach($trabalho); - $aval->trabalhos()->attach($trabalho2); - $aval->trabalhos->first()->pivot->status = 1; + // $aval->eventos()->attach($evento); + // $aval->trabalhos()->attach($trabalho); + // $aval->trabalhos()->attach($trabalho2); + // $aval->trabalhos->first()->pivot->status = 1; - $aval->save(); + // $aval->save(); $user_id = DB::table('users')->where('name','Avaliador2')->pluck('id'); @@ -38,16 +38,16 @@ class AvaliadorSeeder extends Seeder 'user_id' => $user_id[0], 'area_id' => 1, ]); - $aval = App\Avaliador::find(2); - $evento = App\Evento::find(1); - $trabalho = App\Trabalho::find(1); - $aval->trabalhos()->attach($trabalho); - $aval->trabalhos->first()->pivot->status = 1; + // $aval = App\Avaliador::find(2); + // $evento = App\Evento::find(1); + // $trabalho = App\Trabalho::find(1); + // $aval->trabalhos()->attach($trabalho); + // $aval->trabalhos->first()->pivot->status = 1; - $aval->eventos()->attach($evento); - $aval->save(); + // $aval->eventos()->attach($evento); + // $aval->save(); - $user_id = DB::table('users')->where('name','Avaliador3')->pluck('id'); + // $user_id = DB::table('users')->where('name','Avaliador3')->pluck('id'); DB::table('avaliadors')->insert([ 'user_id' => $user_id[0], diff --git a/database/seeds/DatabaseSeeder.php b/database/seeds/DatabaseSeeder.php index 9eeadd93bd7831b66365107983600cd5791258ff..22f52d1171c453d6eea36e64fea2cdc89a582302 100644 --- a/database/seeds/DatabaseSeeder.php +++ b/database/seeds/DatabaseSeeder.php @@ -21,9 +21,10 @@ class DatabaseSeeder extends Seeder $this->call(SubAreaSeeder::class); $this->call(FuncaoParticipanteSeeder::class); $this->call(CoordenadorComissaoSeeder::class); - //$this->call(ParticipanteSeeder::class); + // $this->call(ParticipanteSeeder::class); $this->call(NaturezaSeeder::class); $this->call(RecomendacaoSeeder::class); + $this->call(AvaliadorSeeder::class); // $this->call(UsersTableSeeder::class); diff --git a/database/seeds/ProponenteSeeder.php b/database/seeds/ProponenteSeeder.php index d3794b2d2a22c9734aadadc1f44140692e512296..aa733d384a1ce628c39c9838eb0e21612a274327 100644 --- a/database/seeds/ProponenteSeeder.php +++ b/database/seeds/ProponenteSeeder.php @@ -12,14 +12,11 @@ class ProponenteSeeder extends Seeder */ public function run() { - $user_id = DB::table('users')->where('name','Proponente')->pluck('id'); + $user_id = DB::table('users')->where('name','Proponente')->select('id'); DB::table('proponentes')->insert([ - 'user_id' => $user_id[0], - //'CPF' => '123123123', + 'user_id' => '4', 'SIAPE' => '123123123', - //'email' => '123123123', - //'email' => '123123123', 'cargo' => '123123123', 'vinculo' => '123123123', 'titulacaoMaxima' => 'Mestrado', @@ -28,27 +25,22 @@ class ProponenteSeeder extends Seeder 'bolsistaProdutividade' => '123123123', 'nivel' => '123123123', 'linkLattes' => 'http://lattes.cnpq.br/8363536830656923', - 'created_at' => '2020-01-01 00:00:00' ]); - $user_id = DB::table('users')->where('name','Gabriel')->pluck('id'); + // $user_id = DB::table('users')->where('name','Gabriel')->pluck('id'); - DB::table('proponentes')->insert([ - 'user_id' => $user_id[0], - //'CPF' => '123123123', - 'SIAPE' => '123123123', - //'email' => '123123123', - //'email' => '123123123', - 'cargo' => '123123123', - 'vinculo' => '123123123', - 'titulacaoMaxima' => 'Mestrado', - 'anoTitulacao' => '123123123', - 'areaFormacao' => '123123123', - 'bolsistaProdutividade' => '123123123', - 'nivel' => '123123123', - 'linkLattes' => 'http://lattes.cnpq.br/8363536830656923', - 'created_at' => '2020-01-01 00:00:00' + // DB::table('proponentes')->insert([ + // 'user_id' => '1', + // 'SIAPE' => '123123123', + // 'cargo' => '123123123', + // 'vinculo' => '123123123', + // 'titulacaoMaxima' => 'Mestrado', + // 'anoTitulacao' => '123123123', + // 'areaFormacao' => '123123123', + // 'bolsistaProdutividade' => '123123123', + // 'nivel' => '123123123', + // 'linkLattes' => 'http://lattes.cnpq.br/8363536830656923', - ]); + // ]); } } \ No newline at end of file diff --git a/public/img/icons/confirm.png b/public/img/icons/confirm.png new file mode 100644 index 0000000000000000000000000000000000000000..206b6320055479b70025a2d88dcbec3fea1016e0 Binary files /dev/null and b/public/img/icons/confirm.png differ diff --git a/public/img/icons/recuse.png b/public/img/icons/recuse.png new file mode 100755 index 0000000000000000000000000000000000000000..b73d8e82c0365c3e355c2d049a54e259642aaf86 Binary files /dev/null and b/public/img/icons/recuse.png differ diff --git a/resources/views/avaliador/editais.blade.php b/resources/views/avaliador/editais.blade.php index 420e58b2b23beda302d75090390302deedf0d9b7..df3e7997a79270ade6338ffc85329b99f6da2907 100644 --- a/resources/views/avaliador/editais.blade.php +++ b/resources/views/avaliador/editais.blade.php @@ -46,11 +46,11 @@ @elseif(is_null(Auth::user()->avaliadors->eventos->where('id', $evento->id)->first()->pivot->convite) ) - + Aceitar Convite - + Recusar Convite @endif diff --git a/resources/views/evento/submeterTrabalho.blade.php b/resources/views/evento/submeterTrabalho.blade.php index 1dff1b210f09919f68699eaef7cf2ee5654f0c4a..58ec14a70a7b341aa5186e9dc556f77f259d485f 100644 --- a/resources/views/evento/submeterTrabalho.blade.php +++ b/resources/views/evento/submeterTrabalho.blade.php @@ -414,7 +414,11 @@ - Cancelar + @if (Auth()->user()->administradors != null) + Cancelar + @else + Cancelar + @endif diff --git a/resources/views/evento/visualizarEvento.blade.php b/resources/views/evento/visualizarEvento.blade.php index d8a1d1635eebf9e7609d2166185e5f6b66b9f2ad..1609dd099b5657a21b60e0e21de07c9f8efeb5b3 100644 --- a/resources/views/evento/visualizarEvento.blade.php +++ b/resources/views/evento/visualizarEvento.blade.php @@ -263,7 +263,18 @@
- Voltar + @if (Auth::check()) + @if (Auth()->user()->administradors != null) + Voltar + @elseif (Auth()->user()->proponentes != null) + Voltar + @else + Voltar + + @endif + @else + Voltar + @endif
@if($evento->inicioSubmissao <= $mytime) diff --git a/resources/views/projeto/editar.blade.php b/resources/views/projeto/editar.blade.php index 509d1c2732c2d82763948825d752ae8efd96f6fd..161cc7b48ff3ba8de39f3682f6b6ac762ebedde6 100644 --- a/resources/views/projeto/editar.blade.php +++ b/resources/views/projeto/editar.blade.php @@ -393,7 +393,11 @@

- Cancelar + @if (Auth()->user()->administradors != null) + Cancelar + @else + Cancelar + @endif