Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

fix/misalignment on the report screen #310

Merged
merged 6 commits into from
May 19, 2023
Merged

fix/misalignment on the report screen #310

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
913c73f
fix: height, padding and container buttons
ByteCarlos May 19, 2023
1f5243a
fix: height buttons and text change
ByteCarlos May 19, 2023
6ca8be7
refactor: update TAG version
ByteCarlos May 19, 2023
a646e82
Merge branch 'dev' into fix/misalignment-on-the-report-screen
ByteCarlos May 19, 2023
ff00ca9
refactor: update TAG version
ByteCarlos May 19, 2023
2fabe68
Merge branch 'dev' into fix/misalignment-on-the-report-screen
igorgoncalves May 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
# Atualizações

## [Versão 3.21.47]
- Espaçamento dos botões na tela de relatórios foi corrigido

## [Versão 3.21.46]
- adicionada a opção outros no select de instituição de ensino superior

## [Versão 3.20.45]
- Corrigido o erro na exclusão de professor quando não há dados nas tabelas

Expand Down
3 changes: 1 addition & 2 deletions config.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
defined('YII_DEBUG') or define('YII_DEBUG', true);
// defined('YII_DEBUG') or define('YII_DEBUG', false);

define("TAG_VERSION", '3.21.46');

define("TAG_VERSION", '3.21.47');

define("YII_VERSION", Yii::getVersion());
define("BOARD_MSG", '<div class="alert alert-success">Novas atualizações no TAG. Confira clicando <a class="changelog-link" href="?r=admin/changelog">aqui</a>.</div>');
Expand Down
3 changes: 2 additions & 1 deletion css/reports.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
display: inline-flex;
align-items: center;
width: 35%;
height: auto;
height: 100px;
padding: 20px 30px;
background: #FAFAFE;
border-radius: 5px;
Expand All @@ -36,6 +36,7 @@
@media (max-width: 1440px) {
.report-box-container {
width: 50%;
margin-left: 10px !important;
}
}

Expand Down
12 changes: 7 additions & 5 deletions themes/default/views/reports/index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@

<a href="<?php echo Yii::app()->createUrl('reports/electronicdiary') ?>" target="_blank" rel="noopener">

<button type="button" class="report-box-container">
<button type="button" class="report-box-container" style="padding-left: 25px;">
<div class="pull-left" style="margin-right: 20px;">
<img src="<?php echo Yii::app()->theme->baseUrl; ?>/img/reportsIcon/electronicdiary.svg" />
<!-- <div class="t-icon-schedule report-icon"></div> -->
Expand All @@ -200,7 +200,7 @@
<span class="subtitle">Avaliação do aluno no trimestre</span>
</div>
</button>
<button type="button" class="report-box-container quarterly-follow-up" data-toggle="modal" data-target="#quarterly-follow-up" target="_blank">
<button type="button" class="report-box-container quarterly-follow-up" data-toggle="modal" data-target="#quarterly-follow-up" target="_blank" style="margin-left:15px;padding-left: 35px;">
<div class="pull-left" style="margin-right: 20px;">
<img src="<?php echo Yii::app()->theme->baseUrl; ?>/img/reportsIcon/student_monitoring.svg" alt="student_monitoring" />
<!-- <div class="t-icon-schedule report-icon"></div> -->
Expand All @@ -211,7 +211,7 @@
</div>
</button>

<button type="button" class="report-box-container evaluation-follow-up" data-toggle="modal" data-target="#evaluation-follow-up-students" target="_blank">
<button type="button" class="report-box-container evaluation-follow-up" data-toggle="modal" data-target="#evaluation-follow-up-students" target="_blank" style="padding-left: 35px;">
<div class="pull-left" style="margin-right: 20px;">
<img src="<?php echo Yii::app()->theme->baseUrl; ?>/img/reportsIcon/monitoring_report.svg" alt="student_monitoring" />
<!-- <div class="t-icon-schedule report-icon"></div> -->
Expand Down Expand Up @@ -247,8 +247,8 @@
<!-- <div class="t-icon-schedule report-icon"></div> -->
</div>
<div class="pull-left">
<span class="title">Relação componente curricular/eixo por docente</span><br>
<span class="subtitle">Informações do docente e componente curricular/eixo ministrado em cada turma</span>
<span class="title">Relação componente curricular por docente</span><br>
<span class="subtitle">Docente e componente curricular ministrado em cada turma</span>
</div>
</button>
</a>
Expand Down Expand Up @@ -705,8 +705,10 @@
<script>
var containerFollowUp = $('.quarterly-follow-up');
var containerEvaluation = $('.evaluation-follow-up');
var containerBoxOut = $('.container-box');
containerFollowUp.appendTo('.student-report-container');
containerEvaluation.appendTo('.student-report-container');
containerBoxOut.appendTo('.main');
</script>
<?php

Expand Down