Merge remote-tracking branch 'community/2.6' into community-patch-2021-07-21

Eder Soares
2 parents 58137534 3b7837c3
Showing 2 changed files with 14 additions and 1 deletions Show diff stats
ieducar/modules/Api/Views/ReportController.php
src/Reports/Contracts/TeacherReportCard.php
 <?php
+use iEducar\Reports\Contracts\TeacherReportCard;
+
 require_once 'Reports/Reports/ReportCardReport.php';
 require_once 'Reports/Reports/TeacherReportCardReport.php';
@@ -105,7 +107,7 @@ class ReportController extends ApiCoreController
     protected function getBoletimProfessor()
     {
         if ($this->canGetBoletimProfessor()) {
-            $boletimProfessorReport = new TeacherReportCardReport();
+            $boletimProfessorReport = app(TeacherReportCard::class);
             $boletimProfessorReport->addArg('ano', (int)$this->getRequest()->ano);
             $boletimProfessorReport->addArg('instituicao', (int)$this->getRequest()->instituicao_id);
@@ -121,6 +123,9 @@ class ReportController extends ApiCoreController
             $configuracoes = new clsPmieducarConfiguracoesGerais();
             $configuracoes = $configuracoes->detalhe();
+            $modelo = $configuracoes['modelo_boletim_professor'];
+
+            $boletimProfessorReport->addArg('modelo', $modelo);
             $boletimProfessorReport->addArg('linha', 0);
             $boletimProfessorReport->addArg('SUBREPORT_DIR', config('legacy.report.source_path'));
@@ -0,0 +1,8 @@
+<?php
+
+namespace iEducar\Reports\Contracts;
+
+interface TeacherReportCard
+{
+
+}
@@ -0,0 +1,8 @@		@@ -0,0 +1,8 @@
	1	+<?php
	2	+
	3	+namespace iEducar\Reports\Contracts;
	4	+
	5	+interface TeacherReportCard
	6	+{
	7	+
	8	+}