diff --git a/app/CoordenadorComite.php b/app/AdministradorResponsavel.php similarity index 76% rename from app/CoordenadorComite.php rename to app/AdministradorResponsavel.php index 95be6f05969db9db3a6d4164e6cb9ab4610c8d17..9768c542a875d3da94740d769cb91b07702787cb 100644 --- a/app/CoordenadorComite.php +++ b/app/AdministradorResponsavel.php @@ -4,7 +4,7 @@ namespace App; use Illuminate\Database\Eloquent\Model; -class CoordenadorComite extends Model +class AdministradorResponsavel extends Model { public function user(){ return $this->belongsTo('App\User'); diff --git a/app/FuncaoParticipantes.php b/app/FuncaoParticipantes.php new file mode 100644 index 0000000000000000000000000000000000000000..e5632fdb1df7b2f15ba89fa4739113cf363b4239 --- /dev/null +++ b/app/FuncaoParticipantes.php @@ -0,0 +1,10 @@ +id)->get(); - $areasId = Area::where('eventoId', $evento->id)->select('id')->get(); - $revisores = Revisor::where('eventoId', $evento->id)->get(); - $modalidades = Modalidade::all(); - $areaModalidades = AreaModalidade::whereIn('areaId', $areasId)->get(); - $areasEnomes = Area::wherein('id', $areasId)->get(); - $modalidadesIDeNome = []; - foreach ($areaModalidades as $key) { - array_push($modalidadesIDeNome,['areaId' => $key->area->id, - 'modalidadeId' => $key->modalidade->id, - 'modalidadeNome' => $key->modalidade->nome]); - } - - $trabalhos = Trabalho::where('autorId', Auth::user()->id)->whereIn('areaId', $areasId)->get(); - // dd($evento); + $edital = Evento::find($id); + $grandeAreas = GrandeArea::all(); + $areas = Area::all(); + $subAreas = SubArea::all(); + $funcaoParticipantes = FuncaoParticipantes::all(); return view('evento.submeterTrabalho',[ - 'evento' => $evento, - 'areas' => $areas, - 'revisores' => $revisores, - 'modalidades' => $modalidades, - 'areaModalidades' => $areaModalidades, - 'trabalhos' => $trabalhos, - 'areasEnomes' => $areasEnomes, - 'modalidadesIDeNome' => $modalidadesIDeNome, + 'edital' => $edital, + 'grandeAreas' => $grandeAreas, + 'areas' => $areas, + 'subAreas' => $subAreas, + 'funcaoParticipantes'=> $funcaoParticipantes + ]); } @@ -76,6 +66,7 @@ class TrabalhoController extends Controller * @return \Illuminate\Http\Response */ public function store(Request $request){ + dd($request->all()); $mytime = Carbon::now('America/Recife'); $mytime = $mytime->toDateString(); $evento = Evento::find($request->eventoId); diff --git a/app/PlanoTrabalho.php b/app/PlanoTrabalho.php new file mode 100644 index 0000000000000000000000000000000000000000..6705d9740f6060792c65171f409f30fb83ea8f51 --- /dev/null +++ b/app/PlanoTrabalho.php @@ -0,0 +1,13 @@ +belongsTo('App\Trabalho'); + } +} diff --git a/app/ProReitor.php b/app/ProReitor.php deleted file mode 100644 index f7041a73cf46116ef8a5311ba100fded2f5af560..0000000000000000000000000000000000000000 --- a/app/ProReitor.php +++ /dev/null @@ -1,12 +0,0 @@ -belongsTo('App\User'); - } -} diff --git a/app/Reitor.php b/app/Reitor.php deleted file mode 100644 index 42d4f98b686271a78e0831b6f473ec8da1621802..0000000000000000000000000000000000000000 --- a/app/Reitor.php +++ /dev/null @@ -1,12 +0,0 @@ -belongsTo('App\User'); - } -} diff --git a/app/SubArea.php b/app/SubArea.php new file mode 100644 index 0000000000000000000000000000000000000000..859e5edac4cb4418481ba7547d883f07eba215a1 --- /dev/null +++ b/app/SubArea.php @@ -0,0 +1,10 @@ +belongsTo('App\Evento', 'eventoId'); } + public function planoTrabalho(){ + return $this->hasMany('App\PlanoTrabalho'); + } } diff --git a/app/User.php b/app/User.php index 30a15c91ceaac533a99a08239534def146832b67..7e1cb464863d75318d7cc83402d4f5fbba08c533 100644 --- a/app/User.php +++ b/app/User.php @@ -82,17 +82,10 @@ class User extends Authenticatable implements MustVerifyEmail public function Proponentes(){ return $this->hasMany('App\Proponente'); } - public function Reitors(){ - return $this->hasMany('App\Reitor'); + public function AdministradorResponsavel(){ + return $this->hasMany('App\AdministradorResponsavel'); } - public function ProReitors(){ - return $this->hasMany('App\ProReitor'); - } - public function CoordenadorComites(){ - return $this->hasMany('App\CoordenadorComite'); - } - - + public function sendPasswordResetNotification($token){ $this->notify(new recuperacaoSenha($token)); } diff --git a/database/migrations/2020_02_05_123048_create_trabalhos_table.php b/database/migrations/2020_02_05_123048_create_trabalhos_table.php index 00ad7a58f2aa68b681f36aa6d3f704996c13aab5..3452f461188dea5786c2f9b0b39f0b1e7f337ea7 100644 --- a/database/migrations/2020_02_05_123048_create_trabalhos_table.php +++ b/database/migrations/2020_02_05_123048_create_trabalhos_table.php @@ -17,6 +17,19 @@ class CreateTrabalhosTable extends Migration $table->bigIncrements('id'); $table->timestamps(); $table->string('titulo'); + $table->string('grandeArea'); + $table->string('area'); + $table->string('subArea'); + $table->string('decisaoCONSU'); + $table->string('anexoDecisaoCONSU'); + $table->string('autorizacaoComiteEtica'); + $table->string('anexoAutorizacaoComiteEtica'); + $table->string('coordenador'); //preencher automaticamente + $table->string('anexoLattesCoordenador'); + $table->string('anexoPlanilhaPontuacao'); + $table->string('pontuacaoPlanilha'); + $table->string('linkGrupoPesquisa'); + $table->string('linkLattesEstudante'); $table->string('autores')->nullable(); $table->date('data')->nullable(); $table->text('resumo')->nullable(); @@ -26,6 +39,7 @@ class CreateTrabalhosTable extends Migration $table->integer('areaId'); $table->integer('autorId'); $table->integer('eventoId'); + $table->integer('proponente_id'); }); } diff --git a/database/migrations/2020_02_05_123139_create_areas_table.php b/database/migrations/2020_02_05_123139_create_areas_table.php index 08264032a0ac6a8ebd2f1ea0d5109cc29ee51a04..aa1ca0b64ba141ff1c5c0c14cdd217c79b3c9f61 100644 --- a/database/migrations/2020_02_05_123139_create_areas_table.php +++ b/database/migrations/2020_02_05_123139_create_areas_table.php @@ -14,12 +14,12 @@ class CreateAreasTable extends Migration public function up() { Schema::create('areas', function (Blueprint $table) { - $table->bigIncrements('id'); - $table->timestamps(); + $table->bigIncrements('id'); $table->string('nome'); - - $table->integer('modalidadeId')->nullable(); - $table->integer('eventoId'); + + $table->timestamps(); + // $table->integer('modalidadeId')->nullable(); + // $table->integer('eventoId'); }); } diff --git a/database/migrations/2020_02_06_132418_chaves_estrangeiras.php b/database/migrations/2020_02_06_132418_chaves_estrangeiras.php index a0fc64d7614afa6c97a0d040ef324b1017cd6d88..2b2ecfde51a4dc740a7cb613bde96a6d1847d958 100644 --- a/database/migrations/2020_02_06_132418_chaves_estrangeiras.php +++ b/database/migrations/2020_02_06_132418_chaves_estrangeiras.php @@ -16,18 +16,18 @@ class ChavesEstrangeiras extends Migration //------------------------------------------------------------------------ - Schema::table('areas', function (Blueprint $table) { - $table->foreign('eventoId')->references('id')->on('eventos'); - }); + // Schema::table('areas', function (Blueprint $table) { + // $table->foreign('eventoId')->references('id')->on('eventos'); + // }); - //------------------------------------------------------------------------ + // //------------------------------------------------------------------------ - Schema::table('area_modalidades', function (Blueprint $table) { - $table->foreign('areaId')->references('id')->on('areas'); - }); - Schema::table('area_modalidades', function (Blueprint $table) { - $table->foreign('modalidadeId')->references('id')->on('modalidades'); - }); + // Schema::table('area_modalidades', function (Blueprint $table) { + // $table->foreign('areaId')->references('id')->on('areas'); + // }); + // Schema::table('area_modalidades', function (Blueprint $table) { + // $table->foreign('modalidadeId')->references('id')->on('modalidades'); + // }); //------------------------------------------------------------------------ @@ -61,9 +61,7 @@ class ChavesEstrangeiras extends Migration //------------------------------------------------------------------------ - Schema::table('eventos', function (Blueprint $table) { - $table->foreign('enderecoId')->references('id')->on('enderecos'); - }); + Schema::table('eventos', function (Blueprint $table) { $table->foreign('coordenadorId')->references('id')->on('users'); }); @@ -85,9 +83,9 @@ class ChavesEstrangeiras extends Migration //------------------------------------------------------------------------ - Schema::table('pertences', function (Blueprint $table) { - $table->foreign('areaId')->references('id')->on('areas'); - }); + // Schema::table('pertences', function (Blueprint $table) { + // $table->foreign('areaId')->references('id')->on('areas'); + // }); Schema::table('pertences', function (Blueprint $table) { $table->foreign('revisorId')->references('id')->on('users'); }); @@ -106,9 +104,9 @@ class ChavesEstrangeiras extends Migration Schema::table('trabalhos', function (Blueprint $table) { $table->foreign('modalidadeId')->references('id')->on('modalidades'); }); - Schema::table('trabalhos', function (Blueprint $table) { - $table->foreign('areaId')->references('id')->on('areas'); - }); + // Schema::table('trabalhos', function (Blueprint $table) { + // $table->foreign('areaId')->references('id')->on('areas'); + // }); Schema::table('trabalhos', function (Blueprint $table) { $table->foreign('autorId')->references('id')->on('users'); }); @@ -130,9 +128,9 @@ class ChavesEstrangeiras extends Migration Schema::table('revisors', function (Blueprint $table) { $table->foreign('eventoId')->references('id')->on('eventos'); }); - Schema::table('revisors', function (Blueprint $table) { - $table->foreign('areaId')->references('id')->on('areas'); - }); + // Schema::table('revisors', function (Blueprint $table) { + // $table->foreign('areaId')->references('id')->on('areas'); + // }); Schema::table('eventos',function (Blueprint $table){ $table->foreign('coordComissaoId')->references('id')->on('users'); }); diff --git a/database/migrations/2020_05_20_211027_add_users_to_reitors_table.php b/database/migrations/2020_05_20_211027_add_users_to_reitors_table.php deleted file mode 100644 index 1b10468b8be4ace5c423f3e848ba7cc6f6a2f69d..0000000000000000000000000000000000000000 --- a/database/migrations/2020_05_20_211027_add_users_to_reitors_table.php +++ /dev/null @@ -1,34 +0,0 @@ -unsignedBigInteger('user_id'); - $table->foreign('user_id')->references('id')->on('users'); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::table('reitors', function (Blueprint $table) { - $table->dropForeign('reitors_user_id_foreign'); - $table->dropColumn('user_id'); - }); - } -} diff --git a/database/migrations/2020_05_20_211149_add_users_to_pro_reitors_table.php b/database/migrations/2020_05_20_211149_add_users_to_pro_reitors_table.php deleted file mode 100644 index 62fc9b78504576fc19aacc6fd84cf09a930b1a87..0000000000000000000000000000000000000000 --- a/database/migrations/2020_05_20_211149_add_users_to_pro_reitors_table.php +++ /dev/null @@ -1,34 +0,0 @@ -unsignedBigInteger('user_id'); - $table->foreign('user_id')->references('id')->on('users'); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::table('pro_reitors', function (Blueprint $table) { - $table->dropForeign('pro_reitors_user_id_foreign'); - $table->dropColumn('user_id'); - }); - } -} diff --git a/database/migrations/2020_05_20_211421_create_proponentes_table.php b/database/migrations/2020_05_20_211421_create_proponentes_table.php index 5a319284ce4d807d4dc5f957fd654aafddb9ddec..259937e9fc4e6bc5d1b41d3ec0ce3a5120258ec2 100644 --- a/database/migrations/2020_05_20_211421_create_proponentes_table.php +++ b/database/migrations/2020_05_20_211421_create_proponentes_table.php @@ -15,6 +15,19 @@ class CreateProponentesTable extends Migration { Schema::create('proponentes', function (Blueprint $table) { $table->bigIncrements('id'); + $table->string('CPF'); + $table->string('SIAPE'); + $table->string('email')->unique(); + $table->string('cargo'); + $table->string('vinculo'); + $table->string('titulacaoMaxima'); + $table->string('anoTitulacao'); + $table->string('grandeArea'); + $table->string('area'); + $table->string('subArea'); + $table->string('bolsistaProdutividade'); + $table->string('nivel'); + $table->string('linkLattes'); $table->timestamps(); }); } diff --git a/database/migrations/2020_05_21_014825_add_trabalhos_to_proponentes_table.php b/database/migrations/2020_05_21_014825_add_trabalhos_to_proponentes_table.php new file mode 100644 index 0000000000000000000000000000000000000000..fb6f0f60b831169b06261fb8381b5545337986c3 --- /dev/null +++ b/database/migrations/2020_05_21_014825_add_trabalhos_to_proponentes_table.php @@ -0,0 +1,34 @@ +unsignedBigInteger('trabalho_id'); + $table->foreign('trabalho_id')->references('id')->on('trabalhos'); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('proponentes', function (Blueprint $table) { + $table->dropForeign('proponentes_trabalho_id_foreign'); + $table->dropColumn('trabalho_id'); + }); + } +} diff --git a/database/migrations/2020_05_21_020029_create_plano_trabalhos_table.php b/database/migrations/2020_05_21_020029_create_plano_trabalhos_table.php new file mode 100644 index 0000000000000000000000000000000000000000..e339b504a4f28fa1e8e5993abcdb183d2c490b0f --- /dev/null +++ b/database/migrations/2020_05_21_020029_create_plano_trabalhos_table.php @@ -0,0 +1,33 @@ +bigIncrements('id'); + $table->string('titulo'); + $table->string('anexoPlanoTrabalho'); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('plano_trabalhos'); + } +} diff --git a/database/migrations/2020_05_21_020133_add_trabalhos_to_plano_trabalhos_table.php b/database/migrations/2020_05_21_020133_add_trabalhos_to_plano_trabalhos_table.php new file mode 100644 index 0000000000000000000000000000000000000000..11e27ed625537e40764f476cedac140421c97e75 --- /dev/null +++ b/database/migrations/2020_05_21_020133_add_trabalhos_to_plano_trabalhos_table.php @@ -0,0 +1,34 @@ +unsignedBigInteger('trabalho_id'); + $table->foreign('trabalho_id')->references('id')->on('trabalhos'); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('plano_trabalhos', function (Blueprint $table) { + $table->dropForeign('plano_trabalhos_trabalho_id_foreign'); + $table->dropColumn('trabalho_id'); + }); + } +} diff --git a/database/migrations/2020_05_20_211258_create_coordenador_comites_table.php b/database/migrations/2020_05_21_025543_create_administrador_responsavels_table.php similarity index 68% rename from database/migrations/2020_05_20_211258_create_coordenador_comites_table.php rename to database/migrations/2020_05_21_025543_create_administrador_responsavels_table.php index 7e803e44e5ebfa3051333807772bd38d1e5aeb24..ab128e3e81deb272dbebeea6804aa72087f1cc14 100644 --- a/database/migrations/2020_05_20_211258_create_coordenador_comites_table.php +++ b/database/migrations/2020_05_21_025543_create_administrador_responsavels_table.php @@ -4,7 +4,7 @@ use Illuminate\Database\Migrations\Migration; use Illuminate\Database\Schema\Blueprint; use Illuminate\Support\Facades\Schema; -class CreateCoordenadorComitesTable extends Migration +class CreateAdministradorResponsavelsTable extends Migration { /** * Run the migrations. @@ -13,7 +13,7 @@ class CreateCoordenadorComitesTable extends Migration */ public function up() { - Schema::create('coordenador_comites', function (Blueprint $table) { + Schema::create('administrador_responsavels', function (Blueprint $table) { $table->bigIncrements('id'); $table->timestamps(); }); @@ -26,6 +26,6 @@ class CreateCoordenadorComitesTable extends Migration */ public function down() { - Schema::dropIfExists('coordenador_comites'); + Schema::dropIfExists('administrador_responsavels'); } } diff --git a/database/migrations/2020_05_20_211333_add_users_to_coordenador_comites_table.php b/database/migrations/2020_05_21_025624_add_users_to_administrador_responsavels_table.php similarity index 64% rename from database/migrations/2020_05_20_211333_add_users_to_coordenador_comites_table.php rename to database/migrations/2020_05_21_025624_add_users_to_administrador_responsavels_table.php index d1450972c1472f1e0b1ace69e1c09215a49ade53..d20d2e10a1768d48dfbeaacfee5e0cd6882f76a2 100644 --- a/database/migrations/2020_05_20_211333_add_users_to_coordenador_comites_table.php +++ b/database/migrations/2020_05_21_025624_add_users_to_administrador_responsavels_table.php @@ -4,7 +4,7 @@ use Illuminate\Database\Migrations\Migration; use Illuminate\Database\Schema\Blueprint; use Illuminate\Support\Facades\Schema; -class AddUsersToCoordenadorComitesTable extends Migration +class AddUsersToAdministradorResponsavelsTable extends Migration { /** * Run the migrations. @@ -13,7 +13,7 @@ class AddUsersToCoordenadorComitesTable extends Migration */ public function up() { - Schema::table('coordenador_comites', function (Blueprint $table) { + Schema::table('administrador_responsavels', function (Blueprint $table) { $table->unsignedBigInteger('user_id'); $table->foreign('user_id')->references('id')->on('users'); }); @@ -26,8 +26,8 @@ class AddUsersToCoordenadorComitesTable extends Migration */ public function down() { - Schema::table('coordenador_comites', function (Blueprint $table) { - $table->dropForeign('coordenador_comites_user_id_foreign'); + Schema::table('administrador_responsavels', function (Blueprint $table) { + $table->dropForeign('administrador_responsavels_user_id_foreign'); $table->dropColumn('user_id'); }); } diff --git a/database/migrations/2020_05_20_211049_create_pro_reitors_table.php b/database/migrations/2020_05_22_031644_create_grande_areas_table.php similarity index 69% rename from database/migrations/2020_05_20_211049_create_pro_reitors_table.php rename to database/migrations/2020_05_22_031644_create_grande_areas_table.php index bdd7c2ed4784e654442c10fb8eb3b9b25d372c07..553f6054d3dfb3ef40454aaf68438cba5fb12220 100644 --- a/database/migrations/2020_05_20_211049_create_pro_reitors_table.php +++ b/database/migrations/2020_05_22_031644_create_grande_areas_table.php @@ -4,7 +4,7 @@ use Illuminate\Database\Migrations\Migration; use Illuminate\Database\Schema\Blueprint; use Illuminate\Support\Facades\Schema; -class CreateProReitorsTable extends Migration +class CreateGrandeAreasTable extends Migration { /** * Run the migrations. @@ -13,8 +13,9 @@ class CreateProReitorsTable extends Migration */ public function up() { - Schema::create('pro_reitors', function (Blueprint $table) { + Schema::create('grande_areas', function (Blueprint $table) { $table->bigIncrements('id'); + $table->string('nome'); $table->timestamps(); }); } @@ -26,6 +27,6 @@ class CreateProReitorsTable extends Migration */ public function down() { - Schema::dropIfExists('pro_reitors'); + Schema::dropIfExists('grande_areas'); } } diff --git a/database/migrations/2020_05_20_210104_create_reitors_table.php b/database/migrations/2020_05_22_031838_create_sub_areas_table.php similarity index 70% rename from database/migrations/2020_05_20_210104_create_reitors_table.php rename to database/migrations/2020_05_22_031838_create_sub_areas_table.php index 4685d239ebe8f61aab9645a076b957c6173c1b26..d7fe6e6d93296c50bfe68248edcdc06cdd6228bb 100644 --- a/database/migrations/2020_05_20_210104_create_reitors_table.php +++ b/database/migrations/2020_05_22_031838_create_sub_areas_table.php @@ -4,7 +4,7 @@ use Illuminate\Database\Migrations\Migration; use Illuminate\Database\Schema\Blueprint; use Illuminate\Support\Facades\Schema; -class CreateReitorsTable extends Migration +class CreateSubAreasTable extends Migration { /** * Run the migrations. @@ -13,8 +13,9 @@ class CreateReitorsTable extends Migration */ public function up() { - Schema::create('reitors', function (Blueprint $table) { + Schema::create('sub_areas', function (Blueprint $table) { $table->bigIncrements('id'); + $table->string("nome"); $table->timestamps(); }); } @@ -26,6 +27,6 @@ class CreateReitorsTable extends Migration */ public function down() { - Schema::dropIfExists('reitors'); + Schema::dropIfExists('sub_areas'); } } diff --git a/database/migrations/2020_05_22_032714_add_grande_areas_to_areas_table.php b/database/migrations/2020_05_22_032714_add_grande_areas_to_areas_table.php new file mode 100644 index 0000000000000000000000000000000000000000..c732329cb074a464970f09963e22f2410bd33cba --- /dev/null +++ b/database/migrations/2020_05_22_032714_add_grande_areas_to_areas_table.php @@ -0,0 +1,34 @@ +unsignedBigInteger('grande_area_id'); + $table->foreign('grande_area_id')->references('id')->on('grande_areas'); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('areas', function (Blueprint $table) { + $table->dropForeign('areas_grande_area_id_foreign'); + $table->dropColumn('grande_area_id'); + }); + } +} diff --git a/database/migrations/2020_05_22_032753_add_areas_to_sub_areas_table.php b/database/migrations/2020_05_22_032753_add_areas_to_sub_areas_table.php new file mode 100644 index 0000000000000000000000000000000000000000..baa6be657d830d2ef7906692034cd402143f8171 --- /dev/null +++ b/database/migrations/2020_05_22_032753_add_areas_to_sub_areas_table.php @@ -0,0 +1,34 @@ +unsignedBigInteger('area_id'); + $table->foreign('area_id')->references('id')->on('areas'); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('sub_areas', function (Blueprint $table) { + $table->dropForeign('sub_areas_area_id_foreign'); + $table->dropColumn('area_id'); + }); + } +} diff --git a/database/migrations/2020_05_22_044450_create_funcao_participantes_table.php b/database/migrations/2020_05_22_044450_create_funcao_participantes_table.php new file mode 100644 index 0000000000000000000000000000000000000000..0df1c1293c5920d16095d3166b96af225d83a695 --- /dev/null +++ b/database/migrations/2020_05_22_044450_create_funcao_participantes_table.php @@ -0,0 +1,32 @@ +bigIncrements('id'); + $table->string('nome'); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('funcao_participantes'); + } +} diff --git a/database/migrations/2020_05_22_044629_add_users_to_funcao_participantes_table.php b/database/migrations/2020_05_22_044629_add_users_to_funcao_participantes_table.php new file mode 100644 index 0000000000000000000000000000000000000000..3f9262465c178a873f15b4c89fc6465eef844710 --- /dev/null +++ b/database/migrations/2020_05_22_044629_add_users_to_funcao_participantes_table.php @@ -0,0 +1,34 @@ +unsignedBigInteger('funcao_participante_id')->nullable();; + $table->foreign('funcao_participante_id')->references('id')->on('funcao_participantes'); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('users', function (Blueprint $table) { + $table->dropForeign('users_funcao_participante_id_foreign'); + $table->dropColumn('funcao_participante_id'); + }); + } +} diff --git a/database/seeds/AdministradorResponsavelSeeder.php b/database/seeds/AdministradorResponsavelSeeder.php new file mode 100644 index 0000000000000000000000000000000000000000..ce63cbf71559060232f7657bf19e0a4f226e1267 --- /dev/null +++ b/database/seeds/AdministradorResponsavelSeeder.php @@ -0,0 +1,22 @@ +where('name','AdministradorResponsavel')->pluck('id'); + + DB::table('administrador_responsavels')->insert([ + 'user_id' => $user_id[0], + + ]); + } +} diff --git a/database/seeds/AdministradorSeeder.php b/database/seeds/AdministradorSeeder.php index 491f0cc1abcb99784c1be754739264a448208ed0..231de224150d104c69f8c8e849b2fba795ac0ae5 100644 --- a/database/seeds/AdministradorSeeder.php +++ b/database/seeds/AdministradorSeeder.php @@ -12,12 +12,11 @@ class AdministradorSeeder extends Seeder */ public function run() { - $user_id = DB::table('users')->where('name','Administrador')->pluck('id'); + $user_id = DB::table('users')->where('name','Administrador')->pluck('id'); DB::table('administradors')->insert([ 'matricula'=>'123456789', 'user_id' => $user_id[0], - ]); } } diff --git a/database/seeds/AreaSeeder.php b/database/seeds/AreaSeeder.php new file mode 100644 index 0000000000000000000000000000000000000000..2a4f93429ebdcf6155a9de7d81f9f8adeefc9112 --- /dev/null +++ b/database/seeds/AreaSeeder.php @@ -0,0 +1,166 @@ +insert([ + 'nome'=>'Matemática', + 'grande_area_id' => '1' + ]); + + DB::table('areas')->insert([ + 'nome'=>'Probabilidade e Estatística', + 'grande_area_id' => '1' + ]); + + DB::table('areas')->insert([ + 'nome'=>'Ciência da Computação', + 'grande_area_id' => '1' + ]); + + DB::table('areas')->insert([ + 'nome'=>'Astronomia', + 'grande_area_id' => '1' + ]); + + DB::table('areas')->insert([ + 'nome'=>'Física', + 'grande_area_id' => '1' + ]); + + DB::table('areas')->insert([ + 'nome'=>'Química', + 'grande_area_id' => '1' + ]); + + DB::table('areas')->insert([ + 'nome'=>'GeoCiências', + 'grande_area_id' => '1' + ]); + + DB::table('areas')->insert([ + 'nome'=>'Oceanografia', + 'grande_area_id' => '1' + ]); + + // Ciências Biológicas ---------------------- + + DB::table('areas')->insert([ + 'nome'=>'Biologia Geral', + 'grande_area_id' => '2' + ]); + + DB::table('areas')->insert([ + 'nome'=>'Genética', + 'grande_area_id' => '2' + ]); + + DB::table('areas')->insert([ + 'nome'=>'Botânica', + 'grande_area_id' => '2' + ]); + + DB::table('areas')->insert([ + 'nome'=>'Zoologia', + 'grande_area_id' => '2' + ]); + + DB::table('areas')->insert([ + 'nome'=>'Ecologia', + 'grande_area_id' => '2' + ]); + + DB::table('areas')->insert([ + 'nome'=>'Morfologia', + 'grande_area_id' => '2' + ]); + + DB::table('areas')->insert([ + 'nome'=>'Bioquímica', + 'grande_area_id' => '2' + ]); + + DB::table('areas')->insert([ + 'nome'=>'Fisiologia', + 'grande_area_id' => '2' + ]); + + DB::table('areas')->insert([ + 'nome'=>'Biofísica', + 'grande_area_id' => '2' + ]); + + DB::table('areas')->insert([ + 'nome'=>'Farmacologia', + 'grande_area_id' => '2' + ]); + + DB::table('areas')->insert([ + 'nome'=>'Imunologia', + 'grande_area_id' => '2' + ]); + + DB::table('areas')->insert([ + 'nome'=>'Microbiologia', + 'grande_area_id' => '2' + ]); + + DB::table('areas')->insert([ + 'nome'=>'Parasitologia', + 'grande_area_id' => '2' + ]); + + //Engenharias -------------------- + + DB::table('areas')->insert([ + 'nome'=>'Engenharia Civil', + 'grande_area_id' => '3' + ]); + + // Ciências da Saúde ----------------- + + DB::table('areas')->insert([ + 'nome'=>'Medicina', + 'grande_area_id' => '4' + ]); + + //Ciências Agrárias ------------------ + + DB::table('areas')->insert([ + 'nome'=>'Agronomia', + 'grande_area_id' => '5' + ]); + + //Ciências Sociais Aplicadas ---------- + + DB::table('areas')->insert([ + 'nome'=>'Direito', + 'grande_area_id' => '6' + ]); + + //Ciências Humanas ---------------------- + + DB::table('areas')->insert([ + 'nome'=>'Filosofia', + 'grande_area_id' => '7' + ]); + + //Lingüística, Letras e Artes----------- + + DB::table('areas')->insert([ + 'nome'=>'Lingüística', + 'grande_area_id' => '8' + ]); + + + + } +} diff --git a/database/seeds/DatabaseSeeder.php b/database/seeds/DatabaseSeeder.php index a73754f3d4340145afd8790472f363854250b4ca..b9c4049eb7f0bdd14eb92bdbb3693f9d4550ea85 100644 --- a/database/seeds/DatabaseSeeder.php +++ b/database/seeds/DatabaseSeeder.php @@ -11,49 +11,56 @@ class DatabaseSeeder extends Seeder */ public function run() { + $this->call(UsuarioSeeder::class); + $this->call(AdministradorSeeder::class); + $this->call(AdministradorResponsavelSeeder::class); + $this->call(GrandeAreaSeeder::class); + $this->call(AreaSeeder::class); + $this->call(SubAreaSeeder::class); + $this->call(FuncaoParticipanteSeeder::class); // $this->call(UsersTableSeeder::class); - DB::table('enderecos')->insert([ // 1 - 'rua' => 'a', - 'numero' => 1, - 'bairro' => 'b', - 'cidade' => 'c', - 'uf' => 'd', - 'cep' => 2, - ]); - - DB::table('enderecos')->insert([ // 1 - 'rua' => 'R. Manoel Clemente', - 'numero' => '161', - 'bairro' => 'Santo Antônio', - 'cidade' => 'Garanhuns', - 'uf' => 'PE', - 'cep' => '55293-040', - ]); - - DB::table('users')->insert([ // - 'name' => 'coord', - 'email' => 'teste@teste', - 'password' => bcrypt('12345678'), - 'cpf' => 123132131, - 'instituicao' => 'd', - 'celular' => 2, - 'especProfissional' => 'e', - 'enderecoId' => 1, - 'email_verified_at' => '2020-02-15', - ]); - - DB::table('users')->insert([ // - 'name' => 'Felipe', - 'email' => 'felipeaquac@yahoo.com.br', - 'password' => bcrypt('guedes80'), - 'cpf' => '999.999.999-99', - 'instituicao' => 'UFAPE', - 'celular' => '(99) 99999-9999', - 'especProfissional' => ' ', - 'enderecoId' => 1, - 'email_verified_at' => '2020-02-15', - ]); +// DB::table('enderecos')->insert([ // 1 +// 'rua' => 'a', +// 'numero' => 1, +// 'bairro' => 'b', +// 'cidade' => 'c', +// 'uf' => 'd', +// 'cep' => 2, +// ]); + +// DB::table('enderecos')->insert([ // 1 +// 'rua' => 'R. Manoel Clemente', +// 'numero' => '161', +// 'bairro' => 'Santo Antônio', +// 'cidade' => 'Garanhuns', +// 'uf' => 'PE', +// 'cep' => '55293-040', +// ]); + +// DB::table('users')->insert([ // +// 'name' => 'coord', +// 'email' => 'teste@teste', +// 'password' => bcrypt('12345678'), +// 'cpf' => 123132131, +// 'instituicao' => 'd', +// 'celular' => 2, +// 'especProfissional' => 'e', +// 'enderecoId' => 1, +// 'email_verified_at' => '2020-02-15', +// ]); + +// DB::table('users')->insert([ // +// 'name' => 'Felipe', +// 'email' => 'felipeaquac@yahoo.com.br', +// 'password' => bcrypt('guedes80'), +// 'cpf' => '999.999.999-99', +// 'instituicao' => 'UFAPE', +// 'celular' => '(99) 99999-9999', +// 'especProfissional' => ' ', +// 'enderecoId' => 1, +// 'email_verified_at' => '2020-02-15', +// ]); DB::table('eventos')->insert([ 'nome'=>'II CONGRESSO REGIONAL DE ZOOTECNIA', @@ -65,116 +72,112 @@ Os trabalhos deverão ser submetidos na forma de resumo simples com no máximo u 'dataInicio'=>'2020-07-01', 'dataFim'=>'2020-07-03', 'inicioSubmissao'=>'2020-03-30', - 'fimSubmissao'=>'2020-04-20', + 'fimSubmissao'=>'2020-09-20', 'inicioRevisao'=>'2020-04-21', 'fimRevisao'=>'2020-05-21', 'inicioResultado'=>'2020-05-22', - 'fimResultado'=>'2020-05-23', 'numMaxTrabalhos' => 2, 'numMaxCoautores' => 5, // 'possuiTaxa'=>true, // 'valorTaxa'=>10, - 'enderecoId'=>2, 'coordenadorId'=>1, - 'hasResumo'=>false, - ]); - - $areasEventoZoo = [ - 'Produção e nutrição de ruminantes', - 'Produção e nutrição de não-ruminantes', - 'Reprodução e melhoramento de ruminantes', - 'Reprodução e melhoramento de não-ruminantes', - 'Tecnologia de produtos de origem animal', - 'Nutrição e Criação de Animais Pet', - 'Apicultura e Meliponicultura', - 'Animais Silvestres', - 'Extensão rural e Desenvolvimento Sustentável', - 'Forragicultura' - ]; - - for($i = 0; $i < sizeof($areasEventoZoo); $i++){ - DB::table('areas')->insert([ - 'nome' => $areasEventoZoo[$i], - 'eventoId' => 1, - ]); - } - - DB::table('modalidades')->insert([ - 'nome' => 'Resumo' ]); - for($i = 0; $i < sizeof($areasEventoZoo); $i++){ - DB::table('area_modalidades')->insert([ - 'areaId' => $i + 1, - 'modalidadeId' => 1, - ]); - } - - - 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', - 'enderecoId' => 1, - ]); - - 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', - 'enderecoId' => 1, - ]); - $this->call(UsuarioSeeder::class); - $this->call(AdministradorSeeder::class); +// $areasEventoZoo = [ +// 'Produção e nutrição de ruminantes', +// 'Produção e nutrição de não-ruminantes', +// 'Reprodução e melhoramento de ruminantes', +// 'Reprodução e melhoramento de não-ruminantes', +// 'Tecnologia de produtos de origem animal', +// 'Nutrição e Criação de Animais Pet', +// 'Apicultura e Meliponicultura', +// 'Animais Silvestres', +// 'Extensão rural e Desenvolvimento Sustentável', +// 'Forragicultura' +// ]; + +// for($i = 0; $i < sizeof($areasEventoZoo); $i++){ +// DB::table('areas')->insert([ +// 'nome' => $areasEventoZoo[$i], +// 'eventoId' => 1, +// ]); +// } + +// DB::table('modalidades')->insert([ +// 'nome' => 'Resumo' +// ]); + +// for($i = 0; $i < sizeof($areasEventoZoo); $i++){ +// DB::table('area_modalidades')->insert([ +// 'areaId' => $i + 1, +// 'modalidadeId' => 1, +// ]); +// } + + +// 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', +// 'enderecoId' => 1, +// ]); + +// 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', +// 'enderecoId' => 1, +// ]); + } } diff --git a/database/seeds/FuncaoParticipanteSeeder.php b/database/seeds/FuncaoParticipanteSeeder.php new file mode 100644 index 0000000000000000000000000000000000000000..252de374e258a0fe0f12c73b7cf8a7420e0dda58 --- /dev/null +++ b/database/seeds/FuncaoParticipanteSeeder.php @@ -0,0 +1,43 @@ +insert([ + 'nome'=>'Vice-coordenador', + + ]); + + DB::table('funcao_participantes')->insert([ + 'nome'=>'Colaborador', + + ]); + + DB::table('funcao_participantes')->insert([ + 'nome'=>'Consultor', + + ]); + + DB::table('funcao_participantes')->insert([ + 'nome'=>'Bolsista', + + ]); + + DB::table('funcao_participantes')->insert([ + 'nome'=>'Estudante', + + ]); + DB::table('funcao_participantes')->insert([ + 'nome'=>'Voluntário', + + ]); + } +} diff --git a/database/seeds/GrandeAreaSeeder.php b/database/seeds/GrandeAreaSeeder.php new file mode 100644 index 0000000000000000000000000000000000000000..7e32bee7281d181a983e6e8999af4ad1b7845bd0 --- /dev/null +++ b/database/seeds/GrandeAreaSeeder.php @@ -0,0 +1,40 @@ +insert([ + 'nome'=>'Ciências Exatas e da Terra', + ]); + DB::table('grande_areas')->insert([ + 'nome'=>'Ciências Biológicas', + ]); + DB::table('grande_areas')->insert([ + 'nome'=>'Engenharias', + ]); + DB::table('grande_areas')->insert([ + 'nome'=>'Ciências da Saúde ', + ]); + DB::table('grande_areas')->insert([ + 'nome'=>'Ciências Agrárias', + ]); + DB::table('grande_areas')->insert([ + 'nome'=>'Ciências Sociais Aplicadas', + ]); + DB::table('grande_areas')->insert([ + 'nome'=>'Ciências Humanas', + ]); + DB::table('grande_areas')->insert([ + 'nome'=>'Lingüística, Letras e Artes', + ]); + + } +} diff --git a/database/seeds/ProponenteSeeder.php b/database/seeds/ProponenteSeeder.php new file mode 100644 index 0000000000000000000000000000000000000000..48507d39e49f74460c9451911246de9ac5e222b9 --- /dev/null +++ b/database/seeds/ProponenteSeeder.php @@ -0,0 +1,22 @@ +where('name','Proponente')->pluck('id'); + + DB::table('proponentes')->insert([ + 'user_id' => $user_id[0], + + ]); + } +} diff --git a/database/seeds/SubAreaSeeder.php b/database/seeds/SubAreaSeeder.php new file mode 100644 index 0000000000000000000000000000000000000000..51d47d85290a2d1b76377ba40cbf0423b1e2ef88 --- /dev/null +++ b/database/seeds/SubAreaSeeder.php @@ -0,0 +1,77 @@ +insert([ + 'nome'=>'Álgebra', + 'area_id' => '1' + ]); + + //------------------ Ciências Biológicas ---------------- + //Genética -------------------- + + DB::table('sub_areas')->insert([ + 'nome'=>'Genética Quantitativa', + 'area_id' => '2' + ]); + + //------------------ Engenharias ---------------- + //Engenharia Civil -------------- + + DB::table('sub_areas')->insert([ + 'nome'=>'Álgebra', + 'area_id' => '3' + ]); + + //------------------ Ciências da Saúde ---------------- + //Medicina-------------- + + DB::table('sub_areas')->insert([ + 'nome'=>'Clínica Médica', + 'area_id' => '4' + ]); + + //------------------ Ciências Agrárias ---------------- + //Agronomia -------------- + + DB::table('sub_areas')->insert([ + 'nome'=>'Ciência do Solo', + 'area_id' => '5' + ]); + + //------------------ Ciências Sociais Aplicadas ---------------- + //Direito -------------- + + DB::table('sub_areas')->insert([ + 'nome'=>'Teoria do Direito', + 'area_id' => '6' + ]); + + //------------------ Ciências Humanas ---------------- + //Filosofia -------------- + + DB::table('sub_areas')->insert([ + 'nome'=>' História da Filosofia', + 'area_id' => '7' + ]); + + //------------------ Lingüística, Letras e Artes ---------------- + //Lingüística ------------------ + + DB::table('sub_areas')->insert([ + 'nome'=>'Teoria e Análise Lingüística', + 'area_id' => '8' + ]); + } +} diff --git a/database/seeds/UsuarioSeeder.php b/database/seeds/UsuarioSeeder.php index 789a9438fdfbacdba41c788dc16e42b5523b73f6..a5679c19027c34d0dc5ca679eb7ccdcc8175f255 100644 --- a/database/seeds/UsuarioSeeder.php +++ b/database/seeds/UsuarioSeeder.php @@ -17,9 +17,27 @@ class UsuarioSeeder extends Seeder 'name'=>'Administrador', 'email'=>'admin@ufrpe.br', - 'password'=>Hash::make('123456'), + 'password'=>Hash::make('12345678'), 'tipo'=>'administrador', 'email_verified_at'=>'2020-01-01' ]); + + DB::table('users')->insert([ + + 'name'=>'AdministradorResponsavel', + 'email'=>'adminResp@ufrpe.br', + 'password'=>Hash::make('12345678'), + 'tipo'=>'administradorResponsavel', + 'email_verified_at'=>'2020-01-01' + ]); + + DB::table('users')->insert([ + + 'name'=>'Proponente', + 'email'=>'usuario@ufrpe.br', + 'password'=>Hash::make('12345678'), + 'tipo'=>'proponente', + 'email_verified_at'=>'2020-01-01' + ]); } } diff --git a/resources/views/coordenador/home.blade.php b/resources/views/coordenador/home.blade.php index c5c184f8d4f34ff6cf9883f9c5a22947384c26a5..d7e9b1e09e6a741bc9c636cc6d1f2a3576cc40d2 100644 --- a/resources/views/coordenador/home.blade.php +++ b/resources/views/coordenador/home.blade.php @@ -8,18 +8,48 @@
-
+

Eventos

-
- Comissões -
+ @if(Auth::check()) @if(Auth::user()->tipo == 'administrador') + + +
+ Ver Editais +
+ {{-- + editar/Deletar projetos cadastrados + editar/Deletar proponentes ja cadastrados + editar/Deletar editais já cadastrados + Configurações do sistema + --}} + + @endif + @if(Auth::user()->tipo == 'administradorResponsavel')
- Novo Evento + Novo Edital
+ {{-- + 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') + {{--
+ Submeter Projeto +
--}} + {{-- + projetos + perfil + participantes de projeto + submeter projetos + anexar documentos + --}} @endif @endif @@ -79,17 +109,17 @@

- Realização: {{date('d/m/Y',strtotime($evento->dataInicio))}} - {{date('d/m/Y',strtotime($evento->dataFim))}}
+ {{-- Realização: {{date('d/m/Y',strtotime($evento->dataInicio))}} - {{date('d/m/Y',strtotime($evento->dataFim))}}
Submissão: {{date('d/m/Y',strtotime($evento->inicioSubmissao))}} - {{date('d/m/Y',strtotime($evento->fimSubmissao))}}
- Revisão: {{date('d/m/Y',strtotime($evento->inicioRevisao))}} - {{date('d/m/Y',strtotime($evento->fimRevisao))}}
+ Revisão: {{date('d/m/Y',strtotime($evento->inicioRevisao))}} - {{date('d/m/Y',strtotime($evento->fimRevisao))}}
--}}

-
+ {{--
{{$evento->endereco->rua}}, {{$evento->endereco->numero}} - {{$evento->endereco->cidade}} / {{$evento->endereco->uf}}. -
+
--}}

diff --git a/resources/views/evento/criarEvento.blade.php b/resources/views/evento/criarEvento.blade.php index 520564879672696bdd66d4fc184b9958a1d1c4a3..62212516230845c0dea68a8b74cde19a307a2061 100644 --- a/resources/views/evento/criarEvento.blade.php +++ b/resources/views/evento/criarEvento.blade.php @@ -3,7 +3,7 @@ @section('content')

-

Novo Evento

+

Novo Edital

diff --git a/resources/views/evento/submeterTrabalho.blade.php b/resources/views/evento/submeterTrabalho.blade.php index bbffe7921b4138f9139ad3caa8f4bbd0d0b77b8d..2815e1e6d10d5919b277686093a933cbbd315d2a 100644 --- a/resources/views/evento/submeterTrabalho.blade.php +++ b/resources/views/evento/submeterTrabalho.blade.php @@ -4,25 +4,20 @@
-
+
-
Enviar Trabalho
+
Enviar Projeto

@csrf - -

- @error('numeroMax') - @include('componentes.mensagens') - @enderror -
- + + + {{-- Nome do Projeto --}}
- {{-- Nome Trabalho --}}
- - + + @error('nomeTrabalho') @@ -31,48 +26,33 @@ @enderror
- + + {{-- Grande Area --}}
- {{-- Nome Trabalho --}} -
- - -
-
- -
-
-
+
+ + + @error('grandeAreaId') + + {{ $message }} + + @enderror
- Coautor + -
- - @if($evento->hasResumo) -
-
- - - - @error('resumo') - - {{ $message }} - - @enderror - - -
-
- @endif - + {{-- Area --}}
@@ -85,30 +65,162 @@
- + {{-- Sub Area --}}
- - + + @foreach($subAreas as $subArea) + + @endforeach - @error('modalidadeId') + @error('subAreaId') {{ $message }} @enderror
+ + {{-- Anexo do Projeto --}} +
+ {{-- Arquivo --}} +
+ + +
+
+ Selecione um arquivo: +
+
+ + +
+
+ @error('anexoProjeto') + + {{ $message }} + + @enderror +
+
+ + {{-- + @if(tipo de edital == PIBIC ou tipo de edital == PIBIC-EM) + @endif + --}} + {{-- Decisão do CONSU --}} +
+ {{-- Arquivo --}} +
+ + +
+
+ Selecione um arquivo: +
+
+ + +
+
+ @error('arquivo') + + {{ $message }} + + @enderror +
+
+ + {{-- Autorização do Comitê de Ética --}} +
+ {{-- Arquivo --}} +
+ + +
+
+ Selecione um arquivo: +
+
+ + +
+
+ @error('arquivo') + + {{ $message }} + + @enderror +
+
+ +
+

Coordenador

+ + {{-- Coordenador --}} +
+ +
+ + +
+
+ + {{-- Lattes do Coordenador --}} +
+ {{-- Arquivo --}} +
+ + +
+
+ Selecione um arquivo: +
+
+ + +
+
+ @error('arquivo') + + {{ $message }} + + @enderror +
+
+ + {{-- Pontuação da Planilha de Pontuação --}} +
+ {{-- Nome Trabalho --}} +
+ + +
+
+ + {{-- Anexo da Planilha de Pontuação --}}
{{-- Arquivo --}}
- + -
- +
+
+ Selecione um arquivo: +
+
+ + +
- O arquivo Selecionado deve ser no formato PDF de até 2mb. @error('arquivo') {{ $message }} @@ -117,12 +229,129 @@
+ {{-- Link do grupo de pesquisa --}} +
+
+ + +
+
+
+

Participantes

+ + {{-- Participantes --}} +
+
+
+ +
+
+ + +
+
+ + +
+
+ + +
+
+ + + +
+
+ +
+
+ + +
+
+ + +
+
+ + +
+
+ + + +
+
+ +
+ Participantes + +
+
+ + {{-- Plano de Trabalho --}} +

Plano de Trabalho

+
+
+
+ +
+
+ + +
+ + + {{-- Arquivo --}} +
+ +
+
+ Selecione um arquivo: +
+
+ + +
+
+ @error('anexoPlanoTrabalho') + + {{ $message }} + + @enderror +
+
+ + + +
+ + +
+
+ Plano de Trabalho + +
+
+ + +

- Cancelar + Cancelar
-

Revisão de Trabalhos

+ {{--

Revisão de Trabalhos

{{date('d/m/Y',strtotime($evento->inicioRevisao))}} - {{date('d/m/Y',strtotime($evento->fimRevisao))}} -

+

--}}
-

Endereço

+ {{--

Endereço

{{$evento->endereco->rua}}, {{$evento->endereco->numero}} - {{$evento->endereco->cidade}} / {{$evento->endereco->uf}}. -

+

--}}
@if($hasFile == true) diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index cc2f5422f1dd6350d6579ebc6c8958f1a289be24..17b07a638b5bfca3a554a5c4a1e036559bc767bf 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -69,22 +69,13 @@ {{-- @component('componentes.navbarServidor') @endcomponent --}} @endif - - @if(Auth::user()->tipo == 'proReitor') - - {{-- @component('componentes.navbarAdministrador') - @endcomponent --}} - @endif + @if(Auth::user()->tipo == 'proponente') {{-- @component('componentes.navbarAdministrador') @endcomponent --}} @endif - @if(Auth::user()->tipo == 'coordenadorComite') - - {{-- @component('componentes.navbarAdministrador') - @endcomponent --}} - @endif +
  • diff --git a/routes/web.php b/routes/web.php index c78588e1827ed6f1a57e93310f23572e9c858af0..194430f3c0c693f3df416dd471f672112be0ce05 100644 --- a/routes/web.php +++ b/routes/web.php @@ -59,7 +59,7 @@ Route::group(['middleware' => ['isTemp', 'auth', 'verified']], function(){ //Evento Route::get( '/evento/criar', 'EventoController@create' )->name('evento.criar'); Route::post( '/evento/criar', 'EventoController@store' )->name('evento.criar'); - Route::get( '/evento/visualizar/{id}','EventoController@show' )->name('evento.visualizar'); + Route::get( '/edital/visualizar/{id}','EventoController@show' )->name('edital.visualizar'); Route::delete('/evento/excluir/{id}', 'EventoController@destroy' )->name('evento.deletar'); Route::get( '/evento/editar/{id}', 'EventoController@edit' )->name('evento.editar'); Route::post( '/evento/editar/{id}', 'EventoController@update' )->name('evento.update');