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
64a5af0b
Commit
64a5af0b
authored
Dec 29, 2023
by
sandroresende
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mudanca do resumo propostas uf para o menu
parent
11f1599e
Changes
6
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
311 additions
and
254 deletions
+311
-254
HomeController.php
app/Http/Controllers/HomeController.php
+3
-75
SelecaoController.php
app/Http/Controllers/Propostas/SelecaoController.php
+81
-0
home.blade.php
resources/views/home.blade.php
+0
-178
nav_sistema.blade.php
resources/views/layouts/nav/nav_sistema.blade.php
+9
-1
RelatorioPropostasUf.blade.php
...o_propostas/proposta/admin/RelatorioPropostasUf.blade.php
+215
-0
web.php
routes/web.php
+3
-0
No files found.
app/Http/Controllers/HomeController.php
View file @
64a5af0b
...
...
@@ -45,84 +45,12 @@ class HomeController extends Controller
$propostasCadastradas
=
ViewPropostasCadastradasUf
::
get
();
$totalProposta
=
[
'total_propostas'
=>
0
,
'total_intervencao'
=>
0
,
'total_propostas_sistema'
=>
0
,
'total_intervencao_sistema'
=>
0
,
'total_propostas_forms'
=>
0
,
'total_intervencao_forms'
=>
0
,
'total_num_propostas_ac'
=>
0
,
'total_num_propostas_al'
=>
0
,
'total_num_propostas_am'
=>
0
,
'total_num_propostas_ap'
=>
0
,
'total_num_propostas_ba'
=>
0
,
'total_num_propostas_ce'
=>
0
,
'total_num_propostas_df'
=>
0
,
'total_num_propostas_es'
=>
0
,
'total_num_propostas_go'
=>
0
,
'total_num_propostas_ma'
=>
0
,
'total_num_propostas_mg'
=>
0
,
'total_num_propostas_ms'
=>
0
,
'total_num_propostas_mt'
=>
0
,
'total_num_propostas_ms'
=>
0
,
'total_num_propostas_pa'
=>
0
,
'total_num_propostas_pb'
=>
0
,
'total_num_propostas_pe'
=>
0
,
'total_num_propostas_pi'
=>
0
,
'total_num_propostas_pr'
=>
0
,
'total_num_propostas_rj'
=>
0
,
'total_num_propostas_rn'
=>
0
,
'total_num_propostas_ro'
=>
0
,
'total_num_propostas_rr'
=>
0
,
'total_num_propostas_rs'
=>
0
,
'total_num_propostas_sc'
=>
0
,
'total_num_propostas_se'
=>
0
,
'total_num_propostas_sp'
=>
0
,
'total_num_propostas_to'
=>
0
,
];
foreach
(
$propostasCadastradas
as
$valor
){
$totalProposta
[
'total_propostas'
]
+=
$valor
->
num_propostas
;
$totalProposta
[
'total_intervencao'
]
+=
$valor
->
vlr_total
;
$totalProposta
[
'total_propostas_sistema'
]
+=
$valor
->
num_propostas_enviadas_sistema
;
$totalProposta
[
'total_intervencao_sistema'
]
+=
$valor
->
vlr_intervencao_enviadas_sistema
;
$totalProposta
[
'total_propostas_forms'
]
+=
$valor
->
num_propostas_enviadas_forms
;
$totalProposta
[
'total_intervencao_forms'
]
+=
$valor
->
vlr_intervencao_enviadas_forms
;
$totalProposta
[
'total_num_propostas_ac'
]
+=
$valor
->
num_propostas_ac
;
$totalProposta
[
'total_num_propostas_al'
]
+=
$valor
->
num_propostas_al
;
$totalProposta
[
'total_num_propostas_am'
]
+=
$valor
->
num_propostas_am
;
$totalProposta
[
'total_num_propostas_ap'
]
+=
$valor
->
num_propostas_ap
;
$totalProposta
[
'total_num_propostas_ba'
]
+=
$valor
->
num_propostas_ba
;
$totalProposta
[
'total_num_propostas_ce'
]
+=
$valor
->
num_propostas_ce
;
$totalProposta
[
'total_num_propostas_df'
]
+=
$valor
->
num_propostas_df
;
$totalProposta
[
'total_num_propostas_es'
]
+=
$valor
->
num_propostas_es
;
$totalProposta
[
'total_num_propostas_go'
]
+=
$valor
->
num_propostas_go
;
$totalProposta
[
'total_num_propostas_ma'
]
+=
$valor
->
num_propostas_ma
;
$totalProposta
[
'total_num_propostas_mg'
]
+=
$valor
->
num_propostas_mg
;
$totalProposta
[
'total_num_propostas_ms'
]
+=
$valor
->
num_propostas_ms
;
$totalProposta
[
'total_num_propostas_mt'
]
+=
$valor
->
num_propostas_mt
;
$totalProposta
[
'total_num_propostas_pa'
]
+=
$valor
->
num_propostas_pa
;
$totalProposta
[
'total_num_propostas_pb'
]
+=
$valor
->
num_propostas_pb
;
$totalProposta
[
'total_num_propostas_pe'
]
+=
$valor
->
num_propostas_pe
;
$totalProposta
[
'total_num_propostas_pi'
]
+=
$valor
->
num_propostas_pi
;
$totalProposta
[
'total_num_propostas_pr'
]
+=
$valor
->
num_propostas_pr
;
$totalProposta
[
'total_num_propostas_rj'
]
+=
$valor
->
num_propostas_rj
;
$totalProposta
[
'total_num_propostas_rn'
]
+=
$valor
->
num_propostas_rn
;
$totalProposta
[
'total_num_propostas_ro'
]
+=
$valor
->
num_propostas_ro
;
$totalProposta
[
'total_num_propostas_rr'
]
+=
$valor
->
num_propostas_rr
;
$totalProposta
[
'total_num_propostas_rs'
]
+=
$valor
->
num_propostas_rs
;
$totalProposta
[
'total_num_propostas_sc'
]
+=
$valor
->
num_propostas_sc
;
$totalProposta
[
'total_num_propostas_se'
]
+=
$valor
->
num_propostas_se
;
$totalProposta
[
'total_num_propostas_sp'
]
+=
$valor
->
num_propostas_sp
;
$totalProposta
[
'total_num_propostas_to'
]
+=
$valor
->
num_propostas_to
;
}
//return $totalProposta;
$where
=
[];
$where
[]
=
[
'bln_oficio'
,
true
];
$arquivosOficio
=
ViewArquivosEnviados
::
selectRaw
(
'sg_uf,
...
...
@@ -156,7 +84,7 @@ class HomeController extends Controller
$dadosPaineis
=
DadosPaineis
::
where
(
'bln_ativo'
,
true
)
->
get
();
return
view
(
'home'
,
compact
(
'usuario'
,
'arquivosOficio'
,
'
propostasCadastradas'
,
'totalProposta'
,
'
totalOficios'
,
'selecaoProposta'
,
'dadosPaineis'
));
return
view
(
'home'
,
compact
(
'usuario'
,
'arquivosOficio'
,
'totalOficios'
,
'selecaoProposta'
,
'dadosPaineis'
));
}
...
...
app/Http/Controllers/Propostas/SelecaoController.php
View file @
64a5af0b
...
...
@@ -29,6 +29,7 @@ use App\Propostas\RlcMotivoCorrecaoProposta;
use
App\Propostas\Selecao
;
use
App\Propostas\ViewItensFinanciaveisPropostas
;
use
App\Propostas\ViewPropostasCadastradas
;
use
App\Propostas\ViewPropostasCadastradasUf
;
use
App\Propostas\ViewPropostasSelecionadas
;
use
App\Propostas\ViewResultadoSelecao
;
use
App\Propostas\ViewResumoEmpenhadoPorUf
;
...
...
@@ -1224,4 +1225,84 @@ public function pesquisarProponenteTransferegov(Request $request){
return
view
(
'modulo_propostas.proposta.admin.RelatorioSituacaoPropostasRps'
);
}
public
function
relPropostasUf
(){
$propostasCadastradas
=
ViewPropostasCadastradasUf
::
get
();
$totalProposta
=
[
'total_propostas'
=>
0
,
'total_intervencao'
=>
0
,
'total_propostas_sistema'
=>
0
,
'total_intervencao_sistema'
=>
0
,
'total_propostas_forms'
=>
0
,
'total_intervencao_forms'
=>
0
,
'total_num_propostas_ac'
=>
0
,
'total_num_propostas_al'
=>
0
,
'total_num_propostas_am'
=>
0
,
'total_num_propostas_ap'
=>
0
,
'total_num_propostas_ba'
=>
0
,
'total_num_propostas_ce'
=>
0
,
'total_num_propostas_df'
=>
0
,
'total_num_propostas_es'
=>
0
,
'total_num_propostas_go'
=>
0
,
'total_num_propostas_ma'
=>
0
,
'total_num_propostas_mg'
=>
0
,
'total_num_propostas_ms'
=>
0
,
'total_num_propostas_mt'
=>
0
,
'total_num_propostas_ms'
=>
0
,
'total_num_propostas_pa'
=>
0
,
'total_num_propostas_pb'
=>
0
,
'total_num_propostas_pe'
=>
0
,
'total_num_propostas_pi'
=>
0
,
'total_num_propostas_pr'
=>
0
,
'total_num_propostas_rj'
=>
0
,
'total_num_propostas_rn'
=>
0
,
'total_num_propostas_ro'
=>
0
,
'total_num_propostas_rr'
=>
0
,
'total_num_propostas_rs'
=>
0
,
'total_num_propostas_sc'
=>
0
,
'total_num_propostas_se'
=>
0
,
'total_num_propostas_sp'
=>
0
,
'total_num_propostas_to'
=>
0
,
];
foreach
(
$propostasCadastradas
as
$valor
){
$totalProposta
[
'total_propostas'
]
+=
$valor
->
num_propostas
;
$totalProposta
[
'total_intervencao'
]
+=
$valor
->
vlr_total
;
$totalProposta
[
'total_propostas_sistema'
]
+=
$valor
->
num_propostas_enviadas_sistema
;
$totalProposta
[
'total_intervencao_sistema'
]
+=
$valor
->
vlr_intervencao_enviadas_sistema
;
$totalProposta
[
'total_propostas_forms'
]
+=
$valor
->
num_propostas_enviadas_forms
;
$totalProposta
[
'total_intervencao_forms'
]
+=
$valor
->
vlr_intervencao_enviadas_forms
;
$totalProposta
[
'total_num_propostas_ac'
]
+=
$valor
->
num_propostas_ac
;
$totalProposta
[
'total_num_propostas_al'
]
+=
$valor
->
num_propostas_al
;
$totalProposta
[
'total_num_propostas_am'
]
+=
$valor
->
num_propostas_am
;
$totalProposta
[
'total_num_propostas_ap'
]
+=
$valor
->
num_propostas_ap
;
$totalProposta
[
'total_num_propostas_ba'
]
+=
$valor
->
num_propostas_ba
;
$totalProposta
[
'total_num_propostas_ce'
]
+=
$valor
->
num_propostas_ce
;
$totalProposta
[
'total_num_propostas_df'
]
+=
$valor
->
num_propostas_df
;
$totalProposta
[
'total_num_propostas_es'
]
+=
$valor
->
num_propostas_es
;
$totalProposta
[
'total_num_propostas_go'
]
+=
$valor
->
num_propostas_go
;
$totalProposta
[
'total_num_propostas_ma'
]
+=
$valor
->
num_propostas_ma
;
$totalProposta
[
'total_num_propostas_mg'
]
+=
$valor
->
num_propostas_mg
;
$totalProposta
[
'total_num_propostas_ms'
]
+=
$valor
->
num_propostas_ms
;
$totalProposta
[
'total_num_propostas_mt'
]
+=
$valor
->
num_propostas_mt
;
$totalProposta
[
'total_num_propostas_pa'
]
+=
$valor
->
num_propostas_pa
;
$totalProposta
[
'total_num_propostas_pb'
]
+=
$valor
->
num_propostas_pb
;
$totalProposta
[
'total_num_propostas_pe'
]
+=
$valor
->
num_propostas_pe
;
$totalProposta
[
'total_num_propostas_pi'
]
+=
$valor
->
num_propostas_pi
;
$totalProposta
[
'total_num_propostas_pr'
]
+=
$valor
->
num_propostas_pr
;
$totalProposta
[
'total_num_propostas_rj'
]
+=
$valor
->
num_propostas_rj
;
$totalProposta
[
'total_num_propostas_rn'
]
+=
$valor
->
num_propostas_rn
;
$totalProposta
[
'total_num_propostas_ro'
]
+=
$valor
->
num_propostas_ro
;
$totalProposta
[
'total_num_propostas_rr'
]
+=
$valor
->
num_propostas_rr
;
$totalProposta
[
'total_num_propostas_rs'
]
+=
$valor
->
num_propostas_rs
;
$totalProposta
[
'total_num_propostas_sc'
]
+=
$valor
->
num_propostas_sc
;
$totalProposta
[
'total_num_propostas_se'
]
+=
$valor
->
num_propostas_se
;
$totalProposta
[
'total_num_propostas_sp'
]
+=
$valor
->
num_propostas_sp
;
$totalProposta
[
'total_num_propostas_to'
]
+=
$valor
->
num_propostas_to
;
}
return
view
(
'modulo_propostas.proposta.admin.RelatorioPropostasUf'
,
compact
(
'propostasCadastradas'
,
'totalProposta'
));
}
}
resources/views/home.blade.php
View file @
64a5af0b
This diff is collapsed.
Click to expand it.
resources/views/layouts/nav/nav_sistema.blade.php
View file @
64a5af0b
...
...
@@ -48,7 +48,15 @@
<!-- inicio menu Seleção de Propostas-->
<div
class=
"menu-folder"
><a
class=
"menu-item"
href=
"javascript: void(0)"
><span
class=
"icon"
>
<i
class=
"bi bi-file-earmark-check fa-lg"
></i></span><span
class=
"content"
>
Seleção de Propostas
</span></a>
<ul>
<ul>
<li><a
class=
"menu-item"
href=
"#"
title=
"Propostas"
><span
class=
"icon"
>
<i
class=
"fa fa-clipboard-list fa-lg"
></i></i></span><span
class=
"content"
>
Relatórios
</span></a>
<ul>
<li><a
class=
"menu-item"
href=
"{{ url('/selecao/propostas/relatorios/propostas_uf') }}"
title=
"Propostas Cadastradas por UF"
><span
class=
"icon"
>
<i
class=
"fas fa-file fa-lg"
></i></span><span
class=
"content"
>
Propostas Cadastradas por UF
</span></a>
</li>
</ul>
</li>
<li><a
class=
"menu-item"
href=
"#"
title=
"Propostas"
><span
class=
"icon"
>
<i
class=
"fa fa-clipboard-list fa-lg"
></i></i></span><span
class=
"content"
>
Propostas
</span></a>
<ul>
...
...
resources/views/modulo_propostas/proposta/admin/RelatorioPropostasUf.blade.php
0 → 100644
View file @
64a5af0b
This diff is collapsed.
Click to expand it.
routes/web.php
View file @
64a5af0b
...
...
@@ -71,6 +71,9 @@ Route::get('/usuario/{user}/proposta/{proposta}', 'Propostas\PropostaController@
Route
::
get
(
'/usuario/{userProp}/{userLog}/proposta/excluir/{proposta}'
,
'Propostas\PropostaController@excluirProposta'
);
Route
::
get
(
'/selecao/proposta/excluir/{proposta}'
,
'Propostas\SelecaoController@excluirProposta'
);
Route
::
get
(
'/selecao/propostas/relatorios/propostas_uf'
,
'Propostas\SelecaoController@relPropostasUf'
);
//selecao
...
...
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