Skip to content

GitLab

Commit debdab41 authored by Gabriel-31415's avatar Gabriel-31415
Browse files

Merge branch 'carlos' of https://github.com/lmts-ufape/submeta into admin 

 merge
parents fe4aa415 cee2e0a1
Hide whitespace changes
Inline Side-by-side
composer.lock
View file @ debdab41
......@@ -586,16 +586,16 @@
},
{
"name": "laravel/framework",
"version": "v6.18.16",
"version": "v6.18.18",
"source": {
"type": "git",
"url": "https://github.com/laravel/framework.git",
"reference": "73f18a6bc58fb91aa83925161db25aa3674b73e9"
"reference": "9e5226ecc28f960cba1bd38b6d1d82a52e072dc3"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laravel/framework/zipball/73f18a6bc58fb91aa83925161db25aa3674b73e9",
"reference": "73f18a6bc58fb91aa83925161db25aa3674b73e9",
"url": "https://api.github.com/repos/laravel/framework/zipball/9e5226ecc28f960cba1bd38b6d1d82a52e072dc3",
"reference": "9e5226ecc28f960cba1bd38b6d1d82a52e072dc3",
"shasum": ""
},
"require": {
......@@ -606,7 +606,7 @@
"ext-mbstring": "*",
"ext-openssl": "*",
"league/commonmark": "^1.3",
"league/flysystem": "^1.0.8",
"league/flysystem": "^1.0.34",
"monolog/monolog": "^1.12|^2.0",
"nesbot/carbon": "^2.0",
"opis/closure": "^3.1",
......@@ -729,7 +729,7 @@
"framework",
"laravel"
],
"time": "2020-05-26T14:31:44+00:00"
"time": "2020-06-02T22:32:07+00:00"
},
{
"name": "laravel/tinker",
......@@ -1163,16 +1163,16 @@
},
{
"name": "nikic/php-parser",
"version": "v4.4.0",
"version": "v4.5.0",
"source": {
"type": "git",
"url": "https://github.com/nikic/PHP-Parser.git",
"reference": "bd43ec7152eaaab3bd8c6d0aa95ceeb1df8ee120"
"reference": "53c2753d756f5adb586dca79c2ec0e2654dd9463"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/bd43ec7152eaaab3bd8c6d0aa95ceeb1df8ee120",
"reference": "bd43ec7152eaaab3bd8c6d0aa95ceeb1df8ee120",
"url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/53c2753d756f5adb586dca79c2ec0e2654dd9463",
"reference": "53c2753d756f5adb586dca79c2ec0e2654dd9463",
"shasum": ""
},
"require": {
......@@ -1211,7 +1211,7 @@
"parser",
"php"
],
"time": "2020-04-10T16:34:50+00:00"
"time": "2020-06-03T07:24:19+00:00"
},
{
"name": "opis/closure",
......
resources/views/administrador/editais.blade.php
View file @ debdab41
......@@ -80,6 +80,7 @@
<th scope="col">Nome do Edital</th>
<th scope="col">Status</th>
<th scope="col">Data de Criação</th>
<th scope="col">Baixar edital</th>
<th scope="col">Opção</th>
</tr>
</thead>
......@@ -93,22 +94,24 @@
</td>
<td></td>
<td>{{ $evento->created_at }}</td>
<td style="text-align: center">
<a href="{{ route('baixar.edital', ['id' => $evento->id]) }}">
<img src="{{asset('img/icons/file-download-solid.svg')}}" width="15px">
</a>
</td>
<td>
<div class="btn-group dropright dropdown-options">
<a id="options" class="dropdown-toggle " data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
{{-- <img src="{{asset('img/icons/ellipsis-v-solid.svg')}}" style="width:8px"> --}}
</a>
<div class="dropdown-menu">
<a href="{{ route('baixar.edital', ['id' => $evento->id]) }}" class="dropdown-item" style="text-align: center;">
Baixar edital
</a>
<a href="{{ route('projetos.edital', ['id' => $evento->id]) }}" class="dropdown-item" style="text-align: center">
Submeter projeto
Projetos submetidos
</a>
<a href="" class="dropdown-item" style="text-align: center">
Visualizar resultado
</a>
<a href="" class="dropdown-item" style="text-align: center">
{{-- <a href="" class="dropdown-item" style="text-align: center">
Recurso ao resultado
</a>
<a href="" class="dropdown-item" style="text-align: center">
......@@ -116,7 +119,7 @@
</a>
<a href="" class="dropdown-item" style="text-align: center">
Resultado final
</a>
</a> --}}
</div>
</div>
</td>
......
resources/views/evento/submeterTrabalho.blade.php
View file @ debdab41
......@@ -248,7 +248,7 @@
<div class="row" style="margin-top:20px">
<div class="col-sm-12">
<div id="participantes">
<br><h5>Dados do participante</h5>
<div class="row">
<div class="col-sm-5">
<label>Nome Completo</label>
......@@ -258,91 +258,55 @@
<label>E-mail</label>
<input type="email" style="margin-bottom:10px" class="form-control emailCoautor" name="emailParticipante[]" placeholder="E-mail" required>
</div>
<div class="col-sm-2">
<label for="funcaoParticipante" class="col-form-label">{{ __('Função:') }}</label>
<select class="form-control @error('funcaoParticipante') is-invalid @enderror" id="funcaoParticipante" name="funcaoParticipante[]">
<option value="" disabled selected hidden>-- Função --</option>
@foreach($funcaoParticipantes as $funcaoParticipante)
<option value="{{$funcaoParticipante->id}}">{{$funcaoParticipante->nome}}</option>
@endforeach
</select>
</div>
<div class="col-sm-1">
<a class="delete">
<img src="/img/icons/user-times-solid.svg" style="width:25px;margin-top:35px">
</a>
</div>
</div>
<div class="row">
<div class="col-sm-5">
<label>Nome Completo</label>
<input type="text" style="margin-bottom:10px" class="form-control emailCoautor" name="nomeParticipante[]" placeholder="Nome" required>
</div>
<div class="col-sm-4">
<label>E-mail</label>
<input type="email" style="margin-bottom:10px" class="form-control emailCoautor" name="emailParticipante[]" placeholder="E-mail" required>
</div>
<div class="col-sm-2">
<label for="funcaoParticipante" class="col-form-label">{{ __('Função:') }}</label>
<select class="form-control @error('funcaoParticipante') is-invalid @enderror" id="funcaoParticipante" name="funcaoParticipante[]">
<option value="" disabled selected hidden>-- Função --</option>
@foreach($funcaoParticipantes as $funcaoParticipante)
<option value="{{$funcaoParticipante->id}}">{{$funcaoParticipante->nome}}</option>
@endforeach
</select>
<div class="col-sm-3">
<label>Função:</label>
<select class="form-control @error('funcaoParticipante') is-invalid @enderror" id="funcaoParticipante" name="funcaoParticipante[]">
<option value="" disabled selected hidden>-- Função --</option>
@foreach($funcaoParticipantes as $funcaoParticipante)
<option value="{{$funcaoParticipante->id}}">{{$funcaoParticipante->nome}}</option>
@endforeach
</select>
</div>
<div class="col-sm-1">
<a class="delete">
<img src="/img/icons/user-times-solid.svg" style="width:25px;margin-top:35px">
</a>
</div>
</div>
</div>
<a href="#" class="btn btn-primary" id="addCoautor" style="width:100%;margin-top:10px">Participantes +</a>
</div>
</div>
{{-- Plano de Trabalho --}}
<h4 class="mt-3" >Plano de Trabalho</h4>
<div class="row" style="margin-top:20px">
<div class="col-sm-12">
<div id="planoTrabalho">
<div class="row">
<div class="col-sm-4">
<label>Titulo </label>
<input type="text" style="margin-bottom:10px" class="form-control emailCoautor" name="nomePlanoTrabalho[]" placeholder="Nome" required>
</div>
{{-- Arquivo --}}
<div class="col-sm-7">
<label for="nomeTrabalho" >Anexo</label>
<div class="input-group" >
<div class="input-group-prepend">
<span class="input-group-text" id="anexoPlanoTrabalho">Selecione um arquivo:</span>
</div>
<div class="custom-file">
<input type="file" class="custom-file-input" id="anexoPlanoTrabalho"
aria-describedby="anexoPlanoTrabalho" name="anexoPlanoTrabalho[]">
<label class="custom-file-label" id="custom-file-label" for="inputGroupFile01">O arquivo deve ser no formato PDF de até 2mb.</label>
</div>
<h5>Dados do plano de trabalho</h5>
<div class="row">
<div class="col-sm-12">
<div id="planoTrabalho">
<div class="row">
<div class="col-sm-4">
<label>Titulo </label>
<input type="text" style="margin-bottom:10px" class="form-control emailCoautor" name="nomePlanoTrabalho[]" placeholder="Nome" required>
</div>
{{-- Arquivo --}}
<div class="col-sm-7">
<label for="nomeTrabalho" >Anexo</label>
<div class="input-group" >
<div class="input-group-prepend">
<span class="input-group-text" id="anexoPlanoTrabalho">Selecione um arquivo:</span>
</div>
<div class="custom-file">
<input type="file" class="custom-file-input" id="anexoPlanoTrabalho"
aria-describedby="anexoPlanoTrabalho" name="anexoPlanoTrabalho[]">
<label class="custom-file-label" id="custom-file-label" for="inputGroupFile01">O arquivo deve ser no formato PDF de até 2mb.</label>
</div>
</div>
@error('anexoPlanoTrabalho')
<span class="invalid-feedback" role="alert" style="overflow: visible; display:block">
<strong>{{ $message }}</strong>
</span>
@enderror
</div>
<div class="col-sm-1">
<a class="delete">
<img src="/img/icons/user-times-solid.svg" style="width:25px;margin-top:35px">
</a>
</div>
</div>
@error('anexoPlanoTrabalho')
<span class="invalid-feedback" role="alert" style="overflow: visible; display:block">
<strong>{{ $message }}</strong>
</span>
@enderror
</div>
</div>
<div class="col-sm-1">
<a class="deletePlano">
<img src="/img/icons/user-times-solid.svg" style="width:25px;margin-top:35px">
</a>
</div>
</div>
</div>
</div>
<a href="#" class="btn btn-primary" id="addPlanoTrabalho" style="width:100%;margin-top:10px">Plano de Trabalho +</a>
<a href="#" class="btn btn-primary" id="addCoautor" style="width:100%;margin-top:10px">Participantes +</a>
</div>
</div>
......@@ -370,12 +334,11 @@
<script type="text/javascript">
$(function(){
$(function(){
var qtdLinhas = 1;
var qtdParticipantes = 2;
// Coautores
$('#addCoautor').click(function(e){
if(qtdParticipantes < 100){
e.preventDefault();
linha = montarLinhaInput();
......@@ -384,7 +347,6 @@
}
});
$('#addPlanoTrabalho').click(function(e){
e.preventDefault();
if(qtdLinhas < 4){
......@@ -394,7 +356,6 @@
}
});
// Exibir modalidade de acordo com a área
$("#area").change(function(){
console.log($(this).val());
......@@ -420,9 +381,7 @@
//replace the "Choose a file" label
$(this).next('#custom-file-label').html(fileName);
})
// F
$('#buttonSim').on('click',function(e){
e.preventDefault();
$('#inputEtica').prop('disabled', false);
......@@ -434,12 +393,9 @@
$('#inputJustificativa').prop('disabled', false);
console.log('button nao');
});
});
// Remover Coautor
function addModalidade(areaId){
console.log(modalidades)
$("#modalidade").empty();
......@@ -452,7 +408,8 @@
}
function montarLinhaInput(){
return "<div class="+"row"+">"+
return "<br><h5>Dados do participante</h5>" +
"<div class="+"row"+">"+
"<div class="+"col-sm-5"+">"+
"<label>Nome Completo</label>"+
"<input"+" type="+'text'+" style="+"margin-bottom:10px"+" class="+'form-control emailCoautor'+" name="+'nomeParticipante[]'+" placeholder="+"Nome"+" required>"+
......@@ -461,27 +418,20 @@
"<label>E-mail</label>"+
"<input"+" type="+'email'+" style="+"margin-bottom:10px"+" class="+'form-control emailCoautor'+" name="+'emailParticipante[]'+" placeholder="+"E-mail"+" required>"+
"</div>"+
"<div class='col-sm-2'>"+
"<label for='funcaoParticipante' class='col-form-label'>Função:</label>"+
"<select class="+"form-control @error('funcaoParticipante') is-invalid @enderror"+" id="+"funcaoParticipante"+"name="+"funcaoParticipante[]"+">"+
"<option value='' disabled selected hidden> Função </option>"+
"@foreach($funcaoParticipantes as $funcaoParticipante)"+
"<option value='{{$funcaoParticipante->id}}'>{{$funcaoParticipante->nome}}</option>"+
"@endforeach"+
"</select>"+
"</div>"+
"<div class="+"col-sm-1"+">"+
"<a class="+"delete"+">"+
"<img src="+"/img/icons/user-times-solid.svg"+" style="+"width:25px;margin-top:35px"+">"+
"</a>"+
"<div class='col-sm-3'>"+
"<label>Função:</label>"+
"<select class="+"form-control @error('funcaoParticipante') is-invalid @enderror"+" id="+"funcaoParticipante"+"name="+"funcaoParticipante[]"+">"+
"<option value='' disabled selected hidden> Função </option>"+
"@foreach($funcaoParticipantes as $funcaoParticipante)"+
"<option value='{{$funcaoParticipante->id}}'>{{$funcaoParticipante->nome}}</option>"+
"@endforeach"+
"</select>"+
"</div>"+
"</div>";
}
function montarLinhaInputPlanoTrabalho(){
return "<div class="+"row"+">"+
"</div>" +
"<h5>Dados do plano de trabalho</h5>" +
"<div class="+"row"+">"+
"<div class="+"col-sm-4"+">"+
"<label>Nome Completo</label>"+
"<label>Titulo</label>"+
"<input"+" type="+'text'+" style="+"margin-bottom:10px"+" class="+'form-control emailCoautor'+" name="+'nomePlanoTrabalho[]'+" placeholder="+"Nome"+" required>"+
"</div>"+
"<div class="+"col-sm-7" +">"+
......@@ -502,14 +452,47 @@
"<strong>{{ $message }}</strong>"+
"</span>"+
"@enderror"+
"</div>"+
"</div>"+
"<div class="+"col-sm-1"+">"+
"<a class="+"deletePlano"+">"+
"<a class="+"delete"+">"+
"<img src="+"/img/icons/user-times-solid.svg"+" style="+"width:25px;margin-top:35px"+">"+
"</a>"+
"</div>"+
"</div>";
}
// function montarLinhaInputPlanoTrabalho(){
// return "<div class="+"row"+">"+
// "<div class="+"col-sm-4"+">"+
// "<label>Nome Completo</label>"+
// "<input"+" type="+'text'+" style="+"margin-bottom:10px"+" class="+'form-control emailCoautor'+" name="+'nomePlanoTrabalho[]'+" placeholder="+"Nome"+" required>"+
// "</div>"+
// "<div class="+"col-sm-7" +">"+
// "<label for="+"nomeTrabalho"+">Anexo </label>"+
// "<div class="+"input-group"+">"+
// "<div class='input-group-prepend'>"+
// "<span class='input-group-text' id='inputGroupFileAddon01'>Selecione um arquivo:</span>"+
// "</div>"+
// "<div class='custom-file'>"+
// "<input type='file' class='custom-file-input' id='inputGroupFile01'"+
// "aria-describedby='inputGroupFileAddon01' name='anexoPlanoTrabalho[]'>"+
// "<label class='custom-file-label' id='custom-file-label' for='inputGroupFile01'>O arquivo deve ser no formato PDF de até 2mb.</label>"+
// "</div>"+
// "</div>"+
// "@error('arquivo')"+
// "<span class='invalid-feedback' role='alert' style='overflow: visible; display:block'>"+
// "<strong>{{ $message }}</strong>"+
// "</span>"+
// "@enderror"+
// "</div>"+
// "<div class="+"col-sm-1"+">"+
// "<a class="+"deletePlano"+">"+
// "<img src="+"/img/icons/user-times-solid.svg"+" style="+"width:25px;margin-top:35px"+">"+
// "</a>"+
// "</div>"+
// "</div>";
// }
</script>
@endsection
resources/views/projeto/index.blade.php
View file @ debdab41
......@@ -43,11 +43,11 @@
</a>
<div class="dropdown-menu">
<a href="" class="dropdown-item" style="text-align: center;">
Editar projeto
Editar projeto
</a>
<a href="" class="dropdown-item" style="text-align: center">
{{-- <a href="" class="dropdown-item" style="text-align: center">
Adicionar participantes
</a>
</a> --}}
<a href="" class="dropdown-item" style="text-align: center">
Recorrer
</a>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment