diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml new file mode 100644 index 0000000..15c4832 --- /dev/null +++ b/.idea/dataSources.xml @@ -0,0 +1,12 @@ + + + + + postgresql + true + org.postgresql.Driver + jdbc:postgresql://postgres.dergeorg.at:5432/postgres + $ProjectFileDir$ + + + \ No newline at end of file diff --git a/.idea/libraries/org_postgresql_postgresql_42_2_19.xml b/.idea/libraries/org_postgresql_postgresql_42_2_19.xml new file mode 100644 index 0000000..3fd3a3b --- /dev/null +++ b/.idea/libraries/org_postgresql_postgresql_42_2_19.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/sqldialects.xml b/.idea/sqldialects.xml new file mode 100644 index 0000000..ddea47f --- /dev/null +++ b/.idea/sqldialects.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/TourplanerTabellen.sql b/TourplanerTabellen.sql new file mode 100644 index 0000000..4fe9272 --- /dev/null +++ b/TourplanerTabellen.sql @@ -0,0 +1,20 @@ +// Tour Tabelle + +create table tour +( + tourname varchar not null, + dauer decimal, + mapjson varchar, + start varchar, + ziel varchar, + strecke decimal +); + +create unique index tour_tourname_uindex + on tour (tourname); + +alter table tour add constraint tour_pk primary key (tourname); + +#// Log Table + +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); \ No newline at end of file diff --git a/log/log4j/log.out b/log/log4j/log.out deleted file mode 100644 index c2c2b06..0000000 --- a/log/log4j/log.out +++ /dev/null @@ -1,15 +0,0 @@ -2021-03-18 22:41:23 ERROR ViewModel -> DelTour:33 - Keine Tour ausgewählt! -2021-03-18 22:48:51 ERROR ViewModel -> DelTour:33 - Keine Tour ausgewählt! -2021-03-18 22:53:17 ERROR ViewModel -> DelTour:33 - Keine Tour ausgewählt! -2021-03-18 22:57:20 ERROR ViewModel -> DelTour:33 - Keine Tour ausgewählt! -2021-03-18 22:57:28 ERROR ViewModel -> DelTour:33 - Keine Tour ausgewählt! -2021-03-18 22:58:33 ERROR ViewModel -> DelTour:33 - Keine Tour ausgewählt! -2021-03-18 22:58:34 ERROR ViewModel -> DelTour:33 - Keine Tour ausgewählt! -2021-03-18 23:05:00 ERROR ViewModel -> DelTour:33 - Keine Tour ausgewählt! -2021-03-18 23:11:45 ERROR ViewModel -> DelTour:33 - Keine Tour ausgewählt! -2021-03-18 23:14:55 ERROR ViewModel -> DelTour:33 - Keine Tour ausgewählt! -2021-03-19 11:56:22 ERROR ViewModel -> DelTour:33 - Keine Tour ausgewählt! -2021-03-19 22:35:19 ERROR ViewModel -> DelTour:33 - Keine Tour ausgewählt! -2021-03-19 23:23:36 ERROR ViewModel -> DelTour:33 - Keine Tour ausgewählt! -2021-04-13 18:30:39 ERROR FileNotFoundException:33 - \report\test.pdf (Das System kann den angegebenen Pfad nicht finden) -2021-04-13 18:31:11 ERROR FileNotFoundException:33 - \reports\test.pdf (Das System kann den angegebenen Pfad nicht finden) diff --git a/src/tourplaner/business/Reporter.java b/src/tourplaner/business/Reporter.java index ff599f9..8558292 100644 --- a/src/tourplaner/business/Reporter.java +++ b/src/tourplaner/business/Reporter.java @@ -1,2 +1,34 @@ -package tourplaner.business;public class Reporter { +package tourplaner.business; + +import org.apache.pdfbox.exceptions.COSVisitorException; +import org.apache.pdfbox.pdmodel.PDDocument; +import org.apache.pdfbox.pdmodel.PDPage; +import org.apache.pdfbox.pdmodel.edit.PDPageContentStream; +import org.apache.pdfbox.pdmodel.font.PDFont; +import org.apache.pdfbox.pdmodel.font.PDType1Font; + +import java.io.IOException; + +public class Reporter { + + public static void createTourReport(String tourname) throws IOException, COSVisitorException { + PDDocument document = new PDDocument(); + PDPage page = new PDPage(); + document.addPage(page); + + PDFont font = PDType1Font.HELVETICA; + PDPageContentStream contentStream = new PDPageContentStream(document, page); + contentStream.beginText(); + contentStream.setFont(font, 12); + contentStream.moveTextPositionByAmount(100,700); + contentStream.drawString(tourname); +// contentStream.drawString(); + contentStream.endText(); + + contentStream.close(); + + document.save(ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "report", "path") + "test.pdf"); + document.close(); + } + } diff --git a/src/tourplaner/business/TourPlaner.java b/src/tourplaner/business/TourPlaner.java index 4c3e66e..36a60d5 100644 --- a/src/tourplaner/business/TourPlaner.java +++ b/src/tourplaner/business/TourPlaner.java @@ -2,6 +2,10 @@ package tourplaner.business; import org.apache.log4j.Logger; import tourplaner.data.DbConnect; +import tourplaner.data.PostgresHelper; +import tourplaner.object.Tour; + +import java.util.ArrayList; /** * Haupt Logik des Tourplaners @@ -10,12 +14,18 @@ public class TourPlaner{ private Logger logger; public TourPlaner(){ - LogHelper.info(ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "start", "message"), - ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "start", "app")); +// LogHelper.info(ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "start", "message"), +// ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "start", "app")); new DbConnect().init(); } + public ArrayList getAllTours(){ + DbConnect dbConnect = new DbConnect(); + ArrayList touren = dbConnect.getAllTouren(); + return touren; + } + public String getMapJson(String start, String ziel){ return start + " " + ziel; } diff --git a/src/tourplaner/data/DbConnect.java b/src/tourplaner/data/DbConnect.java index 56a2888..65c0910 100644 --- a/src/tourplaner/data/DbConnect.java +++ b/src/tourplaner/data/DbConnect.java @@ -1,6 +1,9 @@ package tourplaner.data; +import tourplaner.object.Tour; + import java.sql.Connection; +import java.sql.ResultSet; import java.sql.Statement; import java.util.ArrayList; @@ -26,10 +29,49 @@ public class DbConnect { * @return True bei erfolg, sonst error */ public boolean init() { - // TODO: 26.02.2021 Alle sql im init sind noch falsch ArrayList errors = new ArrayList<>(); - errors.add(PostgresHelper.executeUpdateMessage("CREATE TABLE IF NOT EXISTS USERS (username TEXT PRIMARY KEY NOT NULL, nachname TEXT NOT NULL, email TEXT NOT NULL, password TEXT NOT NULL, bio TEXT, image TEXT, coins integer default 20 not null)", "User Table created")); + 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);", "Log Table created")); return !errors.contains(false); } + + /** + * Holt alle Touren aus der Datenbank + * @return Null bei fehler, sonst eine List aus den IDs + */ + public ArrayList getAllTouren(){ + this.c = PostgresHelper.con(); + String tourname, mapjson, start, ziel; + double dauer, strecke; + + ArrayList touren = new ArrayList<>(); + try { + stmt = this.c.createStatement(); + ResultSet rs = stmt.executeQuery("select tourname, dauer, mapjson, start, ziel, strecke from tour;"); + while (rs.next()) { + tourname = rs.getString("tourname"); + mapjson = rs.getString("mapjson"); + start = rs.getString("start"); + ziel = rs.getString("ziel"); + dauer = rs.getDouble("dauer"); + strecke = rs.getDouble("strecke"); + if (!tourname.isEmpty()) { + touren.add(new Tour(tourname, dauer + "", mapjson, strecke, start, ziel)); + }else { + return null; + } + } + rs.close(); + stmt.close(); + this.c.close(); + return touren; + } catch (Exception e) { + System.err.println(e.getClass().getName() + ": " + e.getMessage()); + return null; + } + } + } diff --git a/src/tourplaner/data/PostgresHelper.java b/src/tourplaner/data/PostgresHelper.java index b300920..f90dcac 100644 --- a/src/tourplaner/data/PostgresHelper.java +++ b/src/tourplaner/data/PostgresHelper.java @@ -3,16 +3,20 @@ package tourplaner.data; import tourplaner.business.ConfigHelper; import tourplaner.business.LogHelper; +import tourplaner.object.Tour; import java.sql.Connection; import java.sql.DriverManager; +import java.sql.ResultSet; import java.sql.Statement; +import java.util.ArrayList; /** * Hilfsfunktionen für die verwendung der Postgres DB */ public class PostgresHelper { - + private Connection c; + private Statement stmt; /** * Verbindet mit der Datenbank * @return Das Connection Objekt @@ -21,6 +25,8 @@ 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")); diff --git a/src/tourplaner/viewmodels/ViewModel.java b/src/tourplaner/viewmodels/ViewModel.java index 7749d5b..5db0c9a 100644 --- a/src/tourplaner/viewmodels/ViewModel.java +++ b/src/tourplaner/viewmodels/ViewModel.java @@ -4,6 +4,8 @@ import javafx.collections.FXCollections; import javafx.collections.ObservableList; import org.apache.pdfbox.exceptions.COSVisitorException; import tourplaner.business.Reporter; +import tourplaner.business.TourPlaner; +import tourplaner.data.DbConnect; import tourplaner.ui.AlertHelper; import tourplaner.business.ConfigHelper; import tourplaner.business.LogHelper; @@ -15,14 +17,15 @@ import java.io.IOException; import java.net.URI; import java.net.URISyntaxException; import java.time.LocalDate; +import java.util.ArrayList; import java.util.UUID; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicReference; public class ViewModel { //Tour - private final ObservableList tourData = FXCollections.observableArrayList(new Tour("Test 1", "120", "json dings", 22.3, "Wien", "Graz"),new Tour("Test 2", "210", "json dings", 42.3, "Da", "Dort")); - private final ObservableList tourNamen = FXCollections.observableArrayList("Test 1", "Test 2"); + private final ObservableList tourData = FXCollections.observableArrayList(); + private final ObservableList tourNamen = FXCollections.observableArrayList(); private Tour selectedTour; private String neueTourName, neueTourStart, neueTourZiel, neueBemerkung; //Log @@ -452,6 +455,12 @@ public class ViewModel { } public ObservableList getTourNamen() { + ArrayList namen = new ArrayList<>(); + getTourData().forEach(s -> { + namen.add(s.getName()); + }); + tourNamen.removeAll(); + tourNamen.addAll(namen); return tourNamen; } @@ -472,6 +481,9 @@ public class ViewModel { } public ObservableList getTourData() { + tourData.removeAll(); +// ObservableList data = ; + tourData.addAll(new TourPlaner().getAllTours()); return tourData; }