Commit 907cb7b8 authored by Gabriel Alves's avatar Gabriel Alves
Browse files

Ajuste listar metas funcional

parent 77bcd053
...@@ -773,22 +773,6 @@ class EventoController extends Controller ...@@ -773,22 +773,6 @@ class EventoController extends Controller
return response()->download($path); return response()->download($path);
} }
public function getMetas($odsId)
{
{
try {
$ods = ObjetivoDeDesenvolvimentoSustentavel::with('metas')->findOrFail($odsId);
$response = [
'ods' => $ods->nome,
'metas' => $ods->metas,
];
return response()->json($response);
} catch (\Exception $e) {
return response()->json(['error' => 'Erro ao carregar as metas'], 500);
}
}
}
// public function baixarModelos($id) { // public function baixarModelos($id) {
// $evento = Evento::find($id); // $evento = Evento::find($id);
......
...@@ -97,7 +97,7 @@ class TrabalhoController extends Controller ...@@ -97,7 +97,7 @@ class TrabalhoController extends Controller
$edital = Evento::find($id); $edital = Evento::find($id);
$grandeAreas = GrandeArea::orderBy('nome')->get(); $grandeAreas = GrandeArea::orderBy('nome')->get();
$areaTematicas = AreaTematica::orderBy('nome')->get(); $areaTematicas = AreaTematica::orderBy('nome')->get();
$ODS = ObjetivoDeDesenvolvimentoSustentavel::orderBy('nome')->get(); $ODS = ObjetivoDeDesenvolvimentoSustentavel::with('metas')->get();
$funcaoParticipantes = FuncaoParticipantes::orderBy('nome')->get(); $funcaoParticipantes = FuncaoParticipantes::orderBy('nome')->get();
$proponente = Proponente::where('user_id', Auth::user()->id)->first(); $proponente = Proponente::where('user_id', Auth::user()->id)->first();
...@@ -108,7 +108,6 @@ class TrabalhoController extends Controller ...@@ -108,7 +108,6 @@ class TrabalhoController extends Controller
$rascunho = Trabalho::where('proponente_id', $proponente->id)->where('evento_id',$edital->id)->where('status', 'Rascunho') $rascunho = Trabalho::where('proponente_id', $proponente->id)->where('evento_id',$edital->id)->where('status', 'Rascunho')
->orderByDesc('updated_at')->first(); ->orderByDesc('updated_at')->first();
// dd($estados);
return view('evento.submeterTrabalho',[ return view('evento.submeterTrabalho',[
// return view('evento.backupForm',[ // return view('evento.backupForm',[
...@@ -2247,4 +2246,23 @@ class TrabalhoController extends Controller ...@@ -2247,4 +2246,23 @@ class TrabalhoController extends Controller
return redirect()->back()->with(['sucesso' => 'Proposta avaliada com sucesso']); return redirect()->back()->with(['sucesso' => 'Proposta avaliada com sucesso']);
} }
public function getMetas($odsId)
{
{
try {
$ods = ObjetivoDeDesenvolvimentoSustentavel::with('metas')->findOrFail($odsId);
$response = [
'ods' => $ods->nome,
'metas' => $ods->metas,
];
return response()->json($response);
} catch (\Exception $e) {
return response()->json(['error' => 'Erro ao carregar as metas'], 500);
}
}
}
} }
\ No newline at end of file
<?php
namespace App;
use Illuminate\Database\Eloquent\Model;
class MetaObjetivoDeDesenvolvimentoSustentavel extends Model
{
protected $fillable = [
'nome',
];
public function metas(){
return $this->belongsToMany('objetivo_de_desenvolvimento_sustentavels','objetivo_de_desenvolvimento_sustentavel_trabalhos', 'objetivo_de_desenvolvimento_sustentavel_id');
}
}
...@@ -2258,16 +2258,16 @@ ...@@ -2258,16 +2258,16 @@
}, },
{ {
"name": "phpoption/phpoption", "name": "phpoption/phpoption",
"version": "1.9.2", "version": "1.9.3",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/schmittjoh/php-option.git", "url": "https://github.com/schmittjoh/php-option.git",
"reference": "80735db690fe4fc5c76dfa7f9b770634285fa820" "reference": "e3fac8b24f56113f7cb96af14958c0dd16330f54"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/schmittjoh/php-option/zipball/80735db690fe4fc5c76dfa7f9b770634285fa820", "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/e3fac8b24f56113f7cb96af14958c0dd16330f54",
"reference": "80735db690fe4fc5c76dfa7f9b770634285fa820", "reference": "e3fac8b24f56113f7cb96af14958c0dd16330f54",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -2275,13 +2275,13 @@ ...@@ -2275,13 +2275,13 @@
}, },
"require-dev": { "require-dev": {
"bamarni/composer-bin-plugin": "^1.8.2", "bamarni/composer-bin-plugin": "^1.8.2",
"phpunit/phpunit": "^8.5.34 || ^9.6.13 || ^10.4.2" "phpunit/phpunit": "^8.5.39 || ^9.6.20 || ^10.5.28"
}, },
"type": "library", "type": "library",
"extra": { "extra": {
"bamarni-bin": { "bamarni-bin": {
"bin-links": true, "bin-links": true,
"forward-command": true "forward-command": false
}, },
"branch-alias": { "branch-alias": {
"dev-master": "1.9-dev" "dev-master": "1.9-dev"
...@@ -2317,7 +2317,7 @@ ...@@ -2317,7 +2317,7 @@
], ],
"support": { "support": {
"issues": "https://github.com/schmittjoh/php-option/issues", "issues": "https://github.com/schmittjoh/php-option/issues",
"source": "https://github.com/schmittjoh/php-option/tree/1.9.2" "source": "https://github.com/schmittjoh/php-option/tree/1.9.3"
}, },
"funding": [ "funding": [
{ {
...@@ -2329,7 +2329,7 @@ ...@@ -2329,7 +2329,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2023-11-12T21:59:55+00:00" "time": "2024-07-20T21:41:07+00:00"
}, },
{ {
"name": "psr/clock", "name": "psr/clock",
......
...@@ -810,7 +810,6 @@ ...@@ -810,7 +810,6 @@
$('.form-check-input').change(function(){ $('.form-check-input').change(function(){
selectedOds = []; selectedOds = [];
$('#metas-container').empty(); $('#metas-container').empty();
$('.form-check-input:checked').each(function(){ $('.form-check-input:checked').each(function(){
selectedOds.push($(this).val()); selectedOds.push($(this).val());
}); });
...@@ -823,7 +822,7 @@ ...@@ -823,7 +822,7 @@
selectedOds.forEach(function(odsId){ selectedOds.forEach(function(odsId){
$.ajax({ $.ajax({
url: 'metas/' + odsId, url: '/metas/' + odsId,
method: 'GET', method: 'GET',
success: function(response){ success: function(response){
var metaOptions = '<hr><div class="col-12"><div class="row subtitulo"><div class="col-sm-12"><p>Metas para ' + response.ods + '</p></div></div></div></div>' + '<div class="form-group">'; var metaOptions = '<hr><div class="col-12"><div class="row subtitulo"><div class="col-sm-12"><p>Metas para ' + response.ods + '</p></div></div></div></div>' + '<div class="form-group">';
......
...@@ -155,6 +155,7 @@ Route::group(['middleware' => ['isTemp', 'auth', 'verified']], function () { ...@@ -155,6 +155,7 @@ Route::group(['middleware' => ['isTemp', 'auth', 'verified']], function () {
//######### Trabalho ######################################## //######### Trabalho ########################################
Route::get('/trabalho/submeter/{id}', 'TrabalhoController@index')->name('trabalho.index'); Route::get('/trabalho/submeter/{id}', 'TrabalhoController@index')->name('trabalho.index');
Route::get('/metas/{odsId}', 'TrabalhoController@getMetas')->name('getMetas');
// Route::get( '/trabalho/visualizar/{id}','TrabalhoController@show' )->name('trabalho.show'); // Route::get( '/trabalho/visualizar/{id}','TrabalhoController@show' )->name('trabalho.show');
Route::post('/trabalho/novaVersao', 'TrabalhoController@novaVersao')->name('trabalho.novaVersao'); Route::post('/trabalho/novaVersao', 'TrabalhoController@novaVersao')->name('trabalho.novaVersao');
Route::post('/trabalho/criar', 'TrabalhoController@salvar')->name('trabalho.store'); Route::post('/trabalho/criar', 'TrabalhoController@salvar')->name('trabalho.store');
...@@ -336,7 +337,6 @@ Route::prefix('evento')->name('evento.')->group(function () { ...@@ -336,7 +337,6 @@ Route::prefix('evento')->name('evento.')->group(function () {
Route::post('/editar/{id}', 'EventoController@update')->name('update')->middleware('checkRoles:coordenador,administrador'); Route::post('/editar/{id}', 'EventoController@update')->name('update')->middleware('checkRoles:coordenador,administrador');
Route::post('/setResumo', 'EventoController@setResumo')->name('setResumo')->middleware('checkAdministrador'); Route::post('/setResumo', 'EventoController@setResumo')->name('setResumo')->middleware('checkAdministrador');
Route::post('/setFoto', 'EventoController@setFotoEvento')->name('setFotoEvento')->middleware('checkAdministrador'); Route::post('/setFoto', 'EventoController@setFotoEvento')->name('setFotoEvento')->middleware('checkAdministrador');
Route::get('/metas/{odsId}', 'EventoController@getMetas')->name('getMetas')->middleware('checkAdministrador');;
}); });
//########## Rotas de administrador responsavel (Reitor ou pro-reitor)######## //########## Rotas de administrador responsavel (Reitor ou pro-reitor)########
......
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