Commit 65f90d20349b3c40c8161393e7caa5e85ebcf394
1 parent
52b40ace
Exists in
master
[Redmine Atendimento #4187]Linha acompanhamento contrato
Showing
2 changed files
with
10 additions
and
5 deletions
Show diff stats
cit-contratos-web/src/main/webapp/assets/js/angular/custom/controller/VisaoContratoController.js
| ... | ... | @@ -280,19 +280,21 @@ citApp.controller('VisaoContratoController', ['$scope', |
| 280 | 280 | }; |
| 281 | 281 | |
| 282 | 282 | contratoEventos.eventos.push(eventoDataInicial); |
| 283 | - | |
| 283 | + var finalContratoValid = false; | |
| 284 | 284 | if (isPeriodoValido(ultimaDataFinal, aditivo.dataFim)) { |
| 285 | 285 | var tipoEvento = {descricao : $translate.instant('CONTRATOS.LABEL.DATA_VIGENCIA_FINAL_ADITIVO')}; |
| 286 | 286 | if (ultimaDataFinal == $scope.contrato.dataVigenciaFinal) { |
| 287 | + finalContratoValid = true; | |
| 287 | 288 | tipoEvento = {descricao : $translate.instant('CONTRATOS.LABEL.DATA_VIGENCIA_FINAL_CONTRATO')}; |
| 288 | 289 | colorIcon = ""; |
| 289 | 290 | } |
| 290 | 291 | var eventoDataFinalAnterior = { |
| 291 | - dataVigencia : true, | |
| 292 | + dataVigencia : true, | |
| 292 | 293 | dataEvento : ultimaDataFinal, |
| 293 | 294 | tipoEvento : tipoEvento, |
| 294 | 295 | iconClass : eventoClasses["DATA_FINAL"].icon, |
| 295 | - colorClass : colorIcon | |
| 296 | + colorClass : colorIcon, | |
| 297 | + finalContrato : finalContratoValid | |
| 296 | 298 | }; |
| 297 | 299 | contratoEventos.eventos.push(eventoDataFinalAnterior); |
| 298 | 300 | $scope.contrato.ultimaDataVigenciaFinal = aditivo.dataFim; | ... | ... |
cit-contratos-web/src/main/webapp/html/visaoContrato/visaoContrato.html
| ... | ... | @@ -74,12 +74,15 @@ |
| 74 | 74 | <div class="timeline-item-month-start-text" ng-if="evento.monthStart">{{evento.dataEvento}}</div> |
| 75 | 75 | <div class="timeline-item-month-start-line" ng-if="evento.monthStart"></div> |
| 76 | 76 | |
| 77 | - <i ng-if="!evento.monthStart && !evento.dataInicial && !evento.dataVigencia" class="fa fa-{{evento.iconClass}} {{evento.colorClass}}" ng-click="mostrarEvento(evento);" style="cursor: pointer;"></i> | |
| 78 | - <div class="timeline-item" ng-if="evento.dataVigencia"> | |
| 77 | + <i ng-if="!evento.monthStart && !evento.dataInicial && !evento.dataVigencia && !evento.finalContrato" class="fa fa-{{evento.iconClass}} {{evento.colorClass}}" ng-click="mostrarEvento(evento);" style="cursor: pointer;"></i> | |
| 78 | + <div class="timeline-item" ng-if="evento.dataVigencia && !evento.finalContrato"> | |
| 79 | 79 | <div class="timeline-start-end-point-icon timeline-end-point-icon" ng-click="mostrarEventoContrato(evento);" style="cursor: pointer;"> |
| 80 | 80 | <i class="fa fa-{{evento.iconClass}} {{evento.colorClass}}"></i> |
| 81 | 81 | </div> |
| 82 | 82 | </div> |
| 83 | + <i ng-if="evento.finalContrato" ng-click="mostrarEventoContrato(evento);" style="cursor: pointer;" class="fa fa-{{evento.iconClass}} {{evento.colorClass}}"></i> | |
| 84 | + <div class="timeline-start-end-point-icon timeline-end-point-icon" style="margin-left: -25px" ng-if="evento.finalContrato">{{evento.dataEvento}}</div> | |
| 85 | + | |
| 83 | 86 | <i ng-if="evento.dataInicial" ng-click="mostrarEventoContrato(evento);" style="cursor: pointer;" class="fa fa-{{evento.iconClass}} {{evento.colorClass}}"></i> |
| 84 | 87 | <div class="timeline-start-end-point-icon timeline-end-point-icon" style="margin-left: -25px" ng-if="evento.dataInicial">{{evento.dataEvento}}</div> |
| 85 | 88 | </div><!-- .timeline-item-icon --> | ... | ... |