diff --git a/pom.xml b/pom.xml index 77f0cf1..7c18227 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ org.ccalm main - 1.0.1 + 1.0.2 main main diff --git a/src/main/java/org/ccalm/main/AcceptASDCController.java b/src/main/java/org/ccalm/main/AcceptASDCController.java index 6dea2f7..f0a1194 100644 --- a/src/main/java/org/ccalm/main/AcceptASDCController.java +++ b/src/main/java/org/ccalm/main/AcceptASDCController.java @@ -3038,17 +3038,6 @@ public class AcceptASDCController implements ServletContextAware { @ResponseBody public FileSystemResource sendPhoto(HttpServletResponse response,@RequestParam(required=true,name="table") String tableName,@RequestParam(required=true,name="file") String fileName) { - //Load DB configuration - String data_dir = ""; - Properties prop = new Properties(); - try { - prop.load(new FileInputStream("org_ccalm_main.properties")); // load a properties file - data_dir = prop.getProperty("data.dir"); - } catch (Exception ex) { - ex.printStackTrace(); - logger.error("Error load org_ccalm_main.properties",ex); //TODO delete .properties file and use .yaml file - } - File file = new File(data_dir + "data/" + tableName + "/" + fileName); if(file.exists()) { diff --git a/src/main/java/org/ccalm/main/SendWarning.java b/src/main/java/org/ccalm/main/SendWarning.java index 985b4c0..6efd22a 100644 --- a/src/main/java/org/ccalm/main/SendWarning.java +++ b/src/main/java/org/ccalm/main/SendWarning.java @@ -191,7 +191,7 @@ public class SendWarning { update main.frmcheckpoints set - warn_air=true + warn_air=false where uid=CAST(:uid AS uuid) """; MapSqlParameterSource param = new MapSqlParameterSource(); @@ -246,7 +246,7 @@ public class SendWarning { update main.frmcheckpoints set - warn_soil=true + warn_soil=false where uid=CAST(:uid AS uuid) """; MapSqlParameterSource param = new MapSqlParameterSource(); diff --git a/src/main/resources/templates/engine/index.html b/src/main/resources/templates/engine/index.html index 4aa4bde..f1d7b67 100644 --- a/src/main/resources/templates/engine/index.html +++ b/src/main/resources/templates/engine/index.html @@ -28,20 +28,20 @@ - - - - - - - - - - + + + + + + + + + + - - - + + +