Merge pull request #409 from portabilis/reports

Patch de ajustes para uso de relatórios
portabilis · Sep 28, 2018 · fd0142f · fd0142f
2 parents 241b244 + 1c8a696
commit fd0142f
Show file tree

Hide file tree

Showing 11 changed files with 1,002 additions and 752 deletions.
diff --git a/composer.json b/composer.json
@@ -11,10 +11,10 @@
   "require": {
     "php": "7.0.*",
     "cocur/slugify": "^3.1",
+    "cossou/jasperphp": "^2.7",
     "gilbitron/php-simplecache": "^1.4",
     "google/recaptcha": "~1.1",
     "honeybadger-io/honeybadger-php": "^0.4.1",
-    "portabilis/jasperphp": "v1.2.0",
     "robmorgan/phinx": "v0.8.1",
     "swiftmailer/swiftmailer": "^6.0"
   },

diff --git a/composer.lock b/composer.lock
diff --git a/ieducar/configuration/ieducar.ini.sample b/ieducar/configuration/ieducar.ini.sample
@@ -98,9 +98,11 @@ report.logo_file_name = brasil.png
 report.show_error_details = true
 
 ; Define a fabrica de relatórios padrão
-;report.default_factory = Portabilis_Report_ReportFactoryPHPJasperXML
 report.default_factory = Portabilis_Report_ReportFactoryPHPJasper
 
+; Define o diretório dos arquivos fontes dos relatórios
+report.source_path = /home/portabilis/ieducar/ieducar/modules/Reports/ReportSources
+
 ; Configurações da entidade (instituicao)
 ; define o nome da entidade a ser exibido no topo
 app.entity.name = Prefeitura Municipal de Portabilis Tecnologia