diff --git a/src/main/java/net/altimate/app/Filter.java b/src/main/java/net/altimate/app/Filter.java index 96cc84c..f0aec2a 100644 --- a/src/main/java/net/altimate/app/Filter.java +++ b/src/main/java/net/altimate/app/Filter.java @@ -1,21 +1,40 @@ package net.altimate.app; +import static net.altimate.app.App.filesDirectory; + public class Filter { ListFilesInDir listFilesInDir = new ListFilesInDir(); - public String[] filterRemoveWithRegex(String filterRegex, String filesDirectory) { + public String[] filterRemoveWithRegexOld(String filterRegex, String filesDirectory) { String process[] = listFilesInDir.listFilesInDir(filesDirectory); for (int i = 0; i < process.length; ++i) { + System.out.println("process withRegex: " + process[i]); process[i] = process[i].replaceAll(filterRegex, ""); } return process; } + public String[] filterListSMartName(String filterRegex, String filesDirectory) { + + String process[] = listFilesInDir.listFilesInDir(filesDirectory); + + for (int i = 0; i < process.length; ++i) { + + //System.out.println("process RegexTest: " + process[i]); + //System.out.println(filterSplitValues( i, filesDirectory)); + String[] bak = (filterSplitValues( i, filesDirectory)); + process[i] = bak[0]; + process[i] = process[i].replaceAll(filterRegex, ""); + } + return process; + } + + public String[] filterSplitValues(int choosenFileNumber, String filesDirectory) { String process[] = listFilesInDir.listFilesInDir(filesDirectory); diff --git a/src/main/java/net/altimate/app/SceneCreate.java b/src/main/java/net/altimate/app/SceneCreate.java index 9653545..bc0e53a 100644 --- a/src/main/java/net/altimate/app/SceneCreate.java +++ b/src/main/java/net/altimate/app/SceneCreate.java @@ -1,5 +1,7 @@ package net.altimate.app; +import javafx.beans.value.ChangeListener; +import javafx.beans.value.ObservableValue; import javafx.event.ActionEvent; import javafx.event.EventHandler; import javafx.geometry.Insets; @@ -19,6 +21,8 @@ import javafx.stage.Stage; import java.time.format.DateTimeFormatter; +import static net.altimate.app.App.filesDirectory; + public class SceneCreate { Scene scene; @@ -57,6 +61,13 @@ public class SceneCreate { vbox.getChildren().add(title); nameSmartZiel = new TextField(); + nameSmartZiel.textProperty().addListener(new ChangeListener() { + @Override + public void changed(ObservableValue observable, String oldValue, String newValue) { + System.out.println("Changed!!!"); + // object properties oder update methode beim scene bauen in App + } + }); nameSmartZiel.setPromptText("Gib dm Smart Ziel einen Namen"); nameSmartZiel.setPrefColumnCount(1); nameSmartZiel.setPrefSize(100, 20); @@ -125,7 +136,7 @@ public class SceneCreate { + "thanks" + checkInDatePicker.getValue()); String date = checkInDatePicker.getValue().format(DateTimeFormatter.ofPattern("dd.MM.yyyy")); long seconds = System.currentTimeMillis() / 1000l; - String state = "open"; + String smartState = "open"; String[] createSmart = { nameSmartZiel.getText() + "|" + @@ -133,12 +144,12 @@ public class SceneCreate { messBar.getText() + "|" + attraktiv.getText() + "|" + realistisch.getText() + "|" + - state + "|" + + smartState + "|" + seconds + "|" + date }; // Achtung rausnehmen -String filesDirectory = "/home/mic/files"; +//String filesDirectory = "/home/mic/files"; CreateFile.writeFile(filesDirectory + "/" + seconds + ".smart", createSmart); } else { diff --git a/src/main/java/net/altimate/app/SceneList.java b/src/main/java/net/altimate/app/SceneList.java index 7138a95..d4d7af7 100644 --- a/src/main/java/net/altimate/app/SceneList.java +++ b/src/main/java/net/altimate/app/SceneList.java @@ -6,10 +6,7 @@ import javafx.event.ActionEvent; import javafx.event.EventHandler; import javafx.geometry.Insets; import javafx.scene.Scene; -import javafx.scene.control.Button; -import javafx.scene.control.Label; -import javafx.scene.control.ListView; -import javafx.scene.control.TextField; +import javafx.scene.control.*; import javafx.scene.layout.BorderPane; import javafx.scene.layout.GridPane; import javafx.scene.layout.HBox; @@ -40,7 +37,7 @@ public class SceneList { border.setLeft(addList(label, list1)); border.setRight(addEdit(label,list1)); //border.setBottom(addCreateBottom(label)); - scene = new Scene(border, 600, 300); + scene = new Scene(border, 600, 400); } public Scene getScene() { @@ -73,7 +70,7 @@ public class SceneList { //ListView list1 = new ListView(); - ObservableList items = FXCollections.observableArrayList(filter.filterRemoveWithRegex(".smart", filesDirectory)); + ObservableList items = FXCollections.observableArrayList(filter.filterListSMartName(".smart", filesDirectory)); //ObservableList items = FXCollections.observableArrayList(filter.getSmartTargetName(filesDirectory)); //list1.getItems().addAll(items); //list1.getSelectionModel().setSelectionMode(SelectionMode.MULTIPLE); @@ -100,9 +97,9 @@ public class SceneList { reload.setOnAction(new EventHandler() { @Override public void handle(ActionEvent e) { - ObservableList items = FXCollections.observableArrayList(filter.filterRemoveWithRegex(".smart", filesDirectory)); - System.out.println("theoretischer reload des Inhaltes"); - System.out.println(filter.filterRemoveWithRegex(".smart", filesDirectory)); + //ObservableList items = FXCollections.observableArrayList(filter.filterRemoveWithRegex(".smart", filesDirectory)); + //System.out.println("theoretischer reload des Inhaltes"); + System.out.println(filter.filterListSMartName(".smart", filesDirectory)); } }); @@ -133,35 +130,74 @@ public class SceneList { String[] ar = filter.filterSplitValues((int) o, filesDirectory); - final TextField max = new TextField(ar[0]); - max.setPrefColumnCount(20); - max.setPromptText("max"); + final TextField nameSmartZiel = new TextField(ar[0]); + nameSmartZiel.setPrefColumnCount(20); + nameSmartZiel.setPromptText("max"); //final TextField max2 = new TextField(filesContent[(int) o]); - final TextField max2 = new TextField(ar[1]); - max.setPrefColumnCount(20); - max.setPromptText("max2"); + final TextField sinnesSpezifisch = new TextField(ar[1]); + sinnesSpezifisch .setPrefColumnCount(20); + sinnesSpezifisch .setPromptText("max2"); - final TextField max3 = new TextField(ar[2]); - max.setPrefColumnCount(20); - max.setPromptText("max3"); + final TextField messBar = new TextField(ar[2]); + messBar.setPrefColumnCount(20); + messBar .setPromptText("max3"); //final TextField max2 = new TextField(filesContent[(int) o]); - final TextField max4 = new TextField(ar[3]); - max.setPrefColumnCount(20); - max.setPromptText("max4"); + final TextField attraktiv = new TextField(ar[3]); + attraktiv.setPrefColumnCount(20); + attraktiv.setPromptText("max4"); + + final TextField realistisch = new TextField(ar[4]); + realistisch.setPrefColumnCount(20); + realistisch.setPromptText("max5"); + + ObservableList smartStateObj = FXCollections.observableArrayList( + "open", + "succes", + "penalty", + "closed, penalty done", + "closed, bonus done" + ); + final ComboBox smartState = new ComboBox(smartStateObj); + smartState.setValue(ar[5]); + + //final TextField smartState = new TextField(ar[5]); + //smartState.setPrefColumnCount(20); + //smartState.setPromptText("max6"); - final TextField max5 = new TextField(ar[4]); - max.setPrefColumnCount(20); - max.setPromptText("max5"); //final TextField max2 = new TextField(filesContent[(int) o]); - final TextField max6 = new TextField(ar[5]); - max.setPrefColumnCount(20); - max.setPromptText("max6"); + final TextField smartDate = new TextField(ar[7]); + smartDate.setPrefColumnCount(20); + smartDate.setPromptText("max7"); - vbox.getChildren().addAll(max, max2, max3, max4, max5, max6); + Button edit = new Button("Edit"); + + vbox.getChildren().addAll(nameSmartZiel, sinnesSpezifisch, messBar, attraktiv, realistisch, smartDate, smartState, edit); //System.out.println(Arrays.toString(list1)); + edit.setOnAction(new EventHandler() { + @Override + public void handle(ActionEvent e) { + System.out.println("edited: " + " nameofsmart: " + ar[0] + " file: " + ar[6] + " inhalt zelle1: " + nameSmartZiel.getText() ); + String[] createSmart = { + nameSmartZiel.getText() + "|" + + sinnesSpezifisch.getText() + "|" + + messBar.getText() + "|" + + attraktiv.getText() + "|" + + realistisch.getText() + "|" + + smartState.getValue() + "|" + + ar[6] + "|" + + ar[7] + }; +//String filesDirectory = "/home/mic/files"; + CreateFile.writeFile(filesDirectory + "/" + ar[6] + ".smart", createSmart); + + } + }); + + + } }); diff --git a/target/classes/net/altimate/app/Filter.class b/target/classes/net/altimate/app/Filter.class index fa301df..d0c9925 100644 Binary files a/target/classes/net/altimate/app/Filter.class and b/target/classes/net/altimate/app/Filter.class differ diff --git a/target/classes/net/altimate/app/SceneCreate$1.class b/target/classes/net/altimate/app/SceneCreate$1.class index edfd963..4a77eb2 100644 Binary files a/target/classes/net/altimate/app/SceneCreate$1.class and b/target/classes/net/altimate/app/SceneCreate$1.class differ diff --git a/target/classes/net/altimate/app/SceneCreate$2.class b/target/classes/net/altimate/app/SceneCreate$2.class index 34c2256..f2a3731 100644 Binary files a/target/classes/net/altimate/app/SceneCreate$2.class and b/target/classes/net/altimate/app/SceneCreate$2.class differ diff --git a/target/classes/net/altimate/app/SceneCreate$3.class b/target/classes/net/altimate/app/SceneCreate$3.class new file mode 100644 index 0000000..3e87d36 Binary files /dev/null and b/target/classes/net/altimate/app/SceneCreate$3.class differ diff --git a/target/classes/net/altimate/app/SceneCreate.class b/target/classes/net/altimate/app/SceneCreate.class index 3a643a1..91a2c96 100644 Binary files a/target/classes/net/altimate/app/SceneCreate.class and b/target/classes/net/altimate/app/SceneCreate.class differ diff --git a/target/classes/net/altimate/app/SceneList$1.class b/target/classes/net/altimate/app/SceneList$1.class index cb4d054..575657e 100644 Binary files a/target/classes/net/altimate/app/SceneList$1.class and b/target/classes/net/altimate/app/SceneList$1.class differ diff --git a/target/classes/net/altimate/app/SceneList$2.class b/target/classes/net/altimate/app/SceneList$2.class new file mode 100644 index 0000000..3b5b526 Binary files /dev/null and b/target/classes/net/altimate/app/SceneList$2.class differ diff --git a/target/classes/net/altimate/app/SceneList.class b/target/classes/net/altimate/app/SceneList.class index a4a1006..2a8db8f 100644 Binary files a/target/classes/net/altimate/app/SceneList.class and b/target/classes/net/altimate/app/SceneList.class differ