Commit 560f913d9b27c6e71cdefe3cea56f4ee887e768b
1 parent
73b7fe1c
Exists in
master
Redmine #5043 Validação atendimento usuário
Showing
3 changed files
with
4 additions
and
3 deletions
Show diff stats
cit-portal-api/src/main/resources/scripts-bd/postgres/v2.3.0/01-cit-portal-2.3.0-postgres.sql
| ... | ... | @@ -6,5 +6,5 @@ |
| 6 | 6 | -- Erick INICIO 23/05/2016 |
| 7 | 7 | INSERT INTO configuracaoparametrosistema(id, datacriacao, dataedicao, version, chave, valor, configuracao_id, isobrigatorio) |
| 8 | 8 | SELECT NEXTVAL('hibernate_sequence'), LOCALTIMESTAMP, LOCALTIMESTAMP, 0, 'VALIDAR_FECHAR_ABA', |
| 9 | - 'true', conf.id, false FROM configuracao conf; | |
| 9 | + 'false', conf.id, false FROM configuracao conf; | |
| 10 | 10 | -- Erick FIM 23/05/2016 |
| 11 | 11 | \ No newline at end of file | ... | ... |
cit-portal-web/src/main/webapp/assets/js/angular/custom/directive/ListViewDirective.js
| ... | ... | @@ -20,7 +20,8 @@ citApp.directive("listView", ["$translate", "$injector", "$timeout", "$filter", |
| 20 | 20 | setTotalItens : '=?setTotalItens', |
| 21 | 21 | useCustomFilterTemp : '=?useCustomFilterTemp', |
| 22 | 22 | customFilter : '&ngCustomFilter', |
| 23 | - campoMarcacao : '@ngCampoMarcacao' | |
| 23 | + campoMarcacao : '@ngCampoMarcacao', | |
| 24 | + marcarLinhaGridAtributo : '@ngMarcarLinhaGridAtributo' | |
| 24 | 25 | }, |
| 25 | 26 | replace : true, |
| 26 | 27 | restrict : 'E', | ... | ... |
cit-portal-web/src/main/webapp/assets/js/angular/custom/directive/html/listView.html
| ... | ... | @@ -119,7 +119,7 @@ |
| 119 | 119 | </div> |
| 120 | 120 | </td> |
| 121 | 121 | </tr> |
| 122 | - <tr ng-repeat-start="model in lista" ng-class="(model[campoMarcacao] != undefined && !model[campoMarcacao]) ? 'danger' : ''"> | |
| 122 | + <tr ng-repeat-start="model in lista" ng-class="(model[campoMarcacao] != undefined && !model[campoMarcacao]) ? 'danger' : '' || (model[marcarLinhaGridAtributo] != undefined && model[marcarLinhaGridAtributo]) ? 'danger' : ''"> | |
| 123 | 123 | <td ng-if="isCheckBox != undefined && isCheckBox" ng-class="text-center"> |
| 124 | 124 | <input type="checkbox" ng-checked="model.$checkedChBox" ng-click="checkboxItem(model)" ng-model="model.$checkedChBox"/> |
| 125 | 125 | </td> | ... | ... |