Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
H
HaRakka
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
rlokilja
HaRakka
Commits
23213b74
Commit
23213b74
authored
2 weeks ago
by
Kiljala Renne Lauri Olavi
Browse files
Options
Downloads
Patches
Plain Diff
controller muutoksia
parent
a717d5ad
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/fxHarakka/HarakkaController.java
+6
-3
6 additions, 3 deletions
src/fxHarakka/HarakkaController.java
src/fxHarakka/LuoProjektiController.java
+5
-5
5 additions, 5 deletions
src/fxHarakka/LuoProjektiController.java
with
11 additions
and
8 deletions
src/fxHarakka/HarakkaController.java
+
6
−
3
View file @
23213b74
...
@@ -9,6 +9,7 @@ import javafx.scene.Scene;
...
@@ -9,6 +9,7 @@ import javafx.scene.Scene;
import
javafx.scene.control.*
;
import
javafx.scene.control.*
;
import
javafx.scene.layout.Pane
;
import
javafx.scene.layout.Pane
;
public
class
HarakkaController
{
public
class
HarakkaController
{
@FXML
@FXML
...
@@ -158,6 +159,11 @@ public class HarakkaController {
...
@@ -158,6 +159,11 @@ public class HarakkaController {
@FXML
@FXML
void
handleLisaaPro
(
ActionEvent
event
)
{
void
handleLisaaPro
(
ActionEvent
event
)
{
Tab
uusiLehti
=
new
Tab
();
uusiLehti
.
setContent
(
new
Label
());
lehti
.
getTabs
().
add
(
uusiLehti
);
ModalController
.
showModal
(
HarakkaController
.
class
.
getResource
(
"LuoProjekti.fxml"
),
"Lisää Projekti"
,
null
,
""
);
ModalController
.
showModal
(
HarakkaController
.
class
.
getResource
(
"LuoProjekti.fxml"
),
"Lisää Projekti"
,
null
,
""
);
}
}
...
@@ -198,10 +204,7 @@ public class HarakkaController {
...
@@ -198,10 +204,7 @@ public class HarakkaController {
@FXML
@FXML
public
void
lisaaLehti
(
String
nimi
){
public
void
lisaaLehti
(
String
nimi
){
Tab
uusiLehti
=
new
Tab
(
nimi
);
uusiLehti
.
setContent
(
new
Label
(
nimi
));
lehti
.
getTabs
().
add
(
uusiLehti
);
}
}
...
...
This diff is collapsed.
Click to expand it.
src/fxHarakka/LuoProjektiController.java
+
5
−
5
View file @
23213b74
...
@@ -6,6 +6,7 @@ import fxHarakka.luokat.Harakka;
...
@@ -6,6 +6,7 @@ import fxHarakka.luokat.Harakka;
import
javafx.event.ActionEvent
;
import
javafx.event.ActionEvent
;
import
javafx.fxml.FXML
;
import
javafx.fxml.FXML
;
import
javafx.scene.control.Button
;
import
javafx.scene.control.Button
;
import
javafx.scene.control.TabPane
;
import
javafx.scene.control.TextField
;
import
javafx.scene.control.TextField
;
import
javafx.scene.input.KeyEvent
;
import
javafx.scene.input.KeyEvent
;
...
@@ -28,6 +29,9 @@ public class LuoProjektiController implements ModalControllerInterface<String> {
...
@@ -28,6 +29,9 @@ public class LuoProjektiController implements ModalControllerInterface<String> {
private
TextField
projektiNimi
;
private
TextField
projektiNimi
;
private
String
nimi
=
null
;
private
String
nimi
=
null
;
@FXML
private
TabPane
lehti
;
@FXML
@FXML
void
HylkaaProjekti
(
ActionEvent
event
)
{
void
HylkaaProjekti
(
ActionEvent
event
)
{
...
@@ -42,12 +46,8 @@ public class LuoProjektiController implements ModalControllerInterface<String> {
...
@@ -42,12 +46,8 @@ public class LuoProjektiController implements ModalControllerInterface<String> {
Harakka
harakka
=
new
Harakka
();
Harakka
harakka
=
new
Harakka
();
harakka
.
luoProjekti
(
nimi
,
aihe
,
kesto
);
harakka
.
luoProjekti
(
nimi
,
aihe
,
kesto
);
//lisätään uusi tabi kun luodaan projekti TODO
HarakkaController
controller
=
new
HarakkaController
();
controller
.
lisaaLehti
(
nimi
);
ModalController
.
closeStage
(
projekti
Kesto
);
ModalController
.
closeStage
(
projekti
Nimi
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment