Download as
Browse Code »

Commit 4171ed516ce077682a315d5f1e399bf0b050fadd

Authored by joyfas.silva
1 parent 74977059
Exists in master

{Redmine tarefa-4530}

Showing 3 changed files with 18 additions and 5 deletions   Show diff stats
cit-portal-web/src/main/webapp/assets/js/angular/custom/controller/AppController.js
  Diff comments   View file @4171ed5
... ... @@ -1561,5 +1561,13 @@ citApp.controller('AppController', ['$scope', '$routeParams', '$timeout', '$loca
1561 1561 $scope.limparUsernameRascunho = function(){
1562 1562 $scope.editorRascunho = null;
1563 1563 };
  1564 +
  1565 + $scope.aplicarValidacaoDecimal = function(element){
  1566 + if(element.model){
  1567 + element.model = parseFloat(element.model).toFixed(2);
  1568 + }else{
  1569 + element.model = '';
  1570 + }
  1571 + };
1564 1572  
1565 1573 }]);
... ...
cit-portal-web/src/main/webapp/assets/js/angular/custom/directive/LabelInputDecimalDirective.js
  Diff comments   View file @4171ed5
... ... @@ -24,7 +24,7 @@ citApp.directive("labelInputDecimal", ["$translate", function($translate) {
24 24 restrict : 'E',
25 25 template : "<div class='form-group' ng-class=\"{'has-error': form[id].$error.required && (!form[id].$pristine || form.$submitted)}\">" +
26 26 " <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()' 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}}'/>" +
  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 28 "</div>",
29 29  
30 30 controller: ['$scope', '$element', '$attrs', function ($scope, $element, $attrs) {
... ... @@ -58,7 +58,6 @@ citApp.directive(&quot;labelInputDecimal&quot;, [&quot;$translate&quot;, function($translate) {
58 58 }
59 59 }],
60 60 link : function($scope, $element, attibutes){
61   -
62 61 $scope.removeModel = function(event){
63 62 if((event.keyCode === 8 || event.keyCode === 46) && $scope.model === 0.0){
64 63 $scope.model = null;
... ...
cit-portal-web/src/main/webapp/assets/js/angular/custom/directive/MasksDirective.js
  Diff comments   View file @4171ed5
... ... @@ -1571,14 +1571,20 @@ angular.module(&#39;ui.utils.masks.number&#39;, [])
1571 1571  
1572 1572 var pos = value.indexOf(",");
1573 1573 var result;
  1574 + //se não ouver maxlength, 9 eh padrão...
  1575 + var maxLength = attrs.maxlength ? attrs.maxlength : 9;
  1576 + // -3 conta virgula e 2 casa decimais
  1577 + var digitos = maxLength - 3;
  1578 + var part1 = '';
  1579 + var part2 = '';
1574 1580 if (pos !== -1) {
1575   - var part1 = value.substr(0, pos > 6 ? 6 : pos);
1576   - var part2 = value.substr(pos > 6 ? 6 : pos + 1);
  1581 + part1 = value.substr(0, pos > digitos ? digitos : pos);
  1582 + part2 = value.substr(pos > digitos ? digitos : pos + 1);
1577 1583 //2 casas decimais......
1578 1584 part2 = part2.substr(0,2);
1579 1585 result = cleanForDecimal(part1) + "," + cleanForDecimal(part2);
1580 1586 } else {
1581   - result = cleanForDecimal(value).substr(0,6);
  1587 + result = cleanForDecimal(value).substr(0,digitos);
1582 1588 }
1583 1589  
1584 1590 result = result ==',' ? '' : result;
... ...