From ae96230b455df8ff6291ff46c588a6c21c3c373a Mon Sep 17 00:00:00 2001 From: Lucas Schmoeller da Silva Date: Tue, 26 Nov 2013 14:30:03 -0200 Subject: [PATCH] Retirando do formulário modelo de históricos não disponíveis --- ieducar/modules/Reports/Reports/HistoricoEscolarReport.php | 7 +------ ieducar/modules/Reports/Views/HistoricoEscolarController.php | 11 +---------- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/ieducar/modules/Reports/Reports/HistoricoEscolarReport.php b/ieducar/modules/Reports/Reports/HistoricoEscolarReport.php index 214ea61..c56aa80 100644 --- a/ieducar/modules/Reports/Reports/HistoricoEscolarReport.php +++ b/ieducar/modules/Reports/Reports/HistoricoEscolarReport.php @@ -49,18 +49,13 @@ class HistoricoEscolarReport extends Portabilis_Report_ReportCore { function templateName() { - $modelos = array(1 => 'portabilis_historico_escolar_9anos', - 2 => 'portabilis_historico_escolar', - 3 => 'portabilis_historico_escolar_series_anos'); - - return $modelos[$this->args['modelo']]; + return 'portabilis_historico_escolar_9anos'; } function requiredArgs() { $this->addRequiredArg('instituicao'); $this->addRequiredArg('escola'); $this->addRequiredArg('aluno'); - $this->addRequiredArg('modelo'); } } diff --git a/ieducar/modules/Reports/Views/HistoricoEscolarController.php b/ieducar/modules/Reports/Views/HistoricoEscolarController.php index 91d71b8..b011719 100644 --- a/ieducar/modules/Reports/Views/HistoricoEscolarController.php +++ b/ieducar/modules/Reports/Views/HistoricoEscolarController.php @@ -55,13 +55,6 @@ class HistoricoEscolarController extends Portabilis_Controller_ReportCoreControl $this->inputsHelper()->dynamic(array('instituicao', 'escola')); $this->inputsHelper()->simpleSearchAluno(); - $resources = array(1 => '9 anos', - 2 => '8 anos', - 3 => 'Série/Anos'); - - $options = array('label' => 'Modelo', 'resources' => $resources, 'value' => 1); - $this->inputsHelper()->select('modelo', $options); - // carrega javascript HistoricoEscolar.js para listar alunos de todas as escolas $this->loadResourceAssets($this->getDispatcher()); } @@ -73,9 +66,7 @@ class HistoricoEscolarController extends Portabilis_Controller_ReportCoreControl function beforeValidation() { $this->report->addArg('instituicao', (int)$this->getRequest()->ref_cod_instituicao); $this->report->addArg('escola', (int)$this->getRequest()->ref_cod_escola); - $this->report->addArg('aluno', (int)$this->getRequest()->aluno_id); - $this->report->addArg('aluno', (int)$this->getRequest()->aluno_id); - $this->report->addArg('modelo', (int)$this->getRequest()->modelo); + $this->report->addArg('aluno', (int)$this->getRequest()->aluno_id); } } -- libgit2 0.21.2