diff --git a/src/main/java/com/jFxKasse/controller/MainWindowController.java b/src/main/java/com/jFxKasse/controller/MainWindowController.java index 32cf025..3a77aa1 100644 --- a/src/main/java/com/jFxKasse/controller/MainWindowController.java +++ b/src/main/java/com/jFxKasse/controller/MainWindowController.java @@ -585,7 +585,6 @@ public class MainWindowController @FXML public void btnPrintBillAction(ActionEvent event) { - btnPrintBill.setDisable(true); tapPosEdit.setDisable(false); btnDeleteSelectedPosition.setDisable(true); @@ -593,6 +592,9 @@ public class MainWindowController setJobPrizeLabel(0); + currentJob.setJobtime( + timedate.getSystemTime() + " " + timedate.getSystemDate()); + rootCurrentJob.getChildren().remove(0, rootCurrentJob.getChildren().size()); @@ -1381,8 +1383,7 @@ public class MainWindowController public void createNewJob() { - currentJob = new Job(dbc.getLatestJobNumber_Job() + 1, - timedate.getSystemTime() + " " + timedate.getSystemDate()); + currentJob = new Job(dbc.getLatestJobNumber_Job() + 1); labelJobCounter.setText("Auftragsnummer: " + String.valueOf(dbc.getLatestJobNumber_Job() + 1)); } diff --git a/src/main/java/com/jFxKasse/datatypes/Job.java b/src/main/java/com/jFxKasse/datatypes/Job.java index f6f46ef..4e1f6e2 100644 --- a/src/main/java/com/jFxKasse/datatypes/Job.java +++ b/src/main/java/com/jFxKasse/datatypes/Job.java @@ -19,18 +19,19 @@ public class Job private ArrayList positionenCat; - public Job(int pJobnumber, String pTime) + public Job(int pJobnumber) { this.jobnumber = pJobnumber; - this.jobtime = pTime; - positionenQuantity = new ArrayList(); positionenName = new ArrayList(); positionenValue = new ArrayList(); positionenCat = new ArrayList(); - // System.out.println("Größe: " + positionenName.size()); + } + public void setJobtime(String jobtime) + { + this.jobtime = jobtime; } public int getJobnumber()