Download as
Browse Code »

Commit 22995915e5b468dc3de8e60a568f49efcc21e231

Authored by THIAGO VIEIRA DI COIMBRA ROCHA
1 parent 9cd24777
Exists in master

redmine #4170 Adicionado o botao 'Concluir'. Adicionada regra que verifica se a … 

…entrada que esta sendo editada tem ou nao uma dataContabil para definir a renderizacao ou nao dos botoes 'Concluir', 'Conlcuir e descontabilizar'.
Showing 1 changed file with 5 additions and 5 deletions   Show diff stats
citgrp-patrimonio-web/src/main/webapp/html/entrada/entradaEdit.html
  Diff comments   View file @2299591
@@ -11,14 +11,14 @@ @@ -11,14 +11,14 @@
11 <i class="fa fa-save green"></i> <translate>PATRIMONIO.LABEL.CONCLUIR_ENTRADA</translate><span class="fa fa-caret-down icon-on-right"></span> 11 <i class="fa fa-save green"></i> <translate>PATRIMONIO.LABEL.CONCLUIR_ENTRADA</translate><span class="fa fa-caret-down icon-on-right"></span>
12 </button> 12 </button>
13 <ul class="dropdown-menu-center dropdown-menu dropdown-caret" role="menu"> 13 <ul class="dropdown-menu-center dropdown-menu dropdown-caret" role="menu">
14 - <li>  
15 - <a href="#void" ng-click="saveOrUpdateContabilizar(false)" ><i class="fa fa-file-text orange"></i><translate>PATRIMONIO.LABEL.CONCLUIR_ENTRADA_BTN</translate></a> 14 + <li ng-show="entrada.dataContabil === null">
  15 + <a href="#void" ng-click="saveOrUpdateContabilizar(false)" ><i class="fa fa-save orange"></i><translate>PATRIMONIO.LABEL.CONCLUIR_ENTRADA_BTN</translate></a>
16 </li> 16 </li>
17 <li> 17 <li>
18 - <a href="#void" ng-click="saveOrUpdateContabilizar(true)" ><i class="fa fa-file-text green"></i><translate>PATRIMONIO.LABEL.CONCLUIR_E_CONTABILIZAR_ENTRADA</translate></a> 18 + <a href="#void" ng-click="saveOrUpdateContabilizar(true)" ><i class="fa fa-save green"></i><translate>PATRIMONIO.LABEL.CONCLUIR_E_CONTABILIZAR_ENTRADA</translate></a>
19 </li> 19 </li>
20 - <li>  
21 - <a href="#void" ng-click="saveOrUpdateContabilizar(false)" ><i class="fa fa-file-text-o orange"></i><translate>PATRIMONIO.LABEL.CONCLUIR_E_DESCONTABILIZAR_ENTRADA</translate></a> 20 + <li ng-show="entrada.dataContabil !== null">
  21 + <a href="#void" ng-click="saveOrUpdateContabilizar(false)" ><i class="fa fa-save orange"></i><translate>PATRIMONIO.LABEL.CONCLUIR_E_DESCONTABILIZAR_ENTRADA</translate></a>
22 </li> 22 </li>
23 </ul> 23 </ul>
24 </div> 24 </div>