Merge pull request #665 from antonioDurval/master

Removendo limite de discentes por edital e removendo área e grandeArea quando a natureza for extensão

app/Http/Controllers/GrandeAreaController.php

@@ -6,6 +6,7 @@ use App\AreaTematica;
 use Illuminate\Http\Request;
 use App\GrandeArea;
 use App\Area;
+use App\ObjetivoDeDesenvolvimentoSustentavel;
 
 class GrandeAreaController extends Controller
 {
@@ -18,7 +19,8 @@ class GrandeAreaController extends Controller
     {
         $grandesAreas = GrandeArea::orderBy('nome')->get();
         $areasTematicas = AreaTematica::orderBy('nome')->get();
-        return view('naturezas.grandeArea.index')->with(['grandesAreas' => $grandesAreas, 'areasTematicas' => $areasTematicas]);
+        $ODSs = ObjetivoDeDesenvolvimentoSustentavel::orderBy('nome')->get();
+        return view('naturezas.grandeArea.index')->with(['grandesAreas' => $grandesAreas, 'areasTematicas' => $areasTematicas, 'odss' => $ODSs]);
     }
 
     /**

app/Http/Controllers/ObjetivoDeDesenvolvimentoSustentavelController.php

+<?php
+
+namespace App\Http\Controllers;
+
+
+use Illuminate\Http\Request;
+use Illuminate\Database\Eloquent\Model;
+use App\ObjetivoDeDesenvolvimentoSustentavel;
+
+class ObjetivoDeDesenvolvimentoSustentavelController extends Controller
+{
+    public function create() {
+        return view('objetivoDeDesenvolvimentoSustentavel.create');
+    }
+
+    public function store(Request $request) {
+        $validatedData = $request->validate([
+            'nome'  =>  'required',
+        ]);
+
+        $ODS = new ObjetivoDeDesenvolvimentoSustentavel();
+        $ODS->nome = $request->nome;
+        $ODS->save();
+
+        return redirect( route('grandearea.index') )->with(['mensagem' => 'ODS cadastrado com sucesso']);
+    }
+
+    public function edit($id){
+        $ODS = ObjetivoDeDesenvolvimentoSustentavel::find($id);
+        return view('objetivoDeDesenvolvimentoSustentavel.editar')->with(['ods' => $ODS]);
+    }
+
+    public function update(Request $request, $id){
+        $ODS = ObjetivoDeDesenvolvimentoSustentavel::find($id);
+        $ODS->nome = $request->nome;
+        $ODS->update();
+
+        return redirect( route('grandearea.index') )->with(['mensagem' => 'ODS editado com sucesso']);
+    }
+
+    public function destroy($id)
+    {
+        $ODS = ObjetivoDeDesenvolvimentoSustentavel::find($id);
+        $ODS->delete();
+
+        return redirect( route('grandearea.index') )->with(['mensagem' => 'ODS excluido com sucesso']);
+    }
+}

app/Http/Controllers/TrabalhoController.php

@@ -53,6 +53,7 @@ use App\SolicitacaoParticipante;
 use App\Substituicao;
 use Illuminate\Support\Facades\Notification;
 use App\Desligamento;
+use App\ObjetivoDeDesenvolvimentoSustentavel;
 
 class TrabalhoController extends Controller
 {
@@ -91,6 +92,7 @@ class TrabalhoController extends Controller
         $edital = Evento::find($id);
         $grandeAreas = GrandeArea::orderBy('nome')->get();
         $areaTematicas = AreaTematica::orderBy('nome')->get();
+        $ODS = ObjetivoDeDesenvolvimentoSustentavel::orderBy('nome')->get();
         $funcaoParticipantes = FuncaoParticipantes::orderBy('nome')->get();
         $proponente = Proponente::where('user_id', Auth::user()->id)->first();
 
@@ -112,6 +114,7 @@ class TrabalhoController extends Controller
                                             'enum_turno'         => Participante::ENUM_TURNO,
                                             'estados'            => $this->estados,
                                             'areaTematicas'        => $areaTematicas,
+                                            'ods'                   =>$ODS,
                                             ]);
     }
 
@@ -451,6 +454,7 @@ class TrabalhoController extends Controller
         $areaTematicas = AreaTematica::orderBy('nome')->get();
         $areas = Area::all();
         $subareas = Subarea::all();
+        $ODS = ObjetivoDeDesenvolvimentoSustentavel::orderBy('nome')->get();
         $funcaoParticipantes = FuncaoParticipantes::all();
         $participantes = Participante::where('trabalho_id', $id)->get();
         $participantesUsersIds = Participante::where('trabalho_id', $id)->select('user_id')->get();
@@ -472,6 +476,7 @@ class TrabalhoController extends Controller
             'enum_turno' => Participante::ENUM_TURNO,
             'estados' => $this->estados,
             'areaTematicas'        => $areaTematicas,
+            'listaOds'                  => $ODS,
         ]);
     }
 
@@ -841,6 +846,7 @@ class TrabalhoController extends Controller
                 'coordenador_id' => $evento->coordenadorComissao->id
             ]);
             $trabalho = Trabalho::find($id);
+            $trabalho->ods()->sync($request->ods);
 
             DB::beginTransaction();
             if (!$trabalho) {
@@ -1147,6 +1153,7 @@ class TrabalhoController extends Controller
             $trabalho->modalidade = $request->modalidade;
             $trabalho->save();
 
+            $trabalho->ods()->sync($request->ods);
             DB::commit();
             if (!$request->has('rascunho')) {
                 //Notificações

app/Http/Requests/StoreTrabalho.php

@@ -89,8 +89,8 @@ class StoreTrabalho extends FormRequest
             $rules['editalId']                     = ['required', 'string'];
             $rules['marcado.*']                    = ['required'];
             $rules['titulo']                       = ['required', 'string'];
-            $rules['grande_area_id']               = ['required', 'string'];
-            $rules['area_id']                      = ['required', 'string'];
+            $rules['grande_area_id']               = [Rule::requiredIf($evento->natureza_id != 3), 'string'];
+            $rules['area_id']                      = [Rule::requiredIf($evento->natureza_id != 3), 'string'];
             if($evento->natureza_id == 3){
                 $rules['area_tematica_id']          = ['required', 'string'];
             }

app/Http/Requests/UpdateTrabalho.php

@@ -105,9 +105,12 @@ class UpdateTrabalho extends FormRequest
             $rules['editalId']                     = ['required', 'string'];
             $rules['marcado.*']                    = ['required'];
             $rules['titulo']                       = ['required', 'string'];
-            $rules['grande_area_id']               = ['required', 'string'];
-            $rules['area_id']                      = ['required', 'string'];
-
+            $rules['grande_area_id']               = [Rule::requiredIf($evento->natureza_id != 3), 'string'];
+            $rules['area_id']                      = [Rule::requiredIf($evento->natureza_id != 3), 'string'];
+            
+            if($evento->natureza_id == 3){
+                $rules['area_tematica_id']          = ['required', 'string'];
+            }
             $rules['linkLattesEstudante']          = ['required', 'string'];
 
 

app/ObjetivoDeDesenvolvimentoSustentavel.php

+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class ObjetivoDeDesenvolvimentoSustentavel extends Model
+{
+    protected $fillable = [
+        'nome',
+    ];
+
+    public function trabalhos(){
+        return $this->belongsToMany('App\Trabalho', 'objetivo_de_desenvolvimento_sustentavel_trabalhos', 'objetivo_de_desenvolvimento_sustentavel_id');
+    }
+}

app/Trabalho.php

@@ -125,4 +125,8 @@ class Trabalho extends Model
   {
       return $this->hasMany(Certificado::class, 'trabalho_id');
   }
+
+  public function ods(){
+    return $this->belongsToMany('App\ObjetivoDeDesenvolvimentoSustentavel', 'objetivo_de_desenvolvimento_sustentavel_trabalhos', 'trabalho_id');
+  }
 }

database/migrations/2022_10_19_210913_create_objetivo_de_desenvolvimento_sustentavels_table.php

+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateObjetivoDeDesenvolvimentoSustentavelsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('objetivo_de_desenvolvimento_sustentavels', function (Blueprint $table) {
+            $table->bigIncrements('id');
+            $table->string('nome');
+
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('objetivo_de_desenvolvimento_sustentavels');
+    }
+}

database/migrations/2022_10_19_212007_create_objetivo_de_desenvolvimento_sustentavel_trabalhos_table.php

+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateObjetivoDeDesenvolvimentoSustentavelTrabalhosTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('objetivo_de_desenvolvimento_sustentavel_trabalhos', function (Blueprint $table) {
+            $table->bigIncrements('id');
+            $table->integer('objetivo_de_desenvolvimento_sustentavel_id');
+            $table->foreign('objetivo_de_desenvolvimento_sustentavel_id')->references('id')->on('objetivo_de_desenvolvimento_sustentavels');
+
+            $table->integer('trabalho_id');
+            $table->foreign('trabalho_id')->references('id')->on('trabalhos');
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('ods_trabalhos');
+    }
+}

resources/views/administrador/analisar.blade.php

@@ -68,7 +68,8 @@
                             @foreach( $trabalhos as $trabalho )
                            
                             <!--Informações Proponente-->
-                                    <div class="row justify-content-center allTrab apareceu {{$trabalho->status}} {{$trabalho->grandeArea->nome}} {{$trabalho->area->nome}}" style="margin-top: 20px;" >
+                                
+                                    <div class="row justify-content-center allTrab apareceu" style="margin-top: 20px;" >
                                         <br>
                                         <div class="col-md-11" onclick="myFunc({{$trabalho->id}})">
                                             <a href="{{route('admin.analisarProposta',['id'=>$trabalho->id])}}" id="vizuProposta{{$trabalho->id}}" hidden></a>

resources/views/administrador/analisarProposta.blade.php

@@ -70,6 +70,7 @@
         <!--Areas-->
         <div class="col-md-12">
             <div class="card" style="border-radius: 5px">
+                @if($trabalho->evento->natureza_id != 3)
                 <div class="card-body" style="padding-top: 0.2rem;">
                     <div class="container">
                         <div class="form-row mt-3">
@@ -81,10 +82,12 @@
                                     @if(App\SubArea::where('id', $trabalho->sub_area_id)->first() != null)
                                         > {{App\SubArea::where('id', $trabalho->sub_area_id)->first()->nome}}@endif
 
-                                </h6></div>
+                                </h6>
+                            </div>
                         </div>
                     </div>
                 </div>
+            @endif
             </div>
         </div>
     </div>

resources/views/evento/criarEvento.blade.php

@@ -60,7 +60,7 @@
             <div class="col-sm-2">
                 <label for="numParticipantes" class="col-form-label">{{ __('Nº de Discentes:') }}<span style="color:red; font-weight:bold;">*</span></label>
 
-                <input id="numParticipantes" type="number" min="1" max="20" class="form-control @error('numParticipantes') is-invalid @enderror" name="numParticipantes" value="{{ old('numParticipantes') }}" required autocomplete="numParticipantes" autofocus>
+                <input id="numParticipantes" type="number" min="1" class="form-control @error('numParticipantes') is-invalid @enderror" name="numParticipantes" value="{{ old('numParticipantes') }}" required autocomplete="numParticipantes" autofocus>
 
                 @error('numParticipantes')
                 <span class="invalid-feedback" role="alert">

resources/views/evento/formulario/projeto.blade.php

@@ -22,50 +22,54 @@
     </div>
 
         <div class="row">
-          <div class="form-group col-md-4">
-            <label for="grandeArea" class="col-form-label" style="font-weight: bold">{{ __('Grande Área') }} <span style="color: red; font-weight:bold">*</span></label>
-              <select class="form-control @error('grandeArea') is-invalid @enderror" id="grandeArea" name="grande_area_id" onchange="areas()" >
-                <option value="" disabled selected hidden>-- Grande Área --</option>
-                @foreach($grandeAreas as $grandeArea)
-                <option @if(old('grandeArea') !== null ? old('grandeArea') : (isset($rascunho) ? $rascunho->grande_area_id : '')
-                        == $grandeArea->id ) selected @endif value="{{$grandeArea->id}}">{{$grandeArea->nome}}</option>
-                @endforeach
-              </select>
-              @error('grande_area_id')
-              <span class="invalid-feedback" role="alert" style="overflow: visible; display:block">
-                <strong>{{ $message }}</strong>
-              </span>
-              @enderror
-          </div>
-          <div class="form-group col-md-4">
-            <label for="area" class="col-form-label" style="font-weight: bold">{{ __('Área') }} <span style="color: red; font-weight:bold">*</span></label>
-              <input type="hidden" id="oldArea" value="{{ old('area') }}" >
-              <select class="form-control @error('area') is-invalid @enderror" id="area" name="area_id" onchange="subareas()" >
-                <option value="" disabled selected hidden>-- Área --</option>
-              </select>
-              @error('area_id')
-              <span class="invalid-feedback" role="alert" style="overflow: visible; display:block">
-                <strong>{{ $message }}</strong>
-              </span>
-              @enderror
-          </div>
-          <div class="form-group col-md-4">
-            <label for="subArea" class="col-form-label" style="font-weight: bold">{{ __('Subárea') }} </label>
-              <input type="hidden" id="oldSubArea" value="{{ old('subArea') }}" >
-              <select class="form-control @error('subArea') is-invalid @enderror" id="subArea" name="sub_area_id" >
-                <option value="" disabled selected hidden>-- Subárea --</option>
-                {{-- @foreach($subAreas as $subArea)
-                  <option @if(old('subArea') !== null ? old('subArea') : (isset($rascunho) ? $rascunho->sub_area_id : '')
-                          ==$subArea->id ) selected @endif value="{{$subArea->id}}">{{$subArea->nome}}</option>
-                @endforeach --}}
-              </select>
+          
+          @if($edital->natureza_id != 3)
+            <div class="form-group col-md-4">
+              <label for="grandeArea" class="col-form-label" style="font-weight: bold">{{ __('Grande Área') }} <span style="color: red; font-weight:bold">*</span></label>
+                <select class="form-control @error('grandeArea') is-invalid @enderror" id="grandeArea" name="grande_area_id" onchange="areas()" >
+                  <option value="" disabled selected hidden>-- Grande Área --</option>
+                  @foreach($grandeAreas as $grandeArea)
+                  <option @if(old('grandeArea') !== null ? old('grandeArea') : (isset($rascunho) ? $rascunho->grande_area_id : '')
+                          == $grandeArea->id ) selected @endif value="{{$grandeArea->id}}">{{$grandeArea->nome}}</option>
+                  @endforeach
+                </select>
+                @error('grande_area_id')
+                <span class="invalid-feedback" role="alert" style="overflow: visible; display:block">
+                  <strong>{{ $message }}</strong>
+                </span>
+                @enderror
+            </div>
+            <div class="form-group col-md-4">
+              <label for="area" class="col-form-label" style="font-weight: bold">{{ __('Área') }} <span style="color: red; font-weight:bold">*</span></label>
+                <input type="hidden" id="oldArea" value="{{ old('area') }}" >
+                <select class="form-control @error('area') is-invalid @enderror" id="area" name="area_id" onchange="subareas()" >
+                  <option value="" disabled selected hidden>-- Área --</option>
+                </select>
+                @error('area_id')
+                <span class="invalid-feedback" role="alert" style="overflow: visible; display:block">
+                  <strong>{{ $message }}</strong>
+                </span>
+                @enderror
+            </div>
+            <div class="form-group col-md-4">
+              <label for="subArea" class="col-form-label" style="font-weight: bold">{{ __('Subárea') }} </label>
+                <input type="hidden" id="oldSubArea" value="{{ old('subArea') }}" >
+                <select class="form-control @error('subArea') is-invalid @enderror" id="subArea" name="sub_area_id" >
+                  <option value="" disabled selected hidden>-- Subárea --</option>
+                  {{-- @foreach($subAreas as $subArea)
+                    <option @if(old('subArea') !== null ? old('subArea') : (isset($rascunho) ? $rascunho->sub_area_id : '')
+                            ==$subArea->id ) selected @endif value="{{$subArea->id}}">{{$subArea->nome}}</option>
+                  @endforeach --}}
+                </select>
+
+                @error('sub_area_id')
+                <span class="invalid-feedback" role="alert" style="overflow: visible; display:block">
+                  <strong>{{ $message }}</strong>
+                </span>
+                @enderror
+            </div>
+          @endif
 
-              @error('sub_area_id')
-              <span class="invalid-feedback" role="alert" style="overflow: visible; display:block">
-                <strong>{{ $message }}</strong>
-              </span>
-              @enderror
-          </div>
             @if($edital->natureza_id ==3 )
                 <div class="form-group col-md-4">
                     <label for="areaTematica" class="col-form-label" style="font-weight: bold">{{ __('Área Temática') }} <span style="color: red; font-weight:bold">*</span></label>
@@ -81,9 +85,29 @@
                   </span>
                     @enderror
                 </div>
+
+                  <div class="row col-md-12">
+                    <div class="form-group col-md-12">
+                      <label for="ods" class="col-form-label" style="font-weight: bold">{{ __('Objetivo de Densenvolvimento Sustentável') }} <span style="color: red; font-weight:bold">*</span></label><br>
+                      <div class="row col-md-12">
+                        @foreach($ods as $od)
+                        <div class="col-md-6">
+                          <input type="checkbox" name="ods[]" id="ods{{$od->id}}" value="{{$od->id}}">
+                          <label class="form-check-label" for="ods{{$od->id}}">
+                            {{ $od->nome }}
+                          </label>
+                        </div>
+                        @endforeach
+                      </div>
+                      @error('ods_id')
+                      <span class="invalid-feedback" role="alert" style="overflow: visible; display:block">
+                        <strong>{{ $message }}</strong>
+                      </span>
+                      @enderror
+                    </div>
+                  </div>  
             @endif
         </div>
-          
         </div>
     </div>
     </div>

resources/views/naturezas/grandeArea/collapse-grande-area.blade.php

@@ -79,6 +79,8 @@
     @endforeach
 
 </div>
+
+
 <div id="accordion2">
     <div class="card">
         <div class="row">
@@ -148,4 +150,76 @@
             </div>
         </div>
     @endforeach
+</div>
+
+
+<div id="accordion3">
+    <div class="card">
+        <div class="row">
+            <div class="col-11  ">
+                <h2 class="m-2">ODS(Objetivos de Desenvolvimento Sustentável)</h2>
+            </div>
+            <div class="col-1 text-center">
+                <a href="{{route('objetivoDeDenvolvimentoSustentavel.criar')}}" >
+                    <i class="fas fa-plus-circle fa-2x m-2" style="color: green"></i>
+                </a>
+            </div>
+
+        </div>
+    </div>
+    @foreach ($odss as $ods)
+        <div class="card">
+            <h5 class="mb-0">
+                <div class="row">
+                    <div class="col-11">
+                        <button class="btn btn-link font-size-naturezas" aria-expanded="true" >
+                            {{ $ods->nome }}
+                        </button>
+                    </div>
+                    <div class="col-1 text-center">
+                        <div class=" dropright mt-2 text-center">
+                            <a id="options" class="dropdown-toggle " data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                                {{-- <i class="fas fa-cogs"></i> --}}
+                                <i class="fas fa-cog fa-1x"></i>
+                            </a>
+                            <div class="dropdown-menu">
+                                <a href="{{ route('objetivoDeDenvolvimentoSustentavel.edit', ['id' => $ods->id]) }}" class="dropdown-item text-center">
+                                    Editar
+                                </a>
+                                <hr class="dropdown-hr">
+                                <button data-toggle="modal" data-target="#removerODS{{ $ods->id }}" class="dropdown-item dropdown-item-delete text-center">
+                                    <img src="{{asset('img/icons/logo_lixeira.png')}}" alt="">
+                                    Deletar
+                                </button>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </h5>
+        </div>
+
+        <!-- Modal Remover -->
+        <div class="modal fade" id="removerODS{{ $ods->id }}" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
+            <div class="modal-dialog modal-lg">
+                <div class="modal-content">
+                    <div class="modal-header">
+                        <h5 class="modal-title" id="exampleModalLabel">Remover ODS</h5>
+                        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                            <span aria-hidden="true">&times;</span>
+                        </button>
+                    </div>
+                    <div class="modal-body">
+                        <p>Você tem certeza que deseja remover a ODS: {{ $ods->nome }}?</p>
+                    </div>
+                    <div class="modal-footer">
+                        <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancelar</button>
+                        <form method="POST" action="{{ route('objetivoDeDenvolvimentoSustentavel.deletar', ['id' => $ods->id]) }}">
+                            @csrf
+                            <button type="submit" class="btn btn-danger">Remover</button>
+                        </form>
+                    </div>
+                </div>
+            </div>
+        </div>
+    @endforeach
 </div>
\ No newline at end of file

resources/views/objetivoDeDesenvolvimentoSustentavel/create.blade.php

+@extends('layouts.app')
+
+@section('content')
+
+<div class="container" style="margin-top: 50px; margin-bottom: 305px ">
+    <div class="row" >
+        <div class="col-sm-12">
+            <h2 style="color: rgb(0, 140, 255);">{{ __('Criar um novo ODS(Objetivo de Desenvolvimento Sustentável)') }}</h2>
+        </div>
+    </div>  
+    <div class="row">
+        <form method="POST" action="{{ route('objetivoDeDenvolvimentoSustentavel.salvar')}}">
+            @csrf
+            <div class="col-sm-12">
+                <label for="nome" class="col-form-label" style="color: rgb(0, 140, 255);">{{ __('Nome') }}<span style="color: red;"> *</span></label>
+                <input id="nome" type="text" class="form-control @error('nome') is-invalid @enderror" name="nome" value="{{ old('nome') }}" required autocomplete="nome" autofocus >
+
+                @error('nome')
+                <span class="invalid-feedback" role="alert">
+                    <strong>{{ $message }}</strong>
+                </span>
+                @enderror
+
+                <button type="submit" class="btn btn-info" style="position:relative;top:10px;">{{ __('Salvar') }}</button>
+            </div>
+        </form>
+    </div>
+</div>
+
+@endsection
\ No newline at end of file

resources/views/objetivoDeDesenvolvimentoSustentavel/editar.blade.php

+@extends('layouts.app')
+
+@section('content')
+
+<div class="container" style="margin-top: 50px; margin-bottom: 305px ">
+    <div class="row" >
+        <div class="col-sm-12">
+            <h2 style="color: rgb(0, 140, 255);">{{ __('Editar um ODS(Objetivo de Desenvolvimento Sustentável)') }}</h2>
+        </div>
+    </div>  
+    <div class="row">
+        <form method="POST" action="{{ route('objetivoDeDenvolvimentoSustentavel.atualizar', ['id' => $ods->id])}}">
+            @csrf
+            <div class="col-sm-12">
+                <label for="nome" class="col-form-label"  style="color: rgb(0, 140, 255);">{{ __('Nome') }}<span style="color: red;"> *</span></label>
+                <input id="nome" type="text" class="form-control @error('nome') is-invalid @enderror" name="nome" value="{{ $ods->nome }}" required autocomplete="nome" autofocus>
+
+                @error('nome')
+                <span class="invalid-feedback" role="alert">
+                    <strong>{{ $message }}</strong>
+                </span>
+                @enderror
+
+                <button type="submit" class="btn btn-info" style="position:relative;top:10px;">{{ __('Salvar') }}</button>
+            </div>
+        </form>
+    </div>
+</div>
+
+@endsection
\ No newline at end of file

resources/views/projeto/editaFormulario/projeto.blade.php

@@ -22,52 +22,54 @@
           </div>
         </div>
 
-        <div class="row">
-          <div class="form-group col-md-4">
-            <label for="grandeArea" class="col-form-label" style="font-weight: bold">{{ __('Grande Área') }} <span style="color: red; font-weight:bold">*</span></label>
-            <select class="form-control @error('grandeArea') is-invalid @enderror" id="grandeArea" name="grande_area_id" onchange="areas()" >
-              <option value="" disabled selected hidden>-- Grande Área --</option>
-              @foreach($grandeAreas as $grandeArea)
-                <option @if($projeto->grande_area_id == $grandeArea->id ) selected @endif value="{{$grandeArea->id}}">{{$grandeArea->nome}}</option>
-              @endforeach
-            </select>
-            @error('grande_area_id')
-            <span class="invalid-feedback" role="alert" style="overflow: visible; display:block">
-                <strong>{{ $message }}</strong>
-              </span>
-            @enderror
-          </div>
-          <div class="form-group col-md-4">
-            <label for="area" class="col-form-label" style="font-weight: bold">{{ __('Área') }} <span style="color: red; font-weight:bold">*</span></label>
-            <input type="hidden" id="oldArea" value="{{ old('area') }}" >
-            <select class="form-control @error('area') is-invalid @enderror" id="area" name="area_id" onchange="subareas()" >
-              @foreach($areas as $area)
-                <option @if($projeto->area_id == $area->id ) selected @endif value="{{$area->id}}">{{$area->nome}}</option>
-              @endforeach
-            </select>
-            @error('area_id')
-            <span class="invalid-feedback" role="alert" style="overflow: visible; display:block">
-                <strong>{{ $message }}</strong>
-              </span>
-            @enderror
-          </div>
-          <div class="form-group col-md-4">
-            <label for="subArea" class="col-form-label" style="font-weight: bold">{{ __('Subárea') }} </label>
-            <input type="hidden" id="oldSubArea" value="{{ old('subArea') }}" >
-            <select class="form-control @error('subArea') is-invalid @enderror" id="subArea" name="sub_area_id" >
-              <@if ($projeto->subarea != null)
-                @foreach($subAreas as $subarea)
-                  <option @if($projeto->sub_area_id == $subarea->id ) selected @endif value="{{$subarea->id}}">{{$subarea->nome}}</option>
+          <div class="row">
+          @if($edital->natureza_id != 3)
+            <div class="form-group col-md-4">
+              <label for="grandeArea" class="col-form-label" style="font-weight: bold">{{ __('Grande Área') }} <span style="color: red; font-weight:bold">*</span></label>
+              <select class="form-control @error('grandeArea') is-invalid @enderror" id="grandeArea" name="grande_area_id" onchange="areas()" >
+                <option value="" disabled selected hidden>-- Grande Área --</option>
+                @foreach($grandeAreas as $grandeArea)
+                  <option @if($projeto->grande_area_id == $grandeArea->id ) selected @endif value="{{$grandeArea->id}}">{{$grandeArea->nome}}</option>
+                @endforeach
+              </select>
+              @error('grande_area_id')
+              <span class="invalid-feedback" role="alert" style="overflow: visible; display:block">
+                  <strong>{{ $message }}</strong>
+                </span>
+              @enderror
+            </div>
+            <div class="form-group col-md-4">
+              <label for="area" class="col-form-label" style="font-weight: bold">{{ __('Área') }} <span style="color: red; font-weight:bold">*</span></label>
+              <input type="hidden" id="oldArea" value="{{ old('area') }}" >
+              <select class="form-control @error('area') is-invalid @enderror" id="area" name="area_id" onchange="subareas()" >
+                @foreach($areas as $area)
+                  <option @if($projeto->area_id == $area->id ) selected @endif value="{{$area->id}}">{{$area->nome}}</option>
                 @endforeach
-              @endif
-            </select>
+              </select>
+              @error('area_id')
+              <span class="invalid-feedback" role="alert" style="overflow: visible; display:block">
+                  <strong>{{ $message }}</strong>
+                </span>
+              @enderror
+            </div>
+            <div class="form-group col-md-4">
+              <label for="subArea" class="col-form-label" style="font-weight: bold">{{ __('Subárea') }} </label>
+              <input type="hidden" id="oldSubArea" value="{{ old('subArea') }}" >
+              <select class="form-control @error('subArea') is-invalid @enderror" id="subArea" name="sub_area_id" >
+                <@if ($projeto->subarea != null)
+                  @foreach($subAreas as $subarea)
+                    <option @if($projeto->sub_area_id == $subarea->id ) selected @endif value="{{$subarea->id}}">{{$subarea->nome}}</option>
+                  @endforeach
+                @endif
+              </select>
 
-            @error('sub_area_id')
-            <span class="invalid-feedback" role="alert" style="overflow: visible; display:block">
-                <strong>{{ $message }}</strong>
-              </span>
-            @enderror
-          </div>
+              @error('sub_area_id')
+              <span class="invalid-feedback" role="alert" style="overflow: visible; display:block">
+                  <strong>{{ $message }}</strong>
+                </span>
+              @enderror
+            </div>
+          @endif
           @if($edital->natureza_id ==3 )
             <div class="form-group col-md-4">
               <label for="areaTematica" class="col-form-label" style="font-weight: bold">{{ __('Área Temática') }} <span style="color: red; font-weight:bold">*</span></label>
@@ -83,7 +85,23 @@
                     <strong>{{ $message }}</strong>
                   </span>
               @enderror
-            </div>
+              </div>
+                  
+              <div class="row col-md-12">
+                    <div class="form-group col-md-12">
+                      <label for="ods" class="col-form-label" style="font-weight: bold">{{ __('Objetivo de Densenvolvimento Sustentável') }} <span style="color: red; font-weight:bold">*</span></label><br>
+                      <div class="row col-md-12">
+                        @foreach($listaOds as $ods)
+                        <div class="col-md-6">
+                          <input type="checkbox" name="ods[]" id="ods{{$ods->id}}" value="{{$ods->id}}" @if($projeto->ods->contains($ods->id)) checked @endif >
+                          <label class="form-check-label" for="ods{{$ods->id}}">
+                            {{ $ods->nome }}
+                          </label>
+                        </div>
+                        @endforeach
+                      </div>
+                    </div>
+                  </div> 
           @endif
         </div>
 

resources/views/projeto/formularioVisualizar/projeto2.blade.php

@@ -23,19 +23,23 @@
 <!--Areas-->
 <div class="col-md-12">
   <div class="card" style="border-radius: 5px">
-    <div class="card-body" style="padding-top: 0.2rem;">
-      <div class="container">
-        <div class="form-row mt-3">
-          <div class="col-md-12"><h5 style="color: #234B8B; font-weight: bold">Área de Ensino</h5></div>
-          <div class="col-md-12"><h6 style="color: #234B8B; margin-bottom:-0.4rem">
-              {{App\GrandeArea::where('id', $projeto->grande_area_id)->first()->nome}} >
-              {{App\Area::where('id', $projeto->area_id)->first()->nome}}
-              @if(App\SubArea::where('id', $projeto->sub_area_id)->first() != null)> {{App\SubArea::where('id', $projeto->sub_area_id)->first()->nome}}@endif
-
-            </h6></div>
+    @if($edital->natureza_id != 3)
+      <div class="card-body" style="padding-top: 0.2rem;">
+        <div class="container">
+          <div class="form-row mt-3">
+              <div class="col-md-12"><h5 style="color: #234B8B; font-weight: bold">Área de Ensino</h5></div>
+              <div class="col-md-12"><h6 style="color: #234B8B; margin-bottom:-0.4rem">
+                @if(App\GrandeArea::where('id', $projeto->grande_area_id)->first() != null) {{App\GrandeArea::where('id', $projeto->grande_area_id)->first()->nome}} @endif
+                
+                @if(App\Area::where('id', $projeto->area_id)->first() != null) > {{App\Area::where('id', $projeto->area_id)->first()->nome}} @endif
+                
+                @if(App\SubArea::where('id', $projeto->sub_area_id)->first() != null)> {{App\SubArea::where('id', $projeto->sub_area_id)->first()->nome}}@endif
+                
+              </h6></div>
+            </div>
+          </div>
         </div>
-      </div>
+      @endif
     </div>
   </div>
-</div>
 <!--X projeto X-->
\ No newline at end of file

resources/views/projeto/formularioVisualizar/proponente2.blade.php

@@ -45,7 +45,23 @@
               <br>
               <b style="color: #4D4D4D;">Área Temática:</b>
               <a style="color: #4D4D4D;">{{App\AreaTematica::where('id', $projeto->area_tematica_id)->first()->nome}}</a>
-            </div> 
+            </div>
+            <div class="row col-md-12">
+                    <div class="form-group col-md-12">
+                    <br>
+                    <b style="color: #4D4D4D;">Objetivo de Densenvolvimento Sustentável:</b>
+                    <br>
+                    <div class="row col-md-12">
+                      @foreach($projeto->ods as $ods)
+                      <div class="col-md-6">
+                        <a style="color: #4D4D4D;">
+                          {{ $ods->nome }}
+                        </a>
+                      </div>
+                      @endforeach
+                    </div>
+                  </div>
+                </div> 
           @endif
 
           @if($projeto->modalidade!=null)

routes/web.php

@@ -63,6 +63,14 @@ Route::group(['middleware' => ['isTemp', 'auth', 'verified']], function () {
         Route::get('/nova', 'AreaTematicaController@create')->name('criar')->middleware('checkAdministrador');
     });
 
+    Route::prefix('objetivoDeDenvolvimentoSustentavel')->name('objetivoDeDenvolvimentoSustentavel.')->group(function () {
+        Route::get('/editar/{id}', 'ObjetivoDeDesenvolvimentoSustentavelController@edit')->name('edit')->middleware('checkAdministrador');
+        Route::post('/atualizar/{id}', 'ObjetivoDeDesenvolvimentoSustentavelController@update')->name('atualizar')->middleware('checkAdministrador');
+        Route::post('/excluir/{id}', 'ObjetivoDeDesenvolvimentoSustentavelController@destroy')->name('deletar')->middleware('checkAdministrador');
+        Route::post('/salvar', 'ObjetivoDeDesenvolvimentoSustentavelController@store')->name('salvar')->middleware('checkAdministrador');
+        Route::get('/novo', 'ObjetivoDeDesenvolvimentoSustentavelController@create')->name('criar')->middleware('checkAdministrador');
+    });
+
     //######### Rotas Administrador #################################
     Route::get('/perfil-usuario', 'UserController@minhaConta')->name('user.perfil')->middleware(['auth', 'verified']);