Download as
Browse Code »

Commit 73b7fe1c1bfbef5bd18926025d54b6442d7bf44b

Authored by Ronan Tavares Camargo
2 parents d8549a7c 9f4a4061
Exists in master

Merge branch 'tarefa-3822'

Showing 2 changed files with 8 additions and 1 deletions   Show diff stats
cit-core/src/main/java/br/com/centralit/framework/util/UtilDate.java
  Diff comments   View file @73b7fe1
... ... @@ -846,6 +846,12 @@ public class UtilDate {
846 846 calendar.setTime(data);
847 847 return calendar;
848 848 }
  849 +
  850 + public static Calendar getCalendarDoTimestamp(Timestamp timestamp){
  851 + Calendar calendar = Calendar.getInstance();
  852 + calendar.setTimeInMillis(timestamp.getTime());
  853 + return calendar;
  854 + }
849 855  
850 856 public static boolean isDataDoMesAtual(Date data) {
851 857 return isDataDoMes(data, getCalendarDaDataAtual().get(2));
... ...
cit-portal-web/src/main/webapp/assets/js/angular/custom/directive/LabelInputDecimalDirective.js
  Diff comments   View file @73b7fe1
... ... @@ -13,6 +13,7 @@ citApp.directive("labelInputDecimal", ["$translate", function($translate) {
13 13 model : "=ngModel",
14 14 form : "=form",
15 15 eventoChange : "&ngEventoChange",
  16 + eventoKeyup : "&ngEventoKeyup",
16 17 eventoBlur: "=ngEventoBlur",
17 18 precisao : "@ngPrecisao",
18 19 labelAlertTooltip: '@',
... ... @@ -24,7 +25,7 @@ citApp.directive("labelInputDecimal", ["$translate", function($translate) {
24 25 restrict : 'E',
25 26 template : "<div class='form-group' ng-class=\"{'has-error': form[id].$error.required && (!form[id].$pristine || form.$submitted)}\">" +
26 27 " <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>"+
27   - " <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}}'/>" +
  28 + " <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}}'/>" +
28 29 "</div>",
29 30  
30 31 controller: ['$scope', '$element', '$attrs', function ($scope, $element, $attrs) {
... ...