novas atualizações

database/migrations/2020_05_21_014825_add_trabalhos_to_proponentes_table.php

@@ -14,7 +14,7 @@ class AddTrabalhosToProponentesTable extends Migration
     public function up()
     {
         Schema::table('proponentes', function (Blueprint $table) {
-            $table->unsignedBigInteger('trabalho_id');
+            $table->unsignedBigInteger('trabalho_id')->nullable();
             $table->foreign('trabalho_id')->references('id')->on('trabalhos');
         });
     }

database/migrations/2020_05_23_054649_create_coordenador_comissaos_table.php

+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateCoordenadorComissaosTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('coordenador_comissaos', function (Blueprint $table) {
+            $table->bigIncrements('id');
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('coordenador_comissaos');
+    }
+}

database/migrations/2020_05_23_054741_add_users_to_coordenador_comissaos_table.php

+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddUsersToCoordenadorComissaosTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('coordenador_comissaos', function (Blueprint $table) {
+            $table->unsignedBigInteger('user_id');
+            $table->foreign('user_id')->references('id')->on('users');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('coordenador_comissaos', function (Blueprint $table) {
+            $table->dropForeign('coordenador_comissaos_user_id_foreign');
+            $table->dropColumn('user_id');
+        });
+    }
+}

database/migrations/2020_05_23_054805_create_avaliadors_table.php

+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateAvaliadorsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('avaliadors', function (Blueprint $table) {
+            $table->bigIncrements('id');
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('avaliadors');
+    }
+}

database/migrations/2020_05_23_054859_add_users_to_avaliadors_table.php

+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddUsersToAvaliadorsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('avaliadors', function (Blueprint $table) {
+            $table->unsignedBigInteger('user_id');
+            $table->foreign('user_id')->references('id')->on('users');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('avaliadors', function (Blueprint $table) {
+            $table->dropForeign('avaliadors_user_id_foreign');
+            $table->dropColumn('user_id');
+        });
+    }
+}

database/migrations/2020_05_23_054945_create_participantes_table.php

+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateParticipantesTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('participantes', function (Blueprint $table) {
+            $table->bigIncrements('id');
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('participantes');
+    }
+}

database/migrations/2020_05_23_055033_add_users_to_participantes_table.php

+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddUsersToParticipantesTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('participantes', function (Blueprint $table) {
+            $table->unsignedBigInteger('user_id')->nullable();
+            $table->foreign('user_id')->references('id')->on('users');
+            $table->unsignedBigInteger('trabalho_id')->nullable();
+            $table->foreign('trabalho_id')->references('id')->on('trabalhos');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('participantes', function (Blueprint $table) {
+            $table->dropForeign('participantes_user_id_foreign');
+            $table->dropColumn('user_id');
+        });
+    }
+}

database/migrations/2020_05_23_071949_add_foreign_to_trabalhos_table.php

+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddForeignToTrabalhosTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('trabalhos', function (Blueprint $table) {
+
+            $table->foreign('grande_area_id')->references('id')->on('grande_areas');
+            $table->foreign('area_id')->references('id')->on('areas');
+            $table->foreign('sub_area_id')->references('id')->on('sub_areas');
+            $table->foreign('evento_id')->references('id')->on('eventos');
+            $table->foreign('proponente_id')->references('id')->on('proponentes');
+
+            //$table->foreignId('user_id')->constrained();
+            // $table->integer('coordenador');
+            // $table->integer('grandeArea_id');
+            // $table->integer('area');
+            // $table->integer('subArea');
+            // $table->integer('eventoId');
+            // $table->integer('proponente_id');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('trabalhos', function (Blueprint $table) {
+            //
+        });
+    }
+}

database/migrations/2020_05_23_182520_create_trabalhos_participantes_table.php

+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateTrabalhosParticipantesTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('trabalho_participante', function (Blueprint $table) {
+            $table->unsignedBigInteger('trabalho_id');
+            $table->unsignedBigInteger('participante_id');
+
+            $table->foreign('trabalho_id')->references('id')->on('trabalhos');
+            $table->foreign('participante_id')->references('id')->on('participantes');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('trabalho_participante');
+    }
+}

