From 219bac0098fd230228256697b30e22d63624fc09 Mon Sep 17 00:00:00 2001
From: alinetenorio <aline.tenorio96@gmail.com>
Date: Fri, 5 Jun 2020 13:55:32 -0300
Subject: [PATCH] =?UTF-8?q?Adicionando=20=C3=A1rea=20de=20forma=C3=A7?=
 =?UTF-8?q?=C3=A3o=20ao=20proponente?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/AdministradorController.php          | 4 ++++
 .../2020_05_20_211421_create_proponentes_table.php        | 1 +
 database/seeds/ProponenteSeeder.php                       | 1 +
 resources/views/administrador/editar_user.blade.php       | 6 ++++++
 resources/views/administrador/novo_user.blade.php         | 8 ++++++++
 resources/views/user/perfilUser.blade.php                 | 6 ++++++
 6 files changed, 26 insertions(+)

diff --git a/app/Http/Controllers/AdministradorController.php b/app/Http/Controllers/AdministradorController.php
index a0134cc..36e340d 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 b80eb9c..021492c 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 69615fb..c78ef57 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 a81dc6b..2829246 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 e0ce3b1..f5cbba9 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 451cf74..b2906e4 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">
 
-- 
GitLab