Skip to content

GitLab

Unverified Commit 8547bd21 authored by Alisson Albuquerque's avatar Alisson Albuquerque Committed by GitHub
Browse files

Merge pull request #2 from alissonalbuquerque/task/implement_dropdown 

Task/implement_dropdown - Atualização de Layout e refatoação de pad-ensino
parents 40390e35 da1ae912
Hide whitespace changes
Inline Side-by-side
resources/views/layouts/guest.blade.php
View file @ 8547bd21
...@@ -4,13 +4,11 @@ ...@@ -4,13 +4,11 @@
<head> <head>
<title>Avaliação de Desempanho Docente - PAD</title> <title>Avaliação de Desempanho Docente - PAD</title>
<!-- Meta tags Obrigatórias -->
<meta charset="utf-8" /> <meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" /> <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" />
<!-- Principal CSS do Bootstrap --> @include('components.frontend-libs')
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/css/bootstrap.min.css"
integrity="sha384-MCw98/SFnGE8fJT3GXwEOngsV7Zt27NXFoaoApmYm81iuXoPkFOJwJ8ERdknLPMO" crossorigin="anonymous" />
<!-- Estilos customizados para esse template --> <!-- Estilos customizados para esse template -->
<link rel="stylesheet" href="{{ asset('css/auth.css') }}" /> <link rel="stylesheet" href="{{ asset('css/auth.css') }}" />
...@@ -51,17 +49,5 @@ ...@@ -51,17 +49,5 @@
</div> </div>
</footer> </footer>
<!-- Option 1: Bootstrap Bundle with Popper -->
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/js/bootstrap.bundle.min.js"
integrity="sha384-MrcW6ZMFYlzcLA8Nl+NtUVF0sA7MsXsP1UyJoMp4YLEuNSfAP+JcXn/tWtIaxVXM" crossorigin="anonymous">
</script>
<script src="https://cdn.jsdelivr.net/npm/@popperjs/core@2.9.2/dist/umd/popper.min.js"
integrity="sha384-IQsoLXl5PILFhosVNubq5LC7Qb9DXgDA9i+tQ8Zj3iwWAwPtgFTxbJ8NT4GN1R8p" crossorigin="anonymous">
</script>
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/js/bootstrap.min.js"
integrity="sha384-cVKIPhGWiC2Al4u+LWgxfKTRIcfu0JTxR+EQDz/bgldoEyl4H0zUF0QKbrJ0EcQF" crossorigin="anonymous">
</script>
</body> </body>
</html> </html>
resources/views/layouts/main.blade.php
View file @ 8547bd21
...@@ -8,19 +8,9 @@ ...@@ -8,19 +8,9 @@
<title>{{ config('app.name') }} - @yield('title')</title> <title>{{ config('app.name') }} - @yield('title')</title>
<!-- Styles --> @include('components.frontend-libs')
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/css/bootstrap.min.css"
integrity="sha384-MCw98/SFnGE8fJT3GXwEOngsV7Zt27NXFoaoApmYm81iuXoPkFOJwJ8ERdknLPMO" crossorigin="anonymous" />
<!-- Icons -->
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.8.1/font/bootstrap-icons.css">
<!-- Font Awesome -->
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.15.4/css/all.css"
integrity="sha384-DyZ88mC6Up2uqS4h/KRgHuoeGwBcD4Ng9SiP4dIRy0EXTlnuz47vAwmeGwVChigm" crossorigin="anonymous" />
<link rel="stylesheet" href="{{ asset('css/dashboard.css') }}"> <link rel="stylesheet" href="{{ asset('css/dashboard.css') }}">
<link rel="stylesheet" href="{{ asset('css/forms.css') }}">
</head> </head>
<body> <body>
...@@ -48,16 +38,6 @@ ...@@ -48,16 +38,6 @@
Copyright &copy;2022. Universidade de Pernambuco - Todos os direitos reservados Copyright &copy;2022. Universidade de Pernambuco - Todos os direitos reservados
</footer> </footer>
<!-- Optional JavaScript -->
<!-- jQuery first, then Popper.js, then Bootstrap JS -->
<script src="https://code.jquery.com/jquery-3.1.1.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.9/umd/popper.min.js"
integrity="sha384-ApNbgh9B+Y1QKtv3Rn7W3mgPxhU9K/ScQsAP7hUibX39j7fakFPskvXusvfa0b4Q" crossorigin="anonymous">
</script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js"
integrity="sha384-JZR6Spejh4U02d8jOt6vLEHfe/JQGiRRSQQxSfFWpi1MquVdAyjUar5+76PVCmYl" crossorigin="anonymous">
</script>
@if (Auth::user()->isTypeAdmin()) @if (Auth::user()->isTypeAdmin())
@include('layouts.user-jquery.jquery_admin') @include('layouts.user-jquery.jquery_admin')
@endif @endif
...@@ -74,8 +54,6 @@ ...@@ -74,8 +54,6 @@
@include('layouts.user-jquery.jquery_coordinator') @include('layouts.user-jquery.jquery_coordinator')
@endif @endif
<script src="{{ asset('js/forms.js') }}"></script>
@section('scripts-jquery') @section('scripts-jquery')
@show @show
</body> </body>
......
resources/views/pad/dimensao/ensino.blade.php
View file @ 8547bd21
@extends('layouts.main') @extends('layouts.main')
@section('title', 'Unidade') @section('title', 'Ensino')
@section('header') @section('header')
@include('layouts.header', [ @include('layouts.header', [
'user' => Auth::user(), 'user' => Auth::user(),
...@@ -13,147 +13,109 @@ ...@@ -13,147 +13,109 @@
@endsection @endsection
@section('body') @section('body')
<div class="px-4 md:px-10 py-4 md:py-7 bg-gray-100 rounded-tl-lg rounded-tr-lg">
<h5 class="border-bottom">1 - ENSINO (AULAS EM COMPONENTES CURRICULARES)</h5>
</div>
<hr>
<div class="container"> <div class="container">
<div class="comp" id="compbord">
<div class="row clearfix"> @include('components.pad.dropdown-eixo', ['divs' => $divs])
<div class="col-md-12 table-responsive">
<table class="table table-borderless table-hover table-sortable" id="tab_logic"> <div id="ensino_aulas" class="">
<thead> <div>
<tr> <div class="mb-3">
<th class="text-center"> <h3 class="h3"> Ensino - Aulas </h3 class="h3">
CÓDIGO ATIVIDADE
</th>
<th class="text-center">
COMPONENTE CURRICULAR
(NOME DO COMPONENTE)
</th>
<th class="text-center">
CURSO
</th>
<th class="text-center">
NÍVEL
</th>
<th class="text-center">
MODALIDADE
</th>
<th class="text-center">
CH TOTAL
</th>
<th class="text-center">
CH SEMANAL
</th>
<th class="text-center"
style="border-top: 1px solid #ffffff; border-right: 1px solid #ffffff;">
</th>
</tr>
</thead>
<tbody>
@foreach ($ensinoAulas as $ensinoAula)
<tr>
<td class="text-center">
{{ $ensinoAula->cod_atividade }}
</td>
<td class="text-center">
{{ $ensinoAula->disciplina->name }}
</td>
<td class="text-center">
{{ $ensinoAula->curso->name }}
</td>
<td class="text-center">
{{ $ensinoAula::listNivel($ensinoAula->nivel) }}
</td>
<td class="text-center">
{{ $ensinoAula::listModalidade($ensinoAula->modalidade) }}
</td>
<td class="text-center">
{{ $ensinoAula->ch_semanal }}
</td>
<td class="text-center">
{{ $ensinoAula->ch_total }}
</td>
<td class="text-center">
@include('components.buttons.btn-delete', ['route' => route('ensino_aula_delete', ['id' => $ensinoAula->id])]);
</td>
</tr>
@endforeach
</tbody>
</table>
</div> </div>
</div> <form action="" method="post" id="ensino_aulas-form" class="">
<form method="POST" action="{{ route('ensino_aula_create') }}" class="form-add-new-dimencao">
@csrf <div class="row">
@method('POST')
<div class="form-group" style="width: 200px;"> <input type="hidden" name="pad_id" value={{1}}>
<label for="inputNameProfessor">CÓDIGO ATIVIDADE</label>
<input type="text" name="cod_atividade" class="form-control" disable id="cod_atividade" <div class="mb-3 col-sm-2">
placeholder="Automomático " disabled> <label class="form-label" for="ensino_aulas-cod_atividade">Cód. Atividade</label>
</div><br> <input class="form-control" type="text" name="ensino_aulas-cod_atividade" id="ensino_aulas-cod_atividade" disabled readonly>
<div class="form-row"> </div>
<div class="form-group col-md-6"> <div class="mb-3 col-sm-5">
<label for="selectCurso">CURSO</label> <label class="form-label" for="ensino_aulas-componente_curricular">Componente Curricular</label>
<select name="curso_id" class="custom-select mr-sm-2" id="curso_id" required <input class="form-control" type="text" name="ensino_aulas-componente_curricular" id="ensino_aulas-componente_curricular">
aria-label="Default select example"> </div>
<option selected>Selecionar Curso</option> <div class="mb-3 col-sm-5">
@foreach ($cursos as $curso) <label class="form-label" for="ensino_aulas-curso">Curso</label>
<option value="{{ $curso->id }}"> {{ $curso->name }}</option> <input class="form-control" type="text" name="ensino_aulas-curso" id="ensino_aulas-curso">
@endforeach </div>
</select> <div class="mb-3 col-sm-3">
</div> <label class="form-label" for="ensino_aulas-nivel">Nível</label>
<div class="form-group col-md-6"> <select class="form-select" name="ensino_aulas-nivel" id="ensino_aulas-nivel">
<label for="selectCurso">COMPONENTE CURRICULAR</label> <option selected value="0">Selecione um Nível</option>
<select name="componente_curricular" class="custom-select mr-sm-2" id="componente_curricular" <option value="1">Graduação</option>
aria-label="Default select example" required> <option value="2">Pós-Graduação</option>
<option></option> </select>
</select> </div>
</div>
<div class="form-group col-md-6"> <div class="mb-3 col-sm-3">
<label for="selectCurso">NÍVEL</label> <label class="form-label" for="ensino_aulas-modalidade">Modalidade</label>
<select class="custom-select mr-sm-2" name="nivel" id="nivel" aria-label="Default select example" required> <select class="form-select" name="ensino_aulas-modalidade" id="ensino_aulas-modalidade">
<option disabled selected value> Selecionar </option> <option selected value="0">Selecione uma Modalidade</option>
@foreach ($niveis as $key => $nivel) <option value="1">Presencial</option>
<option value="{{ $key }}"> {{ $nivel }}</option> <option value="2">Remoto</option>
@endforeach </select>
</div>
</select>
</div> <div class="mb-3 col-sm-2">
<div class="form-group col-md-6"> <label class="form-label" for="ensino_aulas-ch_total">CH. Total</label>
<label for="selectCurso">Modalidade</label> <input class="form-control" type="number" name="ensino_aulas-ch_total" id="ensino_aulas-ch_total">
<select class="custom-select mr-sm-2" name="modalidade" id="modalidade" required </div>
aria-label="Default select example">
<option disabled selected value> Selecionar</option> <div class="mb-3 col-sm-2">
@foreach ($modalidades as $key => $modalidade) <label class="form-label" for="ensino_aulas-ch_semanal">CH. Semanal</label>
<option value="{{ $key }}"> {{ $modalidade }}</option> <input class="form-control" type="number" name="ensino_aulas-ch_semanal" id="ensino_aulas-ch_semanal">
@endforeach </div>
</select>
</div>
<div class="form-group col-md-3">
<label for="selectCurso">CARGA HORÁRIA SEMANAL</label>
<input type="number" name="ch_semanal" id="ch_semanal" required>
</div> </div>
<div class="form-group col-md-2">
<label for="selectCurso">CARGA HORÁRIA TOTAL</label> <div class="mt-1 text-end">
<input type="number" name="ch_total" id="ch_semanal" required> <button type="submit" class="btn btn-success rounded">Cadastrar</button>
</div> </div>
<input type="hidden" value="{{ $pad_id }}" name="pad_id" id="pad_id">
</div> </form>
<button type="submit" class="btn btn-success"> Salvar</button> </div>
<div>
LISTA
</div>
</div>
<div id="ensino_coordenacao_disciplina" class="">
<h1> ensino_coordenacao_disciplina <h1>
</div>
<div id="ensino_orientacao" class="">
<h1>ensino_orientacao</h1>
</div>
<div id="ensino_supervisao" class="">
<h1>ensino_supervisao</h1>
</div>
<div id="ensino_atendimento_discente" class="">
<h1>ensino_atendimento_discente</h1>
</div>
<div id="ensino_projeto" class="">
<h1>ensino_projeto</h1>
</div>
</form> <div id="ensino_participacao" class="">
<h1>ensino_participacao</h1>
</div> </div>
<div id="ensino_coordenacao_docente" class="">
<h1>ensino_coordenacao_docente</h1>
</div>
</div> </div>
@endsection @endsection
@section('scripts-jquery') @section('scripts-jquery')
@include('layouts.pad-ensino-jquery.ensino-aula') @include('layouts.pad-ensino-jquery.ensino-aula')
@include('components.pad.dropdown-eixo-script', ['divs' => $divs])
@endsection @endsection
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