Merge pull request #719 from yuriresendematias/master

Selecionando várias áreas temáticas durante o convite para o avaliador

app/Http/Controllers/AdministradorController.php

@@ -845,7 +845,7 @@ class AdministradorController extends Controller
         $emailAvaliador = $request->emailAvaliador;
         $area = Area::where('id', $request->area_id)->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') {
             $nomeInstituicao = 'Universidade Federal do Agreste de Pernambuco';
@@ -952,7 +952,7 @@ class AdministradorController extends Controller
         $emailAvaliador = $request->emailAvaliador;
         $area = Area::where('id', $request->area_id)->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') {
             $nomeInstituicao = 'Universidade Federal do Agreste de Pernambuco';

resources/views/administrador/analisarProposta.blade.php

 @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')
     @php
         $grandesAreas = \App\GrandeArea::all();
@@ -1561,11 +1565,8 @@
 
                         @if($evento->natureza_id == 3)
                             <div class="form-group">
-                                <label for="grandeArea" 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"
-                                    required>
-                                            <option value="" disabled selected hidden>-- Áreas Temáticas --</option>
+                                <label for="areasTemeticas" class="col-form-label">{{ __('Áreas Temáticas') }}<span style="color: red; font-weight:bold">*</span></label>
+                                <select class="form-control" id="areaTematicaConvite" style="width: 425px" name="areasTemeticas[]" multiple="multiple" required>
                                     @foreach($areasTematicas as $areaTematica)
                                         <option value="{{$areaTematica->id}}">{{$areaTematica->nome}}</option>
                                     @endforeach
@@ -1709,6 +1710,14 @@
 @endsection
 
 @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">
         var avaliacaoForm;

resources/views/administrador/selecionarAvaliadores.blade.php

 @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')
 
 <div class="container" style="margin-top: 30px;">
@@ -284,20 +288,14 @@
             </select>
           </div>
         @else       
-       
           <div class="form-group">
-              <label for="grandeArea" 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"
-                  required>
-                          <option value="" disabled selected hidden>-- Áreas Temáticas --</option>
+            <label for="areasTemeticas" class="col-form-label">{{ __('Áreas Temáticas') }}<span style="color: red; font-weight:bold">*</span></label>
+            <select class="form-control" id="areaTematicaConvite" style="width: 425px" name="areasTemeticas[]" multiple="multiple" required>
                 @foreach($areasTematicas as $areaTematica)
                     <option value="{{$areaTematica->id}}">{{$areaTematica->nome}}</option>
                 @endforeach
             </select>
           </div>                       
-                        
-
         @endif
   
           @if($evento->natureza_id != 3)
@@ -337,6 +335,14 @@
 @endsection
 
 @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>
   $('#myModal').on('shown.bs.modal', function () {
     $('#myInput').trigger('focus')

resources/views/administrador/selecionarProjetos.blade.php

 @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')
 
 <div class="container" style="margin-top: 30px;">
@@ -333,8 +337,8 @@
                                    required>
                         </div>
 
-                        <div class="form-group">
                         @if($evento->natureza_id != 3)
+                          <div class="form-group">                          
                               <label for="grandeArea" class="col-form-label">{{ __('Grande Área') }} <span
                                           style="color: red; font-weight:bold">*</span></label>
                               <select class="form-control" id="grandeAreaConvite" name="grande_area_id" onchange="areas()"
@@ -359,15 +363,14 @@
                               </select>
                           </div>
                         @else
-                        <label for="grandeArea" 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"
-                        required>
-                                <option value="" disabled selected hidden>-- Áreas Temáticas --</option>
+                          <div class="form-group">
+                            <label for="areasTemeticas" class="col-form-label">{{ __('Áreas Temáticas') }}<span style="color: red; font-weight:bold">*</span></label>
+                            <select class="form-control" id="areaTematicaConvite" style="width: 425px" name="areasTemeticas[]" multiple="multiple" required>
                                 @foreach($areasTematicas as $areaTematica)
                                     <option value="{{$areaTematica->id}}">{{$areaTematica->nome}}</option>
                                 @endforeach
                             </select>
+                          </div>
                         @endif
 
                         @if($evento->natureza_id != 3)
@@ -414,6 +417,15 @@
 
 @endsection
 @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>
   $('#myModal').on('shown.bs.modal', function () {
     $('#myInput').trigger('focus')
@@ -497,7 +509,5 @@
           $("#outra").prop('required', false);
       }
   }
-
-  
 </script>
 @endsection

resources/views/layouts/app.blade.php

@@ -23,6 +23,7 @@
     <link href="{{ asset('css/app.css') }}" rel="stylesheet">
     <link href="{{ asset('css/layout.css') }}" rel="stylesheet">
 
+    @yield('styles')
 
 
     <style>