Skip to content

GitLab

Unverified Commit 6ac4a6d1 authored by Antônio Durval's avatar Antônio Durval Committed by GitHub
Browse files

Merge pull request #719 from yuriresendematias/master 

Selecionando várias áreas temáticas durante o convite para o avaliador
parents a3165e85 df50a554
master carl-branch dependabot/composer/symfony/http-kernel-4.4.50 dependabot/npm_and_yarn/minimist-and-mkdirp-1.2.8 excluir_projeto_submetido updates_mar
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 9725 additions and 9699 deletions
+9725 -9699
app/Http/Controllers/AdministradorController.php
View file @ 6ac4a6d1
...@@ -845,7 +845,7 @@ class AdministradorController extends Controller ...@@ -845,7 +845,7 @@ class AdministradorController extends Controller
$emailAvaliador = $request->emailAvaliador; $emailAvaliador = $request->emailAvaliador;
$area = Area::where('id', $request->area_id)->first(); $area = Area::where('id', $request->area_id)->first();
$user = User::where('email', $emailAvaliador)->first(); $user = User::where('email', $emailAvaliador)->first();
$areaTematica = AreaTematica::where('id', $request->area_tematica_id)->first(); $areaTematica = AreaTematica::find($request->areasTemeticas);
if ($request->instituicao == 'ufape') { if ($request->instituicao == 'ufape') {
$nomeInstituicao = 'Universidade Federal do Agreste de Pernambuco'; $nomeInstituicao = 'Universidade Federal do Agreste de Pernambuco';
...@@ -952,7 +952,7 @@ class AdministradorController extends Controller ...@@ -952,7 +952,7 @@ class AdministradorController extends Controller
$emailAvaliador = $request->emailAvaliador; $emailAvaliador = $request->emailAvaliador;
$area = Area::where('id', $request->area_id)->first(); $area = Area::where('id', $request->area_id)->first();
$user = User::where('email', $emailAvaliador)->first(); $user = User::where('email', $emailAvaliador)->first();
$areaTematica = AreaTematica::where('id', $request->area_tematica_id)->first(); $areaTematica = AreaTematica::find($request->areasTemeticas);
if ($request->instituicao == 'ufape') { if ($request->instituicao == 'ufape') {
$nomeInstituicao = 'Universidade Federal do Agreste de Pernambuco'; $nomeInstituicao = 'Universidade Federal do Agreste de Pernambuco';
......
app/Http/Controllers/TrabalhoController.php
View file @ 6ac4a6d1
app/Trabalho.php
View file @ 6ac4a6d1
app/TrabalhoUser.php
View file @ 6ac4a6d1
resources/views/administrador/analisarProposta.blade.php
View file @ 6ac4a6d1
@extends('layouts.app') @extends('layouts.app')
@section('styles')
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.13/css/select2.min.css" integrity="sha512-nMNlpuaDPrqlEls3IX/Q56H36qvBASwb3ipuo3MxeWbsQB1881ox0cRv7UPTgBlriqoynt35KjEwgGUeUXIPnw==" crossorigin="anonymous" referrerpolicy="no-referrer" />
@endsection
@section('content') @section('content')
@php @php
$grandesAreas = \App\GrandeArea::all(); $grandesAreas = \App\GrandeArea::all();
...@@ -1561,11 +1565,8 @@ ...@@ -1561,11 +1565,8 @@
@if($evento->natureza_id == 3) @if($evento->natureza_id == 3)
<div class="form-group"> <div class="form-group">
<label for="grandeArea" class="col-form-label">{{ __('Áreas Temáticas') }} <span <label for="areasTemeticas" class="col-form-label">{{ __('Áreas Temáticas') }}<span style="color: red; font-weight:bold">*</span></label>
style="color: red; font-weight:bold">*</span></label> <select class="form-control" id="areaTematicaConvite" style="width: 425px" name="areasTemeticas[]" multiple="multiple" required>
<select class="form-control" id="grandeAreaConvite" name="area_tematica_id"
required>
<option value="" disabled selected hidden>-- Áreas Temáticas --</option>
@foreach($areasTematicas as $areaTematica) @foreach($areasTematicas as $areaTematica)
<option value="{{$areaTematica->id}}">{{$areaTematica->nome}}</option> <option value="{{$areaTematica->id}}">{{$areaTematica->nome}}</option>
@endforeach @endforeach
...@@ -1709,6 +1710,14 @@ ...@@ -1709,6 +1710,14 @@
@endsection @endsection
@section('javascript') @section('javascript')
<script src="https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.13/js/select2.min.js" integrity="sha512-2ImtlRlf2VVmiGZsjm9bEyhjGW4dU7B6TNwh/hx/iSByxNENtj3WVE6o/9Lj4TJeVXPi4bnOIMXFIJJAeufa0A==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
<script type="text/javascript">
$("#areaTematicaConvite").select2({
placeholder: 'Selecione as áreas temáticas',
allowClear: true
});
</script>
<script type="text/javascript" src="http://code.jquery.com/jquery-1.7.2.min.js"></script> <script type="text/javascript" src="http://code.jquery.com/jquery-1.7.2.min.js"></script>
<script type="text/javascript"> <script type="text/javascript">
var avaliacaoForm; var avaliacaoForm;
......
resources/views/administrador/selecionarAvaliadores.blade.php
View file @ 6ac4a6d1
@extends('layouts.app') @extends('layouts.app')
@section('styles')
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.13/css/select2.min.css" integrity="sha512-nMNlpuaDPrqlEls3IX/Q56H36qvBASwb3ipuo3MxeWbsQB1881ox0cRv7UPTgBlriqoynt35KjEwgGUeUXIPnw==" crossorigin="anonymous" referrerpolicy="no-referrer" />
@endsection
@section('content') @section('content')
<div class="container" style="margin-top: 30px;"> <div class="container" style="margin-top: 30px;">
...@@ -284,20 +288,14 @@ ...@@ -284,20 +288,14 @@
</select> </select>
</div> </div>
@else @else
<div class="form-group"> <div class="form-group">
<label for="grandeArea" class="col-form-label">{{ __('Áreas Temáticas') }} <span <label for="areasTemeticas" class="col-form-label">{{ __('Áreas Temáticas') }}<span style="color: red; font-weight:bold">*</span></label>
style="color: red; font-weight:bold">*</span></label> <select class="form-control" id="areaTematicaConvite" style="width: 425px" name="areasTemeticas[]" multiple="multiple" required>
<select class="form-control" id="grandeAreaConvite" name="area_tematica_id"
required>
<option value="" disabled selected hidden>-- Áreas Temáticas --</option>
@foreach($areasTematicas as $areaTematica) @foreach($areasTematicas as $areaTematica)
<option value="{{$areaTematica->id}}">{{$areaTematica->nome}}</option> <option value="{{$areaTematica->id}}">{{$areaTematica->nome}}</option>
@endforeach @endforeach
</select> </select>
</div> </div>
@endif @endif
@if($evento->natureza_id != 3) @if($evento->natureza_id != 3)
...@@ -337,6 +335,14 @@ ...@@ -337,6 +335,14 @@
@endsection @endsection
@section('javascript') @section('javascript')
<script src="https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.13/js/select2.min.js" integrity="sha512-2ImtlRlf2VVmiGZsjm9bEyhjGW4dU7B6TNwh/hx/iSByxNENtj3WVE6o/9Lj4TJeVXPi4bnOIMXFIJJAeufa0A==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
<script type="text/javascript">
$("#areaTematicaConvite").select2({
placeholder: 'Selecione as áreas temáticas',
allowClear: true
});
</script>
<script> <script>
$('#myModal').on('shown.bs.modal', function () { $('#myModal').on('shown.bs.modal', function () {
$('#myInput').trigger('focus') $('#myInput').trigger('focus')
......
resources/views/administrador/selecionarProjetos.blade.php
View file @ 6ac4a6d1
@extends('layouts.app') @extends('layouts.app')
@section('styles')
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.13/css/select2.min.css" integrity="sha512-nMNlpuaDPrqlEls3IX/Q56H36qvBASwb3ipuo3MxeWbsQB1881ox0cRv7UPTgBlriqoynt35KjEwgGUeUXIPnw==" crossorigin="anonymous" referrerpolicy="no-referrer" />
@endsection
@section('content') @section('content')
<div class="container" style="margin-top: 30px;"> <div class="container" style="margin-top: 30px;">
...@@ -333,8 +337,8 @@ ...@@ -333,8 +337,8 @@
required> required>
</div> </div>
<div class="form-group">
@if($evento->natureza_id != 3) @if($evento->natureza_id != 3)
<div class="form-group">
<label for="grandeArea" class="col-form-label">{{ __('Grande Área') }} <span <label for="grandeArea" class="col-form-label">{{ __('Grande Área') }} <span
style="color: red; font-weight:bold">*</span></label> style="color: red; font-weight:bold">*</span></label>
<select class="form-control" id="grandeAreaConvite" name="grande_area_id" onchange="areas()" <select class="form-control" id="grandeAreaConvite" name="grande_area_id" onchange="areas()"
...@@ -359,15 +363,14 @@ ...@@ -359,15 +363,14 @@
</select> </select>
</div> </div>
@else @else
<label for="grandeArea" class="col-form-label">{{ __('Áreas Temáticas') }} <span <div class="form-group">
style="color: red; font-weight:bold">*</span></label> <label for="areasTemeticas" class="col-form-label">{{ __('Áreas Temáticas') }}<span style="color: red; font-weight:bold">*</span></label>
<select class="form-control" id="grandeAreaConvite" name="area_tematica_id" <select class="form-control" id="areaTematicaConvite" style="width: 425px" name="areasTemeticas[]" multiple="multiple" required>
required>
<option value="" disabled selected hidden>-- Áreas Temáticas --</option>
@foreach($areasTematicas as $areaTematica) @foreach($areasTematicas as $areaTematica)
<option value="{{$areaTematica->id}}">{{$areaTematica->nome}}</option> <option value="{{$areaTematica->id}}">{{$areaTematica->nome}}</option>
@endforeach @endforeach
</select> </select>
</div>
@endif @endif
@if($evento->natureza_id != 3) @if($evento->natureza_id != 3)
...@@ -414,6 +417,15 @@ ...@@ -414,6 +417,15 @@
@endsection @endsection
@section('javascript') @section('javascript')
<script src="https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.13/js/select2.min.js" integrity="sha512-2ImtlRlf2VVmiGZsjm9bEyhjGW4dU7B6TNwh/hx/iSByxNENtj3WVE6o/9Lj4TJeVXPi4bnOIMXFIJJAeufa0A==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
<script type="text/javascript">
$("#areaTematicaConvite").select2({
placeholder: 'Selecione as áreas temáticas',
allowClear: true
});
</script>
<script> <script>
$('#myModal').on('shown.bs.modal', function () { $('#myModal').on('shown.bs.modal', function () {
$('#myInput').trigger('focus') $('#myInput').trigger('focus')
...@@ -497,7 +509,5 @@ ...@@ -497,7 +509,5 @@
$("#outra").prop('required', false); $("#outra").prop('required', false);
} }
} }
</script> </script>
@endsection @endsection
resources/views/layouts/app.blade.php
View file @ 6ac4a6d1
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
<link href="{{ asset('css/app.css') }}" rel="stylesheet"> <link href="{{ asset('css/app.css') }}" rel="stylesheet">
<link href="{{ asset('css/layout.css') }}" rel="stylesheet"> <link href="{{ asset('css/layout.css') }}" rel="stylesheet">
@yield('styles')
<style> <style>
......
resources/views/projeto/editar.blade.php
View file @ 6ac4a6d1
routes/web.php
View file @ 6ac4a6d1
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment