diff --git a/app/Http/Controllers/TrabalhoController.php b/app/Http/Controllers/TrabalhoController.php index b29d89eee66934ea6713f86cff00d5c2c4b75cab..7d55a860d073daeafee5b5727f0a801cf0a224fc 100644 --- a/app/Http/Controllers/TrabalhoController.php +++ b/app/Http/Controllers/TrabalhoController.php @@ -112,7 +112,8 @@ class TrabalhoController extends Controller 'area' => ['required', 'string'], 'subArea' => ['required', 'string'], 'pontuacaoPlanilha' => ['required', 'string'], - 'linkGrupo' => ['required', 'string', 'link_grupo'], + 'linkGrupo' => ['required', 'string'], + // 'linkGrupo' => ['required', 'string', 'link_grupo'], 'linkLattesEstudante' => ['required', 'string', 'link_lattes'], 'nomeParticipante.*' => ['required', 'string'], 'emailParticipante.*' => ['required', 'string'], @@ -161,7 +162,8 @@ class TrabalhoController extends Controller 'area' => ['required', 'string'], 'subArea' => ['required', 'string'], 'pontuacaoPlanilha' => ['required', 'string'], - 'linkGrupo' => ['required', 'string', 'link_grupo'], + 'linkGrupo' => ['required', 'string'], + // 'linkGrupo' => ['required', 'string', 'link_grupo'], 'linkLattesEstudante' => ['required', 'string', 'link_lattes'], 'nomeParticipante.*' => ['required', 'string'], 'emailParticipante.*' => ['required', 'string'], diff --git a/resources/views/administrador/editais.blade.php b/resources/views/administrador/editais.blade.php index 12d00994b26cf9b0872c766c40bb1353340d737a..00e488d3f9feaddaaff5ef75d33342d1fde2b65c 100644 --- a/resources/views/administrador/editais.blade.php +++ b/resources/views/administrador/editais.blade.php @@ -50,15 +50,13 @@ Visualizar Pareceres -
- {{ csrf_field() }} - {{ method_field('DELETE') }} - -
+ + @endif @@ -69,6 +67,34 @@ + + @endsection diff --git a/resources/views/projeto/editar.blade.php b/resources/views/projeto/editar.blade.php index e42835b6ed1ba862ae5c0efc5938a91cd90f1aeb..4e5d6df927f071771cf4afd6f9c18883febff77d 100644 --- a/resources/views/projeto/editar.blade.php +++ b/resources/views/projeto/editar.blade.php @@ -681,39 +681,49 @@ ""; } - function areas() { - var grandeArea = $('#grandeArea').val(); - $.getJSON("{{ config('app.url') }}/naturezas/areas/" + grandeArea, - function (dados){ - if (dados.length > 0){ - var option = ""; - $.each(dados, function(i, obj){ - option += ''; - }) - } else { - var option = ""; + function areas() { + var grandeArea = $('#grandeArea').val(); + $.ajax({ + type: 'POST', + url: '{{ route('area.consulta') }}', + data: 'id='+grandeArea , + headers: + { + 'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content') + }, + success: (dados) => { + + if (dados.length > 0) { + if($('#oldArea').val() == null || $('#oldArea').val() == ""){ + var option = ''; } - $('#area').html(option).show(); - }) + $.each(dados, function(i, obj) { + if($('#oldArea').val() != null && $('#oldArea').val() == obj.id){ + option += ''; + }else{ + option += ''; + } + }) + } else { + var option = ""; + } + $('#area').html(option).show(); + subareas(); + }, + error: (data) => { + console.log(data); + } + + }) } function subareas() { - var area = $('#area').val(); - $.getJSON("{{ config('app.url') }}/naturezas/subarea/" + area, - function (dados){ - if (dados.length > 0){ - var option = ""; - $.each(dados, function(i, obj){ - option += ''; - }) - } else { - var option = ""; - } - $('#subArea').html(option).show(); - }) - } - -@endsectionders: + var area = $('#area').val(); + $.ajax({ + type: 'POST', + url: '{{ route('subarea.consulta') }}', + data: 'id='+area , + headers: { 'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content') }, diff --git a/resources/views/projeto/index.blade.php b/resources/views/projeto/index.blade.php index 4776f36e32e765b1ca1d0263e6993245b76e24aa..c29a7b8393707ab4e42a6e61cc397eadb57fbda4 100644 --- a/resources/views/projeto/index.blade.php +++ b/resources/views/projeto/index.blade.php @@ -61,9 +61,14 @@ Resultado --}} @if($projeto->status == 'Submetido') - + + + + + + @endif @@ -71,6 +76,28 @@ @endif + + @endforeach @@ -79,6 +106,7 @@ @section('javascript') @endsection \ No newline at end of file diff --git a/resources/views/proponente/projetos.blade.php b/resources/views/proponente/projetos.blade.php index a2b668ed7f48b4759851baf96f768dc10ce47e3b..054a60b3e76ff26b761eef282a2988320b09ba8f 100644 --- a/resources/views/proponente/projetos.blade.php +++ b/resources/views/proponente/projetos.blade.php @@ -52,16 +52,39 @@ Resultado --}} - @if($projeto->status == 'Submetido') - + @if($projeto->status == 'Submetido') + + @endif + + @endforeach