Download as
Browse Code »

Commit fc7300bc39965d09fb425bf17a90f738d225cc6e

Authored by Lucas Schmoeller da Silva
1 parent 7420e633
Exists in master

Criado parâmetro para exibir nomenclatura da nota exame diferente 

portabilis/ieducar#123
Showing 4 changed files with 12 additions and 3 deletions   Show diff stats
ieducar/configuration/ieducar.ini
  Diff comments   View file @fc7300b
... ... @@ -61,6 +61,9 @@ app.database.port = 5433
61 61 ; Define uma url para redirecionar todas as requisições;
62 62 ; app.routes.redirect_to = /intranet/manutencao.php
63 63  
  64 +; Define a nomenclatura do exame no diario ou relatórios (0 exame, 1 conselho)
  65 +app.diario.nomenclatura_exame = 0
  66 +
64 67 ; Configurações do armazenamento de imagem amazon s3
65 68 ;app.aws.bucketname = nome do bucket
66 69 ;app.aws.awsacesskey = chave
... ...
ieducar/modules/Avaliacao/Assets/Javascripts/Diario.js
  Diff comments   View file @fc7300b
... ... @@ -12,6 +12,8 @@ var DELETE_LABEL = '';
12 12  
13 13 var SEARCH_ORIENTATION = '';
14 14  
  15 +var nomenclatura_exame = '';
  16 +
15 17 // funcoes usados pelo modulo Frontend/Process.js
16 18 var onClickSelectAllEvent = false;
17 19 var onClickActionEvent = false;
... ... @@ -501,6 +503,8 @@ function setTableSearchDetails($tableSearchDetails, dataDetails) {
501 503 $linha.appendTo($tableSearchDetails);
502 504 $tableSearchDetails.show();
503 505  
  506 + nomenclatura_exame = dataDetails.nomenclatura_exame;
  507 +
504 508 //dataDetails.opcoes_notas = safeSortArray(dataDetails.opcoes_notas);
505 509 $tableSearchDetails.data('details', dataDetails);
506 510 }
... ... @@ -716,8 +720,8 @@ function updateComponenteCurricularHeaders($targetElement, $tagElement) {
716 720 $tagElement.clone().addClass('center').html('Nota').appendTo($targetElement);
717 721  
718 722 if ($tableSearchDetails.data('details').quantidade_etapas == $j('#etapa').val()){
719   - $tagElement.clone().addClass('center').html('Nota exame').appendTo($targetElement);
720   - $tagElement.clone().addClass('center').html(safeUtf8Decode('Nota necessária no exame')).appendTo($targetElement);
  723 + $tagElement.clone().addClass('center').html('Nota '+nomenclatura_exame).appendTo($targetElement);
  724 + $tagElement.clone().addClass('center').html(safeUtf8Decode('Nota necessária no '+nomenclatura_exame)).appendTo($targetElement);
721 725 }
722 726 }
723 727  
... ...
ieducar/modules/Avaliacao/Views/DiarioApiController.php
  Diff comments   View file @fc7300b
... ... @@ -1009,6 +1009,8 @@ class DiarioApiController extends ApiCoreController
1009 1009 $itensRegra['quantidade_etapas'] = $this->serviceBoletim()->getOption('etapas');
1010 1010 }
1011 1011  
  1012 + $itensRegra['nomenclatura_exame'] = ($GLOBALS['coreExt']['Config']->app->diario->nomenclatura_exame == 0 ? 'exame' : 'conselho');
  1013 +
1012 1014 return $itensRegra;
1013 1015 }
1014 1016  
... ...
ieducar/modules/Portabilis/Assets/Version.php
  Diff comments   View file @fc7300b
... ... @@ -4,7 +4,7 @@
4 4 usado pelo metodos loadJavascript e loadStylesheet do helper Portabilis_View_Helper_Application */
5 5  
6 6 class Portabilis_Assets_Version {
7   - const VERSION = '7';
  7 + const VERSION = '8';
8 8 }
9 9  
10 10 ?>
... ...