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
1eda5c4a
Commit
1eda5c4a
authored
Jul 31, 2023
by
sandroresende
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
correcao modulo reenviar oficio
parent
494f50aa
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
40 additions
and
13 deletions
+40
-13
ApiController.php
app/Http/Controllers/ApiController.php
+1
-1
HomeController.php
app/Http/Controllers/HomeController.php
+7
-4
EntePublicoController.php
app/Http/Controllers/Sistema/EntePublicoController.php
+2
-2
register.blade.php
resources/views/auth/register.blade.php
+6
-6
nav_sistema.blade.php
resources/views/layouts/nav/nav_sistema.blade.php
+24
-0
No files found.
app/Http/Controllers/ApiController.php
View file @
1eda5c4a
...
...
@@ -85,7 +85,7 @@ class ApiController extends Controller
public
function
buscarModuloSistemas
(){
return
ModuloSistema
::
orderBy
(
'txt_modulo_sistema'
)
->
get
();
return
ModuloSistema
::
where
(
'id'
,
'1'
)
->
orderBy
(
'txt_modulo_sistema'
)
->
get
();
}
public
function
modalidadeParticipacao
(){
...
...
app/Http/Controllers/HomeController.php
View file @
1eda5c4a
...
...
@@ -2,6 +2,7 @@
namespace
App\Http\Controllers
;
use
App\EntePublico
;
use
Illuminate\Http\Request
;
use
App\Http\Controllers\Controller
;
...
...
@@ -10,8 +11,7 @@ use App\Propostas\ViewPropostasCadastradasUf;
use
App\ViewArquivosEnviados
;
use
DirectoryIterator
;
use
Illuminate\Support\Facades\Auth
;
use
PhpParser\Builder\Enum_
;
class
HomeController
extends
Controller
{
...
...
@@ -36,6 +36,7 @@ class HomeController extends Controller
{
$usuario
=
Auth
::
user
();
...
...
@@ -109,8 +110,9 @@ class HomeController extends Controller
//return $totalProposta;
$where
=
[];
$where
[]
=
[
'bln_oficio'
,
true
];
$arquivosOficio
=
ViewArquivosEnviados
::
selectRaw
(
'sg_uf,
return
$arquivosOficio
=
ViewArquivosEnviados
::
selectRaw
(
'sg_uf,
count(usuario_id) as num_oficios,
SUM(CASE WHEN bln_documento_analisado = false THEN 1 ELSE 0 END) AS num_aguardando_analise,
SUM(CASE WHEN bln_documento_analisado = TRUE and bln_documento_validado = true THEN 1 ELSE 0 END) AS num_validado,
...
...
@@ -118,6 +120,7 @@ class HomeController extends Controller
->
where
(
$where
)
->
groupBy
(
'sg_uf'
)
->
get
();
$totalOficios
=
[
'total_oficios'
=>
0
,
'total_num_aguardando_analise'
=>
0
,
'total_num_validado'
=>
0
,
...
...
app/Http/Controllers/Sistema/EntePublicoController.php
View file @
1eda5c4a
...
...
@@ -244,12 +244,12 @@ class EntePublicoController extends Controller
{
if
(
$dados
->
bln_documento_analisado
==
true
&&
$dados
->
bln_documento_validado
==
false
){
$possuiOficioValido
=
true
;
return
'indeferido'
;
}
}
return
view
(
'modulo_sistema.ente_publico.EntePublicoPropostas'
,
compact
(
'usuario'
,
'cronogramas'
,
'propostas'
,
'dadosArquivoOficio'
));
return
view
(
'modulo_sistema.ente_publico.EntePublicoPropostas'
,
compact
(
'usuario'
,
'cronogramas'
,
'propostas'
,
'dadosArquivoOficio'
,
'possuiOficioValido'
));
}
}
...
...
resources/views/auth/register.blade.php
View file @
1eda5c4a
...
...
@@ -26,11 +26,11 @@
<div class="
card
-
header
"></div>
<div class="
card
-
body
">
<form method="
POST
" action="
{{
route
(
'register'
)
}}
" aria-label="
{{
__
(
'
Registe
r'
)
}}
">
<form method="
POST
" action="
{{
route
(
'register'
)
}}
" aria-label="
{{
__
(
'
Cadastra
r'
)
}}
">
@csrf
<div class="
form
-
group
row
">
<label for="
name
" class="
column
col
-
xs
-
12
col
-
form
-
label
text
-
md
-
left
">{{ __('N
a
me') }}</label>
<label for="
name
" class="
column
col
-
xs
-
12
col
-
form
-
label
text
-
md
-
left
">{{ __('N
o
me') }}</label>
<div class="
column
col
-
xs
-
12
">
<input id="
name
" type="
text
" class="
form
-
control
{{
$errors
->
has
(
'name'
)
?
' is-invalid'
:
''
}}
" name="
name
" value="
{{
old
(
'name'
)
}}
" required autofocus>
...
...
@@ -44,7 +44,7 @@
</div>
<div class="
form
-
group
row
">
<label for="
email
" class="
column
col
-
xs
-
12
col
-
form
-
label
text
-
md
-
left
">{{ __('E-Mail
Address
') }}</label>
<label for="
email
" class="
column
col
-
xs
-
12
col
-
form
-
label
text
-
md
-
left
">{{ __('E-Mail
Usuário
') }}</label>
<div class="
column
col
-
xs
-
12
">
<input id="
email
" type="
email
" class="
form
-
control
{{
$errors
->
has
(
'email'
)
?
' is-invalid'
:
''
}}
" name="
email
" value="
{{
old
(
'email'
)
}}
" required>
...
...
@@ -67,7 +67,7 @@
<div class="
form
-
group
row
">
<label for="
password
" class="
column
col
-
xs
-
12
col
-
form
-
label
text
-
md
-
left
">{{ __('
Password
') }}</label>
<label for="
password
" class="
column
col
-
xs
-
12
col
-
form
-
label
text
-
md
-
left
">{{ __('
Senha
') }}</label>
<div class="
column
col
-
xs
-
12
">
<input id="
password
" type="
password
" class="
form
-
control
{{
$errors
->
has
(
'password'
)
?
' is-invalid'
:
''
}}
" name="
password
" required>
...
...
@@ -81,7 +81,7 @@
</div>
<div class="
form
-
group
row
">
<label for="
password
-
confirm
" class="
column
col
-
xs
-
12
col
-
form
-
label
text
-
md
-
left
">{{ __('Confirm
Password
') }}</label>
<label for="
password
-
confirm
" class="
column
col
-
xs
-
12
col
-
form
-
label
text
-
md
-
left
">{{ __('Confirm
e a senha
') }}</label>
<div class="
column
col
-
xs
-
12
">
<input id="
password
-
confirm
" type="
password
" class="
form
-
control
" name="
password_confirmation
" required>
...
...
@@ -91,7 +91,7 @@
<div class="
p
-
3
text
-
right
">
<button class="
br
-
button
primary
mr
-
3
" type="
submit
" > {{ __('Registrar') }}
</button>
<button class="
br
-
button
danger
mr
-
3
" type="
button
" onclick="
window
.
location
.
href
=
'/
painel_control
e'
">Fechar
<button class="
br
-
button
danger
mr
-
3
" type="
button
" onclick="
window
.
location
.
href
=
'/
hom
e'
">Fechar
</button>
</div>
...
...
resources/views/layouts/nav/nav_sistema.blade.php
View file @
1eda5c4a
...
...
@@ -28,5 +28,29 @@
</ul>
</div>
@can('eAdmin')
<div
class=
"menu-folder"
><a
class=
"menu-item"
href=
"javascript: void(0)"
><span
class=
"icon"
>
<i
class=
"bi bi-gear-fill fa-lg"
></i></span><span
class=
"content"
>
Administrador
</span></a>
<ul>
<li><a
class=
"menu-item"
href=
"#"
title=
"Faqs"
><span
class=
"icon"
>
<i
class=
"fas fa-regular fa-users"
aria-hidden=
"true"
></i></span><span
class=
"content"
>
Usuários
</span></a>
<ul>
<li><a
class=
"menu-item"
href=
"{{url('/register') }}"
title=
"Registrar Usuários"
><span
class=
"icon"
>
<i
class=
"fas fa-regular fa-user"
></i></span><span
class=
"content"
>
Registrar Usuários
</span></a>
</li>
<li><a
class=
"menu-item"
href=
"{{url('/admin/usuarios/sistema') }}"
title=
"Usuários"
><span
class=
"icon"
>
<i
class=
"fas fa-regular fa-users"
></i></span><span
class=
"content"
>
Usuários
</span></a>
</li>
</ul>
</li>
</ul>
</div>
@endcan
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