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
798102f1
Commit
798102f1
authored
Jan 16, 2024
by
sandroresende
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
melhorias no form minhas demandas
parent
7dd74b7b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
87 additions
and
3 deletions
+87
-3
DemandaController.php
app/Http/Controllers/Mod_codem/DemandaController.php
+17
-2
minhas_demandas.blade.php
resources/views/modulo_codem/minhas_demandas.blade.php
+70
-1
No files found.
app/Http/Controllers/Mod_codem/DemandaController.php
View file @
798102f1
...
...
@@ -146,6 +146,15 @@ class DemandaController extends Controller
{
$usuarioID
=
Auth
::
user
()
->
id
;
$whereDemandado
[]
=
[
'user_id_demandado'
,
$usuarioID
];
$whereDemandado
[]
=
[
'situacao_id'
,
'!='
,
7
];
$demandasUsuarioDemandado
=
RelacaoDemandas
::
where
(
$whereDemandado
)
->
orderBy
(
'dte_solicitacao'
,
'desc'
)
->
get
();
$where
[]
=
[
'user_id'
,
$usuarioID
];
$where
[]
=
[
'situacao_id'
,
'!='
,
7
];
...
...
@@ -153,9 +162,16 @@ class DemandaController extends Controller
->
orderBy
(
'dte_solicitacao'
,
'desc'
)
->
get
();
$resumoDemandasUsuario
=
ViewResumoDemandasDemandante
::
where
(
'user_id_demandante'
,
$usuarioID
)
->
first
();
$whereSetor
[]
=
[
'setor_id'
,
Auth
::
user
()
->
setor_id
];
$whereSetor
[]
=
[
'situacao_id'
,
'!='
,
7
];
$demandasSetorUsuario
=
RelacaoDemandas
::
where
(
$whereSetor
)
...
...
@@ -174,7 +190,7 @@ class DemandaController extends Controller
}
return
view
(
'modulo_codem.minhas_demandas'
,
compact
(
'demandasUsuario'
,
'encaminhamentoDemanda'
,
'demandasSetorUsuario'
));
return
view
(
'modulo_codem.minhas_demandas'
,
compact
(
'demandasUsuario'
,
'encaminhamentoDemanda'
,
'demandasSetorUsuario'
,
'demandasUsuarioDemandado'
));
}
public
function
atualizarDemanda
(
Request
$request
)
...
...
@@ -187,7 +203,6 @@ class DemandaController extends Controller
$demanda
->
bln_documento_sei
=
$request
->
bln_documento_sei
;
$demanda
->
setor_id
=
$request
->
setor
;
$demanda
->
txt_descricao_demanda
=
$request
->
txt_descricao_demanda
;
$demanda
->
prioridade_id
=
$request
->
prioridade
;
$demanda
->
dte_conclusao
=
$request
->
dte_conclusao
;
$demanda
->
dsc_resposta_demanda
=
$request
->
dsc_resposta_demanda
;
...
...
resources/views/modulo_codem/minhas_demandas.blade.php
View file @
798102f1
...
...
@@ -88,10 +88,79 @@
</div>
</div>
@endif
@if(
$demandasUsuarioDemandado
)
<div class="
titulo
">
<h5>Demandas a responder</h5>
</div><!-- titulo-->
<div class="
form
-
group
row
">
<div class="
col
col
-
xs
-
12
col
-
sm
-
12
">
<button type="
submit
" class="
br
-
button
block
secondary
mr
-
3
" aria-label="
Ícone
ilustrativo
" onclick="
window
.
location
.
href
=
'/codem/demanda/nova'
">
<i class="
fas
fa
-
edit
" aria-hidden="
true
"></i>Nova demanda
</button>
<div class="
table
-
responsive
">
<table class="
table
table
-
striped
table
-
hover
table
-
sm
">
<thead class="
text
-
center
">
<tr class="
text
-
center
">
<th>#</th>
<th>ID</th>
<th>Secretaria Demandada</th>
<th>Departamento Demandado</th>
<th>Setor Demandado</th>
<th>Demandado</th>
<th>Tema</th>
<th>Subtema</th>
<th>Situação</th>
<th>Data Solicitação</th>
<th>Prazo em dias</th>
<th>Previsão Conclusão</th>
<th>Atraso</th>
<th>Interessado (s)</th>
<th class="
acao
">Ação</th>
</tr>
</thead>
<tbody>
@foreach(
$demandasUsuarioDemandado
as
$demanda
)
@if(
$demanda->qtd_dias_atraso
>0)
<tr class="
conteudoTabela
table
-
danger
" >
@else
<tr class="
conteudoTabela
" >
@endif
<td>
@if(
$demanda->bln_visualizada
)
<i class="
fas
fa
-
envelope
-
open
fa
-
2
x
" style="
color
:
green
;
"></i>
@else
<i class="
fas
fa
-
envelope
fa
-
2
x
" style="
color
:
gray
;
"></i>
@endif
</td>
<td>
{
{$demanda->demanda_id}
}
</td>
<td>
{
{$demanda->txt_nome_secretaria}
}
</td>
<td>
{
{$demanda->txt_sigla_departamento}
}
</td>
<td>
{
{$demanda->txt_sigla_setor}
}
</td>
<td>{{mb_convert_case(
$demanda->nome_demandado
, MB_CASE_TITLE, 'UTF-8')}}</td>
<td>
{
{$demanda->txt_tema}
}
</td>
<td>
{
{$demanda->txt_sub_tema}
}
</td>
<td>
{
{$demanda->txt_situacao}
}
</td>
<td>{{(
$demanda->dte_solicitacao
) ? date('d/m/Y',strtotime(
$demanda->dte_solicitacao
)) : ''}}</td>
<td>
{
{$demanda->num_max_dias}
}
</td>
<td>{{(
$demanda->dte_previsao_conclusao
) ? date('d/m/Y',strtotime(
$demanda->dte_previsao_conclusao
)) : ''}}</td>
<td>{{(
$demanda->qtd_dias_atraso
)>0 ?
$demanda->qtd_dias_atraso
: 0}}</td>
<td>
{
{$demanda->txt_nome_interessado}
}
</td>
<td class="
acao
"><a class="
br
-
button
circle
primary
small
" href='{{ url("
codem
/
demanda
/
dados
/
$demanda
->
demanda_id
/
demanda
")}}'><i class="
fas
fa
-
eye
"></i></a></td>
</tr>
@endforeach
</tbody>
</table>
</div>
</div>
</div>
@endif
@if(count(
$encaminhamentoDemanda
)>0)
<div class="
titulo
">
<h5>
D
emandas a responder</h5>
<h5>
Encaminhamentos de d
emandas a responder</h5>
</div><!-- titulo-->
<div class="
form
-
group
row
">
<div class="
col
col
-
xs
-
12
col
-
sm
-
12
">
...
...
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