database/migrations/2020_05_23_182551_create_trabalhos_proponentes_table.php

+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateTrabalhosProponentesTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('trabalho_proponente', function (Blueprint $table) {
+            $table->unsignedBigInteger('trabalho_id');
+            $table->unsignedBigInteger('proponente_id');
+
+            $table->foreign('trabalho_id')->references('id')->on('trabalhos');
+            $table->foreign('proponente_id')->references('id')->on('proponentes');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('trabalho_proponente');
+    }
+}

database/seeds/CoordenadorComissaoSeeder.php

+<?php
+
+use Illuminate\Database\Seeder;
+
+class CoordenadorComissaoSeeder extends Seeder
+{
+    /**
+     * Run the database seeds.
+     *
+     * @return void
+     */
+    public function run()
+    {
+        $user_id = DB::table('users')->where('name','Coordenador1')->pluck('id');
+
+      	DB::table('coordenador_comissaos')->insert([
+        	'user_id' => $user_id[0],
+      	]);
+
+        $user_id = DB::table('users')->where('name','Coordenador2')->pluck('id');
+
+        DB::table('coordenador_comissaos')->insert([
+            'user_id' => $user_id[0],
+        ]);
+    }
+}

database/seeds/DatabaseSeeder.php

@@ -15,10 +15,12 @@ class DatabaseSeeder extends Seeder
         $this->call(UsuarioSeeder::class);
         $this->call(AdministradorSeeder::class);
         $this->call(AdministradorResponsavelSeeder::class);
+        $this->call(ProponenteSeeder::class);
         $this->call(GrandeAreaSeeder::class);
         $this->call(AreaSeeder::class);
         $this->call(SubAreaSeeder::class);
         $this->call(FuncaoParticipanteSeeder::class);
+        $this->call(CoordenadorComissaoSeeder::class);
         // $this->call(UsersTableSeeder::class);
 
 //         DB::table('enderecos')->insert([  // 1
@@ -67,8 +69,8 @@ class DatabaseSeeder extends Seeder
           'nome'=>'II CONGRESSO REGIONAL DE ZOOTECNIA',
           // 'numeroParticipantes'=>60,
           'descricao'=>'Cada autor inscrito poderá submeter até dois (2) resumos;
-O número máximo de autores por trabalho será seis autores;
-Os trabalhos deverão ser submetidos na forma de resumo simples com no máximo uma (01) página, no formato PDF;',
+           O número máximo de autores por trabalho será seis autores;
+           Os trabalhos deverão ser submetidos na forma de resumo simples com no máximo uma (01) página, no formato PDF;',
           'tipo'=>'teste',
           'inicioSubmissao'=>'2020-03-30',
           'fimSubmissao'=>'2020-09-20',
@@ -94,67 +96,5 @@ Os trabalhos deverão ser submetidos na forma de resumo simples com no máximo u
 //                           ];
 
 
-
-        for($i = 0; $i < 40; $i++){
-          DB::table('users')->insert([  //
-            'name' => 'teste',
-            'email' => 'teste@teste'.$i,
-            'password' => bcrypt('12345678'),
-            'cpf' => ''.$i,
-            'instituicao'     => 'd',
-            'celular'    => 2,
-            'especProfissional' => 'e',
-          ]);
-
-          if($i < 20){
-            DB::table('trabalhos')->insert([
-              'titulo' => 'trabalho' . $i,
-              'autores' => '-',
-              'data'  => '2020-02-15',
-              'modalidadeId'  => 1,
-              'areaId'  => 1,
-              'autorId' => $i+2,
-              'eventoId' => 1,
-              'avaliado' => 'nao'
-            ]);
-          }
-          if($i >= 20 && $i < 30){
-            DB::table('trabalhos')->insert([
-              'titulo' => 'trabalho' . $i,
-              'autores' => '-',
-              'data'  => '2020-02-15',
-              'modalidadeId'  => 1,
-              'areaId'  => 2,
-              'eventoId' => 1,
-              'autorId' => $i+2,
-              'avaliado' => 'nao'
-            ]);
-          }
-          if($i >= 30){
-            DB::table('trabalhos')->insert([
-              'titulo' => 'trabalho' . $i,
-              'autores' => '-',
-              'data'  => '2020-02-15',
-              'modalidadeId'  => 1,
-              'areaId'  => 3,
-              'eventoId' => 1,
-              'autorId' => $i+2,
-              'avaliado' => 'nao'
-            ]);
-          }
-
-        }
-
-        DB::table('users')->insert([  //
-          'name' => 'eu',
-          'email' => 'asd@asd',
-          'password' => bcrypt('12345678'),
-          'cpf' => 123132131,
-          'instituicao'     => 'd',
-          'celular'    => 2,
-          'especProfissional' => 'e',
-          'email_verified_at' => '2020-02-15',
-        ]);
->>>>>>> 006bbf698ee22e7e9cf1b30c8de36a7e10331f3b
     }
 }

