From 9f4a406112d21a601a20ee312348e8e0b79d8d43 Mon Sep 17 00:00:00 2001
From: Ronan Tavares Camargo <ronan.camargo@centralit.com.br>
Date: Tue, 24 May 2016 16:15:54 -0300
Subject: [PATCH] Atendimento #4999

---
 cit-core/src/main/java/br/com/centralit/framework/util/UtilDate.java                            | 6 ++++++
 cit-portal-web/src/main/webapp/assets/js/angular/custom/directive/LabelInputDecimalDirective.js | 3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/cit-core/src/main/java/br/com/centralit/framework/util/UtilDate.java b/cit-core/src/main/java/br/com/centralit/framework/util/UtilDate.java
index f016f7a..6422729 100644
--- a/cit-core/src/main/java/br/com/centralit/framework/util/UtilDate.java
+++ b/cit-core/src/main/java/br/com/centralit/framework/util/UtilDate.java
@@ -838,6 +838,12 @@ public class UtilDate {
 		calendar.setTime(data);
 		return calendar;
 	}
+	
+	public static Calendar getCalendarDoTimestamp(Timestamp timestamp){
+		Calendar calendar = Calendar.getInstance();
+		calendar.setTimeInMillis(timestamp.getTime());
+		return calendar;
+	}
 
 	public static boolean isDataDoMesAtual(Date data) {
 		return isDataDoMes(data, getCalendarDaDataAtual().get(2));
diff --git a/cit-portal-web/src/main/webapp/assets/js/angular/custom/directive/LabelInputDecimalDirective.js b/cit-portal-web/src/main/webapp/assets/js/angular/custom/directive/LabelInputDecimalDirective.js
index f6582ec..ffe67bc 100644
--- a/cit-portal-web/src/main/webapp/assets/js/angular/custom/directive/LabelInputDecimalDirective.js
+++ b/cit-portal-web/src/main/webapp/assets/js/angular/custom/directive/LabelInputDecimalDirective.js
@@ -13,6 +13,7 @@ citApp.directive("labelInputDecimal", ["$translate", function($translate) {
 			model :	"=ngModel",
 			form : "=form",
 			eventoChange : "&ngEventoChange",
+			eventoKeyup : "&ngEventoKeyup",
 			eventoBlur: "=ngEventoBlur",
 			precisao : "@ngPrecisao",
 			labelAlertTooltip: '@',
@@ -24,7 +25,7 @@ citApp.directive("labelInputDecimal", ["$translate", function($translate) {
 		restrict : 'E',
 		template :  "<div class='form-group' ng-class=\"{'has-error': form[id].$error.required && (!form[id].$pristine || form.$submitted)}\">" +
 					"	<label for='{{id}}' class='control-label' ng-if='labelRender'><translate>{{label}}</translate> <span class='red' ng-show='obrigatorio'>*</span> <i ng-if='obrigatorio' ng-show='form[id].$error.required && (!form[id].$pristine || form.$submitted)' class='fa fa-warning red' tooltip='{{labelAlertTooltipCopy}}' tooltip-placement='top'></i> <i ng-if='labelInfoTooltipRender' class='fa fa-info-circle blue' tooltip='{{labelInfoTooltip}}' tooltip-placement='top'></i> <i ng-if='labelQuestionTooltipRender' class='fa fa-question-circle green' tooltip='{{labelQuestionTooltip}}' tooltip-placement='top'></i></label>"+
-					" 	<input type='text' class='form-control' ng-change='eventoChange()' ng-blur='eventoBlur(this)' ng-keydown='removeModel($event)' id='{{id}}' name='{{id}}' ng-model='model' ng-disabled='disabled' maxlength='{{maxlength ? maxlength : 23}}' ng-required='obrigatorio' ui-number-mask='{{precisao}}'/>" +
+					" 	<input type='text' class='form-control' ng-keyup='eventoKeyup()' ng-change='eventoChange()' ng-blur='eventoBlur(this)' ng-keydown='removeModel($event)' id='{{id}}' name='{{id}}' ng-model='model' ng-disabled='disabled' maxlength='{{maxlength ? maxlength : 23}}' ng-required='obrigatorio' ui-number-mask='{{precisao}}'/>" +
 					"</div>",
 
 		controller: ['$scope', '$element', '$attrs', function ($scope, $element, $attrs) {
--
libgit2 0.21.2