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
64695976
Commit
64695976
authored
4 years ago
by
carlos
Browse files
Options
Download
Email Patches
Plain Diff
botao voltar de visualizar edital e icones aceitar/recusar
parent
ef05180e
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
database/seeds/AvaliadorSeeder.php
+17
-17
database/seeds/AvaliadorSeeder.php
database/seeds/DatabaseSeeder.php
+3
-2
database/seeds/DatabaseSeeder.php
database/seeds/ProponenteSeeder.php
+15
-23
database/seeds/ProponenteSeeder.php
public/img/icons/confirm.png
+0
-0
public/img/icons/confirm.png
public/img/icons/recuse.png
+0
-0
public/img/icons/recuse.png
resources/views/avaliador/editais.blade.php
+2
-2
resources/views/avaliador/editais.blade.php
resources/views/evento/visualizarEvento.blade.php
+12
-1
resources/views/evento/visualizarEvento.blade.php
with
49 additions
and
45 deletions
+49
-45
database/seeds/AvaliadorSeeder.php
View file @
64695976
...
...
@@ -19,17 +19,17 @@ class AvaliadorSeeder extends Seeder
'area_id'
=>
1
,
]);
$aval
=
App\Avaliador
::
find
(
1
);
$evento
=
App\Evento
::
find
(
1
);
$trabalho
=
App\Trabalho
::
find
(
1
);
$trabalho2
=
App\Trabalho
::
find
(
2
);
//
$aval = App\Avaliador::find(1);
//
$evento = App\Evento::find(1);
//
$trabalho = App\Trabalho::find(1);
//
$trabalho2 = App\Trabalho::find(2);
$aval
->
eventos
()
->
attach
(
$evento
);
$aval
->
trabalhos
()
->
attach
(
$trabalho
);
$aval
->
trabalhos
()
->
attach
(
$trabalho2
);
$aval
->
trabalhos
->
first
()
->
pivot
->
status
=
1
;
//
$aval->eventos()->attach($evento);
//
$aval->trabalhos()->attach($trabalho);
//
$aval->trabalhos()->attach($trabalho2);
//
$aval->trabalhos->first()->pivot->status = 1;
$aval
->
save
();
//
$aval->save();
$user_id
=
DB
::
table
(
'users'
)
->
where
(
'name'
,
'Avaliador2'
)
->
pluck
(
'id'
);
...
...
@@ -38,16 +38,16 @@ class AvaliadorSeeder extends Seeder
'user_id'
=>
$user_id
[
0
],
'area_id'
=>
1
,
]);
$aval
=
App\Avaliador
::
find
(
2
);
$evento
=
App\Evento
::
find
(
1
);
$trabalho
=
App\Trabalho
::
find
(
1
);
$aval
->
trabalhos
()
->
attach
(
$trabalho
);
$aval
->
trabalhos
->
first
()
->
pivot
->
status
=
1
;
//
$aval = App\Avaliador::find(2);
//
$evento = App\Evento::find(1);
//
$trabalho = App\Trabalho::find(1);
//
$aval->trabalhos()->attach($trabalho);
//
$aval->trabalhos->first()->pivot->status = 1;
$aval
->
eventos
()
->
attach
(
$evento
);
$aval
->
save
();
//
$aval->eventos()->attach($evento);
//
$aval->save();
$user_id
=
DB
::
table
(
'users'
)
->
where
(
'name'
,
'Avaliador3'
)
->
pluck
(
'id'
);
//
$user_id = DB::table('users')->where('name','Avaliador3')->pluck('id');
DB
::
table
(
'avaliadors'
)
->
insert
([
'user_id'
=>
$user_id
[
0
],
...
...
This diff is collapsed.
Click to expand it.
database/seeds/DatabaseSeeder.php
View file @
64695976
...
...
@@ -15,15 +15,16 @@ class DatabaseSeeder extends Seeder
$this
->
call
(
UsuarioSeeder
::
class
);
$this
->
call
(
AdministradorSeeder
::
class
);
$this
->
call
(
AdministradorResponsavelSeeder
::
class
);
//
$this->call(ProponenteSeeder::class);
$this
->
call
(
ProponenteSeeder
::
class
);
$this
->
call
(
GrandeAreaSeeder
::
class
);
$this
->
call
(
AreaSeeder
::
class
);
$this
->
call
(
SubAreaSeeder
::
class
);
$this
->
call
(
FuncaoParticipanteSeeder
::
class
);
$this
->
call
(
CoordenadorComissaoSeeder
::
class
);
//$this->call(ParticipanteSeeder::class);
//
$this->call(ParticipanteSeeder::class);
$this
->
call
(
NaturezaSeeder
::
class
);
$this
->
call
(
RecomendacaoSeeder
::
class
);
$this
->
call
(
AvaliadorSeeder
::
class
);
// $this->call(UsersTableSeeder::class);
...
...
This diff is collapsed.
Click to expand it.
database/seeds/ProponenteSeeder.php
View file @
64695976
...
...
@@ -12,14 +12,11 @@ class ProponenteSeeder extends Seeder
*/
public
function
run
()
{
$user_id
=
DB
::
table
(
'users'
)
->
where
(
'name'
,
'Proponente'
)
->
pluck
(
'id'
);
$user_id
=
DB
::
table
(
'users'
)
->
where
(
'name'
,
'Proponente'
)
->
select
(
'id'
);
DB
::
table
(
'proponentes'
)
->
insert
([
'user_id'
=>
$user_id
[
0
],
//'CPF' => '123123123',
'user_id'
=>
'4'
,
'SIAPE'
=>
'123123123'
,
//'email' => '123123123',
//'email' => '123123123',
'cargo'
=>
'123123123'
,
'vinculo'
=>
'123123123'
,
'titulacaoMaxima'
=>
'Mestrado'
,
...
...
@@ -28,27 +25,22 @@ class ProponenteSeeder extends Seeder
'bolsistaProdutividade'
=>
'123123123'
,
'nivel'
=>
'123123123'
,
'linkLattes'
=>
'http://lattes.cnpq.br/8363536830656923'
,
'created_at'
=>
'2020-01-01 00:00:00'
]);
$user_id
=
DB
::
table
(
'users'
)
->
where
(
'name'
,
'Gabriel'
)
->
pluck
(
'id'
);
//
$user_id = DB::table('users')->where('name','Gabriel')->pluck('id');
DB
::
table
(
'proponentes'
)
->
insert
([
'user_id'
=>
$user_id
[
0
],
//'CPF' => '123123123',
'SIAPE'
=>
'123123123'
,
//'email' => '123123123',
//'email' => '123123123',
'cargo'
=>
'123123123'
,
'vinculo'
=>
'123123123'
,
'titulacaoMaxima'
=>
'Mestrado'
,
'anoTitulacao'
=>
'123123123'
,
'areaFormacao'
=>
'123123123'
,
'bolsistaProdutividade'
=>
'123123123'
,
'nivel'
=>
'123123123'
,
'linkLattes'
=>
'http://lattes.cnpq.br/8363536830656923'
,
'created_at'
=>
'2020-01-01 00:00:00'
// DB::table('proponentes')->insert([
// 'user_id' => '1',
// 'SIAPE' => '123123123',
// 'cargo' => '123123123',
// 'vinculo' => '123123123',
// 'titulacaoMaxima' => 'Mestrado',
// 'anoTitulacao' => '123123123',
// 'areaFormacao' => '123123123',
// 'bolsistaProdutividade' => '123123123',
// 'nivel' => '123123123',
// 'linkLattes' => 'http://lattes.cnpq.br/8363536830656923',
]);
//
]);
}
}
\ No newline at end of file
This diff is collapsed.
Click to expand it.
public/img/icons/confirm.png
0 → 100644
View file @
64695976
23.2 KB
This diff is collapsed.
Click to expand it.
public/img/icons/recuse.png
0 → 100755
View file @
64695976
3.89 KB
This diff is collapsed.
Click to expand it.
resources/views/avaliador/editais.blade.php
View file @
64695976
...
...
@@ -46,11 +46,11 @@
</
button
>
@
elseif
(
is_null
(
Auth
::
user
()
->
avaliadors
->
eventos
->
where
(
'id'
,
$evento
->
id
)
->
first
()
->
pivot
->
convite
)
)
<
a
href
=
"{{ route('avaliador.conviteResposta', ['evento_id' =>
$evento->id
, 'resposta'=>true]) }}"
class
=
"dropdown-item"
>
<
img
src
=
"
{
{asset('img/icons/
eye-regular.sv
g')}
}
"
class
=
"icon-card"
alt
=
""
>
<
img
src
=
"
{
{asset('img/icons/
confirm.pn
g')}
}
"
class
=
"icon-card"
alt
=
""
style
=
"width: 20px; height: auto"
>
Aceitar
Convite
</
a
>
<
a
href
=
"{{ route('avaliador.conviteResposta', ['evento_id' =>
$evento->id
, 'resposta'=>false]) }}"
class
=
"dropdown-item"
>
<
img
src
=
"
{
{asset('img/icons/
eye-regular.sv
g')}
}
"
class
=
"icon-card"
alt
=
""
>
<
img
src
=
"
{
{asset('img/icons/
recuse.pn
g')}
}
"
class
=
"icon-card"
alt
=
""
style
=
"width: 20px; height: auto"
>
Recusar
Convite
</
a
>
@
endif
...
...
This diff is collapsed.
Click to expand it.
resources/views/evento/visualizarEvento.blade.php
View file @
64695976
...
...
@@ -263,7 +263,18 @@
<
div
class
=
"row justify-content-center"
style
=
"margin: 20px 0 20px 0"
>
<
div
class
=
"col-md-6 botao-form-left"
style
=
""
>
<
a
class
=
"btn btn-secondary botao-form"
href
=
"{{ route('home') }}"
style
=
"width:100%"
>
Voltar
</
a
>
@
if
(
Auth
::
check
())
@
if
(
Auth
()
->
user
()
->
administradors
!=
null
)
<
a
class
=
"btn btn-secondary botao-form"
href
=
"{{ route('admin.editais') }}"
style
=
"width:100%"
>
Voltar
</
a
>
@
elseif
(
Auth
()
->
user
()
->
proponentes
!=
null
)
<
a
class
=
"btn btn-secondary botao-form"
href
=
"{{ route('proponente.editais') }}"
style
=
"width:100%"
>
Voltar
</
a
>
@
else
<
a
class
=
"btn btn-secondary botao-form"
href
=
"{{ route('participante.editais') }}"
style
=
"width:100%"
>
Voltar
</
a
>
@
endif
@
else
<
a
class
=
"btn btn-secondary botao-form"
href
=
"{{ route('home-user') }}"
style
=
"width:100%"
>
Voltar
</
a
>
@
endif
</
div
>
@
if
(
$evento
->
inicioSubmissao
<=
$mytime
)
...
...
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