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/report button #273

Merged
merged 4 commits into from
Apr 27, 2023
Merged

Fix/report button #273

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e6a09ce
correção da imagem de impressora dos relátorios
Tori-IPTI Apr 25, 2023
8a0f958
retirada da imagem de impressora.png
Tori-IPTI Apr 25, 2023
5d7b0a5
substituido as imagens pela fonte de icone em turma e escola
Tori-IPTI Apr 26, 2023
ea62e0b
Merge branch 'dev' into fix/Report_button
igorgoncalves Apr 27, 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
2 changes: 1 addition & 1 deletion sass/css/main.css
View file
Open in desktop

Large diffs are not rendered by default.

64 changes: 0 additions & 64 deletions sass/css/main.map
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions sass/scss/_button.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@
margin-right: $spaceMedium;
cursor: pointer;

span{
margin: $spaceEmpty $spaceXXXSmall $spaceEmpty $spaceEmpty;
font-size: $FontSizeHeadingTitle1;
}
&:hover,
&--active {
text-decoration: none;
Expand Down
Binary file removed themes/default/img/impressora.png
View file
Open in desktop
Binary file not shown.
18 changes: 12 additions & 6 deletions themes/default/views/classroom/_form.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -460,37 +460,43 @@ class="btn-action single glyphicons circle_question_mark"
<row class="reports">
<div class="reports_cards">
<a class="t-button-secondary" rel="noopener" target="_blank" href="<?= @Yii::app()->createUrl('classroom/batchupdatetransport', array('id' => $modelClassroom->id)); ?>">
<img alt="impressora" src="<?php echo Yii::app()->theme->baseUrl; ?>/img/impressora.svg" class="img_cards" />
<!-- <img alt="impressora" src="<?php echo Yii::app()->theme->baseUrl; ?>/img/Impressora.svg" class="img_cards" /> -->
<span class="t-icon-printer"></span>
<?php echo Yii::t('default', 'Atualizar transporte') ?>
</a>
</div>
<div class="reports_cards">
<a class="t-button-secondary" rel="noopener" target="_blank" href="<?php echo Yii::app()->createUrl('classroom/batchupdatetotal', array('id' => $modelClassroom->id)) ?>">
<img alt="impressora" src="<?php echo Yii::app()->theme->baseUrl; ?>/img/impressora.svg" class="img_cards" />
<!-- <img alt="impressora" src="<?php echo Yii::app()->theme->baseUrl; ?>/img/Impressora.svg" class="img_cards" /> -->
<span class="t-icon-printer"></span>
<?php echo Yii::t('default', 'Atualização em Lote') ?>
</a>
</div>
<div class="reports_cards">
<a class="t-button-secondary" rel="noopener" target="_blank" href="<?php echo Yii::app()->createUrl('reports/enrollmentperclassroomreport', array('id' => $modelClassroom->id)) ?>">
<img alt="impressora" src="<?php echo Yii::app()->theme->baseUrl; ?>/img/impressora.svg" class="img_cards" />
<!-- <img alt="impressora" src="<?php echo Yii::app()->theme->baseUrl; ?>/img/Impressora.svg" class="img_cards" /> -->
<span class="t-icon-printer"></span>
<?php echo Yii::t('default', 'Relatório de Matrícula') ?>
</a>
</div>
<div class="reports_cards">
<a class="t-button-secondary" rel="noopener" target="_blank" href="<?php echo Yii::app()->createUrl('reports/studentperclassroom', array('id' => $modelClassroom->id)) ?>">
<img alt="impressora" src="<?php echo Yii::app()->theme->baseUrl; ?>/img/impressora.svg" class="img_cards" />
<!-- <img alt="impressora" src="<?php echo Yii::app()->theme->baseUrl; ?>/img/Impressora.svg" class="img_cards" /> -->
<span class="t-icon-printer"></span>
<?php echo Yii::t('default', 'Lista de Alunos') ?>
</a>
</div>
<div class="reports_cards">
<a class="t-button-secondary" rel="noopener" target="_blank" href="<?php echo Yii::app()->createUrl('forms/StudentsFileForm', array('classroom_id' => $modelClassroom->id, 'type' => 1)) ?>">
<img alt="impressora" src="<?php echo Yii::app()->theme->baseUrl; ?>/img/impressora.svg" class="img_cards" />
<!-- <img alt="impressora" src="<?php echo Yii::app()->theme->baseUrl; ?>/img/Impressora.svg" class="img_cards" /> -->
<span class="t-icon-printer"></span>
<?php echo Yii::t('default', 'Fichas de Matrícula') ?>
</a>
</div>
<div class="reports_cards">
<a class="t-button-secondary" rel="noopener" target="_blank" href="<?php echo Yii::app()->createUrl('forms/AtaSchoolPerformance', array('id' => $modelClassroom->id)) ?>">
<img alt="impressora" src="<?php echo Yii::app()->theme->baseUrl; ?>/img/impressora.svg" class="img_cards" />
<!-- <img alt="impressora" src="<?php echo Yii::app()->theme->baseUrl; ?>/img/Impressora.svg" class="img_cards" /> -->
<span class="t-icon-printer"></span>
<?php echo Yii::t('default', 'Ata de Notas') ?>
</a>
</div>
Expand Down
19 changes: 13 additions & 6 deletions themes/default/views/school/_form.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2040,37 +2040,44 @@
<row class="reports">
<div class="reports_cards">
<a class="t-button-secondary" rel="noopener" target="_blank" href="<?= @Yii::app()->createUrl('school/reportsMonthlyTransaction', array('id' => $modelSchoolIdentification->inep_id, 'type' => 1)); ?>">
<img alt="impressora" src="<?php echo Yii::app()->theme->baseUrl; ?>/img/impressora.svg" class="img_cards" />
<span class="t-icon-printer"></span>
<!-- <img alt="impressora" src="<?php echo Yii::app()->theme->baseUrl; ?>/img/Impressora.svg" class="img_cards" /> -->
Movimentação Mensal Anos Iniciais
</a>
</div>
<div class="reports_cards">
<a class="t-button-secondary" rel="noopener" target="_blank" href="<?= @Yii::app()->createUrl('school/reportsMonthlyTransaction', array('id' => $modelSchoolIdentification->inep_id, 'type' => 2)); ?>">
<img alt="impressora" src="<?php echo Yii::app()->theme->baseUrl; ?>/img/impressora.svg" class="img_cards" />

<!-- <img alt="impressora" src="<?php echo Yii::app()->theme->baseUrl; ?>/img/Impressora.svg" class="img_cards" /> -->
<span class="t-icon-printer"></span>
Movimentação Mensal Anos Finais
</a>
</div>
<div class="reports_cards">
<a class="t-button-secondary" rel="noopener" target="_blank" href="<?= @Yii::app()->createUrl('school/reportsMonthlyTransaction', array('id' => $modelSchoolIdentification->inep_id, 'type' => 3)); ?>">
<img alt="impressora" src="<?php echo Yii::app()->theme->baseUrl; ?>/img/impressora.svg" class="img_cards" />
<span class="t-icon-printer"></span>
<!-- <img alt="impressora" src="<?php echo Yii::app()->theme->baseUrl; ?>/img/Impressora.svg" class="img_cards" /> -->
Movimentação Mensal Educação Infantil
</a>
</div>
<div class="reports_cards">
<a class="t-button-secondary" rel="noopener" target="_blank" href="<?= @Yii::app()->createUrl('school/reports', array('id' => $modelSchoolIdentification->inep_id)); ?>">
<img alt="impressora" src="<?php echo Yii::app()->theme->baseUrl; ?>/img/impressora.svg" class="img_cards" />
<span class="t-icon-printer"></span>
<!-- <img alt="impressora" src="<?php echo Yii::app()->theme->baseUrl; ?>/img/Impressora.svg" class="img_cards" /> -->
Resumo Mensal de Frequência
</a>
</div>
<div class="reports_cards">
<a class="t-button-secondary" rel="noopener" target="_blank" href="<?= @Yii::app()->createUrl('school/record', array('id' => $modelSchoolIdentification->inep_id, 'type' => 1)); ?>">
<img alt="impressora" src="<?php echo Yii::app()->theme->baseUrl; ?>/img/impressora.svg" class="img_cards" />
<span class="t-icon-printer"></span>
<!-- <img alt="impressora" src="<?php echo Yii::app()->theme->baseUrl; ?>/img/Impressora.svg" class="img_cards" /> -->
Histórico Ensino Regular
</a>
</div>
<div class="reports_cards">
<a class="t-button-secondary" rel="noopener" target="_blank" href="<?= @Yii::app()->createUrl('school/record', array('id' => $modelSchoolIdentification->inep_id, 'type' => 2)); ?>">
<img alt="impressora" src="<?php echo Yii::app()->theme->baseUrl; ?>/img/impressora.svg" class="img_cards" />
<span class="t-icon-printer"></span>
<!-- <img alt="impressora" src="<?php echo Yii::app()->theme->baseUrl; ?>/img/Impressora.svg" class="img_cards" /> -->
Histórico Ensino EJA
</a>
</div>
Expand Down