School/WasteInformationServer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* add city animation

Browse Source 
* delete city button
* reload table data
This commit is contained in:
lukas-heiligenbrunner
2019-11-29 16:55:57 +01:00
parent e292df8bb8
commit 07a4035195
12 changed files with 155 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
src/com/wasteinformationserver/website/datarequests/DataRequest.java
View File

@ -21,19 +21,38 @@ public class DataRequest extends PostRequest {
JDCB jdcb = new JDCB("users", "kOpaIJUjkgb9ur6S", "wasteinformation");
ResultSet set = jdcb.executeQuery("select * from cities where name='" + params.get("cityname") + "' AND wastetype='" + params.get("wastetype") + "' AND zone='" + params.get("wastezone") + "'");
Log.debug(params.get("cityname") + params.get("wastetype") + params.get("wastezone"));
ResultSet set = jdcb.executeQuery("select * from `cities` where `name`='" + params.get("cityname") + "' AND `wastetype`='" + params.get("wastetype") + "' AND `zone`='" + params.get("wastezone") + "'");
int size = 0;
try {
if (set.getFetchSize() == 0) {
//doesnt exist
System.out.println("doesnt exist");
jdcb.executeUpdate("INSERT INTO `cities`(`userid`, `name`, `wastetype`, `zone`) VALUES ('0','" + params.get("cityname") + "','" + params.get("wastetype") + "','" + params.get("wastezone") + "');");
} else {
//already exists
System.out.println("already exists");
if (set != null) {
set.last(); // moves cursor to the last row
size = set.getRow(); // get row id
}
} catch (SQLException e) {
e.printStackTrace();
}
if (size == 0) {
//doesnt exist
System.out.println("doesnt exist");
int status = jdcb.executeUpdate("INSERT INTO `cities`(`userid`, `name`, `wastetype`, `zone`) VALUES ('0','" + params.get("cityname") + "','" + params.get("wastetype") + "','" + params.get("wastezone") + "');");
System.out.println(status);
if (status == 1) {
result = "{\"status\" : \"inserted\"}";
} else {
result = "{\"status\" : \"inserterror\"}";
}
} else if (size > 1) {
Log.warning("more than one entry in db!!!");
result = "{\"status\" : \"exists\"}";
} else {
//already exists
System.out.println("already exists");
result = "{\"status\" : \"exists\"}";
}
Log.debug(result);
break;
case "getAllCities":
@ -48,10 +67,11 @@ public class DataRequest extends PostRequest {
builder.append("{\"data\":[");
try {
while (sett.next()) {
builder.append("{\"cityname\":\""+sett.getString("name")+"\"");
builder.append(",\"wastetype\":\""+sett.getString("wastetype")+"\"");
builder.append(",\"zone\":\""+sett.getString("zone")+"\"}");
if (!sett.isLast()){
builder.append("{\"cityname\":\"" + sett.getString("name") + "\"");
builder.append(",\"wastetype\":\"" + sett.getString("wastetype") + "\"");
builder.append(",\"id\":\"" + sett.getString("id") + "\"");
builder.append(",\"zone\":\"" + sett.getString("zone") + "\"}");
if (!sett.isLast()) {
builder.append(",");
}
@ -61,8 +81,18 @@ public class DataRequest extends PostRequest {
e.printStackTrace();
}
builder.append("]}");
result= builder.toString();
result = builder.toString();
Log.debug(result);
break;
case "deletecity":
//DELETE FROM `cities` WHERE `id`=0
JDCB jdcbcc = new JDCB("users", "kOpaIJUjkgb9ur6S", "wasteinformation");
Log.debug(params.get("id"));
int status= jdcbcc.executeUpdate("DELETE FROM `cities` WHERE `id`='" + params.get("id")+"'");
Log.debug(status);
break;
}
return result;

2
src/com/wasteinformationserver/website/datarequests/login/LoginRequest.java
View File

@ -19,7 +19,7 @@ public class LoginRequest extends PostRequest {
String username = params.get("username");
ResultSet s = new JDCB("users", "kOpaIJUjkgb9ur6S", "wasteinformation").executeQuery("select * from user where username ='" + username + "'");
Log.debug("successfully logged in to db");
String response = "{\"accept\": false}";
try {
s.last();