From 76f774dbc0591961003f71ed144da5380810010e Mon Sep 17 00:00:00 2001
From: Kiljala Renne Lauri Olavi <renne.l.o.kiljala@student.jyu.fi>
Date: Thu, 20 Mar 2025 18:44:44 +0200
Subject: [PATCH] =?UTF-8?q?lis=C3=A4tty=20controller?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/fxHarakka/OksaController.java | 15 +++++++++++++++
src/fxHarakka/luokat/Harakka.java | 2 ++
src/fxHarakka/luokat/Projekti.java | 19 +++++++++++++++++--
3 files changed, 34 insertions(+), 2 deletions(-)
create mode 100644 src/fxHarakka/OksaController.java
diff --git a/src/fxHarakka/OksaController.java b/src/fxHarakka/OksaController.java
new file mode 100644
index 0000000..45abdfd
--- /dev/null
+++ b/src/fxHarakka/OksaController.java
@@ -0,0 +1,15 @@
+package fxHarakka;
+
+import fi.jyu.mit.fxgui.Dialogs;
+import fi.jyu.mit.fxgui.ModalController;
+import javafx.event.ActionEvent;
+import javafx.fxml.FXML;
+import javafx.fxml.FXMLLoader;
+import javafx.scene.Scene;
+import javafx.scene.control.Button;
+import javafx.scene.control.CheckBox;
+import javafx.scene.control.MenuItem;
+import javafx.scene.layout.Pane;
+
+public class OksaController {
+}
diff --git a/src/fxHarakka/luokat/Harakka.java b/src/fxHarakka/luokat/Harakka.java
index 230f464..2183744 100644
--- a/src/fxHarakka/luokat/Harakka.java
+++ b/src/fxHarakka/luokat/Harakka.java
@@ -14,6 +14,8 @@ public class Harakka {
projekti1.rekisteroiProjekti();
projekti2.rekisteroiProjekti();
+ projekti1.setKesto(5);
+ projekti1.setSuoritettu(2);
harakka.lisaaProjekti(projekti1);
diff --git a/src/fxHarakka/luokat/Projekti.java b/src/fxHarakka/luokat/Projekti.java
index adef0ac..6bb55ea 100644
--- a/src/fxHarakka/luokat/Projekti.java
+++ b/src/fxHarakka/luokat/Projekti.java
@@ -97,11 +97,26 @@ public class Projekti {
public String getAihe() {
return aihe;
}
-
+
+ public void setAihe(String aihe){
+ this.aihe = aihe;
+ }
+
+ public void setNimi(String nimi){
+ this.nimi = nimi;
+ }
+
+ public void setKesto(int kesto){
+ this.kesto = kesto;
+ }
+
+ public void setSuoritettu(int suoritettu){
+ this.suoritettu = suoritettu;
+ }
@Override
public String toString(){
- String strg = this.nimi + " | " + this.aihe + " | " + this.id;
+ String strg = this.nimi + " | " + this.aihe + " | " + this.id + " | " + this.kesto + " | " + this.suoritettu;
return strg;
}
--
GitLab