Download as
Browse Code »

Commit 015aff98b7f57cd7e2dedb97c7b62cb4d8878dbd

Authored by erick.sato
2 parents 954d3d97 9e0eedeb
Exists in master

Merge branch 'master' of http://ferramentasgo.centralit.com.br:8080/scm/git/cit-grp-corporativo

Showing 3 changed files with 23 additions and 11 deletions   Show diff stats
cit-core/src/main/java/br/com/centralit/framework/json/Views.java
  Diff comments   View file @015aff9
@@ -362,6 +362,10 @@ public class Views { @@ -362,6 +362,10 @@ public class Views {
362 public static class EsiDataObjectListView extends GenericView{}; 362 public static class EsiDataObjectListView extends GenericView{};
363 363
364 public static class EsiDataObjectEditView extends EsiDataObjectListView{}; 364 public static class EsiDataObjectEditView extends EsiDataObjectListView{};
  365 +
  366 + public static class EsiDatabaseListView extends GenericView{};
  367 +
  368 + public static class EsiDatabaseEditView extends EsiDatabaseListView{};
365 369
366 public static class ConfiguracaoUsuarioUnidadeListView extends GenericView {}; 370 public static class ConfiguracaoUsuarioUnidadeListView extends GenericView {};
367 371
cit-core/src/main/java/br/com/centralit/framework/util/UtilDate.java
  Diff comments   View file @015aff9
@@ -1359,6 +1359,13 @@ public class UtilDate { @@ -1359,6 +1359,13 @@ public class UtilDate {
1359 return dateFormat.format(date.getTime()); 1359 return dateFormat.format(date.getTime());
1360 } 1360 }
1361 1361
  1362 + public static String calendarToJson(final Calendar date) {
  1363 + SimpleDateFormat dateFormat = new SimpleDateFormat(
  1364 + "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'");
  1365 +
  1366 + return dateFormat.format(date.getTime());
  1367 + }
  1368 +
1362 public static Date jsonToDate(final String value) { 1369 public static Date jsonToDate(final String value) {
1363 Date dataReturn = null; 1370 Date dataReturn = null;
1364 try { 1371 try {
@@ -1387,18 +1394,18 @@ public class UtilDate { @@ -1387,18 +1394,18 @@ public class UtilDate {
1387 1394
1388 public static Calendar stringJsonToCalendar(String dataStr) { 1395 public static Calendar stringJsonToCalendar(String dataStr) {
1389 // 2015-01-01T02:00:00.000Z 1396 // 2015-01-01T02:00:00.000Z
1390 - dataStr = (String) dataStr.subSequence(0, 10);  
1391 - dataStr = dataStr.replace('-', '/');  
1392 - Calendar calendar = Calendar.getInstance();  
1393 - try {  
1394 - SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM/dd");  
1395 - calendar.setTime(sdf.parse(dataStr));  
1396 - } catch (ParseException e) {  
1397 - e.printStackTrace();  
1398 - }  
1399 -  
1400 - return calendar; 1397 + String date = dataStr.substring(0, 10);
  1398 + String hour = (String) dataStr.substring(11, 19);
  1399 + Timestamp ts = Timestamp.valueOf(date+" "+hour);
  1400 + return timestampToCalendar(ts);
  1401 + }
1401 1402
  1403 + public static Timestamp stringJsonToTimestamp(String dataStr) {
  1404 + // 2015-01-01T02:00:00.000Z
  1405 + String date = dataStr.substring(0, 10);
  1406 + String hour = (String) dataStr.substring(11, 19);
  1407 + Timestamp ts = Timestamp.valueOf(date+" "+hour);
  1408 + return ts;
1402 } 1409 }
1403 1410
1404 public static Calendar primeiraDataAnoVigente(Calendar dataVigente) { 1411 public static Calendar primeiraDataAnoVigente(Calendar dataVigente) {
cit-portal-web/src/main/java/br/com/centralit/listener/StartupListener.java
  Diff comments   View file @015aff9
@@ -995,6 +995,7 @@ public class StartupListener extends UtilStartup implements ApplicationListener< @@ -995,6 +995,7 @@ public class StartupListener extends UtilStartup implements ApplicationListener<
995 internacionalizacaoList.add(new Internacionalizacao("LABEL.BUSCAR", "Buscar", dominio, modulo)); 995 internacionalizacaoList.add(new Internacionalizacao("LABEL.BUSCAR", "Buscar", dominio, modulo));
996 internacionalizacaoList.add(new Internacionalizacao("LABEL.CADASTRAR", "Cadastrar", dominio, modulo)); 996 internacionalizacaoList.add(new Internacionalizacao("LABEL.CADASTRAR", "Cadastrar", dominio, modulo));
997 internacionalizacaoList.add(new Internacionalizacao("LABEL.CAMPOS_OBRIGATORIOS", "Campos obrigatórios", dominio, modulo)); 997 internacionalizacaoList.add(new Internacionalizacao("LABEL.CAMPOS_OBRIGATORIOS", "Campos obrigatórios", dominio, modulo));
  998 + internacionalizacaoList.add(new Internacionalizacao("LABEL.CAMPO_OBRIGATORIO", "é um campo obrigatório", dominio, modulo));
998 internacionalizacaoList.add(new Internacionalizacao("LABEL.CANCELAR", "Cancelar", dominio, modulo)); 999 internacionalizacaoList.add(new Internacionalizacao("LABEL.CANCELAR", "Cancelar", dominio, modulo));
999 internacionalizacaoList.add(new Internacionalizacao("LABEL.CARACTERISTICA", "Característica", dominio, modulo)); 1000 internacionalizacaoList.add(new Internacionalizacao("LABEL.CARACTERISTICA", "Característica", dominio, modulo));
1000 internacionalizacaoList.add(new Internacionalizacao("LABEL.CARACTERISTICAS", "Características", dominio, modulo)); 1001 internacionalizacaoList.add(new Internacionalizacao("LABEL.CARACTERISTICAS", "Características", dominio, modulo));