database/seeds/ProponenteSeeder.php

@@ -16,6 +16,20 @@ class ProponenteSeeder extends Seeder
 
       DB::table('proponentes')->insert([
         'user_id' => $user_id[0],
+        //'CPF' => '123123123',
+        'SIAPE' => '123123123',
+        //'email' => '123123123',
+        //'email' => '123123123',
+        'cargo' => '123123123',
+        'vinculo' => '123123123',
+        'titulacaoMaxima' => '123123123',
+        'anoTitulacao' => '123123123',
+        'grandeArea' => '123123123',
+        'area' => '123123123',
+        'subArea' => '123123123',
+        'bolsistaProdutividade' => '123123123',
+        'nivel' => '123123123',
+        'linkLattes' => '123123123',
 
       ]);
     }

database/seeds/UsuarioSeeder.php

@@ -39,5 +39,23 @@ class UsuarioSeeder extends Seeder
           'tipo'=>'proponente',
           'email_verified_at'=>'2020-01-01'
         ]);
+
+        DB::table('users')->insert([
+
+          'name'=>'Coordenador1',
+          'email'=>'coordenador1@ufrpe.br',
+          'password'=>Hash::make('12345678'),
+          'tipo'=>'coordenador',
+          'email_verified_at'=>'2020-01-01'
+        ]);
+
+        DB::table('users')->insert([
+
+          'name'=>'Coordenador2',
+          'email'=>'coordenador2@ufrpe.br',
+          'password'=>Hash::make('12345678'),
+          'tipo'=>'coordenador',
+          'email_verified_at'=>'2020-01-01'
+        ]);
     }
 }

resources/views/administrador/index.blade.php

@@ -4,7 +4,7 @@
 
 <div class="container">
 
-    <h2 style="margin-top: 100px; ">Administrador</h2>
+    <h2 style="margin-top: 100px; ">{{ Auth()->user()->name }}</h2>
 
        <div class="row justify-content-center d-flex align-items-center">
 	      <div class="col-sm-4 d-flex justify-content-center ">
@@ -19,7 +19,7 @@
 	      </div>
 
 	      <div class="col-sm-4 d-flex justify-content-center">
-	         <a href="#" style="text-decoration:none; color: inherit;">
+	         <a href="{{ route('admin.naturezas') }}" style="text-decoration:none; color: inherit;">
 	            <div class="card text-center " style="border-radius: 30px; width: 18rem;">
 	             <div class="card-body d-flex justify-content-center">
 	                  <h2 style="padding-top:15px">Natureza</h2>
@@ -28,7 +28,7 @@
 	         </a>
 	      </div>
 	      <div class="col-sm-4 d-flex justify-content-center">
-	         <a href="#" style="text-decoration:none; color: inherit;">
+	         <a href="{{ route('admin.usuarios') }}" style="text-decoration:none; color: inherit;">
 	            <div class="card text-center " style="border-radius: 30px; width: 18rem;">
 	             <div class="card-body d-flex justify-content-center">
 	                  <h2 style="padding-top:15px">Usuários</h2>

resources/views/administrador/usuarios.blade.php

