diff --git a/app/Http/Controllers/AdministradorController.php b/app/Http/Controllers/AdministradorController.php index a0134cc1bd93090f01d319f13b460384368bccc2..36e340d7f0b09f6524028209d1e332c9d19e8517 100644 --- a/app/Http/Controllers/AdministradorController.php +++ b/app/Http/Controllers/AdministradorController.php @@ -86,6 +86,7 @@ class AdministradorController extends Controller 'cargo' => 'required', 'titulacaoMaxima' => 'required', 'anoTitulacao' => 'required', + 'areaFormacao' => 'required', 'area' => 'required', 'bolsistaProdutividade' => 'required', 'nivel' => 'required', @@ -124,6 +125,7 @@ class AdministradorController extends Controller $proponente->vinculo = $request->vinculo; $proponente->titulacaoMaxima = $request->titulacaoMaxima; $proponente->anoTitulacao = $request->anoTitulacao; + $proponente->areaFormacao = $request->areaFormacao; $proponente->grandeArea = $request->area; $proponente->area = "teste"; $proponente->subArea = "teste"; @@ -180,6 +182,7 @@ class AdministradorController extends Controller 'cargo' => 'required', 'titulacaoMaxima' => 'required', 'anoTitulacao' => 'required', + 'areaFormacao' => 'required', 'grandeArea' => 'required', 'bolsistaProdutividade' => 'required', 'nivel' => 'required', @@ -213,6 +216,7 @@ class AdministradorController extends Controller $proponente->vinculo = $request->vinculo; $proponente->titulacaoMaxima = $request->titulacaoMaxima; $proponente->anoTitulacao = $request->anoTitulacao; + $proponente->areaFormacao = $request->areaFormacao; $proponente->grandeArea = $request->grandeArea; $proponente->area = "teste"; $proponente->subArea = "teste"; 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 b80eb9ca78ac2d79652ab3e41ae12af6f1cbc4c5..021492c6450b486d4ede6758b56159996541ef34 100644 --- a/database/migrations/2020_05_20_211421_create_proponentes_table.php +++ b/database/migrations/2020_05_20_211421_create_proponentes_table.php @@ -22,6 +22,7 @@ class CreateProponentesTable extends Migration $table->string('vinculo'); $table->string('titulacaoMaxima'); $table->string('anoTitulacao'); + $table->string('areaFormacao'); $table->string('grandeArea'); $table->string('area'); $table->string('subArea'); diff --git a/database/seeds/ProponenteSeeder.php b/database/seeds/ProponenteSeeder.php index 69615fb25dbf5cec62ecb0014465605bc0f63000..c78ef578c74c3a658430ceb4b56e06c844aebb09 100644 --- a/database/seeds/ProponenteSeeder.php +++ b/database/seeds/ProponenteSeeder.php @@ -24,6 +24,7 @@ class ProponenteSeeder extends Seeder 'vinculo' => '123123123', 'titulacaoMaxima' => '123123123', 'anoTitulacao' => '123123123', + 'areaFormacao' => '123123123', 'grandeArea' => '123123123', 'area' => '123123123', 'subArea' => '123123123', diff --git a/resources/views/administrador/editar_user.blade.php b/resources/views/administrador/editar_user.blade.php index a81dc6b9c12c2109ed28ebeaad0edbdfe68e8568..282924608cdd6231133ac4e82bba85cfbe5d4cd3 100644 --- a/resources/views/administrador/editar_user.blade.php +++ b/resources/views/administrador/editar_user.blade.php @@ -121,6 +121,9 @@ <label class="col-form-label">{{ __('Ano Titulação') }}</label> <input value="{{$proponente->anoTitulacao}}" id="anoTitulacao" type="text" class="form-control @error('anoTitulacao') is-invalid @enderror" name="anoTitulacao" autocomplete="anoTitulacao"> + <label class="col-form-label">{{ __('Area Formação') }}</label> + <input value="{{$proponente->areaFormacao}}" id="areaFormacao" type="text" class="form-control @error('areaFormacao') is-invalid @enderror" name="areaFormacao" autocomplete="areaFormacao"> + <label class="col-form-label">{{ __('Ãrea') }}</label> <input value="{{$proponente->grandeArea}}" id="grandeArea" type="text" class="form-control @error('grandeArea') is-invalid @enderror" name="grandeArea" autocomplete="grandeArea"> @@ -150,6 +153,9 @@ <label class="col-form-label">{{ __('Ano Titulação') }}</label> <input value="" id="anoTitulacao" type="text" class="form-control @error('anoTitulacao') is-invalid @enderror" name="anoTitulacao" autocomplete="anoTitulacao"> + <label class="col-form-label">{{ __('Area Formação') }}</label> + <input value="{{$proponente->areaFormacao}}" id="areaFormacao" type="text" class="form-control @error('areaFormacao') is-invalid @enderror" name="areaFormacao" autocomplete="areaFormacao"> + <label class="col-form-label">{{ __('Ãrea') }}</label> <input value="" id="grandeArea" type="text" class="form-control @error('grandeArea') is-invalid @enderror" name="grandeArea" autocomplete="grandeArea"> diff --git a/resources/views/administrador/novo_user.blade.php b/resources/views/administrador/novo_user.blade.php index e0ce3b1486f2c6d6cc4c822c6ddc1d77806cf7f7..f5cbba9ee869f20b8282d2e89542bfac0cfe1c66 100644 --- a/resources/views/administrador/novo_user.blade.php +++ b/resources/views/administrador/novo_user.blade.php @@ -123,6 +123,14 @@ </span> @enderror + <label for="areaFormacao" class="col-form-label">{{ __('Area de Formação') }}</label> + <input id="areaFormacao" type="text" class="form-control @error('areaFormacao') is-invalid @enderror" name="areaFormacao" value="" autocomplete="nome"> + + @error('areaFormacao') + <span class="invalid-feedback" role="alert"> + <strong>{{ $message }}</strong> + </span> + @enderror <div> <label for="area" class="col-form-label">{{ __('Ãrea') }}</label> diff --git a/resources/views/user/perfilUser.blade.php b/resources/views/user/perfilUser.blade.php index 451cf74c25fac8d46417735b01d19304d428a41e..b2906e411f869373c3db16bb7720cf2acd626144 100644 --- a/resources/views/user/perfilUser.blade.php +++ b/resources/views/user/perfilUser.blade.php @@ -142,6 +142,9 @@ <label class="col-form-label">{{ __('Ano Titulação') }}</label> <input value="{{$proponente->anoTitulacao}}" id="anoTitulacao" type="text" class="form-control @error('anoTitulacao') is-invalid @enderror" name="anoTitulacao" autocomplete="anoTitulacao"> + <label class="col-form-label">{{ __('Area de Formação') }}</label> + <input value="{{$proponente->areaFormacao}}" id="areaFormacao" type="text" class="form-control @error('areaFormacao') is-invalid @enderror" name="areaFormacao" autocomplete="areaFormacao"> + <label class="col-form-label">{{ __('Ãrea') }}</label> <input value="{{$proponente->grandeArea}}" id="grandeArea" type="text" class="form-control @error('grandeArea') is-invalid @enderror" name="grandeArea" autocomplete="grandeArea"> @@ -424,6 +427,9 @@ <label class="col-form-label">{{ __('Ano Titulação') }}</label> <input value="{{$proponente->anoTitulacao}}" id="anoTitulacao" type="text" class="form-control @error('anoTitulacao') is-invalid @enderror" name="anoTitulacao" autocomplete="anoTitulacao"> + <label class="col-form-label">{{ __('Area de Formação') }}</label> + <input value="{{$proponente->areaFormacao}}" id="areaFormacao" type="text" class="form-control @error('areaFormacao') is-invalid @enderror" name="areaFormacao" autocomplete="areaFormacao"> + <label class="col-form-label">{{ __('Ãrea') }}</label> <input value="{{$proponente->grandeArea}}" id="grandeArea" type="text" class="form-control @error('grandeArea') is-invalid @enderror" name="grandeArea" autocomplete="grandeArea">