Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Walter Felipe
submeta
Commits
2ddc75b9
Commit
2ddc75b9
authored
3 years ago
by
Guilherme Silva
Browse files
Options
Download
Email Patches
Plain Diff
Ajuste de paginação nas paginas de listagem de projetos
parent
d7a3dc68
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
app/Http/Controllers/ProponenteController.php
+3
-3
app/Http/Controllers/ProponenteController.php
resources/views/proponente/projetos.blade.php
+3
-0
resources/views/proponente/projetos.blade.php
resources/views/proponente/projetosEdital.blade.php
+6
-0
resources/views/proponente/projetosEdital.blade.php
with
12 additions
and
3 deletions
+12
-3
app/Http/Controllers/ProponenteController.php
View file @
2ddc75b9
...
@@ -92,7 +92,7 @@ class ProponenteController extends Controller
...
@@ -92,7 +92,7 @@ class ProponenteController extends Controller
if
(
$request
->
buscar
==
null
){
if
(
$request
->
buscar
==
null
){
$proponente
=
Proponente
::
where
(
'user_id'
,
Auth
()
->
user
()
->
id
)
->
first
();
$proponente
=
Proponente
::
where
(
'user_id'
,
Auth
()
->
user
()
->
id
)
->
first
();
$projetos
=
Trabalho
::
where
(
'proponente_id'
,
$proponente
->
id
)
->
get
(
);
$projetos
=
Trabalho
::
where
(
'proponente_id'
,
$proponente
->
id
)
->
paginate
(
10
);
$hoje
=
Carbon
::
today
(
'America/Recife'
);
$hoje
=
Carbon
::
today
(
'America/Recife'
);
$hoje
=
$hoje
->
toDateString
();
$hoje
=
$hoje
->
toDateString
();
...
@@ -100,7 +100,7 @@ class ProponenteController extends Controller
...
@@ -100,7 +100,7 @@ class ProponenteController extends Controller
}
else
{
}
else
{
$proponente
=
Proponente
::
where
(
'user_id'
,
Auth
()
->
user
()
->
id
)
->
first
();
$proponente
=
Proponente
::
where
(
'user_id'
,
Auth
()
->
user
()
->
id
)
->
first
();
$projetos
=
Trabalho
::
where
(
'proponente_id'
,
'='
,
$proponente
->
id
)
->
where
(
'titulo'
,
'ilike'
,
'%'
.
$request
->
buscar
.
'%'
)
->
get
(
);
$projetos
=
Trabalho
::
where
(
'proponente_id'
,
'='
,
$proponente
->
id
)
->
where
(
'titulo'
,
'ilike'
,
'%'
.
$request
->
buscar
.
'%'
)
->
paginate
(
10
);
$hoje
=
Carbon
::
today
(
'America/Recife'
);
$hoje
=
Carbon
::
today
(
'America/Recife'
);
$hoje
=
$hoje
->
toDateString
();
$hoje
=
$hoje
->
toDateString
();
...
@@ -111,7 +111,7 @@ class ProponenteController extends Controller
...
@@ -111,7 +111,7 @@ class ProponenteController extends Controller
}
}
public
function
projetosEdital
(
$id
)
{
public
function
projetosEdital
(
$id
)
{
$edital
=
Evento
::
find
(
$id
);
$edital
=
Evento
::
find
(
$id
);
$projetos
=
Trabalho
::
where
(
'evento_id'
,
'='
,
$id
)
->
orderBy
(
'titulo'
)
->
get
(
);
$projetos
=
Trabalho
::
where
(
'evento_id'
,
'='
,
$id
)
->
orderBy
(
'titulo'
)
->
paginate
(
10
);
$hoje
=
Carbon
::
today
(
'America/Recife'
);
$hoje
=
Carbon
::
today
(
'America/Recife'
);
$hoje
=
$hoje
->
toDateString
();
$hoje
=
$hoje
->
toDateString
();
...
...
This diff is collapsed.
Click to expand it.
resources/views/proponente/projetos.blade.php
View file @
2ddc75b9
...
@@ -191,6 +191,9 @@
...
@@ -191,6 +191,9 @@
@
endif
@
endif
@
endif
@
endif
</
div
>
</
div
>
<
div
class
=
"col-md-12"
style
=
"padding-left: 20px"
>
{{
$projetos
->
links
()
}}
</
div
>
</
div
>
</
div
>
</
div
>
</
div
>
</
div
>
</
div
>
...
...
This diff is collapsed.
Click to expand it.
resources/views/proponente/projetosEdital.blade.php
View file @
2ddc75b9
...
@@ -199,10 +199,16 @@
...
@@ -199,10 +199,16 @@
</
div
>
</
div
>
@
endif
@
endif
</
div
>
</
div
>
<
div
class
=
"col-md-12"
style
=
"padding-left: 20px"
>
{{
$projetos
->
links
()
}}
</
div
>
</
div
>
</
div
>
</
div
>
</
div
>
</
div
>
</
div
>
</
div
>
</
div
>
@
endsection
@
endsection
@
section
(
'javascript'
)
@
section
(
'javascript'
)
...
...
This diff is collapsed.
Click to expand it.
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