Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
sistema_mcid
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
marcio neto
sistema_mcid
Commits
50a28ac1
Commit
50a28ac1
authored
Nov 27, 2023
by
sandroresende
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
correcao lista propostas apresentadas
parent
288d7eb9
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
17 deletions
+13
-17
ArquivosController.php
app/Http/Controllers/Sistema/ArquivosController.php
+11
-5
ListaPropostasApresentadas.blade.php
...o_propostas/proposta/ListaPropostasApresentadas.blade.php
+2
-12
No files found.
app/Http/Controllers/Sistema/ArquivosController.php
View file @
50a28ac1
...
...
@@ -85,8 +85,9 @@ class ArquivosController extends Controller
public
function
salvarValidacaoOficio
(
Request
$request
){
$usuario
=
Auth
::
user
();
$usuario
=
Auth
::
user
();
DB
::
beginTransaction
();
//return $request->all();
...
...
@@ -95,6 +96,8 @@ class ArquivosController extends Controller
$permissao
=
Permissoes
::
find
(
$request
->
permissao_id
);
$arquivoOficio
->
bln_documento_analisado
=
true
;
$arquivoOficio
->
user_id_analisado_por
=
$usuario
->
id
;
...
...
@@ -127,7 +130,10 @@ class ArquivosController extends Controller
$salvouPermissao
=
$permissao
->
update
();
$permissao
->
load
(
'user'
,
'tipoIndeferimento'
);
$usuario
->
load
(
'tipoUsuario'
,
'statusUsuario'
,
'entePublico.municipio.uf'
);
$usuarioValidado
=
User
::
find
(
$arquivoOficio
->
user_id
);
$usuarioValidado
->
load
(
'tipoUsuario'
,
'statusUsuario'
,
'entePublico.municipio.uf'
);
if
(
$arquivoSalvo
&&
$salvouPermissao
){
flash
()
->
sucesso
(
"Sucesso"
,
"Ofício validado com sucesso!"
);
...
...
@@ -136,9 +142,9 @@ class ArquivosController extends Controller
if
(
$request
->
bln_validado
==
'true'
){
Mail
::
to
(
$permissao
->
user
->
email
)
->
send
(
new
PermissaoDeferida
(
$permissao
,
$usuario
));
Mail
::
to
(
$permissao
->
user
->
email
)
->
send
(
new
PermissaoDeferida
(
$permissao
,
$usuario
Validado
));
}
else
{
Mail
::
to
(
$permissao
->
user
->
email
)
->
send
(
new
PermissaoIndeferida
(
$permissao
,
$usuario
));
Mail
::
to
(
$permissao
->
user
->
email
)
->
send
(
new
PermissaoIndeferida
(
$permissao
,
$usuario
Validado
));
}
return
back
();
...
...
resources/views/modulo_propostas/proposta/ListaPropostasApresentadas.blade.php
View file @
50a28ac1
...
...
@@ -48,7 +48,7 @@
<th>Município</th>
<th>CNPJ</th>
<th>Ente Público</th>
<th>Açöes</th>
<!-- <th>Açöes</th> -->
<th>Modalidade</th>
<th>Situação</th>
...
...
@@ -72,16 +72,6 @@
$propostas_transferegov
=
$propostas_transferegov
. ' - ' .
$value
;
}
$acoes
= json_decode(
$dados->dsc_acoes
);
$acoes_proposta
= '';
foreach(
$acoes
as
$key
=>
$value
) {
if(
$key
== 0)
$acoes_proposta
=
$value
;
else
$acoes_proposta
=
$acoes_proposta
. ' - ' .
$value
;
}
// agora a nosa
$arr
possui os valores (3, 6, 9, 12)
?>
...
...
@@ -92,7 +82,7 @@
<td>
{
{$dados->ds_municipio}
}
</td>
<td>
{
{$dados->ente_publico_id}
}
</td>
<td>
{
{$dados->txt_ente_publico}
}
</td>
<td><?php print_r(
$acoes_proposta
) ?></td>
<!-- <td></td> -->
<td>
{
{$dados->txt_modalidade_participacao}
}
</td>
<td>
{
{$dados->txt_situacao_proposta}
}
</td>
<td>{{number_format( (
$dados->vlr_intervencao
), 2, ',' , '.')}}</td>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment