From fc7300bc39965d09fb425bf17a90f738d225cc6e Mon Sep 17 00:00:00 2001
From: Lucas Schmoeller da Silva <lucasschmoellerdasilva@gmail.com>
Date: Wed, 18 Mar 2015 18:01:09 -0300
Subject: [PATCH] Criado parâmetro para exibir nomenclatura da nota exame diferente

---
 ieducar/configuration/ieducar.ini                       | 3 +++
 ieducar/modules/Avaliacao/Assets/Javascripts/Diario.js  | 8 ++++++--
 ieducar/modules/Avaliacao/Views/DiarioApiController.php | 2 ++
 ieducar/modules/Portabilis/Assets/Version.php           | 2 +-
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/ieducar/configuration/ieducar.ini b/ieducar/configuration/ieducar.ini
index c7ec400..18e8510 100644
--- a/ieducar/configuration/ieducar.ini
+++ b/ieducar/configuration/ieducar.ini
@@ -61,6 +61,9 @@ app.database.port     = 5433
 ; Define uma url para redirecionar todas as requisições;
 ; app.routes.redirect_to = /intranet/manutencao.php
 
+; Define a nomenclatura do exame no diario ou relatórios (0 exame, 1 conselho)
+app.diario.nomenclatura_exame  = 0
+
 ; Configurações do armazenamento de imagem amazon s3
 ;app.aws.bucketname = nome do bucket
 ;app.aws.awsacesskey = chave
diff --git a/ieducar/modules/Avaliacao/Assets/Javascripts/Diario.js b/ieducar/modules/Avaliacao/Assets/Javascripts/Diario.js
index f049ffa..34d2c19 100644
--- a/ieducar/modules/Avaliacao/Assets/Javascripts/Diario.js
+++ b/ieducar/modules/Avaliacao/Assets/Javascripts/Diario.js
@@ -12,6 +12,8 @@ var DELETE_LABEL = '';
 
 var SEARCH_ORIENTATION = '';
 
+var nomenclatura_exame = '';
+
 // funcoes usados pelo modulo Frontend/Process.js
 var onClickSelectAllEvent = false;
 var onClickActionEvent    = false;
@@ -501,6 +503,8 @@ function setTableSearchDetails($tableSearchDetails, dataDetails) {
   $linha.appendTo($tableSearchDetails);
   $tableSearchDetails.show();
 
+  nomenclatura_exame = dataDetails.nomenclatura_exame;
+
   //dataDetails.opcoes_notas = safeSortArray(dataDetails.opcoes_notas);
   $tableSearchDetails.data('details', dataDetails);
 }
@@ -716,8 +720,8 @@ function updateComponenteCurricularHeaders($targetElement, $tagElement) {
     $tagElement.clone().addClass('center').html('Nota').appendTo($targetElement);
 
     if ($tableSearchDetails.data('details').quantidade_etapas == $j('#etapa').val()){
-      $tagElement.clone().addClass('center').html('Nota exame').appendTo($targetElement);
-      $tagElement.clone().addClass('center').html(safeUtf8Decode('Nota necessária no exame')).appendTo($targetElement);
+      $tagElement.clone().addClass('center').html('Nota '+nomenclatura_exame).appendTo($targetElement);
+      $tagElement.clone().addClass('center').html(safeUtf8Decode('Nota necessária no '+nomenclatura_exame)).appendTo($targetElement);
     }
   }
 
diff --git a/ieducar/modules/Avaliacao/Views/DiarioApiController.php b/ieducar/modules/Avaliacao/Views/DiarioApiController.php
index 87e0948..b949ad2 100644
--- a/ieducar/modules/Avaliacao/Views/DiarioApiController.php
+++ b/ieducar/modules/Avaliacao/Views/DiarioApiController.php
@@ -1009,6 +1009,8 @@ class DiarioApiController extends ApiCoreController
       $itensRegra['quantidade_etapas'] = $this->serviceBoletim()->getOption('etapas');
     }
 
+    $itensRegra['nomenclatura_exame'] = ($GLOBALS['coreExt']['Config']->app->diario->nomenclatura_exame == 0 ? 'exame' : 'conselho');
+
     return $itensRegra;
   }
 
diff --git a/ieducar/modules/Portabilis/Assets/Version.php b/ieducar/modules/Portabilis/Assets/Version.php
index 583ddf8..ad7f6e8 100644
--- a/ieducar/modules/Portabilis/Assets/Version.php
+++ b/ieducar/modules/Portabilis/Assets/Version.php
@@ -4,7 +4,7 @@
    usado pelo metodos loadJavascript e loadStylesheet do helper Portabilis_View_Helper_Application */
 
 class Portabilis_Assets_Version {
-  const VERSION = '7';
+  const VERSION = '8';
 }
 
 ?>
--
libgit2 0.21.2