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

improved ui, added panel to add new city and zone

Browse Source 
parts of displaying cities fromdb
This commit is contained in:
lukas-heiligenbrunner
2019-11-15 11:23:51 +01:00
parent cfddff4d8d
commit 36caaa214b
12 changed files with 186 additions and 207 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/wasteinformationserver/main.java
View File

@ -21,7 +21,7 @@ public class main {
}));
Thread mythread = new Thread(() -> new Webserver().startserver());
//mythread.start();
mythread.start();
Log.message("thread started");

7
src/com/wasteinformationserver/website/MainPage.java
View File

@ -4,12 +4,9 @@ import com.sun.net.httpserver.Headers;
import com.sun.net.httpserver.HttpExchange;
import com.sun.net.httpserver.HttpHandler;
import com.wasteinformationserver.basicutils.Log;
import com.wasteinformationserver.website.datarequests.LoginState;
import com.wasteinformationserver.website.datarequests.login.LoginState;
import java.awt.*;
import java.io.*;
import java.net.URI;
import java.net.URL;
public class MainPage implements HttpHandler {
@Override
@ -29,7 +26,7 @@ public class MainPage implements HttpHandler {
Log.warning("user not logged in --> redirecting to login page");
sendPage("/index.html",t);
}
}else {
}else { //only detect login state on html pages
sendPage(path, t);
}
}

5
src/com/wasteinformationserver/website/Webserver.java
View File

@ -2,9 +2,9 @@ package com.wasteinformationserver.website;
import com.sun.net.httpserver.HttpServer;
import com.wasteinformationserver.basicutils.Log;
import com.wasteinformationserver.website.datarequests.CheckLoginState;
import com.wasteinformationserver.website.datarequests.login.CheckLoginState;
import com.wasteinformationserver.website.datarequests.DataRequest;
import com.wasteinformationserver.website.datarequests.LoginRequest;
import com.wasteinformationserver.website.datarequests.login.LoginRequest;
import com.wasteinformationserver.website.datarequests.RegisterRequest;
import java.io.IOException;
@ -22,6 +22,7 @@ public class Webserver {
}
server.createContext("/", new MainPage());
server.createContext("/senddata/loginget", new LoginRequest());
server.createContext("/senddata/registerpost",new RegisterRequest());
server.createContext("/senddata/checkloginstate",new CheckLoginState());

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

@ -11,29 +11,32 @@ import java.util.HashMap;
public class DataRequest extends PostRequest {
@Override
public String request(HashMap<String, String> params) {
switch (params.get("action")){
case "senddata":
switch (params.get("action")) {
case "newCity":
Log.debug(params.toString());
// check if wastezone and wasteregion already exists
JDCB jdcb = new JDCB("users", "kOpaIJUjkgb9ur6S", "wasteinformation");
ResultSet set = jdcb.executeQuery("select * from cities where name='"+params.get("wasteregion")+"' AND wastetype='"+params.get("wastetype")+"' AND zone='"+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") + "'");
try {
if (set.getFetchSize() == 0){
if (set.getFetchSize() == 0) {
//doesnt exist
System.out.println("doesnt exist");
jdcb.executeUpdate("INSERT INTO `cities`(`userid`, `name`, `wastetype`, `zone`) VALUES (0,'"+params.get("wasteregion")+"','"+params.get("wastetype")+"','"+params.get("wastezone")+"'");
}else {
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");
}
} catch (SQLException e) {
e.printStackTrace();
}
break;
case "getAllCities":
// TODO: 11.10.19 store data in database
// TODO: 15.11.19 database call to get all data and store it as json.
break;
}
return "";

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

@ -1,4 +1,4 @@
package com.wasteinformationserver.website.datarequests;
package com.wasteinformationserver.website.datarequests.login;
import com.wasteinformationserver.basicutils.Log;
import com.wasteinformationserver.website.basicrequest.PostRequest;

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

@ -1,4 +1,4 @@
package com.wasteinformationserver.website.datarequests;
package com.wasteinformationserver.website.datarequests.login;
import com.wasteinformationserver.basicutils.Log;
import com.wasteinformationserver.db.JDCB;
@ -13,6 +13,8 @@ public class LoginRequest extends PostRequest {
@Override
public String request(HashMap<String, String> params) {
Log.message("new login request");
String password = params.get("password");
String username = params.get("username");

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

@ -1,4 +1,4 @@
package com.wasteinformationserver.website.datarequests;
package com.wasteinformationserver.website.datarequests.login;
public class LoginState {
private LoginState() {}