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
904d3e3e
"app/Http/vscode:/vscode.git/clone" did not exist on "d97d2ee62c91f85fc13950a396c877a383971089"
Commit
904d3e3e
authored
Jul 19, 2021
by
José Rômulo
Browse files
Adiciona area em convite de avaliador
parent
721d54a7
Changes
4
Show whitespace changes
Inline
Side-by-side
app/Http/Controllers/AdministradorController.php
View file @
904d3e3e
...
...
@@ -7,8 +7,10 @@ use App\Administrador;
use
App\User
;
use
App\Avaliador
;
use
App\AdministradorResponsavel
;
use
App\Area
;
use
App\Participante
;
use
App\Proponente
;
use
App\GrandeArea
;
use
App\Natureza
;
use
App\Trabalho
;
use
App\FuncaoParticipantes
;
...
...
@@ -363,7 +365,7 @@ class AdministradorController extends Controller
public
function
selecionar
(
Request
$request
){
$evento
=
Evento
::
where
(
'id'
,
$request
->
evento_id
)
->
first
();
$grandeAreas
=
GrandeArea
::
orderBy
(
'nome'
)
->
get
();
$avalSelecionados
=
$evento
->
avaliadors
;
$avalNaoSelecionadosId
=
$evento
->
avaliadors
->
pluck
(
'id'
);
$avaliadores
=
Avaliador
::
whereNotIn
(
'id'
,
$avalNaoSelecionadosId
)
->
get
();
...
...
@@ -371,7 +373,8 @@ class AdministradorController extends Controller
return
view
(
'administrador.selecionarAvaliadores'
,
[
'evento'
=>
$evento
,
'avaliadores'
=>
$avaliadores
,
'avalSelecionados'
=>
$avalSelecionados
'avalSelecionados'
=>
$avalSelecionados
,
'grandeAreas'
=>
$grandeAreas
]);
}
public
function
projetos
(
Request
$request
){
...
...
@@ -455,6 +458,7 @@ class AdministradorController extends Controller
$nomeAvaliador
=
$request
->
nomeAvaliador
;
$emailAvaliador
=
$request
->
emailAvaliador
;
$tipo
=
$request
->
tipo
;
$area
=
Area
::
where
(
'id'
,
$request
->
area_id
)
->
first
();
$user
=
User
::
where
(
'email'
,
$emailAvaliador
)
->
first
();
//existe o caso de enviar o convite de novo para um mesmo usuário
...
...
@@ -485,6 +489,7 @@ class AdministradorController extends Controller
$avaliador
=
new
Avaliador
();
$avaliador
->
save
();
$avaliador
->
area
()
->
associate
(
$area
);
$avaliador
->
user
()
->
associate
(
$user
);
$avaliador
->
eventos
()
->
attach
(
$evento
);
...
...
app/Http/Controllers/UserController.php
View file @
904d3e3e
...
...
@@ -105,7 +105,7 @@ class UserController extends Controller
if
(
$user
->
avaliadors
!=
null
&&
$request
->
area
!=
null
&&
$user
->
tipo
==
"avaliador"
){
$avaliador
=
Avaliador
::
where
(
'user_id'
,
'='
,
$id
)
->
first
();
$avaliador
->
user_id
=
$user
->
id
;
$avaliador
->
area_id
=
$request
->
area
;
//
$avaliador->area_id = $request->area;
$avaliador
->
update
();
}
...
...
@@ -118,7 +118,7 @@ class UserController extends Controller
case
"avaliador"
:
$avaliador
=
Avaliador
::
where
(
'user_id'
,
'='
,
$id
)
->
first
();
$avaliador
->
user_id
=
$user
->
id
;
$avaliador
->
area_id
=
$request
->
area
;
//
$avaliador->area_id = $request->area;
if
(
$user
->
usuarioTemp
==
true
){
$user
->
usuarioTemp
=
false
;
}
...
...
resources/views/administrador/selecionarAvaliadores.blade.php
View file @
904d3e3e
...
...
@@ -142,6 +142,21 @@
<
label
for
=
"exampleInputEmail1"
>
Email
<
span
style
=
"color: red;"
>*</
span
></
label
>
<
input
type
=
"email"
class
=
"form-control"
name
=
"emailAvaliador"
id
=
"exampleInputEmail1"
>
</
div
>
<
div
class
=
"form-group"
>
<
label
for
=
"grandeArea"
class
=
"col-form-label"
>
{{
__
(
'Grande Área'
)
}}
<
span
style
=
"color: red; font-weight:bold"
>*</
span
></
label
>
<
select
class
=
"form-control"
id
=
"grandeArea"
name
=
"grande_area_id"
onchange
=
"areas()"
>
<
option
value
=
""
disabled
selected
hidden
>--
Grande
Área
--</
option
>
@
foreach
(
$grandeAreas
as
$grandeArea
)
<
option
value
=
"
{
{$grandeArea->id}}">{{$grandeArea->nome}
}
</option>
@endforeach
</select>
<label for="
area
" class="
col
-
form
-
label
">{{ __('Área') }} <span style="
color
:
red
;
font
-
weight
:
bold
">*</span></label>
<select class="
form
-
control
@
error
(
'area'
)
is
-
invalid
@
enderror
" id="
area
" name="
area_id
" >
<option value="" disabled selected hidden>-- Área --</option>
</select>
</div>
<div class="
form
-
group
">
<label for="
exampleFormControlSelect1
">Tipo</label>
<select class="
form
-
control
" name="
tipo
" id="
exampleFormControlSelect1
" disabled>
...
...
@@ -187,5 +202,41 @@
}
}
}
function areas() {
var grandeArea = $('#grandeArea').val();
$.ajax({
type: 'POST',
url: '{{ route('area.consulta') }}',
data: 'id='+grandeArea ,
headers:
{
'X-CSRF-TOKEN': $('meta[name="
csrf
-
token
"]').attr('content')
},
success: (dados) => {
if (dados.length > 0) {
if($('#oldArea').val() == null || $('#oldArea').val() == ""){
var option = '<option selected disabled>-- Área --</option>';
}
$.each(dados, function(i, obj) {
if($('#oldArea').val() != null && $('#oldArea').val() == obj.id){
option += '<option selected value="
' + obj.id + '
">' + obj.nome + '</option>';
}else{
option += '<option value="
' + obj.id + '
">' + obj.nome + '</option>';
}
})
} else {
var option = "
<
option
selected
disabled
>--
Área
--</
option
>
";
}
$('#area').html(option).show();
subareas();
},
error: (data) => {
console.log(data);
}
})
}
</script>
@endsection
resources/views/avaliador/listarTrabalhos.blade.php
View file @
904d3e3e
...
...
@@ -55,7 +55,7 @@
<
tbody
>
@
foreach
(
$trabalhos
as
$trabalho
)
<
tr
>
<
td
>
{{
$trabalho
->
titulo
}}
</
td
>
<
td
style
=
"max-width:100px; overflow-x:hidden; text-overflow:ellipsis"
>
{{
$trabalho
->
titulo
}}
</
td
>
<
td
style
=
"text-align: center"
>
{{
$trabalho
->
created_at
->
format
(
'd/m/Y'
)
}}
</
td
>
<
td
style
=
"text-align: center"
>
{{
--
--
}}
...
...
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