From 040225202915ad95c7739f5ce8789737e884628e Mon Sep 17 00:00:00 2001 From: Georg-Notebook Date: Tue, 27 Apr 2021 16:22:13 +0200 Subject: [PATCH] =?UTF-8?q?Suche=20onEnter=20+=20Focus=20auf=20selected=20?= =?UTF-8?q?Tour=20nach=20Suche=20+=20entferne=20sout=C2=B4s=20+=20entferne?= =?UTF-8?q?=20unn=C3=B6tige=20Log=20eintr=C3=A4ge?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/tourplaner/business/DirectionMap.java | 1 - src/tourplaner/business/TourPlaner.java | 1 - src/tourplaner/data/DbConnect.java | 19 +-- src/tourplaner/data/PostgresHelper.java | 38 +++-- src/tourplaner/tourplaner.fxml | 158 +++++++------------- src/tourplaner/ui/AlertHelper.java | 1 - src/tourplaner/ui/TourplanerController.java | 21 +++ src/tourplaner/viewmodels/ViewModel.java | 3 - 8 files changed, 115 insertions(+), 127 deletions(-) diff --git a/src/tourplaner/business/DirectionMap.java b/src/tourplaner/business/DirectionMap.java index d6138d4..4d2d2e0 100644 --- a/src/tourplaner/business/DirectionMap.java +++ b/src/tourplaner/business/DirectionMap.java @@ -56,7 +56,6 @@ public class DirectionMap { * @throws IOException Fehler beim Get der Map */ private Image getMap(String size) throws IOException { - System.out.println("URL: " + "https://www.mapquestapi.com/staticmap/v5/map?session="+this.sessionId+"&size="+size+"&key="+ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "map", "key")); return HttpHelper.httpGetImage("https://www.mapquestapi.com/staticmap/v5/map?session="+this.sessionId+"&size="+size+"&key="+ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "map", "key")); } diff --git a/src/tourplaner/business/TourPlaner.java b/src/tourplaner/business/TourPlaner.java index 141b725..4ef5aa1 100644 --- a/src/tourplaner/business/TourPlaner.java +++ b/src/tourplaner/business/TourPlaner.java @@ -178,7 +178,6 @@ public class TourPlaner{ touren.add(t); } }); - System.out.println(""+bemerkungen.contains(tourname.toLowerCase()) + t.getZiel().toLowerCase(Locale.ROOT).contains(tourname.toLowerCase()) + t.getName().toLowerCase(Locale.ROOT).contains(tourname.toLowerCase()) + t.getStart().toLowerCase(Locale.ROOT).contains(tourname.toLowerCase())); if(bemerkungen.contains(tourname.toLowerCase()) || t.getZiel().toLowerCase(Locale.ROOT).contains(tourname.toLowerCase()) || t.getName().toLowerCase(Locale.ROOT).contains(tourname.toLowerCase()) || t.getStart().toLowerCase(Locale.ROOT).contains(tourname.toLowerCase())){ if(!touren.contains(t)) { touren.add(t); diff --git a/src/tourplaner/data/DbConnect.java b/src/tourplaner/data/DbConnect.java index b2e8c7a..7c3c51a 100644 --- a/src/tourplaner/data/DbConnect.java +++ b/src/tourplaner/data/DbConnect.java @@ -27,15 +27,12 @@ public class DbConnect { /** * Erstellt alle Tabellen die für den Betrieb der Software bennötigt werden - * @return True bei erfolg, sonst error */ - public boolean init() { - ArrayList errors = new ArrayList<>(); - errors.add(PostgresHelper.executeUpdateMessage("create table tour ( tourname varchar not null, dauer decimal, mapjson varchar, start varchar, ziel varchar, strecke decimal);", "Tour Table created")); - errors.add(PostgresHelper.executeUpdateMessage("create unique index tour_tourname_uindex on tour (tourname);", "Tour Table unique created")); - errors.add(PostgresHelper.executeUpdateMessage("alter table tour add constraint tour_pk primary key (tourname);", "Tour Table primary created")); - errors.add(PostgresHelper.executeUpdateMessage("create table log(tourname varchar constraint log_tour_tourname_fk references tour,id varchar,bemerkung varchar,datum date,strecke decimal,avg decimal,hightmeter decimal,pause decimal,gegangen decimal,dauer decimal,rating varchar);", "Log Table created")); - return !errors.contains(false); + public void init() { + PostgresHelper.executeUpdateNoLog("create table tour ( tourname varchar not null, dauer decimal, mapjson varchar, start varchar, ziel varchar, strecke decimal);"); + PostgresHelper.executeUpdateNoLog("create unique index tour_tourname_uindex on tour (tourname);"); + PostgresHelper.executeUpdateNoLog("alter table tour add constraint tour_pk primary key (tourname);"); + PostgresHelper.executeUpdateNoLog("create table log(tourname varchar constraint log_tour_tourname_fk references tour,id varchar,bemerkung varchar,datum date,strecke decimal,avg decimal,hightmeter decimal,pause decimal,gegangen decimal,dauer decimal,rating varchar);"); } @@ -125,7 +122,7 @@ public class DbConnect { this.c.close(); return logs; } catch (Exception e) { - System.err.println(e.getClass().getName() + ": " + e.getMessage()); + LogHelper.error(e); return null; } } @@ -139,8 +136,6 @@ public class DbConnect { */ public boolean addLog(String tourname, Log log){ if(Double.isInfinite(log.getAvgspeed())) log.setAvgspeed(-1.0); - System.out.println("INSERT INTO public.log (tourname, id, bemerkung, datum, strecke, avg, hightmeter, pause, gegangen, dauer, rating) VALUES ('"+tourname+"', '"+log.getId()+"', '"+log.getBemerkung()+"', '"+log.getDatum()+"', " - +log.getStrecke()+", "+log.getAvgspeed()+", "+log.getHightmeter()+", "+log.getPause()+", "+log.getGegangen()+", "+log.getDauer()+",'"+log.getRating()+"')"); return PostgresHelper.executeUpdate("INSERT INTO public.log (tourname, id, bemerkung, datum, strecke, avg, hightmeter, pause, gegangen, dauer, rating) VALUES ('"+tourname+"', '"+log.getId()+"', '"+log.getBemerkung()+"', '"+log.getDatum()+"', " +log.getStrecke()+", "+log.getAvgspeed()+", "+log.getHightmeter()+", "+log.getPause()+", "+log.getGegangen()+", "+log.getDauer()+",'"+log.getRating()+"')"); } @@ -244,7 +239,7 @@ public class DbConnect { this.c.close(); return touren; } catch (Exception e) { - System.err.println(e.getClass().getName() + ": " + e.getMessage()); + LogHelper.error(e); return null; } } diff --git a/src/tourplaner/data/PostgresHelper.java b/src/tourplaner/data/PostgresHelper.java index 94eae49..9af4813 100644 --- a/src/tourplaner/data/PostgresHelper.java +++ b/src/tourplaner/data/PostgresHelper.java @@ -6,6 +6,7 @@ import tourplaner.business.LogHelper; import java.sql.Connection; import java.sql.DriverManager; +import java.sql.SQLException; import java.sql.Statement; /** @@ -20,8 +21,6 @@ public class PostgresHelper { Connection c = null; try { Class.forName("org.postgresql.Driver"); - System.out.println("jdbc:postgresql://" + ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "db", "url") + ":" + ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "db", "port") + "/" + ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "db", "dbname")+ - ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "db", "user")+ ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "db", "pw")); c = DriverManager .getConnection("jdbc:postgresql://" + ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "db", "url") + ":" + ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "db", "port") + "/" + ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "db", "dbname"), ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "db", "user"), ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "db", "pw")); @@ -48,17 +47,38 @@ public class PostgresHelper { * @return True bei erfolg, sonst false */ public static boolean executeUpdate(String sql){ - Connection c = con(); - Statement stmt; try { - stmt = c.createStatement(); - stmt.executeUpdate(sql); - stmt.close(); - c.close(); - } catch (Exception e) { + exUpdate(sql); + } catch (SQLException e) { LogHelper.error(e.getMessage(), e.getClass().getName()); return false; } return true; } + + /** + * Führt ein Sql statement ohne rückgabe aus + * @param sql Sql command + * @return True bei erfolg, sonst false + * @throws SQLException Fehler beim ausführen + */ + private static boolean exUpdate(String sql) throws SQLException { + Connection c = con(); + Statement stmt; + stmt = c.createStatement(); + stmt.executeUpdate(sql); + stmt.close(); + c.close(); + return true; + } + + + public static boolean executeUpdateNoLog(String sql){ + try { + exUpdate(sql); + return true; + }catch (Exception e){ + return false; + } + } } diff --git a/src/tourplaner/tourplaner.fxml b/src/tourplaner/tourplaner.fxml index ae99a23..721d2d1 100644 --- a/src/tourplaner/tourplaner.fxml +++ b/src/tourplaner/tourplaner.fxml @@ -39,101 +39,76 @@ - + - - - + + + - - + + - - + + - - + + - - - + + + - + - - -