Download as
Browse Code »

Commit 5d1e6bff83875b9e0c1de4ec5c2750818c088ef0

Authored by geovane.filho
2 parents a37f4b3e 560f913d
Exists in master

Merge branch 'master' into adm-1.16.0

Showing 6 changed files with 13 additions and 5 deletions   Show diff stats
cit-core/src/main/java/br/com/centralit/framework/util/UtilDate.java
  Diff comments   View file @5d1e6bf
@@ -846,6 +846,12 @@ public class UtilDate { @@ -846,6 +846,12 @@ public class UtilDate {
846 calendar.setTime(data); 846 calendar.setTime(data);
847 return calendar; 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 public static boolean isDataDoMesAtual(Date data) { 856 public static boolean isDataDoMesAtual(Date data) {
851 return isDataDoMes(data, getCalendarDaDataAtual().get(2)); 857 return isDataDoMes(data, getCalendarDaDataAtual().get(2));
cit-portal-api/src/main/resources/scripts-bd/postgres/v2.3.0/01-cit-portal-2.3.0-postgres.sql
  Diff comments   View file @5d1e6bf
@@ -6,5 +6,5 @@ @@ -6,5 +6,5 @@
6 -- Erick INICIO 23/05/2016 6 -- Erick INICIO 23/05/2016
7 INSERT INTO configuracaoparametrosistema(id, datacriacao, dataedicao, version, chave, valor, configuracao_id, isobrigatorio) 7 INSERT INTO configuracaoparametrosistema(id, datacriacao, dataedicao, version, chave, valor, configuracao_id, isobrigatorio)
8 SELECT NEXTVAL('hibernate_sequence'), LOCALTIMESTAMP, LOCALTIMESTAMP, 0, 'VALIDAR_FECHAR_ABA', 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 -- Erick FIM 23/05/2016 10 -- Erick FIM 23/05/2016
11 \ No newline at end of file 11 \ No newline at end of file
cit-portal-web/src/main/webapp/assets/js/angular/custom/controller/AppController.js
  Diff comments   View file @5d1e6bf
@@ -39,7 +39,7 @@ citApp.controller('AppController', ['$scope', '$routeParams', '$timeout', '$loca @@ -39,7 +39,7 @@ citApp.controller('AppController', ['$scope', '$routeParams', '$timeout', '$loca
39 if(result.valor){ 39 if(result.valor){
40 $scope.validarFecharAba = result.valor; 40 $scope.validarFecharAba = result.valor;
41 }else{ 41 }else{
42 - $scope.validarFecharAba = false; 42 + $scope.validarFecharAba = 'false';
43 } 43 }
44 44
45 if($scope.validarFecharAba && $scope.validarFecharAba == 'true'){ 45 if($scope.validarFecharAba && $scope.validarFecharAba == 'true'){
cit-portal-web/src/main/webapp/assets/js/angular/custom/directive/LabelInputDecimalDirective.js
  Diff comments   View file @5d1e6bf
@@ -13,6 +13,7 @@ citApp.directive("labelInputDecimal", ["$translate", function($translate) { @@ -13,6 +13,7 @@ citApp.directive("labelInputDecimal", ["$translate", function($translate) {
13 model : "=ngModel", 13 model : "=ngModel",
14 form : "=form", 14 form : "=form",
15 eventoChange : "&ngEventoChange", 15 eventoChange : "&ngEventoChange",
  16 + eventoKeyup : "&ngEventoKeyup",
16 eventoBlur: "=ngEventoBlur", 17 eventoBlur: "=ngEventoBlur",
17 precisao : "@ngPrecisao", 18 precisao : "@ngPrecisao",
18 labelAlertTooltip: '@', 19 labelAlertTooltip: '@',
@@ -24,7 +25,7 @@ citApp.directive("labelInputDecimal", ["$translate", function($translate) { @@ -24,7 +25,7 @@ citApp.directive("labelInputDecimal", ["$translate", function($translate) {
24 restrict : 'E', 25 restrict : 'E',
25 template : "<div class='form-group' ng-class=\"{'has-error': form[id].$error.required && (!form[id].$pristine || form.$submitted)}\">" + 26 template : "<div class='form-group' ng-class=\"{'has-error': form[id].$error.required && (!form[id].$pristine || form.$submitted)}\">" +
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 " <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 "</div>", 29 "</div>",
29 30
30 controller: ['$scope', '$element', '$attrs', function ($scope, $element, $attrs) { 31 controller: ['$scope', '$element', '$attrs', function ($scope, $element, $attrs) {
cit-portal-web/src/main/webapp/assets/js/angular/custom/directive/ListViewDirective.js
  Diff comments   View file @5d1e6bf
@@ -20,7 +20,8 @@ citApp.directive(&quot;listView&quot;, [&quot;$translate&quot;, &quot;$injector&quot;, &quot;$timeout&quot;, &quot;$filter&quot;, @@ -20,7 +20,8 @@ citApp.directive(&quot;listView&quot;, [&quot;$translate&quot;, &quot;$injector&quot;, &quot;$timeout&quot;, &quot;$filter&quot;,
20 setTotalItens : '=?setTotalItens', 20 setTotalItens : '=?setTotalItens',
21 useCustomFilterTemp : '=?useCustomFilterTemp', 21 useCustomFilterTemp : '=?useCustomFilterTemp',
22 customFilter : '&ngCustomFilter', 22 customFilter : '&ngCustomFilter',
23 - campoMarcacao : '@ngCampoMarcacao' 23 + campoMarcacao : '@ngCampoMarcacao',
  24 + marcarLinhaGridAtributo : '@ngMarcarLinhaGridAtributo'
24 }, 25 },
25 replace : true, 26 replace : true,
26 restrict : 'E', 27 restrict : 'E',
cit-portal-web/src/main/webapp/assets/js/angular/custom/directive/html/listView.html
  Diff comments   View file @5d1e6bf
@@ -119,7 +119,7 @@ @@ -119,7 +119,7 @@
119 </div> 119 </div>
120 </td> 120 </td>
121 </tr> 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 <td ng-if="isCheckBox != undefined && isCheckBox" ng-class="text-center"> 123 <td ng-if="isCheckBox != undefined && isCheckBox" ng-class="text-center">
124 <input type="checkbox" ng-checked="model.$checkedChBox" ng-click="checkboxItem(model)" ng-model="model.$checkedChBox"/> 124 <input type="checkbox" ng-checked="model.$checkedChBox" ng-click="checkboxItem(model)" ng-model="model.$checkedChBox"/>
125 </td> 125 </td>