Download as
Browse Code »

Commit 9e0eedeb4b5d8a3983333938ed58d14d08a26ac9

Authored by geovane.filho
2 parents a982860a f4a76bfc
Exists in master

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

Showing 3 changed files with 25 additions and 11 deletions   Show diff stats
cit-core/src/main/java/br/com/centralit/framework/json/Views.java
  Diff comments   View file @9e0eede
... ... @@ -362,6 +362,10 @@ public class Views {
362 362 public static class EsiDataObjectListView extends GenericView{};
363 363  
364 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 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 @9e0eede
... ... @@ -1359,6 +1359,13 @@ public class UtilDate {
1359 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 1369 public static Date jsonToDate(final String value) {
1363 1370 Date dataReturn = null;
1364 1371 try {
... ... @@ -1387,18 +1394,18 @@ public class UtilDate {
1387 1394  
1388 1395 public static Calendar stringJsonToCalendar(String dataStr) {
1389 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 1411 public static Calendar primeiraDataAnoVigente(Calendar dataVigente) {
... ...
cit-portal-web/src/main/java/br/com/centralit/listener/StartupListener.java
  Diff comments   View file @9e0eede
... ... @@ -1188,6 +1188,9 @@ public class StartupListener extends UtilStartup implements ApplicationListener<
1188 1188 internacionalizacaoList.add(new Internacionalizacao("LABEL.EXPANDIR", "Expandir", dominio, modulo));
1189 1189 internacionalizacaoList.add(new Internacionalizacao("LABEL.INVALIDO", "Inválido", dominio, modulo));
1190 1190 internacionalizacaoList.add(new Internacionalizacao("LABEL.NOVA_UNIDADE", "Nova Unidade", dominio, modulo));
  1191 + internacionalizacaoList.add(new Internacionalizacao("LABEL.PADRAO", "Padrão", dominio, modulo));
  1192 + internacionalizacaoList.add(new Internacionalizacao("LABEL.CAPACIDADE", "Capacidade", dominio, modulo));
  1193 + internacionalizacaoList.add(new Internacionalizacao("LABEL.PRINCIPAL", "Principal", dominio, modulo));
1191 1194  
1192 1195 }
1193 1196  
... ...