+@extends('layouts.app')
+
+@section('content')
+
+<div class="container">
+
+    <h2 style="margin-top: 100px; ">Administrador</h2>
+
+       <div class="row justify-content-center d-flex align-items-center">
+	      <div class="col-sm-4 d-flex justify-content-center ">
+	         <a href="{{route('evento.listar')}}" style="text-decoration:none; color: inherit;">
+	            <div class="card text-center " style="border-radius: 30px; width: 18rem; height: 12rem;">
+	                  <div class="card-body d-flex justify-content-center">
+	                      <h2 style="padding-top:15px">Pró-Reitor</h2>
+	                  </div>
+	                 
+	            </div>
+	         </a>
+	      </div>
+
+	      <div class="col-sm-4 d-flex justify-content-center">
+	         <a href="#" style="text-decoration:none; color: inherit;">
+	            <div class="card text-center " style="border-radius: 30px; width: 18rem; height: 12rem;">
+	             <div class="card-body d-flex justify-content-center">
+	                  <h2 style="padding-top:15px">Coordenador de Comitê de Avaliação</h2>
+	               </div>
+	            </div>
+	         </a>
+	      </div>
+	      <div class="col-sm-4 d-flex justify-content-center">
+	         <a href="#" style="text-decoration:none; color: inherit;">
+	            <div class="card text-center " style="border-radius: 30px; width: 18rem; height: 12rem;">
+	             <div class="card-body d-flex justify-content-center">
+	                  <h2 style="padding-top:15px">Avaliador</h2>
+	               </div>
+	            </div>
+	         </a>
+	      </div>
+	      <div class="col-sm-4 d-flex justify-content-center">
+	         <a href="#" style="text-decoration:none; color: inherit;">
+	            <div class="card text-center " style="border-radius: 30px; width: 18rem; height: 12rem;">
+	             <div class="card-body d-flex justify-content-center">
+	                  <h2 style="padding-top:15px">Proponente</h2>
+	               </div>
+	            </div>
+	         </a>
+	      </div>
+	      <div class="col-sm-4 d-flex justify-content-center">
+	         <a href="#" style="text-decoration:none; color: inherit;">
+	            <div class="card text-center " style="border-radius: 30px; width: 18rem; height: 12rem;">
+	             <div class="card-body d-flex justify-content-center">
+	                  <h2 style="padding-top:15px">Participante</h2>
+	               </div>
+	            </div>
+	         </a>
+	      </div>
+	   </div>
+
+
+      
+
+</div>
+
+@endsection

resources/views/administradorResponsavel/index.blade.php

@@ -4,7 +4,7 @@
 
 <div class="container">
 
-    <h2 style="margin-top: 100px;">Administrador Responsavel</h2>
+  	<h2 style="margin-top: 100px; ">{{ Auth()->user()->name }}</h2>
 
 </div>
 

resources/views/auth/register.blade.php

@@ -210,7 +210,7 @@
           <div class="row justify-content-center" style="margin: 20px 0 20px 0">
 
             <div class="col-md-6" style="padding-left:0">
-                <a class="btn btn-secondary botao-form" href="{{route('cancelarCadastro')}}" style="width:100%">Cancelar Cadastro</a>
+                <a class="btn btn-secondary botao-form" href="/" style="width:100%">Cancelar Cadastro</a>
             </div>
             <div class="col-md-6" style="padding-right:0">
                 <button type="submit" class="btn btn-primary botao-form" style="width:100%">

resources/views/coordenador/home.blade.php

@@ -9,56 +9,8 @@
         <div class="col-sm-12">
             <div class="row">
                 
-                @if(Auth::check())
-                    @if(Auth::user()->tipo == 'administrador')
-                        <!-- Carrega component contendo navbar do administrador -->
+                <h3>Editais</h3>
                 
