Skip to content

S
sistema_mcid
Commit 4828da73 authored by sandroresende's avatar sandroresende
Browse files
Options

inclusao resumo correção secretaria

parent 63974d74
Hide whitespace changes
Inline Side-by-side
Showing with 64 additions and 11 deletions
app/Http/Controllers/WelcomeController.php
View file @ 4828da73
......@@ -3,6 +3,8 @@
namespace App\Http\Controllers;
use App\ConfiguracaoSistema;
use App\Corporativo\Mcid_carteira_investimento\ViewResumoSecretariaOrigem;
use App\Corporativo\Mcid_carteira_investimento\ViewResumoTipoInstrumentoOrigem;
use App\DadosPaineis;
use App\Mod_saci\mod_ibge\Municipio;
use App\Mod_saci\mod_ibge\Uf;
......@@ -54,8 +56,11 @@ class WelcomeController extends Controller
$dadosPaineis = DadosPaineis::where($wherePainel)->get();
$resumoTipoInstrumento = ViewResumoTipoInstrumentoOrigem::get();
$resumoSecretaria = ViewResumoSecretariaOrigem::get();
return view('welcome', compact('configuracao', 'dataAtual', 'dadosPaineis'));
return view('welcome', compact('configuracao', 'dataAtual', 'dadosPaineis', 'resumoTipoInstrumento', 'resumoSecretaria'));
}
......@@ -191,4 +196,4 @@ class WelcomeController extends Controller
return view('modulo_propostas.proposta.ListaPropostasPublicidade', compact('propostas', 'subtitulo1', 'subtitulo2'));
}
}
}
\ No newline at end of file
resources/views/modulo_sistema/gerais/carteira_investimento/resumo_tci_secretaria.blade.php
View file @ 4828da73
......@@ -32,7 +32,7 @@
<th class="text-center" colspan="2">FGTS</th>
<th class="text-center" colspan="2">MCMV</th>
<th class="text-center" colspan="2">BNDES</th>
<th class="text-center align-middle" rowspan="2">TOTAL</th>
<th class="text-center align-middle" colspan="3">TOTAL</th>
</tr>
<tr>
<th class="text-center table-primary">Ativos</th>
......@@ -45,6 +45,9 @@
<th class="text-center table-primary">Inativo</th>
<th class="text-center table-primary">Ativos</th>
<th class="text-center table-primary">Inativo</th>
<th class="text-center table-primary">Ativos</th>
<th class="text-center table-primary">Inativo</th>
<th class="text-center table-primary">Total</th>
</tr>
</thead>
<tbody>
......@@ -84,7 +87,9 @@
<td class="text-center">
{{number_format($dados->num_contratos_inativos_bndes, 0, ',' , '.')}}
</td>
<td class="text-center">{{number_format($dados->num_contratos, 0, ',' , '.')}}</td>
<td class="text-center border-secondary bg-gray-10">{{number_format($dados->num_contratos_ativos, 0, ',' , '.')}}</td>
<td class="text-center border-secondary bg-gray-10">{{number_format($dados->num_contratos_inativos, 0, ',' , '.')}}</td>
<td class="text-center border-secondary bg-gray-10">{{number_format($dados->num_contratos, 0, ',' , '.')}}</td>
</tr>
@endforeach
......@@ -120,7 +125,13 @@
<td class="text-center tabelaNumero">
{{number_format($resumoTipoInstrumento->SUM('num_contratos_inativos_bndes'), 0, ',' , '.')}}
</td>
<td class="text-center tabelaNumero">
<td class="text-center">
{{number_format($resumoTipoInstrumento->SUM('num_contratos_ativos'), 0, ',' , '.')}}
</td>
<td class="text-center">
{{number_format($resumoTipoInstrumento->SUM('num_contratos_inativos'), 0, ',' , '.')}}
</td>
<td class="text-center">
{{number_format($resumoTipoInstrumento->SUM('num_contratos'), 0, ',' , '.')}}
</td>
</tr>
......@@ -141,6 +152,12 @@
<td class="text-center tabelaNumero" colspan="2">
{{number_format($resumoTipoInstrumento->SUM('num_contratos_ativos_bndes')+$resumoTipoInstrumento->SUM('num_contratos_inativos_bndes'), 0, ',' , '.')}}
</td>
<td class="text-center tabelaNumero">
{{number_format($resumoTipoInstrumento->SUM('num_contratos_ativos'), 0, ',' , '.')}}
</td>
<td class="text-center tabelaNumero">
{{number_format($resumoTipoInstrumento->SUM('num_contratos_inativos'), 0, ',' , '.')}}
</td>
<td class="text-center tabelaNumero">
{{number_format($resumoTipoInstrumento->SUM('num_contratos'), 0, ',' , '.')}}
</td>
......
resources/views/modulo_sistema/gerais/carteira_investimento/resumo_tci_tipo_instrumento.blade.php
View file @ 4828da73
......@@ -32,7 +32,7 @@
<th class="text-center" colspan="2">FGTS</th>
<th class="text-center" colspan="2">MCMV</th>
<th class="text-center" colspan="2">BNDES</th>
<th class="text-center align-middle" rowspan="2">TOTAL</th>
<th class="text-center align-middle border-start" colspan="3">TOTAL</th>
</tr>
<tr>
<th class="text-center table-primary">Ativos</th>
......@@ -45,12 +45,15 @@
<th class="text-center table-primary">Inativo</th>
<th class="text-center table-primary">Ativos</th>
<th class="text-center table-primary">Inativo</th>
<th class="text-center table-primary">Ativos</th>
<th class="text-center table-primary">Inativo</th>
<th class="text-center table-primary">Total</th>
</tr>
</thead>
<tbody>
@foreach($resumoTipoInstrumento as $dados)
<tr class="text-center">
<tr class="text-center ">
<td class="text-center">{{$dados->txt_tipo_instrumento}}</td>
<td class="text-center">
......@@ -73,7 +76,9 @@
</td>
<td class="text-center">
{{number_format($dados->num_contratos_inativos_bndes, 0, ',' , '.')}}</td>
<td class="text-center">{{number_format($dados->num_contratos, 0, ',' , '.')}}</td>
<td class="text-center border-secondary bg-gray-10">{{number_format($dados->num_contratos_ativos, 0, ',' , '.')}}</td>
<td class="text-center border-secondary bg-gray-10">{{number_format($dados->num_contratos_inativos, 0, ',' , '.')}}</td>
<td class="text-center border-secondary bg-gray-10">{{number_format($dados->num_contratos, 0, ',' , '.')}}</td>
</tr>
@endforeach
......@@ -109,8 +114,15 @@
<td class="text-center tabelaNumero">
{{number_format($resumoTipoInstrumento->SUM('num_contratos_inativos_bndes'), 0, ',' , '.')}}
</td>
<td class="text-center tabelaNumero border-start">
{{number_format($resumoTipoInstrumento->SUM('num_contratos_ativos'), 0, ',' , '.')}}
</td>
<td class="text-center tabelaNumero">
{{number_format($resumoTipoInstrumento->SUM('num_contratos_inativos'), 0, ',' , '.')}}
</td>
<td class="text-center tabelaNumero">
{{number_format($resumoTipoInstrumento->SUM('num_contratos'), 0, ',' , '.')}}</td>
{{number_format($resumoTipoInstrumento->SUM('num_contratos'), 0, ',' , '.')}}
</td>
</tr>
<tr class="text-center total">
<td class="text-center tabelaNumero">TOTAL</td>
......@@ -129,8 +141,15 @@
<td class="text-center tabelaNumero" colspan="2">
{{number_format($resumoTipoInstrumento->SUM('num_contratos_ativos_bndes')+$resumoTipoInstrumento->SUM('num_contratos_inativos_bndes'), 0, ',' , '.')}}
</td>
<td class="text-center tabelaNumero border-start">
{{number_format($resumoTipoInstrumento->SUM('num_contratos_ativos'), 0, ',' , '.')}}
</td>
<td class="text-center tabelaNumero">
{{number_format($resumoTipoInstrumento->SUM('num_contratos'), 0, ',' , '.')}}</td>
{{number_format($resumoTipoInstrumento->SUM('num_contratos_inativos'), 0, ',' , '.')}}
</td>
<td class="text-center tabelaNumero">
{{number_format($resumoTipoInstrumento->SUM('num_contratos'), 0, ',' , '.')}}
</td>
</tr>
</tbody><!-- fechar tbody-->
</table><!-- fechar table-->
......
resources/views/welcome.blade.php
View file @ 4828da73
......@@ -3,7 +3,19 @@
@section('content')
<div class="main-content" id="main-content">
<div class="main-content" id="main-content">
@include('modulo_sistema.gerais.carteira_investimento.resumo_tci_tipo_instrumento')
<span class="br-divider dashed my-3"></span>
@include('modulo_sistema.gerais.carteira_investimento.resumo_tci_secretaria')
@if($configuracao->dte_termino_funcionalidade > $dataAtual)
<div class="br-card">
......
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