Skip to content

GitLab

Commit 58e0cf1e authored by PedroLopesUPE's avatar PedroLopesUPE
Browse files

Merge branch 'main' into dev-joao-pdf_generator

parents 7d88ca9b 40ac23f1
Show whitespace changes
Inline Side-by-side
resources/views/pad/avaliacao/tarefas_ensino.blade.php
View file @ 58e0cf1e
@extends('layouts.main')
@php
use App\Models\Util\Status;
@endphp
@section('title', 'Ensino')
@section('header')
@include('layouts.header', [
......@@ -76,13 +80,32 @@
<div class="card">
<h5 class="card-header">{{$avaliacao->tarefa->getDescricaoAtividade()}} ({{$avaliacao->tarefa->cod_atividade}})</h5>
<div class="card-body">
<div class="card-header mb-4">
<p class="fw-bold"> Atividade </p>
<ul>
@foreach($avaliacao->tarefa->avaliable_attributes as $key => $attribute)
<li> <span class="fw-bold ">{{ $key }} </span><span class="card-text">{{ $avaliacao->tarefa->$attribute }}</span><br> </li>
@endforeach
@if($avaliacao->status !== Status::REPROVADO)
<li> <span class="fw-bold">Status: </span> {{$avaliacao->getStatusAsText()}} </li>
@endif
</ul>
</div>
@if($avaliacao->status == Status::REPROVADO)
<div class="card-header mb-4">
<p class="fw-bold"> Avaliação </p>
<ul>
<li><span class="fw-bold">Descrição:</span> {{ $avaliacao->descricao }} </li>
<li><span class="fw-bold">Hora de Reajuste:</span> {{ $avaliacao->horas_reajuste }} h </li>
<li><span class="fw-bold">Status:</span> {{$avaliacao->getStatusAsText()}} </li>
</ul>
</div>
@endif
<span class="fw-bold">Status: </span> {{$avaliacao->getStatusAsText()}}
<div class="card-header">
@if($avaliacao->status == 3)
<div style="width: 100%;" class="btns-avaliar d-flex justify-content-end">
......@@ -125,6 +148,8 @@
@endif
</div>
</div>
</div><br>
@endforeach
......
resources/views/pad/avaliacao/tarefas_extensao.blade.php
View file @ 58e0cf1e
@extends('layouts.main')
@php
use App\Models\Util\Status;
@endphp
@section('title', 'Ensino')
@section('header')
@include('layouts.header', [
......@@ -78,14 +82,31 @@
<div class="card-body">
<div class="card-header mb-4">
<p class="fw-bold"> Atividade </p>
<ul>
@foreach($avaliacao->tarefa->avaliable_attributes as $key => $attribute)
<li> <span class="fw-bold ">{{ $key }} </span><span class="card-text">{{ $avaliacao->tarefa->$attribute }}</span><br> </li>
@endforeach
@if($avaliacao->status !== Status::REPROVADO)
<li> <span class="fw-bold">Status: </span> {{$avaliacao->getStatusAsText()}} </li>
@endif
</ul>
</div>
<span class="fw-bold">Status: </span> {{$avaliacao->getStatusAsText()}}
@if($avaliacao->status == Status::REPROVADO)
<div class="card-header mb-4">
<p class="fw-bold"> Avaliação </p>
<ul>
<li><span class="fw-bold">Descrição:</span> {{ $avaliacao->descricao }} </li>
<li><span class="fw-bold">Hora de Reajuste:</span> {{ $avaliacao->horas_reajuste }} h </li>
<li><span class="fw-bold">Status:</span> {{$avaliacao->getStatusAsText()}} </li>
</ul>
</div>
@endif
<div class="card-header">
@if($avaliacao->status == 3)
<div style="width: 100%;" class="btns-avaliar d-flex justify-content-end">
<button
......@@ -125,6 +146,7 @@
</form>
</div>
@endif
</div>
</div>
</div><br>
......
resources/views/pad/avaliacao/tarefas_gestao.blade.php
View file @ 58e0cf1e
@extends('layouts.main')
@php
use App\Models\Util\Status;
@endphp
@section('title', 'Ensino')
@section('header')
@include('layouts.header', [
......@@ -78,14 +82,31 @@
<div class="card-body">
<div class="card-header mb-4">
<p class="fw-bold"> Atividade </p>
<ul>
@foreach($avaliacao->tarefa->avaliable_attributes as $key => $attribute)
<li> <span class="fw-bold ">{{ $key }} </span><span class="card-text">{{ $avaliacao->tarefa->$attribute }}</span><br> </li>
@endforeach
@if($avaliacao->status !== Status::REPROVADO)
<li> <span class="fw-bold">Status: </span> {{$avaliacao->getStatusAsText()}} </li>
@endif
</ul>
</div>
<span class="fw-bold">Status: </span> {{$avaliacao->getStatusAsText()}}
@if($avaliacao->status == Status::REPROVADO)
<div class="card-header mb-4">
<p class="fw-bold"> Avaliação </p>
<ul>
<li><span class="fw-bold">Descrição:</span> {{ $avaliacao->descricao }} </li>
<li><span class="fw-bold">Hora de Reajuste:</span> {{ $avaliacao->horas_reajuste }} h </li>
<li><span class="fw-bold">Status:</span> {{$avaliacao->getStatusAsText()}} </li>
</ul>
</div>
@endif
<div class="card-header">
@if($avaliacao->status == 3)
<div style="width: 100%;" class="btns-avaliar d-flex justify-content-end">
<button
......@@ -125,6 +146,7 @@
</form>
</div>
@endif
</div>
</div>
</div><br>
......
resources/views/pad/avaliacao/tarefas_pesquisa.blade.php
View file @ 58e0cf1e
@extends('layouts.main')
@php
use App\Models\Util\Status;
@endphp
@section('title', 'Ensino')
@section('header')
@include('layouts.header', [
......@@ -78,13 +82,31 @@
<div class="card-body">
<div class="card-header mb-4">
<p class="fw-bold"> Atividade </p>
<ul>
@foreach($avaliacao->tarefa->avaliable_attributes as $key => $attribute)
<li> <span class="fw-bold ">{{ $key }} </span><span class="card-text">{{ $avaliacao->tarefa->$attribute }}</span><br> </li>
@endforeach
@if($avaliacao->status !== Status::REPROVADO)
<li> <span class="fw-bold">Status: </span> {{$avaliacao->getStatusAsText()}} </li>
@endif
</ul>
</div>
<span class="fw-bold">Status: </span> {{$avaliacao->getStatusAsText()}}
@if($avaliacao->status == Status::REPROVADO)
<div class="card-header mb-4">
<p class="fw-bold"> Avaliação </p>
<ul>
<li><span class="fw-bold">Descrição:</span> {{ $avaliacao->descricao }} </li>
<li><span class="fw-bold">Hora de Reajuste:</span> {{ $avaliacao->horas_reajuste }} h </li>
<li><span class="fw-bold">Status:</span> {{$avaliacao->getStatusAsText()}} </li>
</ul>
</div>
@endif
<div class="card-header">
@if($avaliacao->status == 3)
<div style="width: 100%;" class="btns-avaliar d-flex justify-content-end">
......@@ -125,7 +147,7 @@
</form>
</div>
@endif
</div>
</div>
</div><br>
@endforeach
......
storage/app/.gitignore 100644 → 100755
View file @ 58e0cf1e
File mode changed from 100644 to 100755
storage/app/public/.gitignore 100644 → 100755
View file @ 58e0cf1e
File mode changed from 100644 to 100755
storage/framework/.gitignore 100644 → 100755
View file @ 58e0cf1e
File mode changed from 100644 to 100755
storage/framework/cache/.gitignore 100644 → 100755
View file @ 58e0cf1e
File mode changed from 100644 to 100755
storage/framework/cache/data/.gitignore 100644 → 100755
View file @ 58e0cf1e
File mode changed from 100644 to 100755
storage/framework/sessions/.gitignore 100644 → 100755
View file @ 58e0cf1e
File mode changed from 100644 to 100755
storage/framework/testing/.gitignore 100644 → 100755
View file @ 58e0cf1e
File mode changed from 100644 to 100755
storage/framework/views/.gitignore 100644 → 100755
View file @ 58e0cf1e
File mode changed from 100644 to 100755
storage/logs/.gitignore 100644 → 100755
View file @ 58e0cf1e
File mode changed from 100644 to 100755
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