-
-                        {{-- <div class="col-sm-2">
-                            <a href="" class="btn btn-primary">Ver Editais</a>
-                        </div> --}}
-                        {{-- 
-                            editar/Deletar projetos cadastrados
-                            editar/Deletar proponentes ja cadastrados
-                            editar/Deletar editais já cadastrados
-                            Configurações do sistema
-                         --}}
-
-                    @endif
-                    @if(Auth::user()->tipo == 'administradorResponsavel')
-                        {{-- <div class="col-sm-2">
-                            <a href="{{route('evento.criar')}}" class="btn btn-primary">Novo Edital</a>
-                        </div> --}}
-                        {{-- 
-                            Criar/Editar/Deletar editais
-                            Criar datas e anexar  documentos no sistema
-                            Distribuir os projetos com os avaliadores
-                            Gerar Resultado 
-                        --}}
-                    @endif
-                    @if(Auth::user()->tipo == 'proponente')
-                        {{-- <div class="col-sm-2">
-                            <a href="{{route('evento.criar')}}" class="btn btn-primary">Submeter Projeto</a>
-                        </div> --}}
-                        {{-- 
-                            projetos
-                            perfil
-                            participantes de projeto
-                            submeter projetos
-                            anexar documentos 
-                        --}}
-                    @endif
-                @endif
-
-                <div class="col-sm-8">
-                    <h1>Editais</h1>
-                </div>
-                <div class="col-sm-2">
-                    <a href="{{route('comissoes')}}" class="btn btn-primary">Comissões</a>
-                </div>
-                <div class="col-sm-2">
-                    <a href="{{route('evento.criar')}}" class="btn btn-primary">Novo Edital</a>
-                </div>
             </div>
         </div>
     </div>
@@ -80,7 +32,7 @@
                                 <div class="row justify-content-center">
                                     <div class="col-sm-12">
                                         {{$evento->nome}}
-                                        @can('isCoordenador', $evento)
+                                        {{-- @can('isCoordenador', $evento) --}}
                                             <div class="btn-group dropright dropdown-options">
                                                 <a id="options" class="dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                                                     {{-- <img src="{{asset('img/icons/ellipsis-v-solid.svg')}}" style="width:8px"> --}}
@@ -105,7 +57,7 @@
                                                     </form>
                                                 </div>
                                             </div>
-                                        @endcan
+                                        {{-- @endcan --}}
                                     </div>
 
                                 </div>

resources/views/coordenadorComissao/editais.blade.php

+@extends('layouts.app')
+
+@section('content')
+
+<div class="container" style="margin-top: 100px;">
+
+  <div class="container" >
+    <div class="row" >
+      <div class="col-sm-10">
+        <h3>Meus Editais</h3> 
+      </div>
+    </div>
+  </div>
+  <hr>
+  <table class="table table-bordered">
+    <thead>
+      <tr>   
+        <th scope="col">Nome do Edital</th>
+        <th scope="col">Data de Criação</th>
+        <th scope="col">Opção</th>
+      </tr>
+    </thead>
+    <tbody>
+      @foreach ($eventos as $evento)
+        <tr>
+          <td>
+            <a href="{{  route('evento.visualizar',['id'=>$evento->id])  }}" class="visualizarEvento">
+                {{ $evento->nome }}
+            </a>
+          </td>
+          <td>10/05/2020</td>
+          <td>
+            <div class="btn-group dropright dropdown-options">
+                <a id="options" class="dropdown-toggle " data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                    {{-- <img src="{{asset('img/icons/ellipsis-v-solid.svg')}}" style="width:8px"> --}}
+                </a>
+                <div class="dropdown-menu">
+                    <a href="{{ route('coord.detalhesEvento', ['eventoId' => $evento->id]) }}" class="dropdown-item">
+                        <img src="{{asset('img/icons/eye-regular.svg')}}" class="icon-card" alt="">
+                        Detalhes
+                    </a>
+                    <a href="{{route('evento.editar',$evento->id)}}" class="dropdown-item">
+                        <img src="{{asset('img/icons/edit-regular.svg')}}" class="icon-card" alt="">
+                        Editar
+                    </a>
+                    <form method="POST" action="{{route('evento.deletar',$evento->id)}}">
+                        {{ csrf_field() }}
+                        {{ method_field('DELETE') }}
+                        <button type="submit" class="dropdown-item">
+                            <img src="{{asset('img/icons/trash-alt-regular.svg')}}" class="icon-card" alt="">
+                            Deletar
+                        </button>
+
+                    </form>
+                </div>
+            </div>
+          </td>
+        </tr>
+      @endforeach
+    </tbody>
+  </table>
+</div>
+
+@endsection
+
+@section('javascript')
+<script>
+  
+</script>
+@endsection