Skip to content

GitLab

Unverified Commit 8c91b6e2 authored by GuilhermeGz's avatar GuilhermeGz Committed by GitHub
Browse files

Merge branch 'lmts-ufape:master' into master

parents a0558452 8779fb28
master carl-branch dependabot/composer/dompdf/dompdf-1.2.2 dependabot/composer/guzzlehttp/guzzle-6.5.8 dependabot/composer/guzzlehttp/psr7-1.8.5 dependabot/composer/symfony/http-kernel-4.4.50 dependabot/npm_and_yarn/axios-0.21.2 dependabot/npm_and_yarn/decode-uri-component-0.2.2 dependabot/npm_and_yarn/express-4.18.2 dependabot/npm_and_yarn/json5-and-json5-2.2.3 dependabot/npm_and_yarn/loader-utils-and-webpack-cli-1.4.2 dependabot/npm_and_yarn/minimist-and-mkdirp-1.2.8 dependabot/npm_and_yarn/qs-and-express-6.11.0 excluir_projeto_submetido updates_mar
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 140 additions and 164 deletions
+140 -164
app/Area.php
View file @ 8c91b6e2
......@@ -40,4 +40,8 @@ class Area extends Model
public function grandeArea() {
return $this->belongsTo('App\GrandeArea', 'grande_area_id');
}
public function subAreas() {
return $this->hasMany('App\SubArea');
}
}
resources/views/administrador/index.blade.php
View file @ 8c91b6e2
......@@ -3,168 +3,43 @@
@section('content')
<div class="container">
<div class="row justify-content-center titulo-menu">
<h4>Perfil de Administrador</h4>
</div>
<div class="row justify-content-center d-flex align-items-center">
<div class="col-sm-3 d-flex justify-content-center ">
<a href="{{ route('admin.editais') }}" style="text-decoration:none; color: inherit;">
<div class="card text-center card-menu">
<div class="card-body d-flex justify-content-center">
<div class="container">
<div class="row titulo-card-menu">
<div class="col-md-12">
<h2 style="padding-top:15px">Editais</h2>
</div>
</div>
@php
$eventos = \App\Evento::all();
$quantAberta = 0;
$quantEncerrada = 0;
$hoje = today();
foreach ($eventos as $evento) {
if ($evento->fimSubmissao >= $hoje) {
$quantAberta++;
} else {
$quantEncerrada++;
}
}
@endphp
<div class="info-card">
<div class="row" style="text-align: left;">
<div class="col-md-12">
Total: {{$quantAberta + $quantEncerrada}}
</div>
</div>
<div class="row" style="text-align: left;">
<div class="col-md-12">
Aberto: {{$quantAberta}}
</div>
</div>
<div class="row" style="text-align: left;">
<div class="col-md-12">
Encerrado: {{$quantEncerrada}}
</div>
</div>
</div>
<div class="row justify-content-center mb-4">
<div class="col col-sm-4 col-md-4 col-lg-4 col-xl-4 text-center">
<div class="titulo-menu">
<h4>Área do Administrador</h4>
</div>
</div>
</div>
<div class="row justify-content-around mt-5 mb-5 row-cols-1 row-cols-sm-2 row-cols-md-3 ">
<div class="col-sm-4 col-md-4 col-lg-4 col-xl-4 align-self-center mt-2 text-center ">
<a href="{{ route('admin.editais') }}" style="text-decoration:none; color: inherit;">
<i class="fas fa-folder-open fa-5x"></i>
</a>
<p class="mt-2"> Editais</p>
</div>
<div class="col-sm-3 d-flex justify-content-center">
<a href="{{ route('admin.naturezas') }}" style="text-decoration:none; color: inherit;">
<div class="card text-center card-menu">
<div class="container">
<div class="row titulo-card-menu">
<div class="card-body d-flex justify-content-center">
<h2 style="padding-top:15px">Natureza</h2>
</div>
</div>
<div class="row">
<div class="col-md-12">
<h6>Nº total de naturezas:</h6>
</div>
</div>
@php
$naturezas = \App\Natureza::count();
@endphp
<div class="row">
<div class="col-md-12">
<h1 class="quant-titulo-card">{{$naturezas}}</h1>
</div>
</div>
</div>
</div>
<div class="col-sm-4 col-md-4 col-lg-4 col-xl-4 align-self-center mt-2 text-center">
<a href="{{ route('admin.usuarios') }}" style="text-decoration:none; color: inherit;">
<i class="fas fa-user-circle fa-5x"></i>
</a>
<p class="mt-2"> Usuários</p>
</div>
<div class="col-sm-3 d-flex justify-content-center">
<div class="col-sm-4 col-md-4 col-lg-4 col-xl-4 align-self-center mt-2 text-center">
<a href="{{ route('grandearea.index') }}" style="text-decoration:none; color: inherit;">
<div class="card text-center card-menu">
<div class="container">
<div class="row titulo-card-menu">
<div class="card-body d-flex justify-content-center">
<h2 style="padding-top:15px">Áreas</h2>
</div>
</div>
<div class="row">
<div class="col-md-12">
<h6>Nº total de áreas:</h6>
</div>
</div>
@php
$grandeAreas = \App\GrandeArea::count();
$areas = \App\Area::count();
$grandeAreas = \App\SubArea::count();
@endphp
<div class="row">
<div class="col-md-12">
<h1 class="quant-titulo-card">{{$grandeAreas + $areas + $grandeAreas}}</h1>
</div>
</div>
</div>
</div>
<i class="fas fa-project-diagram fa-5x"></i>
</a>
</div>
<div class="col-sm-3 d-flex justify-content-center">
<a href="{{ route('admin.usuarios') }}" style="text-decoration:none; color: inherit;">
<div class="card text-center card-menu">
<div class="container">
<div class="row titulo-card-menu">
<div class="card-body d-flex justify-content-center">
<h2 style="padding-top:15px">Usuários</h2>
</div>
</div>
<div class="row">
<div class="col-md-12">
<h6>Nº total de usuários:</h6>
</div>
</div>
@php
$usuarios = \App\User::count();
@endphp
<div class="row">
<div class="col-md-12">
<h1 class="quant-titulo-card">{{$usuarios}}</h1>
</div>
</div>
<p class="mt-2"> Áreas</p>
</div>
</div>
<div class="col-md-12 justify-content-around d-flex align-items-center">
{{-- <a href="{{ route('admin.naturezas') }}" style="text-decoration:none; color: inherit;">
</a>
</div>
<br>
<div class="col-sm-3 d-flex justify-content-center m-4">
<a href="{{ route('admin.showProjetos') }}" style="text-decoration:none; color: inherit;">
<div class="card text-center card-menu">
<div class="container">
<div class="row titulo-card-menu">
<div class="card-body d-flex justify-content-center">
<h2 style="padding-top:15px">Projetos</h2>
</div>
</div>
<div class="row">
<div class="col-md-12">
<h6>Nº total de projetos:</h6>
</div>
</div>
@php
$trabalhos = \App\Trabalho::count();
@endphp
<div class="row">
<div class="col-md-12">
<h1 class="quant-titulo-card">{{$trabalhos}}</h1>
</div>
</div>
</div>
</div>
</a>
</div>
</a> --}}
</div>
......
resources/views/layouts/app.blade.php
View file @ 8c91b6e2
......@@ -87,6 +87,10 @@
color: white;
margin: 0.5rem;
}
.font-size-naturezas {
font-size: 1.2rem;
}
</style>
</head>
......
resources/views/naturezas/grandeArea/collapse-area.blade.php 0 → 100644
View file @ 8c91b6e2
<div id="accordion2">
@foreach ($grandeArea->areas as $area)
<h5 class="mb-0 ml-2">
<button class="btn btn-link mb-0 font-size-naturezas" data-toggle="collapse" data-target="#collapse{{ $area->id }}" aria-expanded="true" aria-controls="collapseOne" >
<i class="fas fa-sort-down fa-1x"></i>{{ $area->nome }}
</button>
</h5>
<div id="collapse{{ $area->id }}" class="collapse" aria-labelledby="headingOne" data-parent="#accordion2">
@include('naturezas.grandeArea.collapse-sub-area')
</div>
@endforeach
</div>
\ No newline at end of file
resources/views/naturezas/grandeArea/collapse-grande-area.blade.php 0 → 100644
View file @ 8c91b6e2
<div id="accordion1">
<div class="card">
<div class="row">
<div class="col-11 ">
<h2 class="m-2">Grande Áreas</h2>
</div>
<div class="col-1 text-center">
<a href="{{route('grandearea.criar')}}" >
<i class="fas fa-plus-circle fa-2x m-2" style="color: green"></i>
</a>
</div>
</div>
</div>
@foreach ($grandesAreas as $grandeArea)
{{-- @dd($grandeArea->areas) --}}
<div class="card">
<h5 class="mb-0">
<div class="row">
<div class="col-11">
<button class="btn btn-link font-size-naturezas" data-toggle="collapse" data-target="#collapse{{ $grandeArea->id }}" aria-expanded="true" aria-controls="collapseOne" >
<i class="fas fa-sort-down fa-1x"></i> {{ $grandeArea->nome }}
</button>
</div>
<div class="col-1 text-center">
<div class=" dropright mt-2 text-center">
<a id="options" class="dropdown-toggle " data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
{{-- <i class="fas fa-cogs"></i> --}}
<i class="fas fa-cog fa-1x"></i>
</a>
<div class="dropdown-menu">
<a href="{{ route('grandearea.show', ['id' => $grandeArea->id ]) }}" class="dropdown-item text-center">
Detalhes
</a>
<hr class="dropdown-hr">
<a href="{{ route('grandearea.editar', ['id' => $grandeArea->id]) }}" class="dropdown-item text-center">
Editar
</a>
<hr class="dropdown-hr">
<form method="POST" action="{{ route('grandearea.deletar', ['id' => $grandeArea->id]) }}">
{{ csrf_field() }}
<button type="submit" class="dropdown-item dropdown-item-delete text-center">
<img src="{{asset('img/icons/logo_lixeira.png')}}" alt="">
Deletar
</button>
</form>
</div>
</div>
</div>
</div>
</h5>
<div id="collapse{{ $grandeArea->id }}" class="collapse ml-3" aria-labelledby="headingOne" data-parent="#accordion1">
@include('naturezas.grandeArea.collapse-area')
</div>
</div>
@endforeach
</div>
\ No newline at end of file
resources/views/naturezas/grandeArea/collapse-sub-area.blade.php 0 → 100644
View file @ 8c91b6e2
<div id="accordion3">
@forelse ($area->subAreas as $subArea)
<div class="mt-0 ml-5">
{{ $subArea->nome }}
</div>
@empty
<div class="mt-0 ml-5">
Não há sub-áreas
</div>
@endforelse
</div>
\ No newline at end of file
resources/views/naturezas/grandeArea/index.blade.php
View file @ 8c91b6e2
......@@ -18,15 +18,24 @@
Voltar
</a>
</div>
<div class="col-sm-9" style="text-align: center;">
{{-- <div class="col-sm-9" style="text-align: center;">
<h2 class="titulo-table">{{ __('Grandes áreas') }}</h2>
</div>
<div class="col-sm-2">
<a href="{{route('grandearea.criar')}}" class="btn btn-info" style="float: right;">{{ __('Criar grande área') }}</a>
</div>
</div> --}}
</div>
<hr>
<table class="table table-bordered">
<div class="row" >
<div class="col" >
@include('naturezas.grandeArea.collapse-grande-area')
</div>
</div>
{{-- <table class="table table-bordered">
<thead>
<tr>
<th scope="col">Nome</th>
......@@ -68,7 +77,7 @@
</tr>
@endforeach
</tbody>
</table>
</table> --}}
</div>
@endsection
\ No newline at end of file
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