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
7b04089f
Commit
7b04089f
authored
Jul 18, 2020
by
Gabriel-31415
Browse files
add de planos de trabalho em avaliador e restricao em editar projeto
parent
7ccae9d4
Changes
5
Show whitespace changes
Inline
Side-by-side
app/Http/Controllers/ProponenteController.php
View file @
7b04089f
...
@@ -86,8 +86,11 @@ class ProponenteController extends Controller
...
@@ -86,8 +86,11 @@ class ProponenteController extends Controller
$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
)
->
get
();
$hoje
=
Carbon
::
today
(
'America/Recife'
);
$hoje
=
$hoje
->
toDateString
();
return
view
(
'proponente.projetos'
)
->
with
([
'projetos'
=>
$projetos
]);
return
view
(
'proponente.projetos'
)
->
with
([
'projetos'
=>
$projetos
,
'hoje'
=>
$hoje
]);
}
}
public
function
projetosEdital
(
$id
)
{
public
function
projetosEdital
(
$id
)
{
$edital
=
Evento
::
find
(
$id
);
$edital
=
Evento
::
find
(
$id
);
...
...
resources/views/avaliador/editais.blade.php
View file @
7b04089f
...
@@ -35,12 +35,12 @@
...
@@ -35,12 +35,12 @@
<
img
src
=
"
{
{asset('img/icons/ellipsis-v-solid.svg')}
}
"
style
=
"width:8px"
>
<
img
src
=
"
{
{asset('img/icons/ellipsis-v-solid.svg')}
}
"
style
=
"width:8px"
>
</
a
>
</
a
>
<
div
class
=
"dropdown-menu"
>
<
div
class
=
"dropdown-menu"
>
@
if
(
!
is_null
(
Auth
::
user
()
->
avaliadors
->
eventos
->
where
(
'id'
,
1
)
->
first
()
->
pivot
->
convite
)
&&
Auth
::
user
()
->
avaliadors
->
eventos
->
where
(
'id'
,
$evento
->
id
)
->
first
()
->
pivot
->
convite
==
true
)
@
if
(
!
is_null
(
Auth
::
user
()
->
avaliadors
->
eventos
->
where
(
'id'
,
$evento
->
id
)
->
first
()
->
pivot
->
convite
)
&&
Auth
::
user
()
->
avaliadors
->
eventos
->
where
(
'id'
,
$evento
->
id
)
->
first
()
->
pivot
->
convite
==
true
)
<
a
href
=
"{{ route('avaliador.visualizarTrabalho', ['evento_id' =>
$evento->id
]) }}"
class
=
"dropdown-item"
>
<
a
href
=
"{{ route('avaliador.visualizarTrabalho', ['evento_id' =>
$evento->id
]) }}"
class
=
"dropdown-item"
>
<
img
src
=
"
{
{asset('img/icons/eye-regular.svg')}
}
"
class
=
"icon-card"
alt
=
""
>
<
img
src
=
"
{
{asset('img/icons/eye-regular.svg')}
}
"
class
=
"icon-card"
alt
=
""
>
Projetos
para
avaliar
Projetos
para
avaliar
</
a
>
</
a
>
@
elseif
(
!
is_null
(
Auth
::
user
()
->
avaliadors
->
eventos
->
where
(
'id'
,
1
)
->
first
()
->
pivot
->
convite
)
&&
Auth
::
user
()
->
avaliadors
->
eventos
->
where
(
'id'
,
$evento
->
id
)
->
first
()
->
pivot
->
convite
==
false
)
@
elseif
(
!
is_null
(
Auth
::
user
()
->
avaliadors
->
eventos
->
where
(
'id'
,
$evento
->
id
)
->
first
()
->
pivot
->
convite
)
&&
Auth
::
user
()
->
avaliadors
->
eventos
->
where
(
'id'
,
$evento
->
id
)
->
first
()
->
pivot
->
convite
==
false
)
<
button
disabled
=
"disabled"
class
=
"dropdown-item"
>
<
button
disabled
=
"disabled"
class
=
"dropdown-item"
>
Convite
recusado
Convite
recusado
</
button
>
</
button
>
...
...
resources/views/avaliador/listarTrabalhos.blade.php
View file @
7b04089f
...
@@ -17,7 +17,8 @@
...
@@ -17,7 +17,8 @@
<
tr
>
<
tr
>
<
th
scope
=
"col"
>
Nome
do
Projeto
</
th
>
<
th
scope
=
"col"
>
Nome
do
Projeto
</
th
>
<
th
scope
=
"col"
>
Data
de
Criação
</
th
>
<
th
scope
=
"col"
>
Data
de
Criação
</
th
>
<
th
scope
=
"col"
>
Baixar
</
th
>
<
th
scope
=
"col"
>
Projeto
</
th
>
<
th
scope
=
"col"
>
Plano
de
Trabalho
</
th
>
<
th
scope
=
"col"
>
Parecer
</
th
>
<
th
scope
=
"col"
>
Parecer
</
th
>
</
tr
>
</
tr
>
</
thead
>
</
thead
>
...
@@ -32,6 +33,24 @@
...
@@ -32,6 +33,24 @@
<
img
class
=
""
src
=
"
{
{asset('img/icons/file-download-solid.svg')}
}
"
style
=
"width:20px"
>
<
img
class
=
""
src
=
"
{
{asset('img/icons/file-download-solid.svg')}
}
"
style
=
"width:20px"
>
</
a
>
</
a
>
</
td
>
</
td
>
<
td
>
@
foreach
(
$trabalho
->
participantes
as
$participante
)
@
php
if
(
App\Arquivo
::
where
(
'participanteId'
,
$participante
->
pivot
->
participante_id
)
->
first
()
!=
null
){
$planoTrabalho
=
App\Arquivo
::
where
(
'participanteId'
,
$participante
->
pivot
->
participante_id
)
->
first
()
->
nome
;
}
else
{
$planoTrabalho
=
null
;
}
@
endphp
@
if
(
$planoTrabalho
!=
null
)
<
a
href
=
"{{route('download', ['file' =>
$planoTrabalho
])}}"
target
=
"_new"
style
=
"font-size: 20px; color: #114048ff;"
>
<
img
class
=
""
src
=
"
{
{asset('img/icons/file-download-solid.svg')}
}
"
style
=
"width:20px"
>
</
a
>
@
else
Não
há
planos
de
trabalho
.
@
endif
@
endforeach
</
td
>
<
td
>
<
td
>
<
div
class
=
"row"
>
<
div
class
=
"row"
>
<
form
action
=
"{{ route('avaliador.parecer', ['evento' =>
$evento
]) }}"
method
=
"POST"
>
<
form
action
=
"{{ route('avaliador.parecer', ['evento' =>
$evento
]) }}"
method
=
"POST"
>
...
...
resources/views/proponente/projetos.blade.php
View file @
7b04089f
...
@@ -49,9 +49,12 @@
...
@@ -49,9 +49,12 @@
<
img
src
=
"
{
{asset('img/icons/ellipsis-v-solid.svg')}
}
"
style
=
"width:8px"
>
<
img
src
=
"
{
{asset('img/icons/ellipsis-v-solid.svg')}
}
"
style
=
"width:8px"
>
</
a
>
</
a
>
<
div
class
=
"dropdown-menu"
>
<
div
class
=
"dropdown-menu"
>
@
if
(
$projeto
->
evento
->
inicioSubmissao
<=
$hoje
&&
$hoje
<=
$projeto
->
evento
->
fimSubmissao
)
<
a
href
=
"{{ route('trabalho.editar', ['id' =>
$projeto->id
]) }}"
class
=
"dropdown-item"
style
=
"text-align: center;"
>
<
a
href
=
"{{ route('trabalho.editar', ['id' =>
$projeto->id
]) }}"
class
=
"dropdown-item"
style
=
"text-align: center;"
>
Editar
projeto
Editar
projeto
</
a
>
</
a
>
@
else
@
endif
<
a
href
=
"{{ route('trabalho.show', ['id' =>
$projeto->id
]) }}"
class
=
"dropdown-item"
style
=
"text-align: center"
>
<
a
href
=
"{{ route('trabalho.show', ['id' =>
$projeto->id
]) }}"
class
=
"dropdown-item"
style
=
"text-align: center"
>
Visualizar
projeto
Visualizar
projeto
</
a
>
</
a
>
...
...
resources/views/proponente/projetosEdital.blade.php
View file @
7b04089f
...
@@ -66,9 +66,12 @@
...
@@ -66,9 +66,12 @@
<
img
src
=
"
{
{asset('img/icons/ellipsis-v-solid.svg')}
}
"
style
=
"width:8px"
>
<
img
src
=
"
{
{asset('img/icons/ellipsis-v-solid.svg')}
}
"
style
=
"width:8px"
>
</
a
>
</
a
>
<
div
class
=
"dropdown-menu"
>
<
div
class
=
"dropdown-menu"
>
@
if
(
$edital
->
inicioSubmissao
<=
$hoje
&&
$hoje
<=
$edital
->
fimSubmissao
)
<
a
href
=
"{{ route('trabalho.editar', ['id' =>
$projeto->id
]) }}"
class
=
"dropdown-item"
style
=
"text-align: center;"
>
<
a
href
=
"{{ route('trabalho.editar', ['id' =>
$projeto->id
]) }}"
class
=
"dropdown-item"
style
=
"text-align: center;"
>
Editar
projeto
Editar
projeto
</
a
>
</
a
>
@
else
@
endif
<
a
href
=
"{{ route('trabalho.show', ['id' =>
$projeto->id
]) }}"
class
=
"dropdown-item"
style
=
"text-align: center"
>
<
a
href
=
"{{ route('trabalho.show', ['id' =>
$projeto->id
]) }}"
class
=
"dropdown-item"
style
=
"text-align: center"
>
Visualizar
projeto
Visualizar
projeto
</
a
>
</
a
>
...
...
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