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

geovane.filho
2 parents a982860a f4a76bfc
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
cit-core/src/main/java/br/com/centralit/framework/util/UtilDate.java
cit-portal-web/src/main/java/br/com/centralit/listener/StartupListener.java
@@ -362,6 +362,10 @@ public class Views {
 	public static class EsiDataObjectListView extends GenericView{};
 	public static class EsiDataObjectEditView extends EsiDataObjectListView{};
+	
+	public static class EsiDatabaseListView extends GenericView{};
+
+	public static class EsiDatabaseEditView extends EsiDatabaseListView{};
 	public static class ConfiguracaoUsuarioUnidadeListView extends GenericView {};
@@ -1359,6 +1359,13 @@ public class UtilDate {
 		return dateFormat.format(date.getTime());
 	}
+	public static String calendarToJson(final Calendar date) {
+		SimpleDateFormat dateFormat = new SimpleDateFormat(
+				"yyyy-MM-dd'T'HH:mm:ss.SSS'Z'");
+
+		return dateFormat.format(date.getTime());
+	}
+
 	public static Date jsonToDate(final String value) {
 		Date dataReturn = null;
 		try {
@@ -1387,18 +1394,18 @@ public class UtilDate {
 	public static Calendar stringJsonToCalendar(String dataStr) {
 		// 2015-01-01T02:00:00.000Z
-		dataStr = (String) dataStr.subSequence(0, 10);
-		dataStr = dataStr.replace('-', '/');
-		Calendar calendar = Calendar.getInstance();
-		try {
-			SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM/dd");
-			calendar.setTime(sdf.parse(dataStr));
-		} catch (ParseException e) {
-			e.printStackTrace();
-		}
-
-		return calendar;
+		String date = dataStr.substring(0, 10);
+		String hour = (String) dataStr.substring(11, 19);
+		Timestamp ts = Timestamp.valueOf(date+" "+hour);
+		return timestampToCalendar(ts);
+	}
+	public static Timestamp stringJsonToTimestamp(String dataStr) {
+		// 2015-01-01T02:00:00.000Z
+		String date = dataStr.substring(0, 10);
+		String hour = (String) dataStr.substring(11, 19);
+		Timestamp ts = Timestamp.valueOf(date+" "+hour);
+		return ts;
 	}
 	public static Calendar primeiraDataAnoVigente(Calendar dataVigente) {
@@ -1188,6 +1188,9 @@ public class StartupListener extends UtilStartup implements ApplicationListener&lt;
 		internacionalizacaoList.add(new Internacionalizacao("LABEL.EXPANDIR", "Expandir", dominio, modulo));
 		internacionalizacaoList.add(new Internacionalizacao("LABEL.INVALIDO", "Inválido", dominio, modulo));
 		internacionalizacaoList.add(new Internacionalizacao("LABEL.NOVA_UNIDADE", "Nova Unidade", dominio, modulo));
+		internacionalizacaoList.add(new Internacionalizacao("LABEL.PADRAO", "Padrão", dominio, modulo));
+		internacionalizacaoList.add(new Internacionalizacao("LABEL.CAPACIDADE", "Capacidade", dominio, modulo));
+		internacionalizacaoList.add(new Internacionalizacao("LABEL.PRINCIPAL", "Principal", dominio, modulo));
 	}